Packman Build Service PMBS

Changes of Revision 29

gpac.changes Changed

@@ -1,4 +1,138 @@
 -------------------------------------------------------------------
+Thu Jun 27 11:16:12 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 0.8.0
+ General:
+ * Many security fixes (static compile and fuzzing through AFL,
+ always ongoing).
+ * Many bugs fixes
+ * Added :ncl option in log levels to disable color logs
+ * More tests and coverage
+ File Formats:
+ * Better support of QTFF / ProRes files
+ * Support for AV1
+ + import and export
+ + source formats: OBUs (Section 5), IVF and AnnexB
+ + AV1 in HEIF
+ * Support for color (nclc, nclx and ICC profiles) in HEIF and
+ ISOBMFF
+ * Support for HDR (mdcv, clli) info in HEIF and ISOBMFF
+ * Support for alpha in HEIF
+ * Support for enforcing pasp presence even for 1:1 ratios
+ * HEVC temporal sublayer split in MP4Box
+ * Allow meta storage before mdat for meta-only files (heif and
+ co)
+ * Added option to keep AU delimiter in isobmff samples
+ * Support for opus import
+ * Support for pixi and ccst in HEIF
+ * DolbyVision 'dvcC' and partial 'dvhe' boxes for HDR
+ * Support for VP9 import and playback
+ * Sample dependency in avc and hevc importers, and track
+ thinner for non-refs images
+ * Support for audio_roll signaling
+ * New audio import mode to control AudioSampleEntry creation
+ (v0, v1 ISOBMFF, v1 QTFF)
+ * xHE-AAC import with detection of sync samples
+ * Added support for MPEG-H 3D audio boxes (no import yet)
+ * Handle Vobsub empty SPU packets
+ * Added auxv and pict support
+ Common Encryption:
+ * Fully compliant CENC supporting cenc, cens, cbc1 and cbcs
+ * CENC for AV1
+ * Improved DASH+CENC support, pssh in MPD
+ * ForceClear mode for CENC to skip encryption without sample
+ groups
+ * Made senc in movie fragments always stored before truns
+ * Added default values handling for cbcs and possibility to
+ set protection system per track
+ * Compatibility with OpenSSL 1.1.x
+ Streaming and Adaptive Streaming:
+ * Support for ATSC3.0 both US and Korean versions !
+ * Support for for live splices (xlink period insertions) in
+ DASH client
+ * Automatic period continuity in DASH when no codec change
+ between periods
+ * Added DASH cue-base segmentation (XML based) and -dsap
+ option to generate cue files from source
+ * Support for BBA-0 and BOLA implementations
+ * Write fragment defaults in trex even when not using them
+ * Support for simple ssix for keyframe data byterange at the
+ start of a segment
+ * Moved segment template at AdaptationSet level if only one
+ representation
+ * Changed default bsmode in dasher if single input file
+ * Added init-seg-ext option
+ * Added -mvex-after-traks option to MP4Box when dashing for
+ CMAF
+ * Added segmentation option to insert a tfdt per traf
+ * Added -closest mode for DASH segmentation
+ * Added -bound option to use audio segmenting method for video
+ * Renamed -dash-run-for to -run-for
+ * Added '=' in dash templates
+ * Improved bandwith estimation when using HTTP 1.1 chunk
+ transfer
+ * Add option to force moof base offsets
+ MP4Box:
+ * Added -catpl to concatenate from playlist in MP4Box
+ * Added options to set movie timescale at import and dash time
+ * Added mpd rip option and top-level box compressor in MP4Box
+ * Made -dts skip timing check and added -dtsc for that
+ * Made force-cat option more agressive
+ * Support for MovieFragmentRandomAccess using -mfra option
+ * Added -dtsx to dump timing without offset
+ * Added -dnalc opt for nal CRC dump
+ * Added chunk extraction up to time until end
+ * ISOBMFF single track import now removes references by default
+ Decoders:
+ * Updated ffmpeg to 4.0.2
+ * Moved to openHEVC 3.0 API
+ * Added nvdec support (windows, linux) with reuse of decoder
+ context for tiled VR
+ * Added HEVC support to mediacodec on android
+ * AV1 playback through ffmpeg
+ * Opus playback through ffmpeg
+ 3D, VR and 360:
+ * Added vrhud for multiviewpoint 360
+ * Added forced visibility mode of tiles in VR
+ * Added tile visibility debug mode
+ * Added forced stereo output for openhevc
+ * Disable face nav if mouse grabbed
+ * Added simple face tracking vr navigation based on udp
+ commands
+ * Added PSVR support
+ * Added mouse move emulation at window border to force sphere
+ rotation when inactive
+ * Changed tile visibility algo to sample points in mesh
+ Players (Mobile and Desktop):
+ * Added about extension
+ * Added multiple audio objects in dynamic scene
+ * Added addon splicing of main content
+ * Added mosaic://v1:.:vN url support
+ * Added gaze simulation through mouse and gaze-sphere
+ visibility test
+ Subtitles:
+ * Allow * as argument of -srt|ttxt to dump all possible tracks
+ (#925)
+ * Improved support for WebVTT import
+ * Improved support for WebVTT DASHing/fragmentation
+ Misc:
+ * OSX install now done through PKG and modify PATH env
+ in/etc/paths
+ * Added initial PMT version and disc marker to TS muxer
+ * Moved dektec output to matrix API, added SDI clipping
+ * Added temi periodic toggle and manual toggle in MP42TS
+
+- Bumped soversion to 8
+
+- Refreshed gpac-0.6.1-x264-export.patch as
+ gpac-0.8.0-x264-export.patch
+
+- Reworked gpac.ssl.patch (probably pointless, since it applies
+ only to OpenSSL 1.0)
+
+- Dropped gpac-0.7.1-install_DashCast.patch (merged upstream)
+
+-------------------------------------------------------------------
 Tue Oct 9 21:06:57 UTC 2018 - aloisio@gmx.com
 
 - Update to version 0.7.1

gpac.spec Changed

@@ -1,6 +1,7 @@
 #
 # spec file for package gpac
 #
+# Copyright (c) 2019 Packman Team <packman@links2linux.de>
 # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
@@ -12,19 +13,19 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.links2linux.org/
 #
 
 
-%define soname 7
+%define sover 8
 Name: gpac
-Version: 0.7.1
+Version: 0.8.0
 Release: 0
 Summary: A multimedia framework covering MPEG-4, VRML/X3D and SVG
-License: LGPL-2.1+
+License: LGPL-2.1-or-later
 Group: Productivity/Multimedia/Video/Editors and Convertors
 Url: http://gpac.io
-Source: http://github.com/gpac/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source: https://github.com/gpac/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source90: %{name}-rpmlintrc
 #PATCH-FIX-UPSTREAM i@marguerite.su - enable osmozilla and osmo4_wx
 Patch1: gpac-0.7.1-enable_V4Studio.patch
@@ -40,12 +41,11 @@
 Patch6: gpac-0.6.1-no-pc.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix gf_isom_set_pixel_aspect_ratio
 # not available to the public
-Patch9: gpac-0.6.1-x264-export.patch
+Patch9: gpac-0.8.0-x264-export.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix u32 count redelaration
 Patch10: gpac-0.5.1-u32-count-redeclaration.patch
 Patch11: gpac.wx.patch
 Patch12: gpac.ssl.patch
-Patch13: gpac-0.7.1-install_DashCast.patch
 BuildRequires: ImageMagick
 BuildRequires: Mesa-devel
 BuildRequires: alsa-devel
@@ -117,17 +117,17 @@
 
 Author: Jean Le Feuvre <jeanlf at users.sourceforge.net>
 
-%package -n libgpac%{soname}
+%package -n libgpac%{sover}
 Summary: Shared libraries for gpac
 Group: System/Libraries
 
-%description -n libgpac%{soname}
+%description -n libgpac%{sover}
 Shared libraries for package gpac.
 
 %package -n libgpac-devel
 Summary: Development files for gpac
 Group: Development/Languages/C and C++
-Requires: libgpac%{soname} = %{version}
+Requires: libgpac%{sover} = %{version}
 # old name
 Provides: gpac-devel = %{version}
 Obsoletes: gpac-devel < %{version}
@@ -174,7 +174,6 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 
 %build
 # Fix encoding warnings
@@ -259,11 +258,14 @@
 # static lib
 rm -rf %{buildroot}%{_libdir}/*.a
 
+# Windows includes
+rm -rf %{buildroot}%{_includedir}/win32 %{buildroot}%{_includedir}/wince
+
 %fdupes %{buildroot}
 
-%post -n libgpac%{soname} -p /sbin/ldconfig
+%post -n libgpac%{sover} -p /sbin/ldconfig
 
-%postun -n libgpac%{soname} -p /sbin/ldconfig
+%postun -n libgpac%{sover} -p /sbin/ldconfig
 
 %files
 %doc AUTHORS BUGS Changelog README.md TODO
@@ -281,9 +283,9 @@
 %{_datadir}/%{name}/
 %{_mandir}/man1/*
 
-%files -n libgpac%{soname}
-%{_libdir}/libgpac.so.%{soname}
-%{_libdir}/libgpac.so.%{soname}.*
+%files -n libgpac%{sover}
+%{_libdir}/libgpac.so.%{sover}
+%{_libdir}/libgpac.so.%{sover}.*
 
 %files -n libgpac-devel
 %doc doc/CODING_STYLE doc/ipmpx_syntax.bt

gpac-0.6.1-x264-export.patch Deleted

gpac-0.7.1-install_DashCast.patch Deleted

gpac-0.8.0-x264-export.patch Added

gpac.ssl.patch Changed

@@ -1,16 +1,18 @@
---- a/src/utils/downloader.c
-+++ b/src/utils/downloader.c
-@@ -391,8 +391,7 @@ static Bool init_ssl_lib() {
- 	}
+Index: gpac-0.8.0/src/utils/downloader.c
+===================================================================
+--- gpac-0.8.0.orig/src/utils/downloader.c
++++ gpac-0.8.0/src/utils/downloader.c
+@@ -394,8 +394,7 @@ static Bool init_ssl_lib() {
+ #if OPENSSL_VERSION_NUMBER < 0x10100000L
 	SSL_library_init();
 	SSL_load_error_strings();
 -	SSLeay_add_all_algorithms();
 -	SSLeay_add_ssl_algorithms();
 +	OpenSSL_add_all_algorithms();
+ #endif
+ 
 	_ssl_is_initialized = GF_TRUE;
- 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initalization of SSL library complete.\n"));
- 	return GF_FALSE;
-@@ -426,13 +425,13 @@ static int ssl_init(GF_DownloadManager *
+@@ -432,13 +431,13 @@ static int ssl_init(GF_DownloadManager *
 	case 1:
 		meth = SSLv2_client_method();
 		break;
@@ -22,6 +24,6 @@
 		meth = TLSv1_client_method();
 		break;
 +#endif
- 	default:
- 		goto error;
- 	}
+ #else /* for openssl 1.1+ this is the prefered method */
+ 	case 0:
+ 		meth = TLS_client_method();

gpac-0.7.1.tar.gz/build/osxdmg Deleted

gpac-0.7.1.tar.gz/build/osxdmg/Osmo4.app Deleted

gpac-0.7.1.tar.gz/build/osxdmg/Osmo4.app/Contents Deleted

gpac-0.7.1.tar.gz/build/osxdmg/Osmo4.app/Contents/Resources Deleted

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/.classpath Deleted

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/.project Deleted

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/old_codec_ids.h Deleted

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/vda.h Deleted

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/audioconvert.h Deleted

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/intfloat_readwrite.h Deleted

@@ -1,44 +0,0 @@
-/*
- * 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_INTFLOAT_READWRITE_H
-#define AVUTIL_INTFLOAT_READWRITE_H
-
-#include <stdint.h>
-
-#include "attributes.h"
-#include "version.h"
-
-#if FF_API_INTFLOAT
-/* IEEE 80 bits extended float */
-typedef struct AVExtFloat {
- uint8_t exponent[2];
- uint8_t mantissa[8];
-} AVExtFloat;
-
-attribute_deprecated double av_int2dbl(int64_t v) av_const;
-attribute_deprecated float av_int2flt(int32_t v) av_const;
-attribute_deprecated double av_ext2dbl(const AVExtFloat ext) av_const;
-attribute_deprecated int64_t av_dbl2int(double d) av_const;
-attribute_deprecated int32_t av_flt2int(float d) av_const;
-attribute_deprecated AVExtFloat av_dbl2ext(double d) av_const;
-#endif /* FF_API_INTFLOAT */
-
-#endif /* AVUTIL_INTFLOAT_READWRITE_H */

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/old_pix_fmts.h Deleted

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

gpac-0.7.1.tar.gz/extra_lib/include/libavcodec/old_codec_ids.h Deleted

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

gpac-0.7.1.tar.gz/extra_lib/include/libavcodec/vda.h Deleted

@@ -1,168 +0,0 @@
-/*
- * VDA HW acceleration
- *
- * copyright (c) 2011 Sebastien Zwickert
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VDA_H
-#define AVCODEC_VDA_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_vda
- * Public libavcodec VDA header.
- */
-
-#include <stdint.h>
-
-// emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
-// http://openradar.appspot.com/8026390
-#undef __GNUC_STDC_INLINE__
-
-#define Picture QuickdrawPicture
-#include <VideoDecodeAcceleration/VDADecoder.h>
-#undef Picture
-
-#include "libavcodec/version.h"
-
-// extra flags not defined in VDADecoder.h
-enum {
- kVDADecodeInfo_Asynchronous = 1UL << 0,
- kVDADecodeInfo_FrameDropped = 1UL << 1
-};
-
-/**
- * @defgroup lavc_codec_hwaccel_vda VDA
- * @ingroup lavc_codec_hwaccel
- *
- * @{
- */
-
-/**
- * This structure is used to provide the necessary configurations and data
- * to the VDA FFmpeg HWAccel implementation.
- *
- * The application must make it available as AVCodecContext.hwaccel_context.
- */
-struct vda_context {
- /**
- * VDA decoder object.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- VDADecoder decoder;
-
- /**
- * The Core Video pixel buffer that contains the current image data.
- *
- * encoding: unused
- * decoding: Set by libavcodec. Unset by user.
- */
- CVPixelBufferRef cv_buffer;
-
- /**
- * Use the hardware decoder in synchronous mode.
- *
- * encoding: unused
- * decoding: Set by user.
- */
- int use_sync_decoding;
-
- /**
- * The frame width.
- *
- * - encoding: unused
- * - decoding: Set/Unset by user.
- */
- int width;
-
- /**
- * The frame height.
- *
- * - encoding: unused
- * - decoding: Set/Unset by user.
- */
- int height;
-
- /**
- * The frame format.
- *
- * - encoding: unused
- * - decoding: Set/Unset by user.
- */
- int format;
-
- /**
- * The pixel format for output image buffers.
- *
- * - encoding: unused
- * - decoding: Set/Unset by user.
- */
- OSType cv_pix_fmt_type;
-
- /**
- * The current bitstream buffer.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- uint8_t *priv_bitstream;
-
- /**
- * The current size of the bitstream.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- int priv_bitstream_size;
-
- /**
- * The reference size used for fast reallocation.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- int priv_allocated_size;
-
- /**
- * Use av_buffer to manage buffer.
- * When the flag is set, the CVPixelBuffers returned by the decoder will
- * be released automatically, so you have to retain them if necessary.
- * Not setting this flag may cause memory leak.
- *
- * encoding: unused
- * decoding: Set by user.
- */
- int use_ref_buffer;
-};
-
-/** Create the video decoder. */
-int ff_vda_create_decoder(struct vda_context *vda_ctx,
- uint8_t *extradata,
- int extradata_size);
-
-/** Destroy the video decoder. */
-int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_VDA_H */

gpac-0.7.1.tar.gz/extra_lib/include/libavfilter/asrc_abuffer.h Deleted

@@ -1,91 +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_ASRC_ABUFFER_H
-#define AVFILTER_ASRC_ABUFFER_H
-
-#include "avfilter.h"
-
-/**
- * @file
- * memory buffer source for audio
- *
- * @deprecated use buffersrc.h instead.
- */
-
-/**
- * Queue an audio buffer to the audio buffer source.
- *
- * @param abuffersrc audio source buffer context
- * @param data pointers to the samples planes
- * @param linesize linesizes of each audio buffer plane
- * @param nb_samples number of samples per channel
- * @param sample_fmt sample format of the audio data
- * @param ch_layout channel layout of the audio data
- * @param planar flag to indicate if audio data is planar or packed
- * @param pts presentation timestamp of the audio buffer
- * @param flags unused
- *
- * @deprecated use av_buffersrc_add_ref() instead.
- */
-attribute_deprecated
-int av_asrc_buffer_add_samples(AVFilterContext *abuffersrc,
-                               uint8_t *data[8], int linesize[8],
-                               int nb_samples, int sample_rate,
-                               int sample_fmt, int64_t ch_layout, int planar,
-                               int64_t pts, int av_unused flags);
-
-/**
- * Queue an audio buffer to the audio buffer source.
- *
- * This is similar to av_asrc_buffer_add_samples(), but the samples
- * are stored in a buffer with known size.
- *
- * @param abuffersrc audio source buffer context
- * @param buf pointer to the samples data, packed is assumed
- * @param size the size in bytes of the buffer, it must contain an
- * integer number of samples
- * @param sample_fmt sample format of the audio data
- * @param ch_layout channel layout of the audio data
- * @param pts presentation timestamp of the audio buffer
- * @param flags unused
- *
- * @deprecated use av_buffersrc_add_ref() instead.
- */
-attribute_deprecated
-int av_asrc_buffer_add_buffer(AVFilterContext *abuffersrc,
-                              uint8_t *buf, int buf_size,
-                              int sample_rate,
-                              int sample_fmt, int64_t ch_layout, int planar,
-                              int64_t pts, int av_unused flags);
-
-/**
- * Queue an audio buffer to the audio buffer source.
- *
- * @param abuffersrc audio source buffer context
- * @param samplesref buffer ref to queue
- * @param flags unused
- *
- * @deprecated use av_buffersrc_add_ref() instead.
- */
-attribute_deprecated
-int av_asrc_buffer_add_audio_buffer_ref(AVFilterContext *abuffersrc,
-                                        AVFilterBufferRef *samplesref,
-                                        int av_unused flags);
-
-#endif /* AVFILTER_ASRC_ABUFFER_H */

gpac-0.7.1.tar.gz/extra_lib/include/libavfilter/avcodec.h Deleted

@@ -1,110 +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_AVCODEC_H
-#define AVFILTER_AVCODEC_H
-
-/**
- * @file
- * libavcodec/libavfilter gluing utilities
- *
- * This should be included in an application ONLY if the installed
- * libavfilter has been compiled with libavcodec support, otherwise
- * symbols defined below will not be available.
- */
-
-#include "avfilter.h"
-
-#if FF_API_AVFILTERBUFFER
-/**
- * Create and return a picref reference from the data and properties
- * contained in frame.
- *
- * @param perms permissions to assign to the new buffer reference
- * @deprecated avfilter APIs work natively with AVFrame instead.
- */
-attribute_deprecated
-AVFilterBufferRef *avfilter_get_video_buffer_ref_from_frame(const AVFrame *frame, int perms);
-
-
-/**
- * Create and return a picref reference from the data and properties
- * contained in frame.
- *
- * @param perms permissions to assign to the new buffer reference
- * @deprecated avfilter APIs work natively with AVFrame instead.
- */
-attribute_deprecated
-AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_frame(const AVFrame *frame,
-                                                            int perms);
-
-/**
- * Create and return a buffer reference from the data and properties
- * contained in frame.
- *
- * @param perms permissions to assign to the new buffer reference
- * @deprecated avfilter APIs work natively with AVFrame instead.
- */
-attribute_deprecated
-AVFilterBufferRef *avfilter_get_buffer_ref_from_frame(enum AVMediaType type,
-                                                      const AVFrame *frame,
-                                                      int perms);
-#endif
-
-#if FF_API_FILL_FRAME
-/**
- * Fill an AVFrame with the information stored in samplesref.
- *
- * @param frame an already allocated AVFrame
- * @param samplesref an audio buffer reference
- * @return >= 0 in case of success, a negative AVERROR code in case of
- * failure
- * @deprecated Use avfilter_copy_buf_props() instead.
- */
-attribute_deprecated
-int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame,
-                                              const AVFilterBufferRef *samplesref);
-
-/**
- * Fill an AVFrame with the information stored in picref.
- *
- * @param frame an already allocated AVFrame
- * @param picref a video buffer reference
- * @return >= 0 in case of success, a negative AVERROR code in case of
- * failure
- * @deprecated Use avfilter_copy_buf_props() instead.
- */
-attribute_deprecated
-int avfilter_fill_frame_from_video_buffer_ref(AVFrame *frame,
-                                              const AVFilterBufferRef *picref);
-
-/**
- * Fill an AVFrame with information stored in ref.
- *
- * @param frame an already allocated AVFrame
- * @param ref a video or audio buffer reference
- * @return >= 0 in case of success, a negative AVERROR code in case of
- * failure
- * @deprecated Use avfilter_copy_buf_props() instead.
- */
-attribute_deprecated
-int avfilter_fill_frame_from_buffer_ref(AVFrame *frame,
-                                        const AVFilterBufferRef *ref);
-#endif
-
-#endif /* AVFILTER_AVCODEC_H */

gpac-0.7.1.tar.gz/extra_lib/include/libavfilter/avfiltergraph.h Deleted

@@ -1,28 +0,0 @@
-/*
- * Filter graphs
- * 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_AVFILTERGRAPH_H
-#define AVFILTER_AVFILTERGRAPH_H
-
-#include "avfilter.h"
-#include "libavutil/log.h"
-
-#endif /* AVFILTER_AVFILTERGRAPH_H */

gpac-0.7.1.tar.gz/extra_lib/include/libavresample Deleted

gpac-0.7.1.tar.gz/extra_lib/include/libavresample/avresample.h Deleted

@@ -1,417 +0,0 @@
-/*
- * 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
- */
-
-#ifndef AVRESAMPLE_AVRESAMPLE_H
-#define AVRESAMPLE_AVRESAMPLE_H
-
-/**
- * @file
- * @ingroup lavr
- * external API header
- */
-
-/**
- * @defgroup lavr Libavresample
- * @{
- *
- * Libavresample (lavr) is a library that handles audio resampling, sample
- * format conversion and mixing.
- *
- * Interaction with lavr is done through AVAudioResampleContext, which is
- * allocated with avresample_alloc_context(). It is opaque, so all parameters
- * must be set with the @ref avoptions API.
- *
- * 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):
- * @code
- * AVAudioResampleContext *avr = avresample_alloc_context();
- * av_opt_set_int(avr, "in_channel_layout", AV_CH_LAYOUT_5POINT1, 0);
- * av_opt_set_int(avr, "out_channel_layout", AV_CH_LAYOUT_STEREO, 0);
- * av_opt_set_int(avr, "in_sample_rate", 48000, 0);
- * av_opt_set_int(avr, "out_sample_rate", 44100, 0);
- * av_opt_set_int(avr, "in_sample_fmt", AV_SAMPLE_FMT_FLTP, 0);
- * av_opt_set_int(avr, "out_sample_fmt", AV_SAMPLE_FMT_S16, 0);
- * @endcode
- *
- * Once the context is initialized, it must be opened with avresample_open(). If
- * you need to change the conversion parameters, you must close the context with
- * avresample_close(), change the parameters as described above, then reopen it
- * again.
- *
- * The conversion itself is done by repeatedly calling avresample_convert().
- * Note that the samples may get buffered in two places in lavr. The first one
- * is the output FIFO, where the samples end up if the output buffer is not
- * large enough. The data stored in there may be retrieved at any time with
- * avresample_read(). The second place is the resampling delay buffer,
- * applicable only when resampling is done. The samples in it require more input
- * before they can be processed. Their current amount is returned by
- * avresample_get_delay(). At the end of conversion the resampling buffer can be
- * flushed by calling avresample_convert() with NULL input.
- *
- * 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_linesize, in_samples;
- *
- * while (get_input(&input, &in_linesize, &in_samples)) {
- * uint8_t *output
- * int out_linesize;
- * int out_samples = avresample_available(avr) +
- * av_rescale_rnd(avresample_get_delay(avr) +
- * in_samples, 44100, 48000, AV_ROUND_UP);
- * av_samples_alloc(&output, &out_linesize, 2, out_samples,
- * AV_SAMPLE_FMT_S16, 0);
- * out_samples = avresample_convert(avr, &output, out_linesize, out_samples,
- * input, in_linesize, in_samples);
- * handle_output(output, out_linesize, out_samples);
- * av_freep(&output);
- * }
- * @endcode
- *
- * When the conversion is finished and the FIFOs are flushed if required, the
- * conversion context and everything associated with it must be freed with
- * avresample_free().
- */
-
-#include "libavutil/avutil.h"
-#include "libavutil/channel_layout.h"
-#include "libavutil/dict.h"
-#include "libavutil/log.h"
-
-#include "libavresample/version.h"
-
-#define AVRESAMPLE_MAX_CHANNELS 32
-
-typedef struct AVAudioResampleContext AVAudioResampleContext;
-
-/** Mixing Coefficient Types */
-enum AVMixCoeffType {
- AV_MIX_COEFF_TYPE_Q8, /** 16-bit 8.8 fixed-point */
- AV_MIX_COEFF_TYPE_Q15, /** 32-bit 17.15 fixed-point */
- AV_MIX_COEFF_TYPE_FLT, /** floating-point */
- AV_MIX_COEFF_TYPE_NB, /** Number of coeff types. Not part of ABI */
-};
-
-/** Resampling Filter Types */
-enum AVResampleFilterType {
- AV_RESAMPLE_FILTER_TYPE_CUBIC, /**< Cubic */
- AV_RESAMPLE_FILTER_TYPE_BLACKMAN_NUTTALL, /**< Blackman Nuttall Windowed Sinc */
- AV_RESAMPLE_FILTER_TYPE_KAISER, /**< Kaiser Windowed Sinc */
-};
-
-enum AVResampleDitherMethod {
- AV_RESAMPLE_DITHER_NONE, /**< Do not use dithering */
- AV_RESAMPLE_DITHER_RECTANGULAR, /**< Rectangular Dither */
- AV_RESAMPLE_DITHER_TRIANGULAR, /**< Triangular Dither*/
- AV_RESAMPLE_DITHER_TRIANGULAR_HP, /**< Triangular Dither with High Pass */
- AV_RESAMPLE_DITHER_TRIANGULAR_NS, /**< Triangular Dither with Noise Shaping */
- AV_RESAMPLE_DITHER_NB, /**< Number of dither types. Not part of ABI. */
-};
-
-/**
- * Return the LIBAVRESAMPLE_VERSION_INT constant.
- */
-unsigned avresample_version(void);
-
-/**
- * Return the libavresample build-time configuration.
- * @return configure string
- */
-const char *avresample_configuration(void);
-
-/**
- * Return the libavresample license.
- */
-const char *avresample_license(void);
-
-/**
- * Get the AVClass for AVAudioResampleContext.
- *
- * Can be used in combination with AV_OPT_SEARCH_FAKE_OBJ for examining options
- * without allocating a context.
- *
- * @see av_opt_find().
- *
- * @return AVClass for AVAudioResampleContext
- */
-const AVClass *avresample_get_class(void);
-
-/**
- * Allocate AVAudioResampleContext and set options.
- *
- * @return allocated audio resample context, or NULL on failure
- */
-AVAudioResampleContext *avresample_alloc_context(void);
-
-/**
- * Initialize AVAudioResampleContext.
- *
- * @param avr audio resample context
- * @return 0 on success, negative AVERROR code on failure
- */
-int avresample_open(AVAudioResampleContext *avr);
-
-/**
- * Check whether an AVAudioResampleContext is open or closed.
- *
- * @param avr AVAudioResampleContext to check
- * @return 1 if avr is open, 0 if avr is closed.
- */
-int avresample_is_open(AVAudioResampleContext *avr);
-
-/**
- * Close AVAudioResampleContext.
- *
- * This closes the context, but it does not change the parameters. The context
- * can be reopened with avresample_open(). It does, however, clear the output
- * FIFO and any remaining leftover samples in the resampling delay buffer. If
- * there was a custom matrix being used, that is also cleared.
- *
- * @see avresample_convert()
- * @see avresample_set_matrix()
- *
- * @param avr audio resample context
- */
-void avresample_close(AVAudioResampleContext *avr);
-
-/**
- * Free AVAudioResampleContext and associated AVOption values.
- *
- * This also calls avresample_close() before freeing.
- *
- * @param avr audio resample context
- */
-void avresample_free(AVAudioResampleContext **avr);
-
-/**
- * Generate a channel mixing matrix.
- *
- * This function is the one used internally by libavresample 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 normalize if 1, coefficients will be normalized to prevent
- * overflow. if 0, coefficients will not be
- * normalized.
- * @param[out] matrix mixing coefficients; matrix[i + 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)
- * @return 0 on success, negative AVERROR code on failure
- */
-int avresample_build_matrix(uint64_t in_layout, uint64_t out_layout,
- double center_mix_level, double surround_mix_level,
- double lfe_mix_level, int normalize, double *matrix,
- int stride, enum AVMatrixEncoding matrix_encoding);
-
-/**
- * Get the current channel mixing matrix.
- *
- * If no custom matrix has been previously set or the AVAudioResampleContext is
- * not open, an error is returned.
- *
- * @param avr audio resample context
- * @param matrix mixing coefficients; matrix[i + stride * o] is the weight of
- * input channel i in output channel o.
- * @param stride distance between adjacent input channels in the matrix array
- * @return 0 on success, negative AVERROR code on failure
- */
-int avresample_get_matrix(AVAudioResampleContext *avr, double *matrix,
- int stride);
-
-/**
- * Set channel mixing matrix.
- *
- * Allows for setting a custom mixing matrix, overriding the default matrix
- * generated internally during avresample_open(). This function can be called
- * anytime on an allocated context, either before or after calling
- * avresample_open(), as long as the channel layouts have been set.
- * avresample_convert() always uses the current matrix.
- * Calling avresample_close() on the context will clear the current matrix.
- *
- * @see avresample_close()
- *
- * @param avr audio resample context
- * @param matrix mixing coefficients; matrix[i + stride * o] is the weight of
- * input channel i in output channel o.
- * @param stride distance between adjacent input channels in the matrix array
- * @return 0 on success, negative AVERROR code on failure
- */
-int avresample_set_matrix(AVAudioResampleContext *avr, const double *matrix,
- int stride);
-
-/**
- * Set a customized input channel mapping.
- *
- * This function can only be called when the allocated context is not open.
- * Also, the input channel layout must have already been set.
- *
- * Calling avresample_close() on the context will clear the channel mapping.
- *
- * The map for each input channel specifies the channel index in the source to
- * use for that particular channel, or -1 to mute the channel. Source channels
- * can be duplicated by using the same index for multiple input channels.
- *
- * Examples:
- *
- * Reordering 5.1 AAC order (C,L,R,Ls,Rs,LFE) to FFmpeg order (L,R,C,LFE,Ls,Rs):
- * { 1, 2, 0, 5, 3, 4 }
- *
- * Muting the 3rd channel in 4-channel input:
- * { 0, 1, -1, 3 }
- *
- * Duplicating the left channel of stereo input:
- * { 0, 0 }
- *
- * @param avr audio resample context
- * @param channel_map customized input channel mapping
- * @return 0 on success, negative AVERROR code on failure
- */
-int avresample_set_channel_mapping(AVAudioResampleContext *avr,
- const int *channel_map);
-
-/**
- * Set compensation for resampling.
- *
- * This can be called anytime after avresample_open(). If resampling is not
- * automatically enabled because of a sample rate conversion, the
- * "force_resampling" option must have been set to 1 when opening the context
- * in order to use resampling compensation.
- *
- * @param avr audio resample context
- * @param sample_delta compensation delta, in samples
- * @param compensation_distance compensation distance, in samples
- * @return 0 on success, negative AVERROR code on failure
- */
-int avresample_set_compensation(AVAudioResampleContext *avr, int sample_delta,
- int compensation_distance);
-
-/**
- * Convert input samples and write them to the output FIFO.
- *
- * The upper bound on the number of output samples is given by
- * avresample_available() + (avresample_get_delay() + number of input samples) *
- * output sample rate / input sample rate.
- *
- * The output data 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 avresample_read().
- *
- * If converting sample rate, there may be data remaining in the internal
- * resampling delay buffer. avresample_get_delay() tells the number of remaining
- * samples. To get this data as output, call avresample_convert() with NULL
- * input.
- *
- * At the end of the conversion process, there may be data remaining in the
- * internal FIFO buffer. avresample_available() tells the number of remaining
- * samples. To get this data as output, either call avresample_convert() with
- * NULL input or call avresample_read().
- *
- * @see avresample_available()
- * @see avresample_read()
- * @see avresample_get_delay()
- *
- * @param avr audio resample context
- * @param output output data pointers
- * @param out_plane_size output plane size, in bytes.
- * This can be 0 if unknown, but that will lead to
- * optimized functions not being used directly on the
- * output, which could slow down some conversions.
- * @param out_samples maximum number of samples that the output buffer can hold
- * @param input input data pointers
- * @param in_plane_size input plane size, in bytes
- * This can be 0 if unknown, but that will lead to
- * optimized functions not being used directly on the
- * input, which could slow down some conversions.
- * @param in_samples number of input samples to convert
- * @return number of samples written to the output buffer,
- * not including converted samples added to the internal
- * output FIFO
- */
-int avresample_convert(AVAudioResampleContext *avr, uint8_t **output,
- int out_plane_size, int out_samples, uint8_t **input,
- int in_plane_size, int in_samples);
-
-/**
- * Return the number of samples currently in the resampling delay buffer.
- *
- * When resampling, there may be a delay between the input and output. Any
- * unconverted samples in each call are stored internally in a delay buffer.
- * This function allows the user to determine the current number of samples in
- * the delay buffer, which can be useful for synchronization.
- *
- * @see avresample_convert()
- *
- * @param avr audio resample context
- * @return number of samples currently in the resampling delay buffer
- */
-int avresample_get_delay(AVAudioResampleContext *avr);
-
-/**
- * Return the number of available samples in the output FIFO.
- *
- * During conversion, if the user does not specify an output buffer or
- * specifies an output buffer that is smaller than what is needed, remaining
- * samples that are not written to the output are stored to an internal FIFO
- * buffer. The samples in the FIFO can be read with avresample_read() or
- * avresample_convert().
- *
- * @see avresample_read()
- * @see avresample_convert()
- *
- * @param avr audio resample context
- * @return number of samples available for reading
- */
-int avresample_available(AVAudioResampleContext *avr);
-
-/**
- * Read samples from the output FIFO.
- *
- * During conversion, if the user does not specify an output buffer or
- * specifies an output buffer that is smaller than what is needed, remaining
- * samples that are not written to the output are stored to an internal FIFO
- * buffer. This function can be used to read samples from that internal FIFO.
- *
- * @see avresample_available()
- * @see avresample_convert()
- *
- * @param avr audio resample context
- * @param output output data pointers. May be NULL, in which case
- * nb_samples of data is discarded from output FIFO.
- * @param nb_samples number of samples to read from the FIFO
- * @return the number of samples written to output
- */
-int avresample_read(AVAudioResampleContext *avr, uint8_t **output, int nb_samples);
-
-/**
- * @}
- */
-
-#endif /* AVRESAMPLE_AVRESAMPLE_H */

gpac-0.7.1.tar.gz/extra_lib/include/libavresample/version.h Deleted

@@ -1,54 +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 AVRESAMPLE_VERSION_H
-#define AVRESAMPLE_VERSION_H
-
-/**
- * @file
- * @ingroup lavr
- * Libavresample version macros.
- */
-
-#include "libavutil/version.h"
-
-#define LIBAVRESAMPLE_VERSION_MAJOR 1
-#define LIBAVRESAMPLE_VERSION_MINOR 2
-#define LIBAVRESAMPLE_VERSION_MICRO 0
-
-#define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \
- LIBAVRESAMPLE_VERSION_MINOR, \
- LIBAVRESAMPLE_VERSION_MICRO)
-#define LIBAVRESAMPLE_VERSION AV_VERSION(LIBAVRESAMPLE_VERSION_MAJOR, \
- LIBAVRESAMPLE_VERSION_MINOR, \
- LIBAVRESAMPLE_VERSION_MICRO)
-#define LIBAVRESAMPLE_BUILD LIBAVRESAMPLE_VERSION_INT
-
-#define LIBAVRESAMPLE_IDENT "Lavr" AV_STRINGIFY(LIBAVRESAMPLE_VERSION)
-
-/**
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- */
-
-#ifndef FF_API_RESAMPLE_CLOSE_OPEN
-#define FF_API_RESAMPLE_CLOSE_OPEN (LIBAVRESAMPLE_VERSION_MAJOR < 2)
-#endif
-
-#endif /* AVRESAMPLE_VERSION_H */

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/audioconvert.h Deleted

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/intfloat_readwrite.h Deleted

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/old_pix_fmts.h Deleted

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

gpac-0.7.1.tar.gz/extra_lib/include/openHevcWrapper.h Deleted

@@ -1,104 +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 OPEN_HEVC_WRAPPER_H
-#define OPEN_HEVC_WRAPPER_H
-
-#define NV_VERSION "2.0" ///< Current software version
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-
-typedef void* OpenHevc_Handle;
-
-typedef struct OpenHevc_Rational{
- int num; ///< numerator
- int den; ///< denominator
-} OpenHevc_Rational;
-
-
-enum ChromaFormat {
- YUV420 = 0,
- YUV422,
- YUV444,
-};
-
-typedef struct OpenHevc_FrameInfo
-{
- int nYPitch;
- int nUPitch;
- int nVPitch;
- int nBitDepth;
- int nWidth;
- int nHeight;
- int chromat_format;
- OpenHevc_Rational sample_aspect_ratio;
- OpenHevc_Rational frameRate;
- int display_picture_number;
- int flag; //progressive, interlaced, interlaced top field first, interlaced bottom field first.
- int64_t nTimeStamp;
-} OpenHevc_FrameInfo;
-
-typedef struct OpenHevc_Frame
-{
- void** pvY;
- void** pvU;
- void** pvV;
- OpenHevc_FrameInfo frameInfo;
-} OpenHevc_Frame;
-
-typedef struct OpenHevc_Frame_cpy
-{
- void* pvY;
- void* pvU;
- void* pvV;
- OpenHevc_FrameInfo frameInfo;
-} OpenHevc_Frame_cpy;
-
-OpenHevc_Handle libOpenHevcInit(int nb_pthreads, int thread_type);
-int libOpenHevcStartDecoder(OpenHevc_Handle openHevcHandle);
-int libOpenHevcDecode(OpenHevc_Handle openHevcHandle, const unsigned char *buff, int nal_len, int64_t pts);
-void libOpenHevcGetPictureInfo(OpenHevc_Handle openHevcHandle, OpenHevc_FrameInfo *openHevcFrameInfo);
-void libOpenHevcCopyExtraData(OpenHevc_Handle openHevcHandle, unsigned char *extra_data, int extra_size_alloc);
-
-void libOpenHevcGetPictureInfoCpy(OpenHevc_Handle openHevcHandle, OpenHevc_FrameInfo *openHevcFrameInfo);
-int libOpenHevcGetOutput(OpenHevc_Handle openHevcHandle, int got_picture, OpenHevc_Frame *openHevcFrame);
-int libOpenHevcGetOutputCpy(OpenHevc_Handle openHevcHandle, int got_picture, OpenHevc_Frame_cpy *openHevcFrame);
-void libOpenHevcSetCheckMD5(OpenHevc_Handle openHevcHandle, int val);
-void libOpenHevcSetDebugMode(OpenHevc_Handle openHevcHandle, int val);
-void libOpenHevcSetTemporalLayer_id(OpenHevc_Handle openHevcHandle, int val);
-void libOpenHevcSetNoCropping(OpenHevc_Handle openHevcHandle, int val);
-void libOpenHevcSetActiveDecoders(OpenHevc_Handle openHevcHandle, int val);
-void libOpenHevcSetViewLayers(OpenHevc_Handle openHevcHandle, int val);
-void libOpenHevcClose(OpenHevc_Handle openHevcHandle);
-void libOpenHevcFlush(OpenHevc_Handle openHevcHandle);
-void libOpenHevcFlushSVC(OpenHevc_Handle openHevcHandle, int decoderId);
-
-const char *libOpenHevcVersion(OpenHevc_Handle openHevcHandle);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // OPEN_HEVC_WRAPPER_H

gpac-0.7.1.tar.gz/extra_lib/include/openssl/kssl.h Deleted

@@ -1,179 +0,0 @@
-/* ssl/kssl.h -*- mode: C; c-file-style: "eay" -*- */
-/* Written by Vern Staats <staatsvr@asc.hpc.mil> for the OpenSSL project 2000.
- * project 2000.
- */
-/* ====================================================================
- * Copyright (c) 2000 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/*
-**	19990701	VRS 	Started.
-*/
-
-#ifndef	KSSL_H
-#define	KSSL_H
-
-#include <openssl/opensslconf.h>
-
-#ifndef OPENSSL_NO_KRB5
-
-#include <stdio.h>
-#include <ctype.h>
-#include <krb5.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-**	Depending on which KRB5 implementation used, some types from
-**	the other may be missing. Resolve that here and now
-*/
-#ifdef KRB5_HEIMDAL
-typedef unsigned char krb5_octet;
-#define FAR
-#else
-
-#ifndef FAR
-#define FAR
-#endif
-
-#endif
-
-/*	Uncomment this to debug kssl problems or
-**	to trace usage of the Kerberos session key
-**
-**	#define		KSSL_DEBUG
-*/
-
-#ifndef	KRB5SVC
-#define KRB5SVC	"host"
-#endif
-
-#ifndef	KRB5KEYTAB
-#define KRB5KEYTAB	"/etc/krb5.keytab"
-#endif
-
-#ifndef KRB5SENDAUTH
-#define KRB5SENDAUTH	1
-#endif
-
-#ifndef KRB5CHECKAUTH
-#define KRB5CHECKAUTH	1
-#endif
-
-#ifndef KSSL_CLOCKSKEW
-#define	KSSL_CLOCKSKEW	300;
-#endif
-
-#define	KSSL_ERR_MAX	255
-typedef struct kssl_err_st {
-	int reason;
-	char text[KSSL_ERR_MAX+1];
-	} KSSL_ERR;
-
-
-/*	Context for passing
-**		(1) Kerberos session key to SSL, and
-**		(2)	Config data between application and SSL lib
-*/
-typedef struct kssl_ctx_st
- {
- /*	used by: disposition: */
-	char *service_name;	/*	C,S	 default ok (kssl) */
-	char *service_host;	/*	C	 input, REQUIRED */
-	char *client_princ;	/*	S	 output from krb5 ticket */
-	char *keytab_file;	/* S	 NULL (/etc/krb5.keytab) */
-	char *cred_cache;	/*	C	 NULL (default) */
-	krb5_enctype enctype;
-	int length;
-	krb5_octet FAR *key;
-	} KSSL_CTX;
-
-#define	KSSL_CLIENT 	1
-#define KSSL_SERVER 	2
-#define	KSSL_SERVICE	3
-#define	KSSL_KEYTAB 	4
-
-#define KSSL_CTX_OK 	0
-#define KSSL_CTX_ERR	1
-#define KSSL_NOMEM	2
-
-/* Public (for use by applications that use OpenSSL with Kerberos 5 support */
-krb5_error_code kssl_ctx_setstring(KSSL_CTX *kssl_ctx, int which, char *text);
-KSSL_CTX *kssl_ctx_new(void);
-KSSL_CTX *kssl_ctx_free(KSSL_CTX *kssl_ctx);
-void kssl_ctx_show(KSSL_CTX *kssl_ctx);
-krb5_error_code kssl_ctx_setprinc(KSSL_CTX *kssl_ctx, int which,
- krb5_data *realm, krb5_data *entity, int nentities);
-krb5_error_code	kssl_cget_tkt(KSSL_CTX *kssl_ctx, krb5_data **enc_tktp,
- krb5_data *authenp, KSSL_ERR *kssl_err);
-krb5_error_code	kssl_sget_tkt(KSSL_CTX *kssl_ctx, krb5_data *indata,
- krb5_ticket_times *ttimes, KSSL_ERR *kssl_err);
-krb5_error_code kssl_ctx_setkey(KSSL_CTX *kssl_ctx, krb5_keyblock *session);
-void	kssl_err_set(KSSL_ERR *kssl_err, int reason, char *text);
-void kssl_krb5_free_data_contents(krb5_context context, krb5_data *data);
-krb5_error_code kssl_build_principal_2(krb5_context context,
-			krb5_principal *princ, int rlen, const char *realm,
-			int slen, const char *svc, int hlen, const char *host);
-krb5_error_code kssl_validate_times(krb5_timestamp atime,
-					krb5_ticket_times *ttimes);
-krb5_error_code kssl_check_authent(KSSL_CTX *kssl_ctx, krb5_data *authentp,
-			 krb5_timestamp *atimep, KSSL_ERR *kssl_err);
-unsigned char	*kssl_skip_confound(krb5_enctype enctype, unsigned char *authn);
-
-#ifdef __cplusplus
-}
-#endif
-#endif	/* OPENSSL_NO_KRB5	*/
-#endif	/* KSSL_H 	*/

gpac-0.7.1.tar.gz/extra_lib/include/openssl/pqueue.h Deleted

@@ -1,94 +0,0 @@
-/* crypto/pqueue/pqueue.h */
-/* 
- * DTLS implementation written by Nagendra Modadugu
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 
- */
-/* ====================================================================
- * Copyright (c) 1999-2005 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_PQUEUE_H
-#define HEADER_PQUEUE_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-typedef struct _pqueue *pqueue;
-
-typedef struct _pitem
-	{
-	unsigned char priority[8]; /* 64-bit value in big-endian encoding */
-	void *data;
-	struct _pitem *next;
-	} pitem;
-
-typedef struct _pitem *piterator;
-
-pitem *pitem_new(unsigned char *prio64be, void *data);
-void pitem_free(pitem *item);
-
-pqueue pqueue_new(void);
-void pqueue_free(pqueue pq);
-
-pitem *pqueue_insert(pqueue pq, pitem *item);
-pitem *pqueue_peek(pqueue pq);
-pitem *pqueue_pop(pqueue pq);
-pitem *pqueue_find(pqueue pq, unsigned char *prio64be);
-pitem *pqueue_iterator(pqueue pq);
-pitem *pqueue_next(piterator *iter);
-
-void pqueue_print(pqueue pq);
-int pqueue_size(pqueue pq);
-
-#endif /* ! HEADER_PQUEUE_H */

gpac-0.7.1.tar.gz/extra_lib/include/openssl/ssl23.h Deleted

@@ -1,83 +0,0 @@
-/* ssl/ssl23.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_SSL23_H 
-#define HEADER_SSL23_H 
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*client */
-/* write to server */
-#define SSL23_ST_CW_CLNT_HELLO_A	(0x210|SSL_ST_CONNECT)
-#define SSL23_ST_CW_CLNT_HELLO_B	(0x211|SSL_ST_CONNECT)
-/* read from server */
-#define SSL23_ST_CR_SRVR_HELLO_A	(0x220|SSL_ST_CONNECT)
-#define SSL23_ST_CR_SRVR_HELLO_B	(0x221|SSL_ST_CONNECT)
-
-/* server */
-/* read from client */
-#define SSL23_ST_SR_CLNT_HELLO_A	(0x210|SSL_ST_ACCEPT)
-#define SSL23_ST_SR_CLNT_HELLO_B	(0x211|SSL_ST_ACCEPT)
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-

gpac-0.7.1.tar.gz/src/mcrypt Deleted

gpac-0.7.1.tar.gz/src/mcrypt/cbc.c Deleted

@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 1998,1999,2000,2001 Nikos Mavroyanopoulos
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gpac/internal/crypt_dev.h>
-
-#if !defined(GPAC_DISABLE_MCRYPT)
-
-typedef struct cbc_buf {
-	u32 *previous_ciphertext;
-	u32 *previous_cipher;
-	int blocksize;
-} CBC_BUFFER;
-
-/* CBC MODE */
-
-
-static GF_Err _init_mcrypt( void* _buf,void *key, int lenofkey, void *IV, int size)
-{
-	CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
-	/* For cbc */
-	buf->previous_ciphertext =
-	 buf->previous_cipher = NULL;
-
-	buf->blocksize = size;
-
-	buf->previous_ciphertext = gf_malloc( size);
-	buf->previous_cipher = gf_malloc( size);
-
-	if (buf->previous_ciphertext==NULL ||
-	 buf->previous_cipher==NULL) goto freeall;
-
-	if (IV!=NULL) {
-		memcpy(buf->previous_ciphertext, IV, size);
-	} else {
-		memset(buf->previous_ciphertext, 0, size);
-	}
-
-	return GF_OK;
-
-freeall:
-	if (buf->previous_ciphertext) gf_free(buf->previous_ciphertext);
-	if (buf->previous_cipher) gf_free(buf->previous_cipher);
-	return GF_OUT_OF_MEM;
-}
-
-static GF_Err _mcrypt_set_state( void* _buf, void *IV, int size)
-{
-	/* For cbc */
-	CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
-
-	memcpy(buf->previous_ciphertext, IV, size);
-	memcpy(buf->previous_cipher, IV, size);
-
-	return GF_OK;
-}
-
-static GF_Err _mcrypt_get_state( void* _buf, void *IV, int *size)
-{
-	CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
-	if (*size < buf->blocksize) {
-		*size = buf->blocksize;
-		return GF_BAD_PARAM;
-	}
-	*size = buf->blocksize;
-
-	memcpy( IV, buf->previous_ciphertext, buf->blocksize);
-
-	return GF_OK;
-}
-
-
-static void _end_mcrypt( void* _buf) {
-	CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
-	gf_free(buf->previous_ciphertext);
-	gf_free(buf->previous_cipher);
-}
-
-static GF_Err _mcrypt( void* _buf, void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{
-	CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
-	u32 *fplain = plaintext;
-	u32 *plain;
-	int dblock, dlen, i, j;
-	void (*_mcrypt_block_encrypt) (void *, void *);
-
-	_mcrypt_block_encrypt = func;
-
-	dblock = blocksize / sizeof(u32);
-	dlen = len / blocksize;
-	for (j = 0; j < dlen ; j++) {
-
-		plain = &fplain[j * dblock];
-
-		for (i = 0; i < dblock; i++) {
-			plain[i] ^= buf->previous_ciphertext[i];
-		}
-
-		_mcrypt_block_encrypt(akey, plain);
-
-		/* Copy the ciphertext to prev_ciphertext */
-		memcpy(buf->previous_ciphertext, plain, blocksize);
-	}
-	if (j==0 && len!=0) return GF_BAD_PARAM;
-	return GF_OK;
-}
-
-
-
-static GF_Err _mdecrypt( void* _buf, void *ciphertext, int len, int blocksize,void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{
-	CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
-	u32 *cipher;
-	u32 *fcipher = ciphertext;
-	int i, j, dlen, dblock;
-	void (*_mcrypt_block_decrypt) (void *, void *);
-
-	_mcrypt_block_decrypt = func2;
-
-
-	dblock = blocksize / sizeof(u32);
-	dlen = len / blocksize;
-	for (j = 0; j < dlen; j++) {
-
-		cipher = &fcipher[j * dblock];
-		memcpy(buf->previous_cipher, cipher, blocksize);
-
-		_mcrypt_block_decrypt(akey, cipher);
-		for (i = 0; i < dblock; i++) {
-			cipher[i] ^= buf->previous_ciphertext[i];
-		}
-
-		/* Copy the ciphertext to prev_cipher */
-		memcpy(buf->previous_ciphertext, buf->previous_cipher, blocksize);
-
-	}
-	if (j==0 && len!=0) return GF_BAD_PARAM;
-	return GF_OK;
-}
-
-void gf_crypt_register_cbc(GF_Crypt *td)
-{
-	td->mode_name = "CBC";
-	td->_init_mcrypt = _init_mcrypt;
-	td->_end_mcrypt = _end_mcrypt;
-	td->_mcrypt = _mcrypt;
-	td->_mdecrypt = _mdecrypt;
-	td->_mcrypt_get_state = _mcrypt_get_state;
-	td->_mcrypt_set_state = _mcrypt_set_state;
-
-	td->has_IV = 1;
-	td->is_block_mode = 1;
-	td->is_block_algo_mode = 1;
-	td->mode_size = sizeof(CBC_BUFFER);
-	td->mode_version = 20010801;
-}
-
-#endif /*!defined(GPAC_CRYPT_ISMA_ONLY) */

gpac-0.7.1.tar.gz/src/mcrypt/cfb.c Deleted

@@ -1,160 +0,0 @@
-/*
- * Copyright (C) 1998,1999,2000,2001,2002 Nikos Mavroyanopoulos
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gpac/internal/crypt_dev.h>
-
-#if !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)
-
-typedef struct cfb_buf {
-	u8* s_register;
-	u8* enc_s_register;
-	int blocksize;
-} CFB_BUFFER;
-
-/* CFB MODE */
-
-static GF_Err _init_mcrypt( CFB_BUFFER* buf, void *key, int lenofkey, void *IV, int size)
-{
-
-	buf->s_register = buf->enc_s_register = NULL;
-
-	buf->blocksize = size;
-	/* For cfb */
-	buf->s_register=gf_malloc( size);
-	if (buf->s_register==NULL) goto freeall;
-
-	buf->enc_s_register=gf_malloc( size);
-	if (buf->enc_s_register==NULL) goto freeall;
-
-	if (IV!=NULL) {
-		memcpy(buf->s_register, IV, size);
-	} else {
-		memset(buf->s_register, 0, size);
-	}
-	/* End cfb */
-	return GF_OK;
-
-freeall:
-	if (buf->s_register) gf_free(buf->s_register);
-	if (buf->enc_s_register) gf_free(buf->enc_s_register);
-	return GF_OUT_OF_MEM;
-}
-
-
-static GF_Err _mcrypt_set_state( CFB_BUFFER* buf, void *IV, int size)
-{
-	memcpy(buf->enc_s_register, IV, size);
-	memcpy(buf->s_register, IV, size);
-
-	return GF_OK;
-}
-
-static GF_Err _mcrypt_get_state( CFB_BUFFER* buf, u8 *IV, int *size)
-{
-	if (*size < buf->blocksize) {
-		*size = buf->blocksize;
-		return GF_BAD_PARAM;
-	}
-	*size = buf->blocksize;
-
-	memcpy( IV, buf->s_register, buf->blocksize);
-
-	return GF_OK;
-}
-
-
-static void _end_mcrypt( CFB_BUFFER* buf) {
-	gf_free(buf->s_register);
-	gf_free(buf->enc_s_register);
-}
-
-static GF_Err _mcrypt( CFB_BUFFER* buf, void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{	/* plaintext is 1 u8 (8bit cfb) */
-	char *plain = plaintext;
-	int i, j;
-	void (*_mcrypt_block_encrypt) (void *, void *);
-
-	_mcrypt_block_encrypt = func;
-
-	for (j = 0; j < len; j++) {
-
-		memcpy(buf->enc_s_register, buf->s_register, blocksize);
-
-		_mcrypt_block_encrypt(akey, buf->enc_s_register);
-
-		plain[j] ^= buf->enc_s_register[0];
-
-		/* Shift the register */
-		for (i = 0; i < (blocksize - 1); i++)
-			buf->s_register[i] = buf->s_register[i + 1];
-
-		buf->s_register[blocksize - 1] = plain[j];
-	}
-
-	return GF_OK;
-
-}
-
-
-static GF_Err _mdecrypt( CFB_BUFFER* buf, void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{	/* plaintext is 1 u8 (8bit ofb) */
-	char *plain = plaintext;
-	int i, j;
-	void (*_mcrypt_block_encrypt) (void *, void *);
-
-	_mcrypt_block_encrypt = func;
-
-	for (j = 0; j < len; j++) {
-
-		memcpy(buf->enc_s_register, buf->s_register, blocksize);
-
-		_mcrypt_block_encrypt(akey, buf->enc_s_register);
-
-		/* Shift the register */
-		for (i = 0; i < (blocksize - 1); i++)
-			buf->s_register[i] = buf->s_register[i + 1];
-
-		buf->s_register[blocksize - 1] = plain[j];
-
-		plain[j] ^= buf->enc_s_register[0];
-
-	}
-
-	return GF_OK;
-}
-
-void gf_crypt_register_cfb(GF_Crypt *td)
-{
-	td->mode_name = "CFB";
-	td->_init_mcrypt = _init_mcrypt;
-	td->_end_mcrypt = _end_mcrypt;
-	td->_mcrypt = _mcrypt;
-	td->_mdecrypt = _mdecrypt;
-	td->_mcrypt_get_state = _mcrypt_get_state;
-	td->_mcrypt_set_state = _mcrypt_set_state;
-
-	td->has_IV = 1;
-	td->is_block_mode = 0;
-	td->is_block_algo_mode = 1;
-	td->mode_size = sizeof(CFB_BUFFER);
-	td->mode_version = 20020310;
-}
-
-#endif /* !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT) */
-

gpac-0.7.1.tar.gz/src/mcrypt/ctr.c Deleted

@@ -1,237 +0,0 @@
-/*
- * Copyright (C) 2002 Nikos Mavroyanopoulos
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gpac/internal/crypt_dev.h>
-
-#if !defined(GPAC_DISABLE_MCRYPT)
-
-typedef struct ctr_buf {
-	u8* enc_counter;
-	u8* c_counter;
-	int c_counter_pos;
-	int blocksize;
-} CTR_BUFFER;
-
-/* CTR MODE */
-
-/* This function will add one to the given number (as a u8 string).
- * has been reached.
- */
-static void increase_counter( u8 *x, int x_size) {
-	register int i, y=0;
-
-	for (i=x_size-1; i>=0; i--) {
-		y = 0;
-		if ( x[i] == 0xff) {
-			x[i] = 0;
-			y = 1;
-		} else x[i]++;
-
-		if (y==0) break;
-	}
-
-	return;
-}
-
-
-/* size holds the size of the IV (counter in this mode).
- * This is the block size.
- */
-GF_Err _init_mcrypt( void *buf, void *key, int lenofkey, void *IV, int size)
-{
-	((CTR_BUFFER* )buf)->c_counter = ((CTR_BUFFER* )buf)->enc_counter = NULL;
-
-	/* For ctr */
-	((CTR_BUFFER* )buf)->c_counter_pos = 0;
-	((CTR_BUFFER* )buf)->blocksize = size;
-
-	((CTR_BUFFER* )buf)->c_counter = (u8 *)gf_malloc(size);
-	if (((CTR_BUFFER* )buf)->c_counter==NULL) goto freeall;
-
-	((CTR_BUFFER* )buf)->enc_counter = (u8 *)gf_malloc(size);
-	if (((CTR_BUFFER* )buf)->enc_counter==NULL) goto freeall;
-
-	if (IV!=NULL) {
-		memcpy(((CTR_BUFFER* )buf)->enc_counter, IV, size);
-		memcpy(((CTR_BUFFER* )buf)->c_counter, IV, size);
-	}
-
-	/* End ctr */
-
-	return GF_OK;
-freeall:
-	gf_free(((CTR_BUFFER* )buf)->c_counter);
-	gf_free(((CTR_BUFFER* )buf)->enc_counter);
-	return GF_OUT_OF_MEM;
-}
-
-GF_Err _mcrypt_set_state(void *_buf, void *IV, int size)
-{
-	CTR_BUFFER* buf = (CTR_BUFFER* )_buf;
-	((CTR_BUFFER* )buf)->c_counter_pos = ((u8*)IV)[0];
-	memcpy(((CTR_BUFFER* )buf)->c_counter, &((u8*)IV)[1], size-1);
-	memcpy(((CTR_BUFFER* )buf)->enc_counter, &((u8*)IV)[1], size-1);
-
-	return GF_OK;
-}
-
-GF_Err _mcrypt_get_state(void *buf, void *IV, int *size)
-{
-	if (*size < ((CTR_BUFFER* )buf)->blocksize + 1) {
-		*size = ((CTR_BUFFER* )buf)->blocksize + 1;
-		return GF_BAD_PARAM;
-	}
-	*size = ((CTR_BUFFER* )buf)->blocksize + 1;
-
-	((u8 *)IV)[0] = ((CTR_BUFFER* )buf)->c_counter_pos;
-	memcpy( & ((u8 *) IV)[1], ((CTR_BUFFER* )buf)->c_counter, ((CTR_BUFFER* )buf)->blocksize);
-
-	return GF_OK;
-}
-
-
-void _end_mcrypt(void *buf) {
-	gf_free(((CTR_BUFFER* )buf)->c_counter);
-	gf_free(((CTR_BUFFER* )buf)->enc_counter);
-}
-
-static GFINLINE
-void xor_stuff( CTR_BUFFER *buf, void* akey, void (*func)(void*,void*), u8* plain, int blocksize, int xor_size)
-{
-	void (*_mcrypt_block_encrypt) (void *, void *);
-
-	_mcrypt_block_encrypt = func;
-
-	if (xor_size == blocksize) {
-		if (((CTR_BUFFER* )buf)->c_counter_pos == 0) {
-
-			memcpy( ((CTR_BUFFER* )buf)->enc_counter, ((CTR_BUFFER* )buf)->c_counter, blocksize);
-			_mcrypt_block_encrypt(akey, ((CTR_BUFFER* )buf)->enc_counter);
-
-			memxor( plain, ((CTR_BUFFER* )buf)->enc_counter, blocksize);
-
-			increase_counter( ((CTR_BUFFER* )buf)->c_counter, blocksize);
-
-
-		} else {
-			int size = blocksize - ((CTR_BUFFER* )buf)->c_counter_pos;
-
-			memxor( plain, &((CTR_BUFFER* )buf)->enc_counter[((CTR_BUFFER* )buf)->c_counter_pos],
-			 size);
-
-			increase_counter( ((CTR_BUFFER* )buf)->c_counter, blocksize);
-
-			memcpy( ((CTR_BUFFER* )buf)->enc_counter, ((CTR_BUFFER* )buf)->c_counter, blocksize);
-			_mcrypt_block_encrypt(akey, ((CTR_BUFFER* )buf)->enc_counter);
-
-			memxor( &plain[size], ((CTR_BUFFER* )buf)->enc_counter,
-			 ((CTR_BUFFER* )buf)->c_counter_pos);
-
-			/* ((CTR_BUFFER* )buf)->c_counter_pos remains the same */
-
-		}
-	} else { /* xor_size != blocksize */
-		if (((CTR_BUFFER* )buf)->c_counter_pos == 0) {
-			memcpy( ((CTR_BUFFER* )buf)->enc_counter, ((CTR_BUFFER* )buf)->c_counter, blocksize);
-			_mcrypt_block_encrypt(akey, ((CTR_BUFFER* )buf)->enc_counter);
-
-			memxor( plain, ((CTR_BUFFER* )buf)->enc_counter, xor_size);
-			((CTR_BUFFER* )buf)->c_counter_pos = xor_size;
-		} else {
-			int size = blocksize - ((CTR_BUFFER* )buf)->c_counter_pos;
-			int min_size = size < xor_size ? size: xor_size;
-
-			memxor( plain, &((CTR_BUFFER* )buf)->enc_counter[((CTR_BUFFER* )buf)->c_counter_pos],
-			 min_size);
-
-			((CTR_BUFFER* )buf)->c_counter_pos += min_size;
-
-			if (min_size >= xor_size)
-				return;
-
-			increase_counter( ((CTR_BUFFER* )buf)->c_counter, blocksize);
-
-			memcpy( ((CTR_BUFFER* )buf)->enc_counter, ((CTR_BUFFER* )buf)->c_counter, blocksize);
-			_mcrypt_block_encrypt(akey, ((CTR_BUFFER* )buf)->enc_counter);
-
-			memxor( &plain[min_size], ((CTR_BUFFER* )buf)->enc_counter,
-			 xor_size - min_size);
-
-			((CTR_BUFFER* )buf)->c_counter_pos = xor_size - min_size;
-
-		}
-
-	}
-	return;
-}
-
-GF_Err _mcrypt(void * buf,void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{	/* plaintext can be any size */
-	u8 *plain;
-	int dlen, j=0;
-	int modlen;
-
-	dlen = len / blocksize;
-	plain = (u8 *)plaintext;
-	for (j = 0; j < dlen; j++) {
-
-		xor_stuff((CTR_BUFFER*) buf, akey, func, plain, blocksize, blocksize);
-
-		plain += blocksize;
-
-		/* Put the new register */
-
-	}
-	modlen = len % blocksize;
-	if (modlen > 0) {
-		/* This is only useful if encrypting the
-		 * final block. Otherwise you'll not be
-		 * able to decrypt it.
-		 */
-
-		xor_stuff( (CTR_BUFFER*)buf, akey, func, plain, blocksize, modlen);
-
-	}
-
-	return GF_OK;
-}
-
-
-GF_Err _mdecrypt(void * buf,void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{	/* plaintext can be any size */
-	return _mcrypt( buf, plaintext, len, blocksize, akey, func, func2);
-}
-
-void gf_crypt_register_ctr(GF_Crypt *td)
-{
-	td->mode_name = "CTR";
-	td->_init_mcrypt = _init_mcrypt;
-	td->_end_mcrypt = _end_mcrypt;
-	td->_mcrypt = _mcrypt;
-	td->_mdecrypt = _mdecrypt;
-	td->_mcrypt_get_state = _mcrypt_get_state;
-	td->_mcrypt_set_state = _mcrypt_set_state;
-
-	td->has_IV = 1;
-	td->is_block_mode = 1;
-	td->is_block_algo_mode = 1;
-	td->mode_size = sizeof(CTR_BUFFER);
-	td->mode_version = 20020307;
-}
-#endif /*!defined(GPAC_DISABLE_MCRYPT)*/

gpac-0.7.1.tar.gz/src/mcrypt/des.c Deleted

@@ -1,588 +0,0 @@
-
-/* Sofware DES functions
- * written 12 Dec 1986 by Phil Karn, KA9Q; large sections adapted from
- * the 1977 public-domain program by Jim Gillogly
- * Modified for additional speed - 6 December 1988 Phil Karn
- * Modified for parameterized key schedules - Jan 1991 Phil Karn
- * Callers now allocate a key schedule as follows:
- *	kn = (char (*)[8])gf_malloc(sizeof(char) * 8 * 16);
- *	or
- *	char kn[16][8];
- */
-
-/* modified in order to use the libmcrypt API by Nikos Mavroyanopoulos
- * All modifications are placed under the license of libmcrypt.
- */
-
-/* $Id: des.c,v 1.3 2010-02-23 16:24:20 jeanlf Exp $ */
-
-#include <gpac/internal/crypt_dev.h>
-
-#if !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)
-
-typedef struct des_key {
-	char kn[16][8];
-	u32 sp[8][64];
-	char iperm[16][16][8];
-	char fperm[16][16][8];
-} DES_KEY;
-
-
-static void permute_ip(), permute_fp(), perminit_ip(), spinit(),
- perminit_fp();
-static u32 f();
-
-
-/* Tables defined in the Data Encryption Standard documents */
-
-/* initial permutation IP */
-static char ip[] = {
-	58, 50, 42, 34, 26, 18, 10, 2,
-	60, 52, 44, 36, 28, 20, 12, 4,
-	62, 54, 46, 38, 30, 22, 14, 6,
-	64, 56, 48, 40, 32, 24, 16, 8,
-	57, 49, 41, 33, 25, 17, 9, 1,
-	59, 51, 43, 35, 27, 19, 11, 3,
-	61, 53, 45, 37, 29, 21, 13, 5,
-	63, 55, 47, 39, 31, 23, 15, 7
-};
-
-/* final permutation IP^-1 */
-static char fp[] = {
-	40, 8, 48, 16, 56, 24, 64, 32,
-	39, 7, 47, 15, 55, 23, 63, 31,
-	38, 6, 46, 14, 54, 22, 62, 30,
-	37, 5, 45, 13, 53, 21, 61, 29,
-	36, 4, 44, 12, 52, 20, 60, 28,
-	35, 3, 43, 11, 51, 19, 59, 27,
-	34, 2, 42, 10, 50, 18, 58, 26,
-	33, 1, 41, 9, 49, 17, 57, 25
-};
-
-/* expansion operation matrix
- * This is for reference only; it is unused in the code
- * as the f() function performs it implicitly for speed
- */
-#ifdef notdef
-static char ei[] = {
-	32, 1, 2, 3, 4, 5,
-	4, 5, 6, 7, 8, 9,
-	8, 9, 10, 11, 12, 13,
-	12, 13, 14, 15, 16, 17,
-	16, 17, 18, 19, 20, 21,
-	20, 21, 22, 23, 24, 25,
-	24, 25, 26, 27, 28, 29,
-	28, 29, 30, 31, 32, 1
-};
-#endif
-
-/* permuted choice table (key) */
-static char pc1[] = {
-	57, 49, 41, 33, 25, 17, 9,
-	1, 58, 50, 42, 34, 26, 18,
-	10, 2, 59, 51, 43, 35, 27,
-	19, 11, 3, 60, 52, 44, 36,
-
-	63, 55, 47, 39, 31, 23, 15,
-	7, 62, 54, 46, 38, 30, 22,
-	14, 6, 61, 53, 45, 37, 29,
-	21, 13, 5, 28, 20, 12, 4
-};
-
-/* number left rotations of pc1 */
-static char totrot[] = {
-	1, 2, 4, 6, 8, 10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28
-};
-
-/* permuted choice key (table) */
-static char pc2[] = {
-	14, 17, 11, 24, 1, 5,
-	3, 28, 15, 6, 21, 10,
-	23, 19, 12, 4, 26, 8,
-	16, 7, 27, 20, 13, 2,
-	41, 52, 31, 37, 47, 55,
-	30, 40, 51, 45, 33, 48,
-	44, 49, 39, 56, 34, 53,
-	46, 42, 50, 36, 29, 32
-};
-
-/* The (in)famous S-boxes */
-static char si[8][64] = {
-	/* S1 */
-	{	14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
-		0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
-		4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
-		15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13
-	},
-
-	/* S2 */
-	{	15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
-		3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
-		0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
-		13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9
-	},
-
-	/* S3 */
-	{	10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8,
-		13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1,
-		13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7,
-		1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12
-	},
-
-	/* S4 */
-	{	7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15,
-		13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9,
-		10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4,
-		3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14
-	},
-
-	/* S5 */
-	{	2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9,
-		14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6,
-		4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14,
-		11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3
-	},
-
-	/* S6 */
-	{	12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11,
-		10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8,
-		9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6,
-		4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13
-	},
-
-	/* S7 */
-	{	4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1,
-		13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
-		1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2,
-		6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12
-	},
-
-	/* S8 */
-	{	13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7,
-		1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2,
-		7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8,
-		2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11
-	},
-
-};
-
-/* 32-bit permutation function P used on the output of the S-boxes */
-static char p32i[] = {
-	16, 7, 20, 21,
-	29, 12, 28, 17,
-	1, 15, 23, 26,
-	5, 18, 31, 10,
-	2, 8, 24, 14,
-	32, 27, 3, 9,
-	19, 13, 30, 6,
-	22, 11, 4, 25
-};
-
-/* End of DES-defined tables */
-
-/* Lookup tables initialized once only at startup by desinit() */
-
-/* bit 0 is left-most in byte */
-static int bytebit[] = {
-	0200, 0100, 040, 020, 010, 04, 02, 01
-};
-
-static int nibblebit[] = {
-	010, 04, 02, 01
-};
-
-/* Allocate space and initialize DES lookup arrays
- * mode == 0: standard Data Encryption Algorithm
- */
-static int _mcrypt_desinit(DES_KEY * key)
-{
-
-	spinit(key);
-	perminit_ip(key);
-	perminit_fp(key);
-
-	return 0;
-}
-
-
-/* Set key (initialize key schedule array) */
-static GF_Err _mcrypt_set_key(DES_KEY * dkey, char *user_key, int len)
-{
-	char pc1m[56];		/* place to modify pc1 into */
-	char pcr[56];		/* place to rotate pc1 into */
-	register int i, j, l;
-	int m;
-
-	Bzero(dkey, sizeof(DES_KEY));
-	_mcrypt_desinit(dkey);
-
-	/* Clear key schedule */
-
-
-	for (j = 0; j < 56; j++) {	/* convert pc1 to bits of key */
-		l = pc1[j] - 1;	/* integer bit location */
-		m = l & 07;	/* find bit */
-		pc1m[j] = (user_key[l >> 3] &	/* find which key byte l is in */
-		 bytebit[m])	/* and which bit of that byte */
-		 ? 1 : 0;	/* and store 1-bit result */
-
-	}
-	for (i = 0; i < 16; i++) {	/* key chunk for each iteration */
-		for (j = 0; j < 56; j++)	/* rotate pc1 the right amount */
-			pcr[j] =
-			 pc1m[(l = j + totrot[i]) <
-			 (j < 28 ? 28 : 56) ? l : l - 28];
-		/* rotate left and right halves independently */
-		for (j = 0; j < 48; j++) {	/* select bits individually */
-			/* check bit that goes to kn[j] */
-			if (pcr[pc2[j] - 1]) {
-				/* mask it in if it's there */
-				l = j % 6;
-				dkey->kn[i][j / 6] |= bytebit[l] >> 2;
-			}
-		}
-	}
-	return 0;
-}
-
-/* In-place encryption of 64-bit block */
-static void _mcrypt_encrypt(DES_KEY * key, char *block)
-{
-	register u32 left, right;
-	register char *knp;
-	u32 work[2];		/* Working data storage */
-
-	permute_ip(block, key, (char *) work);	/* Initial Permutation */
-#ifndef	WORDS_BIGENDIAN
-	left = byteswap32(work[0]);
-	right = byteswap32(work[1]);
-#else
-	left = work[0];
-	right = work[1];
-#endif
-
-	/* Do the 16 rounds.
-	 * The rounds are numbered from 0 to 15. On even rounds
-	 * the right half is fed to f() and the result exclusive-ORs
-	 * the left half; on odd rounds the reverse is done.
-	 */
-	knp = &key->kn[0][0];
-	left ^= f(key, right, knp);
-	knp += 8;
-	right ^= f(key, left, knp);
-	knp += 8;
-	left ^= f(key, right, knp);
-	knp += 8;
-	right ^= f(key, left, knp);
-	knp += 8;
-	left ^= f(key, right, knp);
-	knp += 8;
-	right ^= f(key, left, knp);
-	knp += 8;
-	left ^= f(key, right, knp);
-	knp += 8;
-	right ^= f(key, left, knp);
-	knp += 8;
-	left ^= f(key, right, knp);
-	knp += 8;
-	right ^= f(key, left, knp);
-	knp += 8;
-	left ^= f(key, right, knp);
-	knp += 8;
-	right ^= f(key, left, knp);
-	knp += 8;
-	left ^= f(key, right, knp);
-	knp += 8;
-	right ^= f(key, left, knp);
-	knp += 8;
-	left ^= f(key, right, knp);
-	knp += 8;
-	right ^= f(key, left, knp);
-
-	/* Left/right half swap, plus byte swap if little-endian */
-#ifndef	WORDS_BIGENDIAN
-	work[1] = byteswap32(left);
-	work[0] = byteswap32(right);
-#else
-	work[0] = right;
-	work[1] = left;
-#endif
-	permute_fp((char *) work, key, block);	/* Inverse initial permutation */
-}
-
-/* In-place decryption of 64-bit block. This function is the mirror
- * image of encryption; exactly the same steps are taken, but in
- * reverse order
- */
-static void _mcrypt_decrypt(DES_KEY * key, char *block)
-{
-	register u32 left, right;
-	register char *knp;
-	u32 work[2];		/* Working data storage */
-
-	permute_ip(block, key, (char *) work);	/* Initial permutation */
-
-	/* Left/right half swap, plus byte swap if little-endian */
-#ifndef	WORDS_BIGENDIAN
-	right = byteswap32(work[0]);
-	left = byteswap32(work[1]);
-#else
-	right = work[0];
-	left = work[1];
-#endif
-	/* Do the 16 rounds in reverse order.
-	 * The rounds are numbered from 15 to 0. On even rounds
-	 * the right half is fed to f() and the result exclusive-ORs
-	 * the left half; on odd rounds the reverse is done.
-	 */
-	knp = &key->kn[15][0];
-	right ^= f(key, left, knp);
-	knp -= 8;
-	left ^= f(key, right, knp);
-	knp -= 8;
-	right ^= f(key, left, knp);
-	knp -= 8;
-	left ^= f(key, right, knp);
-	knp -= 8;
-	right ^= f(key, left, knp);
-	knp -= 8;
-	left ^= f(key, right, knp);
-	knp -= 8;
-	right ^= f(key, left, knp);
-	knp -= 8;
-	left ^= f(key, right, knp);
-	knp -= 8;
-	right ^= f(key, left, knp);
-	knp -= 8;
-	left ^= f(key, right, knp);
-	knp -= 8;
-	right ^= f(key, left, knp);
-	knp -= 8;
-	left ^= f(key, right, knp);
-	knp -= 8;
-	right ^= f(key, left, knp);
-	knp -= 8;
-	left ^= f(key, right, knp);
-	knp -= 8;
-	right ^= f(key, left, knp);
-	knp -= 8;
-	left ^= f(key, right, knp);
-
-#ifndef	WORDS_BIGENDIAN
-	work[0] = byteswap32(left);
-	work[1] = byteswap32(right);
-#else
-	work[0] = left;
-	work[1] = right;
-#endif
-	permute_fp((char *) work, key, block);	/* Inverse initial permutation */
-}
-
-/* Permute inblock with perm */
-static void permute_ip(char *inblock, DES_KEY * key, char *outblock)
-{
-	register char *ib, *ob;	/* ptr to input or output block */
-	register char *p, *q;
-	register int j;
-
-	/* Clear output block */
-	Bzero(outblock, 8);
-
-	ib = inblock;
-	for (j = 0; j < 16; j += 2, ib++) {	/* for each input nibble */
-		ob = outblock;
-		p = key->iperm[j][(*ib >> 4) & 0xf];
-		q = key->iperm[j + 1][*ib & 0xf];
-		/* and each output byte, OR the masks together */
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-	}
-}
-
-/* Permute inblock with perm */
-static void permute_fp(char *inblock, DES_KEY * key, char *outblock)
-{
-	register char *ib, *ob;	/* ptr to input or output block */
-	register char *p, *q;
-	register int j;
-
-	/* Clear output block */
-	Bzero(outblock, 8);
-
-	ib = inblock;
-	for (j = 0; j < 16; j += 2, ib++) {	/* for each input nibble */
-		ob = outblock;
-		p = key->fperm[j][(*ib >> 4) & 0xf];
-		q = key->fperm[j + 1][*ib & 0xf];
-		/* and each output byte, OR the masks together */
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-	}
-}
-
-/* The nonlinear function f(r,k), the heart of DES */
-static u32 f(DES_KEY * key, register u32 r, register char *subkey)
-{
-	register u32 *spp;
-	register u32 rval, rt;
-	register int er;
-
-#ifdef	TRACE
-	fprintf(stderr, "f(%08lx, %02x %02x %02x %02x %02x %02x %02x %02x) = ",
-	 r,
-	 subkey[0], subkey[1], subkey[2],
-	 subkey[3], subkey[4], subkey[5], subkey[6], subkey[7]);
-#endif
-	/* Run E(R) ^ K through the combined S & P boxes.
-	 * This code takes advantage of a convenient regularity in
-	 * E, namely that each group of 6 bits in E(R) feeding
-	 * a single S-box is a contiguous segment of R.
-	 */
-	subkey += 7;
-
-	/* Compute E(R) for each block of 6 bits, and run thru boxes */
-	er = ((int) r << 1) | ((r & 0x80000000) ? 1 : 0);
-	spp = &key->sp[7][0];
-	rval = spp[(er ^ *subkey--) & 0x3f];
-	spp -= 64;
-	rt = (u32) r >> 3;
-	rval |= spp[((int) rt ^ *subkey--) & 0x3f];
-	spp -= 64;
-	rt >>= 4;
-	rval |= spp[((int) rt ^ *subkey--) & 0x3f];
-	spp -= 64;
-	rt >>= 4;
-	rval |= spp[((int) rt ^ *subkey--) & 0x3f];
-	spp -= 64;
-	rt >>= 4;
-	rval |= spp[((int) rt ^ *subkey--) & 0x3f];
-	spp -= 64;
-	rt >>= 4;
-	rval |= spp[((int) rt ^ *subkey--) & 0x3f];
-	spp -= 64;
-	rt >>= 4;
-	rval |= spp[((int) rt ^ *subkey--) & 0x3f];
-	spp -= 64;
-	rt >>= 4;
-	rt |= (r & 1) << 5;
-	rval |= spp[((int) rt ^ *subkey) & 0x3f];
-#ifdef	TRACE
-	fprintf(stderr, " %08lx\n", rval);
-#endif
-	return rval;
-}
-
-/* initialize a perm array */
-static void perminit_ip(DES_KEY * key)
-{
-	register int l, j, k;
-	int i, m;
-
-	/* Clear the permutation array */
-	Bzero(key->iperm, 16 * 16 * 8);
-
-	for (i = 0; i < 16; i++)	/* each input nibble position */
-		for (j = 0; j < 16; j++)	/* each possible input nibble */
-			for (k = 0; k < 64; k++) {	/* each output bit position */
-				l = ip[k] - 1;	/* where does this bit come from */
-				if ((l >> 2) != i)	/* does it come from input posn? */
-					continue;	/* if not, bit k is 0 */
-				if (!(j & nibblebit[l & 3]))
-					continue;	/* any such bit in input? */
-				m = k & 07;	/* which bit is this in the byte */
-				key->iperm[i][j][k >> 3] |= bytebit[m];
-			}
-}
-
-static void perminit_fp(DES_KEY * key)
-{
-	register int l, j, k;
-	int i, m;
-
-	/* Clear the permutation array */
-	Bzero(key->fperm, 16 * 16 * 8);
-
-	for (i = 0; i < 16; i++)	/* each input nibble position */
-		for (j = 0; j < 16; j++)	/* each possible input nibble */
-			for (k = 0; k < 64; k++) {	/* each output bit position */
-				l = fp[k] - 1;	/* where does this bit come from */
-				if ((l >> 2) != i)	/* does it come from input posn? */
-					continue;	/* if not, bit k is 0 */
-				if (!(j & nibblebit[l & 3]))
-					continue;	/* any such bit in input? */
-				m = k & 07;	/* which bit is this in the byte */
-				key->fperm[i][j][k >> 3] |= bytebit[m];
-			}
-}
-
-/* Initialize the lookup table for the combined S and P boxes */
-static void spinit(DES_KEY * key)
-{
-	char pbox[32];
-	int p, i, s, j, rowcol;
-	u32 val;
-
-	/* Compute pbox, the inverse of p32i.
-	 * This is easier to work with
-	 */
-	for (p = 0; p < 32; p++) {
-		for (i = 0; i < 32; i++) {
-			if (p32i[i] - 1 == p) {
-				pbox[p] = i;
-				break;
-			}
-		}
-	}
-	for (s = 0; s < 8; s++) {	/* For each S-box */
-		for (i = 0; i < 64; i++) {	/* For each possible input */
-			val = 0;
-			/* The row number is formed from the first and last
-			 * bits; the column number is from the middle 4
-			 */
-			rowcol =
-			 (i & 32) | ((i & 1) ? 16 : 0) | ((i >> 1) &
-			 0xf);
-			for (j = 0; j < 4; j++) {	/* For each output bit */
-				if (si[s][rowcol] & (8 >> j)) {
-					val |=
-					 1L << (31 - pbox[4 * s + j]);
-				}
-			}
-			key->sp[s][i] = val;
-
-#ifdef DEBUG
-			fprintf(stderr, "sp[%d][%2d] = %08lx\n", s, i,
-			 key->sp[s][i]);
-#endif
-		}
-	}
-}
-
-void gf_crypt_register_des(GF_Crypt *td)
-{
-	td->a_encrypt = _mcrypt_encrypt;
-	td->a_decrypt = _mcrypt_decrypt;
-	td->a_set_key = _mcrypt_set_key;
-	td->algo_name = "DES";
-	td->algo_version = 20010801;
-	td->num_key_sizes = 1;
-	td->key_sizes[0] = 8;
-	td->key_size = 8;
-	td->is_block_algo = 1;
-	td->algo_block_size = 8;
-	td->algo_size = sizeof(DES_KEY);
-}
-
-#endif /*!defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)*/

gpac-0.7.1.tar.gz/src/mcrypt/ecb.c Deleted

@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 1998,1999,2000,2001 Nikos Mavroyanopoulos
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gpac/internal/crypt_dev.h>
-
-#if !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)
-
-static GF_Err _init_mcrypt( void* ign, void *key, int lenofkey, void *IV, int size)
-{
-	return 0;
-
-}
-
-static GF_Err _mcrypt_set_state( void* buf, void *IV, int size) {
-	return GF_BAD_PARAM;
-}
-static GF_Err _mcrypt_get_state( void* buf, void *IV, int *size) {
-	return GF_BAD_PARAM;
-}
-
-static void _end_mcrypt (void* buf) {}
-
-static GF_Err _mcrypt( void* ign, void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{
-	int j;
-	char *plain = plaintext;
-	void (*_mcrypt_block_encrypt) (void *, void *);
-
-	_mcrypt_block_encrypt = func;
-
-	for (j = 0; j < len / blocksize; j++) {
-		_mcrypt_block_encrypt(akey, &plain[j * blocksize]);
-	}
-	if (j==0 && len!=0) return GF_BAD_PARAM; /* no blocks were encrypted */
-	return GF_OK;
-}
-
-
-
-static GF_Err _mdecrypt( void* ign, void *ciphertext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{
-	int j;
-	char *cipher = ciphertext;
-	void (*_mcrypt_block_decrypt) (void *, void *);
-
-	_mcrypt_block_decrypt = func2;
-
-	for (j = 0; j < len / blocksize; j++) {
-		_mcrypt_block_decrypt(akey, &cipher[j * blocksize]);
-	}
-	if (j==0 && len!=0) return GF_BAD_PARAM; /* no blocks were encrypted */
-	return GF_OK;
-}
-
-void gf_crypt_register_ecb(GF_Crypt *td)
-{
-	td->mode_name = "ECB";
-	td->_init_mcrypt = _init_mcrypt;
-	td->_end_mcrypt = _end_mcrypt;
-	td->_mcrypt = _mcrypt;
-	td->_mdecrypt = _mdecrypt;
-	td->_mcrypt_get_state = _mcrypt_get_state;
-	td->_mcrypt_set_state = _mcrypt_set_state;
-
-	td->has_IV = 0;
-	td->is_block_mode = 1;
-	td->is_block_algo_mode = 1;
-	td->mode_size = 0;
-	td->mode_version = 20010801;
-}
-
-#endif /*!defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT) */

gpac-0.7.1.tar.gz/src/mcrypt/g_crypt.c 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 / crypto lib sub-project
- *
- * GPAC is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * GPAC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-/* The GPAC crypto lib is a simplified version of libmcrypt. */
-
-#include <gpac/internal/crypt_dev.h>
-
-#if !defined(GPAC_DISABLE_MCRYPT)
-
-static Bool gf_crypt_assign_algo(GF_Crypt *td, const char *algorithm)
-{
-	if (!stricmp(algorithm, "AES-128") || !stricmp(algorithm, "Rijndael-128")) {
-		gf_crypt_register_rijndael_128(td);
-		return 1;
-	}
-#ifndef GPAC_CRYPT_ISMA_ONLY
-	else if (!stricmp(algorithm, "AES-192") || !stricmp(algorithm, "Rijndael-192")) {
-		gf_crypt_register_rijndael_192(td);
-		return 1;
-	}
-	else if (!stricmp(algorithm, "AES-256") || !stricmp(algorithm, "Rijndael-256")) {
-		gf_crypt_register_rijndael_256(td);
-		return 1;
-	}
-	else if (!stricmp(algorithm, "DES")) {
-		gf_crypt_register_des(td);
-		return 1;
-	}
-	else if (!stricmp(algorithm, "3DES")) {
-		gf_crypt_register_3des(td);
-		return 1;
-	}
-#endif
-	return 0;
-}
-static Bool gf_crypt_assign_mode(GF_Crypt *td, const char *mode)
-{
-	if (!stricmp(mode, "CTR")) {
-		gf_crypt_register_ctr(td);
-		return 1;
-	}
-	else if (!stricmp(mode, "CBC")) {
-		gf_crypt_register_cbc(td);
-		return 1;
-	}
-#ifndef GPAC_CRYPT_ISMA_ONLY
-	else if (!stricmp(mode, "CFB")) {
-		gf_crypt_register_cfb(td);
-		return 1;
-	}
-	else if (!stricmp(mode, "ECB")) {
-		gf_crypt_register_ecb(td);
-		return 1;
-	}
-	else if (!stricmp(mode, "nCFB")) {
-		gf_crypt_register_ncfb(td);
-		return 1;
-	}
-	else if (!stricmp(mode, "nOFB")) {
-		gf_crypt_register_nofb(td);
-		return 1;
-	}
-	else if (!stricmp(mode, "OFB")) {
-		gf_crypt_register_ofb(td);
-		return 1;
-	}
-	else if (!stricmp(mode, "STREAM")) {
-		gf_crypt_register_stream(td);
-		return 1;
-	}
-#endif
-	return 0;
-}
-
-static GF_Crypt *gf_crypt_open_intern(const char *algorithm, const char *mode, Bool is_check)
-{
-	GF_Crypt *td;
-	if ((!algorithm || !mode) && !is_check) return NULL;
-
-	GF_SAFEALLOC(td, GF_Crypt);
-	if (td==NULL) return NULL;
-
-
-	if (algorithm && !gf_crypt_assign_algo(td, algorithm)) {
-		gf_free(td);
-		return NULL;
-	}
-	if (mode && !gf_crypt_assign_mode(td, mode)) {
-		gf_free(td);
-		return NULL;
-	}
-	if (is_check) return td;
-
-	if (td->is_block_algo != td->is_block_algo_mode) {
-		gf_free(td);
-		return NULL;
-	}
-	if (!td->_mcrypt || !td->_mdecrypt || !td->_mcrypt_set_state
-	 || !td->a_decrypt || !td->a_encrypt || !td->a_set_key)
-	{
-		gf_free(td);
-		return NULL;
-	}
-	return td;
-}
-
-static void internal_end_mcrypt(GF_Crypt *td)
-{
-	if (!td || !td->keyword_given) return;
-	gf_free(td->keyword_given);
-	td->keyword_given = NULL;
-
-	if (td->akey) {
-		gf_free(td->akey);
-		td->akey = NULL;
-	}
-	if (td->abuf) {
-		td->_end_mcrypt(td->abuf);
-		gf_free(td->abuf);
-		td->abuf = NULL;
-	}
-}
-
-
-GF_EXPORT
-GF_Crypt *gf_crypt_open(const char *algorithm, const char *mode)
-{
-	return gf_crypt_open_intern(algorithm, mode, 0);
-}
-
-GF_EXPORT
-void gf_crypt_close(GF_Crypt *td)
-{
-	internal_end_mcrypt(td);
-	gf_free(td);
-}
-
-GF_EXPORT
-GF_Err gf_crypt_set_key(GF_Crypt *td, void *key, u32 keysize, const void *IV)
-{
-	GF_Err (*__mcrypt_set_key_stream) (void *, const void *, int, const void *, int);
-	GF_Err (*__mcrypt_set_key_block) (void *, const void *, int);
-
-	if (td->is_block_algo== 0) {
-		/* stream */
-		__mcrypt_set_key_stream = (mcrypt_setkeystream) td->a_set_key;
-		if (__mcrypt_set_key_stream == NULL) return GF_BAD_PARAM;
-		return __mcrypt_set_key_stream(td->akey, key, keysize, IV, (IV!=NULL) ? gf_crypt_get_iv_size(td) : 0);
-	} else {
-		__mcrypt_set_key_block = (mcrypt_setkeyblock) td->a_set_key;
-		if (__mcrypt_set_key_block == NULL) return GF_BAD_PARAM;
-		return __mcrypt_set_key_block(td->akey, key, keysize);
-	}
-}
-
-GF_EXPORT
-GF_Err gf_crypt_set_state(GF_Crypt *td, const void *iv, int size)
-{
-	if (!td) return GF_BAD_PARAM;
-	return td->_mcrypt_set_state(td->abuf, (void *) iv, size);
-}
-
-GF_Err gf_crypt_get_state(GF_Crypt *td, void *iv, int *size)
-{
-	if (!td) return GF_BAD_PARAM;
-	return td->_mcrypt_get_state(td->abuf, iv, size);
-}
-
-u32 gf_crypt_get_block_size(GF_Crypt *td) {
-	return td ? td->algo_block_size : 0;
-}
-
-u32 gf_crypt_get_iv_size(GF_Crypt *td)
-{
-	if (!td) return 0;
-	if (td->is_block_algo_mode) return td->algo_block_size;
-	return td->algo_IV_size;
-}
-
-u32 gf_crypt_get_key_size(GF_Crypt *td) {
-	return td ? td->key_size : 0;
-}
-
-u32 gf_crypt_get_supported_key_sizes(GF_Crypt *td, u32 *key_sizes)
-{
-	u32 i;
-	if (!td || !td->num_key_sizes) return 0;
-	for (i=0; i<td->num_key_sizes; i++) key_sizes[i] = td->key_sizes[i];
-	return td->num_key_sizes;
-}
-
-Bool gf_crypt_is_block_algorithm(GF_Crypt *td) {
-	return td ? td->is_block_algo : 0;
-}
-const char *gf_crypt_get_algorithm_name(GF_Crypt *td) {
-	return td ? td->algo_name : NULL;
-}
-const char *gf_crypt_get_mode_name(GF_Crypt *td) {
-	return td ? td->mode_name : NULL;
-}
-Bool gf_crypt_is_block_mode(GF_Crypt *td) {
-	return td ? td->is_block_mode : 0;
-}
-Bool gf_crypt_mode_has_iv(GF_Crypt *td) {
-	return td ? td->has_IV : 0;
-}
-Bool gf_crypt_is_block_algorithm_mode(GF_Crypt *td) {
-	return td ? td->is_block_algo_mode : 0;
-}
-u32 gf_crypt_get_algorithm_version(GF_Crypt *td) {
-	return td ? td->algo_version : 0;
-}
-u32 gf_crypt_get_mode_version(GF_Crypt *td) {
-	return td ? td->mode_version : 0;
-}
-
-
-
-GF_EXPORT
-GF_Err gf_crypt_init(GF_Crypt *td, void *key, u32 lenofkey, const void *IV)
-{
-	GF_Err e;
-	u32 sizes[MAX_KEY_SIZES];
-	u32 i, num_of_sizes, ok = 0;
-	u32 key_size = gf_crypt_get_key_size(td);
-
-	if ((lenofkey > key_size) || (lenofkey==0)) return GF_BAD_PARAM;
-	num_of_sizes = gf_crypt_get_supported_key_sizes(td, sizes);
-	if (num_of_sizes) {
-		for (i=0; i < num_of_sizes; i++) {
-			if (lenofkey == sizes[i]) {
-				ok = 1;
-				break;
-			}
-		}
-	} else if (lenofkey <= gf_crypt_get_key_size(td)) {
-		ok = 1;
-	}
-
-	if (ok == 0) { /* not supported key size */
-		key_size = gf_crypt_get_key_size(td);
-		for (i = 0; i < num_of_sizes; i++) {
-			if (lenofkey <= sizes[i]) {
-				key_size = sizes[i];
-				break;
-			}
-		}
-	} else {
-		key_size = lenofkey;
-	}
-
-	td->keyword_given = (char*)gf_malloc(sizeof(char)*gf_crypt_get_key_size(td));
-	if (td->keyword_given==NULL) return GF_OUT_OF_MEM;
-
-	memmove(td->keyword_given, key, lenofkey);
-
-	td->akey = (char*)gf_malloc(sizeof(char)*td->algo_size);
-	if (td->akey==NULL) {
-		gf_free(td->keyword_given);
-		return GF_OUT_OF_MEM;
-	}
-	if (td->mode_size > 0) {
-		td->abuf = (char*)gf_malloc(sizeof(char)*td->mode_size);
-		if (td->abuf==NULL) {
-			gf_free(td->keyword_given);
-			gf_free(td->akey);
-			return GF_OUT_OF_MEM;
-		}
-	}
-	e = td->_init_mcrypt(td->abuf, (void *) key, key_size, (void *) IV, gf_crypt_get_block_size(td));
-	if (e!=GF_OK) {
-		gf_free(td->keyword_given);
-		gf_free(td->akey);
-		gf_free(td->abuf);
-		return e;
-	}
-
-	e = gf_crypt_set_key(td, (void *) td->keyword_given, key_size, IV);
-
-	if (e!=GF_OK) internal_end_mcrypt(td);
-	return e;
-}
-
-void gf_crypt_deinit(GF_Crypt *td)
-{
-	internal_end_mcrypt(td);
-}
-
-GF_EXPORT
-GF_Err gf_crypt_encrypt(GF_Crypt *td, void *plaintext, int len)
-{
-	if (!td) return GF_BAD_PARAM;
-	return td->_mcrypt(td->abuf, plaintext, len, gf_crypt_get_block_size(td), td->akey, (mcryptfunc) td->a_encrypt, (mcryptfunc) td->a_decrypt);
-}
-
-GF_EXPORT
-GF_Err gf_crypt_decrypt(GF_Crypt *td, void *ciphertext, int len)
-{
-	if (!td) return GF_BAD_PARAM;
-	return td->_mdecrypt(td->abuf, ciphertext, len, gf_crypt_get_block_size(td), td->akey, (mcryptfunc) td->a_encrypt, (mcryptfunc) td->a_decrypt);
-}
-
-
-u32 gf_crypt_str_get_algorithm_version(const char *algorithm)
-{
-	u32 ret;
-	GF_Crypt *td = gf_crypt_open_intern(algorithm, NULL, 1);
-	ret = td ? td->algo_version : 0;
-	gf_crypt_close(td);
-	return ret;
-}
-u32 gf_crypt_str_get_mode_version(const char *mode)
-{
-	u32 ret;
-	GF_Crypt *td = gf_crypt_open_intern(NULL, mode, 1);
-	ret = td ? td->mode_version : 0;
-	gf_crypt_close(td);
-	return ret;
-}
-Bool gf_crypt_str_is_block_algorithm(const char *algorithm)
-{
-	Bool ret;
-	GF_Crypt *td = gf_crypt_open_intern(algorithm, NULL, 1);
-	ret = td ? td->is_block_algo : 0;
-	gf_crypt_close(td);
-	return ret;
-}
-Bool gf_crypt_str_is_block_algorithm_mode(const char *algorithm)
-{
-	Bool ret;
-	GF_Crypt *td = gf_crypt_open_intern(algorithm, NULL, 1);
-	ret = td ? td->is_block_algo_mode : 0;
-	gf_crypt_close(td);
-	return ret;
-}
-Bool gf_crypt_str_is_block_mode(const char *mode)
-{
-	Bool ret;
-	GF_Crypt *td = gf_crypt_open_intern(NULL, mode, 1);
-	ret = td ? td->is_block_mode : 0;
-	gf_crypt_close(td);
-	return ret;
-}
-u32 gf_crypt_str_module_get_algo_block_size(const char *algorithm)
-{
-	u32 ret;
-	GF_Crypt *td = gf_crypt_open_intern(algorithm, NULL, 1);
-	ret = td ? td->algo_block_size : 0;
-	gf_crypt_close(td);
-	return ret;
-}
-u32 gf_crypt_str_module_get_algo_key_size(const char *algorithm)
-{
-	u32 ret;
-	GF_Crypt *td = gf_crypt_open_intern(algorithm, NULL, 1);
-	ret = td ? td->key_size : 0;
-	gf_crypt_close(td);
-	return ret;
-}
-u32 gf_crypt_str_get_algo_supported_key_sizes(const char *algorithm, int *keys)
-{
-	u32 ret;
-	GF_Crypt *td = gf_crypt_open_intern(algorithm, NULL, 1);
-	ret = gf_crypt_get_supported_key_sizes(td, (u32 *)keys);
-	gf_crypt_close(td);
-	return ret;
-}
-
-#endif /*!defined(GPAC_DISABLE_MCRYPT)*/

gpac-0.7.1.tar.gz/src/mcrypt/ncfb.c Deleted

@@ -1,320 +0,0 @@
-/*
- * Copyright (C) 1998,1999,2000,2001 Nikos Mavroyanopoulos
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gpac/internal/crypt_dev.h>
-
-#if !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)
-
-typedef struct ncfb_buf {
-	u8* enc_s_register;
-	u8* s_register;
-	int s_register_pos;
-	int blocksize;
-} nCFB_BUFFER;
-
-/* nCFB MODE */
-
-static GF_Err _init_mcrypt( nCFB_BUFFER* buf, void *key, int lenofkey, void *IV, int size)
-{
-	buf->enc_s_register = buf->s_register = NULL;
-	buf->s_register_pos = 0;
-
-	buf->blocksize = size;
-
-	/* For cfb */
-	buf->enc_s_register=gf_malloc( size);
-	if (buf->enc_s_register==NULL) goto freeall;
-
-	buf->s_register=gf_malloc( size);
-	if (buf->s_register==NULL) goto freeall;
-
-	if (IV!=NULL) {
-		memcpy(buf->enc_s_register, IV, size);
-		memcpy(buf->s_register, IV, size);
-	} else {
-		memset(buf->enc_s_register, 0, size);
-		memset(buf->s_register, 0, size);
-	}
-
-	/* End ncfb */
-
-	return GF_OK;
-freeall:
-	if (buf->enc_s_register) gf_free(buf->enc_s_register);
-	if (buf->s_register) gf_free(buf->s_register);
-	return GF_BAD_PARAM;
-}
-
-static GF_Err _mcrypt_set_state( nCFB_BUFFER* buf, u8 *IV, int size)
-{
-	buf->s_register_pos = IV[0];
-	memcpy(buf->enc_s_register, &IV[1], size-1);
-	memcpy(buf->s_register, &IV[1], size-1);
-
-	return GF_OK;
-}
-
-static GF_Err _mcrypt_get_state( nCFB_BUFFER* buf, u8 *IV, int *size)
-{
-	if (*size < buf->blocksize + 1) {
-		*size = buf->blocksize + 1;
-		return GF_BAD_PARAM;
-	}
-	*size = buf->blocksize + 1;
-
-	IV[0] = buf->s_register_pos;
-	memcpy( &IV[1], buf->s_register, buf->blocksize);
-
-	return GF_OK;
-}
-
-static void _end_mcrypt( nCFB_BUFFER* buf) {
-	gf_free(buf->enc_s_register);
-	gf_free(buf->s_register);
-}
-
-GFINLINE static
-void xor_stuff_en( nCFB_BUFFER *buf, void* akey, void (*func)(void*,void*), u8* plain, int blocksize, int xor_size)
-{
-	void (*_mcrypt_block_encrypt) (void *, void *);
-
-	_mcrypt_block_encrypt = func;
-
-	if (xor_size == blocksize) {
-		if (buf->s_register_pos == 0) {
-
-			memcpy(buf->enc_s_register, buf->s_register, blocksize);
-
-			_mcrypt_block_encrypt(akey, buf->enc_s_register);
-
-			memxor( plain, buf->enc_s_register, blocksize);
-
-			memcpy(buf->s_register, plain, blocksize);
-
-		} else {
-			int size = blocksize - buf->s_register_pos;
-
-			memxor( plain, &buf->enc_s_register[buf->s_register_pos],
-			 size);
-
-			memcpy(buf->enc_s_register, buf->s_register, blocksize);
-
-			_mcrypt_block_encrypt(akey, buf->enc_s_register);
-
-			memxor( &plain[size], buf->enc_s_register,
-			 buf->s_register_pos);
-
-			memcpy( &buf->s_register[size],
-			 plain, buf->s_register_pos);
-
-			/* buf->s_register_pos remains the same */
-		}
-	} else { /* xor_size != blocksize */
-		if (buf->s_register_pos == 0) {
-			memcpy(buf->enc_s_register, buf->s_register, blocksize);
-
-			_mcrypt_block_encrypt(akey, buf->enc_s_register);
-
-			memxor( plain, buf->enc_s_register, xor_size);
-
-			memcpy(buf->s_register, plain, xor_size);
-
-			buf->s_register_pos = xor_size;
-		} else {
-			int size = blocksize - buf->s_register_pos;
-			int min_size = size < xor_size ? size: xor_size;
-
-			memxor( plain, &buf->enc_s_register[buf->s_register_pos],
-			 min_size);
-
-			memcpy( &buf->s_register[buf->s_register_pos], plain, min_size);
-
-			buf->s_register_pos += min_size;
-
-			if (min_size >= xor_size)
-				return;
-
-			memcpy(buf->enc_s_register, buf->s_register, blocksize);
-
-			_mcrypt_block_encrypt(akey, buf->enc_s_register);
-
-			memxor( &plain[min_size], buf->s_register,
-			 xor_size - min_size);
-
-			buf->s_register_pos = xor_size - min_size;
-
-			memcpy(buf->s_register, plain, xor_size - min_size);
-		}
-
-	}
-	return;
-}
-
-GFINLINE static
-void xor_stuff_de( nCFB_BUFFER *buf, void* akey, void (*func)(void*,void*), u8* cipher, int blocksize, int xor_size)
-{
-	void (*_mcrypt_block_encrypt) (void *, void *);
-
-	_mcrypt_block_encrypt = func;
-
-	if (xor_size == blocksize) {
-		if (buf->s_register_pos == 0) {
-
-			memcpy(buf->enc_s_register, buf->s_register, blocksize);
-
-			_mcrypt_block_encrypt(akey, buf->enc_s_register);
-
-			memcpy(buf->s_register, cipher, blocksize);
-
-			memxor( cipher, buf->enc_s_register, blocksize);
-
-
-		} else {
-			int size = blocksize - buf->s_register_pos;
-
-			memxor( cipher, &buf->enc_s_register[buf->s_register_pos],
-			 size);
-
-			memcpy(buf->enc_s_register, buf->s_register, blocksize);
-
-			_mcrypt_block_encrypt(akey, buf->enc_s_register);
-
-			memcpy( &buf->s_register[size],
-			 cipher, buf->s_register_pos);
-
-			memxor( &cipher[size], buf->enc_s_register,
-			 buf->s_register_pos);
-
-
-			/* buf->s_register_pos remains the same */
-		}
-	} else { /* xor_size != blocksize */
-		if (buf->s_register_pos == 0) {
-			memcpy(buf->enc_s_register, buf->s_register, blocksize);
-
-			_mcrypt_block_encrypt(akey, buf->enc_s_register);
-
-			memcpy(buf->s_register, cipher, xor_size);
-
-			memxor( cipher, buf->enc_s_register, xor_size);
-
-
-			buf->s_register_pos = xor_size;
-		} else {
-			int size = blocksize - buf->s_register_pos;
-			int min_size = size < xor_size ? size: xor_size;
-
-			memxor( cipher, &buf->enc_s_register[buf->s_register_pos],
-			 min_size);
-
-			memcpy( &buf->s_register[buf->s_register_pos], cipher, min_size);
-
-			buf->s_register_pos += min_size;
-
-			if (min_size >= xor_size)
-				return;
-
-			memcpy(buf->enc_s_register, buf->s_register, blocksize);
-
-			_mcrypt_block_encrypt(akey, buf->enc_s_register);
-
-			memcpy(buf->s_register, cipher, xor_size - min_size);
-
-			memxor( &cipher[min_size], buf->s_register,
-			 xor_size - min_size);
-
-			buf->s_register_pos = xor_size - min_size;
-
-		}
-
-	}
-	return;
-}
-
-
-static GF_Err _mcrypt( nCFB_BUFFER* buf,void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{	/* plaintext is n*blocksize bytes (nbit cfb) */
-	u8* plain;
-	int dlen, j=0;
-	void (*_mcrypt_block_encrypt) (void *, void *);
-	int modlen;
-
-	_mcrypt_block_encrypt = func;
-
-	dlen = len / blocksize;
-	plain = plaintext;
-	for (j = 0; j < dlen; j++) {
-		xor_stuff_en( buf, akey, func, plain, blocksize, blocksize);
-
-		plain += blocksize;
-
-	}
-	modlen = len % blocksize;
-	if (modlen > 0) {
-		xor_stuff_en( buf, akey, func, plain, blocksize, modlen);
-	}
-
-	return GF_OK;
-}
-
-
-static GF_Err _mdecrypt( nCFB_BUFFER* buf,void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{	/* plaintext is n*blocksize bytes (nbit cfb) */
-	u8* plain;
-	int dlen, j=0;
-	void (*_mcrypt_block_encrypt) (void *, void *);
-	int modlen;
-
-	_mcrypt_block_encrypt = func;
-
-	dlen = len / blocksize;
-	plain = plaintext;
-	for (j = 0; j < dlen; j++) {
-		xor_stuff_de( buf, akey, func, plain, blocksize, blocksize);
-
-		plain += blocksize;
-
-	}
-	modlen = len % blocksize;
-	if (modlen > 0) {
-		xor_stuff_de( buf, akey, func, plain, blocksize, modlen);
-	}
-
-	return GF_OK;
-}
-
-
-void gf_crypt_register_ncfb(GF_Crypt *td)
-{
-	td->mode_name = "nCFB";
-	td->_init_mcrypt = _init_mcrypt;
-	td->_end_mcrypt = _end_mcrypt;
-	td->_mcrypt = _mcrypt;
-	td->_mdecrypt = _mdecrypt;
-	td->_mcrypt_get_state = _mcrypt_get_state;
-	td->_mcrypt_set_state = _mcrypt_set_state;
-
-	td->has_IV = 1;
-	td->is_block_mode = 0;
-	td->is_block_algo_mode = 1;
-	td->mode_size = sizeof(nCFB_BUFFER);
-	td->mode_version = 20020307;
-}
-
-#endif /*!defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)*/

gpac-0.7.1.tar.gz/src/mcrypt/nofb.c Deleted

@@ -1,211 +0,0 @@
-/*
- * Copyright (C) 1998,1999,2000,2001 Nikos Mavroyanopoulos
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gpac/internal/crypt_dev.h>
-
-#if !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)
-
-typedef struct ncfb_buf {
-	u8* enc_s_register;
-	u8* s_register;
-	int s_register_pos;
-	int blocksize;
-} nOFB_BUFFER;
-
-/* nOFB MODE */
-
-static GF_Err _init_mcrypt( nOFB_BUFFER* buf, void *key, int lenofkey, void *IV, int size)
-{
-	buf->enc_s_register = buf->s_register = NULL;
-	buf->s_register_pos = 0;
-
-	buf->blocksize = size;
-	/* For ofb */
-	buf->enc_s_register=gf_malloc( size);
-	if (buf->enc_s_register==NULL) goto freeall;
-
-	buf->s_register=gf_malloc( size);
-	if (buf->s_register==NULL) goto freeall;
-
-	if (IV!=NULL) {
-		memcpy(buf->enc_s_register, IV, size);
-		memcpy(buf->s_register, IV, size);
-	} else {
-		memset(buf->enc_s_register, 0, size);
-		memset(buf->s_register, 0, size);
-	}
-
-	/* End nofb */
-
-	return GF_OK;
-freeall:
-	if (buf->enc_s_register) gf_free(buf->enc_s_register);
-	if (buf->s_register) gf_free(buf->s_register);
-	return GF_OUT_OF_MEM;
-}
-
-static GF_Err _mcrypt_set_state( nOFB_BUFFER* buf, u8 *IV, int size)
-{
-	buf->s_register_pos = IV[0];
-	memcpy(buf->enc_s_register, &IV[1], size-1);
-	memcpy(buf->s_register, &IV[1], size-1);
-
-	return GF_OK;
-}
-
-static GF_Err _mcrypt_get_state( nOFB_BUFFER* buf, u8 *IV, int *size)
-{
-	if (*size < buf->blocksize + 1) {
-		*size = buf->blocksize + 1;
-		return GF_BAD_PARAM;
-	}
-	*size = buf->blocksize + 1;
-
-	IV[0] = buf->s_register_pos;
-	memcpy( &IV[1], buf->s_register, buf->blocksize);
-
-	return GF_OK;
-}
-
-
-static void _end_mcrypt( nOFB_BUFFER* buf) {
-	gf_free(buf->s_register);
-	gf_free(buf->enc_s_register);
-}
-
-GFINLINE static
-void xor_stuff( nOFB_BUFFER *buf, void* akey, void (*func)(void*,void*), u8* plain, int blocksize, int xor_size)
-{
-	void (*_mcrypt_block_encrypt) (void *, void *);
-
-	_mcrypt_block_encrypt = func;
-
-	if (xor_size == blocksize) {
-		if (buf->s_register_pos == 0) {
-
-			memcpy(buf->enc_s_register, buf->s_register, blocksize);
-
-			_mcrypt_block_encrypt(akey, buf->enc_s_register);
-
-			memcpy(buf->s_register, buf->enc_s_register, blocksize);
-
-			memxor( plain, buf->enc_s_register, blocksize);
-
-		} else {
-			int size = blocksize - buf->s_register_pos;
-
-			memxor( plain, &buf->enc_s_register[buf->s_register_pos],
-			 size);
-
-			memcpy(buf->enc_s_register, buf->s_register, blocksize);
-
-			_mcrypt_block_encrypt(akey, buf->enc_s_register);
-
-			memcpy( buf->s_register,
-			 buf->enc_s_register, blocksize);
-
-			memxor( &plain[size], buf->enc_s_register,
-			 buf->s_register_pos);
-
-			/* buf->s_register_pos remains the same */
-		}
-	} else { /* xor_size != blocksize */
-		if (buf->s_register_pos == 0) {
-			memcpy(buf->enc_s_register, buf->s_register, blocksize);
-
-			_mcrypt_block_encrypt(akey, buf->enc_s_register);
-
-			memcpy(buf->s_register, buf->enc_s_register, blocksize);
-
-			memxor( plain, buf->enc_s_register, xor_size);
-
-			buf->s_register_pos = xor_size;
-		} else {
-			int size = blocksize - buf->s_register_pos;
-			int min_size = size < xor_size ? size: xor_size;
-
-			memxor( plain, &buf->enc_s_register[buf->s_register_pos],
-			 min_size);
-
-			buf->s_register_pos += min_size;
-
-			if (min_size >= xor_size)
-				return;
-
-			memcpy(buf->enc_s_register, buf->s_register, blocksize);
-
-			_mcrypt_block_encrypt(akey, buf->enc_s_register);
-
-			memcpy(buf->s_register, buf->enc_s_register, blocksize);
-
-			memxor( &plain[min_size], buf->s_register,
-			 xor_size - min_size);
-
-			buf->s_register_pos = xor_size - min_size;
-
-		}
-
-	}
-	return;
-}
-
-
-static GF_Err _mcrypt( nOFB_BUFFER* buf,void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{	/* plaintext is n*blocksize bytes (nbit cfb) */
-	u8* plain;
-	int dlen, j=0;
-	void (*_mcrypt_block_encrypt) (void *, void *);
-	int modlen;
-
-	_mcrypt_block_encrypt = func;
-
-	dlen = len / blocksize;
-	plain = plaintext;
-	for (j = 0; j < dlen; j++) {
-		xor_stuff( buf, akey, func, plain, blocksize, blocksize);
-
-		plain += blocksize;
-
-	}
-	modlen = len % blocksize;
-	if (modlen > 0) {
-		xor_stuff( buf, akey, func, plain, blocksize, modlen);
-	}
-
-	return GF_OK;
-}
-
-void gf_crypt_register_nofb(GF_Crypt *td)
-{
-	td->mode_name = "nOFB";
-	td->_init_mcrypt = _init_mcrypt;
-	td->_end_mcrypt = _end_mcrypt;
-	td->_mcrypt = _mcrypt;
-	td->_mdecrypt = _mcrypt;
-	td->_mcrypt_get_state = _mcrypt_get_state;
-	td->_mcrypt_set_state = _mcrypt_set_state;
-
-	td->has_IV = 1;
-	td->is_block_mode = 0;
-	td->is_block_algo_mode = 1;
-	td->mode_size = sizeof(nOFB_BUFFER);
-	td->mode_version = 20020307;
-}
-
-#endif /*!defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)*/

gpac-0.7.1.tar.gz/src/mcrypt/ofb.c Deleted

@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 1998,1999,2000,2001,2002 Nikos Mavroyanopoulos
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gpac/internal/crypt_dev.h>
-
-#if !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)
-
-typedef struct ofb_buf {
-	u8* s_register;
-	u8* enc_s_register;
-	int blocksize;
-} OFB_BUFFER;
-
-
-/* OFB MODE */
-
-static GF_Err _init_mcrypt( OFB_BUFFER* buf, void *key, int lenofkey, void *IV, int size)
-{
-
-	buf->s_register = buf->enc_s_register = NULL;
-
-	buf->blocksize = size;
-
-	/* For ofb */
-	buf->s_register=gf_malloc( size);
-	if (buf->s_register==NULL) goto freeall;
-
-	buf->enc_s_register=gf_malloc( size);
-	if (buf->enc_s_register==NULL) goto freeall;
-
-	if (IV!=NULL) {
-		memcpy(buf->s_register, IV, size);
-	} else {
-		memset(buf->s_register, 0, size);
-	}
-	/* End ofb */
-
-	return GF_OK;
-
-freeall:
-	if (buf->s_register) gf_free(buf->s_register);
-	if (buf->enc_s_register) gf_free(buf->enc_s_register);
-	return GF_OUT_OF_MEM;
-}
-
-static GF_Err _mcrypt_get_state( OFB_BUFFER* buf, u8 *IV, int *size)
-{
-	if (*size < buf->blocksize) {
-		*size = buf->blocksize;
-		return GF_BAD_PARAM;
-	}
-	*size = buf->blocksize;
-
-	memcpy( IV, buf->s_register, buf->blocksize);
-
-	return GF_OK;
-}
-
-static GF_Err _mcrypt_set_state( OFB_BUFFER* buf, void *IV, int size)
-{
-	memcpy(buf->enc_s_register, IV, size);
-	memcpy(buf->s_register, IV, size);
-
-	return GF_OK;
-}
-
-
-static void _end_mcrypt( OFB_BUFFER* buf) {
-	gf_free(buf->s_register);
-	gf_free(buf->enc_s_register);
-}
-
-
-static GF_Err _mcrypt( OFB_BUFFER* buf,void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*) )
-{	/* plaintext is 1 u8 (8bit ofb) */
-	char *plain = plaintext;
-	int i, j;
-	void (*_mcrypt_block_encrypt) (void *, void *);
-
-	_mcrypt_block_encrypt = func;
-
-	for (j = 0; j < len; j++) {
-
-		memcpy(buf->enc_s_register, buf->s_register, blocksize);
-
-		_mcrypt_block_encrypt(akey, buf->enc_s_register);
-
-		plain[j] ^= buf->enc_s_register[0];
-
-		/* Shift the register */
-		for (i = 0; i < (blocksize - 1); i++)
-			buf->s_register[i] = buf->s_register[i + 1];
-
-		buf->s_register[blocksize - 1] = buf->enc_s_register[0];
-	}
-
-	return GF_OK;
-
-}
-
-
-static GF_Err _mdecrypt( OFB_BUFFER* buf, void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
-{	/* plaintext is 1 u8 (8bit ofb) */
-	char *plain = plaintext;
-	int i, j;
-	void (*_mcrypt_block_encrypt) (void *, void *);
-
-	_mcrypt_block_encrypt = func;
-
-	for (j = 0; j < len; j++) {
-
-		memcpy(buf->enc_s_register, buf->s_register, blocksize);
-
-		_mcrypt_block_encrypt(akey, buf->enc_s_register);
-
-		/* Shift the register */
-		for (i = 0; i < (blocksize - 1); i++)
-			buf->s_register[i] = buf->s_register[i + 1];
-
-		buf->s_register[blocksize - 1] = buf->enc_s_register[0];
-
-		plain[j] ^= buf->enc_s_register[0];
-
-	}
-
-	return GF_OK;
-}
-
-void gf_crypt_register_ofb(GF_Crypt *td)
-{
-	td->mode_name = "OFB";
-	td->_init_mcrypt = _init_mcrypt;
-	td->_end_mcrypt = _end_mcrypt;
-	td->_mcrypt = _mcrypt;
-	td->_mdecrypt = _mdecrypt;
-	td->_mcrypt_get_state = _mcrypt_get_state;
-	td->_mcrypt_set_state = _mcrypt_set_state;
-
-	td->has_IV = 1;
-	td->is_block_mode = 0;
-	td->is_block_algo_mode = 1;
-	td->mode_size = sizeof(OFB_BUFFER);
-	td->mode_version = 20010310;
-}
-
-#endif /*!defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)*/
-

gpac-0.7.1.tar.gz/src/mcrypt/rijndael-128.c Deleted

@@ -1,417 +0,0 @@
-/* Rijndael Cipher
-
- Written by Mike Scott 21st April 1999
- Copyright (c) 1999 Mike Scott
- See rijndael documentation
-
- Permission for free direct or derivative use is granted subject
- to compliance with any conditions that the originators of the
- algorithm place on its exploitation.
-
- Inspiration from Brian Gladman's implementation is acknowledged.
-
- Written for clarity, rather than speed.
- Full implementation.
- Endian indifferent.
-*/
-
-/* modified in order to use the libmcrypt API by Nikos Mavroyanopoulos
- * All modifications are placed under the license of libmcrypt.
- */
-
-/* $Id: rijndael-128.c,v 1.3 2009-07-31 07:37:43 jeanlf Exp $ */
-
-#include <gpac/internal/crypt_dev.h>
-
-#if !defined(GPAC_DISABLE_MCRYPT)
-
-typedef struct rijndael_instance {
-	int Nk,Nb,Nr;
-	u8 fi[24],ri[24];
-	u32 fkey[120];
-	u32 rkey[120];
-} RI;
-
-/* rotates x one bit to the left */
-
-#define ROTL(x) (((x)>>7)|((x)<<1))
-
-/* Rotates 32-bit word left by 1, 2 or 3 u8 */
-
-#define ROTL8(x) (((x)<<8)|((x)>>24))
-#define ROTL16(x) (((x)<<16)|((x)>>16))
-#define ROTL24(x) (((x)<<24)|((x)>>8))
-
-/* Fixed Data */
-
-static u8 InCo[4] = { 0xB, 0xD, 0x9, 0xE };	/* Inverse Coefficients */
-
-static u8 fbsub[256];
-static u8 rbsub[256];
-static u8 ptab[256], ltab[256];
-static u32 ftable[256];
-static u32 rtable[256];
-static u32 rco[30];
-static int tables_ok = 0;
-/* Parameter-dependent data */
-
-/* in "rijndael.h" */
-
-static u32 pack(u8 * b)
-{	/* pack bytes into a 32-bit Word */
-	return ((u32) b[3] << 24) | ((u32) b[2] << 16) | ((u32)
-	 b[1] << 8)
-	 | (u32) b[0];
-}
-
-static void unpack(u32 a, u8 * b)
-{	/* unpack bytes from a word */
-	b[0] = (u8) a;
-	b[1] = (u8) (a >> 8);
-	b[2] = (u8) (a >> 16);
-	b[3] = (u8) (a >> 24);
-}
-
-
-static u8 xtime(u8 a)
-{
-	u8 b;
-	if (a & 0x80)
-		b = 0x1B;
-	else
-		b = 0;
-	a <<= 1;
-	a ^= b;
-	return a;
-}
-
-static u8 bmul(u8 x, u8 y)
-{	/* x.y= AntiLog(Log(x) + Log(y)) */
-	if (x && y)
-		return ptab[(ltab[x] + ltab[y]) % 255];
-	else
-		return 0;
-}
-
-static u32 SubByte(u32 a)
-{
-	u8 b[4];
-	unpack(a, b);
-	b[0] = fbsub[b[0]];
-	b[1] = fbsub[b[1]];
-	b[2] = fbsub[b[2]];
-	b[3] = fbsub[b[3]];
-	return pack(b);
-}
-
-static u8 product(u32 x, u32 y)
-{	/* dot product of two 4-u8 arrays */
-	u8 xb[4], yb[4];
-	unpack(x, xb);
-	unpack(y, yb);
-	return bmul(xb[0], yb[0]) ^ bmul(xb[1], yb[1]) ^ bmul(xb[2],
-	 yb[2]) ^
-	 bmul(xb[3], yb[3]);
-}
-
-static u32 InvMixCol(u32 x)
-{	/* matrix Multiplication */
-	u32 y, m;
-	u8 b[4];
-
-	m = pack(InCo);
-	b[3] = product(m, x);
-	m = ROTL24(m);
-	b[2] = product(m, x);
-	m = ROTL24(m);
-	b[1] = product(m, x);
-	m = ROTL24(m);
-	b[0] = product(m, x);
-	y = pack(b);
-	return y;
-}
-
-static u8 ByteSub(u8 x)
-{
-	u8 y = ptab[255 - ltab[x]];	/* multiplicative inverse */
-	x = y;
-	x = ROTL(x);
-	y ^= x;
-	x = ROTL(x);
-	y ^= x;
-	x = ROTL(x);
-	y ^= x;
-	x = ROTL(x);
-	y ^= x;
-	y ^= 0x63;
-	return y;
-}
-
-static void _mcrypt_rijndael_gentables(void)
-{	/* generate tables */
-	int i;
-	u8 y, b[4];
-
-	/* use 3 as primitive root to generate power and log tables */
-
-	ltab[0] = 0;
-	ptab[0] = 1;
-	ltab[1] = 0;
-	ptab[1] = 3;
-	ltab[3] = 1;
-	for (i = 2; i < 256; i++) {
-		ptab[i] = ptab[i - 1] ^ xtime(ptab[i - 1]);
-		ltab[ptab[i]] = i;
-	}
-
-	/* affine transformation:- each bit is xored with itself shifted one bit */
-
-	fbsub[0] = 0x63;
-	rbsub[0x63] = 0;
-	for (i = 1; i < 256; i++) {
-		y = ByteSub((u8) i);
-		fbsub[i] = y;
-		rbsub[y] = i;
-	}
-
-	for (i = 0, y = 1; i < 30; i++) {
-		rco[i] = y;
-		y = xtime(y);
-	}
-
-	/* calculate forward and reverse tables */
-	for (i = 0; i < 256; i++) {
-		y = fbsub[i];
-		b[3] = y ^ xtime(y);
-		b[2] = y;
-		b[1] = y;
-		b[0] = xtime(y);
-		ftable[i] = pack(b);
-
-		y = rbsub[i];
-		b[3] = bmul(InCo[0], y);
-		b[2] = bmul(InCo[1], y);
-		b[1] = bmul(InCo[2], y);
-		b[0] = bmul(InCo[3], y);
-		rtable[i] = pack(b);
-	}
-}
-
-static int _mcrypt_set_key(RI * rinst, u8 * key, int nk)
-{	/* blocksize=32*nb bits. Key=32*nk bits */
-	/* currently nb,bk = 4, 6 or 8 */
-	/* key comes as 4*rinst->Nk bytes */
-	/* Key Scheduler. Create expanded encryption key */
-	int nb = 4;		/* 128 block size */
-	int i, j, k, m, N;
-	int C1, C2, C3;
-	u32 CipherKey[8];
-
-	nk /= 4;
-	if (nk < 4)
-		nk = 4;
-
-	if (tables_ok == 0) {
-		_mcrypt_rijndael_gentables();
-		tables_ok = 1;
-	}
-
-	rinst->Nb = nb;
-	rinst->Nk = nk;
-
-	/* rinst->Nr is number of rounds */
-	if (rinst->Nb >= rinst->Nk)
-		rinst->Nr = 6 + rinst->Nb;
-	else
-		rinst->Nr = 6 + rinst->Nk;
-
-	C1 = 1;
-	if (rinst->Nb < 8) {
-		C2 = 2;
-		C3 = 3;
-	} else {
-		C2 = 3;
-		C3 = 4;
-	}
-
-	/* pre-calculate forward and reverse increments */
-	for (m = j = 0; j < nb; j++, m += 3) {
-		rinst->fi[m] = (j + C1) % nb;
-		rinst->fi[m + 1] = (j + C2) % nb;
-		rinst->fi[m + 2] = (j + C3) % nb;
-		rinst->ri[m] = (nb + j - C1) % nb;
-		rinst->ri[m + 1] = (nb + j - C2) % nb;
-		rinst->ri[m + 2] = (nb + j - C3) % nb;
-	}
-
-	N = rinst->Nb * (rinst->Nr + 1);
-
-	for (i = j = 0; i < rinst->Nk; i++, j += 4) {
-		CipherKey[i] = pack(&key[j]);
-	}
-	for (i = 0; i < rinst->Nk; i++)
-		rinst->fkey[i] = CipherKey[i];
-	for (j = rinst->Nk, k = 0; j < N; j += rinst->Nk, k++) {
-		rinst->fkey[j] =
-		 rinst->fkey[j -
-		 rinst->Nk] ^ SubByte(ROTL24(rinst->
-		 fkey[j -
-		 1])) ^
-		 rco[k];
-		if (rinst->Nk <= 6) {
-			for (i = 1; i < rinst->Nk && (i + j) < N; i++)
-				rinst->fkey[i + j] =
-				 rinst->fkey[i + j -
-				 rinst->Nk] ^ rinst->
-				 fkey[i + j - 1];
-		} else {
-			for (i = 1; i < 4 && (i + j) < N; i++)
-				rinst->fkey[i + j] =
-				 rinst->fkey[i + j -
-				 rinst->Nk] ^ rinst->
-				 fkey[i + j - 1];
-			if ((j + 4) < N)
-				rinst->fkey[j + 4] =
-				 rinst->fkey[j + 4 -
-				 rinst->
-				 Nk] ^ SubByte(rinst->
-				 fkey[j + 3]);
-			for (i = 5; i < rinst->Nk && (i + j) < N; i++)
-				rinst->fkey[i + j] =
-				 rinst->fkey[i + j -
-				 rinst->Nk] ^ rinst->
-				 fkey[i + j - 1];
-		}
-
-	}
-
-	/* now for the expanded decrypt key in reverse order */
-
-	for (j = 0; j < rinst->Nb; j++)
-		rinst->rkey[j + N - rinst->Nb] = rinst->fkey[j];
-	for (i = rinst->Nb; i < N - rinst->Nb; i += rinst->Nb) {
-		k = N - rinst->Nb - i;
-		for (j = 0; j < rinst->Nb; j++)
-			rinst->rkey[k + j] = InvMixCol(rinst->fkey[i + j]);
-	}
-	for (j = N - rinst->Nb; j < N; j++)
-		rinst->rkey[j - N + rinst->Nb] = rinst->fkey[j];
-	return 0;
-}
-
-
-/* There is an obvious time/space trade-off possible here. *
- * Instead of just one ftable[], I could have 4, the other *
- * 3 pre-rotated to save the ROTL8, ROTL16 and ROTL24 overhead */
-
-static void _mcrypt_encrypt(RI * rinst, u8 * buff)
-{
-	int i, j, k, m;
-	u32 a[8], b[8], *x, *y, *t;
-
-	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
-		a[i] = pack(&buff[j]);
-		a[i] ^= rinst->fkey[i];
-	}
-	k = rinst->Nb;
-	x = a;
-	y = b;
-
-	/* State alternates between a and b */
-	for (i = 1; i < rinst->Nr; i++) {	/* rinst->Nr is number of rounds. May be odd. */
-
-		/* if rinst->Nb is fixed - unroll this next
-		 loop and hard-code in the values of fi[] */
-
-		for (m = j = 0; j < rinst->Nb; j++, m += 3) {	/* deal with each 32-bit element of the State */
-			/* This is the time-critical bit */
-			y[j] = rinst->fkey[k++] ^ ftable[(u8) x[j]] ^
-			 ROTL8(ftable[(u8) (x[rinst->fi[m]] >> 8)]) ^
-			 ROTL16(ftable
-			 [(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
-			 ROTL24(ftable[x[rinst->fi[m + 2]] >> 24]);
-		}
-		t = x;
-		x = y;
-		y = t;		/* swap pointers */
-	}
-
-	/* Last Round - unroll if possible */
-	for (m = j = 0; j < rinst->Nb; j++, m += 3) {
-		y[j] = rinst->fkey[k++] ^ (u32) fbsub[(u8) x[j]] ^
-		 ROTL8((u32) fbsub[(u8) (x[rinst->fi[m]] >> 8)]) ^
-		 ROTL16((u32)
-		 fbsub[(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
-		 ROTL24((u32) fbsub[x[rinst->fi[m + 2]] >> 24]);
-	}
-	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
-		unpack(y[i], &buff[j]);
-		x[i] = y[i] = 0;	/* clean up stack */
-	}
-	return;
-}
-
-static void _mcrypt_decrypt(RI * rinst, u8 * buff)
-{
-	int i, j, k, m;
-	u32 a[8], b[8], *x, *y, *t;
-
-	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
-		a[i] = pack(&buff[j]);
-		a[i] ^= rinst->rkey[i];
-	}
-	k = rinst->Nb;
-	x = a;
-	y = b;
-
-	/* State alternates between a and b */
-	for (i = 1; i < rinst->Nr; i++) {	/* rinst->Nr is number of rounds. May be odd. */
-
-		/* if rinst->Nb is fixed - unroll this next
-		 loop and hard-code in the values of ri[] */
-
-		for (m = j = 0; j < rinst->Nb; j++, m += 3) {	/* This is the time-critical bit */
-			y[j] = rinst->rkey[k++] ^ rtable[(u8) x[j]] ^
-			 ROTL8(rtable[(u8) (x[rinst->ri[m]] >> 8)]) ^
-			 ROTL16(rtable
-			 [(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
-			 ROTL24(rtable[x[rinst->ri[m + 2]] >> 24]);
-		}
-		t = x;
-		x = y;
-		y = t;		/* swap pointers */
-	}
-
-	/* Last Round - unroll if possible */
-	for (m = j = 0; j < rinst->Nb; j++, m += 3) {
-		y[j] = rinst->rkey[k++] ^ (u32) rbsub[(u8) x[j]] ^
-		 ROTL8((u32) rbsub[(u8) (x[rinst->ri[m]] >> 8)]) ^
-		 ROTL16((u32)
-		 rbsub[(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
-		 ROTL24((u32) rbsub[x[rinst->ri[m + 2]] >> 24]);
-	}
-	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
-		unpack(y[i], &buff[j]);
-		x[i] = y[i] = 0;	/* clean up stack */
-	}
-	return;
-}
-
-void gf_crypt_register_rijndael_128(GF_Crypt *td)
-{
-	td->a_encrypt = (void *)_mcrypt_encrypt;
-	td->a_decrypt = (void *)_mcrypt_decrypt;
-	td->a_set_key = (void *)_mcrypt_set_key;
-	td->algo_name = "Rijndael-128";
-	td->algo_version = 20010801;
-	td->num_key_sizes = 3;
-	td->key_sizes[0] = 16;
-	td->key_sizes[1] = 24;
-	td->key_sizes[2] = 32;
-	td->key_size = 32;
-	td->is_block_algo = 1;
-	td->algo_block_size = 16;
-	td->algo_size = sizeof(RI);
-}
-
-#endif /*!defined(GPAC_DISABLE_MCRYPT)*/

gpac-0.7.1.tar.gz/src/mcrypt/rijndael-192.c Deleted

@@ -1,418 +0,0 @@
-/* Rijndael Cipher
-
- Written by Mike Scott 21st April 1999
- Copyright (c) 1999 Mike Scott
- See rijndael documentation
-
- Permission for free direct or derivative use is granted subject
- to compliance with any conditions that the originators of the
- algorithm place on its exploitation.
-
- Inspiration from Brian Gladman's implementation is acknowledged.
-
- Written for clarity, rather than speed.
- Full implementation.
- Endian indifferent.
-*/
-
-/* modified in order to use the libmcrypt API by Nikos Mavroyanopoulos
- * All modifications are placed under the license of libmcrypt.
- */
-
-
-/* $Id: rijndael-192.c,v 1.2 2009-07-31 07:37:43 jeanlf Exp $ */
-
-#include <gpac/internal/crypt_dev.h>
-
-#if !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)
-
-typedef struct rijndael_instance {
-	int Nk,Nb,Nr;
-	u8 fi[24],ri[24];
-	u32 fkey[120];
-	u32 rkey[120];
-} RI;
-
-
-/* rotates x one bit to the left */
-
-#define ROTL(x) (((x)>>7)|((x)<<1))
-
-/* Rotates 32-bit word left by 1, 2 or 3 u8 */
-
-#define ROTL8(x) (((x)<<8)|((x)>>24))
-#define ROTL16(x) (((x)<<16)|((x)>>16))
-#define ROTL24(x) (((x)<<24)|((x)>>8))
-
-/* Fixed Data */
-
-static u8 InCo[4] = { 0xB, 0xD, 0x9, 0xE };	/* Inverse Coefficients */
-
-static u8 fbsub[256];
-static u8 rbsub[256];
-static u8 ptab[256], ltab[256];
-static u32 ftable[256];
-static u32 rtable[256];
-static u32 rco[30];
-static int tables_ok = 0;
-
-/* Parameter-dependent data */
-
-/* in "rijndael.h" */
-
-static u32 pack(u8 * b)
-{	/* pack bytes into a 32-bit Word */
-	return ((u32) b[3] << 24) | ((u32) b[2] << 16) | ((u32)
-	 b[1] << 8)
-	 | (u32) b[0];
-}
-
-static void unpack(u32 a, u8 * b)
-{	/* unpack bytes from a word */
-	b[0] = (u8) a;
-	b[1] = (u8) (a >> 8);
-	b[2] = (u8) (a >> 16);
-	b[3] = (u8) (a >> 24);
-}
-
-static u8 xtime(u8 a)
-{
-	u8 b;
-	if (a & 0x80)
-		b = 0x1B;
-	else
-		b = 0;
-	a <<= 1;
-	a ^= b;
-	return a;
-}
-
-static u8 bmul(u8 x, u8 y)
-{	/* x.y= AntiLog(Log(x) + Log(y)) */
-	if (x && y)
-		return ptab[(ltab[x] + ltab[y]) % 255];
-	else
-		return 0;
-}
-
-static u32 SubByte(u32 a)
-{
-	u8 b[4];
-	unpack(a, b);
-	b[0] = fbsub[b[0]];
-	b[1] = fbsub[b[1]];
-	b[2] = fbsub[b[2]];
-	b[3] = fbsub[b[3]];
-	return pack(b);
-}
-
-static u8 product(u32 x, u32 y)
-{	/* dot product of two 4-u8 arrays */
-	u8 xb[4], yb[4];
-	unpack(x, xb);
-	unpack(y, yb);
-	return bmul(xb[0], yb[0]) ^ bmul(xb[1], yb[1]) ^ bmul(xb[2],
-	 yb[2]) ^
-	 bmul(xb[3], yb[3]);
-}
-
-static u32 InvMixCol(u32 x)
-{	/* matrix Multiplication */
-	u32 y, m;
-	u8 b[4];
-
-	m = pack(InCo);
-	b[3] = product(m, x);
-	m = ROTL24(m);
-	b[2] = product(m, x);
-	m = ROTL24(m);
-	b[1] = product(m, x);
-	m = ROTL24(m);
-	b[0] = product(m, x);
-	y = pack(b);
-	return y;
-}
-
-static u8 ByteSub(u8 x)
-{
-	u8 y = ptab[255 - ltab[x]];	/* multiplicative inverse */
-	x = y;
-	x = ROTL(x);
-	y ^= x;
-	x = ROTL(x);
-	y ^= x;
-	x = ROTL(x);
-	y ^= x;
-	x = ROTL(x);
-	y ^= x;
-	y ^= 0x63;
-	return y;
-}
-
-static void _mcrypt_rijndael_gentables(void)
-{	/* generate tables */
-	int i;
-	u8 y, b[4];
-
-	/* use 3 as primitive root to generate power and log tables */
-
-	ltab[0] = 0;
-	ptab[0] = 1;
-	ltab[1] = 0;
-	ptab[1] = 3;
-	ltab[3] = 1;
-	for (i = 2; i < 256; i++) {
-		ptab[i] = ptab[i - 1] ^ xtime(ptab[i - 1]);
-		ltab[ptab[i]] = i;
-	}
-
-	/* affine transformation:- each bit is xored with itself shifted one bit */
-
-	fbsub[0] = 0x63;
-	rbsub[0x63] = 0;
-	for (i = 1; i < 256; i++) {
-		y = ByteSub((u8) i);
-		fbsub[i] = y;
-		rbsub[y] = i;
-	}
-
-	for (i = 0, y = 1; i < 30; i++) {
-		rco[i] = y;
-		y = xtime(y);
-	}
-
-	/* calculate forward and reverse tables */
-	for (i = 0; i < 256; i++) {
-		y = fbsub[i];
-		b[3] = y ^ xtime(y);
-		b[2] = y;
-		b[1] = y;
-		b[0] = xtime(y);
-		ftable[i] = pack(b);
-
-		y = rbsub[i];
-		b[3] = bmul(InCo[0], y);
-		b[2] = bmul(InCo[1], y);
-		b[1] = bmul(InCo[2], y);
-		b[0] = bmul(InCo[3], y);
-		rtable[i] = pack(b);
-	}
-}
-
-static GF_Err _mcrypt_set_key(RI * rinst, u8 * key, int nk)
-{	/* blocksize=32*nb bits. Key=32*nk bits */
-	/* currently nb,bk = 4, 6 or 8 */
-	/* key comes as 4*rinst->Nk bytes */
-	/* Key Scheduler. Create expanded encryption key */
-	int nb = 6;		/* 192 block size */
-	int i, j, k, m, N;
-	int C1, C2, C3;
-	u32 CipherKey[8];
-
-	nk /= 4;
-
-	if (tables_ok == 0) {
-		_mcrypt_rijndael_gentables();
-		tables_ok = 1;
-	}
-
-	rinst->Nb = nb;
-	rinst->Nk = nk;
-
-	/* rinst->Nr is number of rounds */
-	if (rinst->Nb >= rinst->Nk)
-		rinst->Nr = 6 + rinst->Nb;
-	else
-		rinst->Nr = 6 + rinst->Nk;
-
-	C1 = 1;
-	if (rinst->Nb < 8) {
-		C2 = 2;
-		C3 = 3;
-	} else {
-		C2 = 3;
-		C3 = 4;
-	}
-
-	/* pre-calculate forward and reverse increments */
-	for (m = j = 0; j < nb; j++, m += 3) {
-		rinst->fi[m] = (j + C1) % nb;
-		rinst->fi[m + 1] = (j + C2) % nb;
-		rinst->fi[m + 2] = (j + C3) % nb;
-		rinst->ri[m] = (nb + j - C1) % nb;
-		rinst->ri[m + 1] = (nb + j - C2) % nb;
-		rinst->ri[m + 2] = (nb + j - C3) % nb;
-	}
-
-	N = rinst->Nb * (rinst->Nr + 1);
-
-	for (i = j = 0; i < rinst->Nk; i++, j += 4) {
-		CipherKey[i] = pack(&key[j]);
-	}
-	for (i = 0; i < rinst->Nk; i++)
-		rinst->fkey[i] = CipherKey[i];
-	for (j = rinst->Nk, k = 0; j < N; j += rinst->Nk, k++) {
-		rinst->fkey[j] =
-		 rinst->fkey[j -
-		 rinst->Nk] ^ SubByte(ROTL24(rinst->
-		 fkey[j -
-		 1])) ^
-		 rco[k];
-		if (rinst->Nk <= 6) {
-			for (i = 1; i < rinst->Nk && (i + j) < N; i++)
-				rinst->fkey[i + j] =
-				 rinst->fkey[i + j -
-				 rinst->Nk] ^ rinst->
-				 fkey[i + j - 1];
-		} else {
-			for (i = 1; i < 4 && (i + j) < N; i++)
-				rinst->fkey[i + j] =
-				 rinst->fkey[i + j -
-				 rinst->Nk] ^ rinst->
-				 fkey[i + j - 1];
-			if ((j + 4) < N)
-				rinst->fkey[j + 4] =
-				 rinst->fkey[j + 4 -
-				 rinst->
-				 Nk] ^ SubByte(rinst->
-				 fkey[j + 3]);
-			for (i = 5; i < rinst->Nk && (i + j) < N; i++)
-				rinst->fkey[i + j] =
-				 rinst->fkey[i + j -
-				 rinst->Nk] ^ rinst->
-				 fkey[i + j - 1];
-		}
-
-	}
-
-	/* now for the expanded decrypt key in reverse order */
-
-	for (j = 0; j < rinst->Nb; j++)
-		rinst->rkey[j + N - rinst->Nb] = rinst->fkey[j];
-	for (i = rinst->Nb; i < N - rinst->Nb; i += rinst->Nb) {
-		k = N - rinst->Nb - i;
-		for (j = 0; j < rinst->Nb; j++)
-			rinst->rkey[k + j] = InvMixCol(rinst->fkey[i + j]);
-	}
-	for (j = N - rinst->Nb; j < N; j++)
-		rinst->rkey[j - N + rinst->Nb] = rinst->fkey[j];
-	return GF_OK;
-}
-
-
-/* There is an obvious time/space trade-off possible here. *
- * Instead of just one ftable[], I could have 4, the other *
- * 3 pre-rotated to save the ROTL8, ROTL16 and ROTL24 overhead */
-
-static void _mcrypt_encrypt(RI * rinst, u8 * buff)
-{
-	int i, j, k, m;
-	u32 a[8], b[8], *x, *y, *t;
-
-	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
-		a[i] = pack(&buff[j]);
-		a[i] ^= rinst->fkey[i];
-	}
-	k = rinst->Nb;
-	x = a;
-	y = b;
-
-	/* State alternates between a and b */
-	for (i = 1; i < rinst->Nr; i++) {	/* rinst->Nr is number of rounds. May be odd. */
-
-		/* if rinst->Nb is fixed - unroll this next
-		 loop and hard-code in the values of fi[] */
-
-		for (m = j = 0; j < rinst->Nb; j++, m += 3) {	/* deal with each 32-bit element of the State */
-			/* This is the time-critical bit */
-			y[j] = rinst->fkey[k++] ^ ftable[(u8) x[j]] ^
-			 ROTL8(ftable[(u8) (x[rinst->fi[m]] >> 8)]) ^
-			 ROTL16(ftable
-			 [(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
-			 ROTL24(ftable[x[rinst->fi[m + 2]] >> 24]);
-		}
-		t = x;
-		x = y;
-		y = t;		/* swap pointers */
-	}
-
-	/* Last Round - unroll if possible */
-	for (m = j = 0; j < rinst->Nb; j++, m += 3) {
-		y[j] = rinst->fkey[k++] ^ (u32) fbsub[(u8) x[j]] ^
-		 ROTL8((u32) fbsub[(u8) (x[rinst->fi[m]] >> 8)]) ^
-		 ROTL16((u32)
-		 fbsub[(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
-		 ROTL24((u32) fbsub[x[rinst->fi[m + 2]] >> 24]);
-	}
-	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
-		unpack(y[i], &buff[j]);
-		x[i] = y[i] = 0;	/* clean up stack */
-	}
-	return;
-}
-
-static void _mcrypt_decrypt(RI * rinst, u8 * buff)
-{
-	int i, j, k, m;
-	u32 a[8], b[8], *x, *y, *t;
-
-	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
-		a[i] = pack(&buff[j]);
-		a[i] ^= rinst->rkey[i];
-	}
-	k = rinst->Nb;
-	x = a;
-	y = b;
-
-	/* State alternates between a and b */
-	for (i = 1; i < rinst->Nr; i++) {	/* rinst->Nr is number of rounds. May be odd. */
-
-		/* if rinst->Nb is fixed - unroll this next
-		 loop and hard-code in the values of ri[] */
-
-		for (m = j = 0; j < rinst->Nb; j++, m += 3) {	/* This is the time-critical bit */
-			y[j] = rinst->rkey[k++] ^ rtable[(u8) x[j]] ^
-			 ROTL8(rtable[(u8) (x[rinst->ri[m]] >> 8)]) ^
-			 ROTL16(rtable
-			 [(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
-			 ROTL24(rtable[x[rinst->ri[m + 2]] >> 24]);
-		}
-		t = x;
-		x = y;
-		y = t;		/* swap pointers */
-	}
-
-	/* Last Round - unroll if possible */
-	for (m = j = 0; j < rinst->Nb; j++, m += 3) {
-		y[j] = rinst->rkey[k++] ^ (u32) rbsub[(u8) x[j]] ^
-		 ROTL8((u32) rbsub[(u8) (x[rinst->ri[m]] >> 8)]) ^
-		 ROTL16((u32)
-		 rbsub[(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
-		 ROTL24((u32) rbsub[x[rinst->ri[m + 2]] >> 24]);
-	}
-	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
-		unpack(y[i], &buff[j]);
-		x[i] = y[i] = 0;	/* clean up stack */
-	}
-	return;
-}
-
-void gf_crypt_register_rijndael_192(GF_Crypt *td)
-{
-	td->a_encrypt = _mcrypt_encrypt;
-	td->a_decrypt = _mcrypt_decrypt;
-	td->a_set_key = _mcrypt_set_key;
-	td->algo_name = "Rijndael-192";
-	td->algo_version = 20010801;
-	td->num_key_sizes = 3;
-	td->key_sizes[0] = 16;
-	td->key_sizes[1] = 24;
-	td->key_sizes[2] = 32;
-	td->key_size = 32;
-	td->is_block_algo = 1;
-	td->algo_block_size = 24;
-	td->algo_size = sizeof(RI);
-}
-
-#endif /* !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)*/
-

gpac-0.7.1.tar.gz/src/mcrypt/rijndael-256.c Deleted

@@ -1,416 +0,0 @@
-/* Rijndael Cipher
-
- Written by Mike Scott 21st April 1999
- Copyright (c) 1999 Mike Scott
- See rijndael documentation
-
- Permission for free direct or derivative use is granted subject
- to compliance with any conditions that the originators of the
- algorithm place on its exploitation.
-
- Inspiration from Brian Gladman's implementation is acknowledged.
-
- Written for clarity, rather than speed.
- Full implementation.
- Endian indifferent.
-*/
-
-/* modified in order to use the libmcrypt API by Nikos Mavroyanopoulos
- * All modifications are placed under the license of libmcrypt.
- */
-
-/* $Id: rijndael-256.c,v 1.2 2009-07-31 07:37:43 jeanlf Exp $ */
-
-#include <gpac/internal/crypt_dev.h>
-
-#if !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)
-
-typedef struct rijndael_instance {
-	int Nk,Nb,Nr;
-	u8 fi[24],ri[24];
-	u32 fkey[120];
-	u32 rkey[120];
-} RI;
-
-
-/* rotates x one bit to the left */
-
-#define ROTL(x) (((x)>>7)|((x)<<1))
-
-/* Rotates 32-bit word left by 1, 2 or 3 u8 */
-
-#define ROTL8(x) (((x)<<8)|((x)>>24))
-#define ROTL16(x) (((x)<<16)|((x)>>16))
-#define ROTL24(x) (((x)<<24)|((x)>>8))
-
-/* Fixed Data */
-
-static u8 InCo[4] = { 0xB, 0xD, 0x9, 0xE };	/* Inverse Coefficients */
-
-static u8 fbsub[256];
-static u8 rbsub[256];
-static u8 ptab[256], ltab[256];
-static u32 ftable[256];
-static u32 rtable[256];
-static u32 rco[30];
-static int tables_ok = 0;
-
-/* Parameter-dependent data */
-
-/* in "rijndael.h" */
-
-static u32 pack(u8 * b)
-{	/* pack bytes into a 32-bit Word */
-	return ((u32) b[3] << 24) | ((u32) b[2] << 16) | ((u32)
-	 b[1] << 8)
-	 | (u32) b[0];
-}
-
-static void unpack(u32 a, u8 * b)
-{	/* unpack bytes from a word */
-	b[0] = (u8) a;
-	b[1] = (u8) (a >> 8);
-	b[2] = (u8) (a >> 16);
-	b[3] = (u8) (a >> 24);
-}
-
-static u8 xtime(u8 a)
-{
-	u8 b;
-	if (a & 0x80)
-		b = 0x1B;
-	else
-		b = 0;
-	a <<= 1;
-	a ^= b;
-	return a;
-}
-
-static u8 bmul(u8 x, u8 y)
-{	/* x.y= AntiLog(Log(x) + Log(y)) */
-	if (x && y)
-		return ptab[(ltab[x] + ltab[y]) % 255];
-	else
-		return 0;
-}
-
-static u32 SubByte(u32 a)
-{
-	u8 b[4];
-	unpack(a, b);
-	b[0] = fbsub[b[0]];
-	b[1] = fbsub[b[1]];
-	b[2] = fbsub[b[2]];
-	b[3] = fbsub[b[3]];
-	return pack(b);
-}
-
-static u8 product(u32 x, u32 y)
-{	/* dot product of two 4-u8 arrays */
-	u8 xb[4], yb[4];
-	unpack(x, xb);
-	unpack(y, yb);
-	return bmul(xb[0], yb[0]) ^ bmul(xb[1], yb[1]) ^ bmul(xb[2],
-	 yb[2]) ^
-	 bmul(xb[3], yb[3]);
-}
-
-static u32 InvMixCol(u32 x)
-{	/* matrix Multiplication */
-	u32 y, m;
-	u8 b[4];
-
-	m = pack(InCo);
-	b[3] = product(m, x);
-	m = ROTL24(m);
-	b[2] = product(m, x);
-	m = ROTL24(m);
-	b[1] = product(m, x);
-	m = ROTL24(m);
-	b[0] = product(m, x);
-	y = pack(b);
-	return y;
-}
-
-static u8 ByteSub(u8 x)
-{
-	u8 y = ptab[255 - ltab[x]];	/* multiplicative inverse */
-	x = y;
-	x = ROTL(x);
-	y ^= x;
-	x = ROTL(x);
-	y ^= x;
-	x = ROTL(x);
-	y ^= x;
-	x = ROTL(x);
-	y ^= x;
-	y ^= 0x63;
-	return y;
-}
-
-static void _mcrypt_rijndael_gentables(void)
-{	/* generate tables */
-	int i;
-	u8 y, b[4];
-
-	/* use 3 as primitive root to generate power and log tables */
-
-	ltab[0] = 0;
-	ptab[0] = 1;
-	ltab[1] = 0;
-	ptab[1] = 3;
-	ltab[3] = 1;
-	for (i = 2; i < 256; i++) {
-		ptab[i] = ptab[i - 1] ^ xtime(ptab[i - 1]);
-		ltab[ptab[i]] = i;
-	}
-
-	/* affine transformation:- each bit is xored with itself shifted one bit */
-
-	fbsub[0] = 0x63;
-	rbsub[0x63] = 0;
-	for (i = 1; i < 256; i++) {
-		y = ByteSub((u8) i);
-		fbsub[i] = y;
-		rbsub[y] = i;
-	}
-
-	for (i = 0, y = 1; i < 30; i++) {
-		rco[i] = y;
-		y = xtime(y);
-	}
-
-	/* calculate forward and reverse tables */
-	for (i = 0; i < 256; i++) {
-		y = fbsub[i];
-		b[3] = y ^ xtime(y);
-		b[2] = y;
-		b[1] = y;
-		b[0] = xtime(y);
-		ftable[i] = pack(b);
-
-		y = rbsub[i];
-		b[3] = bmul(InCo[0], y);
-		b[2] = bmul(InCo[1], y);
-		b[1] = bmul(InCo[2], y);
-		b[0] = bmul(InCo[3], y);
-		rtable[i] = pack(b);
-	}
-}
-
-static GF_Err _mcrypt_set_key(RI * rinst, u8 * key, int nk)
-{	/* blocksize=32*nb bits. Key=32*nk bits */
-	/* currently nb,bk = 4, 6 or 8 */
-	/* key comes as 4*rinst->Nk bytes */
-	/* Key Scheduler. Create expanded encryption key */
-	int nb = 8;		/* 256 block size */
-	int i, j, k, m, N;
-	int C1, C2, C3;
-	u32 CipherKey[8];
-
-	nk /= 4;
-
-	if (tables_ok == 0) {
-		_mcrypt_rijndael_gentables();
-		tables_ok = 1;
-	}
-
-	rinst->Nb = nb;
-	rinst->Nk = nk;
-
-	/* rinst->Nr is number of rounds */
-	if (rinst->Nb >= rinst->Nk)
-		rinst->Nr = 6 + rinst->Nb;
-	else
-		rinst->Nr = 6 + rinst->Nk;
-
-	C1 = 1;
-	if (rinst->Nb < 8) {
-		C2 = 2;
-		C3 = 3;
-	} else {
-		C2 = 3;
-		C3 = 4;
-	}
-
-	/* pre-calculate forward and reverse increments */
-	for (m = j = 0; j < nb; j++, m += 3) {
-		rinst->fi[m] = (j + C1) % nb;
-		rinst->fi[m + 1] = (j + C2) % nb;
-		rinst->fi[m + 2] = (j + C3) % nb;
-		rinst->ri[m] = (nb + j - C1) % nb;
-		rinst->ri[m + 1] = (nb + j - C2) % nb;
-		rinst->ri[m + 2] = (nb + j - C3) % nb;
-	}
-
-	N = rinst->Nb * (rinst->Nr + 1);
-
-	for (i = j = 0; i < rinst->Nk; i++, j += 4) {
-		CipherKey[i] = pack(&key[j]);
-	}
-	for (i = 0; i < rinst->Nk; i++)
-		rinst->fkey[i] = CipherKey[i];
-	for (j = rinst->Nk, k = 0; j < N; j += rinst->Nk, k++) {
-		rinst->fkey[j] =
-		 rinst->fkey[j -
-		 rinst->Nk] ^ SubByte(ROTL24(rinst->
-		 fkey[j -
-		 1])) ^
-		 rco[k];
-		if (rinst->Nk <= 6) {
-			for (i = 1; i < rinst->Nk && (i + j) < N; i++)
-				rinst->fkey[i + j] =
-				 rinst->fkey[i + j -
-				 rinst->Nk] ^ rinst->
-				 fkey[i + j - 1];
-		} else {
-			for (i = 1; i < 4 && (i + j) < N; i++)
-				rinst->fkey[i + j] =
-				 rinst->fkey[i + j -
-				 rinst->Nk] ^ rinst->
-				 fkey[i + j - 1];
-			if ((j + 4) < N)
-				rinst->fkey[j + 4] =
-				 rinst->fkey[j + 4 -
-				 rinst->
-				 Nk] ^ SubByte(rinst->
-				 fkey[j + 3]);
-			for (i = 5; i < rinst->Nk && (i + j) < N; i++)
-				rinst->fkey[i + j] =
-				 rinst->fkey[i + j -
-				 rinst->Nk] ^ rinst->
-				 fkey[i + j - 1];
-		}
-
-	}
-
-	/* now for the expanded decrypt key in reverse order */
-
-	for (j = 0; j < rinst->Nb; j++)
-		rinst->rkey[j + N - rinst->Nb] = rinst->fkey[j];
-	for (i = rinst->Nb; i < N - rinst->Nb; i += rinst->Nb) {
-		k = N - rinst->Nb - i;
-		for (j = 0; j < rinst->Nb; j++)
-			rinst->rkey[k + j] = InvMixCol(rinst->fkey[i + j]);
-	}
-	for (j = N - rinst->Nb; j < N; j++)
-		rinst->rkey[j - N + rinst->Nb] = rinst->fkey[j];
-	return GF_OK;
-}
-
-
-/* There is an obvious time/space trade-off possible here. *
- * Instead of just one ftable[], I could have 4, the other *
- * 3 pre-rotated to save the ROTL8, ROTL16 and ROTL24 overhead */
-
-static void _mcrypt_encrypt(RI * rinst, u8 * buff)
-{
-	int i, j, k, m;
-	u32 a[8], b[8], *x, *y, *t;
-
-	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
-		a[i] = pack(&buff[j]);
-		a[i] ^= rinst->fkey[i];
-	}
-	k = rinst->Nb;
-	x = a;
-	y = b;
-
-	/* State alternates between a and b */
-	for (i = 1; i < rinst->Nr; i++) {	/* rinst->Nr is number of rounds. May be odd. */
-
-		/* if rinst->Nb is fixed - unroll this next
-		 loop and hard-code in the values of fi[] */
-
-		for (m = j = 0; j < rinst->Nb; j++, m += 3) {	/* deal with each 32-bit element of the State */
-			/* This is the time-critical bit */
-			y[j] = rinst->fkey[k++] ^ ftable[(u8) x[j]] ^
-			 ROTL8(ftable[(u8) (x[rinst->fi[m]] >> 8)]) ^
-			 ROTL16(ftable
-			 [(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
-			 ROTL24(ftable[x[rinst->fi[m + 2]] >> 24]);
-		}
-		t = x;
-		x = y;
-		y = t;		/* swap pointers */
-	}
-
-	/* Last Round - unroll if possible */
-	for (m = j = 0; j < rinst->Nb; j++, m += 3) {
-		y[j] = rinst->fkey[k++] ^ (u32) fbsub[(u8) x[j]] ^
-		 ROTL8((u32) fbsub[(u8) (x[rinst->fi[m]] >> 8)]) ^
-		 ROTL16((u32)
-		 fbsub[(u8) (x[rinst->fi[m + 1]] >> 16)]) ^
-		 ROTL24((u32) fbsub[x[rinst->fi[m + 2]] >> 24]);
-	}
-	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
-		unpack(y[i], &buff[j]);
-		x[i] = y[i] = 0;	/* clean up stack */
-	}
-	return;
-}
-
-static void _mcrypt_decrypt(RI * rinst, u8 * buff)
-{
-	int i, j, k, m;
-	u32 a[8], b[8], *x, *y, *t;
-
-	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
-		a[i] = pack(&buff[j]);
-		a[i] ^= rinst->rkey[i];
-	}
-	k = rinst->Nb;
-	x = a;
-	y = b;
-
-	/* State alternates between a and b */
-	for (i = 1; i < rinst->Nr; i++) {	/* rinst->Nr is number of rounds. May be odd. */
-
-		/* if rinst->Nb is fixed - unroll this next
-		 loop and hard-code in the values of ri[] */
-
-		for (m = j = 0; j < rinst->Nb; j++, m += 3) {	/* This is the time-critical bit */
-			y[j] = rinst->rkey[k++] ^ rtable[(u8) x[j]] ^
-			 ROTL8(rtable[(u8) (x[rinst->ri[m]] >> 8)]) ^
-			 ROTL16(rtable
-			 [(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
-			 ROTL24(rtable[x[rinst->ri[m + 2]] >> 24]);
-		}
-		t = x;
-		x = y;
-		y = t;		/* swap pointers */
-	}
-
-	/* Last Round - unroll if possible */
-	for (m = j = 0; j < rinst->Nb; j++, m += 3) {
-		y[j] = rinst->rkey[k++] ^ (u32) rbsub[(u8) x[j]] ^
-		 ROTL8((u32) rbsub[(u8) (x[rinst->ri[m]] >> 8)]) ^
-		 ROTL16((u32)
-		 rbsub[(u8) (x[rinst->ri[m + 1]] >> 16)]) ^
-		 ROTL24((u32) rbsub[x[rinst->ri[m + 2]] >> 24]);
-	}
-	for (i = j = 0; i < rinst->Nb; i++, j += 4) {
-		unpack(y[i], &buff[j]);
-		x[i] = y[i] = 0;	/* clean up stack */
-	}
-	return;
-}
-
-void gf_crypt_register_rijndael_256(GF_Crypt *td)
-{
-	td->a_encrypt = _mcrypt_encrypt;
-	td->a_decrypt = _mcrypt_decrypt;
-	td->a_set_key = _mcrypt_set_key;
-	td->algo_name = "Rijndael-256";
-	td->algo_version = 20010801;
-	td->num_key_sizes = 3;
-	td->key_sizes[0] = 16;
-	td->key_sizes[1] = 24;
-	td->key_sizes[2] = 32;
-	td->key_size = 32;
-	td->is_block_algo = 1;
-	td->algo_block_size = 32;
-	td->algo_size = sizeof(RI);
-}
-
-#endif /* !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)*/

gpac-0.7.1.tar.gz/src/mcrypt/stream.c Deleted

@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 1998,1999,2000,2001 Nikos Mavroyanopoulos
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gpac/internal/crypt_dev.h>
-
-#if !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)
-
-static GF_Err _init_mcrypt( void* ign, void *key, int lenofkey, void *IV, int size) {
-	return GF_OK;
-}
-
-static GF_Err _mcrypt_set_state( void* buf, void *IV, int size) {
-	return GF_BAD_PARAM;
-}
-static GF_Err _mcrypt_get_state( void* buf, void *IV, int *size) {
-	return GF_BAD_PARAM;
-}
-
-static void _end_mcrypt(void* ign) {}
-
-static GF_Err _mcrypt( void* ign, void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*, int), void (*func2)(void*,void*, int))
-{
-	void (*_mcrypt_stream_encrypt) (void *, void *, int);
-
-	_mcrypt_stream_encrypt = func;
-
-	_mcrypt_stream_encrypt(akey, plaintext, len);
-	return GF_OK;
-}
-
-static GF_Err _mdecrypt( void* ign, void *ciphertext, int len, int blocksize, void* akey, void (*func)(void*,void*, int), void (*func2)(void*,void*, int))
-{
-	void (*_mcrypt_stream_decrypt) (void *, void *, int);
-
-	_mcrypt_stream_decrypt = func2;
-
-	_mcrypt_stream_decrypt(akey, ciphertext, len);
-	return GF_OK;
-}
-
-void gf_crypt_register_stream(GF_Crypt *td)
-{
-	td->mode_name = "STREAM";
-	td->_init_mcrypt = _init_mcrypt;
-	td->_end_mcrypt = _end_mcrypt;
-	td->_mcrypt = _mcrypt;
-	td->_mdecrypt = _mdecrypt;
-	td->_mcrypt_get_state = _mcrypt_get_state;
-	td->_mcrypt_set_state = _mcrypt_set_state;
-
-	td->has_IV = 1;
-	td->is_block_mode = 0;
-	td->is_block_algo_mode = 0;
-	td->mode_size = 0;
-	td->mode_version = 20010801;
-}
-
-#endif /* !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)*/
-

gpac-0.7.1.tar.gz/src/mcrypt/tripledes.c Deleted

@@ -1,767 +0,0 @@
-
-/* Sofware DES functions
- * written 12 Dec 1986 by Phil Karn, KA9Q; large sections adapted from
- * the 1977 public-domain program by Jim Gillogly
- * Modified for additional speed - 6 December 1988 Phil Karn
- * Modified for parameterized key schedules - Jan 1991 Phil Karn
- * Modified modified such that will operate in EDE 3DES - 1999 Nikos Mavroyanopoulos
- *
- * Callers now allocate a key schedule as follows:
- *	kn = (char (*)[8])gf_malloc(sizeof(char) * 8 * 16);
- *	or
- *	char kn[16][8];
- */
-
-/* modified in order to use the libmcrypt API by Nikos Mavroyanopoulos
- * All modifications are placed under the license of libmcrypt.
- */
-
-/* $Id: tripledes.c,v 1.3 2010-02-23 16:24:20 jeanlf Exp $ */
-
-#include <gpac/internal/crypt_dev.h>
-
-#if !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)
-
-typedef struct triple_des_key {
-	char kn[3][16][8];
-	u32 sp[3][8][64];
-
-	char iperm[16][16][8];
-	char fperm[16][16][8];
-
-} TRIPLEDES_KEY;
-
-
-static void permute(), perminit(), spinit();
-static u32 f();
-
-
-/* Tables defined in the Data Encryption Standard documents */
-
-/* initial permutation IP */
-static char ip[] = {
-	58, 50, 42, 34, 26, 18, 10, 2,
-	60, 52, 44, 36, 28, 20, 12, 4,
-	62, 54, 46, 38, 30, 22, 14, 6,
-	64, 56, 48, 40, 32, 24, 16, 8,
-	57, 49, 41, 33, 25, 17, 9, 1,
-	59, 51, 43, 35, 27, 19, 11, 3,
-	61, 53, 45, 37, 29, 21, 13, 5,
-	63, 55, 47, 39, 31, 23, 15, 7
-};
-
-/* final permutation IP^-1 */
-static char fp[] = {
-	40, 8, 48, 16, 56, 24, 64, 32,
-	39, 7, 47, 15, 55, 23, 63, 31,
-	38, 6, 46, 14, 54, 22, 62, 30,
-	37, 5, 45, 13, 53, 21, 61, 29,
-	36, 4, 44, 12, 52, 20, 60, 28,
-	35, 3, 43, 11, 51, 19, 59, 27,
-	34, 2, 42, 10, 50, 18, 58, 26,
-	33, 1, 41, 9, 49, 17, 57, 25
-};
-
-/* expansion operation matrix
- * This is for reference only; it is unused in the code
- * as the f() function performs it implicitly for speed
- */
-#ifdef notdef
-static char ei[] = {
-	32, 1, 2, 3, 4, 5,
-	4, 5, 6, 7, 8, 9,
-	8, 9, 10, 11, 12, 13,
-	12, 13, 14, 15, 16, 17,
-	16, 17, 18, 19, 20, 21,
-	20, 21, 22, 23, 24, 25,
-	24, 25, 26, 27, 28, 29,
-	28, 29, 30, 31, 32, 1
-};
-#endif
-
-/* permuted choice table (key) */
-static char pc1[] = {
-	57, 49, 41, 33, 25, 17, 9,
-	1, 58, 50, 42, 34, 26, 18,
-	10, 2, 59, 51, 43, 35, 27,
-	19, 11, 3, 60, 52, 44, 36,
-
-	63, 55, 47, 39, 31, 23, 15,
-	7, 62, 54, 46, 38, 30, 22,
-	14, 6, 61, 53, 45, 37, 29,
-	21, 13, 5, 28, 20, 12, 4
-};
-
-/* number left rotations of pc1 */
-static char totrot[] = {
-	1, 2, 4, 6, 8, 10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28
-};
-
-/* permuted choice key (table) */
-static char pc2[] = {
-	14, 17, 11, 24, 1, 5,
-	3, 28, 15, 6, 21, 10,
-	23, 19, 12, 4, 26, 8,
-	16, 7, 27, 20, 13, 2,
-	41, 52, 31, 37, 47, 55,
-	30, 40, 51, 45, 33, 48,
-	44, 49, 39, 56, 34, 53,
-	46, 42, 50, 36, 29, 32
-};
-
-/* The (in)famous S-boxes */
-static char si[8][64] = {
-	/* S1 */
-	{	14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
-		0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
-		4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
-		15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13
-	},
-
-	/* S2 */
-	{	15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
-		3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
-		0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
-		13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9
-	},
-
-	/* S3 */
-	{	10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8,
-		13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1,
-		13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7,
-		1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12
-	},
-
-	/* S4 */
-	{	7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15,
-		13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9,
-		10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4,
-		3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14
-	},
-
-	/* S5 */
-	{	2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9,
-		14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6,
-		4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14,
-		11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3
-	},
-
-	/* S6 */
-	{	12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11,
-		10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8,
-		9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6,
-		4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13
-	},
-
-	/* S7 */
-	{	4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1,
-		13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
-		1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2,
-		6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12
-	},
-
-	/* S8 */
-	{	13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7,
-		1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2,
-		7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8,
-		2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11
-	},
-
-};
-
-/* 32-bit permutation function P used on the output of the S-boxes */
-static char p32i[] = {
-	16, 7, 20, 21,
-	29, 12, 28, 17,
-	1, 15, 23, 26,
-	5, 18, 31, 10,
-	2, 8, 24, 14,
-	32, 27, 3, 9,
-	19, 13, 30, 6,
-	22, 11, 4, 25
-};
-
-/* End of DES-defined tables */
-
-/* Lookup tables initialized once only at startup by desinit() */
-
-/* bit 0 is left-most in byte */
-static int bytebit[] = {
-	0200, 0100, 040, 020, 010, 04, 02, 01
-};
-
-static int nibblebit[] = {
-	010, 04, 02, 01
-};
-
-/* Allocate space and initialize DES lookup arrays
- * mode == 0: standard Data Encryption Algorithm
- */
-static int _mcrypt_desinit(TRIPLEDES_KEY * key)
-{
-
-	spinit(key, 0);
-	spinit(key, 1);
-	spinit(key, 2);
-	perminit(&key->iperm, ip);
-	perminit(&key->fperm, fp);
-
-
-	return 0;
-}
-
-
-/* Set key (initialize key schedule array) */
-static GF_Err _mcrypt_set_key(TRIPLEDES_KEY * dkey, char *user_key, int len)
-{
-	char pc1m[56];		/* place to modify pc1 into */
-	char pcr[56];		/* place to rotate pc1 into */
-	register int i, j, l;
-	int m;
-	char *user_key1 = &user_key[0];
-	char *user_key2 = &user_key[8];
-	char *user_key3 = &user_key[16];
-
-	_mcrypt_desinit(dkey);
-
-	/* Clear key schedule */
-	Bzero(dkey->kn[0], 16 * 8);
-	Bzero(dkey->kn[1], 16 * 8);
-	Bzero(dkey->kn[2], 16 * 8);
-
-	/* DES 1 */
-	for (j = 0; j < 56; j++) {	/* convert pc1 to bits of key */
-		l = pc1[j] - 1;	/* integer bit location */
-		m = l & 07;	/* find bit */
-		pc1m[j] = (user_key1[l >> 3] &	/* find which key byte l is in */
-		 bytebit[m])	/* and which bit of that byte */
-		 ? 1 : 0;	/* and store 1-bit result */
-
-	}
-	for (i = 0; i < 16; i++) {	/* key chunk for each iteration */
-		for (j = 0; j < 56; j++)	/* rotate pc1 the right amount */
-			pcr[j] =
-			 pc1m[(l = j + totrot[i]) <
-			 (j < 28 ? 28 : 56) ? l : l - 28];
-		/* rotate left and right halves independently */
-		for (j = 0; j < 48; j++) {	/* select bits individually */
-			/* check bit that goes to kn[j] */
-			if (pcr[pc2[j] - 1]) {
-				/* mask it in if it's there */
-				l = j % 6;
-				dkey->kn[0][i][j / 6] |= bytebit[l] >> 2;
-			}
-		}
-	}
-	/* DES 2 */
-	for (j = 0; j < 56; j++) {	/* convert pc1 to bits of key */
-		l = pc1[j] - 1;	/* integer bit location */
-		m = l & 07;	/* find bit */
-		pc1m[j] = (user_key2[l >> 3] &	/* find which key byte l is in */
-		 bytebit[m])	/* and which bit of that byte */
-		 ? 1 : 0;	/* and store 1-bit result */
-
-	}
-	for (i = 0; i < 16; i++) {	/* key chunk for each iteration */
-		for (j = 0; j < 56; j++)	/* rotate pc1 the right amount */
-			pcr[j] =
-			 pc1m[(l = j + totrot[i]) <
-			 (j < 28 ? 28 : 56) ? l : l - 28];
-		/* rotate left and right halves independently */
-		for (j = 0; j < 48; j++) {	/* select bits individually */
-			/* check bit that goes to kn[j] */
-			if (pcr[pc2[j] - 1]) {
-				/* mask it in if it's there */
-				l = j % 6;
-				dkey->kn[1][i][j / 6] |= bytebit[l] >> 2;
-			}
-		}
-	}
-	/* DES 3 */
-	for (j = 0; j < 56; j++) {	/* convert pc1 to bits of key */
-		l = pc1[j] - 1;	/* integer bit location */
-		m = l & 07;	/* find bit */
-		pc1m[j] = (user_key3[l >> 3] &	/* find which key byte l is in */
-		 bytebit[m])	/* and which bit of that byte */
-		 ? 1 : 0;	/* and store 1-bit result */
-
-	}
-	for (i = 0; i < 16; i++) {	/* key chunk for each iteration */
-		for (j = 0; j < 56; j++)	/* rotate pc1 the right amount */
-			pcr[j] =
-			 pc1m[(l = j + totrot[i]) <
-			 (j < 28 ? 28 : 56) ? l : l - 28];
-		/* rotate left and right halves independently */
-		for (j = 0; j < 48; j++) {	/* select bits individually */
-			/* check bit that goes to kn[j] */
-			if (pcr[pc2[j] - 1]) {
-				/* mask it in if it's there */
-				l = j % 6;
-				dkey->kn[2][i][j / 6] |= bytebit[l] >> 2;
-			}
-		}
-	}
-	return GF_OK;
-}
-
-
-
-
-/* In-place encryption of 64-bit block */
-
-static void _mcrypt_encrypt(TRIPLEDES_KEY * key, char *block)
-{
-	register u32 left, right;
-	register char *knp;
-	u32 work[2];		/* Working data storage */
-
-	/* DES 1 */
-	permute(block, key->iperm, (char *) work);	/* Initial Permutation */
-#ifndef	WORDS_BIGENDIAN
-	left = byteswap32(work[0]);
-	right = byteswap32(work[1]);
-#else
-	left = work[0];
-	right = work[1];
-#endif
-
-	/* Do the 16 rounds.
-	 * The rounds are numbered from 0 to 15. On even rounds
-	 * the right half is fed to f() and the result exclusive-ORs
-	 * the left half; on odd rounds the reverse is done.
-	 */
-	knp = &key->kn[0][0][0];
-	left ^= f(key, 0, right, knp);
-	knp += 8;
-	right ^= f(key, 0, left, knp);
-	knp += 8;
-	left ^= f(key, 0, right, knp);
-	knp += 8;
-	right ^= f(key, 0, left, knp);
-	knp += 8;
-	left ^= f(key, 0, right, knp);
-	knp += 8;
-	right ^= f(key, 0, left, knp);
-	knp += 8;
-	left ^= f(key, 0, right, knp);
-	knp += 8;
-	right ^= f(key, 0, left, knp);
-	knp += 8;
-	left ^= f(key, 0, right, knp);
-	knp += 8;
-	right ^= f(key, 0, left, knp);
-	knp += 8;
-	left ^= f(key, 0, right, knp);
-	knp += 8;
-	right ^= f(key, 0, left, knp);
-	knp += 8;
-	left ^= f(key, 0, right, knp);
-	knp += 8;
-	right ^= f(key, 0, left, knp);
-	knp += 8;
-	left ^= f(key, 0, right, knp);
-	knp += 8;
-	right ^= f(key, 0, left, knp);
-
-	/* DES 2 */
-
-	/* Do the 16 rounds in reverse order.
-	 * The rounds are numbered from 15 to 0. On even rounds
-	 * the right half is fed to f() and the result exclusive-ORs
-	 * the left half; on odd rounds the reverse is done.
-	 */
-	knp = &key->kn[1][15][0];
-	right ^= f(key, 1, left, knp);
-	knp -= 8;
-	left ^= f(key, 1, right, knp);
-	knp -= 8;
-	right ^= f(key, 1, left, knp);
-	knp -= 8;
-	left ^= f(key, 1, right, knp);
-	knp -= 8;
-	right ^= f(key, 1, left, knp);
-	knp -= 8;
-	left ^= f(key, 1, right, knp);
-	knp -= 8;
-	right ^= f(key, 1, left, knp);
-	knp -= 8;
-	left ^= f(key, 1, right, knp);
-	knp -= 8;
-	right ^= f(key, 1, left, knp);
-	knp -= 8;
-	left ^= f(key, 1, right, knp);
-	knp -= 8;
-	right ^= f(key, 1, left, knp);
-	knp -= 8;
-	left ^= f(key, 1, right, knp);
-	knp -= 8;
-	right ^= f(key, 1, left, knp);
-	knp -= 8;
-	left ^= f(key, 1, right, knp);
-	knp -= 8;
-	right ^= f(key, 1, left, knp);
-	knp -= 8;
-	left ^= f(key, 1, right, knp);
-
-	/* Do the 16 rounds.
-	 * The rounds are numbered from 0 to 15. On even rounds
-	 * the right half is fed to f() and the result exclusive-ORs
-	 * the left half; on odd rounds the reverse is done.
-	 */
-	knp = &key->kn[2][0][0];
-	left ^= f(key, 2, right, knp);
-	knp += 8;
-	right ^= f(key, 2, left, knp);
-	knp += 8;
-	left ^= f(key, 2, right, knp);
-	knp += 8;
-	right ^= f(key, 2, left, knp);
-	knp += 8;
-	left ^= f(key, 2, right, knp);
-	knp += 8;
-	right ^= f(key, 2, left, knp);
-	knp += 8;
-	left ^= f(key, 2, right, knp);
-	knp += 8;
-	right ^= f(key, 2, left, knp);
-	knp += 8;
-	left ^= f(key, 2, right, knp);
-	knp += 8;
-	right ^= f(key, 2, left, knp);
-	knp += 8;
-	left ^= f(key, 2, right, knp);
-	knp += 8;
-	right ^= f(key, 2, left, knp);
-	knp += 8;
-	left ^= f(key, 2, right, knp);
-	knp += 8;
-	right ^= f(key, 2, left, knp);
-	knp += 8;
-	left ^= f(key, 2, right, knp);
-	knp += 8;
-	right ^= f(key, 2, left, knp);
-
-	/* Left/right half swap, plus byte swap if little-endian */
-#ifndef	WORDS_BIGENDIAN
-	work[1] = byteswap32(left);
-	work[0] = byteswap32(right);
-#else
-	work[0] = right;
-	work[1] = left;
-#endif
-	permute((char *) work, key->fperm, block);	/* Inverse initial permutation */
-
-}
-
-/* In-place decryption of 64-bit block. This function is the mirror
- * image of encryption; exactly the same steps are taken, but in
- * reverse order
- */
-static void _mcrypt_decrypt(TRIPLEDES_KEY * key, char *block)
-{
-	register u32 left, right;
-	register char *knp;
-	u32 work[2];		/* Working data storage */
-
-	permute(block, key->iperm, (char *) work);	/* Initial permutation */
-
-	/* Left/right half swap, plus byte swap if little-endian */
-#ifndef	WORDS_BIGENDIAN
-	right = byteswap32(work[0]);
-	left = byteswap32(work[1]);
-#else
-	right = work[0];
-	left = work[1];
-#endif
-
-	/* DES 3 */
-
-	/* Do the 16 rounds in reverse order.
-	 * The rounds are numbered from 15 to 0. On even rounds
-	 * the right half is fed to f() and the result exclusive-ORs
-	 * the left half; on odd rounds the reverse is done.
-	 */
-	knp = &key->kn[2][15][0];
-	right ^= f(key, 2, left, knp);
-	knp -= 8;
-	left ^= f(key, 2, right, knp);
-	knp -= 8;
-	right ^= f(key, 2, left, knp);
-	knp -= 8;
-	left ^= f(key, 2, right, knp);
-	knp -= 8;
-	right ^= f(key, 2, left, knp);
-	knp -= 8;
-	left ^= f(key, 2, right, knp);
-	knp -= 8;
-	right ^= f(key, 2, left, knp);
-	knp -= 8;
-	left ^= f(key, 2, right, knp);
-	knp -= 8;
-	right ^= f(key, 2, left, knp);
-	knp -= 8;
-	left ^= f(key, 2, right, knp);
-	knp -= 8;
-	right ^= f(key, 2, left, knp);
-	knp -= 8;
-	left ^= f(key, 2, right, knp);
-	knp -= 8;
-	right ^= f(key, 2, left, knp);
-	knp -= 8;
-	left ^= f(key, 2, right, knp);
-	knp -= 8;
-	right ^= f(key, 2, left, knp);
-	knp -= 8;
-	left ^= f(key, 2, right, knp);
-
-
-	/* DES 2*/
-	/* Do the 16 rounds.
-	 * The rounds are numbered from 0 to 15. On even rounds
-	 * the right half is fed to f() and the result exclusive-ORs
-	 * the left half; on odd rounds the reverse is done.
-	 */
-	knp = &key->kn[1][0][0];
-	left ^= f(key, 1, right, knp);
-	knp += 8;
-	right ^= f(key, 1, left, knp);
-	knp += 8;
-	left ^= f(key, 1, right, knp);
-	knp += 8;
-	right ^= f(key, 1, left, knp);
-	knp += 8;
-	left ^= f(key, 1, right, knp);
-	knp += 8;
-	right ^= f(key, 1, left, knp);
-	knp += 8;
-	left ^= f(key, 1, right, knp);
-	knp += 8;
-	right ^= f(key, 1, left, knp);
-	knp += 8;
-	left ^= f(key, 1, right, knp);
-	knp += 8;
-	right ^= f(key, 1, left, knp);
-	knp += 8;
-	left ^= f(key, 1, right, knp);
-	knp += 8;
-	right ^= f(key, 1, left, knp);
-	knp += 8;
-	left ^= f(key, 1, right, knp);
-	knp += 8;
-	right ^= f(key, 1, left, knp);
-	knp += 8;
-	left ^= f(key, 1, right, knp);
-	knp += 8;
-	right ^= f(key, 1, left, knp);
-
-	/* DES 1 */
-	/* Do the 16 rounds in reverse order.
-	 * The rounds are numbered from 15 to 0. On even rounds
-	 * the right half is fed to f() and the result exclusive-ORs
-	 * the left half; on odd rounds the reverse is done.
-	 */
-	knp = &key->kn[0][15][0];
-	right ^= f(key, 0, left, knp);
-	knp -= 8;
-	left ^= f(key, 0, right, knp);
-	knp -= 8;
-	right ^= f(key, 0, left, knp);
-	knp -= 8;
-	left ^= f(key, 0, right, knp);
-	knp -= 8;
-	right ^= f(key, 0, left, knp);
-	knp -= 8;
-	left ^= f(key, 0, right, knp);
-	knp -= 8;
-	right ^= f(key, 0, left, knp);
-	knp -= 8;
-	left ^= f(key, 0, right, knp);
-	knp -= 8;
-	right ^= f(key, 0, left, knp);
-	knp -= 8;
-	left ^= f(key, 0, right, knp);
-	knp -= 8;
-	right ^= f(key, 0, left, knp);
-	knp -= 8;
-	left ^= f(key, 0, right, knp);
-	knp -= 8;
-	right ^= f(key, 0, left, knp);
-	knp -= 8;
-	left ^= f(key, 0, right, knp);
-	knp -= 8;
-	right ^= f(key, 0, left, knp);
-	knp -= 8;
-	left ^= f(key, 0, right, knp);
-
-
-#ifndef	WORDS_BIGENDIAN
-	work[0] = byteswap32(left);
-	work[1] = byteswap32(right);
-#else
-	work[0] = left;
-	work[1] = right;
-#endif
-	permute((char *) work, key->fperm, block);	/* Inverse initial permutation */
-}
-
-/* Permute inblock with perm */
-static void permute(char *inblock, char perm[16][16][8], char *outblock)
-{
-	register char *ib, *ob;	/* ptr to input or output block */
-	register char *p, *q;
-	register int j;
-
-	if (perm == NULL) {
-		/* No permutation, just copy */
-		memmove(outblock, inblock, 8);
-		return;
-	}
-	/* Clear output block */
-	Bzero(outblock, 8);
-
-	ib = inblock;
-	for (j = 0; j < 16; j += 2, ib++) {	/* for each input nibble */
-		ob = outblock;
-		p = perm[j][(*ib >> 4) & 0xf];
-		q = perm[j + 1][*ib & 0xf];
-		/* and each output byte, OR the masks together */
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-		*ob++ |= *p++ | *q++;
-	}
-}
-
-/* The nonlinear function f(r,k), the heart of DES */
-static u32 f(TRIPLEDES_KEY * key, int pos, register u32 r,
- register char *subkey)
-{
-	register u32 *spp;
-	register u32 rval, rt;
-	register int er;
-
-#ifdef	TRACE
-	fprintf(stderr, "f(%08lx, %02x %02x %02x %02x %02x %02x %02x %02x) = ",
-	 r,
-	 subkey[0], subkey[1], subkey[2],
-	 subkey[3], subkey[4], subkey[5], subkey[6], subkey[7]);
-#endif
-	/* Run E(R) ^ K through the combined S & P boxes.
-	 * This code takes advantage of a convenient regularity in
-	 * E, namely that each group of 6 bits in E(R) feeding
-	 * a single S-box is a contiguous segment of R.
-	 */
-	subkey += 7;
-
-	/* Compute E(R) for each block of 6 bits, and run thru boxes */
-	er = ((int) r << 1) | ((r & 0x80000000) ? 1 : 0);
-	spp = &key->sp[pos][7][0];
-	rval = spp[(er ^ *subkey--) & 0x3f];
-	spp -= 64;
-	rt = (u32) r >> 3;
-	rval |= spp[((int) rt ^ *subkey--) & 0x3f];
-	spp -= 64;
-	rt >>= 4;
-	rval |= spp[((int) rt ^ *subkey--) & 0x3f];
-	spp -= 64;
-	rt >>= 4;
-	rval |= spp[((int) rt ^ *subkey--) & 0x3f];
-	spp -= 64;
-	rt >>= 4;
-	rval |= spp[((int) rt ^ *subkey--) & 0x3f];
-	spp -= 64;
-	rt >>= 4;
-	rval |= spp[((int) rt ^ *subkey--) & 0x3f];
-	spp -= 64;
-	rt >>= 4;
-	rval |= spp[((int) rt ^ *subkey--) & 0x3f];
-	spp -= 64;
-	rt >>= 4;
-	rt |= (r & 1) << 5;
-	rval |= spp[((int) rt ^ *subkey) & 0x3f];
-#ifdef	TRACE
-	fprintf(stderr, " %08lx\n", rval);
-#endif
-	return rval;
-}
-
-/* initialize a perm array */
-static void perminit(char perm[16][16][8], char p[64])
-{
-	register int l, j, k;
-	int i, m;
-
-	/* Clear the permutation array */
-	Bzero((char *) perm, 16 * 16 * 8);
-
-	for (i = 0; i < 16; i++)	/* each input nibble position */
-		for (j = 0; j < 16; j++)	/* each possible input nibble */
-			for (k = 0; k < 64; k++) {	/* each output bit position */
-				l = p[k] - 1;	/* where does this bit come from */
-				if ((l >> 2) != i)	/* does it come from input posn? */
-					continue;	/* if not, bit k is 0 */
-				if (!(j & nibblebit[l & 3]))
-					continue;	/* any such bit in input? */
-				m = k & 07;	/* which bit is this in the byte */
-				perm[i][j][k >> 3] |= bytebit[m];
-			}
-}
-
-/* Initialize the lookup table for the combined S and P boxes */
-static void spinit(TRIPLEDES_KEY * key, int pos)
-{
-	char pbox[32];
-	int p, i, s, j, rowcol;
-	u32 val;
-
-	/* Compute pbox, the inverse of p32i.
-	 * This is easier to work with
-	 */
-	for (p = 0; p < 32; p++) {
-		for (i = 0; i < 32; i++) {
-			if (p32i[i] - 1 == p) {
-				pbox[p] = i;
-				break;
-			}
-		}
-	}
-	for (s = 0; s < 8; s++) {	/* For each S-box */
-		for (i = 0; i < 64; i++) {	/* For each possible input */
-			val = 0;
-			/* The row number is formed from the first and last
-			 * bits; the column number is from the middle 4
-			 */
-			rowcol =
-			 (i & 32) | ((i & 1) ? 16 : 0) | ((i >> 1) &
-			 0xf);
-			for (j = 0; j < 4; j++) {	/* For each output bit */
-				if (si[s][rowcol] & (8 >> j)) {
-					val |=
-					 1L << (31 - pbox[4 * s + j]);
-				}
-			}
-			key->sp[pos][s][i] = val;
-		}
-	}
-}
-
-void gf_crypt_register_3des(GF_Crypt *td)
-{
-	td->a_encrypt = _mcrypt_encrypt;
-	td->a_decrypt = _mcrypt_decrypt;
-	td->a_set_key = _mcrypt_set_key;
-	td->algo_name = "3DES";
-	td->algo_version = 19991129;
-	td->num_key_sizes = 1;
-	td->key_sizes[0] = 24;
-	td->key_size = 24;
-	td->is_block_algo = 1;
-	td->algo_block_size = 8;
-	td->algo_size = sizeof(TRIPLEDES_KEY);
-}
-
-#endif /* !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)*/

gpac-0.7.1.tar.gz/tests/media/encryption/drm_cbcs.xml Deleted

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" />
-<GPACDRM type="CENC AES-CBC Pattern">
-
-<DRMInfo type="pssh" version="0">
-<BS ID128="9A04F07998404286AB92E65BE0885F95"/>
-<BS data="application/data;base64:ACE125"/>
-<BS sourceFile="cenc_blob.bin"/>
-</DRMInfo>
-
-
-<DRMInfo type="pssh" version="1" cypherOffset="9" cypherIV="0x00000000000000000000000000000001" cypherKey="0x6770616363656E6364726D746F6F6C31">
-<BS ID128="6770616363656E6364726D746F6F6C31"/>
-<BS value="2" bits="32"/>
-<BS ID128="0x279926496a7f5d25da69f2b3b2799a7f"/>
-<BS ID128="0x676cb88f302d10227992649885984045"/>
-<BS bits="8" string="CID=Toto"/>
-<BS ID128="0xccc0f2b3b279926496a7f5d25da692f6"/>
-<BS ID128="0xccc0f2b3b279926496a7f5d25da692d6"/>
-</DRMInfo>
-
-<CrypTrack trackID="1" IsEncrypted="1" IV_size="16" first_IV="0x0a610676cb88f302d10ac8bc66e039ed" selectiveType="RAP" saiSavedBox="senc" keyRoll="roll=2">
-<key KID="0x279926496a7f5d25da69f2b3b2799a7f" value="0xccc0f2b3b279926496a7f5d25da692f6"/>
-<key KID="0x676cb88f302d10227992649885984045" value="0xccc0f2b3b279926496a7f5d25da692d6"/>
-</CrypTrack>
-
-</GPACDRM>
-
-

gpac-0.7.1.tar.gz/tests/media/encryption/drm_cens.xml Deleted

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" />
-<GPACDRM type="CENC AES-CTR Pattern">
-
-<DRMInfo type="pssh" version="0">
-<BS ID128="9A04F07998404286AB92E65BE0885F95"/>
-<BS data="application/data;base64:ACE125"/>
-<BS sourceFile="cenc_blob.bin"/>
-</DRMInfo>
-
-
-<DRMInfo type="pssh" version="1" cypherOffset="9" cypherKey="0x6770616363656E6364726D746F6F6C31" cypherIV="0x00000000000000000000000000000001">
-<BS ID128="6770616363656E6364726D746F6F6C31"/>
-<BS value="1" bits="32"/>
-<BS ID128="0x279926496a7f5d25da69f2b3b2799a7f"/>
-<BS bits="8" string="CID=Toto"/>
-<BS ID128="0x5544694d47473326622665665a396b36"/>
-</DRMInfo>
-
-<CrypTrack trackID="1" IsEncrypted="1" constant_IV_size="16" constant_IV="0x0a610676cb88f302d10ac8bc66e039ed" saiSavedBox="senc" skip_byte_block="1" crypt_byte_block="10">
-<key KID="0x279926496a7f5d25da69f2b3b2799a7f" value="0x5544694d47473326622665665a396b36"/>
-</CrypTrack>
-
-</GPACDRM>
-
-

gpac-0.7.1.tar.gz/tests/media/encryption/drm_isma.xml Deleted

gpac-0.7.1.tar.gz/tests/scripts/dash-live-generation.sh Deleted

gpac-0.7.1.tar.gz/tests/scripts/noFragsDefault.sh Deleted

gpac-0.7.1.tar.gz/.gitattributes -> gpac-0.8.0.tar.gz/.gitattributes Changed

gpac-0.7.1.tar.gz/.travis.yml -> gpac-0.8.0.tar.gz/.travis.yml Changed

@@ -7,10 +7,10 @@
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y update -qq ; fi
 install:
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install build-essential fakeroot dpkg-dev devscripts ccache debhelper pkg-config g++ mesa-utils ; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install -y zlib1g-dev libfreetype6-dev libjpeg62-dev libpng12-dev libopenjpeg-dev libmad0-dev libfaad-dev libogg-dev libvorbis-dev libtheora-dev liba52-0.7.4-dev libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libavdevice-dev libxv-dev x11proto-video-dev libgl1-mesa-dev x11proto-gl-dev linux-sound-base libxvidcore-dev libssl-dev libjack-dev libasound2-dev libpulse-dev libsdl1.2-dev dvb-apps libavcodec-extra-53 libmozjs185-dev ; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install -y gcc-mingw-w64-i686 g++-mingw-w64-i686 binutils-mingw-w64-i686 gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-dev ; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install -y zlib1g-dev libfreetype6-dev libjpeg62-dev libpng12-dev libopenjpeg-dev libmad0-dev libfaad-dev libogg-dev libvorbis-dev libtheora-dev liba52-0.7.4-dev libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libavdevice-dev libxv-dev x11proto-video-dev libgl1-mesa-dev x11proto-gl-dev linux-sound-base libxvidcore-dev libssl-dev libjack-dev libasound2-dev libpulse-dev libsdl1.2-dev dvb-apps libavcodec-extra libavutil-dev libmozjs185-dev ; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install -y gcc-mingw-w64-i686 g++-mingw-w64-i686 binutils-mingw-w64-i686 gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-x86-64-dev ; fi
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -qq -y install lcov time; fi
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo chown -R "$USER":admin /usr/local; fi
+#  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo chown -R "$USER":admin /usr/local; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install gnu-time gnu-sed gnu-tar xz lcov ; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install faad2 sdl freetype libvorbis theora openjpeg libmad xvid libogg spidermonkey ffmpeg ; fi
@@ -34,7 +34,7 @@
     - os: linux
       env: GPAC_CONFIGURE_OPTIONS="--prefix=build/all --enable-debug --disable-all" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="make install" DOTRAVIS=""
     - os: linux
-      env: GPAC_CONFIGURE_OPTIONS="--enable-debug --use-js=no --use-mad=no --use-xvid=no --use-ogg=no --use-vorbis=no --use-theora=no --use-openjpeg=no --disable-streaming --disable-isoff-frag --disable-isoff-hint --disable-isoff-write --disable-loader-xmt --disable-loader-bt --disable-loader-isoff --disable-scene-encode --disable-mcrypt --disable-od-dump --disable-scene-dump --disable-scene-stats --disable-swf --disable-export --disable-import --disable-m2ps --disable-ogg -disable-avi --disable-qtvr --disable-seng --disable-smgr --disable-x3d --disable-3d --disable-ssl --disable-jack --disable-pulse --use-a52=no --disable-odf --disable-isoff --disable-m2ts-mux --disable-dvbx --disable-saf --disable-vobsub --disable-ttxt --disable-od-parse" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="" DOTRAVIS=""
+      env: GPAC_CONFIGURE_OPTIONS="--enable-debug --use-js=no --use-mad=no --use-xvid=no --use-ogg=no --use-vorbis=no --use-theora=no --use-openjpeg=no --disable-streaming --disable-isoff-frag --disable-isoff-hint --disable-isoff-write --disable-loader-xmt --disable-loader-bt --disable-loader-isoff --disable-scene-encode --disable-mcrypt --disable-od-dump --disable-scene-dump --disable-scene-stats --disable-swf --disable-export --disable-import --disable-m2ps --disable-ogg -disable-avi --disable-qtvr --disable-seng --disable-smgr --disable-x3d --disable-3d --disable-ssl --disable-jack --disable-pulse --use-a52=no --disable-odf --disable-isoff --disable-m2ts-mux --disable-dvbx --disable-saf --disable-vobsub --disable-ttxt --disable-od-parse --disable-atsc" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="" DOTRAVIS=""
     - os: osx
       env: GPAC_CONFIGURE_OPTIONS="--enable-mem-track" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="sudo make install" DOTRAVIS="" AUDIODEV=null
 script:

gpac-0.7.1.tar.gz/Changelog -> gpac-0.8.0.tar.gz/Changelog Changed

@@ -1,3 +1,34 @@
+26/04/2017: GPAC 0.7.1
+ - Full changelog at https://github.com/gpac/gpac/wiki/GPAC-0.7.0
+ - Many security fixes (static compile and fuzzing through [AFL](http://lcamtuf.coredump.cx/afl/), always ongoing)
+ - Colorized log.
+ - Fix pkg-config Private.libs.
+ - Changed default audio volume to 100% instead of 75%.
+ - Expose more experimental options through the [documentation](http://htmlpreview.github.io/?https://github.com/gpac/gpac/blob/master/doc/configuration.html).
+ - Improved GLES renderer on mobile platforms 
+ - YUV422 and YUV444 8 and 10 bit support in GLES renderer 
+ - Improvements on AVI dump.
+ - SAT>IP modified RTSP client.
+ - Added L-HEVC File Format support (SHVC/MV-HEVC tracks and HEVC Tile Tracks).
+ - Added MPEG IFF (image File Format) support.
+ - Range extension support for AVC and HEVC.
+ - SHVC and MV-HEVC importers and playback: moved to final spec version (SHM6+).
+ - Support of HLS with fragmented MP4 playback.
+ - APIs: gf_mpd_() functions and new segmenter API.
+ - Improved alternate groups.
+ - More support for PIFF PSEC and Smooth Streaming ( file format & playback).
+ - DASH client: pluggable algorithms + improvements with scalable contents.
+ - The counter source from the DASH sequences added to the public content.
+ - HLS and DASH playback minor fixes.
+ - Cleanup of DASH client logs.
+ - Added support for DASH SRD in 360 for independent videos videos (NxM partial spheres) [more](https://gpac.wp.imt.fr/2016/05/25/srd/)
+ - Added support for DASH SRD in 360 for HEV Ctiled videos (NxM tiles on one sphere) - [checkout tuto](https://gpac.wp.imt.fr/2017/02/01/hevc-tile-based-adaptation-guide/)
+ - Apple VideoToolBox hardware decoding support for OSX and iOS for AVC|H264.
+ - Android hardware decoding hardware acceleration for AVC|H264 (HEVC on its way).
+ - Android build is based on Android Studio.
+ - Android: new File Manager.
+ - Import of TTML via NHML according to MPEG-4 part 30 improved.
+
 19/02/2016: GPAC 0.6.0
   Many things added, improved and fixed - see https://github.com/gpac/gpac/releases/tag/v0.6.0

gpac-0.7.1.tar.gz/Makefile -> gpac-0.8.0.tar.gz/Makefile Changed

@@ -41,7 +41,7 @@
 
 instmoz:
 	$(MAKE) -C applications/osmozilla install
-	
+
 depend:
 	$(MAKE) -C src dep
 	$(MAKE) -C applications dep
@@ -60,6 +60,8 @@
 	@find . -type f -name '*.gcno*' -delete
 	@find . -type f -name '*.gcda*' -delete
 	@rm -f coverage.info 2> /dev/null
+	@rm -f bin/gcc/gm_*$(DYN_LIB_SUFFIX) 2> /dev/null
+	@rm -f bin/gcc/gf_*$(DYN_LIB_SUFFIX) 2> /dev/null
 
 docs:
 	@cd $(SRC_PATH)/doc && doxygen
@@ -73,7 +75,7 @@
 lcov_only:
 	@echo "Generating lcov info in coverage.info"
 	@rm -f ./gpac-conf-* > /dev/null
-	@lcov -q -capture --directory . --output-file all.info 
+	@lcov -q -capture --directory . --output-file all.info
 	@lcov --remove all.info /usr/* /usr/include/* /usr/local/include/* /usr/include/libkern/i386/* /usr/include/sys/_types/* /opt/* /opt/local/include/* /opt/local/include/mozjs185/* --output coverage.info
 	@rm all.info
 	@echo "Purging lcov info"
@@ -112,7 +114,7 @@
 ifneq ($(CONFIG_FFMPEG), no)
 ifneq ($(DISABLE_CORE_TOOLS), yes)
 ifneq ($(DISABLE_AV_PARSERS), yes)
-	if [ -f bin/gcc/DashCast$(EXE_SUFFIX)g ] ; then \
+	if [ -f bin/gcc/DashCast$(EXE_SUFFIX) ] ; then \
 	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/DashCast$(EXE_SUFFIX) "$(DESTDIR)$(prefix)/bin" ; \
 	fi
 endif
@@ -140,28 +142,33 @@
 endif
 	$(INSTALL) -d "$(DESTDIR)$(mandir)"
 	$(INSTALL) -d "$(DESTDIR)$(mandir)/man1"
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/ 
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/ 
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/
 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac"
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ 
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui"
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gui.bt "$(DESTDIR)$(prefix)/share/gpac/gui/" 
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gui.js "$(DESTDIR)$(prefix)/share/gpac/gui/" 
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gwlib.js "$(DESTDIR)$(prefix)/share/gpac/gui/" 
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gui.bt "$(DESTDIR)$(prefix)/share/gpac/gui/"
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gui.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gwlib.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/mpegu-core.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/webvtt-renderer.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui/icons"
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui/extensions"
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/shaders/"
+
+	$(INSTALL) -d "$(DESTDIR)$(prefix)/include"
+
 ifeq ($(CONFIG_DARWIN),yes)
-	cp $(SRC_PATH)/gui/icons/* "$(DESTDIR)$(prefix)/share/gpac/gui/icons/" 
-	cp -R $(SRC_PATH)/gui/extensions/* "$(DESTDIR)$(prefix)/share/gpac/gui/extensions/" 
-	cp $(SRC_PATH)/shaders/* "$(DESTDIR)$(prefix)/share/gpac/shaders/" 
+	cp $(SRC_PATH)/gui/icons/* "$(DESTDIR)$(prefix)/share/gpac/gui/icons/"
+	cp -R $(SRC_PATH)/gui/extensions/* "$(DESTDIR)$(prefix)/share/gpac/gui/extensions/"
+	cp $(SRC_PATH)/shaders/* "$(DESTDIR)$(prefix)/share/gpac/shaders/"
+	cp -R $(SRC_PATH)/include/* "$(DESTDIR)$(prefix)/include/"
 else
 	cp --no-preserve=mode,ownership,timestamp $(SRC_PATH)/gui/icons/* $(DESTDIR)$(prefix)/share/gpac/gui/icons/
 	cp -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/gui/extensions/* $(DESTDIR)$(prefix)/share/gpac/gui/extensions/
 	cp --no-preserve=mode,ownership,timestamp $(SRC_PATH)/shaders/* $(DESTDIR)$(prefix)/share/gpac/shaders/
+	cp -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/include/* $(DESTDIR)$(prefix)/include/
 endif
 
 lninstall:
@@ -187,8 +194,9 @@
 endif
 endif
 ifeq ($(CONFIG_DARWIN),yes)
-	ln -s $(BUILD_PATH)/bin/gcc/libgpac$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_MAJOR)
-	ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_MAJOR) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX)
+	ln -s $(BUILD_PATH)/bin/gcc/libgpac$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION_SONAME)$(DYN_LIB_SUFFIX)
+	ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION_SONAME)$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION_MAJOR)$(DYN_LIB_SUFFIX)
+	ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION_SONAME)$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX)
 else
 	ln -s $(BUILD_PATH)/bin/gcc/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME)
 	ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so.$(VERSION_MAJOR)
@@ -223,11 +231,12 @@
 	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(DESTDIR)$(prefix)/bin
 else
 ifeq ($(DEBUGBUILD),no)
-	$(STRIP) bin/gcc/libgpac$(DYN_LIB_SUFFIX)
+	$(STRIP) -S bin/gcc/libgpac$(DYN_LIB_SUFFIX)
 endif
 ifeq ($(CONFIG_DARWIN),yes)
-	$(INSTALL) -m 755 bin/gcc/libgpac$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION)$(DYN_LIB_SUFFIX)
-	ln -sf libgpac.$(VERSION)$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX)
+	$(INSTALL) -m 755 bin/gcc/libgpac$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION_SONAME)$(DYN_LIB_SUFFIX)
+	ln -sf libgpac.$(VERSION_SONAME)$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION_MAJOR)$(DYN_LIB_SUFFIX)
+	ln -sf libgpac.$(VERSION_SONAME)$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX)
 else
 	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME)
 	ln -sf libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so.$(VERSION_MAJOR)
@@ -253,6 +262,9 @@
 endif
 	mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
 	$(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)"
+	if [ -d $(DESTDIR)$(prefix)/$(libdir)/pkgconfig ] ; then \
+	$(INSTALL) $(INSTFLAGS) -m 644 gpac.pc "$(DESTDIR)$(prefix)/$(libdir)/pkgconfig" ; \
+	fi
 	$(MAKE) installdylib
 
 uninstall-lib:
@@ -275,11 +287,6 @@
 
 ifeq ($(CONFIG_LINUX),yes)
 deb:
-	@if [ ! -z "$(shell git diff FETCH_HEAD)" ]; then \
-		echo "Local revision and remote revision are not congruent; you may have local commit."; \
-		echo "Please consider pushing your commit before generating an installer"; \
-		exit 1; \
-	fi
 	git checkout --	debian/changelog
 	fakeroot debian/rules clean
 	sed -i "s/-DEV/-DEV-rev$(VERSION)-$(BRANCH)/" debian/changelog
@@ -298,10 +305,10 @@
 	@echo "modules: builds modules only"
 	@echo "instmoz: build and local install of osmozilla"
 	@echo "sggen: builds scene graph generators"
-	@echo 
+	@echo
 	@echo "clean: clean src repository"
 	@echo "distclean: clean src repository and host config file"
-	@echo 
+	@echo
 	@echo "install: install applications and modules on system"
 	@echo "uninstall: uninstall applications and modules"
 ifeq ($(CONFIG_DARWIN),yes)
@@ -310,7 +317,7 @@
 ifeq ($(CONFIG_LINUX),yes)
 @echo "deb: creates DEB package file for debian based systems"
 endif
-	@echo 
+	@echo
 	@echo "install-lib: install gpac library (dyn and static) and headers <gpac/*.h>, <gpac/modules/*.h> and <gpac/internal/*.h>"
 	@echo "uninstall-lib: uninstall gpac library (dyn and static) and headers"
 	@echo

gpac-0.7.1.tar.gz/README.md -> gpac-0.8.0.tar.gz/README.md Changed

@@ -1,14 +1,36 @@
-[![Build Status](https://travis-ci.org/gpac/gpac.svg?branch=master)](https://travis-ci.org/gpac/gpac)
-[![codecov.io](https://codecov.io/github/gpac/gpac/coverage.svg?branch=master)](https://codecov.io/github/gpac/gpac?branch=master)
+[![Build Status](https://tests.gpac.io/testres/badge/build/ubuntu64)](https://buildbot.gpac.io/#/grid?branch=master)
+[![Tests](https://tests.gpac.io/testres/badge/tests/linux64)](https://tests.gpac.io/)
 
-README for GPAC version 0.7.1
+[![Build Status](https://tests.gpac.io/testres/badge/build/ubuntu32)](https://buildbot.gpac.io/#/grid?branch=master)
+[![Tests](https://tests.gpac.io/testres/badge/tests/linux32)](https://tests.gpac.io/)
+
+[![Build Status](https://tests.gpac.io/testres/badge/build/windows64)](https://buildbot.gpac.io/#/grid?branch=master)
+[![Tests](https://tests.gpac.io/testres/badge/tests/win64)](https://tests.gpac.io/)
+
+[![Build Status](https://tests.gpac.io/testres/badge/build/windows32)](https://buildbot.gpac.io/#/grid?branch=master)
+[![Tests](https://tests.gpac.io/testres/badge/tests/win32)](https://tests.gpac.io/)
+
+[![Build Status](https://tests.gpac.io/testres/badge/build/macos)](https://buildbot.gpac.io/#/grid?branch=master)
+[![Tests](https://tests.gpac.io/testres/badge/tests/macos)](https://tests.gpac.io/)
+
+[![Build Status](https://tests.gpac.io/testres/badge/build/ios)](https://buildbot.gpac.io/#/grid?branch=master)
+
+[![Build Status](https://tests.gpac.io/testres/badge/build/android)](https://buildbot.gpac.io/#/grid?branch=master)
+
+[![Coverage](https://tests.gpac.io/testres/badge/cov/linux64)](https://tests.gpac.io/)
+
+![License](https://img.shields.io/badge/license-LGPL-blue.svg)
+
+README for GPAC version 0.8.0
 
 GPAC is a multimedia framework oriented towards rich media and distributed under the LGPL license (see COPYING).
-GPAC supports many multimedia formats, from simple audiovisual containers (avi, mov, mpg) to complex 
-presentation formats (MPEG-4 Systems, SVG Tiny 1.2, VRML/X3D). GPAC supports scripting of presentation for MPEG4/VRML/X3D through
-mozilla SpiderMonkey javascript engine.
+
+GPAC supports many multimedia formats, from simple audiovisual containers (avi, mov, mpg) to complex
+presentation formats (MPEG-4 Systems, SVG Tiny 1.2, VRML/X3D) and 360 videos. GPAC supports presentation scripting for MPEG4/VRML/X3D through mozilla SpiderMonkey javascript engine.
+
 GPAC currently supports local playback, http progressive download, Adaptive HTTP Streaming (MPEG-DASH, HLS), RTP/RTSP streaming over UDP (unicast or multicast) or TCP and TS demuxing (from file, IP or DVB4Linux).
-GPAC also features MP4Box, a multimedia swiss-army knife for the prompt.
+
+GPAC also features MP4Box, a multimedia swiss-army knife for the prompt, and MP42TS, a fast TS multiplexer from MP4 and RTP sources.
 
 For compilation and installation instruction, check INSTALLME file
 
@@ -16,6 +38,3 @@
 
 For more information, visit the GPAC website:
 	http://gpac.io
-
-		
-

gpac-0.7.1.tar.gz/applications/dashcast/Makefile -> gpac-0.8.0.tar.gz/applications/dashcast/Makefile Changed

@@ -2,7 +2,7 @@
 
 vpath %.c $(SRC_PATH)/applications/dashcast
 
-CFLAGS= $(OPTFLAGS) -D_GNU_SOURCE -I"$(SRC_PATH)/include" -I../../ $(ffmpeg_cflags)
+CFLAGS= $(OPTFLAGS) -D_GNU_SOURCE -Wno-deprecated-declarations -I"$(SRC_PATH)/include" -I../../ $(ffmpeg_cflags)
 
 LINKFLAGS=$(GPAC_SH_FLAGS)
 
@@ -48,24 +48,24 @@
 
 LINKFLAGS+= $(ffmpeg_lflags_dashcast)
 
-ifneq ($(CONFIG_LIBAVRESAMPLE),no)
+ifneq ($(CONFIG_LIBSWRESAMPLE),no)
 CFLAGS+=-DDC_AUDIO_RESAMPLER
-LINKFLAGS+=-lavresample
+LINKFLAGS+=-lswresample
 endif
 
 ifeq ($(CONFIG_DARWIN), yes)
 #fixme - use proper detection of libavdevice dependencies
-#LINKFLAGS+=-lavfilter -lswresample -lbz2 
+#LINKFLAGS+=-lavfilter -lswresample -lbz2
 endif
 
-SRCS := $(OBJS:.o=.c) 
+SRCS := $(OBJS:.o=.c)
 
 all: $(PROG)
 
 DashCast$(EXE): $(OBJS)
 	$(CC) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc $(LDFLAGS) $(LINKFLAGS)
 
-clean: 
+clean:
 	rm -f $(OBJS) ../../bin/gcc/$(PROG)
 
 install: clean
@@ -77,7 +77,7 @@
 dep: depend
 
 depend:
-	rm -f .depend	
+	rm -f .depend
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 distclean: clean

gpac-0.7.1.tar.gz/applications/dashcast/audio_data.h -> gpac-0.8.0.tar.gz/applications/dashcast/audio_data.h Changed

gpac-0.7.1.tar.gz/applications/dashcast/audio_decoder.c -> gpac-0.8.0.tar.gz/applications/dashcast/audio_decoder.c Changed

@@ -150,21 +150,21 @@
 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 = avresample_alloc_context();
+		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_int(audio_input_file->aresampler, "in_channel_layout", channel_layout, 0);
-		av_opt_set_int(audio_input_file->aresampler, "out_channel_layout", DC_AUDIO_CHANNEL_LAYOUT, 0);
-		av_opt_set_int(audio_input_file->aresampler, "in_sample_fmt", sample_format, 0);
-		av_opt_set_int(audio_input_file->aresampler, "out_sample_fmt", DC_AUDIO_SAMPLE_FORMAT, 0);
+		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 (avresample_open(audio_input_file->aresampler)) {
+		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;
 		}
@@ -183,7 +183,7 @@
 		(*output) [i] = (uint8_t*)av_malloc(DC_AUDIO_MAX_CHUNCK_SIZE); //FIXME: fix using size below av_samples_get_buffer_size()
 	}
 
-	i = avresample_convert(audio_input_file->aresampler, *output, DC_AUDIO_MAX_CHUNCK_SIZE, audio_input_data->aframe->nb_samples, audio_input_data->aframe->extended_data, audio_input_data->aframe->linesize[0], audio_input_data->aframe->nb_samples);
+	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;
@@ -441,6 +441,6 @@
 	av_fifo_free(audio_input_file->fifo);
 
 #ifdef DC_AUDIO_RESAMPLER
-	avresample_free(&audio_input_file->aresampler);
+	swr_free(&audio_input_file->aresampler);
 #endif
 }

gpac-0.7.1.tar.gz/applications/dashcast/audio_decoder.h -> gpac-0.8.0.tar.gz/applications/dashcast/audio_decoder.h Changed

gpac-0.7.1.tar.gz/applications/dashcast/audio_encoder.c -> gpac-0.8.0.tar.gz/applications/dashcast/audio_encoder.c Changed

@@ -179,21 +179,21 @@
 static int ensure_resampler(AudioOutputFile *audio_output_file, AVCodecContext *audio_codec_ctx)
 {
 	if (!audio_output_file->aresampler) {
-		audio_output_file->aresampler = avresample_alloc_context();
+		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_int(audio_output_file->aresampler, "in_channel_layout", DC_AUDIO_CHANNEL_LAYOUT, 0);
-		av_opt_set_int(audio_output_file->aresampler, "out_channel_layout", audio_codec_ctx->channel_layout, 0);
-		av_opt_set_int(audio_output_file->aresampler, "in_sample_fmt", DC_AUDIO_SAMPLE_FORMAT, 0);
-		av_opt_set_int(audio_output_file->aresampler, "out_sample_fmt", audio_codec_ctx->sample_fmt, 0);
+		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 (avresample_open(audio_output_file->aresampler)) {
+		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;
 		}
@@ -214,7 +214,7 @@
 		output[i] = (uint8_t*)av_malloc(linesize);
 	}
 
-	if (avresample_convert(audio_output_file->aresampler, output, linesize, audio_output_file->aframe->nb_samples, audio_output_file->aframe->extended_data, audio_output_file->aframe->linesize[0], audio_output_file->aframe->nb_samples) < 0) {
+	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;
 	}
@@ -350,6 +350,6 @@
 	av_free(audio_output_file->codec_ctx);
 
 #ifdef DC_AUDIO_RESAMPLER
-	avresample_free(&audio_output_file->aresampler);
+	swr_free(&audio_output_file->aresampler);
 #endif
 }

gpac-0.7.1.tar.gz/applications/dashcast/audio_muxer.c -> gpac-0.8.0.tar.gz/applications/dashcast/audio_muxer.c Changed

@@ -122,7 +122,7 @@
 
 	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);
+	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;
@@ -138,7 +138,7 @@
 
 	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);
+	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;
@@ -193,13 +193,14 @@
 
 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, 1, audio_output_file->seg_marker, NULL, NULL);
+	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 closed at "LLU"\n", gf_net_get_utc() ));
+	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;
 
@@ -291,9 +292,8 @@
 	}
 	av_dict_free(&opts);
 
-	avformat_write_header(audio_output_file->av_fmt_ctx, NULL);
+	return avformat_write_header(audio_output_file->av_fmt_ctx, NULL);
 
-	return 0;
 }
 
 int dc_ffmpeg_audio_muxer_write(AudioOutputFile *audio_output_file)
@@ -418,7 +418,7 @@
 	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);
 			}

gpac-0.7.1.tar.gz/applications/dashcast/audio_muxer.h -> gpac-0.8.0.tar.gz/applications/dashcast/audio_muxer.h Changed

gpac-0.7.1.tar.gz/applications/dashcast/controler.c -> gpac-0.8.0.tar.gz/applications/dashcast/controler.c Changed

gpac-0.7.1.tar.gz/applications/dashcast/video_data.h -> gpac-0.8.0.tar.gz/applications/dashcast/video_data.h Changed

gpac-0.7.1.tar.gz/applications/dashcast/video_decoder.c -> gpac-0.8.0.tar.gz/applications/dashcast/video_decoder.c Changed

gpac-0.7.1.tar.gz/applications/dashcast/video_encoder.c -> gpac-0.8.0.tar.gz/applications/dashcast/video_encoder.c Changed

@@ -143,8 +143,10 @@
 		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 |= CODEC_FLAG_GLOBAL_HEADER;
+	video_output_file->codec_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+#endif
 
 	video_output_file->vstream_idx = 0;//video_stream->index;
 
@@ -229,6 +231,8 @@
 			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 ));
 		}
 	}
 
@@ -242,8 +246,6 @@
 		return -1;
 	}
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DashCast] Video %s Frame TS "LLU" encoded at UTC "LLU" ms in "LLU" us\n", video_output_file->rep_id, /*video_data_node->source_number, */video_data_node->vframe->pts, gf_net_get_utc(), time_spent ));
-
 	/* if zero size, it means the image was buffered */
 //	if (out_size > 0) {
 //		av_init_packet(&pkt);

gpac-0.7.1.tar.gz/applications/dashcast/video_muxer.c -> gpac-0.8.0.tar.gz/applications/dashcast/video_muxer.c Changed

@@ -478,7 +478,7 @@
 	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);
+	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;
@@ -575,13 +575,13 @@
 
 int dc_gpac_video_isom_close_seg(VideoOutputFile *video_output_file)
 {
-	GF_Err ret;
-	ret = gf_isom_close_segment(video_output_file->isof, 0, 0, 0, 0, 0, 0, 1, video_output_file->seg_marker, NULL, NULL);
+	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 at UTC "LLU" ms\n", video_output_file->rep_id, gf_net_get_utc() ));
+	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;
 }
@@ -623,6 +623,7 @@
 {
 	AVStream *video_stream;
 	AVOutputFormat *output_fmt;
+	int ret;
 
 	AVCodecContext *video_codec_ctx = video_output_file->codec_ctx;
 	video_output_file->av_fmt_ctx = NULL;
@@ -687,7 +688,12 @@
 		return -1;
 	}
 
-	avformat_write_header(video_output_file->av_fmt_ctx, NULL);
+	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;
@@ -846,7 +852,7 @@
 				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);

gpac-0.7.1.tar.gz/applications/mp42ts/main.c -> gpac-0.8.0.tar.gz/applications/mp42ts/main.c Changed

@@ -55,6 +55,11 @@
 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;
 
 static void on_gpac_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
@@ -67,7 +72,7 @@
 static GFINLINE void usage()
 {
 	fprintf(stderr, "GPAC version " GPAC_FULL_VERSION "\n"
-	 "GPAC Copyright (c) Telecom ParisTech 2000-2014\n"
+	 "(c) Telecom ParisTech 2000-2018 - Licence LGPL v2\n"
 	 "GPAC Configuration: " GPAC_CONFIGURATION "\n"
 	 "Features: %s\n\n", gpac_features());
 	fprintf(stderr, "mp42ts <inputs> <destinations> [options]\n"
@@ -82,6 +87,8 @@
 	 " 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 stes version number of the PMT\n"
 
 	 "\n"
 	 "-prog filename same as -src filename\n"
@@ -181,6 +188,8 @@
 	char provider_name[20];
 	u32 ID;
 	Bool is_not_program_declaration;
+	Bool set_disc;
+	u32 pmt_version;
 
 	Double last_ntp;
 } M2TSSource;
@@ -251,13 +260,13 @@
 {
 	u32 res;
 	u32 len;
-	u32 last_time;
+	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 {
+	} 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)) ) {
@@ -273,7 +282,7 @@
 		gf_bs_write_int(bs,	0xFF, 5); //reserved
 		gf_bs_write_int(bs,	timeline_id, 7); //timeline_id
 
-		if (strlen(temi_url)) {
+		if (temi_url) {
 			char *url = (char *)temi_url;
 			if (!strnicmp(temi_url, "http://", 7)) {
 				gf_bs_write_int(bs,	1, 8); //url_scheme
@@ -359,8 +368,10 @@
 		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;
 			}
@@ -376,8 +387,43 @@
 				ntp <<= 32;
 				ntp |= frac;
 			}
-			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;
+			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) {
@@ -445,7 +491,7 @@
 
 		if (!priv->source->real_time && !priv->is_repeat) {
 			priv->source->samples_done++;
-			gf_set_progress("Converting to MPEG-2 TS", priv->source->samples_done, priv->source->samples_count);
+			gf_set_progress("MPEG-2 TS Muxing", priv->source->samples_done, priv->source->samples_count);
 		}
 
 		if (priv->sample_number==priv->sample_count) {
@@ -2144,6 +2190,14 @@
 			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;
 		}
@@ -2226,6 +2280,10 @@
 						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) {
@@ -2588,7 +2646,7 @@
 			}
 			fprintf(stderr, "Setting up program ID %d - send rates: PSI %d ms PCR %d ms - PCR offset %d\n", sources[i].ID, psi_refresh_rate, pcr_ms, prog_pcr_offset);
 
-			program = gf_m2ts_mux_program_add(muxer, sources[i].ID, cur_pid, psi_refresh_rate, prog_pcr_offset, sources[i].mpeg4_signaling);
+			program = gf_m2ts_mux_program_add(muxer, sources[i].ID, cur_pid, psi_refresh_rate, prog_pcr_offset, sources[i].mpeg4_signaling, sources[i].pmt_version, sources[i].set_disc);
 			if (sources[i].mpeg4_signaling) program->iod = sources[i].iod;
 			if (sources[i].od_updates) {
 				program->loop_descriptors = sources[i].od_updates;
@@ -2673,7 +2731,7 @@
 		nb_pck_in_pack=0;
 		while ((ts_pck = gf_m2ts_mux_process(muxer, &status, &usec_till_next)) != NULL) {
 
-			if (ts_pack_buffer ) {
+			if (ts_pack_buffer) {
 				memcpy(ts_pack_buffer + 188 * nb_pck_in_pack, ts_pck, 188);
 				nb_pck_in_pack++;
 
@@ -2780,6 +2838,7 @@
 				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) {

gpac-0.7.1.tar.gz/applications/mp4box/filedump.c -> gpac-0.8.0.tar.gz/applications/mp4box/filedump.c Changed

@@ -802,12 +802,14 @@
 #endif
 
 
-void dump_isom_timestamps(GF_ISOFile *file, char *inName, Bool is_final_name)
+void dump_isom_timestamps(GF_ISOFile *file, char *inName, Bool is_final_name, u32 dump_mode)
 {
 	u32 i, j, k, count;
-	Bool has_error;
+	Bool has_error, is_fragmented=0;
 	FILE *dump;
 	char szBuf[1024];
+	Bool skip_offset = ((dump_mode==2) || (dump_mode==4)) ? GF_TRUE : GF_FALSE;
+	Bool check_ts = ((dump_mode==3) || (dump_mode==4)) ? GF_TRUE : GF_FALSE;
 
 	if (inName) {
 		strcpy(szBuf, inName);
@@ -820,14 +822,22 @@
 	} else {
 		dump = stdout;
 	}
+	if (gf_isom_is_fragmented(file))
+		is_fragmented = 1;
 
 	has_error = 0;
 	for (i=0; i<gf_isom_get_track_count(file); i++) {
 		s64 cts_dts_shift = gf_isom_get_cts_to_dts_shift(file, i+1);
 		u32 has_cts_offset = gf_isom_has_time_offset(file, i+1);
 
-		fprintf(dump, "#dumping track ID %d timing:\n", gf_isom_get_track_id(file, i + 1)); 
-		fprintf(dump, "Num\tDTS\tCTS\tSize\tRAP\tOffset\tisLeading\tDependsOn\tDependedOn\tRedundant\tRAP-SampleGroup\tRoll-SampleGroup\tRoll-Distance\n");
+		fprintf(dump, "#dumping track ID %d timing:\n", gf_isom_get_track_id(file, i + 1));
+		fprintf(dump, "Num\tDTS\tCTS\tSize\tRAP%s\tisLeading\tDependsOn\tDependedOn\tRedundant\tRAP-SampleGroup\tRoll-SampleGroup\tRoll-Distance", skip_offset ? "" : "\tOffset");
+		if (is_fragmented) {
+			fprintf(dump, "\tfrag_start");
+		}
+		fprintf(dump, "\n");
+
+
 		count = gf_isom_get_sample_count(file, i+1);
 
 		for (j=0; j<count; j++) {
@@ -845,7 +855,13 @@
 			gf_isom_get_sample_rap_roll_info(file, i+1, j+1, &is_rap, &has_roll, &roll_distance);
 			dts = samp->DTS;
 			cts = dts + (s32) samp->CTS_Offset;
-			fprintf(dump, "Sample %d\tDTS "LLD"\tCTS "LLD"\t%d\t%d\t"LLD"\t%d\t%d\t%d\t%d\t%d\t%d\t%d", j+1, LLD_CAST dts, LLD_CAST cts, samp->dataLength, samp->IsRAP, offset, isLeading, dependsOn, dependedOn, redundant, is_rap, has_roll, roll_distance);
+			fprintf(dump, "Sample %d\tDTS "LLD"\tCTS "LLD"\t%d\t%d", j+1, LLD_CAST dts, LLD_CAST cts, samp->dataLength, samp->IsRAP);
+
+			if (!skip_offset)
+				fprintf(dump, "\t"LLD, offset);
+
+			fprintf(dump, "\t%d\t%d\t%d\t%d\t%d\t%d\t%d", isLeading, dependsOn, dependedOn, redundant, is_rap, has_roll, roll_distance);
+
 			if (cts<dts) {
 				if (has_cts_offset==2) {
 					if (cts_dts_shift && (cts+cts_dts_shift<dts)) {
@@ -862,7 +878,7 @@
 
 			gf_isom_sample_del(&samp);
 
-			if (has_cts_offset) {
+			if (has_cts_offset && check_ts) {
 				for (k=0; k<count; k++) {
 					u64 adts, acts;
 					if (k==j) continue;
@@ -883,11 +899,14 @@
 				}
 			}
 
+			if (is_fragmented) {
+				fprintf(dump, "\t%d", gf_isom_sample_was_traf_start(file, i+1, j+1) );
+			}
 			fprintf(dump, "\n");
-			gf_set_progress("Analysing Track Timing", j+1, count);
+			gf_set_progress("Dumping track timing", j+1, count);
 		}
 		fprintf(dump, "\n\n");
-		gf_set_progress("Analysing Track Timing", count, count);
+		gf_set_progress("Dumping track timing", count, count);
 	}
 	if (inName) gf_fclose(dump);
 	if (has_error) fprintf(stderr, "\tFile has CTTS table errors\n");
@@ -912,52 +931,70 @@
 
 static void dump_sei(FILE *dump, u8 *ptr, u32 ptr_size, Bool is_hevc)
 {
-	u32 sei_idx=0;
-	u32 i=2;
+	u32 sei_idx = 0;
+	u32 i = is_hevc ? 2 : 1;
+	u8 *sei_no_epb = NULL;
+	u32 sei_no_epb_size = 0;
 	fprintf(dump, " SEI=\"");
-	while (i+1 < ptr_size) {
+
+
+	/*PPS still contains emulation bytes*/
+	sei_no_epb = gf_malloc(ptr_size + 1/*for SEI null string termination*/);
+	sei_no_epb_size = gf_media_nalu_remove_emulation_bytes((const char *) ptr, (char *) sei_no_epb, ptr_size);
+
+
+	while (i+2 < sei_no_epb_size) {
 		u32 sei_type = 0;
 		u32 sei_size = 0;
-		while (ptr[i] == 0xFF) {
+		while (sei_no_epb[i] == 0xFF) {
 			sei_type+= 255;
 			i++;
 		}
-		sei_type += ptr[i];
+		sei_type += sei_no_epb[i];
 		i++;
-		while (ptr[i] == 0xFF) {
+		while (sei_no_epb[i] == 0xFF) {
 			sei_size += 255;
 			i++;
 		}
-		sei_size += ptr[i];
+		sei_size += sei_no_epb[i];
 		i++;
 		i+=sei_size;
 
 		if (sei_idx) fprintf(dump, ",");
 		fprintf(dump, "(type=%u, size=%u)", sei_type, sei_size);
 		sei_idx++;
-		if (ptr[i]== 0x80) {
-			i=ptr_size;
+		if (sei_no_epb[i]== 0x80) {
+			i=sei_no_epb_size;
 			break;
 		}
 	}
-	if (i!=ptr_size) fprintf(dump, "(garbage at end)");
+	if (i != sei_no_epb_size) {
+		fprintf(dump, "(garbage at end)");
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("dump_sei(): garbage at end for index=%u (size of SEI(s)=%u)"));
+	}
 	fprintf(dump, "\"");
+	gf_free(sei_no_epb);
 }
 
-static void dump_nalu(FILE *dump, char *ptr, u32 ptr_size, Bool is_svc, HEVCState *hevc, AVCState *avc, u32 nalh_size)
+static void dump_nalu(FILE *dump, char *ptr, u32 ptr_size, Bool is_svc, HEVCState *hevc, AVCState *avc, u32 nalh_size, Bool dump_crc)
 {
 	s32 res;
-	u8 type;
+	u8 type, nal_ref_idc, hdr;
 	u8 dependency_id, quality_id, temporal_id;
 	u8 track_ref_index;
 	s8 sample_offset;
-	u32 data_offset, idx, data_size;
+	u32 data_offset, data_size;
+	s32 idx;
 	GF_BitStream *bs;
 
+
 	if (!ptr_size) {
 		fprintf(dump, "error=\"invalid nal size 0\"");
 		return;
 	}
+
+	if (dump_crc) fprintf(dump, "crc=\"%u\" ", gf_crc_32(ptr, ptr_size) );
+
 	if (hevc) {
 #ifndef GPAC_DISABLE_HEVC
 		res = gf_media_hevc_parse_nalu(ptr, ptr_size, hevc, &type, &temporal_id, &quality_id);
@@ -1048,12 +1085,40 @@
 			fputs("HEVCAggregator", dump);
 			break;
 		case 49:
-			fputs("HEVCExtractor", dump);
-			track_ref_index = (u8) ptr[3];
-			sample_offset = (s8) ptr[4];
-			data_offset = read_nal_size_hdr(&ptr[5], nalh_size);
-			data_size = read_nal_size_hdr(&ptr[5+nalh_size], nalh_size);
-			fprintf(dump, "\" track_ref_index=\"%d\" sample_offset=\"%d\" data_offset=\"%d\" data_size=\"%d", track_ref_index, sample_offset, data_offset, data_size);
+		{
+			u32 remain = ptr_size-2;
+			char *s = ptr+2;
+
+			fputs("HEVCExtractor ", dump);
+			while (remain) {
+				u32 mode = s[0];
+				remain -= 1;
+				s += 1;
+				if (mode) {
+					u32 len = s[0];
+					if (len+1>remain) {
+						fprintf(dump, "error=\"invalid inband data extractor size: %d vs %d remaining\"", len, remain);
+						return;
+					}
+					remain -= len+1;
+					s += len+1;
+					fprintf(dump, "\" inband_size=\"%d", len);
+				} else {
+					if (remain < 2 + 2*nalh_size) {
+						fprintf(dump, "error=\"invalid ref data extractor size: %d vs %d remaining\"", 2 + 2*nalh_size, remain);
+						return;
+					}
+					track_ref_index = (u8) s[0];
+					sample_offset = (s8) s[1];
+					data_offset = read_nal_size_hdr(&s[2], nalh_size);
+					data_size = read_nal_size_hdr(&s[2+nalh_size], nalh_size);
+					fprintf(dump, "\" track_ref_index=\"%d\" sample_offset=\"%d\" data_offset=\"%d\" data_size=\"%d", track_ref_index, sample_offset, data_offset, data_size);
+
+					remain -= 2 + 2*nalh_size;
+					s += 2 + 2*nalh_size;
+				}
+			}
+		}
 			break;
 		default:
 			fprintf(dump, "UNKNOWN (parsing return %d)", res);
@@ -1079,7 +1144,10 @@
 	}
 
 	bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
-	type = gf_bs_read_u8(bs) & 0x1F;
+	hdr = gf_bs_read_u8(bs);
+	type = hdr & 0x1F;
+	nal_ref_idc = hdr & 0x60;
+	nal_ref_idc>>=5;
 	fprintf(dump, "code=\"%d\" type=\"", type);
 	res = 0;
 	switch (type) {
@@ -1147,7 +1215,7 @@
 		assert (idx >= 0);
 		fprintf(dump, "\" pps_id=\"%d\" sps_id=\"%d", idx, avc->pps[idx].sps_id);
 		fprintf(dump, "\" entropy_coding_mode_flag=\"%d", avc->pps[idx].entropy_coding_mode_flag);
-		
+
 		break;
 	case GF_AVC_NALU_ACCESS_UNIT:
 		fputs("AccessUnit delimiter", dump);
@@ -1205,6 +1273,10 @@
 	}
 	fputs("\"", dump);
 
+	if (nal_ref_idc) {
+		fprintf(dump, " nal_ref_idc=\"%d\"", nal_ref_idc);
+	}
+
 	if (type==GF_AVC_NALU_SEI) {
 		dump_sei(dump, (u8 *) ptr, ptr_size, GF_FALSE);
 	}
@@ -1216,7 +1288,7 @@
 }
 #endif
 
-void dump_isom_nal_ex(GF_ISOFile *file, u32 trackID, FILE *dump)
+void dump_isom_nal_ex(GF_ISOFile *file, u32 trackID, FILE *dump, Bool dump_crc)
 {
 	u32 i, count, track, nalh_size, timescale, cur_extract_mode;
 	s32 countRef;
@@ -1255,9 +1327,9 @@
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 	//for tile tracks the hvcC is stored in the 'tbas' track
-	if (!hevccfg && gf_isom_get_reference_count(file, track, GF_4CC('t','b','a','s'))) {
+	if (!hevccfg && gf_isom_get_reference_count(file, track, GF_ISOM_REF_TBAS)) {
 		u32 tk = 0;
-		gf_isom_get_reference(file, track, GF_4CC('t','b','a','s'), 1, &tk);
+		gf_isom_get_reference(file, track, GF_ISOM_REF_TBAS, 1, &tk);
 		hevccfg = gf_isom_hevc_config_get(file, tk, 1);
 	}
 	fprintf(dump, " <NALUConfig>\n");
@@ -1268,12 +1340,12 @@
 		for (i=0; i<gf_list_count(arr); i++) {\
 			slc = gf_list_get(arr, i);\
 			fprintf(dump, " <NALU number=\"%d\" size=\"%d\" ", i+1, slc->size);\
-			dump_nalu(dump, slc->data, slc->size, svccfg ? 1 : 0, is_hevc ? &hevc : NULL, &avc, nalh_size);\
+			dump_nalu(dump, slc->data, slc->size, svccfg ? 1 : 0, is_hevc ? &hevc : NULL, &avc, nalh_size, dump_crc);\
 			fprintf(dump, "/>\n");\
 		}\
 		fprintf(dump, " </%sArray>\n", name);\
 	}\
- 
+
 	nalh_size = 0;
 
 	if (avccfg) {
@@ -1391,7 +1463,7 @@
 			} else {
 				fprintf(dump, " <NALU number=\"%d\" size=\"%d\" ", idx, nal_size);
 #ifndef GPAC_DISABLE_AV_PARSERS
-				dump_nalu(dump, ptr, nal_size, svccfg ? 1 : 0, is_hevc ? &hevc : NULL, &avc, nalh_size);
+				dump_nalu(dump, ptr, nal_size, svccfg ? 1 : 0, is_hevc ? &hevc : NULL, &avc, nalh_size, dump_crc);
 #endif
 				fprintf(dump, "/>\n");
 			}
@@ -1420,13 +1492,23 @@
 	gf_isom_set_nalu_extract_mode(file, track, cur_extract_mode);
 }
 
-void dump_isom_nal(GF_ISOFile *file, u32 trackID, char *inName, Bool is_final_name)
+void dump_isom_obu(GF_ISOFile *file, u32 trackID, FILE *dump, Bool dump_crc);
+
+void dump_isom_nal(GF_ISOFile *file, u32 trackID, char *inName, Bool is_final_name, Bool dump_crc)
 {
+	Bool is_av1 = GF_FALSE;
+
 	FILE *dump;
 	if (inName) {
 		char szBuf[GF_MAX_PATH];
 		strcpy(szBuf, inName);
-		if (!is_final_name) sprintf(szBuf, "%s_%d_nalu.xml", inName, trackID);
+		u32 track = gf_isom_get_track_by_id(file, trackID);
+
+		if (gf_isom_get_media_subtype(file, track, 1) == GF_ISOM_SUBTYPE_AV01) {
+			is_av1 = GF_TRUE;
+		}
+
+		if (!is_final_name) sprintf(szBuf, "%s_%d_%s.xml", inName, trackID, is_av1 ? "obu" : "nalu");
 		dump = gf_fopen(szBuf, "wt");
 		if (!dump) {
 			fprintf(stderr, "Failed to open %s for dumping\n", szBuf);
@@ -1435,11 +1517,245 @@
 	} else {
 		dump = stdout;
 	}
-	dump_isom_nal_ex(file, gf_isom_get_track_id(file, trackID), dump);
+
+	if (is_av1)
+		dump_isom_obu(file, trackID, dump, dump_crc);
+	else
+		dump_isom_nal_ex(file, trackID, dump, dump_crc);
 
 	if (inName) gf_fclose(dump);
 }
 
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+static void dump_obu(FILE *dump, u32 idx, AV1State *av1, char *obu, u32 obu_length, ObuType obu_type, u32 obu_size, u32 hdr_size, Bool dump_crc)
+{
+#define DUMP_OBU_INT(_v) fprintf(dump, #_v"=\"%d\" ", av1->_v);
+#define DUMP_OBU_INT2(_n, _v) fprintf(dump, _n"=\"%d\" ", _v);
+
+	fprintf(dump, " <OBU number=\"%d\" size=\"%d\" type=\"%s\" header_size=\"%d\" has_size_field=\"%d\" has_ext=\"%d\" temporalID=\"%d\" spatialID=\"%d\" ", idx, (u32) obu_size, av1_get_obu_name(obu_type), hdr_size, av1->obu_has_size_field, av1->obu_extension_flag, av1->temporal_id , av1->spatial_id);
+	if (dump_crc) fprintf(dump, "crc=\"%u\" ", gf_crc_32(obu, obu_length) );
+	switch (obu_type) {
+	case OBU_SEQUENCE_HEADER:
+		DUMP_OBU_INT(width)
+		DUMP_OBU_INT(height)
+		DUMP_OBU_INT(bit_depth)
+		DUMP_OBU_INT(still_picture)
+		DUMP_OBU_INT(OperatingPointIdc)
+		DUMP_OBU_INT(color_range)
+		DUMP_OBU_INT(color_description_present_flag)
+		DUMP_OBU_INT(color_primaries)
+		DUMP_OBU_INT(transfer_characteristics)
+		DUMP_OBU_INT(matrix_coefficients)
+		DUMP_OBU_INT2("profile", av1->config->seq_profile)
+		DUMP_OBU_INT2("level", av1->config->seq_level_idx_0)
+		break;
+	case OBU_FRAME_HEADER:
+	case OBU_FRAME:
+		if (av1->frame_id_numbers_present_flag) {
+			DUMP_OBU_INT2("delta_frame_id_length_minus_2", av1->delta_frame_id_length_minus_2)
+		}
+		if (av1->reduced_still_picture_header) {
+			DUMP_OBU_INT(reduced_still_picture_header)
+		}
+		DUMP_OBU_INT2("uncompressed_header_bytes", av1->frame_state.uncompressed_header_bytes);
+		if (av1->frame_state.uncompressed_header_bytes) {
+			if (av1->frame_state.frame_type==AV1_KEY_FRAME) fprintf(dump, "frame_type=\"key\" ");
+			else if (av1->frame_state.frame_type==AV1_INTER_FRAME) fprintf(dump, "frame_type=\"inter\" ");
+			else if (av1->frame_state.frame_type==AV1_INTRA_ONLY_FRAME) fprintf(dump, "frame_type=\"intra_only\" ");
+			else if (av1->frame_state.frame_type==AV1_SWITCH_FRAME) fprintf(dump, "frame_type=\"switch\" ");
+			fprintf(dump, "refresh_frame_flags=\"%d\" ", av1->frame_state.refresh_frame_flags);
+
+			DUMP_OBU_INT2("show_frame", av1->frame_state.show_frame);
+			if (av1->frame_state.show_existing_frame) {
+				DUMP_OBU_INT2("show_existing_frame", av1->frame_state.show_existing_frame);
+			} else {
+				DUMP_OBU_INT2("show_existing_frame", 0);
+			}
+		}
+		if (obu_type==OBU_FRAME_HEADER)
+			break;
+
+	case OBU_TILE_GROUP:
+		if (av1->frame_state.nb_tiles_in_obu) {
+			DUMP_OBU_INT2("nb_tiles", av1->frame_state.nb_tiles_in_obu)
+		} else {
+			fprintf(dump, "nb_tiles=\"unknown\" ");
+		}
+		break;
+	default:
+		break;
+
+	}
+	fprintf(dump, "/>\n");
+}
+#endif
+
+void dump_isom_obu(GF_ISOFile *file, u32 trackID, FILE *dump, Bool dump_crc)
+{
+#ifndef GPAC_DISABLE_AV_PARSERS
+	u32 i, count, track, timescale;
+	AV1State av1;
+	ObuType obu_type;
+	u64 obu_size;
+	u32 hdr_size;
+	GF_BitStream *bs;
+	u32 idx;
+
+	track = gf_isom_get_track_by_id(file, trackID);
+
+	memset(&av1, 0, sizeof(AV1State));
+	av1.config = gf_isom_av1_config_get(file, track, 1);
+	if (!av1.config) {
+		fprintf(stderr, "Error: Track #%d is not AV1!\n", trackID);
+		return;
+	}
+
+	count = gf_isom_get_sample_count(file, track);
+	timescale = gf_isom_get_media_timescale(file, track);
+
+	fprintf(dump, "<OBUTrack trackID=\"%d\" SampleCount=\"%d\" TimeScale=\"%d\">\n", trackID, count, timescale);
+
+	fprintf(dump, " <OBUConfig>\n");
+
+	idx = 1;
+	for (i=0; i<gf_list_count(av1.config->obu_array); i++) {
+		GF_AV1_OBUArrayEntry *obu = gf_list_get(av1.config->obu_array, i);
+		bs = gf_bs_new((const char *)obu->obu, (u32) obu->obu_length, GF_BITSTREAM_READ);
+		gf_media_aom_av1_parse_obu(bs, &obu_type, &obu_size, &hdr_size, &av1);
+		dump_obu(dump, idx, &av1, (char*)obu->obu, (u32)obu->obu_length, obu_type, (u32)obu_size, hdr_size, dump_crc);
+		gf_bs_del(bs);
+		idx++;
+	}
+	fprintf(dump, " </OBUConfig>\n");
+
+	fprintf(dump, " <OBUSamples>\n");
+
+	for (i=0; i<count; i++) {
+		u64 dts, cts;
+		u32 size;
+		char *ptr;
+		GF_ISOSample *samp = gf_isom_get_sample(file, track, i+1, NULL);
+		if (!samp) {
+			fprintf(dump, "\n", i+1);
+			continue;
+		}
+		dts = samp->DTS;
+		cts = dts + (s32) samp->CTS_Offset;
+
+		fprintf(dump, " <Sample number=\"%d\" DTS=\""LLD"\" CTS=\""LLD"\" size=\"%d\" RAP=\"%d\" >\n", i+1, dts, cts, samp->dataLength, samp->IsRAP);
+		if (cts<dts) fprintf(dump, "\n");
+
+		idx = 1;
+		ptr = samp->data;
+		size = samp->dataLength;
+
+		bs = gf_bs_new(ptr, size, GF_BITSTREAM_READ);
+		while (size) {
+			gf_media_aom_av1_parse_obu(bs, &obu_type, &obu_size, &hdr_size, &av1);
+
+			if (obu_size > size) {
+				fprintf(dump, " \n", idx, (u32) obu_size, size);
+				break;
+			}
+
+			dump_obu(dump, idx, &av1, ptr, (u32)obu_size, obu_type, (u32) obu_size, hdr_size, dump_crc);
+			ptr += obu_size;
+			size -= (u32)obu_size;
+			idx++;
+		}
+		gf_bs_del(bs);
+		fprintf(dump, " </Sample>\n");
+		gf_isom_sample_del(&samp);
+
+		fprintf(dump, "\n");
+		gf_set_progress("Analysing Track OBUs", i+1, count);
+	}
+	fprintf(dump, " </OBUSamples>\n");
+	fprintf(dump, "</OBUTrack>\n");
+
+	if (av1.config) gf_odf_av1_cfg_del(av1.config);
+#endif
+}
+
+void dump_isom_saps(GF_ISOFile *file, u32 trackID, u32 dump_saps_mode, char *inName, Bool is_final_name)
+{
+	FILE *dump;
+	u32 i, count;
+	s64 media_offset=0;
+	u32 track = gf_isom_get_track_by_id(file, trackID);
+	if (inName) {
+		char szBuf[GF_MAX_PATH];
+		strcpy(szBuf, inName);
+
+		if (!is_final_name) sprintf(szBuf, "%s_%d_cues.xml", inName, trackID);
+		dump = gf_fopen(szBuf, "wt");
+		if (!dump) {
+			fprintf(stderr, "Failed to open %s for dumping\n", szBuf);
+			return;
+		}
+	} else {
+		dump = stdout;
+	}
+
+	fprintf(dump, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+	fprintf(dump, "<DASHCues xmlns=\"urn:gpac:dash:schema:cues:2018\">\n");
+	fprintf(dump, "<Stream id=\"%d\" timescale=\"%d\"", trackID, gf_isom_get_media_timescale(file, track) );
+	if (dump_saps_mode==4) {
+		fprintf(dump, " mode=\"edit\"");
+		gf_isom_get_edit_list_type(file, track, &media_offset);
+	}
+	fprintf(dump, ">\n");
+
+	count = gf_isom_get_sample_count(file, track);
+	for (i=0; i<count; i++) {
+		s64 cts, dts;
+		u32 di;
+		Bool traf_start = 0;
+		u32 sap_type = 0;
+		u64 doffset;
+		GF_ISOSample *samp = gf_isom_get_sample_info(file, track, i+1, &di, &doffset);
+
+		traf_start = gf_isom_sample_was_traf_start(file, track, i+1);
+
+		sap_type = samp->IsRAP;
+		if (!sap_type) {
+			Bool is_rap, has_roll;
+			s32 roll_dist;
+			gf_isom_get_sample_rap_roll_info(file, track, i+1, &is_rap, &has_roll, &roll_dist);
+			if (has_roll) sap_type = SAP_TYPE_4;
+			else if (is_rap) sap_type = SAP_TYPE_3;
+		}
+
+		if (!sap_type) {
+			gf_isom_sample_del(&samp);
+			continue;
+		}
+
+		dts = cts = samp->DTS;
+		cts += samp->CTS_Offset;
+		fprintf(dump, "<Cue sap=\"%d\"", sap_type);
+		if (dump_saps_mode==4) {
+			cts += media_offset;
+			fprintf(dump, " cts=\""LLD"\"", cts);
+		} else {
+			if (!dump_saps_mode || (dump_saps_mode==1)) fprintf(dump, " sample=\"%d\"", i+1);
+			if (!dump_saps_mode || (dump_saps_mode==2)) fprintf(dump, " cts=\""LLD"\"", cts);
+			if (!dump_saps_mode || (dump_saps_mode==3)) fprintf(dump, " dts=\""LLD"\"", dts);
+		}
+
+		if (traf_start)
+			fprintf(dump, " wasFragStart=\"yes\"");
+
+		fprintf(dump, "/>\n");
+
+		gf_isom_sample_del(&samp);
+	}
+	fprintf(dump, "</Stream>\n");
+	fprintf(dump, "</DASHCues>\n");
+	if (inName) gf_fclose(dump);
+}
+
 #ifndef GPAC_DISABLE_ISOM_DUMP
 
 void dump_isom_ismacryp(GF_ISOFile *file, char *inName, Bool is_final_name)
@@ -1512,7 +1828,7 @@
 			sprintf(szBuf, "%s.%s", inName, ext) ;
 		else
 			sprintf(szBuf, "%s_%d_text.%s", inName, trackID, ext);
-		
+
 		dump = gf_fopen(szBuf, "wt");
 		if (!dump) {
 			fprintf(stderr, "Failed to open %s for dumping\n", szBuf);
@@ -1583,7 +1899,7 @@
 	Bool do_close=GF_FALSE;
 	char szBuf[1024];
 	if (!file) return GF_ISOM_INVALID_FILE;
-	
+
 	if (inName) {
 		strcpy(szBuf, inName);
 		if (!is_final_name) {
@@ -1605,8 +1921,6 @@
 	if (e) {
 		fprintf(stderr, "Error dumping ISO structure\n");
 	}
-	if ( gf_isom_get_track_count(file) == 0 )
-		do_track_dump = GF_FALSE;
 
 	if (do_track_dump) {
 		u32 i, j;
@@ -1614,6 +1928,7 @@
 		GF_ISOFile *the_file = gf_isom_open(gf_isom_get_filename(file), GF_ISOM_OPEN_READ, NULL);
 		u32 tcount = gf_isom_get_track_count(the_file);
 		fprintf(dump, "<Tracks>\n");
+#ifndef GPAC_DISABLE_MEDIA_EXPORT
 		for (i=0; i<tcount; i++) {
 			GF_MediaExporter dumper;
 			u32 trackID = gf_isom_get_track_id(the_file, i+1);
@@ -1645,7 +1960,7 @@
 				fmt_handled = GF_TRUE;
 			}
 			else if (gf_isom_get_avc_svc_type(the_file, i+1, 1) || gf_isom_get_hevc_lhvc_type(the_file, i+1, 1)) {
-				dump_isom_nal_ex(the_file, trackID, dump);
+				dump_isom_nal_ex(the_file, trackID, dump, GF_FALSE);
 				fmt_handled = GF_TRUE;
 			} else if ((mtype==GF_ISOM_MEDIA_TEXT) || (mtype==GF_ISOM_MEDIA_SUBT) ) {
 
@@ -1664,10 +1979,13 @@
 				gf_media_export_nhml(&dumper, GF_FALSE);
 			}
 		}
+#else
+		return GF_NOT_SUPPORTED;
+#endif /*GPAC_DISABLE_MEDIA_EXPORT*/
 		gf_isom_delete(the_file);
 		fprintf(dump, "</Tracks>\n");
+		fprintf(dump, "</ISOBaseMediaFileTrace>\n");
 	}
-	fprintf(dump, "</ISOBaseMediaFileTrace>\n");
 	if (do_close) gf_fclose(dump);
 	return e;
 }
@@ -1765,7 +2083,7 @@
 			strcpy(szName, inName);
 		else
 			sprintf(szName, "%s_%s.udta", inName, gf_4cc_to_str(dump_udta_type) );
-		
+
 		t = gf_fopen(szName, "wb");
 		if (!t) {
 			gf_free(data);
@@ -1850,8 +2168,9 @@
 		const char *it_name, *mime, *enc, *url, *urn;
 		Bool self_ref;
 		u32 ID;
-		gf_isom_get_meta_item_info(file, root_meta, tk_num, i+1, &ID, NULL, &self_ref, &it_name, &mime, &enc, &url, &urn);
-		fprintf(stderr, "Item #%d - ID %d", i+1, ID);
+		u32 it_type;
+		gf_isom_get_meta_item_info(file, root_meta, tk_num, i+1, &ID, &it_type, NULL, &self_ref, &it_name, &mime, &enc, &url, &urn);
+		fprintf(stderr, "Item #%d - ID %d - type %s ", i+1, ID, gf_4cc_to_str(it_type));
 		if (self_ref) fprintf(stderr, " - Self-Reference");
 		else if (it_name) fprintf(stderr, " - Name: %s", it_name);
 		if (mime) fprintf(stderr, " - MimeType: %s", mime);
@@ -1960,7 +2279,7 @@
 {
 	Float scale;
 	Bool is_od_track = 0;
-	u32 trackNum, i, j, max_rate, rate, ts, mtype, msub_type, timescale, sr, nb_ch, count, alt_group, nb_groups, nb_edits;
+	u32 trackNum, i, j, max_rate, rate, ts, mtype, msub_type, timescale, sr, nb_ch, count, alt_group, nb_groups, nb_edits, cdur, csize;
 	u64 time_slice, dur, size;
 	u8 bps;
 	GF_ESD *esd;
@@ -2023,7 +2342,7 @@
 
 	print_udta(file, trackNum);
 
-	if (mtype==GF_ISOM_MEDIA_VISUAL) {
+	if (gf_isom_is_video_subtype(mtype) ) {
 		s32 tx, ty;
 		u32 w, h;
 		gf_isom_get_track_layout_info(file, trackNum, &w, &h, &tx, &ty, NULL);
@@ -2052,8 +2371,9 @@
 	 || (msub_type==GF_ISOM_SUBTYPE_HVT1)
 	 ) {
 		esd = gf_isom_get_esd(file, trackNum, 1);
-		if (!esd) {
+		if (!esd || !esd->decoderConfig) {
 			fprintf(stderr, "WARNING: Broken MPEG-4 Track\n");
+			if (esd) gf_odf_desc_del((GF_Descriptor *)esd);
 		} else {
 			const char *st = gf_odf_stream_type_name(esd->decoderConfig->streamType);
 			if (st) {
@@ -2202,7 +2522,7 @@
 						Bool full_frame;
 						if (gf_isom_get_tile_info(file, trackNum, 1, &is_default, &id, &independent, &full_frame, &x, &y, &w, &h)) {
 							fprintf(stderr, "\tHEVC Tile - ID %d independent %d (x,y,w,h)=%d,%d,%d,%d \n", id, independent, x, y, w, h);
-						} else if (gf_isom_get_sample_group_info(file, trackNum, 1, GF_4CC('t','r','i','f'), &is_default, &data, &size)) {
+						} else if (gf_isom_get_sample_group_info(file, trackNum, 1, GF_ISOM_SAMPLE_GROUP_TRIF, &is_default, &data, &size)) {
 							fprintf(stderr, "\tHEVC Tile track containing a tile set\n");
 						} else {
 							fprintf(stderr, "\tHEVC Tile track without tiling info\n");
@@ -2210,8 +2530,8 @@
 					} else if (!hevccfg && !lhvccfg) {
 						fprintf(stderr, "\n\n\tNon-compliant HEVC track: No hvcC or shcC found in sample description\n");
 					}
-					
-					if (gf_isom_get_reference_count(file, trackNum, GF_4CC('s','a','b','t'))) {
+
+					if (gf_isom_get_reference_count(file, trackNum, GF_ISOM_REF_SABT)) {
 						fprintf(stderr, "\tHEVC Tile base track\n");
 					}
 					if (hevccfg) {
@@ -2472,11 +2792,36 @@
 			}
 
 		}
+	} else if (msub_type == GF_ISOM_SUBTYPE_AV01) {
+		GF_AV1Config *av1c;
+		u32 w, h, i, count;
+		gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
+		fprintf(stderr, "\tAOM AV1 stream - Resolution %d x %d\n", w, h);
+
+		av1c = gf_isom_av1_config_get(file, trackNum, 1);
+		fprintf(stderr, "\tversion=%u, profile=%u, level_idx0=%u, tier=%u\n", (u32)av1c->version, (u32)av1c->seq_profile, (u32)av1c->seq_level_idx_0, (u32)av1c->seq_tier_0);
+		fprintf(stderr, "\thigh_bitdepth=%u, twelve_bit=%u, monochrome=%u\n", (u32)av1c->high_bitdepth, (u32)av1c->twelve_bit, (u32)av1c->monochrome);
+		fprintf(stderr, "\tchroma: subsampling_x=%u, subsampling_y=%u, sample_position=%u\n", (u32)av1c->chroma_subsampling_x, (u32)av1c->chroma_subsampling_y, (u32)av1c->chroma_sample_position);
+
+		if (av1c->initial_presentation_delay_present)
+			fprintf(stderr, "\tInitial presentation delay %u\n", (u32) av1c->initial_presentation_delay_minus_one+1);
+
+		count = gf_list_count(av1c->obu_array);
+		for (i=0; i<count; i++) {
+			u8 hash[20];
+			u32 j;
+			GF_AV1_OBUArrayEntry *obu = gf_list_get(av1c->obu_array, i);
+			gf_sha1_csum((u8*)obu->obu, (u32)obu->obu_length, hash);
+			fprintf(stderr, "\tOBU#%d %s hash: ", i+1, av1_get_obu_name(obu->obu_type) );
+			for (j=0; j<20; j++) fprintf(stderr, "%02X", hash[j]);
+			fprintf(stderr, "\n");
+		}
+		gf_odf_av1_cfg_del(av1c);
 	} else if (msub_type == GF_ISOM_SUBTYPE_3GP_H263) {
 		u32 w, h;
 		gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
 		fprintf(stderr, "\t3GPP H263 stream - Resolution %d x %d\n", w, h);
-	} else if (msub_type == GF_4CC('m','j','p','2')) {
+	} else if (msub_type == GF_ISOM_SUBTYPE_MJP2) {
 		u32 w, h;
 		gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
 		fprintf(stderr, "\tMotionJPEG2000 stream - Resolution %d x %d\n", w, h);
@@ -2622,8 +2967,10 @@
 	} else {
 		GF_GenericSampleDescription *udesc = gf_isom_get_generic_sample_description(file, trackNum, 1);
 		if (udesc) {
-			if (mtype==GF_ISOM_MEDIA_VISUAL) {
-				fprintf(stderr, "Visual Track - Compressor \"%s\" - Resolution %d x %d\n", udesc->compressor_name, udesc->width, udesc->height);
+			if (gf_isom_is_video_subtype(mtype) ) {
+ fprintf(stderr, "%s Track - Compressor \"%s\" - Resolution %d x %d\n",
+ (mtype == GF_ISOM_MEDIA_VISUAL?"Visual":"Auxiliary Video"),
+ udesc->compressor_name, udesc->width, udesc->height);
 			} else if (mtype==GF_ISOM_MEDIA_AUDIO) {
 				fprintf(stderr, "Audio Track - Sample Rate %d - %d channel(s)\n", udesc->samplerate, udesc->nb_channels);
 			} else {
@@ -2643,9 +2990,11 @@
 	}
 
 	{
-		char szCodec[100];
-		gf_media_get_rfc_6381_codec_name(file, trackNum, szCodec, GF_FALSE, GF_FALSE);
-		fprintf(stderr, "\tRFC6381 Codec Parameters: %s\n", szCodec);
+		char szCodec[RFC6381_CODEC_NAME_SIZE_MAX];
+		GF_Err e = gf_media_get_rfc_6381_codec_name(file, trackNum, szCodec, GF_FALSE, GF_FALSE);
+		if (e == GF_OK) {
+			fprintf(stderr, "\tRFC6381 Codec Parameters: %s\n", szCodec);
+		}
 	}
 
 	DumpMetaItem(file, 0, trackNum, "Track Meta");
@@ -2701,28 +3050,40 @@
 	max_rate = rate = 0;
 	time_slice = 0;
 	ts = gf_isom_get_media_timescale(file, trackNum);
-	for (j=0; j<gf_isom_get_sample_count(file, trackNum); j++) {
-		GF_ISOSample *samp;
-		if (is_od_track) {
-			samp = gf_isom_get_sample(file, trackNum, j+1, NULL);
-		} else {
-			samp = gf_isom_get_sample_info(file, trackNum, j+1, NULL, NULL);
-		}
-		if (!samp) {
-			fprintf(stderr, "Failed to fetch sample %d\n", j+1);
-			return;
-		}
-		dur = samp->DTS+samp->CTS_Offset;
-		size += samp->dataLength;
-		rate += samp->dataLength;
-		if (samp->DTS - time_slice>ts) {
-			if (max_rate < rate) max_rate = rate;
-			rate = 0;
-			time_slice = samp->DTS;
+	csize = gf_isom_get_constant_sample_size(file, trackNum);
+	cdur = gf_isom_get_constant_sample_duration(file, trackNum);
+	count = gf_isom_get_sample_count(file, trackNum);
+	if (csize && cdur) {
+		size = count * csize;
+		dur = cdur * count;
+	} else {
+
+		for (j=0; j<count; j++) {
+			GF_ISOSample *samp;
+			if (is_od_track) {
+				samp = gf_isom_get_sample(file, trackNum, j+1, NULL);
+			} else {
+				samp = gf_isom_get_sample_info(file, trackNum, j+1, NULL, NULL);
+			}
+			if (!samp) {
+				fprintf(stderr, "Failed to fetch sample %d\n", j+1);
+				return;
+			}
+			dur = samp->DTS+samp->CTS_Offset;
+			size += samp->dataLength;
+			rate += samp->dataLength;
+			if (samp->DTS - time_slice>ts) {
+				if (max_rate < rate) max_rate = rate;
+				rate = 0;
+				time_slice = samp->DTS;
+			}
+			gf_isom_sample_del(&samp);
 		}
-		gf_isom_sample_del(&samp);
 	}
 	fprintf(stderr, "\nComputed info from media:\n");
+	if (csize && cdur) {
+		fprintf(stderr, "\tConstant sample size %d bytes and dur %d / %d\n", csize, cdur, ts);
+	}
 	scale = 1000;
 	scale /= ts;
 	dur = (u64) (scale * (s64)dur);
@@ -2733,7 +3094,12 @@
 	}
 	/*rate in byte, dur is in ms*/
 	rate = (u32) ((size * 8 * 1000) / dur);
-	max_rate *= 8;
+
+	if (!max_rate)
+		max_rate = rate;
+	else
+		max_rate *= 8;
+
 	if (rate >= 1500) {
 		rate /= 1000;
 		max_rate /= 1000;
@@ -2849,7 +3215,7 @@
 	if (gf_isom_get_brand_info(file, &brand, &min, &count) == GF_OK) {
 		fprintf(stderr, "\tFile Brand %s - version %d\n\t\tCompatible brands:", gf_4cc_to_str(brand), min);
 		for (i=0; i<count;i++) {
-			if (gf_isom_get_alternate_brand(file, i+1, &brand)==GF_OK) 
+			if (gf_isom_get_alternate_brand(file, i+1, &brand)==GF_OK)
 				fprintf(stderr, " %s", gf_4cc_to_str(brand) );
 		}
 		fprintf(stderr, "\n");
@@ -3184,6 +3550,10 @@
 	GF_M2TS_Demuxer *ts;
 	FILE *src;
 
+	if (!prog_num && !out_name) {
+		fprintf(stderr, "No program number nor output filename specified. No timestamp file will be generated.");
+	}
+
 	src = gf_fopen(mpeg2ts_file, "rb");
 	if (!src) {
 		fprintf(stderr, "Cannot open %s: no such file\n", mpeg2ts_file);
@@ -3265,5 +3635,271 @@
 	if (dumper.timestamps_info_file) gf_fclose(dumper.timestamps_info_file);
 }
 
-
 #endif /*GPAC_DISABLE_MPEG2TS*/
+
+
+#include <gpac/download.h>
+#include <gpac/internal/mpd.h>
+
+void get_file_callback(void *usr_cbk, GF_NETIO_Parameter *parameter)
+{
+	if (parameter->msg_type==GF_NETIO_DATA_EXCHANGE) {
+		u32 tot_size, bps, done;
+		u64 max;
+		gf_dm_sess_get_stats(parameter->sess, NULL, NULL, &tot_size, &done, &bps, NULL);
+		if (tot_size) {
+			max = done;
+			max *= 100;
+			max /= tot_size;
+			fprintf(stderr, "download %02d %% at %05d kpbs\r", (u32) max, bps*8/1000);
+		}
+	}
+}
+
+static GF_DownloadSession *get_file(const char *url, GF_DownloadManager *dm, GF_Err *e)
+{
+	GF_DownloadSession *sess;
+	sess = gf_dm_sess_new(dm, url, GF_NETIO_SESSION_NOT_THREADED, get_file_callback, NULL, e);
+	if (!sess) return NULL;
+	*e = gf_dm_sess_process(sess);
+	if (*e) {
+		gf_dm_sess_del(sess);
+		return NULL;
+	}
+	return sess;
+}
+
+static void revert_cache_file(char *item_path)
+{
+	char szPATH[GF_MAX_PATH];
+	const char *url;
+	char *sep;
+	GF_Config *cached;
+	if (!strstr(item_path, "gpac_cache_")) {
+		fprintf(stderr, "%s is not a gpac cache file\n", item_path);
+		return;
+	}
+	if (!strncmp(item_path, "./", 2) || !strncmp(item_path, ".\\", 2))
+			item_path += 2;
+
+ 	strcpy(szPATH, item_path);
+	strcat(szPATH, ".txt");
+
+	cached = gf_cfg_new(NULL, szPATH);
+	url = gf_cfg_get_key(cached, "cache", "url");
+	if (url) url = strstr(url, "://");
+	if (url) {
+		u32 i, len, dir_len=0, k=0;
+		char *dst_name;
+		sep = strstr(item_path, "gpac_cache_");
+		if (sep) {
+			sep[0] = 0;
+			dir_len = (u32) strlen(item_path);
+			sep[0] = 'g';
+		}
+		url+=3;
+		len = (u32) strlen(url);
+		dst_name = gf_malloc(len+dir_len+1);
+		memset(dst_name, 0, len+dir_len+1);
+
+		strncpy(dst_name, item_path, dir_len);
+		k=dir_len;
+		for (i=0; i<len; i++) {
+			dst_name[k] = url[i];
+			if (dst_name[k]==':') dst_name[k]='_';
+			else if (dst_name[k]=='/') {
+				if (!gf_dir_exists(dst_name))
+					gf_mkdir(dst_name);
+			}
+			k++;
+		}
+		if (gf_file_exists(item_path)) {
+			gf_move_file(item_path, dst_name);
+		}
+
+		gf_free(dst_name);
+	} else {
+		fprintf(stderr, "Failed to reverse %s cache file\n", item_path);
+	}
+	gf_cfg_del(cached);
+	gf_delete_file(szPATH);
+}
+
+GF_Err rip_mpd(const char *mpd_src)
+{
+	GF_DownloadSession *sess;
+	u32 i, connect_time, reply_time, download_time, req_hdr_size, rsp_hdr_size;
+	GF_Err e;
+	GF_DOMParser *mpd_parser;
+	GF_MPD *mpd;
+	GF_MPD_Period *period;
+	GF_MPD_AdaptationSet *as;
+	GF_MPD_Representation *rep;
+	char szName[GF_MAX_PATH];
+	char *name;
+	GF_Config *cfg;
+	GF_DownloadManager *dm;
+
+	gf_sys_init(0);
+
+	cfg = gf_cfg_new(NULL, NULL);
+	gf_cfg_set_key(cfg, "General", "CacheDirectory", ".");
+	gf_cfg_set_key(cfg, "Downloader", "CleanCache", "true");
+	dm = gf_dm_new(cfg);
+
+
+	name = strrchr(mpd_src, '/');
+	if (!name) name = strrchr(mpd_src, '\\');
+	if (!name) name = "manifest.mpd";
+	else name ++;
+
+	if (strchr(name, '?') || strchr(name, '&')) name = "manifest.mpd";
+
+	fprintf(stderr, "Downloading %s\n", mpd_src);
+	sess = get_file(mpd_src, dm, &e);
+	if (!sess) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Error downloading MPD file %s: %s\n", mpd_src, gf_error_to_string(e) ));
+		return e;
+	}
+	strcpy(szName, gf_dm_sess_get_cache_name(sess) );
+	gf_dm_sess_get_header_sizes_and_times(sess, &req_hdr_size, &rsp_hdr_size, &connect_time, &reply_time, &download_time);
+	gf_dm_sess_del(sess);
+
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Error fetching MPD file %s: %s\n", mpd_src, gf_error_to_string(e)));
+		return e;
+	}
+	else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Fetched file %s\n", mpd_src));
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_APP, ("GET Header size %d - Reply header size %d\n", req_hdr_size, rsp_hdr_size));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_APP, ("GET time: Connect Time %d - Reply Time %d - Download Time %d\n", connect_time, reply_time, download_time));
+
+	mpd_parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse(mpd_parser, szName, NULL, NULL);
+
+	if (e != GF_OK) {
+		gf_xml_dom_del(mpd_parser);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Error parsing MPD %s : %s\n", mpd_src, gf_error_to_string(e)));
+		return e;
+	}
+	mpd = gf_mpd_new();
+	e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), mpd, mpd_src);
+	gf_xml_dom_del(mpd_parser);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Error initializing MPD %s : %s\n", mpd_src, gf_error_to_string(e)));
+		goto err_exit;
+	}
+	else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_APP, ("MPD %s initialized: %s\n", szName, gf_error_to_string(e)));
+	}
+
+	revert_cache_file(szName);
+	if (mpd->type==GF_MPD_TYPE_DYNAMIC) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("MPD rip is not supported on live sources\n"));
+		e = GF_NOT_SUPPORTED;
+		goto err_exit;
+	}
+
+	i=0;
+	while ((period = (GF_MPD_Period *) gf_list_enum(mpd->periods, &i))) {
+		char *initTemplate = NULL;
+		Bool segment_base = GF_FALSE;
+		u32 j=0;
+
+		if (period->segment_base) segment_base=GF_TRUE;
+
+		if (period->segment_template && period->segment_template->initialization) {
+			initTemplate = period->segment_template->initialization;
+		}
+
+		while ((as = gf_list_enum(period->adaptation_sets, &j))) {
+			u32 k=0;
+			if (!initTemplate && as->segment_template && as->segment_template->initialization) {
+				initTemplate = as->segment_template->initialization;
+			}
+			if (as->segment_base) segment_base=GF_TRUE;
+
+			while ((rep = gf_list_enum(as->representations, &k))) {
+				u64 out_range_start, out_range_end, segment_duration;
+				Bool is_in_base_url;
+				char *seg_url;
+				u32 seg_idx=0;
+				if (rep->segment_template && rep->segment_template->initialization) {
+					initTemplate = rep->segment_template->initialization;
+				} else if (k>1) {
+					initTemplate = NULL;
+				}
+				if (rep->segment_base) segment_base=GF_TRUE;
+
+				e = gf_mpd_resolve_url(mpd, rep, as, period, mpd_src, 0, GF_MPD_RESOLVE_URL_INIT, 0, 0, &seg_url, &out_range_start, &out_range_end, &segment_duration, &is_in_base_url, NULL, NULL);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Error resolving init segment name : %s\n", gf_error_to_string(e)));
+					continue;
+				}
+				//not a byte range, replace URL
+				if (segment_base) {
+
+				} else if (out_range_start || out_range_end || !seg_url) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("byte range rip not yet implemented\n"));
+					if (seg_idx) gf_free(seg_url);
+					e = GF_NOT_SUPPORTED;
+					goto err_exit;
+				}
+
+				fprintf(stderr, "Downloading %s\n", seg_url);
+				sess = get_file(seg_url, dm, &e);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Error downloading init segment %s from MPD %s : %s\n", seg_url, mpd_src, gf_error_to_string(e)));
+					goto err_exit;
+				}
+				revert_cache_file((char *) gf_dm_sess_get_cache_name(sess) );
+				gf_free(seg_url);
+				gf_dm_sess_del(sess);
+
+				if (segment_base) continue;
+
+				while (1) {
+					e = gf_mpd_resolve_url(mpd, rep, as, period, mpd_src, 0, GF_MPD_RESOLVE_URL_MEDIA, seg_idx, 0, &seg_url, &out_range_start, &out_range_end, &segment_duration, NULL, NULL, NULL);
+					if (e) {
+						if (e<0) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Error resolving segment name : %s\n", gf_error_to_string(e)));
+						}
+						break;
+					}
+
+					seg_idx++;
+
+					if (out_range_start || out_range_end || !seg_url) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("byte range rip not yet implemented\n"));
+						if (seg_url) gf_free(seg_url);
+						break;
+					}
+					fprintf(stderr, "Downloading %s\n", seg_url);
+					sess = get_file(seg_url, dm, &e);
+					if (e) {
+						if (seg_url) gf_free(seg_url);
+						if (e != GF_URL_ERROR) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Error downloading segment %s: %s\n", seg_url, gf_error_to_string(e)));
+						}
+						break;
+					}
+					revert_cache_file((char *) gf_dm_sess_get_cache_name(sess) );
+					gf_free(seg_url);
+					gf_dm_sess_del(sess);
+				}
+			}
+		}
+		if (initTemplate) {
+			gf_free(initTemplate);
+			initTemplate = NULL;
+		}
+	}
+
+err_exit:
+	gf_mpd_del(mpd);
+	gf_dm_del(dm);
+	gf_cfg_del(cfg);
+	gf_sys_close();
+	return e;
+}

gpac-0.7.1.tar.gz/applications/mp4box/fileimport.c -> gpac-0.8.0.tar.gz/applications/mp4box/fileimport.c Changed

@@ -46,6 +46,7 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 #include <gpac/xml.h>
+#include <gpac/internal/isomedia_dev.h>
 
 typedef struct
 {
@@ -147,7 +148,14 @@
 		switch (import.tk_info[i].type) {
 		case GF_ISOM_MEDIA_VISUAL:
 			fprintf(stderr, "Video (%s)", gf_4cc_to_str(import.tk_info[i].media_type));
+			if (import.tk_info[i].video_info.temporal_enhancement) fprintf(stderr, " Temporal Enhancement");
 			break;
+ case GF_ISOM_MEDIA_AUXV:
+ fprintf(stderr, "Auxiliary Video (%s)", gf_4cc_to_str(import.tk_info[i].media_type));
+ break;
+ case GF_ISOM_MEDIA_PICT:
+ fprintf(stderr, "Picture Sequence (%s)", gf_4cc_to_str(import.tk_info[i].media_type));
+ break;
 		case GF_ISOM_MEDIA_AUDIO:
 			fprintf(stderr, "Audio (%s)", gf_4cc_to_str(import.tk_info[i].media_type));
 			break;
@@ -187,9 +195,8 @@
 		fprintf(stderr, "\n");
 		if (!trackID) continue;
 
-		if ((import.tk_info[i].type==GF_ISOM_MEDIA_VISUAL)
-		 && import.tk_info[i].video_info.width
-		 && import.tk_info[i].video_info.height
+
+		if (gf_isom_is_video_subtype(import.tk_info[i].type) && import.tk_info[i].video_info.width && import.tk_info[i].video_info.height
 		 ) {
 			fprintf(stderr, "Source: %s %dx%d", gf_4cc_to_str(import.tk_info[i].media_type), import.tk_info[i].video_info.width, import.tk_info[i].video_info.height);
 			if (import.tk_info[i].video_info.FPS) fprintf(stderr, " @ %g FPS", import.tk_info[i].video_info.FPS);
@@ -226,7 +233,7 @@
 	u64 ref_duration, chap_duration;
 	Double scale;
 
-	gf_isom_set_track_reference(file, chapter_ref_trak, GF_4CC('c','h','a','p'), gf_isom_get_track_id(file, track) );
+	gf_isom_set_track_reference(file, chapter_ref_trak, GF_ISOM_REF_CHAP, gf_isom_get_track_id(file, track) );
 	gf_isom_set_track_enabled(file, track, 0);
 
 	ref_duration = gf_isom_get_media_duration(file, chapter_ref_trak);
@@ -245,21 +252,33 @@
 GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, Double force_fps, u32 frames_per_sample)
 {
 	u32 track_id, i, j, timescale, track, stype, profile, level, new_timescale, rescale, svc_mode, txt_flags, split_tile_mode, temporal_mode;
-	s32 par_d, par_n, prog_id, delay;
+	s32 par_d, par_n, prog_id, delay, force_rate, moov_timescale;
 	s32 tw, th, tx, ty, txtw, txth, txtx, txty;
-	Bool do_audio, do_video, do_all, disable, track_layout, text_layout, chap_ref, is_chap, is_chap_file, keep_handler, negative_cts_offset, rap_only;
+	Bool do_audio, do_video, do_auxv,do_pict, do_all, disable, track_layout, text_layout, chap_ref, is_chap, is_chap_file, keep_handler, negative_cts_offset, rap_only, refs_only, force_par;
 	u32 group, handler, rvc_predefined, check_track_for_svc, check_track_for_lhvc, check_track_for_hevc;
 	const char *szLan;
 	GF_Err e;
+	u32 tmcd_track = 0;
+	Bool keep_audelim = GF_FALSE;
 	GF_MediaImporter import;
 	char *ext, szName[1000], *handler_name, *rvc_config, *chapter_name;
 	GF_List *kinds;
 	GF_TextFlagsMode txt_mode = GF_ISOM_TEXT_FLAGS_OVERWRITE;
 	u8 max_layer_id_plus_one, max_temporal_id_plus_one;
+	u32 bitdepth=0;
+	u32 clr_type=0;
+	u32 clr_prim;
+	u32 clr_tranf;
+	u32 clr_mx;
+	u32 clr_full_range=GF_FALSE;
+	Bool fmt_ok = GF_TRUE;
+	u32 icc_size=0;
+	char *icc_data = NULL;
 
 	rvc_predefined = 0;
 	chapter_name = NULL;
 	new_timescale = 1;
+	moov_timescale = 0;
 	rescale = 0;
 	text_layout = 0;
 	/*0: merge all
@@ -296,11 +315,14 @@
 	split_tile_mode = 0;
 	temporal_mode = 0;
 	rap_only = 0;
+	refs_only = 0;
 	txt_flags = 0;
 	max_layer_id_plus_one = max_temporal_id_plus_one = 0;
+	force_rate = -1;
 
 	tw = th = tx = ty = txtw = txth = txtx = txty = 0;
 	par_d = par_n = -2;
+	force_par = GF_FALSE;
 	/*use ':' as separator, but beware DOS paths...*/
 	ext = strchr(szName, ':');
 	if (ext && ext[1]=='\\') ext = strchr(szName+2, ':');
@@ -309,17 +331,36 @@
 	rvc_config = NULL;
 	while (ext) {
 		char *ext2 = strchr(ext+1, ':');
-		if (ext2 && !strncmp(ext2, "://", 3)) ext2 = strchr(ext2+1, ':');
-		if (ext2 && !strncmp(ext2, ":\\", 2)) ext2 = strchr(ext2+1, ':');
+
+		// if the colon is part of a file path/url we keep it
+		if (ext2 && !strncmp(ext2, "://", 3) ) {
+			ext2[0] = ':';
+			ext2 = strchr(ext2+1, ':');
+		}
+
+		// keep windows drive: path, can be after a file://
+		if (ext2 && ( !strncmp(ext2, ":\\", 2) || !strncmp(ext2, ":/", 2) ) ) {
+			ext2[0] = ':';
+			ext2 = strchr(ext2+1, ':');
+		}
+
 		if (ext2) ext2[0] = 0;
 
 		/*all extensions for track-based importing*/
-		if (!strnicmp(ext+1, "dur=", 4)) import.duration = (u32) (atof(ext+5) * 1000);
-		else if (!strnicmp(ext+1, "lang=", 5)) szLan = ext+6;
+		if (!strnicmp(ext+1, "dur=", 4)) import.duration = (u32)( (atof(ext+5) * 1000) + 0.5 );
+		else if (!strnicmp(ext+1, "lang=", 5)) {
+			/* prevent leak if param is set twice */
+			if (szLan)
+				gf_free((char*) szLan);
+
+			szLan = gf_strdup(ext+6);
+		}
 		else if (!strnicmp(ext+1, "delay=", 6)) delay = atoi(ext+7);
 		else if (!strnicmp(ext+1, "par=", 4)) {
-			if (!stricmp(ext+5, "none")) {
+			if (!stricmp(ext + 5, "none")) {
 				par_n = par_d = -1;
+			} else if (!stricmp(ext + 5, "force")) {
+				force_par = GF_TRUE;
 			} else {
 				if (ext2) ext2[0] = ':';
 				if (ext2) ext2 = strchr(ext2+1, ':');
@@ -327,7 +368,9 @@
 				sscanf(ext+5, "%d:%d", &par_n, &par_d);
 			}
 		}
-		else if (!strnicmp(ext+1, "name=", 5)) handler_name = gf_strdup(ext+6);
+		else if (!strnicmp(ext+1, "name=", 5)) {
+			handler_name = gf_strdup(ext+6);
+		}
 		else if (!strnicmp(ext+1, "ext=", 4)) {
 			/*extensions begin with '.'*/
 			if (*(ext+5) == '.')
@@ -356,9 +399,11 @@
 			else force_fps = atof(ext+5);
 		}
 		else if (!stricmp(ext+1, "rap")) rap_only = 1;
+		else if (!stricmp(ext+1, "refs")) refs_only = 1;
 		else if (!stricmp(ext+1, "trailing")) import_flags |= GF_IMPORT_KEEP_TRAILING;
 		else if (!strnicmp(ext+1, "agg=", 4)) frames_per_sample = atoi(ext+5);
 		else if (!stricmp(ext+1, "dref")) import_flags |= GF_IMPORT_USE_DATAREF;
+		else if (!stricmp(ext+1, "keep_refs")) import_flags |= GF_IMPORT_KEEP_REFS;
 		else if (!stricmp(ext+1, "nodrop")) import_flags |= GF_IMPORT_NO_FRAME_DROP;
 		else if (!stricmp(ext+1, "packed")) import_flags |= GF_IMPORT_FORCE_PACKED;
 		else if (!stricmp(ext+1, "sbr")) import_flags |= GF_IMPORT_SBR_IMPLICIT;
@@ -378,6 +423,8 @@
 
 			if (!stricmp(mode, "splitnox"))
 				svc_mode = 3;
+			else if (!stricmp(mode, "splitnoxib"))
+				svc_mode = 4;
 			else if (!stricmp(mode, "splitall") || !stricmp(mode, "split"))
 				svc_mode = 2;
 			else if (!stricmp(mode, "splitbase"))
@@ -385,7 +432,7 @@
 			else if (!stricmp(mode, "merged"))
 				svc_mode = 0;
 		}
-		/*split SVC layers*/
+		/*split SHVC temporal sublayers*/
 		else if (!strnicmp(ext+1, "temporal=", 9)) {
 			char *mode = ext+10;
 			if (!stricmp(mode, "split"))
@@ -400,8 +447,12 @@
 			}
 		}
 		else if (!stricmp(ext+1, "subsamples")) import_flags |= GF_IMPORT_SET_SUBSAMPLES;
+		else if (!stricmp(ext+1, "deps")) import_flags |= GF_IMPORT_SAMPLE_DEPS;
+		else if (!stricmp(ext+1, "ccst")) import_flags |= GF_IMPORT_USE_CCST;
+		else if (!stricmp(ext+1, "alpha")) import.is_alpha = GF_TRUE;
 		else if (!stricmp(ext+1, "forcesync")) import_flags |= GF_IMPORT_FORCE_SYNC;
 		else if (!stricmp(ext+1, "xps_inband")) import_flags |= GF_IMPORT_FORCE_XPS_INBAND;
+		else if (!stricmp(ext+1, "au_delim")) keep_audelim = GF_TRUE;
 		else if (!strnicmp(ext+1, "max_lid=", 8) || !strnicmp(ext+1, "max_tid=", 8)) {
 			s32 val = atoi(ext+9);
 			if (val < 0) {
@@ -409,7 +460,7 @@
 			} else {
 				if (!strnicmp(ext+1, "max_lid=", 8))
 					max_layer_id_plus_one = 1 + (u8) val;
-				else 
+				else
 					max_temporal_id_plus_one = 1 + (u8) val;
 			}
 		}
@@ -423,7 +474,9 @@
 			stype = GF_4CC(ext[7], ext[8], ext[9], ext[10]);
 		}
 		else if (!stricmp(ext+1, "chap")) is_chap = 1;
-		else if (!strnicmp(ext+1, "chapter=", 8)) chapter_name = gf_strdup(ext+9);
+		else if (!strnicmp(ext+1, "chapter=", 8)) {
+			chapter_name = gf_strdup(ext+9);
+		}
 		else if (!strnicmp(ext+1, "chapfile=", 9)) {
 			chapter_name = gf_strdup(ext+10);
 			is_chap_file=1;
@@ -442,6 +495,10 @@
 		else if (!strnicmp(ext+1, "timescale=", 10)) {
 			new_timescale = atoi(ext+11);
 		}
+		else if (!strnicmp(ext+1, "moovts=", 7)) {
+			moov_timescale = atoi(ext+8);
+		}
+
 		else if (!stricmp(ext+1, "noedit")) import_flags |= GF_IMPORT_NO_EDIT_LIST;
 
 
@@ -454,6 +511,7 @@
 		else if (!strnicmp(ext+1, "profile=", 8)) profile = atoi(ext+9);
 		else if (!strnicmp(ext+1, "level=", 6)) level = atoi(ext+7);
 		else if (!strnicmp(ext+1, "novpsext", 8)) import_flags |= GF_IMPORT_NO_VPS_EXTENSIONS;
+		else if (!strnicmp(ext+1, "keepav1t", 8)) import_flags |= GF_IMPORT_KEEP_AV1_TEMPORAL_OBU;
 
 		else if (!strnicmp(ext+1, "font=", 5)) import.fontName = gf_strdup(ext+6);
 		else if (!strnicmp(ext+1, "size=", 5)) import.fontSize = atoi(ext+6);
@@ -479,7 +537,7 @@
 		else if (!stricmp(ext+1, "swf-same-app")) import.swf_flags |= GF_SM_SWF_REUSE_APPEARANCE;
 		else if (!strnicmp(ext+1, "swf-flatten=", 12)) import.swf_flatten_angle = (Float) atof(ext+13);
 #endif
-		
+
 		else if (!strnicmp(ext+1, "kind=", 5)) {
 			char *kind_scheme, *kind_value;
 			char *kind_data = ext+6;
@@ -510,6 +568,73 @@
 				txt_mode = GF_ISOM_TEXT_FLAGS_UNTOGGLE;
 			}
 		}
+		else if (!strnicmp(ext+1, "rate=", 5)) {
+			force_rate = atoi(ext+6);
+		}
+
+		else if (!strnicmp(ext+1, "asemode=", 8)){
+			char *mode = ext+9;
+			if (!stricmp(mode, "v0-bs"))
+				import.asemode = GF_IMPORT_AUDIO_SAMPLE_ENTRY_v0_BS;
+			else if (!stricmp(mode, "v0-2"))
+				import.asemode = GF_IMPORT_AUDIO_SAMPLE_ENTRY_v0_2;
+			else if (!stricmp(mode, "v1"))
+				import.asemode = GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_MPEG;
+			else if (!stricmp(mode, "v1-qt"))
+				import.asemode = GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF;
+			else
+				fprintf(stderr, "Unrecognized audio sample entry mode %s, ignoring\n", mode);
+		}
+
+		else if (!strnicmp(ext+1, "audio_roll=", 11)) {
+			import.audio_roll_change = GF_TRUE;
+			import.audio_roll = atoi(ext+12);
+		}
+		else if (!strnicmp(ext+1, "bitdepth=", 9)) {
+			bitdepth=atoi(ext+10);
+		}
+		else if (!strnicmp(ext+1, "colr=", 5)) {
+			char *cval = ext+6;
+			if (strlen(cval)<6) {
+				fmt_ok = GF_FALSE;
+			} else {
+				clr_type = GF_4CC(cval[0],cval[1],cval[2],cval[3]);
+				cval+=4;
+				if (cval[0] != ',') {
+					fmt_ok = GF_FALSE;
+				}
+				else if (clr_type==GF_ISOM_SUBTYPE_NCLX) {
+					if (sscanf(cval+1, "%d,%d,%d,%d", &clr_prim, &clr_tranf, &clr_mx, &clr_full_range) != 4)
+						fmt_ok=GF_FALSE;
+				}
+				else if (clr_type==GF_ISOM_SUBTYPE_NCLC) {
+					if (sscanf(cval+1, "%d,%d,%d", &clr_prim, &clr_tranf, &clr_mx) != 3)
+						fmt_ok=GF_FALSE;
+				}
+				else if ((clr_type==GF_ISOM_SUBTYPE_RICC) || (clr_type==GF_ISOM_SUBTYPE_PROF)) {
+					FILE *f = gf_fopen(cval+1, "rb");
+					if (!f) {
+						fprintf(stderr, "Failed to open file %s\n", cval+1);
+						fmt_ok = GF_FALSE;
+					} else {
+						gf_fseek(f, 0, SEEK_END);
+						icc_size = (u32) gf_ftell(f);
+						icc_data = gf_malloc(sizeof(char)*icc_size);
+						gf_fseek(f, 0, SEEK_SET);
+						icc_size = (u32) gf_fread(icc_data, 1, icc_size, f);
+						gf_fclose(f);
+					}
+				} else {
+					fprintf(stderr, "unrecognized profile %s\n", gf_4cc_to_str(clr_type) );
+					fmt_ok = GF_FALSE;
+				}
+			}
+			if (!fmt_ok) {
+				fprintf(stderr, "Bad format for clr option, check help\n");
+				e = GF_BAD_PARAM;
+				goto exit;
+			}
+		}
 
 		/*unrecognized, assume name has colon in it*/
 		else {
@@ -521,7 +646,11 @@
 		if (ext2) ext2[0] = ':';
 
 		ext[0] = 0;
-		ext = strchr(ext+1, ':');
+
+		/* restart from where we stopped
+		 * if we didn't stop (ext2 null) then the end has been reached
+		 * so we can stop the whole thing */
+		ext = ext2;
 	}
 
 	/*check duration import (old syntax)*/
@@ -532,7 +661,7 @@
 	}
 
 	/*select switches for av containers import*/
-	do_audio = do_video = 0;
+	do_audio = do_video = do_auxv = do_pict = 0;
 	track_id = prog_id = 0;
 	do_all = 1;
 	ext = strrchr(szName, '#');
@@ -549,6 +678,8 @@
 		ext++;
 		if (!strnicmp(ext, "audio", 5)) do_audio = 1;
 		else if (!strnicmp(ext, "video", 5)) do_video = 1;
+ else if (!strnicmp(ext, "auxv", 4)) do_auxv = 1;
+ else if (!strnicmp(ext, "pict", 4)) do_pict = 1;
 		else if (!strnicmp(ext, "trackID=", 8)) track_id = atoi(&ext[8]);
 		else if (!strnicmp(ext, "PID=", 4)) track_id = atoi(&ext[4]);
 		else if (!strnicmp(ext, "program=", 8)) {
@@ -566,7 +697,7 @@
 		}
 		else track_id = atoi(ext);
 	}
-	if (do_audio || do_video || track_id) do_all = 0;
+	if (do_audio || do_video || do_auxv || do_pict || track_id) do_all = 0;
 
 	if (track_layout || is_chap) {
 		u32 w, h, sw, sh, fw, fh, i;
@@ -576,6 +707,8 @@
 			switch (gf_isom_get_media_type(dest, i+1)) {
 			case GF_ISOM_MEDIA_SCENE:
 			case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
 				if (!chap_ref && gf_isom_is_track_enabled(dest, i+1) ) chap_ref = i+1;
 
 				gf_isom_get_visual_info(dest, i+1, 1, &sw, &sh);
@@ -614,6 +747,7 @@
 	import.video_fps = force_fps;
 	import.frames_per_sample = frames_per_sample;
 	import.flags = import_flags;
+	import.keep_audelim = keep_audelim;
 
 	if (!import.nb_tracks) {
 		u32 count, o_count;
@@ -621,6 +755,13 @@
 		e = gf_media_import(&import);
 		if (e) return e;
 		count = gf_isom_get_track_count(import.dest);
+
+		if (moov_timescale) {
+			if (moov_timescale<0) moov_timescale = gf_isom_get_media_timescale(import.dest, o_count+1);
+			gf_isom_set_timescale(import.dest, moov_timescale);
+			moov_timescale = 0;
+		}
+
 		timescale = gf_isom_get_timescale(dest);
 		for (i=o_count; i<count; i++) {
 			if (szLan) gf_isom_set_media_language(import.dest, i+1, (char *) szLan);
@@ -641,12 +782,12 @@
 					}
 				}
 			}
-			if ((par_n>=0) && (par_d>=0)) {
-				e = gf_media_change_par(import.dest, i+1, par_n, par_d);
+			if (((par_n>=0) && (par_d>=0)) || force_par) {
+				e = gf_media_change_par(import.dest, i+1, par_n, par_d, force_par);
 			}
 
-			if (rap_only) {
-				e = gf_media_remove_non_rap(import.dest, i+1);
+			if (rap_only || refs_only) {
+				e = gf_media_remove_non_rap(import.dest, i+1, refs_only);
 			}
 
 			if (handler_name) gf_isom_set_handler_name(import.dest, i+1, handler_name);
@@ -675,6 +816,12 @@
 			if (is_chap && chap_ref) {
 				set_chapter_track(import.dest, i+1, chap_ref);
 			}
+			if (bitdepth) {
+				gf_isom_set_visual_bit_depth(import.dest, i+1, 1, bitdepth);
+			}
+			if (clr_type) {
+				gf_isom_set_visual_color_info(import.dest, i+1, 1, clr_type, clr_prim, clr_tranf, clr_mx, clr_full_range, icc_data, icc_size);
+			}
 
 			for (j = 0; j < gf_list_count(kinds); j+=2) {
 				char *kind_scheme = (char *)gf_list_get(kinds, j);
@@ -685,8 +832,14 @@
 			if (profile || level)
 				gf_media_change_pl(import.dest, i+1, profile, level);
 
-			if (gf_isom_get_media_subtype(import.dest, i+1, 1)== GF_4CC( 'm', 'p', '4', 's' ))
+			switch (gf_isom_get_media_subtype(import.dest, i+1, 1)) {
+			case GF_ISOM_BOX_TYPE_MP4S:
 				keep_sys_tracks = 1;
+				break;
+			case GF_QT_BOX_TYPE_TMCD:
+				tmcd_track = i+1;
+				break;
+			}
 
 			gf_isom_set_composition_offset_mode(import.dest, i+1, negative_cts_offset);
 
@@ -707,6 +860,9 @@
 				gf_isom_text_set_display_flags(import.dest, i+1, 0, txt_flags, txt_mode);
 			}
 
+			if (force_rate>=0) {
+				gf_isom_update_bitrate(import.dest, i+1, 1, force_rate, force_rate, 0);
+			}
 
 			if (split_tile_mode) {
 				switch (gf_isom_get_media_subtype(import.dest, i+1, 1)) {
@@ -722,6 +878,9 @@
 			}
 		}
 	} else {
+		if (do_all)
+			import.flags |= GF_IMPORT_KEEP_REFS;
+
 		for (i=0; i<import.nb_tracks; i++) {
 			import.trackID = import.tk_info[i].track_num;
 			if (prog_id) {
@@ -741,11 +900,26 @@
 				do_video = 0;
 				e = gf_media_import(&import);
 			}
+ else if (do_auxv && (import.tk_info[i].type==GF_ISOM_MEDIA_AUXV)) {
+ do_auxv = 0;
+ e = gf_media_import(&import);
+ }
+ else if (do_pict && (import.tk_info[i].type==GF_ISOM_MEDIA_PICT)) {
+ do_pict = 0;
+ e = gf_media_import(&import);
+ }
 			else continue;
 			if (e) goto exit;
 
-			timescale = gf_isom_get_timescale(dest);
 			track = gf_isom_get_track_by_id(import.dest, import.final_trackID);
+
+			if (moov_timescale) {
+				if (moov_timescale<0) moov_timescale = gf_isom_get_media_timescale(import.dest, track);
+				gf_isom_set_timescale(import.dest, moov_timescale);
+				moov_timescale = 0;
+			}
+
+			timescale = gf_isom_get_timescale(dest);
 			if (szLan) gf_isom_set_media_language(import.dest, track, (char *) szLan);
 			if (disable) gf_isom_set_track_enabled(import.dest, track, 0);
 
@@ -766,11 +940,14 @@
 					}
 				}
 			}
-			if ((import.tk_info[i].type==GF_ISOM_MEDIA_VISUAL) && (par_n>=-1) && (par_d>=-1)) {
-				e = gf_media_change_par(import.dest, track, par_n, par_d);
+			if (gf_isom_is_video_subtype(import.tk_info[i].type) && (par_n>=-1) && (par_d>=-1)) {
+				e = gf_media_change_par(import.dest, track, par_n, par_d, force_par);
 			}
-			if (rap_only) {
-				e = gf_media_remove_non_rap(import.dest, track);
+			if (gf_isom_get_media_subtype(import.dest, track, 1) == GF_QT_BOX_TYPE_TMCD) {
+				tmcd_track = track;
+			}
+			if (rap_only || refs_only) {
+				e = gf_media_remove_non_rap(import.dest, track, refs_only);
 			}
 			if (handler_name) gf_isom_set_handler_name(import.dest, track, handler_name);
 			else if (!keep_handler) {
@@ -799,6 +976,13 @@
 				set_chapter_track(import.dest, track, chap_ref);
 			}
 
+			if (bitdepth) {
+				gf_isom_set_visual_bit_depth(import.dest, track, 1, bitdepth);
+			}
+			if (clr_type) {
+				gf_isom_set_visual_color_info(import.dest, track, 1, clr_type, clr_prim, clr_tranf, clr_mx, clr_full_range, icc_data, icc_size);
+			}
+
 			for (j = 0; j < gf_list_count(kinds); j+=2) {
 				char *kind_scheme = (char *)gf_list_get(kinds, j);
 				char *kind_value = (char *)gf_list_get(kinds, j+1);
@@ -875,6 +1059,9 @@
 			if (txt_flags) {
 				gf_isom_text_set_display_flags(import.dest, track, 0, txt_flags, txt_mode);
 			}
+			if (force_rate>=0) {
+				gf_isom_update_bitrate(import.dest, i+1, 1, force_rate, force_rate, 0);
+			}
 
 			if (split_tile_mode) {
 				switch (gf_isom_get_media_subtype(import.dest, track, 1)) {
@@ -891,6 +1078,8 @@
 		}
 		if (track_id) fprintf(stderr, "WARNING: Track ID %d not found in file\n", track_id);
 		else if (do_video) fprintf(stderr, "WARNING: Video track not found\n");
+ else if (do_auxv) fprintf(stderr, "WARNING: Auxiliary Video track not found\n");
+ else if (do_pict) fprintf(stderr, "WARNING: Picture sequence track not found\n");
 		else if (do_audio) fprintf(stderr, "WARNING: Audio track not found\n");
 	}
 
@@ -902,12 +1091,27 @@
 		}
 	}
 
+	if (tmcd_track) {
+		u32 tmcd_id = gf_isom_get_track_id(import.dest, tmcd_track);
+		for (i=0; i < gf_isom_get_track_count(import.dest); i++) {
+			switch (gf_isom_get_media_type(import.dest, i+1)) {
+			case GF_ISOM_MEDIA_VISUAL:
+			case GF_ISOM_MEDIA_AUXV:
+			case GF_ISOM_MEDIA_PICT:
+				break;
+			default:
+				continue;
+			}
+			gf_isom_set_track_reference(import.dest, i+1, GF_ISOM_REF_TMCD, tmcd_id);
+		}
+	}
+
 	/*force to rewrite all dependencies*/
 	for (i = 1; i <= gf_isom_get_track_count(import.dest); i++)
 	{
 		e = gf_isom_rewrite_track_dependencies(import.dest, i);
 		if (e) {
-			fprintf(stderr, "Warning: track ID %d has references to a track not imported\n", gf_isom_get_track_id(import.dest, i));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Warning: track ID %d has references to a track not imported\n", gf_isom_get_track_id(import.dest, i) ));
 			e = GF_OK;
 		}
 	}
@@ -935,7 +1139,10 @@
 #ifndef GPAC_DISABLE_HEVC
 	if (check_track_for_lhvc) {
 		if (svc_mode) {
-			e = gf_media_split_lhvc(import.dest, check_track_for_lhvc, GF_FALSE, (svc_mode==1) ? 0 : 1, (svc_mode==3) ? 0 : 1 );
+			GF_LHVCExtractoreMode xmode = GF_LHVC_EXTRACTORS_ON;
+			if (svc_mode==3) xmode = GF_LHVC_EXTRACTORS_OFF;
+			else if (svc_mode==4) xmode = GF_LHVC_EXTRACTORS_OFF_FORCE_INBAND;
+			e = gf_media_split_lhvc(import.dest, check_track_for_lhvc, GF_FALSE, (svc_mode==1) ? 0 : 1, xmode );
 			if (e) goto exit;
 		} else {
 			//TODO - merge, temporal sublayers
@@ -947,7 +1154,8 @@
 			if (e) goto exit;
 		}
 		if (temporal_mode) {
-			e = gf_media_split_lhvc(import.dest, check_track_for_hevc, GF_TRUE, (temporal_mode==1) ? GF_FALSE : GF_TRUE, (temporal_mode==3) ? GF_FALSE : GF_TRUE );
+			GF_LHVCExtractoreMode xmode = (temporal_mode==3) ? GF_LHVC_EXTRACTORS_OFF : GF_LHVC_EXTRACTORS_ON;
+			e = gf_media_split_lhvc(import.dest, check_track_for_hevc, GF_TRUE, (temporal_mode==1) ? GF_FALSE : GF_TRUE, xmode );
 			if (e) goto exit;
 		}
 	}
@@ -967,6 +1175,8 @@
 	if (import.streamFormat) gf_free(import.streamFormat);
 	if (import.force_ext) gf_free(import.force_ext);
 	if (rvc_config) gf_free(rvc_config);
+	if (szLan) gf_free((char *)szLan);
+	if (icc_data) gf_free(icc_data);
 	return e;
 }
 
@@ -1005,10 +1215,9 @@
 	rap_split = 0;
 	if (split_size_kb == (u64)-1) rap_split = 1;
 	if (split_dur == -1) rap_split = 1;
-	else if (split_dur==-2) {
+	else if (split_dur <= -2) {
 		split_size_kb = 0;
 		split_until_end = 1;
-		split_dur = 0;
 	}
 
 	if (rap_split) {
@@ -1028,7 +1237,7 @@
 
 	conv_type = 0;
 	switch (gf_isom_guess_specification(mp4)) {
-	case GF_4CC('I','S','M','A'):
+	case GF_ISOM_BRAND_ISMA:
 		conv_type = 1;
 		break;
 	case GF_ISOM_BRAND_3GP4:
@@ -1067,6 +1276,8 @@
 		case GF_ISOM_MEDIA_AUDIO:
 			break;
 		case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
 			if (gf_isom_get_sample_count(mp4, i+1)>1) {
 				break;
 			}
@@ -1127,7 +1338,18 @@
 		return GF_NOT_SUPPORTED;
 	}
 	if (split_until_end) {
-		split_dur = max_dur;
+		if (split_dur < -2) {
+			split_dur = - (split_dur + 2 - chunk_start);
+			if (max_dur < split_dur) {
+				fprintf(stderr, "Split duration till end %lf longer than track duration %lf\n", split_dur, max_dur);
+				gf_free(tks);
+				return GF_NOT_SUPPORTED;
+			} else {
+				split_dur = max_dur - split_dur;
+			}
+		} else {
+			split_dur = max_dur;
+		}
 	} else if (!rap_split && (max_dur<=split_dur)) {
 		fprintf(stderr, "Input file (%f) shorter than requested split duration (%f)\n", max_dur, split_dur);
 		gf_free(tks);
@@ -1141,7 +1363,9 @@
 			has_enough_sync = GF_TRUE;
 		else if (gf_isom_get_sync_point_count(mp4, tki->tk) > 1)
 			has_enough_sync = GF_TRUE;
-		else if (gf_isom_get_sample_group_info(mp4, tki->tk, 1, GF_4CC('r', 'a', 'p', ' '), NULL, NULL, NULL))
+		else if (gf_isom_get_sample_group_info(mp4, tki->tk, 1, GF_ISOM_SAMPLE_GROUP_RAP, NULL, NULL, NULL))
+			has_enough_sync = GF_TRUE;
+		else if (gf_isom_get_sample_group_info(mp4, tki->tk, 1, GF_ISOM_SAMPLE_GROUP_SYNC, NULL, NULL, NULL))
 			has_enough_sync = GF_TRUE;
 
 		if (!has_enough_sync) {
@@ -1234,7 +1458,7 @@
 			/*track done - we remove the track from destination, an empty video track could cause pbs to some players*/
 			if (tki->stop_state==2) continue;
 
-			e = gf_isom_clone_track(mp4, tki->tk, dest, GF_FALSE, &tki->dst_tk);
+			e = gf_isom_clone_track(mp4, tki->tk, dest, 0, &tki->dst_tk);
 			if (e) {
 				fprintf(stderr, "Error cloning track %d\n", tki->tk);
 				goto err_exit;
@@ -1740,7 +1964,9 @@
 }
 #endif /*GPAC_DISABLE_HEVC */
 
-GF_Err cat_isomedia_file(GF_ISOFile *dest, char *fileName, u32 import_flags, Double force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command)
+GF_Err cat_playlist(GF_ISOFile *dest, char *playlistName, u32 import_flags, Double force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command);
+
+GF_Err cat_isomedia_file(GF_ISOFile *dest, char *fileName, u32 import_flags, Double force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command, Bool is_pl)
 {
 	u32 i, j, count, nb_tracks, nb_samp, nb_done;
 	GF_ISOFile *orig;
@@ -1754,6 +1980,8 @@
 	GF_ISOSample *samp;
 	Double aligned_to_DTS = 0;
 
+	if (is_pl) return cat_playlist(dest, fileName, import_flags, force_fps, frames_per_sample, tmp_dir, force_cat, align_timelines, allow_add_in_command);
+
 	if (strchr(fileName, '*')) return cat_multiple_files(dest, fileName, import_flags, force_fps, frames_per_sample, tmp_dir, force_cat, align_timelines, allow_add_in_command);
 
 	multi_cat = allow_add_in_command ? strchr(fileName, '+') : NULL;
@@ -1808,6 +2036,8 @@
 		case GF_ISOM_MEDIA_SUBT:
 		case GF_ISOM_MEDIA_MPEG_SUBT:
 		case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
 		case GF_ISOM_MEDIA_SCENE:
 		case GF_ISOM_MEDIA_OCR:
 		case GF_ISOM_MEDIA_OCI:
@@ -1865,6 +2095,7 @@
 			use_ts_dur = 0;
 		case GF_ISOM_MEDIA_AUDIO:
 		case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_PICT:
 		case GF_ISOM_MEDIA_OCR:
 		case GF_ISOM_MEDIA_OCI:
 		case GF_ISOM_MEDIA_IPMP:
@@ -1896,7 +2127,7 @@
 			for (j=0; j<gf_isom_get_track_count(dest); j++) {
 				if (mtype != gf_isom_get_media_type(dest, j+1)) continue;
 				if (gf_isom_is_same_sample_description(orig, i+1, 0, dest, j+1, 0)) {
-					if (mtype==GF_ISOM_MEDIA_VISUAL) {
+					if (gf_isom_is_video_subtype(mtype) ) {
 						u32 w, h, ow, oh;
 						gf_isom_get_visual_info(orig, i+1, 1, &ow, &oh);
 						gf_isom_get_visual_info(dest, j+1, 1, &w, &h);
@@ -1936,6 +2167,7 @@
 		}
 
 		if (dst_tk) {
+			u32 found_dst_tk = dst_tk;
 			u32 stype = gf_isom_get_media_subtype(dest, dst_tk, 1);
 			/*we MUST have the same codec*/
 			if (gf_isom_get_media_subtype(orig, i+1, 1) != stype) dst_tk = 0;
@@ -1946,7 +2178,7 @@
 				dst_tk = 0;
 			}
 			/*we force the same visual resolution*/
-			else if (mtype==GF_ISOM_MEDIA_VISUAL) {
+			else if (gf_isom_is_video_subtype(mtype) ) {
 				u32 w, h, ow, oh;
 				gf_isom_get_visual_info(orig, i+1, 1, &ow, &oh);
 				gf_isom_get_visual_info(dest, dst_tk, 1, &w, &h);
@@ -1972,13 +2204,16 @@
 					dst_tk = merge_hevc_config(dest, tk_id, orig, i+1, force_cat);
 				}
 #endif /*GPAC_DISABLE_HEVC*/
+				else if (force_cat) {
+					dst_tk = found_dst_tk;
+				}
 			}
 		}
 
 		/*looks like a new track*/
 		if (!dst_tk) {
 			fprintf(stderr, "No suitable destination track found - creating new one (type %s)\n", gf_4cc_to_str(mtype));
-			e = gf_isom_clone_track(orig, i+1, dest, GF_FALSE, &dst_tk);
+			e = gf_isom_clone_track(orig, i+1, dest, 0, &dst_tk);
 			if (e) goto err_exit;
 			gf_isom_clone_pl_indications(orig, dest);
 			new_track = 1;
@@ -2044,6 +2279,8 @@
 			}
 		}
 
+		gf_isom_enable_raw_pack(orig, i+1, 2048);
+
 		last_DTS = 0;
 		count = gf_isom_get_sample_count(orig, i+1);
 		for (j=0; j<count; j++) {
@@ -2061,6 +2298,9 @@
 				e = gf_isom_add_sample_reference(dest, dst_tk, di, samp, offset);
 				gf_isom_sample_del(&s);
 			}
+			if (samp->nb_pack)
+				j+= samp->nb_pack-1;
+
 			gf_isom_sample_del(&samp);
 			if (e) goto err_exit;
 
@@ -2170,10 +2410,18 @@
 				gf_isom_set_edit_segment(dest, dst_tk, editTime, segmentDuration, mediaTime, editMode);
 			}
 		}
+		gf_media_update_bitrate(dest, dst_tk);
 
 	}
 	gf_set_progress("Appending", nb_samp, nb_samp);
 
+	/*check brands*/
+	gf_isom_get_brand_info(orig, NULL, NULL, &j);
+	for (i=0; i<j; i++) {
+		u32 brand;
+		gf_isom_get_alternate_brand(orig, i+1, &brand);
+		gf_isom_modify_alternate_brand(dest, brand, 1);
+	}
 	/*check chapters*/
 	for (i=0; i<gf_isom_get_chapter_count(orig, 0); i++) {
 		char *name;
@@ -2228,7 +2476,7 @@
 	strcpy(szFileName, szName);
 	strcat(szFileName, cat_enum->szOpt);
 
-	e = cat_isomedia_file(cat_enum->dest, szFileName, cat_enum->import_flags, cat_enum->force_fps, cat_enum->frames_per_sample, cat_enum->tmp_dir, cat_enum->force_cat, cat_enum->align_timelines, cat_enum->allow_add_in_command);
+	e = cat_isomedia_file(cat_enum->dest, szFileName, cat_enum->import_flags, cat_enum->force_fps, cat_enum->frames_per_sample, cat_enum->tmp_dir, cat_enum->force_cat, cat_enum->align_timelines, cat_enum->allow_add_in_command, GF_FALSE);
 	if (e) return 1;
 	return 0;
 }
@@ -2247,17 +2495,33 @@
 	cat_enum.align_timelines = align_timelines;
 	cat_enum.allow_add_in_command = allow_add_in_command;
 
+	if (strlen(fileName) >= sizeof(cat_enum.szPath)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("File name %s is too long.\n", fileName));
+		return GF_NOT_SUPPORTED;
+	}
 	strcpy(cat_enum.szPath, fileName);
 	sep = strrchr(cat_enum.szPath, GF_PATH_SEPARATOR);
 	if (!sep) sep = strrchr(cat_enum.szPath, '/');
 	if (!sep) {
 		strcpy(cat_enum.szPath, ".");
+		if (strlen(fileName) >= sizeof(cat_enum.szRad1)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("File name %s is too long.\n", fileName));
+			return GF_NOT_SUPPORTED;
+		}
 		strcpy(cat_enum.szRad1, fileName);
 	} else {
+		if (strlen(sep + 1) >= sizeof(cat_enum.szRad1)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("File name %s is too long.\n", (sep + 1)));
+			return GF_NOT_SUPPORTED;
+		}
 		strcpy(cat_enum.szRad1, sep+1);
 		sep[0] = 0;
 	}
 	sep = strchr(cat_enum.szRad1, '*');
+	if (strlen(sep + 1) >= sizeof(cat_enum.szRad2)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("File name %s is too long.\n", (sep + 1)));
+		return GF_NOT_SUPPORTED;
+	}
 	strcpy(cat_enum.szRad2, sep+1);
 	sep[0] = 0;
 	sep = strchr(cat_enum.szRad2, '%');
@@ -2265,12 +2529,56 @@
 	if (!sep) sep = strchr(cat_enum.szRad2, ':');
 	strcpy(cat_enum.szOpt, "");
 	if (sep) {
+		if (strlen(sep) >= sizeof(cat_enum.szOpt)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Invalid option: %s.\n", sep));
+			return GF_NOT_SUPPORTED;
+		}
 		strcpy(cat_enum.szOpt, sep);
 		sep[0] = 0;
 	}
 	return gf_enum_directory(cat_enum.szPath, 0, cat_enumerate, &cat_enum, NULL);
 }
 
+GF_Err cat_playlist(GF_ISOFile *dest, char *playlistName, u32 import_flags, Double force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command)
+{
+	GF_Err e;
+	FILE *pl = gf_fopen(playlistName, "r");
+	if (!pl) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Failed to open playlist file %s\n", playlistName));
+		return GF_URL_ERROR;
+	}
+
+	e = GF_OK;
+	while (!feof(pl)) {
+		char szLine[10000];
+		char *url;
+		u32 len;
+		szLine[0] = 0;
+		if (fgets(szLine, 10000, pl) == NULL) break;
+		if (szLine[0]=='#') continue;
+		len = (u32) strlen(szLine);
+		while (len && strchr("\r\n \t", szLine[len-1])) {
+			szLine[len-1] = 0;
+			len--;
+		}
+		if (!len) continue;
+
+		url = gf_url_concatenate(playlistName, szLine);
+		if (!url) url = gf_strdup(szLine);
+
+		e = cat_isomedia_file(dest, url, import_flags, force_fps, frames_per_sample, tmp_dir, force_cat, align_timelines, allow_add_in_command, GF_FALSE);
+
+
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Failed to concatenate file %s\n", url));
+			gf_free(url);
+			break;
+		}
+		gf_free(url);
+	}
+	gf_fclose(pl);
+	return e;
+}
 
 #ifndef GPAC_DISABLE_SCENE_ENCODER
 /*
@@ -2781,10 +3089,10 @@
 		mtype = GF_4CC(fcc[0],fcc[1],fcc[2],fcc[3]);
 	} else {
 		mtype = 0;
-		if (!stricmp(type, "svg")) mtype = ascii ? GF_4CC('s','v','g',' ') : GF_4CC('s','v','g','z');
-		else if (!stricmp(type, "smil")) mtype = ascii ? GF_4CC('s','m','i','l') : GF_4CC('s','m','l','z');
-		else if (!stricmp(type, "x3d")) mtype = ascii ? GF_4CC('x','3','d',' ') : GF_4CC('x','3','d','z') ;
-		else if (!stricmp(type, "xmt-a")) mtype = ascii ? GF_4CC('x','m','t','a') : GF_4CC('x','m','t','z');
+		if (!stricmp(type, "svg")) mtype = ascii ? GF_META_TYPE_SVG : GF_META_TYPE_SVGZ;
+		else if (!stricmp(type, "smil")) mtype = ascii ? GF_META_TYPE_SMIL : GF_META_TYPE_SMLZ;
+		else if (!stricmp(type, "x3d")) mtype = ascii ? GF_META_TYPE_X3D : GF_META_TYPE_X3DZ ;
+		else if (!stricmp(type, "xmt-a")) mtype = ascii ? GF_META_TYPE_XMTA : GF_META_TYPE_XMTZ;
 	}
 	if (!mtype) {
 		fprintf(stderr, "Missing 4CC code for meta name - please use ABCD:fileName\n");
@@ -2881,7 +3189,7 @@
 			encoding = "binary-gzip";
 		}
 
-		e = gf_isom_add_meta_item(file, 1, 0, 0, item, name, 0, GF_4CC('m', 'i', 'm', 'e'), mime, encoding, NULL, NULL, NULL);
+		e = gf_isom_add_meta_item(file, 1, 0, 0, item, name, 0, GF_META_ITEM_TYPE_MIME, mime, encoding, NULL, NULL, NULL);
 		gf_free(name);
 		if (e) goto exit;
 	}
@@ -2901,12 +3209,110 @@
 	}
 	return file;
 }
+
+GF_Err hdr_file(GF_ISOFile *movie, char *file_name)
+{
+	GF_DOMParser *parser;
+	GF_XMLNode *root, *stream;
+	GF_Err e;
+	u32 i;
+	GF_MasteringDisplayColourVolumeBox mdcv;
+	GF_ContentLightLevelBox clli;
+
+	memset(&mdcv, 0, sizeof(GF_MasteringDisplayColourVolumeBox));
+	memset(&clli, 0, sizeof(GF_ContentLightLevelBox));
+
+	parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse(parser, file_name, NULL, NULL);
+	if (e) {
+		fprintf(stderr, "Error parsing HDR XML file: Line %d - %s. Abort.\n", gf_xml_dom_get_line(parser), gf_xml_dom_get_error(parser));
+		gf_xml_dom_del(parser);
+		return e;
+	}
+	root = gf_xml_dom_get_root(parser);
+	if (!root) {
+		fprintf(stderr, "Error parsing HDR XML file: no \"root\" found. Abort.\n");
+		gf_xml_dom_del(parser);
+		return e;
+	}
+	if (strcmp(root->name, "HDR")) {
+		fprintf(stderr, "Error parsing HDR XML file: root name is \"%s\", expecting \"HDR\"\n", root->name);
+		gf_xml_dom_del(parser);
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	i = 0;
+	while ((stream = gf_list_enum(root->content, &i))) {
+		u32 id = 0, j;
+		GF_XMLAttribute* att = NULL;
+		GF_XMLNode *box = NULL;
+
+		if (stream->type != GF_XML_NODE_TYPE) continue;
+		if (strcmp(stream->name, "Track")) continue;
+
+		j = 0;
+		while ((att = gf_list_enum(stream->attributes, &j))) {
+			if (!strcmp(att->name, "id")) id = atoi(att->value);
+			else fprintf(stderr, "HDR XML: ignoring track attribute \"%s\"\n", att->name);
+		}
+
+		j = 0;
+		while ((box = gf_list_enum(stream->content, &j))) {
+			u32 k;
+
+			if (box->type != GF_XML_NODE_TYPE) continue;
+
+			if (!strcmp(box->name, "mdcv")) {
+				k = 0;
+				while ((att = gf_list_enum(box->attributes, &k))) {
+					if (!strcmp(att->name, "display_primaries_0_x")) mdcv.display_primaries[0].x = atoi(att->value);
+					else if (!strcmp(att->name, "display_primaries_0_y")) mdcv.display_primaries[0].y = atoi(att->value);
+					else if (!strcmp(att->name, "display_primaries_1_x")) mdcv.display_primaries[1].x = atoi(att->value);
+					else if (!strcmp(att->name, "display_primaries_1_y")) mdcv.display_primaries[1].y = atoi(att->value);
+					else if (!strcmp(att->name, "display_primaries_2_x")) mdcv.display_primaries[2].x = atoi(att->value);
+					else if (!strcmp(att->name, "display_primaries_2_y")) mdcv.display_primaries[2].y = atoi(att->value);
+					else if (!strcmp(att->name, "white_point_x")) mdcv.white_point_x = atoi(att->value);
+					else if (!strcmp(att->name, "white_point_y")) mdcv.white_point_y = atoi(att->value);
+					else if (!strcmp(att->name, "max_display_mastering_luminance")) mdcv.max_display_mastering_luminance = atoi(att->value);
+					else if (!strcmp(att->name, "min_display_mastering_luminance")) mdcv.min_display_mastering_luminance = atoi(att->value);
+					else fprintf(stderr, "HDR XML: ignoring box \"%s\" attribute \"%s\"\n", box->name, att->name);
+				}
+			} else if (!strcmp(box->name, "clli")) {
+				k = 0;
+				while ((att = gf_list_enum(box->attributes, &k))) {
+					if (!strcmp(att->name, "max_content_light_level")) clli.max_content_light_level = atoi(att->value);
+					else if (!strcmp(att->name, "max_pic_average_light_level")) clli.max_pic_average_light_level = atoi(att->value);
+					else fprintf(stderr, "HDR XML: ignoring box \"%s\" attribute \"%s\"\n", box->name, att->name);
+				}
+			} else {
+				fprintf(stderr, "HDR XML: ignoring box element \"%s\"\n", box->name);
+				continue;
+			}
+		}
+
+		e = gf_isom_set_hdr(movie, id, 1, &mdcv, &clli);
+		if (e) {
+			fprintf(stderr, "HDR XML: error in gf_isom_set_hdr()\n");
+			break;
+		}
+	}
+
+	gf_xml_dom_del(parser);
+	return e;
+}
+
 #else
 GF_ISOFile *package_file(char *file_name, char *fcc, const char *tmpdir, Bool make_wgt)
 {
 	fprintf(stderr, "XML Not supported in this build of GPAC - cannot package file\n");
 	return NULL;
 }
+
+GF_Err hdr_file(GF_ISOFile* movie, char* file_name)
+{
+	fprintf(stderr, "XML Not supported in this build of GPAC - cannot process HDR parameter file\n");
+	return GF_OK;
+}
 #endif //#ifndef GPAC_DISABLE_CORE_TOOLS

gpac-0.7.1.tar.gz/applications/mp4box/live.c -> gpac-0.8.0.tar.gz/applications/mp4box/live.c Changed

@@ -148,7 +148,7 @@
 		gf_isom_streamer_write_sdp(file_streamer, sdp_file);
 
 if (run_for==0) run=GF_FALSE;
- 
+
 		while (run) {
 			gf_isom_streamer_send_next_packet(file_streamer, 0, 0);
 			check--;
@@ -958,4 +958,129 @@
 
 #endif /* GPAC_DISABLE_MPEG2TS */
 
+#ifndef GPAC_DISABLE_ATSC
+
+#include <gpac/atsc.h>
+
+static Bool inspect_mode = GF_FALSE;
+
+static u32 nb_services=0;
+void atsc_on_evt(void *udta, GF_ATSCEventType evt, u32 evt_param, GF_ATSCEventFileInfo *info)
+{
+	switch (evt) {
+	case GF_ATSC_EVT_SERVICE_FOUND:
+		fprintf(stderr, "found service id %d\n", evt_param);
+		nb_services++;
+		break;
+	case GF_ATSC_EVT_SERVICE_SCAN:
+		fprintf(stderr, "Done scaning all services\n");
+		break;
+	case GF_ATSC_EVT_SEG:
+		if (inspect_mode) {
+			gf_atsc3_dmx_remove_object_by_name( (GF_ATSCDmx *) udta, evt_param, (char *) info->filename, GF_FALSE);
+		}
+		break;
+	case GF_ATSC_EVT_MPD:
+		if (inspect_mode) {
+			fprintf(stderr, "MPD update found\n");
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+static void atsc_stats(GF_ATSCDmx *atscd, u32 now)
+{
+	Double rate=0.0;
+	u64 st = gf_atsc3_dmx_get_first_packet_time(atscd);
+	u64 et = gf_atsc3_dmx_get_last_packet_time(atscd);
+	u64 nb_pck = gf_atsc3_dmx_get_nb_packets(atscd);
+	u64 nb_bytes = gf_atsc3_dmx_get_recv_bytes(atscd);
+
+	et -= st;
+	if (et) {
+		rate = (Double)nb_bytes*8;
+		rate /= et;
+	}
+	if (now) {
+		fprintf(stderr, " \r");
+		fprintf(stderr, "At %us stats: "LLU" bytes "LLU" packets in "LLU" ms rate %.02f mbps\r", now/1000, nb_bytes, nb_pck, et/1000, rate);
+	} else {
+		fprintf(stderr, "\nFinal stats: "LLU" bytes "LLU" packets in "LLU" ms rate %.02f mbps\n", nb_bytes, nb_pck, et/1000, rate);
+	}
+}
+
+u32 grab_atsc3_session(const char *dir, const char *ifce, s32 serviceID, s32 atsc_max_segs, u32 stats_rate, u32 debug_tsi)
+{
+	GF_ATSCDmx *atscd;
+	Bool run = GF_TRUE;
+	GF_SystemRTInfo rti;
+	u32 nb_stats=1;
+	u32 start_time = gf_sys_clock();
+
+	gf_sys_get_rti(0, &rti, 0);
+
+	atscd = gf_atsc3_dmx_new(ifce, dir, 0);
+	if (!atscd) {
+		fprintf(stderr, "Failed to create ATSC3 demuxer\n");
+		return 1;
+	}
+	gf_atsc3_set_callback(atscd, atsc_on_evt, atscd);
+	gf_atsc3_tune_in(atscd, (u32) serviceID, GF_FALSE);
+	if (atsc_max_segs>=0)
+		gf_atsc3_set_max_objects_store(atscd, (u32) atsc_max_segs);
+
+	if (debug_tsi) {
+		fprintf(stderr, "Filtering objects from TSI %d only\n", debug_tsi);
+		gf_atsc3_dmx_debug_tsi(atscd, debug_tsi);
+	}
+
+	if (!dir) {
+		fprintf(stderr, "No output dir, ATSC3 demux inspect mode only\n");
+		inspect_mode = GF_TRUE;
+	}
+	fprintf(stderr, "Starting ATSC3 demux, press 'q' to stop, 'm' for memory/cpu info\n");
+
+	while (atscd && run) {
+		Bool is_empty = GF_TRUE;
+		GF_Err e = gf_atsc3_dmx_process(atscd);
+		if (e != GF_IP_NETWORK_EMPTY) is_empty = GF_FALSE;
+
+		if (is_empty) {
+			u32 /*st, */now = gf_sys_clock()- start_time;
+			gf_sleep(1);
+
+			if (gf_prompt_has_input()) {
+				u8 c = gf_prompt_get_char();
+				switch (c) {
+				case 'q':
+					run = GF_FALSE;
+					break;
+				case 'm':
+					gf_sys_get_rti(100, &rti, 0);
+					fprintf(stderr, "CPU %02d - memory "LLU"\n", rti.process_cpu_usage, rti.gpac_memory);
+					break;
+				}
+			}
+
+			if (!nb_services && (now >=10000)) {
+				fprintf(stderr, "\nNo ATSC3 service found in %u ms, aborting\n", now);
+				run = GF_FALSE;
+			}
+			if (stats_rate) {
+				/*st = gf_sys_clock();*/
+				if (now >= nb_stats*1000*stats_rate) {
+					nb_stats+=1;
+					atsc_stats(atscd, now);
+				}
+			}
+		}
+	}
+	atsc_stats(atscd, 0);
+	gf_atsc3_dmx_del(atscd);
+	fprintf(stderr, "\n");
+	return 0;
+}
 
+#endif /* GPAC_DISABLE_ATSC */

gpac-0.7.1.tar.gz/applications/mp4box/main.c -> gpac-0.8.0.tar.gz/applications/mp4box/main.c Changed

@@ -71,9 +71,15 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
 GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, Double force_fps, u32 frames_per_sample);
+#else
+GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, Double force_fps, u32 frames_per_sample) {
+	return GF_NOT_SUPPORTED;
+}
+#endif
 GF_Err split_isomedia_file(GF_ISOFile *mp4, Double split_dur, u64 split_size_kb, char *inName, Double interleaving_time, Double chunk_start, Bool adjust_split_end, char *outName, const char *tmpdir);
-GF_Err cat_isomedia_file(GF_ISOFile *mp4, char *fileName, u32 import_flags, Double force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command);
+GF_Err cat_isomedia_file(GF_ISOFile *mp4, char *fileName, u32 import_flags, Double force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command, Bool is_pl);
 
 #if !defined(GPAC_DISABLE_SCENE_ENCODER)
 GF_Err EncodeFile(char *in, GF_ISOFile *mp4, GF_SMEncodeOptions *opts, FILE *logs);
@@ -81,6 +87,7 @@
 #endif
 
 GF_ISOFile *package_file(char *file_name, char *fcc, const char *tmpdir, Bool make_wgt);
+GF_Err hdr_file(GF_ISOFile* movie, char* file_name);
 
 #endif
 
@@ -90,6 +97,8 @@
 GF_Err set_file_udta(GF_ISOFile *dest, u32 tracknum, u32 udta_type, char *src, Bool is_box_array);
 u32 id3_get_genre_tag(const char *name);
 
+GF_Err rip_mpd(const char *mpd);
+
 /*in filedump.c*/
 #ifndef GPAC_DISABLE_SCENE_DUMP
 GF_Err dump_isom_scene(char *file, char *inName, Bool is_final_name, GF_SceneDumpFormat dump_mode, Bool do_log);
@@ -114,8 +123,10 @@
 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);
-void dump_isom_nal(GF_ISOFile *file, u32 trackID, char *inName, Bool is_final_name);
+void dump_isom_timestamps(GF_ISOFile *file, char *inName, Bool is_final_name, u32 dump_mode);
+void dump_isom_nal(GF_ISOFile *file, u32 trackID, char *inName, Bool is_final_name, Bool dump_crc);
+
+void dump_isom_saps(GF_ISOFile *file, u32 trackID, u32 dump_saps_mode, char *inName, Bool is_final_name);
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
 void dump_isom_ismacryp(GF_ISOFile *file, char *inName, Bool is_final_name);
@@ -143,6 +154,10 @@
 u32 grab_live_m2ts(const char *grab_m2ts, const char *ifce_name, const char *outName);
 #endif
 
+#ifndef GPAC_DISABLE_ATSC
+u32 grab_atsc3_session(const char *dir, const char *ifce, s32 serviceID, s32 max_segs, u32 stats_rate, u32 debug_tsi);
+#endif
+
 int mp4boxTerminal(int argc, char **argv);
 
 u32 quiet = 0;
@@ -190,7 +205,7 @@
 void PrintVersion()
 {
 	fprintf(stderr, "MP4Box - GPAC version " GPAC_FULL_VERSION "\n"
-	 "GPAC Copyright (c) Telecom ParisTech 2000-2012\n"
+	 "(c) Telecom ParisTech 2000-2018 - Licence LGPL v2\n"
 	 "GPAC Configuration: " GPAC_CONFIGURATION "\n"
 	 "Features: %s\n", gpac_features());
 }
@@ -223,6 +238,7 @@
 	 " -no-sys removes all MPEG-4 Systems info except IOD (profiles)\n"
 	 " * Note: Set by default whith '-add' and '-cat'\n"
 	 " -no-iod removes InitialObjectDescriptor from file\n"
+	 " -mfra inserts movie fragment random offset when fragmenting file (ignored in dash mode).\n"
 	 " -isma rewrites the file as an ISMA 1.0 AV file\n"
 	 " -ismax same as \'-isma\' and removes all clock references\n"
 	 " -3gp rewrites as 3GPP(2) file (no more MPEG-4 Systems Info)\n"
@@ -239,13 +255,15 @@
 	 " -swap-track-id id1:id2 swaps the IDs of the identified tracks\n"
 	 " -rem trackID removes track from file\n"
 	 " -rap trackID removes all non-RAP samples from track\n"
+	 " -refonly trackID removes all non-reference pictures from track\n"
 	 " -enable trackID enables track\n"
 	 " -disable trackID disables track\n"
 	 " -new forces creation of a new destination file\n"
 	 " -timescale VAL sets movie timescale to VAL ticks per second (default is 600)\n"
 	 " -lang [tkID=]LAN sets track language. LAN is the BCP-47 code (eng, en-UK, ...)\n"
 	 " -delay tkID=TIME sets track start delay in ms\n"
-	 " -par tkID=PAR sets visual track pixel aspect ratio (PAR=N:D or \"none\")\n"
+	 " -par tkID=PAR sets visual track pixel aspect ratio (PAR=N:D or \"none\" or \"force\" to write anyway)\n"
+	 " -hdr file path to XML file describing HDR boxes (mdcv, clli, ...)"
 	 " -name tkID=NAME sets track handler name\n"
 	 " * NAME can indicate a UTF-8 file (\"file://file name\"\n"
 	 " -itags tag1[:tag2] sets iTunes tags to file - more info: MP4Box -tag-list\n"
@@ -256,6 +274,7 @@
 	 " -split-rap splits in files beginning at each RAP. same as -splitr.\n"
 	 " * Note: this removes all MPEG-4 Systems media\n"
 	 " -split-chunk S:E extracts a new file from Start to End (in seconds). same as -splitx\n"
+	 " E may be a number, \"end\" or \"end-N\", where N is a number of seconds before the end\n"
 	 " * Note: this removes all MPEG-4 Systems media\n"
 	 " -splitz S:E same as -split-chunk, but adjust the end time to be before the last RAP sample\n"
 	 " * Note: this removes all MPEG-4 Systems media\n"
@@ -298,14 +317,13 @@
 void PrintDASHUsage()
 {
 	fprintf(stderr, "DASH Options:\n"
-	 " -mpd m3u8 converts HLS manifest (local or remote http) to MPD \n"
+	 " -mpd m3u8 converts HLS manifest (local or remote http) to MPD\n"
 	 " Note: not compatible with other DASH options (except -out and -tmp) and does not convert associated segments\n"
 	 " -dash dur enables DASH-ing of the file(s) with a segment duration of DUR ms\n"
 	 " Note: the duration of a fragment (subsegment) is set\n"
 	 "	 using the -frag switch.\n"
 	 " Note: for onDemand profile, sets duration of a subsegment\n"
-	 " -dash-strict dur enables DASH-ing of the file(s) with a segment duration of DUR ms (old behaviour)\n"
-	 " Note: the duration will be the closest to \'dur\', and will remain constant\n"
+	 " -dash-strict dur [DEPRECATED, will behave like -dash]\n"
 	 " -dash-live[=F] dur generates a live DASH session using dur segment duration, optionally writing live context to F\n"
 	 " MP4Box will run the live session until \'q\' is pressed or a fatal error occurs.\n"
 	 " -ddbg-live[=F] dur same as -dash-live without time regulation for debug purposes.\n"
@@ -328,10 +346,11 @@
 	 " \"#audio\" only uses the first audio track from the source file\n"
 	 " \":id=NAME\" sets the representation ID to NAME\n"
 	 " \":dur=VALUE\" processes VALUE seconds from the media\n"
-	 " If VALUE is longer than the media duration, the last media duration is lengthen.\n"
+	 " If VALUE is longer than media duration, last sample duration is extended.\n"
 	 " \":period=NAME\" sets the representation's period to NAME. Multiple periods may be used\n"
 	 " period appear in the MPD in the same order as specified with this option\n"
 	 " \":BaseURL=NAME\" sets the BaseURL. Set multiple times for multiple BaseURLs\n"
+	 " WARNING: this does NOT modify generated files location (see segment template).\n"
 	 " \":bandwidth=VALUE\" sets the representation's bandwidth to a given value\n"
 	 " \":period_duration=VALUE\" increases the duration of this period by the given duration in seconds\n"
 	 " only used when no input media is specified (remote period insertion), eg :period=X:xlink=Z:duration=Y.\n"
@@ -346,6 +365,7 @@
 	 " value is ignored while creating AdaptationSet elements.\n"
 	 " \":desc_rep=VALUE\" adds a descriptor at the Representation level. Value must be a properly formatted XML element.\n"
 	 " value is ignored while creating AdaptationSet elements.\n"
+	 " \":sscale\" forces movie timescale to match media timescale of the first track in the segment.\n"
 	 "\n"
 	 " -rap segments begin with random access points\n"
 	 " Note: segment duration may not be exactly what asked by\n"
@@ -356,11 +376,23 @@
 	 " -segment-name name sets the segment name for generated segments\n"
 	 " If not set (default), segments are concatenated in output file\n"
 	 " except in \"live\" profile where dash_%%s is used\n"
+	 " Replacement strings supported:\n"
+	 " $Number[%%0Nd]$ is replaced by the segment number, possibly prefixed with 0.\n"
+	 " $RepresentationID$ is replaced by representation name.\n"
+	 " $Time$ is replaced by segment start time.\n"
+	 " $Bandwidth$ is replaced by representation bandwidth.\n"
+	 " $Init=NAME$ is replaced by NAME for init segment, ignored otherwise. May occur multiple times.\n"
+	 " $Index=NAME$ is replaced by NAME for index segments, ignored otherwise. May occur multiple times.\n"
+	 " $Path=PATH$ is replaced by PATH when creating segments, ignored otherwise. May occur multiple times.\n"
+	 " $Segment=NAME$ is replaced by NAME for media segments, ignored for init segments. May occur multiple times.\n"
+			"\n"
 	 " -segment-ext name sets the segment extension. Default is m4s, \"null\" means no extension\n"
+	 " -init-segment-ext n sets the segment extension for init segments (and index and bitstream switching segments). Default is mp4, \"null\" means no extension\n"
 	 " -segment-timeline uses SegmentTimeline when generating segments.\n"
 	 " -segment-marker MARK adds a box of type \'MARK\' at the end of each DASH segment. MARK shall be a 4CC identifier\n"
-	 " -insert-utc inserts UTC clock at the begining of each ISOBMF segment\n"
+	 " -insert-utc inserts UTC clock at the beginning of each ISOBMF segment\n"
 	 " -base-url string sets Base url at MPD level. Can be used several times.\n"
+	 " WARNING: this does NOT modify generated files location (see segment template).\n"
 	 " -mpd-title string sets MPD title.\n"
 	 " -mpd-source string sets MPD source.\n"
 	 " -mpd-info-url string sets MPD info url.\n"
@@ -373,19 +405,27 @@
 	 " -time-shift TIME specifies MPD time shift buffer depth in seconds (default 0). Specify -1 to keep all files\n"
 	 " -subdur DUR specifies maximum duration in ms of the input file to be dashed in LIVE or context mode.\n"
 	 " NOTE: This does not change the segment duration: dashing stops once segments produced exceeded the duration.\n"
-	 " -dash-run-for TIME In case of dash live, runs for T ms of the media then exits\n"
+	 " NOTE: If there is not enough samples to finish a segment, data is looped unless -no-loop is used (period end).\n"
+	 " -run-for TIME runs for T ms of the dash-live session then exits\n"
 	 " -min-buffer TIME specifies MPD min buffer time in milliseconds\n"
 	 " -ast-offset TIME specifies MPD AvailabilityStartTime offset in ms if positive, or availabilityTimeOffset of each representation if negative. Default is 0 sec delay\n"
 	 " -dash-scale SCALE specifies that timing for -dash and -frag are expressed in SCALE units per seconds\n"
 	 " -mem-frags fragments will be produced in memory rather than on disk before flushing to disk\n"
-	 " -pssh-moof stores PSSH boxes in first moof of each segments. By default PSSH are stored in movie box.\n"
+	 " -pssh-moof [deprecated] use -pssh=f\n"
+	 " -pssh=MODE sets pssh store mode. Mode can be v (moov), f (frag), m (mpd) mv/vm (moov+mpd) mf/fm (moof+mpd).\n"
 	 " -sample-groups-traf stores sample group descriptions in traf (duplicated for each traf). If not used, sample group descriptions are stored in the movie box.\n"
+			" -mvex-after-traks Stores mvex box after trak boxes within the moov box. If not used, mvex is before.\n"
+	 " -no-cache disable file cache for dash inputs .\n"
+	 " -no-loop disables looping content in live mode and uses period switch instead.\n"
+	 " -bound enables video segmentation with same method as audio (i.e.: always try to split before or at the segment boundary - not after)\n"
+	 " -closest enables video segmentation closest to the segment boundary (before or after)\n"
 
 	 "\n"
 	 "Advanced Options, should not be needed when using -profile:\n"
 	 " -subsegs-per-sidx N sets the number of subsegments to be written in each SIDX box\n"
 	 " If 0, a single SIDX box is used per segment\n"
 	 " If -1, no SIDX box is used\n"
+	 " -ssix Enables SubsegmentIndexBox (describing 2 ranges, first one from moof to end of first I-frame, second one unmapped). Doesn't work with daisy chaining mode\n"
 	 " -url-template uses SegmentTemplate instead of explicit sources in segments.\n"
 	 " Ignored if segments are stored in the output file.\n"
 	 " -daisy-chain uses daisy-chain SIDX instead of hierarchical. Ignored if frags/sidx is 0.\n"
@@ -394,8 +434,9 @@
 	 " -bs-switching MODE sets bitstream switching to \"inband\" (default), \"merge\", \"multi\", \"no\" or \"single\" to test with single input.\n"
 	 " -moof-sn N sets sequence number of first moof to N\n"
 	 " -tfdt N sets TFDT of first traf to N in SCALE units (cf -dash-scale)\n"
-	 " -no-frags-default disables default flags in fragments\n"
+	 " -no-frags-default disables default fragments flags in trex (required by some dash-if profiles and CMAF/smooth streaming compatibility)\n"
 	 " -single-traf uses a single track fragment per moof (smooth streaming and derived specs may require this)\n"
+ " -tfdt-traf uses a tfdt per track fragment (when -single-traf is used)\n"
 	 " -dash-ts-prog N program_number to be considered in case of an MPTS input file.\n"
 	 " -frag-rt when using fragments in live mode, flush fragments according to their timing (only supported with a single input).\n"
 	 " -cp-location=MODE sets ContentProtection element location. Possible values for mode are:\n"
@@ -404,6 +445,8 @@
 	 " both: sets ContentProtection in both elements\n"
 	 " -start-date for live mode, sets start date (as xs:date, eg YYYY-MM-DDTHH:MM:SSZ. Default is now.\n"
 	 " !! Do not use with multiple periods, nor when DASH duration is not a multiple of GOP size !!\n"
+	 " -cues ignores dash duration and segment according to cue times in given XML file. See tests/media/dash_cues for examples.\n"
+	 " -strict-cues throw error if something is wrong while parsing cues or applying cue-based segmentation.\n"
 	 "\n");
 }
 
@@ -478,9 +521,11 @@
 	 " If G is 0, the first available GroupID will be picked.\n"
 	 " \":fps=VAL\" same as -fps option\n"
 	 " \":rap\" imports only RAP samples\n"
+	 " \":refs\" imports only reference pictures\n"
 	 " \":trailing\" keeps trailing 0-bytes in AVC/HEVC samples\n"
 	 " \":agg=VAL\" same as -agg option\n"
 	 " \":dref\" same as -dref option\n"
+	 " \":keep_refs\" keeps track reference when importing a single track\n"
 	 " \":nodrop\" same as -nodrop option\n"
 	 " \":packed\" same as -packed option\n"
 	 " \":sbr\" same as -sbr option\n"
@@ -488,6 +533,12 @@
 	 " \":ovsbr\" same as -ovsbr option\n"
 	 " \":ps\" same as -ps option\n"
 	 " \":psx\" same as -psx option\n"
+	 " \":asemode=MODE\" sets the mode to create the AudioSampleEntry\n"
+	 " \" v0-bs : uses MPEG AudioSampleEntry v0 and the channel count from the bitstream (even if greater than 2) - default\n"
+	 " \" v0-2 : uses MPEG AudioSampleEntry v0 and the channel count is forced to 2\n"
+	 " \" v1 : uses MPEG AudioSampleEntry v1 and the channel count from the bitstream\n"
+	 " \" v1-qt : uses QuickTime Sound Sample Description Version 1 and the channel count from the bitstream (even if greater than 2)\n"
+			" \":audio_roll=N\" adds a roll sample group with roll_distance = N\n"
 	 " \":mpeg4\" same as -mpeg4 option\n"
 	 " \":nosei\" discard all SEI messages during import\n"
 	 " \":svc\" import SVC/LHVC with explicit signaling (no AVC base compatibility)\n"
@@ -495,12 +546,20 @@
 	 " \":svcmode=MODE\" sets SVC/LHVC import mode:\n"
 	 " \" split : each layer is in its own track\n"
 	 " \" merge : all layers are merged in a single track\n"
-	 " \" splitbase : all layers are merged in a track, and the AVC base in another\n"
+	 " \" splitbase : all layers are merged in a track, and the AVC/HEVC base in another\n"
+	 " \" splitnox : each layer is in its own track, and no extractors are written\n"
+	 " \" splitnoxib : each layer is in its own track, no extractors are written, using inband param set signaling\n"
+	 " \":temporal\" sets HEVC/LHVC temporal sublayer import mode:\n"
+	 " \" split : each sublayer is in its own track\n"
+	 " \" splitbase : all sublayers are merged in a track, and the HEVC base in another\n"
 	 " \" splitnox : each layer is in its own track, and no extractors are written\n"
 	 " \":subsamples\" adds SubSample information for AVC+SVC\n"
+	 " \":deps\" import sample dependency information for AVC and HEVC\n"
+	 " \":ccst\" adds default HEIF ccst box to visual sample entry\n"
 	 " \":forcesync\" forces non IDR samples with I slices to be marked as sync points (AVC GDR)\n"
 	 " !! RESULTING FILE IS NOT COMPLIANT WITH THE SPEC but will fix seeking in most players\n"
 	 " \":xps_inband\" Sets xPS inband for AVC/H264 and HEVC (for reverse operation, re-import from raw media)\n"
+	 " \":au_delim\" Keeps AU delimiter NAL units in the imported file\n"
 	 " \":max_lid=N\" sets HEVC max layer ID to be imported to N. Default imports all.\n"
 	 " \":max_tid=N\" sets HEVC max temporal ID to be imported to N. Default imports all.\n"
 	 " \":tiles\" adds HEVC tiles signaling and NALU maps without splitting the tiles into different tile tracks.\n"
@@ -520,13 +579,15 @@
 	 " track area\n"
 	 " - X and Y can be omitted (:layout=WxH)\n"
 	 " \":rescale=TS\" forces media timescale to TS !! changes the media duration\n"
-	 " \":timescale=TS\" sets import timescale to TS\n"
+	 " \":timescale=TS\" sets imported media timescale to TS.\n"
+	 " \":moovts=TS\" sets movie timescale to TS. A negative value picks the media timescale of the first track imported.\n"
 	 " \":noedit\" do not set edit list when importing B-frames video tracks\n"
-	 " \":rvc=FILENAME\" sets TVC configuration for the media\n"
+	 " \":rvc=FILENAME\" sets RVC configuration for the media\n"
 	 " \":fmt=FORMAT\" overrides format detection with given format (cf BT/XMTA doc)\n"
 	 " \":profile=INT\" overrides AVC profile\n"
 	 " \":level=INT\" overrides AVC level\n"
 	 " \":novpsext\" removes VPS extensions from HEVC VPS\n"
+	 " \":keepav1t\" keeps AV1 temporal delimiter OBU in samples, might help if source file had losses\n"
 
 	 " \":font=name\" specifies font name for text import (default \"Serif\")\n"
 	 " \":size=s\" specifies font size for text import (default 18)\n"
@@ -555,6 +616,13 @@
 	 " \":txtflags=flags\" sets display flags (hexa number) of text track\n"
 	 " \":txtflags+=flags\" adds display flags (hexa number) to text track\n"
 	 " \":txtflags-=flags\" removes display flags (hexa number) from text track\n"
+	 " \":rate=VAL\" forces average rate and max rate to VAL (in bps) in btrt box. If 0, removes btrt box\n"
+	 " \":bitdepth=VAL\" sets bit depth to VAL for imported video content (default is 24)\n"
+	 " \":colr=OPT\" sets color profile for imported video content (see ISO/IEC 23001-8). OPT is formatted as:\n"
+	 " - \"nclc,p,t,m\" : with p colour primary, t transfer characteristics and m matrix coef\n"
+	 " - \"nclx,p,t,m,r\" : same as nclx with r full range flag\n"
+	 " - \"prof,path\" : with path indicating the file containing the ICC color profile\n"
+	 " - \"rICC,path\" : with path indicating the file containing the restricted ICC color profile\n"
 	 "\n"
 	 " -add file add file tracks to (new) output file\n"
 	 " -cat file concatenates file samples to (new) output file\n"
@@ -562,6 +630,8 @@
 	 " * Note: aligns initial timestamp of the file to be concatenated.\n"
 	 " -catx file same as cat but new tracks can be imported before concatenation by specifying '+ADD_COMMAND'\n"
 	 " where ADD_COMMAND is a regular -add syntax\n"
+	 " -catpl file concatenates files listed in the given file (one file per line, lines starting with # are comments).\n"
+	 " * each listed file is concatenated as if called with -cat\n"
 	 " -unalign-cat does not attempt to align timestamps of samples inbetween tracks\n"
 	 " -force-cat skips media configuration check when concatenating file\n"
 	 " !!! THIS MAY BREAK THE CONCATENATED TRACK(S) !!!\n"
@@ -737,29 +807,40 @@
 	 " -diso dumps IsoMedia file boxes in XML output\n"
 	 " -dxml dumps IsoMedia file boxes and known track samples in XML output\n"
 	 " -drtp rtp hint samples structure to XML output\n"
-	 " -dts prints sample timing to text output\n"
+	 " -dts prints sample timing, size and position in file to text output\n"
+	 " -dtsx same as -dts but does not print offset\n"
+	 " -dtsc same as -dts but analyse each sample for duplicated dts/cts - slow !\n"
+	 " -dtsxc same as -dtsc does not print offset - slow !\n"
 	 " -dnal trackID prints NAL sample info of given track\n"
+	 " -dnalc trackID prints NAL sample info of given track, adding CRC for each nal\n"
 	 " -sdp dumps SDP description of hinted file\n"
+	 " -sdp dumps SDP description of hinted file\n"
+	 " -dsap trackID dumps DASH SAP cues (see -cues) for a given track.\n"
+	 " use -dsaps to only print sample number, -dsapc to only CTS, -dsapd to only print DTS, -dsapp to only print presentation time.\n"
 	 " -dcr ISMACryp samples structure to XML output\n"
-	 " -dump-cover Extracts cover art\n"
-	 " -dump-chap Extracts chapter file\n"
-	 " -dump-chap-ogg Extracts chapter file as OGG format\n"
-	 " -dump-udta [ID:]4cc Extracts udta for the given 4CC. If ID is given, dumps from UDTA of the given track ID, otherwise moov is used.\n"
+	 " -dump-cover extracts cover art\n"
+	 " -dump-chap extracts chapter file\n"
+	 " -dump-chap-ogg extracts chapter file as OGG format\n"
+	 " -dump-udta [ID:]4cc extracts udta for the given 4CC. If ID is given, dumps from UDTA of the given track ID, otherwise moov is used.\n"
 	 "\n"
 #ifndef GPAC_DISABLE_ISOM_WRITE
-	 " -ttxt Converts input subtitle to GPAC TTXT format\n"
+	 " -ttxt converts input subtitle to GPAC TTXT format\n"
 #endif
-	 " -ttxt TrackID Dumps Text track to GPAC TTXT format\n"
+	 " -ttxt TrackID dumps Text track to GPAC TTXT format\n"
 #ifndef GPAC_DISABLE_ISOM_WRITE
-	 " -srt Converts input subtitle to SRT format\n"
+	 " -srt converts input subtitle to SRT format\n"
 #endif
-	 " -srt TrackID Dumps Text track to SRT format\n"
+	 " -srt TrackID dumps Text track to SRT format\n"
+	 "\n"
+	 " -rip-mpd download manifest and segments of an MPD. Does not work with live sessions\n"
 	 "\n"
 	 " -stat generates node/field statistics for scene\n"
 	 " -stats generates node/field statistics per MPEG-4 Access Unit\n"
 	 " -statx generates node/field statistics for scene after each AU\n"
 	 "\n"
 	 " -hash generates SHA-1 Hash of the input file\n"
+	 "\n"
+	 " -comp BOXLIST compresses top level box listed. The list is formated as orig_4cc_1=comp_4cc_1[,orig_4cc_2=comp_4cc_2]\n"
 #ifndef GPAC_DISABLE_CORE_TOOLS
 	 " -bin converts input XML file using NHML bitstream syntax to binary\n"
 #endif
@@ -784,12 +865,18 @@
 		" encoding=enctype: item content-encoding type\n"
 		" id=id:	 item ID\n"
 		" ref=4cc,id: reference of type 4cc to an other item\n"
-		" Image Item options\n"
-		" image-size=wxh sets the width and height of the image.\n"
-		" image-pasp=wxh sets the pixel aspect ratio property of the image.\n"
-		" image-rloc=wxh sets the location of this image within another image item.\n"
-		" image-irot=a sets the rotation angle for this image to 90*a degrees anti-clockwise.\n"
-		" image-hidden indicates that this image item should be hidden.\n"
+		" -add-image args adds the given file (with parameters) as HEIF image item \n"
+		" * same syntax as add-item with the following options\n"
+		"						 name=str			same as for -add-item\n"
+		"						 id=id				same as for -add-item\n"
+		"						 ref=4cc, id		same as for -add-item\n"
+		" primary			indicates that this item should be the primary item.\n"
+		"						 time=t				uses the next sync sample after time t (float, in sec, default 0)\n"
+		"						 split_tiles		for an HEVC tiled image, each tile is stored as a separate item\n"
+		" rotation=a sets the rotation angle for this image to 90*a degrees anti-clockwise.\n"
+		" hidden indicates that this image item should be hidden.\n"
+		" icc_path path to icc to add as colr.\n"
+		" alpha indicates that the image is an alpha image (should use ref=auxl also).\n"
 		" -rem-item args removes resource from meta - syntax: item_ID[:tk=ID]\n"
 		" -set-primary args sets item as primary for meta - syntax: item_ID[:tk=ID]\n"
 		" -set-xml args sets meta XML data\n"
@@ -828,6 +915,25 @@
 	 );
 }
 
+void PrintATSCUsage()
+{
+	fprintf(stderr,
+	 "ATSC3 reader Options\n"
+	 "\n"
+	 "MP4Box can read ATSC3 sessions from network. \n"
+	 "\n"
+	 " -atsc 			enables ATSC3 reader\n"
+	 " -ifce IP			IP adress of network interface to use\n"
+	 " -dir PATH			local filesystem path to which the files are written. If not set, nothing is written to disk.\n"
+	 " -service ID:		ID of the service to grab. If not set or -1, all services are dumped. If 0, no services are dumped. If -2, the first service found is used.\n"
+	 " -nb-segs N:		sets max segments to keep on disk per stream. -1 (default) keeps all.\n"
+	 " -atsc-stats N:	prints stats every N seconds. If 0 (default) stats disabled.\n"
+	 "\n"
+	 "On OSX with VM packet replay you will need to force mcast routing, eg:\n"
+	 "route add -net 239.255.1.4/32 -interface vboxnet0\n"
+	 "\n"
+	 );
+}
 void PrintUsage()
 {
 	fprintf (stderr, "MP4Box [option] input [option]\n"
@@ -844,6 +950,7 @@
 	 " -h format supported formats help\n"
 	 " -h rtp file streamer help\n"
 	 " -h live BIFS streamer help\n"
+	 " -h atsc ATSC3 reader help\n"
 	 " -h all all options are printed\n"
 	 "\n"
 	 " -nodes lists supported MPEG4 nodes\n"
@@ -854,8 +961,8 @@
 	 " -languages lists supported ISO 639 languages\n"
 	 " -boxes lists all supported ISOBMF boxes and their syntax\n"
 	 "\n"
-	 " -quiet quiet mode\n"
-	 " -noprog disables progress\n"
+	 " -quiet quiet mode\n"
+	 " -noprog disables progress\n"
 	 " -v verbose mode\n"
 	 " -logs set log tools and levels, formatted as a ':'-separated list of toolX[:toolZ]@levelX\n"
 	 " -log-file FILE sets output log file. Also works with -lf FILE\n"
@@ -969,6 +1076,18 @@
 				media_prio = 2;
 			}
 			break;
+ case GF_ISOM_MEDIA_AUXV:
+ if (single_av) {
+ media_group = 2;
+ media_prio = 3;
+ }
+ break;
+ case GF_ISOM_MEDIA_PICT:
+ if (single_av) {
+ media_group = 2;
+ media_prio = 4;
+ }
+ break;
 		case GF_ISOM_MEDIA_AUDIO:
 			if (single_av) {
 				media_group = 2;
@@ -979,7 +1098,7 @@
 			continue;
 		default:
 			/*no hinting of systems track on isma*/
-			if (spec_type==GF_4CC('I','S','M','A')) continue;
+			if (spec_type==GF_ISOM_BRAND_ISMA) continue;
 		}
 		mtype = gf_isom_get_media_subtype(file, i+1, 1);
 		if ((mtype==GF_ISOM_SUBTYPE_MPEG4) || (mtype==GF_ISOM_SUBTYPE_MPEG4_CRYP) ) mtype = gf_isom_get_mpeg4_subtype(file, i+1, 1);
@@ -1127,6 +1246,8 @@
 	for (i=0; i<gf_isom_get_track_count(file); i++) {
 		switch (gf_isom_get_media_type(file, i+1)) {
 		case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
 		case GF_ISOM_MEDIA_AUDIO:
 		case GF_ISOM_MEDIA_TEXT:
 		case GF_ISOM_MEDIA_SUBT:
@@ -1203,11 +1324,11 @@
 	return type;
 }
 
-#ifndef GPAC_DISABLE_ISOM_WRITE
+#if !defined(GPAC_DISABLE_MEDIA_IMPORT) && !defined(GPAC_DISABLE_ISOM_WRITE)
 static Bool can_convert_to_isma(GF_ISOFile *file)
 {
 	u32 spec = gf_isom_guess_specification(file);
-	if (spec==GF_4CC('I','S','M','A')) return GF_TRUE;
+	if (spec==GF_ISOM_BRAND_ISMA) return GF_TRUE;
 	return GF_FALSE;
 }
 #endif
@@ -1243,6 +1364,7 @@
 	char szPath[GF_MAX_PATH];
 	char szName[1024], mime_type[1024], enc_type[1024];
 	u32 item_id;
+	Bool primary;
 	u32 item_type;
 	u32 ref_item_id;
 	u32 ref_type;
@@ -1271,7 +1393,7 @@
 		strcpy(szSlot, opts);
 		next = strchr(szSlot, ':');
 		/*use ':' as separator, but beware DOS paths...*/
-		if (next && next[1]=='\\') next = strchr(szSlot+2, ':');
+		if (next && next[1]=='\\') next = strchr(next+2, ':');
 		if (next) next[0] = 0;
 
 		if (!strnicmp(szSlot, "tk=", 3)) {
@@ -1289,10 +1411,10 @@
 		}
 		else if (!strnicmp(szSlot, "ref=", 4)) {
 			char type[10];
-			sscanf(szSlot, "ref=%u,%s", &meta->ref_item_id, type);
+			sscanf(szSlot, "ref=%s,%u", type, &meta->ref_item_id);
 			meta->ref_type = GF_4CC(type[0], type[1], type[2], type[3]);
 			ret = 1;
-		}		
+		}
 		else if (!strnicmp(szSlot, "name=", 5)) {
 			strcpy(meta->szName, szSlot+5);
 			ret = 1;
@@ -1302,7 +1424,7 @@
 			ret = 1;
 		}
 		else if (!strnicmp(szSlot, "mime=", 5)) {
-			meta->item_type = GF_4CC('m','i','m','e');
+			meta->item_type = GF_META_ITEM_TYPE_MIME;
 			strcpy(meta->mime_type, szSlot+5);
 			ret = 1;
 		}
@@ -1331,43 +1453,60 @@
 			sscanf(szSlot+11, "%dx%d", &meta->image_props->hOffset, &meta->image_props->vOffset);
 			ret = 1;
 		}
-		else if (!strnicmp(szSlot, "image-irot=", 11)) {
+		else if (!strnicmp(szSlot, "rotation=", 9)) {
 			if (!meta->image_props) {
 				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
 			}
-			meta->image_props->angle = atoi(szSlot+11);
+			meta->image_props->angle = atoi(szSlot+9);
 			ret = 1;
 		}
-		else if (!strnicmp(szSlot, "image-hidden", 12)) {
+		else if (!stricmp(szSlot, "hidden")) {
 			if (!meta->image_props) {
 				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
 			}
 			meta->image_props->hidden = GF_TRUE;
 			ret = 1;
 		}
-		else if (!strnicmp(szSlot, "tilemode=", 9)) {
+		else if (!stricmp(szSlot, "alpha")) {
 			if (!meta->image_props) {
 				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
 			}
-			if (!strnicmp(szSlot + 9, "nobase", 6)) {
-				meta->image_props->tile_mode = TILE_ITEM_ALL_NO_BASE;
-			} else if (!strnicmp(szSlot + 9, "base", 4)) {
-				meta->image_props->tile_mode = TILE_ITEM_ALL_BASE;
-			} else if (!strnicmp(szSlot + 9, "grid", 4)) {
-				meta->image_props->tile_mode = TILE_ITEM_ALL_GRID;
-			} else {
-				meta->image_props->tile_mode = TILE_ITEM_SINGLE;
-				sscanf(szSlot + 9, "%d", &meta->image_props->single_tile_number);
-			}			
+			meta->image_props->alpha = GF_TRUE;
+			ret = 1;
 		}
-		else if (!strnicmp(szSlot, "dref", 4)) {
+		else if (!strnicmp(szSlot, "time=", 5)) {
+			if (!meta->image_props) {
+				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
+			}
+			meta->image_props->time = atof(szSlot+5);
+			ret = 1;
+		}
+		else if (!stricmp(szSlot, "split_tiles")) {
+			if (!meta->image_props) {
+				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
+			}
+			meta->image_props->tile_mode = TILE_ITEM_ALL_BASE;
+			ret = 1;
+		}
+		else if (!stricmp(szSlot, "dref")) {
 			meta->use_dref = 1;
 			ret = 1;
 		}
+		else if (!stricmp(szSlot, "primary")) {
+			meta->primary = 1;
+			ret = 1;
+		}
 		else if (!stricmp(szSlot, "binary")) {
 			if (meta->act_type==META_ACTION_SET_XML) meta->act_type=META_ACTION_SET_BINARY_XML;
 			ret = 1;
 		}
+		else if (!strnicmp(szSlot, "icc_path=", 9)) {
+			if (!meta->image_props) {
+				GF_SAFEALLOC(meta->image_props, GF_ImageItemProperties);
+			}
+			strcpy(meta->image_props->iccPath, szSlot+9);
+			ret = 1;
+		}
 		else if (!strchr(szSlot, '=')) {
 			switch (meta->act_type) {
 			case META_ACTION_SET_TYPE:
@@ -1509,6 +1648,7 @@
 	TRAC_ACTION_SET_ID			= 13,
 	TRAC_ACTION_SET_UDTA		= 14,
 	TRAC_ACTION_SWAP_ID			= 15,
+	TRAC_ACTION_REM_NON_REFS	= 16,
 } TrackActionType;
 
 typedef struct
@@ -1534,7 +1674,8 @@
 	GF_ISOM_CONV_TYPE_ISMA_EX,
 	GF_ISOM_CONV_TYPE_3GPP,
 	GF_ISOM_CONV_TYPE_IPOD,
-	GF_ISOM_CONV_TYPE_PSP
+	GF_ISOM_CONV_TYPE_PSP,
+	GF_ISOM_CONV_TYPE_MOV
 };
 
 
@@ -1577,6 +1718,7 @@
 				 !strnicmp(sep, ":bandwidth=", 11) ||
 				 !strnicmp(sep, ":role=", 6) ||
 				 !strnicmp(sep, ":desc", 5) ||
+				 !strnicmp(sep, ":sscale", 7) ||
 				 !strnicmp(sep, ":duration=", 10) || /*legacy*/!strnicmp(sep, ":period_duration=", 10) ||
 				 !strnicmp(sep, ":xlink=", 7)) {
 					break;
@@ -1643,6 +1785,7 @@
 
 			}
 			else if (!strnicmp(opts, "xlink=", 6)) di->xlink = gf_strdup(opts+6);
+			else if (!strnicmp(opts, "sscale", 6)) di->sscale = GF_TRUE;
 			else if (!strnicmp(opts, "period_duration=", 16)) {
 				di->period_duration = (Double) atof(opts+16);
 			}	else if (!strnicmp(opts, "duration=", 9)) {
@@ -1669,7 +1812,7 @@
 {
 	char *param = string;
 	if (!action || !string) return GF_BAD_PARAM;
-	
+
 	while (param) {
 		param = strchr(param, ':');
 		if (param) {
@@ -1775,6 +1918,254 @@
 }
 #endif /*GPAC_DISABLE_CORE_TOOLS*/
 
+static GF_Err do_compress_top_boxes(char *inName, char *outName, char *compress_top_boxes, u32 comp_top_box_version, Bool use_lzma)
+{
+	FILE *in, *out;
+	char *buf;
+	u32 buf_alloc, comp_size, start_offset;
+	s32 bytes_comp=0;
+	s32 bytes_uncomp=0;
+	GF_Err e = GF_OK;
+	u64 source_size, dst_size;
+	u32 orig_box_overhead;
+	u32 final_box_overhead;
+	u32 gzip_code = use_lzma ? GF_4CC('l','z','m','a') : GF_4CC('g','z','i','p') ;
+	u32 nb_added_box_bytes=0;
+	Bool has_mov = GF_FALSE;
+	u32 range_idx, nb_ranges=0;
+	Bool replace_all = !strcmp(compress_top_boxes, "*");
+	Bool requires_byte_ranges=GF_FALSE;
+	GF_BitStream *bs_in, *bs_out;
+	u32 idx_size=0, nb_moof;
+	struct _ranges {
+		u32 size, csize;
+	} *ranges=NULL;
+
+
+	in = gf_fopen(inName, "rb");
+	if (!in) return GF_URL_ERROR;
+	out = gf_fopen(outName, "wb");
+	if (!out) return GF_IO_ERR;
+
+	buf_alloc = 4096;
+	buf = gf_malloc(buf_alloc);
+
+	bs_in = gf_bs_from_file(in, GF_BITSTREAM_READ);
+	source_size = gf_bs_get_size(bs_in);
+
+	bs_out = gf_bs_from_file(out, GF_BITSTREAM_WRITE);
+
+	start_offset = 0;
+	nb_moof = 0;
+	if (comp_top_box_version==2) {
+		u32 i;
+		while (gf_bs_available(bs_in)) {
+			u32 size = gf_bs_read_u32(bs_in);
+			u32 type = gf_bs_read_u32(bs_in);
+			const char *b4cc = gf_4cc_to_str(type);
+			const char *replace = strstr(compress_top_boxes, b4cc);
+
+			if (start_offset) {
+				Bool compress = (replace || replace_all) ? 1 : 0;
+				ranges = gf_realloc(ranges, sizeof(struct _ranges)*(nb_ranges+1));
+				ranges[nb_ranges].csize = compress;
+				ranges[nb_ranges].size = size-8;
+				nb_ranges++;
+			}
+			if (!strcmp(b4cc, "ftyp") || !strcmp(b4cc, "styp")) {
+				if (!start_offset) start_offset = (u32) gf_bs_get_position(bs_in) + size-8;
+			}
+			if (!strcmp(b4cc, "sidx") || !strcmp(b4cc, "ssix")) {
+				requires_byte_ranges = GF_TRUE;
+			}
+			if (!strcmp(b4cc, "moof"))
+				nb_moof++;
+
+			gf_bs_skip_bytes(bs_in, size-8);
+		}
+
+		gf_bs_seek(bs_in, 0);
+		if (buf_alloc<start_offset) {
+			buf_alloc = start_offset;
+			buf = gf_realloc(buf, buf_alloc);
+		}
+		gf_bs_read_data(bs_in, buf, start_offset);
+		gf_bs_write_data(bs_out, buf, start_offset);
+
+		if (!requires_byte_ranges) {
+			nb_ranges = 0;
+			gf_free(ranges);
+			ranges = NULL;
+		}
+		idx_size = 8 + 4 + 4;
+		for (i=0; i<nb_ranges; i++) {
+			idx_size += 1;
+			if (ranges[i].size<0xFFFF) {
+				idx_size += 2;
+				if (ranges[i].csize) idx_size += 2;
+			} else {
+				idx_size += 4;
+				if (ranges[i].csize) idx_size += 4;
+			}
+			ranges[i].csize = 0;
+		}
+		i=idx_size;
+		while (i) {
+			gf_bs_write_u8(bs_out, 0);
+			i--;
+		}
+	}
+
+	range_idx = 0;
+	orig_box_overhead = 0;
+	final_box_overhead = 0;
+	while (gf_bs_available(bs_in)) {
+		u32 size = gf_bs_read_u32(bs_in);
+		u32 type = gf_bs_read_u32(bs_in);
+		const char *b4cc = gf_4cc_to_str(type);
+		const char *replace = strstr(compress_top_boxes, b4cc);
+		if (!strcmp(b4cc, "moov")) has_mov = GF_TRUE;
+
+		if (!replace && !replace_all) {
+			if (ranges) {
+				assert(! ranges[range_idx].csize);
+				range_idx++;
+			}
+			gf_bs_write_u32(bs_out, size);
+			gf_bs_write_u32(bs_out, type);
+
+			size-=8;
+			while (size) {
+				u32 nbytes = size;
+				if (nbytes>buf_alloc) nbytes=buf_alloc;
+				gf_bs_read_data(bs_in, buf, nbytes);
+				gf_bs_write_data(bs_out, buf, nbytes);
+				size-=nbytes;
+			}
+			continue;
+		}
+		orig_box_overhead += size;
+
+		if (comp_top_box_version != 1)
+			size-=8;
+
+		if (size>buf_alloc) {
+			buf_alloc = size;
+			buf = gf_realloc(buf, buf_alloc);
+		}
+		gf_bs_read_data(bs_in, buf, size);
+
+		if (comp_top_box_version != 1)
+			replace+=5;
+
+		comp_size = buf_alloc;
+
+		if (use_lzma) {
+			e = gf_lz_compress_payload(&buf, size, &comp_size);
+		} else {
+			e = gf_gz_compress_payload(&buf, size, &comp_size);
+		}
+		if (e) break;
+
+		if (comp_size>buf_alloc) {
+			buf_alloc = comp_size;
+		}
+		bytes_uncomp += size;
+		bytes_comp += comp_size;
+		if (comp_top_box_version==1)
+			nb_added_box_bytes +=8;
+
+		//write size
+		gf_bs_write_u32(bs_out, comp_size+8);
+		//write type
+		if (comp_top_box_version==1)
+			gf_bs_write_u32(bs_out, gzip_code);
+		else
+			gf_bs_write_data(bs_out, replace, 4);
+		//write data
+		gf_bs_write_data(bs_out, buf, comp_size);
+
+		final_box_overhead += 8+comp_size;
+
+		if (ranges) {
+			assert(ranges[range_idx].size == size);
+			ranges[range_idx].csize = comp_size;
+			range_idx++;
+		}
+	}
+	dst_size = gf_bs_get_position(bs_out);
+
+	if (comp_top_box_version==2) {
+		u32 i;
+		gf_bs_seek(bs_out, start_offset);
+		gf_bs_write_u32(bs_out, idx_size);
+		gf_bs_write_u32(bs_out, GF_4CC('c','m','a','p'));
+		gf_bs_write_u32(bs_out, gzip_code);
+		gf_bs_write_u32(bs_out, nb_ranges);
+		for (i=0; i<nb_ranges; i++) {
+			u32 large_size = ranges[i].size>0xFFFF ? 1 : 0;
+			gf_bs_write_int(bs_out, ranges[i].csize ? 1 : 0, 1);
+			gf_bs_write_int(bs_out, large_size ? 1 : 0, 1);
+			gf_bs_write_int(bs_out, 0, 6);
+			large_size = large_size ? 32 : 16;
+
+			gf_bs_write_int(bs_out, ranges[i].size, large_size);
+			if (ranges[i].csize)
+				gf_bs_write_int(bs_out, ranges[i].csize, large_size);
+		}
+		final_box_overhead += idx_size;
+		nb_added_box_bytes += idx_size;
+
+	}
+	gf_bs_del(bs_in);
+	gf_bs_del(bs_out);
+	gf_fclose(in);
+	gf_fclose(out);
+	if (e) {
+		fprintf(stderr, "Error compressing: %s\n", gf_error_to_string(e));
+		return e;
+	}
+
+	if (has_mov) {
+		u32 i, nb_tracks, nb_samples;
+		GF_ISOFile *mov;
+		Double rate, new_rate, duration;
+
+		mov = gf_isom_open(inName, GF_ISOM_OPEN_READ, NULL);
+		duration = (Double) gf_isom_get_duration(mov);
+		duration /= gf_isom_get_timescale(mov);
+
+		nb_samples = 0;
+		nb_tracks = gf_isom_get_track_count(mov);
+		for (i=0; i<nb_tracks; i++) {
+			nb_samples += gf_isom_get_sample_count(mov, i+1);
+		}
+		gf_isom_close(mov);
+
+		rate = (Double) source_size;
+		rate /= duration;
+		rate /= 1000;
+
+		new_rate = (Double) dst_size;
+		new_rate /= duration;
+		new_rate /= 1000;
+
+
+		fprintf(stderr, "Log format:\nname\torig\tcomp\tgain\tadded_bytes\torate\tcrate\tsamples\tobbps\tcbbps\n");
+		fprintf(stdout, "%s\t%d\t%d\t%g\t%d\t%g\t%g\t%d\t%g\t%g\n", inName, bytes_uncomp, bytes_comp, ((Double)(bytes_uncomp-bytes_comp)*100)/bytes_uncomp, nb_added_box_bytes, rate, new_rate, nb_samples, ((Double)orig_box_overhead)/nb_samples, ((Double)final_box_overhead)/nb_samples );
+
+		fprintf(stderr, "%s Compressing top-level boxes saved %d bytes out of %d (reduced by %g %%) additionnal bytes %d original rate %g kbps new rate %g kbps, orig %g box bytes/sample final %g bytes/sample\n", inName, bytes_uncomp-bytes_comp, bytes_uncomp, ((Double)(bytes_uncomp-bytes_comp)*100)/bytes_uncomp, nb_added_box_bytes, rate, new_rate, ((Double)orig_box_overhead)/nb_samples, ((Double)final_box_overhead)/nb_samples );
+
+	} else {
+		fprintf(stderr, "Log format:\nname\torig\tcomp\tgain\tadded_bytes\n");
+		fprintf(stdout, "%s\t%d\t%d\t%g\t%d\n", inName, bytes_uncomp, bytes_comp, ((Double) (bytes_uncomp - bytes_comp)*100)/(bytes_uncomp), nb_added_box_bytes);
+
+		fprintf(stderr, "%s Compressing top-level boxes saved %d bytes out of %d (reduced by %g %%) additionnal bytes %d\n", inName, bytes_uncomp-bytes_comp, bytes_uncomp, ((Double)(bytes_uncomp-bytes_comp)*100)/bytes_uncomp, nb_added_box_bytes);
+
+	}
+	return GF_OK;
+}
+
 static GF_Err hash_file(char *name, u32 dump_std)
 {
 	u32 i;
@@ -1796,9 +2187,9 @@
 Bool log_sys_clock = GF_FALSE;
 Bool log_utc_time = GF_FALSE;
 
-static void on_gpac_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
+static void on_mp4box_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
 {
-	FILE *logs = cbk;
+	FILE *logs = cbk ? cbk : stderr;
 
 	if (log_sys_clock) {
 		fprintf(logs, "At "LLD" ", gf_sys_clock_high_res() );
@@ -1831,18 +2222,20 @@
 u32 *brand_add = NULL;
 u32 *brand_rem = NULL;
 GF_DashSwitchingMode bitstream_switching_mode = GF_DASH_BSMODE_DEFAULT;
-u32 i, stat_level, hint_flags, info_track_id, import_flags, nb_add, nb_cat, crypt, agg_samples, nb_sdp_ex, max_ptime, split_size, nb_meta_act, nb_track_act, rtp_rate, major_brand, nb_alt_brand_add, nb_alt_brand_rem, old_interleave, car_dur, minor_version, conv_type, nb_tsel_acts, program_number, dump_nal, time_shift_depth, initial_moof_sn, dump_std, import_subtitle;
+u32 i, j, stat_level, hint_flags, info_track_id, import_flags, nb_add, nb_cat, crypt, agg_samples, nb_sdp_ex, max_ptime, split_size, nb_meta_act, nb_track_act, rtp_rate, major_brand, nb_alt_brand_add, nb_alt_brand_rem, old_interleave, car_dur, minor_version, conv_type, nb_tsel_acts, program_number, dump_nal, time_shift_depth, initial_moof_sn, dump_std, import_subtitle, dump_saps, dump_saps_mode;
 GF_DashDynamicMode dash_mode=GF_DASH_STATIC;
 #ifndef GPAC_DISABLE_SCENE_DUMP
 GF_SceneDumpFormat dump_mode;
 #endif
 Double mpd_live_duration = 0;
 Bool HintIt, needSave, FullInter, Frag, HintInter, dump_rtp, regular_iod, remove_sys_tracks, remove_hint, force_new, remove_root_od;
-Bool print_sdp, print_info, open_edit, dump_cr, force_ocr, encode, do_log, do_flat, dump_srt, dump_ttxt, dump_timestamps, do_saf, dump_m2ts, dump_cart, do_hash, verbose, force_cat, align_cat, pack_wgt, single_group, clean_groups, dash_live, no_fragments_defaults, single_traf_per_moof;
-char *inName, *outName, *arg, *mediaSource, *tmpdir, *input_ctx, *output_ctx, *drm_file, *avi2raw, *cprt, *chap_file, *pes_dump, *itunes_tags, *pack_file, *raw_cat, *seg_name, *dash_ctx_file;
-u32 track_dump_type, dump_isom;
+Bool print_sdp, print_info, open_edit, dump_cr, force_ocr, encode, do_log, do_flat, dump_srt, dump_ttxt, do_saf, dump_m2ts, dump_cart, do_hash, verbose, force_cat, align_cat, pack_wgt, single_group, clean_groups, dash_live, no_fragments_defaults, single_traf_per_moof, tfdt_per_traf, dump_nal_crc, do_mpd_rip;
+char *inName, *outName, *arg, *mediaSource, *tmpdir, *input_ctx, *output_ctx, *drm_file, *avi2raw, *cprt, *chap_file, *pes_dump, *itunes_tags, *pack_file, *raw_cat, *seg_name, *dash_ctx_file, *compress_top_boxes, *hdr_filename;
+u32 track_dump_type, dump_isom, dump_timestamps;
 u32 trackID;
+Bool comp_lzma=GF_FALSE;
 Double min_buffer = 1.5;
+u32 comp_top_box_version = 0;
 s32 ast_offset_ms = 0;
 u32 dump_chap = 0;
 u32 dump_udta_type = 0;
@@ -1851,6 +2244,7 @@
 u32 nb_mpd_base_urls = 0;
 u32 dash_scale = 1000;
 Bool insert_utc = GF_FALSE;
+const char *udp_dest = NULL;
 
 #ifndef GPAC_DISABLE_MPD
 Bool do_mpd = GF_FALSE;
@@ -1874,40 +2268,59 @@
 Bool force_test_mode = GF_FALSE;
 Bool force_co64 = GF_FALSE;
 Bool live_scene = GF_FALSE;
+Bool use_mfra = GF_FALSE;
 GF_MemTrackerType mem_track = GF_MemTrackerNone;
 
 Bool dump_iod = GF_FALSE;
-Bool pssh_in_moof = GF_FALSE;
+GF_DASHPSSHMode pssh_mode = 0;
 Bool samplegroups_in_traf = GF_FALSE;
+Bool mvex_after_traks = GF_FALSE;
 Bool daisy_chain_sidx = GF_FALSE;
+Bool use_ssix = GF_FALSE;
 Bool single_segment = GF_FALSE;
 Bool single_file = GF_FALSE;
 Bool segment_timeline = GF_FALSE;
 u32 segment_marker = GF_FALSE;
 GF_DashProfile dash_profile = GF_DASH_PROFILE_UNKNOWN;
 const char *dash_profile_extension = NULL;
+const char *dash_cues = NULL;
+Bool strict_cues = GF_FALSE;
 Bool use_url_template = GF_FALSE;
 Bool seg_at_rap = GF_FALSE;
 Bool frag_at_rap = GF_FALSE;
 Bool adjust_split_end = GF_FALSE;
 Bool memory_frags = GF_TRUE;
 Bool keep_utc = GF_FALSE;
+#ifndef GPAC_DISABLE_ATSC
+Bool grab_atsc = GF_FALSE;
+s32 atsc_max_segs = -1;
+u32 atsc_stats_rate = 0;
+u32 atsc_debug_tsi = 0;
+const char *atsc_output_dir = NULL;
+s32 atsc_service = -1;
+#endif
 u32 timescale = 0;
 const char *do_wget = NULL;
 GF_DashSegmenterInput *dash_inputs = NULL;
 u32 nb_dash_inputs = 0;
 char *gf_logs = NULL;
 char *seg_ext = NULL;
+char *init_seg_ext = NULL;
 const char *dash_title = NULL;
 const char *dash_source = NULL;
 const char *dash_more_info = NULL;
 #if !defined(GPAC_DISABLE_STREAMING)
 const char *grab_m2ts = NULL;
-const char *grab_ifce = NULL;
 #endif
+const char *grab_ifce = NULL;
+
 FILE *logfile = NULL;
-static u32 dash_run_for;
+static u32 run_for=0;
 static u32 dash_cumulated_time,dash_prev_time,dash_now_time;
+static Bool no_cache=GF_FALSE;
+static Bool no_loop=GF_FALSE;
+static Bool split_on_bound=GF_FALSE;
+static Bool split_on_closest=GF_FALSE;
 
 u32 mp4box_cleanup(u32 ret_code) {
 	if (mpd_base_urls) {
@@ -2030,12 +2443,12 @@
 		}
 		else if (!stricmp(arg, "-ocr")) force_ocr = 1;
 		else if (!stricmp(arg, "-latm")) hint_flags |= GP_RTP_PCK_USE_LATM_AAC;
-		else if (!stricmp(arg, "-rap")) {
+		else if (!stricmp(arg, "-rap") || !stricmp(arg, "-refonly")) {
 			if ((i + 1 < (u32)argc) && (argv[i + 1][0] != '-')) {
 				if (sscanf(argv[i + 1], "%d", &trackID) == 1) {
 					tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
 					memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
-					tracks[nb_track_act].act_type = TRAC_ACTION_REM_NON_RAP;
+					tracks[nb_track_act].act_type = !stricmp(arg, "-rap") ? TRAC_ACTION_REM_NON_RAP : TRAC_ACTION_REM_NON_REFS;
 					tracks[nb_track_act].trackID = trackID;
 					nb_track_act++;
 					i++;
@@ -2048,6 +2461,9 @@
 		else if (!stricmp(arg, "-frag-rap")) {
 			frag_at_rap = 1;
 		}
+		else if (!stricmp(arg, "-mfra")) {
+			use_mfra = GF_TRUE;
+		}
 		else if (!stricmp(arg, "-ts")) hint_flags |= GP_RTP_PCK_SIGNAL_TS;
 		else if (!stricmp(arg, "-size")) hint_flags |= GP_RTP_PCK_SIGNAL_SIZE;
 		else if (!stricmp(arg, "-idx")) hint_flags |= GP_RTP_PCK_SIGNAL_AU_IDX;
@@ -2156,7 +2572,7 @@
 			nb_add++;
 			i++;
 		}
-		else if (!stricmp(arg, "-cat") || !stricmp(arg, "-catx")) {
+		else if (!stricmp(arg, "-cat") || !stricmp(arg, "-catx") || !stricmp(arg, "-catpl")) {
 			CHECK_NEXT_ARG
 			nb_cat++;
 			i++;
@@ -2246,6 +2662,11 @@
 			nb_track_act++;
 			i++;
 		}
+		else if (!stricmp(arg, "-hdr")) {
+			CHECK_NEXT_ARG
+			hdr_filename = argv[i + 1];
+			i++;
+		}
 		else if (!stricmp(arg, "-lang")) {
 			char szTK[20], *ext;
 			CHECK_NEXT_ARG
@@ -2254,7 +2675,8 @@
 
 			tracks[nb_track_act].act_type = TRAC_ACTION_SET_LANGUAGE;
 			tracks[nb_track_act].trackID = 0;
-			strcpy(szTK, argv[i + 1]);
+			strncpy(szTK, argv[i + 1], sizeof(szTK)-1);
+			szTK[sizeof(szTK)-1] = 0;
 			ext = strchr(szTK, '=');
 			if (!strnicmp(argv[i + 1], "all=", 4)) {
 				strncpy(tracks[nb_track_act].lang, argv[i + 1] + 4, 10);
@@ -2332,7 +2754,8 @@
 			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
 			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
 
-			strcpy(szTK, argv[i + 1]);
+			strncpy(szTK, argv[i + 1], sizeof(szTK)-1);
+			szTK[sizeof(szTK)-1] = 0;
 			ext = strchr(szTK, '=');
 			if (!ext) {
 				fprintf(stderr, "Bad format for track delay - expecting ID=DLAY got %s\n", argv[i + 1]);
@@ -2382,7 +2805,8 @@
 			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act + 1));
 			memset(&tracks[nb_track_act], 0, sizeof(TrackAction));
 
-			strcpy(szTK, argv[i + 1]);
+			strncpy(szTK, argv[i + 1], sizeof(szTK)-1);
+			szTK[sizeof(szTK)-1] = 0;
 			ext = strchr(szTK, '=');
 			if (!ext) {
 				fprintf(stderr, "Bad format for track name - expecting ID=name got %s\n", argv[i + 1]);
@@ -2558,7 +2982,7 @@
 		else if (!stricmp(arg, "-split")) {
 			CHECK_NEXT_ARG
 			split_duration = atof(argv[i + 1]);
-			if (split_duration < 0) split_duration = 0;;
+			if (split_duration < 0) split_duration = 0;
 			i++;
 			split_size = 0;
 		}
@@ -2580,8 +3004,14 @@
 				return 2;
 			}
 			if (strstr(argv[i + 1], "end")) {
-				sscanf(argv[i + 1], "%lf:end", &split_start);
-				split_duration = -2;
+				if (strstr(argv[i + 1], "end-")) {
+					Double dur_end=0;
+					sscanf(argv[i + 1], "%lf:end-%lf", &split_start, &dur_end);
+					split_duration = -2 - dur_end;
+				} else {
+					sscanf(argv[i + 1], "%lf:end", &split_start);
+					split_duration = -2;
+				}
 			}
 			else {
 				sscanf(argv[i + 1], "%lf:%lf", &split_start, &split_duration);
@@ -2732,6 +3162,9 @@
 	else if (!strcmp(argv[i + 1], "crypt")) PrintEncryptUsage();
 	else if (!strcmp(argv[i + 1], "meta")) PrintMetaUsage();
 	else if (!strcmp(argv[i + 1], "swf")) PrintSWFUsage();
+#ifndef GPAC_DISABLE_ATSC
+	else if (!strcmp(argv[i + 1], "atsc")) PrintATSCUsage();
+#endif
 #if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
 	else if (!strcmp(argv[i + 1], "rtp")) PrintStreamerUsage();
 	else if (!strcmp(argv[i + 1], "live")) PrintLiveUsage();
@@ -2748,6 +3181,9 @@
 		PrintEncryptUsage();
 		PrintMetaUsage();
 		PrintSWFUsage();
+#ifndef GPAC_DISABLE_ATSC
+		PrintATSCUsage();
+#endif
 #if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
 		PrintStreamerUsage();
 		PrintLiveUsage();
@@ -2829,7 +3265,7 @@
 		}
 		else if (!strcmp(arg, "-log-file") || !strcmp(arg, "-lf")) {
 			logfile = gf_fopen(argv[i + 1], "wt");
-			gf_log_set_callback(logfile, on_gpac_log);
+			gf_log_set_callback(logfile, on_mp4box_log);
 			i++;
 		}
 		else if (!strcmp(arg, "-lc") || !strcmp(arg, "-log-clock")) {
@@ -2857,12 +3293,41 @@
 			grab_m2ts = argv[i + 1];
 			i++;
 		}
+#endif
 		else if (!stricmp(arg, "-ifce")) {
 			CHECK_NEXT_ARG
 			grab_ifce = argv[i + 1];
 			i++;
 		}
-
+#ifndef GPAC_DISABLE_ATSC
+		else if (!stricmp(arg, "-atsc")) {
+			grab_atsc = GF_TRUE;
+		}
+		else if (!stricmp(arg, "-dir")) {
+			CHECK_NEXT_ARG
+			atsc_output_dir = argv[i + 1];
+			i++;
+		}
+		else if (!stricmp(arg, "-service")) {
+			CHECK_NEXT_ARG
+			atsc_service = atoi(argv[i + 1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-nb-segs")) {
+			CHECK_NEXT_ARG
+			atsc_max_segs = atoi(argv[i + 1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-atsc-stats")) {
+			CHECK_NEXT_ARG
+			atsc_stats_rate = atoi(argv[i + 1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-tsi")) {
+			CHECK_NEXT_ARG
+			atsc_debug_tsi = atoi(argv[i + 1]);
+			i++;
+		}
 #endif
 #if !defined(GPAC_DISABLE_CORE_TOOLS)
 		else if (!stricmp(arg, "-wget")) {
@@ -2999,6 +3464,19 @@
 		else if (!stricmp(arg, "-dump-chap")) dump_chap = 1;
 		else if (!stricmp(arg, "-dump-chap-ogg")) dump_chap = 2;
 		else if (!stricmp(arg, "-hash")) do_hash = GF_TRUE;
+		else if (!strnicmp(arg, "-comp", 5)) {
+			CHECK_NEXT_ARG
+
+			if (strchr(arg, 'x')) comp_top_box_version = 1;
+			else if (strchr(arg, 'f')) comp_top_box_version = 2;
+
+			if (strchr(arg, 'l')) comp_lzma = GF_TRUE;
+
+			compress_top_boxes = argv[i + 1];
+			i++;
+		}
+		else if (!stricmp(arg, "-mpd-rip")) do_mpd_rip = GF_TRUE;
+
 #ifndef GPAC_DISABLE_CORE_TOOLS
 		else if (!stricmp(arg, "-bin")) do_bin_nhml = GF_TRUE;
 #endif
@@ -3032,11 +3510,36 @@
 				}
 			}
 		}
+		else if (!stricmp(arg, "-dtsx")) {
+			dump_timestamps = 2;
+		}
+		else if (!stricmp(arg, "-dtsc")) {
+			dump_timestamps = 3;
+		}
+		else if (!stricmp(arg, "-dtsxc")) {
+			dump_timestamps = 4;
+		}
 		else if (!stricmp(arg, "-dnal")) {
 			CHECK_NEXT_ARG
 			dump_nal = atoi(argv[i + 1]);
 			i++;
 		}
+		else if (!stricmp(arg, "-dnalc")) {
+			CHECK_NEXT_ARG
+			dump_nal = atoi(argv[i + 1]);
+			dump_nal_crc = GF_TRUE;
+			i++;
+		}
+		else if (!strnicmp(arg, "-dsap", 5)) {
+			CHECK_NEXT_ARG
+			dump_saps = atoi(argv[i + 1]);
+			if (!stricmp(arg, "-dsaps")) dump_saps_mode = 1;
+			else if (!stricmp(arg, "-dsapc")) dump_saps_mode = 2;
+			else if (!stricmp(arg, "-dsapd")) dump_saps_mode = 3;
+			else if (!stricmp(arg, "-dsapp")) dump_saps_mode = 4;
+			else dump_saps_mode = 0;
+			i++;
+		}
 		else if (!stricmp(arg, "-dcr")) dump_cr = 1;
 		else if (!stricmp(arg, "-ttxt") || !stricmp(arg, "-srt")) {
 			if ((i + 1<(u32)argc) && (sscanf(argv[i + 1], "%u", &trackID) == 1)) {
@@ -3045,6 +3548,10 @@
 				if (!strcmp(szTk, argv[i + 1])) i++;
 				else trackID = 0;
 			}
+			else if ((i + 1<(u32)argc) && !strcmp(argv[i + 1], "*")) {
+				trackID = (u32)-1;
+				i++;
+			}
 			else {
 				trackID = 0;
 			}
@@ -3150,6 +3657,7 @@
 		else if (!stricmp(arg, "-inter") || !stricmp(arg, "-old-inter")) {
 			CHECK_NEXT_ARG
 			interleaving_time = atof(argv[i + 1]) / 1000;
+			if (!interleaving_time) do_flat = GF_TRUE;
 			open_edit = GF_TRUE;
 			needSave = GF_TRUE;
 			if (!stricmp(arg, "-old-inter")) old_interleave = 1;
@@ -3160,7 +3668,7 @@
 			interleaving_time = atof(argv[i + 1]) / 1000;
 			needSave = GF_TRUE;
 			i++;
-			Frag = 1;
+			Frag = GF_TRUE;
 		}
 		else if (!stricmp(arg, "-dash")) {
 			CHECK_NEXT_ARG
@@ -3178,7 +3686,7 @@
 				fprintf(stderr, "\tERROR: \"-dash-dash_duration\": invalid parameter %s\n", argv[i + 1]);
 				return 2;
 			}
-			dash_duration_strict = GF_TRUE;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] -dash-strict is deprecated, will behave like -dash\n"));
 			i++;
 		}
 		else if (!stricmp(arg, "-subdur")) {
@@ -3210,16 +3718,33 @@
 			seg_name = argv[i + 1];
 			i++;
 		}
-		else if (!stricmp(arg, "-dash-run-for")) {
+		else if (!stricmp(arg, "-run-for")) {
 			CHECK_NEXT_ARG
-			dash_run_for = atoi(argv[i + 1]);
+			run_for = atoi(argv[i + 1]);
 			i++;
 		}
+		else if (!stricmp(arg, "-no-cache")) {
+			no_cache = GF_TRUE;
+		}
+		else if (!stricmp(arg, "-no-loop")) {
+			no_loop = GF_TRUE;
+		}
+		else if (!stricmp(arg, "-bound")) {
+			split_on_bound = GF_TRUE;
+		}
+		else if (!stricmp(arg, "-closest")) {
+			split_on_closest = GF_TRUE;
+		}
 		else if (!stricmp(arg, "-segment-ext")) {
 			CHECK_NEXT_ARG
 			seg_ext = argv[i + 1];
 			i++;
 		}
+		else if (!stricmp(arg, "-init-segment-ext")) {
+			CHECK_NEXT_ARG
+			init_seg_ext = argv[i + 1];
+			i++;
+		}
 		else if (!stricmp(arg, "-bs-switching")) {
 			CHECK_NEXT_ARG
 			if (!stricmp(argv[i + 1], "no") || !stricmp(argv[i + 1], "off")) bitstream_switching_mode = GF_DASH_BSMODE_NONE;
@@ -3305,6 +3830,9 @@
 		else if (!stricmp(arg, "-single-traf")) {
 			single_traf_per_moof = 1;
 		}
+ else if (!stricmp(arg, "-tfdt-traf")) {
+ tfdt_per_traf = 1;
+ }
 		else if (!stricmp(arg, "-mpd-title")) {
 			CHECK_NEXT_ARG dash_title = argv[i + 1];
 			i++;
@@ -3330,6 +3858,9 @@
 			dash_ctx_file = argv[i + 1];
 			i++;
 		}
+		else if (!stricmp(arg, "-ssix")) {
+			use_ssix = 1;
+		}
 		else if (!stricmp(arg, "-daisy-chain")) {
 			daisy_chain_sidx = 1;
 		}
@@ -3340,11 +3871,22 @@
 			single_file = 1;
 		}
 		else if (!stricmp(arg, "-pssh-moof")) {
-			pssh_in_moof = 1;
+			pssh_mode = GF_DASH_PSSH_MOOF;
+		}
+		else if (!strnicmp(arg, "-pssh=", 6)) {
+			if (!strcmp(arg+6, "f")) pssh_mode = GF_DASH_PSSH_MOOF;
+			else if (!strcmp(arg+6, "v")) pssh_mode = GF_DASH_PSSH_MOOV;
+			else if (!strcmp(arg+6, "m")) pssh_mode = GF_DASH_PSSH_MPD;
+			else if (!strcmp(arg+6, "mf") || !strcmp(arg+6, "fm")) pssh_mode = GF_DASH_PSSH_MOOF_MPD;
+			else if (!strcmp(arg+6, "mv") || !strcmp(arg+6, "vm")) pssh_mode = GF_DASH_PSSH_MOOV_MPD;
+			else pssh_mode = GF_DASH_PSSH_MOOV;
 		}
 		else if (!stricmp(arg, "-sample-groups-traf")) {
 			samplegroups_in_traf = 1;
 		}
+		else if (!stricmp(arg, "-mvex-after-traks")) {
+			mvex_after_traks = GF_TRUE;
+		}
 		else if (!stricmp(arg, "-dash-profile") || !stricmp(arg, "-profile")) {
 			CHECK_NEXT_ARG
 			if (!stricmp(argv[i + 1], "live") || !stricmp(argv[i + 1], "simple")) dash_profile = GF_DASH_PROFILE_LIVE;
@@ -3386,9 +3928,21 @@
 			segment_marker = GF_4CC(m[0], m[1], m[2], m[3]);
 			i++;
 		}
+		else if (!stricmp(arg, "-cues")) {
+			CHECK_NEXT_ARG
+			dash_cues = argv[i + 1];
+			i++;
+		}
+		else if (!stricmp(arg, "-strict-cues")) {
+			strict_cues = GF_TRUE;
+		}
 		else if (!stricmp(arg, "-insert-utc")) {
 			insert_utc = GF_TRUE;
 		}
+		else if (!stricmp(arg, "-udp-write")) {
+			udp_dest = argv[i+1];
+			i++;
+		}
 		else {
 			u32 ret = mp4box_parse_args_continue(argc, argv, &i);
 			if (ret) return ret;
@@ -3403,23 +3957,24 @@
 	e = GF_OK;
 	split_duration = 0.0;
 	split_start = -1.0;
-	interleaving_time = DEFAULT_INTERLEAVING_IN_SEC;
+	interleaving_time = 0;
 	dash_duration = dash_subduration = 0.0;
-	dash_duration_strict = GF_FALSE;
 	import_fps = 0;
 	import_flags = 0;
 	split_size = 0;
 	movie_time = 0;
-	dump_nal = 0;
-	FullInter = HintInter = encode = do_log = old_interleave = do_saf = do_hash = verbose = GF_FALSE;
+	dump_nal = dump_saps = dump_saps_mode = 0;
+	FullInter = HintInter = encode = do_log = old_interleave = do_saf = do_hash = verbose = do_mpd_rip = GF_FALSE;
 #ifndef GPAC_DISABLE_SCENE_DUMP
 	dump_mode = GF_SM_DUMP_NONE;
 #endif
 	Frag = force_ocr = remove_sys_tracks = agg_samples = remove_hint = keep_sys_tracks = remove_root_od = single_group = clean_groups = GF_FALSE;
-	conv_type = HintIt = needSave = print_sdp = print_info = regular_iod = dump_std = open_edit = dump_rtp = dump_cr = dump_srt = dump_ttxt = force_new = dump_timestamps = dump_m2ts = dump_cart = import_subtitle = force_cat = pack_wgt = dash_live = GF_FALSE;
+	conv_type = HintIt = needSave = print_sdp = print_info = regular_iod = dump_std = open_edit = dump_rtp = dump_cr = dump_srt = dump_ttxt = force_new = dump_m2ts = dump_cart = import_subtitle = force_cat = pack_wgt = dash_live = GF_FALSE;
 	no_fragments_defaults = GF_FALSE;
 	single_traf_per_moof = GF_FALSE,
-	dump_isom = 0;
+ tfdt_per_traf = GF_FALSE,
+	dump_nal_crc = GF_FALSE,
+	dump_isom = dump_timestamps = 0;
 	/*align cat is the new default behaviour for -cat*/
 	align_cat = GF_TRUE;
 	subsegs_per_sidx = 0;
@@ -3429,6 +3984,7 @@
 	file = NULL;
 	itunes_tags = pes_dump = NULL;
 	seg_name = dash_ctx_file = NULL;
+	compress_top_boxes = NULL;
 	initial_moof_sn = 0;
 	initial_tfdt = 0;
 
@@ -3440,7 +3996,7 @@
 	program_number = 0;
 	info_track_id = 0;
 	do_flat = GF_FALSE;
-	inName = outName = mediaSource = input_ctx = output_ctx = drm_file = avi2raw = cprt = chap_file = pack_file = raw_cat = NULL;
+	inName = outName = mediaSource = input_ctx = output_ctx = drm_file = avi2raw = cprt = chap_file = pack_file = raw_cat = hdr_filename = NULL;
 
 #ifndef GPAC_DISABLE_SWF_IMPORT
 	swf_flags = GF_SM_SWF_SPLIT_TIMELINE;
@@ -3459,10 +4015,16 @@
 		}
 	}
 
+#ifdef _TWO_DIGIT_EXPONENT
+	_set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
+
 	/*init libgpac*/
 	gf_sys_init(mem_track);
 	if (argc < 2) {
-		PrintUsage();
+		fprintf(stderr, "Not enough arguments - check usage with -h\n"
+			"MP4Box - GPAC version " GPAC_FULL_VERSION "\n"
+	 "(c) Telecom ParisTech 2000-2018 - Licence LGPL v2\n");
 		gf_sys_close();
 		return 0;
 	}
@@ -3472,9 +4034,22 @@
 		return mp4box_cleanup(i - 1);
 	}
 
+	if (!logfile && (log_sys_clock || log_utc_time) )
+		gf_log_set_callback(NULL, on_mp4box_log);
+
 	if (!inName && dump_std)
 		inName = "std";
 
+#ifndef GPAC_DISABLE_ATSC
+	if (grab_atsc) {
+		if (!gf_logs) {
+			gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
+			gf_log_set_tool_level(GF_LOG_CONTAINER, GF_LOG_INFO);
+		}
+		return grab_atsc3_session(atsc_output_dir, grab_ifce, atsc_service, atsc_max_segs, atsc_stats_rate, atsc_debug_tsi);
+	}
+#endif
+
 	if (!inName) {
 		PrintUsage();
 		return mp4box_cleanup(1);
@@ -3489,8 +4064,9 @@
 		/*by default use single fragment per dash segment*/
 		if (dash_duration)
 			interleaving_time = dash_duration;
-		else
-			do_flat = GF_TRUE;
+		else if (!do_flat) {
+			interleaving_time = DEFAULT_INTERLEAVING_IN_SEC;
+		}
 	}
 
 	if (dump_std)
@@ -3546,6 +4122,16 @@
 		gf_fclose(fout);
 		return mp4box_cleanup(0);
 	}
+	if (compress_top_boxes) {
+		e = do_compress_top_boxes(inName, outName, compress_top_boxes, comp_top_box_version, comp_lzma);
+		return mp4box_cleanup(e ? 1 : 0);
+	}
+
+	if (do_mpd_rip) {
+		e = rip_mpd(inName);
+		return mp4box_cleanup(e ? 1 : 0);
+	}
+
 #if !defined(GPAC_DISABLE_STREAMING)
 	if (grab_m2ts) {
 		return grab_live_m2ts(grab_m2ts, grab_ifce, inName);
@@ -3553,7 +4139,7 @@
 #endif
 
 	if (gf_logs) {
-		//gf_log_set_tools_levels(gf_logs);
+		if (quiet==1) gf_set_progress_callback(NULL, progress_quiet);
 	} else {
 		GF_LOG_Level level = verbose ? GF_LOG_DEBUG : GF_LOG_INFO;
 		gf_log_set_tool_level(GF_LOG_CONTAINER, level);
@@ -3561,6 +4147,7 @@
 		gf_log_set_tool_level(GF_LOG_PARSER, level);
 		gf_log_set_tool_level(GF_LOG_AUTHOR, level);
 		gf_log_set_tool_level(GF_LOG_CODING, level);
+		gf_log_set_tool_level(GF_LOG_DASH, level);
 #ifdef GPAC_MEMORY_TRACKING
 		if (mem_track)
 			gf_log_set_tool_level(GF_LOG_MEMORY, level);
@@ -3581,6 +4168,25 @@
 	}
 #endif
 
+	if (udp_dest) {
+		GF_Socket *sock = gf_sk_new(GF_SOCK_TYPE_UDP);
+		u16 port = 2345;
+		char *sep = strrchr(udp_dest, ':');
+		if (sep) {
+			sep[0] = 0;
+			port = atoi(sep+1);
+		}
+		e = gf_sk_bind( sock, "127.0.0.1", 0, udp_dest, port, 0);
+		if (sep) sep[0] = ':';
+		if (e) fprintf(stderr, "Failed to bind socket to %s: %s\n", udp_dest, gf_error_to_string(e) );
+		else {
+			e = gf_sk_send(sock, inName, (u32)strlen(inName));
+			if (e) fprintf(stderr, "Failed to send datagram: %s\n", gf_error_to_string(e) );
+		}
+		gf_sk_del(sock);
+		return 0;
+	}
+
 #ifndef GPAC_DISABLE_MPD
 	if (do_mpd) {
 		Bool remote = GF_FALSE;
@@ -3627,7 +4233,7 @@
 			fprintf(stderr, "[DASH] Error: MPD creation problem %s\n", gf_error_to_string(e));
 			mp4box_cleanup(1);
 		}
-		e = gf_m3u8_to_mpd(remote ? "tmp_main.m3u8" : inName, mpd_base_url ? mpd_base_url : inName, outfile, 0, "video/mp2t", GF_TRUE, use_url_template, NULL, mpd, GF_TRUE);
+		e = gf_m3u8_to_mpd(remote ? "tmp_main.m3u8" : inName, mpd_base_url ? mpd_base_url : inName, outfile, 0, "video/mp2t", GF_TRUE, use_url_template, NULL, mpd, GF_TRUE, GF_TRUE, force_test_mode);
 		if (!e)
 			gf_mpd_write_file(mpd, outfile);
 
@@ -3811,8 +4417,8 @@
 			}
 		}
 		for (i=0; i<(u32)argc; i++) {
-			if (!strcmp(argv[i], "-cat") || !strcmp(argv[i], "-catx")) {
-				e = cat_isomedia_file(file, argv[i+1], import_flags, import_fps, agg_samples, tmpdir, force_cat, align_cat, !strcmp(argv[i], "-catx") ? GF_TRUE : GF_FALSE);
+			if (!strcmp(argv[i], "-cat") || !strcmp(argv[i], "-catx") || !strcmp(argv[i], "-catpl")) {
+				e = cat_isomedia_file(file, argv[i+1], import_flags, import_fps, agg_samples, tmpdir, force_cat, align_cat, !strcmp(argv[i], "-catx") ? GF_TRUE : GF_FALSE, !strcmp(argv[i], "-catpl") ? GF_TRUE : GF_FALSE);
 				if (e) {
 					fprintf(stderr, "Error appending %s: %s\n", argv[i+1], gf_error_to_string(e));
 					gf_isom_delete(file);
@@ -3827,7 +4433,7 @@
 		needSave = GF_TRUE;
 		if (conv_type && can_convert_to_isma(file)) conv_type = GF_ISOM_CONV_TYPE_ISMA;
 	}
-#endif
+#endif /*!GPAC_DISABLE_MEDIA_IMPORT && !GPAC_DISABLE_ISOM_WRITE*/
 
 #if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_SCENE_ENCODER) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
 	else if (chunk_mode) {
@@ -3972,26 +4578,33 @@
 			fprintf(stderr, "DASH Warning: using -segment-timeline with no -url-template. Forcing URL template.\n");
 			use_url_template = GF_TRUE;
 		}
-		
-		e = gf_dasher_enable_url_template(dasher, (Bool) use_url_template, seg_name, seg_ext);
+
+		e = gf_dasher_enable_url_template(dasher, (Bool) use_url_template, seg_name, seg_ext, init_seg_ext);
 		if (!e) e = gf_dasher_enable_segment_timeline(dasher, segment_timeline);
 		if (!e) e = gf_dasher_enable_single_segment(dasher, single_segment);
 		if (!e) e = gf_dasher_enable_single_file(dasher, single_file);
 		if (!e) e = gf_dasher_set_switch_mode(dasher, bitstream_switching_mode);
-		if (!e) e = gf_dasher_set_durations(dasher, dash_duration, dash_duration_strict, interleaving_time);
+		if (!e) e = gf_dasher_set_durations(dasher, dash_duration, interleaving_time);
 		if (!e) e = gf_dasher_enable_rap_splitting(dasher, seg_at_rap, frag_at_rap);
 		if (!e) e = gf_dasher_set_segment_marker(dasher, segment_marker);
-		if (!e) e = gf_dasher_enable_sidx(dasher, (subsegs_per_sidx>=0) ? 1 : 0, (u32) subsegs_per_sidx, daisy_chain_sidx);
+		if (!e) e = gf_dasher_enable_sidx(dasher, (subsegs_per_sidx>=0) ? 1 : 0, (u32) subsegs_per_sidx, daisy_chain_sidx, use_ssix);
 		if (!e) e = gf_dasher_set_dynamic_mode(dasher, dash_mode, mpd_update_time, time_shift_depth, mpd_live_duration);
 		if (!e) e = gf_dasher_set_min_buffer(dasher, min_buffer);
 		if (!e) e = gf_dasher_set_ast_offset(dasher, ast_offset_ms);
 		if (!e) e = gf_dasher_enable_memory_fragmenting(dasher, memory_frags);
 		if (!e) e = gf_dasher_set_initial_isobmf(dasher, initial_moof_sn, initial_tfdt);
-		if (!e) e = gf_dasher_configure_isobmf_default(dasher, no_fragments_defaults, pssh_in_moof, samplegroups_in_traf, single_traf_per_moof);
+		if (!e) e = gf_dasher_configure_isobmf_default(dasher, no_fragments_defaults, pssh_mode, samplegroups_in_traf, single_traf_per_moof, tfdt_per_traf);
 		if (!e) e = gf_dasher_enable_utc_ref(dasher, insert_utc);
 		if (!e) e = gf_dasher_enable_real_time(dasher, frag_real_time);
 		if (!e) e = gf_dasher_set_content_protection_location_mode(dasher, cp_location_mode);
 		if (!e) e = gf_dasher_set_profile_extension(dasher, dash_profile_extension);
+		if (!e) e = gf_dasher_enable_cached_inputs(dasher, no_cache);
+		if (!e) e = gf_dasher_set_test_mode(dasher,force_test_mode);
+		if (!e) e = gf_dasher_enable_loop_inputs(dasher, ! no_loop);
+		if (!e) e = gf_dasher_set_split_on_bound(dasher, split_on_bound);
+		if (!e) e = gf_dasher_set_split_on_closest(dasher, split_on_closest);
+		if (!e && dash_cues) e = gf_dasher_set_cues(dasher, dash_cues, strict_cues);
+		if (!e) e = gf_dasher_set_isobmff_options(dasher, mvex_after_traks);
 
 		for (i=0; i < nb_dash_inputs; i++) {
 			if (!e) e = gf_dasher_add_input(dasher, &dash_inputs[i]);
@@ -4004,7 +4617,7 @@
 		dash_cumulated_time=0;
 
 		while (1) {
-			if (dash_run_for && (dash_cumulated_time>dash_run_for))
+			if (run_for && (dash_cumulated_time > run_for))
 				do_abort = 3;
 
 			dash_prev_time=gf_sys_clock();
@@ -4030,6 +4643,11 @@
 				u32 slept = gf_sys_clock();
 				u32 sleep_for = gf_dasher_next_update_time(dasher, &ms_in_session);
 				fprintf(stderr, "Next generation scheduled in %u ms (DASH time "LLU" ms)\n", sleep_for, ms_in_session);
+				if (ms_in_session>=run_for) {
+					dash_cumulated_time = 1+run_for;
+					continue;
+				}
+
 				while (1) {
 					if (gf_prompt_has_input()) {
 						char c = (char) gf_prompt_get_char();
@@ -4053,7 +4671,7 @@
 					if (!sleep_for) break;
 
 					gf_sleep(1);
-					sleep_for = gf_dasher_next_update_time(dasher, NULL);
+					sleep_for = gf_dasher_next_update_time(dasher, &ms_in_session);
 					if (sleep_for<1) {
 						dash_now_time=gf_sys_clock();
 						fprintf(stderr, "Slept for %d ms before generation\n", dash_now_time - slept);
@@ -4069,7 +4687,7 @@
 		gf_dasher_del(dasher);
 
 		if (dash_ctx) {
-			if (do_abort==3) {
+			if (!force_test_mode && (do_abort==3)) {
 				if (!dash_ctx_file) {
 					char szName[1024];
 					fprintf(stderr, "Enter file name to save dash context:\n");
@@ -4090,7 +4708,7 @@
 		goto exit;
 	}
 
-	else if (!file
+	else if (!file && !do_hash
 #ifndef GPAC_DISABLE_MEDIA_EXPORT
 	 && !(track_dump_type & GF_EXPORT_AVI_NATIVE)
 #endif
@@ -4103,7 +4721,7 @@
 		}
 		switch (get_file_type_by_ext(inName)) {
 		case 1:
-			file = gf_isom_open(inName, (u8) (open_edit ? GF_ISOM_OPEN_EDIT : ( ((dump_isom>0) || print_info) ? GF_ISOM_OPEN_READ_DUMP : GF_ISOM_OPEN_READ) ), tmpdir);
+			file = gf_isom_open(inName, (u8) (force_new ? GF_ISOM_WRITE_EDIT : (open_edit ? GF_ISOM_OPEN_EDIT : ( ((dump_isom>0) || print_info) ? GF_ISOM_OPEN_READ_DUMP : GF_ISOM_OPEN_READ) ) ), tmpdir);
 			if (!file && (gf_isom_last_error(NULL) == GF_ISOM_INCOMPLETE_FILE) && !open_edit) {
 				u64 missing_bytes;
 				e = gf_isom_open_progressive(inName, 0, 0, &file, &missing_bytes);
@@ -4202,6 +4820,11 @@
 		}
 	}
 
+	if (hdr_filename) {
+		e = hdr_file(file, hdr_filename);
+		if (e) goto err_exit;
+	}
+
 	if (file && keep_utc && open_edit) {
 		gf_isom_keep_utc_times(file, 1);
 	}
@@ -4225,6 +4848,8 @@
 				conv_type = GF_ISOM_CONV_TYPE_IPOD;
 			else if (!stricmp(szExt, ".psp"))
 				conv_type = GF_ISOM_CONV_TYPE_PSP;
+			else if (!stricmp(szExt, ".mov"))
+				conv_type = GF_ISOM_CONV_TYPE_MOV;
 
 			//remove extension from outfile
 			*szExt = 0;
@@ -4311,9 +4936,23 @@
 		if (e) goto err_exit;
 	}
 	if (dump_cr) dump_isom_ismacryp(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
-	if ((dump_ttxt || dump_srt) && trackID)
-		dump_isom_timed_text(file, trackID, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE,
-							 GF_FALSE, dump_srt ? GF_TEXTDUMPTYPE_SRT : GF_TEXTDUMPTYPE_TTXT);
+	if ((dump_ttxt || dump_srt) && trackID) {
+
+		if (trackID == (u32)-1) {
+
+			u32 j;
+			for (j=0; j<gf_isom_get_track_count(file); j++) {
+				trackID = gf_isom_get_track_id(file, j+1);
+				dump_isom_timed_text(file, trackID, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE,
+									GF_FALSE, dump_srt ? GF_TEXTDUMPTYPE_SRT : GF_TEXTDUMPTYPE_TTXT);
+			}
+
+		}
+		else {
+			dump_isom_timed_text(file, trackID, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE,
+								GF_FALSE, dump_srt ? GF_TEXTDUMPTYPE_SRT : GF_TEXTDUMPTYPE_TTXT);
+		}
+	}
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
 	if (dump_rtp) dump_isom_rtp(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
@@ -4321,8 +4960,9 @@
 
 #endif
 
-	if (dump_timestamps) dump_isom_timestamps(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
-	if (dump_nal) dump_isom_nal(file, dump_nal, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
+	if (dump_timestamps) dump_isom_timestamps(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE, dump_timestamps);
+	if (dump_nal) dump_isom_nal(file, dump_nal, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE, dump_nal_crc);
+	if (dump_saps) dump_isom_saps(file, dump_saps, dump_saps_mode, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
 
 	if (do_hash) {
 		e = hash_file(inName, dump_std);
@@ -4456,30 +5096,40 @@
 			needSave = GF_TRUE;
 			break;
 		case META_ACTION_ADD_IMAGE_ITEM:
-			{
-				e = import_file(file, meta->szPath, 0, 0, 0);
+		{
+			u32 old_tk_count = gf_isom_get_track_count(file);
+			e = import_file(file, meta->szPath, 0, 0, 0);
+			if (e == GF_OK) {
+				u32 meta_type = gf_isom_get_meta_type(file, meta->root_meta, tk);
+				if (!meta_type) {
+					e = gf_isom_set_meta_type(file, meta->root_meta, tk, GF_META_ITEM_TYPE_PICT);
+				} else {
+					if (meta_type != GF_META_ITEM_TYPE_PICT) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Warning: file already has a root 'meta' box of type %s\n", gf_4cc_to_str(meta_type)));
+						e = GF_BAD_PARAM;
+					}
+				}
 				if (e == GF_OK) {
-					if (!gf_isom_get_meta_type(file, meta->root_meta, tk)) {
-						e = gf_isom_set_meta_type(file, meta->root_meta, tk, GF_4CC('p','i','c','t'));
+					if (!meta->item_id) {
+						e = gf_isom_meta_get_next_item_id(file, meta->root_meta, tk, &meta->item_id);
 					}
 					if (e == GF_OK) {
-						if (!meta->item_id) {
-							e = gf_isom_meta_get_next_item_id(file, meta->root_meta, tk, &meta->item_id);
-						}
-						if (e == GF_OK) {
-							gf_isom_iff_create_image_item_from_track(file, meta->root_meta, tk, 1,
+						e = gf_isom_iff_create_image_item_from_track(file, meta->root_meta, tk, 1,
 								strlen(meta->szName) ? meta->szName : NULL,
 								meta->item_id,
 								meta->image_props, NULL);
-							if (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);
-							}
+						if (e == GF_OK && meta->primary) {
+							e = gf_isom_set_meta_primary_item(file, meta->root_meta, tk, meta->item_id);
+						}
+						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);
 						}
 					}
 				}
-				gf_isom_remove_track(file, 1);				
-				needSave = GF_TRUE;
 			}
+			gf_isom_remove_track(file, old_tk_count+1);
+			needSave = GF_TRUE;
+		}
 			break;
 		case META_ACTION_REM_ITEM:
 			e = gf_isom_remove_meta_item(file, meta->root_meta, tk, meta->item_id);
@@ -4538,7 +5188,7 @@
 		if (e) goto err_exit;
 		needSave = GF_TRUE;
 	}
-	
+
 	for (i=0; i<nb_tsel_acts; i++) {
 		switch (tsel_acts[i].act_type) {
 		case TSEL_ACTION_SET_PARAM:
@@ -4650,6 +5300,12 @@
 			if (e) goto err_exit;
 			needSave = GF_TRUE;
 		}
+		if (conv_type == GF_ISOM_CONV_TYPE_MOV) {
+			e = gf_media_check_qt_prores(file);
+			if (e) goto err_exit;
+			needSave = GF_TRUE;
+			if (interleaving_time) interleaving_time = 0.5;
+		}
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 		if (conv_type == GF_ISOM_CONV_TYPE_IPOD) {
 			u32 major_brand = 0;
@@ -4660,7 +5316,9 @@
 				u32 mType = gf_isom_get_media_type(file, i+1);
 				switch (mType) {
 				case GF_ISOM_MEDIA_VISUAL:
-					major_brand = GF_4CC('M','4','V',' ');
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
+					major_brand = GF_ISOM_BRAND_M4V;
 					gf_isom_set_ipod_compatible(file, i+1);
 #if 0
 					switch (gf_isom_get_media_subtype(file, i+1, 1)) {
@@ -4675,20 +5333,20 @@
 #endif
 					break;
 				case GF_ISOM_MEDIA_AUDIO:
-					if (!major_brand) major_brand = GF_4CC('M','4','A',' ');
-					else gf_isom_modify_alternate_brand(file, GF_4CC('M','4','A',' '), 1);
+					if (!major_brand) major_brand = GF_ISOM_BRAND_M4A;
+					else gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_M4A, 1);
 					break;
 				case GF_ISOM_MEDIA_TEXT:
 					/*this is a text track track*/
-					if (gf_isom_get_media_subtype(file, i+1, 1) == GF_4CC('t','x','3','g')) {
+					if (gf_isom_get_media_subtype(file, i+1, 1) == GF_ISOM_SUBTYPE_TX3G) {
 						u32 j;
 						Bool is_chap = 0;
 						for (j=0; j<gf_isom_get_track_count(file); j++) {
-							s32 count = gf_isom_get_reference_count(file, j+1, GF_4CC('c','h','a','p'));
+							s32 count = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_CHAP);
 							if (count>0) {
 								u32 tk, k;
 								for (k=0; k<(u32) count; k++) {
-									gf_isom_get_reference(file, j+1, GF_4CC('c','h','a','p'), k+1, &tk);
+									gf_isom_get_reference(file, j+1, GF_ISOM_REF_CHAP, k+1, &tk);
 									if (tk==i+1) {
 										is_chap = 1;
 										break;
@@ -4735,9 +5393,8 @@
 		strcpy(outfile, outName);
 	}
 
-
-	for (i=0; i<nb_track_act; i++) {
-		TrackAction *tka = &tracks[i];
+	for (j=0; j<nb_track_act; j++) {
+		TrackAction *tka = &tracks[j];
 		u32 track = tka->trackID ? gf_isom_get_track_by_id(file, tka->trackID) : 0;
 		u32 timescale = gf_isom_get_timescale(file);
 		switch (tka->act_type) {
@@ -4850,7 +5507,7 @@
 			}
 			break;
 		case TRAC_ACTION_SET_PAR:
-			e = gf_media_change_par(file, track, tka->par_num, tka->par_den);
+			e = gf_media_change_par(file, track, tka->par_num, tka->par_den, GF_FALSE);
 			needSave = GF_TRUE;
 			break;
 		case TRAC_ACTION_SET_HANDLER_NAME:
@@ -4875,7 +5532,12 @@
 			break;
 		case TRAC_ACTION_REM_NON_RAP:
 			fprintf(stderr, "Removing non-rap samples from track %d\n", tka->trackID);
-			e = gf_media_remove_non_rap(file, track);
+			e = gf_media_remove_non_rap(file, track, GF_FALSE);
+			needSave = GF_TRUE;
+			break;
+		case TRAC_ACTION_REM_NON_REFS:
+			fprintf(stderr, "Removing non-reference samples from track %d\n", tka->trackID);
+			e = gf_media_remove_non_rap(file, track, GF_TRUE);
 			needSave = GF_TRUE;
 			break;
 		case TRAC_ACTION_SET_UDTA:
@@ -4936,18 +5598,21 @@
 			case GF_ISOM_ITUNE_COVER_ART:
 			{
 				char *d, *ext;
-				FILE *t = gf_fopen(val, "rb");
-				gf_fseek(t, 0, SEEK_END);
-				tlen = (u32) gf_ftell(t);
-				gf_fseek(t, 0, SEEK_SET);
-				d = gf_malloc(sizeof(char) * tlen);
-				tlen = (u32) fread(d, sizeof(char), tlen, t);
-				gf_fclose(t);
+				d=NULL;
+				if (val) {
+					FILE *t = gf_fopen(val, "rb");
+					gf_fseek(t, 0, SEEK_END);
+					tlen = (u32)gf_ftell(t);
+					gf_fseek(t, 0, SEEK_SET);
+					d = gf_malloc(sizeof(char) * tlen);
+					tlen = (u32)fread(d, sizeof(char), tlen, t);
+					gf_fclose(t);
 
-				ext = strrchr(val, '.');
-				if (!stricmp(ext, ".png")) tlen |= 0x80000000;
+					ext = strrchr(val, '.');
+					if (!stricmp(ext, ".png")) tlen |= 0x80000000;
+				}
 				e = gf_isom_apple_set_tag(file, GF_ISOM_ITUNE_COVER_ART, d, tlen);
-				gf_free(d);
+				if (d) gf_free(d);
 			}
 			break;
 			case GF_ISOM_ITUNE_TEMPO:
@@ -4970,20 +5635,22 @@
 				u32 n, t;
 				char _t[8];
 				n = t = 0;
-				memset(_t, 0, sizeof(char)*8);
-				tlen = (itag==GF_ISOM_ITUNE_DISK) ? 6 : 8;
-				if (sscanf(val, "%u/%u", &n, &t) == 2) {
-					_t[3]=n;
-					_t[2]=n>>8;
-					_t[5]=t;
-					_t[4]=t>>8;
-				}
-				else if (sscanf(val, "%u", &n) == 1) {
-					_t[3]=n;
-					_t[2]=n>>8;
+				if (val) {
+					memset(_t, 0, sizeof(char) * 8);
+					tlen = (itag == GF_ISOM_ITUNE_DISK) ? 6 : 8;
+					if (sscanf(val, "%u/%u", &n, &t) == 2) {
+						_t[3] = n;
+						_t[2] = n >> 8;
+						_t[5] = t;
+						_t[4] = t >> 8;
+					}
+					else if (sscanf(val, "%u", &n) == 1) {
+						_t[3] = n;
+						_t[2] = n >> 8;
+					}
+					else tlen = 0;
 				}
-				else tlen = 0;
-				if (tlen) gf_isom_apple_set_tag(file, itag, _t, tlen);
+				if (!val || tlen) gf_isom_apple_set_tag(file, itag, val ? _t : NULL, tlen);
 			}
 			break;
 			case GF_ISOM_ITUNE_GAPLESS:
@@ -5018,12 +5685,41 @@
 		needSave = GF_TRUE;
 	}
 
+	if (cprt) {
+		e = gf_isom_set_copyright(file, "und", cprt);
+		needSave = GF_TRUE;
+		if (e) goto err_exit;
+	}
+	if (chap_file) {
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
+		e = gf_media_import_chapters(file, chap_file, import_fps);
+		needSave = GF_TRUE;
+#else
+		fprintf(stderr, "Warning: GPAC compiled without Media Import, chapters can't be imported\n");
+		e = GF_NOT_SUPPORTED;
+#endif
+		if (e) goto err_exit;
+	}
+
+	if (major_brand) {
+		gf_isom_set_brand_info(file, major_brand, minor_version);
+		needSave = GF_TRUE;
+	}
+	for (i=0; i<nb_alt_brand_add; i++) {
+		gf_isom_modify_alternate_brand(file, brand_add[i], 1);
+		needSave = GF_TRUE;
+	}
+	for (i=0; i<nb_alt_brand_rem; i++) {
+		gf_isom_modify_alternate_brand(file, brand_rem[i], 0);
+		needSave = GF_TRUE;
+	}
+
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (Frag) {
 		if (!interleaving_time) interleaving_time = DEFAULT_INTERLEAVING_IN_SEC;
 		if (HintIt) fprintf(stderr, "Warning: cannot hint and fragment - ignoring hint\n");
 		fprintf(stderr, "Fragmenting file (%.3f seconds fragments)\n", interleaving_time);
-		e = gf_media_fragment_file(file, outfile, interleaving_time);
+		e = gf_media_fragment_file(file, outfile, interleaving_time, use_mfra);
 		if (e) fprintf(stderr, "Error while fragmenting file: %s\n", gf_error_to_string(e));
 		if (!e && !outName && !force_new) {
 			if (gf_delete_file(inName)) fprintf(stderr, "Error removing file %s\n", inName);
@@ -5096,35 +5792,6 @@
 	}
 #endif /*!defined(GPAC_DISABLE_ISOM_HINTING) && !defined(GPAC_DISABLE_SENG)*/
 
-	if (cprt) {
-		e = gf_isom_set_copyright(file, "und", cprt);
-		needSave = GF_TRUE;
-		if (e) goto err_exit;
-	}
-	if (chap_file) {
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
-		e = gf_media_import_chapters(file, chap_file, import_fps);
-		needSave = GF_TRUE;
-#else
-		fprintf(stderr, "Warning: GPAC compiled without Media Import, chapters can't be imported\n");
-		e = GF_NOT_SUPPORTED;
-#endif
-		if (e) goto err_exit;
-	}
-
-	if (major_brand) {
-		gf_isom_set_brand_info(file, major_brand, minor_version);
-		needSave = GF_TRUE;
-	}
-	for (i=0; i<nb_alt_brand_add; i++) {
-		gf_isom_modify_alternate_brand(file, brand_add[i], 1);
-		needSave = GF_TRUE;
-	}
-	for (i=0; i<nb_alt_brand_rem; i++) {
-		gf_isom_modify_alternate_brand(file, brand_rem[i], 0);
-		needSave = GF_TRUE;
-	}
-
 	if (!encode && !force_new) gf_isom_set_final_name(file, outfile);
 	if (needSave) {
 		if (outName) {
@@ -5182,7 +5849,7 @@
 
 #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_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
 		gf_memory_print();
 		return 2;
 	}
@@ -5191,6 +5858,8 @@
 }
 
 #if defined(WIN32) && !defined(NO_WMAIN)
+#include <windows.h>
+
 int wmain( int argc, wchar_t** wargv )
 {
 	int i;
@@ -5210,6 +5879,8 @@
 			return -1;
 		}
 	}
+	/* force windows console codepage to utf8 to display (some, but not all) characters properly */
+	SetConsoleOutputCP(65001);
 	res = mp4boxMain(argc, argv);
 	for (i = 0; i < argc; i++) {
 		free(argv[i]);

gpac-0.7.1.tar.gz/applications/mp4client/main.c -> gpac-0.8.0.tar.gz/applications/mp4client/main.c Changed

@@ -229,6 +229,7 @@
 	 "\t \"module\" : GPAC modules debugging\n"
 	 "\t \"mutex\" : mutex\n"
 	 "\t \"all\" : all tools logged - other tools can be specified afterwards.\n"
+	 "\tThe special value \"ncl\" disables color logs.\n"
 	 "\n"
 	 "\t-log-clock or -lc : logs time in micro sec since start time of GPAC before each log line.\n"
 	 "\t-log-utc or -lu : logs UTC time in ms before each log line.\n"
@@ -239,7 +240,7 @@
 #else
 	 "\t-no-thread: disables thread usage (except for audio)\n"
 #endif
-	 "\t-no-compositor-thread: disables compositor thread (iOS and Android mode)\n"
+	 "\t-no-cthread: disables compositor thread (iOS and Android mode)\n"
 	 "\t-no-audio: disables audio \n"
 	 "\t-no-wnd: uses windowless mode (Win32 only)\n"
 	 "\t-no-back: uses transparent background for output window when no background is specified (Win32 only)\n"
@@ -260,6 +261,9 @@
 	 "\t-views v1:.:vN: creates an auto-stereo scene of N views. vN can be any type of URL supported by GPAC.\n"
 	 "\t in this mode, URL argument of GPAC is ignored, GUI as well.\n"
 	 "\t this is equivalent as using views://v1:.:N as an URL.\n"
+	 "\t-mosaic v1:.:vN: creates a mosaic of N views. vN can be any type of URL supported by GPAC.\n"
+	 "\t in this mode, URL argument of GPAC is ignored.\n"
+	 "\t this is equivalent as using mosaic://v1:.:N as an URL.\n"
 	 "\n"
 	 "\t-exit: automatically exits when presentation is over\n"
 	 "\t-run-for TIME: runs for TIME seconds and exits\n"
@@ -295,7 +299,7 @@
 	 "\t-help: shows this screen\n"
 	 "\n"
 	 "MP4Client - GPAC command line player and dumper - version "GPAC_FULL_VERSION"\n"
-	 "GPAC Written by Jean Le Feuvre (c) 2001-2005 - ENST (c) 2005-200X\n"
+	 "(c) Telecom ParisTech 2000-2018 - Licence LGPL v2\n"
 	 "GPAC Configuration: " GPAC_CONFIGURATION "\n"
 	 "Features: %s\n",
 	 GF_IMPORT_DEFAULT_FPS,
@@ -826,7 +830,13 @@
 		break;
 	case GF_EVENT_EOS:
 		eos_seen = GF_TRUE;
-		if (!playlist && loop_at_end) restart = 1;
+		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_TERM_WINDOWLESS) {
@@ -900,7 +910,8 @@
 		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);
+			strncpy(the_url, evt->navigate.to_url, sizeof(the_url)-1);
+			the_url[sizeof(the_url) - 1] = 0;
 			fprintf(stderr, "Navigating to URL %s\n", the_url);
 			gf_term_navigate_to(term, evt->navigate.to_url);
 			return 1;
@@ -1037,7 +1048,7 @@
 
 	if (rti_logs && (lm & GF_LOG_RTI)) {
 		char szMsg[2048];
-		vsprintf(szMsg, fmt, list);
+		vsnprintf(szMsg, 2048, fmt, list);
 		UpdateRTInfo(szMsg + 6 /*"[RTI] "*/);
 	} else {
 		if (log_time_start) {
@@ -1089,6 +1100,11 @@
 	}
 	{
 		const size_t sepIdx = sep - opt_string;
+		if (sepIdx >= sizeof(szSec)) {
+			fprintf(stderr, "Badly formatted option %s - Section name is too long\n", opt_string);
+			return;
+		}
+
 		strncpy(szSec, opt_string, sepIdx);
 		szSec[sepIdx] = 0;
 	}
@@ -1100,8 +1116,16 @@
 	}
 	{
 		const size_t sepIdx = sep2 - sep;
+		if (sepIdx >= sizeof(szKey)) {
+			fprintf(stderr, "Badly formatted option %s - key name is too long\n", opt_string);
+			return;
+		}
 		strncpy(szKey, sep, sepIdx);
 		szKey[sepIdx] = 0;
+		if (strlen(sep2 + 1) >= sizeof(szVal)) {
+			fprintf(stderr, "Badly formatted option %s - value is too long\n", opt_string);
+			return;
+		}
 		strcpy(szVal, sep2+1);
 	}
 
@@ -1201,8 +1225,8 @@
 GF_MemTrackerType mem_track = GF_MemTrackerNone;
 #endif
 	Double fps = GF_IMPORT_DEFAULT_FPS;
-	Bool fill_ar, visible, do_uncache;
-	char *url_arg, *out_arg, *the_cfg, *rti_file, *views, *default_com;
+	Bool fill_ar, visible, do_uncache, has_command;
+	char *url_arg, *out_arg, *the_cfg, *rti_file, *views, *mosaic;
 	FILE *logfile = NULL;
 	Float scale = 1;
 #ifndef WIN32
@@ -1215,8 +1239,8 @@
 	memset(&user, 0, sizeof(GF_User));
 
 	dump_mode = DUMP_NONE;
-	fill_ar = visible = do_uncache = GF_FALSE;
-	url_arg = out_arg = the_cfg = rti_file = views = default_com = NULL;
+	fill_ar = visible = do_uncache = has_command = GF_FALSE;
+	url_arg = out_arg = the_cfg = rti_file = views = mosaic = NULL;
 	nb_times = 0;
 	times[0] = 0;
 
@@ -1309,7 +1333,7 @@
 #else
 		else if (!strcmp(arg, "-no-thread")) threading_flags = GF_TERM_NO_DECODER_THREAD | GF_TERM_NO_COMPOSITOR_THREAD | GF_TERM_WINDOW_NO_THREAD;
 #endif
-		else if (!strcmp(arg, "-no-compositor-thread")) threading_flags |= GF_TERM_NO_COMPOSITOR_THREAD;
+		else if (!strcmp(arg, "-no-cthread") || !strcmp(arg, "-no-compositor-thread")) threading_flags |= GF_TERM_NO_COMPOSITOR_THREAD;
 		else if (!strcmp(arg, "-no-audio")) no_audio = 1;
 		else if (!strcmp(arg, "-no-regulation")) no_regulation = 1;
 		else if (!strcmp(arg, "-fs")) start_fs = 1;
@@ -1391,7 +1415,11 @@
 			sscanf(argv[i+1], "%f", &scale);
 			i++;
 		}
-		
+		else if (!strcmp(arg, "-c") || !strcmp(arg, "-cfg")) {
+			/* already parsed */
+			i++;
+		}
+
 		/*arguments only used in non-gui mode*/
 		if (!gui_mode) {
 			if (arg[0] != '-') {
@@ -1438,8 +1466,12 @@
 				views = argv[i+1];
 				i++;
 			}
+			else if (!stricmp(arg, "-mosaic")) {
+				mosaic = argv[i+1];
+				i++;
+			}
 			else if (!stricmp(arg, "-com")) {
-				default_com = argv[i+1];
+				has_command = GF_TRUE;
 				i++;
 			}
 			else if (!stricmp(arg, "-service")) {
@@ -1554,6 +1586,12 @@
 	}
 	fprintf(stderr, "Modules Found : %d \n", i);
 
+	str = gf_cfg_get_key(cfg_file, "General", "GPACVersion");
+	if (!str || strcmp(str, GPAC_FULL_VERSION)) {
+		gf_cfg_del_section(cfg_file, "PluginsCache");
+		gf_cfg_set_key(cfg_file, "General", "GPACVersion", GPAC_FULL_VERSION);
+	}
+
 	user.config = cfg_file;
 	user.EventProc = GPAC_EventProc;
 	/*dummy in this case (global vars) but MUST be non-NULL*/
@@ -1656,7 +1694,14 @@
 	else if (!gui_mode && url_arg) {
 		char *ext;
 
-		strcpy(the_url, url_arg);
+		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_url[sizeof(the_url) - 1] = 0;
+		}
+		else {
+			strcpy(the_url, url_arg);
+		}
 		ext = strrchr(the_url, '.');
 		if (ext && (!stricmp(ext, ".m3u") || !stricmp(ext, ".pls"))) {
 			GF_Err e = GF_OK;
@@ -1668,7 +1713,10 @@
 				GF_DownloadSession *sess = gf_dm_sess_new(term->downloader, the_url, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
 				if (sess) {
 					e = gf_dm_sess_process(sess);
-					if (!e) strcpy(the_url, gf_dm_sess_get_cache_name(sess));
+					if (!e) {
+						strncpy(the_url, gf_dm_sess_get_cache_name(sess), sizeof(the_url) - 1);
+						the_url[sizeof(the_url) - 1] = 0;
+					}
 					gf_dm_sess_del(sess);
 				}
 			}
@@ -1691,7 +1739,8 @@
 		fprintf(stderr, "Hit 'h' for help\n\n");
 		str = gf_cfg_get_key(cfg_file, "General", "StartupFile");
 		if (str) {
-			strcpy(the_url, "MP4Client "GPAC_FULL_VERSION);
+			strncpy(the_url, "MP4Client "GPAC_FULL_VERSION , sizeof(the_url)-1);
+			the_url[sizeof(the_url) - 1] = 0;
 			gf_term_connect(term, str);
 			startup_file = 1;
 			is_connected = 1;
@@ -1706,6 +1755,11 @@
 		sprintf(szTemp, "views://%s", views);
 		gf_term_connect(term, szTemp);
 	}
+	if (mosaic) {
+		char szTemp[4046];
+		sprintf(szTemp, "mosaic://%s", mosaic);
+		gf_term_connect(term, szTemp);
+	}
 	if (bench_mode) {
 		rti_update_time_ms = 500;
 		bench_mode_start = gf_sys_clock();
@@ -1731,9 +1785,14 @@
 				goto force_input;
 			}
 
-			if (default_com && is_connected) {
-				gf_term_scene_update(term, NULL, default_com);
-				default_com = NULL;
+			if (has_command && is_connected) {
+				has_command = GF_FALSE;
+				for (i=0; i<(u32)argc; i++) {
+					if (!strcmp(argv[i], "-com")) {
+						gf_term_scene_update(term, NULL, argv[i+1]);
+						i++;
+					}
+				}
 			}
 			if (initial_service_id && is_connected) {
 				GF_ObjectManager *root_od = gf_term_get_root_object(term);
@@ -2272,12 +2331,16 @@
 			odm = NULL;
 			root_od = gf_term_get_root_object(term);
 			if (root_od) {
-				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 - trying with serviceID\n", index);
+				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);
+					}
 				}
 			}
 		}
@@ -2625,8 +2688,16 @@
 				fprintf(stderr, "#%d - ", num);
 				if (odi.media_url) {
 					fprintf(stderr, "%s", odi.media_url);
+				} else if (odi.od) {
+				 	if (odi.od->URLString) {
+						fprintf(stderr, "%s", odi.od->URLString);
+					} else {
+						fprintf(stderr, "ID %d", odi.od->objectDescriptorID);
+					}
+				} else if (odi.service_url) {
+					fprintf(stderr, "%s", odi.service_url);
 				} else {
-					fprintf(stderr, "ID %d", odi.od->objectDescriptorID);
+					fprintf(stderr, "unknown");
 				}
 				fprintf(stderr, " - %s", (odi.od_type==GF_STREAM_VISUAL) ? "Video" : (odi.od_type==GF_STREAM_AUDIO) ? "Audio" : "Systems");
 				if (odi.od && odi.od->ServiceID) fprintf(stderr, " - Service ID %d", odi.od->ServiceID);
@@ -2657,7 +2728,7 @@
 			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.od->objectDescriptorID == OD_ID)) break;
+				if ((number == (u32)(-1)) && odi.od && (odi.od->objectDescriptorID == OD_ID)) break;
 				else if (i == (u32)(number-1)) break;
 			}
 			odm = NULL;

gpac-0.7.1.tar.gz/applications/osmo4_android_studio/app/src/main/jni/wrapper.cpp -> gpac-0.8.0.tar.gz/applications/osmo4_android_studio/app/src/main/jni/wrapper.cpp Changed

@@ -180,6 +180,7 @@
 	}
 	javaVM = NULL;
 	jni_thread_env_key = (int) NULL;
+	return 0;
 }
 
 #define NUM_JNI_VERSIONS 4
@@ -304,11 +305,13 @@
 }
 
 static u32 beforeThreadExits(void * param) {
-	/* Ivica - I think there is no need for this because the detach is done in jni_destroy_env_func()
+	/* 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() {
@@ -710,7 +713,7 @@
 		strcpy(m_cfg_dir, cfg_dir);
 
 	char m_cfg_filename[GF_MAX_PATH];
-	if (m_cfg_dir) {
+	if (m_cfg_dir[0]) {
 		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");
@@ -736,7 +739,7 @@
 
 	//load config file
 	LOGI("Loading User Config %s...", "GPAC.cfg");
-	m_user.config = gf_cfg_init(m_cfg_dir ? m_cfg_filename : NULL, NULL);
+	m_user.config = gf_cfg_init(m_cfg_dir[0] ? m_cfg_filename : NULL, NULL);
 	gf_set_progress_callback(this, Osmo4_progress_cbk);
 
 
@@ -835,6 +838,7 @@
 		}
 	}
 	debug_log("connected ...");
+	return 0;
 }
 
 void CNativeWrapper::setGpacPreference( const char * category, const char * name, const char * value)

gpac-0.7.1.tar.gz/applications/osmo4_ios/main.c -> gpac-0.8.0.tar.gz/applications/osmo4_ios/main.c Changed

@@ -81,7 +81,7 @@
 {
 	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)
@@ -98,17 +98,17 @@
 				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",
@@ -189,7 +189,7 @@
 {
 	GF_Event evt;
 	memset(&evt, 0, sizeof(GF_Event));
-	
+
 	switch (sensorType) {
 	case SENSOR_ORIENTATION:
 		evt.type = GF_EVENT_SENSOR_ORIENTATION;
@@ -238,7 +238,7 @@
 	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);
@@ -317,7 +317,7 @@
 
 	if (rti_logs && (lm & GF_LOG_RTI)) {
 		char szMsg[2048];
-		vsprintf(szMsg, fmt, list);
+		vsnprintf(szMsg, 2048, fmt, list);
 		UpdateRTInfo(szMsg + 6 /*"[RTI] "*/);
 	} else {
 		if (log_time_start) fprintf(logs, "[At %d]", gf_sys_clock() - log_time_start);
@@ -538,7 +538,7 @@
 		}
 	}
 	gf_sys_set_args(argc, (const char **) argv);
-	
+
 	user.config = cfg_file;
 	user.EventProc = GPAC_EventProc;
 	/*dummy in this case (global vars) but MUST be non-NULL*/
@@ -585,7 +585,7 @@
 			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("WARNING: using raw output video (memory only) - no display used\n"));
 		}
 	}
-	
+
 	/*check audio output*/
 	str = gf_cfg_get_key(cfg_file, "Audio", "DriverName");
 	if (!str || !strcmp(str, "No Audio Output Available")) {
@@ -659,7 +659,7 @@
 		rti_update_time_ms = 500;
 		bench_mode_start = gf_sys_clock();
 	}
-	
+
 	while (Run) {
 		if (restart) {
 			restart = 0;

gpac-0.7.1.tar.gz/applications/osmo4_ios/osmo4ios-Info.plist -> gpac-0.8.0.tar.gz/applications/osmo4_ios/osmo4ios-Info.plist Changed

gpac-0.7.1.tar.gz/applications/osmo4_sym/osmo4_view.cpp -> gpac-0.8.0.tar.gz/applications/osmo4_sym/osmo4_view.cpp Changed

gpac-0.7.1.tar.gz/applications/osmo4_w32/Osmo4.rc -> gpac-0.8.0.tar.gz/applications/osmo4_w32/Osmo4.rc Changed

gpac-0.8.0.tar.gz/applications/testapps/atscdmx Added

gpac-0.8.0.tar.gz/applications/testapps/atscdmx/Makefile Added

gpac-0.8.0.tar.gz/applications/testapps/atscdmx/main.c Added

@@ -0,0 +1,151 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ * This file is part of GPAC - ATSC/ROUTE implementation
+ *
+ */
+
+#include <gpac/atsc.h>
+#include <time.h>
+
+void PrintUsage()
+{
+	fprintf(stderr, "USAGE: [OPTS]\n"
+#ifdef GPAC_MEMORY_TRACKING
+ "-mem-track:		enables memory tracker\n"
+ "-mem-track-stack:	enables memory tracker with stack dumping\n"
+#endif
+	 "-log-file file:	sets output log file. Also works with -lf\n"
+	 "-logs log_args:	sets log tools and levels, formatted as a ':'-separated list of toolX[:toolZ]@levelX\n"
+	 "-log-clock or -lc logs time in micro sec since start time of GPAC before each log line.\n"
+	 "-log-utc or -lu logs UTC time in ms before each log line.\n"
+	 "-ifce IP:			IP adress of network interface to use\n"
+	 "-dir PATH:			local filesystem path to which the files are written. If not set, memory mode is used.\n"
+	 " NOTE: memory mode is not yet implemented ...\n"
+	 "-service ID:		ID of the service to play. If not set, all services are dumped. If 0, no services are dumped\n"
+	 "\n"
+	 "\n on OSX with VM packet replay you will need to force mcast routing, eg:\n"
+	 "route add -net 239.255.1.4/32 -interface vboxnet0\n"
+	 );
+}
+
+static u64 log_time_start = 0;
+static Bool log_utc_time = GF_FALSE;
+static u64 last_log_time=0;
+static void on_atscd_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
+{
+	FILE *logs = cbk ? cbk : stderr;
+	if (log_time_start) {
+		u64 now = gf_sys_clock_high_res();
+		fprintf(logs, "At "LLD" (diff %d) - ", now - log_time_start, (u32) (now - last_log_time) );
+		last_log_time = now;
+	}
+	if (log_utc_time) {
+		u64 utc_clock = gf_net_get_utc() ;
+		time_t secs = utc_clock/1000;
+		struct tm t;
+		t = *gmtime(&secs);
+		fprintf(logs, "UTC %d-%02d-%02dT%02d:%02d:%02dZ (TS "LLU") - ", 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, utc_clock);
+	}
+	vfprintf(logs, fmt, list);
+	fflush(logs);
+}
+
+int main(int argc, char **argv)
+{
+	u32 i, serviceID=0xFFFFFFFF;
+	Bool run = GF_TRUE;
+	GF_MemTrackerType mem_track = GF_MemTrackerNone;
+	const char *ifce = NULL;
+	const char *dir = NULL;
+	FILE *logfile = NULL;
+	GF_ATSCDmx *atscd;
+	if (argc<1) {
+		PrintUsage();
+		return 0;
+	}
+	for (i=0; i<(u32)argc; i++) {
+		char *arg = argv[i];
+		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", argv[i]);
+#endif
+		}
+	}
+
+	/*****************/
+	/* gpac init */
+	/*****************/
+#ifdef GPAC_MEMORY_TRACKING
+	gf_sys_init(mem_track);
+#else
+	gf_sys_init(GF_MemTrackerNone);
+#endif
+	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
+	gf_log_set_tool_level(GF_LOG_CONTAINER, GF_LOG_INFO);
+
+	//parse args
+	for (i=0; i<(u32)argc; i++) {
+		char *arg = argv[i];
+
+		if (!strcmp(arg, "-ifce")) ifce=argv[++i];
+		else if (!strcmp(arg, "-dir")) dir=argv[++i];
+		else if (!strcmp(arg, "-service")) serviceID=atoi(argv[++i]);
+		else if (!strcmp(arg, "-log-file") || !strcmp(arg, "-lf")) {
+			logfile = gf_fopen(argv[i+1], "wt");
+			i++;
+		} else if (!strcmp(arg, "-logs") ) {
+			if (gf_log_set_tools_levels(argv[i+1]) != GF_OK) {
+				return 1;
+			}
+			i++;
+		} else if (!strcmp(arg, "-log-clock") || !strcmp(arg, "-lc")) {
+			log_time_start = 1;
+		} else if (!strcmp(arg, "-log-utc") || !strcmp(arg, "-lu")) {
+			log_utc_time = 1;
+		}
+	}
+
+	gf_log_set_callback(logfile, on_atscd_log);
+	if (log_time_start) log_time_start = gf_sys_clock_high_res();
+	/*****************/
+	/* atsc init */
+	/*****************/
+	atscd = gf_atsc3_dmx_new(ifce, dir, 0);
+	gf_atsc3_tune_in(atscd, serviceID, GF_FALSE);
+
+	while (atscd && run) {
+		GF_Err e = gf_atsc3_dmx_process(atscd);
+		if (e == GF_IP_NETWORK_EMPTY)
+			gf_sleep(1);
+
+		if (gf_prompt_has_input()) {
+			u8 c = gf_prompt_get_char();
+			switch (c) {
+			case 'q':
+				run = GF_FALSE;
+				break;
+			}
+		}
+	}
+	gf_atsc3_dmx_del(atscd);
+
+	if (logfile) gf_fclose(logfile);
+	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-0.7.1.tar.gz/applications/testapps/fmp4demux/main.c -> gpac-0.8.0.tar.gz/applications/testapps/fmp4demux/main.c Changed

gpac-0.7.1.tar.gz/applications/testapps/player_api/main.c -> gpac-0.8.0.tar.gz/applications/testapps/player_api/main.c Changed

gpac-0.7.1.tar.gz/applications/testapps/ts2udp/main.c -> gpac-0.8.0.tar.gz/applications/testapps/ts2udp/main.c Changed

gpac-0.7.1.tar.gz/applications/ts2hds/f4v.c -> gpac-0.8.0.tar.gz/applications/ts2hds/f4v.c Changed

@@ -30,6 +30,10 @@
 //we need to write Adobe custom boxes
 #include <gpac/internal/isomedia_dev.h>
 
+extern struct box_registry_entry box_registry[];
+extern u32 get_box_reg_idx(u32 boxCode, u32 parent_type);
+extern size_t size_registry();
+
 GF_Err adobize_segment(GF_ISOFile *isom_file, AdobeHDSCtx *ctx)
 {
 	GF_Err e;
@@ -54,6 +58,7 @@
 	afra->type = GF_4CC('a', 'f', 'r', 'a');
 	afra->version = 0;
 	afra->flags = 0;
+	afra->registry = (const struct box_registry_entry*)((u8*)& box_registry + size_registry() * get_box_reg_idx(afra->type, 0));
 	afra->long_ids = 1;
 	afra->long_offsets = 1;
 	afra->global_entries = 0;
@@ -78,6 +83,7 @@
 	abst->type = GF_4CC('a', 'b', 's', 't');
 	abst->version = 0;
 	abst->flags = 0;
+	abst->registry = (const struct box_registry_entry*)((u8*)& box_registry + size_registry() * get_box_reg_idx(abst->type, 0));
 	abst->bootstrapinfo_version = 1;
 	abst->profile = 0;
 	abst->live = 1;
@@ -99,6 +105,7 @@
 		asrt->type = GF_4CC('a', 's', 'r', 't');
 		asrt->version = 0;
 		asrt->flags = 0;
+		asrt->registry = (const struct box_registry_entry*)((u8*)& box_registry + size_registry() * get_box_reg_idx(asrt->type, 0));
 		asrt->segment_run_entry_count = 1;
 		{
 			asre->first_segment = ctx->segnum;
@@ -124,6 +131,7 @@
 		afrt->type = GF_4CC('a', 'f', 'r', 't');
 		afrt->version = 0;
 		afrt->flags = 0;
+		afrt->registry = (const struct box_registry_entry*)((u8*)& box_registry + size_registry() * get_box_reg_idx(afrt->type, 0));
 		afrt->timescale = gf_isom_get_timescale(isom_file);
 		afrt->fragment_run_entry_count = 1;
 		{
@@ -152,6 +160,7 @@
 		return e;
 	}
 
+	abst->size = 12; /*full box*/
 	e = abst_Size((GF_Box*)abst);
 	if (e) {
 		fprintf(stderr, "Impossible to compute ABST box size: %s\n", gf_error_to_string(e));
@@ -182,4 +191,4 @@
 	gf_isom_modify_alternate_brand(isom_file, GF_4CC('m','4','v',' '), 1);
 
 	return GF_OK;
-}
\ No newline at end of file
+}

gpac-0.7.1.tar.gz/applications/ts2hds/main.c -> gpac-0.8.0.tar.gz/applications/ts2hds/main.c Changed

gpac-0.7.1.tar.gz/bin/smartphone 2003 (armv4)/release/install/archive.bat -> gpac-0.8.0.tar.gz/bin/smartphone 2003 (armv4)/release/install/archive.bat Changed

gpac-0.7.1.tar.gz/bin/smartphone 2003 (armv4)/release/install/build_installer.bat -> gpac-0.8.0.tar.gz/bin/smartphone 2003 (armv4)/release/install/build_installer.bat Changed

gpac-0.7.1.tar.gz/build/android/jni/common.mk -> gpac-0.8.0.tar.gz/build/android/jni/common.mk Changed

gpac-0.7.1.tar.gz/build/android/jni/gpac_build_android -> gpac-0.8.0.tar.gz/build/android/jni/gpac_build_android Changed

gpac-0.7.1.tar.gz/build/android/jni/libgpac/Android.mk -> gpac-0.8.0.tar.gz/build/android/jni/libgpac/Android.mk Changed

@@ -91,6 +91,7 @@
 	../../../../src/compositor/svg_text.c \
 	../../../../src/compositor/hc_flash_shape.c \
 	../../../../src/compositor/svg_filters.c \
+	../../../../src/media_tools/atsc_dmx.c \
 	../../../../src/media_tools/avilib.c \
 	../../../../src/media_tools/filestreamer.c \
 	../../../../src/media_tools/isom_tools.c \
@@ -217,20 +218,10 @@
 	../../../../src/isomedia/isom_store.c \
 	../../../../src/isomedia/movie_fragments.c \
 	../../../../src/isomedia/media_odf.c \
-	../../../../src/mcrypt/ofb.c \
-	../../../../src/mcrypt/tripledes.c \
-	../../../../src/mcrypt/cfb.c \
-	../../../../src/mcrypt/stream.c \
-	../../../../src/mcrypt/rijndael-256.c \
-	../../../../src/mcrypt/ncfb.c \
-	../../../../src/mcrypt/rijndael-192.c \
-	../../../../src/mcrypt/ctr.c \
-	../../../../src/mcrypt/nofb.c \
-	../../../../src/mcrypt/des.c \
-	../../../../src/mcrypt/g_crypt.c \
-	../../../../src/mcrypt/ecb.c \
-	../../../../src/mcrypt/cbc.c \
-	../../../../src/mcrypt/rijndael-128.c \
+	../../../../src/crypto/g_crypt.c \
+	../../../../src/crypto/g_crypt_openssl.c \
+	../../../../src/crypto/g_crypt_tinyaes.c \
+	../../../../src/crypto/tiny_aes.c \
 	../../../../src/terminal/scene.c \
 	../../../../src/terminal/terminal.c \
 	../../../../src/terminal/network_service.c \

gpac-0.7.1.tar.gz/build/android/jni/modules/Android.mk -> gpac-0.8.0.tar.gz/build/android/jni/modules/Android.mk Changed

gpac-0.8.0.tar.gz/build/msvc10/atsc_in.vcxproj Added

@@ -0,0 +1,284 @@
+<?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>{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}</ProjectGuid>
+ <RootNamespace>atsc_in</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>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <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>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+ <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)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/atsc_in_deb/atsc_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <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/atsc_in_deb/atsc_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </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>.\obj/atsc_in_rel/atsc_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <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/atsc_in_rel/atsc_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\atsc_in\atsc_in.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>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </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-0.7.1.tar.gz/build/msvc10/dashcast.vcxproj -> gpac-0.8.0.tar.gz/build/msvc10/dashcast.vcxproj Changed

@@ -103,7 +103,7 @@
 </ResourceCompile>
 <Link>
 <RegisterOutput>false</RegisterOutput>
- <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
+ <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;swresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -142,7 +142,7 @@
 </ResourceCompile>
 <Link>
 <RegisterOutput>false</RegisterOutput>
- <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
+ <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;swresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -179,7 +179,7 @@
 <Culture>0x040c</Culture>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
+ <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;swresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -217,7 +217,7 @@
 <Culture>0x040c</Culture>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
+ <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;swresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

gpac-0.7.1.tar.gz/build/msvc10/dektec_out.vcxproj -> gpac-0.8.0.tar.gz/build/msvc10/dektec_out.vcxproj Changed

@@ -120,7 +120,7 @@
 <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
 <TargetMachine>MachineX86</TargetMachine>
 <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
- <AdditionalDependencies>dtapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 </Link>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -163,7 +163,7 @@
 <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
 <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
 <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
- <AdditionalDependencies>dtapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 </Link>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -209,7 +209,7 @@
 <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
 <TargetMachine>MachineX86</TargetMachine>
 <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
- <AdditionalDependencies>dtapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 </Link>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -251,7 +251,7 @@
 <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
 <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
 <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
- <AdditionalDependencies>dtapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 </Link>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -259,7 +259,6 @@
 </ItemDefinitionGroup>
 <ItemGroup>
 <ClCompile Include="..\..\modules\dektec_out\dektec_video.cpp" />
- <ClCompile Include="..\..\modules\dx_hw\copy_pixels.c" />
 <ClCompile Include="..\..\modules\modules_export.cpp" />
 </ItemGroup>
 <ItemGroup>

gpac-0.7.1.tar.gz/build/msvc10/gpac.sln -> gpac-0.8.0.tar.gz/build/msvc10/gpac.sln Changed

@@ -6,6 +6,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aac_in", "aac_in.vcxproj", "{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atsc_in", "atsc_in.vcxproj", "{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bifs_dec", "bifs_dec.vcxproj", "{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ctx_load", "ctx_load.vcxproj", "{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}"
@@ -109,6 +111,10 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtt_in", "vtt_in.vcxproj", "{E578716F-6663-4D83-AC79-57EA00D2F406}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nvdec", "nvdec.vcxproj", "{073E2381-4CDB-4C4D-B217-C489EF17C48B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dektec_out", "dektec_out.vcxproj", "{CAC981C2-5665-4E90-80D3-604C1A785D91}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug - MP4Box_only|Win32 = Debug - MP4Box_only|Win32
@@ -155,6 +161,17 @@
 		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.Build.0 = Release|Win32
 		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|x64.ActiveCfg = Release|x64
 		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|x64.Build.0 = Release|x64
+		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|x64
+		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Debug|x64.ActiveCfg = Debug|x64
+		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Debug|x64.Build.0 = Debug|x64
+		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Release - MP4Box_only|Win32.ActiveCfg = Release|x64
+		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.ActiveCfg = Release|Win32
+		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.Build.0 = Release|Win32
+		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Release|x64.ActiveCfg = Release|x64
+		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Release|x64.Build.0 = Release|x64
 		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
 		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -724,6 +741,30 @@
 		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|Win32.Build.0 = Release|Win32
 		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|x64.ActiveCfg = Release|x64
 		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|x64.Build.0 = Release|x64
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug|Win32.Build.0 = Debug|Win32
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug|x64.ActiveCfg = Debug|x64
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug|x64.Build.0 = Debug|x64
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release|Win32.ActiveCfg = Release|Win32
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release|Win32.Build.0 = Release|Win32
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release|x64.ActiveCfg = Release|x64
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release|x64.Build.0 = Release|x64
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug|Win32.Build.0 = Debug|Win32
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug|x64.ActiveCfg = Debug|x64
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug|x64.Build.0 = Debug|x64
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release|Win32.ActiveCfg = Release|Win32
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release|Win32.Build.0 = Release|Win32
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release|x64.ActiveCfg = Release|x64
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -736,6 +777,7 @@
 		{72486240-A124-496E-A67A-E76FEC7E99BE} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
 		{A35D99BF-D72D-4F56-99A1-97249B22BCE2} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
 		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
+		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{073E2381-4FDE-4C4D-A117-C489EB17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
@@ -777,6 +819,8 @@
 		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{E578716F-6663-4D83-AC79-57EA00D2F406} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{CAC981C2-5665-4E90-80D3-604C1A785D91} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {BC1A9F4D-C716-467F-8B11-6F58FB74FF3B}
 		{233014D5-F6E5-419D-8757-FA9CE7337088} = {BC1A9F4D-C716-467F-8B11-6F58FB74FF3B}
 	EndGlobalSection

gpac-0.7.1.tar.gz/build/msvc10/libgpac.vcxproj -> gpac-0.8.0.tar.gz/build/msvc10/libgpac.vcxproj Changed

@@ -36,6 +36,7 @@
 </ItemGroup>
 <ItemGroup>
 <ClInclude Include="..\..\include\gpac\ait.h" />
+ <ClInclude Include="..\..\include\gpac\atsc.h" />
 <ClInclude Include="..\..\include\gpac\avparse.h" />
 <ClInclude Include="..\..\include\gpac\base_coding.h" />
 <ClInclude Include="..\..\include\gpac\bifs.h" />
@@ -271,21 +272,12 @@
 <ClCompile Include="..\..\src\laser\lsr_dec.c" />
 <ClCompile Include="..\..\src\laser\lsr_enc.c" />
 <ClCompile Include="..\..\src\laser\lsr_tables.c" />
- <ClCompile Include="..\..\src\mcrypt\cbc.c" />
- <ClCompile Include="..\..\src\mcrypt\cfb.c" />
- <ClCompile Include="..\..\src\mcrypt\ctr.c" />
- <ClCompile Include="..\..\src\mcrypt\des.c" />
- <ClCompile Include="..\..\src\mcrypt\ecb.c" />
- <ClCompile Include="..\..\src\mcrypt\g_crypt.c" />
- <ClCompile Include="..\..\src\mcrypt\ncfb.c" />
- <ClCompile Include="..\..\src\mcrypt\nofb.c" />
- <ClCompile Include="..\..\src\mcrypt\ofb.c" />
- <ClCompile Include="..\..\src\mcrypt\rijndael-128.c" />
- <ClCompile Include="..\..\src\mcrypt\rijndael-192.c" />
- <ClCompile Include="..\..\src\mcrypt\rijndael-256.c" />
- <ClCompile Include="..\..\src\mcrypt\stream.c" />
- <ClCompile Include="..\..\src\mcrypt\tripledes.c" />
+ <ClCompile Include="..\..\src\crypto\g_crypt.c" />
+ <ClCompile Include="..\..\src\crypto\g_crypt_openssl.c" />
+ <ClCompile Include="..\..\src\crypto\g_crypt_tinyaes.c" />
+ <ClCompile Include="..\..\src\crypto\tiny_aes.c" />
 <ClCompile Include="..\..\src\media_tools\ait.c" />
+ <ClCompile Include="..\..\src\media_tools\atsc_dmx.c" />
 <ClCompile Include="..\..\src\media_tools\avilib.c" />
 <ClCompile Include="..\..\src\media_tools\av_parsers.c" />
 <ClCompile Include="..\..\src\media_tools\dash_client.c" />
@@ -731,6 +723,7 @@
 <Lib>
 <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac_static.lib</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalOptions> /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
 </Lib>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -801,6 +794,7 @@
 <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac_static.lib</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <TargetMachine>MachineX64</TargetMachine>
+ <AdditionalOptions> /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
 </Lib>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>

gpac-0.7.1.tar.gz/build/msvc10/libgpac.vcxproj.filters -> gpac-0.8.0.tar.gz/build/msvc10/libgpac.vcxproj.filters Changed

@@ -25,7 +25,7 @@
 <Filter Include="laser">
 <UniqueIdentifier>{3073cf49-9ebb-48cf-aea8-35a44d810e10}</UniqueIdentifier>
 </Filter>
- <Filter Include="mcrypt">
+ <Filter Include="crypto">
 <UniqueIdentifier>{34d7c2c7-ecca-42a1-b891-dab22082820c}</UniqueIdentifier>
 </Filter>
 <Filter Include="media_tools">
@@ -396,6 +396,7 @@
 <ClInclude Include="..\..\include\gpac\webvtt.h">
 <Filter>include</Filter>
 </ClInclude>
+ <ClInclude Include="..\..\include\gpac\atsc.h" />
 </ItemGroup>
 <ItemGroup>
 <ClCompile Include="..\..\src\bifs\arith_decoder.c">
@@ -749,47 +750,17 @@
 <ClCompile Include="..\..\src\laser\lsr_tables.c">
 <Filter>laser</Filter>
 </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\cbc.c">
- <Filter>mcrypt</Filter>
+ <ClCompile Include="..\..\src\crypto\g_crypt.c">
+ <Filter>crypto</Filter>
 </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\cfb.c">
- <Filter>mcrypt</Filter>
+ <ClCompile Include="..\..\src\crypto\g_crypt_openssl.c">
+ <Filter>crypto</Filter>
 </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\ctr.c">
- <Filter>mcrypt</Filter>
+ <ClCompile Include="..\..\src\crypto\g_crypt_tinyaes.c">
+ <Filter>crypto</Filter>
 </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\des.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\ecb.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\g_crypt.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\ncfb.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\nofb.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\ofb.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\rijndael-128.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\rijndael-192.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\rijndael-256.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\stream.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\tripledes.c">
- <Filter>mcrypt</Filter>
+ <ClCompile Include="..\..\src\crypto\tiny_aes.c">
+ <Filter>crypto</Filter>
 </ClCompile>
 <ClCompile Include="..\..\src\media_tools\ait.c">
 <Filter>media_tools</Filter>
@@ -1172,5 +1143,8 @@
 <ClCompile Include="..\..\src\isomedia\iff.c">
 <Filter>isomedia</Filter>
 </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\atsc_dmx.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
 </ItemGroup>
 </Project>
\ No newline at end of file

gpac-0.7.1.tar.gz/build/msvc10/libgpac_dll.vcxproj -> gpac-0.8.0.tar.gz/build/msvc10/libgpac_dll.vcxproj Changed

@@ -117,7 +117,7 @@
 <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
 </ProjectReference>
 <Link>
- <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;ssleay32.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;libcryptoMDd.lib;libsslMDd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>..\..\extra_lib\lib\w32_deb;../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -166,7 +166,7 @@
 <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
 </ProjectReference>
 <Link>
- <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;libcryptoMDd.lib;libsslMDd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -215,7 +215,7 @@
 <Culture>0x040c</Culture>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;opengl32.lib;glu32.lib;ssleay32.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;opengl32.lib;glu32.lib;libcryptoMD.lib;libsslMD.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -262,7 +262,7 @@
 <Culture>0x040c</Culture>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;libcryptoMD.lib;libsslMD.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

gpac-0.7.1.tar.gz/build/msvc10/mp4box.vcxproj -> gpac-0.8.0.tar.gz/build/msvc10/mp4box.vcxproj Changed

@@ -174,7 +174,7 @@
 </ResourceCompile>
 <Link>
 <RegisterOutput>false</RegisterOutput>
- <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;winmm.lib;libcryptoMDd.lib;libsslMDd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -263,7 +263,7 @@
 </ResourceCompile>
 <Link>
 <RegisterOutput>false</RegisterOutput>
- <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;winmm.lib;libcryptoMDd.lib;libsslMDd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -348,7 +348,7 @@
 <Culture>0x040c</Culture>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;winmm.lib;libcryptoMD.lib;libsslMD.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -434,7 +434,7 @@
 <Culture>0x040c</Culture>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;winmm.lib;libcryptoMD.lib;libsslMD.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

gpac-0.8.0.tar.gz/build/msvc10/nvdec.vcxproj Added

@@ -0,0 +1,284 @@
+<?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">
+ <ProjectName>nvdec</ProjectName>
+ <ProjectGuid>{073E2381-4CDB-4C4D-B217-C489EF17C48B}</ProjectGuid>
+ <RootNamespace>nvdec</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>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <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'">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)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dymmy_in_deb/nvdec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <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/dymmy_in_deb/nvdec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../modules/nvdec/nvcuda/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>INIT_CUDA_GL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </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>.\obj/dymmy_in_rel/nvdec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <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/dymmy_in_rel/nvdec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../modules/nvdec/nvcuda/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\nvdec\cuda_sdk.c" />
+ <ClCompile Include="..\..\modules\nvdec\nvdec.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>
+ <ItemGroup>
+ <ClInclude Include="..\..\modules\nvdec\cuda_sdk.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.7.1.tar.gz/build/msvc14/Osmo4.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/Osmo4.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/aac_in.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/aac_in.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/ac3_in.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/ac3_in.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/amr_dec.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/amr_dec.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/amr_float_dec.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/amr_float_dec.vcxproj Changed

gpac-0.8.0.tar.gz/build/msvc14/atsc_in.vcxproj Added

@@ -0,0 +1,289 @@
+<?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>{48071212-239F-4F24-B4FA-E21250CCB087}</ProjectGuid>
+ <RootNamespace>atsc_in</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
+ </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>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+ <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)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/atsc_in_deb/atsc_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <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/atsc_in_deb/atsc_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </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>.\obj/atsc_in_rel/atsc_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <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/atsc_in_rel/atsc_in.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\atsc_in\atsc_in.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>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ </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-0.7.1.tar.gz/build/msvc14/audio_filter.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/audio_filter.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/bifs_dec.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/bifs_dec.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/ctx_load.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/ctx_load.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/dashcast.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/dashcast.vcxproj Changed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <ItemGroup Label="ProjectConfigurations">
 <ProjectConfiguration Include="Debug|Win32">
 <Configuration>Debug</Configuration>
@@ -21,13 +21,14 @@
 <PropertyGroup Label="Globals">
 <ProjectGuid>{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}</ProjectGuid>
 <RootNamespace>dashcast</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
 </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>
+ <PlatformToolset>v141</PlatformToolset>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 <ConfigurationType>Application</ConfigurationType>
@@ -39,7 +40,7 @@
 <ConfigurationType>Application</ConfigurationType>
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 <ConfigurationType>Application</ConfigurationType>
@@ -107,7 +108,7 @@
 </ResourceCompile>
 <Link>
 <RegisterOutput>false</RegisterOutput>
- <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
+ <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;swresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -146,7 +147,7 @@
 </ResourceCompile>
 <Link>
 <RegisterOutput>false</RegisterOutput>
- <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
+ <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;swresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -175,7 +176,7 @@
 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
 <ObjectFileName>$(IntDir)</ObjectFileName>
 <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
+ <WarningLevel>Level2</WarningLevel>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </ClCompile>
 <ResourceCompile>
@@ -183,13 +184,14 @@
 <Culture>0x040c</Culture>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
+ <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;swresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
 <SubSystem>Console</SubSystem>
 <TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
 </Link>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -213,7 +215,7 @@
 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
 <ObjectFileName>$(IntDir)</ObjectFileName>
 <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
- <WarningLevel>Level3</WarningLevel>
+ <WarningLevel>Level2</WarningLevel>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 </ClCompile>
 <ResourceCompile>
@@ -221,7 +223,7 @@
 <Culture>0x040c</Culture>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
+ <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;swresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

gpac-0.7.1.tar.gz/build/msvc14/dektec_out.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/dektec_out.vcxproj Changed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <ItemGroup Label="ProjectConfigurations">
 <ProjectConfiguration Include="Debug|Win32">
 <Configuration>Debug</Configuration>
@@ -21,27 +21,32 @@
 <PropertyGroup Label="Globals">
 <ProjectGuid>{CAC981C2-5665-4E90-80D3-604C1A785D91}</ProjectGuid>
 <RootNamespace>dektec_out</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
 </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>v141</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>v141</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">
@@ -120,7 +125,8 @@
 <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
 <TargetMachine>MachineX86</TargetMachine>
 <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
- <AdditionalDependencies>dtapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
 </Link>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -163,7 +169,7 @@
 <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
 <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
 <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
- <AdditionalDependencies>dtapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 </Link>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -209,7 +215,7 @@
 <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
 <TargetMachine>MachineX86</TargetMachine>
 <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
- <AdditionalDependencies>dtapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 </Link>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -251,7 +257,7 @@
 <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
 <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
 <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
- <AdditionalDependencies>dtapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 </Link>
 <Bscmake>
 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -259,7 +265,6 @@
 </ItemDefinitionGroup>
 <ItemGroup>
 <ClCompile Include="..\..\modules\dektec_out\dektec_video.cpp" />
- <ClCompile Include="..\..\modules\dx_hw\copy_pixels.c" />
 <ClCompile Include="..\..\modules\modules_export.cpp" />
 </ItemGroup>
 <ItemGroup>

gpac-0.7.1.tar.gz/build/msvc14/dummy_in.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/dummy_in.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/dx_hw.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/dx_hw.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/ffmpeg_in.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/ffmpeg_in.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/ft_font.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/ft_font.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/gdip_raster.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/gdip_raster.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/gpac.sln -> gpac-0.8.0.tar.gz/build/msvc14/gpac.sln Changed

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4client", "mp4client.vcxproj", "{A35D99BF-D72D-4F56-99A1-97249B22BCE2}"
 EndProject
@@ -105,6 +105,12 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtt_in", "vtt_in.vcxproj", "{E578716F-6663-4D83-AC79-57EA00D2F406}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nvdec", "nvdec.vcxproj", "{073E2381-4CDB-4C4D-B217-C489EF17C48B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dektec_out", "dektec_out.vcxproj", "{CAC981C2-5665-4E90-80D3-604C1A785D91}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atsc_in", "atsc_in.vcxproj", "{48071212-239F-4F24-B4FA-E21250CCB087}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug - MP4Box_only|Win32 = Debug - MP4Box_only|Win32
@@ -132,12 +138,10 @@
 		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
 		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.Build.0 = Debug|Win32
 		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|x64.ActiveCfg = Debug|x64
 		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
 		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
 		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.ActiveCfg = Release|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.Build.0 = Release|Win32
 		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|x64.ActiveCfg = Release|x64
 		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
 		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
@@ -687,6 +691,42 @@
 		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|Win32.Build.0 = Release|Win32
 		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|x64.ActiveCfg = Release|x64
 		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|x64.Build.0 = Release|x64
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug|Win32.Build.0 = Debug|Win32
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug|x64.ActiveCfg = Debug|x64
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug|x64.Build.0 = Debug|x64
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release|Win32.ActiveCfg = Release|Win32
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release|Win32.Build.0 = Release|Win32
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release|x64.ActiveCfg = Release|x64
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release|x64.Build.0 = Release|x64
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug|Win32.Build.0 = Debug|Win32
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug|x64.ActiveCfg = Debug|x64
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug|x64.Build.0 = Debug|x64
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release|Win32.ActiveCfg = Release|Win32
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release|Win32.Build.0 = Release|Win32
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release|x64.ActiveCfg = Release|x64
+		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release|x64.Build.0 = Release|x64
+		{48071212-239F-4F24-B4FA-E21250CCB087}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{48071212-239F-4F24-B4FA-E21250CCB087}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{48071212-239F-4F24-B4FA-E21250CCB087}.Debug|Win32.ActiveCfg = Debug|Win32
+		{48071212-239F-4F24-B4FA-E21250CCB087}.Debug|Win32.Build.0 = Debug|Win32
+		{48071212-239F-4F24-B4FA-E21250CCB087}.Debug|x64.ActiveCfg = Debug|x64
+		{48071212-239F-4F24-B4FA-E21250CCB087}.Debug|x64.Build.0 = Debug|x64
+		{48071212-239F-4F24-B4FA-E21250CCB087}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{48071212-239F-4F24-B4FA-E21250CCB087}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{48071212-239F-4F24-B4FA-E21250CCB087}.Release|Win32.ActiveCfg = Release|Win32
+		{48071212-239F-4F24-B4FA-E21250CCB087}.Release|Win32.Build.0 = Release|Win32
+		{48071212-239F-4F24-B4FA-E21250CCB087}.Release|x64.ActiveCfg = Release|x64
+		{48071212-239F-4F24-B4FA-E21250CCB087}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -739,5 +779,8 @@
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
 		{E578716F-6663-4D83-AC79-57EA00D2F406} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{073E2381-4CDB-4C4D-B217-C489EF17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{CAC981C2-5665-4E90-80D3-604C1A785D91} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{48071212-239F-4F24-B4FA-E21250CCB087} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 	EndGlobalSection
 EndGlobal

gpac-0.7.1.tar.gz/build/msvc14/gpac_js.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/gpac_js.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/img_in.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/img_in.vcxproj Changed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <ItemGroup Label="ProjectConfigurations">
 <ProjectConfiguration Include="Debug|Win32">
 <Configuration>Debug</Configuration>
@@ -21,13 +21,14 @@
 <PropertyGroup Label="Globals">
 <ProjectGuid>{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}</ProjectGuid>
 <RootNamespace>img_in</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
 </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>
+ <PlatformToolset>v141</PlatformToolset>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -39,7 +40,7 @@
 <ConfigurationType>DynamicLibrary</ConfigurationType>
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -98,7 +99,7 @@
 </Midl>
 <ClCompile>
 <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/jpeg;../../extra_lib/include/zlib;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/jpeg;../../extra_lib/include/zlib;../../extra_lib/include/openjpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <MinimalRebuild>true</MinimalRebuild>
 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -142,7 +143,7 @@
 </Midl>
 <ClCompile>
 <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/jpeg;../../extra_lib/include/zlib;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/jpeg;../../extra_lib/include/zlib;../../extra_lib/include/openjpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -186,7 +187,7 @@
 <ClCompile>
 <Optimization>MaxSpeed</Optimization>
 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/zlib;../../extra_lib/include/jpeg;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/zlib;../../extra_lib/include/jpeg;../../extra_lib/include/openjpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <StringPooling>true</StringPooling>
 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -230,7 +231,7 @@
 <ClCompile>
 <Optimization>Full</Optimization>
 <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/zlib;../../extra_lib/include/jpeg;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/zlib;../../extra_lib/include/jpeg;../../extra_lib/include/openjpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <StringPooling>true</StringPooling>
 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

gpac-0.7.1.tar.gz/build/msvc14/ismacryp.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/ismacryp.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/isom_in.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/isom_in.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/laser_dec.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/laser_dec.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/libgpac.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/libgpac.vcxproj Changed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <ItemGroup Label="ProjectConfigurations">
 <ProjectConfiguration Include="Debug - MP4Box_only|Win32">
 <Configuration>Debug - MP4Box_only</Configuration>
@@ -36,6 +36,7 @@
 </ItemGroup>
 <ItemGroup>
 <ClInclude Include="..\..\include\gpac\ait.h" />
+ <ClInclude Include="..\..\include\gpac\atsc.h" />
 <ClInclude Include="..\..\include\gpac\avparse.h" />
 <ClInclude Include="..\..\include\gpac\base_coding.h" />
 <ClInclude Include="..\..\include\gpac\bifs.h" />
@@ -271,21 +272,12 @@
 <ClCompile Include="..\..\src\laser\lsr_dec.c" />
 <ClCompile Include="..\..\src\laser\lsr_enc.c" />
 <ClCompile Include="..\..\src\laser\lsr_tables.c" />
- <ClCompile Include="..\..\src\mcrypt\cbc.c" />
- <ClCompile Include="..\..\src\mcrypt\cfb.c" />
- <ClCompile Include="..\..\src\mcrypt\ctr.c" />
- <ClCompile Include="..\..\src\mcrypt\des.c" />
- <ClCompile Include="..\..\src\mcrypt\ecb.c" />
- <ClCompile Include="..\..\src\mcrypt\g_crypt.c" />
- <ClCompile Include="..\..\src\mcrypt\ncfb.c" />
- <ClCompile Include="..\..\src\mcrypt\nofb.c" />
- <ClCompile Include="..\..\src\mcrypt\ofb.c" />
- <ClCompile Include="..\..\src\mcrypt\rijndael-128.c" />
- <ClCompile Include="..\..\src\mcrypt\rijndael-192.c" />
- <ClCompile Include="..\..\src\mcrypt\rijndael-256.c" />
- <ClCompile Include="..\..\src\mcrypt\stream.c" />
- <ClCompile Include="..\..\src\mcrypt\tripledes.c" />
+ <ClCompile Include="..\..\src\crypto\g_crypt.c" />
+ <ClCompile Include="..\..\src\crypto\g_crypt_openssl.c" />
+ <ClCompile Include="..\..\src\crypto\g_crypt_tinyaes.c" />
+ <ClCompile Include="..\..\src\crypto\tiny_aes.c" />
 <ClCompile Include="..\..\src\media_tools\ait.c" />
+ <ClCompile Include="..\..\src\media_tools\atsc_dmx.c" />
 <ClCompile Include="..\..\src\media_tools\avilib.c" />
 <ClCompile Include="..\..\src\media_tools\av_parsers.c" />
 <ClCompile Include="..\..\src\media_tools\dash_client.c" />
@@ -414,7 +406,7 @@
 <PropertyGroup Label="Globals">
 <ProjectGuid>{233014D5-F6E5-419D-8757-FA9CE7337088}</ProjectGuid>
 <RootNamespace>libgpac</RootNamespace>
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
 </PropertyGroup>
 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -427,7 +419,7 @@
 <ConfigurationType>StaticLibrary</ConfigurationType>
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -451,7 +443,7 @@
 <ConfigurationType>StaticLibrary</ConfigurationType>
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -519,8 +511,8 @@
 <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">libgpac_static</TargetName>
 <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libgpac_static</TargetName>
 <TargetName Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">libgpac_static</TargetName>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;</LibraryPath>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 <IncludePath>$(IncludePath)</IncludePath>

gpac-0.7.1.tar.gz/build/msvc14/libgpac.vcxproj.filters -> gpac-0.8.0.tar.gz/build/msvc14/libgpac.vcxproj.filters Changed

@@ -25,7 +25,7 @@
 <Filter Include="laser">
 <UniqueIdentifier>{3073cf49-9ebb-48cf-aea8-35a44d810e10}</UniqueIdentifier>
 </Filter>
- <Filter Include="mcrypt">
+ <Filter Include="crypto">
 <UniqueIdentifier>{34d7c2c7-ecca-42a1-b891-dab22082820c}</UniqueIdentifier>
 </Filter>
 <Filter Include="media_tools">
@@ -396,6 +396,9 @@
 <ClInclude Include="..\..\include\gpac\webvtt.h">
 <Filter>include</Filter>
 </ClInclude>
+ <ClInclude Include="..\..\include\gpac\atsc.h">
+ <Filter>include</Filter>
+ </ClInclude>
 </ItemGroup>
 <ItemGroup>
 <ClCompile Include="..\..\src\bifs\arith_decoder.c">
@@ -749,47 +752,17 @@
 <ClCompile Include="..\..\src\laser\lsr_tables.c">
 <Filter>laser</Filter>
 </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\cbc.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\cfb.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\ctr.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\des.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\ecb.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\g_crypt.c">
- <Filter>mcrypt</Filter>
+ <ClCompile Include="..\..\src\crypto\g_crypt.c">
+ <Filter>crypto</Filter>
 </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\ncfb.c">
- <Filter>mcrypt</Filter>
+ <ClCompile Include="..\..\src\crypto\g_crypt_openssl.c">
+ <Filter>crypto</Filter>
 </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\nofb.c">
- <Filter>mcrypt</Filter>
+ <ClCompile Include="..\..\src\crypto\g_crypt_tinyaes.c">
+ <Filter>crypto</Filter>
 </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\ofb.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\rijndael-128.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\rijndael-192.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\rijndael-256.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\stream.c">
- <Filter>mcrypt</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\mcrypt\tripledes.c">
- <Filter>mcrypt</Filter>
+ <ClCompile Include="..\..\src\crypto\tiny_aes.c">
+ <Filter>crypto</Filter>
 </ClCompile>
 <ClCompile Include="..\..\src\media_tools\ait.c">
 <Filter>media_tools</Filter>
@@ -1172,5 +1145,8 @@
 <ClCompile Include="..\..\src\isomedia\iff.c">
 <Filter>isomedia</Filter>
 </ClCompile>
+ <ClCompile Include="..\..\src\media_tools\atsc_dmx.c">
+ <Filter>media_tools</Filter>
+ </ClCompile>
 </ItemGroup>
 </Project>
\ No newline at end of file

gpac-0.7.1.tar.gz/build/msvc14/libgpac_dll.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/libgpac_dll.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/mp3_in.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/mp3_in.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/mp42ts.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/mp42ts.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/mp4box.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/mp4box.vcxproj Changed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <ItemGroup Label="ProjectConfigurations">
 <ProjectConfiguration Include="Debug - MP4Box_only|Win32">
 <Configuration>Debug - MP4Box_only</Configuration>
@@ -37,19 +37,20 @@
 <PropertyGroup Label="Globals">
 <ProjectGuid>{48E2C7C6-52EB-46FB-8722-00A62F46F497}</ProjectGuid>
 <RootNamespace>mp4box</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
 </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>
+ <PlatformToolset>v141</PlatformToolset>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'" Label="Configuration">
 <ConfigurationType>Application</ConfigurationType>
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 <ConfigurationType>Application</ConfigurationType>
@@ -67,13 +68,13 @@
 <ConfigurationType>Application</ConfigurationType>
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'" Label="Configuration">
 <ConfigurationType>Application</ConfigurationType>
 <UseOfMfc>false</UseOfMfc>
 <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 <ConfigurationType>Application</ConfigurationType>
@@ -186,7 +187,7 @@
 </ResourceCompile>
 <Link>
 <RegisterOutput>false</RegisterOutput>
- <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;winmm.lib;libcrypto.lib;libssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -276,7 +277,7 @@
 </ResourceCompile>
 <Link>
 <RegisterOutput>false</RegisterOutput>
- <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;winmm.lib;libcryptoMDd.lib;libsslMDd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -301,7 +302,7 @@
 <ClCompile>
 <Optimization>Disabled</Optimization>
 <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
@@ -361,7 +362,7 @@
 <Culture>0x040c</Culture>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;winmm.lib;libcryptoMD.lib;libsslMD.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -447,7 +448,7 @@
 <Culture>0x040c</Culture>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;winmm.lib;libcryptoMD.lib;libsslMD.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

gpac-0.7.1.tar.gz/build/msvc14/mp4client.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/mp4client.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/mpd_in.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/mpd_in.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/mpegts_in.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/mpegts_in.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/mse_in.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/mse_in.vcxproj Changed

gpac-0.8.0.tar.gz/build/msvc14/nvdec.vcxproj Added

@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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">
+ <ProjectName>nvdec</ProjectName>
+ <ProjectGuid>{073E2381-4CDB-4C4D-B217-C489EF17C48B}</ProjectGuid>
+ <RootNamespace>nvdec</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
+ </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>v141</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>v141</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'">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)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\obj/dymmy_in_deb/nvdec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <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/dymmy_in_deb/nvdec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../../include;../../modules/nvdec/nvcuda/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>INIT_CUDA_GL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ </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>.\obj/dymmy_in_rel/nvdec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <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/dymmy_in_rel/nvdec.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../../include;../../modules/nvdec/nvcuda/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+ <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\modules\modules_export.cpp" />
+ <ClCompile Include="..\..\modules\nvdec\cuda_sdk.c" />
+ <ClCompile Include="..\..\modules\nvdec\nvdec.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>
+ <ItemGroup>
+ <ClInclude Include="..\..\modules\nvdec\cuda_sdk.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.7.1.tar.gz/build/msvc14/odf_dec.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/odf_dec.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/ogg.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/ogg.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/openhevc.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/openhevc.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/opensvc.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/opensvc.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/platinum.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/platinum.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/raw_out.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/raw_out.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/redirect_av.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/redirect_av.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/rtp_in.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/rtp_in.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/saf_in.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/saf_in.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/sdl_out.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/sdl_out.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/soft_raster.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/soft_raster.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/svg_in.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/svg_in.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/timedtext.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/timedtext.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/ui_rec.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/ui_rec.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/validator.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/validator.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/vtt_in.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/vtt_in.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/wav_out.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/wav_out.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/widgetman.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/widgetman.vcxproj Changed

gpac-0.7.1.tar.gz/build/msvc14/xvid_dec.vcxproj -> gpac-0.8.0.tar.gz/build/msvc14/xvid_dec.vcxproj Changed

gpac-0.7.1.tar.gz/build/symbian/libgpac.mmp -> gpac-0.8.0.tar.gz/build/symbian/libgpac.mmp Changed

gpac-0.7.1.tar.gz/build/xcode/gpac.xcodeproj/project.pbxproj -> gpac-0.8.0.tar.gz/build/xcode/gpac.xcodeproj/project.pbxproj Changed

@@ -163,20 +163,6 @@
 		9201013018D5A444003D1ACA /* lsr_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000F18D5A444003D1ACA /* lsr_dec.c */; };
 		9201013118D5A444003D1ACA /* lsr_enc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001018D5A444003D1ACA /* lsr_enc.c */; };
 		9201013218D5A445003D1ACA /* lsr_tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001118D5A444003D1ACA /* lsr_tables.c */; };
-		9201013418D5A445003D1ACA /* cbc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001418D5A444003D1ACA /* cbc.c */; };
-		9201013518D5A445003D1ACA /* cfb.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001518D5A444003D1ACA /* cfb.c */; };
-		9201013618D5A445003D1ACA /* ctr.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001618D5A444003D1ACA /* ctr.c */; };
-		9201013718D5A445003D1ACA /* des.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001718D5A444003D1ACA /* des.c */; };
-		9201013818D5A445003D1ACA /* ecb.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001818D5A444003D1ACA /* ecb.c */; };
-		9201013918D5A445003D1ACA /* g_crypt.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001918D5A444003D1ACA /* g_crypt.c */; };
-		9201013A18D5A445003D1ACA /* ncfb.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001A18D5A444003D1ACA /* ncfb.c */; };
-		9201013B18D5A445003D1ACA /* nofb.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001B18D5A444003D1ACA /* nofb.c */; };
-		9201013C18D5A445003D1ACA /* ofb.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001C18D5A444003D1ACA /* ofb.c */; };
-		9201013D18D5A445003D1ACA /* rijndael-128.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001D18D5A444003D1ACA /* rijndael-128.c */; };
-		9201013E18D5A445003D1ACA /* rijndael-192.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001E18D5A444003D1ACA /* rijndael-192.c */; };
-		9201013F18D5A445003D1ACA /* rijndael-256.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001F18D5A444003D1ACA /* rijndael-256.c */; };
-		9201014018D5A445003D1ACA /* stream.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002018D5A444003D1ACA /* stream.c */; };
-		9201014118D5A445003D1ACA /* tripledes.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002118D5A444003D1ACA /* tripledes.c */; };
 		9201014218D5A445003D1ACA /* ait.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002318D5A444003D1ACA /* ait.c */; };
 		9201014318D5A445003D1ACA /* av_parsers.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002418D5A444003D1ACA /* av_parsers.c */; };
 		9201014418D5A445003D1ACA /* avilib.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002518D5A444003D1ACA /* avilib.c */; };
@@ -318,6 +304,17 @@
 		9235E0521CFECD450051D8A1 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9235E0511CFECD450051D8A1 /* VideoToolbox.framework */; };
 		9235E0531CFECD520051D8A1 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5AA661A152BB700372C59 /* CoreFoundation.framework */; };
 		924FEE821BA6C63A003F77A6 /* iff.c in Sources */ = {isa = PBXBuildFile; fileRef = 924FEE811BA6C63A003F77A6 /* iff.c */; };
+		92597E4D20B4805C000365B9 /* g_crypt_openssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 92597E4820B4805B000365B9 /* g_crypt_openssl.c */; };
+		92597E4E20B4805C000365B9 /* tiny_aes.h in Headers */ = {isa = PBXBuildFile; fileRef = 92597E4920B4805B000365B9 /* tiny_aes.h */; };
+		92597E4F20B4805C000365B9 /* g_crypt.c in Sources */ = {isa = PBXBuildFile; fileRef = 92597E4A20B4805B000365B9 /* g_crypt.c */; };
+		92597E5020B4805C000365B9 /* tiny_aes.c in Sources */ = {isa = PBXBuildFile; fileRef = 92597E4B20B4805B000365B9 /* tiny_aes.c */; };
+		92597E5120B4805C000365B9 /* g_crypt_tinyaes.c in Sources */ = {isa = PBXBuildFile; fileRef = 92597E4C20B4805B000365B9 /* g_crypt_tinyaes.c */; };
+		92A7E9592003BA8F000C22DE /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9235E0511CFECD450051D8A1 /* VideoToolbox.framework */; };
+		92A7E95A2003BA9B000C22DE /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2839E2C41A163711002D73E1 /* CoreMedia.framework */; };
+		92A7E95B2003BAA3000C22DE /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9235E04F1CFECD370051D8A1 /* CoreVideo.framework */; };
+		92A7E95D2003BAAA000C22DE /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92A7E95C2003BAAA000C22DE /* CoreServices.framework */; };
+		92A7E95F2003BACB000C22DE /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92A7E95E2003BACB000C22DE /* AudioToolbox.framework */; };
+		92A7E9612003BAE8000C22DE /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92A7E9602003BAE8000C22DE /* Security.framework */; };
 		92A9D3C91CCA7AAA006FF303 /* amr_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92A9D3C61CCA79B4006FF303 /* amr_in.c */; };
 		92AAF0E418D6DB8600E2FF12 /* audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0D818D6DB5500E2FF12 /* audio.c */; };
 		92AAF0E518D6DB8600E2FF12 /* sdl_out.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0DA18D6DB5500E2FF12 /* sdl_out.c */; };
@@ -504,7 +501,11 @@
 		92BE50D418D6D62600AA59D8 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50D218D6D62600AA59D8 /* main.c */; };
 		92BE50D518D6D66C00AA59D8 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
 		92BE50D618D6D6C100AA59D8 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		92D3C6272031E94F00BA1735 /* atsc_dmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D3C6262031E94F00BA1735 /* atsc_dmx.c */; };
+		92D3C6292031E98600BA1735 /* atsc.h in Headers */ = {isa = PBXBuildFile; fileRef = 92D3C6282031E98600BA1735 /* atsc.h */; };
+		92D3C6312031F4C200BA1735 /* atsc_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D3C6302031F4C100BA1735 /* atsc_in.c */; };
 		92D535711A5C0D1400F2442A /* carbon_events.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D5356F1A5C0CF700F2442A /* carbon_events.c */; };
+		92F8D46C1F6FF7A100616F7C /* netctrl.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F8D46B1F6FF7A100616F7C /* netctrl.c */; };
 		92F930821A5ADB870072A85C /* os_divers.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F930801A5ADB870072A85C /* os_divers.c */; };
 		92F930831A5ADB870072A85C /* os_file.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F930811A5ADB870072A85C /* os_file.c */; };
 /* End PBXBuildFile section */
@@ -689,20 +690,6 @@
 		9201000F18D5A444003D1ACA /* lsr_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsr_dec.c; sourceTree = "<group>"; };
 		9201001018D5A444003D1ACA /* lsr_enc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsr_enc.c; sourceTree = "<group>"; };
 		9201001118D5A444003D1ACA /* lsr_tables.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsr_tables.c; sourceTree = "<group>"; };
-		9201001418D5A444003D1ACA /* cbc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cbc.c; sourceTree = "<group>"; };
-		9201001518D5A444003D1ACA /* cfb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cfb.c; sourceTree = "<group>"; };
-		9201001618D5A444003D1ACA /* ctr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ctr.c; sourceTree = "<group>"; };
-		9201001718D5A444003D1ACA /* des.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = des.c; sourceTree = "<group>"; };
-		9201001818D5A444003D1ACA /* ecb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ecb.c; sourceTree = "<group>"; };
-		9201001918D5A444003D1ACA /* g_crypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_crypt.c; sourceTree = "<group>"; };
-		9201001A18D5A444003D1ACA /* ncfb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ncfb.c; sourceTree = "<group>"; };
-		9201001B18D5A444003D1ACA /* nofb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nofb.c; sourceTree = "<group>"; };
-		9201001C18D5A444003D1ACA /* ofb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ofb.c; sourceTree = "<group>"; };
-		9201001D18D5A444003D1ACA /* rijndael-128.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "rijndael-128.c"; sourceTree = "<group>"; };
-		9201001E18D5A444003D1ACA /* rijndael-192.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "rijndael-192.c"; sourceTree = "<group>"; };
-		9201001F18D5A444003D1ACA /* rijndael-256.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "rijndael-256.c"; sourceTree = "<group>"; };
-		9201002018D5A444003D1ACA /* stream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stream.c; sourceTree = "<group>"; };
-		9201002118D5A444003D1ACA /* tripledes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tripledes.c; sourceTree = "<group>"; };
 		9201002318D5A444003D1ACA /* ait.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ait.c; sourceTree = "<group>"; };
 		9201002418D5A444003D1ACA /* av_parsers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = av_parsers.c; sourceTree = "<group>"; };
 		9201002518D5A444003D1ACA /* avilib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = avilib.c; sourceTree = "<group>"; };
@@ -953,20 +940,6 @@
 		9201FEFA18D5A444003D1ACA /* lsr_dec.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = lsr_dec.dep; sourceTree = "<group>"; };
 		9201FEFB18D5A444003D1ACA /* lsr_enc.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = lsr_enc.dep; sourceTree = "<group>"; };
 		9201FEFC18D5A444003D1ACA /* lsr_tables.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = lsr_tables.dep; sourceTree = "<group>"; };
-		9201FEFE18D5A444003D1ACA /* cbc.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cbc.dep; sourceTree = "<group>"; };
-		9201FEFF18D5A444003D1ACA /* cfb.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cfb.dep; sourceTree = "<group>"; };
-		9201FF0018D5A444003D1ACA /* ctr.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ctr.dep; sourceTree = "<group>"; };
-		9201FF0118D5A444003D1ACA /* des.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = des.dep; sourceTree = "<group>"; };
-		9201FF0218D5A444003D1ACA /* ecb.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ecb.dep; sourceTree = "<group>"; };
-		9201FF0318D5A444003D1ACA /* g_crypt.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = g_crypt.dep; sourceTree = "<group>"; };
-		9201FF0418D5A444003D1ACA /* ncfb.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ncfb.dep; sourceTree = "<group>"; };
-		9201FF0518D5A444003D1ACA /* nofb.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = nofb.dep; sourceTree = "<group>"; };
-		9201FF0618D5A444003D1ACA /* ofb.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ofb.dep; sourceTree = "<group>"; };
-		9201FF0718D5A444003D1ACA /* rijndael-128.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "rijndael-128.dep"; sourceTree = "<group>"; };
-		9201FF0818D5A444003D1ACA /* rijndael-192.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "rijndael-192.dep"; sourceTree = "<group>"; };
-		9201FF0918D5A444003D1ACA /* rijndael-256.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "rijndael-256.dep"; sourceTree = "<group>"; };
-		9201FF0A18D5A444003D1ACA /* stream.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stream.dep; sourceTree = "<group>"; };
-		9201FF0B18D5A444003D1ACA /* tripledes.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tripledes.dep; sourceTree = "<group>"; };
 		9201FF0D18D5A444003D1ACA /* av_parsers.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = av_parsers.dep; sourceTree = "<group>"; };
 		9201FF0E18D5A444003D1ACA /* avilib.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = avilib.dep; sourceTree = "<group>"; };
 		9201FF0F18D5A444003D1ACA /* dash_client.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dash_client.dep; sourceTree = "<group>"; };
@@ -1208,6 +1181,14 @@
 		9235E04F1CFECD370051D8A1 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
 		9235E0511CFECD450051D8A1 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
 		924FEE811BA6C63A003F77A6 /* iff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iff.c; sourceTree = "<group>"; };
+		92597E4820B4805B000365B9 /* g_crypt_openssl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt_openssl.c; path = crypto/g_crypt_openssl.c; sourceTree = "<group>"; };
+		92597E4920B4805B000365B9 /* tiny_aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tiny_aes.h; path = crypto/tiny_aes.h; sourceTree = "<group>"; };
+		92597E4A20B4805B000365B9 /* g_crypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt.c; path = crypto/g_crypt.c; sourceTree = "<group>"; };
+		92597E4B20B4805B000365B9 /* tiny_aes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tiny_aes.c; path = crypto/tiny_aes.c; sourceTree = "<group>"; };
+		92597E4C20B4805B000365B9 /* 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>"; };
+		92A7E95C2003BAAA000C22DE /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };
+		92A7E95E2003BACB000C22DE /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
+		92A7E9602003BAE8000C22DE /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		92A9D3C61CCA79B4006FF303 /* amr_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = amr_in.c; path = ../../modules/amr_dec/amr_in.c; sourceTree = "<group>"; };
 		92AAF0D318D6DB2D00E2FF12 /* gm_sdl_out.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_sdl_out.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		92AAF0D818D6DB5500E2FF12 /* audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio.c; path = ../../modules/sdl_out/audio.c; sourceTree = "<group>"; };
@@ -1279,6 +1260,7 @@
 		92AAF1D518D7109A00E2FF12 /* vtt_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtt_dec.c; path = ../../modules/vtt_in/vtt_dec.c; sourceTree = "<group>"; };
 		92AAF1D618D7109A00E2FF12 /* vtt_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtt_in.c; path = ../../modules/vtt_in/vtt_in.c; sourceTree = "<group>"; };
 		92B02F4E1DD2004400F85E77 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
+		92BAF023202C542C001ED2F1 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../applications/testapps/atscdmx/main.c; sourceTree = "<group>"; };
 		92BBFC481A7122AD006A7735 /* ait.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ait.h; path = ../include/gpac/ait.h; sourceTree = "<group>"; };
 		92BBFC491A7122AD006A7735 /* avparse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = avparse.h; path = ../include/gpac/avparse.h; sourceTree = "<group>"; };
 		92BBFC4A1A7122AD006A7735 /* base_coding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base_coding.h; path = ../include/gpac/base_coding.h; sourceTree = "<group>"; };
@@ -1396,7 +1378,11 @@
 		92BE510F18D6DA6300AA59D8 /* stencil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stencil.c; path = ../../modules/soft_raster/stencil.c; sourceTree = "<group>"; };
 		92BE511018D6DA6300AA59D8 /* surface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = surface.c; path = ../../modules/soft_raster/surface.c; sourceTree = "<group>"; };
 		92CC44F91DC0D22C0084D6A6 /* libopensvc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libopensvc.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		92D3C6262031E94F00BA1735 /* atsc_dmx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = atsc_dmx.c; sourceTree = "<group>"; };
+		92D3C6282031E98600BA1735 /* atsc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = atsc.h; path = ../include/gpac/atsc.h; sourceTree = "<group>"; };
+		92D3C6302031F4C100BA1735 /* atsc_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = atsc_in.c; path = ../../modules/atsc_in/atsc_in.c; sourceTree = "<group>"; };
 		92D5356F1A5C0CF700F2442A /* carbon_events.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = carbon_events.c; path = ../../applications/mp4client/carbon_events.c; sourceTree = "<group>"; };
+		92F8D46B1F6FF7A100616F7C /* netctrl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = netctrl.c; path = ../../modules/netctrl/netctrl.c; sourceTree = "<group>"; };
 		92F930801A5ADB870072A85C /* os_divers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_divers.c; sourceTree = "<group>"; };
 		92F930811A5ADB870072A85C /* os_file.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_file.c; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -1480,6 +1466,12 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				92A7E9612003BAE8000C22DE /* Security.framework in Frameworks */,
+				92A7E95F2003BACB000C22DE /* AudioToolbox.framework in Frameworks */,
+				92A7E95D2003BAAA000C22DE /* CoreServices.framework in Frameworks */,
+				92A7E95B2003BAA3000C22DE /* CoreVideo.framework in Frameworks */,
+				92A7E95A2003BA9B000C22DE /* CoreMedia.framework in Frameworks */,
+				92A7E9592003BA8F000C22DE /* VideoToolbox.framework in Frameworks */,
 				28C5AA691A152BC400372C59 /* VideoDecodeAcceleration.framework in Frameworks */,
 				28C5AA671A152BB700372C59 /* CoreFoundation.framework in Frameworks */,
 				28C5AA651A15240800372C59 /* AVFoundation.framework in Frameworks */,
@@ -1580,30 +1572,10 @@
 			path = laser;
 			sourceTree = "<group>";
 		};
-		9201001318D5A444003D1ACA /* mcrypt */ = {
-			isa = PBXGroup;
-			children = (
-				9201001418D5A444003D1ACA /* cbc.c */,
-				9201001518D5A444003D1ACA /* cfb.c */,
-				9201001618D5A444003D1ACA /* ctr.c */,
-				9201001718D5A444003D1ACA /* des.c */,
-				9201001818D5A444003D1ACA /* ecb.c */,
-				9201001918D5A444003D1ACA /* g_crypt.c */,
-				9201001A18D5A444003D1ACA /* ncfb.c */,
-				9201001B18D5A444003D1ACA /* nofb.c */,
-				9201001C18D5A444003D1ACA /* ofb.c */,
-				9201001D18D5A444003D1ACA /* rijndael-128.c */,
-				9201001E18D5A444003D1ACA /* rijndael-192.c */,
-				9201001F18D5A444003D1ACA /* rijndael-256.c */,
-				9201002018D5A444003D1ACA /* stream.c */,
-				9201002118D5A444003D1ACA /* tripledes.c */,
-			);
-			path = mcrypt;
-			sourceTree = "<group>";
-		};
 		9201002218D5A444003D1ACA /* media_tools */ = {
 			isa = PBXGroup;
 			children = (
+				92D3C6262031E94F00BA1735 /* atsc_dmx.c */,
 				9201002318D5A444003D1ACA /* ait.c */,
 				9201002418D5A444003D1ACA /* av_parsers.c */,
 				9201002518D5A444003D1ACA /* avilib.c */,
@@ -1814,10 +1786,10 @@
 				9201FE8018D5A444003D1ACA /* .deps */,
 				9201FF8918D5A444003D1ACA /* bifs */,
 				9201FF9A18D5A444003D1ACA /* compositor */,
+				92DC362B20B4803E00C48E39 /* crypto */,
 				9201FFE318D5A444003D1ACA /* ietf */,
 				9201FFF118D5A444003D1ACA /* isomedia */,
 				9201000E18D5A444003D1ACA /* laser */,
-				9201001318D5A444003D1ACA /* mcrypt */,
 				9201002218D5A444003D1ACA /* media_tools */,
 				9201004018D5A444003D1ACA /* odf */,
 				9201004E18D5A444003D1ACA /* scene_manager */,
@@ -1838,7 +1810,6 @@
 				9201FECE18D5A444003D1ACA /* ietf */,
 				9201FEDC18D5A444003D1ACA /* isomedia */,
 				9201FEF918D5A444003D1ACA /* laser */,
-				9201FEFD18D5A444003D1ACA /* mcrypt */,
 				9201FF0C18D5A444003D1ACA /* media_tools */,
 				9201FF2418D5A444003D1ACA /* odf */,
 				9201FF3218D5A444003D1ACA /* scene_manager */,
@@ -2003,27 +1974,6 @@
 			path = laser;
 			sourceTree = "<group>";
 		};
-		9201FEFD18D5A444003D1ACA /* mcrypt */ = {
-			isa = PBXGroup;
-			children = (
-				9201FEFE18D5A444003D1ACA /* cbc.dep */,
-				9201FEFF18D5A444003D1ACA /* cfb.dep */,
-				9201FF0018D5A444003D1ACA /* ctr.dep */,
-				9201FF0118D5A444003D1ACA /* des.dep */,
-				9201FF0218D5A444003D1ACA /* ecb.dep */,
-				9201FF0318D5A444003D1ACA /* g_crypt.dep */,
-				9201FF0418D5A444003D1ACA /* ncfb.dep */,
-				9201FF0518D5A444003D1ACA /* nofb.dep */,
-				9201FF0618D5A444003D1ACA /* ofb.dep */,
-				9201FF0718D5A444003D1ACA /* rijndael-128.dep */,
-				9201FF0818D5A444003D1ACA /* rijndael-192.dep */,
-				9201FF0918D5A444003D1ACA /* rijndael-256.dep */,
-				9201FF0A18D5A444003D1ACA /* stream.dep */,
-				9201FF0B18D5A444003D1ACA /* tripledes.dep */,
-			);
-			path = mcrypt;
-			sourceTree = "<group>";
-		};
 		9201FF0C18D5A444003D1ACA /* media_tools */ = {
 			isa = PBXGroup;
 			children = (
@@ -2381,6 +2331,7 @@
 		92AAF0E918D6E35200E2FF12 /* builtin_modules */ = {
 			isa = PBXGroup;
 			children = (
+				92D3C62D2031F48500BA1735 /* atsc_in */,
 				92A9D3C81CCA79BD006FF303 /* amr_in */,
 				92AAF0F318D6E5BB00E2FF12 /* audio_filter */,
 				92AAF0F618D6E5EA00E2FF12 /* bifs_dec */,
@@ -2394,6 +2345,7 @@
 				92AAF12218D6E6FE00E2FF12 /* mpd_in */,
 				92AAF12518D6E71C00E2FF12 /* mpegts_in */,
 				92AAF12818D6E73700E2FF12 /* mse_in */,
+				92F8D46A1F6FF78600616F7C /* netctrl */,
 				92AAF12B18D6E74F00E2FF12 /* odf_dec */,
 				92AAF12E18D6E76400E2FF12 /* osd */,
 				92BE50DF18D6D7F800AA59D8 /* raw_out */,
@@ -2668,14 +2620,26 @@
 		92B02F4D1DD2004300F85E77 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				92A7E9602003BAE8000C22DE /* Security.framework */,
+				92A7E95E2003BACB000C22DE /* AudioToolbox.framework */,
+				92A7E95C2003BAAA000C22DE /* CoreServices.framework */,
 				92B02F4E1DD2004400F85E77 /* OpenGL.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		92BAF022202C541B001ED2F1 /* atscdmx */ = {
+			isa = PBXGroup;
+			children = (
+				92BAF023202C542C001ED2F1 /* main.c */,
+			);
+			name = atscdmx;
+			sourceTree = "<group>";
+		};
 		92BBFC471A71228A006A7735 /* include */ = {
 			isa = PBXGroup;
 			children = (
+				92D3C6282031E98600BA1735 /* atsc.h */,
 				92BBFC481A7122AD006A7735 /* ait.h */,
 				92BBFC491A7122AD006A7735 /* avparse.h */,
 				92BBFC4A1A7122AD006A7735 /* base_coding.h */,
@@ -2809,6 +2773,7 @@
 		92BE50AC18D6375100AA59D8 /* applications */ = {
 			isa = PBXGroup;
 			children = (
+				92BAF022202C541B001ED2F1 /* atscdmx */,
 				92D5356F1A5C0CF700F2442A /* carbon_events.c */,
 				2839E2911A1635FE002D73E1 /* DashCast */,
 				92BE50C918D6D60100AA59D8 /* MP4Client */,
@@ -2882,6 +2847,34 @@
 			name = soft_raster;
 			sourceTree = "<group>";
 		};
+		92D3C62D2031F48500BA1735 /* atsc_in */ = {
+			isa = PBXGroup;
+			children = (
+				92D3C6302031F4C100BA1735 /* atsc_in.c */,
+			);
+			name = atsc_in;
+			sourceTree = "<group>";
+		};
+		92DC362B20B4803E00C48E39 /* crypto */ = {
+			isa = PBXGroup;
+			children = (
+				92597E4820B4805B000365B9 /* g_crypt_openssl.c */,
+				92597E4C20B4805B000365B9 /* g_crypt_tinyaes.c */,
+				92597E4A20B4805B000365B9 /* g_crypt.c */,
+				92597E4B20B4805B000365B9 /* tiny_aes.c */,
+				92597E4920B4805B000365B9 /* tiny_aes.h */,
+			);
+			name = crypto;
+			sourceTree = "<group>";
+		};
+		92F8D46A1F6FF78600616F7C /* netctrl */ = {
+			isa = PBXGroup;
+			children = (
+				92F8D46B1F6FF7A100616F7C /* netctrl.c */,
+			);
+			name = netctrl;
+			sourceTree = "<group>";
+		};
 		92FA48841D0191570072C8A4 /* linklibs */ = {
 			isa = PBXGroup;
 			children = (
@@ -3010,6 +3003,7 @@
 				92BBFCFD1A7122AD006A7735 /* scenegraph.h in Headers */,
 				92BBFCBA1A7122AD006A7735 /* dvb_mpe.h in Headers */,
 				92BBFCE21A7122AD006A7735 /* module.h in Headers */,
+				92597E4E20B4805C000365B9 /* tiny_aes.h in Headers */,
 				9201019B18D5A445003D1ACA /* media_memory.h in Headers */,
 				92BBFCCC1A7122AD006A7735 /* m3u8.h in Headers */,
 				92BBFCC71A7122AD006A7735 /* crypt_dev.h in Headers */,
@@ -3021,6 +3015,7 @@
 				920101B418D5A445003D1ACA /* module_wrap.h in Headers */,
 				92BBFD001A7122AD006A7735 /* sync_layer.h in Headers */,
 				92AAF0EC18D6E5AA00E2FF12 /* rast_soft.h in Headers */,
+				92D3C6292031E98600BA1735 /* atsc.h in Headers */,
 				92AAF10D18D6E69500E2FF12 /* img_in.h in Headers */,
 				92BBFD011A7122AD006A7735 /* term_info.h in Headers */,
 				92BBFCF01A7122AD006A7735 /* nodes_mpeg4.h in Headers */,
@@ -3460,6 +3455,7 @@
 				920100B418D5A444003D1ACA /* com_enc.c in Sources */,
 				920100B518D5A444003D1ACA /* conditional.c in Sources */,
 				920100B618D5A444003D1ACA /* field_decode.c in Sources */,
+				92597E4F20B4805C000365B9 /* g_crypt.c in Sources */,
 				920100B718D5A444003D1ACA /* field_encode.c in Sources */,
 				920100B818D5A444003D1ACA /* memory_decoder.c in Sources */,
 				920100B918D5A444003D1ACA /* predictive_mffield.c in Sources */,
@@ -3566,26 +3562,13 @@
 				9201012A18D5A444003D1ACA /* sample_descs.c in Sources */,
 				9201012B18D5A444003D1ACA /* stbl_read.c in Sources */,
 				9201012C18D5A444003D1ACA /* stbl_write.c in Sources */,
+				92597E5020B4805C000365B9 /* tiny_aes.c in Sources */,
 				9201012D18D5A444003D1ACA /* track.c in Sources */,
 				9201012E18D5A444003D1ACA /* ttml.c in Sources */,
 				9201012F18D5A444003D1ACA /* tx3g.c in Sources */,
 				9201013018D5A444003D1ACA /* lsr_dec.c in Sources */,
 				9201013118D5A444003D1ACA /* lsr_enc.c in Sources */,
 				9201013218D5A445003D1ACA /* lsr_tables.c in Sources */,
-				9201013418D5A445003D1ACA /* cbc.c in Sources */,
-				9201013518D5A445003D1ACA /* cfb.c in Sources */,
-				9201013618D5A445003D1ACA /* ctr.c in Sources */,
-				9201013718D5A445003D1ACA /* des.c in Sources */,
-				9201013818D5A445003D1ACA /* ecb.c in Sources */,
-				9201013918D5A445003D1ACA /* g_crypt.c in Sources */,
-				9201013A18D5A445003D1ACA /* ncfb.c in Sources */,
-				9201013B18D5A445003D1ACA /* nofb.c in Sources */,
-				9201013C18D5A445003D1ACA /* ofb.c in Sources */,
-				9201013D18D5A445003D1ACA /* rijndael-128.c in Sources */,
-				9201013E18D5A445003D1ACA /* rijndael-192.c in Sources */,
-				9201013F18D5A445003D1ACA /* rijndael-256.c in Sources */,
-				9201014018D5A445003D1ACA /* stream.c in Sources */,
-				9201014118D5A445003D1ACA /* tripledes.c in Sources */,
 				9201014218D5A445003D1ACA /* ait.c in Sources */,
 				9201014318D5A445003D1ACA /* av_parsers.c in Sources */,
 				9201014418D5A445003D1ACA /* avilib.c in Sources */,
@@ -3595,6 +3578,7 @@
 				9201014818D5A445003D1ACA /* dvb_mpe.c in Sources */,
 				9201014918D5A445003D1ACA /* filestreamer.c in Sources */,
 				9201014A18D5A445003D1ACA /* gpac_ogg.c in Sources */,
+				92D3C6312031F4C200BA1735 /* atsc_in.c in Sources */,
 				9201014B18D5A445003D1ACA /* html5_media.c in Sources */,
 				9201014C18D5A445003D1ACA /* html5_mse.c in Sources */,
 				9201014D18D5A445003D1ACA /* img.c in Sources */,
@@ -3604,6 +3588,7 @@
 				9201015118D5A445003D1ACA /* m2ts_mux.c in Sources */,
 				9201015218D5A445003D1ACA /* m3u8.c in Sources */,
 				9201015318D5A445003D1ACA /* media_export.c in Sources */,
+				92597E4D20B4805C000365B9 /* g_crypt_openssl.c in Sources */,
 				9201015418D5A445003D1ACA /* media_import.c in Sources */,
 				9201015518D5A445003D1ACA /* mpd.c in Sources */,
 				9201015618D5A445003D1ACA /* mpeg2_ps.c in Sources */,
@@ -3631,6 +3616,7 @@
 				9201016D18D5A445003D1ACA /* loader_isom.c in Sources */,
 				9201016E18D5A445003D1ACA /* loader_qt.c in Sources */,
 				9201016F18D5A445003D1ACA /* loader_svg.c in Sources */,
+				92597E5120B4805C000365B9 /* g_crypt_tinyaes.c in Sources */,
 				9201017018D5A445003D1ACA /* loader_xmt.c in Sources */,
 				9201017118D5A445003D1ACA /* scene_dump.c in Sources */,
 				9201017218D5A445003D1ACA /* scene_engine.c in Sources */,
@@ -3644,9 +3630,11 @@
 				9201017918D5A445003D1ACA /* base_scenegraph.c in Sources */,
 				9201017A18D5A445003D1ACA /* commands.c in Sources */,
 				9201017B18D5A445003D1ACA /* dom_events.c in Sources */,
+				92D3C6272031E94F00BA1735 /* atsc_dmx.c in Sources */,
 				9201017C18D5A445003D1ACA /* dom_smjs.c in Sources */,
 				9201017D18D5A445003D1ACA /* html5_media_smjs.c in Sources */,
 				9201017E18D5A445003D1ACA /* html5_mse_smjs.c in Sources */,
+				92F8D46C1F6FF7A100616F7C /* netctrl.c in Sources */,
 				9201017F18D5A445003D1ACA /* mpeg4_animators.c in Sources */,
 				9201018018D5A445003D1ACA /* mpeg4_nodes.c in Sources */,
 				9201018118D5A445003D1ACA /* mpeg4_valuator.c in Sources */,
@@ -4681,6 +4669,8 @@
 					CoreFoundation,
 					"-weak_framework",
 					QuartzCore,
+					"-laom",
+					"-llzma",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -4730,6 +4720,8 @@
 					CoreFoundation,
 					"-weak_framework",
 					QuartzCore,
+					"-laom",
+					"-llzma",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -4838,7 +4830,7 @@
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = "-lLibOpenHevcWrapper";
+				OTHER_LDFLAGS = "-lopenhevc";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 			};
@@ -4871,7 +4863,7 @@
 					/opt/local/lib,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				OTHER_LDFLAGS = "-lLibOpenHevcWrapper";
+				OTHER_LDFLAGS = "-lopenhevc";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 			};

gpac-0.7.1.tar.gz/build/xcode/gpac4ios.xcodeproj/project.pbxproj -> gpac-0.8.0.tar.gz/build/xcode/gpac4ios.xcodeproj/project.pbxproj Changed

@@ -22,8 +22,8 @@
 		285DBBA21712C80E00AF2B9B /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9D1712C80E00AF2B9B /* libavutil.a */; };
 		285DBBA41712C80E00AF2B9B /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9F1712C80E00AF2B9B /* libswscale.a */; };
 		2897039C1A13C4050063E9C0 /* libswresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2897039B1A13C4050063E9C0 /* libswresample.a */; };
-		28F2240417D6367000E9D2BE /* ffmpeg_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F2240317D6367000E9D2BE /* ffmpeg_decode.c */; };
-		28F2240617D6369700E9D2BE /* ffmpeg_demux.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F2240517D6369700E9D2BE /* ffmpeg_demux.c */; };
+		28F2240417D6367000E9D2BE /* ffmpeg_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F2240317D6367000E9D2BE /* ffmpeg_decode.c */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations"; }; };
+		28F2240617D6369700E9D2BE /* ffmpeg_demux.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F2240517D6369700E9D2BE /* ffmpeg_demux.c */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations -Wno-shorten-64-to-32"; }; };
 		28F2240A17D636DA00E9D2BE /* ffmpeg_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F2240917D636DA00E9D2BE /* ffmpeg_load.c */; };
 		7141FF301292CB9200FCB27D /* alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 7141FF2F1292CB9200FCB27D /* alloc.c */; };
 		7147426012B918C900DB5A59 /* cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 7147425F12B918C900DB5A59 /* cache.c */; };
@@ -161,20 +161,6 @@
 		71CCF2C21277045100339E12 /* lsr_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1BA1277045100339E12 /* lsr_dec.c */; };
 		71CCF2C31277045100339E12 /* lsr_enc.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1BB1277045100339E12 /* lsr_enc.c */; };
 		71CCF2C41277045100339E12 /* lsr_tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1BC1277045100339E12 /* lsr_tables.c */; };
-		71CCF2C51277045100339E12 /* cbc.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1BE1277045100339E12 /* cbc.c */; };
-		71CCF2C61277045100339E12 /* cfb.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1BF1277045100339E12 /* cfb.c */; };
-		71CCF2C71277045100339E12 /* ctr.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1C01277045100339E12 /* ctr.c */; };
-		71CCF2C81277045100339E12 /* des.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1C11277045100339E12 /* des.c */; };
-		71CCF2C91277045100339E12 /* ecb.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1C21277045100339E12 /* ecb.c */; };
-		71CCF2CA1277045100339E12 /* g_crypt.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1C31277045100339E12 /* g_crypt.c */; };
-		71CCF2CB1277045100339E12 /* ncfb.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1C41277045100339E12 /* ncfb.c */; };
-		71CCF2CC1277045100339E12 /* nofb.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1C51277045100339E12 /* nofb.c */; };
-		71CCF2CD1277045100339E12 /* ofb.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1C61277045100339E12 /* ofb.c */; };
-		71CCF2CE1277045100339E12 /* rijndael-128.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1C71277045100339E12 /* rijndael-128.c */; };
-		71CCF2CF1277045100339E12 /* rijndael-192.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1C81277045100339E12 /* rijndael-192.c */; };
-		71CCF2D01277045100339E12 /* rijndael-256.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1C91277045100339E12 /* rijndael-256.c */; };
-		71CCF2D21277045100339E12 /* stream.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1CB1277045100339E12 /* stream.c */; };
-		71CCF2D31277045100339E12 /* tripledes.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1CC1277045100339E12 /* tripledes.c */; };
 		71CCF2D41277045100339E12 /* av_parsers.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1CE1277045100339E12 /* av_parsers.c */; };
 		71CCF2D51277045100339E12 /* avilib.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1CF1277045100339E12 /* avilib.c */; };
 		71CCF2D61277045100339E12 /* dvb_mpe.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1D01277045100339E12 /* dvb_mpe.c */; };
@@ -363,6 +349,8 @@
 		71CCF3FE12770A8C00339E12 /* utf.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF3AF12770A8C00339E12 /* utf.h */; };
 		71CCF3FF12770A8C00339E12 /* xml.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF3B012770A8C00339E12 /* xml.h */; };
 		71EC88E11396273B004DCB6A /* osmo.icns in Resources */ = {isa = PBXBuildFile; fileRef = 71EC88E01396273B004DCB6A /* osmo.icns */; };
+		896CBC872110598E00220377 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 896CBC862110598E00220377 /* Security.framework */; };
+		896CBC8921105A6900220377 /* libaom.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 896CBC8821105A6900220377 /* libaom.a */; };
 		9212E8031CCA82310036F310 /* amr_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 9212E8021CCA82300036F310 /* amr_in.c */; };
 		9214AD341D0181A5009D3CFD /* ac3_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 9214AD321D0181A5009D3CFD /* ac3_in.c */; };
 		9214AD351D0181A5009D3CFD /* liba52_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9214AD331D0181A5009D3CFD /* liba52_dec.c */; };
@@ -371,6 +359,7 @@
 		921FEBA51CF881DE00B437C2 /* sensors_def.h in Headers */ = {isa = PBXBuildFile; fileRef = 921FEBA21CF881DE00B437C2 /* sensors_def.h */; };
 		921FEBA61CF881DE00B437C2 /* sensors.h in Headers */ = {isa = PBXBuildFile; fileRef = 921FEBA31CF881DE00B437C2 /* sensors.h */; };
 		921FEBA71CF881DE00B437C2 /* sensors.m in Sources */ = {isa = PBXBuildFile; fileRef = 921FEBA41CF881DE00B437C2 /* sensors.m */; };
+		9225CCA520343CDE00250C87 /* atsc_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 9225CCA420343CDD00250C87 /* atsc_in.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 */; };
 		922EB5821AAE13C500DF46D0 /* html5_mse.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB57A1AAE13C500DF46D0 /* html5_mse.h */; };
@@ -455,6 +444,12 @@
 		92BC213C16EF8E7A000E0620 /* widgetman.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A1998F1278777A00ACFF58 /* widgetman.h */; };
 		92C7F19A1AA8B48E00BA5B4C /* gui in Resources */ = {isa = PBXBuildFile; fileRef = 92C7F1991AA8B48E00BA5B4C /* gui */; };
 		92D127FE1BBADC7F00DA003B /* shaders in Resources */ = {isa = PBXBuildFile; fileRef = 92D127FD1BBADC7F00DA003B /* shaders */; };
+		92D3C62C2031ECE600BA1735 /* atsc_dmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D3C62B2031ECE600BA1735 /* atsc_dmx.c */; };
+		92DC362520B47FB600C48E39 /* g_crypt_openssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 92DC362020B47FB600C48E39 /* g_crypt_openssl.c */; };
+		92DC362620B47FB600C48E39 /* tiny_aes.h in Headers */ = {isa = PBXBuildFile; fileRef = 92DC362120B47FB600C48E39 /* tiny_aes.h */; };
+		92DC362720B47FB600C48E39 /* g_crypt.c in Sources */ = {isa = PBXBuildFile; fileRef = 92DC362220B47FB600C48E39 /* g_crypt.c */; };
+		92DC362820B47FB600C48E39 /* tiny_aes.c in Sources */ = {isa = PBXBuildFile; fileRef = 92DC362320B47FB600C48E39 /* tiny_aes.c */; };
+		92DC362920B47FB600C48E39 /* g_crypt_tinyaes.c in Sources */ = {isa = PBXBuildFile; fileRef = 92DC362420B47FB600C48E39 /* g_crypt_tinyaes.c */; };
 		92DF5CA61BA6C6F80058A7BA /* iff.c in Sources */ = {isa = PBXBuildFile; fileRef = 92DF5CA51BA6C6F80058A7BA /* iff.c */; };
 		92E8C78B1A0CD57A00E0436D /* timedtext_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA826116F254F50002629E /* timedtext_dec.c */; };
 		92E8C78C1A0CD57A00E0436D /* timedtext_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA826216F254F50002629E /* timedtext_in.c */; };
@@ -462,6 +457,7 @@
 		92E8C78E1A0CD57A00E0436D /* saf_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825D16F254C60002629E /* saf_in.c */; };
 		92E8C78F1A0CD57A00E0436D /* audio_filter.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825B16F254AF0002629E /* audio_filter.c */; };
 		92E8C7901A0CD58300E0436D /* validator.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825916F2549D0002629E /* validator.c */; };
+		92F8D46E1F713E5F00616F7C /* netctrl.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F8D46D1F713E5F00616F7C /* netctrl.c */; };
 		92F930861A5ADC1A0072A85C /* os_divers.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F930841A5ADC1A0072A85C /* os_divers.c */; };
 		92FA48891D059A820072C8A4 /* glcontext.m in Sources */ = {isa = PBXBuildFile; fileRef = 92FA48881D059A820072C8A4 /* glcontext.m */; };
 		970A26C913434D2C0007362C /* m3u8.c in Sources */ = {isa = PBXBuildFile; fileRef = 970A26C713434D2C0007362C /* m3u8.c */; };
@@ -713,20 +709,6 @@
 		71CCF1BA1277045100339E12 /* lsr_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsr_dec.c; sourceTree = "<group>"; };
 		71CCF1BB1277045100339E12 /* lsr_enc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsr_enc.c; sourceTree = "<group>"; };
 		71CCF1BC1277045100339E12 /* lsr_tables.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsr_tables.c; sourceTree = "<group>"; };
-		71CCF1BE1277045100339E12 /* cbc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cbc.c; sourceTree = "<group>"; };
-		71CCF1BF1277045100339E12 /* cfb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cfb.c; sourceTree = "<group>"; };
-		71CCF1C01277045100339E12 /* ctr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ctr.c; sourceTree = "<group>"; };
-		71CCF1C11277045100339E12 /* des.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = des.c; sourceTree = "<group>"; };
-		71CCF1C21277045100339E12 /* ecb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ecb.c; sourceTree = "<group>"; };
-		71CCF1C31277045100339E12 /* g_crypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_crypt.c; sourceTree = "<group>"; };
-		71CCF1C41277045100339E12 /* ncfb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ncfb.c; sourceTree = "<group>"; };
-		71CCF1C51277045100339E12 /* nofb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nofb.c; sourceTree = "<group>"; };
-		71CCF1C61277045100339E12 /* ofb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ofb.c; sourceTree = "<group>"; };
-		71CCF1C71277045100339E12 /* rijndael-128.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "rijndael-128.c"; sourceTree = "<group>"; };
-		71CCF1C81277045100339E12 /* rijndael-192.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "rijndael-192.c"; sourceTree = "<group>"; };
-		71CCF1C91277045100339E12 /* rijndael-256.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "rijndael-256.c"; sourceTree = "<group>"; };
-		71CCF1CB1277045100339E12 /* stream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stream.c; sourceTree = "<group>"; };
-		71CCF1CC1277045100339E12 /* tripledes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tripledes.c; sourceTree = "<group>"; };
 		71CCF1CE1277045100339E12 /* av_parsers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = av_parsers.c; sourceTree = "<group>"; };
 		71CCF1CF1277045100339E12 /* avilib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = avilib.c; sourceTree = "<group>"; };
 		71CCF1D01277045100339E12 /* dvb_mpe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dvb_mpe.c; sourceTree = "<group>"; };
@@ -922,6 +904,8 @@
 		71F2A45412830B1400C384DE /* libjs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjs.a; path = ../../extra_lib/lib/iOS/libjs.a; sourceTree = SOURCE_ROOT; };
 		71F2A45512830B1400C384DE /* libmad.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmad.a; path = ../../extra_lib/lib/iOS/libmad.a; sourceTree = SOURCE_ROOT; };
 		71F2A45612830B1400C384DE /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../extra_lib/lib/iOS/libpng.a; sourceTree = SOURCE_ROOT; };
+		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>"; };
 		9201D1101BD3FE11005E326A /* bifs_tests */ = {isa = PBXFileReference; lastKnownFileType = folder; path = bifs_tests; sourceTree = "<group>"; };
 		9212E8021CCA82300036F310 /* amr_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = amr_in.c; path = ../../modules/amr_dec/amr_in.c; sourceTree = "<group>"; };
 		9214AD301D018197009D3CFD /* aac_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = aac_in.c; path = ../../modules/aac_in/aac_in.c; sourceTree = "<group>"; };
@@ -932,6 +916,7 @@
 		921FEBA21CF881DE00B437C2 /* sensors_def.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sensors_def.h; path = ../../applications/osmo4_ios/sensors_def.h; sourceTree = "<group>"; };
 		921FEBA31CF881DE00B437C2 /* sensors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sensors.h; path = ../../applications/osmo4_ios/sensors.h; sourceTree = "<group>"; };
 		921FEBA41CF881DE00B437C2 /* sensors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = sensors.m; path = ../../applications/osmo4_ios/sensors.m; sourceTree = "<group>"; };
+		9225CCA420343CDD00250C87 /* atsc_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = atsc_in.c; path = ../../modules/atsc_in/atsc_in.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>"; };
 		922EB57A1AAE13C500DF46D0 /* html5_mse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = html5_mse.h; sourceTree = "<group>"; };
@@ -1035,7 +1020,14 @@
 		92B69EB61A091CFC004E74AA /* webvtt-renderer.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "webvtt-renderer.js"; sourceTree = "<group>"; };
 		92C7F1991AA8B48E00BA5B4C /* gui */ = {isa = PBXFileReference; lastKnownFileType = folder; name = gui; path = ../../gui; sourceTree = "<group>"; };
 		92D127FD1BBADC7F00DA003B /* shaders */ = {isa = PBXFileReference; lastKnownFileType = folder; name = shaders; path = ../../shaders; sourceTree = "<group>"; };
+		92D3C62B2031ECE600BA1735 /* atsc_dmx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = atsc_dmx.c; sourceTree = "<group>"; };
+		92DC362020B47FB600C48E39 /* g_crypt_openssl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt_openssl.c; path = ../../../src/crypto/g_crypt_openssl.c; sourceTree = "<group>"; };
+		92DC362120B47FB600C48E39 /* tiny_aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tiny_aes.h; path = ../../../src/crypto/tiny_aes.h; sourceTree = "<group>"; };
+		92DC362220B47FB600C48E39 /* g_crypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt.c; path = ../../../src/crypto/g_crypt.c; sourceTree = "<group>"; };
+		92DC362320B47FB600C48E39 /* tiny_aes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tiny_aes.c; path = ../../../src/crypto/tiny_aes.c; sourceTree = "<group>"; };
+		92DC362420B47FB600C48E39 /* g_crypt_tinyaes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt_tinyaes.c; path = ../../../src/crypto/g_crypt_tinyaes.c; sourceTree = "<group>"; };
 		92DF5CA51BA6C6F80058A7BA /* iff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iff.c; sourceTree = "<group>"; };
+		92F8D46D1F713E5F00616F7C /* netctrl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = netctrl.c; path = ../../modules/netctrl/netctrl.c; sourceTree = "<group>"; };
 		92F930841A5ADC1A0072A85C /* os_divers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_divers.c; sourceTree = "<group>"; };
 		92F930851A5ADC1A0072A85C /* os_file.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_file.c; sourceTree = "<group>"; };
 		92FA48881D059A820072C8A4 /* glcontext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = glcontext.m; path = ../../modules/vtb_decode/glcontext.m; sourceTree = "<group>"; };
@@ -1085,6 +1077,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				896CBC8921105A6900220377 /* libaom.a in Frameworks */,
+				896CBC872110598E00220377 /* Security.framework in Frameworks */,
 				9292BF031CFC94060070EB05 /* CoreMedia.framework in Frameworks */,
 				9292BF011CFC93D50070EB05 /* CoreVideo.framework in Frameworks */,
 				9292BEFF1CFC93C10070EB05 /* VideoToolbox.framework in Frameworks */,
@@ -1150,6 +1144,7 @@
 				71A19B1412796AC700ACFF58 /* osmo4iOS */,
 				7184780712785F7B00917298 /* Frameworks */,
 				71CCF1321277037A00339E12 /* Products */,
+				92D3C62A2031ECD600BA1735 /* Recovered References */,
 			);
 			name = CustomTemplate;
 			sourceTree = "<group>";
@@ -1157,6 +1152,8 @@
 		7184780712785F7B00917298 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				896CBC8821105A6900220377 /* libaom.a */,
+				896CBC862110598E00220377 /* Security.framework */,
 				9292BF021CFC94060070EB05 /* CoreMedia.framework */,
 				9292BF001CFC93D50070EB05 /* CoreVideo.framework */,
 				9292BEFE1CFC93C10070EB05 /* VideoToolbox.framework */,
@@ -1317,10 +1314,10 @@
 				71CCF35E12770A8C00339E12 /* include */,
 				71CCF1391277045100339E12 /* bifs */,
 				71CCF14A1277045100339E12 /* compositor */,
+				9273F71320B47F4D00DADC67 /* crypto */,
 				71CCF1911277045100339E12 /* ietf */,
 				71CCF19F1277045100339E12 /* isomedia */,
 				71CCF1B91277045100339E12 /* laser */,
-				71CCF1BD1277045100339E12 /* mcrypt */,
 				71CCF1CD1277045100339E12 /* media_tools */,
 				71CCF1E11277045100339E12 /* odf */,
 				71CCF1EF1277045100339E12 /* scene_manager */,
@@ -1501,31 +1498,10 @@
 			path = ../../src/laser;
 			sourceTree = SOURCE_ROOT;
 		};
-		71CCF1BD1277045100339E12 /* mcrypt */ = {
-			isa = PBXGroup;
-			children = (
-				71CCF1BE1277045100339E12 /* cbc.c */,
-				71CCF1BF1277045100339E12 /* cfb.c */,
-				71CCF1C01277045100339E12 /* ctr.c */,
-				71CCF1C11277045100339E12 /* des.c */,
-				71CCF1C21277045100339E12 /* ecb.c */,
-				71CCF1C31277045100339E12 /* g_crypt.c */,
-				71CCF1C41277045100339E12 /* ncfb.c */,
-				71CCF1C51277045100339E12 /* nofb.c */,
-				71CCF1C61277045100339E12 /* ofb.c */,
-				71CCF1C71277045100339E12 /* rijndael-128.c */,
-				71CCF1C81277045100339E12 /* rijndael-192.c */,
-				71CCF1C91277045100339E12 /* rijndael-256.c */,
-				71CCF1CB1277045100339E12 /* stream.c */,
-				71CCF1CC1277045100339E12 /* tripledes.c */,
-			);
-			name = mcrypt;
-			path = ../../src/mcrypt;
-			sourceTree = SOURCE_ROOT;
-		};
 		71CCF1CD1277045100339E12 /* media_tools */ = {
 			isa = PBXGroup;
 			children = (
+				92D3C62B2031ECE600BA1735 /* atsc_dmx.c */,
 				97E29F6817D1138B00904FBF /* webvtt.c */,
 				970FBA7B16F9F0720052216D /* html5_media.c */,
 				970FBA7C16F9F0720052216D /* html5_mse.c */,
@@ -1830,9 +1806,22 @@
 			path = modules;
 			sourceTree = "<group>";
 		};
+		9273F71320B47F4D00DADC67 /* crypto */ = {
+			isa = PBXGroup;
+			children = (
+				92DC362020B47FB600C48E39 /* g_crypt_openssl.c */,
+				92DC362420B47FB600C48E39 /* g_crypt_tinyaes.c */,
+				92DC362220B47FB600C48E39 /* g_crypt.c */,
+				92DC362320B47FB600C48E39 /* tiny_aes.c */,
+				92DC362120B47FB600C48E39 /* tiny_aes.h */,
+			);
+			path = crypto;
+			sourceTree = "<group>";
+		};
 		929A929516EF8A7500B7C64F /* modules */ = {
 			isa = PBXGroup;
 			children = (
+				9225CCA420343CDD00250C87 /* atsc_in.c */,
 				9214AD321D0181A5009D3CFD /* ac3_in.c */,
 				9214AD301D018197009D3CFD /* aac_in.c */,
 				9212E8021CCA82300036F310 /* amr_in.c */,
@@ -1855,6 +1844,7 @@
 				71179CBF1292EC1800A83216 /* mpd_in.c */,
 				71A1997D1278775900ACFF58 /* mpegts_in.c */,
 				97E29F6D17D114E900904FBF /* mse_in.c */,
+				92F8D46D1F713E5F00616F7C /* netctrl.c */,
 				71A199671278773900ACFF58 /* odf_dec.c */,
 				97E29F7B17D1190600904FBF /* osd.c */,
 				97E29F7917D118F100904FBF /* raw_video.c */,
@@ -2004,6 +1994,15 @@
 			path = icons;
 			sourceTree = "<group>";
 		};
+		92D3C62A2031ECD600BA1735 /* Recovered References */ = {
+			isa = PBXGroup;
+			children = (
+				285DBB48170F17D700AF2B9B /* ffmpeg_in.h */,
+				71A199071278765600ACFF58 /* aac_in.c */,
+			);
+			name = "Recovered References";
+			sourceTree = "<group>";
+		};
 		92FA488A1D05DADC0072C8A4 /* vtb_decoder */ = {
 			isa = PBXGroup;
 			children = (
@@ -2073,6 +2072,7 @@
 				922EB5801AAE13C500DF46D0 /* dash.h in Headers */,
 				71CCF3C512770A8C00339E12 /* compositor_dev.h in Headers */,
 				71CCF3C612770A8C00339E12 /* crypt_dev.h in Headers */,
+				92DC362620B47FB600C48E39 /* tiny_aes.h in Headers */,
 				71CCF3C712770A8C00339E12 /* dvb_mpe_dev.h in Headers */,
 				71CCF3C812770A8C00339E12 /* ietf_dev.h in Headers */,
 				71CCF3C912770A8C00339E12 /* isomedia_dev.h in Headers */,
@@ -2383,6 +2383,7 @@
 				71CCF2821277045100339E12 /* mpeg4_timesensor.c in Sources */,
 				71CCF2831277045100339E12 /* mpeg4_viewport.c in Sources */,
 				71CCF2841277045100339E12 /* navigate.c in Sources */,
+				92F8D46E1F713E5F00616F7C /* netctrl.c in Sources */,
 				71CCF2861277045100339E12 /* offscreen_cache.c in Sources */,
 				71CCF2881277045100339E12 /* svg_base.c in Sources */,
 				71CCF2891277045100339E12 /* svg_filters.c in Sources */,
@@ -2425,6 +2426,7 @@
 				71CCF2B21277045100339E12 /* hint_track.c in Sources */,
 				71CCF2B31277045100339E12 /* hinting.c in Sources */,
 				71CCF2B41277045100339E12 /* drm_sample.c in Sources */,
+				92DC362520B47FB600C48E39 /* g_crypt_openssl.c in Sources */,
 				71CCF2B51277045100339E12 /* isom_intern.c in Sources */,
 				71CCF2B61277045100339E12 /* isom_read.c in Sources */,
 				71CCF2B71277045100339E12 /* isom_store.c in Sources */,
@@ -2442,22 +2444,9 @@
 				71CCF2C21277045100339E12 /* lsr_dec.c in Sources */,
 				71CCF2C31277045100339E12 /* lsr_enc.c in Sources */,
 				71CCF2C41277045100339E12 /* lsr_tables.c in Sources */,
-				71CCF2C51277045100339E12 /* cbc.c in Sources */,
-				71CCF2C61277045100339E12 /* cfb.c in Sources */,
-				71CCF2C71277045100339E12 /* ctr.c in Sources */,
-				71CCF2C81277045100339E12 /* des.c in Sources */,
-				71CCF2C91277045100339E12 /* ecb.c in Sources */,
-				71CCF2CA1277045100339E12 /* g_crypt.c in Sources */,
-				71CCF2CB1277045100339E12 /* ncfb.c in Sources */,
-				71CCF2CC1277045100339E12 /* nofb.c in Sources */,
-				71CCF2CD1277045100339E12 /* ofb.c in Sources */,
-				71CCF2CE1277045100339E12 /* rijndael-128.c in Sources */,
-				71CCF2CF1277045100339E12 /* rijndael-192.c in Sources */,
-				71CCF2D01277045100339E12 /* rijndael-256.c in Sources */,
-				71CCF2D21277045100339E12 /* stream.c in Sources */,
-				71CCF2D31277045100339E12 /* tripledes.c in Sources */,
 				71CCF2D41277045100339E12 /* av_parsers.c in Sources */,
 				71CCF2D51277045100339E12 /* avilib.c in Sources */,
+				92DC362820B47FB600C48E39 /* tiny_aes.c in Sources */,
 				71CCF2D61277045100339E12 /* dvb_mpe.c in Sources */,
 				71CCF2D71277045100339E12 /* filestreamer.c in Sources */,
 				71CCF2D81277045100339E12 /* gpac_ogg.c in Sources */,
@@ -2478,7 +2467,9 @@
 				71CCF2E81277045100339E12 /* descriptors.c in Sources */,
 				71CCF2E91277045100339E12 /* ipmpx_code.c in Sources */,
 				71CCF2EA1277045100339E12 /* ipmpx_dump.c in Sources */,
+				92D3C62C2031ECE600BA1735 /* atsc_dmx.c in Sources */,
 				71CCF2EB1277045100339E12 /* ipmpx_parse.c in Sources */,
+				9225CCA520343CDE00250C87 /* atsc_in.c in Sources */,
 				71CCF2EC1277045100339E12 /* oci_codec.c in Sources */,
 				71CCF2ED1277045100339E12 /* odf_code.c in Sources */,
 				71CCF2EE1277045100339E12 /* odf_codec.c in Sources */,
@@ -2518,6 +2509,7 @@
 				71CCF3101277045100339E12 /* vrml_route.c in Sources */,
 				71CCF3111277045100339E12 /* vrml_script.c in Sources */,
 				71CCF3121277045100339E12 /* vrml_smjs.c in Sources */,
+				92DC362720B47FB600C48E39 /* g_crypt.c in Sources */,
 				9214AD341D0181A5009D3CFD /* ac3_in.c in Sources */,
 				71CCF3131277045100339E12 /* vrml_tools.c in Sources */,
 				71CCF3141277045100339E12 /* x3d_nodes.c in Sources */,
@@ -2538,6 +2530,7 @@
 				71CCF3241277045100339E12 /* network_service.c in Sources */,
 				71CCF3251277045100339E12 /* object_browser.c in Sources */,
 				71CCF3261277045100339E12 /* object_manager.c in Sources */,
+				92DC362920B47FB600C48E39 /* g_crypt_tinyaes.c in Sources */,
 				71CCF3271277045100339E12 /* scene.c in Sources */,
 				71CCF3281277045100339E12 /* svg_external.c in Sources */,
 				71CCF3291277045100339E12 /* term_node_init.c in Sources */,

gpac-0.7.1.tar.gz/configure -> gpac-0.8.0.tar.gz/configure Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-# GPAC configure script 
-# (c) 2003-2012 Telecom ParisTech 
+# GPAC configure script
+# (c) 2003-2018 Telecom ParisTech
 # Authors: Jean Le Feuvre, Romain Bouqueau
 #
 #set -v
@@ -113,6 +113,8 @@
 want_gcov="no"
 has_joystick="no"
 has_xul="no"
+has_hid="no"
+has_lzma="no"
 enable_joystick="no"
 static_mp4box="no"
 disable_core_tools="no"
@@ -146,7 +148,7 @@
 disable_od_dump="no"
 disable_od_parse="no"
 disable_isom_dump="no"
-disable_mcrypt="no"
+disable_crypto="no"
 disable_mpd="no"
 disable_dash="no"
 disable_isoff="no"
@@ -163,8 +165,11 @@
 disable_ttxt="no"
 disable_ttml="no"
 disable_hevc="no"
+disable_atsc="no"
+disable_mcrypt="no"
 enable_depth_compositor="no"
 enable_renoir="no"
+enable_sanitizer="no"
 has_avcap="no"
 avcap_cflags=""
 avcap_ldflags="-lavcap"
@@ -238,6 +243,8 @@
 --std-allocator uses standard lib memory allocator
 --static-modules includes static modules in libgpac whenever possible
 --enable-mem-track enable tracking of all memory allocated by gpac
+ --enable-sanitizer enable adress sanitizer
+ --enable-afl enable instrumentation for American Fuzzy Lop
 --disable-opt disable GCC optimizations
 --disable-ipv6 disable IPV6 support
 --disable-wx disable wxWidgets support
@@ -294,7 +301,7 @@
 --disable-loader-xmt disable scene loading from ISO File Format
 --disable-od-dump disable OD dump
 --disable-isom-dump disable ISOM dump
- --disable-mcrypt disable mcrypt
+ --disable-crypt disable crypto tools
 --disable-isoff disable ISO File Format
 --disable-isoff-write disable ISO File Format edit/write
 --disable-isoff-hint disable ISO File Format hinting
@@ -308,6 +315,8 @@
 --disable-player disable player (terminal and compositor)
 --disable-scenegraph disable scenegraph, scene parsers and player (terminal and compositor)
 --disable-hevc disable HEVC support
+ --disable-atsc disable ATSC3 support
+ --disable-mcrypt disable MCRYPT support
 
 Extra libraries configuration. You can turn a libray off or force using the local version in gpac/extra_lib/
 --use-js=OPT force SpiderMonkey ECMAScript OPT=[no,local]
@@ -368,6 +377,8 @@
 ;;
 --enable-gcov) want_gcov="yes";
 ;;
+ --enable-afl) cc_orig="afl-gcc"; cxx_orig="afl-g++"
+ ;;
 --verbose) verbose="yes";
 ;;
 esac
@@ -414,7 +425,7 @@
 ;;
 ppc64)
 cpu="powerpc"
- ;; 
+ ;;
 "Power Macintosh"|ppc)
 cpu="powerpc"
 ;;
@@ -573,13 +584,13 @@
 darwin="yes"
 gcc_version=`$cc -v 2>>$logs | grep version | cut -d ' ' -f3`
 case "$gcc_version" in
- *2.95*) 
+ *2.95*)
 CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
 ;;
 3.*)
 CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic -fno-common"
 ;;
- 4.*) 
+ 4.*)
 CFLAGS="$CFLAGS -pipe -fomit-frame-pointer -fno-common"
 ;;
 esac
@@ -610,7 +621,7 @@
 ;;
 
 CYGWIN*|cygwin*)
- js_flags=-DXP_PC 
+ js_flags=-DXP_PC
 extralibs="$extralibs -lws2_32 -lwinmm"
 cygwin="yes"
 win32="yes"
@@ -643,7 +654,7 @@
 
 
 #defines directory for binaries and libs (ex. for TinyGL)
-target_bin_dir="" 
+target_bin_dir=""
 if test "$cross_prefix" = "" ; then
 target_bin_dir=`${cc} -v 2>>$logs | sed -n '2p' | awk ' {print $2}'`-${cc_orig}
 else
@@ -660,7 +671,7 @@
 
 #OK check for all local & systems lib
 local_inc=$source_path/extra_lib/include
-local_lib=extra_lib/lib/gcc
+local_lib=$source_path/extra_lib/lib/gcc
 
 
 dolog() {
@@ -785,7 +796,7 @@
 
 cat > $TMPC << EOF
 #include <jsapi.h>
-int main( void ) { JSContext *cx=NULL; jsval rp; return JS_AddValueRoot(cx, &rp); }
+int main( void ) { JSContext *cx=NULL; jsval rp; return JS_AddRoot(cx, &rp); }
 EOF
 
 #try local
@@ -799,7 +810,7 @@
 mozjs_pkgcfg="mozjs"
 elif $pkg_config --exists mozjs185 ; then
 mozjs_pkgcfg="mozjs185"
- elif docc $js_flags -L$local_lib -ljs -lpthread ; then
+ elif docc $js_flags -L$local_lib -ljs -lpthread -lm ; then
 has_js="local"
 #dc added
 fi
@@ -1025,14 +1036,14 @@
 cat > $TMPC << EOF
 #include <avcap/avcap.h>
 using namespace avcap;
-int main( void ) { 
+int main( void ) {
 const DeviceCollector::DeviceList& dl = DEVICE_COLLECTOR::instance().getDeviceList();
 DeviceDescriptor* dd = 0;
 for (DeviceCollector::DeviceList::const_iterator i = dl.begin(); i != dl.end(); i++) {
 dd = *i;
 std::cout << dd->getName().c_str() << "\n";
 }
- return 0; 
+ return 0;
 }
 EOF
 if docxx -o $TMPO $TMPC $LDFLAGS $avcap_cflags $avcap_ldflags ; then
@@ -1047,7 +1058,7 @@
 fi
 if docxx -o $TMPO $TMPC $avcap_cflags $LDFLAGS -L$local_lib $avcap_ldflags ; then
 has_avcap="yes"
- avcap_ldflags="-L../../$local_lib $avcap_ldflags"
+ avcap_ldflags="-L$local_lib $avcap_ldflags"
 fi
 fi
 
@@ -1069,12 +1080,12 @@
 if docc $osvc_cflags $LDFLAGS $osvc_ldflags ; then
 has_opensvc="yes"
 else
-osvc_cflags="-I$local_inc"
+osvc_cflags="-idirafter $local_inc"
 osvc_ldflags="-lOpenSVCDec"
 
 if docc $osvc_cflags $LDFLAGS -L$local_lib $osvc_ldflags ; then
 has_opensvc="yes"
- osvc_ldflags="-L../../$local_lib $osvc_ldflags"
+ osvc_ldflags="-L$local_lib $osvc_ldflags"
 fi
 
 fi
@@ -1083,28 +1094,28 @@
 
 if test "$darwin" = "yes" ; then
 ohevc_cflags="-I/usr/include -I/usr/local/include"
- ohevc_ldflags="-L/usr/lib -L/usr/local/lib -lLibOpenHevcWrapper -lm -lpthread "
+ ohevc_ldflags="-L/usr/lib -L/usr/local/lib -lopenhevc -lm -lpthread "
 elif test "$cross_prefix" = "" ; then
 ohevc_cflags="-I/usr/include -I/usr/local/include"
- ohevc_ldflags="-L/usr/lib -L/usr/local/lib -lLibOpenHevcWrapper -lm -lpthread"
+ ohevc_ldflags="-L/usr/lib -L/usr/local/lib -lopenhevc -lm -lpthread"
 else
 ohevc_cflags="-I${prefix}include"
- ohevc_ldflags="-lLibOpenHevcWrapper -lm -lpthread"
+ ohevc_ldflags="-lopenhevc -lm -lpthread"
 fi
 
 cat > $TMPC << EOF
 #include <stdio.h>
-#include <openHevcWrapper.h>
-int main( void ) { libOpenHevcInit(1, 1); return 0; }
+#include <libopenhevc/openhevc.h>
+int main( void ) { oh_init(1, 1); return 0; }
 EOF
 if docc $ohevc_cflags $ohevc_ldflags $LDFLAGS ; then
 has_openhevc="yes"
 else
 ohevc_cflags="-I$local_inc"
- ohevc_ldflags="-lLibOpenHevcWrapper -lm -lpthread"
+ ohevc_ldflags="-lopenhevc -lm -lpthread"
 if docc $ohevc_cflags $ohevc_ldflags $LDFLAGS -L$local_lib ; then
 has_openhevc="yes"
- ohevc_ldflags="-L../../$local_lib $ohevc_ldflags"
+ ohevc_ldflags="-L$local_lib $ohevc_ldflags"
 fi
 fi
 
@@ -1124,8 +1135,8 @@
 fi
 if test "$cross_prefix" = "" ; then
 if test "$has_ft" = "no" ; then
- ft_cflags="`freetype-config --cflags 2>>$logs`"
- ft_lflags="`freetype-config --libs 2>>$logs`"
+ ft_cflags="`pkg-config --cflags freetype2 2>>$logs`"
+ ft_lflags="`pkg-config --libs freetype2 2>>$logs`"
 if docc $ft_cflags $ft_lflags $LDFLAGS ; then
 has_ft="system"
 fi
@@ -1383,8 +1394,8 @@
 ffmpeg_lflags_dashcast="$ffmpeg_lflags -lavdevice"
 
 if test "$cross_prefix" = "" -a "$pkg_config" != "no"; then
- if $pkg_config --exists libavcodec libavformat libswscale libavdevice libavutil libavresample ; then
- ffmpeg_cflags=`$pkg_config --cflags libavcodec libavformat libswscale libavutil libavdevice libavresample`
+ if $pkg_config --exists libavcodec libavformat libswscale libavdevice libavutil libswresample ; then
+ ffmpeg_cflags=`$pkg_config --cflags libavcodec libavformat libswscale libavutil libavdevice libswresample`
 ffmpeg_lflags=`$pkg_config --libs libavcodec libavformat libswscale libavutil`
 ffmpeg_lflags_dashcast=`$pkg_config --libs libavcodec libavformat libswscale libavutil libavdevice`
 has_ffmpeg="system"
@@ -1490,21 +1501,21 @@
 fi
 fi
 
-#detect libavresample (libav only, but ffmpeg backported with '--enable-avresample') for dashcast only
+#detect libswresample for dashcast only
 cat > $TMPC << EOF
-#include "libavresample/avresample.h"
+#include "libswresample/swresample.h"
 int main(void) {
- AVAudioResampleContext *aresampler = avresample_alloc_context();
+ SwrContext *aresampler = swr_alloc();
 free(aresampler);
 return 0;
 }
 EOF
 
-if docc $ffmpeg_cflags $ffmpeg_lflags_dashcast -lavresample ; then
- has_libavresample="yes"
- ffmpeg_lflags_dashcast="$ffmpeg_lflags_dashcast -lavresample"
+if docc $ffmpeg_cflags $ffmpeg_lflags_dashcast -lswresample ; then
+ has_libswresample="yes"
+ ffmpeg_lflags_dashcast="$ffmpeg_lflags_dashcast -lswresample"
 else
- has_libavresample="no"
+ has_libswresample="no"
 fi
 
 
@@ -1517,8 +1528,8 @@
 freenect_flags=`$pkg_config --cflags libfreenect`
 freenect_libs=`$pkg_config --libs libfreenect`
 has_freenect="system"
- freenect_flags="-DFREENECT_FLAT_HEADERS $freenect_flags" 
- fi 
+ freenect_flags="-DFREENECT_FLAT_HEADERS $freenect_flags"
+ fi
 fi
 
 if test "$has_freenect" = "no"; then
@@ -1845,6 +1856,32 @@
 fi
 
 
+#look for hid support
+cat > $TMPC << EOF
+#include <hidapi/hidapi.h>
+int main( void ) { hid_init(); hid_exit(); return 0; }
+EOF
+
+if docc -lhidapi-hidraw $LDFLAGS ; then
+ hid_lib="-lhidapi-hidraw"
+ has_hid="yes"
+fi
+
+
+
+#look for lzma support
+cat > $TMPC << EOF
+#include <lzma.h>
+int main( void ) { lzma_options_lzma opt_lzma2; lzma_lzma_preset(&opt_lzma2, 9); return 0; }
+EOF
+
+if docc $CFLAGS_DIR -llzma $LDFLAGS ; then
+ has_lzma="yes"
+ GPAC_SH_FLAGS="$GPAC_SH_FLAGS -llzma"
+ if test "$win32" = "yes"; then
+ extralibs="$extralibs -llzma"
+ fi
+fi
 
 #overwrite detection with manual settings
 for opt do
@@ -1905,6 +1942,8 @@
 ;;
 --enable-mem-track) use_memory_tracking="yes"
 ;;
+ --enable-sanitizer) enable_sanitizer="yes"
+ ;;
 --enable-tinygl) enable_tinygl="yes"
 ;;
 --disable-ssl) has_ssl="no"
@@ -1935,13 +1974,13 @@
 if test "$tmp_has_png" = "system" ; then
 if test "$has_png" != "system" ; then
 if test "$cross_prefix" != "" ; then
- echo 
+ echo
 echo "WARNING: PNG has been forced to system, but we are cross-compiling, it will have to be on target"
- echo 
+ echo
 else
- echo 
+ echo
 echo "WARNING!! : PNG has been forced to system even though it hasn't been found in this host"
- echo 
+ echo
 fi
 fi
 fi
@@ -1951,20 +1990,20 @@
 if test "$tmp_has_zlib" = "system" ; then
 if test "$has_zlib" != "system" ; then
 if test "$cross_prefix" != "" ; then
- echo 
+ echo
 echo "WARNING: ZLIB has been forced to system, but we are cross-compiling, it will have to be on target"
- echo 
+ echo
 else
- echo 
+ echo
 echo "WARNING!! : ZLIB has been forced to system even though it hasn't been found in this host"
- echo 
+ echo
 fi
 fi
 has_zlib=$tmp_has_zlib
 elif test "$tmp_has_zlib" = "no" ; then
- echo 
+ echo
 echo "WARNING!! : you have forced not to use ZLIB. This will disable some core functionalities of GPAC."
- echo 
+ echo
 has_zlib="force-no"
 fi
 ;;
@@ -1980,9 +2019,9 @@
 ;;
 --enable-pulseaudio) has_pulseaudio="yes"
 ;;
- --disable-all) has_pulseaudio="no"; has_alsa="no"; disable_core_tools="yes"; disable_3d="yes"; disable_svg="yes"; disable_vrml="yes"; disable_od="yes"; disable_bifs="yes"; disable_bifs_enc="yes"; disable_laser="yes"; disable_seng="yes"; disable_qtvr="yes"; disable_avi="yes"; disable_ogg="yes"; disable_m2ps="yes"; disable_m2ts="yes"; disable_m2ts_mux="yes"; disable_parsers="yes"; disable_import="yes"; disable_export="yes"; disable_swf="yes"; disable_scene_stats="yes"; disable_scene_dump="yes"; disable_scene_encode="yes"; disable_loader_isoff="yes"; disable_od_dump="yes"; disable_od_parse="yes"; disable_isom_dump="yes"; disable_mcrypt="yes"; disable_isoff="yes"; disable_isoff_write="yes"; disable_isoff_hint="yes"; disable_isoff_frag="yes"; disable_streaming="yes"; disable_x3d="yes"; disable_loader_bt="yes"; disable_loader_xmt="yes"; has_dvb4linux="no"; disable_player="yes"; disable_vobsub="yes"; disable_scenegraph="yes"; disable_dvbx="yes"; disable_ttxt="yes"; disable_ttml="yes"; disable_saf="yes"; disable_smgr="yes"; disable_mpd="yes"; disable_dash="yes"; disable_isoff_hds="yes"; disable_hevc="yes"
+ --disable-all) has_pulseaudio="no"; has_alsa="no"; disable_core_tools="yes"; disable_3d="yes"; disable_svg="yes"; disable_vrml="yes"; disable_od="yes"; disable_bifs="yes"; disable_bifs_enc="yes"; disable_laser="yes"; disable_seng="yes"; disable_qtvr="yes"; disable_avi="yes"; disable_ogg="yes"; disable_m2ps="yes"; disable_m2ts="yes"; disable_m2ts_mux="yes"; disable_parsers="yes"; disable_import="yes"; disable_export="yes"; disable_swf="yes"; disable_scene_stats="yes"; disable_scene_dump="yes"; disable_scene_encode="yes"; disable_loader_isoff="yes"; disable_od_dump="yes"; disable_od_parse="yes"; disable_isom_dump="yes"; disable_crypto="yes"; disable_isoff="yes"; disable_isoff_write="yes"; disable_isoff_hint="yes"; disable_isoff_frag="yes"; disable_streaming="yes"; disable_x3d="yes"; disable_loader_bt="yes"; disable_loader_xmt="yes"; has_dvb4linux="no"; disable_player="yes"; disable_vobsub="yes"; disable_scenegraph="yes"; disable_dvbx="yes"; disable_ttxt="yes"; disable_vtt="yes"; disable_ttml="yes"; disable_saf="yes"; disable_smgr="yes"; disable_mpd="yes"; disable_dash="yes"; disable_isoff_hds="yes"; disable_hevc="yes" ; disable_atsc="yes" ; disable_mcrypt="yes"
 ;;
- --isomedia-only) has_pulseaudio="no"; has_alsa="no"; disable_core_tools="yes"; disable_3d="yes"; disable_svg="yes"; disable_vrml="yes"; disable_od="yes"; disable_bifs="yes"; disable_bifs_enc="yes"; disable_laser="yes"; disable_seng="yes"; disable_qtvr="yes"; disable_avi="yes"; disable_ogg="yes"; disable_m2ps="yes"; disable_m2ts="yes"; disable_m2ts_mux="yes"; disable_parsers="yes"; disable_import="yes"; disable_export="yes"; disable_swf="yes"; disable_scene_stats="yes"; disable_scene_dump="yes"; disable_scene_encode="yes"; disable_loader_isoff="yes"; disable_od_dump="yes"; disable_od_parse="yes"; disable_isom_dump="yes"; disable_mcrypt="yes"; disable_streaming="yes"; disable_x3d="yes"; disable_loader_bt="yes"; disable_loader_xmt="yes"; has_dvb4linux="no"; disable_player="yes"; disable_vobsub="yes"; disable_scenegraph="yes"; disable_dvbx="yes"; disable_ttxt="yes"; disable_saf="yes"; disable_smgr="yes"; disable_mpd="yes"; disable_dash="yes"; disable_hevc="no"; disable_isoff="no"; disable_isoff_hds="no"; disable_isoff_write="no"; disable_isoff_hint="no"; disable_isoff_frag="no"
+ --isomedia-only) has_pulseaudio="no"; has_alsa="no"; disable_core_tools="yes"; disable_3d="yes"; disable_svg="yes"; disable_vrml="yes"; disable_od="yes"; disable_bifs="yes"; disable_bifs_enc="yes"; disable_laser="yes"; disable_seng="yes"; disable_qtvr="yes"; disable_avi="yes"; disable_ogg="yes"; disable_m2ps="yes"; disable_m2ts="yes"; disable_m2ts_mux="yes"; disable_parsers="yes"; disable_import="yes"; disable_export="yes"; disable_swf="yes"; disable_scene_stats="yes"; disable_scene_dump="yes"; disable_scene_encode="yes"; disable_loader_isoff="yes"; disable_od_dump="yes"; disable_od_parse="yes"; disable_isom_dump="yes"; disable_crypto="yes"; disable_streaming="yes"; disable_x3d="yes"; disable_loader_bt="yes"; disable_loader_xmt="yes"; has_dvb4linux="no"; disable_player="yes"; disable_vobsub="yes"; disable_scenegraph="yes"; disable_dvbx="yes"; disable_ttxt="yes"; disable_saf="yes"; disable_smgr="yes"; disable_mpd="yes"; disable_dash="yes"; disable_hevc="no"; disable_isoff="no"; disable_isoff_hds="no"; disable_isoff_write="no"; disable_isoff_hint="no"; disable_isoff_frag="no" ; disable_atsc="yes" ; disable_mcrypt="yes"
 ;;
 --disable-3d) disable_3d="yes"
 ;;
@@ -2098,9 +2137,9 @@
 ;;
 --enable-isom-dump) disable_isom_dump="no"
 ;;
- --disable-mcrypt) disable_mcrypt="yes"
+ --disable-crypto) disable_crypto="yes"
 ;;
- --enable-mcrypt) disable_mcrypt="no"
+ --enable-crypto) disable_crypto="no"
 ;;
 --disable-isoff) disable_isoff="yes"
 ;;
@@ -2125,55 +2164,67 @@
 --disable-streaming) disable_streaming="yes"
 ;;
 --enable-streaming) disable_streaming="no"
- ;; 
+ ;;
 --disable-player) disable_player="yes"
 ;;
 --enable-player) disable_player="no"
- ;; 
+ ;;
 --disable-scenegraph) disable_scenegraph="yes"
 ;;
 --enable-scenegraph) disable_scenegraph="no"
- ;; 
+ ;;
 --disable-dvbx) disable_dvbx="yes"
 ;;
 --enable-dvbx) disable_dvbx="no"
- ;; 
+ ;;
 --disable-vobsub) disable_vobsub="yes"
 ;;
 --enable-vobsub) disable_vobsub="no"
- ;; 
+ ;;
 --disable-ttxt) disable_ttxt="yes"
 ;;
 --enable-ttxt) disable_ttxt="no"
- ;; 
+ ;;
 --disable-ttml) disable_ttml="yes"
 ;;
+ --enable-vtt) disable_vtt="no"
+ ;;
+ --disable-vtt) disable_vtt="yes"
+ ;;
 --enable-ttml) disable_ttml="no"
- ;; 
+ ;;
 --disable-saf) disable_saf="yes"
 ;;
 --enable-saf) disable_saf="no"
- ;; 
+ ;;
 --disable-smgr) disable_smgr="yes"
 ;;
 --enable-smgr) disable_smgr="no"
- ;; 
+ ;;
 --disable-mpd) disable_mpd="yes"
 ;;
 --enable-mpd) disable_mpd="no"
- ;; 
+ ;;
 --disable-dash) disable_dash="yes"
 ;;
 --enable-dash) disable_dash="no"
- ;; 
+ ;;
 --disable-core) disable_core_tools="yes"
 ;;
 --enable-core) disable_core_tools="no"
- ;; 
+ ;;
 --disable-hevc) disable_hevc="yes"
 ;;
 --enable-hevc) disable_hevc="no"
- ;; 
+ ;;
+ --disable-atsc) disable_atsc="yes"
+ ;;
+ --enable-atsc) disable_atsc="no"
+ ;;
+ --disable-mcrypt) disable_mcrypt="yes"
+ ;;
+ --enable-mcrypt) disable_mcrypt="no"
+ ;;
 esac
 done
 
@@ -2276,7 +2327,7 @@
 if $pkg_config --exists libxul 2>>$logs ; then
 if docxx -o $TMPO $TMPCXX `$pkg_config --cflags libxul` `$pkg_config --libs libxul` ; then
 has_xul="system"
- xul_flags="`$pkg_config --cflags libxul` `$pkg_config --libs libxul`" 
+ xul_flags="`$pkg_config --cflags libxul` `$pkg_config --libs libxul`"
 fi
 fi
 fi
@@ -2560,6 +2611,7 @@
 echo "GProf enabled: $gprof_build"
 echo "Static build enabled: $static_build"
 echo "Memory tracking enabled: $use_memory_tracking"
+echo "Sanitizer enabled: $enable_sanitizer"
 echo "Fixed-Point Version: $use_fixed_point"
 echo "IPV6 Support: $has_ipv6"
 echo "Static Modules: $static_modules"
@@ -2704,9 +2756,9 @@
 echo "ISOM dump disabled"
 echo "#define GPAC_DISABLE_ISOM_DUMP" >> $TMPH
 fi
-if test "$disable_mcrypt" = "yes" ; then
- echo "MCrypt disabled"
- echo "#define GPAC_DISABLE_MCRYPT" >> $TMPH
+if test "$disable_crypto" = "yes" ; then
+ echo "Crypto tools disabled"
+ echo "#define GPAC_DISABLE_CRYPTO" >> $TMPH
 fi
 if test "$disable_isoff" = "yes" ; then
 echo "ISO File Format disabled"
@@ -2752,6 +2804,11 @@
 echo "#define GPAC_DISABLE_TTML" >> $TMPH
 fi
 
+if test "$disable_vtt" = "yes" ; then
+ echo "WebVTT disabled"
+ echo "#define GPAC_DISABLE_VTT" >> $TMPH
+fi
+
 if test "$enable_depth_compositor" = "yes" ; then
 echo "Depth Compositor enabled"
 echo "#define GF_SR_USE_DEPTH" >> $TMPH
@@ -2772,6 +2829,16 @@
 echo "#define GPAC_DISABLE_HEVC" >> $TMPH
 fi
 
+if test "$disable_atsc" = "yes" ; then
+ echo "ATSC3 Support disabled"
+ echo "#define GPAC_DISABLE_ATSC" >> $TMPH
+fi
+
+if test "$disable_mcrypt" = "yes" ; then
+ echo "MCRYPT Support disabled"
+ echo "#define GPAC_DISABLE_MCRYPT" >> $TMPH
+fi
+
 echo ""
 
 echo "** Detected libraries **"
@@ -2830,6 +2897,7 @@
 echo "FAAD: $has_faad"
 echo "XVID: $has_xvid"
 echo "FFMPEG: $has_ffmpeg"
+echo "LZMA: $has_lzma"
 echo "Xiph OGG: $has_ogg"
 echo "Platinum UPnP: $has_platinum"
 echo "AVCap: $has_avcap"
@@ -2892,6 +2960,12 @@
 CFLAGS="$CFLAGS_DIR $CFLAGS"
 fi
 
+if test "$enable_sanitizer" = "yes" ; then
+ CFLAGS="$CFLAGS -fsanitize=address,undefined -fno-sanitize-recover -g"
+ LDFLAGS="$LDFLAGS -fsanitize=address,undefined -ldl"
+fi
+
+
 ldir=`pwd`
 CFLAGS="$CFLAGS -DGPAC_HAVE_CONFIG_H -I\"$ldir\""
 if test "$win32" = "no" ; then
@@ -2988,7 +3062,7 @@
 echo "#define fseeko64 fseek" >> $TMPH
 fi
 if test "$mingw32" = "yes" ; then
- 
+
 # -municode test
 cat > $TMPC << EOF
 #include <inttypes.h>
@@ -3076,6 +3150,11 @@
 echo "#define GPAC_HAS_PNG" >> $TMPH
 fi
 
+echo "CONFIG_LZMA=$has_lzma" >> config.mak
+if test "$has_lzma" = "yes"; then
+echo "#define GPAC_HAS_LZMA" >> $TMPH
+fi
+
 echo "CONFIG_JP2=$has_openjpeg" >> config.mak
 echo "CONFIG_FAAD=$has_faad" >> config.mak
 echo "CONFIG_MAD=$has_mad" >> config.mak
@@ -3091,7 +3170,7 @@
 echo "ffmpeg_lflags=$ffmpeg_lflags" >> config.mak
 echo "ffmpeg_lflags_dashcast=$ffmpeg_lflags_dashcast" >> config.mak
 echo "CONFIG_LIBAV=$is_libav" >> config.mak
- echo "CONFIG_LIBAVRESAMPLE=$has_libavresample" >> config.mak
+ echo "CONFIG_LIBSWRESAMPLE=$has_libswresample" >> config.mak
 fi
 echo "CONFIG_FFMPEG_OLD=$old_ffmpeg_inc" >> config.mak
 
@@ -3123,7 +3202,7 @@
 echo "DISABLE_SCENE_DUMP=$disable_scene_dump" >> config.mak
 echo "DISABLE_SCENE_ENCODE=$disable_scene_encode" >> config.mak
 echo "DISABLE_SCENEGRAPH=$disable_scenegraph" >> config.mak
-echo "DISABLE_MCRYPT=$disable_mcrypt" >> config.mak
+echo "DISABLE_CRYPTO=$disable_crypto" >> config.mak
 echo "DISABLE_DVBX=$disable_dvbx" >> config.mak
 echo "DISABLE_AVILIB=$disable_avi" >> config.mak
 echo "DISABLE_M2PS=$disable_m2ps" >> config.mak
@@ -3145,6 +3224,8 @@
 echo "MINIMAL_OD=$disable_od" >> config.mak
 echo "DISABLE_ISOM_ADOBE=$disable_isoff_hds" >> config.mak
 echo "DISABLE_VRML=$disable_vrml" >> config.mak
+echo "DISABLE_ATSC=$disable_atsc" >> config.mak
+echo "DISABLE_MCRYPT=$disable_mcrypt" >> config.mak
 
 if test "$disable_parsers" = "yes" ; then
 disable_m2ts_mux="yes"
@@ -3270,6 +3351,10 @@
 echo "USE_X11_XV=$has_x11_xv" >> config.mak
 fi
 
+echo "CONFIG_HID=$has_hid" >> config.mak
+echo "HID_LDFLAGS=$hid_lib" >> config.mak
+
+
 if test "$is_64" = "yes"; then
 #not on OSX ...
 if test "$darwin" = "yes"; then
@@ -3315,7 +3400,7 @@
 if test "$source_path_used" = "yes" ; then
 
 echo "Creating compilation tree image"
- SRC_DIRS="src src/utils src/isomedia src/ietf src/odf src/bifs src/scenegraph src/terminal src/mcrypt src/media_tools src/scene_manager src/compositor src/laser" 
+ SRC_DIRS="src src/utils src/isomedia src/ietf src/odf src/bifs src/scenegraph src/terminal src/crypto src/media_tools src/scene_manager src/compositor src/laser"
 
 APP_DIRS="applications/mp4box applications/mp4client applications/osmozilla applications/osmo4_wx applications/mp42ts applications/dashcast"
 
@@ -3413,16 +3498,20 @@
 echo '	$(CXX) $(CFLAGS) -c -o $@ $<' >> config.mak
 
 #pkg-config
-echo "prefix=$prefix"				 > gpac.pc
-echo "exec_prefix=\${prefix}"			>> gpac.pc
-echo "libdir=\${exec_prefix}/$libdir"		>> gpac.pc
-echo "includedir=\${exec_prefix}/include"	>> gpac.pc
-echo ""						>> gpac.pc
-echo "Name: gpac"				>> gpac.pc
-echo "Description: GPAC Multimedia Framework"	>> gpac.pc
-echo "URL: http://gpac.sourceforge.net"		>> gpac.pc
-echo "Version:$version"				>> gpac.pc
-echo "Cflags: -I\${prefix}/include/gpac"	>> gpac.pc
-echo "Libs: -L\${libdir} -lgpac"		>> gpac.pc
+generate_pkgconfig () {
+	echo "prefix=$prefix"
+	echo "exec_prefix=\${prefix}"
+	echo "libdir=\${exec_prefix}/$libdir"
+	echo "includedir=\${exec_prefix}/include"
+	echo ""
+	echo "Name: gpac"
+	echo "Description: GPAC Multimedia Framework"
+	echo "URL: http://gpac.sourceforge.net"
+	echo "Version:$version"
+	echo "Cflags: -I\${prefix}/include"
+	echo "Libs: -L\${libdir} -lgpac"
+}
+
+generate_pkgconfig > gpac.pc
 
 echo "Done - type 'make help' for make info, 'make' to build"

gpac-0.7.1.tar.gz/debian/changelog -> gpac-0.8.0.tar.gz/debian/changelog Changed

gpac-0.7.1.tar.gz/doc/CODING_STYLE -> gpac-0.8.0.tar.gz/doc/CODING_STYLE Changed

gpac-0.7.1.tar.gz/doc/configuration.html -> gpac-0.8.0.tar.gz/doc/configuration.html Changed

@@ -10,7 +10,7 @@
 
 GPAC Configuration file documentation
 
-GPAC Version 0.7.1
+GPAC Version 0.8.0
 
 
 
@@ -51,6 +51,7 @@
 <a href="#DektecVideo" style="text-decoration: underline;">DektecVideo</a>
 <a href="#M2TS" style="text-decoration: underline;">M2TS</a>
 <a href="#RAW" style="text-decoration: underline;">RAWVideo</a>
+<a href="#NVDec" style="text-decoration: underline;">NVDec</a>
 
 
 
@@ -422,6 +423,21 @@
 
 Default field of view for VR 360. Default is PI/2.
 
+TileVisibilityTest [value: int1-int2]
+
+Sets the number of points to test for tile visibility to int1, and consider the tile visible if more than int2 points are visible. Default is 30-0.
+
+SimulateGaze [value: yes,no]
+
+Uses the mouse to simulate gazing direction on the display for quality adaptation. Default is no.
+
+TileVisibilityDebug [value: yes,no]
+
+Enables tiles visibility debugging. This disables the tile having full coverage of the SRD, only displaying sub tiles. Default is no.
+
+TileVisibilityForced [value: yes,no]
+
+Forces tiles visibility. All tiles will be considered as visible, regardless the current viewpoint. Default is no.
 
 
 
@@ -461,6 +477,19 @@
 
 Defines a set of audio filters. Audio filters are declared as a list of strings separated with ";;". The exact syntax of the string is filter specific.
 
+ForceFrequency [value: integer]
+
+Force audio output frequency. Set to 0 (default) for dynamic reconfiguration of all params (freq, ch, layout and bps).
+ForceChannels [value: integer]
+
+Force audio output channels. Set to 0 (default) for dynamic reconfiguration of all params (freq, ch, layout and bps).
+ForceLayout [value: hexa integer]
+
+Force audio output frequency. Set to 0 (default) for dynamic reconfiguration of all params (freq, ch, layout and bps).
+ForceBPS [value: integer]
+
+Force audio output bits per sample. Set to 0 (default) for dynamic reconfiguration of all params (freq, ch, layout and bps).
+
 
 
 <a name="Video"></a>
@@ -762,13 +791,14 @@
 <li>none: uses the player settings for buffering.</li> 
 </ul>
 
-NetworkAdaptation [value: disabled, bandwidth, buffer]
+NetworkAdaptation [value: disabled, bandwidth, buffer, BBA-0, BOLA_FINITE, BOLA_BASIC, BOLA_U, BOLA_O]
 
 Sets automatic adaptation logic mode:
 <ul>
 <li>disabled: no adaptation to network condition is used.</li>
 <li>bandwidth: network adaptation is based only on available download rate.</li> 
 <li>buffer: network adaptation is based on available download rate for quality increase and buffer levels for quality drops. Default mode.</li> 
+<li>Other values: use algorithms as defined in their respective papers.</li> 
 </ul>
 
 
@@ -851,6 +881,21 @@
 If 0, bitstream will not be smoothed across tiles/qualities, and concurrency may happen between different media.
 Default is 100.
 
+UTCShiftATSC [value: unsigned integer]
+
+Indicates the amount of ms to delay requests for ATSC broadcast. Default value is 1000.
+
+IgnoreXLink [value: yes no]
+
+Indicates if periods with both xlink and adaptation sets specified should resolve the xlink. Default value is yes.
+
+NoContinuity [value: yes no]
+
+Disabled period continuity playback (forces flushing all content before next period). Period continutity is only implemented for unmultiplexed files. Default value is no.
+
+XLinkQuery [value: string]
+
+Specifies a query parameter (without initial '?') to append to xlink on periods. Default value is no value.
 
 
 
@@ -933,6 +978,10 @@
 
 Packs 4 consecutive frames in a single 4x frame.
 
+ResetAtReinit [value: yes, no ]
+
+Destroys and recreates the decoder whenever a layer is restarted (base or enhancement). Default is no, but openHevc may need this depending on version/branch/platform.
+
 
 
 
@@ -965,9 +1014,18 @@
 
 The "DektecVideo" section of the config file holds the configuration options for the Dektec SDI video output module.</a>
 
+CardSlot [value: int:int]
+
+Specifies the bus bus number (first int) and slot id (second int) of the card. If not present, the module will look for DTA-2174 and DTA-2154.
 SDIOutput [value: unsigned integer]
 
 Specifies the output port of the card. Default value is 1.
+FrameRate [value: float]
+
+Specifies the output frame rate for the card. If not present (default), the compositor output frame rate will be used.
+ClipSDI [value: yes, no]
+
+Indicates if YUV data shall be clipped to valid SDI range or left untouched. Default is yes.
 
 
 
@@ -982,6 +1040,9 @@
 RecordTo [value: file path]
 
 Records the TS content to the specified file.
+UDPBufferSize [value: unsigned integer]
+
+UDP buffer size for the socket. Default value is a few hundred kilobytes depending on the platform.
 
 <a name="RAW"></a>
 Section "RAWVideo" <a href="#Overview">Back to top</a>
@@ -995,5 +1056,23 @@
 
 Sets the output video format of the raw module, mostly used for testing. The default format is rgb.
 
+<a name="NVDec"></a>
+Section "NVDec" <a href="#Overview">Back to top</a>
+
+The "NVDec" section of the config file holds configuration options for NVidia hardware decoding module.</a>
+
+NumSurfaces [value: integer]
+
+Sets the number of decoded surface for the decoder. Default is 20.
+DisableGL [value: yes, no]
+
+Disables hardware decoder to opengl transfer on GPU (and forces GPU->CPU->GPU memory). Default is no.
+UnloadInactive [value: no, destroy, reuse]
+
+Enables unloading inactive decoders to free GPU resources (usefull for tiling VR). no disables unloading, destroy kills the decoder, reuse reassigns the HW decoder to another object (still buggy). Default is no.
+PreferMode [value: cuvid, dxva, cuda]
+
+Sets prefered mode for harware decoder. cuda should only be used for MPEG-1 and MPEG-2 video. Default is cuvid.
+
 </body>
 </html>

gpac-0.7.1.tar.gz/doc/man/gpac.1 -> gpac-0.8.0.tar.gz/doc/man/gpac.1 Changed

gpac-0.7.1.tar.gz/doc/man/mp4box.1 -> gpac-0.8.0.tar.gz/doc/man/mp4box.1 Changed

gpac-0.7.1.tar.gz/extra_lib/include/DTAPI.h -> gpac-0.8.0.tar.gz/extra_lib/include/DTAPI.h Changed

@@ -1,16 +1,16 @@
-//*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#* DTAPI.h *#*#*#*#*#*#*#*#*#* (C) 2000-2015 DekTec
+//*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#* DTAPI.h *#*#*#*#*#*#*#*#*#* (C) 2000-2018 DekTec
 //
-// DTAPI - C++ API for DekTec PCI/PCI-Express cards, USB-2 adapters and network devices
+// 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 14
+#define DTAPI_VERSION_MINOR 30
 #define DTAPI_VERSION_BUGFIX 0
-#define DTAPI_VERSION_BUILD 56
+#define DTAPI_VERSION_BUILD 108
 
 //-.-.-.-.-.-.-.-.-.-.-.-.- Additional Libraries to be Linked In -.-.-.-.-.-.-.-.-.-.-.-.-
 
@@ -101,6 +101,20 @@
 #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
@@ -118,9 +132,14 @@
 
 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;
@@ -130,11 +149,16 @@
 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;
@@ -167,11 +191,13 @@
 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;
@@ -221,12 +247,12 @@
 class DtCaps 
 {
 // Number of 64-bit integers used to represent a capability
- static const int DTCAPS_SIZE = 3;
+ static const int DTCAPS_SIZE = 4;
 
 public:
 DtCaps();
 DtCaps(int BitNr);
- DtCaps(__int64 F1, __int64 F2, __int64 F3);
+ DtCaps(__int64 F1, __int64 F2, __int64 F3, __int64 F4);
 
 public:
 int GetCapIndex() const;
@@ -239,6 +265,8 @@
 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
@@ -255,203 +283,257 @@
 #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_MR Dtapi::DtCaps(5) // MuxXpert runtime
-#define DTAPI_CAP_MS Dtapi::DtCaps(6) // MuxXpert SDK
-#define DTAPI_CAP_MX Dtapi::DtCaps(7) // MuxXpert
-#define DTAPI_CAP_RC Dtapi::DtCaps(8) // StreamXpress remote control
-#define DTAPI_CAP_RX Dtapi::DtCaps(9) // RFXpert
-#define DTAPI_CAP_SP Dtapi::DtCaps(10) // StreamXpress stream player
-#define DTAPI_CAP_SPNIC Dtapi::DtCaps(11) // StreamXpress through local NIC
-#define DTAPI_CAP_SX Dtapi::DtCaps(12) // StreamXpert analyzer
-#define DTAPI_CAP_SXDGL Dtapi::DtCaps(13) // StreamXpert analyzer (dongled)
-#define DTAPI_CAP_SY Dtapi::DtCaps(14) // SdEye
-#define DTAPI_CAP_XP Dtapi::DtCaps(15) // Xpect
-#define DTAPI_CAP_T2X Dtapi::DtCaps(16) // T2Xpert
+#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(17) // Isochronous bandwidth allocated
-#define DTAPI_CAP_FAILSAFE Dtapi::DtCaps(18) // A fail-over relay is available
-#define DTAPI_CAP_FRACMODE Dtapi::DtCaps(19) // Fractional mode is supported
-#define DTAPI_CAP_GENLOCKED Dtapi::DtCaps(20) // Locked to a genlock reference
-#define DTAPI_CAP_GENREF Dtapi::DtCaps(21) // Genlock reference input
-#define DTAPI_CAP_SWS2APSK Dtapi::DtCaps(22) // DVB-S2 APSK mode
+#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(23) // Antenna power
-#define DTAPI_CAP_LNB Dtapi::DtCaps(24) // LNB
-#define DTAPI_CAP_RX_ADV Dtapi::DtCaps(25) // Advanced demodulation
+#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(26) // L-band 950-2150MHz
-#define DTAPI_CAP_VHF Dtapi::DtCaps(27) // VHF-band 47-470MHz
-#define DTAPI_CAP_UHF Dtapi::DtCaps(28) // UHF-band 400-862MHz
+#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(29) // Port is disabled
-#define DTAPI_CAP_INPUT Dtapi::DtCaps(30) // Uni-directional input
-#define DTAPI_CAP_OUTPUT Dtapi::DtCaps(31) // Uni-directional output
+#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(32) // Get antenna signal from another port
+#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(33) // Double buffered output
-#define DTAPI_CAP_LOOPS2L3 Dtapi::DtCaps(34) // Loop-through of DVB-S2 in L3-frames
-#define DTAPI_CAP_LOOPS2TS Dtapi::DtCaps(35) // Loop-through of an DVB-S(2) input
-#define DTAPI_CAP_LOOPTHR Dtapi::DtCaps(36) // Loop-through of another input
+#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(37) // ASI output signal can be inverted
-#define DTAPI_CAP_HUFFMAN Dtapi::DtCaps(38) // Huffman coding for SDI
-#define DTAPI_CAP_IPPAIR Dtapi::DtCaps(39) // Network port supports failover
-#define DTAPI_CAP_L3MODE Dtapi::DtCaps(40) // L3-frame mode
-#define DTAPI_CAP_MATRIX Dtapi::DtCaps(41) // Matrix API support
-#define DTAPI_CAP_MATRIX2 Dtapi::DtCaps(42) // High-level Matrix API support
-#define DTAPI_CAP_RAWASI Dtapi::DtCaps(43) // Raw ASI
-#define DTAPI_CAP_SDI10BNBO Dtapi::DtCaps(44) // 10-bit network byte order
-#define DTAPI_CAP_SDITIME Dtapi::DtCaps(45) // SDI timestamping
-#define DTAPI_CAP_TIMESTAMP64 Dtapi::DtCaps(46) // 64-bit timestamping
-#define DTAPI_CAP_TRPMODE Dtapi::DtCaps(47) // Transparent mode
-#define DTAPI_CAP_TS Dtapi::DtCaps(48) // MPEG-2 transport stream
-#define DTAPI_CAP_TXONTIME Dtapi::DtCaps(49) // Transmit on timestamp
-#define DTAPI_CAP_VIRTUAL Dtapi::DtCaps(50) // Virtual port, no physical connection
+#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_3GSDI Dtapi::DtCaps(51) // 3G-SDI
-#define DTAPI_CAP_ASI Dtapi::DtCaps(52) // DVB-ASI transport stream
-#define DTAPI_CAP_DEMOD Dtapi::DtCaps(53) // Demodulation
-#define DTAPI_CAP_GPSTIME Dtapi::DtCaps(54) // Supports GPS-time
-#define DTAPI_CAP_HDSDI Dtapi::DtCaps(55) // HD-SDI
-#define DTAPI_CAP_IFADC Dtapi::DtCaps(56) // IF A/D converter
-#define DTAPI_CAP_IP Dtapi::DtCaps(57) // Transport stream over IP
-#define DTAPI_CAP_MOD Dtapi::DtCaps(58) // Modulator output
-#define DTAPI_CAP_PHASENOISE Dtapi::DtCaps(59) // Phase noise injector
-#define DTAPI_CAP_RS422 Dtapi::DtCaps(60) // RS422 port
-#define DTAPI_CAP_SDI Dtapi::DtCaps(61) // SD-SDI
-#define DTAPI_CAP_SPI Dtapi::DtCaps(62) // DVB-SPI transport stream
-#define DTAPI_CAP_SPISDI Dtapi::DtCaps(63) // SD-SDI on a parallel port
+#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(64) // 1080p/50 lvl A
-#define DTAPI_CAP_1080P50B Dtapi::DtCaps(65) // 1080p/50 lvl B
-#define DTAPI_CAP_1080P59_94 Dtapi::DtCaps(66) // 1080p/59.94 lvl A
-#define DTAPI_CAP_1080P59_94B Dtapi::DtCaps(67) // 1080p/59.94 lvl B
-#define DTAPI_CAP_1080P60 Dtapi::DtCaps(68) // 1080p/60 lvl A
-#define DTAPI_CAP_1080P60B Dtapi::DtCaps(69) // 1080p/60 lvl B
+#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(70) // 1080i/50
-#define DTAPI_CAP_1080I59_94 Dtapi::DtCaps(71) // 1080i/59.94
-#define DTAPI_CAP_1080I60 Dtapi::DtCaps(72) // 1080i/60
-#define DTAPI_CAP_1080P23_98 Dtapi::DtCaps(73) // 1080p/23.98
-#define DTAPI_CAP_1080P24 Dtapi::DtCaps(74) // 1080p/24
-#define DTAPI_CAP_1080P25 Dtapi::DtCaps(75) // 1080p/25
-#define DTAPI_CAP_1080P29_97 Dtapi::DtCaps(76) // 1080p/29.97
-#define DTAPI_CAP_1080P30 Dtapi::DtCaps(77) // 1080p/30
-#define DTAPI_CAP_1080PSF23_98 Dtapi::DtCaps(78) // 1080psf/23.98
-#define DTAPI_CAP_1080PSF24 Dtapi::DtCaps(79) // 1080psf/24
-#define DTAPI_CAP_1080PSF25 Dtapi::DtCaps(80) // 1080psf/25
-#define DTAPI_CAP_1080PSF29_97 Dtapi::DtCaps(81) // 1080psf/29.97
-#define DTAPI_CAP_1080PSF30 Dtapi::DtCaps(82) // 1080psf/30
-#define DTAPI_CAP_720P23_98 Dtapi::DtCaps(83) // 720p/23.98
-#define DTAPI_CAP_720P24 Dtapi::DtCaps(84) // 720p/24
-#define DTAPI_CAP_720P25 Dtapi::DtCaps(85) // 720p/25
-#define DTAPI_CAP_720P29_97 Dtapi::DtCaps(86) // 720p/29.97
-#define DTAPI_CAP_720P30 Dtapi::DtCaps(87) // 720p/30
-#define DTAPI_CAP_720P50 Dtapi::DtCaps(88) // 720p/50
-#define DTAPI_CAP_720P59_94 Dtapi::DtCaps(89) // 720p/59.94
-#define DTAPI_CAP_720P60 Dtapi::DtCaps(90) // 720p/60
+#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(91) // 525i/59.94
-#define DTAPI_CAP_625I50 Dtapi::DtCaps(92) // 625i/50
+#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(93) // SPI 525i/59.94
-#define DTAPI_CAP_SPI625I50 Dtapi::DtCaps(94) // SPI 625i/50
+#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(95) // ATSC 8-VSB modulation
-#define DTAPI_CAP_TX_CMMB Dtapi::DtCaps(96) // CMMB modulation
-#define DTAPI_CAP_TX_DAB Dtapi::DtCaps(97) // DAB modulation
-#define DTAPI_CAP_TX_DTMB Dtapi::DtCaps(98) // DTMB modulation
-#define DTAPI_CAP_TX_DVBC2 Dtapi::DtCaps(99) // DVB-C2 modulation
-#define DTAPI_CAP_TX_DVBS Dtapi::DtCaps(100) // DVB-S modulation
-#define DTAPI_CAP_TX_DVBS2 Dtapi::DtCaps(101) // DVB-S2 modulation
-#define DTAPI_CAP_TX_DVBS2X Dtapi::DtCaps(102) // DVB-S2X modulation
-#define DTAPI_CAP_TX_DVBT Dtapi::DtCaps(103) // DVB-T modulation
-#define DTAPI_CAP_TX_DVBT2 Dtapi::DtCaps(104) // DVB-T2 modulation
-#define DTAPI_CAP_TX_GOLD Dtapi::DtCaps(105) // GOLD for modulators
-#define DTAPI_CAP_TX_IQ Dtapi::DtCaps(106) // I/Q sample modulation
-#define DTAPI_CAP_TX_ISDBS Dtapi::DtCaps(107) // ISDB-S modulation
-#define DTAPI_CAP_TX_ISDBT Dtapi::DtCaps(108) // ISDB-T modulation
-#define DTAPI_CAP_TX_ISDBTMM Dtapi::DtCaps(109) // ISDB-Tmm modulation
-#define DTAPI_CAP_TX_MH Dtapi::DtCaps(110) // ATSC-MH modulation
-#define DTAPI_CAP_TX_QAMA Dtapi::DtCaps(111) // QAM-A modulation
-#define DTAPI_CAP_TX_QAMB Dtapi::DtCaps(112) // QAM-B modulation
-#define DTAPI_CAP_TX_QAMC Dtapi::DtCaps(113) // QAM-C modulation
-#define DTAPI_CAP_TX_SWMC Dtapi::DtCaps(114) // SW multi-channel modulation
-#define DTAPI_CAP_TX_T2MI Dtapi::DtCaps(115) // T2MI transmission
-#define DTAPI_CAP_TX_T2SPLP Dtapi::DtCaps(116) // DVB-T2 single PLP modulation
+#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(117) // Adjustable output level
-#define DTAPI_CAP_CM Dtapi::DtCaps(118) // Channel simulation
-#define DTAPI_CAP_CW Dtapi::DtCaps(119) // Continuous wave
-#define DTAPI_CAP_DIGIQ Dtapi::DtCaps(120) // Digital I/Q sample output
-#define DTAPI_CAP_DVBCID Dtapi::DtCaps(121) // DVB carrier ID 
-#define DTAPI_CAP_IF Dtapi::DtCaps(122) // IF output
-#define DTAPI_CAP_MUTE Dtapi::DtCaps(123) // Mute RF output signal
-#define DTAPI_CAP_ROLLOFF Dtapi::DtCaps(124) // Adjustable roll-off factor
-#define DTAPI_CAP_S2APSK Dtapi::DtCaps(125) // DVB-S2 16-APSK/32-APSK
-#define DTAPI_CAP_SNR Dtapi::DtCaps(126) // AWGN insertion
-#define DTAPI_CAP_TX_16MHZ Dtapi::DtCaps(127) // 16MHz bandwidth mode
-#define DTAPI_CAP_TX_SFN Dtapi::DtCaps(128) // SNF operation
+#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(129) // External RF clock input
-#define DTAPI_CAP_RFCLKINT Dtapi::DtCaps(130) // Internal RF clock reference
+#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(131) // ATSC 8-VSB reception
-#define DTAPI_CAP_RX_CMMB Dtapi::DtCaps(132) // CMMB reception
-#define DTAPI_CAP_RX_DAB Dtapi::DtCaps(133) // DAB reception
-#define DTAPI_CAP_RX_DTMB Dtapi::DtCaps(134) // DTMB reception
-#define DTAPI_CAP_RX_DVBC2 Dtapi::DtCaps(135) // DVB-C2 reception
-#define DTAPI_CAP_RX_DVBS Dtapi::DtCaps(136) // DVB-S reception
-#define DTAPI_CAP_RX_DVBS2 Dtapi::DtCaps(137) // DVB-S2 reception
-#define DTAPI_CAP_RX_DVBT Dtapi::DtCaps(138) // DVB-T reception
-#define DTAPI_CAP_RX_DVBT2 Dtapi::DtCaps(139) // DVB-T2 reception
-#define DTAPI_CAP_RX_GOLD Dtapi::DtCaps(140) // GOLD for receivers
-#define DTAPI_CAP_RX_IQ Dtapi::DtCaps(141) // I/Q sample reception
-#define DTAPI_CAP_RX_ISDBS Dtapi::DtCaps(142) // ISDB-S reception
-#define DTAPI_CAP_RX_ISDBT Dtapi::DtCaps(143) // ISDB-T reception
-#define DTAPI_CAP_RX_MH Dtapi::DtCaps(144) // ATSC-MH reception
-#define DTAPI_CAP_RX_QAMA Dtapi::DtCaps(145) // QAM-A reception
-#define DTAPI_CAP_RX_QAMB Dtapi::DtCaps(146) // QAM-B reception
-#define DTAPI_CAP_RX_QAMC Dtapi::DtCaps(147) // QAM-C reception
-#define DTAPI_CAP_RX_T2MI Dtapi::DtCaps(148) // T2MI reception
+#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(149) // External clock input
-#define DTAPI_CAP_SPICLKINT Dtapi::DtCaps(150) // Internal clock reference
+#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(151) // SPI fixed clock with valid signal
-#define DTAPI_CAP_SPIDVBMODE Dtapi::DtCaps(152) // SPI DVB mode
-#define DTAPI_CAP_SPISER8B Dtapi::DtCaps(153) // SPI serial 8-bit mode
-#define DTAPI_CAP_SPISER10B Dtapi::DtCaps(154) // SPI serial 10-bit 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(155) // LVDS1
-#define DTAPI_CAP_SPILVDS2 Dtapi::DtCaps(156) // LVDS2
-#define DTAPI_CAP_SPILVTTL Dtapi::DtCaps(157) // LVTTL
+#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(158) // External TS rate clock input
-#define DTAPI_CAP_EXTRATIO Dtapi::DtCaps(159) // External TS rate clock with ratio
-#define DTAPI_CAP_INTTSRATE Dtapi::DtCaps(160) // Internal TS rate clock reference
-#define DTAPI_CAP_LOCK2INP Dtapi::DtCaps(161) // Lock TS rate to input port
+#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 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
 //
@@ -547,10 +629,10 @@
 class IDtDemodEvent
 {
 public:
- virtual void TuningFreqHasChanged(__int64 OldFreqHz, __int64 NewFreqHz) {}
+ virtual void TuningFreqHasChanged(__int64 /*OldFreqHz*/, __int64 /*NewFreqHz*/) {}
 virtual void TuningParsHaveChanged(
- __int64 OldFreqHz, int OldModType, int OldParXtra[3],
- __int64 NewFreqHz, int NewModType, int NewParXtra[3]) {}
+ __int64 /*OldFreqHz*/, int /*OldModType*/, int[3] /*OldParXtra[3]*/,
+ __int64 /*NewFreqHz*/, int /*NewModType*/, int[3] /*NewParXtra[3]*/) {}
 };
 
 
@@ -578,6 +660,7 @@
 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
@@ -617,6 +700,8 @@
 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
 
@@ -624,7 +709,9 @@
 // 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 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
@@ -651,6 +738,7 @@
 // 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
@@ -772,116 +860,143 @@
 // I/O configuration groups
 #define DTAPI_IOCONFIG_IODIR 0 // I/O direction
 #define DTAPI_IOCONFIG_IOSTD 1 // I/O standard
-#define DTAPI_IOCONFIG_RFCLKSEL 2 // RF clock source selection
-#define DTAPI_IOCONFIG_SPICLKSEL 3 // Parallel port clock source selection
-#define DTAPI_IOCONFIG_SPIMODE 4 // Parallel port mode
-#define DTAPI_IOCONFIG_SPISTD 5 // Parallel port I/O standard
-#define DTAPI_IOCONFIG_TSRATESEL 6 // Transport-stream rate selection
+#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 7 // Isochronous bandwidth allocated
-#define DTAPI_IOCONFIG_FAILSAFE 8 // A fail-over relay is available
-#define DTAPI_IOCONFIG_FRACMODE 9 // Fractional mode is supported
-#define DTAPI_IOCONFIG_GENLOCKED 10 // Locked to a genlock reference
-#define DTAPI_IOCONFIG_GENREF 11 // Genlock reference input
-#define DTAPI_IOCONFIG_SWS2APSK 12 // DVB-S2 APSK mode
+#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 13 // Turn I/O capability on
-#define DTAPI_IOCONFIG_FALSE 14 // Turn I/O capability off
+#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 15 // Port is disabled
-#define DTAPI_IOCONFIG_INPUT 16 // Uni-directional input
-#define DTAPI_IOCONFIG_OUTPUT 17 // Uni-directional output
+#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 18 // Get antenna signal from another port
+#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 19 // Double buffered output
-#define DTAPI_IOCONFIG_LOOPS2L3 20 // Loop-through of DVB-S2 in L3-frames
-#define DTAPI_IOCONFIG_LOOPS2TS 21 // Loop-through of an DVB-S(2) input
-#define DTAPI_IOCONFIG_LOOPTHR 22 // Loop-through of another input
+#define DTAPI_IOCONFIG_DBLBUF 22 // Double buffered output
+#define DTAPI_IOCONFIG_LOOPS2L3 23 // Loop-through of DVB-S2 in L3-frames
+#define DTAPI_IOCONFIG_LOOPS2TS 24 // Loop-through of an DVB-S(2) input
+#define DTAPI_IOCONFIG_LOOPTHR 25 // Loop-through of another input
 
 // Values for group IO_CONFIG_IOSTD (I/O standard)
-#define DTAPI_IOCONFIG_3GSDI 23 // 3G-SDI
-#define DTAPI_IOCONFIG_ASI 24 // DVB-ASI transport stream
-#define DTAPI_IOCONFIG_DEMOD 25 // Demodulation
-#define DTAPI_IOCONFIG_GPSTIME 26 // Supports GPS-time
-#define DTAPI_IOCONFIG_HDSDI 27 // HD-SDI
-#define DTAPI_IOCONFIG_IFADC 28 // IF A/D converter
-#define DTAPI_IOCONFIG_IP 29 // Transport stream over IP
-#define DTAPI_IOCONFIG_MOD 30 // Modulator output
-#define DTAPI_IOCONFIG_PHASENOISE 31 // Phase noise injector
-#define DTAPI_IOCONFIG_RS422 32 // RS422 port
-#define DTAPI_IOCONFIG_SDI 33 // SD-SDI
-#define DTAPI_IOCONFIG_SPI 34 // DVB-SPI transport stream
-#define DTAPI_IOCONFIG_SPISDI 35 // SD-SDI on a parallel port
+#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 36 // 1080p/50 lvl A
-#define DTAPI_IOCONFIG_1080P50B 37 // 1080p/50 lvl B
-#define DTAPI_IOCONFIG_1080P59_94 38 // 1080p/59.94 lvl A
-#define DTAPI_IOCONFIG_1080P59_94B 39 // 1080p/59.94 lvl B
-#define DTAPI_IOCONFIG_1080P60 40 // 1080p/60 lvl A
-#define DTAPI_IOCONFIG_1080P60B 41 // 1080p/60 lvl B
+#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 42 // 1080i/50
-#define DTAPI_IOCONFIG_1080I59_94 43 // 1080i/59.94
-#define DTAPI_IOCONFIG_1080I60 44 // 1080i/60
-#define DTAPI_IOCONFIG_1080P23_98 45 // 1080p/23.98
-#define DTAPI_IOCONFIG_1080P24 46 // 1080p/24
-#define DTAPI_IOCONFIG_1080P25 47 // 1080p/25
-#define DTAPI_IOCONFIG_1080P29_97 48 // 1080p/29.97
-#define DTAPI_IOCONFIG_1080P30 49 // 1080p/30
-#define DTAPI_IOCONFIG_1080PSF23_98 50 // 1080psf/23.98
-#define DTAPI_IOCONFIG_1080PSF24 51 // 1080psf/24
-#define DTAPI_IOCONFIG_1080PSF25 52 // 1080psf/25
-#define DTAPI_IOCONFIG_1080PSF29_97 53 // 1080psf/29.97
-#define DTAPI_IOCONFIG_1080PSF30 54 // 1080psf/30
-#define DTAPI_IOCONFIG_720P23_98 55 // 720p/23.98
-#define DTAPI_IOCONFIG_720P24 56 // 720p/24
-#define DTAPI_IOCONFIG_720P25 57 // 720p/25
-#define DTAPI_IOCONFIG_720P29_97 58 // 720p/29.97
-#define DTAPI_IOCONFIG_720P30 59 // 720p/30
-#define DTAPI_IOCONFIG_720P50 60 // 720p/50
-#define DTAPI_IOCONFIG_720P59_94 61 // 720p/59.94
-#define DTAPI_IOCONFIG_720P60 62 // 720p/60
+#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 63 // 525i/59.94
-#define DTAPI_IOCONFIG_625I50 64 // 625i/50
+#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 65 // SPI 525i/59.94
-#define DTAPI_IOCONFIG_SPI625I50 66 // SPI 625i/50
+#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 67 // External RF clock input
-#define DTAPI_IOCONFIG_RFCLKINT 68 // Internal RF clock reference
+#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 69 // External clock input
-#define DTAPI_IOCONFIG_SPICLKINT 70 // Internal clock reference
+#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 71 // SPI fixed clock with valid signal
-#define DTAPI_IOCONFIG_SPIDVBMODE 72 // SPI DVB mode
-#define DTAPI_IOCONFIG_SPISER8B 73 // SPI serial 8-bit mode
-#define DTAPI_IOCONFIG_SPISER10B 74 // SPI serial 10-bit 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 75 // LVDS1
-#define DTAPI_IOCONFIG_SPILVDS2 76 // LVDS2
-#define DTAPI_IOCONFIG_SPILVTTL 77 // LVTTL
+#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 78 // External TS rate clock input
-#define DTAPI_IOCONFIG_EXTRATIO 79 // External TS rate clock with ratio
-#define DTAPI_IOCONFIG_INTTSRATE 80 // Internal TS rate clock reference
-#define DTAPI_IOCONFIG_LOCK2INP 81 // Lock TS rate to input port
+#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 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
 //
@@ -958,6 +1073,20 @@
 #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
@@ -1056,8 +1185,6 @@
 };
 
 
-
-
 // ISDB-T layer selection used for demodulation
 #define DTAPI_ISDBT_LAYER_NONE -1
 #define DTAPI_ISDBT_LAYER_AUTO -2
@@ -1175,6 +1302,9 @@
 DtCmPars m_CmPars[DTAPI_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
@@ -1194,22 +1324,24 @@
 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(), IsAtscMh(), IsCmmb(), IsCmEnable(int i=0);
- bool IsDab();
- bool IsDtmb(), IsDvbC2(), IsDvbCidEnable(), IsDvbS(), IsDvbS2(), IsDvbS2Apsk(), 
- IsDvbS2L3(), IsDvbS2X(), IsDvbS2XL3(), IsDvbS2Mux();
- bool IsDvbT(), IsDvbT2(), IsIqDirect(), IsIsdbS(), IsIsdbT(), IsIsdbTmm();
+ 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();
@@ -1272,7 +1404,7 @@
 static DTAPI_RESULT ToXml(DtPar* pPars, int Count, std::wstring& XmlString);
 
 // Assignment operator
- DtPar& operator=(const DtPar&);
+ DtPar& operator = (const DtPar&);
 
 private:
 // No implementation is provided for the copy constructor
@@ -1315,6 +1447,21 @@
 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
@@ -1331,7 +1478,8 @@
 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_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
 };
 
 
@@ -1346,8 +1494,9 @@
 void* m_pValue; // Pointer if value type is STAT_VT_DVBC2_L1P2,
 // STAT_VT_DVBC2_PLPSIG, STAT_VT_DVBT_TPS,
 // STAT_VT_DVBT2_L1, STAT_VT_VIT_STATS
- // STAT_VT_DAB_ENSEM or STAT_VT_RS_STATS,
- // STAT_VT_DAB_TXID
+ // 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);
@@ -1355,12 +1504,15 @@
 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);
@@ -1372,12 +1524,15 @@
 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);
@@ -1395,7 +1550,7 @@
 static DTAPI_RESULT ToXml(DtStatistic* pStatistics, int Count, std::wstring&);
 
 // Assignment operator
- DtStatistic& operator=(const DtStatistic&);
+ DtStatistic& operator = (const DtStatistic&);
 
 private:
 // No implementation is given of the copy constructor
@@ -1403,6 +1558,8 @@
 };
 
 // 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
@@ -1424,6 +1581,14 @@
 #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
@@ -1438,7 +1603,7 @@
 #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) 
+#define DTAPI_STAT_SAMPRATE_OFFSET 0x10C // Sample rate offset (ppm)
 
 // Boolean lock statistics
 #define DTAPI_STAT_CARRIER_LOCK 0x201 // Carrier lock
@@ -1451,11 +1616,14 @@
 // 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
@@ -1537,6 +1705,11 @@
 
 // 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)
@@ -1559,6 +1732,7 @@
 //
 // Structure for storing SDI/TS-over-IP parameters
 //
+struct DtIpPars2;
 struct DtIpPars
 {
 public:
@@ -1606,11 +1780,79 @@
 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_SrcFltIp[16]; // 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_Ip[16]; // IP address (IPv4/IPv6)
+ unsigned short m_Port; // Port number
+ unsigned char m_Gateway[16]; // 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_Ip2[16]; // IP address (IPv4/IPv6)
+ unsigned short m_Port2; // Port number
+ unsigned char m_Gateway2[16]; // 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
@@ -1714,7 +1956,8 @@
 bool m_IsInterlaced; // Is interlaced
 int m_NumLines; // Number of lines per frame
 double m_Fps; // Frame rate
- bool m_IsFractional; // Fractional framerate
+ 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
@@ -1734,6 +1977,9 @@
 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 +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
@@ -1766,6 +2012,7 @@
 int GetModType() const;
 DTAPI_RESULT SetModType(int ModType);
 DtDemodParsAtsc* Atsc() const;
+ DtDemodParsAtsc3* Atsc3() const;
 DtDemodParsDab* Dab() const;
 DtDemodParsDvbC2* DvbC2() const;
 DtDemodParsDvbS* DvbS() const;
@@ -1779,12 +2026,12 @@
 DtDemodParsQam* Qam() const;
 
 // Predicates
- bool IsAtsc() const, IsDab() const, IsDvbC2() const, IsDvbS() const, 
+ 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;
+ IsIsdbt() const, IsQam() const, IsQamAC() const, IsQamB() const;
 
 // Operators
- void operator=(const DtDemodPars& Pars);
+ void operator = (const DtDemodPars& Pars);
 
 // Serialisation
 DTAPI_RESULT FromXml(const std::wstring& XmlString);
@@ -1809,6 +2056,18 @@
 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
@@ -1824,6 +2083,7 @@
 struct DtDemodParsDvbC2
 {
 int m_Bandwidth; // Bandwidth
+ bool m_ScanL1Part2Data; // Scan on each tune for full L1Part2Data
 };
 
 //-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsDvbS -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
@@ -1948,7 +2208,7 @@
 
 //-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodLdpcStats -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
 //
-// LDCP statistic information for DVB-T2 and DVB-C2
+// LDCP statistic information for ATSC3.0 DVB-T2 and DVB-C2
 //
 struct DtDemodLdpcStats
 {
@@ -2107,8 +2367,8 @@
 // Used by DtInpChannel::SpectrumScan to return current state and the RF-Levels 
 // found by scanning a frequency band using the DtSpsProgressFunc callback.
 //
-struct DtSpsProgress {
-
+struct DtSpsProgress
+{
 enum SpsEvent
 {
 SPS_STEP, // One frequency step is completed
@@ -2132,6 +2392,187 @@
 // 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_ChanStat[24]; // 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_SmpteTimeCode[8];
+ 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 +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
 //+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
@@ -2155,6 +2596,7 @@
 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;
@@ -2165,9 +2607,11 @@
 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 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);
@@ -2179,8 +2623,10 @@
 virtual DTAPI_RESULT GetDisplayName(wchar_t* pName);
 virtual DTAPI_RESULT GetDisplayName(char* pName);
 virtual DTAPI_RESULT GetFanSpeed(int Fan, int& Rpm);
- virtual DTAPI_RESULT GetFanTemperature(int Fan, int& Temp);
+ virtual DTAPI_RESULT 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);
@@ -2192,7 +2638,11 @@
 __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);
@@ -2204,14 +2654,22 @@
 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);
@@ -2266,25 +2724,35 @@
 #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
+#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 + port (e.g. "DTA-124 port 1")
-#define DTAPI_HWF2STR_TYPE_AND_PORT 1
-// String conversion - Device type number + location (e.g. "DTA-100 in slot 5");
-#define DTAPI_HWF2STR_TYPE_AND_LOC 2
+#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
+#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
+#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
@@ -2292,9 +2760,11 @@
 #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_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
@@ -2306,6 +2776,10 @@
 #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
@@ -2428,9 +2902,10 @@
 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 GetPars(int Count, DtPar* pPars);
 DTAPI_RESULT GetRxClkFreq(int& RxClkFreq);
 DTAPI_RESULT GetRxControl(int& RxControl);
 DTAPI_RESULT GetRxMode(int& RxMode);
@@ -2440,6 +2915,7 @@
 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);
@@ -2481,9 +2957,11 @@
 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);
@@ -2595,7 +3073,7 @@
 #define DTAPI_RXMODE_SDI_10B 0x00004000
 #define DTAPI_RXMODE_SDI_16B 0x00008000
 #define DTAPI_RXMODE_SDI_10B_NBO 0x00010000
-#define DTAPI_RXMODE_SDI_FRAMECOUNT 0x00020000
+#define DTAPI_RXMODE_SDI_STAT 0x00020000
 
 // Receive mode for SDI and Transport Streams - Common flags
 #define DTAPI_RXMODE_TIMESTAMP32 0x01000000
@@ -2712,7 +3190,7 @@
 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 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);
@@ -2732,6 +3210,7 @@
 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);
@@ -2760,7 +3239,9 @@
 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&);
@@ -2768,6 +3249,7 @@
 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, 
@@ -2824,7 +3306,7 @@
 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 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);
@@ -2873,7 +3355,9 @@
 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&);
@@ -2881,6 +3365,7 @@
 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, 
@@ -2924,7 +3409,8 @@
 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;
@@ -3121,6 +3607,8 @@
 #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
 
@@ -3173,6 +3661,7 @@
 // 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
@@ -3344,23 +3833,25 @@
 // 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_5 0x00000200 // 5% roll-off for DVB-S2X
-#define DTAPI_MOD_ROLLOFF_10 0x00000300 // 10% roll-off for DVB-S2X
-#define DTAPI_MOD_ROLLOFF_15 0x00000400 // 15% roll-off for DVB-S2X
-#define DTAPI_MOD_ROLLOFF_20 0x00000500 // 20% roll-off for DVB-S2
-#define DTAPI_MOD_ROLLOFF_25 0x00000600 // 25% roll-off for DVB-S2
-#define DTAPI_MOD_ROLLOFF_35 0x00000700 // 35% roll-off for DVB-S/S2
+#define DTAPI_MOD_ROLLOFF_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 0x00000800 // Passband up to samplerate*0.614,
+#define DTAPI_MOD_LPF_0_614 0x00000900 // Passband up to samplerate*0.614,
 // used for 2MHz CMMB
-#define DTAPI_MOD_LPF_0_686 0x00000900 // Passband up to samplerate*0.686,
+#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 0x00000A00 // Passband up to samplerate*0.754,
+#define DTAPI_MOD_LPF_0_754 0x00000B00 // Passband up to samplerate*0.754,
 // used for 8MHz CMMB, DAB
-#define DTAPI_MOD_LPF_0_833 0x00000B00 // Passband up to samplerate*0.833,
+#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 0x00000C00 // Passband up to samplerate*0.850,
- // used for DVB-T2 extended bandwidth
+#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
 
@@ -3401,6 +3892,51 @@
 #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
@@ -3570,25 +4106,32 @@
 #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_2160P50 (DTAPI_VIDSTD_BASE + 0)
-#define DTAPI_VIDSTD_2160P50B (DTAPI_VIDSTD_BASE + 1)
-#define DTAPI_VIDSTD_2160P59_94 (DTAPI_VIDSTD_BASE + 2)
-#define DTAPI_VIDSTD_2160P59_94B (DTAPI_VIDSTD_BASE + 3)
-#define DTAPI_VIDSTD_2160P60 (DTAPI_VIDSTD_BASE + 4)
-#define DTAPI_VIDSTD_2160P60B (DTAPI_VIDSTD_BASE + 5)
-#define DTAPI_VIDSTD_2160P23_98 (DTAPI_VIDSTD_BASE + 6)
-#define DTAPI_VIDSTD_2160P24 (DTAPI_VIDSTD_BASE + 7)
-#define DTAPI_VIDSTD_2160P25 (DTAPI_VIDSTD_BASE + 8)
-#define DTAPI_VIDSTD_2160P29_97 (DTAPI_VIDSTD_BASE + 9)
-#define DTAPI_VIDSTD_2160P30 (DTAPI_VIDSTD_BASE + 10)
+#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
@@ -3605,9 +4148,16 @@
 #define DTAPI_SDI_ANC_MASK (DTAPI_SDI_HANC | DTAPI_SDI_VANC)
 
 // Chrominace/luminance stream selection (can be OR-ed)
-#define DTAPI_SDI_CHROM 0x01
-#define DTAPI_SDI_LUM 0x02
-#define DTAPI_SDI_STREAM_MASK (DTAPI_SDI_CHROM | DTAPI_SDI_LUM)
+#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
@@ -3687,7 +4237,7 @@
 class DtFrameBufTrPars
 {
 public:
- enum ParsType { PT_VIDEO, PT_ANC, PT_RAW };
+ enum ParsType { PT_VIDEO, PT_ANC, PT_RAW, PT_ANC2 };
 
 protected:
 DtFrameBufTrPars(ParsType Type);
@@ -3872,100 +4422,14 @@
 SdiMatrixImpl* m_pImpl; // Implementation class
 };
 
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Global DTAPI Functions -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-
-DTAPI_RESULT DtapiCheckDeviceDriverVersion(void);
-DTAPI_RESULT DtapiCheckDeviceDriverVersion(int DeviceCategory);
-DTAPI_RESULT DtapiDeviceScan(int NumEntries, int& NumEntriesResult,
- DtDeviceDesc* DvcDescArr, bool InclDteDvcs=false,
- int ScanOrder=DTAPI_SCANORDER_ORIG);
-DTAPI_RESULT DtapiDtaPlusDeviceScan(int NumEntries, int& NumEntriesResult,
- DtDtaPlusDeviceDesc* DvcDescArr);
-DTAPI_RESULT DtapiDtDeviceDesc2String(DtDeviceDesc* pDvcDesc, int StringType, 
- char* pString, int StringLength);
-DTAPI_RESULT DtapiDtDeviceDesc2String(DtDeviceDesc* pDvcDesc, int StringType, 
- wchar_t* pString, int StringLength);
-DTAPI_RESULT DtapiDtHwFuncDesc2String(DtHwFuncDesc* pHwFunc, int StringType, 
- char* pString, int StringLength);
-DTAPI_RESULT DtapiDtHwFuncDesc2String(DtHwFuncDesc* pHwFunc, int StringType, 
- wchar_t* pString, int StringLength);
-DTAPI_RESULT DtapiGetDeviceDriverVersion(int, int&, int&, int&, int&);
-DTAPI_RESULT DtapiGetDtapiServiceVersion(int&, int&, int&, int&);
-DTAPI_RESULT DtapiGetVersion(int& Maj, int& Min, int& BugFix, int& Build);
-DTAPI_RESULT DtapiHwFuncScan(int NumEntries, int& NumEntriesResult,
- DtHwFuncDesc* pHwFuncs, bool InclDteDvcs=false,
- int ScanOrder=DTAPI_SCANORDER_ORIG);
-DTAPI_RESULT DtapiPower2Voltage(int dBm, int& dBmV, bool Is50Ohm=false);
-const char* DtapiResult2Str(DTAPI_RESULT DtapiResult);
-DTAPI_RESULT DtapiVoltage2Power(int dBmV, int& dBm, bool Is50Ohm=false);
-
-// Callbacks
-DTAPI_RESULT DtapiRegisterCallback(pDtEventCallback Callback, void* pContext,
- int EventTypes, void** pId = NULL);
-DTAPI_RESULT DtapiUnregisterCallback(void* pId);
-
-// IP address conversion
-DTAPI_RESULT DtapiInitDtIpParsFromIpString(DtIpPars& IpPars,
- const char* pDstIp, const char* pSrcIp);
-DTAPI_RESULT DtapiInitDtIpParsFromIpString(DtIpPars& IpPars,
- const wchar_t* pDstIp, const wchar_t* pSrcIp);
-DTAPI_RESULT DtapiIpAddr2ByteArray(const char* pIpStr, unsigned char* pIpByte,
- int& Flags);
-DTAPI_RESULT DtapiIpAddr2ByteArray(const wchar_t* pIpStr, 
- unsigned char* pIpByte, int& Flags);
-DTAPI_RESULT DtapiIpAddr2Str(char* pStr, int Len, unsigned char* pIpAddr);
-DTAPI_RESULT DtapiIpAddr2Str(wchar_t* pStr, int Len, unsigned char* pIpAddr);
-DTAPI_RESULT DtapiStr2IpAddr(unsigned char* pIpAddr, const char* pStr);
-DTAPI_RESULT DtapiStr2IpAddr(unsigned char* pIpAddr, const wchar_t* pStr);
-
-// Legacy
-#define DtapiInitDtTsIpParsFromIpString DtapiInitDtIpParsFromIpString
-
-// Modulator functions
-DTAPI_RESULT DtapiModPars2Bandwidth(int& ModBandwidth, int& TotalBandwidth,
- int ModType, int ParXtra0, int ParXtra1, int ParXtra2,
- void* pXtraPars, int SymRate);
-DTAPI_RESULT DtapiModPars2SymRate(int& SymRate, int ModType, int ParXtra0,
- int ParXtra1, int ParXtra2, int TsRate);
-DTAPI_RESULT DtapiModPars2SymRate(int& SymRate, int ModType, int ParXtra0,
- int ParXtra1, int ParXtra2, 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 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);
-
 //-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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)
@@ -4183,8 +4647,52 @@
 #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_MODE_VIDEOSTD (DTAPI_E + 215)
-
+#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 +=+=+=+=+=+=+=+=+
@@ -4222,10 +4730,6 @@
 bool IsEqual(DtBigTsSplitPars& TsSplitPars);
 };
 
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtPlpInpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Class for specifying the PLP input
-//
 struct DtPlpInpPars
 {
 // PLP input data types
@@ -4233,24 +4737,30 @@
 {
 TS188, // 188-byte TS packets 
 TS204, // 204-byte TS packets
- GSE // Generic Stream Encapsulation
+ 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 or GSE packets
+ InDataType m_DataType; // TS188, TS204 byte, GSE or ALP packets
 DtBigTsSplitPars m_BigTsSplit; // Big TS splitting (optional)
 
 public:
 // Methods
- void Init(int Idx = 0);
+ 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
@@ -4269,6 +4779,15 @@
 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
@@ -4361,9 +4880,643 @@
 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_TESTPOINTS[DTAPI_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_BondedRfId[DTAPI_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_BondedBsId[DTAPI_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_PlpInputs[DTAPI_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_BondedRfId[DTAPI_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_HtiNumFecBlocks[16]; // 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_BondedBsId[DTAPI_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 +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
 
@@ -4508,7 +5661,7 @@
 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
+ double m_RelativePowerdB; // Transmitter power, relative to total power
 };
 
 
@@ -4520,7 +5673,6 @@
 {
 std::vector<DtDabTransmitterId> m_Transmitters;
 };
-
 //=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ DVB-C2 Parameters +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
 
 // Maxima
@@ -4578,6 +5730,10 @@
 // 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
@@ -4715,7 +5871,7 @@
 // 'm_NumFrames' C2 frames
 // L1 DSlice updates
 std::vector<DtDvbC2L1UpdateDSlicePars> m_DSlices;
- bool m_EarlyWarningSystem;		// Early warning system
+ bool m_EarlyWarningSystem; // Early warning system
 
 public:
 void Init();
@@ -4799,6 +5955,8 @@
 //
 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
@@ -4810,13 +5968,16 @@
 int m_TsRate; // If 0 the rate is computed from the PLP parameters,
 // only possible in case of single PLP and no ISSY 
 // is used
- int m_Ccm; // ACM/CMM bit in the BBframe header 0 or 1
+ // 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
@@ -4886,7 +6047,7 @@
 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
+ bool m_EarlyWarningSystem; // Early warning system
 int m_C2Version; // DVB-C2 Version
 int m_L1TiMode; // L1 time interleaving mode. See DVBC2_L1TIMODE_x
 
@@ -5059,7 +6220,7 @@
 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
+ bool m_EarlyWarningSystem; // Early warning system
 int m_C2Version; // DVB-C2 Version
 
 // Data slices
@@ -5532,6 +6693,7 @@
 // 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
@@ -6008,6 +7170,22 @@
 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 +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
 
@@ -6045,12 +7223,15 @@
 //
 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
@@ -6058,11 +7239,13 @@
 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_TF_GROUPDELAY, // Transfer function group delay
+ STREAM_TXID_IMPRESP // Impulse reponse of Tx-ID
 };
 
 //.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtConstelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
@@ -6074,7 +7257,7 @@
 int m_Period; // Minimum period between callbacks in ms
 int m_ConstellationType; // 0: Constellation per PLP
 // 1: Constellation per carrier (after equalization)
- int m_Index; // Index of the PLP or carrier
+ int m_Index; // Index of the carrier or PLP-ID
 int m_MaxNumPoints; // Maximum number of constellation points
 };
 
@@ -6104,8 +7287,8 @@
 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	
+ 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);
@@ -6206,6 +7389,20 @@
 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
@@ -6217,6 +7414,9 @@
 
 union {
 // Selection parameters for demodulated streams
+ DtAtscStreamSelPars m_Atsc;
+ DtAtsc3StreamSelPars m_Atsc3;
+ DtQamStreamSelPars m_Qam;
 DtDvbC2StreamSelPars m_DvbC2;
 DtDvbTStreamSelPars m_DvbT;
 DtDvbT2StreamSelPars m_DvbT2;
@@ -6232,6 +7432,7 @@
 DtMerPars m_Mer;
 DtSpectrumPars m_Spectrum;
 DtTransFuncPars m_TransFunc;
+ DtTxIdImpRespPars m_TxIdImpResp;
 } u;
 
 bool operator == (DtStreamSelPars& Rhs);
@@ -6387,14 +7588,15 @@
 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_RGBX, // Packed RGB data with a 4th dummy symbol per pixel. With
- // 8-byte data this means 32-bit per pixel which is easy
- // to process.
 //DT_PXFMT_RGB_P, // Planar RGB data
 
 DT_PXFMT_INVALID = -1,
@@ -6417,13 +7619,16 @@
 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. HLM will chose a stride, usually
+ // 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. HLM is allowed to pick larger stride for
+ // 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
@@ -6472,6 +7677,7 @@
 {
 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 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
@@ -6541,16 +7747,49 @@
 // 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 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
@@ -6561,10 +7800,8 @@
 bool m_DeEmbedAll; // De-embed all auxdata. Defaults to false.
 DtMxAuxDataType m_DataType; // Indicates which of the following objects is valid.
 
- union
- {
- DtMxAuxConfigSdi m_Sdi;
- };
+ DtMxAuxConfigSdi m_Sdi; // SDI-specific settings. Valid only if
+ // m_DataType==DT_AUXDATA_SDI
 
 DtMxAuxDataConfig();
 };
@@ -6712,6 +7949,203 @@
 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_Data[90]; // 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_Data[2]; // 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_Data[42]; // Raw packet data (excl. clock run-in and framing code)
+};
+
 //.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAuxData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
 //
 class DtMxAuxData
@@ -6720,6 +8154,11 @@
 // Teletext
 // Closed captioning
 
+ DtMxSdVideoIndex m_VidIndex[2];
+ DtMxSdWss m_Wss[2];
+ DtMxLine21 m_Line21[2];
+ std::vector<DtMxTeletextPacket> m_Teletext;
+
 // Other anc data
 bool m_AncTimeCodeValid;
 __int64 m_AncTimeCode;
@@ -6795,7 +8234,7 @@
 public:
 DtMxAudioChannel();
 virtual ~DtMxAudioChannel();
- DtMxAudioChannel& operator=(const DtMxAudioChannel& Other);
+ DtMxAudioChannel& operator = (const DtMxAudioChannel& Other);
 };
 
 //.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxAudioServiceType -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
@@ -6824,7 +8263,7 @@
 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)
+ inline DtFixedVector& operator = (const DtFixedVector& Oth)
 {
 this->m_Data = Oth.m_Data;
 return *this;
@@ -6848,6 +8287,7 @@
 friend class MxCommonData;
 friend class MxDecData;
 friend class MxActionAncEnc;
+ friend class MxActionAncDec;
 friend class MxProcessImpl;
 };
 
@@ -6870,7 +8310,7 @@
 // Constructor, destructor
 public:
 DtMxAudioService();
- DtMxAudioService& operator=(const DtMxAudioService& Other);
+ DtMxAudioService& operator = (const DtMxAudioService& Other);
 };
 
 //-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAudioData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
@@ -6886,6 +8326,11 @@
 // 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 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
@@ -6900,9 +8345,11 @@
 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_DROPPED, // Frame data was dropped because the input thread
- // in the API was too slow. Data is not available. This
- // should never happen under normal circumstances.
+ 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.
@@ -6910,6 +8357,8 @@
 // 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 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
 //
@@ -6951,6 +8400,8 @@
 // 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
@@ -6975,7 +8426,8 @@
 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) = 0;
+ int HancVanc, int Stream, int Link=-1,
+ int StartLine=-1, int NumLines=-1) = 0;
 
 // Constructor, destructor
 protected:
@@ -6984,7 +8436,7 @@
 private:
 // No implementation is provided for the copy constructor or for operator=
 DtMxFrame(const DtMxFrame&);
- DtMxFrame& operator=(const DtMxFrame&);
+ DtMxFrame& operator = (const DtMxFrame&);
 };
 
 //.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxRowData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
@@ -7029,7 +8481,6 @@
 //=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ MATRIX CONTROL +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
 //+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
 
-
 //.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxPort -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
 //
 // The DtMxPort is used as abstraction for one logical input or output. Often this
@@ -7070,7 +8521,7 @@
 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);
+ 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
@@ -7078,9 +8529,10 @@
 // Destructor
 virtual ~DtMxPort();
 // Assignment operator
- DtMxPort& operator=(const DtMxPort&);
+ DtMxPort& operator = (const DtMxPort&);
 
- DTAPI_RESULT AddPhysicalPort(DtDevice*, int Port, int ClockPriority=0);
+ DTAPI_RESULT AddPhysicalPort(DtDevice*, int Port, int ClockPriority=0, 
+ int PixelOffset=0);
 
 private:
 class MxPortImpl* m_pImpl;
@@ -7117,15 +8569,50 @@
 // clock so that the average fifo load remains the same.
 };
 
-
-// Affinity masks for several threads. Each can be set to 0 to disable them.
-class DtMxCpuAffinity
+//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxSchedulingArgs -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
+//
+class DtMxSchedulingArgs
 {
 public:
- unsigned int m_Default; // Mask for all other threads
- unsigned int m_Dma; // Mask for DMA threads
- unsigned int m_Decode; // Mask for decode threads
- unsigned int m_Encode; // Mask for encode threads
+ // 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 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
@@ -7160,26 +8647,25 @@
 DTAPI_RESULT AttachRowToOutput(int Row, const DtMxPort& Port, int ExtraOutDelay=0);
 
 // Change the way the HLM clock source is controlled.
- DTAPI_RESULT SetClockControl(DtMxClockMode ClockMode, DtDevice* pDvc=NULL,
- int AvgFifoLoad=-1);
+ 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);
+ DTAPI_RESULT NewClockSample(__int64 PcrOrFifoLoad, int RefClkCnt);
 
 // Changes the number of phases. Global setting per matrix.
- DTAPI_RESULT SetNumPhases(int NumPhases);
+ 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);
+ 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);
+ 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);
@@ -7188,9 +8674,9 @@
 // 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);
+ 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.
@@ -7198,7 +8684,7 @@
 // Stop a runnig matrix process and return to IDLE.
 DTAPI_RESULT Stop();
 
- DTAPI_RESULT SetThreadAffinity(const DtMxCpuAffinity& Affinity);
+ 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
@@ -7218,9 +8704,1101 @@
 private:
 // No implementation is provided for the copy constructor or for operator=
 DtMxProcess(const DtMxProcess&);
- DtMxProcess& operator=(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
 
@@ -7229,4 +9807,3 @@
 #endif
 
 #endif //#ifndef __DTAPI_H
-

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/ac3_parser.h Added

@@ -0,0 +1,36 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/adts_parser.h Added

@@ -0,0 +1,37 @@
+/*
+ * 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.
+ * @param[in] buf pointer to AAC data buffer
+ * @param[out] samples Pointer to where number of samples is written
+ * @param[out] 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-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/avcodec.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/avcodec.h Changed

@@ -36,19 +36,17 @@
 #include "libavutil/channel_layout.h"
 #include "libavutil/dict.h"
 #include "libavutil/frame.h"
+#include "libavutil/hwcontext.h"
 #include "libavutil/log.h"
 #include "libavutil/pixfmt.h"
 #include "libavutil/rational.h"
 
 #include "version.h"
 
-#if FF_API_FAST_MALLOC
-// to provide fast_*alloc
-#include "libavutil/mem.h"
-#endif
-
 /**
- * @defgroup libavc Encoding/Decoding Library
+ * @defgroup libavc libavcodec
+ * Encoding/Decoding Library
+ *
 * @{
 *
 * @defgroup lavc_decoding Decoding
@@ -75,7 +73,118 @@
 * @{
 * @}
 * @}
+ */
+
+/**
+ * @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.
+ *
+ * This API replaces the following legacy functions:
+ * - avcodec_decode_video2() and avcodec_decode_audio4():
+ * Use avcodec_send_packet() to feed input to the decoder, then use
+ * avcodec_receive_frame() to receive decoded frames after each packet.
+ * Unlike with the old video decoding API, multiple frames might result from
+ * a packet. For audio, splitting the input packet into frames by partially
+ * decoding packets becomes transparent to the API user. You never need to
+ * feed an AVPacket to the API twice (unless it is rejected with AVERROR(EAGAIN) - then
+ * no data was read from the packet).
+ * Additionally, sending a flush/draining packet is required only once.
+ * - avcodec_encode_video2()/avcodec_encode_audio2():
+ * Use avcodec_send_frame() to feed input to the encoder, then use
+ * avcodec_receive_packet() to receive encoded packets.
+ * Providing user-allocated buffers for avcodec_receive_packet() is not
+ * possible.
+ * - The new API does not handle subtitles yet.
+ *
+ * Mixing new and old function calls on the same AVCodecContext is not allowed,
+ * and will result in undefined behavior.
+ *
+ * Some codecs might require using the new API; using the old API will return
+ * an error when calling it. All codecs support the new API.
+ *
+ * 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.
+ * @}
 */
 
 /**
@@ -97,9 +206,8 @@
 * details.
 *
 * If you add a codec ID to this list, add it so that
- * 1. no value of a existing codec ID changes (that would break ABI),
- * 2. Give it a value which when taken as ASCII is recognized uniquely by a human as this specific codec.
- * This ensures that 2 forks can independently add AVCodecIDs without producing conflicts.
+ * 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.
@@ -110,9 +218,6 @@
 /* video codecs */
 AV_CODEC_ID_MPEG1VIDEO,
 AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-#if FF_API_XVMC
- AV_CODEC_ID_MPEG2VIDEO_XVMC,
-#endif /* FF_API_XVMC */
 AV_CODEC_ID_H261,
 AV_CODEC_ID_H263,
 AV_CODEC_ID_RV10,
@@ -247,7 +352,7 @@
 AV_CODEC_ID_ANM,
 AV_CODEC_ID_BINKVIDEO,
 AV_CODEC_ID_IFF_ILBM,
- AV_CODEC_ID_IFF_BYTERUN1,
+#define AV_CODEC_ID_IFF_BYTERUN1 AV_CODEC_ID_IFF_ILBM
 AV_CODEC_ID_KGV1,
 AV_CODEC_ID_YOP,
 AV_CODEC_ID_VP8,
@@ -280,50 +385,67 @@
 AV_CODEC_ID_MSS2,
 AV_CODEC_ID_VP9,
 AV_CODEC_ID_AIC,
- AV_CODEC_ID_ESCAPE130_DEPRECATED,
- AV_CODEC_ID_G2M_DEPRECATED,
- AV_CODEC_ID_WEBP_DEPRECATED,
+ AV_CODEC_ID_ESCAPE130,
+ AV_CODEC_ID_G2M,
+ AV_CODEC_ID_WEBP,
 AV_CODEC_ID_HNM4_VIDEO,
- AV_CODEC_ID_HEVC_DEPRECATED,
+ 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_DEPRECATED,
- AV_CODEC_ID_PAF_VIDEO_DEPRECATED,
- AV_CODEC_ID_EXR_DEPRECATED,
- AV_CODEC_ID_VP7_DEPRECATED,
- AV_CODEC_ID_SANM_DEPRECATED,
- AV_CODEC_ID_SGIRLE_DEPRECATED,
- AV_CODEC_ID_MVC1_DEPRECATED,
- AV_CODEC_ID_MVC2_DEPRECATED,
-
- AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'),
- AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'),
- AV_CODEC_ID_ESCAPE130 = MKBETAG('E','1','3','0'),
- AV_CODEC_ID_EXR = MKBETAG('0','E','X','R'),
- AV_CODEC_ID_AVRP = MKBETAG('A','V','R','P'),
-
- AV_CODEC_ID_012V = MKBETAG('0','1','2','V'),
- AV_CODEC_ID_G2M = MKBETAG( 0 ,'G','2','M'),
- AV_CODEC_ID_AVUI = MKBETAG('A','V','U','I'),
- AV_CODEC_ID_AYUV = MKBETAG('A','Y','U','V'),
- AV_CODEC_ID_TARGA_Y216 = MKBETAG('T','2','1','6'),
- AV_CODEC_ID_V308 = MKBETAG('V','3','0','8'),
- AV_CODEC_ID_V408 = MKBETAG('V','4','0','8'),
- AV_CODEC_ID_YUV4 = MKBETAG('Y','U','V','4'),
- AV_CODEC_ID_SANM = MKBETAG('S','A','N','M'),
- AV_CODEC_ID_PAF_VIDEO = MKBETAG('P','A','F','V'),
- AV_CODEC_ID_AVRN = MKBETAG('A','V','R','n'),
- AV_CODEC_ID_CPIA = MKBETAG('C','P','I','A'),
- AV_CODEC_ID_XFACE = MKBETAG('X','F','A','C'),
- AV_CODEC_ID_SGIRLE = MKBETAG('S','G','I','R'),
- AV_CODEC_ID_MVC1 = MKBETAG('M','V','C','1'),
- AV_CODEC_ID_MVC2 = MKBETAG('M','V','C','2'),
- AV_CODEC_ID_SNOW = MKBETAG('S','N','O','W'),
- AV_CODEC_ID_WEBP = MKBETAG('W','E','B','P'),
- AV_CODEC_ID_SMVJPEG = MKBETAG('S','M','V','J'),
- AV_CODEC_ID_HEVC = MKBETAG('H','2','6','5'),
-#define AV_CODEC_ID_H265 AV_CODEC_ID_HEVC
- AV_CODEC_ID_VP7 = MKBETAG('V','P','7','0'),
+ 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_Y41P = 0x8000,
+ 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,
 
 /* various PCM "codecs" */
 AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
@@ -355,11 +477,14 @@
 AV_CODEC_ID_PCM_LXF,
 AV_CODEC_ID_S302M,
 AV_CODEC_ID_PCM_S8_PLANAR,
- AV_CODEC_ID_PCM_S24LE_PLANAR_DEPRECATED,
- AV_CODEC_ID_PCM_S32LE_PLANAR_DEPRECATED,
- AV_CODEC_ID_PCM_S24LE_PLANAR = MKBETAG(24,'P','S','P'),
- AV_CODEC_ID_PCM_S32LE_PLANAR = MKBETAG(32,'P','S','P'),
- AV_CODEC_ID_PCM_S16BE_PLANAR = MKBETAG('P','S','P',16),
+ AV_CODEC_ID_PCM_S24LE_PLANAR,
+ AV_CODEC_ID_PCM_S32LE_PLANAR,
+ AV_CODEC_ID_PCM_S16BE_PLANAR,
+
+ AV_CODEC_ID_PCM_S64LE = 0x10800,
+ AV_CODEC_ID_PCM_S64BE,
+ AV_CODEC_ID_PCM_F16LE,
+ AV_CODEC_ID_PCM_F24LE,
 
 /* various ADPCM codecs */
 AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
@@ -392,14 +517,18 @@
 AV_CODEC_ID_ADPCM_IMA_ISS,
 AV_CODEC_ID_ADPCM_G722,
 AV_CODEC_ID_ADPCM_IMA_APC,
- AV_CODEC_ID_ADPCM_VIMA_DEPRECATED,
- AV_CODEC_ID_ADPCM_VIMA = MKBETAG('V','I','M','A'),
- AV_CODEC_ID_VIMA = MKBETAG('V','I','M','A'),
- AV_CODEC_ID_ADPCM_AFC = MKBETAG('A','F','C',' '),
- AV_CODEC_ID_ADPCM_IMA_OKI = MKBETAG('O','K','I',' '),
- AV_CODEC_ID_ADPCM_DTK = MKBETAG('D','T','K',' '),
- AV_CODEC_ID_ADPCM_IMA_RAD = MKBETAG('R','A','D',' '),
- AV_CODEC_ID_ADPCM_G726LE = MKBETAG('6','2','7','G'),
+ AV_CODEC_ID_ADPCM_VIMA,
+
+ AV_CODEC_ID_ADPCM_AFC = 0x11800,
+ 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,
 
 /* AMR */
 AV_CODEC_ID_AMR_NB = 0x12000,
@@ -415,6 +544,9 @@
 AV_CODEC_ID_XAN_DPCM,
 AV_CODEC_ID_SOL_DPCM,
 
+ AV_CODEC_ID_SDX2_DPCM = 0x14800,
+ AV_CODEC_ID_GREMLIN_DPCM,
+
 /* audio codecs */
 AV_CODEC_ID_MP2 = 0x15000,
 AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
@@ -448,9 +580,6 @@
 AV_CODEC_ID_MLP,
 AV_CODEC_ID_GSM_MS, /* as found in WAV */
 AV_CODEC_ID_ATRAC3,
-#if FF_API_VOXWARE
- AV_CODEC_ID_VOXWARE,
-#endif
 AV_CODEC_ID_APE,
 AV_CODEC_ID_NELLYMOSER,
 AV_CODEC_ID_MUSEPACK8,
@@ -479,24 +608,35 @@
 AV_CODEC_ID_RALF,
 AV_CODEC_ID_IAC,
 AV_CODEC_ID_ILBC,
- AV_CODEC_ID_OPUS_DEPRECATED,
+ AV_CODEC_ID_OPUS,
 AV_CODEC_ID_COMFORT_NOISE,
- AV_CODEC_ID_TAK_DEPRECATED,
+ AV_CODEC_ID_TAK,
 AV_CODEC_ID_METASOUND,
- AV_CODEC_ID_PAF_AUDIO_DEPRECATED,
+ AV_CODEC_ID_PAF_AUDIO,
 AV_CODEC_ID_ON2AVC,
- AV_CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
- AV_CODEC_ID_SONIC = MKBETAG('S','O','N','C'),
- AV_CODEC_ID_SONIC_LS = MKBETAG('S','O','N','L'),
- AV_CODEC_ID_PAF_AUDIO = MKBETAG('P','A','F','A'),
- AV_CODEC_ID_OPUS = MKBETAG('O','P','U','S'),
- AV_CODEC_ID_TAK = MKBETAG('t','B','a','K'),
- AV_CODEC_ID_EVRC = MKBETAG('s','e','v','c'),
- AV_CODEC_ID_SMV = MKBETAG('s','s','m','v'),
- AV_CODEC_ID_DSD_LSBF = MKBETAG('D','S','D','L'),
- AV_CODEC_ID_DSD_MSBF = MKBETAG('D','S','D','M'),
- AV_CODEC_ID_DSD_LSBF_PLANAR = MKBETAG('D','S','D','1'),
- AV_CODEC_ID_DSD_MSBF_PLANAR = MKBETAG('D','S','D','8'),
+ AV_CODEC_ID_DSS_SP,
+ AV_CODEC_ID_CODEC2,
+
+ AV_CODEC_ID_FFWAVESYNTH = 0x15800,
+ 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,
 
 /* subtitle codecs */
 AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
@@ -509,31 +649,36 @@
 AV_CODEC_ID_HDMV_PGS_SUBTITLE,
 AV_CODEC_ID_DVB_TELETEXT,
 AV_CODEC_ID_SRT,
- AV_CODEC_ID_MICRODVD = MKBETAG('m','D','V','D'),
- AV_CODEC_ID_EIA_608 = MKBETAG('c','6','0','8'),
- AV_CODEC_ID_JACOSUB = MKBETAG('J','S','U','B'),
- AV_CODEC_ID_SAMI = MKBETAG('S','A','M','I'),
- AV_CODEC_ID_REALTEXT = MKBETAG('R','T','X','T'),
- AV_CODEC_ID_SUBVIEWER1 = MKBETAG('S','b','V','1'),
- AV_CODEC_ID_SUBVIEWER = MKBETAG('S','u','b','V'),
- AV_CODEC_ID_SUBRIP = MKBETAG('S','R','i','p'),
- AV_CODEC_ID_WEBVTT = MKBETAG('W','V','T','T'),
- AV_CODEC_ID_MPL2 = MKBETAG('M','P','L','2'),
- AV_CODEC_ID_VPLAYER = MKBETAG('V','P','l','r'),
- AV_CODEC_ID_PJS = MKBETAG('P','h','J','S'),
- AV_CODEC_ID_ASS = MKBETAG('A','S','S',' '), ///< ASS as defined in Matroska
+
+ AV_CODEC_ID_MICRODVD = 0x17800,
+ 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,
 
 /* 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_BINTEXT = MKBETAG('B','T','X','T'),
- AV_CODEC_ID_XBIN = MKBETAG('X','B','I','N'),
- AV_CODEC_ID_IDF = MKBETAG( 0 ,'I','D','F'),
- AV_CODEC_ID_OTF = MKBETAG( 0 ,'O','T','F'),
- AV_CODEC_ID_SMPTE_KLV = MKBETAG('K','L','V','A'),
- AV_CODEC_ID_DVD_NAV = MKBETAG('D','N','A','V'),
- AV_CODEC_ID_TIMED_ID3 = MKBETAG('T','I','D','3'),
- AV_CODEC_ID_BIN_DATA = MKBETAG('D','A','T','A'),
+
+ AV_CODEC_ID_SCTE_35, ///< Contain timestamp estimated through PCR of program stream.
+ AV_CODEC_ID_BINTEXT = 0x18800,
+ 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
@@ -543,16 +688,13 @@
 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.
-
-#if FF_API_CODEC_ID
-#include "old_codec_ids.h"
-#endif
+ AV_CODEC_ID_WRAPPED_AVFRAME = 0x21001, ///< Passthrough codec, AVFrames wrapped in AVPacket
 };
 
 /**
 * This struct describes the properties of a single codec described by an
 * AVCodecID.
- * @see avcodec_get_descriptor()
+ * @see avcodec_descriptor_get()
 */
 typedef struct AVCodecDescriptor {
 enum AVCodecID id;
@@ -571,18 +713,22 @@
 * 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 codecs only.
+ * Video and audio codecs only.
 */
 #define AV_CODEC_PROP_INTRA_ONLY (1 << 0)
 /**
@@ -624,32 +770,14 @@
 * Note: If the first 23 bits of the additional bytes are not 0, then damaged
 * MPEG bitstreams could cause overread and segfault.
 */
-#define FF_INPUT_BUFFER_PADDING_SIZE 32
+#define AV_INPUT_BUFFER_PADDING_SIZE 64
 
 /**
 * @ingroup lavc_encoding
 * minimum encoding buffer size
 * Used to avoid some checks during header writing.
 */
-#define FF_MIN_BUFFER_SIZE 16384
-
-
-/**
- * @ingroup lavc_encoding
- * motion estimation type.
- */
-enum Motion_Est_ID {
- ME_ZERO = 1, ///< no search, that is use 0,0 vector whenever one is needed
- ME_FULL,
- ME_LOG,
- ME_PHODS,
- ME_EPZS, ///< enhanced predictive zonal search
- ME_X1, ///< reserved for experiments
- ME_HEX, ///< hexagon based search
- ME_UMH, ///< uneven multi-hexagon search
- ME_TESA, ///< transformed exhaustive search algorithm
- ME_ITER=50, ///< iterative search
-};
+#define AV_INPUT_BUFFER_MIN_SIZE 16384
 
 /**
 * @ingroup lavc_decoding
@@ -689,13 +817,6 @@
 float quality_factor;
 } RcOverride;
 
-#if FF_API_MAX_BFRAMES
-/**
- * @deprecated there is no libavcodec-wide limit on the number of B-frames
- */
-#define FF_MAX_B_FRAMES 16
-#endif
-
 /* encoding support
 These flags can be passed in AVCodecContext.flags before initialization.
 Note: Not everything is supported yet.
@@ -705,69 +826,119 @@
 * Allow decoders to produce frames with data planes that are not aligned
 * to CPU requirements (e.g. due to cropping).
 */
-#define CODEC_FLAG_UNALIGNED 0x0001
-#define CODEC_FLAG_QSCALE 0x0002 ///< Use fixed qscale.
-#define CODEC_FLAG_4MV 0x0004 ///< 4 MV per MB allowed / advanced prediction for H.263.
-#define CODEC_FLAG_OUTPUT_CORRUPT 0x0008 ///< Output even those frames that might be corrupted
-#define CODEC_FLAG_QPEL 0x0010 ///< Use qpel MC.
-#if FF_API_GMC
+#define AV_CODEC_FLAG_UNALIGNED (1 << 0)
 /**
- * @deprecated use the "gmc" private option of the libxvid encoder
+ * Use fixed qscale.
 */
-#define CODEC_FLAG_GMC 0x0020 ///< Use GMC.
-#endif
-#if FF_API_MV0
+#define AV_CODEC_FLAG_QSCALE (1 << 1)
 /**
- * @deprecated use the flag "mv0" in the "mpv_flags" private option of the
- * mpegvideo encoders
+ * 4 MV per MB allowed / advanced prediction for H.263.
 */
-#define CODEC_FLAG_MV0 0x0040
-#endif
-#if FF_API_INPUT_PRESERVED
+#define AV_CODEC_FLAG_4MV (1 << 2)
 /**
- * @deprecated passing reference-counted frames to the encoders replaces this
- * flag
+ * Output even those frames that might be corrupted.
 */
-#define CODEC_FLAG_INPUT_PRESERVED 0x0100
-#endif
-#define CODEC_FLAG_PASS1 0x0200 ///< Use internal 2pass ratecontrol in first pass mode.
-#define CODEC_FLAG_PASS2 0x0400 ///< Use internal 2pass ratecontrol in second pass mode.
-#define CODEC_FLAG_GRAY 0x2000 ///< Only decode/encode grayscale.
-#if FF_API_EMU_EDGE
+#define AV_CODEC_FLAG_OUTPUT_CORRUPT (1 << 3)
 /**
- * @deprecated edges are not used/required anymore. I.e. this flag is now always
- * set.
+ * Use qpel MC.
 */
-#define CODEC_FLAG_EMU_EDGE 0x4000
-#endif
-#define CODEC_FLAG_PSNR 0x8000 ///< error[?] variables will be set during encoding.
-#define CODEC_FLAG_TRUNCATED 0x00010000 /** Input bitstream might be truncated at a random
- location instead of only at frame boundaries. */
-#if FF_API_NORMALIZE_AQP
-/**
- * @deprecated use the flag "naq" in the "mpv_flags" private option of the
- * mpegvideo encoders
- */
-#define CODEC_FLAG_NORMALIZE_AQP 0x00020000
-#endif
-#define CODEC_FLAG_INTERLACED_DCT 0x00040000 ///< Use interlaced DCT.
-#define CODEC_FLAG_LOW_DELAY 0x00080000 ///< Force low delay.
-#define CODEC_FLAG_GLOBAL_HEADER 0x00400000 ///< Place global headers in extradata instead of every keyframe.
-#define CODEC_FLAG_BITEXACT 0x00800000 ///< Use only bitexact stuff (except (I)DCT).
-/* Fx : Flag for h263+ extra options */
-#define CODEC_FLAG_AC_PRED 0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction
-#define CODEC_FLAG_LOOP_FILTER 0x00000800 ///< loop filter
-#define CODEC_FLAG_INTERLACED_ME 0x20000000 ///< interlaced motion estimation
-#define CODEC_FLAG_CLOSED_GOP 0x80000000
-#define CODEC_FLAG2_FAST 0x00000001 ///< Allow non spec compliant speedup tricks.
-#define CODEC_FLAG2_NO_OUTPUT 0x00000004 ///< Skip bitstream encoding.
-#define CODEC_FLAG2_LOCAL_HEADER 0x00000008 ///< Place global headers at every keyframe instead of in extradata.
-#define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format. DEPRECATED!!!!
-#define CODEC_FLAG2_IGNORE_CROP 0x00010000 ///< Discard cropping information from SPS.
-
-#define CODEC_FLAG2_CHUNKS 0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
-#define CODEC_FLAG2_SHOW_ALL 0x00400000 ///< Show all frames before the first keyframe
-#define CODEC_FLAG2_EXPORT_MVS 0x10000000 ///< Export motion vectors through frame side data
+#define AV_CODEC_FLAG_QPEL (1 << 4)
+/**
+ * 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)
+/**
+ * Input bitstream might be truncated at a random location
+ * instead of only at frame boundaries.
+ */
+#define AV_CODEC_FLAG_TRUNCATED (1 << 16)
+/**
+ * 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)
@@ -776,24 +947,17 @@
 /* /Fx */
 /* codec capabilities */
 
-#define CODEC_CAP_DRAW_HORIZ_BAND 0x0001 ///< Decoder can use draw_horiz_band callback.
+/**
+ * Decoder can use draw_horiz_band callback.
+ */
+#define AV_CODEC_CAP_DRAW_HORIZ_BAND (1 << 0)
 /**
 * Codec uses get_buffer() for allocating buffers and supports custom allocators.
 * If not set, it might not use get_buffer() at all or use operations that
 * assume the buffer was allocated by avcodec_default_get_buffer.
 */
-#define CODEC_CAP_DR1 0x0002
-#define CODEC_CAP_TRUNCATED 0x0008
-#if FF_API_XVMC
-/* Codec can export data for HW decoding. This flag indicates that
- * the codec would call get_format() with list that might contain HW accelerated
- * pixel formats (XvMC, VDPAU, VAAPI, etc). The application can pick any of them
- * including raw image format.
- * The application can use the passed context to determine bitstream version,
- * chroma format, resolution etc.
- */
-#define CODEC_CAP_HWACCEL 0x0010
-#endif /* FF_API_XVMC */
+#define AV_CODEC_CAP_DR1 (1 << 1)
+#define AV_CODEC_CAP_TRUNCATED (1 << 3)
 /**
 * Encoder or decoder requires flushing with NULL input at the end in order to
 * give the complete and correct output.
@@ -817,106 +981,93 @@
 * each output packet. If this flag is not set, the pts and duration will
 * be determined by libavcodec from the input frame.
 */
-#define CODEC_CAP_DELAY 0x0020
+#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 CODEC_CAP_SMALL_LAST_FRAME 0x0040
-#if FF_API_CAP_VDPAU
-/**
- * Codec can export data for HW decoding (VDPAU).
- */
-#define CODEC_CAP_HWACCEL_VDPAU 0x0080
-#endif
+#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 carring such bitstreams thus
+ * 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 CODEC_CAP_SUBFRAMES 0x0100
+#define AV_CODEC_CAP_SUBFRAMES (1 << 8)
 /**
 * Codec is experimental and is thus avoided in favor of non experimental
 * encoders
 */
-#define CODEC_CAP_EXPERIMENTAL 0x0200
+#define AV_CODEC_CAP_EXPERIMENTAL (1 << 9)
 /**
 * Codec should fill in channel configuration and samplerate instead of container
 */
-#define CODEC_CAP_CHANNEL_CONF 0x0400
-#if FF_API_NEG_LINESIZES
-/**
- * @deprecated no codecs use this capability
- */
-#define CODEC_CAP_NEG_LINESIZES 0x0800
-#endif
+#define AV_CODEC_CAP_CHANNEL_CONF (1 << 10)
 /**
 * Codec supports frame-level multithreading.
 */
-#define CODEC_CAP_FRAME_THREADS 0x1000
+#define AV_CODEC_CAP_FRAME_THREADS (1 << 12)
 /**
 * Codec supports slice-based (or partition-based) multithreading.
 */
-#define CODEC_CAP_SLICE_THREADS 0x2000
+#define AV_CODEC_CAP_SLICE_THREADS (1 << 13)
 /**
 * Codec supports changed parameters at any point.
 */
-#define CODEC_CAP_PARAM_CHANGE 0x4000
+#define AV_CODEC_CAP_PARAM_CHANGE (1 << 14)
 /**
 * Codec supports avctx->thread_count == 0 (auto).
 */
-#define CODEC_CAP_AUTO_THREADS 0x8000
+#define AV_CODEC_CAP_AUTO_THREADS (1 << 15)
 /**
 * Audio encoder supports receiving a different number of samples in each call.
 */
-#define CODEC_CAP_VARIABLE_FRAME_SIZE 0x10000
+#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)
 /**
 * Codec is intra only.
 */
-#define CODEC_CAP_INTRA_ONLY 0x40000000
+#define AV_CODEC_CAP_INTRA_ONLY 0x40000000
 /**
 * Codec is lossless.
 */
-#define CODEC_CAP_LOSSLESS 0x80000000
+#define AV_CODEC_CAP_LOSSLESS 0x80000000
 
-#if FF_API_MB_TYPE
-//The following defines may change, don't expect compatibility if you use them.
-#define MB_TYPE_INTRA4x4 0x0001
-#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
-#define MB_TYPE_INTRA_PCM 0x0004 //FIXME H.264-specific
-#define MB_TYPE_16x16 0x0008
-#define MB_TYPE_16x8 0x0010
-#define MB_TYPE_8x16 0x0020
-#define MB_TYPE_8x8 0x0040
-#define MB_TYPE_INTERLACED 0x0080
-#define MB_TYPE_DIRECT2 0x0100 //FIXME
-#define MB_TYPE_ACPRED 0x0200
-#define MB_TYPE_GMC 0x0400
-#define MB_TYPE_SKIP 0x0800
-#define MB_TYPE_P0L0 0x1000
-#define MB_TYPE_P1L0 0x2000
-#define MB_TYPE_P0L1 0x4000
-#define MB_TYPE_P1L1 0x8000
-#define MB_TYPE_L0 (MB_TYPE_P0L0 | MB_TYPE_P1L0)
-#define MB_TYPE_L1 (MB_TYPE_P0L1 | MB_TYPE_P1L1)
-#define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1)
-#define MB_TYPE_QUANT 0x00010000
-#define MB_TYPE_CBP 0x00020000
-//Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...)
-#endif
+/**
+ * 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)
 
 /**
 * Pan Scan area.
 * This specifies the area which should be displayed.
 * Note there may be multiple such areas for one frame.
 */
-typedef struct AVPanScan{
+typedef struct AVPanScan {
 /**
 * id
 * - encoding: Set by user.
@@ -938,26 +1089,45 @@
 * - decoding: Set by libavcodec.
 */
 int16_t position[3][2];
-}AVPanScan;
+} AVPanScan;
 
-#if FF_API_QSCALE_TYPE
-#define FF_QSCALE_TYPE_MPEG1 0
-#define FF_QSCALE_TYPE_MPEG2 1
-#define FF_QSCALE_TYPE_H264 2
-#define FF_QSCALE_TYPE_VP56 3
-#endif
-
-#if FF_API_GET_BUFFER
-#define FF_BUFFER_TYPE_INTERNAL 1
-#define FF_BUFFER_TYPE_USER 2 ///< direct rendering buffers (image is (de)allocated by user)
-#define FF_BUFFER_TYPE_SHARED 4 ///< Buffer from somewhere else; don't deallocate image (data/base), all other tables are not shared.
-#define FF_BUFFER_TYPE_COPY 8 ///< Just a (modified) copy of some other buffer, don't deallocate anything.
-
-#define FF_BUFFER_HINTS_VALID 0x01 // Buffer hints value is meaningful (if 0 ignore).
-#define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer.
-#define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content.
-#define FF_BUFFER_HINTS_REUSABLE 0x08 // Codec will reuse the buffer (update).
-#endif
+/**
+ * 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.
+ */
+ int max_bitrate;
+ /**
+ * Minimum bitrate of the stream, in bits per second.
+ * Zero if unknown or unspecified.
+ */
+ int min_bitrate;
+ /**
+ * Average bitrate of the stream, in bits per second.
+ * Zero if unknown or unspecified.
+ */
+ int avg_bitrate;
+
+ /**
+ * The size of the buffer to which the ratecontrol is applied, in bits.
+ * Zero if unknown or unspecified.
+ */
+ int 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;
 
 /**
 * The decoder will keep a reference to the frame and may reuse it later.
@@ -971,7 +1141,20 @@
 * @{
 */
 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,
 
 /**
@@ -1034,6 +1217,37 @@
 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
+ * u64le[error 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
@@ -1042,7 +1256,7 @@
 * u8 reason for end skip (0=padding silence, 1=convergence)
 * @endcode
 */
- AV_PKT_DATA_SKIP_SAMPLES=70,
+ AV_PKT_DATA_SKIP_SAMPLES,
 
 /**
 * An AV_PKT_DATA_JP_DUALMONO side data packet indicates that
@@ -1096,8 +1310,66 @@
 * side data includes updated metadata which appeared in the stream.
 */
 AV_PKT_DATA_METADATA_UPDATE,
+
+ /**
+ * MPEGTS stream ID, 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,
+
+ /**
+ * 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;
 int size;
@@ -1110,21 +1382,27 @@
 * then passed to muxers.
 *
 * For video, it should typically contain one compressed frame. For audio it may
- * contain several compressed frames.
+ * 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).
 *
 * AVPacket is one of the few structs in FFmpeg, whose size is a part of public
 * ABI. Thus it may be allocated on stack and no new fields can be added to it
 * without libavcodec and libavformat major bump.
 *
- * The semantics of data ownership depends on the buf or destruct (deprecated)
- * fields. If either is set, the packet data is dynamically allocated and is
- * valid indefinitely until av_free_packet() is called (which in turn calls
- * av_buffer_unref()/the destruct callback to free the data). If neither is set,
- * the packet data is typically backed by some static buffer somewhere and is
- * only valid for a limited time (e.g. until the next read call when demuxing).
+ * The 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() and is freed in
- * av_free_packet().
+ * The side data is always allocated with av_malloc(), copied by
+ * av_packet_ref() and freed by av_packet_unref().
+ *
+ * @see av_packet_ref
+ * @see av_packet_unref
 */
 typedef struct AVPacket {
 /**
@@ -1167,36 +1445,41 @@
 * Duration of this packet in AVStream->time_base units, 0 if unknown.
 * Equals next_pts - this_pts in presentation order.
 */
- int duration;
-#if FF_API_DESTRUCT_PACKET
- attribute_deprecated
- void (*destruct)(struct AVPacket *);
- attribute_deprecated
- void *priv;
-#endif
+ int64_t duration;
+
 int64_t pos; ///< byte position in stream, -1 if unknown
 
+#if FF_API_CONVERGENCE_DURATION
 /**
- * Time difference in AVStream->time_base units from the pts of this
- * packet to the point at which the output from the decoder has converged
- * independent from the availability of previous frames. That is, the
- * frames are virtually identical no matter if decoding started from
- * the very first frame or from this keyframe.
- * Is AV_NOPTS_VALUE if unknown.
- * This field is not the display duration of the current packet.
- * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
- * set.
- *
- * The purpose of this field is to allow seeking in streams that have no
- * keyframes in the conventional sense. It corresponds to the
- * recovery point SEI in H.264 and match_time_delta in NUT. It is also
- * essential for some types of subtitle streams to ensure that all
- * subtitles are correctly displayed after seeking.
+ * @deprecated Same as the duration field, but as int64_t. This was required
+ * for Matroska subtitles, whose duration values could overflow when the
+ * duration field was still an int.
 */
+ attribute_deprecated
 int64_t convergence_duration;
+#endif
 } AVPacket;
 #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,
@@ -1224,8 +1507,12 @@
 * New fields can be added to the end with minor version bumps.
 * Removal, reordering and changes to existing fields require a major
 * version bump.
- * Please use AVOptions (av_opt* / av_set/get*()) to access these fields from user
+ * 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 {
@@ -1238,13 +1525,6 @@
 
 enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
 const struct AVCodec *codec;
-#if FF_API_CODEC_NAME
- /**
- * @deprecated this field is not used for anything in libavcodec
- */
- attribute_deprecated
- char codec_name[32];
-#endif
 enum AVCodecID codec_id; /* see AV_CODEC_ID_xxx */
 
 /**
@@ -1262,14 +1542,6 @@
 */
 unsigned int codec_tag;
 
- /**
- * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
- * This is used to work around some encoder bugs.
- * - encoding: unused
- * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
- */
- unsigned int stream_codec_tag;
-
 void *priv_data;
 
 /**
@@ -1290,9 +1562,10 @@
 /**
 * the average bitrate
 * - encoding: Set by user; unused for constant quantizer encoding.
- * - decoding: Set by libavcodec. 0 or some bitrate if this info is available in the stream.
+ * - decoding: Set by user, may be overwritten by libavcodec
+ * if this info is available in the stream
 */
- int bit_rate;
+ int64_t bit_rate;
 
 /**
 * number of bits the bitstream is allowed to diverge from the reference.
@@ -1318,14 +1591,14 @@
 #define FF_COMPRESSION_DEFAULT -1
 
 /**
- * CODEC_FLAG_*.
+ * AV_CODEC_FLAG_*.
 * - encoding: Set by user.
 * - decoding: Set by user.
 */
 int flags;
 
 /**
- * CODEC_FLAG2_*
+ * AV_CODEC_FLAG2_*
 * - encoding: Set by user.
 * - decoding: Set by user.
 */
@@ -1333,10 +1606,10 @@
 
 /**
 * some codecs need / can use extradata like Huffman tables.
- * mjpeg: Huffman tables
+ * MJPEG: Huffman tables
 * rv10: additional flags
- * mpeg4: global headers (they can be in the bitstream or here)
- * The allocated memory should be FF_INPUT_BUFFER_PADDING_SIZE bytes larger
+ * 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.
 * - encoding: Set/allocated/freed by libavcodec.
@@ -1350,8 +1623,19 @@
 * 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: Set by libavcodec.
+ * - decoding: the use of this field for decoding is deprecated.
+ * Use framerate instead.
 */
 AVRational time_base;
 
@@ -1377,16 +1661,7 @@
 * encoded input.
 *
 * Audio:
- * For encoding, this is the number of "priming" samples added by the
- * encoder to the beginning of the stream. The decoded output will be
- * delayed by this many samples relative to the input to the encoder (or
- * more, if the decoder adds its own padding).
- * The timestamps on the output packets are adjusted by the encoder so
- * that they always refer to the first sample of the data actually
- * contained in the packet, including any added padding.
- * E.g. if the timebase is 1/samplerate and the timestamp of the first
- * input sample is 0, the timestamp of the first output packet will be
- * -delay.
+ * For 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
@@ -1401,28 +1676,34 @@
 /* video only */
 /**
 * picture width / height.
+ *
+ * @note Those fields may not match the values of the last
+ * AVFrame output by avcodec_decode_video2 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.
+ * 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.
+ * overwrite those values as required while parsing the data.
 */
 int coded_width, coded_height;
 
-#if FF_API_ASPECT_EXTENDED
-#define FF_ASPECT_EXTENDED 15
-#endif
-
 /**
 * the number of pictures in a group of pictures, or 0 for intra_only
 * - encoding: Set by user.
@@ -1434,21 +1715,18 @@
 * 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 if known
+ * - decoding: Set by user if known, overridden by libavcodec while
+ * parsing the data.
 */
 enum AVPixelFormat pix_fmt;
 
 /**
- * Motion estimation algorithm used for video coding.
- * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),
- * 8 (umh), 9 (iter), 10 (tesa) [7, 8, 10 are x264 specific, 9 is snow specific]
- * - encoding: MUST be set by user.
- * - decoding: unused
- */
- int me_method;
-
- /**
 * If non NULL, 'draw_horiz_band' is called by the libavcodec
 * decoder to draw a horizontal band. It improves cache usage. Not
 * all codecs can do that. You must check the codec capabilities
@@ -1480,6 +1758,10 @@
 * @param fmt is the list of formats which are supported by the codec,
 * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.
 * The first is always the native one.
+ * @note The callback may be called again immediately if initialization for
+ * the selected (hardware-accelerated) pixel format failed.
+ * @warning Behavior is undefined if the callback returns a value not
+ * in the fmt list of formats.
 * @return the chosen format
 * - encoding: unused
 * - decoding: Set by user, if not set the native format will be chosen.
@@ -1503,11 +1785,11 @@
 */
 float b_quant_factor;
 
- /** obsolete FIXME remove */
- int rc_strategy;
-#define FF_RC_STRATEGY_XVID 1
-
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int b_frame_strategy;
+#endif
 
 /**
 * qscale offset between IP and B-frames
@@ -1524,16 +1806,15 @@
 */
 int has_b_frames;
 
- /**
- * 0-> h263 quant 1-> mpeg quant
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int mpeg_quant;
+#endif
 
 /**
- * qscale factor between P and I-frames
- * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset).
+ * 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
@@ -1588,15 +1869,15 @@
 * - decoding: Set by user (or 0).
 */
 int slice_count;
- /**
- * prediction method (needed for huffyuv)
- * - encoding: Set by user.
- * - decoding: unused
- */
+
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int prediction_method;
 #define FF_PRED_LEFT 0
 #define FF_PRED_PLANE 1
 #define FF_PRED_MEDIAN 2
+#endif
 
 /**
 * slice offsets in the frame in bytes
@@ -1638,22 +1919,23 @@
 * - 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_CHROMA 256
+#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
@@ -1669,12 +1951,11 @@
 */
 int last_predictor_count;
 
- /**
- * prepass for motion estimation
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int pre_me;
+#endif
 
 /**
 * motion estimation prepass comparison function
@@ -1697,26 +1978,6 @@
 */
 int me_subpel_quality;
 
-#if FF_API_AFD
- /**
- * DTG active format information (additional aspect ratio
- * information only used in DVB MPEG-2 transport streams)
- * 0 if not set.
- *
- * - encoding: unused
- * - decoding: Set by decoder.
- * @deprecated Deprecated in favor of AVSideData
- */
- attribute_deprecated int dtg_active_format;
-#define FF_DTG_AFD_SAME 8
-#define FF_DTG_AFD_4_3 9
-#define FF_DTG_AFD_16_9 10
-#define FF_DTG_AFD_14_9 11
-#define FF_DTG_AFD_4_3_SP_14_9 13
-#define FF_DTG_AFD_16_9_SP_14_9 14
-#define FF_DTG_AFD_SP_4_3 15
-#endif /* FF_API_AFD */
-
 /**
 * maximum motion estimation search range in subpel units
 * If 0 then no limit.
@@ -1727,40 +1988,15 @@
 int me_range;
 
 /**
- * intra quantizer bias
- * - encoding: Set by user.
- * - decoding: unused
- */
- int intra_quant_bias;
-#define FF_DEFAULT_QUANT_BIAS 999999
-
- /**
- * inter quantizer bias
- * - encoding: Set by user.
- * - decoding: unused
- */
- int inter_quant_bias;
-
- /**
 * 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 (MPEG2 field pics)
+#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)
 
-#if FF_API_XVMC
- /**
- * XVideo Motion Acceleration
- * - encoding: forbidden
- * - decoding: set by decoder
- * @deprecated XvMC doesn't need it anymore.
- */
- attribute_deprecated int xvmc_acceleration;
-#endif /* FF_API_XVMC */
-
 /**
 * macroblock decision mode
 * - encoding: Set by user.
@@ -1785,41 +2021,20 @@
 */
 uint16_t *inter_matrix;
 
- /**
- * scene change detection threshold
- * 0 is default, larger means fewer detected scene changes.
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int scenechange_threshold;
 
- /**
- * noise reduction strength
- * - encoding: Set by user.
- * - decoding: unused
- */
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int noise_reduction;
-
- /**
- * Motion estimation threshold below which no motion estimation is
- * performed, but instead the user specified motion vectors are used.
- *
- * - encoding: Set by user.
- * - decoding: unused
- */
- int me_threshold;
-
- /**
- * Macroblock threshold below which the user specified macroblock types will be used.
- * - encoding: Set by user.
- * - decoding: unused
- */
- int mb_threshold;
+#endif
 
 /**
 * precision of the intra DC coefficient - 8
 * - encoding: Set by user.
- * - decoding: unused
+ * - decoding: Set by libavcodec
 */
 int intra_dc_precision;
 
@@ -1838,47 +2053,38 @@
 int skip_bottom;
 
 /**
- * Border processing masking, raises the quantizer for mbs on the borders
- * of the picture.
- * - encoding: Set by user.
- * - decoding: unused
- */
- float border_masking;
-
- /**
- * minimum MB lagrange multipler
+ * minimum MB Lagrange multiplier
 * - encoding: Set by user.
 * - decoding: unused
 */
 int mb_lmin;
 
 /**
- * maximum MB lagrange multipler
+ * maximum MB Lagrange multiplier
 * - encoding: Set by user.
 * - decoding: unused
 */
 int mb_lmax;
 
+#if FF_API_PRIVATE_OPT
 /**
- *
- * - encoding: Set by user.
- * - decoding: unused
+ * @deprecated use encoder private options instead
 */
+ attribute_deprecated
 int me_penalty_compensation;
+#endif
 
 /**
- *
 * - encoding: Set by user.
 * - decoding: unused
 */
 int bidir_refine;
 
- /**
- *
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int brd_scale;
+#endif
 
 /**
 * minimum GOP size
@@ -1894,36 +2100,24 @@
 */
 int refs;
 
- /**
- * chroma qp offset from luma
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int chromaoffset;
-
-#if FF_API_UNUSED_MEMBERS
- /**
- * Multiplied by qscale for each frame and added to scene_change_score.
- * - encoding: Set by user.
- * - decoding: unused
- */
- attribute_deprecated int scenechange_factor;
 #endif
 
 /**
- *
 * Note: Value depends upon the compare function used for fullpel ME.
 * - encoding: Set by user.
 * - decoding: unused
 */
 int mv0_threshold;
 
- /**
- * Adjust sensitivity of b_frame_strategy 1.
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int b_sensitivity;
+#endif
 
 /**
 * Chromaticity coordinates of the source primaries.
@@ -1992,7 +2186,7 @@
 *
 * - encoding: set by libavcodec in avcodec_open2(). Each submitted frame
 * except the last must contain exactly frame_size samples per channel.
- * May be 0 when the codec has CODEC_CAP_VARIABLE_FRAME_SIZE set, then the
+ * 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
 */
@@ -2022,16 +2216,6 @@
 */
 int cutoff;
 
-#if FF_API_REQUEST_CHANNELS
- /**
- * Decoder should decode to this many channels if it can (0 for default)
- * - encoding: unused
- * - decoding: Set by user.
- * @deprecated Deprecated in favor of request_channel_layout.
- */
- attribute_deprecated int request_channels;
-#endif
-
 /**
 * Audio channel layout.
 * - encoding: set by user.
@@ -2061,102 +2245,6 @@
 */
 enum AVSampleFormat request_sample_fmt;
 
-#if FF_API_GET_BUFFER
- /**
- * Called at the beginning of each frame to get a buffer for it.
- *
- * The function will set AVFrame.data[], AVFrame.linesize[].
- * AVFrame.extended_data[] must also be set, but it should be the same as
- * AVFrame.data[] except for planar audio with more channels than can fit
- * in AVFrame.data[]. In that case, AVFrame.data[] shall still contain as
- * many data pointers as it can hold.
- *
- * if CODEC_CAP_DR1 is not set then get_buffer() must call
- * avcodec_default_get_buffer() instead of providing buffers allocated by
- * some other means.
- *
- * AVFrame.data[] should be 32- or 16-byte-aligned unless the CPU doesn't
- * need it. avcodec_default_get_buffer() aligns the output buffer properly,
- * but if get_buffer() is overridden then alignment considerations should
- * be taken into account.
- *
- * @see avcodec_default_get_buffer()
- *
- * Video:
- *
- * If pic.reference is set then the frame will be read later by libavcodec.
- * avcodec_align_dimensions2() should be used to find the required width and
- * height, as they normally need to be rounded up to the next multiple of 16.
- *
- * If frame multithreading is used and thread_safe_callbacks is set,
- * it may be called from a different thread, but not from more than one at
- * once. Does not need to be reentrant.
- *
- * @see release_buffer(), reget_buffer()
- * @see avcodec_align_dimensions2()
- *
- * Audio:
- *
- * Decoders request a buffer of a particular size by setting
- * AVFrame.nb_samples prior to calling get_buffer(). The decoder may,
- * however, utilize only part of the buffer by setting AVFrame.nb_samples
- * to a smaller value in the output frame.
- *
- * Decoders cannot use the buffer after returning from
- * avcodec_decode_audio4(), so they will not call release_buffer(), as it
- * is assumed to be released immediately upon return. In some rare cases,
- * a decoder may need to call get_buffer() more than once in a single
- * call to avcodec_decode_audio4(). In that case, when get_buffer() is
- * called again after it has already been called once, the previously
- * acquired buffer is assumed to be released at that time and may not be
- * reused by the decoder.
- *
- * As a convenience, av_samples_get_buffer_size() and
- * av_samples_fill_arrays() in libavutil may be used by custom get_buffer()
- * functions to find the required data size and to fill data pointers and
- * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
- * since all planes must be the same size.
- *
- * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
- *
- * - encoding: unused
- * - decoding: Set by libavcodec, user can override.
- *
- * @deprecated use get_buffer2()
- */
- attribute_deprecated
- int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
- /**
- * Called to release buffers which were allocated with get_buffer.
- * A released buffer can be reused in get_buffer().
- * pic.data[*] must be set to NULL.
- * May be called from a different thread if frame multithreading is used,
- * but not by more than one thread at once, so does not need to be reentrant.
- * - encoding: unused
- * - decoding: Set by libavcodec, user can override.
- *
- * @deprecated custom freeing callbacks should be set from get_buffer2()
- */
- attribute_deprecated
- void (*release_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
- /**
- * Called at the beginning of a frame to get cr buffer for it.
- * Buffer type (size, hints) must be the same. libavcodec won't check it.
- * libavcodec will pass previous buffer in pic, function should return
- * same buffer or new buffer with old frame "painted" into it.
- * If pic.data[0] == NULL must behave like get_buffer().
- * if CODEC_CAP_DR1 is not set then reget_buffer() must call
- * avcodec_default_reget_buffer() instead of providing buffers allocated by
- * some other means.
- * - encoding: unused
- * - decoding: Set by libavcodec, user can override.
- */
- attribute_deprecated
- int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
-#endif
-
 /**
 * This callback is called at the beginning of each frame to get data
 * buffer(s) for it. There may be one contiguous buffer for all the data or
@@ -2183,7 +2271,7 @@
 * to all data planes. data[] must hold as many pointers as it can.
 * extended_data must be allocated with av_malloc() and will be freed in
 * av_frame_unref().
- * * otherwise exended_data must point to data
+ * * 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
@@ -2194,7 +2282,7 @@
 * buffers than buf[] can hold. extended_buf will be freed in
 * av_frame_unref().
 *
- * If CODEC_CAP_DR1 is not set then get_buffer2() must call
+ * 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.
 *
@@ -2247,9 +2335,12 @@
 * Otherwise, the decoded frames must not be freed by the caller and are
 * only valid until the next decode call.
 *
+ * This is always automatically enabled if avcodec_receive_frame() is used.
+ *
 * - encoding: unused
 * - decoding: set by the caller before avcodec_open2().
 */
+ attribute_deprecated
 int refcounted_frames;
 
 /* - encoding parameters */
@@ -2278,17 +2369,6 @@
 int max_qdiff;
 
 /**
- * ratecontrol qmin qmax limiting method
- * 0-> clipping, 1-> use a nice continuous function to limit qscale within qmin/qmax.
- * - encoding: Set by user.
- * - decoding: unused
- */
- float rc_qsquish;
-
- float rc_qmod_amp;
- int rc_qmod_freq;
-
- /**
 * decoder bitstream buffer size
 * - encoding: Set by user.
 * - decoding: unused
@@ -2304,34 +2384,18 @@
 RcOverride *rc_override;
 
 /**
- * rate control equation
- * - encoding: Set by user
- * - decoding: unused
- */
- const char *rc_eq;
-
- /**
 * maximum bitrate
 * - encoding: Set by user.
- * - decoding: Set by libavcodec.
+ * - decoding: Set by user, may be overwritten by libavcodec.
 */
- int rc_max_rate;
+ int64_t rc_max_rate;
 
 /**
 * minimum bitrate
 * - encoding: Set by user.
 * - decoding: unused
 */
- int rc_min_rate;
-
- float rc_buffer_aggressivity;
-
- /**
- * initial complexity for pass1 ratecontrol
- * - encoding: Set by user.
- * - decoding: unused
- */
- float rc_initial_cplx;
+ int64_t rc_min_rate;
 
 /**
 * Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow.
@@ -2354,68 +2418,41 @@
 */
 int rc_initial_buffer_occupancy;
 
+#if FF_API_CODER_TYPE
 #define FF_CODER_TYPE_VLC 0
 #define FF_CODER_TYPE_AC 1
 #define FF_CODER_TYPE_RAW 2
 #define FF_CODER_TYPE_RLE 3
-#if FF_API_UNUSED_MEMBERS
-#define FF_CODER_TYPE_DEFLATE 4
-#endif /* FF_API_UNUSED_MEMBERS */
 /**
- * coder type
- * - encoding: Set by user.
- * - decoding: unused
+ * @deprecated use encoder private options instead
 */
+ attribute_deprecated
 int coder_type;
+#endif /* FF_API_CODER_TYPE */
 
- /**
- * context model
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int context_model;
+#endif
 
- /**
- * minimum Lagrange multiplier
- * - encoding: Set by user.
- * - decoding: unused
- */
- int lmin;
-
- /**
- * maximum Lagrange multiplier
- * - encoding: Set by user.
- * - decoding: unused
- */
- int lmax;
-
- /**
- * frame skip threshold
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int frame_skip_threshold;
 
- /**
- * frame skip factor
- * - encoding: Set by user.
- * - decoding: unused
- */
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int frame_skip_factor;
 
- /**
- * frame skip exponent
- * - encoding: Set by user.
- * - decoding: unused
- */
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int frame_skip_exp;
 
- /**
- * frame skip comparison function
- * - encoding: Set by user.
- * - decoding: unused
- */
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int frame_skip_cmp;
+#endif /* FF_API_PRIVATE_OPT */
 
 /**
 * trellis RD quantization
@@ -2424,56 +2461,68 @@
 */
 int trellis;
 
- /**
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int min_prediction_order;
 
- /**
- * - encoding: Set by user.
- * - decoding: unused
- */
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int max_prediction_order;
 
- /**
- * GOP timecode frame start number
- * - encoding: Set by user, in non drop frame format
- * - decoding: Set by libavcodec (timecode in the 25 bits format, -1 if unset)
- */
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int64_t timecode_frame_start;
+#endif
 
+#if FF_API_RTP_CALLBACK
+ /**
+ * @deprecated unused
+ */
 /* The RTP callback: This function is called */
 /* every time the encoder has a packet to send. */
 /* It depends on the encoder if the data starts */
 /* with a Start Code (it should). H.263 does. */
 /* mb_nb contains the number of macroblocks */
 /* encoded in the RTP payload. */
+ attribute_deprecated
 void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);
+#endif
 
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int rtp_payload_size; /* The size of the RTP payload: the coder will */
 /* do its best to deliver a chunk with size */
 /* below rtp_payload_size, the chunk will start */
 /* with a start code on some codecs like H.263. */
 /* This doesn't take account of any particular */
 /* headers inside the transmitted RTP payload. */
+#endif
 
+#if FF_API_STAT_BITS
 /* statistics, used for 2-pass encoding */
+ attribute_deprecated
 int mv_bits;
+ attribute_deprecated
 int header_bits;
+ attribute_deprecated
 int i_tex_bits;
+ attribute_deprecated
 int p_tex_bits;
+ attribute_deprecated
 int i_count;
+ attribute_deprecated
 int p_count;
+ attribute_deprecated
 int skip_count;
+ attribute_deprecated
 int misc_bits;
 
- /**
- * number of bits used for the previously encoded frame
- * - encoding: Set by libavcodec.
- * - decoding: unused
- */
+ /** @deprecated this field is unused */
+ attribute_deprecated
 int frame_bits;
+#endif
 
 /**
 * pass1 encoding statistics output buffer
@@ -2497,16 +2546,10 @@
 */
 int workaround_bugs;
 #define FF_BUG_AUTODETECT 1 ///< autodetection
-#if FF_API_OLD_MSMPEG4
-#define FF_BUG_OLD_MSMPEG4 2
-#endif
 #define FF_BUG_XVID_ILACE 4
 #define FF_BUG_UMP4 8
 #define FF_BUG_NO_PADDING 16
 #define FF_BUG_AMV 32
-#if FF_API_AC_VLC
-#define FF_BUG_AC_VLC 0 ///< Will be removed, libavcodec can now handle these non-compliant files by default.
-#endif
 #define FF_BUG_QPEL_CHROMA 64
 #define FF_BUG_STD_QPEL 128
 #define FF_BUG_QPEL_CHROMA2 256
@@ -2516,9 +2559,10 @@
 #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 (MPEG4, ...).
+ * 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
@@ -2566,31 +2610,28 @@
 #define FF_DEBUG_DCT_COEFF 0x00000040
 #define FF_DEBUG_SKIP 0x00000080
 #define FF_DEBUG_STARTCODE 0x00000100
-#if FF_API_UNUSED_MEMBERS
-#define FF_DEBUG_PTS 0x00000200
-#endif /* FF_API_UNUSED_MEMBERS */
 #define FF_DEBUG_ER 0x00000400
 #define FF_DEBUG_MMCO 0x00000800
 #define FF_DEBUG_BUGS 0x00001000
 #if FF_API_DEBUG_MV
-#define FF_DEBUG_VIS_QP 0x00002000 ///< only access through AVOptions from outside libavcodec
-#define FF_DEBUG_VIS_MB_TYPE 0x00004000 ///< only access through AVOptions from outside libavcodec
+#define FF_DEBUG_VIS_QP 0x00002000
+#define FF_DEBUG_VIS_MB_TYPE 0x00004000
 #endif
 #define FF_DEBUG_BUFFERS 0x00008000
 #define FF_DEBUG_THREADS 0x00010000
+#define FF_DEBUG_GREEN_MD 0x00800000
 #define FF_DEBUG_NOMC 0x01000000
 
 #if FF_API_DEBUG_MV
 /**
 * debug
- * Code outside libavcodec should access this field using AVOptions
 * - encoding: Set by user.
 * - decoding: Set by user.
 */
 int debug_mv;
-#define FF_DEBUG_VIS_MV_P_FOR 0x00000001 //visualize forward predicted MVs of P frames
-#define FF_DEBUG_VIS_MV_B_FOR 0x00000002 //visualize forward predicted MVs of B frames
-#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
+#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
 
 /**
@@ -2618,7 +2659,7 @@
 
 
 /**
- * opaque 64bit number (generally a PTS) that will be reordered and
+ * opaque 64-bit number (generally a PTS) that will be reordered and
 * output in AVFrame.reordered_opaque
 * - encoding: unused
 * - decoding: Set by user.
@@ -2630,7 +2671,7 @@
 * - encoding: unused.
 * - decoding: Set by libavcodec
 */
- struct AVHWAccel *hwaccel;
+ const struct AVHWAccel *hwaccel;
 
 /**
 * Hardware accelerator context.
@@ -2646,7 +2687,7 @@
 
 /**
 * error
- * - encoding: Set by libavcodec if flags&CODEC_FLAG_PSNR.
+ * - encoding: Set by libavcodec if flags & AV_CODEC_FLAG_PSNR.
 * - decoding: unused
 */
 uint64_t error[AV_NUM_DATA_POINTERS];
@@ -2659,9 +2700,7 @@
 int dct_algo;
 #define FF_DCT_AUTO 0
 #define FF_DCT_FASTINT 1
-#if FF_API_UNUSED_MEMBERS
 #define FF_DCT_INT 2
-#endif /* FF_API_UNUSED_MEMBERS */
 #define FF_DCT_MMX 3
 #define FF_DCT_ALTIVEC 5
 #define FF_DCT_FAAN 6
@@ -2678,27 +2717,13 @@
 #define FF_IDCT_SIMPLEMMX 3
 #define FF_IDCT_ARM 7
 #define FF_IDCT_ALTIVEC 8
-#if FF_API_ARCH_SH4
-#define FF_IDCT_SH4 9
-#endif
 #define FF_IDCT_SIMPLEARM 10
-#if FF_API_UNUSED_MEMBERS
-#define FF_IDCT_IPP 13
-#endif /* FF_API_UNUSED_MEMBERS */
 #define FF_IDCT_XVID 14
-#if FF_API_IDCT_XVIDMMX
-#define FF_IDCT_XVIDMMX 14
-#endif /* FF_API_IDCT_XVIDMMX */
 #define FF_IDCT_SIMPLEARMV5TE 16
 #define FF_IDCT_SIMPLEARMV6 17
-#if FF_API_ARCH_SPARC
-#define FF_IDCT_SIMPLEVIS 18
-#endif
 #define FF_IDCT_FAAN 20
 #define FF_IDCT_SIMPLENEON 22
-#if FF_API_ARCH_ALPHA
-#define FF_IDCT_SIMPLEALPHA 23
-#endif
+#define FF_IDCT_NONE 24 /* Used by XvMC to extract IDCT coefficients with FF_IDCT_PERM_NONE */
 #define FF_IDCT_SIMPLEAUTO 128
 
 /**
@@ -2720,18 +2745,20 @@
 * low resolution decoding, 1-> 1/2 size, 2->1/4 size
 * - encoding: unused
 * - decoding: Set by user.
- * Code outside libavcodec should access this field using:
- * av_codec_{get,set}_lowres(avctx)
 */
 int lowres;
 #endif
 
+#if FF_API_CODED_FRAME
 /**
 * the picture in the bitstream
 * - encoding: Set by libavcodec.
 * - decoding: unused
+ *
+ * @deprecated use the quality factor packet side data instead
 */
- AVFrame *coded_frame;
+ attribute_deprecated AVFrame *coded_frame;
+#endif
 
 /**
 * thread count
@@ -2801,14 +2828,6 @@
 */
 int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
 
-#if FF_API_THREAD_OPAQUE
- /**
- * @deprecated this field should not be used from outside of lavc
- */
- attribute_deprecated
- void *thread_opaque;
-#endif
-
 /**
 * noise vs. sse weight for the nsse comparison function
 * - encoding: Set by user.
@@ -2836,11 +2855,19 @@
 #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
@@ -2859,8 +2886,10 @@
 #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)
@@ -2888,18 +2917,34 @@
 #define FF_PROFILE_MPEG4_SIMPLE_STUDIO 14
 #define FF_PROFILE_MPEG4_ADVANCED_SIMPLE 15
 
-#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0 0
-#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1 1
-#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION 2
+#define FF_PROFILE_JPEG2000_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_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
+
 /**
 * level
 * - encoding: Set by user.
@@ -2940,50 +2985,69 @@
 uint8_t *subtitle_header;
 int subtitle_header_size;
 
-#if FF_API_ERROR_RATE
- /**
- * @deprecated use the 'error_rate' private AVOption of the mpegvideo
- * encoders
- */
- attribute_deprecated
- int error_rate;
-#endif
-
-#if FF_API_CODEC_PKT
- /**
- * @deprecated this field is not supposed to be accessed from outside lavc
- */
- attribute_deprecated
- AVPacket *pkt;
-#endif
-
+#if FF_API_VBV_DELAY
 /**
 * VBV delay coded in the last frame (in periods of a 27 MHz clock).
 * Used for compliant TS muxing.
 * - encoding: Set by libavcodec.
 * - decoding: unused.
+ * @deprecated this value is now exported as a part of
+ * AV_PKT_DATA_CPB_PROPERTIES packet side data
 */
+ attribute_deprecated
 uint64_t vbv_delay;
+#endif
 
+#if FF_API_SIDEDATA_ONLY_PKT
 /**
- * Encoding only. Allow encoders to output packets that do not contain any
- * encoded data, only side data.
+ * Encoding only and set by default. Allow encoders to output packets
+ * that do not contain any encoded data, only side data.
 *
 * Some encoders need to output such packets, e.g. to update some stream
 * parameters at the end of encoding.
 *
- * All callers are strongly recommended to set this option to 1 and update
- * their code to deal with such packets, since this behaviour may become
- * always enabled in the future (then this option will be deprecated and
- * later removed). To avoid ABI issues when this happens, the callers should
- * use AVOptions to set this field.
+ * @deprecated this field disables the default behaviour and
+ * it is kept only for compatibility.
 */
+ attribute_deprecated
 int side_data_only_packets;
+#endif
+
+ /**
+ * 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.
- * Code outside libavcodec should access this field using:
- * av_codec_{get,set}_pkt_timebase(avctx)
 * - encoding unused.
 * - decoding set by user.
 */
@@ -2991,8 +3055,6 @@
 
 /**
 * AVCodecDescriptor
- * Code outside libavcodec should access this field using:
- * av_codec_{get,set}_codec_descriptor(avctx)
 * - encoding: unused.
 * - decoding: set by libavcodec.
 */
@@ -3003,8 +3065,6 @@
 * low resolution decoding, 1-> 1/2 size, 2->1/4 size
 * - encoding: unused
 * - decoding: Set by user.
- * Code outside libavcodec should access this field using:
- * av_codec_{get,set}_lowres(avctx)
 */
 int lowres;
 #endif
@@ -3036,6 +3096,7 @@
 #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.
@@ -3045,7 +3106,6 @@
 * However for formats that do not use pre-multiplied alpha
 * there might be serious artefacts (though e.g. libswscale currently
 * assumes pre-multiplied alpha anyway).
- * Code outside libavcodec should access this field using AVOptions
 *
 * - decoding: set by user
 * - encoding: unused
@@ -3062,7 +3122,6 @@
 #if !FF_API_DEBUG_MV
 /**
 * debug motion vectors
- * Code outside libavcodec should access this field using AVOptions
 * - encoding: Set by user.
 * - decoding: Set by user.
 */
@@ -3074,27 +3133,207 @@
 
 /**
 * custom intra quantization matrix
- * Code outside libavcodec should access this field using av_codec_g/set_chroma_intra_matrix()
 * - encoding: Set by user, can be NULL.
 * - decoding: unused.
 */
 uint16_t *chroma_intra_matrix;
+
+ /**
+ * 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
+
+ /**
+ * 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;
+
+ /**
+ * Control the form of AVSubtitle.rects[N]->ass
+ * - decoding: set by user
+ * - encoding: unused
+ */
+ int sub_text_format;
+#define FF_SUB_TEXT_FMT_ASS 0
+#if FF_API_ASS_TIMING
+#define FF_SUB_TEXT_FMT_ASS_WITH_TIMINGS 1
+#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;
 } AVCodecContext;
 
+#if FF_API_CODEC_GET_SET
+/**
+ * Accessors for some AVCodecContext fields. These used to be provided for ABI
+ * compatibility, and do not need to be used anymore.
+ */
+attribute_deprecated
 AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx);
+attribute_deprecated
 void av_codec_set_pkt_timebase (AVCodecContext *avctx, AVRational val);
 
+attribute_deprecated
 const AVCodecDescriptor *av_codec_get_codec_descriptor(const AVCodecContext *avctx);
+attribute_deprecated
 void av_codec_set_codec_descriptor(AVCodecContext *avctx, const AVCodecDescriptor *desc);
 
+attribute_deprecated
+unsigned av_codec_get_codec_properties(const AVCodecContext *avctx);
+
+#if FF_API_LOWRES
+attribute_deprecated
 int av_codec_get_lowres(const AVCodecContext *avctx);
+attribute_deprecated
 void av_codec_set_lowres(AVCodecContext *avctx, int val);
+#endif
 
+attribute_deprecated
 int av_codec_get_seek_preroll(const AVCodecContext *avctx);
+attribute_deprecated
 void av_codec_set_seek_preroll(AVCodecContext *avctx, int val);
 
+attribute_deprecated
 uint16_t *av_codec_get_chroma_intra_matrix(const AVCodecContext *avctx);
+attribute_deprecated
 void av_codec_set_chroma_intra_matrix(AVCodecContext *avctx, uint16_t *val);
+#endif
 
 /**
 * AVProfile.
@@ -3104,6 +3343,61 @@
 const char *name; ///< short name for the profile
 } AVProfile;
 
+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.
+ */
+ 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 {
+ /**
+ * A hardware pixel format which the codec can use.
+ */
+ 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;
+
 typedef struct AVCodecDefault AVCodecDefault;
 
 struct AVSubtitle;
@@ -3128,7 +3422,7 @@
 enum AVCodecID id;
 /**
 * Codec capabilities.
- * see CODEC_CAP_*
+ * see AV_CODEC_CAP_*
 */
 int capabilities;
 const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
@@ -3136,12 +3430,22 @@
 const int *supported_samplerates; ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
 const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
 const uint64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
-#if FF_API_LOWRES
- uint8_t max_lowres; ///< maximum value for lowres supported by the decoder, no direct access, use av_codec_get_max_lowres()
-#endif
+ uint8_t max_lowres; ///< maximum value for lowres supported by the decoder
 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
@@ -3178,6 +3482,9 @@
 
 /**
 * Initialize codec static data, called from avcodec_register().
+ *
+ * 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);
 
@@ -3199,18 +3506,72 @@
 int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt);
 int (*close)(AVCodecContext *);
 /**
+ * Encode API with decoupled packet/frame dataflow. The API is the
+ * same as the avcodec_ prefixed APIs (avcodec_send_frame() etc.), except
+ * that:
+ * - never called if the codec is closed or the wrong type,
+ * - if AV_CODEC_CAP_DELAY is not set, drain frames are never sent,
+ * - only one drain frame is ever passed down,
+ */
+ int (*send_frame)(AVCodecContext *avctx, const AVFrame *frame);
+ int (*receive_packet)(AVCodecContext *avctx, 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)(AVCodecContext *avctx, AVFrame *frame);
+ /**
 * Flush buffers.
 * Will be called when seeking
 */
 void (*flush)(AVCodecContext *);
+ /**
+ * Internal codec capabilities.
+ * See FF_CODEC_CAP_* in internal.h
+ */
+ int caps_internal;
+
+ /**
+ * 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 **hw_configs;
 } AVCodec;
 
+#if FF_API_CODEC_GET_SET
+attribute_deprecated
 int av_codec_get_max_lowres(const AVCodec *codec);
+#endif
 
 struct MpegEncContext;
 
 /**
- * AVHWAccel.
+ * 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);
+
+/**
+ * @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 {
 /**
@@ -3243,7 +3604,7 @@
 
 /**
 * Hardware accelerated codec capabilities.
- * see FF_HWACCEL_CODEC_CAP_*
+ * see AV_HWACCEL_CODEC_CAP_*
 */
 int capabilities;
 
@@ -3254,7 +3615,6 @@
 * New public fields should be added right above.
 *****************************************************************
 */
- struct AVHWAccel *next;
 
 /**
 * Allocate a custom buffer
@@ -3278,6 +3638,20 @@
 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
@@ -3314,7 +3688,7 @@
 /**
 * Called for every Macroblock in a slice.
 *
- * XvMC uses it to replace the ff_mpv_decode_mb().
+ * 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.
 *
@@ -3344,9 +3718,65 @@
 * 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)
+
+/**
+ * @}
+ */
+
+#if FF_API_AVPICTURE
+/**
 * @defgroup lavc_picture AVPicture
 *
 * Functions for working with AVPicture
@@ -3358,15 +3788,19 @@
 *
 * Up to four components can be stored into it, the last component is
 * alpha.
+ * @deprecated use AVFrame or imgutils functions instead
 */
 typedef struct AVPicture {
+ attribute_deprecated
 uint8_t *data[AV_NUM_DATA_POINTERS]; ///< pointers to the image data planes
+ attribute_deprecated
 int linesize[AV_NUM_DATA_POINTERS]; ///< number of bytes per line
 } AVPicture;
 
 /**
 * @}
 */
+#endif
 
 enum AVSubtitleType {
 SUBTITLE_NONE,
@@ -3395,11 +3829,20 @@
 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
 
+#if FF_API_AVPICTURE
 /**
- * data+linesize for the bitmap of this subtitle.
- * can be set for text/ass as well once they where rendered
+ * @deprecated unused
 */
+ attribute_deprecated
 AVPicture pict;
+#endif
+ /**
+ * data+linesize for the bitmap of this subtitle.
+ * Can be set for text/ass as well once they are rendered.
+ */
+ uint8_t *data[4];
+ int linesize[4];
+
 enum AVSubtitleType type;
 
 char *text; ///< 0 terminated plain UTF-8 text
@@ -3424,11 +3867,183 @@
 } AVSubtitle;
 
 /**
+ * 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;
+
+/**
+ * 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);
+
+#if FF_API_NEXT
+/**
 * If c is NULL, returns the first registered codec,
 * if c is non-NULL, returns the next registered codec after c,
 * or NULL if c is the last one.
 */
+attribute_deprecated
 AVCodec *av_codec_next(const AVCodec *c);
+#endif
 
 /**
 * Return the LIBAVCODEC_VERSION_INT constant.
@@ -3445,6 +4060,7 @@
 */
 const char *avcodec_license(void);
 
+#if FF_API_NEXT
 /**
 * Register the codec codec and initialize libavcodec.
 *
@@ -3453,6 +4069,7 @@
 *
 * @see avcodec_register_all()
 */
+attribute_deprecated
 void avcodec_register(AVCodec *codec);
 
 /**
@@ -3465,7 +4082,9 @@
 * @see av_register_codec_parser
 * @see av_register_bitstream_filter
 */
+attribute_deprecated
 void avcodec_register_all(void);
+#endif
 
 /**
 * Allocate an AVCodecContext and set its fields to default values. The
@@ -3479,7 +4098,6 @@
 * important mainly for encoders, e.g. libx264).
 *
 * @return An AVCodecContext filled with default values or NULL on failure.
- * @see avcodec_get_context_defaults
 */
 AVCodecContext *avcodec_alloc_context3(const AVCodec *codec);
 
@@ -3489,16 +4107,14 @@
 */
 void avcodec_free_context(AVCodecContext **avctx);
 
+#if FF_API_GET_CONTEXT_DEFAULTS
 /**
- * Set the fields of the given AVCodecContext to default values corresponding
- * to the given codec (defaults may be codec-dependent).
- *
- * Do not call this function if a non-NULL codec has been passed
- * to avcodec_alloc_context3() that allocated this AVCodecContext.
- * If codec is non-NULL, it is illegal to call avcodec_open2() with a
- * different codec on this AVCodecContext.
+ * @deprecated This function should not be used, as closing and opening a codec
+ * context multiple time is not supported. A new codec context should be
+ * allocated for each new use.
 */
 int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec);
+#endif
 
 /**
 * Get the AVClass for AVCodecContext. It can be used in combination with
@@ -3508,6 +4124,7 @@
 */
 const AVClass *avcodec_get_class(void);
 
+#if FF_API_COPY_CONTEXT
 /**
 * Get the AVClass for AVFrame. It can be used in combination with
 * AV_OPT_SEARCH_FAKE_OBJ for examining options.
@@ -3534,41 +4151,58 @@
 * avcodec_alloc_context3(NULL), but otherwise uninitialized
 * @param src source codec context
 * @return AVERROR() on error (e.g. memory allocation error), 0 on success
+ *
+ * @deprecated The semantics of this function are ill-defined and it should not
+ * be used. If you need to transfer the stream parameters from one codec context
+ * to another, use an intermediate AVCodecParameters instance and the
+ * avcodec_parameters_from_context() / avcodec_parameters_to_context()
+ * functions.
 */
+attribute_deprecated
 int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
+#endif
 
-#if FF_API_AVFRAME_LAVC
 /**
- * @deprecated use av_frame_alloc()
+ * Allocate a new AVCodecParameters and set its fields to default values
+ * (unknown/invalid/0). The returned struct must be freed with
+ * avcodec_parameters_free().
 */
-attribute_deprecated
-AVFrame *avcodec_alloc_frame(void);
+AVCodecParameters *avcodec_parameters_alloc(void);
 
 /**
- * Set the fields of the given AVFrame to default values.
- *
- * @param frame The AVFrame of which the fields should be set to default values.
- *
- * @deprecated use av_frame_unref()
+ * Free an AVCodecParameters instance and everything associated with it and
+ * write NULL to the supplied pointer.
 */
-attribute_deprecated
-void avcodec_get_frame_defaults(AVFrame *frame);
+void avcodec_parameters_free(AVCodecParameters **par);
 
 /**
- * Free the frame and any dynamically allocated objects in it,
- * e.g. extended_data.
+ * 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.
 *
- * @param frame frame to be freed. The pointer will be set to NULL.
+ * @return >= 0 on success, a negative AVERROR code on failure.
+ */
+int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src);
+
+/**
+ * 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.
 *
- * @warning this function does NOT free the data buffers themselves
- * (it does not know how, since they might have been allocated with
- * a custom get_buffer()).
+ * @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.
 *
- * @deprecated use av_frame_free()
+ * @return >= 0 on success, a negative AVERROR code on failure.
 */
-attribute_deprecated
-void avcodec_free_frame(AVFrame **frame);
-#endif
+int avcodec_parameters_to_context(AVCodecContext *codec,
+ const AVCodecParameters *par);
 
 /**
 * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
@@ -3580,6 +4214,9 @@
 *
 * @warning This function is not thread safe!
 *
+ * @note Always call this function before using decoding routines (such as
+ * @ref avcodec_receive_frame()).
+ *
 * @code
 * avcodec_register_all();
 * av_dict_set(&opts, "b", "2.5M", 0);
@@ -3596,9 +4233,8 @@
 * @param avctx The context to initialize.
 * @param codec The codec to open this context for. If a non-NULL codec has been
 * previously passed to avcodec_alloc_context3() or
- * avcodec_get_context_defaults3() for this context, then this
- * parameter MUST be either NULL or equal to the previously passed
- * codec.
+ * 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.
 *
@@ -3613,9 +4249,13 @@
 * (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() /
- * avcodec_get_context_defaults3() with a non-NULL codec. Subsequent calls will
- * do nothing.
+ * 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);
 
@@ -3635,14 +4275,39 @@
 * @{
 */
 
-#if FF_API_DESTRUCT_PACKET
 /**
- * Default packet destructor.
- * @deprecated use the AVBuffer API instead
+ * 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
 */
-attribute_deprecated
-void av_destruct_packet(AVPacket *pkt);
-#endif
+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);
 
 /**
 * Initialize optional fields of a packet with default values.
@@ -3689,39 +4354,51 @@
 * function returns successfully, the data is owned by the underlying AVBuffer.
 * The caller may not access the data through other means.
 * @param size size of data in bytes, without the padding. I.e. the full buffer
- * size is assumed to be size + FF_INPUT_BUFFER_PADDING_SIZE.
+ * 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);
 
+#if FF_API_AVPACKET_OLD_API
 /**
 * @warning This is a hack - the packet memory allocation stuff is broken. The
 * packet is allocated if it was not really allocated.
+ *
+ * @deprecated Use av_packet_ref or av_packet_make_refcounted
 */
+attribute_deprecated
 int av_dup_packet(AVPacket *pkt);
-
 /**
 * Copy packet, including contents
 *
 * @return 0 on success, negative AVERROR on fail
+ *
+ * @deprecated Use av_packet_ref
 */
+attribute_deprecated
 int av_copy_packet(AVPacket *dst, const AVPacket *src);
 
 /**
 * Copy packet side data
 *
 * @return 0 on success, negative AVERROR on fail
+ *
+ * @deprecated Use av_packet_copy_props
 */
+attribute_deprecated
 int av_copy_packet_side_data(AVPacket *dst, const AVPacket *src);
 
 /**
 * Free a packet.
 *
+ * @deprecated Use av_packet_unref
+ *
 * @param pkt packet to free
 */
+attribute_deprecated
 void av_free_packet(AVPacket *pkt);
-
+#endif
 /**
 * Allocate new information of a packet.
 *
@@ -3734,6 +4411,22 @@
 int 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
@@ -3752,12 +4445,18 @@
 * @param size pointer for side information size to store (optional)
 * @return pointer to data if present or NULL otherwise
 */
-uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+uint8_t* av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type,
 int *size);
 
+#if FF_API_MERGE_SD_API
+attribute_deprecated
 int av_packet_merge_side_data(AVPacket *pkt);
 
+attribute_deprecated
 int av_packet_split_side_data(AVPacket *pkt);
+#endif
+
+const char *av_packet_side_data_name(enum AVPacketSideDataType type);
 
 /**
 * Pack a dictionary for use in side_data.
@@ -3834,11 +4533,37 @@
 * @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.
@@ -3876,40 +4601,19 @@
 */
 AVCodec *avcodec_find_decoder_by_name(const char *name);
 
-#if FF_API_GET_BUFFER
-attribute_deprecated int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
-attribute_deprecated void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
-attribute_deprecated int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
-#endif
-
 /**
 * The default callback for AVCodecContext.get_buffer2(). It is made public so
 * it can be called by custom get_buffer2() implementations for decoders without
- * CODEC_CAP_DR1 set.
+ * AV_CODEC_CAP_DR1 set.
 */
 int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *frame, int flags);
 
-#if FF_API_EMU_EDGE
-/**
- * Return the amount of padding in pixels which the get_buffer callback must
- * provide around the edge of the image for codecs which do not have the
- * CODEC_FLAG_EMU_EDGE flag.
- *
- * @return Required padding in pixels.
- *
- * @deprecated CODEC_FLAG_EMU_EDGE is deprecated, so this function is no longer
- * needed
- */
-attribute_deprecated
-unsigned avcodec_get_edge_width(void);
-#endif
-
 /**
 * Modify width and height values so that they will result in a memory
 * buffer that is acceptable for the codec if you do not use any horizontal
 * padding.
 *
- * May only be used if a codec with CODEC_CAP_DR1 has been opened.
+ * 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);
 
@@ -3918,7 +4622,7 @@
 * buffer that is acceptable for the codec if you also ensure that all
 * line sizes are a multiple of the respective linesize_align[i].
 *
- * May only be used if a codec with CODEC_CAP_DR1 has been opened.
+ * 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_align[AV_NUM_DATA_POINTERS]);
@@ -3945,66 +4649,6 @@
 */
 enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos);
 
-#if FF_API_OLD_DECODE_AUDIO
-/**
- * Wrapper function which calls avcodec_decode_audio4.
- *
- * @deprecated Use avcodec_decode_audio4 instead.
- *
- * Decode the audio frame of size avpkt->size from avpkt->data into samples.
- * Some decoders may support multiple frames in a single AVPacket, such
- * decoders would then just decode the first frame. In this case,
- * avcodec_decode_audio3 has to be called again with an AVPacket that contains
- * the remaining data in order to decode the second frame etc.
- * If no frame
- * could be outputted, frame_size_ptr is zero. Otherwise, it is the
- * decompressed frame size in bytes.
- *
- * @warning You must set frame_size_ptr to the allocated size of the
- * output buffer before calling avcodec_decode_audio3().
- *
- * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
- * the actual read bytes because some optimized bitstream readers read 32 or 64
- * bits at once and could read over the end.
- *
- * @warning The end of the input buffer avpkt->data should be set to 0 to ensure that
- * no overreading happens for damaged MPEG streams.
- *
- * @warning You must not provide a custom get_buffer() when using
- * avcodec_decode_audio3(). Doing so will override it with
- * avcodec_default_get_buffer. Use avcodec_decode_audio4() instead,
- * which does allow the application to provide a custom get_buffer().
- *
- * @note You might have to align the input buffer avpkt->data and output buffer
- * samples. The alignment requirements depend on the CPU: On some CPUs it isn't
- * necessary at all, on others it won't work at all if not aligned and on others
- * it will work but it will have an impact on performance.
- *
- * In practice, avpkt->data should have 4 byte alignment at minimum and
- * samples should be 16 byte aligned unless the CPU doesn't need it
- * (AltiVec and SSE do).
- *
- * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
- * between input and output, these need to be fed with avpkt->data=NULL,
- * avpkt->size=0 at the end to return the remaining frames.
- *
- * @param avctx the codec context
- * @param[out] samples the output buffer, sample type in avctx->sample_fmt
- * If the sample format is planar, each channel plane will
- * be the same size, with no padding between channels.
- * @param[in,out] frame_size_ptr the output buffer size in bytes
- * @param[in] avpkt The input AVPacket containing the input buffer.
- * You can create such packet with av_init_packet() and by then setting
- * data and size, some decoders might in addition need other fields.
- * All decoders are designed to use the least fields possible though.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame data was decompressed (used) from the input AVPacket.
- */
-attribute_deprecated int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
- int *frame_size_ptr,
- AVPacket *avpkt);
-#endif
-
 /**
 * Decode the audio frame of size avpkt->size from avpkt->data into frame.
 *
@@ -4016,18 +4660,21 @@
 * needs to be fed to the decoder with remaining data until it is completely
 * consumed or an error occurs.
 *
- * Some decoders (those marked with CODEC_CAP_DELAY) have a delay between input
+ * 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 samples. It is safe to flush even those decoders that are not
- * marked with CODEC_CAP_DELAY, then no samples will be returned.
+ * marked with AV_CODEC_CAP_DELAY, then no samples will be returned.
 *
- * @warning The input buffer, avpkt->data must be FF_INPUT_BUFFER_PADDING_SIZE
+ * @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 the codec context
 * @param[out] frame The AVFrame in which to store decoded audio samples.
 * The decoder will allocate a buffer for the decoded frame by
@@ -4044,7 +4691,7 @@
 * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is
 * non-zero. Note that this field being set to zero
 * does not mean that an error has occurred. For
- * decoders with CODEC_CAP_DELAY set, no given decode
+ * decoders with AV_CODEC_CAP_DELAY set, no given decode
 * call is guaranteed to produce a frame.
 * @param[in] avpkt The input AVPacket containing the input buffer.
 * At least avpkt->data and avpkt->size should be set. Some
@@ -4052,7 +4699,10 @@
 * @return A negative error code is returned if an error occurred during
 * decoding, otherwise the number of bytes consumed from the input
 * AVPacket is returned.
+ *
+* @deprecated Use avcodec_send_packet() and avcodec_receive_frame().
 */
+attribute_deprecated
 int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
 int *got_frame_ptr, const AVPacket *avpkt);
 
@@ -4061,17 +4711,20 @@
 * Some decoders may support multiple frames in a single AVPacket, such
 * decoders would then just decode the first frame.
 *
- * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
+ * @warning The input buffer 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.
 *
 * @warning The end of the input buffer buf should be set to 0 to ensure that
 * no overreading happens for damaged MPEG streams.
 *
- * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
+ * @note Codecs which have the AV_CODEC_CAP_DELAY capability set have a delay
 * between input and output, these need to be fed with avpkt->data=NULL,
 * avpkt->size=0 at the end to return the remaining frames.
 *
+ * @note The AVCodecContext MUST have been opened with @ref avcodec_open2()
+ * before packets may be fed to the decoder.
+ *
 * @param avctx the codec context
 * @param[out] picture The AVFrame in which the decoded video frame will be stored.
 * Use av_frame_alloc() to get an AVFrame. The codec will
@@ -4095,7 +4748,10 @@
 * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
 * @return On error a negative value is returned, otherwise the number of bytes
 * used or zero if no frame could be decompressed.
+ *
+ * @deprecated Use avcodec_send_packet() and avcodec_receive_frame().
 */
+attribute_deprecated
 int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
 int *got_picture_ptr,
 const AVPacket *avpkt);
@@ -4105,18 +4761,21 @@
 * Return a negative value on error, otherwise return the number of bytes used.
 * If no subtitle could be decompressed, got_sub_ptr is zero.
 * Otherwise, the subtitle is stored in *sub.
- * Note that CODEC_CAP_DR1 is not available for subtitle codecs. This is for
+ * Note that AV_CODEC_CAP_DR1 is not available for subtitle codecs. This is for
 * simplicity, because the performance difference is expect to be negligible
 * and reusing a get_buffer written for video codecs would probably perform badly
 * due to a potentially very different allocation pattern.
 *
- * Some decoders (those marked with CODEC_CAP_DELAY) have a delay between input
+ * 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 CODEC_CAP_DELAY, then no subtitles will be returned.
+ * 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
 * @param[out] sub The Preallocated AVSubtitle in which the decoded subtitle will be stored,
@@ -4129,6 +4788,236 @@
 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.
+ *
+ * @warning Do not mix this API with the legacy API (like avcodec_decode_video2())
+ * on the same AVCodecContext. It will return unexpected results now
+ * or in future libavcodec versions.
+ *
+ * @note The AVCodecContext MUST have been opened with @ref avcodec_open2()
+ * before packets may be fed to the decoder.
+ *
+ * @param avctx codec context
+ * @param[in] 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
+ * 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
+ * @param[in] 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, refcounted_frames not set, it is a
+ * decoder, or requires flush
+ * AVERROR(ENOMEM): failed to add packet to internal queue, or similar
+ * other errors: legitimate decoding 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_frame_unref(frame) 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 an encoder
+ * other errors: legitimate decoding 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
 * @{
 */
@@ -4191,24 +5080,13 @@
 */
 int key_frame;
 
+#if FF_API_CONVERGENCE_DURATION
 /**
- * Time difference in stream time base units from the pts of this
- * packet to the point at which the output from the decoder has converged
- * independent from the availability of previous frames. That is, the
- * frames are virtually identical no matter if decoding started from
- * the very first frame or from this keyframe.
- * Is AV_NOPTS_VALUE if unknown.
- * This field is not the display duration of the current frame.
- * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
- * set.
- *
- * The purpose of this field is to allow seeking in streams that have no
- * keyframes in the conventional sense. It corresponds to the
- * recovery point SEI in H.264 and match_time_delta in NUT. It is also
- * essential for some types of subtitle streams to ensure that all
- * subtitles are correctly displayed after seeking.
+ * @deprecated unused
 */
+ attribute_deprecated
 int64_t convergence_duration;
+#endif
 
 // Timestamp generation support:
 /**
@@ -4294,12 +5172,36 @@
 * 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_ids[5]; /* 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,
@@ -4309,8 +5211,21 @@
 struct AVCodecParser *next;
 } 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);
+
+attribute_deprecated
 AVCodecParser *av_parser_next(const AVCodecParser *c);
 
+attribute_deprecated
 void av_register_codec_parser(AVCodecParser *parser);
 AVCodecParserContext *av_parser_init(int codec_id);
 
@@ -4322,7 +5237,10 @@
 * @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 input length, to signal EOF, this should be 0 (so that the last frame can be output).
+ * @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.
@@ -4385,36 +5303,6 @@
 */
 AVCodec *avcodec_find_encoder_by_name(const char *name);
 
-#if FF_API_OLD_ENCODE_AUDIO
-/**
- * Encode an audio frame from samples into buf.
- *
- * @deprecated Use avcodec_encode_audio2 instead.
- *
- * @note The output buffer should be at least FF_MIN_BUFFER_SIZE bytes large.
- * However, for codecs with avctx->frame_size equal to 0 (e.g. PCM) the user
- * will know how much space is needed because it depends on the value passed
- * in buf_size as described below. In that case a lower value can be used.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer
- * @param[in] buf_size the output buffer size
- * @param[in] samples the input buffer containing the samples
- * The number of samples read from this buffer is frame_size*channels,
- * both of which are defined in avctx.
- * For codecs which have avctx->frame_size equal to 0 (e.g. PCM) the number of
- * samples read from samples is equal to:
- * buf_size * 8 / (avctx->channels * av_get_bits_per_sample(avctx->codec_id))
- * This also implies that av_get_bits_per_sample() must not return 0 for these
- * codecs.
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used to encode the data read from the input buffer.
- */
-int attribute_deprecated avcodec_encode_audio(AVCodecContext *avctx,
- uint8_t *buf, int buf_size,
- const short *samples);
-#endif
-
 /**
 * Encode a frame of audio.
 *
@@ -4436,12 +5324,11 @@
 * of the output packet.
 *
 * If this function fails or produces no output, avpkt will be
- * freed using av_free_packet() (i.e. avpkt->destruct will be
- * called to free the user supplied buffer).
+ * freed using av_packet_unref().
 * @param[in] frame AVFrame containing the raw audio data to be encoded.
 * May be NULL when flushing an encoder that has the
- * CODEC_CAP_DELAY capability set.
- * If CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
+ * AV_CODEC_CAP_DELAY capability set.
+ * 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.
@@ -4453,29 +5340,12 @@
 * value of got_packet_ptr is undefined and should
 * not be used.
 * @return 0 on success, negative error code on failure
- */
-int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
- const AVFrame *frame, int *got_packet_ptr);
-
-#if FF_API_OLD_ENCODE_VIDEO
-/**
- * @deprecated use avcodec_encode_video2() instead.
 *
- * Encode a video frame from pict into buf.
- * The input picture should be
- * stored using a specific format, namely avctx.pix_fmt.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer for the bitstream of encoded frame
- * @param[in] buf_size the size of the output buffer in bytes
- * @param[in] pict the input picture to encode
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used from the output buffer.
+ * @deprecated use avcodec_send_frame()/avcodec_receive_packet() instead
 */
 attribute_deprecated
-int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
- const AVFrame *pict);
-#endif
+int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
+ const AVFrame *frame, int *got_packet_ptr);
 
 /**
 * Encode a frame of video.
@@ -4498,11 +5368,10 @@
 * caller, he is responsible for freeing it.
 *
 * If this function fails or produces no output, avpkt will be
- * freed using av_free_packet() (i.e. avpkt->destruct will be
- * called to free the user supplied buffer).
+ * freed using av_packet_unref().
 * @param[in] frame AVFrame containing the raw video data to be encoded.
 * May be NULL when flushing an encoder that has the
- * CODEC_CAP_DELAY capability set.
+ * AV_CODEC_CAP_DELAY capability set.
 * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
 * output packet is non-empty, and to 0 if it is
 * empty. If the function returns an error, the
@@ -4510,7 +5379,10 @@
 * value of got_packet_ptr is undefined and should
 * not be used.
 * @return 0 on success, negative error code on failure
+ *
+ * @deprecated use avcodec_send_frame()/avcodec_receive_packet() instead
 */
+attribute_deprecated
 int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
 const AVFrame *frame, int *got_packet_ptr);
 
@@ -4522,226 +5394,70 @@
 * @}
 */
 
-#if FF_API_AVCODEC_RESAMPLE
-/**
- * @defgroup lavc_resample Audio resampling
- * @ingroup libavc
- * @deprecated use libswresample instead
- *
- * @{
- */
-struct ReSampleContext;
-struct AVResampleContext;
-
-typedef struct ReSampleContext ReSampleContext;
-
-/**
- * Initialize audio resampling context.
- *
- * @param output_channels number of output channels
- * @param input_channels number of input channels
- * @param output_rate output sample rate
- * @param input_rate input sample rate
- * @param sample_fmt_out requested output sample format
- * @param sample_fmt_in input sample format
- * @param filter_length length of each FIR filter in the filterbank relative to the cutoff frequency
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear if 1 then the used FIR filter will be linearly interpolated
- between the 2 closest, if 0 the closest will be used
- * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
- * @return allocated ReSampleContext, NULL if error occurred
- */
-attribute_deprecated
-ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
- int output_rate, int input_rate,
- enum AVSampleFormat sample_fmt_out,
- enum AVSampleFormat sample_fmt_in,
- int filter_length, int log2_phase_count,
- int linear, double cutoff);
-
-attribute_deprecated
-int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples);
-
-/**
- * Free resample context.
- *
- * @param s a non-NULL pointer to a resample context previously
- * created with av_audio_resample_init()
- */
-attribute_deprecated
-void audio_resample_close(ReSampleContext *s);
-
-
-/**
- * Initialize an audio resampler.
- * Note, if either rate is not an integer then simply scale both rates up so they are.
- * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear If 1 then the used FIR filter will be linearly interpolated
- between the 2 closest, if 0 the closest will be used
- * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
- */
-attribute_deprecated
-struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff);
-
-/**
- * Resample an array of samples using a previously configured context.
- * @param src an array of unconsumed samples
- * @param consumed the number of samples of src which have been consumed are returned here
- * @param src_size the number of unconsumed samples available
- * @param dst_size the amount of space in samples available in dst
- * @param update_ctx If this is 0 then the context will not be modified, that way several channels can be resampled with the same context.
- * @return the number of samples written in dst or -1 if an error occurred
- */
-attribute_deprecated
-int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx);
-
-
-/**
- * Compensate samplerate/timestamp drift. The compensation is done by changing
- * the resampler parameters, so no audible clicks or similar distortions occur
- * @param compensation_distance distance in output samples over which the compensation should be performed
- * @param sample_delta number of output samples which should be output less
- *
- * example: av_resample_compensate(c, 10, 500)
- * here instead of 510 samples only 500 samples would be output
- *
- * note, due to rounding the actual compensation might be slightly different,
- * especially if the compensation_distance is large and the in_rate used during init is small
- */
-attribute_deprecated
-void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance);
-attribute_deprecated
-void av_resample_close(struct AVResampleContext *c);
-
-/**
- * @}
- */
-#endif
-
+#if FF_API_AVPICTURE
 /**
 * @addtogroup lavc_picture
 * @{
 */
 
 /**
- * Allocate memory for the pixels of a picture and setup the AVPicture
- * fields for it.
- *
- * Call avpicture_free() to free it.
- *
- * @param picture the picture structure to be filled in
- * @param pix_fmt the pixel format of the picture
- * @param width the width of the picture
- * @param height the height of the picture
- * @return zero if successful, a negative error code otherwise
- *
- * @see av_image_alloc(), avpicture_fill()
+ * @deprecated unused
 */
+attribute_deprecated
 int avpicture_alloc(AVPicture *picture, enum AVPixelFormat pix_fmt, int width, int height);
 
 /**
- * Free a picture previously allocated by avpicture_alloc().
- * The data buffer used by the AVPicture is freed, but the AVPicture structure
- * itself is not.
- *
- * @param picture the AVPicture to be freed
+ * @deprecated unused
 */
+attribute_deprecated
 void avpicture_free(AVPicture *picture);
 
 /**
- * Setup the picture fields based on the specified image parameters
- * and the provided image data buffer.
- *
- * The picture fields are filled in by using the image data buffer
- * pointed to by ptr.
- *
- * If ptr is NULL, the function will fill only the picture linesize
- * array and return the required size for the image buffer.
- *
- * To allocate an image buffer and fill the picture data in one call,
- * use avpicture_alloc().
- *
- * @param picture the picture to be filled in
- * @param ptr buffer where the image data is stored, or NULL
- * @param pix_fmt the pixel format of the image
- * @param width the width of the image in pixels
- * @param height the height of the image in pixels
- * @return the size in bytes required for src, a negative error code
- * in case of failure
- *
- * @see av_image_fill_arrays()
+ * @deprecated use av_image_fill_arrays() instead.
 */
+attribute_deprecated
 int avpicture_fill(AVPicture *picture, const uint8_t *ptr,
 enum AVPixelFormat pix_fmt, int width, int height);
 
 /**
- * Copy pixel data from an AVPicture into a buffer.
- *
- * avpicture_get_size() can be used to compute the required size for
- * the buffer to fill.
- *
- * @param src source picture with filled data
- * @param pix_fmt picture pixel format
- * @param width picture width
- * @param height picture height
- * @param dest destination buffer
- * @param dest_size destination buffer size in bytes
- * @return the number of bytes written to dest, or a negative value
- * (error code) on error, for example if the destination buffer is not
- * big enough
- *
- * @see av_image_copy_to_buffer()
+ * @deprecated use av_image_copy_to_buffer() instead.
 */
+attribute_deprecated
 int avpicture_layout(const AVPicture *src, enum AVPixelFormat pix_fmt,
 int width, int height,
 unsigned char *dest, int dest_size);
 
 /**
- * Calculate the size in bytes that a picture of the given width and height
- * would occupy if stored in the given picture format.
- *
- * @param pix_fmt picture pixel format
- * @param width picture width
- * @param height picture height
- * @return the computed picture buffer size or a negative error code
- * in case of error
- *
- * @see av_image_get_buffer_size().
+ * @deprecated use av_image_get_buffer_size() instead.
 */
+attribute_deprecated
 int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height);
 
-#if FF_API_DEINTERLACE
 /**
- * deinterlace - if not supported return -1
- *
- * @deprecated - use yadif (in libavfilter) instead
+ * @deprecated av_image_copy() instead.
 */
 attribute_deprecated
-int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
- enum AVPixelFormat pix_fmt, int width, int height);
-#endif
-/**
- * Copy image src to dst. Wraps av_image_copy().
- */
 void av_picture_copy(AVPicture *dst, const AVPicture *src,
 enum AVPixelFormat pix_fmt, int width, int height);
 
 /**
- * Crop image top and left side.
+ * @deprecated unused
 */
+attribute_deprecated
 int av_picture_crop(AVPicture *dst, const AVPicture *src,
 enum AVPixelFormat pix_fmt, int top_band, int left_band);
 
 /**
- * Pad image.
+ * @deprecated unused
 */
+attribute_deprecated
 int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum AVPixelFormat pix_fmt,
 int padtop, int padbottom, int padleft, int padright, int *color);
 
 /**
 * @}
 */
+#endif
 
 /**
 * @defgroup lavc_misc Utility functions
@@ -4759,22 +5475,14 @@
 * @{
 */
 
+#if FF_API_GETCHROMA
 /**
- * Utility function to access log2_chroma_w log2_chroma_h from
- * the pixel format AVPixFmtDescriptor.
- *
- * This function asserts that pix_fmt is valid. See av_pix_fmt_get_chroma_sub_sample
- * for one that returns a failure code and continues in case of invalid
- * pix_fmts.
- *
- * @param[in] pix_fmt the pixel format
- * @param[out] h_shift store log2_chroma_w
- * @param[out] v_shift store log2_chroma_h
- *
- * @see av_pix_fmt_get_chroma_sub_sample
+ * @deprecated Use av_pix_fmt_get_chroma_sub_sample
 */
 
+attribute_deprecated
 void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift);
+#endif
 
 /**
 * Return a value representing the fourCC code associated to the
@@ -4817,15 +5525,8 @@
 enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
 
 attribute_deprecated
-#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
-enum AVPixelFormat avcodec_find_best_pix_fmt2(const enum AVPixelFormat *pix_fmt_list,
- enum AVPixelFormat src_pix_fmt,
- int has_alpha, int *loss_ptr);
-#else
 enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2,
 enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
-#endif
-
 
 enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
 
@@ -4833,14 +5534,7 @@
 * @}
 */
 
-#if FF_API_SET_DIMENSIONS
-/**
- * @deprecated this function is not supposed to be used from outside of lavc
- */
-attribute_deprecated
-void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
-#endif
-
+#if FF_API_TAG_STRING
 /**
 * Put a string representing the codec tag codec_tag in buf.
 *
@@ -4849,8 +5543,12 @@
 * @param codec_tag codec tag to assign
 * @return the length of the string that would have been generated if
 * enough space had been available, excluding the trailing null
+ *
+ * @deprecated see av_fourcc_make_string() and av_fourcc2str().
 */
+attribute_deprecated
 size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag);
+#endif
 
 void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
 
@@ -4863,6 +5561,19 @@
 */
 const char *av_get_profile_name(const AVCodec *codec, int profile);
 
+/**
+ * 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);
+
 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
@@ -4941,105 +5652,350 @@
 */
 int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes);
 
+/**
+ * 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);
 
+#if FF_API_OLD_BSF
 typedef struct AVBitStreamFilterContext {
 void *priv_data;
- struct AVBitStreamFilter *filter;
+ const struct AVBitStreamFilter *filter;
 AVCodecParserContext *parser;
 struct AVBitStreamFilterContext *next;
+ /**
+ * Internal default arguments, used if NULL is passed to av_bitstream_filter_filter().
+ * Not for access by library users.
+ */
+ char *args;
 } AVBitStreamFilterContext;
+#endif
+
+typedef struct AVBSFInternal AVBSFInternal;
+
+/**
+ * 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 libavcodec internal data. Must not be touched by the caller in any
+ * way.
+ */
+ AVBSFInternal *internal;
 
+ /**
+ * 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 (*filter)(AVBitStreamFilterContext *bsfc,
- AVCodecContext *avctx, const char *args,
- uint8_t **poutbuf, int *poutbuf_size,
- const uint8_t *buf, int buf_size, int keyframe);
- void (*close)(AVBitStreamFilterContext *bsfc);
- struct AVBitStreamFilter *next;
+ int (*init)(AVBSFContext *ctx);
+ int (*filter)(AVBSFContext *ctx, AVPacket *pkt);
+ void (*close)(AVBSFContext *ctx);
 } AVBitStreamFilter;
 
+#if FF_API_OLD_BSF
+/**
+ * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext)
+ * is deprecated. Use the new bitstream filtering API (using AVBSFContext).
+ */
+attribute_deprecated
+void av_register_bitstream_filter(AVBitStreamFilter *bsf);
+/**
+ * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext)
+ * is deprecated. Use av_bsf_get_by_name(), av_bsf_alloc(), and av_bsf_init()
+ * from the new bitstream filtering API (using AVBSFContext).
+ */
+attribute_deprecated
+AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
+/**
+ * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext)
+ * is deprecated. Use av_bsf_send_packet() and av_bsf_receive_packet() from the
+ * new bitstream filtering API (using AVBSFContext).
+ */
+attribute_deprecated
+int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
+ AVCodecContext *avctx, const char *args,
+ uint8_t **poutbuf, int *poutbuf_size,
+ const uint8_t *buf, int buf_size, int keyframe);
+/**
+ * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext)
+ * is deprecated. Use av_bsf_free() from the new bitstream filtering API (using
+ * AVBSFContext).
+ */
+attribute_deprecated
+void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
+/**
+ * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext)
+ * is deprecated. Use av_bsf_iterate() from the new bitstream filtering API (using
+ * AVBSFContext).
+ */
+attribute_deprecated
+const AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f);
+#endif
+
 /**
- * Register a bitstream filter.
+ * @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.
 *
- * The filter will be accessible to the application code through
- * av_bitstream_filter_next() or can be directly initialized with
- * av_bitstream_filter_init().
+ * @param opaque a pointer where libavcodec will store the iteration state. Must
+ * point to NULL to start the iteration.
 *
- * @see avcodec_register_all()
+ * @return the next registered bitstream filter or NULL when the iteration is
+ * finished
 */
-void av_register_bitstream_filter(AVBitStreamFilter *bsf);
+const AVBitStreamFilter *av_bsf_iterate(void **opaque);
+#if FF_API_NEXT
+attribute_deprecated
+const AVBitStreamFilter *av_bsf_next(void **opaque);
+#endif
 
 /**
- * Create and initialize a bitstream filter context given a bitstream
- * filter name.
+ * 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.
 *
- * The returned context must be freed with av_bitstream_filter_close().
+ * @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.
 *
- * @param name the name of the bitstream filter
- * @return a bitstream filter context if a matching filter was found
- * and successfully initialized, NULL otherwise
+ * @return 0 on success, a negative AVERROR code on failure
 */
-AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
+int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **ctx);
 
 /**
- * Filter bitstream.
+ * 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.
 *
- * This function filters the buffer buf with size buf_size, and places the
- * filtered buffer in the buffer pointed to by poutbuf.
+ * 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.
 *
- * The output buffer must be freed by the caller.
+ * @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.
+ * This parameter may be NULL, which signals the end of the stream (i.e. no more
+ * packets will be sent). That will cause the filter to output any packets it
+ * may have buffered internally.
 *
- * @param bsfc bitstream filter context created by av_bitstream_filter_init()
- * @param avctx AVCodecContext accessed by the filter, may be NULL.
- * If specified, this must point to the encoder context of the
- * output stream the packet is sent to.
- * @param args arguments which specify the filter configuration, may be NULL
- * @param poutbuf pointer which is updated to point to the filtered buffer
- * @param poutbuf_size pointer which is updated to the filtered buffer size in bytes
- * @param buf buffer containing the data to filter
- * @param buf_size size in bytes of buf
- * @param keyframe set to non-zero if the buffer to filter corresponds to a key-frame packet data
- * @return >= 0 in case of success, or a negative error code in case of failure
- *
- * If the return value is positive, an output buffer is allocated and
- * is available in *poutbuf, and is distinct from the input buffer.
- *
- * If the return value is 0, the output buffer is not allocated and
- * should be considered identical to the input buffer, or in case
- * *poutbuf was set it points to the input buffer (not necessarily to
- * its starting address).
+ * @return 0 on success, a negative AVERROR on error.
 */
-int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
- AVCodecContext *avctx, const char *args,
- uint8_t **poutbuf, int *poutbuf_size,
- const uint8_t *buf, int buf_size, int keyframe);
+int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt);
 
 /**
- * Release bitstream filter context.
+ * Retrieve a filtered packet.
 *
- * @param bsf the bitstream filter context created with
- * av_bitstream_filter_init(), can be NULL
+ * @param[out] 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.
 */
-void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
+int av_bsf_receive_packet(AVBSFContext *ctx, AVPacket *pkt);
+
+/**
+ * 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
+ * @param[out] 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);
 
 /**
- * If f is NULL, return the first registered bitstream filter,
- * if f is non-NULL, return the next registered bitstream filter
- * after f, or NULL if f is the last one.
+ * 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]`
+ * @param[out] bsf Pointer to be set to newly created @ref AVBSFContext structure
+ * representing the chain of bitstream filters
 *
- * This function can be used to iterate over all registered bitstream
- * filters.
+ * @return >=0 on success, negative AVERROR in case of failure
 */
-AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f);
+int av_bsf_list_parse_str(const char *str, AVBSFContext **bsf);
+
+/**
+ * Get null/pass-through bitstream filter.
+ *
+ * @param[out] bsf Pointer to be set to new instance of pass-through bitstream filter
+ *
+ * @return
+ */
+int av_bsf_get_null_filter(AVBSFContext **bsf);
 
 /* memory */
 
 /**
 * Same behaviour av_fast_malloc but the buffer has additional
- * FF_INPUT_BUFFER_PADDING_SIZE at the end which will always be 0.
+ * 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.
@@ -5061,51 +6017,32 @@
 */
 unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
 
-#if FF_API_MISSING_SAMPLE
-/**
- * Log a generic warning message about a missing feature. This function is
- * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] feature string containing the name of the missing feature
- * @param[in] want_sample indicates if samples are wanted which exhibit this feature.
- * If want_sample is non-zero, additional verbage will be added to the log
- * message which tells the user how to report samples to the development
- * mailing list.
- * @deprecated Use avpriv_report_missing_feature() instead.
- */
-attribute_deprecated
-void av_log_missing_feature(void *avc, const char *feature, int want_sample);
-
-/**
- * Log a generic warning message asking for a sample. This function is
- * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] msg string containing an optional message, or NULL if no message
- * @deprecated Use avpriv_request_sample() instead.
- */
-attribute_deprecated
-void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3);
-#endif /* FF_API_MISSING_SAMPLE */
-
+#if FF_API_USER_VISIBLE_AVHWACCEL
 /**
 * Register the hardware accelerator hwaccel.
+ *
+ * @deprecated This function doesn't do anything.
 */
+attribute_deprecated
 void av_register_hwaccel(AVHWAccel *hwaccel);
 
 /**
 * If hwaccel is NULL, returns the first registered hardware accelerator,
 * if hwaccel is non-NULL, returns the next registered hardware accelerator
 * after hwaccel, or NULL if hwaccel is the last one.
+ *
+ * @deprecated AVHWaccel structures contain no user-serviceable parts, so
+ * this function should not be used.
 */
+attribute_deprecated
 AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel);
+#endif
 
-
+#if FF_API_LOCKMGR
 /**
 * Lock operation used by lockmgr
+ *
+ * @deprecated Deprecated together with av_lockmgr_register().
 */
 enum AVLockOp {
 AV_LOCK_CREATE, ///< Create a mutex
@@ -5116,18 +6053,33 @@
 
 /**
 * Register a user provided lock manager supporting the operations
- * specified by AVLockOp. mutex points to a (void *) where the
- * lockmgr should store/get a pointer to a user allocated mutex. It's
- * NULL upon AV_LOCK_CREATE and != NULL for all other ops.
- *
- * @param cb User defined callback. Note: FFmpeg may invoke calls to this
- * callback during the call to av_lockmgr_register().
- * Thus, the application must be prepared to handle that.
- * If cb is set to NULL the lockmgr will be unregistered.
- * Also note that during unregistration the previously registered
- * lockmgr callback may also be invoked.
+ * specified by AVLockOp. The "mutex" argument to the function points
+ * to a (void *) where the lockmgr should store/get a pointer to a user
+ * allocated mutex. It is NULL upon AV_LOCK_CREATE and equal to the
+ * value left by the last call for all other ops. If the lock manager is
+ * unable to perform the op then it should leave the mutex in the same
+ * state as when it was called and return a non-zero value. However,
+ * when called with AV_LOCK_DESTROY the mutex will always be assumed to
+ * have been successfully destroyed. If av_lockmgr_register succeeds
+ * it will return a non-negative value, if it fails it will return a
+ * negative value and destroy all mutex and unregister all callbacks.
+ * av_lockmgr_register is not thread-safe, it must be called from a
+ * single thread before any calls which make use of locking are used.
+ *
+ * @param cb User defined callback. av_lockmgr_register invokes calls
+ * to this callback and the previously registered callback.
+ * The callback will be used to create more than one mutex
+ * each of which must be backed by its own underlying locking
+ * mechanism (i.e. do not use a single static object to
+ * implement your lock manager). If cb is set to NULL the
+ * lockmgr will be unregistered.
+ *
+ * @deprecated This function does nothing, and always returns 0. Be sure to
+ * build with thread support to get basic thread safety.
 */
+attribute_deprecated
 int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op));
+#endif
 
 /**
 * Get the type of the given codec.
@@ -5177,6 +6129,17 @@
 const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name);
 
 /**
+ * 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);
+
+/**
 * @}
 */

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/avdct.h Added

@@ -0,0 +1,84 @@
+/*
+ * 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 
+ * 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_permutation[64];
+
+ 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;
+} 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-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/avfft.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/avfft.h Changed

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

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/d3d11va.h Added

@@ -0,0 +1,112 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/dirac.h Added

@@ -0,0 +1,131 @@
+/*
+ * 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-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/dv_profile.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/dv_profile.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/dxva2.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/dxva2.h Changed

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

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/jni.h Added

@@ -0,0 +1,46 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/mediacodec.h Added

@@ -0,0 +1,88 @@
+/*
+ * 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);
+
+#endif /* AVCODEC_MEDIACODEC_H */

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/qsv.h Added

@@ -0,0 +1,107 @@
+/*
+ * 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-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/vaapi.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/vaapi.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/vdpau.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/vdpau.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/version.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/version.h Changed

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

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/videotoolbox.h Added

@@ -0,0 +1,127 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/vorbis_parser.h Added

@@ -0,0 +1,74 @@
+/*
+ * 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-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/xvmc.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavcodec/xvmc.h Changed

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

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavdevice Added

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavdevice/avdevice.h Added

@@ -0,0 +1,514 @@
+/*
+ * 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.
+ */
+AVInputFormat *av_input_audio_device_next(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.
+ */
+AVInputFormat *av_input_video_device_next(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.
+ */
+AVOutputFormat *av_output_audio_device_next(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.
+ */
+AVOutputFormat *av_output_video_device_next(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);
+
+/**
+ * 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.
+ */
+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.
+ *
+ * @param[out] 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.
+ */
+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.
+ */
+void avdevice_capabilities_free(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s);
+
+/**
+ * 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 */
+} 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.
+ * @param[out] 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.
+ * @param[out] 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(struct AVInputFormat *device, const char *device_name,
+ AVDictionary *device_options, AVDeviceInfoList **device_list);
+int avdevice_list_output_sinks(struct AVOutputFormat *device, const char *device_name,
+ AVDictionary *device_options, AVDeviceInfoList **device_list);
+
+/**
+ * @}
+ */
+
+#endif /* AVDEVICE_AVDEVICE_H */

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavdevice/version.h Added

@@ -0,0 +1,50 @@
+/*
+ * 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  58
+#define LIBAVDEVICE_VERSION_MINOR   3
+#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.
+ */
+
+#endif /* AVDEVICE_VERSION_H */

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavfilter Added

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavfilter/avfilter.h Added

@@ -0,0 +1,1168 @@
+/*
+ * 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;
+
+/**
+ * Get the number of elements in a NULL-terminated array of AVFilterPads (e.g.
+ * AVFilter.inputs/outputs).
+ */
+int avfilter_pad_count(const AVFilterPad *pads);
+
+/**
+ * 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)
+/**
+ * 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 inputs, terminated by a zeroed element.
+ *
+ * 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 outputs, terminated by a zeroed element.
+ *
+ * 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.
+ *****************************************************************
+ */
+
+ /**
+ * 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);
+
+ /**
+ * 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.out_formats on every input link and
+ * AVFilterLink.in_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.in_samplerates "in_samplerates" /
+ * @ref AVFilterLink.out_samplerates "out_samplerates" and
+ * @ref AVFilterLink.in_channel_layouts "in_channel_layouts" /
+ * @ref AVFilterLink.out_channel_layouts "out_channel_layouts" analogously.
+ *
+ * This callback may be NULL for filters with one input, in which case
+ * libavfilter assumes that it supports all input formats and preserves
+ * them on output.
+ *
+ * @return zero on success, a negative value corresponding to an
+ * AVERROR code otherwise
+ */
+ int (*query_formats)(AVFilterContext *);
+
+ int priv_size; ///< size of private data to allocate for the filter
+
+ int flags_internal; ///< Additional flags for avfilter internal use only.
+
+ /**
+ * Used by the filter registration system. Must not be touched by any other
+ * code.
+ */
+ struct AVFilter *next;
+
+ /**
+ * 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 initialization function, alternative to the init()
+ * callback. Args contains the user-supplied parameters, opaque is
+ * used for providing binary data.
+ */
+ int (*init_opaque)(AVFilterContext *ctx, void *opaque);
+
+ /**
+ * 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;
+
+/**
+ * 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;
+};
+
+/**
+ * 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 formats and channel layouts supported by the input and output
+ * filters respectively. These lists are used for negotiating the format
+ * to actually be used, which will be loaded into the format and
+ * channel_layout members, above, when chosen.
+ *
+ */
+ AVFilterFormats *in_formats;
+ AVFilterFormats *out_formats;
+
+ /**
+ * Lists of channel layouts and sample rates used for automatic
+ * negotiation.
+ */
+ AVFilterFormats *in_samplerates;
+ AVFilterFormats *out_samplerates;
+ struct AVFilterChannelLayouts *in_channel_layouts;
+ struct AVFilterChannelLayouts *out_channel_layouts;
+
+ /**
+ * Audio only, the destination filter sets this to a non-zero value to
+ * request that buffers with the given number of samples should be sent to
+ * it. AVFilterPad.needs_fifo must also be set on the corresponding input
+ * pad.
+ * Last buffer before EOF will be padded with silence.
+ */
+ int request_samples;
+
+ /** 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;
+
+ /**
+ * Buffer partially filled with samples to achieve a fixed/minimum size.
+ */
+ AVFrame *partial_buf;
+
+ /**
+ * Size of the partial buffer to allocate.
+ * Must be between min_samples and max_samples.
+ */
+ int partial_buf_size;
+
+ /**
+ * Minimum number of samples to filter at once. If filter_frame() is
+ * called with fewer samples, it will accumulate them in partial_buf.
+ * 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;
+
+ /**
+ * Link processing flags.
+ */
+ unsigned flags;
+
+ /**
+ * Number of past frames sent through the link.
+ */
+ int64_t frame_count_in, frame_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 reserved[0xF000];
+
+#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);
+
+#if FF_API_FILTER_GET_SET
+/**
+ * Get the number of channels of a link.
+ * @deprecated Use av_buffersink_get_channels()
+ */
+attribute_deprecated
+int avfilter_link_get_channels(AVFilterLink *link);
+#endif
+
+/**
+ * Set the closed field of a link.
+ * @deprecated applications are not supposed to mess with links, they should
+ * close the sinks.
+ */
+attribute_deprecated
+void avfilter_link_set_closed(AVFilterLink *link, int closed);
+
+/**
+ * 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);
+
+#if FF_API_NEXT
+/** Initialize the filter system. Register all builtin filters. */
+attribute_deprecated
+void avfilter_register_all(void);
+
+/**
+ * Register a filter. This is only needed if you plan to use
+ * avfilter_get_by_name later to lookup the AVFilter structure by name. A
+ * filter can still by instantiated with avfilter_graph_alloc_filter even if it
+ * is not registered.
+ *
+ * @param filter the filter to register
+ * @return 0 if the registration was successful, a negative value
+ * otherwise
+ */
+attribute_deprecated
+int avfilter_register(AVFilter *filter);
+
+/**
+ * Iterate over all registered filters.
+ * @return If prev is non-NULL, next registered filter after prev or NULL if
+ * prev is the last filter. If prev is NULL, return the first registered filter.
+ */
+attribute_deprecated
+const AVFilter *avfilter_next(const AVFilter *prev);
+#endif
+
+/**
+ * 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
+#if FF_API_LAVR_OPTS
+ attribute_deprecated char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters
+#endif
+
+ /**
+ * 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 parameters args and opaque.
+ *
+ * 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.
+ *
+ * @param[in] graph the filter graph where to link the parsed graph context
+ * @param[in] filters string to be parsed
+ * @param[out] 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().
+ * @param[out] 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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavfilter/buffersink.h Added

@@ -0,0 +1,165 @@
+/*
+ * 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
+ * @{
+ */
+
+/**
+ * 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
+
+/**
+ * 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().
+ */
+AVBufferSinkParams *av_buffersink_params_alloc(void);
+
+/**
+ * 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().
+ */
+AVABufferSinkParams *av_abuffersink_params_alloc(void);
+
+/**
+ * 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_samples().
+ *
+ * @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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavfilter/buffersrc.h Added

@@ -0,0 +1,209 @@
+/*
+ * 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 secon.
+     */
+    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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavfilter/version.h Added

@@ -0,0 +1,65 @@
+/*
+ * 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 7
+#define LIBAVFILTER_VERSION_MINOR 16
+#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.
+ */
+
+#ifndef FF_API_OLD_FILTER_OPTS_ERROR
+#define FF_API_OLD_FILTER_OPTS_ERROR (LIBAVFILTER_VERSION_MAJOR < 8)
+#endif
+#ifndef FF_API_LAVR_OPTS
+#define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 8)
+#endif
+#ifndef FF_API_FILTER_GET_SET
+#define FF_API_FILTER_GET_SET (LIBAVFILTER_VERSION_MAJOR < 8)
+#endif
+#ifndef FF_API_NEXT
+#define FF_API_NEXT (LIBAVFILTER_VERSION_MAJOR < 8)
+#endif
+
+#endif /* AVFILTER_VERSION_H */

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavformat/avformat.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavformat/avformat.h Changed

@@ -28,8 +28,8 @@
 */
 
 /**
- * @defgroup libavf I/O and Muxing/Demuxing Library
- * @{
+ * @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
@@ -67,7 +67,7 @@
 * with an AVFMT_NOFILE format).
 *
 * @section lavf_options Passing options to (de)muxers
- * Lavf allows to configure muxers and demuxers using the @ref avoptions
+ * 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
@@ -78,6 +78,20 @@
 * 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
@@ -88,10 +102,10 @@
 * cleanup.
 *
 * @section lavf_decoding_open Opening a media file
- * The minimum information required to open a file is its URL or filename, which
+ * 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 = "in.mp3";
+ * const char *url = "file:in.mp3";
 * AVFormatContext *s = NULL;
 * int ret = avformat_open_input(&s, url, NULL, NULL);
 * if (ret < 0)
@@ -149,8 +163,8 @@
 * av_read_frame() on it. Each call, if successful, will return an AVPacket
 * containing encoded data for one AVStream, identified by
 * AVPacket.stream_index. This packet may be passed straight into the libavcodec
- * decoding functions avcodec_decode_video2(), avcodec_decode_audio4() or
- * avcodec_decode_subtitle2() if the caller wishes to decode the data.
+ * 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
@@ -165,7 +179,7 @@
 * until the next av_read_frame() call or closing the file. If the caller
 * requires a longer lifetime, av_dup_packet() will make an av_malloc()ed copy
 * of it.
- * In both cases, the packet must be freed with av_free_packet() when it is no
+ * In both cases, the packet must be freed with av_packet_unref() when it is no
 * longer needed.
 *
 * @section lavf_decoding_seek Seeking
@@ -191,13 +205,17 @@
 * avio_open2() or a custom one.
 * - Unless the format is of the AVFMT_NOSTREAMS type, at least one stream must
 * be created with the avformat_new_stream() function. The caller should fill
- * the @ref AVStream.codec "stream codec context" information, such as the
- * codec @ref AVCodecContext.codec_type "type", @ref AVCodecContext.codec_id
+ * 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
@@ -229,6 +247,53 @@
 *
 * @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
@@ -247,7 +312,6 @@
 * @{
 * @}
 * @}
- *
 */
 
 #include <time.h>
@@ -373,19 +437,6 @@
 */
 int av_append_packet(AVIOContext *s, AVPacket *pkt, int size);
 
-#if FF_API_LAVF_FRAC
-/*************************************************/
-/* fractional numbers for exact pts handling */
-
-/**
- * The exact value of the fractional number is: 'val + num / den'.
- * num is assumed to be 0 <= num < den.
- */
-typedef struct AVFrac {
- int64_t val, num, den;
-} AVFrac;
-#endif
-
 /*************************************************/
 /* input/output formats */
 
@@ -398,7 +449,7 @@
 const char *filename;
 unsigned char *buf; /**< Buffer must have AVPROBE_PADDING_SIZE of extra allocated bytes filled with zero. */
 int buf_size; /**< Size of buf except extra allocated bytes */
- uint8_t *mime_type; /**< mime_type, when known. */
+ const char *mime_type; /**< mime_type, when known. */
 } AVProbeData;
 
 #define AVPROBE_SCORE_RETRY (AVPROBE_SCORE_MAX/4)
@@ -414,8 +465,6 @@
 #define AVFMT_NOFILE 0x0001
 #define AVFMT_NEEDNUMBER 0x0002 /**< Needs '%d' in filename. */
 #define AVFMT_SHOW_IDS 0x0008 /**< Show format stream IDs numbers. */
-#define AVFMT_RAWPICTURE 0x0020 /**< Format wants AVPicture structure for
- raw picture data. */
 #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. */
@@ -427,12 +476,7 @@
 #define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fall back on generic search */
 #define AVFMT_NO_BYTE_SEEK 0x8000 /**< Format does not allow seeking by bytes */
 #define AVFMT_ALLOW_FLUSH 0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */
-#if LIBAVFORMAT_VERSION_MAJOR <= 54
-#define AVFMT_TS_NONSTRICT 0x8020000 //we try to be compatible to the ABIs of ffmpeg and major forks
-#else
-#define AVFMT_TS_NONSTRICT 0x20000
-#endif
- /**< Format does not require strictly
+#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
@@ -465,10 +509,10 @@
 enum AVCodecID video_codec; /**< default video codec */
 enum AVCodecID subtitle_codec; /**< default subtitle codec */
 /**
- * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE,
+ * 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_NONSTRICT, AVFMT_TS_NEGATIVE
 */
 int flags;
 
@@ -551,6 +595,32 @@
 * @see avdevice_capabilities_free() for more details.
 */
 int (*free_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps);
+ 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.
+ * Return 0 if more packets from this stream must be checked; 1 if not.
+ */
+ int (*check_bitstream)(struct AVFormatContext *, const AVPacket *pkt);
 } AVOutputFormat;
 /**
 * @}
@@ -627,8 +697,8 @@
 
 /**
 * Read the format header and initialize the AVFormatContext
- * structure. Return 0 if OK. Only used in raw format right
- * now. 'avformat_new_stream' should be called to create new streams.
+ * structure. Return 0 if OK. 'avformat_new_stream' should be
+ * called to create new streams.
 */
 int (*read_header)(struct AVFormatContext *);
 
@@ -715,9 +785,9 @@
 AVSTREAM_PARSE_HEADERS, /**< Only parse headers, do not repack. */
 AVSTREAM_PARSE_TIMESTAMPS, /**< full parsing and interpolation of timestamps for frames not starting on a packet boundary */
 AVSTREAM_PARSE_FULL_ONCE, /**< full parsing and repack of the first frame only, only implemented for H.264 currently */
- AVSTREAM_PARSE_FULL_RAW=MKTAG(0,'R','A','W'), /**< full parsing and repack with timestamp and position generation by parser for raw
- this assumes that each packet in the file contains no demuxer level headers and
- just codec level data, otherwise position generation would fail */
+ 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 {
@@ -729,6 +799,9 @@
 * 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. */
@@ -752,11 +825,19 @@
 #define AV_DISPOSITION_CLEAN_EFFECTS 0x0200 /**< stream without voice */
 /**
 * The stream is stored in the file as an attached picture/"cover art" (e.g.
- * APIC frame in ID3v2). The single packet associated with it will be returned
- * among the first few packets read from the file unless seeking takes place.
- * It can also be accessed at any time in AVStream.attached_pic.
+ * 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 0x0400
+/**
+ * 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 0x0800
+
+typedef struct AVStreamInternal AVStreamInternal;
 
 /**
 * To specify text track kind (different from subtitles default).
@@ -764,6 +845,7 @@
 #define AV_DISPOSITION_CAPTIONS 0x10000
 #define AV_DISPOSITION_DESCRIPTIONS 0x20000
 #define AV_DISPOSITION_METADATA 0x40000
+#define AV_DISPOSITION_DEPENDENT 0x80000 ///< dependent audio stream (mix_type=0 in mpegts)
 
 /**
 * Options for behavior on timestamp wrap detection.
@@ -787,27 +869,14 @@
 * encoding: set by the user, replaced by libavformat if left unset
 */
 int id;
+#if FF_API_LAVF_AVCTX
 /**
- * Codec context associated with this stream. Allocated and freed by
- * libavformat.
- *
- * - decoding: The demuxer exports codec information stored in the headers
- * here.
- * - encoding: The user sets codec information, the muxer writes it to the
- * output. Mandatory fields as specified in AVCodecContext
- * documentation must be set even if this AVCodecContext is
- * not actually used for encoding.
- */
- AVCodecContext *codec;
- void *priv_data;
-
-#if FF_API_LAVF_FRAC
- /**
- * @deprecated this field is unused
+ * @deprecated use the codecpar struct instead
 */
 attribute_deprecated
- struct AVFrac pts;
+ AVCodecContext *codec;
 #endif
+ void *priv_data;
 
 /**
 * This is the fundamental unit of time (in seconds) in terms
@@ -837,6 +906,9 @@
 * 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;
 
@@ -905,18 +977,53 @@
 int event_flags;
 #define AVSTREAM_EVENT_FLAG_METADATA_UPDATED 0x0001 ///< The call resulted in updated metadata.
 
+ /**
+ * 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;
+
+#if FF_API_LAVF_FFSERVER
+ /**
+ * String containing pairs of key and values describing recommended encoder configuration.
+ * Pairs are separated by ','.
+ * Keys are separated from values by '='.
+ *
+ * @deprecated unused
+ */
+ attribute_deprecated
+ char *recommended_encoder_configuration;
+#endif
+
+ /**
+ * 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;
+
 /*****************************************************************
 * 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.
+ * Internal note: be aware that physically removing these fields
+ * will break ABI. Replace removed fields with dummy fields, and
+ * add new fields to AVStreamInternal.
 *****************************************************************
 */
 
+#define MAX_STD_TIMEBASES (30*12+30+3+6)
 /**
- * Stream information used internally by av_find_stream_info()
+ * Stream information used internally by avformat_find_stream_info()
 */
-#define MAX_STD_TIMEBASES (60*12+6)
 struct {
 int64_t last_dts;
 int64_t duration_gcd;
@@ -925,6 +1032,7 @@
 double (*duration_error)[2][MAX_STD_TIMEBASES];
 int64_t codec_info_duration;
 int64_t codec_info_duration_fields;
+ int frame_delay_evidence;
 
 /**
 * 0 -> decoder has not been searched for yet.
@@ -963,11 +1071,10 @@
 /**
 * Number of packets to buffer for codec probing
 */
-#define MAX_PROBE_PACKETS 2500
 int probe_packets;
 
 /**
- * Number of frames that have been demuxed during av_find_stream_info()
+ * Number of frames that have been demuxed during avformat_find_stream_info()
 */
 int codec_info_nb_frames;
 
@@ -989,19 +1096,6 @@
 unsigned int index_entries_allocated_size;
 
 /**
- * Real base framerate of the stream.
- * This is the lowest framerate with which all timestamps can be
- * represented accurately (it is the least common multiple of all
- * framerates in the stream). Note, this value is just a guess!
- * For example, if the time base is 1/90000 and all frames have either
- * approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
- *
- * Code outside avformat should access this field using:
- * av_stream_get/set_r_frame_rate(stream)
- */
- AVRational r_frame_rate;
-
- /**
 * Stream Identifier
 * This is the MPEG-TS stream identifier +1
 * 0 means unknown
@@ -1031,6 +1125,30 @@
 int skip_samples;
 
 /**
+ * If not 0, the number of samples that should be skipped from the start of
+ * the stream (the samples are removed from packets with pts==0, which also
+ * assumes negative timestamps do not happen).
+ * Intended for use with formats such as mp3 with ad-hoc gapless audio
+ * support.
+ */
+ int64_t start_skip_samples;
+
+ /**
+ * If not 0, the first audio sample that should be discarded from the stream.
+ * This is broken by design (needs global sample count), but can't be
+ * avoided for broken by design formats such as mp3 with ad-hoc gapless
+ * audio support.
+ */
+ int64_t first_discard_sample;
+
+ /**
+ * The sample after last sample that is intended to be discarded after
+ * first_discard_sample. Works on frame boundaries only. Used to prevent
+ * early EOF if the gapless info is broken (considered concatenated mp3s).
+ */
+ int64_t last_discard_sample;
+
+ /**
 * Number of internally decoded frames, used internally in libavformat, do not access
 * its lifetime differs from info which is why it is not in that structure.
 */
@@ -1082,10 +1200,37 @@
 */
 int inject_global_side_data;
 
+ /**
+ * display aspect ratio (0 if unknown)
+ * - encoding: unused
+ * - decoding: Set by libavformat to calculate sample_aspect_ratio internally
+ */
+ AVRational display_aspect_ratio;
+
+ /**
+ * An opaque field for libavformat internal usage.
+ * Must not be accessed in any way by callers.
+ */
+ AVStreamInternal *internal;
 } AVStream;
 
+#if FF_API_FORMAT_GET_SET
+/**
+ * Accessors for some AVStream fields. These used to be provided for ABI
+ * compatibility, and do not need to be used anymore.
+ */
+attribute_deprecated
 AVRational av_stream_get_r_frame_rate(const AVStream *s);
+attribute_deprecated
 void av_stream_set_r_frame_rate(AVStream *s, AVRational r);
+#if FF_API_LAVF_FFSERVER
+attribute_deprecated
+char* av_stream_get_recommended_encoder_configuration(const AVStream *s);
+attribute_deprecated
+void av_stream_set_recommended_encoder_configuration(AVStream *s, char *configuration);
+#endif
+#endif
+
 struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
 
 /**
@@ -1131,6 +1276,11 @@
 
 #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 {
 int id; ///< unique ID to identify the chapter
@@ -1146,6 +1296,8 @@
 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
@@ -1166,6 +1318,12 @@
 * 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 {
 /**
@@ -1237,13 +1395,33 @@
 */
 AVStream **streams;
 
+#if FF_API_FORMAT_FILENAME
 /**
 * input or output filename
 *
 * - demuxing: set by avformat_open_input()
 * - muxing: may be set by the caller before avformat_write_header()
+ *
+ * @deprecated Use url instead.
 */
+ attribute_deprecated
 char filename[1024];
+#endif
+
+ /**
+ * 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
@@ -1269,7 +1447,7 @@
 * available. Never set it directly if the file_size and the
 * duration are known as FFmpeg can compute it automatically.
 */
- int bit_rate;
+ int64_t bit_rate;
 
 unsigned int packet_size;
 int max_delay;
@@ -1299,18 +1477,27 @@
 #define AVFMT_FLAG_MP4A_LATM 0x8000 ///< Enable RTP MP4A-LATM payload
 #define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down)
 #define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted)
-#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Don't merge side data but keep it separate.
+#if FF_API_LAVF_KEEPSIDE_FLAG
+#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< 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
 
 /**
- * @deprecated deprecated in favor of probesize2
+ * Maximum size of the data read from input for determining
+ * the input container format.
+ * Demuxing only, set by the caller before avformat_open_input().
 */
- unsigned int probesize;
+ int64_t probesize;
 
 /**
- * @deprecated deprecated in favor of max_analyze_duration2
+ * 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.
 */
- attribute_deprecated
- int max_analyze_duration;
+ int64_t max_analyze_duration;
 
 const uint8_t *key;
 int keylen;
@@ -1460,6 +1647,17 @@
 */
 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.
@@ -1470,7 +1668,7 @@
 /**
 * Audio preload in microseconds.
 * Note, not all formats support this and unpredictable things may happen if it is used when not supported.
- * - encoding: Set by user via AVOptions (NO direct access)
+ * - encoding: Set by user
 * - decoding: unused
 */
 int audio_preload;
@@ -1478,7 +1676,7 @@
 /**
 * Max chunk time in microseconds.
 * Note, not all formats support this and unpredictable things may happen if it is used when not supported.
- * - encoding: Set by user via AVOptions (NO direct access)
+ * - encoding: Set by user
 * - decoding: unused
 */
 int max_chunk_duration;
@@ -1486,7 +1684,7 @@
 /**
 * Max chunk size in bytes
 * Note, not all formats support this and unpredictable things may happen if it is used when not supported.
- * - encoding: Set by user via AVOptions (NO direct access)
+ * - encoding: Set by user
 * - decoding: unused
 */
 int max_chunk_size;
@@ -1495,25 +1693,14 @@
 * forces the use of wallclock timestamps as pts/dts of packets
 * This has undefined results in the presence of B frames.
 * - encoding: unused
- * - decoding: Set by user via AVOptions (NO direct access)
+ * - decoding: Set by user
 */
 int use_wallclock_as_timestamps;
 
 /**
- * Avoid negative timestamps during muxing.
- * 0 -> allow negative timestamps
- * 1 -> avoid negative timestamps
- * -1 -> choose automatically (default)
- * Note, this only works when interleave_packet_per_dts is in use.
- * - encoding: Set by user via AVOptions (NO direct access)
- * - decoding: unused
- */
- int avoid_negative_ts;
-
- /**
 * avio flags, used to force AVIO_FLAG_DIRECT.
 * - encoding: unused
- * - decoding: Set by user via AVOptions (NO direct access)
+ * - decoding: Set by user
 */
 int avio_flags;
 
@@ -1521,34 +1708,34 @@
 * The duration field can be estimated through various ways, and this field can be used
 * to know how the duration was estimated.
 * - encoding: unused
- * - decoding: Read by user via AVOptions (NO direct access)
+ * - decoding: Read by user
 */
 enum AVDurationEstimationMethod duration_estimation_method;
 
 /**
 * Skip initial bytes when opening stream
 * - encoding: unused
- * - decoding: Set by user via AVOptions (NO direct access)
+ * - decoding: Set by user
 */
 int64_t skip_initial_bytes;
 
 /**
 * Correct single timestamp overflows
 * - encoding: unused
- * - decoding: Set by user via AVOptions (NO direct access)
+ * - decoding: Set by user
 */
 unsigned int correct_ts_overflow;
 
 /**
 * Force seeking to any (also non key) frames.
 * - encoding: unused
- * - decoding: Set by user via AVOptions (NO direct access)
+ * - decoding: Set by user
 */
 int seek2any;
 
 /**
 * Flush the I/O context after each packet.
- * - encoding: Set by user via AVOptions (NO direct access)
+ * - encoding: Set by user
 * - decoding: unused
 */
 int flush_packets;
@@ -1558,66 +1745,32 @@
 * The maximal score is AVPROBE_SCORE_MAX, its set when the demuxer probes
 * the format.
 * - encoding: unused
- * - decoding: set by avformat, read by user via av_format_get_probe_score() (NO direct access)
+ * - decoding: set by avformat, read by user
 */
 int probe_score;
 
 /**
 * number of bytes to read maximally to identify format.
 * - encoding: unused
- * - decoding: set by user through AVOPtions (NO direct access)
+ * - decoding: set by user
 */
 int format_probesize;
 
- /*****************************************************************
- * All fields below this line are not part of the public API. They
- * may not be used outside of libavformat and can be changed and
- * removed at will.
- * New public fields should be added right above.
- *****************************************************************
- */
-
- /**
- * This buffer is only needed when packets were already buffered but
- * not decoded, for example to get the codec parameters in MPEG
- * streams.
- */
- struct AVPacketList *packet_buffer;
- struct AVPacketList *packet_buffer_end;
-
- /* av_seek_frame() support */
- int64_t data_offset; /**< offset of the first packet */
-
- /**
- * Raw packets from the demuxer, prior to parsing and decoding.
- * This buffer is used for buffering packets until the codec can
- * be identified, as parsing cannot be done without knowing the
- * codec.
- */
- struct AVPacketList *raw_packet_buffer;
- struct AVPacketList *raw_packet_buffer_end;
- /**
- * Packets split by the parser get queued here.
- */
- struct AVPacketList *parse_queue;
- struct AVPacketList *parse_queue_end;
- /**
- * Remaining size available for raw_packet_buffer, in bytes.
- */
-#define RAW_PACKET_BUFFER_SIZE 2500000
- int raw_packet_buffer_remaining_size;
-
 /**
- * Offset to remap timestamps to be non-negative.
- * Expressed in timebase units.
- * @see AVStream.mux_ts_offset
+ * ',' separated list of allowed decoders.
+ * If NULL then all are allowed
+ * - encoding: unused
+ * - decoding: set by user
 */
- int64_t offset;
+ char *codec_whitelist;
 
 /**
- * Timebase for the timestamp offset.
+ * ',' separated list of allowed demuxers.
+ * If NULL then all are allowed
+ * - encoding: unused
+ * - decoding: set by user
 */
- AVRational offset_timebase;
+ char *format_whitelist;
 
 /**
 * An opaque field for libavformat internal usage.
@@ -1637,7 +1790,7 @@
 * Forced video codec.
 * This allows forcing a specific decoder, even when there are multiple with
 * the same codec_id.
- * Demuxing: Set by user via av_format_set_video_codec (NO direct access).
+ * Demuxing: Set by user
 */
 AVCodec *video_codec;
 
@@ -1645,7 +1798,7 @@
 * Forced audio codec.
 * This allows forcing a specific decoder, even when there are multiple with
 * the same codec_id.
- * Demuxing: Set by user via av_format_set_audio_codec (NO direct access).
+ * Demuxing: Set by user
 */
 AVCodec *audio_codec;
 
@@ -1653,11 +1806,19 @@
 * Forced subtitle codec.
 * This allows forcing a specific decoder, even when there are multiple with
 * the same codec_id.
- * Demuxing: Set by user via av_format_set_subtitle_codec (NO direct access).
+ * Demuxing: Set by user
 */
 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
+ */
+ 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.
@@ -1667,7 +1828,6 @@
 /**
 * User data.
 * This is a place for some private data of the user.
- * Mostly usable with control_message_cb or any future callbacks in device's context.
 */
 void *opaque;
 
@@ -1678,41 +1838,136 @@
 
 /**
 * Output timestamp offset, in microseconds.
- * Muxing: set by user via AVOptions (NO direct access)
+ * Muxing: set by user
 */
 int64_t output_ts_offset;
 
 /**
- * Maximum duration (in AV_TIME_BASE units) of the data read
- * from input in avformat_find_stream_info().
- * Demuxing only, set by the caller before avformat_find_stream_info()
- * via AVOptions (NO direct access).
- * Can be set to 0 to let avformat choose using a heuristic.
+ * dump format separator.
+ * can be ", " or "\n " or anything else
+ * - muxing: Set by user.
+ * - demuxing: Set by user.
 */
- int64_t max_analyze_duration2;
+ uint8_t *dump_separator;
 
 /**
- * Maximum size of the data read from input for determining
- * the input container format.
- * Demuxing only, set by the caller before avformat_open_input()
- * via AVOptions (NO direct access).
+ * Forced Data codec_id.
+ * Demuxing: Set by user.
+ */
+ enum AVCodecID data_codec_id;
+
+#if FF_API_OLD_OPEN_CALLBACKS
+ /**
+ * Called to open further IO contexts when needed for demuxing.
+ *
+ * This can be set by the user application to perform security checks on
+ * the URLs before opening them.
+ * The function should behave like avio_open2(), AVFormatContext is provided
+ * as contextual information and to reach AVFormatContext.opaque.
+ *
+ * If NULL then some simple checks are used together with avio_open2().
+ *
+ * Must not be accessed directly from outside avformat.
+ * @See av_format_set_open_cb()
+ *
+ * Demuxing: Set by user.
+ *
+ * @deprecated Use io_open and io_close.
+ */
+ attribute_deprecated
+ int (*open_cb)(struct AVFormatContext *s, AVIOContext **p, const char *url, int flags, const AVIOInterruptCB *int_cb, AVDictionary **options);
+#endif
+
+ /**
+ * ',' 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
 */
- int64_t probesize2;
+ char *protocol_blacklist;
+
+ /**
+ * The maximum number of streams.
+ * - encoding: unused
+ * - decoding: set by user
+ */
+ int max_streams;
 } AVFormatContext;
 
+#if FF_API_FORMAT_GET_SET
+/**
+ * Accessors for some AVFormatContext fields. These used to be provided for ABI
+ * compatibility, and do not need to be used anymore.
+ */
+attribute_deprecated
 int av_format_get_probe_score(const AVFormatContext *s);
+attribute_deprecated
 AVCodec * av_format_get_video_codec(const AVFormatContext *s);
+attribute_deprecated
 void av_format_set_video_codec(AVFormatContext *s, AVCodec *c);
+attribute_deprecated
 AVCodec * av_format_get_audio_codec(const AVFormatContext *s);
+attribute_deprecated
 void av_format_set_audio_codec(AVFormatContext *s, AVCodec *c);
+attribute_deprecated
 AVCodec * av_format_get_subtitle_codec(const AVFormatContext *s);
+attribute_deprecated
 void av_format_set_subtitle_codec(AVFormatContext *s, AVCodec *c);
+attribute_deprecated
+AVCodec * av_format_get_data_codec(const AVFormatContext *s);
+attribute_deprecated
+void av_format_set_data_codec(AVFormatContext *s, AVCodec *c);
+attribute_deprecated
 int av_format_get_metadata_header_padding(const AVFormatContext *s);
+attribute_deprecated
 void av_format_set_metadata_header_padding(AVFormatContext *s, int c);
+attribute_deprecated
 void * av_format_get_opaque(const AVFormatContext *s);
+attribute_deprecated
 void av_format_set_opaque(AVFormatContext *s, void *opaque);
+attribute_deprecated
 av_format_control_message av_format_get_control_message_cb(const AVFormatContext *s);
+attribute_deprecated
 void av_format_set_control_message_cb(AVFormatContext *s, av_format_control_message callback);
+#if FF_API_OLD_OPEN_CALLBACKS
+attribute_deprecated AVOpenCallback av_format_get_open_cb(const AVFormatContext *s);
+attribute_deprecated void av_format_set_open_cb(AVFormatContext *s, AVOpenCallback callback);
+#endif
+#endif
 
 /**
 * This function will cause global side data to be injected in the next packet
@@ -1757,6 +2012,7 @@
 */
 const char *avformat_license(void);
 
+#if FF_API_NEXT
 /**
 * Initialize libavformat and register all the muxers, demuxers and
 * protocols. If you do not call this function, then you can select
@@ -1765,31 +2021,44 @@
 * @see av_register_input_format()
 * @see av_register_output_format()
 */
+attribute_deprecated
 void av_register_all(void);
 
+attribute_deprecated
 void av_register_input_format(AVInputFormat *format);
+attribute_deprecated
 void av_register_output_format(AVOutputFormat *format);
+#endif
 
 /**
- * Do global initialization of network components. This is optional,
- * but recommended, since it avoids the overhead of implicitly
- * doing the setup for each session.
+ * Do global initialization of network libraries. This is optional,
+ * and not recommended anymore.
 *
- * Calling this function will become mandatory if using network
- * protocols at some major version bump.
+ * 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.
+ * 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);
 
+#if FF_API_NEXT
 /**
 * If f is NULL, returns the first registered input format,
 * if f is non-NULL, returns the next registered input format after f
 * or NULL if f is the last one.
 */
+attribute_deprecated
 AVInputFormat *av_iformat_next(const AVInputFormat *f);
 
 /**
@@ -1797,7 +2066,31 @@
 * if f is non-NULL, returns the next registered output format after f
 * or NULL if f is the last one.
 */
+attribute_deprecated
 AVOutputFormat *av_oformat_next(const AVOutputFormat *f);
+#endif
+
+/**
+ * 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.
@@ -1842,6 +2135,31 @@
 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, int size);
+/**
 * Get side information from stream.
 *
 * @param stream stream
@@ -1849,7 +2167,7 @@
 * @param size pointer for side information size to store (optional)
 * @return pointer to data if present or NULL otherwise
 */
-uint8_t *av_stream_get_side_data(AVStream *stream,
+uint8_t *av_stream_get_side_data(const AVStream *stream,
 enum AVPacketSideDataType type, int *size);
 
 AVProgram *av_new_program(AVFormatContext *s, int id);
@@ -1859,16 +2177,6 @@
 */
 
 
-#if FF_API_ALLOC_OUTPUT_CONTEXT
-/**
- * @deprecated deprecated in favor of avformat_alloc_output_context2()
- */
-attribute_deprecated
-AVFormatContext *avformat_alloc_output_context(const char *format,
- AVOutputFormat *oformat,
- const char *filename);
-#endif
-
 /**
 * Allocate an AVFormatContext for an output format.
 * avformat_free_context() can be used to free the context and
@@ -1938,7 +2246,7 @@
 *
 * @param pb the bytestream to probe
 * @param fmt the input format is put here
- * @param filename the filename of the stream
+ * @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)
@@ -1947,14 +2255,14 @@
 * AVERROR code otherwise
 */
 int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
- const char *filename, void *logctx,
+ 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, AVInputFormat **fmt,
- const char *filename, void *logctx,
+ const char *url, void *logctx,
 unsigned int offset, unsigned int max_probe_size);
 
 /**
@@ -1965,7 +2273,7 @@
 * May be a pointer to NULL, in which case an AVFormatContext is allocated by this
 * function and written into ps.
 * Note that a user-supplied AVFormatContext will be freed on failure.
- * @param filename Name of the stream to open.
+ * @param 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.
@@ -1976,31 +2284,11 @@
 *
 * @note If you want to use custom IO, preallocate the format context and set its pb field.
 */
-int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options);
+int avformat_open_input(AVFormatContext **ps, const char *url, AVInputFormat *fmt, AVDictionary **options);
 
 attribute_deprecated
 int av_demuxer_open(AVFormatContext *ic);
 
-#if FF_API_FORMAT_PARAMETERS
-/**
- * Read packets of a media file to get stream information. This
- * is useful for file formats with no headers such as MPEG. This
- * function also computes the real framerate in case of MPEG-2 repeat
- * frame mode.
- * The logical file position is not changed by this function;
- * examined packets may be buffered for later processing.
- *
- * @param ic media file handle
- * @return >=0 if OK, AVERROR_xxx on error
- * @todo Let the user decide somehow what information is needed so that
- * we do not waste time getting stuff the user does not need.
- *
- * @deprecated use avformat_find_stream_info.
- */
-attribute_deprecated
-int av_find_stream_info(AVFormatContext *ic);
-#endif
-
 /**
 * Read packets of a media file to get stream information. This
 * is useful for file formats with no headers such as MPEG. This
@@ -2036,6 +2324,8 @@
 */
 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
@@ -2067,24 +2357,6 @@
 AVCodec **decoder_ret,
 int flags);
 
-#if FF_API_READ_PACKET
-/**
- * @deprecated use AVFMT_FLAG_NOFILLIN | AVFMT_FLAG_NOPARSE to read raw
- * unprocessed packets
- *
- * Read a transport packet from a media file.
- *
- * This function is obsolete and should never be used.
- * Use av_read_frame() instead.
- *
- * @param s media file handle
- * @param pkt is filled
- * @return 0 if OK, AVERROR_xxx on error
- */
-attribute_deprecated
-int av_read_packet(AVFormatContext *s, AVPacket *pkt);
-#endif
-
 /**
 * Return the next frame of a stream.
 * This function returns what is stored in the file, and does not validate
@@ -2096,7 +2368,7 @@
 * If pkt->buf is NULL, then the packet is valid until the next
 * av_read_frame() or until avformat_close_input(). Otherwise the packet
 * is valid indefinitely. In both cases the packet must be freed with
- * av_free_packet when it is no longer needed. For video, the packet contains
+ * 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.
@@ -2158,6 +2430,24 @@
 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.
 */
@@ -2170,17 +2460,6 @@
 */
 int av_read_pause(AVFormatContext *s);
 
-#if FF_API_CLOSE_INPUT_FILE
-/**
- * @deprecated use avformat_close_input()
- * Close a media file (but not its codecs).
- *
- * @param s media file handle
- */
-attribute_deprecated
-void av_close_input_file(AVFormatContext *s);
-#endif
-
 /**
 * Close an opened input AVFormatContext. Free it and all its contents
 * and set *s to NULL.
@@ -2190,30 +2469,6 @@
 * @}
 */
 
-#if FF_API_NEW_STREAM
-/**
- * Add a new stream to a media file.
- *
- * Can only be called in the read_header() function. If the flag
- * AVFMTCTX_NOHEADER is in the format context, then new streams
- * can be added in read_packet too.
- *
- * @param s media file handle
- * @param id file-format-dependent stream ID
- */
-attribute_deprecated
-AVStream *av_new_stream(AVFormatContext *s, int id);
-#endif
-
-#if FF_API_SET_PTS_INFO
-/**
- * @deprecated this function is not supposed to be called outside of lavf
- */
-attribute_deprecated
-void av_set_pts_info(AVStream *s, int pts_wrap_bits,
- unsigned int pts_num, unsigned int pts_den);
-#endif
-
 #define AVSEEK_FLAG_BACKWARD 1 ///< seek backward
 #define AVSEEK_FLAG_BYTE 2 ///< seeking based on position in bytes
 #define AVSEEK_FLAG_ANY 4 ///< seek to any frame, even non-keyframes
@@ -2223,6 +2478,10 @@
 * @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.
@@ -2234,13 +2493,38 @@
 * On return this parameter will be destroyed and replaced with a dict containing
 * options that were not found. May be NULL.
 *
- * @return 0 on success, negative AVERROR on failure.
+ * @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.
+ * @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
@@ -2262,10 +2546,17 @@
 * 
 * Packet's @ref AVPacket.stream_index "stream_index" field must be
 * set to the index of the corresponding stream in @ref
- * AVFormatContext.streams "s->streams". It is very strongly
- * recommended that timing information (@ref AVPacket.pts "pts", @ref
- * AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to
- * correct values.
+ * AVFormatContext.streams "s->streams".
+ * 
+ * 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()
@@ -2280,6 +2571,10 @@
 * 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.
 * 
@@ -2295,10 +2590,16 @@
 * 
 * Packet's @ref AVPacket.stream_index "stream_index" field must be
 * set to the index of the corresponding stream in @ref
- * AVFormatContext.streams "s->streams". It is very strongly
- * recommended that timing information (@ref AVPacket.pts "pts", @ref
- * AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to
- * correct values.
+ * AVFormatContext.streams "s->streams".
+ * 
+ * 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. Libavformat will always
 * take care of freeing the packet, even if this function fails.
@@ -2308,7 +2609,7 @@
 int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
 
 /**
- * Write a uncoded frame to an output media file.
+ * Write an uncoded frame to an output media file.
 *
 * The frame must be correctly interleaved according to the container
 * specification; if not, then av_interleaved_write_frame() must be used.
@@ -2319,9 +2620,9 @@
 AVFrame *frame);
 
 /**
- * Write a uncoded frame to an output media file.
+ * Write an uncoded frame to an output media file.
 *
- * If the muxer supports it, this function allows to write an AVFrame
+ * 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.
@@ -2561,6 +2862,9 @@
 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.
 *
@@ -2571,8 +2875,12 @@
 * @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);
 
@@ -2705,6 +3013,52 @@
 
 int avformat_queue_attached_pictures(AVFormatContext *s);
 
+#if FF_API_OLD_BSF
+/**
+ * Apply a list of bitstream filters to a packet.
+ *
+ * @param codec AVCodecContext, usually from an AVStream
+ * @param pkt the packet to apply filters to. If, on success, the returned
+ * packet has size == 0 and side_data_elems == 0, it indicates that
+ * the packet should be dropped
+ * @param bsfc a NULL-terminated list of filters to apply
+ * @return >=0 on success;
+ * AVERROR code on failure
+ */
+attribute_deprecated
+int av_apply_bitstream_filters(AVCodecContext *codec, AVPacket *pkt,
+ AVBitStreamFilterContext *bsfc);
+#endif
+
+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);
 
 /**
 * @}

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavformat/avio.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavformat/avio.h Changed

@@ -34,8 +34,15 @@
 
 #include "libavformat/version.h"
 
+/**
+ * Seeking works like for a local file.
+ */
+#define AVIO_SEEKABLE_NORMAL (1 << 0)
 
-#define AVIO_SEEKABLE_NORMAL 0x0001 /**< Seeking works like for a local file */
+/**
+ * Seeking by timestamp with avio_seek_time() is possible.
+ */
+#define AVIO_SEEKABLE_TIME (1 << 1)
 
 /**
 * Callback for checking whether to abort blocking functions.
@@ -54,6 +61,92 @@
 } 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 fields can be added to the end with minor version bumps.
 * Removal, reordering and changes to existing fields require a major
@@ -79,6 +172,57 @@
 * 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 */
@@ -92,7 +236,6 @@
 int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
 int64_t (*seek)(void *opaque, int64_t offset, int whence);
 int64_t pos; /**< position in the file of the current buffer */
- int must_flush; /**< true if the next seek should flush */
 int eof_reached; /**< true if eof reached */
 int write_flag; /**< true if open for writing */
 int max_packet_size;
@@ -153,9 +296,60 @@
 * This field is internal to libavformat and access from outside is not allowed.
 */
 int orig_buffer_size;
-} AVIOContext;
 
-/* unbuffered I/O */
+ /**
+ * Threshold to favor readahead over seek.
+ * This is current internal only, do not use from outside.
+ */
+ int short_seek_threshold;
+
+ /**
+ * ',' 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;
+
+ /**
+ * Internal, not meant to be used from outside of AVIOContext.
+ */
+ enum AVIODataMarkerType current_type;
+ int64_t last_time;
+
+ /**
+ * A callback that is used instead of short_seek_threshold.
+ * This is current internal only, do not use from outside.
+ */
+ int (*short_seek_get)(void *opaque);
+
+ int64_t written;
+
+ /**
+ * 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;
+
+ /**
+ * Try to buffer at least this amount of data before flushing it
+ */
+ int min_packet_size;
+} AVIOContext;
 
 /**
 * Return the name of the protocol that will handle the passed URL.
@@ -181,17 +375,84 @@
 int avio_check(const char *url, int flags);
 
 /**
+ * Move or rename a resource.
+ *
+ * @note url_src and url_dst should share the same protocol and authority.
+ *
+ * @param url_src url to resource to be moved
+ * @param url_dst new url to resource if the operation succeeded
+ * @return >=0 on success or negative on error.
+ */
+int avpriv_io_move(const char *url_src, const char *url_dst);
+
+/**
+ * Delete a resource.
+ *
+ * @param url resource to be deleted.
+ * @return >=0 on success or negative on error.
+ */
+int avpriv_io_delete(const char *url);
+
+/**
+ * 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.
+ * @param[out] 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 av_free().
+ * 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.
@@ -207,6 +468,14 @@
 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);
@@ -226,19 +495,43 @@
 
 /**
 * 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);
 
 /**
- * Passing this as the "whence" parameter to a seek function causes it to
+ * 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
 
 /**
- * Oring this flag as into the "whence" parameter to a seek function causes it to
+ * 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.
@@ -277,22 +570,19 @@
 * @return non zero if and only if end of file
 */
 int avio_feof(AVIOContext *s);
-#if FF_API_URL_FEOF
-/**
- * @deprecated use avio_feof()
- */
-attribute_deprecated
-int url_feof(AVIOContext *s);
-#endif
 
-/** @warning currently size is limited */
+/** @warning Writes up to 4 KiB per call */
 int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
 
 /**
- * Force flushing of buffered data to the output s.
+ * Force flushing of buffered data.
 *
- * Force the buffered data to be immediately written to the output,
+ * 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);
 
@@ -303,6 +593,15 @@
 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
 * @{
 *
@@ -453,9 +752,21 @@
 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 FF_INPUT_BUFFER_PADDING_SIZE is added to the buffer.
+ * Padding of AV_INPUT_BUFFER_PADDING_SIZE is added to the buffer.
 *
 * @param s IO context
 * @param pbuffer pointer to a byte buffer
@@ -518,4 +829,33 @@
 */
 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-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavformat/version.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavformat/version.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/adler32.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/adler32.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/aes.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/aes.h Changed

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

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/aes_ctr.h Added

@@ -0,0 +1,88 @@
+/*
+ * 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"
+#include "version.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-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/attributes.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/attributes.h Changed

@@ -27,9 +27,11 @@
 #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_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
 
 #ifndef av_always_inline
@@ -50,6 +52,12 @@
 #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)
@@ -58,19 +66,19 @@
 # define av_noinline
 #endif
 
-#if AV_GCC_VERSION_AT_LEAST(3,1)
+#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)
+#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)
+#if AV_GCC_VERSION_AT_LEAST(4,3) || defined(__clang__)
 # define av_cold __attribute__((cold))
 #else
 # define av_cold
@@ -113,8 +121,7 @@
 #endif
 #endif
 
-
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__clang__)
 # define av_unused __attribute__((unused))
 #else
 # define av_unused
@@ -125,25 +132,25 @@
 * away. This is useful for variables accessed only from inline
 * assembler without the compiler being aware.
 */
-#if AV_GCC_VERSION_AT_LEAST(3,1)
+#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)
+#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(__INTEL_COMPILER) && !defined(__clang__)
+#if (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER)
 # define av_uninit(x) x=x
 #else
 # define av_uninit(x) x
 #endif
 
-#ifdef __GNUC__
+#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
@@ -151,7 +158,7 @@
 # define av_printf_format(fmtpos, attrpos)
 #endif
 
-#if AV_GCC_VERSION_AT_LEAST(2,5)
+#if AV_GCC_VERSION_AT_LEAST(2,5) || defined(__clang__)
 # define av_noreturn __attribute__((noreturn))
 #else
 # define av_noreturn

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/audio_fifo.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/audio_fifo.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/avassert.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/avassert.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/avconfig.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/avconfig.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/avstring.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/avstring.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/avutil.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/avutil.h Changed

@@ -23,7 +23,8 @@
 
 /**
 * @file
- * external API header
+ * @ingroup lavu
+ * Convenience header that includes @ref lavu "libavutil"'s core.
 */
 
 /**
@@ -78,14 +79,15 @@
 */
 
 /**
- * @defgroup lavu Common utility functions
+ * @defgroup lavu libavutil
+ * Common code shared across all FFmpeg libraries.
 *
- * @brief
- * libavutil contains the code shared across all the other FFmpeg
- * libraries
- *
- * @note In order to use the functions provided by avutil you must include
- * the specific header.
+ * @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.
 *
 * @{
 *
@@ -94,7 +96,7 @@
 * @{
 * @}
 *
- * @defgroup lavu_math Maths
+ * @defgroup lavu_math Mathematics
 * @{
 *
 * @}
@@ -116,36 +118,34 @@
 *
 * @}
 *
- * @defgroup lavu_audio Audio related
+ * @defgroup lavu_video Video related
 *
 * @{
 *
 * @}
 *
- * @defgroup lavu_error Error Codes
+ * @defgroup lavu_audio Audio related
 *
 * @{
 *
 * @}
 *
- * @defgroup lavu_log Logging Facility
+ * @defgroup lavu_error Error Codes
 *
 * @{
 *
 * @}
 *
- * @defgroup lavu_misc Other
+ * @defgroup lavu_log Logging Facility
 *
 * @{
 *
- * @defgroup lavu_internal Internal
+ * @}
 *
- * Not exported functions, for internal usage only
+ * @defgroup lavu_misc Other
 *
 * @{
 *
- * @}
- *
 * @defgroup preproc_misc Preprocessor String Macros
 *
 * @{
@@ -171,6 +171,13 @@
 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);
@@ -267,7 +274,7 @@
 AV_PICTURE_TYPE_I, ///< Intra
 AV_PICTURE_TYPE_P, ///< Predicted
 AV_PICTURE_TYPE_B, ///< Bi-dir predicted
- AV_PICTURE_TYPE_S, ///< S(GMC)-VOP MPEG4
+ AV_PICTURE_TYPE_S, ///< S(GMC)-VOP MPEG-4
 AV_PICTURE_TYPE_SI, ///< Switching Intra
 AV_PICTURE_TYPE_SP, ///< Switching Predicted
 AV_PICTURE_TYPE_BI, ///< BI type
@@ -336,6 +343,20 @@
 */
 AVRational av_get_time_base_q(void);
 
+#define AV_FOURCC_MAX_STRING_SIZE 32
+
+#define av_fourcc2str(fourcc) av_fourcc_make_string((char[AV_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);
+
 /**
 * @}
 * @}

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/base64.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/base64.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/blowfish.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/blowfish.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/bprint.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/bprint.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/bswap.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/bswap.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/buffer.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/buffer.h Changed

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

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/camellia.h Added

@@ -0,0 +1,70 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/cast5.h Added

@@ -0,0 +1,80 @@
+/*
+ * 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-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/channel_layout.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/channel_layout.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/common.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/common.h Changed

@@ -40,6 +40,7 @@
 #include <string.h>
 
 #include "attributes.h"
+#include "macros.h"
 #include "version.h"
 #include "libavutil/avconfig.h"
 
@@ -53,14 +54,43 @@
 #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
 /* assume b>0 */
 #define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
-/* assume a>0 and b>0 */
-#define FF_CEIL_RSHIFT(a,b) (!av_builtin_constant_p(b) ? -((-(a)) >> (b)) \
+/* 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)))
+
+/**
+ * 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))
@@ -68,17 +98,9 @@
 
 #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 FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
 
 /* misc math functions */
 
-/**
- * Reverse the order of the bits of an 8-bits unsigned integer.
- */
-#if FF_API_AV_REVERSE
-extern attribute_deprecated const uint8_t av_reverse[256];
-#endif
-
 #ifdef HAVE_AV_CONFIG_H
 # include "config.h"
 # include "intmath.h"
@@ -136,7 +158,7 @@
 */
 static av_always_inline av_const uint8_t av_clip_uint8_c(int a)
 {
- if (a&(~0xFF)) return (-a)>>31;
+ if (a&(~0xFF)) return (~a)>>31;
 else return a;
 }
 
@@ -147,7 +169,7 @@
 */
 static av_always_inline av_const int8_t av_clip_int8_c(int a)
 {
- if ((a+0x80) & ~0xFF) return (a>>31) ^ 0x7F;
+ if ((a+0x80U) & ~0xFF) return (a>>31) ^ 0x7F;
 else return a;
 }
 
@@ -158,7 +180,7 @@
 */
 static av_always_inline av_const uint16_t av_clip_uint16_c(int a)
 {
- if (a&(~0xFFFF)) return (-a)>>31;
+ if (a&(~0xFFFF)) return (~a)>>31;
 else return a;
 }
 
@@ -169,7 +191,7 @@
 */
 static av_always_inline av_const int16_t av_clip_int16_c(int a)
 {
- if ((a+0x8000) & ~0xFFFF) return (a>>31) ^ 0x7FFF;
+ if ((a+0x8000U) & ~0xFFFF) return (a>>31) ^ 0x7FFF;
 else return a;
 }
 
@@ -185,6 +207,20 @@
 }
 
 /**
+ * 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
@@ -192,11 +228,22 @@
 */
 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);
+ 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 & ((1 << p) - 1);
+}
+
+/**
 * Add two signed 32-bit values with saturation.
 *
 * @param a one value
@@ -213,7 +260,7 @@
 *
 * @param a first value
 * @param b value doubled and added to a
- * @return sum with signed saturation
+ * @return sum sat(a + sat(2*b)) with signed saturation
 */
 static av_always_inline int av_sat_dadd32_c(int a, int b)
 {
@@ -221,6 +268,30 @@
 }
 
 /**
+ * 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));
+}
+
+/**
 * Clip a float value into the amin-amax range.
 * @param a value to clip
 * @param amin minimum value of the clip range
@@ -287,6 +358,11 @@
 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;
+}
+
 #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))
 
@@ -307,13 +383,13 @@
 * to prevent undefined results.
 */
 #define GET_UTF8(val, GET_BYTE, ERROR)\
- val= GET_BYTE;\
+ val= (GET_BYTE);\
 {\
 uint32_t top = (val & 128) >> 1;\
 if ((val & 0xc0) == 0x80 || val >= 0xFE)\
 ERROR\
 while (val & top) {\
- int tmp= GET_BYTE - 128;\
+ int tmp= (GET_BYTE) - 128;\
 if(tmp>>6)\
 ERROR\
 val= (val<<6) + tmp;\
@@ -446,15 +522,27 @@
 #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_clipf
 # define av_clipf av_clipf_c
 #endif
@@ -467,3 +555,6 @@
 #ifndef av_popcount64
 # define av_popcount64 av_popcount64_c
 #endif
+#ifndef av_parity
+# define av_parity av_parity_c
+#endif

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/cpu.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/cpu.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/crc.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/crc.h Changed

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

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/des.h Added

@@ -0,0 +1,77 @@
+/*
+ * 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_keys[3][16];
+ 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-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/dict.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/dict.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/display.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/display.h Changed

@@ -18,107 +18,38 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#ifndef AVUTIL_DISPLAY_H
-#define AVUTIL_DISPLAY_H
-
-#include <stdint.h>
-
 /**
- * The display transformation matrix specifies an affine transformation that
- * should be applied to video frames for correct presentation. It is compatible
- * with the matrices stored in the ISO/IEC 14496-12 container format.
- *
- * The data is a 3x3 matrix represented as a 9-element array:
- *
- * | a b u |
- * (a, b, u, c, d, v, x, y, w) -> | c d v |
- * | x y w |
- *
- * All numbers are stored in native endianness, as 16.16 fixed-point values,
- * except for u, v and w, which are stored as 2.30 fixed-point values.
- *
- * The transformation maps a point (p, q) in the source (pre-transformation)
- * frame to the point (p', q') in the destination (post-transformation) frame as
- * follows:
- * | a b u |
- * (p, q, 1) . | c d v | = z * (p', q', 1)
- * | x y w |
- *
- * The transformation can also be more explicitly written in components as
- * follows:
- * p' = (a * p + c * q + x) / z;
- * q' = (b * p + d * q + y) / z;
- * z = u * p + v * q + w
+ * @file
+ * Display matrix
 */
 
-/**
- * Extract the rotation component of the transformation matrix.
- *
- * @param matrix the transformation matrix
- * @return the angle (in degrees) by which the transformation rotates the frame.
- * The angle will be in range [-180.0, 180.0], or NaN if the matrix is
- * singular.
- *
- * @note floating point numbers are inherently inexact, so callers are
- * recommended to round the return value to nearest integer before use.
- */
-double av_display_rotation_get(const int32_t matrix[9]);
+#ifndef AVUTIL_DISPLAY_H
+#define AVUTIL_DISPLAY_H
 
-/**
- * Initialize a transformation matrix describing a pure rotation by the
- * specified angle (in degrees).
- *
- * @param matrix an allocated transformation matrix (will be fully overwritten
- * by this function)
- * @param angle rotation angle in degrees.
- */
-void av_display_rotation_set(int32_t matrix[9], double angle);
+#include <stdint.h>
+#include "common.h"
 
 /**
- * Flip the input matrix horizontally and/or vertically.
- *
- * @param matrix an allocated transformation matrix
- * @param hflip whether the matrix should be flipped horizontally
- * @param vflip whether the matrix should be flipped vertically
- */
-void av_display_matrix_flip(int32_t matrix[9], int hflip, int vflip);
-
-#endif /* AVUTIL_DISPLAY_H */
-/*
- * Copyright (c) 2014 Vittorio Giovara <vittorio.giovara@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * @addtogroup lavu_video
+ * @{
 *
- * 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
+ * @defgroup lavu_video_display Display transformation matrix functions
+ * @{
 */
 
-#ifndef AVUTIL_DISPLAY_H
-#define AVUTIL_DISPLAY_H
-
-#include <stdint.h>
-
 /**
+ * @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.
@@ -126,24 +57,30 @@
 * 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.
- * The angle will be in range [-180.0, 180.0], or NaN if the matrix is
- * singular.
+ * @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.
@@ -151,8 +88,8 @@
 double av_display_rotation_get(const int32_t matrix[9]);
 
 /**
- * Initialize a transformation matrix describing a pure rotation by the
- * specified angle (in degrees).
+ * Initialize a transformation matrix describing a pure counterclockwise
+ * rotation by the specified angle (in degrees).
 *
 * @param matrix an allocated transformation matrix (will be fully overwritten
 * by this function)
@@ -169,4 +106,9 @@
 */
 void av_display_matrix_flip(int32_t matrix[9], int hflip, int vflip);
 
+/**
+ * @}
+ * @}
+ */
+
 #endif /* AVUTIL_DISPLAY_H */

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/downmix_info.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/downmix_info.h Changed

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

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/encryption_info.h Added

@@ -0,0 +1,200 @@
+/**
+ * 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. */
+ 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;
+} 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 key_id_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-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/error.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/error.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/eval.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/eval.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/ffversion.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/ffversion.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/fifo.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/fifo.h Changed

@@ -73,7 +73,7 @@
 * @param f AVFifoBuffer to read from
 * @return size
 */
-int av_fifo_size(FF_CONST_AVUTIL53 AVFifoBuffer *f);
+int av_fifo_size(const AVFifoBuffer *f);
 
 /**
 * Return the amount of space in bytes in the AVFifoBuffer, that is the
@@ -81,165 +81,28 @@
 * @param f AVFifoBuffer to write into
 * @return size
 */
-int av_fifo_space(FF_CONST_AVUTIL53 AVFifoBuffer *f);
+int av_fifo_space(const AVFifoBuffer *f);
 
 /**
- * Feed data from an AVFifoBuffer to a user-supplied callback.
+ * 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_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);
+int av_fifo_generic_peek_at(AVFifoBuffer *f, void *dest, int offset, int buf_size, void (*func)(void*, void*, int));
 
 /**
- * Read and discard the specified amount of data from an AVFifoBuffer.
- * @param f AVFifoBuffer to read from
- * @param size amount of data to read in bytes
- */
-void av_fifo_drain(AVFifoBuffer *f, int size);
-
-/**
- * Return a pointer to the data stored in a FIFO buffer at a certain offset.
- * The FIFO buffer is not modified.
- *
- * @param f AVFifoBuffer to peek at, f must be non-NULL
- * @param offs an offset in bytes, its absolute value must be less
- * than the used buffer size or the returned pointer will
- * point outside to the buffer data.
- * The used buffer size can be checked with av_fifo_size().
- */
-static inline uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs)
-{
- uint8_t *ptr = f->rptr + offs;
- if (ptr >= f->end)
- ptr = f->buffer + (ptr - f->end);
- else if (ptr < f->buffer)
- ptr = f->end - (f->buffer - ptr);
- return ptr;
-}
-
-#endif /* AVUTIL_FIFO_H */
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * a very simple circular buffer FIFO implementation
- */
-
-#ifndef AVUTIL_FIFO_H
-#define AVUTIL_FIFO_H
-
-#include <stdint.h>
-#include "avutil.h"
-#include "attributes.h"
-
-typedef struct AVFifoBuffer {
- uint8_t *buffer;
- uint8_t *rptr, *wptr, *end;
- uint32_t rndx, wndx;
-} AVFifoBuffer;
-
-/**
- * Initialize an AVFifoBuffer.
- * @param size of FIFO
- * @return AVFifoBuffer or NULL in case of memory allocation failure
- */
-AVFifoBuffer *av_fifo_alloc(unsigned int size);
-
-/**
- * Initialize an AVFifoBuffer.
- * @param nmemb number of elements
- * @param size size of the single element
- * @return AVFifoBuffer or NULL in case of memory allocation failure
- */
-AVFifoBuffer *av_fifo_alloc_array(size_t nmemb, size_t size);
-
-/**
- * Free an AVFifoBuffer.
- * @param f AVFifoBuffer to free
- */
-void av_fifo_free(AVFifoBuffer *f);
-
-/**
- * Free an AVFifoBuffer and reset pointer to NULL.
- * @param f AVFifoBuffer to free
- */
-void av_fifo_freep(AVFifoBuffer **f);
-
-/**
- * Reset the AVFifoBuffer to the state right after av_fifo_alloc, in particular it is emptied.
- * @param f AVFifoBuffer to reset
- */
-void av_fifo_reset(AVFifoBuffer *f);
-
-/**
- * Return the amount of data in bytes in the AVFifoBuffer, that is the
- * amount of data you can read from it.
+ * 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
- * @return size
- */
-int av_fifo_size(FF_CONST_AVUTIL53 AVFifoBuffer *f);
-
-/**
- * Return the amount of space in bytes in the AVFifoBuffer, that is the
- * amount of data you can write into it.
- * @param f AVFifoBuffer to write into
- * @return size
+ * @param buf_size number of bytes to read
+ * @param func generic read function
+ * @param dest data destination
 */
-int av_fifo_space(FF_CONST_AVUTIL53 AVFifoBuffer *f);
+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.

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/file.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/file.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/frame.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/frame.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/hash.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/hash.h Changed

@@ -18,122 +18,100 @@
 * 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 <stdint.h>
 
-struct AVHashContext;
+#include "version.h"
 
 /**
- * Allocate a hash context for the algorithm specified by name.
+ * @defgroup lavu_hash Hash Functions
+ * @ingroup lavu_crypto
+ * Hash functions useful in multimedia.
 *
- * @return >= 0 for success, a negative error code for failure
- * @note The context is not initialized, you must call av_hash_init().
- */
-int av_hash_alloc(struct AVHashContext **ctx, const char *name);
-
-/**
- * Get the names of available hash algorithms.
+ * 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.
 *
- * This function can be used to enumerate the algorithms.
+ * @{
 *
- * @param i index of the hash algorithm, starting from 0
- * @return a pointer to a static string or NULL if i is out of range
- */
-const char *av_hash_names(int i);
-
-/**
- * Get the name of the algorithm corresponding to the given hash context.
- */
-const char *av_hash_get_name(const struct AVHashContext *ctx);
-
-/**
- * Maximum value that av_hash_get_size will currently return.
+ * @defgroup lavu_hash_generic Generic Hashing API
+ * An abstraction layer for all hash functions supported by libavutil.
 *
- * You can use this if you absolutely want or need to use static allocation
- * and are fine with not supporting hashes newly added to libavutil without
- * recompilation.
- * Note that you still need to check against av_hash_get_size, adding new hashes
- * with larger sizes will not be considered an ABI change and should not cause
- * your code to overflow a buffer.
- */
-#define AV_HASH_MAX_SIZE 64
-
-/**
- * Get the size of the resulting hash value in bytes.
+ * 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.
 *
- * The pointer passed to av_hash_final have space for at least this many bytes.
- */
-int av_hash_get_size(const struct AVHashContext *ctx);
-
-/**
- * Initialize or reset a hash context.
- */
-void av_hash_init(struct AVHashContext *ctx);
-
-/**
- * Update a hash context with additional data.
- */
-void av_hash_update(struct AVHashContext *ctx, const uint8_t *src, int len);
-
-/**
- * Finalize a hash context and compute the actual hash value.
- */
-void av_hash_final(struct AVHashContext *ctx, uint8_t *dst);
-
-/**
- * Finalize a hash context and compute the actual hash value.
- * If size is smaller than the hash size, the hash is truncated;
- * if size is larger, the buffer is padded with 0.
- */
-void av_hash_final_bin(struct AVHashContext *ctx, uint8_t *dst, int size);
-
-/**
- * Finalize a hash context and compute the actual hash value as a hex string.
- * The string is always 0-terminated.
- * If size is smaller than 2 * hash_size + 1, the hex string is truncated.
- */
-void av_hash_final_hex(struct AVHashContext *ctx, uint8_t *dst, int size);
-
-/**
- * Finalize a hash context and compute the actual hash value as a base64 string.
- * The string is always 0-terminated.
- * If size is smaller than AV_BASE64_SIZE(hash_size), the base64 string is
- * truncated.
- */
-void av_hash_final_b64(struct AVHashContext *ctx, uint8_t *dst, int size);
-
-/**
- * Free hash context.
- */
-void av_hash_freep(struct AVHashContext **ctx);
-
-#endif /* AVUTIL_HASH_H */
-/*
- * Copyright (C) 2013 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
+ * @section Sample Code
 *
- * This file is part of FFmpeg.
+ * A basic template for using the Generic Hashing API follows:
 *
- * 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.
+ * @code
+ * struct AVHashContext *ctx = NULL;
+ * const char *hash_name = NULL;
+ * uint8_t *output_buf = NULL;
 *
- * 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.
+ * // Select from a string returned by av_hash_names()
+ * hash_name = ...;
 *
- * 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
+ * // 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.
+ *
+ * @{
 */
 
-#ifndef AVUTIL_HASH_H
-#define AVUTIL_HASH_H
-
-#include <stdint.h>
+/**
+ * @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;
 
@@ -141,7 +119,9 @@
 * Allocate a hash context for the algorithm specified by name.
 *
 * @return >= 0 for success, a negative error code for failure
- * @note The context is not initialized, you must call av_hash_init().
+ *
+ * @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);
 
@@ -150,8 +130,8 @@
 *
 * This function can be used to enumerate the algorithms.
 *
- * @param i index of the hash algorithm, starting from 0
- * @return a pointer to a static string or NULL if i is out of range
+ * @param[in] 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);
 
@@ -161,64 +141,129 @@
 const char *av_hash_get_name(const struct AVHashContext *ctx);
 
 /**
- * Maximum value that av_hash_get_size will currently return.
+ * 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.
 *
- * You can use this if you absolutely want or need to use static allocation
- * and are fine with not supporting hashes newly added to libavutil without
- * recompilation.
- * Note that you still need to check against av_hash_get_size, adding new hashes
- * with larger sizes will not be considered an ABI change and should not cause
- * your code to overflow a buffer.
+ * @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 pointer passed to av_hash_final have space for at least this many bytes.
+ * The maximum value this function will currently return is available as macro
+ * #AV_HASH_MAX_SIZE.
+ *
+ * @param[in] 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.
+ *
+ * @param[in,out] ctx Hash context
 */
 void av_hash_init(struct AVHashContext *ctx);
 
 /**
 * Update a hash context with additional data.
+ *
+ * @param[in,out] ctx Hash context
+ * @param[in] src Data to be added to the hash context
+ * @param[in] len Size of the additional data
 */
+#if FF_API_CRYPTO_SIZE_T
 void av_hash_update(struct AVHashContext *ctx, const uint8_t *src, int len);
+#else
+void av_hash_update(struct AVHashContext *ctx, const uint8_t *src, size_t len);
+#endif
 
 /**
 * 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.
+ *
+ * @param[in,out] ctx Hash context
+ * @param[out] 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 compute the actual hash value.
- * If size is smaller than the hash size, the hash is truncated;
- * if size is larger, the buffer is padded with 0.
+ * 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.
+ *
+ * @param[in,out] ctx Hash context
+ * @param[out] dst Where the final hash value will be stored
+ * @param[in] 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 compute the actual hash value as a hex string.
+ * 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, the hex string is truncated.
+ *
+ * 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.
+ *
+ * @param[in,out] ctx Hash context
+ * @param[out] dst Where the string will be stored
+ * @param[in] 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 compute the actual hash value as a base64 string.
+ * 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), the base64 string is
- * truncated.
+ *
+ * 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.
+ *
+ * @param[in,out] ctx Hash context
+ * @param[out] dst Where the final hash value will be stored
+ * @param[in] 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.
+ * Free hash context and set hash context pointer to `NULL`.
+ *
+ * @param[in,out] ctx Pointer to hash context
 */
 void av_hash_freep(struct AVHashContext **ctx);
 
+/**
+ * @}
+ * @}
+ */
+
 #endif /* AVUTIL_HASH_H */

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/hmac.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/hmac.h Changed

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

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/hwcontext.h Added

@@ -0,0 +1,584 @@
+/*
+ * 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,
+};
+
+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);
+
+
+/**
+ * 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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/hwcontext_cuda.h Added

@@ -0,0 +1,51 @@
+/*
+ * 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;
+ AVCUDADeviceContextInternal *internal;
+} AVCUDADeviceContext;
+
+/**
+ * AVHWFramesContext.hwctx is currently not used
+ */
+
+#endif /* AVUTIL_HWCONTEXT_CUDA_H */

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/hwcontext_d3d11va.h Added

@@ -0,0 +1,169 @@
+/*
+ * 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.data[0].
+ */
+ 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.data[1] (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;
+} AVD3D11VAFramesContext;
+
+#endif /* AVUTIL_HWCONTEXT_D3D11VA_H */

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/hwcontext_drm.h Added

@@ -0,0 +1,169 @@
+/*
+ * 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 planes[AV_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 objects[AV_DRM_MAX_PLANES];
+ /**
+ * Number of layers in the frame.
+ */
+ int nb_layers;
+ /**
+ * Array of layers in the frame.
+ */
+ AVDRMLayerDescriptor layers[AV_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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/hwcontext_dxva2.h Added

@@ -0,0 +1,75 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/hwcontext_mediacodec.h Added

@@ -0,0 +1,36 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/hwcontext_qsv.h Added

@@ -0,0 +1,53 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/hwcontext_vaapi.h Added

@@ -0,0 +1,117 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/hwcontext_vdpau.h Added

@@ -0,0 +1,44 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/hwcontext_videotoolbox.h Added

@@ -0,0 +1,54 @@
+/*
+ * 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 currently does not support frame allocation, as the raw VideoToolbox
+ * API does allocation, and FFmpeg itself never has the need to allocate frames.
+ *
+ * If the API user sets a custom pool, AVHWFramesContext.pool must return
+ * AVBufferRefs whose data pointer is a CVImageBufferRef or CVPixelBufferRef.
+ *
+ * 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);
+
+#endif /* AVUTIL_HWCONTEXT_VIDEOTOOLBOX_H */

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/imgutils.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/imgutils.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/intfloat.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/intfloat.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/intreadwrite.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/intreadwrite.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/lfg.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/lfg.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/log.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/log.h Changed

@@ -24,6 +24,7 @@
 #include <stdarg.h>
 #include "avutil.h"
 #include "attributes.h"
+#include "version.h"
 
 typedef enum {
 AV_CLASS_CATEGORY_NA = 0,
@@ -43,7 +44,7 @@
 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
+ AV_CLASS_CATEGORY_NB ///< not part of ABI/API
 }AVClassCategory;
 
 #define AV_IS_INPUT_DEVICE(category) \
@@ -195,7 +196,12 @@
 */
 #define AV_LOG_DEBUG 48
 
-#define AV_LOG_MAX_OFFSET (AV_LOG_DEBUG - AV_LOG_QUIET)
+/**
+ * Extremely verbose debugging, useful for libav* development.
+ */
+#define AV_LOG_TRACE 56
+
+#define AV_LOG_MAX_OFFSET (AV_LOG_TRACE - AV_LOG_QUIET)
 
 /**
 * @}
@@ -209,7 +215,7 @@
 * Requires 256color terminal support. Uses outside debugging is not
 * recommended.
 */
-#define AV_LOG_C(x) (x << 8)
+#define AV_LOG_C(x) ((x) << 8)
 
 /**
 * Send the specified message to the log if the level is less than or equal
@@ -219,7 +225,7 @@
 * @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.
+ * 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
@@ -303,7 +309,7 @@
 
 /**
 * Format a line of log the same way as the default callback.
- * @param line buffer to receive the formated line
+ * @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
@@ -312,15 +318,21 @@
 char *line, int line_size, int *print_prefix);
 
 /**
- * av_dlog macros
- * Useful to print debug messages that shouldn't get compiled in normally.
+ * 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.
 */
-
-#ifdef DEBUG
-# define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
-#else
-# define av_dlog(pctx, ...) do { if (0) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0)
-#endif
+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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/lzo.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/lzo.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/macros.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/macros.h Changed

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

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/mastering_display_metadata.h Added

@@ -0,0 +1,128 @@
+/*
+ * 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_primaries[3][2];
+
+ /**
+ * CIE 1931 xy chromaticity coords of white point.
+ */
+ AVRational white_point[2];
+
+ /**
+ * 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-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/mathematics.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/mathematics.h Changed

@@ -18,6 +18,12 @@
 * 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
 
@@ -63,83 +69,155 @@
 
 /**
 * @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.
- AV_ROUND_PASS_MINMAX = 8192, ///< Flag to pass INT64_MIN/MAX through instead of rescaling, this avoids special cases for AV_NOPTS_VALUE
+ /**
+ * 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,
 };
 
 /**
- * Return the greatest common divisor of a and b.
- * If both a and b are 0 or either or both are <0 then behavior is
- * undefined.
+ * 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.
- * A simple a*b/c isn't possible as it can overflow.
+ *
+ * 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.
- * A simple a*b/c isn't possible as it can overflow.
 *
- * @return rescaled value a, or if AV_ROUND_PASS_MINMAX is set and a is
- * INT64_MIN or INT64_MAX then a is passed through unchanged.
+ * The operation is mathematically equivalent to `a * b / c`, but writing that
+ * directly can overflow, and does not support different rounding methods.
+ *
+ * @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) av_const;
+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.
 *
- * @return rescaled value a, or if AV_ROUND_PASS_MINMAX is set and a is
- * INT64_MIN or INT64_MAX then a is passed through unchanged.
+ * 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) av_const;
+ enum AVRounding rnd) av_const;
 
 /**
- * Compare 2 timestamps each in its own timebases.
- * The result of the function is undefined if one of the timestamps
- * is outside the int64_t range when represented in the others timebase.
- * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position
+ * 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 2 integers modulo mod.
- * That is we compare integers a and b for which only the least
- * significant log2(mod) bits are known.
- *
- * @param mod must be a power of 2
- * @return a negative value if a is smaller than b
- * a positive value if a is greater than b
- * 0 if a equals b
+ * 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`
+ * - 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.
 *
- * @param in_ts Input timestamp
- * @param in_tb Input timebase
- * @param fs_tb Duration and *last timebase
- * @param duration duration till the next call
- * @param out_tb Output timebase
+ * 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.
+ *
+ * @param[in] in_tb Input time base
+ * @param[in] in_ts Input timestamp
+ * @param[in] fs_tb Duration time base; typically this is finer-grained
+ * (greater) than `in_tb` and `out_tb`
+ * @param[in] duration Duration till the next call to this function (i.e.
+ * duration of the current packet/frame)
+ * @param[in,out] last Pointer to a timestamp expressed in terms of
+ * `fs_tb`, acting as a state variable
+ * @param[in] 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);
 
@@ -149,15 +227,15 @@
 * This function guarantees that when the same value is repeatly added that
 * no accumulation of rounding errors occurs.
 *
- * @param ts Input timestamp
- * @param ts_tb Input timestamp timebase
- * @param inc value to add to ts
- * @param inc_tb inc timebase
+ * @param[in] ts Input timestamp
+ * @param[in] ts_tb Input timestamp time base
+ * @param[in] inc Value to be added
+ * @param[in] inc_tb Time base of `inc`
 */
 int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb, int64_t inc);
 
 
- /**
+/**
 * @}
 */

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/md5.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/md5.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/mem.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/mem.h Changed

@@ -20,7 +20,8 @@
 
 /**
 * @file
- * memory handling functions
+ * @ingroup lavu_mem
+ * Memory handling functions
 */
 
 #ifndef AVUTIL_MEM_H
@@ -35,37 +36,133 @@
 
 /**
 * @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.
+ *
 * @{
+ *
+ * @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_array[128];
+ * @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(__TI_COMPILER_VERSION__)
- #define DECLARE_ALIGNED(n,t,v) \
- AV_PRAGMA(DATA_ALIGN(v,n)) \
- t __attribute__((aligned(n))) v
- #define DECLARE_ASM_CONST(n,t,v) \
- AV_PRAGMA(DATA_ALIGN(v,n)) \
- static const t __attribute__((aligned(n))) v
-#elif defined(__GNUC__)
+#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
 
+/**
+ * @}
+ */
+
+/**
+ * @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
@@ -73,203 +170,423 @@
 #endif
 
 /**
- * Allocate a block of size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU).
- * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
+ * @}
+ */
+
+/**
+ * @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 block of size * nmemb bytes with av_malloc().
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
+ * 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()
 */
-av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size)
-{
- if (!size || nmemb >= INT_MAX / size)
- return NULL;
- return av_malloc(nmemb * size);
-}
+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()
+ */
+av_alloc_size(1, 2) void *av_mallocz_array(size_t nmemb, size_t size);
 
 /**
- * Allocate or reallocate a block of memory.
- * If ptr is NULL and size > 0, allocate a new block. If
- * size is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a memory block already allocated with
- * av_realloc() or NULL.
+ * Non-inlined equivalent of av_mallocz_array().
+ *
+ * Created for symmetry with the calloc() C function.
+ */
+void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib;
+
+/**
+ * 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 Pointers originating from the av_malloc() family of functions must
- * not be passed to av_realloc(). The former can be implemented using
- * memalign() (or other functions), and there is no guarantee that
- * pointers from such functions can be passed to realloc() at all.
- * The situation is undefined according to POSIX and may crash with
- * some libc implementations.
+ * 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 or reallocate a block of memory.
- * This function does the same thing as av_realloc, except:
- * - It takes two arguments and checks the result of the multiplication for
- * integer overflow.
- * - It frees the input block in case of failure, thus avoiding the memory
- * leak with the classic "buf = realloc(buf); if (!buf) return -1;".
+ * 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`.
+ *
+ * @param[in,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.
+ * @param[in] 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.
 */
-void *av_realloc_f(void *ptr, size_t nelem, size_t elsize);
+av_warn_unused_result
+int av_reallocp(void *ptr, size_t size);
 
 /**
- * Allocate or reallocate a block of memory.
- * If *ptr is NULL and size > 0, allocate a new block. If
- * size is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a pointer to a memory block already allocated
- * with av_realloc(), or pointer to a pointer to NULL.
- * The pointer is updated on success, or freed on failure.
- * @param size Size in bytes for the memory block to be allocated or
- * reallocated
- * @return Zero on success, an AVERROR error code on failure.
- * @warning Pointers originating from the av_malloc() family of functions must
- * not be passed to av_reallocp(). The former can be implemented using
- * memalign() (or other functions), and there is no guarantee that
- * pointers from such functions can be passed to realloc() at all.
- * The situation is undefined according to POSIX and may crash with
- * some libc implementations.
+ * 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.
 */
-int av_reallocp(void *ptr, size_t size);
+void *av_realloc_f(void *ptr, size_t nelem, size_t elsize);
 
 /**
- * Allocate or reallocate an array.
- * If ptr is NULL and nmemb > 0, allocate a new block. If
- * nmemb is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a memory block already allocated with
- * av_realloc() or NULL.
- * @param nmemb Number of elements
- * @param size Size of the single element
+ * 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 Pointers originating from the av_malloc() family of functions must
- * not be passed to av_realloc(). The former can be implemented using
- * memalign() (or other functions), and there is no guarantee that
- * pointers from such functions can be passed to realloc() at all.
- * The situation is undefined according to POSIX and may crash with
- * some libc implementations.
+ * 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 or reallocate an array through a pointer to a pointer.
- * If *ptr is NULL and nmemb > 0, allocate a new block. If
- * nmemb is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a pointer to a memory block already allocated
- * with av_realloc(), or pointer to a pointer to NULL.
- * The pointer is updated on success, or freed on failure.
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Zero on success, an AVERROR error code on failure.
- * @warning Pointers originating from the av_malloc() family of functions must
- * not be passed to av_realloc(). The former can be implemented using
- * memalign() (or other functions), and there is no guarantee that
- * pointers from such functions can be passed to realloc() at all.
- * The situation is undefined according to POSIX and may crash with
- * some libc implementations.
+ * 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`.
+ *
+ * @param[in,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.
+ * @param[in] nmemb Number of elements
+ * @param[in] 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.
 */
 av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
 
 /**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc().
- * @param ptr Pointer to the memory block which should be freed.
- * @note ptr = NULL is explicitly allowed.
- * @note It is recommended that you use av_freep() instead.
- * @see av_freep()
+ * 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
+ *
+ * @param[in,out] ptr Already allocated buffer, or `NULL`
+ * @param[in,out] size Pointer to current size of buffer `ptr`. `*size` is
+ * changed to `min_size` in case of success or 0 in
+ * case of failure
+ * @param[in] min_size New 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_free(void *ptr);
+void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
 
 /**
- * Allocate a block of size bytes 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, NULL if it cannot be allocated.
- * @see av_malloc()
+ * 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
+ *
+ * @param[in,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
+ * @param[in,out] size Pointer to current size of buffer `*ptr`. `*size` is
+ * changed to `min_size` in case of success or 0 in
+ * case of failure
+ * @param[in] min_size New size of buffer `*ptr`
+ * @see av_realloc()
+ * @see av_fast_mallocz()
 */
-void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
+void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
 
 /**
- * Allocate a block of nmemb * size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU) and
- * zero all the bytes of the block.
- * The allocation will fail if nmemb * size is greater than or equal
- * to INT_MAX.
- * @param nmemb
- * @param size
- * @return Pointer to the allocated block, NULL if it cannot be allocated.
+ * 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.
+ *
+ * @param[in,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
+ * @param[in,out] size Pointer to current size of buffer `*ptr`. `*size` is
+ * changed to `min_size` in case of success or 0 in
+ * case of failure
+ * @param[in] min_size New size of buffer `*ptr`
+ * @see av_fast_malloc()
 */
-void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib;
+void av_fast_mallocz(void *ptr, unsigned int *size, size_t min_size);
 
 /**
- * Allocate a block of size * nmemb bytes with av_mallocz().
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_mallocz()
- * @see av_malloc_array()
+ * 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()
 */
-av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
-{
- if (!size || nmemb >= INT_MAX / size)
- return NULL;
- return av_mallocz(nmemb * size);
-}
+void av_free(void *ptr);
 
 /**
- * Duplicate the string s.
- * @param s string to be duplicated
+ * 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.
+ * 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 the string s.
- * @param s string to be duplicated
- * @param len the maximum length of the resulting string (not counting the
- * terminating byte).
+ * 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
- * copy of s or NULL if the string cannot be allocated.
+ * substring of `s` or `NULL` if the string cannot be allocated
 */
 char *av_strndup(const char *s, size_t len) av_malloc_attrib;
 
 /**
- * Duplicate the buffer p.
- * @param p buffer to be duplicated
+ * 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.
+ * copy of `p` or `NULL` if the buffer cannot be allocated
 */
 void *av_memdup(const void *p, size_t size);
 
 /**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc() and set the pointer pointing to it to NULL.
- * @param ptr Pointer to the pointer to the memory block which should
- * be freed.
- * @note passing a pointer to a NULL pointer is safe and leads to no action.
- * @see av_free()
+ * 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_freep(void *ptr);
+void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
 
 /**
- * Add an element to a dynamic array.
+ * @}
+ */
+
+/**
+ * @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 == array[0]
+ * // &to_be_added2 == array[1]
+ *
+ * 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 == array[0]
+ * // to_be_added2 == array[1]
+ *
+ * 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
@@ -279,14 +596,14 @@
 * 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
+ * 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.
+ * In case of failure, the array is freed, `*tab_ptr` is set to `NULL` and
+ * `*nb_ptr` is set to 0.
 *
- * @param tab_ptr pointer to the array to grow
- * @param nb_ptr pointer to the number of elements in the array
- * @param elem element to add
+ * @param[in,out] tab_ptr Pointer to the array to grow
+ * @param[in,out] nb_ptr Pointer to the number of elements in the array
+ * @param[in] elem Element to add
 * @see av_dynarray_add_nofree(), av_dynarray2_add()
 */
 void av_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem);
@@ -298,47 +615,62 @@
 * but it doesn't free memory on fails. It returns error code
 * instead and leave current buffer untouched.
 *
- * @param tab_ptr pointer to the array to grow
- * @param nb_ptr pointer to the number of elements in the array
- * @param elem element to add
- * @return >=0 on success, negative otherwise.
+ * @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.
+ * 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
+ * point to the new grown array, and the number pointed to by `nb_ptr`
 * is incremented.
- * In case of failure, the array is freed, *tab_ptr is set to NULL and
- * *nb_ptr is set to 0.
- *
- * @param tab_ptr pointer to the array to grow
- * @param nb_ptr pointer to the number of elements in the array
- * @param elem_size size in bytes of the elements in the array
- * @param elem_data pointer to the data of the element to add. If NULL, the space of
- * the new added element is not filled.
- * @return pointer to the data of the element to copy in the new allocated space.
- * If NULL, the new allocated space is left uninitialized."
+ * In case of failure, the array is freed, `*tab_ptr` is set to `NULL` and
+ * `*nb_ptr` is set to 0.
+ *
+ * @param[in,out] tab_ptr Pointer to the array to grow
+ * @param[in,out] nb_ptr Pointer to the number of elements in the array
+ * @param[in] elem_size Size in bytes of an element in the array
+ * @param[in] 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);
 
 /**
- * Multiply two size_t values checking for overflow.
- * @return 0 if success, AVERROR(EINVAL) if overflow.
+ * @}
+ */
+
+/**
+ * @defgroup lavu_mem_misc Miscellaneous Functions
+ *
+ * Other functions related to memory allocation.
+ *
+ * @{
+ */
+
+/**
+ * Multiply two `size_t` values checking for overflow.
+ *
+ * @param[in] a,b Operands of multiplication
+ * @param[out] r Pointer to the result of the operation
+ * @return 0 on success, AVERROR(EINVAL) on overflow
 */
 static inline int av_size_mult(size_t a, size_t b, size_t *r)
 {
 size_t t = a * b;
- /* Hack inspired from glibc: only try the division if nelem and elsize
- * are both greater than sqrt(SIZE_MAX). */
+ /* Hack inspired from glibc: don't try the division if nelem and elsize
+ * are both less than sqrt(SIZE_MAX). */
 if ((a | b) >= ((size_t)1 << (sizeof(size_t) * 4)) && a && t / a != b)
 return AVERROR(EINVAL);
 *r = t;
@@ -346,44 +678,23 @@
 }
 
 /**
- * Set the maximum size that may me allocated in one block.
- */
-void av_max_alloc(size_t max);
-
-/**
- * deliberately overlapping memcpy implementation
- * @param dst destination buffer
- * @param back how many bytes back we start (the initial size of the overlapping window), must be > 0
- * @param cnt number of bytes to copy, must be >= 0
+ * Set the maximum size that may be allocated in one block.
 *
- * cnt > back is valid, this will copy the bytes we just copied,
- * thus creating a repeating pattern with a period length of back.
- */
-void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
-
-/**
- * Reallocate the given block if it is not large enough, otherwise do nothing.
+ * The value specified with this function is effective for all libavutil's @ref
+ * lavu_mem_funcs "heap management functions."
 *
- * @see av_realloc
- */
-void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Allocate a buffer, reusing the given one if large enough.
+ * By default, the max value is defined as `INT_MAX`.
 *
- * Contrary to av_fast_realloc the current buffer contents might not be
- * preserved and on error the old buffer is freed, thus no special
- * handling to avoid memleaks is necessary.
+ * @param max Value to be set as the new maximum size
 *
- * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
- * @param size size of the buffer *ptr points to
- * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
- * *size 0 if an error occurred.
+ * @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_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
+void av_max_alloc(size_t max);
 
 /**
 * @}
+ * @}
 */
 
 #endif /* AVUTIL_MEM_H */

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/motion_vector.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/motion_vector.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/murmur3.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/murmur3.h Changed

@@ -18,47 +18,103 @@
 * 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 <stdint.h>
 
-struct AVMurMur3 *av_murmur3_alloc(void);
-void av_murmur3_init_seeded(struct AVMurMur3 *c, uint64_t seed);
-void av_murmur3_init(struct AVMurMur3 *c);
-void av_murmur3_update(struct AVMurMur3 *c, const uint8_t *src, int len);
-void av_murmur3_final(struct AVMurMur3 *c, uint8_t dst[16]);
+#include "version.h"
 
-#endif /* AVUTIL_MURMUR3_H */
-/*
- * Copyright (C) 2013 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
+/**
+ * @defgroup lavu_murmur3 Murmur3
+ * @ingroup lavu_hash
+ * MurmurHash3 hash function implementation.
 *
- * This file is part of FFmpeg.
+ * MurmurHash3 is a non-cryptographic hash function, of which three
+ * incompatible versions were created by its inventor Austin Appleby:
 *
- * 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.
+ * - 32-bit output
+ * - 128-bit output for 32-bit platforms
+ * - 128-bit output for 64-bit platforms
 *
- * 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.
+ * 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.
 *
- * 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
+ * @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.
+ *
+ * @{
 */
 
-#ifndef AVUTIL_MURMUR3_H
-#define AVUTIL_MURMUR3_H
-
-#include <stdint.h>
-
+/**
+ * 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.
+ *
+ * @param[out] c Hash context
+ * @param[in] 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.
+ *
+ * @param[out] 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.
+ *
+ * @param[out] c Hash context
+ * @param[in] src Input data to update hash with
+ * @param[in] len Number of bytes to read from `src`
+ */
+#if FF_API_CRYPTO_SIZE_T
 void av_murmur3_update(struct AVMurMur3 *c, const uint8_t *src, int len);
+#else
+void av_murmur3_update(struct AVMurMur3 *c, const uint8_t *src, size_t len);
+#endif
+
+/**
+ * Finish hashing and output digest value.
+ *
+ * @param[in,out] c Hash context
+ * @param[out] dst Buffer where output digest value is stored
+ */
 void av_murmur3_final(struct AVMurMur3 *c, uint8_t dst[16]);
 
+/**
+ * @}
+ */
+
 #endif /* AVUTIL_MURMUR3_H */

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/opt.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/opt.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/parseutils.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/parseutils.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/pixdesc.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/pixdesc.h Changed

@@ -26,35 +26,47 @@
 
 #include "attributes.h"
 #include "pixfmt.h"
+#include "version.h"
 
 typedef struct AVComponentDescriptor {
 /**
 * Which of the 4 planes contains the component.
 */
- uint16_t plane : 2;
+ int plane;
 
 /**
- * Number of elements between 2 horizontally consecutive pixels minus 1.
+ * Number of elements between 2 horizontally consecutive pixels.
 * Elements are bits for bitstream formats, bytes otherwise.
 */
- uint16_t step_minus1 : 3;
+ int step;
 
 /**
- * Number of elements before the component of the first pixel plus 1.
+ * Number of elements before the component of the first pixel.
 * Elements are bits for bitstream formats, bytes otherwise.
 */
- uint16_t offset_plus1 : 3;
+ int offset;
 
 /**
 * Number of least significant bits that must be shifted away
 * to get the value.
 */
- uint16_t shift : 3;
+ int shift;
 
 /**
- * Number of bits in the component minus 1.
+ * Number of bits in the component.
 */
- uint16_t depth_minus1 : 4;
+ int depth;
+
+#if FF_API_PLUS1_MINUS1
+ /** deprecated, use step instead */
+ attribute_deprecated int step_minus1;
+
+ /** deprecated, use depth instead */
+ attribute_deprecated int depth_minus1;
+
+ /** deprecated, use offset instead */
+ attribute_deprecated int offset_plus1;
+#endif
 } AVComponentDescriptor;
 
 /**
@@ -73,29 +85,34 @@
 /**
 * Amount to shift the luma width right to find the chroma width.
 * For YV12 this is 1 for example.
- * chroma_width = -((-luma_width) >> log2_chroma_w)
+ * 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; ///< chroma_width = -((-luma_width )>>log2_chroma_w)
+ 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= -((-luma_height) >> log2_chroma_h)
+ * 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;
- uint8_t flags;
+
+ /**
+ * Combination of AV_PIX_FMT_FLAG_... flags.
+ */
+ uint64_t flags;
 
 /**
 * Parameters that describe how pixels are packed.
- * If the format has 2 or 4 components, then alpha is last.
 * If the format has 1 or 2 components, then luma is 0.
- * If the format has 3 or 4 components,
- * if the RGB flag is set then 0 is red, 1 is green and 2 is blue;
- * otherwise 0 is luma, 1 is chroma-U and 2 is chroma-V.
+ * 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 comp[4];
 
@@ -129,109 +146,50 @@
 * The pixel format contains RGB-like data (as opposed to YUV/grayscale).
 */
 #define AV_PIX_FMT_FLAG_RGB (1 << 5)
-/**
- * The pixel format is "pseudo-paletted". This means that FFmpeg treats it as
- * paletted internally, but the palette is generated by the decoder and is not
- * stored in the file.
- */
-#define AV_PIX_FMT_FLAG_PSEUDOPAL (1 << 6)
-/**
- * The pixel format has an alpha channel.
- */
-#define AV_PIX_FMT_FLAG_ALPHA (1 << 7)
-
-#if FF_API_PIX_FMT
-/**
- * @deprecated use the AV_PIX_FMT_FLAG_* flags
- */
-#define PIX_FMT_BE AV_PIX_FMT_FLAG_BE
-#define PIX_FMT_PAL AV_PIX_FMT_FLAG_PAL
-#define PIX_FMT_BITSTREAM AV_PIX_FMT_FLAG_BITSTREAM
-#define PIX_FMT_HWACCEL AV_PIX_FMT_FLAG_HWACCEL
-#define PIX_FMT_PLANAR AV_PIX_FMT_FLAG_PLANAR
-#define PIX_FMT_RGB AV_PIX_FMT_FLAG_RGB
-#define PIX_FMT_PSEUDOPAL AV_PIX_FMT_FLAG_PSEUDOPAL
-#define PIX_FMT_ALPHA AV_PIX_FMT_FLAG_ALPHA
-#endif
 
-#if FF_API_PIX_FMT_DESC
 /**
- * The array of all the pixel format descriptors.
- */
-extern attribute_deprecated const AVPixFmtDescriptor av_pix_fmt_descriptors[];
-#endif
-
-/**
- * Read a line from an image, and write the values of the
- * pixel format component c to dst.
+ * The pixel format is "pseudo-paletted". This means that it contains a
+ * fixed palette in the 2nd plane but the palette is fixed/constant for each
+ * PIX_FMT. This allows interpreting the data as if it was PAL8, which can
+ * in some cases be simpler. Or the data can be interpreted purely based on
+ * the pixel format without using the palette.
+ * An example of a pseudo-paletted format is AV_PIX_FMT_GRAY8
 *
- * @param data the array containing the pointers to the planes of the image
- * @param linesize the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to read
- * @param y the vertical coordinate of the first pixel to read
- * @param w the width of the line to read, that is the number of
- * values to write to dst
- * @param read_pal_component if not zero and the format is a paletted
- * format writes the values corresponding to the palette
- * component c in data[1] to dst, rather than the palette indexes in
- * data[0]. The behavior is undefined if the format is not paletted.
+ * @deprecated This flag is deprecated, and will be removed. When it is removed,
+ * the extra palette allocation in AVFrame.data[1] is removed as well. Only
+ * actual paletted formats (as indicated by AV_PIX_FMT_FLAG_PAL) will have a
+ * palette. Starting with FFmpeg versions which have this flag deprecated, the
+ * extra "pseudo" palette is already ignored, and API users are not required to
+ * allocate a palette for AV_PIX_FMT_FLAG_PSEUDOPAL formats (it was required
+ * before the deprecation, though).
 */
-void av_read_image_line(uint16_t *dst, const uint8_t *data[4],
- const int linesize[4], const AVPixFmtDescriptor *desc,
- int x, int y, int c, int w, int read_pal_component);
-
-/**
- * Write the values from src to the pixel format component c of an
- * image line.
- *
- * @param src array containing the values to write
- * @param data the array containing the pointers to the planes of the
- * image to write into. It is supposed to be zeroed.
- * @param linesize the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to write
- * @param y the vertical coordinate of the first pixel to write
- * @param w the width of the line to write, that is the number of
- * values to write to the image line
- */
-void av_write_image_line(const uint16_t *src, uint8_t *data[4],
- const int linesize[4], const AVPixFmtDescriptor *desc,
- int x, int y, int c, int w);
+#define AV_PIX_FMT_FLAG_PSEUDOPAL (1 << 6)
 
 /**
- * Return the pixel format corresponding to name.
+ * The pixel format has an alpha channel. This is set on all formats that
+ * support alpha in some way. The exception is AV_PIX_FMT_PAL8, which can
+ * carry alpha as part of the palette. Details are explained in the
+ * AVPixelFormat enum, and are also encoded in the corresponding
+ * AVPixFmtDescriptor.
 *
- * 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".
+ * The alpha is always straight, never pre-multiplied.
 *
- * Finally if no pixel format has been found, returns AV_PIX_FMT_NONE.
+ * 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.
 */
-enum AVPixelFormat av_get_pix_fmt(const char *name);
+#define AV_PIX_FMT_FLAG_ALPHA (1 << 7)
 
 /**
- * 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()
+ * The pixel format is following a Bayer pattern
 */
-const char *av_get_pix_fmt_name(enum AVPixelFormat pix_fmt);
+#define AV_PIX_FMT_FLAG_BAYER (1 << 8)
 
 /**
- * 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.
+ * 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).
 */
-char *av_get_pix_fmt_string(char *buf, int buf_size,
- enum AVPixelFormat pix_fmt);
+#define AV_PIX_FMT_FLAG_FLOAT (1 << 9)
 
 /**
 * Return the number of bits per pixel used by the pixel format
@@ -275,14 +233,9 @@
 * Utility function to access log2_chroma_w log2_chroma_h from
 * the pixel format AVPixFmtDescriptor.
 *
- * See av_get_chroma_sub_sample() for a function that asserts a
- * valid pixel format instead of returning an error code.
- * Its recommended that you use avcodec_get_chroma_sub_sample unless
- * you do check the return code!
- *
 * @param[in] pix_fmt the pixel format
- * @param[out] h_shift store log2_chroma_w
- * @param[out] v_shift store log2_chroma_h
+ * @param[out] h_shift store log2_chroma_w (horizontal/width shift)
+ * @param[out] v_shift store log2_chroma_h (vertical/height shift)
 *
 * @return 0 on success, AVERROR(ENOSYS) on invalid or unknown pixel format
 */
@@ -295,268 +248,55 @@
 */
 int av_pix_fmt_count_planes(enum AVPixelFormat pix_fmt);
 
-void ff_check_pixfmt_descriptors(void);
-
 /**
- * Utility function to swap the endianness of a pixel format.
- *
- * @param[in] pix_fmt the pixel format
- *
- * @return pixel format with swapped endianness if it exists,
- * otherwise AV_PIX_FMT_NONE
+ * @return the name for provided color range or NULL if unknown.
 */
-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) */
+const char *av_color_range_name(enum AVColorRange range);
 
 /**
- * Compute what kind of losses will occur when converting from one specific
- * pixel format to another.
- * When converting from one pixel format to another, information loss may occur.
- * For example, when converting from RGB24 to GRAY, the color information will
- * be lost. Similarly, other losses occur when converting from some formats to
- * other formats. These losses can involve loss of chroma, but also loss of
- * resolution, loss of color depth, loss due to the color space conversion, loss
- * of the alpha bits or loss due to color quantization.
- * av_get_fix_fmt_loss() informs you about the various types of losses
- * which will occur when converting from one pixel format to another.
- *
- * @param[in] dst_pix_fmt destination pixel format
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @return Combination of flags informing you what kind of losses will occur
- * (maximum loss for an invalid dst_pix_fmt).
+ * @return the AVColorRange value for name or an AVError if not found.
 */
-int av_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt,
- enum AVPixelFormat src_pix_fmt,
- int has_alpha);
+int av_color_range_from_name(const char *name);
 
 /**
- * Compute what kind of losses will occur when converting from one specific
- * pixel format to another.
- * When converting from one pixel format to another, information loss may occur.
- * For example, when converting from RGB24 to GRAY, the color information will
- * be lost. Similarly, other losses occur when converting from some formats to
- * other formats. These losses can involve loss of chroma, but also loss of
- * resolution, loss of color depth, loss due to the color space conversion, loss
- * of the alpha bits or loss due to color quantization.
- * av_get_fix_fmt_loss() informs you about the various types of losses
- * which will occur when converting from one pixel format to another.
- *
- * @param[in] dst_pix_fmt destination pixel format
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @return Combination of flags informing you what kind of losses will occur
- * (maximum loss for an invalid dst_pix_fmt).
- */
-enum AVPixelFormat av_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2,
- enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
-#endif /* AVUTIL_PIXDESC_H */
-/*
- * pixel format descriptor
- * Copyright (c) 2009 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * @return the name for provided color primaries or NULL if unknown.
 */
-
-#ifndef AVUTIL_PIXDESC_H
-#define AVUTIL_PIXDESC_H
-
-#include <inttypes.h>
-
-#include "attributes.h"
-#include "pixfmt.h"
-
-typedef struct AVComponentDescriptor {
- /**
- * Which of the 4 planes contains the component.
- */
- uint16_t plane : 2;
-
- /**
- * Number of elements between 2 horizontally consecutive pixels minus 1.
- * Elements are bits for bitstream formats, bytes otherwise.
- */
- uint16_t step_minus1 : 3;
-
- /**
- * Number of elements before the component of the first pixel plus 1.
- * Elements are bits for bitstream formats, bytes otherwise.
- */
- uint16_t offset_plus1 : 3;
-
- /**
- * Number of least significant bits that must be shifted away
- * to get the value.
- */
- uint16_t shift : 3;
-
- /**
- * Number of bits in the component minus 1.
- */
- uint16_t depth_minus1 : 4;
-} AVComponentDescriptor;
+const char *av_color_primaries_name(enum AVColorPrimaries primaries);
 
 /**
- * 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.
+ * @return the AVColorPrimaries value for name or an AVError if not found.
 */
-typedef struct AVPixFmtDescriptor {
- const char *name;
- uint8_t nb_components; ///< The number of components each pixel has, (1-4)
-
- /**
- * Amount to shift the luma width right to find the chroma width.
- * For YV12 this is 1 for example.
- * chroma_width = -((-luma_width) >> log2_chroma_w)
- * The note above is needed to ensure rounding up.
- * This value only refers to the chroma components.
- */
- uint8_t log2_chroma_w; ///< chroma_width = -((-luma_width )>>log2_chroma_w)
-
- /**
- * Amount to shift the luma height right to find the chroma height.
- * For YV12 this is 1 for example.
- * chroma_height= -((-luma_height) >> log2_chroma_h)
- * The note above is needed to ensure rounding up.
- * This value only refers to the chroma components.
- */
- uint8_t log2_chroma_h;
- uint8_t flags;
-
- /**
- * Parameters that describe how pixels are packed.
- * If the format has 2 or 4 components, then alpha is last.
- * If the format has 1 or 2 components, then luma is 0.
- * If the format has 3 or 4 components,
- * if the RGB flag is set then 0 is red, 1 is green and 2 is blue;
- * otherwise 0 is luma, 1 is chroma-U and 2 is chroma-V.
- */
- AVComponentDescriptor comp[4];
-
- /**
- * Alternative comma-separated names.
- */
- const char *alias;
-} AVPixFmtDescriptor;
+int av_color_primaries_from_name(const char *name);
 
 /**
- * Pixel format is big-endian.
+ * @return the name for provided color transfer or NULL if unknown.
 */
-#define AV_PIX_FMT_FLAG_BE (1 << 0)
-/**
- * Pixel format has a palette in data[1], values are indexes in this palette.
- */
-#define AV_PIX_FMT_FLAG_PAL (1 << 1)
-/**
- * All values of a component are bit-wise packed end to end.
- */
-#define AV_PIX_FMT_FLAG_BITSTREAM (1 << 2)
-/**
- * Pixel format is an HW accelerated format.
- */
-#define AV_PIX_FMT_FLAG_HWACCEL (1 << 3)
-/**
- * At least one pixel component is not in the first data plane.
- */
-#define AV_PIX_FMT_FLAG_PLANAR (1 << 4)
-/**
- * The pixel format contains RGB-like data (as opposed to YUV/grayscale).
- */
-#define AV_PIX_FMT_FLAG_RGB (1 << 5)
-/**
- * The pixel format is "pseudo-paletted". This means that FFmpeg treats it as
- * paletted internally, but the palette is generated by the decoder and is not
- * stored in the file.
- */
-#define AV_PIX_FMT_FLAG_PSEUDOPAL (1 << 6)
+const char *av_color_transfer_name(enum AVColorTransferCharacteristic transfer);
+
 /**
- * The pixel format has an alpha channel.
+ * @return the AVColorTransferCharacteristic value for name or an AVError if not found.
 */
-#define AV_PIX_FMT_FLAG_ALPHA (1 << 7)
+int av_color_transfer_from_name(const char *name);
 
-#if FF_API_PIX_FMT
 /**
- * @deprecated use the AV_PIX_FMT_FLAG_* flags
+ * @return the name for provided color space or NULL if unknown.
 */
-#define PIX_FMT_BE AV_PIX_FMT_FLAG_BE
-#define PIX_FMT_PAL AV_PIX_FMT_FLAG_PAL
-#define PIX_FMT_BITSTREAM AV_PIX_FMT_FLAG_BITSTREAM
-#define PIX_FMT_HWACCEL AV_PIX_FMT_FLAG_HWACCEL
-#define PIX_FMT_PLANAR AV_PIX_FMT_FLAG_PLANAR
-#define PIX_FMT_RGB AV_PIX_FMT_FLAG_RGB
-#define PIX_FMT_PSEUDOPAL AV_PIX_FMT_FLAG_PSEUDOPAL
-#define PIX_FMT_ALPHA AV_PIX_FMT_FLAG_ALPHA
-#endif
+const char *av_color_space_name(enum AVColorSpace space);
 
-#if FF_API_PIX_FMT_DESC
 /**
- * The array of all the pixel format descriptors.
+ * @return the AVColorSpace value for name or an AVError if not found.
 */
-extern attribute_deprecated const AVPixFmtDescriptor av_pix_fmt_descriptors[];
-#endif
+int av_color_space_from_name(const char *name);
 
 /**
- * Read a line from an image, and write the values of the
- * pixel format component c to dst.
- *
- * @param data the array containing the pointers to the planes of the image
- * @param linesize the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to read
- * @param y the vertical coordinate of the first pixel to read
- * @param w the width of the line to read, that is the number of
- * values to write to dst
- * @param read_pal_component if not zero and the format is a paletted
- * format writes the values corresponding to the palette
- * component c in data[1] to dst, rather than the palette indexes in
- * data[0]. The behavior is undefined if the format is not paletted.
+ * @return the name for provided chroma location or NULL if unknown.
 */
-void av_read_image_line(uint16_t *dst, const uint8_t *data[4],
- const int linesize[4], const AVPixFmtDescriptor *desc,
- int x, int y, int c, int w, int read_pal_component);
+const char *av_chroma_location_name(enum AVChromaLocation location);
 
 /**
- * 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
+ * @return the AVChromaLocation value for name or an AVError if not found.
 */
-void av_write_image_line(const uint16_t *src, uint8_t *data[4],
- const int linesize[4], const AVPixFmtDescriptor *desc,
- int x, int y, int c, int w);
+int av_chroma_location_from_name(const char *name);
 
 /**
 * Return the pixel format corresponding to name.
@@ -593,68 +333,42 @@
 enum AVPixelFormat pix_fmt);
 
 /**
- * Return the number of bits per pixel used by the pixel format
- * described by pixdesc. Note that this is not the same as the number
- * of bits per sample.
- *
- * The returned number of bits refers to the number of bits actually
- * used for storing the pixel information, that is padding bits are
- * not counted.
- */
-int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
-
-/**
- * Return the number of bits per pixel for the pixel format
- * described by pixdesc, including any padding or unused bits.
- */
-int av_get_padded_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
-
-/**
- * @return a pixel format descriptor for provided pixel format or NULL if
- * this pixel format is unknown.
- */
-const AVPixFmtDescriptor *av_pix_fmt_desc_get(enum AVPixelFormat pix_fmt);
-
-/**
- * Iterate over all pixel format descriptors known to libavutil.
- *
- * @param prev previous descriptor. NULL to get the first descriptor.
+ * Read a line from an image, and write the values of the
+ * pixel format component c to dst.
 *
- * @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.
+ * @param data the array containing the pointers to the planes of the image
+ * @param linesize the array containing the linesizes of the image
+ * @param desc the pixel format descriptor for the image
+ * @param x the horizontal coordinate of the first pixel to read
+ * @param y the vertical coordinate of the first pixel to read
+ * @param w the width of the line to read, that is the number of
+ * values to write to dst
+ * @param read_pal_component if not zero and the format is a paletted
+ * format writes the values corresponding to the palette
+ * component c in data[1] to dst, rather than the palette indexes in
+ * data[0]. The behavior is undefined if the format is not paletted.
 */
-enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc);
+void av_read_image_line(uint16_t *dst, const uint8_t *data[4],
+ const int linesize[4], const AVPixFmtDescriptor *desc,
+ int x, int y, int c, int w, int read_pal_component);
 
 /**
- * Utility function to access log2_chroma_w log2_chroma_h from
- * the pixel format AVPixFmtDescriptor.
- *
- * See av_get_chroma_sub_sample() for a function that asserts a
- * valid pixel format instead of returning an error code.
- * Its recommended that you use avcodec_get_chroma_sub_sample unless
- * you do check the return code!
- *
- * @param[in] pix_fmt the pixel format
- * @param[out] h_shift store log2_chroma_w
- * @param[out] v_shift store log2_chroma_h
+ * Write the values from src to the pixel format component c of an
+ * image line.
 *
- * @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.
+ * @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
 */
-int av_pix_fmt_count_planes(enum AVPixelFormat pix_fmt);
-
-void ff_check_pixfmt_descriptors(void);
+void av_write_image_line(const uint16_t *src, uint8_t *data[4],
+ const int linesize[4], const AVPixFmtDescriptor *desc,
+ int x, int y, int c, int w);
 
 /**
 * Utility function to swap the endianness of a pixel format.
@@ -715,4 +429,5 @@
 */
 enum AVPixelFormat av_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2,
 enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
+
 #endif /* AVUTIL_PIXDESC_H */

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/pixelutils.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/pixelutils.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/pixfmt.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/pixfmt.h Changed

@@ -24,7 +24,6 @@
 /**
 * @file
 * pixel format definitions
- *
 */
 
 #include "libavutil/avconfig.h"
@@ -44,24 +43,19 @@
 * big-endian CPUs.
 *
 * @par
- * When the pixel format is palettized RGB (AV_PIX_FMT_PAL8), the palettized
+ * When the pixel format is palettized RGB32 (AV_PIX_FMT_PAL8), the palettized
 * image data is stored in AVFrame.data[0]. The palette is transported in
 * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
 * formatted the same as in AV_PIX_FMT_RGB32 described above (i.e., it is
- * also endian-specific). Note also that the individual RGB palette
+ * also endian-specific). Note also that the individual RGB32 palette
 * components stored in AVFrame.data[1] should be in the range 0..255.
 * This is important as many custom PAL8 video codecs that were designed
 * to run on the IBM VGA graphics adapter use 6-bit palette components.
 *
 * @par
- * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like
+ * For all the 8 bits per pixel formats, an RGB32 palette is in data[1] like
 * for pal8. This palette is filled in automatically by the function
 * allocating the picture.
- *
- * @note
- * Make sure that all newly added big-endian formats have (pix_fmt & 1) == 1
- * and that all newly added little-endian formats have (pix_fmt & 1) == 0.
- * This allows simpler detection of big vs little-endian.
 */
 enum AVPixelFormat {
 AV_PIX_FMT_NONE = -1,
@@ -76,15 +70,10 @@
 AV_PIX_FMT_GRAY8, ///< Y , 8bpp
 AV_PIX_FMT_MONOWHITE, ///< Y , 1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
 AV_PIX_FMT_MONOBLACK, ///< Y , 1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
- AV_PIX_FMT_PAL8, ///< 8 bit with PIX_FMT_RGB32 palette
- AV_PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
- AV_PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
- AV_PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
-#if FF_API_XVMC
- AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
- AV_PIX_FMT_XVMC_MPEG2_IDCT,
-#define AV_PIX_FMT_XVMC AV_PIX_FMT_XVMC_MPEG2_IDCT
-#endif /* FF_API_XVMC */
+ AV_PIX_FMT_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)
@@ -104,31 +93,36 @@
 AV_PIX_FMT_GRAY16BE, ///< Y , 16bpp, big-endian
 AV_PIX_FMT_GRAY16LE, ///< Y , 16bpp, little-endian
 AV_PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
- AV_PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
+ AV_PIX_FMT_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)
-#if FF_API_VDPAU
- AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
- AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
- AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
- AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
- AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
 AV_PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
 AV_PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
 
 AV_PIX_FMT_RGB565BE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), big-endian
 AV_PIX_FMT_RGB565LE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), little-endian
- AV_PIX_FMT_RGB555BE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
- AV_PIX_FMT_RGB555LE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
+ AV_PIX_FMT_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)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
- AV_PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
+ AV_PIX_FMT_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
 
+#if FF_API_VAAPI
+ /** @name Deprecated pixel formats */
+ /**@{*/
 AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
 AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
- AV_PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+ AV_PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a VASurfaceID
+ /**@}*/
+ AV_PIX_FMT_VAAPI = AV_PIX_FMT_VAAPI_VLD,
+#else
+ /**
+ * Hardware acceleration through VA-API, data[3] contains a
+ * VASurfaceID.
+ */
+ AV_PIX_FMT_VAAPI,
+#endif
 
 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
@@ -136,16 +130,13 @@
 AV_PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
 AV_PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
 AV_PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-#if FF_API_VDPAU
- AV_PIX_FMT_VDPAU_MPEG4, ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
 AV_PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
 
- AV_PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
- AV_PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
- AV_PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
- AV_PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
- AV_PIX_FMT_YA8, ///< 8bit gray, 8bit alpha
+ AV_PIX_FMT_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
@@ -170,30 +161,16 @@
 AV_PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
 AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
 AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
- AV_PIX_FMT_VDA_VLD, ///< hardware decoding through VDA
-
-#ifdef AV_PIX_FMT_ABI_GIT_MASTER
- AV_PIX_FMT_RGBA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
- AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
- AV_PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
- AV_PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-#endif
 AV_PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp
+ AV_PIX_FMT_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
-
- /**
- * duplicated pixel formats for compatibility with libav.
- * FFmpeg supports these formats since May 8 2012 and Jan 28 2012 (commits f9ca1ac7 and 143a5c55)
- * Libav added them Oct 12 2012 with incompatible values (commit 6d5600e85)
- */
- AV_PIX_FMT_YUVA422P_LIBAV, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
- AV_PIX_FMT_YUVA444P_LIBAV, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
-
+ AV_PIX_FMT_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
@@ -221,37 +198,42 @@
 AV_PIX_FMT_NV20LE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
 AV_PIX_FMT_NV20BE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
 
- /**
- * duplicated pixel formats for compatibility with libav.
- * FFmpeg supports these formats since Sat Sep 24 06:01:45 2011 +0200 (commits 9569a3c9f41387a8c7d1ce97d8693520477a66c3)
- * also see Fri Nov 25 01:38:21 2011 +0100 92afb431621c79155fcb7171d26f137eb1bee028
- * Libav added them Sun Mar 16 23:05:47 2014 +0100 with incompatible values (commit 1481d24c3a0abf81e1d7a514547bd5305232be30)
- */
- AV_PIX_FMT_RGBA64BE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
- AV_PIX_FMT_RGBA64LE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
- AV_PIX_FMT_BGRA64BE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
- AV_PIX_FMT_BGRA64LE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+ AV_PIX_FMT_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_VDA, ///< HW acceleration through VDA, data[3] contains a CVPixelBufferRef
+ 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_YA16BE, ///< 16bit gray, 16bit alpha (big-endian)
- AV_PIX_FMT_YA16LE, ///< 16bit gray, 16bit 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, data[3] contains a pointer to the
+ * mfxFrameSurface1 structure.
+ */
+ AV_PIX_FMT_QSV,
+ /**
+ * HW acceleration though MMAL, data[3] 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.data[3] contains a ID3D11VideoDecoderOutputView pointer
 
-#ifndef AV_PIX_FMT_ABI_GIT_MASTER
- AV_PIX_FMT_RGBA64BE=0x123, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
- AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
- AV_PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
- AV_PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-#endif
- AV_PIX_FMT_0RGB=0x123+4, ///< packed RGB 8:8:8, 32bpp, 0RGB0RGB...
- AV_PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGB0RGB0...
- AV_PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, 0BGR0BGR...
- AV_PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGR0BGR0...
- AV_PIX_FMT_YUVA444P, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
- AV_PIX_FMT_YUVA422P, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
+ /**
+ * HW acceleration through CUDA. data[i] 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
@@ -269,10 +251,7 @@
 AV_PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little-endian
 AV_PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big-endian
 AV_PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little-endian
- AV_PIX_FMT_GBRAP, ///< planar GBRA 4:4:4:4 32bpp
- AV_PIX_FMT_GBRAP16BE, ///< planar GBRA 4:4:4:4 64bpp, big-endian
- AV_PIX_FMT_GBRAP16LE, ///< planar GBRA 4:4:4:4 64bpp, little-endian
- AV_PIX_FMT_YUVJ411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) full scale (JPEG), deprecated in favor of PIX_FMT_YUV411P and setting color_range
+ AV_PIX_FMT_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 */
@@ -286,29 +265,73 @@
 AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, big-endian */
 AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian */
 AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian */
-#if !FF_API_XVMC
+
 AV_PIX_FMT_XVMC,///< XVideo Motion Acceleration via common packet passing
-#endif /* !FF_API_XVMC */
 
- AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
+ 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
 
-#if FF_API_PIX_FMT
-#include "old_pix_fmts.h"
-#endif
-};
+ AV_PIX_FMT_VIDEOTOOLBOX, ///< hardware decoding through Videotoolbox
 
-#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
-#define AV_PIX_FMT_YUVA422P AV_PIX_FMT_YUVA422P_LIBAV
-#define AV_PIX_FMT_YUVA444P AV_PIX_FMT_YUVA444P_LIBAV
-#define AV_PIX_FMT_RGBA64BE AV_PIX_FMT_RGBA64BE_LIBAV
-#define AV_PIX_FMT_RGBA64LE AV_PIX_FMT_RGBA64LE_LIBAV
-#define AV_PIX_FMT_BGRA64BE AV_PIX_FMT_BGRA64BE_LIBAV
-#define AV_PIX_FMT_BGRA64LE AV_PIX_FMT_BGRA64LE_LIBAV
-#endif
+ 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.
+ *
+ * data[0] contains a ID3D11Texture2D pointer, and data[1] 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
 
-#define AV_PIX_FMT_Y400A AV_PIX_FMT_GRAY8A
-#define AV_PIX_FMT_GBR24P AV_PIX_FMT_GBRP
+ 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.
+ *
+ * data[0] points to an AVDRMFrameDescriptor.
+ */
+ AV_PIX_FMT_DRM_PRIME,
+ /**
+ * Hardware surfaces for OpenCL.
+ *
+ * data[i] 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_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
@@ -323,6 +346,9 @@
 #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_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)
@@ -341,9 +367,11 @@
 #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)
@@ -357,6 +385,8 @@
 #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)
@@ -364,6 +394,8 @@
 #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_YUVA420P9 AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE)
 #define AV_PIX_FMT_YUVA422P9 AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE)
@@ -377,78 +409,40 @@
 
 #define AV_PIX_FMT_XYZ12 AV_PIX_FMT_NE(XYZ12BE, XYZ12LE)
 #define AV_PIX_FMT_NV20 AV_PIX_FMT_NE(NV20BE, NV20LE)
-
-
-#if FF_API_PIX_FMT
-#define PixelFormat AVPixelFormat
-
-#define PIX_FMT_Y400A AV_PIX_FMT_Y400A
-#define PIX_FMT_GBR24P AV_PIX_FMT_GBR24P
-
-#define PIX_FMT_NE(be, le) AV_PIX_FMT_NE(be, le)
-
-#define PIX_FMT_RGB32 AV_PIX_FMT_RGB32
-#define PIX_FMT_RGB32_1 AV_PIX_FMT_RGB32_1
-#define PIX_FMT_BGR32 AV_PIX_FMT_BGR32
-#define PIX_FMT_BGR32_1 AV_PIX_FMT_BGR32_1
-#define PIX_FMT_0RGB32 AV_PIX_FMT_0RGB32
-#define PIX_FMT_0BGR32 AV_PIX_FMT_0BGR32
-
-#define PIX_FMT_GRAY16 AV_PIX_FMT_GRAY16
-#define PIX_FMT_RGB48 AV_PIX_FMT_RGB48
-#define PIX_FMT_RGB565 AV_PIX_FMT_RGB565
-#define PIX_FMT_RGB555 AV_PIX_FMT_RGB555
-#define PIX_FMT_RGB444 AV_PIX_FMT_RGB444
-#define PIX_FMT_BGR48 AV_PIX_FMT_BGR48
-#define PIX_FMT_BGR565 AV_PIX_FMT_BGR565
-#define PIX_FMT_BGR555 AV_PIX_FMT_BGR555
-#define PIX_FMT_BGR444 AV_PIX_FMT_BGR444
-
-#define PIX_FMT_YUV420P9 AV_PIX_FMT_YUV420P9
-#define PIX_FMT_YUV422P9 AV_PIX_FMT_YUV422P9
-#define PIX_FMT_YUV444P9 AV_PIX_FMT_YUV444P9
-#define PIX_FMT_YUV420P10 AV_PIX_FMT_YUV420P10
-#define PIX_FMT_YUV422P10 AV_PIX_FMT_YUV422P10
-#define PIX_FMT_YUV444P10 AV_PIX_FMT_YUV444P10
-#define PIX_FMT_YUV420P12 AV_PIX_FMT_YUV420P12
-#define PIX_FMT_YUV422P12 AV_PIX_FMT_YUV422P12
-#define PIX_FMT_YUV444P12 AV_PIX_FMT_YUV444P12
-#define PIX_FMT_YUV420P14 AV_PIX_FMT_YUV420P14
-#define PIX_FMT_YUV422P14 AV_PIX_FMT_YUV422P14
-#define PIX_FMT_YUV444P14 AV_PIX_FMT_YUV444P14
-#define PIX_FMT_YUV420P16 AV_PIX_FMT_YUV420P16
-#define PIX_FMT_YUV422P16 AV_PIX_FMT_YUV422P16
-#define PIX_FMT_YUV444P16 AV_PIX_FMT_YUV444P16
-
-#define PIX_FMT_RGBA64 AV_PIX_FMT_RGBA64
-#define PIX_FMT_BGRA64 AV_PIX_FMT_BGRA64
-#define PIX_FMT_GBRP9 AV_PIX_FMT_GBRP9
-#define PIX_FMT_GBRP10 AV_PIX_FMT_GBRP10
-#define PIX_FMT_GBRP12 AV_PIX_FMT_GBRP12
-#define PIX_FMT_GBRP14 AV_PIX_FMT_GBRP14
-#define PIX_FMT_GBRP16 AV_PIX_FMT_GBRP16
-#endif
+#define 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)
 
 /**
 * Chromaticity coordinates of the source primaries.
+ * These values match the ones defined by ISO/IEC 23001-8_2013 § 7.1.
 */
 enum AVColorPrimaries {
- AVCOL_PRI_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
+ AVCOL_PRI_RESERVED0 = 0,
+ AVCOL_PRI_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
 AVCOL_PRI_UNSPECIFIED = 2,
 AVCOL_PRI_RESERVED = 3,
- AVCOL_PRI_BT470M = 4,
- AVCOL_PRI_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
- AVCOL_PRI_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
- AVCOL_PRI_SMPTE240M = 7, ///< functionally identical to above
- AVCOL_PRI_FILM = 8,
- AVCOL_PRI_BT2020 = 9, ///< ITU-R BT2020
- AVCOL_PRI_NB, ///< Not part of ABI
+ 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, ///< functionally identical to above
+ 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_JEDEC_P22 = 22, ///< JEDEC P22 phosphors
+ AVCOL_PRI_NB ///< Not part of ABI
 };
 
 /**
 * Color Transfer Characteristic.
+ * These values match the ones defined by ISO/IEC 23001-8_2013 § 7.2.
 */
 enum AVColorTransferCharacteristic {
+ AVCOL_TRC_RESERVED0 = 0,
 AVCOL_TRC_BT709 = 1, ///< also ITU-R BT1361
 AVCOL_TRC_UNSPECIFIED = 2,
 AVCOL_TRC_RESERVED = 3,
@@ -462,30 +456,39 @@
 AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4
 AVCOL_TRC_BT1361_ECG = 12, ///< ITU-R BT1361 Extended Colour Gamut
 AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC)
- AVCOL_TRC_BT2020_10 = 14, ///< ITU-R BT2020 for 10 bit system
- AVCOL_TRC_BT2020_12 = 15, ///< ITU-R BT2020 for 12 bit system
- AVCOL_TRC_NB, ///< Not part of ABI
+ 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 23001-8_2013 § 7.3.
 */
 enum AVColorSpace {
- AVCOL_SPC_RGB = 0,
+ AVCOL_SPC_RGB = 0, ///< order of coefficients is actually GBR, also IEC 61966-2-1 (sRGB)
 AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
 AVCOL_SPC_UNSPECIFIED = 2,
 AVCOL_SPC_RESERVED = 3,
- AVCOL_SPC_FCC = 4,
+ AVCOL_SPC_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,
- AVCOL_SPC_YCOCG = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
+ AVCOL_SPC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
+ AVCOL_SPC_SMPTE240M = 7, ///< functionally identical to above
+ 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_NB, ///< Not part of ABI
+ 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
 };
-#define AVCOL_SPC_YCGCO AVCOL_SPC_YCOCG
-
 
 /**
 * MPEG vs JPEG YUV range.
@@ -494,25 +497,33 @@
 AVCOL_RANGE_UNSPECIFIED = 0,
 AVCOL_RANGE_MPEG = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
 AVCOL_RANGE_JPEG = 2, ///< the normal 2^n-1 "JPEG" YUV ranges
- AVCOL_RANGE_NB, ///< Not part of ABI
+ AVCOL_RANGE_NB ///< Not part of ABI
 };
 
 /**
 * Location of chroma samples.
 *
- * X X 3 4 X X are luma samples,
- * 1 2 1-6 are possible chroma positions
- * X X 5 6 X 0 is undefined/unknown position
+ * 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, ///< mpeg2/4, h264 default
- AVCHROMA_LOC_CENTER = 2, ///< mpeg1, jpeg, h263
- AVCHROMA_LOC_TOPLEFT = 3, ///< DV
+ 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
+ AVCHROMA_LOC_NB ///< Not part of ABI
 };
 
 #endif /* AVUTIL_PIXFMT_H */

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/random_seed.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/random_seed.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/rational.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/rational.h Changed

@@ -21,7 +21,8 @@
 
 /**
 * @file
- * rational numbers
+ * @ingroup lavu_math_rational
+ * Utilties for rational number calculation.
 * @author Michael Niedermayer <michaelni@gmx.at>
 */
 
@@ -33,22 +34,39 @@
 #include "attributes.h"
 
 /**
- * @addtogroup lavu_math
+ * @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 numerator/denominator
+ * Rational number (pair of numerator and denominator).
 */
 typedef struct AVRational{
- int num; ///< numerator
- int den; ///< denominator
+ int num; ///< Numerator
+ int den; ///< Denominator
 } AVRational;
 
 /**
- * Create a rational.
+ * Create an AVRational.
+ *
 * Useful for compilers that do not support compound literals.
- * @note The return value is not reduced.
+ *
+ * @note The return value is not reduced.
+ * @see av_reduce()
 */
 static inline AVRational av_make_q(int num, int den)
 {
@@ -58,10 +76,15 @@
 
 /**
 * Compare two rationals.
- * @param a first rational
- * @param b second rational
- * @return 0 if a==b, 1 if a>b, -1 if a<b, and INT_MIN if one of the
- * values is of the form 0/0
+ *
+ * @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;
@@ -73,9 +96,10 @@
 }
 
 /**
- * Convert rational to double.
- * @param a rational to convert
- * @return (double) a
+ * 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;
@@ -83,44 +107,46 @@
 
 /**
 * Reduce a fraction.
+ *
 * This is useful for framerate calculations.
- * @param dst_num destination numerator
- * @param dst_den destination denominator
- * @param num source numerator
- * @param den source denominator
- * @param max the maximum allowed for dst_num & dst_den
- * @return 1 if exact, 0 otherwise
+ *
+ * @param[out] dst_num Destination numerator
+ * @param[out] dst_den Destination denominator
+ * @param[in] num Source numerator
+ * @param[in] den Source denominator
+ * @param[in] 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
+ * @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
+ * @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
+ * @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
+ * @param b First rational
+ * @param c Second rational
 * @return b-c
 */
 AVRational av_sub_q(AVRational b, AVRational c) av_const;
@@ -138,28 +164,50 @@
 
 /**
 * Convert a double precision floating point number to a rational.
- * inf is expressed as {1,0} or {-1,0} depending on the sign.
 *
- * @param d double to convert
- * @param max the maximum allowed numerator and denominator
- * @return (AVRational) d
+ * 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;
 
 /**
- * @return 1 if q1 is nearer to q than q2, -1 if q2 is nearer
- * than q1, 0 if they have the same distance.
+ * 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 nearest value in q_list to q.
- * @param q_list an array of rationals terminated by {0, 0}
- * @return the index of the nearest value found in the array
+ * 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);
+
+/**
 * @}
 */

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/rc4.h Added

@@ -0,0 +1,66 @@
+/*
+ * 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 state[256];
+ 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-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/replaygain.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/replaygain.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/ripemd.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/ripemd.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/samplefmt.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/samplefmt.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/sha.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/sha.h Changed

@@ -18,9 +18,16 @@
 * 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"
@@ -28,81 +35,17 @@
 
 /**
 * @defgroup lavu_sha SHA
- * @ingroup lavu_crypto
- * @{
- */
-
-extern const int av_sha_size;
-
-struct AVSHA;
-
-/**
- * Allocate an AVSHA context.
- */
-struct AVSHA *av_sha_alloc(void);
-
-/**
- * Initialize SHA-1 or SHA-2 hashing.
- *
- * @param context pointer to the function context (of size av_sha_size)
- * @param bits number of bits in digest (SHA-1 - 160 bits, SHA-2 224 or 256 bits)
- * @return zero if initialization succeeded, -1 otherwise
- */
-int av_sha_init(struct AVSHA* context, int bits);
-
-/**
- * Update hash value.
- *
- * @param context hash function context
- * @param data input data to update hash with
- * @param len input data length
- */
-void av_sha_update(struct AVSHA* context, const uint8_t* data, unsigned int len);
-
-/**
- * Finish hashing and output digest value.
- *
- * @param context hash function context
- * @param digest buffer where output digest value is stored
- */
-void av_sha_final(struct AVSHA* context, uint8_t *digest);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_SHA_H */
-/*
- * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
+ * @ingroup lavu_hash
+ * SHA-1 and SHA-256 (Secure Hash Algorithm) hash function implementations.
 *
- * This file is part of FFmpeg.
+ * This module supports the following SHA hash functions:
 *
- * 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.
+ * - SHA-1: 160 bits
+ * - SHA-224: 224 bits, as a variant of SHA-2
+ * - SHA-256: 256 bits, as a variant of SHA-2
 *
- * 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.
+ * @see For SHA-384, SHA-512, and variants thereof, see @ref lavu_sha512.
 *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_SHA_H
-#define AVUTIL_SHA_H
-
-#include <stdint.h>
-
-#include "attributes.h"
-#include "version.h"
-
-/**
- * @defgroup lavu_sha SHA
- * @ingroup lavu_crypto
 * @{
 */
 
@@ -127,11 +70,15 @@
 /**
 * Update hash value.
 *
- * @param context hash function context
+ * @param ctx hash function context
 * @param data input data to update hash with
 * @param len input data length
 */
-void av_sha_update(struct AVSHA* context, const uint8_t* data, unsigned int len);
+#if FF_API_CRYPTO_SIZE_T
+void av_sha_update(struct AVSHA *ctx, const uint8_t *data, unsigned int len);
+#else
+void av_sha_update(struct AVSHA *ctx, const uint8_t *data, size_t len);
+#endif
 
 /**
 * Finish hashing and output digest value.

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/sha512.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/sha512.h Changed

@@ -19,92 +19,35 @@
 * 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"
 #include "version.h"
 
 /**
- * @defgroup lavu_sha512 SHA512
- * @ingroup lavu_crypto
- * @{
- */
-
-extern const int av_sha512_size;
-
-struct AVSHA512;
-
-/**
- * Allocate an AVSHA512 context.
- */
-struct AVSHA512 *av_sha512_alloc(void);
-
-/**
- * Initialize SHA-2 512 hashing.
- *
- * @param context pointer to the function context (of size av_sha512_size)
- * @param bits number of bits in digest (224, 256, 384 or 512 bits)
- * @return zero if initialization succeeded, -1 otherwise
- */
-int av_sha512_init(struct AVSHA512* context, int bits);
-
-/**
- * Update hash value.
- *
- * @param context hash function context
- * @param data input data to update hash with
- * @param len input data length
- */
-void av_sha512_update(struct AVSHA512* context, const uint8_t* data, unsigned int len);
-
-/**
- * Finish hashing and output digest value.
- *
- * @param context hash function context
- * @param digest buffer where output digest value is stored
- */
-void av_sha512_final(struct AVSHA512* context, uint8_t *digest);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_SHA512_H */
-/*
- * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
- * Copyright (C) 2013 James Almer <jamrial@gmail.com>
+ * @defgroup lavu_sha512 SHA-512
+ * @ingroup lavu_hash
+ * SHA-512 (Secure Hash Algorithm) hash function implementations.
 *
- * This file is part of FFmpeg.
+ * This module supports the following SHA-2 hash functions:
 *
- * 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.
+ * - SHA-512/224: 224 bits
+ * - SHA-512/256: 256 bits
+ * - SHA-384: 384 bits
+ * - SHA-512: 512 bits
 *
- * 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.
+ * @see For SHA-1, SHA-256, and variants thereof, see @ref lavu_sha.
 *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_SHA512_H
-#define AVUTIL_SHA512_H
-
-#include <stdint.h>
-
-#include "attributes.h"
-#include "version.h"
-
-/**
- * @defgroup lavu_sha512 SHA512
- * @ingroup lavu_crypto
 * @{
 */
 
@@ -133,7 +76,11 @@
 * @param data input data to update hash with
 * @param len input data length
 */
+#if FF_API_CRYPTO_SIZE_T
 void av_sha512_update(struct AVSHA512* context, const uint8_t* data, unsigned int len);
+#else
+void av_sha512_update(struct AVSHA512* context, const uint8_t* data, size_t len);
+#endif
 
 /**
 * Finish hashing and output digest value.

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/spherical.h Added

@@ -0,0 +1,232 @@
+/*
+ * 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-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/stereo3d.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/stereo3d.h Changed

@@ -18,6 +18,11 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+/**
+ * @file
+ * Stereoscopic video
+ */
+
 #ifndef AVUTIL_STEREO3D_H
 #define AVUTIL_STEREO3D_H
 
@@ -26,6 +31,21 @@
 #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 {
@@ -37,41 +57,49 @@
 /**
 * 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,
 
@@ -79,34 +107,59 @@
 * 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.
@@ -130,6 +183,11 @@
 * Additional information about the frame packing.
 */
 int flags;
+
+ /**
+ * Determines which views are packed.
+ */
+ enum AVStereo3DView view;
 } AVStereo3D;
 
 /**
@@ -149,156 +207,27 @@
 */
 AVStereo3D *av_stereo3d_create_side_data(AVFrame *frame);
 
-#endif /* AVUTIL_STEREO3D_H */
-/*
- * Copyright (c) 2013 Vittorio Giovara <vittorio.giovara@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+/**
+ * Provide a human-readable name of a given stereo3d type.
 *
- * 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.
+ * @param type The input stereo3d type value.
 *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_STEREO3D_H
-#define AVUTIL_STEREO3D_H
-
-#include <stdint.h>
-
-#include "frame.h"
-
-/**
- * List of possible 3D Types
- */
-enum AVStereo3DType {
- /**
- * Video is not stereoscopic (and metadata has to be there).
- */
- AV_STEREO3D_2D,
-
- /**
- * Views are next to each other.
- *
- * LLLLRRRR
- * LLLLRRRR
- * LLLLRRRR
- * ...
- */
- AV_STEREO3D_SIDEBYSIDE,
-
- /**
- * Views are on top of each other.
- *
- * LLLLLLLL
- * LLLLLLLL
- * RRRRRRRR
- * RRRRRRRR
- */
- AV_STEREO3D_TOPBOTTOM,
-
- /**
- * Views are alternated temporally.
- *
- * frame0 frame1 frame2 ...
- * LLLLLLLL RRRRRRRR LLLLLLLL
- * LLLLLLLL RRRRRRRR LLLLLLLL
- * LLLLLLLL RRRRRRRR LLLLLLLL
- * ... ... ...
- */
- AV_STEREO3D_FRAMESEQUENCE,
-
- /**
- * Views are packed in a checkerboard-like structure per pixel.
- *
- * LRLRLRLR
- * RLRLRLRL
- * LRLRLRLR
- * ...
- */
- AV_STEREO3D_CHECKERBOARD,
-
- /**
- * Views are next to each other, but when upscaling
- * apply a checkerboard pattern.
- *
- * LLLLRRRR L L L L R R R R
- * LLLLRRRR => L L L L R R R R
- * LLLLRRRR L L L L R R R R
- * LLLLRRRR L L L L R R R R
- */
- AV_STEREO3D_SIDEBYSIDE_QUINCUNX,
-
- /**
- * Views are packed per line, as if interlaced.
- *
- * LLLLLLLL
- * RRRRRRRR
- * LLLLLLLL
- * ...
- */
- AV_STEREO3D_LINES,
-
- /**
- * Views are packed per column.
- *
- * LRLRLRLR
- * LRLRLRLR
- * LRLRLRLR
- * ...
- */
- AV_STEREO3D_COLUMNS,
-};
-
-
-/**
- * Inverted views, Right/Bottom represents the left view.
+ * @return The name of the stereo3d value, or "unknown".
 */
-#define AV_STEREO3D_FLAG_INVERT (1 << 0)
+const char *av_stereo3d_type_name(unsigned int type);
 
 /**
- * Stereo 3D type: this structure describes how two videos are packed
- * within a single video surface, with additional information as needed.
+ * Get the AVStereo3DType form a human-readable name.
 *
- * @note The struct must be allocated with av_stereo3d_alloc() and
- * its size is not a part of the public ABI.
- */
-typedef struct AVStereo3D {
- /**
- * How views are packed within the video.
- */
- enum AVStereo3DType type;
-
- /**
- * Additional information about the frame packing.
- */
- int flags;
-} AVStereo3D;
-
-/**
- * Allocate an AVStereo3D structure and set its fields to default values.
- * The resulting struct can be freed using av_freep().
+ * @param name The input string.
 *
- * @return An AVStereo3D filled with default values or NULL on failure.
+ * @return The AVStereo3DType value, or -1 if not found.
 */
-AVStereo3D *av_stereo3d_alloc(void);
+int av_stereo3d_from_name(const char *name);
 
 /**
- * Allocate a complete AVFrameSideData and add it to the frame.
- *
- * @param frame The frame which side data is added to.
- *
- * @return The AVStereo3D structure to be filled by caller.
+ * @}
+ * @}
 */
-AVStereo3D *av_stereo3d_create_side_data(AVFrame *frame);
 
 #endif /* AVUTIL_STEREO3D_H */

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/tea.h Added

@@ -0,0 +1,71 @@
+/*
+ * 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 key[16], 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-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/threadmessage.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/threadmessage.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/time.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/time.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/timecode.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/timecode.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/timestamp.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/timestamp.h Changed

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

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/tree.h Added

@@ -0,0 +1,138 @@
+/*
+ * 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"
+#include "version.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 next[0] will contain the previous
+ * element and next[1] 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 *next[2]);
+
+/**
+ * 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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/twofish.h Added

@@ -0,0 +1,70 @@
+/*
+ * 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-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/version.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/version.h Changed

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

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libavutil/xtea.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libavutil/xtea.h Changed

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

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libswresample Added

gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libswresample/swresample.h Added

@@ -0,0 +1,579 @@
+/*
+ * 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()
+ *
+ * @param[in,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.
+ *
+ * @param[in] 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.
+ *
+ * @param[in] 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.
+ *
+ * @param[in,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 s[in] initialized Swr context
+ * @param pts[in] 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().
+ *
+ * @param[in,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.
+ * @param[in] sample_delta delta in PTS per sample
+ * @param[in] 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.
+ *
+ * @param[in,out] s allocated Swr context, not yet initialized
+ * @param[in] 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.
+ * @param[out] matrix mixing coefficients; matrix[i + 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; matrix[i + 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-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libswresample/version.h Added

@@ -0,0 +1,45 @@
+/*
+ * 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/avutil.h"
+
+#define LIBSWRESAMPLE_VERSION_MAJOR   3
+#define LIBSWRESAMPLE_VERSION_MINOR   1
+#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-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libswscale/swscale.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libswscale/swscale.h Changed

@@ -35,7 +35,9 @@
 #include "version.h"
 
 /**
- * @defgroup libsws Color conversion and scaling
+ * @defgroup libsws libswscale
+ * Color conversion and scaling library.
+ *
 * @{
 *
 * Return the LIBSWSCALE_VERSION_INT constant.
@@ -73,7 +75,7 @@
 #define SWS_PRINT_INFO 0x1000
 
 //the following 3 flags are not completely implemented
-//internal chrominace subsampling info
+//internal chrominance subsampling info
 #define SWS_FULL_CHR_H_INT 0x2000
 //input subsampling info
 #define SWS_FULL_CHR_H_INP 0x4000
@@ -82,22 +84,6 @@
 #define SWS_BITEXACT 0x80000
 #define SWS_ERROR_DIFFUSION 0x800000
 
-#if FF_API_SWS_CPU_CAPS
-/**
- * CPU caps are autodetected now, those flags
- * are only provided for API compatibility.
- */
-#define SWS_CPU_CAPS_MMX 0x80000000
-#define SWS_CPU_CAPS_MMXEXT 0x20000000
-#define SWS_CPU_CAPS_MMX2 0x20000000
-#define SWS_CPU_CAPS_3DNOW 0x40000000
-#define SWS_CPU_CAPS_ALTIVEC 0x10000000
-#if FF_API_ARCH_BFIN
-#define SWS_CPU_CAPS_BFIN 0x01000000
-#endif
-#define SWS_CPU_CAPS_SSE2 0x02000000
-#endif
-
 #define SWS_MAX_REDUCE_CUTOFF 0.002
 
 #define SWS_CS_ITU709 1
@@ -107,6 +93,7 @@
 #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
@@ -166,6 +153,7 @@
 * @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);
 
 /**
@@ -185,6 +173,12 @@
 * @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 param[0] and [1] tune the shape of the basis
+ * function, param[0] tunes f(1) and param[1] f´(1)
+ * For SWS_GAUSS param[0] tunes the exponent and thus cutoff
+ * frequency
+ * For SWS_LANCZOS param[0] 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
@@ -257,18 +251,6 @@
 SwsVector *sws_getGaussianVec(double variance, double quality);
 
 /**
- * Allocate and return a vector with length coefficients, all
- * with the same value c.
- */
-SwsVector *sws_getConstVec(double c, int length);
-
-/**
- * Allocate and return a vector with just one coefficient, with
- * value 1.0.
- */
-SwsVector *sws_getIdentityVec(void);
-
-/**
 * Scale all the coefficients of a by the scalar value.
 */
 void sws_scaleVec(SwsVector *a, double scalar);
@@ -277,22 +259,17 @@
 * Scale all the coefficients of a so that their sum equals height.
 */
 void sws_normalizeVec(SwsVector *a, double height);
-void sws_convVec(SwsVector *a, SwsVector *b);
-void sws_addVec(SwsVector *a, SwsVector *b);
-void sws_subVec(SwsVector *a, SwsVector *b);
-void sws_shiftVec(SwsVector *a, int shift);
 
-/**
- * Allocate and return a clone of the vector a, that is a vector
- * with the same coefficients as a.
- */
-SwsVector *sws_cloneVec(SwsVector *a);
-
-/**
- * Print with av_log() a textual representation of the vector a
- * if log_level <= av_log_level.
- */
-void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level);
+#if FF_API_SWS_VECTOR
+attribute_deprecated SwsVector *sws_getConstVec(double c, int length);
+attribute_deprecated SwsVector *sws_getIdentityVec(void);
+attribute_deprecated void sws_convVec(SwsVector *a, SwsVector *b);
+attribute_deprecated void sws_addVec(SwsVector *a, SwsVector *b);
+attribute_deprecated void sws_subVec(SwsVector *a, SwsVector *b);
+attribute_deprecated void sws_shiftVec(SwsVector *a, int shift);
+attribute_deprecated SwsVector *sws_cloneVec(SwsVector *a);
+attribute_deprecated void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level);
+#endif
 
 void sws_freeVec(SwsVector *a);

gpac-0.7.1.tar.gz/extra_lib/include/ffmpeg_android/libswscale/version.h -> gpac-0.8.0.tar.gz/extra_lib/include/ffmpeg_android/libswscale/version.h Changed

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

gpac-0.8.0.tar.gz/extra_lib/include/libavcodec/ac3_parser.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavcodec/adts_parser.h Added

gpac-0.7.1.tar.gz/extra_lib/include/libavcodec/avcodec.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavcodec/avcodec.h Changed

@@ -36,19 +36,17 @@
 #include "libavutil/channel_layout.h"
 #include "libavutil/dict.h"
 #include "libavutil/frame.h"
+#include "libavutil/hwcontext.h"
 #include "libavutil/log.h"
 #include "libavutil/pixfmt.h"
 #include "libavutil/rational.h"
 
 #include "version.h"
 
-#if FF_API_FAST_MALLOC
-// to provide fast_*alloc
-#include "libavutil/mem.h"
-#endif
-
 /**
- * @defgroup libavc Encoding/Decoding Library
+ * @defgroup libavc libavcodec
+ * Encoding/Decoding Library
+ *
 * @{
 *
 * @defgroup lavc_decoding Decoding
@@ -75,7 +73,118 @@
 * @{
 * @}
 * @}
+ */
+
+/**
+ * @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.
+ *
+ * This API replaces the following legacy functions:
+ * - avcodec_decode_video2() and avcodec_decode_audio4():
+ * Use avcodec_send_packet() to feed input to the decoder, then use
+ * avcodec_receive_frame() to receive decoded frames after each packet.
+ * Unlike with the old video decoding API, multiple frames might result from
+ * a packet. For audio, splitting the input packet into frames by partially
+ * decoding packets becomes transparent to the API user. You never need to
+ * feed an AVPacket to the API twice (unless it is rejected with AVERROR(EAGAIN) - then
+ * no data was read from the packet).
+ * Additionally, sending a flush/draining packet is required only once.
+ * - avcodec_encode_video2()/avcodec_encode_audio2():
+ * Use avcodec_send_frame() to feed input to the encoder, then use
+ * avcodec_receive_packet() to receive encoded packets.
+ * Providing user-allocated buffers for avcodec_receive_packet() is not
+ * possible.
+ * - The new API does not handle subtitles yet.
+ *
+ * Mixing new and old function calls on the same AVCodecContext is not allowed,
+ * and will result in undefined behavior.
+ *
+ * Some codecs might require using the new API; using the old API will return
+ * an error when calling it. All codecs support the new API.
+ *
+ * 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.
+ * @}
 */
 
 /**
@@ -97,9 +206,8 @@
 * details.
 *
 * If you add a codec ID to this list, add it so that
- * 1. no value of a existing codec ID changes (that would break ABI),
- * 2. Give it a value which when taken as ASCII is recognized uniquely by a human as this specific codec.
- * This ensures that 2 forks can independently add AVCodecIDs without producing conflicts.
+ * 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.
@@ -110,9 +218,6 @@
 /* video codecs */
 AV_CODEC_ID_MPEG1VIDEO,
 AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-#if FF_API_XVMC
- AV_CODEC_ID_MPEG2VIDEO_XVMC,
-#endif /* FF_API_XVMC */
 AV_CODEC_ID_H261,
 AV_CODEC_ID_H263,
 AV_CODEC_ID_RV10,
@@ -247,7 +352,7 @@
 AV_CODEC_ID_ANM,
 AV_CODEC_ID_BINKVIDEO,
 AV_CODEC_ID_IFF_ILBM,
- AV_CODEC_ID_IFF_BYTERUN1,
+#define AV_CODEC_ID_IFF_BYTERUN1 AV_CODEC_ID_IFF_ILBM
 AV_CODEC_ID_KGV1,
 AV_CODEC_ID_YOP,
 AV_CODEC_ID_VP8,
@@ -280,40 +385,67 @@
 AV_CODEC_ID_MSS2,
 AV_CODEC_ID_VP9,
 AV_CODEC_ID_AIC,
- AV_CODEC_ID_ESCAPE130_DEPRECATED,
- AV_CODEC_ID_G2M_DEPRECATED,
- AV_CODEC_ID_WEBP_DEPRECATED,
+ AV_CODEC_ID_ESCAPE130,
+ AV_CODEC_ID_G2M,
+ AV_CODEC_ID_WEBP,
 AV_CODEC_ID_HNM4_VIDEO,
- AV_CODEC_ID_HEVC_DEPRECATED,
- AV_CODEC_ID_FIC,
-
- AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'),
- AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'),
- AV_CODEC_ID_ESCAPE130 = MKBETAG('E','1','3','0'),
- AV_CODEC_ID_EXR = MKBETAG('0','E','X','R'),
- AV_CODEC_ID_AVRP = MKBETAG('A','V','R','P'),
-
- AV_CODEC_ID_012V = MKBETAG('0','1','2','V'),
- AV_CODEC_ID_G2M = MKBETAG( 0 ,'G','2','M'),
- AV_CODEC_ID_AVUI = MKBETAG('A','V','U','I'),
- AV_CODEC_ID_AYUV = MKBETAG('A','Y','U','V'),
- AV_CODEC_ID_TARGA_Y216 = MKBETAG('T','2','1','6'),
- AV_CODEC_ID_V308 = MKBETAG('V','3','0','8'),
- AV_CODEC_ID_V408 = MKBETAG('V','4','0','8'),
- AV_CODEC_ID_YUV4 = MKBETAG('Y','U','V','4'),
- AV_CODEC_ID_SANM = MKBETAG('S','A','N','M'),
- AV_CODEC_ID_PAF_VIDEO = MKBETAG('P','A','F','V'),
- AV_CODEC_ID_AVRN = MKBETAG('A','V','R','n'),
- AV_CODEC_ID_CPIA = MKBETAG('C','P','I','A'),
- AV_CODEC_ID_XFACE = MKBETAG('X','F','A','C'),
- AV_CODEC_ID_SGIRLE = MKBETAG('S','G','I','R'),
- AV_CODEC_ID_MVC1 = MKBETAG('M','V','C','1'),
- AV_CODEC_ID_MVC2 = MKBETAG('M','V','C','2'),
- AV_CODEC_ID_SNOW = MKBETAG('S','N','O','W'),
- AV_CODEC_ID_WEBP = MKBETAG('W','E','B','P'),
- AV_CODEC_ID_SMVJPEG = MKBETAG('S','M','V','J'),
- AV_CODEC_ID_HEVC = MKBETAG('H','2','6','5'),
+ 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_Y41P = 0x8000,
+ 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,
 
 /* various PCM "codecs" */
 AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
@@ -345,11 +477,14 @@
 AV_CODEC_ID_PCM_LXF,
 AV_CODEC_ID_S302M,
 AV_CODEC_ID_PCM_S8_PLANAR,
- AV_CODEC_ID_PCM_S24LE_PLANAR_DEPRECATED,
- AV_CODEC_ID_PCM_S32LE_PLANAR_DEPRECATED,
- AV_CODEC_ID_PCM_S24LE_PLANAR = MKBETAG(24,'P','S','P'),
- AV_CODEC_ID_PCM_S32LE_PLANAR = MKBETAG(32,'P','S','P'),
- AV_CODEC_ID_PCM_S16BE_PLANAR = MKBETAG('P','S','P',16),
+ AV_CODEC_ID_PCM_S24LE_PLANAR,
+ AV_CODEC_ID_PCM_S32LE_PLANAR,
+ AV_CODEC_ID_PCM_S16BE_PLANAR,
+
+ AV_CODEC_ID_PCM_S64LE = 0x10800,
+ AV_CODEC_ID_PCM_S64BE,
+ AV_CODEC_ID_PCM_F16LE,
+ AV_CODEC_ID_PCM_F24LE,
 
 /* various ADPCM codecs */
 AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
@@ -382,12 +517,18 @@
 AV_CODEC_ID_ADPCM_IMA_ISS,
 AV_CODEC_ID_ADPCM_G722,
 AV_CODEC_ID_ADPCM_IMA_APC,
- AV_CODEC_ID_VIMA = MKBETAG('V','I','M','A'),
- AV_CODEC_ID_ADPCM_AFC = MKBETAG('A','F','C',' '),
- AV_CODEC_ID_ADPCM_IMA_OKI = MKBETAG('O','K','I',' '),
- AV_CODEC_ID_ADPCM_DTK = MKBETAG('D','T','K',' '),
- AV_CODEC_ID_ADPCM_IMA_RAD = MKBETAG('R','A','D',' '),
- AV_CODEC_ID_ADPCM_G726LE = MKBETAG('6','2','7','G'),
+ AV_CODEC_ID_ADPCM_VIMA,
+
+ AV_CODEC_ID_ADPCM_AFC = 0x11800,
+ 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,
 
 /* AMR */
 AV_CODEC_ID_AMR_NB = 0x12000,
@@ -403,6 +544,9 @@
 AV_CODEC_ID_XAN_DPCM,
 AV_CODEC_ID_SOL_DPCM,
 
+ AV_CODEC_ID_SDX2_DPCM = 0x14800,
+ AV_CODEC_ID_GREMLIN_DPCM,
+
 /* audio codecs */
 AV_CODEC_ID_MP2 = 0x15000,
 AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
@@ -436,9 +580,6 @@
 AV_CODEC_ID_MLP,
 AV_CODEC_ID_GSM_MS, /* as found in WAV */
 AV_CODEC_ID_ATRAC3,
-#if FF_API_VOXWARE
- AV_CODEC_ID_VOXWARE,
-#endif
 AV_CODEC_ID_APE,
 AV_CODEC_ID_NELLYMOSER,
 AV_CODEC_ID_MUSEPACK8,
@@ -467,18 +608,35 @@
 AV_CODEC_ID_RALF,
 AV_CODEC_ID_IAC,
 AV_CODEC_ID_ILBC,
- AV_CODEC_ID_OPUS_DEPRECATED,
+ AV_CODEC_ID_OPUS,
 AV_CODEC_ID_COMFORT_NOISE,
- AV_CODEC_ID_TAK_DEPRECATED,
+ AV_CODEC_ID_TAK,
 AV_CODEC_ID_METASOUND,
- AV_CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
- AV_CODEC_ID_SONIC = MKBETAG('S','O','N','C'),
- AV_CODEC_ID_SONIC_LS = MKBETAG('S','O','N','L'),
- AV_CODEC_ID_PAF_AUDIO = MKBETAG('P','A','F','A'),
- AV_CODEC_ID_OPUS = MKBETAG('O','P','U','S'),
- AV_CODEC_ID_TAK = MKBETAG('t','B','a','K'),
- AV_CODEC_ID_EVRC = MKBETAG('s','e','v','c'),
- AV_CODEC_ID_SMV = MKBETAG('s','s','m','v'),
+ AV_CODEC_ID_PAF_AUDIO,
+ AV_CODEC_ID_ON2AVC,
+ AV_CODEC_ID_DSS_SP,
+ AV_CODEC_ID_CODEC2,
+
+ AV_CODEC_ID_FFWAVESYNTH = 0x15800,
+ 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,
 
 /* subtitle codecs */
 AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
@@ -491,30 +649,36 @@
 AV_CODEC_ID_HDMV_PGS_SUBTITLE,
 AV_CODEC_ID_DVB_TELETEXT,
 AV_CODEC_ID_SRT,
- AV_CODEC_ID_MICRODVD = MKBETAG('m','D','V','D'),
- AV_CODEC_ID_EIA_608 = MKBETAG('c','6','0','8'),
- AV_CODEC_ID_JACOSUB = MKBETAG('J','S','U','B'),
- AV_CODEC_ID_SAMI = MKBETAG('S','A','M','I'),
- AV_CODEC_ID_REALTEXT = MKBETAG('R','T','X','T'),
- AV_CODEC_ID_SUBVIEWER1 = MKBETAG('S','b','V','1'),
- AV_CODEC_ID_SUBVIEWER = MKBETAG('S','u','b','V'),
- AV_CODEC_ID_SUBRIP = MKBETAG('S','R','i','p'),
- AV_CODEC_ID_WEBVTT = MKBETAG('W','V','T','T'),
- AV_CODEC_ID_MPL2 = MKBETAG('M','P','L','2'),
- AV_CODEC_ID_VPLAYER = MKBETAG('V','P','l','r'),
- AV_CODEC_ID_PJS = MKBETAG('P','h','J','S'),
- AV_CODEC_ID_ASS = MKBETAG('A','S','S',' '), ///< ASS as defined in Matroska
+
+ AV_CODEC_ID_MICRODVD = 0x17800,
+ 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,
 
 /* 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_BINTEXT = MKBETAG('B','T','X','T'),
- AV_CODEC_ID_XBIN = MKBETAG('X','B','I','N'),
- AV_CODEC_ID_IDF = MKBETAG( 0 ,'I','D','F'),
- AV_CODEC_ID_OTF = MKBETAG( 0 ,'O','T','F'),
- AV_CODEC_ID_SMPTE_KLV = MKBETAG('K','L','V','A'),
- AV_CODEC_ID_DVD_NAV = MKBETAG('D','N','A','V'),
- AV_CODEC_ID_TIMED_ID3 = MKBETAG('T','I','D','3'),
+
+ AV_CODEC_ID_SCTE_35, ///< Contain timestamp estimated through PCR of program stream.
+ AV_CODEC_ID_BINTEXT = 0x18800,
+ 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
@@ -524,16 +688,13 @@
 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.
-
-#if FF_API_CODEC_ID
-#include "old_codec_ids.h"
-#endif
+ AV_CODEC_ID_WRAPPED_AVFRAME = 0x21001, ///< Passthrough codec, AVFrames wrapped in AVPacket
 };
 
 /**
 * This struct describes the properties of a single codec described by an
 * AVCodecID.
- * @see avcodec_get_descriptor()
+ * @see avcodec_descriptor_get()
 */
 typedef struct AVCodecDescriptor {
 enum AVCodecID id;
@@ -552,11 +713,22 @@
 * 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 codecs only.
+ * Video and audio codecs only.
 */
 #define AV_CODEC_PROP_INTRA_ONLY (1 << 0)
 /**
@@ -570,6 +742,16 @@
 */
 #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.
 */
@@ -588,32 +770,14 @@
 * Note: If the first 23 bits of the additional bytes are not 0, then damaged
 * MPEG bitstreams could cause overread and segfault.
 */
-#define FF_INPUT_BUFFER_PADDING_SIZE 16
+#define AV_INPUT_BUFFER_PADDING_SIZE 64
 
 /**
 * @ingroup lavc_encoding
 * minimum encoding buffer size
 * Used to avoid some checks during header writing.
 */
-#define FF_MIN_BUFFER_SIZE 16384
-
-
-/**
- * @ingroup lavc_encoding
- * motion estimation type.
- */
-enum Motion_Est_ID {
- ME_ZERO = 1, ///< no search, that is use 0,0 vector whenever one is needed
- ME_FULL,
- ME_LOG,
- ME_PHODS,
- ME_EPZS, ///< enhanced predictive zonal search
- ME_X1, ///< reserved for experiments
- ME_HEX, ///< hexagon based search
- ME_UMH, ///< uneven multi-hexagon search
- ME_TESA, ///< transformed exhaustive search algorithm
- ME_ITER=50, ///< iterative search
-};
+#define AV_INPUT_BUFFER_MIN_SIZE 16384
 
 /**
 * @ingroup lavc_decoding
@@ -625,56 +789,11 @@
 AVDISCARD_DEFAULT = 0, ///< discard useless packets like 0 size packets in avi
 AVDISCARD_NONREF = 8, ///< discard all non reference
 AVDISCARD_BIDIR = 16, ///< discard all bidirectional frames
+ AVDISCARD_NONINTRA= 24, ///< discard all non intra frames
 AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes
 AVDISCARD_ALL = 48, ///< discard all
 };
 
-enum AVColorPrimaries{
- AVCOL_PRI_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
- AVCOL_PRI_UNSPECIFIED = 2,
- AVCOL_PRI_BT470M = 4,
- AVCOL_PRI_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
- AVCOL_PRI_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
- AVCOL_PRI_SMPTE240M = 7, ///< functionally identical to above
- AVCOL_PRI_FILM = 8,
- AVCOL_PRI_BT2020 = 9, ///< ITU-R BT2020
- AVCOL_PRI_NB , ///< Not part of ABI
-};
-
-enum AVColorTransferCharacteristic{
- AVCOL_TRC_BT709 = 1, ///< also ITU-R BT1361
- AVCOL_TRC_UNSPECIFIED = 2,
- AVCOL_TRC_GAMMA22 = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
- AVCOL_TRC_GAMMA28 = 5, ///< also ITU-R BT470BG
- AVCOL_TRC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358 525 or 625 / ITU-R BT1700 NTSC
- AVCOL_TRC_SMPTE240M = 7,
- AVCOL_TRC_LINEAR = 8, ///< "Linear transfer characteristics"
- AVCOL_TRC_LOG = 9, ///< "Logarithmic transfer characteristic (100:1 range)"
- AVCOL_TRC_LOG_SQRT = 10, ///< "Logarithmic transfer characteristic (100 * Sqrt( 10 ) : 1 range)"
- AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4
- AVCOL_TRC_BT1361_ECG = 12, ///< ITU-R BT1361 Extended Colour Gamut
- AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC)
- AVCOL_TRC_BT2020_10 = 14, ///< ITU-R BT2020 for 10 bit system
- AVCOL_TRC_BT2020_12 = 15, ///< ITU-R BT2020 for 12 bit system
- AVCOL_TRC_NB , ///< Not part of ABI
-};
-
-/**
- * X X 3 4 X X are luma samples,
- * 1 2 1-6 are possible chroma positions
- * X X 5 6 X 0 is undefined/unknown position
- */
-enum AVChromaLocation{
- AVCHROMA_LOC_UNSPECIFIED = 0,
- AVCHROMA_LOC_LEFT = 1, ///< mpeg2/4, h264 default
- AVCHROMA_LOC_CENTER = 2, ///< mpeg1, jpeg, h263
- AVCHROMA_LOC_TOPLEFT = 3, ///< DV
- AVCHROMA_LOC_TOP = 4,
- AVCHROMA_LOC_BOTTOMLEFT = 5,
- AVCHROMA_LOC_BOTTOM = 6,
- AVCHROMA_LOC_NB , ///< Not part of ABI
-};
-
 enum AVAudioServiceType {
 AV_AUDIO_SERVICE_TYPE_MAIN = 0,
 AV_AUDIO_SERVICE_TYPE_EFFECTS = 1,
@@ -698,13 +817,6 @@
 float quality_factor;
 } RcOverride;
 
-#if FF_API_MAX_BFRAMES
-/**
- * @deprecated there is no libavcodec-wide limit on the number of B-frames
- */
-#define FF_MAX_B_FRAMES 16
-#endif
-
 /* encoding support
 These flags can be passed in AVCodecContext.flags before initialization.
 Note: Not everything is supported yet.
@@ -714,50 +826,119 @@
 * Allow decoders to produce frames with data planes that are not aligned
 * to CPU requirements (e.g. due to cropping).
 */
-#define CODEC_FLAG_UNALIGNED 0x0001
-#define CODEC_FLAG_QSCALE 0x0002 ///< Use fixed qscale.
-#define CODEC_FLAG_4MV 0x0004 ///< 4 MV per MB allowed / advanced prediction for H.263.
-#define CODEC_FLAG_OUTPUT_CORRUPT 0x0008 ///< Output even those frames that might be corrupted
-#define CODEC_FLAG_QPEL 0x0010 ///< Use qpel MC.
-#define CODEC_FLAG_GMC 0x0020 ///< Use GMC.
-#define CODEC_FLAG_MV0 0x0040 ///< Always try a MB with MV=<0,0>.
-/**
- * The parent program guarantees that the input for B-frames containing
- * streams is not written to for at least s->max_b_frames+1 frames, if
- * this is not set the input will be copied.
- */
-#define CODEC_FLAG_INPUT_PRESERVED 0x0100
-#define CODEC_FLAG_PASS1 0x0200 ///< Use internal 2pass ratecontrol in first pass mode.
-#define CODEC_FLAG_PASS2 0x0400 ///< Use internal 2pass ratecontrol in second pass mode.
-#define CODEC_FLAG_GRAY 0x2000 ///< Only decode/encode grayscale.
-#if FF_API_EMU_EDGE
+#define AV_CODEC_FLAG_UNALIGNED (1 << 0)
 /**
- * @deprecated edges are not used/required anymore. I.e. this flag is now always
- * set.
+ * Use fixed qscale.
 */
-#define CODEC_FLAG_EMU_EDGE 0x4000
-#endif
-#define CODEC_FLAG_PSNR 0x8000 ///< error[?] variables will be set during encoding.
-#define CODEC_FLAG_TRUNCATED 0x00010000 /** Input bitstream might be truncated at a random
- location instead of only at frame boundaries. */
-#define CODEC_FLAG_NORMALIZE_AQP 0x00020000 ///< Normalize adaptive quantization.
-#define CODEC_FLAG_INTERLACED_DCT 0x00040000 ///< Use interlaced DCT.
-#define CODEC_FLAG_LOW_DELAY 0x00080000 ///< Force low delay.
-#define CODEC_FLAG_GLOBAL_HEADER 0x00400000 ///< Place global headers in extradata instead of every keyframe.
-#define CODEC_FLAG_BITEXACT 0x00800000 ///< Use only bitexact stuff (except (I)DCT).
-/* Fx : Flag for h263+ extra options */
-#define CODEC_FLAG_AC_PRED 0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction
-#define CODEC_FLAG_LOOP_FILTER 0x00000800 ///< loop filter
-#define CODEC_FLAG_INTERLACED_ME 0x20000000 ///< interlaced motion estimation
-#define CODEC_FLAG_CLOSED_GOP 0x80000000
-#define CODEC_FLAG2_FAST 0x00000001 ///< Allow non spec compliant speedup tricks.
-#define CODEC_FLAG2_NO_OUTPUT 0x00000004 ///< Skip bitstream encoding.
-#define CODEC_FLAG2_LOCAL_HEADER 0x00000008 ///< Place global headers at every keyframe instead of in extradata.
-#define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format. DEPRECATED!!!!
-#define CODEC_FLAG2_IGNORE_CROP 0x00010000 ///< Discard cropping information from SPS.
+#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)
+/**
+ * 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)
+/**
+ * Input bitstream might be truncated at a random location
+ * instead of only at frame boundaries.
+ */
+#define AV_CODEC_FLAG_TRUNCATED (1 << 16)
+/**
+ * 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)
 
-#define CODEC_FLAG2_CHUNKS 0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
-#define CODEC_FLAG2_SHOW_ALL 0x00400000 ///< Show all frames before the first keyframe
+/**
+ * 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)
@@ -766,24 +947,17 @@
 /* /Fx */
 /* codec capabilities */
 
-#define CODEC_CAP_DRAW_HORIZ_BAND 0x0001 ///< Decoder can use draw_horiz_band callback.
+/**
+ * Decoder can use draw_horiz_band callback.
+ */
+#define AV_CODEC_CAP_DRAW_HORIZ_BAND (1 << 0)
 /**
 * Codec uses get_buffer() for allocating buffers and supports custom allocators.
 * If not set, it might not use get_buffer() at all or use operations that
 * assume the buffer was allocated by avcodec_default_get_buffer.
 */
-#define CODEC_CAP_DR1 0x0002
-#define CODEC_CAP_TRUNCATED 0x0008
-#if FF_API_XVMC
-/* Codec can export data for HW decoding. This flag indicates that
- * the codec would call get_format() with list that might contain HW accelerated
- * pixel formats (XvMC, VDPAU, VAAPI, etc). The application can pick any of them
- * including raw image format.
- * The application can use the passed context to determine bitstream version,
- * chroma format, resolution etc.
- */
-#define CODEC_CAP_HWACCEL 0x0010
-#endif /* FF_API_XVMC */
+#define AV_CODEC_CAP_DR1 (1 << 1)
+#define AV_CODEC_CAP_TRUNCATED (1 << 3)
 /**
 * Encoder or decoder requires flushing with NULL input at the end in order to
 * give the complete and correct output.
@@ -807,106 +981,93 @@
 * each output packet. If this flag is not set, the pts and duration will
 * be determined by libavcodec from the input frame.
 */
-#define CODEC_CAP_DELAY 0x0020
+#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 CODEC_CAP_SMALL_LAST_FRAME 0x0040
-#if FF_API_CAP_VDPAU
-/**
- * Codec can export data for HW decoding (VDPAU).
- */
-#define CODEC_CAP_HWACCEL_VDPAU 0x0080
-#endif
+#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 carring such bitstreams thus
+ * 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 CODEC_CAP_SUBFRAMES 0x0100
+#define AV_CODEC_CAP_SUBFRAMES (1 << 8)
 /**
 * Codec is experimental and is thus avoided in favor of non experimental
 * encoders
 */
-#define CODEC_CAP_EXPERIMENTAL 0x0200
+#define AV_CODEC_CAP_EXPERIMENTAL (1 << 9)
 /**
 * Codec should fill in channel configuration and samplerate instead of container
 */
-#define CODEC_CAP_CHANNEL_CONF 0x0400
-#if FF_API_NEG_LINESIZES
-/**
- * @deprecated no codecs use this capability
- */
-#define CODEC_CAP_NEG_LINESIZES 0x0800
-#endif
+#define AV_CODEC_CAP_CHANNEL_CONF (1 << 10)
 /**
 * Codec supports frame-level multithreading.
 */
-#define CODEC_CAP_FRAME_THREADS 0x1000
+#define AV_CODEC_CAP_FRAME_THREADS (1 << 12)
 /**
 * Codec supports slice-based (or partition-based) multithreading.
 */
-#define CODEC_CAP_SLICE_THREADS 0x2000
+#define AV_CODEC_CAP_SLICE_THREADS (1 << 13)
 /**
 * Codec supports changed parameters at any point.
 */
-#define CODEC_CAP_PARAM_CHANGE 0x4000
+#define AV_CODEC_CAP_PARAM_CHANGE (1 << 14)
 /**
 * Codec supports avctx->thread_count == 0 (auto).
 */
-#define CODEC_CAP_AUTO_THREADS 0x8000
+#define AV_CODEC_CAP_AUTO_THREADS (1 << 15)
 /**
 * Audio encoder supports receiving a different number of samples in each call.
 */
-#define CODEC_CAP_VARIABLE_FRAME_SIZE 0x10000
+#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)
 /**
 * Codec is intra only.
 */
-#define CODEC_CAP_INTRA_ONLY 0x40000000
+#define AV_CODEC_CAP_INTRA_ONLY 0x40000000
 /**
 * Codec is lossless.
 */
-#define CODEC_CAP_LOSSLESS 0x80000000
+#define AV_CODEC_CAP_LOSSLESS 0x80000000
 
-#if FF_API_MB_TYPE
-//The following defines may change, don't expect compatibility if you use them.
-#define MB_TYPE_INTRA4x4 0x0001
-#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
-#define MB_TYPE_INTRA_PCM 0x0004 //FIXME H.264-specific
-#define MB_TYPE_16x16 0x0008
-#define MB_TYPE_16x8 0x0010
-#define MB_TYPE_8x16 0x0020
-#define MB_TYPE_8x8 0x0040
-#define MB_TYPE_INTERLACED 0x0080
-#define MB_TYPE_DIRECT2 0x0100 //FIXME
-#define MB_TYPE_ACPRED 0x0200
-#define MB_TYPE_GMC 0x0400
-#define MB_TYPE_SKIP 0x0800
-#define MB_TYPE_P0L0 0x1000
-#define MB_TYPE_P1L0 0x2000
-#define MB_TYPE_P0L1 0x4000
-#define MB_TYPE_P1L1 0x8000
-#define MB_TYPE_L0 (MB_TYPE_P0L0 | MB_TYPE_P1L0)
-#define MB_TYPE_L1 (MB_TYPE_P0L1 | MB_TYPE_P1L1)
-#define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1)
-#define MB_TYPE_QUANT 0x00010000
-#define MB_TYPE_CBP 0x00020000
-//Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...)
-#endif
+/**
+ * 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)
 
 /**
 * Pan Scan area.
 * This specifies the area which should be displayed.
 * Note there may be multiple such areas for one frame.
 */
-typedef struct AVPanScan{
+typedef struct AVPanScan {
 /**
 * id
 * - encoding: Set by user.
@@ -928,26 +1089,45 @@
 * - decoding: Set by libavcodec.
 */
 int16_t position[3][2];
-}AVPanScan;
+} AVPanScan;
 
-#if FF_API_QSCALE_TYPE
-#define FF_QSCALE_TYPE_MPEG1 0
-#define FF_QSCALE_TYPE_MPEG2 1
-#define FF_QSCALE_TYPE_H264 2
-#define FF_QSCALE_TYPE_VP56 3
-#endif
-
-#if FF_API_GET_BUFFER
-#define FF_BUFFER_TYPE_INTERNAL 1
-#define FF_BUFFER_TYPE_USER 2 ///< direct rendering buffers (image is (de)allocated by user)
-#define FF_BUFFER_TYPE_SHARED 4 ///< Buffer from somewhere else; don't deallocate image (data/base), all other tables are not shared.
-#define FF_BUFFER_TYPE_COPY 8 ///< Just a (modified) copy of some other buffer, don't deallocate anything.
-
-#define FF_BUFFER_HINTS_VALID 0x01 // Buffer hints value is meaningful (if 0 ignore).
-#define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer.
-#define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content.
-#define FF_BUFFER_HINTS_REUSABLE 0x08 // Codec will reuse the buffer (update).
-#endif
+/**
+ * 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.
+ */
+ int max_bitrate;
+ /**
+ * Minimum bitrate of the stream, in bits per second.
+ * Zero if unknown or unspecified.
+ */
+ int min_bitrate;
+ /**
+ * Average bitrate of the stream, in bits per second.
+ * Zero if unknown or unspecified.
+ */
+ int avg_bitrate;
+
+ /**
+ * The size of the buffer to which the ratecontrol is applied, in bits.
+ * Zero if unknown or unspecified.
+ */
+ int 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;
 
 /**
 * The decoder will keep a reference to the frame and may reuse it later.
@@ -961,7 +1141,20 @@
 * @{
 */
 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,
 
 /**
@@ -1003,6 +1196,58 @@
 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
+ * u64le[error 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
@@ -1011,7 +1256,7 @@
 * u8 reason for end skip (0=padding silence, 1=convergence)
 * @endcode
 */
- AV_PKT_DATA_SKIP_SAMPLES=70,
+ AV_PKT_DATA_SKIP_SAMPLES,
 
 /**
 * An AV_PKT_DATA_JP_DUALMONO side data packet indicates that
@@ -1065,29 +1310,99 @@
 * side data includes updated metadata which appeared in the stream.
 */
 AV_PKT_DATA_METADATA_UPDATE,
+
+ /**
+ * MPEGTS stream ID, 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,
+
+ /**
+ * 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;
+ int size;
+ enum AVPacketSideDataType type;
+} AVPacketSideData;
+
 /**
 * This structure stores compressed data. It is typically exported by demuxers
 * and then passed as input to decoders, or received as output from encoders and
 * then passed to muxers.
 *
 * For video, it should typically contain one compressed frame. For audio it may
- * contain several compressed frames.
+ * 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).
 *
 * AVPacket is one of the few structs in FFmpeg, whose size is a part of public
 * ABI. Thus it may be allocated on stack and no new fields can be added to it
 * without libavcodec and libavformat major bump.
 *
- * The semantics of data ownership depends on the buf or destruct (deprecated)
- * fields. If either is set, the packet data is dynamically allocated and is
- * valid indefinitely until av_free_packet() is called (which in turn calls
- * av_buffer_unref()/the destruct callback to free the data). If neither is set,
- * the packet data is typically backed by some static buffer somewhere and is
- * only valid for a limited time (e.g. until the next read call when demuxing).
+ * The 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() and is freed in
- * av_free_packet().
+ * The side data is always allocated with av_malloc(), copied by
+ * av_packet_ref() and freed by av_packet_unref().
+ *
+ * @see av_packet_ref
+ * @see av_packet_unref
 */
 typedef struct AVPacket {
 /**
@@ -1123,47 +1438,48 @@
 * Additional packet data that can be provided by the container.
 * Packet can contain several types of side information.
 */
- struct {
- uint8_t *data;
- int size;
- enum AVPacketSideDataType type;
- } *side_data;
+ AVPacketSideData *side_data;
 int side_data_elems;
 
 /**
 * Duration of this packet in AVStream->time_base units, 0 if unknown.
 * Equals next_pts - this_pts in presentation order.
 */
- int duration;
-#if FF_API_DESTRUCT_PACKET
- attribute_deprecated
- void (*destruct)(struct AVPacket *);
- attribute_deprecated
- void *priv;
-#endif
+ int64_t duration;
+
 int64_t pos; ///< byte position in stream, -1 if unknown
 
+#if FF_API_CONVERGENCE_DURATION
 /**
- * Time difference in AVStream->time_base units from the pts of this
- * packet to the point at which the output from the decoder has converged
- * independent from the availability of previous frames. That is, the
- * frames are virtually identical no matter if decoding started from
- * the very first frame or from this keyframe.
- * Is AV_NOPTS_VALUE if unknown.
- * This field is not the display duration of the current packet.
- * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
- * set.
- *
- * The purpose of this field is to allow seeking in streams that have no
- * keyframes in the conventional sense. It corresponds to the
- * recovery point SEI in H.264 and match_time_delta in NUT. It is also
- * essential for some types of subtitle streams to ensure that all
- * subtitles are correctly displayed after seeking.
+ * @deprecated Same as the duration field, but as int64_t. This was required
+ * for Matroska subtitles, whose duration values could overflow when the
+ * duration field was still an int.
 */
+ attribute_deprecated
 int64_t convergence_duration;
+#endif
 } AVPacket;
 #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,
@@ -1191,8 +1507,12 @@
 * New fields can be added to the end with minor version bumps.
 * Removal, reordering and changes to existing fields require a major
 * version bump.
- * Please use AVOptions (av_opt* / av_set/get*()) to access these fields from user
+ * 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 {
@@ -1205,7 +1525,6 @@
 
 enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
 const struct AVCodec *codec;
- char codec_name[32];
 enum AVCodecID codec_id; /* see AV_CODEC_ID_xxx */
 
 /**
@@ -1223,14 +1542,6 @@
 */
 unsigned int codec_tag;
 
- /**
- * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
- * This is used to work around some encoder bugs.
- * - encoding: unused
- * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
- */
- unsigned int stream_codec_tag;
-
 void *priv_data;
 
 /**
@@ -1251,9 +1562,10 @@
 /**
 * the average bitrate
 * - encoding: Set by user; unused for constant quantizer encoding.
- * - decoding: Set by libavcodec. 0 or some bitrate if this info is available in the stream.
+ * - decoding: Set by user, may be overwritten by libavcodec
+ * if this info is available in the stream
 */
- int bit_rate;
+ int64_t bit_rate;
 
 /**
 * number of bits the bitstream is allowed to diverge from the reference.
@@ -1279,14 +1591,14 @@
 #define FF_COMPRESSION_DEFAULT -1
 
 /**
- * CODEC_FLAG_*.
+ * AV_CODEC_FLAG_*.
 * - encoding: Set by user.
 * - decoding: Set by user.
 */
 int flags;
 
 /**
- * CODEC_FLAG2_*
+ * AV_CODEC_FLAG2_*
 * - encoding: Set by user.
 * - decoding: Set by user.
 */
@@ -1294,10 +1606,10 @@
 
 /**
 * some codecs need / can use extradata like Huffman tables.
- * mjpeg: Huffman tables
+ * MJPEG: Huffman tables
 * rv10: additional flags
- * mpeg4: global headers (they can be in the bitstream or here)
- * The allocated memory should be FF_INPUT_BUFFER_PADDING_SIZE bytes larger
+ * 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.
 * - encoding: Set/allocated/freed by libavcodec.
@@ -1311,8 +1623,19 @@
 * 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: Set by libavcodec.
+ * - decoding: the use of this field for decoding is deprecated.
+ * Use framerate instead.
 */
 AVRational time_base;
 
@@ -1338,12 +1661,8 @@
 * encoded input.
 *
 * Audio:
- * For encoding, this is the number of "priming" samples added to the
- * beginning of the stream. The decoded output will be delayed by this
- * many samples relative to the input to the encoder. Note that this
- * field is purely informational and does not directly affect the pts
- * output by the encoder, which should always be based on the actual
- * presentation time, including any delay.
+ * 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.
@@ -1357,28 +1676,34 @@
 /* video only */
 /**
 * picture width / height.
+ *
+ * @note Those fields may not match the values of the last
+ * AVFrame output by avcodec_decode_video2 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.
+ * 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.
+ * overwrite those values as required while parsing the data.
 */
 int coded_width, coded_height;
 
-#if FF_API_ASPECT_EXTENDED
-#define FF_ASPECT_EXTENDED 15
-#endif
-
 /**
 * the number of pictures in a group of pictures, or 0 for intra_only
 * - encoding: Set by user.
@@ -1390,21 +1715,18 @@
 * 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 if known
+ * - decoding: Set by user if known, overridden by libavcodec while
+ * parsing the data.
 */
 enum AVPixelFormat pix_fmt;
 
 /**
- * Motion estimation algorithm used for video coding.
- * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),
- * 8 (umh), 9 (iter), 10 (tesa) [7, 8, 10 are x264 specific, 9 is snow specific]
- * - encoding: MUST be set by user.
- * - decoding: unused
- */
- int me_method;
-
- /**
 * If non NULL, 'draw_horiz_band' is called by the libavcodec
 * decoder to draw a horizontal band. It improves cache usage. Not
 * all codecs can do that. You must check the codec capabilities
@@ -1436,6 +1758,10 @@
 * @param fmt is the list of formats which are supported by the codec,
 * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.
 * The first is always the native one.
+ * @note The callback may be called again immediately if initialization for
+ * the selected (hardware-accelerated) pixel format failed.
+ * @warning Behavior is undefined if the callback returns a value not
+ * in the fmt list of formats.
 * @return the chosen format
 * - encoding: unused
 * - decoding: Set by user, if not set the native format will be chosen.
@@ -1459,11 +1785,11 @@
 */
 float b_quant_factor;
 
- /** obsolete FIXME remove */
- int rc_strategy;
-#define FF_RC_STRATEGY_XVID 1
-
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int b_frame_strategy;
+#endif
 
 /**
 * qscale offset between IP and B-frames
@@ -1480,16 +1806,15 @@
 */
 int has_b_frames;
 
- /**
- * 0-> h263 quant 1-> mpeg quant
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int mpeg_quant;
+#endif
 
 /**
- * qscale factor between P and I-frames
- * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset).
+ * 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
@@ -1544,15 +1869,15 @@
 * - decoding: Set by user (or 0).
 */
 int slice_count;
- /**
- * prediction method (needed for huffyuv)
- * - encoding: Set by user.
- * - decoding: unused
- */
+
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int prediction_method;
 #define FF_PRED_LEFT 0
 #define FF_PRED_PLANE 1
 #define FF_PRED_MEDIAN 2
+#endif
 
 /**
 * slice offsets in the frame in bytes
@@ -1594,22 +1919,23 @@
 * - 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_CHROMA 256
+#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
@@ -1625,12 +1951,11 @@
 */
 int last_predictor_count;
 
- /**
- * prepass for motion estimation
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int pre_me;
+#endif
 
 /**
 * motion estimation prepass comparison function
@@ -1654,23 +1979,6 @@
 int me_subpel_quality;
 
 /**
- * DTG active format information (additional aspect ratio
- * information only used in DVB MPEG-2 transport streams)
- * 0 if not set.
- *
- * - encoding: unused
- * - decoding: Set by decoder.
- */
- int dtg_active_format;
-#define FF_DTG_AFD_SAME 8
-#define FF_DTG_AFD_4_3 9
-#define FF_DTG_AFD_16_9 10
-#define FF_DTG_AFD_14_9 11
-#define FF_DTG_AFD_4_3_SP_14_9 13
-#define FF_DTG_AFD_16_9_SP_14_9 14
-#define FF_DTG_AFD_SP_4_3 15
-
- /**
 * maximum motion estimation search range in subpel units
 * If 0 then no limit.
 *
@@ -1680,40 +1988,15 @@
 int me_range;
 
 /**
- * intra quantizer bias
- * - encoding: Set by user.
- * - decoding: unused
- */
- int intra_quant_bias;
-#define FF_DEFAULT_QUANT_BIAS 999999
-
- /**
- * inter quantizer bias
- * - encoding: Set by user.
- * - decoding: unused
- */
- int inter_quant_bias;
-
- /**
 * 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 (MPEG2 field pics)
+#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)
 
-#if FF_API_XVMC
- /**
- * XVideo Motion Acceleration
- * - encoding: forbidden
- * - decoding: set by decoder
- * @deprecated XvMC doesn't need it anymore.
- */
- attribute_deprecated int xvmc_acceleration;
-#endif /* FF_API_XVMC */
-
 /**
 * macroblock decision mode
 * - encoding: Set by user.
@@ -1738,41 +2021,20 @@
 */
 uint16_t *inter_matrix;
 
- /**
- * scene change detection threshold
- * 0 is default, larger means fewer detected scene changes.
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int scenechange_threshold;
 
- /**
- * noise reduction strength
- * - encoding: Set by user.
- * - decoding: unused
- */
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int noise_reduction;
-
- /**
- * Motion estimation threshold below which no motion estimation is
- * performed, but instead the user specified motion vectors are used.
- *
- * - encoding: Set by user.
- * - decoding: unused
- */
- int me_threshold;
-
- /**
- * Macroblock threshold below which the user specified macroblock types will be used.
- * - encoding: Set by user.
- * - decoding: unused
- */
- int mb_threshold;
+#endif
 
 /**
 * precision of the intra DC coefficient - 8
 * - encoding: Set by user.
- * - decoding: unused
+ * - decoding: Set by libavcodec
 */
 int intra_dc_precision;
 
@@ -1791,47 +2053,38 @@
 int skip_bottom;
 
 /**
- * Border processing masking, raises the quantizer for mbs on the borders
- * of the picture.
- * - encoding: Set by user.
- * - decoding: unused
- */
- float border_masking;
-
- /**
- * minimum MB lagrange multipler
+ * minimum MB Lagrange multiplier
 * - encoding: Set by user.
 * - decoding: unused
 */
 int mb_lmin;
 
 /**
- * maximum MB lagrange multipler
+ * maximum MB Lagrange multiplier
 * - encoding: Set by user.
 * - decoding: unused
 */
 int mb_lmax;
 
+#if FF_API_PRIVATE_OPT
 /**
- *
- * - encoding: Set by user.
- * - decoding: unused
+ * @deprecated use encoder private options instead
 */
+ attribute_deprecated
 int me_penalty_compensation;
+#endif
 
 /**
- *
 * - encoding: Set by user.
 * - decoding: unused
 */
 int bidir_refine;
 
- /**
- *
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int brd_scale;
+#endif
 
 /**
 * minimum GOP size
@@ -1847,34 +2100,24 @@
 */
 int refs;
 
- /**
- * chroma qp offset from luma
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int chromaoffset;
+#endif
 
 /**
- * Multiplied by qscale for each frame and added to scene_change_score.
- * - encoding: Set by user.
- * - decoding: unused
- */
- int scenechange_factor;
-
- /**
- *
 * Note: Value depends upon the compare function used for fullpel ME.
 * - encoding: Set by user.
 * - decoding: unused
 */
 int mv0_threshold;
 
- /**
- * Adjust sensitivity of b_frame_strategy 1.
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int b_sensitivity;
+#endif
 
 /**
 * Chromaticity coordinates of the source primaries.
@@ -1943,7 +2186,7 @@
 *
 * - encoding: set by libavcodec in avcodec_open2(). Each submitted frame
 * except the last must contain exactly frame_size samples per channel.
- * May be 0 when the codec has CODEC_CAP_VARIABLE_FRAME_SIZE set, then the
+ * 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
 */
@@ -1973,16 +2216,6 @@
 */
 int cutoff;
 
-#if FF_API_REQUEST_CHANNELS
- /**
- * Decoder should decode to this many channels if it can (0 for default)
- * - encoding: unused
- * - decoding: Set by user.
- * @deprecated Deprecated in favor of request_channel_layout.
- */
- attribute_deprecated int request_channels;
-#endif
-
 /**
 * Audio channel layout.
 * - encoding: set by user.
@@ -2012,102 +2245,6 @@
 */
 enum AVSampleFormat request_sample_fmt;
 
-#if FF_API_GET_BUFFER
- /**
- * Called at the beginning of each frame to get a buffer for it.
- *
- * The function will set AVFrame.data[], AVFrame.linesize[].
- * AVFrame.extended_data[] must also be set, but it should be the same as
- * AVFrame.data[] except for planar audio with more channels than can fit
- * in AVFrame.data[]. In that case, AVFrame.data[] shall still contain as
- * many data pointers as it can hold.
- *
- * if CODEC_CAP_DR1 is not set then get_buffer() must call
- * avcodec_default_get_buffer() instead of providing buffers allocated by
- * some other means.
- *
- * AVFrame.data[] should be 32- or 16-byte-aligned unless the CPU doesn't
- * need it. avcodec_default_get_buffer() aligns the output buffer properly,
- * but if get_buffer() is overridden then alignment considerations should
- * be taken into account.
- *
- * @see avcodec_default_get_buffer()
- *
- * Video:
- *
- * If pic.reference is set then the frame will be read later by libavcodec.
- * avcodec_align_dimensions2() should be used to find the required width and
- * height, as they normally need to be rounded up to the next multiple of 16.
- *
- * If frame multithreading is used and thread_safe_callbacks is set,
- * it may be called from a different thread, but not from more than one at
- * once. Does not need to be reentrant.
- *
- * @see release_buffer(), reget_buffer()
- * @see avcodec_align_dimensions2()
- *
- * Audio:
- *
- * Decoders request a buffer of a particular size by setting
- * AVFrame.nb_samples prior to calling get_buffer(). The decoder may,
- * however, utilize only part of the buffer by setting AVFrame.nb_samples
- * to a smaller value in the output frame.
- *
- * Decoders cannot use the buffer after returning from
- * avcodec_decode_audio4(), so they will not call release_buffer(), as it
- * is assumed to be released immediately upon return. In some rare cases,
- * a decoder may need to call get_buffer() more than once in a single
- * call to avcodec_decode_audio4(). In that case, when get_buffer() is
- * called again after it has already been called once, the previously
- * acquired buffer is assumed to be released at that time and may not be
- * reused by the decoder.
- *
- * As a convenience, av_samples_get_buffer_size() and
- * av_samples_fill_arrays() in libavutil may be used by custom get_buffer()
- * functions to find the required data size and to fill data pointers and
- * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
- * since all planes must be the same size.
- *
- * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
- *
- * - encoding: unused
- * - decoding: Set by libavcodec, user can override.
- *
- * @deprecated use get_buffer2()
- */
- attribute_deprecated
- int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
- /**
- * Called to release buffers which were allocated with get_buffer.
- * A released buffer can be reused in get_buffer().
- * pic.data[*] must be set to NULL.
- * May be called from a different thread if frame multithreading is used,
- * but not by more than one thread at once, so does not need to be reentrant.
- * - encoding: unused
- * - decoding: Set by libavcodec, user can override.
- *
- * @deprecated custom freeing callbacks should be set from get_buffer2()
- */
- attribute_deprecated
- void (*release_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
- /**
- * Called at the beginning of a frame to get cr buffer for it.
- * Buffer type (size, hints) must be the same. libavcodec won't check it.
- * libavcodec will pass previous buffer in pic, function should return
- * same buffer or new buffer with old frame "painted" into it.
- * If pic.data[0] == NULL must behave like get_buffer().
- * if CODEC_CAP_DR1 is not set then reget_buffer() must call
- * avcodec_default_reget_buffer() instead of providing buffers allocated by
- * some other means.
- * - encoding: unused
- * - decoding: Set by libavcodec, user can override.
- */
- attribute_deprecated
- int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
-#endif
-
 /**
 * This callback is called at the beginning of each frame to get data
 * buffer(s) for it. There may be one contiguous buffer for all the data or
@@ -2134,7 +2271,7 @@
 * to all data planes. data[] must hold as many pointers as it can.
 * extended_data must be allocated with av_malloc() and will be freed in
 * av_frame_unref().
- * * otherwise exended_data must point to data
+ * * 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
@@ -2145,7 +2282,7 @@
 * buffers than buf[] can hold. extended_buf will be freed in
 * av_frame_unref().
 *
- * If CODEC_CAP_DR1 is not set then get_buffer2() must call
+ * 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.
 *
@@ -2198,9 +2335,12 @@
 * Otherwise, the decoded frames must not be freed by the caller and are
 * only valid until the next decode call.
 *
+ * This is always automatically enabled if avcodec_receive_frame() is used.
+ *
 * - encoding: unused
 * - decoding: set by the caller before avcodec_open2().
 */
+ attribute_deprecated
 int refcounted_frames;
 
 /* - encoding parameters */
@@ -2229,17 +2369,6 @@
 int max_qdiff;
 
 /**
- * ratecontrol qmin qmax limiting method
- * 0-> clipping, 1-> use a nice continuous function to limit qscale wthin qmin/qmax.
- * - encoding: Set by user.
- * - decoding: unused
- */
- float rc_qsquish;
-
- float rc_qmod_amp;
- int rc_qmod_freq;
-
- /**
 * decoder bitstream buffer size
 * - encoding: Set by user.
 * - decoding: unused
@@ -2255,34 +2384,18 @@
 RcOverride *rc_override;
 
 /**
- * rate control equation
- * - encoding: Set by user
- * - decoding: unused
- */
- const char *rc_eq;
-
- /**
 * maximum bitrate
 * - encoding: Set by user.
- * - decoding: unused
+ * - decoding: Set by user, may be overwritten by libavcodec.
 */
- int rc_max_rate;
+ int64_t rc_max_rate;
 
 /**
 * minimum bitrate
 * - encoding: Set by user.
 * - decoding: unused
 */
- int rc_min_rate;
-
- float rc_buffer_aggressivity;
-
- /**
- * initial complexity for pass1 ratecontrol
- * - encoding: Set by user.
- * - decoding: unused
- */
- float rc_initial_cplx;
+ int64_t rc_min_rate;
 
 /**
 * Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow.
@@ -2305,66 +2418,41 @@
 */
 int rc_initial_buffer_occupancy;
 
+#if FF_API_CODER_TYPE
 #define FF_CODER_TYPE_VLC 0
 #define FF_CODER_TYPE_AC 1
 #define FF_CODER_TYPE_RAW 2
 #define FF_CODER_TYPE_RLE 3
-#define FF_CODER_TYPE_DEFLATE 4
 /**
- * coder type
- * - encoding: Set by user.
- * - decoding: unused
+ * @deprecated use encoder private options instead
 */
+ attribute_deprecated
 int coder_type;
+#endif /* FF_API_CODER_TYPE */
 
- /**
- * context model
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int context_model;
+#endif
 
- /**
- * minimum Lagrange multipler
- * - encoding: Set by user.
- * - decoding: unused
- */
- int lmin;
-
- /**
- * maximum Lagrange multipler
- * - encoding: Set by user.
- * - decoding: unused
- */
- int lmax;
-
- /**
- * frame skip threshold
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int frame_skip_threshold;
 
- /**
- * frame skip factor
- * - encoding: Set by user.
- * - decoding: unused
- */
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int frame_skip_factor;
 
- /**
- * frame skip exponent
- * - encoding: Set by user.
- * - decoding: unused
- */
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int frame_skip_exp;
 
- /**
- * frame skip comparison function
- * - encoding: Set by user.
- * - decoding: unused
- */
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int frame_skip_cmp;
+#endif /* FF_API_PRIVATE_OPT */
 
 /**
 * trellis RD quantization
@@ -2373,56 +2461,68 @@
 */
 int trellis;
 
- /**
- * - encoding: Set by user.
- * - decoding: unused
- */
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int min_prediction_order;
 
- /**
- * - encoding: Set by user.
- * - decoding: unused
- */
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int max_prediction_order;
 
- /**
- * GOP timecode frame start number
- * - encoding: Set by user, in non drop frame format
- * - decoding: Set by libavcodec (timecode in the 25 bits format, -1 if unset)
- */
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int64_t timecode_frame_start;
+#endif
 
+#if FF_API_RTP_CALLBACK
+ /**
+ * @deprecated unused
+ */
 /* The RTP callback: This function is called */
 /* every time the encoder has a packet to send. */
 /* It depends on the encoder if the data starts */
 /* with a Start Code (it should). H.263 does. */
 /* mb_nb contains the number of macroblocks */
 /* encoded in the RTP payload. */
+ attribute_deprecated
 void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);
+#endif
 
+#if FF_API_PRIVATE_OPT
+ /** @deprecated use encoder private options instead */
+ attribute_deprecated
 int rtp_payload_size; /* The size of the RTP payload: the coder will */
 /* do its best to deliver a chunk with size */
 /* below rtp_payload_size, the chunk will start */
 /* with a start code on some codecs like H.263. */
 /* This doesn't take account of any particular */
 /* headers inside the transmitted RTP payload. */
+#endif
 
+#if FF_API_STAT_BITS
 /* statistics, used for 2-pass encoding */
+ attribute_deprecated
 int mv_bits;
+ attribute_deprecated
 int header_bits;
+ attribute_deprecated
 int i_tex_bits;
+ attribute_deprecated
 int p_tex_bits;
+ attribute_deprecated
 int i_count;
+ attribute_deprecated
 int p_count;
+ attribute_deprecated
 int skip_count;
+ attribute_deprecated
 int misc_bits;
 
- /**
- * number of bits used for the previously encoded frame
- * - encoding: Set by libavcodec.
- * - decoding: unused
- */
+ /** @deprecated this field is unused */
+ attribute_deprecated
 int frame_bits;
+#endif
 
 /**
 * pass1 encoding statistics output buffer
@@ -2446,16 +2546,10 @@
 */
 int workaround_bugs;
 #define FF_BUG_AUTODETECT 1 ///< autodetection
-#if FF_API_OLD_MSMPEG4
-#define FF_BUG_OLD_MSMPEG4 2
-#endif
 #define FF_BUG_XVID_ILACE 4
 #define FF_BUG_UMP4 8
 #define FF_BUG_NO_PADDING 16
 #define FF_BUG_AMV 32
-#if FF_API_AC_VLC
-#define FF_BUG_AC_VLC 0 ///< Will be removed, libavcodec can now handle these non-compliant files by default.
-#endif
 #define FF_BUG_QPEL_CHROMA 64
 #define FF_BUG_STD_QPEL 128
 #define FF_BUG_QPEL_CHROMA2 256
@@ -2465,9 +2559,10 @@
 #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 (MPEG4, ...).
+ * 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
@@ -2493,6 +2588,7 @@
 int error_concealment;
 #define FF_EC_GUESS_MVS 1
 #define FF_EC_DEBLOCK 2
+#define FF_EC_FAVOR_INTER 256
 
 /**
 * debug
@@ -2514,28 +2610,28 @@
 #define FF_DEBUG_DCT_COEFF 0x00000040
 #define FF_DEBUG_SKIP 0x00000080
 #define FF_DEBUG_STARTCODE 0x00000100
-#define FF_DEBUG_PTS 0x00000200
 #define FF_DEBUG_ER 0x00000400
 #define FF_DEBUG_MMCO 0x00000800
 #define FF_DEBUG_BUGS 0x00001000
 #if FF_API_DEBUG_MV
-#define FF_DEBUG_VIS_QP 0x00002000 ///< only access through AVOptions from outside libavcodec
-#define FF_DEBUG_VIS_MB_TYPE 0x00004000 ///< only access through AVOptions from outside libavcodec
+#define FF_DEBUG_VIS_QP 0x00002000
+#define FF_DEBUG_VIS_MB_TYPE 0x00004000
 #endif
 #define FF_DEBUG_BUFFERS 0x00008000
 #define FF_DEBUG_THREADS 0x00010000
+#define FF_DEBUG_GREEN_MD 0x00800000
+#define FF_DEBUG_NOMC 0x01000000
 
 #if FF_API_DEBUG_MV
 /**
 * debug
- * Code outside libavcodec should access this field using AVOptions
 * - encoding: Set by user.
 * - decoding: Set by user.
 */
 int debug_mv;
-#define FF_DEBUG_VIS_MV_P_FOR 0x00000001 //visualize forward predicted MVs of P frames
-#define FF_DEBUG_VIS_MV_B_FOR 0x00000002 //visualize forward predicted MVs of B frames
-#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
+#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
 
 /**
@@ -2556,15 +2652,15 @@
 #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 compliancies 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 64bit number (generally a PTS) that will be reordered and
+ * opaque 64-bit number (generally a PTS) that will be reordered and
 * output in AVFrame.reordered_opaque
- * @deprecated in favor of pkt_pts
 * - encoding: unused
 * - decoding: Set by user.
 */
@@ -2575,7 +2671,7 @@
 * - encoding: unused.
 * - decoding: Set by libavcodec
 */
- struct AVHWAccel *hwaccel;
+ const struct AVHWAccel *hwaccel;
 
 /**
 * Hardware accelerator context.
@@ -2591,7 +2687,7 @@
 
 /**
 * error
- * - encoding: Set by libavcodec if flags&CODEC_FLAG_PSNR.
+ * - encoding: Set by libavcodec if flags & AV_CODEC_FLAG_PSNR.
 * - decoding: unused
 */
 uint64_t error[AV_NUM_DATA_POINTERS];
@@ -2621,18 +2717,14 @@
 #define FF_IDCT_SIMPLEMMX 3
 #define FF_IDCT_ARM 7
 #define FF_IDCT_ALTIVEC 8
-#define FF_IDCT_SH4 9
 #define FF_IDCT_SIMPLEARM 10
-#define FF_IDCT_IPP 13
-#define FF_IDCT_XVIDMMX 14
+#define FF_IDCT_XVID 14
 #define FF_IDCT_SIMPLEARMV5TE 16
 #define FF_IDCT_SIMPLEARMV6 17
-#define FF_IDCT_SIMPLEVIS 18
 #define FF_IDCT_FAAN 20
 #define FF_IDCT_SIMPLENEON 22
-#if FF_API_ARCH_ALPHA
-#define FF_IDCT_SIMPLEALPHA 23
-#endif
+#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).
@@ -2653,18 +2745,20 @@
 * low resolution decoding, 1-> 1/2 size, 2->1/4 size
 * - encoding: unused
 * - decoding: Set by user.
- * Code outside libavcodec should access this field using:
- * av_codec_{get,set}_lowres(avctx)
 */
 int lowres;
 #endif
 
+#if FF_API_CODED_FRAME
 /**
 * the picture in the bitstream
 * - encoding: Set by libavcodec.
 * - decoding: unused
+ *
+ * @deprecated use the quality factor packet side data instead
 */
- AVFrame *coded_frame;
+ attribute_deprecated AVFrame *coded_frame;
+#endif
 
 /**
 * thread count
@@ -2734,16 +2828,8 @@
 */
 int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
 
-#if FF_API_THREAD_OPAQUE
 /**
- * @deprecated this field should not be used from outside of lavc
- */
- attribute_deprecated
- void *thread_opaque;
-#endif
-
- /**
- * noise vs. sse weight for the nsse comparsion function
+ * noise vs. sse weight for the nsse comparison function
 * - encoding: Set by user.
 * - decoding: unused
 */
@@ -2769,11 +2855,19 @@
 #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
@@ -2792,8 +2886,10 @@
 #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)
@@ -2821,16 +2917,33 @@
 #define FF_PROFILE_MPEG4_SIMPLE_STUDIO 14
 #define FF_PROFILE_MPEG4_ADVANCED_SIMPLE 15
 
-#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0 0
-#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1 1
-#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION 2
+#define FF_PROFILE_JPEG2000_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_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
 
 /**
 * level
@@ -2872,35 +2985,69 @@
 uint8_t *subtitle_header;
 int subtitle_header_size;
 
-#if FF_API_ERROR_RATE
+#if FF_API_VBV_DELAY
 /**
- * @deprecated use the 'error_rate' private AVOption of the mpegvideo
- * encoders
+ * VBV delay coded in the last frame (in periods of a 27 MHz clock).
+ * Used for compliant TS muxing.
+ * - encoding: Set by libavcodec.
+ * - decoding: unused.
+ * @deprecated this value is now exported as a part of
+ * AV_PKT_DATA_CPB_PROPERTIES packet side data
 */
 attribute_deprecated
- int error_rate;
+ uint64_t vbv_delay;
 #endif
 
-#if FF_API_CODEC_PKT
+#if FF_API_SIDEDATA_ONLY_PKT
 /**
- * @deprecated this field is not supposed to be accessed from outside lavc
+ * Encoding only and set by default. Allow encoders to output packets
+ * that do not contain any encoded data, only side data.
+ *
+ * Some encoders need to output such packets, e.g. to update some stream
+ * parameters at the end of encoding.
+ *
+ * @deprecated this field disables the default behaviour and
+ * it is kept only for compatibility.
 */
 attribute_deprecated
- AVPacket *pkt;
+ int side_data_only_packets;
 #endif
 
 /**
- * VBV delay coded in the last frame (in periods of a 27 MHz clock).
- * Used for compliant TS muxing.
- * - encoding: Set by libavcodec.
- * - decoding: unused.
+ * 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.
 */
- uint64_t vbv_delay;
+ 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.
- * Code outside libavcodec should access this field using:
- * av_codec_{get,set}_pkt_timebase(avctx)
 * - encoding unused.
 * - decoding set by user.
 */
@@ -2908,8 +3055,6 @@
 
 /**
 * AVCodecDescriptor
- * Code outside libavcodec should access this field using:
- * av_codec_{get,set}_codec_descriptor(avctx)
 * - encoding: unused.
 * - decoding: set by libavcodec.
 */
@@ -2920,8 +3065,6 @@
 * low resolution decoding, 1-> 1/2 size, 2->1/4 size
 * - encoding: unused
 * - decoding: Set by user.
- * Code outside libavcodec should access this field using:
- * av_codec_{get,set}_lowres(avctx)
 */
 int lowres;
 #endif
@@ -2953,6 +3096,7 @@
 #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.
@@ -2962,7 +3106,6 @@
 * However for formats that do not use pre-multiplied alpha
 * there might be serious artefacts (though e.g. libswscale currently
 * assumes pre-multiplied alpha anyway).
- * Code outside libavcodec should access this field using AVOptions
 *
 * - decoding: set by user
 * - encoding: unused
@@ -2979,7 +3122,6 @@
 #if !FF_API_DEBUG_MV
 /**
 * debug motion vectors
- * Code outside libavcodec should access this field using AVOptions
 * - encoding: Set by user.
 * - decoding: Set by user.
 */
@@ -2991,27 +3133,207 @@
 
 /**
 * custom intra quantization matrix
- * Code outside libavcodec should access this field using av_codec_g/set_chroma_intra_matrix()
 * - encoding: Set by user, can be NULL.
 * - decoding: unused.
 */
 uint16_t *chroma_intra_matrix;
+
+ /**
+ * 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
+
+ /**
+ * 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;
+
+ /**
+ * Control the form of AVSubtitle.rects[N]->ass
+ * - decoding: set by user
+ * - encoding: unused
+ */
+ int sub_text_format;
+#define FF_SUB_TEXT_FMT_ASS 0
+#if FF_API_ASS_TIMING
+#define FF_SUB_TEXT_FMT_ASS_WITH_TIMINGS 1
+#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;
 } AVCodecContext;
 
+#if FF_API_CODEC_GET_SET
+/**
+ * Accessors for some AVCodecContext fields. These used to be provided for ABI
+ * compatibility, and do not need to be used anymore.
+ */
+attribute_deprecated
 AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx);
+attribute_deprecated
 void av_codec_set_pkt_timebase (AVCodecContext *avctx, AVRational val);
 
+attribute_deprecated
 const AVCodecDescriptor *av_codec_get_codec_descriptor(const AVCodecContext *avctx);
+attribute_deprecated
 void av_codec_set_codec_descriptor(AVCodecContext *avctx, const AVCodecDescriptor *desc);
 
+attribute_deprecated
+unsigned av_codec_get_codec_properties(const AVCodecContext *avctx);
+
+#if FF_API_LOWRES
+attribute_deprecated
 int av_codec_get_lowres(const AVCodecContext *avctx);
+attribute_deprecated
 void av_codec_set_lowres(AVCodecContext *avctx, int val);
+#endif
 
+attribute_deprecated
 int av_codec_get_seek_preroll(const AVCodecContext *avctx);
+attribute_deprecated
 void av_codec_set_seek_preroll(AVCodecContext *avctx, int val);
 
+attribute_deprecated
 uint16_t *av_codec_get_chroma_intra_matrix(const AVCodecContext *avctx);
+attribute_deprecated
 void av_codec_set_chroma_intra_matrix(AVCodecContext *avctx, uint16_t *val);
+#endif
 
 /**
 * AVProfile.
@@ -3021,6 +3343,61 @@
 const char *name; ///< short name for the profile
 } AVProfile;
 
+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.
+ */
+ 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 {
+ /**
+ * A hardware pixel format which the codec can use.
+ */
+ 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;
+
 typedef struct AVCodecDefault AVCodecDefault;
 
 struct AVSubtitle;
@@ -3045,7 +3422,7 @@
 enum AVCodecID id;
 /**
 * Codec capabilities.
- * see CODEC_CAP_*
+ * see AV_CODEC_CAP_*
 */
 int capabilities;
 const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
@@ -3053,12 +3430,22 @@
 const int *supported_samplerates; ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
 const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
 const uint64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
-#if FF_API_LOWRES
- uint8_t max_lowres; ///< maximum value for lowres supported by the decoder, no direct access, use av_codec_get_max_lowres()
-#endif
+ uint8_t max_lowres; ///< maximum value for lowres supported by the decoder
 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
@@ -3095,6 +3482,9 @@
 
 /**
 * Initialize codec static data, called from avcodec_register().
+ *
+ * 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);
 
@@ -3116,18 +3506,72 @@
 int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt);
 int (*close)(AVCodecContext *);
 /**
+ * Encode API with decoupled packet/frame dataflow. The API is the
+ * same as the avcodec_ prefixed APIs (avcodec_send_frame() etc.), except
+ * that:
+ * - never called if the codec is closed or the wrong type,
+ * - if AV_CODEC_CAP_DELAY is not set, drain frames are never sent,
+ * - only one drain frame is ever passed down,
+ */
+ int (*send_frame)(AVCodecContext *avctx, const AVFrame *frame);
+ int (*receive_packet)(AVCodecContext *avctx, 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)(AVCodecContext *avctx, AVFrame *frame);
+ /**
 * Flush buffers.
 * Will be called when seeking
 */
 void (*flush)(AVCodecContext *);
+ /**
+ * Internal codec capabilities.
+ * See FF_CODEC_CAP_* in internal.h
+ */
+ int caps_internal;
+
+ /**
+ * 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 **hw_configs;
 } AVCodec;
 
+#if FF_API_CODEC_GET_SET
+attribute_deprecated
 int av_codec_get_max_lowres(const AVCodec *codec);
+#endif
 
 struct MpegEncContext;
 
 /**
- * AVHWAccel.
+ * 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);
+
+/**
+ * @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 {
 /**
@@ -3160,11 +3604,22 @@
 
 /**
 * Hardware accelerated codec capabilities.
- * see FF_HWACCEL_CODEC_CAP_*
+ * see AV_HWACCEL_CODEC_CAP_*
 */
 int capabilities;
 
- struct AVHWAccel *next;
+ /*****************************************************************
+ * 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.
@@ -3183,6 +3638,20 @@
 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
@@ -3208,27 +3677,106 @@
 int (*end_frame)(AVCodecContext *avctx);
 
 /**
- * Size of HW accelerator private data.
+ * Size of per-frame hardware accelerator private data.
 *
 * Private data is allocated with av_mallocz() before
 * AVCodecContext.get_buffer() and deallocated after
 * AVCodecContext.release_buffer().
 */
- int priv_data_size;
+ int frame_priv_data_size;
 
 /**
 * Called for every Macroblock in a slice.
 *
- * XvMC uses it to replace the ff_MPV_decode_mb().
+ * 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)
+
+/**
+ * @}
+ */
+
+#if FF_API_AVPICTURE
+/**
 * @defgroup lavc_picture AVPicture
 *
 * Functions for working with AVPicture
@@ -3240,15 +3788,19 @@
 *
 * Up to four components can be stored into it, the last component is
 * alpha.
+ * @deprecated use AVFrame or imgutils functions instead
 */
 typedef struct AVPicture {
+ attribute_deprecated
 uint8_t *data[AV_NUM_DATA_POINTERS]; ///< pointers to the image data planes
+ attribute_deprecated
 int linesize[AV_NUM_DATA_POINTERS]; ///< number of bytes per line
 } AVPicture;
 
 /**
 * @}
 */
+#endif
 
 enum AVSubtitleType {
 SUBTITLE_NONE,
@@ -3277,11 +3829,20 @@
 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
 
+#if FF_API_AVPICTURE
 /**
- * data+linesize for the bitmap of this subtitle.
- * can be set for text/ass as well once they where rendered
+ * @deprecated unused
 */
+ attribute_deprecated
 AVPicture pict;
+#endif
+ /**
+ * data+linesize for the bitmap of this subtitle.
+ * Can be set for text/ass as well once they are rendered.
+ */
+ uint8_t *data[4];
+ int linesize[4];
+
 enum AVSubtitleType type;
 
 char *text; ///< 0 terminated plain UTF-8 text
@@ -3306,11 +3867,183 @@
 } AVSubtitle;
 
 /**
+ * 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;
+
+/**
+ * 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);
+
+#if FF_API_NEXT
+/**
 * If c is NULL, returns the first registered codec,
 * if c is non-NULL, returns the next registered codec after c,
 * or NULL if c is the last one.
 */
+attribute_deprecated
 AVCodec *av_codec_next(const AVCodec *c);
+#endif
 
 /**
 * Return the LIBAVCODEC_VERSION_INT constant.
@@ -3327,6 +4060,7 @@
 */
 const char *avcodec_license(void);
 
+#if FF_API_NEXT
 /**
 * Register the codec codec and initialize libavcodec.
 *
@@ -3335,6 +4069,7 @@
 *
 * @see avcodec_register_all()
 */
+attribute_deprecated
 void avcodec_register(AVCodec *codec);
 
 /**
@@ -3347,12 +4082,13 @@
 * @see av_register_codec_parser
 * @see av_register_bitstream_filter
 */
+attribute_deprecated
 void avcodec_register_all(void);
+#endif
 
 /**
- * Allocate an AVCodecContext and set its fields to default values. The
- * resulting struct can be deallocated by calling avcodec_close() on it followed
- * by av_free().
+ * 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()
@@ -3362,20 +4098,23 @@
 * important mainly for encoders, e.g. libx264).
 *
 * @return An AVCodecContext filled with default values or NULL on failure.
- * @see avcodec_get_context_defaults
 */
 AVCodecContext *avcodec_alloc_context3(const AVCodec *codec);
 
 /**
- * Set the fields of the given AVCodecContext to default values corresponding
- * to the given codec (defaults may be codec-dependent).
- *
- * Do not call this function if a non-NULL codec has been passed
- * to avcodec_alloc_context3() that allocated this AVCodecContext.
- * If codec is non-NULL, it is illegal to call avcodec_open2() with a
- * different codec on this AVCodecContext.
+ * Free the codec context and everything associated with it and write NULL to
+ * the provided pointer.
+ */
+void avcodec_free_context(AVCodecContext **avctx);
+
+#if FF_API_GET_CONTEXT_DEFAULTS
+/**
+ * @deprecated This function should not be used, as closing and opening a codec
+ * context multiple time is not supported. A new codec context should be
+ * allocated for each new use.
 */
 int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec);
+#endif
 
 /**
 * Get the AVClass for AVCodecContext. It can be used in combination with
@@ -3385,6 +4124,7 @@
 */
 const AVClass *avcodec_get_class(void);
 
+#if FF_API_COPY_CONTEXT
 /**
 * Get the AVClass for AVFrame. It can be used in combination with
 * AV_OPT_SEARCH_FAKE_OBJ for examining options.
@@ -3411,41 +4151,58 @@
 * avcodec_alloc_context3(NULL), but otherwise uninitialized
 * @param src source codec context
 * @return AVERROR() on error (e.g. memory allocation error), 0 on success
+ *
+ * @deprecated The semantics of this function are ill-defined and it should not
+ * be used. If you need to transfer the stream parameters from one codec context
+ * to another, use an intermediate AVCodecParameters instance and the
+ * avcodec_parameters_from_context() / avcodec_parameters_to_context()
+ * functions.
 */
+attribute_deprecated
 int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
+#endif
 
-#if FF_API_AVFRAME_LAVC
 /**
- * @deprecated use av_frame_alloc()
+ * Allocate a new AVCodecParameters and set its fields to default values
+ * (unknown/invalid/0). The returned struct must be freed with
+ * avcodec_parameters_free().
 */
-attribute_deprecated
-AVFrame *avcodec_alloc_frame(void);
+AVCodecParameters *avcodec_parameters_alloc(void);
 
 /**
- * Set the fields of the given AVFrame to default values.
- *
- * @param frame The AVFrame of which the fields should be set to default values.
- *
- * @deprecated use av_frame_unref()
+ * Free an AVCodecParameters instance and everything associated with it and
+ * write NULL to the supplied pointer.
 */
-attribute_deprecated
-void avcodec_get_frame_defaults(AVFrame *frame);
+void avcodec_parameters_free(AVCodecParameters **par);
 
 /**
- * Free the frame and any dynamically allocated objects in it,
- * e.g. extended_data.
+ * 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.
 *
- * @param frame frame to be freed. The pointer will be set to NULL.
+ * @return >= 0 on success, a negative AVERROR code on failure.
+ */
+int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src);
+
+/**
+ * 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.
 *
- * @warning this function does NOT free the data buffers themselves
- * (it does not know how, since they might have been allocated with
- * a custom get_buffer()).
+ * @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.
 *
- * @deprecated use av_frame_free()
+ * @return >= 0 on success, a negative AVERROR code on failure.
 */
-attribute_deprecated
-void avcodec_free_frame(AVFrame **frame);
-#endif
+int avcodec_parameters_to_context(AVCodecContext *codec,
+ const AVCodecParameters *par);
 
 /**
 * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
@@ -3457,6 +4214,9 @@
 *
 * @warning This function is not thread safe!
 *
+ * @note Always call this function before using decoding routines (such as
+ * @ref avcodec_receive_frame()).
+ *
 * @code
 * avcodec_register_all();
 * av_dict_set(&opts, "b", "2.5M", 0);
@@ -3473,9 +4233,8 @@
 * @param avctx The context to initialize.
 * @param codec The codec to open this context for. If a non-NULL codec has been
 * previously passed to avcodec_alloc_context3() or
- * avcodec_get_context_defaults3() for this context, then this
- * parameter MUST be either NULL or equal to the previously passed
- * codec.
+ * 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.
 *
@@ -3490,9 +4249,13 @@
 * (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() /
- * avcodec_get_context_defaults3() with a non-NULL codec. Subsequent calls will
- * do nothing.
+ * 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);
 
@@ -3512,14 +4275,39 @@
 * @{
 */
 
-#if FF_API_DESTRUCT_PACKET
 /**
- * Default packet destructor.
- * @deprecated use the AVBuffer API instead
+ * 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
 */
-attribute_deprecated
-void av_destruct_packet(AVPacket *pkt);
-#endif
+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);
 
 /**
 * Initialize optional fields of a packet with default values.
@@ -3566,39 +4354,51 @@
 * function returns successfully, the data is owned by the underlying AVBuffer.
 * The caller may not access the data through other means.
 * @param size size of data in bytes, without the padding. I.e. the full buffer
- * size is assumed to be size + FF_INPUT_BUFFER_PADDING_SIZE.
+ * 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);
 
+#if FF_API_AVPACKET_OLD_API
 /**
 * @warning This is a hack - the packet memory allocation stuff is broken. The
 * packet is allocated if it was not really allocated.
+ *
+ * @deprecated Use av_packet_ref or av_packet_make_refcounted
 */
+attribute_deprecated
 int av_dup_packet(AVPacket *pkt);
-
 /**
 * Copy packet, including contents
 *
 * @return 0 on success, negative AVERROR on fail
+ *
+ * @deprecated Use av_packet_ref
 */
-int av_copy_packet(AVPacket *dst, AVPacket *src);
+attribute_deprecated
+int av_copy_packet(AVPacket *dst, const AVPacket *src);
 
 /**
 * Copy packet side data
 *
 * @return 0 on success, negative AVERROR on fail
+ *
+ * @deprecated Use av_packet_copy_props
 */
-int av_copy_packet_side_data(AVPacket *dst, AVPacket *src);
+attribute_deprecated
+int av_copy_packet_side_data(AVPacket *dst, const AVPacket *src);
 
 /**
 * Free a packet.
 *
+ * @deprecated Use av_packet_unref
+ *
 * @param pkt packet to free
 */
+attribute_deprecated
 void av_free_packet(AVPacket *pkt);
-
+#endif
 /**
 * Allocate new information of a packet.
 *
@@ -3611,6 +4411,22 @@
 int 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
@@ -3629,12 +4445,18 @@
 * @param size pointer for side information size to store (optional)
 * @return pointer to data if present or NULL otherwise
 */
-uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+uint8_t* av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type,
 int *size);
 
+#if FF_API_MERGE_SD_API
+attribute_deprecated
 int av_packet_merge_side_data(AVPacket *pkt);
 
+attribute_deprecated
 int av_packet_split_side_data(AVPacket *pkt);
+#endif
+
+const char *av_packet_side_data_name(enum AVPacketSideDataType type);
 
 /**
 * Pack a dictionary for use in side_data.
@@ -3679,7 +4501,7 @@
 *
 * @return 0 on success, a negative AVERROR on error.
 */
-int av_packet_ref(AVPacket *dst, AVPacket *src);
+int av_packet_ref(AVPacket *dst, const AVPacket *src);
 
 /**
 * Wipe the packet.
@@ -3711,11 +4533,50 @@
 * @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);
+
+/**
 * @}
 */
 
@@ -3740,40 +4601,19 @@
 */
 AVCodec *avcodec_find_decoder_by_name(const char *name);
 
-#if FF_API_GET_BUFFER
-attribute_deprecated int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
-attribute_deprecated void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
-attribute_deprecated int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
-#endif
-
 /**
 * The default callback for AVCodecContext.get_buffer2(). It is made public so
 * it can be called by custom get_buffer2() implementations for decoders without
- * CODEC_CAP_DR1 set.
+ * AV_CODEC_CAP_DR1 set.
 */
 int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *frame, int flags);
 
-#if FF_API_EMU_EDGE
-/**
- * Return the amount of padding in pixels which the get_buffer callback must
- * provide around the edge of the image for codecs which do not have the
- * CODEC_FLAG_EMU_EDGE flag.
- *
- * @return Required padding in pixels.
- *
- * @deprecated CODEC_FLAG_EMU_EDGE is deprecated, so this function is no longer
- * needed
- */
-attribute_deprecated
-unsigned avcodec_get_edge_width(void);
-#endif
-
 /**
 * Modify width and height values so that they will result in a memory
 * buffer that is acceptable for the codec if you do not use any horizontal
 * padding.
 *
- * May only be used if a codec with CODEC_CAP_DR1 has been opened.
+ * 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);
 
@@ -3782,7 +4622,7 @@
 * buffer that is acceptable for the codec if you also ensure that all
 * line sizes are a multiple of the respective linesize_align[i].
 *
- * May only be used if a codec with CODEC_CAP_DR1 has been opened.
+ * 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_align[AV_NUM_DATA_POINTERS]);
@@ -3809,66 +4649,6 @@
 */
 enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos);
 
-#if FF_API_OLD_DECODE_AUDIO
-/**
- * Wrapper function which calls avcodec_decode_audio4.
- *
- * @deprecated Use avcodec_decode_audio4 instead.
- *
- * Decode the audio frame of size avpkt->size from avpkt->data into samples.
- * Some decoders may support multiple frames in a single AVPacket, such
- * decoders would then just decode the first frame. In this case,
- * avcodec_decode_audio3 has to be called again with an AVPacket that contains
- * the remaining data in order to decode the second frame etc.
- * If no frame
- * could be outputted, frame_size_ptr is zero. Otherwise, it is the
- * decompressed frame size in bytes.
- *
- * @warning You must set frame_size_ptr to the allocated size of the
- * output buffer before calling avcodec_decode_audio3().
- *
- * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
- * the actual read bytes because some optimized bitstream readers read 32 or 64
- * bits at once and could read over the end.
- *
- * @warning The end of the input buffer avpkt->data should be set to 0 to ensure that
- * no overreading happens for damaged MPEG streams.
- *
- * @warning You must not provide a custom get_buffer() when using
- * avcodec_decode_audio3(). Doing so will override it with
- * avcodec_default_get_buffer. Use avcodec_decode_audio4() instead,
- * which does allow the application to provide a custom get_buffer().
- *
- * @note You might have to align the input buffer avpkt->data and output buffer
- * samples. The alignment requirements depend on the CPU: On some CPUs it isn't
- * necessary at all, on others it won't work at all if not aligned and on others
- * it will work but it will have an impact on performance.
- *
- * In practice, avpkt->data should have 4 byte alignment at minimum and
- * samples should be 16 byte aligned unless the CPU doesn't need it
- * (AltiVec and SSE do).
- *
- * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
- * between input and output, these need to be fed with avpkt->data=NULL,
- * avpkt->size=0 at the end to return the remaining frames.
- *
- * @param avctx the codec context
- * @param[out] samples the output buffer, sample type in avctx->sample_fmt
- * If the sample format is planar, each channel plane will
- * be the same size, with no padding between channels.
- * @param[in,out] frame_size_ptr the output buffer size in bytes
- * @param[in] avpkt The input AVPacket containing the input buffer.
- * You can create such packet with av_init_packet() and by then setting
- * data and size, some decoders might in addition need other fields.
- * All decoders are designed to use the least fields possible though.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame data was decompressed (used) from the input AVPacket.
- */
-attribute_deprecated int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
- int *frame_size_ptr,
- AVPacket *avpkt);
-#endif
-
 /**
 * Decode the audio frame of size avpkt->size from avpkt->data into frame.
 *
@@ -3880,18 +4660,21 @@
 * needs to be fed to the decoder with remaining data until it is completely
 * consumed or an error occurs.
 *
- * Some decoders (those marked with CODEC_CAP_DELAY) have a delay between input
+ * 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 samples. It is safe to flush even those decoders that are not
- * marked with CODEC_CAP_DELAY, then no samples will be returned.
+ * marked with AV_CODEC_CAP_DELAY, then no samples will be returned.
 *
- * @warning The input buffer, avpkt->data must be FF_INPUT_BUFFER_PADDING_SIZE
+ * @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 the codec context
 * @param[out] frame The AVFrame in which to store decoded audio samples.
 * The decoder will allocate a buffer for the decoded frame by
@@ -3908,7 +4691,7 @@
 * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is
 * non-zero. Note that this field being set to zero
 * does not mean that an error has occurred. For
- * decoders with CODEC_CAP_DELAY set, no given decode
+ * decoders with AV_CODEC_CAP_DELAY set, no given decode
 * call is guaranteed to produce a frame.
 * @param[in] avpkt The input AVPacket containing the input buffer.
 * At least avpkt->data and avpkt->size should be set. Some
@@ -3916,7 +4699,10 @@
 * @return A negative error code is returned if an error occurred during
 * decoding, otherwise the number of bytes consumed from the input
 * AVPacket is returned.
+ *
+* @deprecated Use avcodec_send_packet() and avcodec_receive_frame().
 */
+attribute_deprecated
 int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
 int *got_frame_ptr, const AVPacket *avpkt);
 
@@ -3925,17 +4711,20 @@
 * Some decoders may support multiple frames in a single AVPacket, such
 * decoders would then just decode the first frame.
 *
- * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
+ * @warning The input buffer 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.
 *
 * @warning The end of the input buffer buf should be set to 0 to ensure that
 * no overreading happens for damaged MPEG streams.
 *
- * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
+ * @note Codecs which have the AV_CODEC_CAP_DELAY capability set have a delay
 * between input and output, these need to be fed with avpkt->data=NULL,
 * avpkt->size=0 at the end to return the remaining frames.
 *
+ * @note The AVCodecContext MUST have been opened with @ref avcodec_open2()
+ * before packets may be fed to the decoder.
+ *
 * @param avctx the codec context
 * @param[out] picture The AVFrame in which the decoded video frame will be stored.
 * Use av_frame_alloc() to get an AVFrame. The codec will
@@ -3959,7 +4748,10 @@
 * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
 * @return On error a negative value is returned, otherwise the number of bytes
 * used or zero if no frame could be decompressed.
+ *
+ * @deprecated Use avcodec_send_packet() and avcodec_receive_frame().
 */
+attribute_deprecated
 int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
 int *got_picture_ptr,
 const AVPacket *avpkt);
@@ -3969,22 +4761,25 @@
 * Return a negative value on error, otherwise return the number of bytes used.
 * If no subtitle could be decompressed, got_sub_ptr is zero.
 * Otherwise, the subtitle is stored in *sub.
- * Note that CODEC_CAP_DR1 is not available for subtitle codecs. This is for
+ * Note that AV_CODEC_CAP_DR1 is not available for subtitle codecs. This is for
 * simplicity, because the performance difference is expect to be negligible
 * and reusing a get_buffer written for video codecs would probably perform badly
 * due to a potentially very different allocation pattern.
 *
- * Some decoders (those marked with CODEC_CAP_DELAY) have a delay between input
+ * 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 CODEC_CAP_DELAY, then no subtitles will be returned.
+ * 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
- * @param[out] sub The AVSubtitle in which the decoded subtitle will be stored, must be
- freed with avsubtitle_free if *got_sub_ptr is set.
+ * @param[out] sub The Preallocated AVSubtitle in which the decoded subtitle will be stored,
+ * must be freed with avsubtitle_free if *got_sub_ptr is set.
 * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero.
 * @param[in] avpkt The input AVPacket containing the input buffer.
 */
@@ -3993,6 +4788,236 @@
 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.
+ *
+ * @warning Do not mix this API with the legacy API (like avcodec_decode_video2())
+ * on the same AVCodecContext. It will return unexpected results now
+ * or in future libavcodec versions.
+ *
+ * @note The AVCodecContext MUST have been opened with @ref avcodec_open2()
+ * before packets may be fed to the decoder.
+ *
+ * @param avctx codec context
+ * @param[in] 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
+ * 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
+ * @param[in] 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, refcounted_frames not set, it is a
+ * decoder, or requires flush
+ * AVERROR(ENOMEM): failed to add packet to internal queue, or similar
+ * other errors: legitimate decoding 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_frame_unref(frame) 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 an encoder
+ * other errors: legitimate decoding 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
 * @{
 */
@@ -4055,24 +5080,13 @@
 */
 int key_frame;
 
+#if FF_API_CONVERGENCE_DURATION
 /**
- * Time difference in stream time base units from the pts of this
- * packet to the point at which the output from the decoder has converged
- * independent from the availability of previous frames. That is, the
- * frames are virtually identical no matter if decoding started from
- * the very first frame or from this keyframe.
- * Is AV_NOPTS_VALUE if unknown.
- * This field is not the display duration of the current frame.
- * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
- * set.
- *
- * The purpose of this field is to allow seeking in streams that have no
- * keyframes in the conventional sense. It corresponds to the
- * recovery point SEI in H.264 and match_time_delta in NUT. It is also
- * essential for some types of subtitle streams to ensure that all
- * subtitles are correctly displayed after seeking.
+ * @deprecated unused
 */
+ attribute_deprecated
 int64_t convergence_duration;
+#endif
 
 // Timestamp generation support:
 /**
@@ -4158,12 +5172,36 @@
 * 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_ids[5]; /* 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,
@@ -4173,8 +5211,21 @@
 struct AVCodecParser *next;
 } AVCodecParser;
 
-AVCodecParser *av_parser_next(AVCodecParser *c);
+/**
+ * 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);
+
+attribute_deprecated
+AVCodecParser *av_parser_next(const AVCodecParser *c);
 
+attribute_deprecated
 void av_register_codec_parser(AVCodecParser *parser);
 AVCodecParserContext *av_parser_init(int codec_id);
 
@@ -4186,7 +5237,10 @@
 * @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 input length, to signal EOF, this should be 0 (so that the last frame can be output).
+ * @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.
@@ -4249,36 +5303,6 @@
 */
 AVCodec *avcodec_find_encoder_by_name(const char *name);
 
-#if FF_API_OLD_ENCODE_AUDIO
-/**
- * Encode an audio frame from samples into buf.
- *
- * @deprecated Use avcodec_encode_audio2 instead.
- *
- * @note The output buffer should be at least FF_MIN_BUFFER_SIZE bytes large.
- * However, for codecs with avctx->frame_size equal to 0 (e.g. PCM) the user
- * will know how much space is needed because it depends on the value passed
- * in buf_size as described below. In that case a lower value can be used.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer
- * @param[in] buf_size the output buffer size
- * @param[in] samples the input buffer containing the samples
- * The number of samples read from this buffer is frame_size*channels,
- * both of which are defined in avctx.
- * For codecs which have avctx->frame_size equal to 0 (e.g. PCM) the number of
- * samples read from samples is equal to:
- * buf_size * 8 / (avctx->channels * av_get_bits_per_sample(avctx->codec_id))
- * This also implies that av_get_bits_per_sample() must not return 0 for these
- * codecs.
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used to encode the data read from the input buffer.
- */
-int attribute_deprecated avcodec_encode_audio(AVCodecContext *avctx,
- uint8_t *buf, int buf_size,
- const short *samples);
-#endif
-
 /**
 * Encode a frame of audio.
 *
@@ -4300,12 +5324,11 @@
 * of the output packet.
 *
 * If this function fails or produces no output, avpkt will be
- * freed using av_free_packet() (i.e. avpkt->destruct will be
- * called to free the user supplied buffer).
+ * freed using av_packet_unref().
 * @param[in] frame AVFrame containing the raw audio data to be encoded.
 * May be NULL when flushing an encoder that has the
- * CODEC_CAP_DELAY capability set.
- * If CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
+ * AV_CODEC_CAP_DELAY capability set.
+ * 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.
@@ -4317,29 +5340,12 @@
 * value of got_packet_ptr is undefined and should
 * not be used.
 * @return 0 on success, negative error code on failure
- */
-int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
- const AVFrame *frame, int *got_packet_ptr);
-
-#if FF_API_OLD_ENCODE_VIDEO
-/**
- * @deprecated use avcodec_encode_video2() instead.
 *
- * Encode a video frame from pict into buf.
- * The input picture should be
- * stored using a specific format, namely avctx.pix_fmt.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer for the bitstream of encoded frame
- * @param[in] buf_size the size of the output buffer in bytes
- * @param[in] pict the input picture to encode
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used from the output buffer.
+ * @deprecated use avcodec_send_frame()/avcodec_receive_packet() instead
 */
 attribute_deprecated
-int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
- const AVFrame *pict);
-#endif
+int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
+ const AVFrame *frame, int *got_packet_ptr);
 
 /**
 * Encode a frame of video.
@@ -4362,11 +5368,10 @@
 * caller, he is responsible for freeing it.
 *
 * If this function fails or produces no output, avpkt will be
- * freed using av_free_packet() (i.e. avpkt->destruct will be
- * called to free the user supplied buffer).
+ * freed using av_packet_unref().
 * @param[in] frame AVFrame containing the raw video data to be encoded.
 * May be NULL when flushing an encoder that has the
- * CODEC_CAP_DELAY capability set.
+ * AV_CODEC_CAP_DELAY capability set.
 * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
 * output packet is non-empty, and to 0 if it is
 * empty. If the function returns an error, the
@@ -4374,7 +5379,10 @@
 * value of got_packet_ptr is undefined and should
 * not be used.
 * @return 0 on success, negative error code on failure
+ *
+ * @deprecated use avcodec_send_frame()/avcodec_receive_packet() instead
 */
+attribute_deprecated
 int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
 const AVFrame *frame, int *got_packet_ptr);
 
@@ -4386,226 +5394,70 @@
 * @}
 */
 
-#if FF_API_AVCODEC_RESAMPLE
-/**
- * @defgroup lavc_resample Audio resampling
- * @ingroup libavc
- * @deprecated use libswresample instead
- *
- * @{
- */
-struct ReSampleContext;
-struct AVResampleContext;
-
-typedef struct ReSampleContext ReSampleContext;
-
-/**
- * Initialize audio resampling context.
- *
- * @param output_channels number of output channels
- * @param input_channels number of input channels
- * @param output_rate output sample rate
- * @param input_rate input sample rate
- * @param sample_fmt_out requested output sample format
- * @param sample_fmt_in input sample format
- * @param filter_length length of each FIR filter in the filterbank relative to the cutoff frequency
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear if 1 then the used FIR filter will be linearly interpolated
- between the 2 closest, if 0 the closest will be used
- * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
- * @return allocated ReSampleContext, NULL if error occurred
- */
-attribute_deprecated
-ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
- int output_rate, int input_rate,
- enum AVSampleFormat sample_fmt_out,
- enum AVSampleFormat sample_fmt_in,
- int filter_length, int log2_phase_count,
- int linear, double cutoff);
-
-attribute_deprecated
-int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples);
-
-/**
- * Free resample context.
- *
- * @param s a non-NULL pointer to a resample context previously
- * created with av_audio_resample_init()
- */
-attribute_deprecated
-void audio_resample_close(ReSampleContext *s);
-
-
-/**
- * Initialize an audio resampler.
- * Note, if either rate is not an integer then simply scale both rates up so they are.
- * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear If 1 then the used FIR filter will be linearly interpolated
- between the 2 closest, if 0 the closest will be used
- * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
- */
-attribute_deprecated
-struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff);
-
-/**
- * Resample an array of samples using a previously configured context.
- * @param src an array of unconsumed samples
- * @param consumed the number of samples of src which have been consumed are returned here
- * @param src_size the number of unconsumed samples available
- * @param dst_size the amount of space in samples available in dst
- * @param update_ctx If this is 0 then the context will not be modified, that way several channels can be resampled with the same context.
- * @return the number of samples written in dst or -1 if an error occurred
- */
-attribute_deprecated
-int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx);
-
-
-/**
- * Compensate samplerate/timestamp drift. The compensation is done by changing
- * the resampler parameters, so no audible clicks or similar distortions occur
- * @param compensation_distance distance in output samples over which the compensation should be performed
- * @param sample_delta number of output samples which should be output less
- *
- * example: av_resample_compensate(c, 10, 500)
- * here instead of 510 samples only 500 samples would be output
- *
- * note, due to rounding the actual compensation might be slightly different,
- * especially if the compensation_distance is large and the in_rate used during init is small
- */
-attribute_deprecated
-void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance);
-attribute_deprecated
-void av_resample_close(struct AVResampleContext *c);
-
-/**
- * @}
- */
-#endif
-
+#if FF_API_AVPICTURE
 /**
 * @addtogroup lavc_picture
 * @{
 */
 
 /**
- * Allocate memory for the pixels of a picture and setup the AVPicture
- * fields for it.
- *
- * Call avpicture_free() to free it.
- *
- * @param picture the picture structure to be filled in
- * @param pix_fmt the pixel format of the picture
- * @param width the width of the picture
- * @param height the height of the picture
- * @return zero if successful, a negative error code otherwise
- *
- * @see av_image_alloc(), avpicture_fill()
+ * @deprecated unused
 */
+attribute_deprecated
 int avpicture_alloc(AVPicture *picture, enum AVPixelFormat pix_fmt, int width, int height);
 
 /**
- * Free a picture previously allocated by avpicture_alloc().
- * The data buffer used by the AVPicture is freed, but the AVPicture structure
- * itself is not.
- *
- * @param picture the AVPicture to be freed
+ * @deprecated unused
 */
+attribute_deprecated
 void avpicture_free(AVPicture *picture);
 
 /**
- * Setup the picture fields based on the specified image parameters
- * and the provided image data buffer.
- *
- * The picture fields are filled in by using the image data buffer
- * pointed to by ptr.
- *
- * If ptr is NULL, the function will fill only the picture linesize
- * array and return the required size for the image buffer.
- *
- * To allocate an image buffer and fill the picture data in one call,
- * use avpicture_alloc().
- *
- * @param picture the picture to be filled in
- * @param ptr buffer where the image data is stored, or NULL
- * @param pix_fmt the pixel format of the image
- * @param width the width of the image in pixels
- * @param height the height of the image in pixels
- * @return the size in bytes required for src, a negative error code
- * in case of failure
- *
- * @see av_image_fill_arrays()
+ * @deprecated use av_image_fill_arrays() instead.
 */
+attribute_deprecated
 int avpicture_fill(AVPicture *picture, const uint8_t *ptr,
 enum AVPixelFormat pix_fmt, int width, int height);
 
 /**
- * Copy pixel data from an AVPicture into a buffer.
- *
- * avpicture_get_size() can be used to compute the required size for
- * the buffer to fill.
- *
- * @param src source picture with filled data
- * @param pix_fmt picture pixel format
- * @param width picture width
- * @param height picture height
- * @param dest destination buffer
- * @param dest_size destination buffer size in bytes
- * @return the number of bytes written to dest, or a negative value
- * (error code) on error, for example if the destination buffer is not
- * big enough
- *
- * @see av_image_copy_to_buffer()
+ * @deprecated use av_image_copy_to_buffer() instead.
 */
+attribute_deprecated
 int avpicture_layout(const AVPicture *src, enum AVPixelFormat pix_fmt,
 int width, int height,
 unsigned char *dest, int dest_size);
 
 /**
- * Calculate the size in bytes that a picture of the given width and height
- * would occupy if stored in the given picture format.
- *
- * @param pix_fmt picture pixel format
- * @param width picture width
- * @param height picture height
- * @return the computed picture buffer size or a negative error code
- * in case of error
- *
- * @see av_image_get_buffer_size().
+ * @deprecated use av_image_get_buffer_size() instead.
 */
+attribute_deprecated
 int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height);
 
-#if FF_API_DEINTERLACE
 /**
- * deinterlace - if not supported return -1
- *
- * @deprecated - use yadif (in libavfilter) instead
+ * @deprecated av_image_copy() instead.
 */
 attribute_deprecated
-int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
- enum AVPixelFormat pix_fmt, int width, int height);
-#endif
-/**
- * Copy image src to dst. Wraps av_image_copy().
- */
 void av_picture_copy(AVPicture *dst, const AVPicture *src,
 enum AVPixelFormat pix_fmt, int width, int height);
 
 /**
- * Crop image top and left side.
+ * @deprecated unused
 */
+attribute_deprecated
 int av_picture_crop(AVPicture *dst, const AVPicture *src,
 enum AVPixelFormat pix_fmt, int top_band, int left_band);
 
 /**
- * Pad image.
+ * @deprecated unused
 */
+attribute_deprecated
 int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum AVPixelFormat pix_fmt,
 int padtop, int padbottom, int padleft, int padright, int *color);
 
 /**
 * @}
 */
+#endif
 
 /**
 * @defgroup lavc_misc Utility functions
@@ -4623,22 +5475,14 @@
 * @{
 */
 
+#if FF_API_GETCHROMA
 /**
- * Utility function to access log2_chroma_w log2_chroma_h from
- * the pixel format AVPixFmtDescriptor.
- *
- * This function asserts that pix_fmt is valid. See av_pix_fmt_get_chroma_sub_sample
- * for one that returns a failure code and continues in case of invalid
- * pix_fmts.
- *
- * @param[in] pix_fmt the pixel format
- * @param[out] h_shift store log2_chroma_w
- * @param[out] v_shift store log2_chroma_h
- *
- * @see av_pix_fmt_get_chroma_sub_sample
+ * @deprecated Use av_pix_fmt_get_chroma_sub_sample
 */
 
+attribute_deprecated
 void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift);
+#endif
 
 /**
 * Return a value representing the fourCC code associated to the
@@ -4647,30 +5491,8 @@
 */
 unsigned int avcodec_pix_fmt_to_codec_tag(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.
- * avcodec_get_fix_fmt_loss() informs you about the various types of losses
- * which will occur when converting from one pixel format to another.
- *
- * @param[in] dst_pix_fmt destination pixel format
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @return Combination of flags informing you what kind of losses will occur
- * (maximum loss for an invalid dst_pix_fmt).
+/**
+ * @deprecated see av_get_pix_fmt_loss()
 */
 int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt,
 int has_alpha);
@@ -4697,48 +5519,14 @@
 int has_alpha, int *loss_ptr);
 
 /**
- * Find the best pixel format to convert to given a certain source pixel
- * format and a selection of two destination pixel formats. 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() selects which of
- * the given pixel formats should be used to suffer the least amount of loss.
- *
- * If one of the destination formats is AV_PIX_FMT_NONE the other pixel format (if valid) will be
- * returned.
- *
- * @code
- * src_pix_fmt = AV_PIX_FMT_YUV420P;
- * dst_pix_fmt1= AV_PIX_FMT_RGB24;
- * dst_pix_fmt2= AV_PIX_FMT_GRAY8;
- * dst_pix_fmt3= AV_PIX_FMT_RGB8;
- * loss= FF_LOSS_CHROMA; // don't care about chroma loss, so chroma loss will be ignored.
- * dst_pix_fmt = avcodec_find_best_pix_fmt_of_2(dst_pix_fmt1, dst_pix_fmt2, src_pix_fmt, alpha, &loss);
- * dst_pix_fmt = avcodec_find_best_pix_fmt_of_2(dst_pix_fmt, dst_pix_fmt3, src_pix_fmt, alpha, &loss);
- * @endcode
- *
- * @param[in] dst_pix_fmt1 One of the two destination pixel formats to choose from
- * @param[in] dst_pix_fmt2 The other of the two destination pixel formats to choose from
- * @param[in] src_pix_fmt Source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @param[in, out] loss_ptr Combination of loss flags. In: selects which of the losses to ignore, i.e.
- * NULL or value of zero means we care about all losses. Out: the loss
- * that occurs when converting from src to selected dst pixel format.
- * @return The best pixel format to convert to or -1 if none was found.
+ * @deprecated see av_find_best_pix_fmt_of_2()
 */
 enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2,
 enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
 
 attribute_deprecated
-#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
-enum AVPixelFormat avcodec_find_best_pix_fmt2(const enum AVPixelFormat *pix_fmt_list,
- enum AVPixelFormat src_pix_fmt,
- int has_alpha, int *loss_ptr);
-#else
 enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2,
 enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
-#endif
-
 
 enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
 
@@ -4746,14 +5534,7 @@
 * @}
 */
 
-#if FF_API_SET_DIMENSIONS
-/**
- * @deprecated this function is not supposed to be used from outside of lavc
- */
-attribute_deprecated
-void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
-#endif
-
+#if FF_API_TAG_STRING
 /**
 * Put a string representing the codec tag codec_tag in buf.
 *
@@ -4762,8 +5543,12 @@
 * @param codec_tag codec tag to assign
 * @return the length of the string that would have been generated if
 * enough space had been available, excluding the trailing null
+ *
+ * @deprecated see av_fourcc_make_string() and av_fourcc2str().
 */
+attribute_deprecated
 size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag);
+#endif
 
 void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
 
@@ -4776,6 +5561,19 @@
 */
 const char *av_get_profile_name(const AVCodec *codec, int profile);
 
+/**
+ * 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);
+
 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
@@ -4854,105 +5652,350 @@
 */
 int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes);
 
+/**
+ * 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);
 
+#if FF_API_OLD_BSF
 typedef struct AVBitStreamFilterContext {
 void *priv_data;
- struct AVBitStreamFilter *filter;
+ const struct AVBitStreamFilter *filter;
 AVCodecParserContext *parser;
 struct AVBitStreamFilterContext *next;
+ /**
+ * Internal default arguments, used if NULL is passed to av_bitstream_filter_filter().
+ * Not for access by library users.
+ */
+ char *args;
 } AVBitStreamFilterContext;
+#endif
+
+typedef struct AVBSFInternal AVBSFInternal;
+
+/**
+ * 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 libavcodec internal data. Must not be touched by the caller in any
+ * way.
+ */
+ AVBSFInternal *internal;
+
+ /**
+ * 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 (*filter)(AVBitStreamFilterContext *bsfc,
- AVCodecContext *avctx, const char *args,
- uint8_t **poutbuf, int *poutbuf_size,
- const uint8_t *buf, int buf_size, int keyframe);
- void (*close)(AVBitStreamFilterContext *bsfc);
- struct AVBitStreamFilter *next;
+ int (*init)(AVBSFContext *ctx);
+ int (*filter)(AVBSFContext *ctx, AVPacket *pkt);
+ void (*close)(AVBSFContext *ctx);
 } AVBitStreamFilter;
 
+#if FF_API_OLD_BSF
+/**
+ * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext)
+ * is deprecated. Use the new bitstream filtering API (using AVBSFContext).
+ */
+attribute_deprecated
+void av_register_bitstream_filter(AVBitStreamFilter *bsf);
+/**
+ * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext)
+ * is deprecated. Use av_bsf_get_by_name(), av_bsf_alloc(), and av_bsf_init()
+ * from the new bitstream filtering API (using AVBSFContext).
+ */
+attribute_deprecated
+AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
+/**
+ * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext)
+ * is deprecated. Use av_bsf_send_packet() and av_bsf_receive_packet() from the
+ * new bitstream filtering API (using AVBSFContext).
+ */
+attribute_deprecated
+int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
+ AVCodecContext *avctx, const char *args,
+ uint8_t **poutbuf, int *poutbuf_size,
+ const uint8_t *buf, int buf_size, int keyframe);
+/**
+ * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext)
+ * is deprecated. Use av_bsf_free() from the new bitstream filtering API (using
+ * AVBSFContext).
+ */
+attribute_deprecated
+void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
+/**
+ * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext)
+ * is deprecated. Use av_bsf_iterate() from the new bitstream filtering API (using
+ * AVBSFContext).
+ */
+attribute_deprecated
+const AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f);
+#endif
+
 /**
- * Register a bitstream filter.
+ * @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.
 *
- * The filter will be accessible to the application code through
- * av_bitstream_filter_next() or can be directly initialized with
- * av_bitstream_filter_init().
+ * @param opaque a pointer where libavcodec will store the iteration state. Must
+ * point to NULL to start the iteration.
 *
- * @see avcodec_register_all()
+ * @return the next registered bitstream filter or NULL when the iteration is
+ * finished
 */
-void av_register_bitstream_filter(AVBitStreamFilter *bsf);
+const AVBitStreamFilter *av_bsf_iterate(void **opaque);
+#if FF_API_NEXT
+attribute_deprecated
+const AVBitStreamFilter *av_bsf_next(void **opaque);
+#endif
 
 /**
- * Create and initialize a bitstream filter context given a bitstream
- * filter name.
+ * 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.
 *
- * The returned context must be freed with av_bitstream_filter_close().
+ * @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.
 *
- * @param name the name of the bitstream filter
- * @return a bitstream filter context if a matching filter was found
- * and successfully initialized, NULL otherwise
+ * @return 0 on success, a negative AVERROR code on failure
 */
-AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
+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);
 
 /**
- * Filter bitstream.
+ * Submit a packet for filtering.
 *
- * This function filters the buffer buf with size buf_size, and places the
- * filtered buffer in the buffer pointed to by poutbuf.
+ * 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.
 *
- * The output buffer must be freed by the caller.
+ * @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.
+ * This parameter may be NULL, which signals the end of the stream (i.e. no more
+ * packets will be sent). That will cause the filter to output any packets it
+ * may have buffered internally.
 *
- * @param bsfc bitstream filter context created by av_bitstream_filter_init()
- * @param avctx AVCodecContext accessed by the filter, may be NULL.
- * If specified, this must point to the encoder context of the
- * output stream the packet is sent to.
- * @param args arguments which specify the filter configuration, may be NULL
- * @param poutbuf pointer which is updated to point to the filtered buffer
- * @param poutbuf_size pointer which is updated to the filtered buffer size in bytes
- * @param buf buffer containing the data to filter
- * @param buf_size size in bytes of buf
- * @param keyframe set to non-zero if the buffer to filter corresponds to a key-frame packet data
- * @return >= 0 in case of success, or a negative error code in case of failure
- *
- * If the return value is positive, an output buffer is allocated and
- * is availble in *poutbuf, and is distinct from the input buffer.
- *
- * If the return value is 0, the output buffer is not allocated and
- * should be considered identical to the input buffer, or in case
- * *poutbuf was set it points to the input buffer (not necessarily to
- * its starting address).
+ * @return 0 on success, a negative AVERROR on error.
 */
-int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
- AVCodecContext *avctx, const char *args,
- uint8_t **poutbuf, int *poutbuf_size,
- const uint8_t *buf, int buf_size, int keyframe);
+int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt);
 
 /**
- * Release bitstream filter context.
+ * Retrieve a filtered packet.
+ *
+ * @param[out] 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.
 *
- * @param bsf the bitstream filter context created with
- * av_bitstream_filter_init(), can be NULL
+ * @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.
 */
-void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
+int av_bsf_receive_packet(AVBSFContext *ctx, AVPacket *pkt);
+
+/**
+ * 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);
 
 /**
- * If f is NULL, return the first registered bitstream filter,
- * if f is non-NULL, return the next registered bitstream filter
- * after f, or NULL if f is the last one.
+ * 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
+ * @param[out] 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]`
+ * @param[out] 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.
+ *
+ * @param[out] bsf Pointer to be set to new instance of pass-through bitstream filter
 *
- * This function can be used to iterate over all registered bitstream
- * filters.
+ * @return
 */
-AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f);
+int av_bsf_get_null_filter(AVBSFContext **bsf);
 
 /* memory */
 
 /**
 * Same behaviour av_fast_malloc but the buffer has additional
- * FF_INPUT_BUFFER_PADDING_SIZE at the end which will always be 0.
+ * 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.
@@ -4974,51 +6017,32 @@
 */
 unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
 
-#if FF_API_MISSING_SAMPLE
-/**
- * Log a generic warning message about a missing feature. This function is
- * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] feature string containing the name of the missing feature
- * @param[in] want_sample indicates if samples are wanted which exhibit this feature.
- * If want_sample is non-zero, additional verbage will be added to the log
- * message which tells the user how to report samples to the development
- * mailing list.
- * @deprecated Use avpriv_report_missing_feature() instead.
- */
-attribute_deprecated
-void av_log_missing_feature(void *avc, const char *feature, int want_sample);
-
-/**
- * Log a generic warning message asking for a sample. This function is
- * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.)
- * only, and would normally not be used by applications.
- * @param[in] avc a pointer to an arbitrary struct of which the first field is
- * a pointer to an AVClass struct
- * @param[in] msg string containing an optional message, or NULL if no message
- * @deprecated Use avpriv_request_sample() instead.
- */
-attribute_deprecated
-void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3);
-#endif /* FF_API_MISSING_SAMPLE */
-
+#if FF_API_USER_VISIBLE_AVHWACCEL
 /**
 * Register the hardware accelerator hwaccel.
+ *
+ * @deprecated This function doesn't do anything.
 */
+attribute_deprecated
 void av_register_hwaccel(AVHWAccel *hwaccel);
 
 /**
 * If hwaccel is NULL, returns the first registered hardware accelerator,
 * if hwaccel is non-NULL, returns the next registered hardware accelerator
 * after hwaccel, or NULL if hwaccel is the last one.
+ *
+ * @deprecated AVHWaccel structures contain no user-serviceable parts, so
+ * this function should not be used.
 */
-AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel);
-
+attribute_deprecated
+AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel);
+#endif
 
+#if FF_API_LOCKMGR
 /**
 * Lock operation used by lockmgr
+ *
+ * @deprecated Deprecated together with av_lockmgr_register().
 */
 enum AVLockOp {
 AV_LOCK_CREATE, ///< Create a mutex
@@ -5029,18 +6053,33 @@
 
 /**
 * Register a user provided lock manager supporting the operations
- * specified by AVLockOp. mutex points to a (void *) where the
- * lockmgr should store/get a pointer to a user allocated mutex. It's
- * NULL upon AV_LOCK_CREATE and != NULL for all other ops.
- *
- * @param cb User defined callback. Note: FFmpeg may invoke calls to this
- * callback during the call to av_lockmgr_register().
- * Thus, the application must be prepared to handle that.
- * If cb is set to NULL the lockmgr will be unregistered.
- * Also note that during unregistration the previously registered
- * lockmgr callback may also be invoked.
+ * specified by AVLockOp. The "mutex" argument to the function points
+ * to a (void *) where the lockmgr should store/get a pointer to a user
+ * allocated mutex. It is NULL upon AV_LOCK_CREATE and equal to the
+ * value left by the last call for all other ops. If the lock manager is
+ * unable to perform the op then it should leave the mutex in the same
+ * state as when it was called and return a non-zero value. However,
+ * when called with AV_LOCK_DESTROY the mutex will always be assumed to
+ * have been successfully destroyed. If av_lockmgr_register succeeds
+ * it will return a non-negative value, if it fails it will return a
+ * negative value and destroy all mutex and unregister all callbacks.
+ * av_lockmgr_register is not thread-safe, it must be called from a
+ * single thread before any calls which make use of locking are used.
+ *
+ * @param cb User defined callback. av_lockmgr_register invokes calls
+ * to this callback and the previously registered callback.
+ * The callback will be used to create more than one mutex
+ * each of which must be backed by its own underlying locking
+ * mechanism (i.e. do not use a single static object to
+ * implement your lock manager). If cb is set to NULL the
+ * lockmgr will be unregistered.
+ *
+ * @deprecated This function does nothing, and always returns 0. Be sure to
+ * build with thread support to get basic thread safety.
 */
+attribute_deprecated
 int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op));
+#endif
 
 /**
 * Get the type of the given codec.
@@ -5090,6 +6129,17 @@
 const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name);
 
 /**
+ * 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);
+
+/**
 * @}
 */

gpac-0.8.0.tar.gz/extra_lib/include/libavcodec/avdct.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavcodec/d3d11va.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavcodec/dirac.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavcodec/dv_profile.h Added

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

gpac-0.8.0.tar.gz/extra_lib/include/libavcodec/jni.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavcodec/mediacodec.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavcodec/qsv.h Added

gpac-0.7.1.tar.gz/extra_lib/include/libavcodec/vaapi.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavcodec/vaapi.h Changed

@@ -31,6 +31,10 @@
 */
 
 #include <stdint.h>
+#include "libavutil/attributes.h"
+#include "version.h"
+
+#if FF_API_STRUCT_VAAPI_CONTEXT
 
 /**
 * @defgroup lavc_codec_hwaccel_vaapi VA API Decoding
@@ -46,8 +50,10 @@
 * during initialization or through each AVCodecContext.get_buffer()
 * function call. In any case, they must be valid prior to calling
 * decoding functions.
+ *
+ * Deprecated: use AVCodecContext.hw_frames_ctx instead.
 */
-struct vaapi_context {
+struct attribute_deprecated vaapi_context {
 /**
 * Window system dependent data
 *
@@ -71,103 +77,10 @@
 * - decoding: Set by user
 */
 uint32_t context_id;
-
- /**
- * VAPictureParameterBuffer ID
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
- uint32_t pic_param_buf_id;
-
- /**
- * VAIQMatrixBuffer ID
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
- uint32_t iq_matrix_buf_id;
-
- /**
- * VABitPlaneBuffer ID (for VC-1 decoding)
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
- uint32_t bitplane_buf_id;
-
- /**
- * Slice parameter/data buffer IDs
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
- uint32_t *slice_buf_ids;
-
- /**
- * Number of effective slice buffer IDs to send to the HW
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
- unsigned int n_slice_buf_ids;
-
- /**
- * Size of pre-allocated slice_buf_ids
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
- unsigned int slice_buf_ids_alloc;
-
- /**
- * Pointer to VASliceParameterBuffers
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
- void *slice_params;
-
- /**
- * Size of a VASliceParameterBuffer element
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
- unsigned int slice_param_size;
-
- /**
- * Size of pre-allocated slice_params
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
- unsigned int slice_params_alloc;
-
- /**
- * Number of slices currently filled in
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
- unsigned int slice_count;
-
- /**
- * Pointer to slice data buffer base
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
- const uint8_t *slice_data;
-
- /**
- * Current size of slice data
- *
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
- uint32_t slice_data_size;
 };
 
 /* @} */
 
+#endif /* FF_API_STRUCT_VAAPI_CONTEXT */
+
 #endif /* AVCODEC_VAAPI_H */

gpac-0.7.1.tar.gz/extra_lib/include/libavcodec/vdpau.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavcodec/vdpau.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavcodec/version.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavcodec/version.h Changed

@@ -1,5 +1,4 @@
 /*
- *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
@@ -28,9 +27,9 @@
 
 #include "libavutil/version.h"
 
-#define LIBAVCODEC_VERSION_MAJOR 55
-#define LIBAVCODEC_VERSION_MINOR 52
-#define LIBAVCODEC_VERSION_MICRO 102
+#define LIBAVCODEC_VERSION_MAJOR 58
+#define LIBAVCODEC_VERSION_MINOR 18
+#define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
 LIBAVCODEC_VERSION_MINOR, \
@@ -46,100 +45,93 @@
 * 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.
 */
 
-#ifndef FF_API_REQUEST_CHANNELS
-#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_OLD_DECODE_AUDIO
-#define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_OLD_ENCODE_AUDIO
-#define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_OLD_ENCODE_VIDEO
-#define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_CODEC_ID
-#define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_LOWRES
+#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_AUDIO_CONVERT
-#define FF_API_AUDIO_CONVERT (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_DEBUG_MV
+#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
-#ifndef FF_API_AVCODEC_RESAMPLE
-#define FF_API_AVCODEC_RESAMPLE FF_API_AUDIO_CONVERT
+#ifndef FF_API_AVCTX_TIMEBASE
+#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_DEINTERLACE
-#define FF_API_DEINTERLACE (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_CODED_FRAME
+#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_DESTRUCT_PACKET
-#define FF_API_DESTRUCT_PACKET (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_SIDEDATA_ONLY_PKT
+#define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_GET_BUFFER
-#define FF_API_GET_BUFFER (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_VDPAU_PROFILE
+#define FF_API_VDPAU_PROFILE (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_MISSING_SAMPLE
-#define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_CONVERGENCE_DURATION
+#define FF_API_CONVERGENCE_DURATION (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_LOWRES
-#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_AVPICTURE
+#define FF_API_AVPICTURE (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_CAP_VDPAU
-#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_AVPACKET_OLD_API
+#define FF_API_AVPACKET_OLD_API (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_BUFS_VDPAU
-#define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_RTP_CALLBACK
+#define FF_API_RTP_CALLBACK (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_VOXWARE
-#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_VBV_DELAY
+#define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_SET_DIMENSIONS
-#define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_CODER_TYPE
+#define FF_API_CODER_TYPE (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_DEBUG_MV
-#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_STAT_BITS
+#define FF_API_STAT_BITS (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_AC_VLC
-#define FF_API_AC_VLC (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_PRIVATE_OPT
+#define FF_API_PRIVATE_OPT (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_OLD_MSMPEG4
-#define FF_API_OLD_MSMPEG4 (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_ASS_TIMING
+#define FF_API_ASS_TIMING (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_ASPECT_EXTENDED
-#define FF_API_ASPECT_EXTENDED (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_OLD_BSF
+#define FF_API_OLD_BSF (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_THREAD_OPAQUE
-#define FF_API_THREAD_OPAQUE (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_COPY_CONTEXT
+#define FF_API_COPY_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_CODEC_PKT
-#define FF_API_CODEC_PKT (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_GET_CONTEXT_DEFAULTS
+#define FF_API_GET_CONTEXT_DEFAULTS (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_ARCH_ALPHA
-#define FF_API_ARCH_ALPHA (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_NVENC_OLD_NAME
+#define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_XVMC
-#define FF_API_XVMC (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_STRUCT_VAAPI_CONTEXT
+#define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_ERROR_RATE
-#define FF_API_ERROR_RATE (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_MERGE_SD_API
+#define FF_API_MERGE_SD_API (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_QSCALE_TYPE
-#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_TAG_STRING
+#define FF_API_TAG_STRING (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_MB_TYPE
-#define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_GETCHROMA
+#define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_MAX_BFRAMES
-#define FF_API_MAX_BFRAMES (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_CODEC_GET_SET
+#define FF_API_CODEC_GET_SET (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_FAST_MALLOC
-#define FF_API_FAST_MALLOC (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_USER_VISIBLE_AVHWACCEL
+#define FF_API_USER_VISIBLE_AVHWACCEL (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_NEG_LINESIZES
-#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_LOCKMGR
+#define FF_API_LOCKMGR (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_EMU_EDGE
-#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 56)
+#ifndef FF_API_NEXT
+#define FF_API_NEXT (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
 
+
 #endif /* AVCODEC_VERSION_H */

gpac-0.8.0.tar.gz/extra_lib/include/libavcodec/videotoolbox.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavcodec/vorbis_parser.h Added

gpac-0.7.1.tar.gz/extra_lib/include/libavcodec/xvmc.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavcodec/xvmc.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavdevice/avdevice.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavdevice/avdevice.h Changed

@@ -28,21 +28,26 @@
 */
 
 /**
- * @defgroup lavd Special devices muxing/demuxing library
- * @{
+ * @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 x11grab it is the display name.
+ * 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"
 
 /**
@@ -62,10 +67,45 @@
 
 /**
 * Initialize libavdevice and register all the input and output devices.
- * @warning This function is not thread safe.
 */
 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.
+ */
+AVInputFormat *av_input_audio_device_next(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.
+ */
+AVInputFormat *av_input_video_device_next(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.
+ */
+AVOutputFormat *av_output_audio_device_next(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.
+ */
+AVOutputFormat *av_output_video_device_next(AVOutputFormat *d);
+
 typedef struct AVDeviceRect {
 int x; /**< x coordinate of top left corner */
 int y; /**< y coordinate of top left corner */
@@ -96,12 +136,60 @@
 /**
 * Repaint request message.
 *
- * Message is sent to the device when window have to be rapainted.
+ * 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')
+ 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'),
 };
 
 /**
@@ -144,7 +232,7 @@
 * Display window buffer message.
 *
 * Device requests to display a window buffer.
- * Message is sent when new frame is ready to be displyed.
+ * Message is sent when new frame is ready to be displayed.
 * Usually buffers need to be swapped in handler of this message.
 *
 * data: NULL.
@@ -160,7 +248,49 @@
 *
 * data: NULL.
 */
- AV_DEV_TO_APP_DESTROY_WINDOW_BUFFER = MKBETAG('B','D','E','S')
+ 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'),
 };
 
 /**
@@ -192,6 +322,131 @@
 void *data, size_t data_size);
 
 /**
+ * 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.
+ */
+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.
+ *
+ * @param[out] 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.
+ */
+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.
+ */
+void avdevice_capabilities_free(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s);
+
+/**
 * Structure describes basic parameters of the device.
 */
 typedef struct AVDeviceInfo {
@@ -224,10 +479,36 @@
 int avdevice_list_devices(struct AVFormatContext *s, AVDeviceInfoList **device_list);
 
 /**
- * Convinient function to free result of avdevice_list_devices().
+ * 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.
+ * @param[out] 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(struct AVInputFormat *device, const char *device_name,
+ AVDictionary *device_options, AVDeviceInfoList **device_list);
+int avdevice_list_output_sinks(struct AVOutputFormat *device, const char *device_name,
+ AVDictionary *device_options, AVDeviceInfoList **device_list);
+
+/**
+ * @}
+ */
+
 #endif /* AVDEVICE_AVDEVICE_H */

gpac-0.7.1.tar.gz/extra_lib/include/libavdevice/version.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavdevice/version.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavfilter/avfilter.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavfilter/avfilter.h Changed

@@ -29,7 +29,9 @@
 */
 
 /**
- * @defgroup lavfi Libavfilter - graph-based frame editing library
+ * @defgroup lavfi libavfilter
+ * Graph-based frame editing library.
+ *
 * @{
 */
 
@@ -37,6 +39,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/avutil.h"
+#include "libavutil/buffer.h"
 #include "libavutil/dict.h"
 #include "libavutil/frame.h"
 #include "libavutil/log.h"
@@ -66,335 +69,6 @@
 typedef struct AVFilterPad AVFilterPad;
 typedef struct AVFilterFormats AVFilterFormats;
 
-#if FF_API_AVFILTERBUFFER
-/**
- * A reference-counted buffer data type used by the filter system. Filters
- * should not store pointers to this structure directly, but instead use the
- * AVFilterBufferRef structure below.
- */
-typedef struct AVFilterBuffer {
- uint8_t *data[8]; ///< buffer data for each plane/channel
-
- /**
- * pointers to the data planes/channels.
- *
- * For video, this should simply point to data[].
- *
- * For planar audio, each channel has a separate data pointer, and
- * linesize[0] contains the size of each channel buffer.
- * For packed audio, there is just one data pointer, and linesize[0]
- * contains the total size of the buffer for all channels.
- *
- * Note: Both data and extended_data will always be set, 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;
- int linesize[8]; ///< number of bytes per line
-
- /** private data to be used by a custom free function */
- void *priv;
- /**
- * A pointer to the function to deallocate this buffer if the default
- * function is not sufficient. This could, for example, add the memory
- * back into a memory pool to be reused later without the overhead of
- * reallocating it from scratch.
- */
- void (*free)(struct AVFilterBuffer *buf);
-
- int format; ///< media format
- int w, h; ///< width and height of the allocated buffer
- unsigned refcount; ///< number of references to this buffer
-} AVFilterBuffer;
-
-#define AV_PERM_READ 0x01 ///< can read from the buffer
-#define AV_PERM_WRITE 0x02 ///< can write to the buffer
-#define AV_PERM_PRESERVE 0x04 ///< nobody else can overwrite the buffer
-#define AV_PERM_REUSE 0x08 ///< can output the buffer multiple times, with the same contents each time
-#define AV_PERM_REUSE2 0x10 ///< can output the buffer multiple times, modified each time
-#define AV_PERM_NEG_LINESIZES 0x20 ///< the buffer requested can have negative linesizes
-#define AV_PERM_ALIGN 0x40 ///< the buffer must be aligned
-
-#define AVFILTER_ALIGN 16 //not part of ABI
-
-/**
- * Audio specific properties in a reference to an AVFilterBuffer. Since
- * AVFilterBufferRef is common to different media formats, audio specific
- * per reference properties must be separated out.
- */
-typedef struct AVFilterBufferRefAudioProps {
- uint64_t channel_layout; ///< channel layout of audio buffer
- int nb_samples; ///< number of audio samples per channel
- int sample_rate; ///< audio buffer sample rate
- int channels; ///< number of channels (do not access directly)
-} AVFilterBufferRefAudioProps;
-
-/**
- * Video specific properties in a reference to an AVFilterBuffer. Since
- * AVFilterBufferRef is common to different media formats, video specific
- * per reference properties must be separated out.
- */
-typedef struct AVFilterBufferRefVideoProps {
- int w; ///< image width
- int h; ///< image height
- AVRational sample_aspect_ratio; ///< sample aspect ratio
- int interlaced; ///< is frame interlaced
- int top_field_first; ///< field order
- enum AVPictureType pict_type; ///< picture type of the frame
- int key_frame; ///< 1 -> keyframe, 0-> not
- int qp_table_linesize; ///< qp_table stride
- int qp_table_size; ///< qp_table size
- int8_t *qp_table; ///< array of Quantization Parameters
-} AVFilterBufferRefVideoProps;
-
-/**
- * A reference to an AVFilterBuffer. Since filters can manipulate the origin of
- * a buffer to, for example, crop image without any memcpy, the buffer origin
- * and dimensions are per-reference properties. Linesize is also useful for
- * image flipping, frame to field filters, etc, and so is also per-reference.
- *
- * TODO: add anything necessary for frame reordering
- */
-typedef struct AVFilterBufferRef {
- AVFilterBuffer *buf; ///< the buffer that this is a reference to
- uint8_t *data[8]; ///< picture/audio data for each plane
- /**
- * pointers to the data planes/channels.
- *
- * For video, this should simply point to data[].
- *
- * For planar audio, each channel has a separate data pointer, and
- * linesize[0] contains the size of each channel buffer.
- * For packed audio, there is just one data pointer, and linesize[0]
- * contains the total size of the buffer for all channels.
- *
- * Note: Both data and extended_data will always be set, 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;
- int linesize[8]; ///< number of bytes per line
-
- AVFilterBufferRefVideoProps *video; ///< video buffer specific properties
- AVFilterBufferRefAudioProps *audio; ///< audio buffer specific properties
-
- /**
- * presentation timestamp. The time unit may change during
- * filtering, as it is specified in the link and the filter code
- * may need to rescale the PTS accordingly.
- */
- int64_t pts;
- int64_t pos; ///< byte position in stream, -1 if unknown
-
- int format; ///< media format
-
- int perms; ///< permissions, see the AV_PERM_* flags
-
- enum AVMediaType type; ///< media type of buffer data
-
- AVDictionary *metadata; ///< dictionary containing metadata key=value tags
-} AVFilterBufferRef;
-
-/**
- * Copy properties of src to dst, without copying the actual data
- */
-attribute_deprecated
-void avfilter_copy_buffer_ref_props(AVFilterBufferRef *dst, AVFilterBufferRef *src);
-
-/**
- * Add a new reference to a buffer.
- *
- * @param ref an existing reference to the buffer
- * @param pmask a bitmask containing the allowable permissions in the new
- * reference
- * @return a new reference to the buffer with the same properties as the
- * old, excluding any permissions denied by pmask
- */
-attribute_deprecated
-AVFilterBufferRef *avfilter_ref_buffer(AVFilterBufferRef *ref, int pmask);
-
-/**
- * Remove a reference to a buffer. If this is the last reference to the
- * buffer, the buffer itself is also automatically freed.
- *
- * @param ref reference to the buffer, may be NULL
- *
- * @note it is recommended to use avfilter_unref_bufferp() instead of this
- * function
- */
-attribute_deprecated
-void avfilter_unref_buffer(AVFilterBufferRef *ref);
-
-/**
- * Remove a reference to a buffer and set the pointer to NULL.
- * If this is the last reference to the buffer, the buffer itself
- * is also automatically freed.
- *
- * @param ref pointer to the buffer reference
- */
-attribute_deprecated
-void avfilter_unref_bufferp(AVFilterBufferRef **ref);
-#endif
-
-/**
- * Get the number of channels of a buffer reference.
- */
-attribute_deprecated
-int avfilter_ref_get_channels(AVFilterBufferRef *ref);
-
-#if FF_API_AVFILTERPAD_PUBLIC
-/**
- * A filter pad used for either input or output.
- *
- * See doc/filter_design.txt for details on how to implement the methods.
- *
- * @warning this struct might be removed from public API.
- * users should call avfilter_pad_get_name() and avfilter_pad_get_type()
- * to access the name and type fields; there should be no need to access
- * any other fields from outside of libavfilter.
- */
-struct AVFilterPad {
- /**
- * Pad name. The name is unique among inputs and among outputs, but an
- * input may have the same name as an output. This may be NULL if this
- * pad has no need to ever be referenced by name.
- */
- const char *name;
-
- /**
- * AVFilterPad type.
- */
- enum AVMediaType type;
-
- /**
- * Input pads:
- * Minimum required permissions on incoming buffers. Any buffer with
- * insufficient permissions will be automatically copied by the filter
- * system to a new buffer which provides the needed access permissions.
- *
- * Output pads:
- * Guaranteed permissions on outgoing buffers. Any buffer pushed on the
- * link must have at least these permissions; this fact is checked by
- * asserts. It can be used to optimize buffer allocation.
- */
- attribute_deprecated int min_perms;
-
- /**
- * Input pads:
- * Permissions which are not accepted on incoming buffers. Any buffer
- * which has any of these permissions set will be automatically copied
- * by the filter system to a new buffer which does not have those
- * permissions. This can be used to easily disallow buffers with
- * AV_PERM_REUSE.
- *
- * Output pads:
- * Permissions which are automatically removed on outgoing buffers. It
- * can be used to optimize buffer allocation.
- */
- attribute_deprecated int rej_perms;
-
- /**
- * @deprecated unused
- */
- int (*start_frame)(AVFilterLink *link, AVFilterBufferRef *picref);
-
- /**
- * Callback function to get a video buffer. If NULL, the filter system will
- * use ff_default_get_video_buffer().
- *
- * Input video pads only.
- */
- AVFrame *(*get_video_buffer)(AVFilterLink *link, int w, int h);
-
- /**
- * Callback function to get an audio buffer. If NULL, the filter system will
- * use ff_default_get_audio_buffer().
- *
- * Input audio pads only.
- */
- AVFrame *(*get_audio_buffer)(AVFilterLink *link, int nb_samples);
-
- /**
- * @deprecated unused
- */
- int (*end_frame)(AVFilterLink *link);
-
- /**
- * @deprecated unused
- */
- int (*draw_slice)(AVFilterLink *link, int y, int height, int slice_dir);
-
- /**
- * Filtering callback. This is where a filter receives a frame with
- * audio/video data and should do its processing.
- *
- * Input pads only.
- *
- * @return >= 0 on success, a negative AVERROR on error. This function
- * must ensure that frame is properly unreferenced on error if it
- * hasn't been passed on to another filter.
- */
- int (*filter_frame)(AVFilterLink *link, AVFrame *frame);
-
- /**
- * Frame poll callback. This returns the number of immediately available
- * samples. It should return a positive value if the next request_frame()
- * is guaranteed to return one frame (with no delay).
- *
- * Defaults to just calling the source poll_frame() method.
- *
- * Output pads only.
- */
- int (*poll_frame)(AVFilterLink *link);
-
- /**
- * Frame request callback. A call to this should result in at least one
- * frame being output over the given link. This should return zero on
- * success, and another value on error.
- * See ff_request_frame() for the error codes with a specific
- * meaning.
- *
- * Output pads only.
- */
- int (*request_frame)(AVFilterLink *link);
-
- /**
- * Link configuration callback.
- *
- * For output pads, this should set the following link properties:
- * video: width, height, sample_aspect_ratio, time_base
- * audio: sample_rate.
- *
- * This should NOT set properties such as format, channel_layout, etc which
- * are negotiated between filters by the filter system using the
- * query_formats() callback before this function is called.
- *
- * For input pads, this should check the properties of the link, and update
- * the filter's internal state as necessary.
- *
- * For both input and output pads, this should return zero on success,
- * and another value on error.
- */
- int (*config_props)(AVFilterLink *link);
-
- /**
- * The filter expects a fifo to be inserted on its input link,
- * typically because it has a delay.
- *
- * input pads only.
- */
- int needs_fifo;
-
- /**
- * The filter expects writable frames from its input link,
- * duplicating data buffers if needed.
- *
- * input pads only.
- */
- int needs_writable;
-};
-#endif
-
 /**
 * Get the number of elements in a NULL-terminated array of AVFilterPads (e.g.
 * AVFilter.inputs/outputs).
@@ -521,6 +195,21 @@
 */
 
 /**
+ * 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
@@ -594,6 +283,8 @@
 
 int priv_size; ///< size of private data to allocate for the filter
 
+ int flags_internal; ///< Additional flags for avfilter internal use only.
+
 /**
 * Used by the filter registration system. Must not be touched by any other
 * code.
@@ -620,6 +311,20 @@
 * used for providing binary data.
 */
 int (*init_opaque)(AVFilterContext *ctx, void *opaque);
+
+ /**
+ * 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;
 
 /**
@@ -639,16 +344,10 @@
 
 AVFilterPad *input_pads; ///< array of input pads
 AVFilterLink **inputs; ///< array of pointers to input links
-#if FF_API_FOO_COUNT
- attribute_deprecated unsigned input_count; ///< @deprecated use nb_inputs
-#endif
 unsigned nb_inputs; ///< number of input pads
 
 AVFilterPad *output_pads; ///< array of output pads
 AVFilterLink **outputs; ///< array of pointers to output links
-#if FF_API_FOO_COUNT
- attribute_deprecated unsigned output_count; ///< @deprecated use nb_outputs
-#endif
 unsigned nb_outputs; ///< number of output pads
 
 void *priv; ///< private data for use by the filter
@@ -668,7 +367,7 @@
 * allowed threading types. I.e. a threading type needs to be set in both
 * to be allowed.
 *
- * After the filter is initialzed, libavfilter sets this field to the
+ * After the filter is initialized, libavfilter sets this field to the
 * threading type that is actually used (0 for no multithreading).
 */
 int thread_type;
@@ -684,6 +383,45 @@
 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;
 };
 
 /**
@@ -692,6 +430,11 @@
 * 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
@@ -763,8 +506,6 @@
 AVLINK_INIT ///< complete
 } init_state;
 
- struct AVFilterPool *pool;
-
 /**
 * Graph the filter belongs to.
 */
@@ -772,21 +513,28 @@
 
 /**
 * Current timestamp of the link, as defined by the most recent
- * frame(s), in AV_TIME_BASE units.
+ * 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;
- * if left to 0/0, will be automatically be copied from the first input
+ * 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.
@@ -820,46 +568,82 @@
 int max_samples;
 
 /**
- * The buffer reference currently being received across the link by the
- * destination filter. This is used internally by the filter system to
- * allow automatic copying of buffers which do not have sufficient
- * permissions for the destination. This should not be accessed directly
- * by the filters.
+ * Number of channels.
+ */
+ int channels;
+
+ /**
+ * Link processing flags.
 */
- AVFilterBufferRef *cur_buf_copy;
+ unsigned flags;
 
 /**
- * True if the link is closed.
- * If set, all attemps of start_frame, filter_frame or request_frame
- * will fail with AVERROR_EOF, and if necessary the reference will be
- * destroyed.
- * If request_frame returns AVERROR_EOF, this flag is set on the
- * corresponding link.
- * It can be set also be set by either the source or the destination
- * filter.
+ * Number of past frames sent through the link.
 */
- int closed;
+ int64_t frame_count_in, frame_count_out;
 
 /**
- * Number of channels.
+ * A pointer to a FFFramePool struct.
 */
- int channels;
+ void *frame_pool;
 
 /**
- * True if a frame is being requested on the link.
- * Used internally by the framework.
+ * 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.
 */
- unsigned frame_requested;
+ int frame_wanted_out;
 
 /**
- * Link processing flags.
+ * For hwaccel pixel formats, this should be a reference to the
+ * AVHWFramesContext describing the frames.
 */
- unsigned flags;
+ AVBufferRef *hw_frames_ctx;
+
+#ifndef FF_INTERNAL_FIELDS
 
 /**
- * Number of past frames sent through the link.
+ * Internal structure members.
+ * The fields below this limit are internal for libavfilter's use
+ * and must in no way be accessed by applications.
 */
- int64_t frame_count;
+ char reserved[0xF000];
+
+#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 */
+
 };
 
 /**
@@ -879,14 +663,21 @@
 */
 void avfilter_link_free(AVFilterLink **link);
 
+#if FF_API_FILTER_GET_SET
 /**
 * Get the number of channels of a link.
+ * @deprecated Use av_buffersink_get_channels()
 */
+attribute_deprecated
 int avfilter_link_get_channels(AVFilterLink *link);
+#endif
 
 /**
 * Set the closed field of a link.
+ * @deprecated applications are not supposed to mess with links, they should
+ * close the sinks.
 */
+attribute_deprecated
 void avfilter_link_set_closed(AVFilterLink *link, int closed);
 
 /**
@@ -897,69 +688,6 @@
 */
 int avfilter_config_links(AVFilterContext *filter);
 
-#if FF_API_AVFILTERBUFFER
-/**
- * Create a buffer reference wrapped around an already allocated image
- * buffer.
- *
- * @param data pointers to the planes of the image to reference
- * @param linesize linesizes for the planes of the image to reference
- * @param perms the required access permissions
- * @param w the width of the image specified by the data and linesize arrays
- * @param h the height of the image specified by the data and linesize arrays
- * @param format the pixel format of the image specified by the data and linesize arrays
- */
-attribute_deprecated
-AVFilterBufferRef *
-avfilter_get_video_buffer_ref_from_arrays(uint8_t * const data[4], const int linesize[4], int perms,
- int w, int h, enum AVPixelFormat format);
-
-/**
- * Create an audio buffer reference wrapped around an already
- * allocated samples buffer.
- *
- * See avfilter_get_audio_buffer_ref_from_arrays_channels() for a version
- * that can handle unknown channel layouts.
- *
- * @param data pointers to the samples plane buffers
- * @param linesize linesize for the samples plane buffers
- * @param perms the required access permissions
- * @param nb_samples number of samples per channel
- * @param sample_fmt the format of each sample in the buffer to allocate
- * @param channel_layout the channel layout of the buffer
- */
-attribute_deprecated
-AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_arrays(uint8_t **data,
- int linesize,
- int perms,
- int nb_samples,
- enum AVSampleFormat sample_fmt,
- uint64_t channel_layout);
-/**
- * Create an audio buffer reference wrapped around an already
- * allocated samples buffer.
- *
- * @param data pointers to the samples plane buffers
- * @param linesize linesize for the samples plane buffers
- * @param perms the required access permissions
- * @param nb_samples number of samples per channel
- * @param sample_fmt the format of each sample in the buffer to allocate
- * @param channels the number of channels of the buffer
- * @param channel_layout the channel layout of the buffer,
- * must be either 0 or consistent with channels
- */
-attribute_deprecated
-AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_arrays_channels(uint8_t **data,
- int linesize,
- int perms,
- int nb_samples,
- enum AVSampleFormat sample_fmt,
- int channels,
- uint64_t channel_layout);
-
-#endif
-
-
 #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)
 
@@ -969,14 +697,21 @@
 */
 int avfilter_process_command(AVFilterContext *filter, const char *cmd, const char *arg, char *res, int res_len, int flags);
 
-/** Initialize the filter system. Register all builtin filters. */
-void avfilter_register_all(void);
+/**
+ * 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);
 
-#if FF_API_OLD_FILTER_REGISTER
-/** Uninitialize the filter system. Unregister all filters. */
+#if FF_API_NEXT
+/** Initialize the filter system. Register all builtin filters. */
 attribute_deprecated
-void avfilter_uninit(void);
-#endif
+void avfilter_register_all(void);
 
 /**
 * Register a filter. This is only needed if you plan to use
@@ -988,70 +723,28 @@
 * @return 0 if the registration was successful, a negative value
 * otherwise
 */
+attribute_deprecated
 int avfilter_register(AVFilter *filter);
 
 /**
- * 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.
- */
-#if !FF_API_NOCONST_GET_NAME
-const
-#endif
-AVFilter *avfilter_get_by_name(const char *name);
-
-/**
 * Iterate over all registered filters.
 * @return If prev is non-NULL, next registered filter after prev or NULL if
 * prev is the last filter. If prev is NULL, return the first registered filter.
 */
-const AVFilter *avfilter_next(const AVFilter *prev);
-
-#if FF_API_OLD_FILTER_REGISTER
-/**
- * If filter is NULL, returns a pointer to the first registered filter pointer,
- * if filter is non-NULL, returns the next pointer after filter.
- * If the returned pointer points to NULL, the last registered filter
- * was already reached.
- * @deprecated use avfilter_next()
- */
 attribute_deprecated
-AVFilter **av_filter_next(AVFilter **filter);
+const AVFilter *avfilter_next(const AVFilter *prev);
 #endif
 
-#if FF_API_AVFILTER_OPEN
 /**
- * Create a filter instance.
+ * Get a filter definition matching the given name.
 *
- * @param filter_ctx put here a pointer to the created filter context
- * on success, NULL on failure
- * @param filter the filter to create an instance of
- * @param inst_name Name to give to the new instance. Can be NULL for none.
- * @return >= 0 in case of success, a negative error code otherwise
- * @deprecated use avfilter_graph_alloc_filter() instead
+ * @param name the filter name to find
+ * @return the filter definition, if any matching one is registered.
+ * NULL if none found.
 */
-attribute_deprecated
-int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name);
-#endif
+const AVFilter *avfilter_get_by_name(const char *name);
 
 
-#if FF_API_AVFILTER_INIT_FILTER
-/**
- * Initialize a filter.
- *
- * @param filter the filter to initialize
- * @param args A string of parameters to use when initializing the filter.
- * The format and meaning of this string varies by filter.
- * @param opaque Any extra non-string data needed by the filter. The meaning
- * of this parameter varies by filter.
- * @return zero on success
- */
-attribute_deprecated
-int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque);
-#endif
-
 /**
 * Initialize a filter with the supplied parameters.
 *
@@ -1106,26 +799,6 @@
 int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt,
 unsigned filt_srcpad_idx, unsigned filt_dstpad_idx);
 
-#if FF_API_AVFILTERBUFFER
-/**
- * Copy the frame properties of src to dst, without copying the actual
- * image data.
- *
- * @return 0 on success, a negative number on error.
- */
-attribute_deprecated
-int avfilter_copy_frame_props(AVFilterBufferRef *dst, const AVFrame *src);
-
-/**
- * Copy the frame properties and data pointers of src to dst, without copying
- * the actual data.
- *
- * @return 0 on success, a negative number on error.
- */
-attribute_deprecated
-int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src);
-#endif
-
 /**
 * @return AVClass for AVFilterContext.
 *
@@ -1166,19 +839,12 @@
 
 typedef struct AVFilterGraph {
 const AVClass *av_class;
-#if FF_API_FOO_COUNT
- attribute_deprecated
- unsigned filter_count_unused;
-#endif
 AVFilterContext **filters;
-#if !FF_API_FOO_COUNT
 unsigned nb_filters;
-#endif
 
 char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters
- char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters
-#if FF_API_FOO_COUNT
- unsigned nb_filters;
+#if FF_API_LAVR_OPTS
+ attribute_deprecated char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters
 #endif
 
 /**
@@ -1245,6 +911,8 @@
 
 /**
 * Allocate a filter graph.
+ *
+ * @return the allocated filter graph on success or NULL.
 */
 AVFilterGraph *avfilter_graph_alloc(void);
 
@@ -1260,33 +928,21 @@
 *
 * @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 or failure.
+ * 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 with name name from graph.
+ * 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, char *name);
-
-#if FF_API_AVFILTER_OPEN
-/**
- * Add an existing filter instance to a filter graph.
- *
- * @param graphctx the filter graph
- * @param filter the filter to be added
- *
- * @deprecated use avfilter_graph_alloc_filter() to allocate a filter in a
- * filter graph
- */
-attribute_deprecated
-int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter);
-#endif
+AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, const char *name);
 
 /**
 * Create and add a filter instance into an existing graph.
@@ -1371,7 +1027,6 @@
 */
 void avfilter_inout_free(AVFilterInOut **inout);
 
-#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI || !FF_API_OLD_GRAPH_PARSE
 /**
 * Add a graph described by a string to a graph.
 *
@@ -1384,7 +1039,7 @@
 * 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 grap context
+ * @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
@@ -1393,30 +1048,14 @@
 int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
 AVFilterInOut *inputs, AVFilterInOut *outputs,
 void *log_ctx);
-#else
-/**
- * Add a graph described by a string to a graph.
- *
- * @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
- * @deprecated Use avfilter_graph_parse_ptr() instead.
- */
-attribute_deprecated
-int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
- AVFilterInOut **inputs, AVFilterInOut **outputs,
- void *log_ctx);
-#endif
 
 /**
 * 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.
@@ -1482,7 +1121,7 @@
 * "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 alphanummeric only
+ * @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
 *

gpac-0.7.1.tar.gz/extra_lib/include/libavfilter/buffersink.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavfilter/buffersink.h Changed

@@ -33,63 +33,6 @@
 * @{
 */
 
-#if FF_API_AVFILTERBUFFER
-/**
- * Get an audio/video buffer data from buffer_sink and put it in bufref.
- *
- * This function works with both audio and video buffer sinks.
- *
- * @param buffer_sink pointer to a buffersink or abuffersink context
- * @param flags a combination of AV_BUFFERSINK_FLAG_* flags
- * @return >= 0 in case of success, a negative AVERROR code in case of
- * failure
- */
-attribute_deprecated
-int av_buffersink_get_buffer_ref(AVFilterContext *buffer_sink,
- AVFilterBufferRef **bufref, int flags);
-
-/**
- * Get the number of immediately available frames.
- */
-attribute_deprecated
-int av_buffersink_poll_frame(AVFilterContext *ctx);
-
-/**
- * Get a buffer with filtered data from sink and put it in buf.
- *
- * @param ctx pointer to a context of a buffersink or abuffersink AVFilter.
- * @param buf pointer to the buffer will be written here if buf is non-NULL. buf
- * must be freed by the caller using avfilter_unref_buffer().
- * Buf may also be NULL to query whether a buffer is ready to be
- * output.
- *
- * @return >= 0 in case of success, a negative AVERROR code in case of
- * failure.
- */
-attribute_deprecated
-int av_buffersink_read(AVFilterContext *ctx, AVFilterBufferRef **buf);
-
-/**
- * Same as av_buffersink_read, but with the ability to specify the number of
- * samples read. This function is less efficient than av_buffersink_read(),
- * because it copies the data around.
- *
- * @param ctx pointer to a context of the abuffersink AVFilter.
- * @param buf pointer to the buffer will be written here if buf is non-NULL. buf
- * must be freed by the caller using avfilter_unref_buffer(). buf
- * will contain exactly nb_samples audio samples, except at the end
- * of stream, when it can contain less than nb_samples.
- * Buf may also be NULL to query whether a buffer is ready to be
- * output.
- *
- * @warning do not mix this function with av_buffersink_read(). Use only one or
- * the other with a single sink, not both.
- */
-attribute_deprecated
-int av_buffersink_read_samples(AVFilterContext *ctx, AVFilterBufferRef **buf,
- int nb_samples);
-#endif
-
 /**
 * Get a frame with filtered data from sink and put it in frame.
 *
@@ -119,7 +62,7 @@
 /**
 * Struct to use for initializing a buffersink context.
 */
-typedef struct {
+typedef struct AVBufferSinkParams {
 const enum AVPixelFormat *pixel_fmts; ///< list of allowed pixel formats, terminated by AV_PIX_FMT_NONE
 } AVBufferSinkParams;
 
@@ -133,7 +76,7 @@
 /**
 * Struct to use for initializing an abuffersink context.
 */
-typedef struct {
+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
@@ -158,9 +101,27 @@
 void av_buffersink_set_frame_size(AVFilterContext *ctx, unsigned frame_size);
 
 /**
- * Get the frame rate of the input.
+ * @defgroup lavfi_buffersink_accessors Buffer sink accessors
+ * Get the properties of the stream
+ * @{
 */
-AVRational av_buffersink_get_frame_rate(AVFilterContext *ctx);
+
+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.

gpac-0.7.1.tar.gz/extra_lib/include/libavfilter/buffersrc.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavfilter/buffersrc.h Changed

@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
@@ -26,7 +25,6 @@
  * Memory buffer source API.
  */
 
-#include "libavcodec/avcodec.h"
 #include "avfilter.h"
 
 /**
@@ -42,13 +40,6 @@
      */
     AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT = 1,
 
-#if FF_API_AVFILTERBUFFER
-    /**
-     * Ignored
-     */
-    AV_BUFFERSRC_FLAG_NO_COPY = 2,
-#endif
-
     /**
      * Immediately push the frame to the output.
      */
@@ -64,18 +55,6 @@
 };
 
 /**
- * Add buffer data in picref to buffer_src.
- *
- * @param buffer_src  pointer to a buffer source context
- * @param picref      a buffer reference, 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
- */
-int av_buffersrc_add_ref(AVFilterContext *buffer_src,
-                         AVFilterBufferRef *picref, int flags);
-
-/**
  * Get the number of failed requests.
  *
  * A failed request is when the request_frame method is called while no
@@ -84,20 +63,79 @@
  */
 unsigned av_buffersrc_get_nb_failed_requests(AVFilterContext *buffer_src);
 
-#if FF_API_AVFILTERBUFFER
 /**
- * Add a buffer to a filtergraph.
- *
- * @param ctx an instance of the buffersrc filter
- * @param buf buffer containing frame data to be passed down the filtergraph.
- * This function will take ownership of buf, the user must not free it.
- * A NULL buf signals EOF -- i.e. no more frames will be sent to this filter.
+ * This structure contains the parameters describing the frames that will be
+ * passed to this filter.
  *
- * @deprecated use av_buffersrc_write_frame() or av_buffersrc_add_frame()
+ * 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 secon.
+     */
+    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().
  */
-attribute_deprecated
-int av_buffersrc_buffer(AVFilterContext *ctx, AVFilterBufferRef *buf);
-#endif
+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.
@@ -112,6 +150,7 @@
  * 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);
 
 /**
@@ -132,13 +171,14 @@
  * 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 controled
+ * 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.
@@ -149,9 +189,18 @@
  * @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);
 
 /**
  * @}

gpac-0.7.1.tar.gz/extra_lib/include/libavfilter/version.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavfilter/version.h Changed

@@ -29,8 +29,8 @@
 
 #include "libavutil/version.h"
 
-#define LIBAVFILTER_VERSION_MAJOR 4
-#define LIBAVFILTER_VERSION_MINOR 2
+#define LIBAVFILTER_VERSION_MAJOR 7
+#define LIBAVFILTER_VERSION_MINOR 16
 #define LIBAVFILTER_VERSION_MICRO 100
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
@@ -49,47 +49,17 @@
 * the public API and may change, break or disappear at any time.
 */
 
-#ifndef FF_API_AVFILTERPAD_PUBLIC
-#define FF_API_AVFILTERPAD_PUBLIC (LIBAVFILTER_VERSION_MAJOR < 5)
+#ifndef FF_API_OLD_FILTER_OPTS_ERROR
+#define FF_API_OLD_FILTER_OPTS_ERROR (LIBAVFILTER_VERSION_MAJOR < 8)
 #endif
-#ifndef FF_API_FOO_COUNT
-#define FF_API_FOO_COUNT (LIBAVFILTER_VERSION_MAJOR < 5)
+#ifndef FF_API_LAVR_OPTS
+#define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 8)
 #endif
-#ifndef FF_API_FILL_FRAME
-#define FF_API_FILL_FRAME (LIBAVFILTER_VERSION_MAJOR < 5)
+#ifndef FF_API_FILTER_GET_SET
+#define FF_API_FILTER_GET_SET (LIBAVFILTER_VERSION_MAJOR < 8)
 #endif
-#ifndef FF_API_BUFFERSRC_BUFFER
-#define FF_API_BUFFERSRC_BUFFER (LIBAVFILTER_VERSION_MAJOR < 5)
-#endif
-#ifndef FF_API_AVFILTERBUFFER
-#define FF_API_AVFILTERBUFFER (LIBAVFILTER_VERSION_MAJOR < 5)
-#endif
-#ifndef FF_API_OLD_FILTER_OPTS
-#define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 5)
-#endif
-#ifndef FF_API_ACONVERT_FILTER
-#define FF_API_ACONVERT_FILTER (LIBAVFILTER_VERSION_MAJOR < 5)
-#endif
-#ifndef FF_API_AVFILTER_OPEN
-#define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 5)
-#endif
-#ifndef FF_API_AVFILTER_INIT_FILTER
-#define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 5)
-#endif
-#ifndef FF_API_OLD_FILTER_REGISTER
-#define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 5)
-#endif
-#ifndef FF_API_OLD_GRAPH_PARSE
-#define FF_API_OLD_GRAPH_PARSE (LIBAVFILTER_VERSION_MAJOR < 5)
-#endif
-#ifndef FF_API_DRAWTEXT_OLD_TIMELINE
-#define FF_API_DRAWTEXT_OLD_TIMELINE (LIBAVFILTER_VERSION_MAJOR < 5)
-#endif
-#ifndef FF_API_NOCONST_GET_NAME
-#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 5)
-#endif
-#ifndef FF_API_INTERLACE_LOWPASS_SET
-#define FF_API_INTERLACE_LOWPASS_SET (LIBAVFILTER_VERSION_MAJOR < 5)
+#ifndef FF_API_NEXT
+#define FF_API_NEXT (LIBAVFILTER_VERSION_MAJOR < 8)
 #endif
 
 #endif /* AVFILTER_VERSION_H */

gpac-0.7.1.tar.gz/extra_lib/include/libavformat/avformat.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavformat/avformat.h Changed

@@ -28,8 +28,8 @@
 */
 
 /**
- * @defgroup libavf I/O and Muxing/Demuxing Library
- * @{
+ * @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
@@ -67,7 +67,7 @@
 * with an AVFMT_NOFILE format).
 *
 * @section lavf_options Passing options to (de)muxers
- * Lavf allows to configure muxers and demuxers using the @ref avoptions
+ * 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
@@ -78,6 +78,20 @@
 * 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
@@ -88,10 +102,10 @@
 * cleanup.
 *
 * @section lavf_decoding_open Opening a media file
- * The minimum information required to open a file is its URL or filename, which
+ * 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 = "in.mp3";
+ * const char *url = "file:in.mp3";
 * AVFormatContext *s = NULL;
 * int ret = avformat_open_input(&s, url, NULL, NULL);
 * if (ret < 0)
@@ -149,8 +163,8 @@
 * av_read_frame() on it. Each call, if successful, will return an AVPacket
 * containing encoded data for one AVStream, identified by
 * AVPacket.stream_index. This packet may be passed straight into the libavcodec
- * decoding functions avcodec_decode_video2(), avcodec_decode_audio4() or
- * avcodec_decode_subtitle2() if the caller wishes to decode the data.
+ * 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
@@ -165,7 +179,7 @@
 * until the next av_read_frame() call or closing the file. If the caller
 * requires a longer lifetime, av_dup_packet() will make an av_malloc()ed copy
 * of it.
- * In both cases, the packet must be freed with av_free_packet() when it is no
+ * In both cases, the packet must be freed with av_packet_unref() when it is no
 * longer needed.
 *
 * @section lavf_decoding_seek Seeking
@@ -191,13 +205,17 @@
 * avio_open2() or a custom one.
 * - Unless the format is of the AVFMT_NOSTREAMS type, at least one stream must
 * be created with the avformat_new_stream() function. The caller should fill
- * the @ref AVStream.codec "stream codec context" information, such as the
- * codec @ref AVCodecContext.codec_type "type", @ref AVCodecContext.codec_id
+ * 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 AVCodecContext.time_base "codec timebase" should
+ * 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
@@ -218,8 +236,8 @@
 * 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 the
- * caller set on the codec context.
+ * 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
@@ -229,6 +247,53 @@
 *
 * @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
@@ -247,7 +312,6 @@
 * @{
 * @}
 * @}
- *
 */
 
 #include <time.h>
@@ -262,6 +326,7 @@
 struct AVFormatContext;
 
 struct AVDeviceInfoList;
+struct AVDeviceCapabilitiesQuery;
 
 /**
 * @defgroup metadata_api Public Metadata API
@@ -297,6 +362,11 @@
 * - sorting -- a modified version of a tag that should be used for
 * sorting will have '-sort' appended. E.g. artist="The Beatles",
 * artist-sort="Beatles, The".
+ * - Some protocols and demuxers support metadata updates. After a successful
+ * call to av_read_packet(), AVFormatContext.event_flags or AVStream.event_flags
+ * will be updated to indicate if metadata changed. In order to detect metadata
+ * changes on a stream, you need to loop through all streams in the AVFormatContext
+ * and check their individual event_flags.
 *
 * - Demuxers attempt to export metadata in a generic format, however tags
 * with no generic equivalents are left as they are stored in the container.
@@ -368,17 +438,6 @@
 int av_append_packet(AVIOContext *s, AVPacket *pkt, int size);
 
 /*************************************************/
-/* fractional numbers for exact pts handling */
-
-/**
- * The exact value of the fractional number is: 'val + num / den'.
- * num is assumed to be 0 <= num < den.
- */
-typedef struct AVFrac {
- int64_t val, num, den;
-} AVFrac;
-
-/*************************************************/
 /* input/output formats */
 
 struct AVCodecTag;
@@ -390,12 +449,14 @@
 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
@@ -404,8 +465,6 @@
 #define AVFMT_NOFILE 0x0001
 #define AVFMT_NEEDNUMBER 0x0002 /**< Needs '%d' in filename. */
 #define AVFMT_SHOW_IDS 0x0008 /**< Show format stream IDs numbers. */
-#define AVFMT_RAWPICTURE 0x0020 /**< Format wants AVPicture structure for
- raw picture data. */
 #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. */
@@ -417,12 +476,7 @@
 #define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fall back on generic search */
 #define AVFMT_NO_BYTE_SEEK 0x8000 /**< Format does not allow seeking by bytes */
 #define AVFMT_ALLOW_FLUSH 0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */
-#if LIBAVFORMAT_VERSION_MAJOR <= 54
-#define AVFMT_TS_NONSTRICT 0x8020000 //we try to be compatible to the ABIs of ffmpeg and major forks
-#else
-#define AVFMT_TS_NONSTRICT 0x20000
-#endif
- /**< Format does not require strictly
+#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
@@ -455,10 +509,10 @@
 enum AVCodecID video_codec; /**< default video codec */
 enum AVCodecID subtitle_codec; /**< default subtitle codec */
 /**
- * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE,
+ * 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_NONSTRICT, AVFMT_TS_NEGATIVE
 */
 int flags;
 
@@ -531,6 +585,42 @@
 * @see avdevice_list_devices() for more details.
 */
 int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list);
+ /**
+ * Initialize device capabilities submodule.
+ * @see avdevice_capabilities_create() for more details.
+ */
+ int (*create_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps);
+ /**
+ * Free device capabilities submodule.
+ * @see avdevice_capabilities_free() for more details.
+ */
+ int (*free_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps);
+ 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.
+ * Return 0 if more packets from this stream must be checked; 1 if not.
+ */
+ int (*check_bitstream)(struct AVFormatContext *, const AVPacket *pkt);
 } AVOutputFormat;
 /**
 * @}
@@ -572,6 +662,13 @@
 
 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
@@ -600,8 +697,8 @@
 
 /**
 * Read the format header and initialize the AVFormatContext
- * structure. Return 0 if OK. Only used in raw format right
- * now. 'avformat_new_stream' should be called to create new streams.
+ * structure. Return 0 if OK. 'avformat_new_stream' should be
+ * called to create new streams.
 */
 int (*read_header)(struct AVFormatContext *);
 
@@ -665,6 +762,18 @@
 * @see avdevice_list_devices() for more details.
 */
 int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list);
+
+ /**
+ * Initialize device capabilities submodule.
+ * @see avdevice_capabilities_create() for more details.
+ */
+ int (*create_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps);
+
+ /**
+ * Free device capabilities submodule.
+ * @see avdevice_capabilities_free() for more details.
+ */
+ int (*free_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps);
 } AVInputFormat;
 /**
 * @}
@@ -676,9 +785,9 @@
 AVSTREAM_PARSE_HEADERS, /**< Only parse headers, do not repack. */
 AVSTREAM_PARSE_TIMESTAMPS, /**< full parsing and interpolation of timestamps for frames not starting on a packet boundary */
 AVSTREAM_PARSE_FULL_ONCE, /**< full parsing and repack of the first frame only, only implemented for H.264 currently */
- AVSTREAM_PARSE_FULL_RAW=MKTAG(0,'R','A','W'), /**< full parsing and repack with timestamp and position generation by parser for raw
- this assumes that each packet in the file contains no demuxer level headers and
- just codec level data, otherwise position generation would fail */
+ 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 {
@@ -690,6 +799,9 @@
 * 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. */
@@ -713,11 +825,19 @@
 #define AV_DISPOSITION_CLEAN_EFFECTS 0x0200 /**< stream without voice */
 /**
 * The stream is stored in the file as an attached picture/"cover art" (e.g.
- * APIC frame in ID3v2). The single packet associated with it will be returned
- * among the first few packets read from the file unless seeking takes place.
- * It can also be accessed at any time in AVStream.attached_pic.
+ * 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 0x0400
+/**
+ * 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 0x0800
+
+typedef struct AVStreamInternal AVStreamInternal;
 
 /**
 * To specify text track kind (different from subtitles default).
@@ -725,6 +845,7 @@
 #define AV_DISPOSITION_CAPTIONS 0x10000
 #define AV_DISPOSITION_DESCRIPTIONS 0x20000
 #define AV_DISPOSITION_METADATA 0x40000
+#define AV_DISPOSITION_DEPENDENT 0x80000 ///< dependent audio stream (mix_type=0 in mpegts)
 
 /**
 * Options for behavior on timestamp wrap detection.
@@ -748,33 +869,26 @@
 * encoding: set by the user, replaced by libavformat if left unset
 */
 int id;
+#if FF_API_LAVF_AVCTX
 /**
- * Codec context associated with this stream. Allocated and freed by
- * libavformat.
- *
- * - decoding: The demuxer exports codec information stored in the headers
- * here.
- * - encoding: The user sets codec information, the muxer writes it to the
- * output. Mandatory fields as specified in AVCodecContext
- * documentation must be set even if this AVCodecContext is
- * not actually used for encoding.
+ * @deprecated use the codecpar struct instead
 */
+ attribute_deprecated
 AVCodecContext *codec;
+#endif
 void *priv_data;
 
 /**
- * encoding: pts generation when outputting stream
- */
- struct AVFrac pts;
-
- /**
 * This is the fundamental unit of time (in seconds) in terms
 * of which frame timestamps are represented.
 *
 * decoding: set by libavformat
- * encoding: set by libavformat in avformat_write_header. The muxer may use the
- * user-provided value of @ref AVCodecContext.time_base "codec->time_base"
- * as a hint.
+ * 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;
 
@@ -792,6 +906,9 @@
 * 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;
 
@@ -812,6 +929,10 @@
 
 /**
 * 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;
 
@@ -824,18 +945,85 @@
 */
 AVPacket attached_pic;
 
+ /**
+ * An array of side data that applies to the whole stream (i.e. the
+ * container does not allow it to change between packets).
+ *
+ * There may be no overlap between the side data in this array and side data
+ * in the packets. I.e. a given side data is either exported by the muxer
+ * (demuxing) / set by the caller (muxing) in this array, then it never
+ * appears in the packets, or the side data is exported / sent through
+ * the packets (always in the first packet where the value becomes known or
+ * changes), then it does not appear in this array.
+ *
+ * - demuxing: Set by libavformat when the stream is created.
+ * - muxing: May be set by the caller before avformat_write_header().
+ *
+ * Freed by libavformat in avformat_free_context().
+ *
+ * @see av_format_inject_global_side_data()
+ */
+ AVPacketSideData *side_data;
+ /**
+ * The number of elements in the AVStream.side_data array.
+ */
+ int nb_side_data;
+
+ /**
+ * Flags for the user to detect events happening on the stream. Flags must
+ * be cleared by the user once the event has been handled.
+ * A combination of AVSTREAM_EVENT_FLAG_*.
+ */
+ int event_flags;
+#define AVSTREAM_EVENT_FLAG_METADATA_UPDATED 0x0001 ///< The call resulted in updated metadata.
+
+ /**
+ * 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;
+
+#if FF_API_LAVF_FFSERVER
+ /**
+ * String containing pairs of key and values describing recommended encoder configuration.
+ * Pairs are separated by ','.
+ * Keys are separated from values by '='.
+ *
+ * @deprecated unused
+ */
+ attribute_deprecated
+ char *recommended_encoder_configuration;
+#endif
+
+ /**
+ * 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;
+
 /*****************************************************************
 * 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.
+ * Internal note: be aware that physically removing these fields
+ * will break ABI. Replace removed fields with dummy fields, and
+ * add new fields to AVStreamInternal.
 *****************************************************************
 */
 
+#define MAX_STD_TIMEBASES (30*12+30+3+6)
 /**
- * Stream information used internally by av_find_stream_info()
+ * Stream information used internally by avformat_find_stream_info()
 */
-#define MAX_STD_TIMEBASES (60*12+6)
 struct {
 int64_t last_dts;
 int64_t duration_gcd;
@@ -844,6 +1032,7 @@
 double (*duration_error)[2][MAX_STD_TIMEBASES];
 int64_t codec_info_duration;
 int64_t codec_info_duration_fields;
+ int frame_delay_evidence;
 
 /**
 * 0 -> decoder has not been searched for yet.
@@ -866,11 +1055,6 @@
 
 int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
 
-#if FF_API_REFERENCE_DTS
- /* a hack to keep ABI compatibility for ffmpeg and other applications, which accesses parser even
- * though it should not */
- int64_t do_not_use;
-#endif
 // Timestamp generation support:
 /**
 * Timestamp corresponding to the last dts sync point.
@@ -887,11 +1071,10 @@
 /**
 * Number of packets to buffer for codec probing
 */
-#define MAX_PROBE_PACKETS 2500
 int probe_packets;
 
 /**
- * Number of frames that have been demuxed during av_find_stream_info()
+ * Number of frames that have been demuxed during avformat_find_stream_info()
 */
 int codec_info_nb_frames;
 
@@ -913,19 +1096,6 @@
 unsigned int index_entries_allocated_size;
 
 /**
- * Real base framerate of the stream.
- * This is the lowest framerate with which all timestamps can be
- * represented accurately (it is the least common multiple of all
- * framerates in the stream). Note, this value is just a guess!
- * For example, if the time base is 1/90000 and all frames have either
- * approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
- *
- * Code outside avformat should access this field using:
- * av_stream_get/set_r_frame_rate(stream)
- */
- AVRational r_frame_rate;
-
- /**
 * Stream Identifier
 * This is the MPEG-TS stream identifier +1
 * 0 means unknown
@@ -955,6 +1125,30 @@
 int skip_samples;
 
 /**
+ * If not 0, the number of samples that should be skipped from the start of
+ * the stream (the samples are removed from packets with pts==0, which also
+ * assumes negative timestamps do not happen).
+ * Intended for use with formats such as mp3 with ad-hoc gapless audio
+ * support.
+ */
+ int64_t start_skip_samples;
+
+ /**
+ * If not 0, the first audio sample that should be discarded from the stream.
+ * This is broken by design (needs global sample count), but can't be
+ * avoided for broken by design formats such as mp3 with ad-hoc gapless
+ * audio support.
+ */
+ int64_t first_discard_sample;
+
+ /**
+ * The sample after last sample that is intended to be discarded after
+ * first_discard_sample. Works on frame boundaries only. Used to prevent
+ * early EOF if the gapless info is broken (considered concatenated mp3s).
+ */
+ int64_t last_discard_sample;
+
+ /**
 * Number of internally decoded frames, used internally in libavformat, do not access
 * its lifetime differs from info which is why it is not in that structure.
 */
@@ -1001,10 +1195,50 @@
 uint8_t dts_ordered;
 uint8_t dts_misordered;
 
+ /**
+ * Internal data to inject global side data
+ */
+ int inject_global_side_data;
+
+ /**
+ * display aspect ratio (0 if unknown)
+ * - encoding: unused
+ * - decoding: Set by libavformat to calculate sample_aspect_ratio internally
+ */
+ AVRational display_aspect_ratio;
+
+ /**
+ * An opaque field for libavformat internal usage.
+ * Must not be accessed in any way by callers.
+ */
+ AVStreamInternal *internal;
 } AVStream;
 
+#if FF_API_FORMAT_GET_SET
+/**
+ * Accessors for some AVStream fields. These used to be provided for ABI
+ * compatibility, and do not need to be used anymore.
+ */
+attribute_deprecated
 AVRational av_stream_get_r_frame_rate(const AVStream *s);
+attribute_deprecated
 void av_stream_set_r_frame_rate(AVStream *s, AVRational r);
+#if FF_API_LAVF_FFSERVER
+attribute_deprecated
+char* av_stream_get_recommended_encoder_configuration(const AVStream *s);
+attribute_deprecated
+void av_stream_set_recommended_encoder_configuration(AVStream *s, char *configuration);
+#endif
+#endif
+
+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
 
@@ -1042,6 +1276,11 @@
 
 #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 {
 int id; ///< unique ID to identify the chapter
@@ -1057,6 +1296,8 @@
 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
@@ -1077,6 +1318,12 @@
 * 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 {
 /**
@@ -1123,7 +1370,11 @@
 AVIOContext *pb;
 
 /* stream info */
- int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */
+ /**
+ * Flags signalling stream properties. A combination of AVFMTCTX_*.
+ * Set by libavformat.
+ */
+ int ctx_flags;
 
 /**
 * Number of elements in AVFormatContext.streams.
@@ -1144,13 +1395,33 @@
 */
 AVStream **streams;
 
+#if FF_API_FORMAT_FILENAME
 /**
 * input or output filename
 *
 * - demuxing: set by avformat_open_input()
 * - muxing: may be set by the caller before avformat_write_header()
+ *
+ * @deprecated Use url instead.
 */
+ attribute_deprecated
 char filename[1024];
+#endif
+
+ /**
+ * 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
@@ -1176,11 +1447,15 @@
 * available. Never set it directly if the file_size and the
 * duration are known as FFmpeg can compute it automatically.
 */
- int bit_rate;
+ 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.
@@ -1192,24 +1467,37 @@
 #define AVFMT_FLAG_CUSTOM_IO 0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
 #define AVFMT_FLAG_DISCARD_CORRUPT 0x0100 ///< Discard frames marked corrupted
 #define AVFMT_FLAG_FLUSH_PACKETS 0x0200 ///< Flush the AVIOContext every packet.
+/**
+ * When muxing, try to avoid writing any random/volatile data to the output.
+ * This includes any random IDs, real-time timestamps/dates, muxer version, etc.
+ *
+ * This flag is mainly intended for testing.
+ */
+#define AVFMT_FLAG_BITEXACT 0x0400
 #define AVFMT_FLAG_MP4A_LATM 0x8000 ///< Enable RTP MP4A-LATM payload
 #define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down)
 #define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted)
-#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Don't merge side data but keep it separate.
+#if FF_API_LAVF_KEEPSIDE_FLAG
+#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< 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 size of the data read from input for determining
 * the input container format.
 * Demuxing only, set by the caller before avformat_open_input().
 */
- unsigned int 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.
 */
- int max_analyze_duration;
+ int64_t max_analyze_duration;
 
 const uint8_t *key;
 int keylen;
@@ -1281,7 +1569,12 @@
 * 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 only, set by the caller before avformat_write_header().
+ * - 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;
 
@@ -1335,6 +1628,38 @@
 int64_t max_interleave_delta;
 
 /**
+ * Allow non-standard and experimental extension
+ * @see AVCodecContext.strict_std_compliance
+ */
+ int strict_std_compliance;
+
+ /**
+ * Flags for the user to detect events happening on the file. Flags must
+ * be cleared by the user once the event has been handled.
+ * A combination of AVFMT_EVENT_FLAG_*.
+ */
+ int event_flags;
+#define AVFMT_EVENT_FLAG_METADATA_UPDATED 0x0001 ///< The call resulted in updated metadata.
+
+ /**
+ * Maximum number of packets to read while waiting for the first timestamp.
+ * Decoding only.
+ */
+ int max_ts_probe;
+
+ /**
+ * 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
 */
@@ -1343,7 +1668,7 @@
 /**
 * Audio preload in microseconds.
 * Note, not all formats support this and unpredictable things may happen if it is used when not supported.
- * - encoding: Set by user via AVOptions (NO direct access)
+ * - encoding: Set by user
 * - decoding: unused
 */
 int audio_preload;
@@ -1351,7 +1676,7 @@
 /**
 * Max chunk time in microseconds.
 * Note, not all formats support this and unpredictable things may happen if it is used when not supported.
- * - encoding: Set by user via AVOptions (NO direct access)
+ * - encoding: Set by user
 * - decoding: unused
 */
 int max_chunk_duration;
@@ -1359,7 +1684,7 @@
 /**
 * Max chunk size in bytes
 * Note, not all formats support this and unpredictable things may happen if it is used when not supported.
- * - encoding: Set by user via AVOptions (NO direct access)
+ * - encoding: Set by user
 * - decoding: unused
 */
 int max_chunk_size;
@@ -1368,25 +1693,14 @@
 * forces the use of wallclock timestamps as pts/dts of packets
 * This has undefined results in the presence of B frames.
 * - encoding: unused
- * - decoding: Set by user via AVOptions (NO direct access)
+ * - decoding: Set by user
 */
 int use_wallclock_as_timestamps;
 
 /**
- * Avoid negative timestamps during muxing.
- * 0 -> allow negative timestamps
- * 1 -> avoid negative timestamps
- * -1 -> choose automatically (default)
- * Note, this only works when interleave_packet_per_dts is in use.
- * - encoding: Set by user via AVOptions (NO direct access)
- * - decoding: unused
- */
- int avoid_negative_ts;
-
- /**
 * avio flags, used to force AVIO_FLAG_DIRECT.
 * - encoding: unused
- * - decoding: Set by user via AVOptions (NO direct access)
+ * - decoding: Set by user
 */
 int avio_flags;
 
@@ -1394,34 +1708,34 @@
 * The duration field can be estimated through various ways, and this field can be used
 * to know how the duration was estimated.
 * - encoding: unused
- * - decoding: Read by user via AVOptions (NO direct access)
+ * - decoding: Read by user
 */
 enum AVDurationEstimationMethod duration_estimation_method;
 
 /**
 * Skip initial bytes when opening stream
 * - encoding: unused
- * - decoding: Set by user via AVOptions (NO direct access)
+ * - decoding: Set by user
 */
- unsigned int skip_initial_bytes;
+ int64_t skip_initial_bytes;
 
 /**
 * Correct single timestamp overflows
 * - encoding: unused
- * - decoding: Set by user via AVOptions (NO direct access)
+ * - decoding: Set by user
 */
 unsigned int correct_ts_overflow;
 
 /**
 * Force seeking to any (also non key) frames.
 * - encoding: unused
- * - decoding: Set by user via AVOptions (NO direct access)
+ * - decoding: Set by user
 */
 int seek2any;
 
 /**
 * Flush the I/O context after each packet.
- * - encoding: Set by user via AVOptions (NO direct access)
+ * - encoding: Set by user
 * - decoding: unused
 */
 int flush_packets;
@@ -1431,59 +1745,32 @@
 * The maximal score is AVPROBE_SCORE_MAX, its set when the demuxer probes
 * the format.
 * - encoding: unused
- * - decoding: set by avformat, read by user via av_format_get_probe_score() (NO direct access)
+ * - decoding: set by avformat, read by user
 */
 int probe_score;
 
- /*****************************************************************
- * All fields below this line are not part of the public API. They
- * may not be used outside of libavformat and can be changed and
- * removed at will.
- * New public fields should be added right above.
- *****************************************************************
- */
-
 /**
- * This buffer is only needed when packets were already buffered but
- * not decoded, for example to get the codec parameters in MPEG
- * streams.
- */
- struct AVPacketList *packet_buffer;
- struct AVPacketList *packet_buffer_end;
-
- /* av_seek_frame() support */
- int64_t data_offset; /**< offset of the first packet */
-
- /**
- * Raw packets from the demuxer, prior to parsing and decoding.
- * This buffer is used for buffering packets until the codec can
- * be identified, as parsing cannot be done without knowing the
- * codec.
- */
- struct AVPacketList *raw_packet_buffer;
- struct AVPacketList *raw_packet_buffer_end;
- /**
- * Packets split by the parser get queued here.
- */
- struct AVPacketList *parse_queue;
- struct AVPacketList *parse_queue_end;
- /**
- * Remaining size available for raw_packet_buffer, in bytes.
+ * number of bytes to read maximally to identify format.
+ * - encoding: unused
+ * - decoding: set by user
 */
-#define RAW_PACKET_BUFFER_SIZE 2500000
- int raw_packet_buffer_remaining_size;
+ int format_probesize;
 
 /**
- * Offset to remap timestamps to be non-negative.
- * Expressed in timebase units.
- * @see AVStream.mux_ts_offset
+ * ',' separated list of allowed decoders.
+ * If NULL then all are allowed
+ * - encoding: unused
+ * - decoding: set by user
 */
- int64_t offset;
+ char *codec_whitelist;
 
 /**
- * Timebase for the timestamp offset.
+ * ',' separated list of allowed demuxers.
+ * If NULL then all are allowed
+ * - encoding: unused
+ * - decoding: set by user
 */
- AVRational offset_timebase;
+ char *format_whitelist;
 
 /**
 * An opaque field for libavformat internal usage.
@@ -1503,7 +1790,7 @@
 * Forced video codec.
 * This allows forcing a specific decoder, even when there are multiple with
 * the same codec_id.
- * Demuxing: Set by user via av_format_set_video_codec (NO direct access).
+ * Demuxing: Set by user
 */
 AVCodec *video_codec;
 
@@ -1511,7 +1798,7 @@
 * Forced audio codec.
 * This allows forcing a specific decoder, even when there are multiple with
 * the same codec_id.
- * Demuxing: Set by user via av_format_set_audio_codec (NO direct access).
+ * Demuxing: Set by user
 */
 AVCodec *audio_codec;
 
@@ -1519,11 +1806,19 @@
 * Forced subtitle codec.
 * This allows forcing a specific decoder, even when there are multiple with
 * the same codec_id.
- * Demuxing: Set by user via av_format_set_subtitle_codec (NO direct access).
+ * Demuxing: Set by user
 */
 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
+ */
+ 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.
@@ -1533,7 +1828,6 @@
 /**
 * User data.
 * This is a place for some private data of the user.
- * Mostly usable with control_message_cb or any future callbacks in device's context.
 */
 void *opaque;
 
@@ -1544,24 +1838,142 @@
 
 /**
 * Output timestamp offset, in microseconds.
- * Muxing: set by user via AVOptions (NO direct access)
+ * 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;
+
+#if FF_API_OLD_OPEN_CALLBACKS
+ /**
+ * Called to open further IO contexts when needed for demuxing.
+ *
+ * This can be set by the user application to perform security checks on
+ * the URLs before opening them.
+ * The function should behave like avio_open2(), AVFormatContext is provided
+ * as contextual information and to reach AVFormatContext.opaque.
+ *
+ * If NULL then some simple checks are used together with avio_open2().
+ *
+ * Must not be accessed directly from outside avformat.
+ * @See av_format_set_open_cb()
+ *
+ * Demuxing: Set by user.
+ *
+ * @deprecated Use io_open and io_close.
+ */
+ attribute_deprecated
+ int (*open_cb)(struct AVFormatContext *s, AVIOContext **p, const char *url, int flags, const AVIOInterruptCB *int_cb, AVDictionary **options);
+#endif
+
+ /**
+ * ',' 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;
 } AVFormatContext;
 
+#if FF_API_FORMAT_GET_SET
+/**
+ * Accessors for some AVFormatContext fields. These used to be provided for ABI
+ * compatibility, and do not need to be used anymore.
+ */
+attribute_deprecated
 int av_format_get_probe_score(const AVFormatContext *s);
+attribute_deprecated
 AVCodec * av_format_get_video_codec(const AVFormatContext *s);
+attribute_deprecated
 void av_format_set_video_codec(AVFormatContext *s, AVCodec *c);
+attribute_deprecated
 AVCodec * av_format_get_audio_codec(const AVFormatContext *s);
+attribute_deprecated
 void av_format_set_audio_codec(AVFormatContext *s, AVCodec *c);
+attribute_deprecated
 AVCodec * av_format_get_subtitle_codec(const AVFormatContext *s);
+attribute_deprecated
 void av_format_set_subtitle_codec(AVFormatContext *s, AVCodec *c);
+attribute_deprecated
+AVCodec * av_format_get_data_codec(const AVFormatContext *s);
+attribute_deprecated
+void av_format_set_data_codec(AVFormatContext *s, AVCodec *c);
+attribute_deprecated
 int av_format_get_metadata_header_padding(const AVFormatContext *s);
+attribute_deprecated
 void av_format_set_metadata_header_padding(AVFormatContext *s, int c);
+attribute_deprecated
 void * av_format_get_opaque(const AVFormatContext *s);
+attribute_deprecated
 void av_format_set_opaque(AVFormatContext *s, void *opaque);
+attribute_deprecated
 av_format_control_message av_format_get_control_message_cb(const AVFormatContext *s);
+attribute_deprecated
 void av_format_set_control_message_cb(AVFormatContext *s, av_format_control_message callback);
+#if FF_API_OLD_OPEN_CALLBACKS
+attribute_deprecated AVOpenCallback av_format_get_open_cb(const AVFormatContext *s);
+attribute_deprecated void av_format_set_open_cb(AVFormatContext *s, AVOpenCallback callback);
+#endif
+#endif
+
+/**
+ * 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.
@@ -1600,6 +2012,7 @@
 */
 const char *avformat_license(void);
 
+#if FF_API_NEXT
 /**
 * Initialize libavformat and register all the muxers, demuxers and
 * protocols. If you do not call this function, then you can select
@@ -1608,39 +2021,76 @@
 * @see av_register_input_format()
 * @see av_register_output_format()
 */
+attribute_deprecated
 void av_register_all(void);
 
+attribute_deprecated
 void av_register_input_format(AVInputFormat *format);
+attribute_deprecated
 void av_register_output_format(AVOutputFormat *format);
+#endif
 
 /**
- * Do global initialization of network components. This is optional,
- * but recommended, since it avoids the overhead of implicitly
- * doing the setup for each session.
+ * Do global initialization of network libraries. This is optional,
+ * and not recommended anymore.
 *
- * Calling this function will become mandatory if using network
- * protocols at some major version bump.
+ * 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.
+ * 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);
 
+#if FF_API_NEXT
 /**
 * If f is NULL, returns the first registered input format,
 * if f is non-NULL, returns the next registered input format after f
 * or NULL if f is the last one.
 */
-AVInputFormat *av_iformat_next(AVInputFormat *f);
+attribute_deprecated
+AVInputFormat *av_iformat_next(const AVInputFormat *f);
 
 /**
 * If f is NULL, returns the first registered output format,
 * if f is non-NULL, returns the next registered output format after f
 * or NULL if f is the last one.
 */
-AVOutputFormat *av_oformat_next(AVOutputFormat *f);
+attribute_deprecated
+AVOutputFormat *av_oformat_next(const AVOutputFormat *f);
+#endif
+
+/**
+ * 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.
@@ -1684,22 +2134,48 @@
 */
 AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c);
 
-AVProgram *av_new_program(AVFormatContext *s, int id);
+/**
+ * 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, int size);
+/**
+ * Get side information from stream.
+ *
+ * @param stream stream
+ * @param type desired side information type
+ * @param size pointer for side information size to store (optional)
+ * @return pointer to data if present or NULL otherwise
 */
+uint8_t *av_stream_get_side_data(const AVStream *stream,
+ enum AVPacketSideDataType type, int *size);
 
+AVProgram *av_new_program(AVFormatContext *s, int id);
 
-#if FF_API_ALLOC_OUTPUT_CONTEXT
 /**
- * @deprecated deprecated in favor of avformat_alloc_output_context2()
+ * @}
 */
-attribute_deprecated
-AVFormatContext *avformat_alloc_output_context(const char *format,
- AVOutputFormat *oformat,
- const char *filename);
-#endif
+
 
 /**
 * Allocate an AVFormatContext for an output format.
@@ -1770,7 +2246,7 @@
 *
 * @param pb the bytestream to probe
 * @param fmt the input format is put here
- * @param filename the filename of the stream
+ * @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)
@@ -1779,14 +2255,14 @@
 * AVERROR code otherwise
 */
 int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
- const char *filename, void *logctx,
+ 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, AVInputFormat **fmt,
- const char *filename, void *logctx,
+ const char *url, void *logctx,
 unsigned int offset, unsigned int max_probe_size);
 
 /**
@@ -1797,7 +2273,7 @@
 * May be a pointer to NULL, in which case an AVFormatContext is allocated by this
 * function and written into ps.
 * Note that a user-supplied AVFormatContext will be freed on failure.
- * @param filename Name of the stream to open.
+ * @param 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.
@@ -1808,31 +2284,11 @@
 *
 * @note If you want to use custom IO, preallocate the format context and set its pb field.
 */
-int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options);
+int avformat_open_input(AVFormatContext **ps, const char *url, AVInputFormat *fmt, AVDictionary **options);
 
 attribute_deprecated
 int av_demuxer_open(AVFormatContext *ic);
 
-#if FF_API_FORMAT_PARAMETERS
-/**
- * Read packets of a media file to get stream information. This
- * is useful for file formats with no headers such as MPEG. This
- * function also computes the real framerate in case of MPEG-2 repeat
- * frame mode.
- * The logical file position is not changed by this function;
- * examined packets may be buffered for later processing.
- *
- * @param ic media file handle
- * @return >=0 if OK, AVERROR_xxx on error
- * @todo Let the user decide somehow what information is needed so that
- * we do not waste time getting stuff the user does not need.
- *
- * @deprecated use avformat_find_stream_info.
- */
-attribute_deprecated
-int av_find_stream_info(AVFormatContext *ic);
-#endif
-
 /**
 * Read packets of a media file to get stream information. This
 * is useful for file formats with no headers such as MPEG. This
@@ -1868,6 +2324,8 @@
 */
 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
@@ -1899,24 +2357,6 @@
 AVCodec **decoder_ret,
 int flags);
 
-#if FF_API_READ_PACKET
-/**
- * @deprecated use AVFMT_FLAG_NOFILLIN | AVFMT_FLAG_NOPARSE to read raw
- * unprocessed packets
- *
- * Read a transport packet from a media file.
- *
- * This function is obsolete and should never be used.
- * Use av_read_frame() instead.
- *
- * @param s media file handle
- * @param pkt is filled
- * @return 0 if OK, AVERROR_xxx on error
- */
-attribute_deprecated
-int av_read_packet(AVFormatContext *s, AVPacket *pkt);
-#endif
-
 /**
 * Return the next frame of a stream.
 * This function returns what is stored in the file, and does not validate
@@ -1928,7 +2368,7 @@
 * If pkt->buf is NULL, then the packet is valid until the next
 * av_read_frame() or until avformat_close_input(). Otherwise the packet
 * is valid indefinitely. In both cases the packet must be freed with
- * av_free_packet when it is no longer needed. For video, the packet contains
+ * 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.
@@ -1990,6 +2430,24 @@
 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.
 */
@@ -2002,17 +2460,6 @@
 */
 int av_read_pause(AVFormatContext *s);
 
-#if FF_API_CLOSE_INPUT_FILE
-/**
- * @deprecated use avformat_close_input()
- * Close a media file (but not its codecs).
- *
- * @param s media file handle
- */
-attribute_deprecated
-void av_close_input_file(AVFormatContext *s);
-#endif
-
 /**
 * Close an opened input AVFormatContext. Free it and all its contents
 * and set *s to NULL.
@@ -2022,30 +2469,6 @@
 * @}
 */
 
-#if FF_API_NEW_STREAM
-/**
- * Add a new stream to a media file.
- *
- * Can only be called in the read_header() function. If the flag
- * AVFMTCTX_NOHEADER is in the format context, then new streams
- * can be added in read_packet too.
- *
- * @param s media file handle
- * @param id file-format-dependent stream ID
- */
-attribute_deprecated
-AVStream *av_new_stream(AVFormatContext *s, int id);
-#endif
-
-#if FF_API_SET_PTS_INFO
-/**
- * @deprecated this function is not supposed to be called outside of lavf
- */
-attribute_deprecated
-void av_set_pts_info(AVStream *s, int pts_wrap_bits,
- unsigned int pts_num, unsigned int pts_den);
-#endif
-
 #define AVSEEK_FLAG_BACKWARD 1 ///< seek backward
 #define AVSEEK_FLAG_BYTE 2 ///< seeking based on position in bytes
 #define AVSEEK_FLAG_ANY 4 ///< seek to any frame, even non-keyframes
@@ -2055,6 +2478,10 @@
 * @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.
@@ -2066,13 +2493,38 @@
 * On return this parameter will be destroyed and replaced with a dict containing
 * options that were not found. May be NULL.
 *
- * @return 0 on success, negative AVERROR on failure.
+ * @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.
+ * @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
@@ -2094,10 +2546,17 @@
 * 
 * Packet's @ref AVPacket.stream_index "stream_index" field must be
 * set to the index of the corresponding stream in @ref
- * AVFormatContext.streams "s->streams". It is very strongly
- * recommended that timing information (@ref AVPacket.pts "pts", @ref
- * AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to
- * correct values.
+ * AVFormatContext.streams "s->streams".
+ * 
+ * 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()
@@ -2112,6 +2571,10 @@
 * 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.
 * 
@@ -2127,10 +2590,16 @@
 * 
 * Packet's @ref AVPacket.stream_index "stream_index" field must be
 * set to the index of the corresponding stream in @ref
- * AVFormatContext.streams "s->streams". It is very strongly
- * recommended that timing information (@ref AVPacket.pts "pts", @ref
- * AVPacket.dts "dts", @ref AVPacket.duration "duration") is set to
- * correct values.
+ * AVFormatContext.streams "s->streams".
+ * 
+ * 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. Libavformat will always
 * take care of freeing the packet, even if this function fails.
@@ -2140,7 +2609,7 @@
 int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
 
 /**
- * Write a uncoded frame to an output media file.
+ * Write an uncoded frame to an output media file.
 *
 * The frame must be correctly interleaved according to the container
 * specification; if not, then av_interleaved_write_frame() must be used.
@@ -2151,9 +2620,9 @@
 AVFrame *frame);
 
 /**
- * Write a uncoded frame to an output media file.
+ * Write an uncoded frame to an output media file.
 *
- * If the muxer supports it, this function allows to write an AVFrame
+ * 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.
@@ -2277,7 +2746,7 @@
 * @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, AVPacket *pkt, int dump_payload, AVStream *st);
+void av_pkt_dump2(FILE *f, const AVPacket *pkt, int dump_payload, const AVStream *st);
 
 
 /**
@@ -2291,8 +2760,8 @@
 * @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, AVPacket *pkt, int dump_payload,
- AVStream *st);
+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.
@@ -2378,11 +2847,24 @@
 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.
 *
@@ -2393,8 +2875,12 @@
 * @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);
 
@@ -2444,7 +2930,8 @@
 * @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(AVOutputFormat *ofmt, enum AVCodecID codec_id, int std_compliance);
+int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id,
+ int std_compliance);
 
 /**
 * @defgroup riff_fourcc RIFF FourCCs
@@ -2526,6 +3013,52 @@
 
 int avformat_queue_attached_pictures(AVFormatContext *s);
 
+#if FF_API_OLD_BSF
+/**
+ * Apply a list of bitstream filters to a packet.
+ *
+ * @param codec AVCodecContext, usually from an AVStream
+ * @param pkt the packet to apply filters to. If, on success, the returned
+ * packet has size == 0 and side_data_elems == 0, it indicates that
+ * the packet should be dropped
+ * @param bsfc a NULL-terminated list of filters to apply
+ * @return >=0 on success;
+ * AVERROR code on failure
+ */
+attribute_deprecated
+int av_apply_bitstream_filters(AVCodecContext *codec, AVPacket *pkt,
+ AVBitStreamFilterContext *bsfc);
+#endif
+
+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);
 
 /**
 * @}

gpac-0.7.1.tar.gz/extra_lib/include/libavformat/avio.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavformat/avio.h Changed

@@ -34,8 +34,15 @@
 
 #include "libavformat/version.h"
 
+/**
+ * Seeking works like for a local file.
+ */
+#define AVIO_SEEKABLE_NORMAL (1 << 0)
 
-#define AVIO_SEEKABLE_NORMAL 0x0001 /**< Seeking works like for a local file */
+/**
+ * Seeking by timestamp with avio_seek_time() is possible.
+ */
+#define AVIO_SEEKABLE_TIME (1 << 1)
 
 /**
 * Callback for checking whether to abort blocking functions.
@@ -54,6 +61,92 @@
 } 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 fields can be added to the end with minor version bumps.
 * Removal, reordering and changes to existing fields require a major
@@ -79,6 +172,57 @@
 * 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 */
@@ -92,7 +236,6 @@
 int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
 int64_t (*seek)(void *opaque, int64_t offset, int whence);
 int64_t pos; /**< position in the file of the current buffer */
- int must_flush; /**< true if the next seek should flush */
 int eof_reached; /**< true if eof reached */
 int write_flag; /**< true if open for writing */
 int max_packet_size;
@@ -146,9 +289,67 @@
 * This field is internal to libavformat and access from outside is not allowed.
 */
 int writeout_count;
-} AVIOContext;
 
-/* unbuffered I/O */
+ /**
+ * Original buffer size
+ * used internally after probing and ensure seekback to reset the buffer size
+ * This field is internal to libavformat and access from outside is not allowed.
+ */
+ int orig_buffer_size;
+
+ /**
+ * Threshold to favor readahead over seek.
+ * This is current internal only, do not use from outside.
+ */
+ int short_seek_threshold;
+
+ /**
+ * ',' 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;
+
+ /**
+ * Internal, not meant to be used from outside of AVIOContext.
+ */
+ enum AVIODataMarkerType current_type;
+ int64_t last_time;
+
+ /**
+ * A callback that is used instead of short_seek_threshold.
+ * This is current internal only, do not use from outside.
+ */
+ int (*short_seek_get)(void *opaque);
+
+ int64_t written;
+
+ /**
+ * 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;
+
+ /**
+ * Try to buffer at least this amount of data before flushing it
+ */
+ int min_packet_size;
+} AVIOContext;
 
 /**
 * Return the name of the protocol that will handle the passed URL.
@@ -174,17 +375,84 @@
 int avio_check(const char *url, int flags);
 
 /**
+ * Move or rename a resource.
+ *
+ * @note url_src and url_dst should share the same protocol and authority.
+ *
+ * @param url_src url to resource to be moved
+ * @param url_dst new url to resource if the operation succeeded
+ * @return >=0 on success or negative on error.
+ */
+int avpriv_io_move(const char *url_src, const char *url_dst);
+
+/**
+ * Delete a resource.
+ *
+ * @param url resource to be deleted.
+ * @return >=0 on success or negative on error.
+ */
+int avpriv_io_delete(const char *url);
+
+/**
+ * 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.
+ * @param[out] 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 av_free().
+ * 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.
@@ -200,6 +468,14 @@
 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);
@@ -219,19 +495,43 @@
 
 /**
 * 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);
 
 /**
- * Passing this as the "whence" parameter to a seek function causes it to
+ * 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
 
 /**
- * Oring this flag as into the "whence" parameter to a seek function causes it to
+ * 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.
@@ -269,16 +569,20 @@
 * feof() equivalent for AVIOContext.
 * @return non zero if and only if end of file
 */
-int url_feof(AVIOContext *s);
+int avio_feof(AVIOContext *s);
 
-/** @warning currently size is limited */
+/** @warning Writes up to 4 KiB per call */
 int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
 
 /**
- * Force flushing of buffered data to the output s.
+ * Force flushing of buffered data.
 *
- * Force the buffered data to be immediately written to the output,
+ * 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);
 
@@ -289,6 +593,15 @@
 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
 * @{
 *
@@ -439,9 +752,21 @@
 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 FF_INPUT_BUFFER_PADDING_SIZE is added to the buffer.
+ * Padding of AV_INPUT_BUFFER_PADDING_SIZE is added to the buffer.
 *
 * @param s IO context
 * @param pbuffer pointer to a byte buffer
@@ -493,4 +818,44 @@
 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-0.7.1.tar.gz/extra_lib/include/libavformat/version.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavformat/version.h Changed

@@ -29,8 +29,10 @@
 
 #include "libavutil/version.h"
 
-#define LIBAVFORMAT_VERSION_MAJOR 55
-#define LIBAVFORMAT_VERSION_MINOR 33
+// 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 58
+#define LIBAVFORMAT_VERSION_MINOR 12
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
@@ -47,32 +49,53 @@
 * 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.
+ *
 */
-#ifndef FF_API_REFERENCE_DTS
-#define FF_API_REFERENCE_DTS (LIBAVFORMAT_VERSION_MAJOR < 56)
+#ifndef FF_API_COMPUTE_PKT_FIELDS2
+#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
-
-#ifndef FF_API_ALLOC_OUTPUT_CONTEXT
-#define FF_API_ALLOC_OUTPUT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 56)
+#ifndef FF_API_OLD_OPEN_CALLBACKS
+#define FF_API_OLD_OPEN_CALLBACKS (LIBAVFORMAT_VERSION_MAJOR < 59)
+#endif
+#ifndef FF_API_LAVF_AVCTX
+#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59)
+#endif
+#ifndef FF_API_HTTP_USER_AGENT
+#define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_FORMAT_PARAMETERS
-#define FF_API_FORMAT_PARAMETERS (LIBAVFORMAT_VERSION_MAJOR < 56)
+#ifndef FF_API_HLS_WRAP
+#define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_NEW_STREAM
-#define FF_API_NEW_STREAM (LIBAVFORMAT_VERSION_MAJOR < 56)
+#ifndef FF_API_LAVF_KEEPSIDE_FLAG
+#define FF_API_LAVF_KEEPSIDE_FLAG (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_SET_PTS_INFO
-#define FF_API_SET_PTS_INFO (LIBAVFORMAT_VERSION_MAJOR < 56)
+#ifndef FF_API_OLD_ROTATE_API
+#define FF_API_OLD_ROTATE_API (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_CLOSE_INPUT_FILE
-#define FF_API_CLOSE_INPUT_FILE (LIBAVFORMAT_VERSION_MAJOR < 56)
+#ifndef FF_API_FORMAT_GET_SET
+#define FF_API_FORMAT_GET_SET (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_READ_PACKET
-#define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 56)
+#ifndef FF_API_OLD_AVIO_EOF_0
+#define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_ASS_SSA
-#define FF_API_ASS_SSA (LIBAVFORMAT_VERSION_MAJOR < 56)
+#ifndef FF_API_LAVF_FFSERVER
+#define FF_API_LAVF_FFSERVER (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
+#ifndef FF_API_FORMAT_FILENAME
+#define FF_API_FORMAT_FILENAME (LIBAVFORMAT_VERSION_MAJOR < 59)
+#endif
+#ifndef FF_API_OLD_RTSP_OPTIONS
+#define FF_API_OLD_RTSP_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 59)
+#endif
+#ifndef FF_API_NEXT
+#define FF_API_NEXT (LIBAVFORMAT_VERSION_MAJOR < 59)
+#endif
+
+
 #ifndef FF_API_R_FRAME_RATE
 #define FF_API_R_FRAME_RATE 1
 #endif

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/adler32.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/adler32.h Changed

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/aes_ctr.h Added

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/attributes.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/attributes.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/audio_fifo.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/audio_fifo.h Changed

@@ -34,6 +34,9 @@
 /**
  * @addtogroup lavu_audio
  * @{
+ *
+ * @defgroup lavu_audiofifo Audio FIFO Buffer
+ * @{
  */
 
 /**
@@ -70,6 +73,7 @@
  * @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);
 
 /**
@@ -91,6 +95,39 @@
 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
@@ -144,6 +181,7 @@
 
 /**
  * @}
+ * @}
  */
 
 #endif /* AVUTIL_AUDIO_FIFO_H */

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/avassert.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/avassert.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/avconfig.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/avconfig.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/avstring.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/avstring.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/avutil.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/avutil.h Changed

@@ -23,7 +23,8 @@
 
 /**
 * @file
- * external API header
+ * @ingroup lavu
+ * Convenience header that includes @ref lavu "libavutil"'s core.
 */
 
 /**
@@ -78,14 +79,15 @@
 */
 
 /**
- * @defgroup lavu Common utility functions
+ * @defgroup lavu libavutil
+ * Common code shared across all FFmpeg libraries.
 *
- * @brief
- * libavutil contains the code shared across all the other FFmpeg
- * libraries
- *
- * @note In order to use the functions provided by avutil you must include
- * the specific header.
+ * @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.
 *
 * @{
 *
@@ -94,7 +96,7 @@
 * @{
 * @}
 *
- * @defgroup lavu_math Maths
+ * @defgroup lavu_math Mathematics
 * @{
 *
 * @}
@@ -116,6 +118,12 @@
 *
 * @}
 *
+ * @defgroup lavu_video Video related
+ *
+ * @{
+ *
+ * @}
+ *
 * @defgroup lavu_audio Audio related
 *
 * @{
@@ -138,15 +146,13 @@
 *
 * @{
 *
- * @defgroup lavu_internal Internal
- *
- * Not exported functions, for internal usage only
+ * @defgroup preproc_misc Preprocessor String Macros
 *
 * @{
 *
 * @}
 *
- * @defgroup preproc_misc Preprocessor String Macros
+ * @defgroup version_utils Library Version Macros
 *
 * @{
 *
@@ -165,6 +171,13 @@
 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);
@@ -261,7 +274,7 @@
 AV_PICTURE_TYPE_I, ///< Intra
 AV_PICTURE_TYPE_P, ///< Predicted
 AV_PICTURE_TYPE_B, ///< Bi-dir predicted
- AV_PICTURE_TYPE_S, ///< S(GMC)-VOP MPEG4
+ AV_PICTURE_TYPE_S, ///< S(GMC)-VOP MPEG-4
 AV_PICTURE_TYPE_SI, ///< Switching Intra
 AV_PICTURE_TYPE_SP, ///< Switching Predicted
 AV_PICTURE_TYPE_BI, ///< BI type
@@ -282,10 +295,10 @@
 
 #include "common.h"
 #include "error.h"
+#include "rational.h"
 #include "version.h"
 #include "macros.h"
 #include "mathematics.h"
-#include "rational.h"
 #include "log.h"
 #include "pixfmt.h"
 
@@ -326,6 +339,25 @@
 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((char[AV_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);
+
+/**
 * @}
 * @}
 */

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/base64.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/base64.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/blowfish.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/blowfish.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/bprint.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/bprint.h Changed

@@ -30,9 +30,13 @@
 * Define a structure with extra padding to a fixed size
 * This helps ensuring binary compatibility with future versions.
 */
-#define FF_PAD_STRUCTURE(size, ...) \
+
+#define FF_PAD_STRUCTURE(name, size, ...) \
+struct ff_pad_helper_##name { __VA_ARGS__ }; \
+typedef struct name { \
 __VA_ARGS__ \
- char reserved_padding[size - sizeof(struct { __VA_ARGS__ })];
+ char reserved_padding[size - sizeof(struct ff_pad_helper_##name)]; \
+} name;
 
 /**
 * Buffer to print data progressively
@@ -74,15 +78,14 @@
 * internal buffer is large enough to hold a reasonable paragraph of text,
 * such as the current paragraph.
 */
-typedef struct AVBPrint {
- FF_PAD_STRUCTURE(1024,
+
+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_buffer[1];
- )
-} AVBPrint;
+)
 
 /**
 * Convenience macros for special values for av_bprint_init() size_max
@@ -179,7 +182,7 @@
 * It may have been truncated due to a memory allocation failure
 * or the size_max limit (compare size and size_max if necessary).
 */
-static inline int av_bprint_is_complete(AVBPrint *buf)
+static inline int av_bprint_is_complete(const AVBPrint *buf)
 {
 return buf->len < buf->size;
 }

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/bswap.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/bswap.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/buffer.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/buffer.h Changed

@@ -249,13 +249,30 @@
 AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int 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.
+ * @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.
+ * @return newly created buffer pool on success, NULL on error.
+ */
+AVBufferPool *av_buffer_pool_init2(int size, void *opaque,
+                                   AVBufferRef* (*alloc)(void *opaque, int 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.
- * @see av_buffer_pool_can_uninit()
  */
 void av_buffer_pool_uninit(AVBufferPool **pool);

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/camellia.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/cast5.h Added

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/channel_layout.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/channel_layout.h Changed

@@ -79,7 +79,7 @@
 
 /**
 * @}
- * @defgroup channel_mask_c Audio channel convenience macros
+ * @defgroup channel_mask_c Audio channel layouts
 * @{
 * */
 #define AV_CH_LAYOUT_MONO (AV_CH_FRONT_CENTER)
@@ -108,6 +108,7 @@
 #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)
 
 enum AVMatrixEncoding {
@@ -122,10 +123,6 @@
 };
 
 /**
- * @}
- */
-
-/**
 * 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,
@@ -134,22 +131,31 @@
 * 5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix);
 * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC,
 * SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR);
- * - a number of channels, in decimal, optionally followed by 'c', yielding
+ * - 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).
 *
- * @warning Starting from the next major bump the trailing character
- * 'c' to specify a number of channels will be required, while a
- * channel layout mask could also be specified as a decimal number
- * (if and only if not followed by "c").
- *
 * Example: "stereo+FC" = "2c+FC" = "2c+1c" = "0x7"
 */
 uint64_t av_get_channel_layout(const char *name);
 
 /**
+ * Return a 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.
+ *
+ * @param[in] name channel layout specification string
+ * @param[out] channel_layout parsed channel layout (0 if unknown)
+ * @param[out] 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.
 *
@@ -220,6 +226,7 @@
 
 /**
 * @}
+ * @}
 */
 
 #endif /* AVUTIL_CHANNEL_LAYOUT_H */

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/common.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/common.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/cpu.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/cpu.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/crc.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/crc.h Changed

@@ -18,16 +18,29 @@
 * 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"
+#include "version.h"
 
 /**
- * @defgroup lavu_crc32 CRC32
- * @ingroup lavu_crypto
+ * @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.
+ *
 * @{
 */
 
@@ -39,7 +52,9 @@
 AV_CRC_16_CCITT,
 AV_CRC_32_IEEE,
 AV_CRC_32_IEEE_LE, /*< reversed bitorder version of AV_CRC_32_IEEE */
- AV_CRC_24_IEEE = 12,
+ 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;

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/des.h Added

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/dict.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/dict.h Changed

@@ -1,5 +1,4 @@
 /*
- *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
@@ -31,6 +30,10 @@
 #ifndef AVUTIL_DICT_H
 #define AVUTIL_DICT_H
 
+#include <stdint.h>
+
+#include "version.h"
+
 /**
 * @addtogroup lavu_dict AVDictionary
 * @ingroup lavu_data
@@ -61,7 +64,6 @@
 }
 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(). */
@@ -74,6 +76,7 @@
 #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;
@@ -97,8 +100,8 @@
 * @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(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags);
+AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key,
+ const AVDictionaryEntry *prev, int flags);
 
 /**
 * Get number of entries in dictionary.
@@ -111,16 +114,30 @@
 /**
 * 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 be av_strduped depending on flags)
- * @param value entry value to add to *pm (will be av_strduped depending on flags).
+ * @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
@@ -147,8 +164,10 @@
 * @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.
 */
-void av_dict_copy(AVDictionary **dst, AVDictionary *src, int flags);
+int av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags);
 
 /**
 * Free all the memory allocated for an AVDictionary struct
@@ -157,6 +176,24 @@
 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 ('\').
+ *
+ * @param[in] m dictionary
+ * @param[out] buffer Pointer to buffer that will be allocated with string containg entries.
+ * Buffer must be freed by the caller when is no longer needed.
+ * @param[in] key_val_sep character used to separate key from value
+ * @param[in] 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);
+
+/**
 * @}
 */

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/display.h Added

@@ -0,0 +1,114 @@
+/*
+ * 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 matrix[9]);
+
+/**
+ * Initialize a transformation matrix describing a pure counterclockwise
+ * rotation by the specified angle (in degrees).
+ *
+ * @param matrix an allocated transformation matrix (will be fully overwritten
+ * by this function)
+ * @param angle rotation angle in degrees.
+ */
+void av_display_rotation_set(int32_t matrix[9], double angle);
+
+/**
+ * Flip the input matrix horizontally and/or vertically.
+ *
+ * @param matrix an allocated transformation matrix
+ * @param hflip whether the matrix should be flipped horizontally
+ * @param vflip whether the matrix should be flipped vertically
+ */
+void av_display_matrix_flip(int32_t matrix[9], int hflip, int vflip);
+
+/**
+ * @}
+ * @}
+ */
+
+#endif /* AVUTIL_DISPLAY_H */

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/downmix_info.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/downmix_info.h Changed

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/encryption_info.h Added

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/error.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/error.h Changed

@@ -70,6 +70,15 @@
 #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

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/eval.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/eval.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/ffversion.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/ffversion.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/fifo.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/fifo.h Changed

@@ -42,12 +42,26 @@
 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
  */
@@ -59,7 +73,7 @@
  * @param f AVFifoBuffer to read from
  * @return size
  */
-int av_fifo_size(AVFifoBuffer *f);
+int av_fifo_size(const AVFifoBuffer *f);
 
 /**
  * Return the amount of space in bytes in the AVFifoBuffer, that is the
@@ -67,7 +81,28 @@
  * @param f AVFifoBuffer to write into
  * @return size
  */
-int av_fifo_space(AVFifoBuffer *f);
+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.

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/file.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/file.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/frame.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/frame.h Changed

@@ -1,5 +1,4 @@
 /*
- *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
@@ -26,6 +25,7 @@
 #ifndef AVUTIL_FRAME_H
 #define AVUTIL_FRAME_H
 
+#include <stddef.h>
 #include <stdint.h>
 
 #include "avutil.h"
@@ -33,32 +33,10 @@
 #include "dict.h"
 #include "rational.h"
 #include "samplefmt.h"
+#include "pixfmt.h"
 #include "version.h"
 
 
-enum AVColorSpace{
- AVCOL_SPC_RGB = 0,
- AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
- AVCOL_SPC_UNSPECIFIED = 2,
- AVCOL_SPC_FCC = 4,
- AVCOL_SPC_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
- AVCOL_SPC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
- AVCOL_SPC_SMPTE240M = 7,
- AVCOL_SPC_YCOCG = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
- AVCOL_SPC_BT2020_NCL = 9, ///< ITU-R BT2020 non-constant luminance system
- AVCOL_SPC_BT2020_CL = 10, ///< ITU-R BT2020 constant luminance system
- AVCOL_SPC_NB , ///< Not part of ABI
-};
-#define AVCOL_SPC_YCGCO AVCOL_SPC_YCOCG
-
-enum AVColorRange{
- AVCOL_RANGE_UNSPECIFIED = 0,
- AVCOL_RANGE_MPEG = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
- AVCOL_RANGE_JPEG = 2, ///< the normal 2^n-1 "JPEG" YUV ranges
- AVCOL_RANGE_NB , ///< Not part of ABI
-};
-
-
 /**
 * @defgroup lavu_frame AVFrame
 * @ingroup lavu_data
@@ -92,13 +70,119 @@
 * 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,
+
+#if FF_API_FRAME_QP
+ /**
+ * Implementation-specific description of the format of AV_FRAME_QP_TABLE_DATA.
+ * The contents of this side data are undocumented and internal; use
+ * av_frame_set_qp_table() and av_frame_get_qp_table() to access this in a
+ * meaningful way instead.
+ */
+ AV_FRAME_DATA_QP_TABLE_PROPERTIES,
+
+ /**
+ * Raw QP table data. Its format is described by
+ * AV_FRAME_DATA_QP_TABLE_PROPERTIES. Use av_frame_set_qp_table() and
+ * av_frame_get_qp_table() to access this instead.
+ */
+ AV_FRAME_DATA_QP_TABLE_DATA,
+#endif
+};
+
+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;
 int size;
 AVDictionary *metadata;
+ AVBufferRef *buf;
 } AVFrameSideData;
 
 /**
@@ -126,9 +210,10 @@
 *
 * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added
 * to the end with a minor bump.
- * Similarly fields that are marked as to be only accessed by
- * av_opt_ptr() can be reordered. This allows 2 forks to add fields
- * without breaking compatibility with each other.
+ *
+ * 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
@@ -140,6 +225,9 @@
 * 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: Except for hwaccel formats, pointers not needed by the format
+ * MUST be set to NULL.
 */
 uint8_t *data[AV_NUM_DATA_POINTERS];
 
@@ -150,7 +238,7 @@
 * For audio, only linesize[0] may be set. For planar audio, each channel
 * plane must be the same size.
 *
- * For video the linesizes should be multiplies of the CPUs alignment
+ * 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.
@@ -177,9 +265,18 @@
 uint8_t **extended_data;
 
 /**
- * width and height of the video frame
+ * @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
@@ -203,11 +300,6 @@
 */
 enum AVPictureType pict_type;
 
-#if FF_API_AVFRAME_LAVC
- attribute_deprecated
- uint8_t *base[AV_NUM_DATA_POINTERS];
-#endif
-
 /**
 * Sample aspect ratio for the video frame, 0/1 if unknown/unspecified.
 */
@@ -218,13 +310,17 @@
 */
 int64_t pts;
 
+#if FF_API_PKT_PTS
 /**
 * PTS copied from the AVPacket that was decoded to produce this frame.
+ * @deprecated use the pts field instead
 */
+ attribute_deprecated
 int64_t pkt_pts;
+#endif
 
 /**
- * DTS copied from the AVPacket that triggered returning this frame. (if frame threading isnt used)
+ * 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.
 */
@@ -244,78 +340,17 @@
 */
 int quality;
 
-#if FF_API_AVFRAME_LAVC
- attribute_deprecated
- int reference;
-
- /**
- * QP table
- */
- attribute_deprecated
- int8_t *qscale_table;
- /**
- * QP store stride
- */
- attribute_deprecated
- int qstride;
-
- attribute_deprecated
- int qscale_type;
-
- /**
- * mbskip_table[mb]>=1 if MB didn't change
- * stride= mb_width = (width+15)>>4
- */
- attribute_deprecated
- uint8_t *mbskip_table;
-
- /**
- * motion vector table
- * @code
- * example:
- * int mv_sample_log2= 4 - motion_subsample_log2;
- * int mb_width= (width+15)>>4;
- * int mv_stride= (mb_width << mv_sample_log2) + 1;
- * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
- * @endcode
- */
- attribute_deprecated
- int16_t (*motion_val[2])[2];
-
- /**
- * macroblock type table
- * mb_type_base + mb_width + 2
- */
- attribute_deprecated
- uint32_t *mb_type;
-
- /**
- * DCT coefficients
- */
- attribute_deprecated
- short *dct_coeff;
-
- /**
- * motion reference frame index
- * the order in which these are stored can depend on the codec.
- */
- attribute_deprecated
- int8_t *ref_index[2];
-#endif
-
 /**
 * for some private data of the user
 */
 void *opaque;
 
+#if FF_API_ERROR_FRAME
 /**
- * error
+ * @deprecated unused
 */
- uint64_t error[AV_NUM_DATA_POINTERS];
-
-#if FF_API_AVFRAME_LAVC
 attribute_deprecated
- int type;
+ uint64_t error[AV_NUM_DATA_POINTERS];
 #endif
 
 /**
@@ -339,19 +374,8 @@
 */
 int palette_has_changed;
 
-#if FF_API_AVFRAME_LAVC
- attribute_deprecated
- int buffer_hints;
-
 /**
- * Pan scan.
- */
- attribute_deprecated
- struct AVPanScan *pan_scan;
-#endif
-
- /**
- * reordered opaque 64bit (generally an integer or a double precision float
+ * 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,
@@ -361,25 +385,6 @@
 */
 int64_t reordered_opaque;
 
-#if FF_API_AVFRAME_LAVC
- /**
- * @deprecated this field is unused
- */
- attribute_deprecated void *hwaccel_picture_private;
-
- attribute_deprecated
- struct AVCodecContext *owner;
- attribute_deprecated
- void *thread_opaque;
-
- /**
- * log2 of the size of the block which a single vector in motion_val represents:
- * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)
- */
- attribute_deprecated
- uint8_t motion_subsample_log2;
-#endif
-
 /**
 * Sample rate of the audio data.
 */
@@ -392,7 +397,9 @@
 
 /**
 * AVBuffer references backing the data for this frame. If all elements of
- * this array are NULL, then this frame is not reference counted.
+ * this array are NULL, then this frame is not reference counted. This array
+ * must be filled contiguously -- if buf[i] is non-NULL then buf[j] 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
@@ -425,6 +432,7 @@
 
 /**
 * @defgroup lavu_frame_flags AV_FRAME_FLAGS
+ * @ingroup lavu_frame
 * Flags describing additional frame properties.
 *
 * @{
@@ -435,6 +443,10 @@
 */
 #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)
+/**
 * @}
 */
 
@@ -444,9 +456,27 @@
 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
- * Code outside libavcodec should access this field using:
- * av_frame_get_best_effort_timestamp(frame)
 * - encoding: unused
 * - decoding: set by libavcodec, read by user.
 */
@@ -454,8 +484,6 @@
 
 /**
 * reordered pos from the last AVPacket that has been input into the decoder
- * Code outside libavcodec should access this field using:
- * av_frame_get_pkt_pos(frame)
 * - encoding: unused
 * - decoding: Read by user.
 */
@@ -464,8 +492,6 @@
 /**
 * duration of the corresponding packet, expressed in
 * AVStream->time_base units, 0 if unknown.
- * Code outside libavcodec should access this field using:
- * av_frame_get_pkt_duration(frame)
 * - encoding: unused
 * - decoding: Read by user.
 */
@@ -473,8 +499,6 @@
 
 /**
 * metadata.
- * Code outside libavcodec should access this field using:
- * av_frame_get_metadata(frame)
 * - encoding: Set by user.
 * - decoding: Set by libavcodec.
 */
@@ -484,8 +508,6 @@
 * decode error flags of the frame, set to a combination of
 * FF_DECODE_ERROR_xxx flags if the decoder produced a frame, but there
 * were errors during the decoding.
- * Code outside libavcodec should access this field using:
- * av_frame_get_decode_error_flags(frame)
 * - encoding: unused
 * - decoding: set by libavcodec, read by user.
 */
@@ -495,8 +517,6 @@
 
 /**
 * number of audio channels, only used for audio.
- * Code outside libavcodec should access this field using:
- * av_frame_get_channels(frame)
 * - encoding: unused
 * - decoding: Read by user.
 */
@@ -504,69 +524,134 @@
 
 /**
 * size of the corresponding packet containing the compressed
- * frame. It must be accessed using av_frame_get_pkt_size() and
- * av_frame_set_pkt_size().
+ * frame.
 * It is set to a negative value if unknown.
 * - encoding: unused
 * - decoding: set by libavcodec, read by user.
 */
 int pkt_size;
 
+#if FF_API_FRAME_QP
 /**
- * YUV colorspace type.
- * It must be accessed using av_frame_get_colorspace() and
- * av_frame_set_colorspace().
- * - encoding: Set by user
- * - decoding: Set by libavcodec
+ * QP table
 */
- enum AVColorSpace colorspace;
+ attribute_deprecated
+ int8_t *qscale_table;
+ /**
+ * QP store stride
+ */
+ attribute_deprecated
+ int qstride;
+
+ attribute_deprecated
+ int qscale_type;
 
+ attribute_deprecated
+ AVBufferRef *qp_table_buf;
+#endif
 /**
- * MPEG vs JPEG YUV range.
- * It must be accessed using av_frame_get_color_range() and
- * av_frame_set_color_range().
- * - encoding: Set by user
- * - decoding: Set by libavcodec
+ * For hwaccel-format frames, this should be a reference to the
+ * AVHWFramesContext describing the frame.
 */
- enum AVColorRange color_range;
+ 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;
 
 /**
- * Not to be accessed directly from outside libavutil
+ * @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.
+ * @{
 */
- AVBufferRef *qp_table_buf;
+ 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_FRAME_GET_SET
 /**
- * Accessors for some AVFrame fields.
- * The position of these field in the structure is not part of the ABI,
- * they should not be accessed directly outside libavcodec.
+ * Accessors for some AVFrame fields. These used to be provided for ABI
+ * compatibility, and do not need to be used anymore.
 */
+attribute_deprecated
 int64_t av_frame_get_best_effort_timestamp(const AVFrame *frame);
+attribute_deprecated
 void av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val);
+attribute_deprecated
 int64_t av_frame_get_pkt_duration (const AVFrame *frame);
+attribute_deprecated
 void av_frame_set_pkt_duration (AVFrame *frame, int64_t val);
+attribute_deprecated
 int64_t av_frame_get_pkt_pos (const AVFrame *frame);
+attribute_deprecated
 void av_frame_set_pkt_pos (AVFrame *frame, int64_t val);
+attribute_deprecated
 int64_t av_frame_get_channel_layout (const AVFrame *frame);
+attribute_deprecated
 void av_frame_set_channel_layout (AVFrame *frame, int64_t val);
+attribute_deprecated
 int av_frame_get_channels (const AVFrame *frame);
+attribute_deprecated
 void av_frame_set_channels (AVFrame *frame, int val);
+attribute_deprecated
 int av_frame_get_sample_rate (const AVFrame *frame);
+attribute_deprecated
 void av_frame_set_sample_rate (AVFrame *frame, int val);
+attribute_deprecated
 AVDictionary *av_frame_get_metadata (const AVFrame *frame);
+attribute_deprecated
 void av_frame_set_metadata (AVFrame *frame, AVDictionary *val);
+attribute_deprecated
 int av_frame_get_decode_error_flags (const AVFrame *frame);
+attribute_deprecated
 void av_frame_set_decode_error_flags (AVFrame *frame, int val);
+attribute_deprecated
 int av_frame_get_pkt_size(const AVFrame *frame);
+attribute_deprecated
 void av_frame_set_pkt_size(AVFrame *frame, int val);
-AVDictionary **avpriv_frame_get_metadatap(AVFrame *frame);
+#if FF_API_FRAME_QP
+attribute_deprecated
 int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type);
+attribute_deprecated
 int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int type);
+#endif
+attribute_deprecated
 enum AVColorSpace av_frame_get_colorspace(const AVFrame *frame);
+attribute_deprecated
 void av_frame_set_colorspace(AVFrame *frame, enum AVColorSpace val);
+attribute_deprecated
 enum AVColorRange av_frame_get_color_range(const AVFrame *frame);
+attribute_deprecated
 void av_frame_set_color_range(AVFrame *frame, enum AVColorRange val);
+#endif
 
 /**
 * Get the name of a colorspace.
@@ -604,6 +689,10 @@
 * 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);
@@ -623,7 +712,11 @@
 void av_frame_unref(AVFrame *frame);
 
 /**
- * Move everythnig contained in src to dst and reset src.
+ * 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);
 
@@ -639,8 +732,14 @@
 * 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
+ * @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.
 */
@@ -720,6 +819,22 @@
 int 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.
 */
@@ -727,6 +842,51 @@
 enum AVFrameSideDataType type);
 
 /**
+ * If side data of the supplied type exists in the frame, free it and remove it
+ * from the frame.
+ */
+void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type);
+
+
+/**
+ * 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);
+
+/**
 * @}
 */

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/hash.h Added

@@ -0,0 +1,269 @@
+/*
+ * 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 <stdint.h>
+
+#include "version.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.
+ *
+ * @param[in] 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.
+ *
+ * @param[in] 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.
+ *
+ * @param[in,out] ctx Hash context
+ */
+void av_hash_init(struct AVHashContext *ctx);
+
+/**
+ * Update a hash context with additional data.
+ *
+ * @param[in,out] ctx Hash context
+ * @param[in] src Data to be added to the hash context
+ * @param[in] len Size of the additional data
+ */
+#if FF_API_CRYPTO_SIZE_T
+void av_hash_update(struct AVHashContext *ctx, const uint8_t *src, int len);
+#else
+void av_hash_update(struct AVHashContext *ctx, const uint8_t *src, size_t len);
+#endif
+
+/**
+ * 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.
+ *
+ * @param[in,out] ctx Hash context
+ * @param[out] 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.
+ *
+ * @param[in,out] ctx Hash context
+ * @param[out] dst Where the final hash value will be stored
+ * @param[in] 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.
+ *
+ * @param[in,out] ctx Hash context
+ * @param[out] dst Where the string will be stored
+ * @param[in] 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.
+ *
+ * @param[in,out] ctx Hash context
+ * @param[out] dst Where the final hash value will be stored
+ * @param[in] 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`.
+ *
+ * @param[in,out] ctx Pointer to hash context
+ */
+void av_hash_freep(struct AVHashContext **ctx);
+
+/**
+ * @}
+ * @}
+ */
+
+#endif /* AVUTIL_HASH_H */

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/hmac.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/hmac.h Changed

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/hwcontext.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/hwcontext_cuda.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/hwcontext_d3d11va.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/hwcontext_drm.h Added

@@ -0,0 +1,169 @@
+/*
+ * 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 planes[AV_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 objects[AV_DRM_MAX_PLANES];
+ /**
+ * Number of layers in the frame.
+ */
+ int nb_layers;
+ /**
+ * Array of layers in the frame.
+ */
+ AVDRMLayerDescriptor layers[AV_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-0.8.0.tar.gz/extra_lib/include/libavutil/hwcontext_dxva2.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/hwcontext_mediacodec.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/hwcontext_qsv.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/hwcontext_vaapi.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/hwcontext_vdpau.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/hwcontext_videotoolbox.h Added

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/imgutils.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/imgutils.h Changed

@@ -29,6 +29,7 @@
 
 #include "avutil.h"
 #include "pixdesc.h"
+#include "rational.h"
 
 /**
  * Compute the max pixel step for each plane of an image with a
@@ -120,6 +121,24 @@
                    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_data[4],       const ptrdiff_t dst_linesizes[4],
+                           const uint8_t *src_data[4], const ptrdiff_t src_linesizes[4],
+                           enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
  * Setup the data pointers and linesizes based on the specified image
  * parameters and the provided array.
  *
@@ -136,7 +155,7 @@
  * one call, use av_image_alloc().
  *
  * @param dst_data      data pointers to be filled in
- * @param dst_linesizes linesizes for the image in dst_data to be filled in
+ * @param 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
@@ -153,7 +172,11 @@
  * Return the size in bytes of the amount of data required to store an
  * image with the given parameters.
  *
- * @param[in] align the assumed linesize alignment
+ * @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);
 
@@ -166,7 +189,7 @@
  * @param dst           a buffer into which picture data will be copied
  * @param dst_size      the size in bytes of dst
  * @param src_data      pointers containing the source image data
- * @param src_linesizes linesizes for the image in src_data
+ * @param 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
@@ -190,7 +213,61 @@
  */
 int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
 
-int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt);
+/**
+ * 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_data[4], const ptrdiff_t dst_linesize[4],
+                        enum AVPixelFormat pix_fmt, enum AVColorRange range,
+                        int width, int height);
 
 /**
  * @}

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/intreadwrite.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/intreadwrite.h Changed

@@ -50,6 +50,14 @@
  * AV_[RW][BLN](16|24|32|48|64) and AV_(COPY|SWAP|ZERO)(64|128) macros.
  * Preprocessor symbols must be defined, even if these are implemented
  * as inline functions.
+ *
+ * R/W means read/write, B/L/N means big/little/native endianness.
+ * The following macros require aligned access, compared to their
+ * unaligned variants: AV_(COPY|SWAP|ZERO)(64|128), AV_[RW]N[8-64]A.
+ * Incorrect usage may range from abysmal performance to crash
+ * depending on the platform.
+ *
+ * The unaligned variants are AV_[RW][BLN][8-64] and AV_COPY*U.
  */
 
 #ifdef HAVE_AV_CONFIG_H
@@ -207,7 +215,7 @@
  * by per-arch headers.
  */
 
-#if defined(__GNUC__) && !defined(__TI_COMPILER_VERSION__)
+#if defined(__GNUC__)
 
 union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias;
 union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias;
@@ -216,7 +224,7 @@
 #   define AV_RN(s, p) (((const union unaligned_##s *) (p))->l)
 #   define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v))
 
-#elif defined(__DECC)
+#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))
@@ -234,8 +242,8 @@
       ((const uint8_t*)(x))[1])
 #endif
 #ifndef AV_WB16
-#   define AV_WB16(p, darg) do {                \
-        unsigned d = (darg);                    \
+#   define AV_WB16(p, val) do {                 \
+        uint16_t d = (val);                     \
         ((uint8_t*)(p))[1] = (d);               \
         ((uint8_t*)(p))[0] = (d)>>8;            \
     } while(0)
@@ -247,8 +255,8 @@
       ((const uint8_t*)(x))[0])
 #endif
 #ifndef AV_WL16
-#   define AV_WL16(p, darg) do {                \
-        unsigned d = (darg);                    \
+#   define AV_WL16(p, val) do {                 \
+        uint16_t d = (val);                     \
         ((uint8_t*)(p))[0] = (d);               \
         ((uint8_t*)(p))[1] = (d)>>8;            \
     } while(0)
@@ -262,8 +270,8 @@
                 ((const uint8_t*)(x))[3])
 #endif
 #ifndef AV_WB32
-#   define AV_WB32(p, darg) do {                \
-        unsigned d = (darg);                    \
+#   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;           \
@@ -279,8 +287,8 @@
                 ((const uint8_t*)(x))[0])
 #endif
 #ifndef AV_WL32
-#   define AV_WL32(p, darg) do {                \
-        unsigned d = (darg);                    \
+#   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;           \
@@ -300,8 +308,8 @@
       (uint64_t)((const uint8_t*)(x))[7])
 #endif
 #ifndef AV_WB64
-#   define AV_WB64(p, darg) do {                \
-        uint64_t d = (darg);                    \
+#   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;           \
@@ -325,8 +333,8 @@
       (uint64_t)((const uint8_t*)(x))[0])
 #endif
 #ifndef AV_WL64
-#   define AV_WL64(p, darg) do {                \
-        uint64_t d = (darg);                    \
+#   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;           \

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/lfg.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/lfg.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/log.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/log.h Changed

@@ -24,6 +24,7 @@
 #include <stdarg.h>
 #include "avutil.h"
 #include "attributes.h"
+#include "version.h"
 
 typedef enum {
 AV_CLASS_CATEGORY_NA = 0,
@@ -37,9 +38,25 @@
 AV_CLASS_CATEGORY_BITSTREAM_FILTER,
 AV_CLASS_CATEGORY_SWSCALER,
 AV_CLASS_CATEGORY_SWRESAMPLER,
- AV_CLASS_CATEGORY_NB, ///< not part of ABI/API
+ 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;
 
 /**
@@ -179,13 +196,28 @@
 */
 #define AV_LOG_DEBUG 48
 
-#define AV_LOG_MAX_OFFSET (AV_LOG_DEBUG - AV_LOG_QUIET)
+/**
+ * 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
@@ -193,7 +225,7 @@
 * @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.
+ * 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
@@ -277,7 +309,7 @@
 
 /**
 * Format a line of log the same way as the default callback.
- * @param line buffer to receive the formated line
+ * @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
@@ -286,15 +318,21 @@
 char *line, int line_size, int *print_prefix);
 
 /**
- * av_dlog macros
- * Useful to print debug messages that shouldn't get compiled in normally.
+ * 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.
 */
-
-#ifdef DEBUG
-# define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
-#else
-# define av_dlog(pctx, ...) do { if (0) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0)
-#endif
+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
@@ -305,7 +343,17 @@
 * 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);
 
 /**
 * @}

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/macros.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/macros.h Changed

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/mastering_display_metadata.h Added

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/mathematics.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/mathematics.h Changed

@@ -18,6 +18,12 @@
 * 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
 
@@ -63,101 +69,173 @@
 
 /**
 * @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.
- AV_ROUND_PASS_MINMAX = 8192, ///< Flag to pass INT64_MIN/MAX through instead of rescaling, this avoids special cases for AV_NOPTS_VALUE
+ /**
+ * 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,
 };
 
 /**
- * Return the greatest common divisor of a and b.
- * If both a and b are 0 or either or both are <0 then behavior is
- * undefined.
+ * 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.
- * A simple a*b/c isn't possible as it can overflow.
+ *
+ * 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.
- * A simple a*b/c isn't possible as it can overflow.
 *
- * @return rescaled value a, or if AV_ROUND_PASS_MINMAX is set and a is
- * INT64_MIN or INT64_MAX then a is passed through unchanged.
+ * The operation is mathematically equivalent to `a * b / c`, but writing that
+ * directly can overflow, and does not support different rounding methods.
+ *
+ * @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) av_const;
+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.
 *
- * @return rescaled value a, or if AV_ROUND_PASS_MINMAX is set and a is
- * INT64_MIN or INT64_MAX then a is passed through unchanged.
+ * 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) av_const;
+ enum AVRounding rnd) av_const;
 
 /**
- * Compare 2 timestamps each in its own timebases.
- * The result of the function is undefined if one of the timestamps
- * is outside the int64_t range when represented in the others timebase.
- * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position
+ * 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 2 integers modulo mod.
- * That is we compare integers a and b for which only the least
- * significant log2(mod) bits are known.
- *
- * @param mod must be a power of 2
- * @return a negative value if a is smaller than b
- * a positive value if a is greater than b
- * 0 if a equals b
+ * 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`
+ * - 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.
 *
- * @param in_ts Input timestamp
- * @param in_tb Input timebase
- * @param fs_tb Duration and *last timebase
- * @param duration duration till the next call
- * @param out_tb Output timebase
+ * 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.
+ *
+ * @param[in] in_tb Input time base
+ * @param[in] in_ts Input timestamp
+ * @param[in] fs_tb Duration time base; typically this is finer-grained
+ * (greater) than `in_tb` and `out_tb`
+ * @param[in] duration Duration till the next call to this function (i.e.
+ * duration of the current packet/frame)
+ * @param[in,out] last Pointer to a timestamp expressed in terms of
+ * `fs_tb`, acting as a state variable
+ * @param[in] 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 gurantees that when the same value is repeatly added that
+ * This function guarantees that when the same value is repeatly added that
 * no accumulation of rounding errors occurs.
 *
- * @param ts Input timestamp
- * @param ts_tb Input timestamp timebase
- * @param inc value to add to ts
- * @param inc_tb inc timebase
+ * @param[in] ts Input timestamp
+ * @param[in] ts_tb Input timestamp time base
+ * @param[in] inc Value to be added
+ * @param[in] inc_tb Time base of `inc`
 */
 int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb, int64_t inc);
 
 
- /**
+/**
 * @}
 */

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/md5.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/md5.h Changed

@@ -18,9 +18,16 @@
 * 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"
@@ -28,7 +35,9 @@
 
 /**
 * @defgroup lavu_md5 MD5
- * @ingroup lavu_crypto
+ * @ingroup lavu_hash
+ * MD5 hash function implementation.
+ *
 * @{
 */
 
@@ -55,7 +64,11 @@
 * @param src input data to update hash with
 * @param len input data length
 */
+#if FF_API_CRYPTO_SIZE_T
 void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, int len);
+#else
+void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, size_t len);
+#endif
 
 /**
 * Finish hashing and output digest value.
@@ -72,7 +85,11 @@
 * @param src The data to hash
 * @param len The length of the data, in bytes
 */
+#if FF_API_CRYPTO_SIZE_T
 void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len);
+#else
+void av_md5_sum(uint8_t *dst, const uint8_t *src, size_t len);
+#endif
 
 /**
 * @}

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/mem.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/mem.h Changed

@@ -20,7 +20,8 @@
 
 /**
 * @file
- * memory handling functions
+ * @ingroup lavu_mem
+ * Memory handling functions
 */
 
 #ifndef AVUTIL_MEM_H
@@ -35,37 +36,133 @@
 
 /**
 * @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.
+ *
+ * @{
+ *
+ * @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_array[128];
+ * @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(__TI_COMPILER_VERSION__)
- #define DECLARE_ALIGNED(n,t,v) \
- AV_PRAGMA(DATA_ALIGN(v,n)) \
- t __attribute__((aligned(n))) v
- #define DECLARE_ASM_CONST(n,t,v) \
- AV_PRAGMA(DATA_ALIGN(v,n)) \
- static const t __attribute__((aligned(n))) v
-#elif defined(__GNUC__)
+#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
 
+/**
+ * @}
+ */
+
+/**
+ * @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
@@ -73,192 +170,423 @@
 #endif
 
 /**
- * Allocate a block of size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU).
- * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
+ * @}
+ */
+
+/**
+ * @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 block of size * nmemb bytes with av_malloc().
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
+ * 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()
 */
-av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size)
-{
- if (!size || nmemb >= INT_MAX / size)
- return NULL;
- return av_malloc(nmemb * size);
-}
+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 or reallocate a block of memory.
- * If ptr is NULL and size > 0, allocate a new block. If
- * size is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a memory block already allocated with
- * av_realloc() or NULL.
+ * 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()
+ */
+av_alloc_size(1, 2) void *av_mallocz_array(size_t nmemb, size_t size);
+
+/**
+ * Non-inlined equivalent of av_mallocz_array().
+ *
+ * Created for symmetry with the calloc() C function.
+ */
+void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib;
+
+/**
+ * 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 Pointers originating from the av_malloc() family of functions must
- * not be passed to av_realloc(). The former can be implemented using
- * memalign() (or other functions), and there is no guarantee that
- * pointers from such functions can be passed to realloc() at all.
- * The situation is undefined according to POSIX and may crash with
- * some libc implementations.
+ * 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 or reallocate a block of memory.
- * This function does the same thing as av_realloc, except:
- * - It takes two arguments and checks the result of the multiplication for
- * integer overflow.
- * - It frees the input block in case of failure, thus avoiding the memory
- * leak with the classic "buf = realloc(buf); if (!buf) return -1;".
+ * 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`.
+ *
+ * @param[in,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.
+ * @param[in] 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.
 */
-void *av_realloc_f(void *ptr, size_t nelem, size_t elsize);
+av_warn_unused_result
+int av_reallocp(void *ptr, size_t size);
 
 /**
- * Allocate or reallocate a block of memory.
- * If *ptr is NULL and size > 0, allocate a new block. If
- * size is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a pointer to a memory block already allocated
- * with av_realloc(), or pointer to a pointer to NULL.
- * The pointer is updated on success, or freed on failure.
- * @param size Size in bytes for the memory block to be allocated or
- * reallocated
- * @return Zero on success, an AVERROR error code on failure.
- * @warning Pointers originating from the av_malloc() family of functions must
- * not be passed to av_reallocp(). The former can be implemented using
- * memalign() (or other functions), and there is no guarantee that
- * pointers from such functions can be passed to realloc() at all.
- * The situation is undefined according to POSIX and may crash with
- * some libc implementations.
+ * 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.
 */
-int av_reallocp(void *ptr, size_t size);
+void *av_realloc_f(void *ptr, size_t nelem, size_t elsize);
 
 /**
- * Allocate or reallocate an array.
- * If ptr is NULL and nmemb > 0, allocate a new block. If
- * nmemb is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a memory block already allocated with
- * av_realloc() or NULL.
- * @param nmemb Number of elements
- * @param size Size of the single element
+ * 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 Pointers originating from the av_malloc() family of functions must
- * not be passed to av_realloc(). The former can be implemented using
- * memalign() (or other functions), and there is no guarantee that
- * pointers from such functions can be passed to realloc() at all.
- * The situation is undefined according to POSIX and may crash with
- * some libc implementations.
+ * 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 or reallocate an array through a pointer to a pointer.
- * If *ptr is NULL and nmemb > 0, allocate a new block. If
- * nmemb is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a pointer to a memory block already allocated
- * with av_realloc(), or pointer to a pointer to NULL.
- * The pointer is updated on success, or freed on failure.
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Zero on success, an AVERROR error code on failure.
- * @warning Pointers originating from the av_malloc() family of functions must
- * not be passed to av_realloc(). The former can be implemented using
- * memalign() (or other functions), and there is no guarantee that
- * pointers from such functions can be passed to realloc() at all.
- * The situation is undefined according to POSIX and may crash with
- * some libc implementations.
+ * 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`.
+ *
+ * @param[in,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.
+ * @param[in] nmemb Number of elements
+ * @param[in] 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.
 */
 av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
 
 /**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc().
- * @param ptr Pointer to the memory block which should be freed.
- * @note ptr = NULL is explicitly allowed.
- * @note It is recommended that you use av_freep() instead.
- * @see av_freep()
+ * 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
+ *
+ * @param[in,out] ptr Already allocated buffer, or `NULL`
+ * @param[in,out] size Pointer to current size of buffer `ptr`. `*size` is
+ * changed to `min_size` in case of success or 0 in
+ * case of failure
+ * @param[in] min_size New 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_free(void *ptr);
+void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
 
 /**
- * Allocate a block of size bytes 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, NULL if it cannot be allocated.
- * @see av_malloc()
+ * 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
+ *
+ * @param[in,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
+ * @param[in,out] size Pointer to current size of buffer `*ptr`. `*size` is
+ * changed to `min_size` in case of success or 0 in
+ * case of failure
+ * @param[in] min_size New size of buffer `*ptr`
+ * @see av_realloc()
+ * @see av_fast_mallocz()
 */
-void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
+void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
 
 /**
- * Allocate a block of nmemb * size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU) and
- * zero all the bytes of the block.
- * The allocation will fail if nmemb * size is greater than or equal
- * to INT_MAX.
- * @param nmemb
- * @param size
- * @return Pointer to the allocated block, NULL if it cannot be allocated.
+ * 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.
+ *
+ * @param[in,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
+ * @param[in,out] size Pointer to current size of buffer `*ptr`. `*size` is
+ * changed to `min_size` in case of success or 0 in
+ * case of failure
+ * @param[in] min_size New size of buffer `*ptr`
+ * @see av_fast_malloc()
 */
-void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib;
+void av_fast_mallocz(void *ptr, unsigned int *size, size_t min_size);
 
 /**
- * Allocate a block of size * nmemb bytes with av_mallocz().
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_mallocz()
- * @see av_malloc_array()
+ * 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()
 */
-av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
-{
- if (!size || nmemb >= INT_MAX / size)
- return NULL;
- return av_mallocz(nmemb * size);
-}
+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 the string s.
- * @param s string to be duplicated
+ * 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.
+ * copy of `s` or `NULL` if the string cannot be allocated
+ * @see av_strndup()
 */
 char *av_strdup(const char *s) av_malloc_attrib;
 
 /**
- * Duplicate the buffer p.
- * @param p buffer to be duplicated
+ * 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.
+ * copy of `p` or `NULL` if the buffer cannot be allocated
 */
 void *av_memdup(const void *p, size_t size);
 
 /**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc() and set the pointer pointing to it to NULL.
- * @param ptr Pointer to the pointer to the memory block which should
- * be freed.
- * @see av_free()
+ * 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_freep(void *ptr);
+void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
 
 /**
- * Add an element to a dynamic array.
+ * @}
+ */
+
+/**
+ * @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 == array[0]
+ * // &to_be_added2 == array[1]
+ *
+ * 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 == array[0]
+ * // to_be_added2 == array[1]
+ *
+ * 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
@@ -268,51 +596,81 @@
 * 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
+ * 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.
+ * In case of failure, the array is freed, `*tab_ptr` is set to `NULL` and
+ * `*nb_ptr` is set to 0.
 *
- * @param tab_ptr pointer to the array to grow
- * @param nb_ptr pointer to the number of elements in the array
- * @param elem element to add
- * @see av_dynarray2_add()
+ * @param[in,out] tab_ptr Pointer to the array to grow
+ * @param[in,out] nb_ptr Pointer to the number of elements in the array
+ * @param[in] 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 of size elem_size to a dynamic array.
+ * 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
+ * point to the new grown array, and the number pointed to by `nb_ptr`
 * is incremented.
- * In case of failure, the array is freed, *tab_ptr is set to NULL and
- * *nb_ptr is set to 0.
- *
- * @param tab_ptr pointer to the array to grow
- * @param nb_ptr pointer to the number of elements in the array
- * @param elem_size size in bytes of the elements in the array
- * @param elem_data pointer to the data of the element to add. If NULL, the space of
- * the new added element is not filled.
- * @return pointer to the data of the element to copy in the new allocated space.
- * If NULL, the new allocated space is left uninitialized."
- * @see av_dynarray_add()
+ * In case of failure, the array is freed, `*tab_ptr` is set to `NULL` and
+ * `*nb_ptr` is set to 0.
+ *
+ * @param[in,out] tab_ptr Pointer to the array to grow
+ * @param[in,out] nb_ptr Pointer to the number of elements in the array
+ * @param[in] elem_size Size in bytes of an element in the array
+ * @param[in] 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);
 
 /**
- * Multiply two size_t values checking for overflow.
- * @return 0 if success, AVERROR(EINVAL) if overflow.
+ * @}
+ */
+
+/**
+ * @defgroup lavu_mem_misc Miscellaneous Functions
+ *
+ * Other functions related to memory allocation.
+ *
+ * @{
+ */
+
+/**
+ * Multiply two `size_t` values checking for overflow.
+ *
+ * @param[in] a,b Operands of multiplication
+ * @param[out] r Pointer to the result of the operation
+ * @return 0 on success, AVERROR(EINVAL) on overflow
 */
 static inline int av_size_mult(size_t a, size_t b, size_t *r)
 {
 size_t t = a * b;
- /* Hack inspired from glibc: only try the division if nelem and elsize
- * are both greater than sqrt(SIZE_MAX). */
+ /* Hack inspired from glibc: don't try the division if nelem and elsize
+ * are both less than sqrt(SIZE_MAX). */
 if ((a | b) >= ((size_t)1 << (sizeof(size_t) * 4)) && a && t / a != b)
 return AVERROR(EINVAL);
 *r = t;
@@ -320,44 +678,23 @@
 }
 
 /**
- * Set the maximum size that may me allocated in one block.
- */
-void av_max_alloc(size_t max);
-
-/**
- * deliberately overlapping memcpy implementation
- * @param dst destination buffer
- * @param back how many bytes back we start (the initial size of the overlapping window), must be > 0
- * @param cnt number of bytes to copy, must be >= 0
+ * Set the maximum size that may be allocated in one block.
 *
- * cnt > back is valid, this will copy the bytes we just copied,
- * thus creating a repeating pattern with a period length of back.
- */
-void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
-
-/**
- * Reallocate the given block if it is not large enough, otherwise do nothing.
+ * The value specified with this function is effective for all libavutil's @ref
+ * lavu_mem_funcs "heap management functions."
 *
- * @see av_realloc
- */
-void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Allocate a buffer, reusing the given one if large enough.
+ * By default, the max value is defined as `INT_MAX`.
 *
- * Contrary to av_fast_realloc the current buffer contents might not be
- * preserved and on error the old buffer is freed, thus no special
- * handling to avoid memleaks is necessary.
+ * @param max Value to be set as the new maximum size
 *
- * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
- * @param size size of the buffer *ptr points to
- * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
- * *size 0 if an error occurred.
+ * @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_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
+void av_max_alloc(size_t max);
 
 /**
 * @}
+ * @}
 */
 
 #endif /* AVUTIL_MEM_H */

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/motion_vector.h Added

@@ -0,0 +1,57 @@
+/*
+ * 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-0.7.1.tar.gz/extra_lib/include/libavutil/murmur3.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/murmur3.h Changed

@@ -18,15 +18,103 @@
 * 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 <stdint.h>
 
+#include "version.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.
+ *
+ * @param[out] c Hash context
+ * @param[in] 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.
+ *
+ * @param[out] 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.
+ *
+ * @param[out] c Hash context
+ * @param[in] src Input data to update hash with
+ * @param[in] len Number of bytes to read from `src`
+ */
+#if FF_API_CRYPTO_SIZE_T
 void av_murmur3_update(struct AVMurMur3 *c, const uint8_t *src, int len);
+#else
+void av_murmur3_update(struct AVMurMur3 *c, const uint8_t *src, size_t len);
+#endif
+
+/**
+ * Finish hashing and output digest value.
+ *
+ * @param[in,out] c Hash context
+ * @param[out] dst Buffer where output digest value is stored
+ */
 void av_murmur3_final(struct AVMurMur3 *c, uint8_t dst[16]);
 
+/**
+ * @}
+ */
+
 #endif /* AVUTIL_MURMUR3_H */

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/opt.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/opt.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/parseutils.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/parseutils.h Changed

@@ -146,40 +146,46 @@
 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().
  *
- * In particular it actually supports the parameters:
+ * 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'
+ *   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'
+ *   range '00' through '59'
  * - %S: the second as a decimal number, using a 24-hour clock, in the
- * range '00' through '59'
+ *   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'
+ *   through '31'
+ * - %T: alias for '%H:%M:%S'
  * - %%: a literal '%'
  *
- * @return a pointer to the first character not processed in this
- * function call, or NULL in case the function fails to match all of
- * the fmt string and therefore an error occurred
+ * @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);
 
 /**
- * Attempt to find a specific tag in a URL.
- *
- * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done.
- * Return 1 if found.
- */
-int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
-
-/**
  * Convert the decomposed UTC time in tm to a time_t value.
  */
 time_t av_timegm(struct tm *tm);

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/pixdesc.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/pixdesc.h Changed

@@ -26,24 +26,48 @@
 
 #include "attributes.h"
 #include "pixfmt.h"
+#include "version.h"
 
-typedef struct AVComponentDescriptor{
- uint16_t plane :2; ///< which of the 4 planes contains the component
+typedef struct AVComponentDescriptor {
+ /**
+ * Which of the 4 planes contains the component.
+ */
+ int plane;
 
 /**
- * Number of elements between 2 horizontally consecutive pixels minus 1.
+ * Number of elements between 2 horizontally consecutive pixels.
 * Elements are bits for bitstream formats, bytes otherwise.
 */
- uint16_t step_minus1 :3;
+ int step;
 
 /**
- * Number of elements before the component of the first pixel plus 1.
+ * Number of elements before the component of the first pixel.
 * Elements are bits for bitstream formats, bytes otherwise.
 */
- uint16_t offset_plus1 :3;
- uint16_t shift :3; ///< number of least significant bits that must be shifted away to get the value
- uint16_t depth_minus1 :4; ///< number of bits in the component minus 1
-}AVComponentDescriptor;
+ 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;
+
+#if FF_API_PLUS1_MINUS1
+ /** deprecated, use step instead */
+ attribute_deprecated int step_minus1;
+
+ /** deprecated, use depth instead */
+ attribute_deprecated int depth_minus1;
+
+ /** deprecated, use offset instead */
+ attribute_deprecated int offset_plus1;
+#endif
+} AVComponentDescriptor;
 
 /**
 * Descriptor that unambiguously describes how the bits of a pixel are
@@ -54,39 +78,49 @@
 * and all the YUV variants) AVPixFmtDescriptor just stores how values
 * are stored not what these values represent.
 */
-typedef struct AVPixFmtDescriptor{
+typedef struct AVPixFmtDescriptor {
 const char *name;
- uint8_t nb_components; ///< The number of components each pixel has, (1-4)
+ uint8_t nb_components; ///< The number of components each pixel has, (1-4)
 
 /**
 * Amount to shift the luma width right to find the chroma width.
 * For YV12 this is 1 for example.
- * chroma_width = -((-luma_width) >> log2_chroma_w)
+ * 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; ///< chroma_width = -((-luma_width )>>log2_chroma_w)
+ 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= -((-luma_height) >> log2_chroma_h)
+ * 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;
- uint8_t flags;
+
+ /**
+ * Combination of AV_PIX_FMT_FLAG_... flags.
+ */
+ uint64_t flags;
 
 /**
 * Parameters that describe how pixels are packed.
- * If the format has 2 or 4 components, then alpha is last.
 * If the format has 1 or 2 components, then luma is 0.
- * If the format has 3 or 4 components,
- * if the RGB flag is set then 0 is red, 1 is green and 2 is blue;
- * otherwise 0 is luma, 1 is chroma-U and 2 is chroma-V.
+ * 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 comp[4];
-}AVPixFmtDescriptor;
+
+ /**
+ * Alternative comma-separated names.
+ */
+ const char *alias;
+} AVPixFmtDescriptor;
 
 /**
 * Pixel format is big-endian.
@@ -112,106 +146,50 @@
 * The pixel format contains RGB-like data (as opposed to YUV/grayscale).
 */
 #define AV_PIX_FMT_FLAG_RGB (1 << 5)
-/**
- * The pixel format is "pseudo-paletted". This means that FFmpeg treats it as
- * paletted internally, but the palette is generated by the decoder and is not
- * stored in the file.
- */
-#define AV_PIX_FMT_FLAG_PSEUDOPAL (1 << 6)
-/**
- * The pixel format has an alpha channel.
- */
-#define AV_PIX_FMT_FLAG_ALPHA (1 << 7)
 
-#if FF_API_PIX_FMT
 /**
- * @deprecated use the AV_PIX_FMT_FLAG_* flags
- */
-#define PIX_FMT_BE AV_PIX_FMT_FLAG_BE
-#define PIX_FMT_PAL AV_PIX_FMT_FLAG_PAL
-#define PIX_FMT_BITSTREAM AV_PIX_FMT_FLAG_BITSTREAM
-#define PIX_FMT_HWACCEL AV_PIX_FMT_FLAG_HWACCEL
-#define PIX_FMT_PLANAR AV_PIX_FMT_FLAG_PLANAR
-#define PIX_FMT_RGB AV_PIX_FMT_FLAG_RGB
-#define PIX_FMT_PSEUDOPAL AV_PIX_FMT_FLAG_PSEUDOPAL
-#define PIX_FMT_ALPHA AV_PIX_FMT_FLAG_ALPHA
-#endif
-
-#if FF_API_PIX_FMT_DESC
-/**
- * The array of all the pixel format descriptors.
- */
-extern attribute_deprecated const AVPixFmtDescriptor av_pix_fmt_descriptors[];
-#endif
-
-/**
- * Read a line from an image, and write the values of the
- * pixel format component c to dst.
+ * The pixel format is "pseudo-paletted". This means that it contains a
+ * fixed palette in the 2nd plane but the palette is fixed/constant for each
+ * PIX_FMT. This allows interpreting the data as if it was PAL8, which can
+ * in some cases be simpler. Or the data can be interpreted purely based on
+ * the pixel format without using the palette.
+ * An example of a pseudo-paletted format is AV_PIX_FMT_GRAY8
 *
- * @param data the array containing the pointers to the planes of the image
- * @param linesize the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to read
- * @param y the vertical coordinate of the first pixel to read
- * @param w the width of the line to read, that is the number of
- * values to write to dst
- * @param read_pal_component if not zero and the format is a paletted
- * format writes the values corresponding to the palette
- * component c in data[1] to dst, rather than the palette indexes in
- * data[0]. The behavior is undefined if the format is not paletted.
+ * @deprecated This flag is deprecated, and will be removed. When it is removed,
+ * the extra palette allocation in AVFrame.data[1] is removed as well. Only
+ * actual paletted formats (as indicated by AV_PIX_FMT_FLAG_PAL) will have a
+ * palette. Starting with FFmpeg versions which have this flag deprecated, the
+ * extra "pseudo" palette is already ignored, and API users are not required to
+ * allocate a palette for AV_PIX_FMT_FLAG_PSEUDOPAL formats (it was required
+ * before the deprecation, though).
 */
-void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
- const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component);
-
-/**
- * Write the values from src to the pixel format component c of an
- * image line.
- *
- * @param src array containing the values to write
- * @param data the array containing the pointers to the planes of the
- * image to write into. It is supposed to be zeroed.
- * @param linesize the array containing the linesizes of the image
- * @param desc the pixel format descriptor for the image
- * @param x the horizontal coordinate of the first pixel to write
- * @param y the vertical coordinate of the first pixel to write
- * @param w the width of the line to write, that is the number of
- * values to write to the image line
- */
-void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],
- const AVPixFmtDescriptor *desc, int x, int y, int c, int w);
+#define AV_PIX_FMT_FLAG_PSEUDOPAL (1 << 6)
 
 /**
- * Return the pixel format corresponding to name.
+ * The pixel format has an alpha channel. This is set on all formats that
+ * support alpha in some way. The exception is AV_PIX_FMT_PAL8, which can
+ * carry alpha as part of the palette. Details are explained in the
+ * AVPixelFormat enum, and are also encoded in the corresponding
+ * AVPixFmtDescriptor.
 *
- * 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".
+ * The alpha is always straight, never pre-multiplied.
 *
- * Finally if no pixel format has been found, returns AV_PIX_FMT_NONE.
+ * 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.
 */
-enum AVPixelFormat av_get_pix_fmt(const char *name);
+#define AV_PIX_FMT_FLAG_ALPHA (1 << 7)
 
 /**
- * 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()
+ * The pixel format is following a Bayer pattern
 */
-const char *av_get_pix_fmt_name(enum AVPixelFormat pix_fmt);
+#define AV_PIX_FMT_FLAG_BAYER (1 << 8)
 
 /**
- * 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.
+ * 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).
 */
-char *av_get_pix_fmt_string (char *buf, int buf_size, enum AVPixelFormat pix_fmt);
+#define AV_PIX_FMT_FLAG_FLOAT (1 << 9)
 
 /**
 * Return the number of bits per pixel used by the pixel format
@@ -255,14 +233,9 @@
 * Utility function to access log2_chroma_w log2_chroma_h from
 * the pixel format AVPixFmtDescriptor.
 *
- * See avcodec_get_chroma_sub_sample() for a function that asserts a
- * valid pixel format instead of returning an error code.
- * Its recommanded that you use avcodec_get_chroma_sub_sample unless
- * you do check the return code!
- *
 * @param[in] pix_fmt the pixel format
- * @param[out] h_shift store log2_chroma_w
- * @param[out] v_shift store log2_chroma_h
+ * @param[out] h_shift store log2_chroma_w (horizontal/width shift)
+ * @param[out] v_shift store log2_chroma_h (vertical/height shift)
 *
 * @return 0 on success, AVERROR(ENOSYS) on invalid or unknown pixel format
 */
@@ -275,7 +248,127 @@
 */
 int av_pix_fmt_count_planes(enum AVPixelFormat pix_fmt);
 
-void ff_check_pixfmt_descriptors(void);
+/**
+ * @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 data[1] to dst, rather than the palette indexes in
+ * data[0]. The behavior is undefined if the format is not paletted.
+ */
+void av_read_image_line(uint16_t *dst, const uint8_t *data[4],
+ const int linesize[4], const AVPixFmtDescriptor *desc,
+ int x, int y, int c, int w, int read_pal_component);
+
+/**
+ * Write the values from src to the pixel format component c of an
+ * image line.
+ *
+ * @param src array containing the values to write
+ * @param data the array containing the pointers to the planes of the
+ * image to write into. It is supposed to be zeroed.
+ * @param linesize the array containing the linesizes of the image
+ * @param desc the pixel format descriptor for the image
+ * @param x the horizontal coordinate of the first pixel to write
+ * @param y the vertical coordinate of the first pixel to write
+ * @param w the width of the line to write, that is the number of
+ * values to write to the image line
+ */
+void av_write_image_line(const uint16_t *src, uint8_t *data[4],
+ const int linesize[4], const AVPixFmtDescriptor *desc,
+ int x, int y, int c, int w);
 
 /**
 * Utility function to swap the endianness of a pixel format.
@@ -287,5 +380,54 @@
 */
 enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt);
 
+#define FF_LOSS_RESOLUTION 0x0001 /**< loss due to resolution change */
+#define FF_LOSS_DEPTH 0x0002 /**< loss due to color depth change */
+#define FF_LOSS_COLORSPACE 0x0004 /**< loss due to color space conversion */
+#define FF_LOSS_ALPHA 0x0008 /**< loss of alpha bits */
+#define FF_LOSS_COLORQUANT 0x0010 /**< loss due to color quantization */
+#define FF_LOSS_CHROMA 0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */
+
+/**
+ * Compute what kind of losses will occur when converting from one specific
+ * pixel format to another.
+ * When converting from one pixel format to another, information loss may occur.
+ * For example, when converting from RGB24 to GRAY, the color information will
+ * be lost. Similarly, other losses occur when converting from some formats to
+ * other formats. These losses can involve loss of chroma, but also loss of
+ * resolution, loss of color depth, loss due to the color space conversion, loss
+ * of the alpha bits or loss due to color quantization.
+ * av_get_fix_fmt_loss() informs you about the various types of losses
+ * which will occur when converting from one pixel format to another.
+ *
+ * @param[in] dst_pix_fmt destination pixel format
+ * @param[in] src_pix_fmt source pixel format
+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
+ * @return Combination of flags informing you what kind of losses will occur
+ * (maximum loss for an invalid dst_pix_fmt).
+ */
+int av_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt,
+ enum AVPixelFormat src_pix_fmt,
+ int has_alpha);
+
+/**
+ * Compute what kind of losses will occur when converting from one specific
+ * pixel format to another.
+ * When converting from one pixel format to another, information loss may occur.
+ * For example, when converting from RGB24 to GRAY, the color information will
+ * be lost. Similarly, other losses occur when converting from some formats to
+ * other formats. These losses can involve loss of chroma, but also loss of
+ * resolution, loss of color depth, loss due to the color space conversion, loss
+ * of the alpha bits or loss due to color quantization.
+ * av_get_fix_fmt_loss() informs you about the various types of losses
+ * which will occur when converting from one pixel format to another.
+ *
+ * @param[in] dst_pix_fmt destination pixel format
+ * @param[in] src_pix_fmt source pixel format
+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
+ * @return Combination of flags informing you what kind of losses will occur
+ * (maximum loss for an invalid dst_pix_fmt).
+ */
+enum AVPixelFormat av_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2,
+ enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
 
 #endif /* AVUTIL_PIXDESC_H */

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/pixelutils.h Added

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

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/pixfmt.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/pixfmt.h Changed

@@ -24,7 +24,6 @@
 /**
 * @file
 * pixel format definitions
- *
 */
 
 #include "libavutil/avconfig.h"
@@ -44,24 +43,19 @@
 * big-endian CPUs.
 *
 * @par
- * When the pixel format is palettized RGB (AV_PIX_FMT_PAL8), the palettized
+ * When the pixel format is palettized RGB32 (AV_PIX_FMT_PAL8), the palettized
 * image data is stored in AVFrame.data[0]. The palette is transported in
 * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
 * formatted the same as in AV_PIX_FMT_RGB32 described above (i.e., it is
- * also endian-specific). Note also that the individual RGB palette
+ * also endian-specific). Note also that the individual RGB32 palette
 * components stored in AVFrame.data[1] should be in the range 0..255.
 * This is important as many custom PAL8 video codecs that were designed
 * to run on the IBM VGA graphics adapter use 6-bit palette components.
 *
 * @par
- * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like
+ * For all the 8 bits per pixel formats, an RGB32 palette is in data[1] like
 * for pal8. This palette is filled in automatically by the function
 * allocating the picture.
- *
- * @note
- * Make sure that all newly added big-endian formats have (pix_fmt & 1) == 1
- * and that all newly added little-endian formats have (pix_fmt & 1) == 0.
- * This allows simpler detection of big vs little-endian.
 */
 enum AVPixelFormat {
 AV_PIX_FMT_NONE = -1,
@@ -76,15 +70,10 @@
 AV_PIX_FMT_GRAY8, ///< Y , 8bpp
 AV_PIX_FMT_MONOWHITE, ///< Y , 1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
 AV_PIX_FMT_MONOBLACK, ///< Y , 1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
- AV_PIX_FMT_PAL8, ///< 8 bit with PIX_FMT_RGB32 palette
- AV_PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
- AV_PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
- AV_PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
-#if FF_API_XVMC
- AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
- AV_PIX_FMT_XVMC_MPEG2_IDCT,
-#define AV_PIX_FMT_XVMC AV_PIX_FMT_XVMC_MPEG2_IDCT
-#endif /* FF_API_XVMC */
+ AV_PIX_FMT_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)
@@ -104,31 +93,36 @@
 AV_PIX_FMT_GRAY16BE, ///< Y , 16bpp, big-endian
 AV_PIX_FMT_GRAY16LE, ///< Y , 16bpp, little-endian
 AV_PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
- AV_PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
+ AV_PIX_FMT_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)
-#if FF_API_VDPAU
- AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
- AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
- AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
- AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
- AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
 AV_PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
 AV_PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
 
 AV_PIX_FMT_RGB565BE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), big-endian
 AV_PIX_FMT_RGB565LE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), little-endian
- AV_PIX_FMT_RGB555BE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
- AV_PIX_FMT_RGB555LE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
+ AV_PIX_FMT_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)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
- AV_PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
+ AV_PIX_FMT_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
 
+#if FF_API_VAAPI
+ /** @name Deprecated pixel formats */
+ /**@{*/
 AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
 AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
- AV_PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+ AV_PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a VASurfaceID
+ /**@}*/
+ AV_PIX_FMT_VAAPI = AV_PIX_FMT_VAAPI_VLD,
+#else
+ /**
+ * Hardware acceleration through VA-API, data[3] contains a
+ * VASurfaceID.
+ */
+ AV_PIX_FMT_VAAPI,
+#endif
 
 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
@@ -136,16 +130,17 @@
 AV_PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
 AV_PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
 AV_PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-#if FF_API_VDPAU
- AV_PIX_FMT_VDPAU_MPEG4, ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
 AV_PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
 
- AV_PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
- AV_PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
- AV_PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
- AV_PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
- AV_PIX_FMT_GRAY8A, ///< 8bit gray, 8bit alpha
+ 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
 
@@ -166,30 +161,16 @@
 AV_PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
 AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
 AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
- AV_PIX_FMT_VDA_VLD, ///< hardware decoding through VDA
-
-#ifdef AV_PIX_FMT_ABI_GIT_MASTER
- AV_PIX_FMT_RGBA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
- AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
- AV_PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
- AV_PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-#endif
 AV_PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp
+ AV_PIX_FMT_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
-
- /**
- * duplicated pixel formats for compatibility with libav.
- * FFmpeg supports these formats since May 8 2012 and Jan 28 2012 (commits f9ca1ac7 and 143a5c55)
- * Libav added them Oct 12 2012 with incompatible values (commit 6d5600e85)
- */
- AV_PIX_FMT_YUVA422P_LIBAV, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
- AV_PIX_FMT_YUVA444P_LIBAV, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
-
+ AV_PIX_FMT_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
@@ -217,18 +198,42 @@
 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
 
-#ifndef AV_PIX_FMT_ABI_GIT_MASTER
- AV_PIX_FMT_RGBA64BE=0x123, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
- AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
- AV_PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
- AV_PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-#endif
- AV_PIX_FMT_0RGB=0x123+4, ///< packed RGB 8:8:8, 32bpp, 0RGB0RGB...
- AV_PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGB0RGB0...
- AV_PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, 0BGR0BGR...
- AV_PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGR0BGR0...
- AV_PIX_FMT_YUVA444P, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
- AV_PIX_FMT_YUVA422P, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
+ AV_PIX_FMT_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, data[3] contains a pointer to the
+ * mfxFrameSurface1 structure.
+ */
+ AV_PIX_FMT_QSV,
+ /**
+ * HW acceleration though MMAL, data[3] 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.data[3] contains a ID3D11VideoDecoderOutputView pointer
+
+ /**
+ * HW acceleration through CUDA. data[i] 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
@@ -246,10 +251,7 @@
 AV_PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little-endian
 AV_PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big-endian
 AV_PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little-endian
- AV_PIX_FMT_GBRAP, ///< planar GBRA 4:4:4:4 32bpp
- AV_PIX_FMT_GBRAP16BE, ///< planar GBRA 4:4:4:4 64bpp, big-endian
- AV_PIX_FMT_GBRAP16LE, ///< planar GBRA 4:4:4:4 64bpp, little-endian
- AV_PIX_FMT_YUVJ411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) full scale (JPEG), deprecated in favor of PIX_FMT_YUV411P and setting color_range
+ AV_PIX_FMT_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 */
@@ -263,25 +265,73 @@
 AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, big-endian */
 AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian */
 AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian */
-#if !FF_API_XVMC
+
 AV_PIX_FMT_XVMC,///< XVideo Motion Acceleration via common packet passing
-#endif /* !FF_API_XVMC */
 
- AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
+ 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
 
-#if FF_API_PIX_FMT
-#include "old_pix_fmts.h"
-#endif
-};
+ AV_PIX_FMT_VIDEOTOOLBOX, ///< hardware decoding through Videotoolbox
 
-#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
-#define AV_PIX_FMT_YUVA422P AV_PIX_FMT_YUVA422P_LIBAV
-#define AV_PIX_FMT_YUVA444P AV_PIX_FMT_YUVA444P_LIBAV
-#endif
+ 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
 
-#define AV_PIX_FMT_Y400A AV_PIX_FMT_GRAY8A
-#define AV_PIX_FMT_GBR24P AV_PIX_FMT_GBRP
+ 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.
+ *
+ * data[0] contains a ID3D11Texture2D pointer, and data[1] 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.
+ *
+ * data[0] points to an AVDRMFrameDescriptor.
+ */
+ AV_PIX_FMT_DRM_PRIME,
+ /**
+ * Hardware surfaces for OpenCL.
+ *
+ * data[i] 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_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
@@ -296,24 +346,32 @@
 #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_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)
@@ -322,13 +380,13 @@
 #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_RGBA64 AV_PIX_FMT_NE(RGBA64BE, RGBA64LE)
-#define AV_PIX_FMT_BGRA64 AV_PIX_FMT_NE(BGRA64BE, BGRA64LE)
 #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)
@@ -336,6 +394,8 @@
 #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_YUVA420P9 AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE)
 #define AV_PIX_FMT_YUVA422P9 AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE)
@@ -349,55 +409,121 @@
 
 #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)
 
-#if FF_API_PIX_FMT
-#define PixelFormat AVPixelFormat
-
-#define PIX_FMT_Y400A AV_PIX_FMT_Y400A
-#define PIX_FMT_GBR24P AV_PIX_FMT_GBR24P
-
-#define PIX_FMT_NE(be, le) AV_PIX_FMT_NE(be, le)
-
-#define PIX_FMT_RGB32 AV_PIX_FMT_RGB32
-#define PIX_FMT_RGB32_1 AV_PIX_FMT_RGB32_1
-#define PIX_FMT_BGR32 AV_PIX_FMT_BGR32
-#define PIX_FMT_BGR32_1 AV_PIX_FMT_BGR32_1
-#define PIX_FMT_0RGB32 AV_PIX_FMT_0RGB32
-#define PIX_FMT_0BGR32 AV_PIX_FMT_0BGR32
-
-#define PIX_FMT_GRAY16 AV_PIX_FMT_GRAY16
-#define PIX_FMT_RGB48 AV_PIX_FMT_RGB48
-#define PIX_FMT_RGB565 AV_PIX_FMT_RGB565
-#define PIX_FMT_RGB555 AV_PIX_FMT_RGB555
-#define PIX_FMT_RGB444 AV_PIX_FMT_RGB444
-#define PIX_FMT_BGR48 AV_PIX_FMT_BGR48
-#define PIX_FMT_BGR565 AV_PIX_FMT_BGR565
-#define PIX_FMT_BGR555 AV_PIX_FMT_BGR555
-#define PIX_FMT_BGR444 AV_PIX_FMT_BGR444
-
-#define PIX_FMT_YUV420P9 AV_PIX_FMT_YUV420P9
-#define PIX_FMT_YUV422P9 AV_PIX_FMT_YUV422P9
-#define PIX_FMT_YUV444P9 AV_PIX_FMT_YUV444P9
-#define PIX_FMT_YUV420P10 AV_PIX_FMT_YUV420P10
-#define PIX_FMT_YUV422P10 AV_PIX_FMT_YUV422P10
-#define PIX_FMT_YUV444P10 AV_PIX_FMT_YUV444P10
-#define PIX_FMT_YUV420P12 AV_PIX_FMT_YUV420P12
-#define PIX_FMT_YUV422P12 AV_PIX_FMT_YUV422P12
-#define PIX_FMT_YUV444P12 AV_PIX_FMT_YUV444P12
-#define PIX_FMT_YUV420P14 AV_PIX_FMT_YUV420P14
-#define PIX_FMT_YUV422P14 AV_PIX_FMT_YUV422P14
-#define PIX_FMT_YUV444P14 AV_PIX_FMT_YUV444P14
-#define PIX_FMT_YUV420P16 AV_PIX_FMT_YUV420P16
-#define PIX_FMT_YUV422P16 AV_PIX_FMT_YUV422P16
-#define PIX_FMT_YUV444P16 AV_PIX_FMT_YUV444P16
-
-#define PIX_FMT_RGBA64 AV_PIX_FMT_RGBA64
-#define PIX_FMT_BGRA64 AV_PIX_FMT_BGRA64
-#define PIX_FMT_GBRP9 AV_PIX_FMT_GBRP9
-#define PIX_FMT_GBRP10 AV_PIX_FMT_GBRP10
-#define PIX_FMT_GBRP12 AV_PIX_FMT_GBRP12
-#define PIX_FMT_GBRP14 AV_PIX_FMT_GBRP14
-#define PIX_FMT_GBRP16 AV_PIX_FMT_GBRP16
-#endif
+/**
+ * Chromaticity coordinates of the source primaries.
+ * These values match the ones defined by ISO/IEC 23001-8_2013 § 7.1.
+ */
+enum AVColorPrimaries {
+ AVCOL_PRI_RESERVED0 = 0,
+ AVCOL_PRI_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
+ AVCOL_PRI_UNSPECIFIED = 2,
+ AVCOL_PRI_RESERVED = 3,
+ AVCOL_PRI_BT470M = 4, ///< 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, ///< functionally identical to above
+ 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_JEDEC_P22 = 22, ///< JEDEC P22 phosphors
+ AVCOL_PRI_NB ///< Not part of ABI
+};
+
+/**
+ * Color Transfer Characteristic.
+ * These values match the ones defined by ISO/IEC 23001-8_2013 § 7.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 23001-8_2013 § 7.3.
+ */
+enum AVColorSpace {
+ AVCOL_SPC_RGB = 0, ///< order of coefficients is actually GBR, also IEC 61966-2-1 (sRGB)
+ AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
+ AVCOL_SPC_UNSPECIFIED = 2,
+ AVCOL_SPC_RESERVED = 3,
+ AVCOL_SPC_FCC = 4, ///< 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
+ AVCOL_SPC_SMPTE240M = 7, ///< functionally identical to above
+ 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
+};
+
+/**
+ * MPEG vs JPEG YUV range.
+ */
+enum AVColorRange {
+ AVCOL_RANGE_UNSPECIFIED = 0,
+ AVCOL_RANGE_MPEG = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
+ AVCOL_RANGE_JPEG = 2, ///< the normal 2^n-1 "JPEG" YUV ranges
+ AVCOL_RANGE_NB ///< Not part of ABI
+};
+
+/**
+ * Location of chroma samples.
+ *
+ * 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-0.7.1.tar.gz/extra_lib/include/libavutil/rational.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/rational.h Changed

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/rc4.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/replaygain.h Added

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

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/ripemd.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/ripemd.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/samplefmt.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/samplefmt.h Changed

@@ -25,26 +25,35 @@
 #include "attributes.h"
 
 /**
- * Audio Sample Formats
+ * @addtogroup lavu_audio
+ * @{
 *
- * @par
- * 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.
+ * @defgroup lavu_sampfmts Audio sample formats
 *
- * @par
- * 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.
+ * Audio sample format enumeration and related convenience functions.
+ * @{
+ */
+
+/**
+ * Audio sample formats
 *
- * @par
- * The data layout as used in av_samples_fill_arrays() and elsewhere in FFmpeg
- * (such as AVFrame in libavcodec) is as follows:
+ * - 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,
@@ -59,6 +68,8 @@
 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
 };
@@ -119,14 +130,6 @@
 */
 char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat sample_fmt);
 
-#if FF_API_GET_BITS_PER_SAMPLE_FMT
-/**
- * @deprecated Use av_get_bytes_per_sample() instead.
- */
-attribute_deprecated
-int av_get_bits_per_sample_fmt(enum AVSampleFormat sample_fmt);
-#endif
-
 /**
 * Return number of bytes per sample.
 *
@@ -158,6 +161,15 @@
 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.
 *
@@ -253,4 +265,8 @@
 int av_samples_set_silence(uint8_t **audio_data, int offset, int nb_samples,
 int nb_channels, enum AVSampleFormat sample_fmt);
 
+/**
+ * @}
+ * @}
+ */
 #endif /* AVUTIL_SAMPLEFMT_H */

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/sha.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/sha.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/sha512.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/sha512.h Changed

@@ -19,17 +19,35 @@
 * 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"
 #include "version.h"
 
 /**
- * @defgroup lavu_sha512 SHA512
- * @ingroup lavu_crypto
+ * @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.
+ *
 * @{
 */
 
@@ -58,7 +76,11 @@
 * @param data input data to update hash with
 * @param len input data length
 */
+#if FF_API_CRYPTO_SIZE_T
 void av_sha512_update(struct AVSHA512* context, const uint8_t* data, unsigned int len);
+#else
+void av_sha512_update(struct AVSHA512* context, const uint8_t* data, size_t len);
+#endif
 
 /**
 * Finish hashing and output digest value.

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/spherical.h Added

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/stereo3d.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/stereo3d.h Changed

@@ -18,11 +18,34 @@
 * 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 {
@@ -34,41 +57,49 @@
 /**
 * 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,
 
@@ -76,34 +107,59 @@
 * 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.
@@ -127,6 +183,11 @@
 * Additional information about the frame packing.
 */
 int flags;
+
+ /**
+ * Determines which views are packed.
+ */
+ enum AVStereo3DView view;
 } AVStereo3D;
 
 /**
@@ -145,3 +206,28 @@
 * @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-0.8.0.tar.gz/extra_lib/include/libavutil/tea.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/threadmessage.h Added

@@ -0,0 +1,107 @@
+/*
+ * 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));
+
+/**
+ * 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-0.7.1.tar.gz/extra_lib/include/libavutil/time.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/time.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/timecode.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/timecode.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/timestamp.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/timestamp.h Changed

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/tree.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libavutil/twofish.h Added

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/version.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/version.h Changed

@@ -18,32 +18,55 @@
 * 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"
 
 /**
- * @defgroup version_utils Library Version Macros
+ * @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_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)
 
 /**
- * @file
- * @ingroup lavu
- * Libavutil version macros
+ * @}
 */
 
 /**
@@ -55,8 +78,8 @@
 * @{
 */
 
-#define LIBAVUTIL_VERSION_MAJOR 52
-#define LIBAVUTIL_VERSION_MINOR 66
+#define LIBAVUTIL_VERSION_MAJOR 56
+#define LIBAVUTIL_VERSION_MINOR 14
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
@@ -70,77 +93,47 @@
 #define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
 
 /**
- * @}
- *
- * @defgroup depr_guards Deprecation guards
+ * @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.
+ *
 * @{
 */
 
-#ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
-#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_FIND_OPT
-#define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_OLD_AVOPTIONS
-#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_PIX_FMT
-#define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_CONTEXT_SIZE
-#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_PIX_FMT_DESC
-#define FF_API_PIX_FMT_DESC (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_AV_REVERSE
-#define FF_API_AV_REVERSE (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_AUDIOCONVERT
-#define FF_API_AUDIOCONVERT (LIBAVUTIL_VERSION_MAJOR < 54)
+#ifndef FF_API_VAAPI
+#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 57)
 #endif
-#ifndef FF_API_CPU_FLAG_MMX2
-#define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 54)
+#ifndef FF_API_FRAME_QP
+#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 57)
 #endif
-#ifndef FF_API_SAMPLES_UTILS_RETURN_ZERO
-#define FF_API_SAMPLES_UTILS_RETURN_ZERO (LIBAVUTIL_VERSION_MAJOR < 54)
+#ifndef FF_API_PLUS1_MINUS1
+#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 57)
 #endif
-#ifndef FF_API_LLS_PRIVATE
-#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 54)
+#ifndef FF_API_ERROR_FRAME
+#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 57)
 #endif
-#ifndef FF_API_LLS1
-#define FF_API_LLS1 (LIBAVUTIL_VERSION_MAJOR < 54)
+#ifndef FF_API_PKT_PTS
+#define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 57)
 #endif
-#ifndef FF_API_AVFRAME_LAVC
-#define FF_API_AVFRAME_LAVC (LIBAVUTIL_VERSION_MAJOR < 54)
+#ifndef FF_API_CRYPTO_SIZE_T
+#define FF_API_CRYPTO_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 57)
 #endif
-#ifndef FF_API_VDPAU
-#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 54)
+#ifndef FF_API_FRAME_GET_SET
+#define FF_API_FRAME_GET_SET (LIBAVUTIL_VERSION_MAJOR < 57)
 #endif
-#ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT
-#define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_OLD_OPENCL
-#define FF_API_OLD_OPENCL (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_XVMC
-#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_INTFLOAT
-#define FF_API_INTFLOAT (LIBAVUTIL_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_OPT_TYPE_METADATA
-#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 54)
+#ifndef FF_API_PSEUDOPAL
+#define FF_API_PSEUDOPAL (LIBAVUTIL_VERSION_MAJOR < 57)
 #endif
 
+
 /**
 * @}
+ * @}
 */
 
 #endif /* AVUTIL_VERSION_H */
-

gpac-0.7.1.tar.gz/extra_lib/include/libavutil/xtea.h -> gpac-0.8.0.tar.gz/extra_lib/include/libavutil/xtea.h Changed

gpac-0.8.0.tar.gz/extra_lib/include/libopenhevc Added

gpac-0.8.0.tar.gz/extra_lib/include/libopenhevc/ohconfig.h Added

gpac-0.8.0.tar.gz/extra_lib/include/libopenhevc/openhevc.h Added

@@ -0,0 +1,397 @@
+/*
+ * 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
+ * @param[in] pkt_data The input NAL raw data to be decoded.
+ * @param[in] pkt_size The input NAL raw data length in bytes.
+ * @param[in] 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
+ * @param[in] pkt_data The input NAL raw data to be decoded.
+ * @param[in] pkt_size The input NAL raw data length in bytes.
+ * @param[in] 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-0.8.0.tar.gz/extra_lib/include/libopenhevc/version.h Added

@@ -0,0 +1,46 @@
+/*
+ * 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-0.7.1.tar.gz/extra_lib/include/libswresample/swresample.h -> gpac-0.8.0.tar.gz/extra_lib/include/libswresample/swresample.h Changed

@@ -28,20 +28,25 @@
 */
 
 /**
- * @defgroup lswr Libswresample
+ * @defgroup lswr libswresample
 * @{
 *
- * Libswresample (lswr) is a library that handles audio resampling, sample
- * format conversion and mixing.
+ * 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):
+ * 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);
@@ -52,10 +57,24 @@
 * 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
- * as described above, or by using swr_alloc_set_opts(), then call swr_init()
- * again.
+ * 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
@@ -65,6 +84,10 @@
 * 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().
 *
@@ -89,23 +112,32 @@
 *
 * 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"
 
-#if LIBSWRESAMPLE_VERSION_MAJOR < 1
-#define SWR_CH_MAX 32 ///< Maximum number of channels
-#endif
+/**
+ * @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,
@@ -133,21 +165,37 @@
 /** 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 */
+ 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
+ * 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
@@ -160,7 +208,12 @@
 
 /**
 * 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()
 *
+ * @param[in,out] s Swr context to initialize
 * @return AVERROR error code in case of failure.
 */
 int swr_init(struct SwrContext *s);
@@ -168,6 +221,8 @@
 /**
 * Check whether an swr context has been initialized or not.
 *
+ * @param[in] 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);
@@ -179,7 +234,7 @@
 * other hand, swr_alloc() can use swr_alloc_set_opts() to set the parameters
 * on the allocated context.
 *
- * @param s Swr context, can be NULL
+ * @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)
@@ -198,19 +253,47 @@
 int log_offset, void *log_ctx);
 
 /**
+ * @}
+ *
+ * @name SwrContext destructor functions
+ * @{
+ */
+
+/**
 * Free the given SwrContext and set the pointer to NULL.
+ *
+ * @param[in] s a pointer to a pointer to Swr context
 */
 void swr_free(struct SwrContext **s);
 
 /**
- * Convert audio.
+ * 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.
+ *
+ * @param[in,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 providing more output space than input.
- * Convertion will run directly without copying whenever possible.
+ * 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
@@ -228,49 +311,128 @@
 * timestamps are in 1/(in_sample_rate * out_sample_rate) units.
 *
 * @note There are 2 slightly differently behaving modes.
- * First is when automatic timestamp compensation is not used, (min_compensation >= FLT_MAX)
+ * @li When automatic timestamp compensation is not used, (min_compensation >= FLT_MAX)
 * in this case timestamps will be passed through with delays compensated
- * Second is when automatic timestamp compensation is used, (min_compensation < FLT_MAX)
- * in this case the output timestamps will match output sample numbers
+ * @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 pts timestamp for the next input sample, INT64_MIN if unknown
+ * @param s[in] initialized Swr context
+ * @param pts[in] 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);
 
 /**
- * Activate resampling compensation.
+ * @}
+ *
+ * @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().
+ *
+ * @param[in,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.
+ * @param[in] sample_delta delta in PTS per sample
+ * @param[in] 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.
 *
- * @param s allocated Swr context, not yet initialized
- * @param channel_map customized input channel mapping (array of channel
- * indexes, -1 for a muted channel)
- * @return AVERROR error code in case of failure.
+ * @param[in,out] s allocated Swr context, not yet initialized
+ * @param[in] 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.
+ * @param[out] matrix mixing coefficients; matrix[i + 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; matrix[i + stride * o] is
 * the weight of input channel i in output channel o
 * @param stride offset between lines of the matrix
- * @return AVERROR error code in case of failure.
+ * @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);
 
@@ -286,33 +448,132 @@
 * for upsampling and the input sample rate.
 *
 * @param s swr context
- * @param base timebase in which the returned delay will be
- * if its set to 1 the returned delay is in seconds
- * if its set to 1000 the returned delay is in milli seconds
- * if its set to the input sample rate then the returned delay is in input samples
- * if its set to the output sample rate then the returned delay is in output samples
- * an exact rounding free delay can be found by using LCM(in_sample_rate, out_sample_rate)
- * @returns the delay in 1/base units.
+ * @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);
 
 /**
- * Return the LIBSWRESAMPLE_VERSION_INT constant.
+ * 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-0.7.1.tar.gz/extra_lib/include/libswresample/version.h -> gpac-0.8.0.tar.gz/extra_lib/include/libswresample/version.h Changed

gpac-0.7.1.tar.gz/extra_lib/include/libswscale/swscale.h -> gpac-0.8.0.tar.gz/extra_lib/include/libswscale/swscale.h Changed

@@ -35,7 +35,9 @@
 #include "version.h"
 
 /**
- * @defgroup libsws Color conversion and scaling
+ * @defgroup libsws libswscale
+ * Color conversion and scaling library.
+ *
 * @{
 *
 * Return the LIBSWSCALE_VERSION_INT constant.
@@ -73,7 +75,7 @@
 #define SWS_PRINT_INFO 0x1000
 
 //the following 3 flags are not completely implemented
-//internal chrominace subsampling info
+//internal chrominance subsampling info
 #define SWS_FULL_CHR_H_INT 0x2000
 //input subsampling info
 #define SWS_FULL_CHR_H_INP 0x4000
@@ -82,20 +84,6 @@
 #define SWS_BITEXACT 0x80000
 #define SWS_ERROR_DIFFUSION 0x800000
 
-#if FF_API_SWS_CPU_CAPS
-/**
- * CPU caps are autodetected now, those flags
- * are only provided for API compatibility.
- */
-#define SWS_CPU_CAPS_MMX 0x80000000
-#define SWS_CPU_CAPS_MMXEXT 0x20000000
-#define SWS_CPU_CAPS_MMX2 0x20000000
-#define SWS_CPU_CAPS_3DNOW 0x40000000
-#define SWS_CPU_CAPS_ALTIVEC 0x10000000
-#define SWS_CPU_CAPS_BFIN 0x01000000
-#define SWS_CPU_CAPS_SSE2 0x02000000
-#endif
-
 #define SWS_MAX_REDUCE_CUTOFF 0.002
 
 #define SWS_CS_ITU709 1
@@ -105,6 +93,7 @@
 #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
@@ -164,6 +153,7 @@
 * @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);
 
 /**
@@ -172,7 +162,6 @@
 */
 void sws_freeContext(struct SwsContext *swsContext);
 
-#if FF_API_SWS_GETCONTEXT
 /**
 * Allocate and return an SwsContext. You need it to perform
 * scaling/conversion operations using sws_scale().
@@ -184,16 +173,20 @@
 * @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 param[0] and [1] tune the shape of the basis
+ * function, param[0] tunes f(1) and param[1] f´(1)
+ * For SWS_GAUSS param[0] tunes the exponent and thus cutoff
+ * frequency
+ * For SWS_LANCZOS param[0] 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
- * @deprecated Use sws_getCachedContext() instead.
 */
 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);
-#endif
 
 /**
 * Scale the image slice in srcSlice and put the resulting scaled
@@ -258,18 +251,6 @@
 SwsVector *sws_getGaussianVec(double variance, double quality);
 
 /**
- * Allocate and return a vector with length coefficients, all
- * with the same value c.
- */
-SwsVector *sws_getConstVec(double c, int length);
-
-/**
- * Allocate and return a vector with just one coefficient, with
- * value 1.0.
- */
-SwsVector *sws_getIdentityVec(void);
-
-/**
 * Scale all the coefficients of a by the scalar value.
 */
 void sws_scaleVec(SwsVector *a, double scalar);
@@ -278,22 +259,17 @@
 * Scale all the coefficients of a so that their sum equals height.
 */
 void sws_normalizeVec(SwsVector *a, double height);
-void sws_convVec(SwsVector *a, SwsVector *b);
-void sws_addVec(SwsVector *a, SwsVector *b);
-void sws_subVec(SwsVector *a, SwsVector *b);
-void sws_shiftVec(SwsVector *a, int shift);
 
-/**
- * Allocate and return a clone of the vector a, that is a vector
- * with the same coefficients as a.
- */
-SwsVector *sws_cloneVec(SwsVector *a);
-
-/**
- * Print with av_log() a textual representation of the vector a
- * if log_level <= av_log_level.
- */
-void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level);
+#if FF_API_SWS_VECTOR
+attribute_deprecated SwsVector *sws_getConstVec(double c, int length);
+attribute_deprecated SwsVector *sws_getIdentityVec(void);
+attribute_deprecated void sws_convVec(SwsVector *a, SwsVector *b);
+attribute_deprecated void sws_addVec(SwsVector *a, SwsVector *b);
+attribute_deprecated void sws_subVec(SwsVector *a, SwsVector *b);
+attribute_deprecated void sws_shiftVec(SwsVector *a, int shift);
+attribute_deprecated SwsVector *sws_cloneVec(SwsVector *a);
+attribute_deprecated void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level);
+#endif
 
 void sws_freeVec(SwsVector *a);

gpac-0.7.1.tar.gz/extra_lib/include/libswscale/version.h -> gpac-0.8.0.tar.gz/extra_lib/include/libswscale/version.h Changed

gpac-0.8.0.tar.gz/extra_lib/include/openjpeg Added

gpac-0.8.0.tar.gz/extra_lib/include/openjpeg/openjpeg.h Changed

gpac-0.8.0.tar.gz/extra_lib/include/openssl/__DECC_INCLUDE_EPILOGUE.H Added

gpac-0.8.0.tar.gz/extra_lib/include/openssl/__DECC_INCLUDE_PROLOGUE.H Added

gpac-0.8.0.tar.gz/extra_lib/include/openssl/aes.h Added

@@ -0,0 +1,92 @@
+/*
+ * 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_key[4 * (AES_MAXNR + 1)];
+# else
+ unsigned int rd_key[4 * (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-0.8.0.tar.gz/extra_lib/include/openssl/applink.c Added

@@ -0,0 +1,138 @@
+/*
+ * 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_ApplinkTable[APPLINK_MAX + 1] =
+ { (void *)APPLINK_MAX };
+
+ if (once) {
+ OPENSSL_ApplinkTable[APPLINK_STDIN] = app_stdin;
+ OPENSSL_ApplinkTable[APPLINK_STDOUT] = app_stdout;
+ OPENSSL_ApplinkTable[APPLINK_STDERR] = app_stderr;
+ OPENSSL_ApplinkTable[APPLINK_FPRINTF] = fprintf;
+ OPENSSL_ApplinkTable[APPLINK_FGETS] = fgets;
+ OPENSSL_ApplinkTable[APPLINK_FREAD] = fread;
+ OPENSSL_ApplinkTable[APPLINK_FWRITE] = fwrite;
+ OPENSSL_ApplinkTable[APPLINK_FSETMOD] = app_fsetmod;
+ OPENSSL_ApplinkTable[APPLINK_FEOF] = app_feof;
+ OPENSSL_ApplinkTable[APPLINK_FCLOSE] = fclose;
+
+ OPENSSL_ApplinkTable[APPLINK_FOPEN] = fopen;
+ OPENSSL_ApplinkTable[APPLINK_FSEEK] = fseek;
+ OPENSSL_ApplinkTable[APPLINK_FTELL] = ftell;
+ OPENSSL_ApplinkTable[APPLINK_FFLUSH] = fflush;
+ OPENSSL_ApplinkTable[APPLINK_FERROR] = app_ferror;
+ OPENSSL_ApplinkTable[APPLINK_CLEARERR] = app_clearerr;
+ OPENSSL_ApplinkTable[APPLINK_FILENO] = app_fileno;
+
+ OPENSSL_ApplinkTable[APPLINK_OPEN] = _open;
+ OPENSSL_ApplinkTable[APPLINK_READ] = _read;
+ OPENSSL_ApplinkTable[APPLINK_WRITE] = _write;
+ OPENSSL_ApplinkTable[APPLINK_LSEEK] = _lseek;
+ OPENSSL_ApplinkTable[APPLINK_CLOSE] = _close;
+
+ once = 0;
+ }
+
+ return OPENSSL_ApplinkTable;
+}
+
+#ifdef __cplusplus
+}
+#endif
+#endif

gpac-0.7.1.tar.gz/extra_lib/include/openssl/asn1.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/asn1.h Changed

@@ -1,368 +1,282 @@
-/* crypto/asn1/asn1.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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
+# define HEADER_ASN1_H
 
-#include <time.h>
-#include <openssl/e_os2.h>
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#include <openssl/stack.h>
-#include <openssl/safestack.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/symhacks.h>
 
-#include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#endif
+# 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 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_NEG			0x100	/* negative flag */
-
-#define V_ASN1_UNDEF			-1
-#define V_ASN1_EOC			0
-#define V_ASN1_BOOLEAN			1	/**/
-#define V_ASN1_INTEGER			2
-#define V_ASN1_NEG_INTEGER		(2 | V_ASN1_NEG)
-#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_NEG_ENUMERATED		(10 | V_ASN1_NEG)
-#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
+# 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.
+ */
 
-/* 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
+# 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;
-DECLARE_STACK_OF(X509_ALGOR)
-
-#define DECLARE_ASN1_SET_OF(type) /* filled in by mkstack.pl */
-#define IMPLEMENT_ASN1_SET_OF(type) /* nothing, no longer needed */
-
-/* We MUST make sure that, except for constness, asn1_ctx_st and
- asn1_const_ctx are exactly the same. Fortunately, as soon as
- the old ASN1 parsing macros are gone, we can throw this away
- as well... */
-typedef struct asn1_ctx_st
-	{
-	unsigned char *p;/* work char pointer */
-	int eos;	/* end of sequence read for indefinite encoding */
-	int error;	/* error code to use when returning an error */
-	int inf;	/* constructed if 0x20, indefinite is 0x21 */
-	int tag;	/* tag from last 'get object' */
-	int xclass;	/* class from last 'get object' */
-	long slen;	/* length of last 'get object' */
-	unsigned char *max; /* largest value of p allowed */
-	unsigned char *q;/* temporary variable */
-	unsigned char **pp;/* variable */
-	int line;	/* used in error processing */
-	} ASN1_CTX;
-
-typedef struct asn1_const_ctx_st
-	{
-	const unsigned char *p;/* work char pointer */
-	int eos;	/* end of sequence read for indefinite encoding */
-	int error;	/* error code to use when returning an error */
-	int inf;	/* constructed if 0x20, indefinite is 0x21 */
-	int tag;	/* tag from last 'get object' */
-	int xclass;	/* class from last 'get object' */
-	long slen;	/* length of last 'get object' */
-	const unsigned char *max; /* largest value of p allowed */
-	const unsigned char *q;/* temporary variable */
-	const unsigned char **pp;/* variable */
-	int line;	/* used in error processing */
-	} ASN1_const_CTX;
-
-/* These are used internally in the ASN1_OBJECT to keep track of
- * whether the names and data need to be free()ed */
-#define ASN1_OBJECT_FLAG_DYNAMIC	 0x01	/* internal use */
-#define ASN1_OBJECT_FLAG_CRITICAL	 0x02	/* critical x509v3 object id */
-#define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04	/* internal use */
-#define ASN1_OBJECT_FLAG_DYNAMIC_DATA 	 0x08	/* internal use */
-typedef struct asn1_object_st
-	{
-	const char *sn,*ln;
-	int nid;
-	int length;
-	const unsigned char *data;	/* data remains const after init */
-	int flags;	/* Should we free this one */
-	} ASN1_OBJECT;
-
-#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 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 
+# 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.
+/*
+ * 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
+# 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 
+# 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 :-) */
-typedef 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_STRING;
-
-/* 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.
+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;
+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
-#define STABLE_NO_MASK		0x02
-#define DIRSTRING_TYPE	\
+# 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)
+# 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;
+ int nid;
+ long minsize;
+ long maxsize;
+ unsigned long mask;
+ unsigned long flags;
 } ASN1_STRING_TABLE;
 
-DECLARE_STACK_OF(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
+# 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_ITEM_st ASN1_ITEM;
 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_FUNCTIONS(type) DECLARE_ASN1_FUNCTIONS_name(type, type)
 
-#define DECLARE_ASN1_ALLOC_FUNCTIONS(type) \
-	DECLARE_ASN1_ALLOC_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_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_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(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_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_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_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_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(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 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 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) \
+# define CHECKED_D2I_OF(type, d2i) \
 ((d2i_of_void*) (1 ? d2i : ((D2I_OF(type))0)))
-#define CHECKED_I2D_OF(type, i2d) \
+# define CHECKED_I2D_OF(type, i2d) \
 ((i2d_of_void*) (1 ? i2d : ((I2D_OF(type))0)))
-#define CHECKED_NEW_OF(type, xnew) \
+# define CHECKED_NEW_OF(type, xnew) \
 ((void *(*)(void)) (1 ? xnew : ((type *(*)(void))0)))
-#define CHECKED_PTR_OF(type, p) \
+# define CHECKED_PTR_OF(type, p) \
 ((void*) (1 ? p : (type*)0))
-#define CHECKED_PPTR_OF(type, p) \
+# 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)
+# 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
+/*-
+ * 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
@@ -381,7 +295,7 @@
 * ...
 * ASN1_ITEM_EXP *iptr;
 * ...
- * } SOMETHING; 
+ * } SOMETHING;
 *
 * It would be initialised as e.g.:
 *
@@ -397,469 +311,292 @@
 *
 */
 
-#ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
+# 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)
+# 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_ref(iptr) (&(iptr##_it))
 
-#define ASN1_ITEM_rptr(ref) (&(ref##_it))
+# define ASN1_ITEM_rptr(ref) (&(ref##_it))
 
-#define DECLARE_ASN1_ITEM(name) \
-	OPENSSL_EXTERN const ASN1_ITEM name##_it;
+# define DECLARE_ASN1_ITEM(name) \
+ OPENSSL_EXTERN const ASN1_ITEM name##_it;
 
-#else
+# else
 
-/* Platforms that can't easily handle shared global variables are declared
- * as functions returning ASN1_ITEM pointers.
+/*
+ * 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);
+typedef const ASN1_ITEM *ASN1_ITEM_EXP (void);
 
 /* Macro to obtain ASN1_ITEM pointer from exported type */
-#define ASN1_ITEM_ptr(iptr) (iptr())
+# 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_ref(iptr) (iptr##_it)
 
-#define ASN1_ITEM_rptr(ref) (ref##_it())
+# define ASN1_ITEM_rptr(ref) (ref##_it())
 
-#define DECLARE_ASN1_ITEM(name) \
-	const ASN1_ITEM * name##_it(void);
+# define DECLARE_ASN1_ITEM(name) \
+ const ASN1_ITEM * name##_it(void);
 
-#endif
+# endif
 
 /* Parameters used by ASN1_STRING_print_ex() */
 
-/* These determine which characters to escape:
- * RFC2253 special characters, control characters and
- * MSB set characters
+/*
+ * 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
+# 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.
+/*
+ * This flag determines how we do escaping: normally RC2253 backslash only,
+ * set this to use backslash and quote.
 */
 
-#define ASN1_STRFLGS_ESC_QUOTE		8
-
+# define ASN1_STRFLGS_ESC_QUOTE 8
 
 /* These three flags are internal use only. */
 
 /* Character is a valid PrintableString character */
-#define CHARTYPE_PRINTABLESTRING	0x10
+# define CHARTYPE_PRINTABLESTRING 0x10
 /* Character needs escaping if it is the first character */
-#define CHARTYPE_FIRST_ESC_2253		0x20
+# define CHARTYPE_FIRST_ESC_2253 0x20
 /* Character needs escaping if it is the last character */
-#define CHARTYPE_LAST_ESC_2253		0x40
+# define CHARTYPE_LAST_ESC_2253 0x40
 
-/* NB the internal flags are safely reused below by flags
- * handled at the top level.
+/*
+ * 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 
+/*
+ * If this is set we convert all character strings to UTF8 first
 */
 
-#define ASN1_STRFLGS_UTF8_CONVERT	0x10
+# 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!
+/*
+ * 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
+# 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_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
+# 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.
+/*
+ * 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
+# define ASN1_STRFLGS_DUMP_DER 0x200
 
-/* All the string flags consistent with RFC2253,
- * escaping control characters isn't essential in
- * RFC2253 but it is advisable anyway.
+/*
+ * This flag specifies that RC2254 escaping shall be performed.
 */
+#define ASN1_STRFLGS_ESC_2254 0x400
 
-#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)
-
-DECLARE_STACK_OF(ASN1_INTEGER)
-DECLARE_ASN1_SET_OF(ASN1_INTEGER)
-
-DECLARE_STACK_OF(ASN1_GENERALSTRING)
-
-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;
-
-DECLARE_STACK_OF(ASN1_TYPE)
-DECLARE_ASN1_SET_OF(ASN1_TYPE)
+/*
+ * 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)
 
-typedef struct NETSCAPE_X509_st
-	{
-	ASN1_OCTET_STRING *header;
-	X509 *cert;
-	} NETSCAPE_X509;
-
 /* This is used to contain a list of bit names */
 typedef struct BIT_STRING_BITNAME_st {
-	int bitnum;
-	const char *lname;
-	const char *sname;
+ int bitnum;
+ const char *lname;
+ const char *sname;
 } BIT_STRING_BITNAME;
 
-
-#define M_ASN1_STRING_length(x)	((x)->length)
-#define M_ASN1_STRING_length_set(x, n)	((x)->length = (n))
-#define M_ASN1_STRING_type(x)	((x)->type)
-#define M_ASN1_STRING_data(x)	((x)->data)
-
-/* Macros for string operations */
-#define M_ASN1_BIT_STRING_new()	(ASN1_BIT_STRING *)\
-		ASN1_STRING_type_new(V_ASN1_BIT_STRING)
-#define M_ASN1_BIT_STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_ASN1_BIT_STRING_dup(a) (ASN1_BIT_STRING *)\
-		ASN1_STRING_dup((const ASN1_STRING *)a)
-#define M_ASN1_BIT_STRING_cmp(a,b) ASN1_STRING_cmp(\
-		(const ASN1_STRING *)a,(const ASN1_STRING *)b)
-#define M_ASN1_BIT_STRING_set(a,b,c) ASN1_STRING_set((ASN1_STRING *)a,b,c)
-
-#define M_ASN1_INTEGER_new()	(ASN1_INTEGER *)\
-		ASN1_STRING_type_new(V_ASN1_INTEGER)
-#define M_ASN1_INTEGER_free(a)		ASN1_STRING_free((ASN1_STRING *)a)
-#define M_ASN1_INTEGER_dup(a) (ASN1_INTEGER *)\
-		ASN1_STRING_dup((const ASN1_STRING *)a)
-#define M_ASN1_INTEGER_cmp(a,b)	ASN1_STRING_cmp(\
-		(const ASN1_STRING *)a,(const ASN1_STRING *)b)
-
-#define M_ASN1_ENUMERATED_new()	(ASN1_ENUMERATED *)\
-		ASN1_STRING_type_new(V_ASN1_ENUMERATED)
-#define M_ASN1_ENUMERATED_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_ASN1_ENUMERATED_dup(a) (ASN1_ENUMERATED *)\
-		ASN1_STRING_dup((const ASN1_STRING *)a)
-#define M_ASN1_ENUMERATED_cmp(a,b)	ASN1_STRING_cmp(\
-		(const ASN1_STRING *)a,(const ASN1_STRING *)b)
-
-#define M_ASN1_OCTET_STRING_new()	(ASN1_OCTET_STRING *)\
-		ASN1_STRING_type_new(V_ASN1_OCTET_STRING)
-#define M_ASN1_OCTET_STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_ASN1_OCTET_STRING_dup(a) (ASN1_OCTET_STRING *)\
-		ASN1_STRING_dup((const ASN1_STRING *)a)
-#define M_ASN1_OCTET_STRING_cmp(a,b) ASN1_STRING_cmp(\
-		(const ASN1_STRING *)a,(const ASN1_STRING *)b)
-#define M_ASN1_OCTET_STRING_set(a,b,c)	ASN1_STRING_set((ASN1_STRING *)a,b,c)
-#define M_ASN1_OCTET_STRING_print(a,b)	ASN1_STRING_print(a,(ASN1_STRING *)b)
-#define M_i2d_ASN1_OCTET_STRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_OCTET_STRING,\
-		V_ASN1_UNIVERSAL)
-
-#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
-
-#define M_ASN1_PRINTABLE_new()	ASN1_STRING_type_new(V_ASN1_T61STRING)
-#define M_ASN1_PRINTABLE_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_PRINTABLE(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-		pp,a->type,V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_PRINTABLE(a,pp,l) \
-		d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-			B_ASN1_PRINTABLE)
-
-#define M_DIRECTORYSTRING_new() ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
-#define M_DIRECTORYSTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_DIRECTORYSTRING(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-						pp,a->type,V_ASN1_UNIVERSAL)
-#define M_d2i_DIRECTORYSTRING(a,pp,l) \
-		d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-			B_ASN1_DIRECTORYSTRING)
-
-#define M_DISPLAYTEXT_new() ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)
-#define M_DISPLAYTEXT_free(a) ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_DISPLAYTEXT(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-						pp,a->type,V_ASN1_UNIVERSAL)
-#define M_d2i_DISPLAYTEXT(a,pp,l) \
-		d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-			B_ASN1_DISPLAYTEXT)
-
-#define M_ASN1_PRINTABLESTRING_new() (ASN1_PRINTABLESTRING *)\
-		ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
-#define M_ASN1_PRINTABLESTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_PRINTABLESTRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_PRINTABLESTRING,\
-		V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_PRINTABLESTRING(a,pp,l) \
-		(ASN1_PRINTABLESTRING *)d2i_ASN1_type_bytes\
-		((ASN1_STRING **)a,pp,l,B_ASN1_PRINTABLESTRING)
-
-#define M_ASN1_T61STRING_new()	(ASN1_T61STRING *)\
-		ASN1_STRING_type_new(V_ASN1_T61STRING)
-#define M_ASN1_T61STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_T61STRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_T61STRING,\
-		V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_T61STRING(a,pp,l) \
-		(ASN1_T61STRING *)d2i_ASN1_type_bytes\
-		((ASN1_STRING **)a,pp,l,B_ASN1_T61STRING)
-
-#define M_ASN1_IA5STRING_new()	(ASN1_IA5STRING *)\
-		ASN1_STRING_type_new(V_ASN1_IA5STRING)
-#define M_ASN1_IA5STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_ASN1_IA5STRING_dup(a)	\
-		(ASN1_IA5STRING *)ASN1_STRING_dup((const ASN1_STRING *)a)
-#define M_i2d_ASN1_IA5STRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_IA5STRING,\
-			V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_IA5STRING(a,pp,l) \
-		(ASN1_IA5STRING *)d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l,\
-			B_ASN1_IA5STRING)
-
-#define M_ASN1_UTCTIME_new()	(ASN1_UTCTIME *)\
-		ASN1_STRING_type_new(V_ASN1_UTCTIME)
-#define M_ASN1_UTCTIME_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_ASN1_UTCTIME_dup(a) (ASN1_UTCTIME *)\
-		ASN1_STRING_dup((const ASN1_STRING *)a)
-
-#define M_ASN1_GENERALIZEDTIME_new()	(ASN1_GENERALIZEDTIME *)\
-		ASN1_STRING_type_new(V_ASN1_GENERALIZEDTIME)
-#define M_ASN1_GENERALIZEDTIME_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_ASN1_GENERALIZEDTIME_dup(a) (ASN1_GENERALIZEDTIME *)ASN1_STRING_dup(\
-	(const ASN1_STRING *)a)
-
-#define M_ASN1_TIME_new()	(ASN1_TIME *)\
-		ASN1_STRING_type_new(V_ASN1_UTCTIME)
-#define M_ASN1_TIME_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_ASN1_TIME_dup(a) (ASN1_TIME *)\
-	ASN1_STRING_dup((const ASN1_STRING *)a)
-
-#define M_ASN1_GENERALSTRING_new()	(ASN1_GENERALSTRING *)\
-		ASN1_STRING_type_new(V_ASN1_GENERALSTRING)
-#define M_ASN1_GENERALSTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_GENERALSTRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_GENERALSTRING,\
-			V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_GENERALSTRING(a,pp,l) \
-		(ASN1_GENERALSTRING *)d2i_ASN1_type_bytes\
-		((ASN1_STRING **)a,pp,l,B_ASN1_GENERALSTRING)
-
-#define M_ASN1_UNIVERSALSTRING_new()	(ASN1_UNIVERSALSTRING *)\
-		ASN1_STRING_type_new(V_ASN1_UNIVERSALSTRING)
-#define M_ASN1_UNIVERSALSTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_UNIVERSALSTRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UNIVERSALSTRING,\
-			V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_UNIVERSALSTRING(a,pp,l) \
-		(ASN1_UNIVERSALSTRING *)d2i_ASN1_type_bytes\
-		((ASN1_STRING **)a,pp,l,B_ASN1_UNIVERSALSTRING)
-
-#define M_ASN1_BMPSTRING_new()	(ASN1_BMPSTRING *)\
-		ASN1_STRING_type_new(V_ASN1_BMPSTRING)
-#define M_ASN1_BMPSTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_BMPSTRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_BMPSTRING,\
-			V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_BMPSTRING(a,pp,l) \
-		(ASN1_BMPSTRING *)d2i_ASN1_type_bytes\
-		((ASN1_STRING **)a,pp,l,B_ASN1_BMPSTRING)
-
-#define M_ASN1_VISIBLESTRING_new()	(ASN1_VISIBLESTRING *)\
-		ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)
-#define M_ASN1_VISIBLESTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_VISIBLESTRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_VISIBLESTRING,\
-			V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_VISIBLESTRING(a,pp,l) \
-		(ASN1_VISIBLESTRING *)d2i_ASN1_type_bytes\
-		((ASN1_STRING **)a,pp,l,B_ASN1_VISIBLESTRING)
-
-#define M_ASN1_UTF8STRING_new()	(ASN1_UTF8STRING *)\
-		ASN1_STRING_type_new(V_ASN1_UTF8STRING)
-#define M_ASN1_UTF8STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_UTF8STRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UTF8STRING,\
-			V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_UTF8STRING(a,pp,l) \
-		(ASN1_UTF8STRING *)d2i_ASN1_type_bytes\
-		((ASN1_STRING **)a,pp,l,B_ASN1_UTF8STRING)
-
- /* for the is_set parameter to i2d_ASN1_SET */
-#define IS_SEQUENCE	0
-#define IS_SET		1
+# 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(ASN1_TYPE *a);
+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(ASN1_TYPE *a, ASN1_TYPE *b);
+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(ASN1_OBJECT *a,unsigned char **pp);
-ASN1_OBJECT *	c2i_ASN1_OBJECT(ASN1_OBJECT **a,const unsigned char **pp,
-			long length);
-ASN1_OBJECT *	d2i_ASN1_OBJECT(ASN1_OBJECT **a,const unsigned char **pp,
-			long length);
+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)
 
-DECLARE_STACK_OF(ASN1_OBJECT)
-DECLARE_ASN1_SET_OF(ASN1_OBJECT)
-
-ASN1_STRING *	ASN1_STRING_new(void);
-void		ASN1_STRING_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);
+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(ASN1_STRING *x);
-unsigned char * ASN1_STRING_data(ASN1_STRING *x);
+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		i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a,unsigned char **pp);
-ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,const unsigned char **pp,
-			long length);
-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(ASN1_BIT_STRING *a, int n);
-int ASN1_BIT_STRING_check(ASN1_BIT_STRING *a,
- unsigned char *flags, int flags_len);
-
-#ifndef OPENSSL_NO_BIO
-int ASN1_BIT_STRING_name_print(BIO *out, ASN1_BIT_STRING *bs,
-				BIT_STRING_BITNAME *tbl, int indent);
-#endif
-int ASN1_BIT_STRING_num_asc(char *name, BIT_STRING_BITNAME *tbl);
-int ASN1_BIT_STRING_set_asc(ASN1_BIT_STRING *bs, char *name, int value,
-				BIT_STRING_BITNAME *tbl);
+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		i2d_ASN1_BOOLEAN(int a,unsigned char **pp);
-int 		d2i_ASN1_BOOLEAN(int *a,const unsigned char **pp,long length);
+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)
-int		i2c_ASN1_INTEGER(ASN1_INTEGER *a,unsigned char **pp);
-ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a,const unsigned char **pp,
-			long length);
-ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a,const unsigned char **pp,
-			long length);
-ASN1_INTEGER *	ASN1_INTEGER_dup(const ASN1_INTEGER *x);
+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(ASN1_UTCTIME *a);
-ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s,time_t t);
+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 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);
-#if 0
-time_t ASN1_UTCTIME_get(const ASN1_UTCTIME *s);
-#endif
 
-int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *a);
-ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *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);
+ 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);
+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)
@@ -884,199 +621,174 @@
 
 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(ASN1_TIME *t);
-ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out);
+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 i2d_ASN1_SET(STACK_OF(OPENSSL_BLOCK) *a, unsigned char **pp,
-		 i2d_of_void *i2d, int ex_tag, int ex_class,
-		 int is_set);
-STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a,
-			 const unsigned char **pp,
-			 long length, d2i_of_void *d2i,
-			 void (*free_func)(OPENSSL_BLOCK), int ex_tag,
-			 int ex_class);
-
-#ifndef OPENSSL_NO_BIO
-int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a);
-int a2i_ASN1_INTEGER(BIO *bp,ASN1_INTEGER *bs,char *buf,int size);
-int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a);
-int a2i_ASN1_ENUMERATED(BIO *bp,ASN1_ENUMERATED *bs,char *buf,int size);
-int i2a_ASN1_OBJECT(BIO *bp,ASN1_OBJECT *a);
-int a2i_ASN1_STRING(BIO *bp,ASN1_STRING *bs,char *buf,int size);
-int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type);
-#endif
-int i2t_ASN1_OBJECT(char *buf,int buf_len,ASN1_OBJECT *a);
+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 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);
+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(ASN1_ENUMERATED *a);
-ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai);
-BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai,BIGNUM *bn);
+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);
 
-int i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass);
-ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp,
-	long length, int Ptag, int Pclass);
 unsigned long ASN1_tag2bit(int tag);
-/* type is one or more of the B_ASN1_ values. */
-ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a,const unsigned char **pp,
-		long length,int type);
-
-/* PARSING */
-int asn1_Finish(ASN1_CTX *c);
-int asn1_const_Finish(ASN1_const_CTX *c);
 
 /* 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);
+ 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 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) \
+# 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)))
+ CHECKED_D2I_OF(type, d2i), \
+ CHECKED_PTR_OF(type, x)))
 
-#define ASN1_dup_of_const(type,i2d,d2i,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)))
+ 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))
+# 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_FP_API
-void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);
+# 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) \
+# 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)))
+ 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);
+int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, void *x);
 
-#define ASN1_i2d_fp_of(type,i2d,out,x) \
+# define ASN1_i2d_fp_of(type,i2d,out,x) \
 (ASN1_i2d_fp(CHECKED_I2D_OF(type, i2d), \
-		 out, \
-		 CHECKED_PTR_OF(type, x)))
+ out, \
+ CHECKED_PTR_OF(type, x)))
 
-#define ASN1_i2d_fp_of_const(type,i2d,out,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)))
+ 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, ASN1_STRING *str, unsigned long flags);
-#endif
+int ASN1_STRING_print_ex_fp(FILE *fp, const ASN1_STRING *str, unsigned long flags);
+# endif
 
-int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in);
+int ASN1_STRING_to_UTF8(unsigned char **out, const ASN1_STRING *in);
 
-#ifndef OPENSSL_NO_BIO
-void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);
+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) \
+# 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)))
+ 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);
+int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x);
 
-#define ASN1_i2d_bio_of(type,i2d,out,x) \
+# define ASN1_i2d_bio_of(type,i2d,out,x) \
 (ASN1_i2d_bio(CHECKED_I2D_OF(type, i2d), \
-		 out, \
-		 CHECKED_PTR_OF(type, x)))
+ out, \
+ CHECKED_PTR_OF(type, x)))
 
-#define ASN1_i2d_bio_of_const(type,i2d,out,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)))
+ 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, ASN1_STRING *str, unsigned long flags);
+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);
-#endif
+ 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 */
-
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_X509)
+/* 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(ASN1_TYPE *a,
-	unsigned char *data, int max_len);
+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(ASN1_TYPE *a,long *num,
-	unsigned char *data, int max_len);
-
-STACK_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
-				 d2i_of_void *d2i, void (*free_func)(OPENSSL_BLOCK));
-unsigned char *ASN1_seq_pack(STACK_OF(OPENSSL_BLOCK) *safes, i2d_of_void *i2d,
-			 unsigned char **buf, int *len );
-void *ASN1_unpack_string(ASN1_STRING *oct, d2i_of_void *d2i);
-void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it);
-ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
-			 ASN1_OCTET_STRING **oct);
-
-#define ASN1_pack_string_of(type,obj,i2d,oct) \
- (ASN1_pack_string(CHECKED_PTR_OF(type, obj), \
-		 CHECKED_I2D_OF(type, i2d), \
-		 oct))
-
-ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct);
+ 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 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);
+ 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 *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);
@@ -1086,317 +798,302 @@
 /* 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);
+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);
+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(char *str, CONF *nconf);
-ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf);
+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	
+# define ASN1_PCTX_FLAGS_SHOW_ABSENT 0x001
 /* Mark start and end of SEQUENCE */
-#define ASN1_PCTX_FLAGS_SHOW_SEQUENCE		0x002
+# define ASN1_PCTX_FLAGS_SHOW_SEQUENCE 0x002
 /* Mark start and end of SEQUENCE/SET OF */
-#define ASN1_PCTX_FLAGS_SHOW_SSOF		0x004
+# define ASN1_PCTX_FLAGS_SHOW_SSOF 0x004
 /* Show the ASN1 type of primitives */
-#define ASN1_PCTX_FLAGS_SHOW_TYPE		0x008
+# define ASN1_PCTX_FLAGS_SHOW_TYPE 0x008
 /* Don't show ASN1 type of ANY */
-#define ASN1_PCTX_FLAGS_NO_ANY_TYPE		0x010
+# define ASN1_PCTX_FLAGS_NO_ANY_TYPE 0x010
 /* Don't show ASN1 type of MSTRINGs */
-#define ASN1_PCTX_FLAGS_NO_MSTRING_TYPE		0x020
+# define ASN1_PCTX_FLAGS_NO_MSTRING_TYPE 0x020
 /* Don't show field names in SEQUENCE */
-#define ASN1_PCTX_FLAGS_NO_FIELD_NAME		0x040
+# define ASN1_PCTX_FLAGS_NO_FIELD_NAME 0x040
 /* Show structure names of each SEQUENCE field */
-#define ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME	0x080
+# 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
+# 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);
+ 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(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(ASN1_PCTX *p);
+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(ASN1_PCTX *p);
+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(ASN1_PCTX *p);
+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(ASN1_PCTX *p);
+unsigned long ASN1_PCTX_get_str_flags(const ASN1_PCTX *p);
 void ASN1_PCTX_set_str_flags(ASN1_PCTX *p, unsigned long flags);
 
-BIO_METHOD *BIO_f_asn1(void);
+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);
+ 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);
+ 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);
+ 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
+/*
+ * 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.
 */
-void ERR_load_ASN1_strings(void);
+
+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_ENUMERATED			 101
-#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_COLLATE_PRIMITIVE			 105
-#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_DUP					 111
-#define ASN1_F_ASN1_ENUMERATED_SET			 112
-#define ASN1_F_ASN1_ENUMERATED_TO_BN			 113
-#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_GENERALIZEDTIME_SET			 185
-#define ASN1_F_ASN1_GENERATE_V3				 178
-#define ASN1_F_ASN1_GET_OBJECT				 114
-#define ASN1_F_ASN1_HEADER_NEW				 115
-#define ASN1_F_ASN1_I2D_BIO				 116
-#define ASN1_F_ASN1_I2D_FP				 117
-#define ASN1_F_ASN1_INTEGER_SET				 118
-#define ASN1_F_ASN1_INTEGER_TO_BN			 119
-#define ASN1_F_ASN1_ITEM_D2I_FP				 206
-#define ASN1_F_ASN1_ITEM_DUP				 191
-#define ASN1_F_ASN1_ITEM_EX_COMBINE_NEW			 121
-#define ASN1_F_ASN1_ITEM_EX_D2I				 120
-#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_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_PACK_STRING				 124
-#define ASN1_F_ASN1_PCTX_NEW				 205
-#define ASN1_F_ASN1_PKCS5_PBE_SET			 125
-#define ASN1_F_ASN1_SEQ_PACK				 126
-#define ASN1_F_ASN1_SEQ_UNPACK				 127
-#define ASN1_F_ASN1_SIGN				 128
-#define ASN1_F_ASN1_STR2TYPE				 179
-#define ASN1_F_ASN1_STRING_SET				 186
-#define ASN1_F_ASN1_STRING_TABLE_ADD			 129
-#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_TIME_SET				 175
-#define ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING		 134
-#define ASN1_F_ASN1_TYPE_GET_OCTETSTRING		 135
-#define ASN1_F_ASN1_UNPACK_STRING			 136
-#define ASN1_F_ASN1_UTCTIME_ADJ				 218
-#define ASN1_F_ASN1_UTCTIME_SET				 187
-#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_ENUMERATED			 138
-#define ASN1_F_BN_TO_ASN1_INTEGER			 139
-#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_COLLECT_DATA				 140
-#define ASN1_F_D2I_ASN1_BIT_STRING			 141
-#define ASN1_F_D2I_ASN1_BOOLEAN				 142
-#define ASN1_F_D2I_ASN1_BYTES				 143
-#define ASN1_F_D2I_ASN1_GENERALIZEDTIME			 144
-#define ASN1_F_D2I_ASN1_HEADER				 145
-#define ASN1_F_D2I_ASN1_INTEGER				 146
-#define ASN1_F_D2I_ASN1_OBJECT				 147
-#define ASN1_F_D2I_ASN1_SET				 148
-#define ASN1_F_D2I_ASN1_TYPE_BYTES			 149
-#define ASN1_F_D2I_ASN1_UINTEGER			 150
-#define ASN1_F_D2I_ASN1_UTCTIME				 151
-#define ASN1_F_D2I_AUTOPRIVATEKEY			 207
-#define ASN1_F_D2I_NETSCAPE_RSA				 152
-#define ASN1_F_D2I_NETSCAPE_RSA_2			 153
-#define ASN1_F_D2I_PRIVATEKEY				 154
-#define ASN1_F_D2I_PUBLICKEY				 155
-#define ASN1_F_D2I_RSA_NET				 200
-#define ASN1_F_D2I_RSA_NET_2				 201
-#define ASN1_F_D2I_X509					 156
-#define ASN1_F_D2I_X509_CINF				 157
-#define ASN1_F_D2I_X509_PKEY				 159
-#define ASN1_F_I2D_ASN1_BIO_STREAM			 211
-#define ASN1_F_I2D_ASN1_SET				 188
-#define ASN1_F_I2D_ASN1_TIME				 160
-#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_NET				 162
-#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_PBE_SET				 202
-#define ASN1_F_PKCS5_PBE_SET0_ALGOR			 215
-#define ASN1_F_SMIME_READ_ASN1				 212
-#define ASN1_F_SMIME_TEXT				 213
-#define ASN1_F_X509_CINF_NEW				 168
-#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_NEW					 172
-#define ASN1_F_X509_PKEY_NEW				 173
+# 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_CLASS				 101
-#define ASN1_R_BAD_OBJECT_HEADER			 102
-#define ASN1_R_BAD_PASSWORD_READ			 103
-#define ASN1_R_BAD_TAG					 104
-#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_DATA_IS_WRONG				 109
-#define ASN1_R_DECODE_ERROR				 110
-#define ASN1_R_DECODING_ERROR				 111
-#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_PARSING_SET_ELEMENT		 113
-#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_EXPECTING_A_BOOLEAN			 117
-#define ASN1_R_EXPECTING_A_TIME				 118
-#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_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_TAGGED_ANY			 127
-#define ASN1_R_ILLEGAL_TIME_VALUE			 184
-#define ASN1_R_INTEGER_NOT_ASCII_FORMAT			 185
-#define ASN1_R_INTEGER_TOO_LARGE_FOR_LONG		 128
-#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_SEPARATOR			 131
-#define ASN1_R_INVALID_TIME_FORMAT			 132
-#define ASN1_R_INVALID_UNIVERSALSTRING_LENGTH		 133
-#define ASN1_R_INVALID_UTF8STRING			 134
-#define ASN1_R_IV_TOO_LARGE				 135
-#define ASN1_R_LENGTH_ERROR				 136
-#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_DEFAULT_DIGEST			 201
-#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_PRIVATE_KEY_HEADER_MISSING		 146
-#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_TAG_VALUE_TOO_HIGH			 153
-#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_LONG					 155
-#define ASN1_R_TYPE_NOT_CONSTRUCTED			 156
-#define ASN1_R_UNABLE_TO_DECODE_RSA_KEY			 157
-#define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY		 158
-#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_UNKOWN_FORMAT				 195
-#define ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE		 164
-#define ASN1_R_UNSUPPORTED_CIPHER			 165
-#define ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM		 166
-#define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE		 167
-#define ASN1_R_UNSUPPORTED_TYPE				 196
-#define ASN1_R_WRONG_PUBLIC_KEY_TYPE			 200
-#define ASN1_R_WRONG_TAG				 168
-#define ASN1_R_WRONG_TYPE				 169
-
-#ifdef __cplusplus
+# 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
 #endif

gpac-0.8.0.tar.gz/extra_lib/include/openssl/asn1_mac.h Added

gpac-0.8.0.tar.gz/extra_lib/include/openssl/asn1t.h Added

@@ -0,0 +1,929 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/openssl/async.h Added

@@ -0,0 +1,98 @@
+/*
+ * 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-0.7.1.tar.gz/extra_lib/include/openssl/bio.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/bio.h Changed

@@ -1,770 +1,850 @@
-/* crypto/bio/bio.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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
+# define HEADER_BIO_H
 
-#include <openssl/e_os2.h>
+# include <openssl/e_os2.h>
 
-#ifndef OPENSSL_NO_FP_API
-# include <stdio.h>
-#endif
-#include <stdarg.h>
+# ifndef OPENSSL_NO_STDIO
+# include <stdio.h>
+# endif
+# include <stdarg.h>
 
-#include <openssl/crypto.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|0x0400)
-#define BIO_TYPE_FILE		(2|0x0400)
-
-#define BIO_TYPE_FD		(4|0x0400|0x0100)
-#define BIO_TYPE_SOCKET		(5|0x0400|0x0100)
-#define BIO_TYPE_NULL		(6|0x0400)
-#define BIO_TYPE_SSL		(7|0x0200)
-#define BIO_TYPE_MD		(8|0x0200)		/* passive filter */
-#define BIO_TYPE_BUFFER		(9|0x0200)		/* filter */
-#define BIO_TYPE_CIPHER		(10|0x0200)		/* filter */
-#define BIO_TYPE_BASE64		(11|0x0200)		/* filter */
-#define BIO_TYPE_CONNECT	(12|0x0400|0x0100)	/* socket - connect */
-#define BIO_TYPE_ACCEPT		(13|0x0400|0x0100)	/* socket for accept */
-#define BIO_TYPE_PROXY_CLIENT	(14|0x0200)		/* client proxy BIO */
-#define BIO_TYPE_PROXY_SERVER	(15|0x0200)		/* server proxy BIO */
-#define BIO_TYPE_NBIO_TEST	(16|0x0200)		/* server proxy BIO */
-#define BIO_TYPE_NULL_FILTER	(17|0x0200)
-#define BIO_TYPE_BER		(18|0x0200)		/* BER -> bin filter */
-#define BIO_TYPE_BIO		(19|0x0400)		/* (half a) BIO pair */
-#define BIO_TYPE_LINEBUFFER	(20|0x0200)		/* filter */
-#define BIO_TYPE_DGRAM		(21|0x0400|0x0100)
-#define BIO_TYPE_ASN1 		(22|0x0200)		/* filter */
-#define BIO_TYPE_COMP 		(23|0x0200)		/* filter */
-
-#define BIO_TYPE_DESCRIPTOR	0x0100	/* socket, fd, connect or accept */
-#define BIO_TYPE_FILTER		0x0200
-#define BIO_TYPE_SOURCE_SINK	0x0400
-
-/* 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 */
-/* callback is int cb(BIO *bio,state,ret); */
-#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 */
+# 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
 
-/* 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_TYPE_START 128
 
-#define BIO_CTRL_DGRAM_QUERY_MTU 40 /* as kernel for current MTU */
-#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 */
+/*
+ * 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
 
-#define BIO_CTRL_DGRAM_MTU_EXCEEDED 43 /* check whether the MTU
-					 * was exceed in the
-					 * previous write
-					 * operation */
+/*
+ * 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 */
 
-#define BIO_CTRL_DGRAM_GET_PEER 46
-#define BIO_CTRL_DGRAM_SET_PEER 44 /* Destination for the data */
+/* 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_SET_NEXT_TIMEOUT 45 /* Next DTLS handshake timeout to
-											 * adjust socket timeouts */
+# 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 */
 
-/* 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
+/* #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
 
-/* Used in BIO_gethostbyname() */
-#define BIO_GHBN_CTRL_HITS		1
-#define BIO_GHBN_CTRL_MISSES		2
-#define BIO_GHBN_CTRL_CACHE_SIZE	3
-#define BIO_GHBN_CTRL_GET_ENTRY		4
-#define BIO_GHBN_CTRL_FLUSH		5
-
-/* Mostly used in the SSL BIO */
-/* Not used anymore
- * #define BIO_FLAGS_PROTOCOL_DELAYED_READ 0x10
- * #define BIO_FLAGS_PROTOCOL_DELAYED_WRITE 0x20
- * #define BIO_FLAGS_PROTOCOL_STARTUP	0x40
+/* 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
+# define BIO_FLAGS_BASE64_NO_NL 0x100
 
-/* This is used with memory BIOs: it means we shouldn't free up or change the
- * data in any way.
+/*
+ * 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_MEM_RDONLY 0x200
+# define BIO_FLAGS_NONCLEAR_RST 0x400
 
-typedef struct bio_st BIO;
+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);
+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))
+# 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))
+# 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
+# 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
+# define BIO_RR_CONNECT 0x02
 /* Returned from the accept BIO when an accept would have blocked */
-#define BIO_RR_ACCEPT			0x03
+# 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)
-
-long (*BIO_get_callback(const BIO *b)) (struct bio_st *,int,const char *,int, long,long);
-void BIO_set_callback(BIO *b, 
-	long (*callback)(struct bio_st *,int,const char *,int, long,long));
+# 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);
 
-const char * BIO_method_name(const BIO *b);
+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(struct bio_st *, int, const char *, int, long, long);
-
-typedef struct bio_method_st
-	{
-	int type;
-	const char *name;
-	int (*bwrite)(BIO *, const char *, int);
-	int (*bread)(BIO *, char *, int);
-	int (*bputs)(BIO *, const char *);
-	int (*bgets)(BIO *, char *, int);
-	long (*ctrl)(BIO *, int, long, void *);
-	int (*create)(BIO *);
-	int (*destroy)(BIO *);
- long (*callback_ctrl)(BIO *, int, bio_info_cb *);
-	} BIO_METHOD;
-
-struct bio_st
-	{
-	BIO_METHOD *method;
-	/* bio, mode, argp, argi, argl, ret */
-	long (*callback)(struct bio_st *,int,const char *,int, long,long);
-	char *cb_arg; /* first argument for the callback */
-
-	int init;
-	int shutdown;
-	int flags;	/* extra storage */
-	int retry_reason;
-	int num;
-	void *ptr;
-	struct bio_st *next_bio;	/* used by filter BIOs */
-	struct bio_st *prev_bio;	/* used by filter BIOs */
-	int references;
-	unsigned long num_read;
-	unsigned long num_write;
-
-	CRYPTO_EX_DATA ex_data;
-	};
-
-DECLARE_STACK_OF(BIO)
-
-typedef struct bio_f_buffer_ctx_struct
-	{
-	/* BIO *bio; */ /* this is now in the BIO struct */
-	int ibuf_size;	/* how big is the input buffer */
-	int obuf_size;	/* how big is the output buffer */
-
-	char *ibuf;		/* the char array */
-	int ibuf_len;		/* how many bytes are in it */
-	int ibuf_off;		/* write/read offset */
-
-	char *obuf;		/* the char array */
-	int obuf_len;		/* how many bytes are in it */
-	int obuf_off;		/* write/read offset */
-	} BIO_F_BUFFER_CTX;
+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);
-
-/* connect BIO stuff */
-#define BIO_CONN_S_BEFORE		1
-#define BIO_CONN_S_GET_IP		2
-#define BIO_CONN_S_GET_PORT		3
-#define BIO_CONN_S_CREATE_SOCKET	4
-#define BIO_CONN_S_CONNECT		5
-#define BIO_CONN_S_OK			6
-#define BIO_CONN_S_BLOCKED_CONNECT	7
-#define BIO_CONN_S_NBIO			8
-/*#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_set_app_data(s,arg)		BIO_set_ex_data(s,0,arg)
-#define BIO_get_app_data(s)		BIO_get_ex_data(s,0)
-
-/* BIO_s_connect() and BIO_s_socks4a_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_ip(b,ip)	 BIO_ctrl(b,BIO_C_SET_CONNECT,2,(char *)ip)
-#define BIO_set_conn_int_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,3,(char *)port)
-#define BIO_get_conn_hostname(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0)
-#define BIO_get_conn_port(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1)
-#define BIO_get_conn_ip(b) 		 BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2)
-#define BIO_get_conn_int_port(b) BIO_int_ctrl(b,BIO_C_GET_CONNECT,3,0)
-
-
-#define BIO_set_nbio(b,n)	BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL)
-
-/* BIO_s_accept_socket() */
-#define BIO_set_accept_port(b,name) BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char *)name)
-#define BIO_get_accept_port(b)	BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0)
-/* #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,1,(n)?(void *)"a":NULL)
-#define BIO_set_accept_bios(b,bio) BIO_ctrl(b,BIO_C_SET_ACCEPT,2,(char *)bio)
-
-#define BIO_BIND_NORMAL			0
-#define BIO_BIND_REUSEADDR_IF_UNUSED	1
-#define BIO_BIND_REUSEADDR		2
-#define BIO_set_bind_mode(b,mode) BIO_ctrl(b,BIO_C_SET_BIND_MODE,mode,NULL)
-#define BIO_get_bind_mode(b,mode) BIO_ctrl(b,BIO_C_GET_BIND_MODE,0,NULL)
-
-#define BIO_do_connect(b)	BIO_do_handshake(b)
-#define BIO_do_accept(b)	BIO_do_handshake(b)
-#define BIO_do_handshake(b)	BIO_ctrl(b,BIO_C_DO_STATE_MACHINE,0,NULL)
-
-/* BIO_s_proxy_client() */
-#define BIO_set_url(b,url)	BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,0,(char *)(url))
-#define BIO_set_proxies(b,p)	BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,1,(char *)(p))
-/* BIO_set_nbio(b,n) */
-#define BIO_set_filter_bio(b,s) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,2,(char *)(s))
-/* BIO *BIO_get_filter_bio(BIO *bio); */
-#define BIO_set_proxy_cb(b,cb) BIO_callback_ctrl(b,BIO_C_SET_PROXY_PARAM,3,(void *(*cb)()))
-#define BIO_set_proxy_header(b,sk) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,4,(char *)sk)
-#define BIO_set_no_connect_return(b,bool) BIO_int_ctrl(b,BIO_C_SET_PROXY_PARAM,5,bool)
-
-#define BIO_get_proxy_header(b,skp) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,0,(char *)skp)
-#define BIO_get_proxies(b,pxy_p) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,1,(char *)(pxy_p))
-#define BIO_get_url(b,url)	BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,2,(char *)(url))
-#define BIO_get_no_connect_return(b)	BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,5,NULL)
-
-#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)
-
-#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)
-
-#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
+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) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-		BIO_CLOSE|BIO_FP_READ,(char *)name)
-#endif
-#define BIO_write_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-		BIO_CLOSE|BIO_FP_WRITE,name)
-#define BIO_append_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-		BIO_CLOSE|BIO_FP_APPEND,name)
-#define BIO_rw_filename(b,name) 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);
+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_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)
+# 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)
+# 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)
+# 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)
+# 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)
+# 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)
+# 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)
+# 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) \
+# define BIO_ctrl_dgram_connect(b,peer) \
 (int)BIO_ctrl(b,BIO_CTRL_DGRAM_CONNECT,0, (char *)peer)
-#define BIO_ctrl_set_connected(b, state, peer) \
- (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_CONNECTED, state, (char *)peer)
-#define BIO_dgram_recv_timedout(b) \
+# 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) \
+# 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) \
+# 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) \
+# 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)
 
-/* These two aren't currently implemented */
-/* int BIO_get_ex_num(BIO *bio); */
-/* void BIO_set_ex_free_func(BIO *bio,int idx,void (*cb)()); */
-int BIO_set_ex_data(BIO *bio,int idx,void *data);
-void *BIO_get_ex_data(BIO *bio,int idx);
-int BIO_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-unsigned long BIO_number_read(BIO *bio);
-unsigned long BIO_number_written(BIO *bio);
+#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);
+ asn1_ps_func *prefix_free);
 int BIO_asn1_get_prefix(BIO *b, asn1_ps_func **pprefix,
-					asn1_ps_func **pprefix_free);
+ asn1_ps_func **pprefix_free);
 int BIO_asn1_set_suffix(BIO *b, asn1_ps_func *suffix,
-					asn1_ps_func *suffix_free);
+ asn1_ps_func *suffix_free);
 int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix,
-					asn1_ps_func **psuffix_free);
+ asn1_ps_func **psuffix_free);
 
-# ifndef OPENSSL_NO_FP_API
-BIO_METHOD *BIO_s_file(void );
+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);
-# define BIO_s_file_internal	BIO_s_file
 # endif
-BIO *	BIO_new(BIO_METHOD *type);
-int	BIO_set(BIO *a,BIO_METHOD *type);
-int	BIO_free(BIO *a);
-void	BIO_vfree(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)(struct bio_st *, int, const char *, int, long, long));
-char *	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);
-BIO *	BIO_get_retry_BIO(BIO *bio, int *reason);
-int	BIO_get_retry_reason(BIO *bio);
-BIO *	BIO_dup_chain(BIO *in);
+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);
-
-BIO_METHOD *BIO_s_mem(void);
-BIO *BIO_new_mem_buf(void *buf, int len);
-BIO_METHOD *BIO_s_socket(void);
-BIO_METHOD *BIO_s_connect(void);
-BIO_METHOD *BIO_s_accept(void);
-BIO_METHOD *BIO_s_fd(void);
-#ifndef OPENSSL_SYS_OS2
-BIO_METHOD *BIO_s_log(void);
-#endif
-BIO_METHOD *BIO_s_bio(void);
-BIO_METHOD *BIO_s_null(void);
-BIO_METHOD *BIO_f_null(void);
-BIO_METHOD *BIO_f_buffer(void);
-#ifdef OPENSSL_SYS_VMS
-BIO_METHOD *BIO_f_linebuffer(void);
-#endif
-BIO_METHOD *BIO_f_nbio_test(void);
-#ifndef OPENSSL_NO_DGRAM
-BIO_METHOD *BIO_s_datagram(void);
-#endif
+long BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi,
+ long argl, long ret);
 
-/* BIO_METHOD *BIO_f_ber(void); */
+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);
-int BIO_dgram_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_FP_API
+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
-struct hostent *BIO_gethostbyname(const char *name);
-/* We might want a thread-safe interface too:
- * struct hostent *BIO_gethostbyname_r(const char *name,
- * struct hostent *result, void *buffer, size_t buflen);
- * or something similar (caller allocates a struct hostent,
- * pointed to by "result", and additional buffer space for the various
- * substructures; if the buffer does not suffice, NULL is returned
- * and an appropriate error code is set).
- */
+# 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_get_port(const char *str, unsigned short *port_ptr);
-int BIO_get_host_ip(const char *str, unsigned char *ip);
-int BIO_get_accept_socket(char *host_port,int mode);
-int BIO_accept(int sock,char **ip_port);
-int BIO_sock_init(void );
-void BIO_sock_cleanup(void);
-int BIO_set_tcp_ndelay(int sock,int turn_on);
+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_dgram(int fd, 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);
-BIO *BIO_new_connect(char *host_port);
-BIO *BIO_new_accept(char *host_port);
 
 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.
+ 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);*/
+/*
+ * long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);
+ */
 
-#ifdef __GNUC__
+# ifdef __GNUC__
 # define __bio_h__attr__ __attribute__
-#else
+# else
 # define __bio_h__attr__(x)
-#endif
+# endif
 int BIO_printf(BIO *bio, const char *format, ...)
-	__bio_h__attr__((__format__(__printf__,2,3)));
+__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)));
+__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)));
+__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_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
+/*
+ * 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.
 */
-void ERR_load_BIO_strings(void);
+
+int ERR_load_BIO_strings(void);
 
 /* Error codes for the BIO functions. */
 
 /* Function codes. */
-#define BIO_F_ACPT_STATE				 100
-#define BIO_F_BIO_ACCEPT				 101
-#define BIO_F_BIO_BER_GET_HEADER			 102
-#define BIO_F_BIO_CALLBACK_CTRL				 131
-#define BIO_F_BIO_CTRL					 103
-#define BIO_F_BIO_GETHOSTBYNAME				 120
-#define BIO_F_BIO_GETS					 104
-#define BIO_F_BIO_GET_ACCEPT_SOCKET			 105
-#define BIO_F_BIO_GET_HOST_IP				 106
-#define BIO_F_BIO_GET_PORT				 107
-#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_PUTS					 110
-#define BIO_F_BIO_READ					 111
-#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_FILE_CTRL					 116
-#define BIO_F_FILE_READ					 130
-#define BIO_F_LINEBUFFER_CTRL				 129
-#define BIO_F_MEM_READ					 128
-#define BIO_F_MEM_WRITE					 117
-#define BIO_F_SSL_NEW					 118
-#define BIO_F_WSASTARTUP				 119
+# 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_BAD_FOPEN_MODE				 101
-#define BIO_R_BAD_HOSTNAME_LOOKUP			 102
-#define BIO_R_BROKEN_PIPE				 124
-#define BIO_R_CONNECT_ERROR				 103
-#define BIO_R_EOF_ON_MEMORY_BIO				 127
-#define BIO_R_ERROR_SETTING_NBIO			 104
-#define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPTED_SOCKET	 105
-#define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPT_SOCKET	 106
-#define BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET		 107
-#define BIO_R_INVALID_ARGUMENT				 125
-#define BIO_R_INVALID_IP_ADDRESS			 108
-#define BIO_R_IN_USE					 123
-#define BIO_R_KEEPALIVE					 109
-#define BIO_R_NBIO_CONNECT_ERROR			 110
-#define BIO_R_NO_ACCEPT_PORT_SPECIFIED			 111
-#define BIO_R_NO_HOSTNAME_SPECIFIED			 112
-#define BIO_R_NO_PORT_DEFINED				 113
-#define BIO_R_NO_PORT_SPECIFIED				 114
-#define BIO_R_NO_SUCH_FILE				 128
-#define BIO_R_NULL_PARAMETER				 115
-#define BIO_R_TAG_MISMATCH				 116
-#define BIO_R_UNABLE_TO_BIND_SOCKET			 117
-#define BIO_R_UNABLE_TO_CREATE_SOCKET			 118
-#define BIO_R_UNABLE_TO_LISTEN_SOCKET			 119
-#define BIO_R_UNINITIALIZED				 120
-#define BIO_R_UNSUPPORTED_METHOD			 121
-#define BIO_R_WRITE_TO_READ_ONLY_BIO			 126
-#define BIO_R_WSASTARTUP				 122
-
-#ifdef __cplusplus
+# 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
 #endif

gpac-0.8.0.tar.gz/extra_lib/include/openssl/blowfish.h Added

@@ -0,0 +1,61 @@
+/*
+ * 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 P[BF_ROUNDS + 2];
+ BF_LONG S[4 * 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-0.7.1.tar.gz/extra_lib/include/openssl/bn.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/bn.h Changed

@@ -1,374 +1,132 @@
-/* crypto/bn/bn.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+/*
+ * 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 
+ * 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 
+ * 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
+# define HEADER_BN_H
 
-#include <openssl/e_os2.h>
-#ifndef OPENSSL_NO_FP_API
-#include <stdio.h> /* FILE */
-#endif
-#include <openssl/ossl_typ.h>
-#include <openssl/crypto.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
 
-/* These preprocessor symbols control various aspects of the bignum headers and
- * library code. They're not defined by any "normal" configuration, as they are
- * intended for development and testing purposes. NB: defining all three can be
- * useful for debugging application code as well as openssl itself.
- *
- * BN_DEBUG - turn on various debugging alterations to the bignum code
- * BN_DEBUG_RAND - uses random poisoning of unused words to trip up
- * mismanagement of bignum internals. You must also define BN_DEBUG.
+/*
+ * 64-bit processor with LP64 ABI
 */
-/* #define BN_DEBUG */
-/* #define BN_DEBUG_RAND */
+# ifdef SIXTY_FOUR_BIT_LONG
+# define BN_ULONG unsigned long
+# define BN_BYTES 8
+# endif
 
-#ifndef OPENSSL_SMALL_FOOTPRINT
-#define BN_MUL_COMBA
-#define BN_SQR_COMBA
-#define BN_RECURSION
-#endif
+/*
+ * 64-bit processor other than LP64 ABI
+ */
+# ifdef SIXTY_FOUR_BIT
+# define BN_ULONG unsigned long long
+# define BN_BYTES 8
+# endif
 
-/* This next option uses the C libraries (2 word)/(1 word) function.
- * If it is not defined, I use my C version (which is slower).
- * The reason for this flag is that when the particular C compiler
- * library routine is used, and the library is linked with a different
- * compiler, the library is missing. This mostly happens when the
- * library is built with gcc and then linked using normal cc. This would
- * be a common occurrence because gcc normally produces code that is
- * 2 times faster than system compilers for the big number stuff.
- * For machines with only one compiler (or shared libraries), this should
- * be on. Again this in only really a problem on machines
- * using "long long's", are 32bit, and are not using my assembler code. */
-#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || \
- defined(OPENSSL_SYS_WIN32) || defined(linux)
-# ifndef BN_DIV2W
-# define BN_DIV2W
+# ifdef THIRTY_TWO_BIT
+# define BN_ULONG unsigned int
+# define BN_BYTES 4
 # endif
-#endif
 
-/* assuming long is 64bit - this is the DEC Alpha
- * unsigned long long is only 64 bits :-(, don't define
- * BN_LLONG for the DEC Alpha */
-#ifdef SIXTY_FOUR_BIT_LONG
-#define BN_ULLONG	unsigned long long
-#define BN_ULONG	unsigned long
-#define BN_LONG		long
-#define BN_BITS		128
-#define BN_BYTES	8
-#define BN_BITS2	64
-#define BN_BITS4	32
-#define BN_MASK		(0xffffffffffffffffffffffffffffffffLL)
-#define BN_MASK2	(0xffffffffffffffffL)
-#define BN_MASK2l	(0xffffffffL)
-#define BN_MASK2h	(0xffffffff00000000L)
-#define BN_MASK2h1	(0xffffffff80000000L)
-#define BN_TBIT		(0x8000000000000000L)
-#define BN_DEC_CONV	(10000000000000000000UL)
-#define BN_DEC_FMT1	"%lu"
-#define BN_DEC_FMT2	"%019lu"
-#define BN_DEC_NUM	19
-#define BN_HEX_FMT1	"%lX"
-#define BN_HEX_FMT2	"%016lX"
-#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
 
-/* This is where the long long data type is 64 bits, but long is 32.
- * For machines where there are 64bit registers, this is the mode to use.
- * IRIX, on R4000 and above should use this mode, along with the relevant
- * assembler code :-). Do NOT define BN_LLONG.
+/*
+ * 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.
 */
-#ifdef SIXTY_FOUR_BIT
-#undef BN_LLONG
-#undef BN_ULLONG
-#define BN_ULONG	unsigned long long
-#define BN_LONG		long long
-#define BN_BITS		128
-#define BN_BYTES	8
-#define BN_BITS2	64
-#define BN_BITS4	32
-#define BN_MASK2	(0xffffffffffffffffLL)
-#define BN_MASK2l	(0xffffffffL)
-#define BN_MASK2h	(0xffffffff00000000LL)
-#define BN_MASK2h1	(0xffffffff80000000LL)
-#define BN_TBIT		(0x8000000000000000LL)
-#define BN_DEC_CONV	(10000000000000000000ULL)
-#define BN_DEC_FMT1	"%llu"
-#define BN_DEC_FMT2	"%019llu"
-#define BN_DEC_NUM	19
-#define BN_HEX_FMT1	"%llX"
-#define BN_HEX_FMT2	"%016llX"
-#endif
+# define BN_FLG_CONSTTIME 0x04
+# define BN_FLG_SECURE 0x08
 
-#ifdef THIRTY_TWO_BIT
-#ifdef BN_LLONG
-# if defined(_WIN32) && !defined(__GNUC__)
-# define BN_ULLONG	unsigned __int64
-# define BN_MASK	(0xffffffffffffffffI64)
-# else
-# define BN_ULLONG	unsigned long long
-# define BN_MASK	(0xffffffffffffffffLL)
+# 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
-#endif
-#define BN_ULONG	unsigned int
-#define BN_LONG		int
-#define BN_BITS		64
-#define BN_BYTES	4
-#define BN_BITS2	32
-#define BN_BITS4	16
-#define BN_MASK2	(0xffffffffL)
-#define BN_MASK2l	(0xffff)
-#define BN_MASK2h1	(0xffff8000L)
-#define BN_MASK2h	(0xffff0000L)
-#define BN_TBIT		(0x80000000L)
-#define BN_DEC_CONV	(1000000000L)
-#define BN_DEC_FMT1	"%u"
-#define BN_DEC_FMT2	"%09u"
-#define BN_DEC_NUM	9
-#define BN_HEX_FMT1	"%X"
-#define BN_HEX_FMT2	"%08X"
-#endif
 
-#define BN_DEFAULT_BITS	1280
+void BN_set_flags(BIGNUM *b, int n);
+int BN_get_flags(const BIGNUM *b, int n);
 
-#define BN_FLG_MALLOCED		0x01
-#define BN_FLG_STATIC_DATA	0x02
-#define BN_FLG_CONSTTIME	0x04 /* 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.
- */
+/* Values for |top| in BN_rand() */
+#define BN_RAND_TOP_ANY -1
+#define BN_RAND_TOP_ONE 0
+#define BN_RAND_TOP_TWO 1
 
-#ifndef OPENSSL_NO_DEPRECATED
-#define BN_FLG_EXP_CONSTTIME BN_FLG_CONSTTIME /* deprecated name for the flag */
- /* avoid leaking exponent information through timings
- * (BN_mod_exp_mont() will call BN_mod_exp_mont_consttime) */
-#endif
+/* Values for |bottom| in BN_rand() */
+#define BN_RAND_BOTTOM_ANY 0
+#define BN_RAND_BOTTOM_ODD 1
 
-#ifndef OPENSSL_NO_DEPRECATED
-#define BN_FLG_FREE		0x8000	/* used for debuging */
-#endif
-#define BN_set_flags(b,n)	((b)->flags|=(n))
-#define BN_get_flags(b,n)	((b)->flags&(n))
-
-/* get a clone of a BIGNUM with changed flags, for *temporary* use only
- * (the two BIGNUMs cannot not be used in parallel!) */
-#define BN_with_flags(dest,b,n) ((dest)->d=(b)->d, \
- (dest)->top=(b)->top, \
- (dest)->dmax=(b)->dmax, \
- (dest)->neg=(b)->neg, \
- (dest)->flags=(((dest)->flags & BN_FLG_MALLOCED) \
- | ((b)->flags & ~BN_FLG_MALLOCED) \
- | BN_FLG_STATIC_DATA \
- | (n)))
-
-/* Already declared in ossl_typ.h */
-#if 0
-typedef struct bignum_st BIGNUM;
-/* Used for temp variables (declaration hidden in bn_lcl.h) */
-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;
-#endif
-
-struct bignum_st
-	{
-	BN_ULONG *d;	/* Pointer to an array of 'BN_BITS2' bit chunks. */
-	int top;	/* Index of last used d +1. */
-	/* The next are internal book keeping for bn_expand. */
-	int dmax;	/* Size of the d array. */
-	int neg;	/* one if the number is negative */
-	int flags;
-	};
-
-/* Used for montgomery multiplication */
-struct bn_mont_ctx_st
-	{
-	int ri; /* number of bits in R */
-	BIGNUM RR; /* used to convert to montgomery form */
-	BIGNUM N; /* The modulus */
-	BIGNUM Ni; /* R*(1/R mod N) - N*Ni = 1
-	 * (Ni is only stored for bignum algorithm) */
-	BN_ULONG n0[2];/* least significant word(s) of Ni;
-	 (type changed with 0.9.9, was "BN_ULONG n0;" before) */
-	int flags;
-	};
-
-/* Used for reciprocal division/mod functions
- * It cannot be shared between threads
+/*
+ * 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.
 */
-struct bn_recp_ctx_st
-	{
-	BIGNUM N;	/* the divisor */
-	BIGNUM Nr;	/* the reciprocal */
-	int num_bits;
-	int shift;
-	int flags;
-	};
-
-/* Used for slow "generation" functions. */
-struct bn_gencb_st
-	{
-	unsigned int ver;	/* To handle binary (in)compatibility */
-	void *arg;		/* callback-specific data */
-	union
-		{
-		/* if(ver==1) - handles old style callbacks */
-		void (*cb_1)(int, int, void *);
-		/* if(ver==2) - new callback style */
-		int (*cb_2)(int, int, BN_GENCB *);
-		} cb;
-	};
-/* Wrapper function to make using BN_GENCB easier, */
+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);
-/* Macro to populate a BN_GENCB structure with an "old"-style callback */
-#define BN_GENCB_set_old(gencb, callback, cb_arg) { \
-		BN_GENCB *tmp_gencb = (gencb); \
-		tmp_gencb->ver = 1; \
-		tmp_gencb->arg = (cb_arg); \
-		tmp_gencb->cb.cb_1 = (callback); }
-/* Macro to populate a BN_GENCB structure with a "new"-style callback */
-#define BN_GENCB_set(gencb, callback, cb_arg) { \
-		BN_GENCB *tmp_gencb = (gencb); \
-		tmp_gencb->ver = 2; \
-		tmp_gencb->arg = (cb_arg); \
-		tmp_gencb->cb.cb_2 = (callback); }
-
-#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 : \
+
+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 : \
@@ -381,272 +139,314 @@
 (b) >= 150 ? 18 : \
 /* b >= 100 */ 27)
 
-#define BN_num_bytes(a)	((BN_num_bits(a)+7)/8)
-
-/* Note that BN_abs_is_word didn't work reliably for w == 0 until 0.9.8 */
-#define BN_abs_is_word(a,w) ((((a)->top == 1) && ((a)->d[0] == (BN_ULONG)(w))) || \
-				(((w) == 0) && ((a)->top == 0)))
-#define BN_is_zero(a) ((a)->top == 0)
-#define BN_is_one(a) (BN_abs_is_word((a),1) && !(a)->neg)
-#define BN_is_word(a,w) (BN_abs_is_word((a),(w)) && (!(w) || !(a)->neg))
-#define BN_is_odd(a)	 (((a)->top > 0) && ((a)->d[0] & 1))
-
-#define BN_one(a)	(BN_set_word((a),1))
-#define BN_zero_ex(a) \
-	do { \
-		BIGNUM *_tmp_bn = (a); \
-		_tmp_bn->top = 0; \
-		_tmp_bn->neg = 0; \
-	} while(0)
-#ifdef OPENSSL_NO_DEPRECATED
-#define BN_zero(a)	BN_zero_ex(a)
-#else
-#define BN_zero(a)	(BN_set_word((a),0))
-#endif
+# 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);
+char *BN_options(void);
 BN_CTX *BN_CTX_new(void);
-#ifndef OPENSSL_NO_DEPRECATED
-void	BN_CTX_init(BN_CTX *c);
-#endif
-void	BN_CTX_free(BN_CTX *c);
-void	BN_CTX_start(BN_CTX *ctx);
+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);
+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);
-void	BN_init(BIGNUM *);
-void	BN_clear_free(BIGNUM *a);
+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);
-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);
+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 
+ * \param n 0 if the BIGNUM b should be positive and a value != 0 otherwise
 */
-void	BN_set_negative(BIGNUM *b, int n);
+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
 */
-#define BN_is_negative(a) ((a)->neg != 0)
-
-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);
+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);
+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_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_FP_API
-int	BN_print_fp(FILE *fp, const BIGNUM *a);
-#endif
-#ifdef HEADER_BIO_H
-int	BN_print(BIO *fp, const BIGNUM *a);
-#else
-int	BN_print(void *fp, const BIGNUM *a);
-#endif
-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);
+ 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 */
+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);
+ const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx);
 BIGNUM *BN_mod_sqrt(BIGNUM *ret,
-	const BIGNUM *a, const BIGNUM *n,BN_CTX *ctx);
+ const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx);
+
+void BN_consttime_swap(BN_ULONG swap, BIGNUM *a, BIGNUM *b, int nwords);
 
 /* Deprecated versions */
-#ifndef OPENSSL_NO_DEPRECATED
-BIGNUM *BN_generate_prime(BIGNUM *ret,int bits,int safe,
-	const BIGNUM *add, const BIGNUM *rem,
-	void (*callback)(int,int,void *),void *cb_arg);
-int	BN_is_prime(const BIGNUM *p,int nchecks,
-	void (*callback)(int,int,void *),
-	BN_CTX *ctx,void *cb_arg);
-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);
-#endif /* !defined(OPENSSL_NO_DEPRECATED) */
+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);
-
-BN_MONT_CTX *BN_MONT_CTX_new(void );
-void BN_MONT_CTX_init(BN_MONT_CTX *ctx);
-int BN_mod_mul_montgomery(BIGNUM *r,const BIGNUM *a,const BIGNUM *b,
-	BN_MONT_CTX *mont, BN_CTX *ctx);
-#define BN_to_montgomery(r,a,mont,ctx)	BN_mod_mul_montgomery(\
-	(r),(a),&((mont)->RR),(mont),(ctx))
-int BN_from_montgomery(BIGNUM *r,const BIGNUM *a,
-	BN_MONT_CTX *mont, BN_CTX *ctx);
+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, int lock,
-					const BIGNUM *mod, BN_CTX *ctx);
+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
+# 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_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 *);
-#ifndef OPENSSL_NO_DEPRECATED
-unsigned long BN_BLINDING_get_thread_id(const BN_BLINDING *);
-void BN_BLINDING_set_thread_id(BN_BLINDING *, unsigned long);
-#endif
-CRYPTO_THREADID *BN_BLINDING_thread_id(BN_BLINDING *);
+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);
-
-#ifndef OPENSSL_NO_DEPRECATED
-void BN_set_params(int mul,int high,int low,int mont);
-int BN_get_params(int which); /* 0, mul, 1 high, 2 low, 3 mont */
-#endif
+ 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 */
 
-void	BN_RECP_CTX_init(BN_RECP_CTX *recp);
 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);
-
-/* Functions for arithmetic over binary polynomials represented by BIGNUMs. 
- *
+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.
+ * ignored. Note that input arguments are not const so that their bit arrays
+ * can be expanded to the appropriate size if needed.
 */
 
-int	BN_GF2m_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b); /*r = a + b*/
-#define BN_GF2m_sub(r, a, b) BN_GF2m_add(r, a, b)
-int	BN_GF2m_mod(BIGNUM *r, const BIGNUM *a, const BIGNUM *p); /*r=a mod p*/
-int	BN_GF2m_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-	const BIGNUM *p, BN_CTX *ctx); /* r = (a * b) mod p */
-int	BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-	BN_CTX *ctx); /* r = (a * a) mod p */
-int	BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *b, const BIGNUM *p,
-	BN_CTX *ctx); /* r = (1 / 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 = (a ^ b) mod p */
-int	BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-	BN_CTX *ctx); /* r = sqrt(a) mod p */
-int	BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-	BN_CTX *ctx); /* r^2 + r = a mod p */
-#define BN_GF2m_cmp(a, b) BN_ucmp((a), (b))
-/* Some functions allow for representation of the irreducible polynomials
+/*
+ * 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^p[0] + t^p[1] + ... + t^p[k]
 * where m = p[0] > p[1] > ... > p[k] = 0.
 */
-int	BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const int p[]);
-	/* r = a mod p */
-int	BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-	const int p[], BN_CTX *ctx); /* r = (a * b) mod p */
-int	BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const int p[],
-	BN_CTX *ctx); /* r = (a * a) mod p */
-int	BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *b, const int p[],
-	BN_CTX *ctx); /* r = (1 / 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 = (a ^ b) mod p */
-int	BN_GF2m_mod_sqrt_arr(BIGNUM *r, const BIGNUM *a,
-	const int p[], BN_CTX *ctx); /* r = sqrt(a) mod p */
-int	BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a,
-	const int p[], BN_CTX *ctx); /* r^2 + r = a mod p */
-int	BN_GF2m_poly2arr(const BIGNUM *a, int p[], int max);
-int	BN_GF2m_arr2poly(const int p[], BIGNUM *a);
-
-/* faster mod functions for the 'NIST primes' 
- * 0 <= a < p^2 */
+/* 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);
@@ -659,200 +459,117 @@
 const BIGNUM *BN_get0_nist_prime_384(void);
 const BIGNUM *BN_get0_nist_prime_521(void);
 
-/* library internal functions */
+int (*BN_nist_mod_func(const BIGNUM *p)) (BIGNUM *r, const BIGNUM *a,
+ const BIGNUM *field, BN_CTX *ctx);
 
-#define bn_expand(a,bits) ((((((bits+BN_BITS2-1))/BN_BITS2)) <= (a)->dmax)?\
-	(a):bn_expand2((a),(bits+BN_BITS2-1)/BN_BITS2))
-#define bn_wexpand(a,words) (((words) <= (a)->dmax)?(a):bn_expand2((a),(words)))
-BIGNUM *bn_expand2(BIGNUM *a, int words);
-#ifndef OPENSSL_NO_DEPRECATED
-BIGNUM *bn_dup_expand(const BIGNUM *a, int words); /* unused */
-#endif
-
-/* Bignum consistency macros
- * There is one "API" macro, bn_fix_top(), for stripping leading zeroes from
- * bignum data after direct manipulations on the data. There is also an
- * "internal" macro, bn_check_top(), for verifying that there are no leading
- * zeroes. Unfortunately, some auditing is required due to the fact that
- * bn_fix_top() has become an overabused duct-tape because bignum data is
- * occasionally passed around in an inconsistent state. So the following
- * changes have been made to sort this out;
- * - bn_fix_top()s implementation has been moved to bn_correct_top()
- * - if BN_DEBUG isn't defined, bn_fix_top() maps to bn_correct_top(), and
- * bn_check_top() is as before.
- * - if BN_DEBUG *is* defined;
- * - bn_check_top() tries to pollute unused words even if the bignum 'top' is
- * consistent. (ed: only if BN_DEBUG_RAND is defined)
- * - bn_fix_top() maps to bn_check_top() rather than "fixing" anything.
- * The idea is to have debug builds flag up inconsistent bignums when they
- * occur. If that occurs in a bn_fix_top(), we examine the code in question; if
- * the use of bn_fix_top() was appropriate (ie. it follows directly after code
- * that manipulates the bignum) it is converted to bn_correct_top(), and if it
- * was not appropriate, we convert it permanently to bn_check_top() and track
- * down the cause of the bug. Eventually, no internal code should be using the
- * bn_fix_top() macro. External applications and libraries should try this with
- * their own code too, both in terms of building against the openssl headers
- * with BN_DEBUG defined *and* linking with a version of OpenSSL built with it
- * defined. This not only improves external code, it provides more test
- * coverage for openssl's own code.
- */
-
-#ifdef BN_DEBUG
-
-/* We only need assert() when debugging */
-#include <assert.h>
-
-#ifdef BN_DEBUG_RAND
-/* To avoid "make update" cvs wars due to BN_DEBUG, use some tricks */
-#ifndef RAND_pseudo_bytes
-int RAND_pseudo_bytes(unsigned char *buf,int num);
-#define BN_DEBUG_TRIX
-#endif
-#define bn_pollute(a) \
-	do { \
-		const BIGNUM *_bnum1 = (a); \
-		if(_bnum1->top < _bnum1->dmax) { \
-			unsigned char _tmp_char; \
-			/* We cast away const without the compiler knowing, any \
-			 * *genuinely* constant variables that aren't mutable \
-			 * wouldn't be constructed with top!=dmax. */ \
-			BN_ULONG *_not_const; \
-			memcpy(&_not_const, &_bnum1->d, sizeof(BN_ULONG*)); \
-			RAND_pseudo_bytes(&_tmp_char, 1); \
-			memset((unsigned char *)(_not_const + _bnum1->top), _tmp_char, \
-				(_bnum1->dmax - _bnum1->top) * sizeof(BN_ULONG)); \
-		} \
-	} while(0)
-#ifdef BN_DEBUG_TRIX
-#undef RAND_pseudo_bytes
-#endif
-#else
-#define bn_pollute(a)
-#endif
-#define bn_check_top(a) \
-	do { \
-		const BIGNUM *_bnum2 = (a); \
-		if (_bnum2 != NULL) { \
-			assert((_bnum2->top == 0) || \
-				(_bnum2->d[_bnum2->top - 1] != 0)); \
-			bn_pollute(_bnum2); \
-		} \
-	} while(0)
-
-#define bn_fix_top(a)		bn_check_top(a)
-
-#else /* !BN_DEBUG */
-
-#define bn_pollute(a)
-#define bn_check_top(a)
-#define bn_fix_top(a)		bn_correct_top(a)
-
-#endif
-
-#define bn_correct_top(a) \
- { \
- BN_ULONG *ftl; \
-	int tmp_top = (a)->top; \
-	if (tmp_top > 0) \
-		{ \
-		for (ftl= &((a)->d[tmp_top-1]); tmp_top > 0; tmp_top--) \
-			if (*(ftl--)) break; \
-		(a)->top = tmp_top; \
-		} \
-	bn_pollute(a); \
-	}
-
-BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w);
-BN_ULONG bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w);
-void bn_sqr_words(BN_ULONG *rp, const BN_ULONG *ap, int num);
-BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d);
-BN_ULONG bn_add_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,int num);
-BN_ULONG bn_sub_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,int num);
+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 *get_rfc2409_prime_768(BIGNUM *bn);
-BIGNUM *get_rfc2409_prime_1024(BIGNUM *bn);
+BIGNUM *BN_get_rfc2409_prime_768(BIGNUM *bn);
+BIGNUM *BN_get_rfc2409_prime_1024(BIGNUM *bn);
 
 /* Primes from RFC 3526 */
-BIGNUM *get_rfc3526_prime_1536(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_2048(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_3072(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_4096(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_6144(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_8192(BIGNUM *bn);
+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);
+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
+/*
+ * 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.
 */
-void ERR_load_BN_strings(void);
+
+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_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_NO_BRANCH				 138
-#define BN_F_BN_DIV_RECP				 130
-#define BN_F_BN_EXP					 123
-#define BN_F_BN_EXPAND2					 108
-#define BN_F_BN_EXPAND_INTERNAL				 120
-#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_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_MUL_RECIPROCAL			 111
-#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_USUB					 115
+# 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_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_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_P_IS_NOT_PRIME				 112
-#define BN_R_TOO_MANY_ITERATIONS			 113
-#define BN_R_TOO_MANY_TEMPORARY_VARIABLES		 109
-
-#ifdef __cplusplus
+# 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
 #endif

gpac-0.7.1.tar.gz/extra_lib/include/openssl/buffer.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/buffer.h Changed

@@ -1,119 +1,76 @@
-/* crypto/buffer/buffer.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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
+# define HEADER_BUFFER_H
+
+# include <openssl/ossl_typ.h>
+# ifndef HEADER_CRYPTO_H
+# include <openssl/crypto.h>
+# endif
 
-#include <openssl/ossl_typ.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stddef.h>
-
-#if !defined(NO_SYS_TYPES_H)
-#include <sys/types.h>
-#endif
+# include <stddef.h>
 
-/* Already declared in ossl_typ.h */
-/* typedef struct buf_mem_st BUF_MEM; */
+# if !defined(NO_SYS_TYPES_H)
+# include <sys/types.h>
+# endif
 
-struct buf_mem_st
-	{
-	size_t length;	/* current number of bytes */
-	char *data;
-	size_t max;	/* size of buffer */
-	};
+/*
+ * 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)
 
-BUF_MEM *BUF_MEM_new(void);
-void	BUF_MEM_free(BUF_MEM *a);
-int	BUF_MEM_grow(BUF_MEM *str, size_t len);
-int	BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
-char *	BUF_strdup(const char *str);
-char *	BUF_strndup(const char *str, size_t siz);
-void *	BUF_memdup(const void *data, size_t siz);
-void	BUF_reverse(unsigned char *out, unsigned char *in, size_t siz);
+struct buf_mem_st {
+ size_t length; /* current number of bytes */
+ char *data;
+ size_t max; /* size of buffer */
+ unsigned long flags;
+};
 
-/* safe string functions */
-size_t BUF_strlcpy(char *dst,const char *src,size_t siz);
-size_t BUF_strlcat(char *dst,const char *src,size_t siz);
+# 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
+/*
+ * 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.
 */
-void ERR_load_BUF_strings(void);
+
+int ERR_load_BUF_strings(void);
 
 /* Error codes for the BUF functions. */
 
 /* Function codes. */
-#define BUF_F_BUF_MEMDUP				 103
-#define BUF_F_BUF_MEM_GROW				 100
-#define BUF_F_BUF_MEM_GROW_CLEAN			 105
-#define BUF_F_BUF_MEM_NEW				 101
-#define BUF_F_BUF_STRDUP				 102
-#define BUF_F_BUF_STRNDUP				 104
+# 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
+# ifdef __cplusplus
 }
-#endif
+# endif
 #endif

gpac-0.8.0.tar.gz/extra_lib/include/openssl/camellia.h Added

@@ -0,0 +1,83 @@
+/*
+ * 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_TYPE[CAMELLIA_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 ivec[CAMELLIA_BLOCK_SIZE],
+ unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
+ unsigned int *num);
+
+# ifdef __cplusplus
+}
+# endif
+# endif
+
+#endif

gpac-0.8.0.tar.gz/extra_lib/include/openssl/cast.h Added

@@ -0,0 +1,53 @@
+/*
+ * 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 data[32];
+ 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-0.8.0.tar.gz/extra_lib/include/openssl/cmac.h Added

@@ -0,0 +1,41 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/openssl/cms.h Added

@@ -0,0 +1,512 @@
+/*
+ * 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-0.7.1.tar.gz/extra_lib/include/openssl/comp.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/comp.h Changed

@@ -1,80 +1,72 @@
+/*
+ * 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
+# define HEADER_COMP_H
 
-#include <openssl/crypto.h>
+# include <openssl/opensslconf.h>
 
-#ifdef __cplusplus
+# ifndef OPENSSL_NO_COMP
+# include <openssl/crypto.h>
+# ifdef __cplusplus
 extern "C" {
-#endif
+# endif
 
-typedef struct comp_ctx_st COMP_CTX;
-
-typedef struct comp_method_st
-	{
-	int type;		/* NID for compression library */
-	const char *name;	/* A text string to identify the library */
-	int (*init)(COMP_CTX *ctx);
-	void (*finish)(COMP_CTX *ctx);
-	int (*compress)(COMP_CTX *ctx,
-			unsigned char *out, unsigned int olen,
-			unsigned char *in, unsigned int ilen);
-	int (*expand)(COMP_CTX *ctx,
-		 unsigned char *out, unsigned int olen,
-		 unsigned char *in, unsigned int ilen);
-	/* The following two do NOTHING, but are kept for backward compatibility */
-	long (*ctrl)(void);
-	long (*callback_ctrl)(void);
-	} COMP_METHOD;
-
-struct comp_ctx_st
-	{
-	COMP_METHOD *meth;
-	unsigned long compress_in;
-	unsigned long compress_out;
-	unsigned long expand_in;
-	unsigned long expand_out;
-
-	CRYPTO_EX_DATA	ex_data;
-	};
 
 
 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);
+ 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_rle(void );
-COMP_METHOD *COMP_zlib(void );
-void COMP_zlib_cleanup(void);
-
-#ifdef HEADER_BIO_H
-#ifdef ZLIB
-BIO_METHOD *BIO_f_zlib(void);
-#endif
+ 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
+/*
+ * 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.
 */
-void ERR_load_COMP_strings(void);
+
+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
+# 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
+# define COMP_R_ZLIB_DEFLATE_ERROR 99
+# define COMP_R_ZLIB_INFLATE_ERROR 100
+# define COMP_R_ZLIB_NOT_SUPPORTED 101
 
-#ifdef __cplusplus
+# ifdef __cplusplus
 }
-#endif
+# endif
+# endif
 #endif

gpac-0.7.1.tar.gz/extra_lib/include/openssl/conf.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/conf.h Changed

@@ -1,194 +1,148 @@
-/* crypto/conf/conf.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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
+# 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/bio.h>
+# include <openssl/lhash.h>
+# include <openssl/stack.h>
+# include <openssl/safestack.h>
+# include <openssl/e_os2.h>
 
-#include <openssl/ossl_typ.h>
+# include <openssl/ossl_typ.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct
-	{
-	char *section;
-	char *name;
-	char *value;
-	} CONF_VALUE;
+typedef struct {
+ char *section;
+ char *name;
+ char *value;
+} CONF_VALUE;
 
-DECLARE_STACK_OF(CONF_VALUE)
-DECLARE_LHASH_OF(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);
-	};
+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;
 
-DECLARE_STACK_OF(CONF_MODULE)
-DECLARE_STACK_OF(CONF_IMODULE)
+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);
+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
+# 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_FP_API
+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);
+ 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);
+ 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);
 
-void OPENSSL_config(const char *config_name);
-void OPENSSL_no_config(void);
+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 */
+/*
+ * 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;
-	};
+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);
-#if 0 /* Just to give you an idea of what I have in mind */
-CONF_METHOD *NCONF_XML(void);
-#endif
 void NCONF_free(CONF *conf);
 void NCONF_free_data(CONF *conf);
 
-int NCONF_load(CONF *conf,const char *file,long *eline);
-#ifndef OPENSSL_NO_FP_API
-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);
+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);
 
-#if 0 /* The following function has no error checking,
-	 and should therefore be avoided */
-long NCONF_get_number(CONF *conf,char *group,char *name);
-#else
 #define NCONF_get_number(c,g,n,r) NCONF_get_number_e(c,g,n,r)
-#endif
- 
+
 /* Module functions */
 
 int CONF_modules_load(const CONF *cnf, const char *appname,
-		 unsigned long flags);
+ unsigned long flags);
 int CONF_modules_load_file(const char *filename, const char *appname,
-			 unsigned long flags);
+ unsigned long flags);
 void CONF_modules_unload(int all);
 void CONF_modules_finish(void);
-void CONF_modules_free(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);
+ conf_finish_func *ffunc);
 
 const char *CONF_imodule_get_name(const CONF_IMODULE *md);
 const char *CONF_imodule_get_value(const CONF_IMODULE *md);
@@ -203,61 +157,61 @@
 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);
+ 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
+/*
+ * 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.
 */
-void ERR_load_CONF_strings(void);
+
+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_BIO				 102
-#define CONF_F_CONF_LOAD_FP				 103
-#define CONF_F_CONF_MODULES_LOAD			 116
-#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				 107
-#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
+# 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_FINISH_FUNCTION			 111
-#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_HAS_NO_VALUE			 104
-
-#ifdef __cplusplus
+# 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
 #endif

gpac-0.8.0.tar.gz/extra_lib/include/openssl/conf_api.h Added

@@ -0,0 +1,40 @@
+/*
+ * 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-0.7.1.tar.gz/extra_lib/include/openssl/crypto.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/crypto.h Changed

@@ -1,575 +1,463 @@
-/* crypto/crypto.h */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+/*
+ * 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 (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
+
 /* ====================================================================
 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by 
+ * ECDH support in OpenSSL originally developed by
 * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
 */
 
 #ifndef HEADER_CRYPTO_H
-#define HEADER_CRYPTO_H
+# define HEADER_CRYPTO_H
 
-#include <stdlib.h>
+# include <stdlib.h>
+# include <time.h>
 
-#include <openssl/e_os2.h>
+# include <openssl/e_os2.h>
 
-#ifndef OPENSSL_NO_FP_API
-#include <stdio.h>
-#endif
+# 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/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
+# 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>
+/*
+ * 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
 
-/* Backward compatibility to SSLeay */
-/* This is more to be used to check the correct DLL is being used
- * in the MS world. */
-#define SSLEAY_VERSION_NUMBER	OPENSSL_VERSION_NUMBER
-#define SSLEAY_VERSION		0
-/* #define SSLEAY_OPTIONS	1 no longer supported */
-#define SSLEAY_CFLAGS		2
-#define SSLEAY_BUILT_ON		3
-#define SSLEAY_PLATFORM		4
-#define SSLEAY_DIR		5
-
-/* Already declared in ossl_typ.h */
-#if 0
-typedef struct crypto_ex_data_st CRYPTO_EX_DATA;
-/* Called when a new object is created */
-typedef int CRYPTO_EX_new(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-					int idx, long argl, void *argp);
-/* Called when an object is free()ed */
-typedef void CRYPTO_EX_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-					int idx, long argl, void *argp);
-/* Called when we need to dup an object */
-typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from, void *from_d, 
-					int idx, long argl, void *argp);
-#endif
-
-/* A generic structure to pass assorted data in a expandable way */
-typedef struct openssl_item_st
-	{
-	int code;
-	void *value;		/* Not used for flag attributes */
-	size_t value_size;	/* Max size of value for output, length for input */
-	size_t *value_length;	/* Returned length of value for output */
-	} OPENSSL_ITEM;
-
-
-/* When changing the CRYPTO_LOCK_* list, be sure to maintin the text lock
- * names in cryptlib.c
+# 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;
 
-#define	CRYPTO_LOCK_ERR			1
-#define	CRYPTO_LOCK_EX_DATA		2
-#define	CRYPTO_LOCK_X509		3
-#define	CRYPTO_LOCK_X509_INFO		4
-#define	CRYPTO_LOCK_X509_PKEY		5
-#define CRYPTO_LOCK_X509_CRL		6
-#define CRYPTO_LOCK_X509_REQ		7
-#define CRYPTO_LOCK_DSA			8
-#define CRYPTO_LOCK_RSA			9
-#define CRYPTO_LOCK_EVP_PKEY		10
-#define CRYPTO_LOCK_X509_STORE		11
-#define CRYPTO_LOCK_SSL_CTX		12
-#define CRYPTO_LOCK_SSL_CERT		13
-#define CRYPTO_LOCK_SSL_SESSION		14
-#define CRYPTO_LOCK_SSL_SESS_CERT	15
-#define CRYPTO_LOCK_SSL			16
-#define CRYPTO_LOCK_SSL_METHOD		17
-#define CRYPTO_LOCK_RAND		18
-#define CRYPTO_LOCK_RAND2		19
-#define CRYPTO_LOCK_MALLOC		20
-#define CRYPTO_LOCK_BIO			21
-#define CRYPTO_LOCK_GETHOSTBYNAME	22
-#define CRYPTO_LOCK_GETSERVBYNAME	23
-#define CRYPTO_LOCK_READDIR		24
-#define CRYPTO_LOCK_RSA_BLINDING	25
-#define CRYPTO_LOCK_DH			26
-#define CRYPTO_LOCK_MALLOC2		27
-#define CRYPTO_LOCK_DSO			28
-#define CRYPTO_LOCK_DYNLOCK		29
-#define CRYPTO_LOCK_ENGINE		30
-#define CRYPTO_LOCK_UI			31
-#define CRYPTO_LOCK_ECDSA 32
-#define CRYPTO_LOCK_EC			33
-#define CRYPTO_LOCK_ECDH		34
-#define CRYPTO_LOCK_BN 		35
-#define CRYPTO_LOCK_EC_PRE_COMP		36
-#define CRYPTO_LOCK_STORE		37
-#define CRYPTO_LOCK_COMP		38
-#define CRYPTO_LOCK_FIPS		39
-#define CRYPTO_LOCK_FIPS2		40
-#define CRYPTO_NUM_LOCKS		41
-
-#define CRYPTO_LOCK		1
-#define CRYPTO_UNLOCK		2
-#define CRYPTO_READ		4
-#define CRYPTO_WRITE		8
-
-#ifndef OPENSSL_NO_LOCKING
-#ifndef CRYPTO_w_lock
-#define CRYPTO_w_lock(type)	\
-	CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-#define CRYPTO_w_unlock(type)	\
-	CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-#define CRYPTO_r_lock(type)	\
-	CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-#define CRYPTO_r_unlock(type)	\
-	CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-#define CRYPTO_add(addr,amount,type)	\
-	CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)
-#endif
-#else
-#define CRYPTO_w_lock(a)
-#define CRYPTO_w_unlock(a)
-#define CRYPTO_r_lock(a)
-#define CRYPTO_r_unlock(a)
-#define CRYPTO_add(a,b,c)	((*(a))+=(b))
-#endif
-
-/* Some applications as well as some parts of OpenSSL need to allocate
- and deallocate locks in a dynamic fashion. The following typedef
- makes this possible in a type-safe manner. */
-/* struct CRYPTO_dynlock_value has to be defined by the application. */
-typedef struct
-	{
-	int references;
-	struct CRYPTO_dynlock_value *data;
-	} CRYPTO_dynlock;
-
-
-/* The following can be used to detect memory leaks in the SSLeay library.
- * It used, it turns on malloc checking */
-
-#define CRYPTO_MEM_CHECK_OFF	0x0	/* an enume */
-#define CRYPTO_MEM_CHECK_ON	0x1	/* a bit */
-#define CRYPTO_MEM_CHECK_ENABLE	0x2	/* a bit */
-#define CRYPTO_MEM_CHECK_DISABLE 0x3	/* an enume */
+# endif /* OPENSSL_API_COMPAT */
 
-/* The following are bit values to turn on or off options connected to the
- * malloc checking functionality */
+typedef void CRYPTO_RWLOCK;
 
-/* Adds time to the memory checking information */
-#define V_CRYPTO_MDEBUG_TIME	0x1 /* a bit */
-/* Adds thread number to the memory checking information */
-#define V_CRYPTO_MDEBUG_THREAD	0x2 /* a bit */
+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);
 
-#define V_CRYPTO_MDEBUG_ALL (V_CRYPTO_MDEBUG_TIME | V_CRYPTO_MDEBUG_THREAD)
+int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock);
 
-
-/* predec of the BIO type */
-typedef struct bio_st BIO_dummy;
-
-struct crypto_ex_data_st
-	{
-	STACK_OF(void) *sk;
-	int dummy; /* gcc is screwing up this data structure :-( */
-	};
-DECLARE_STACK_OF(void)
-
-/* This stuff is basically class callback functions
- * The current classes are SSL_CTX, SSL, SSL_SESSION, and a few more */
-
-typedef struct crypto_ex_data_func_st
-	{
-	long argl;	/* Arbitary long */
-	void *argp;	/* Arbitary void * */
-	CRYPTO_EX_new *new_func;
-	CRYPTO_EX_free *free_func;
-	CRYPTO_EX_dup *dup_func;
-	} CRYPTO_EX_DATA_FUNCS;
-
-DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS)
-
-/* Per class, we have a STACK of CRYPTO_EX_DATA_FUNCS for each CRYPTO_EX_DATA
- * entry.
+/*
+ * The following can be used to detect memory leaks in the library. If
+ * used, it turns on malloc checking
 */
-
-#define CRYPTO_EX_INDEX_BIO		0
-#define CRYPTO_EX_INDEX_SSL		1
-#define CRYPTO_EX_INDEX_SSL_CTX		2
-#define CRYPTO_EX_INDEX_SSL_SESSION	3
-#define CRYPTO_EX_INDEX_X509_STORE	4
-#define CRYPTO_EX_INDEX_X509_STORE_CTX	5
-#define CRYPTO_EX_INDEX_RSA		6
-#define CRYPTO_EX_INDEX_DSA		7
-#define CRYPTO_EX_INDEX_DH		8
-#define CRYPTO_EX_INDEX_ENGINE		9
-#define CRYPTO_EX_INDEX_X509		10
-#define CRYPTO_EX_INDEX_UI		11
-#define CRYPTO_EX_INDEX_ECDSA		12
-#define CRYPTO_EX_INDEX_ECDH		13
-#define CRYPTO_EX_INDEX_COMP		14
-#define CRYPTO_EX_INDEX_STORE		15
-
-/* Dynamically assigned indexes start from this value (don't use directly, use
- * via CRYPTO_ex_data_new_class). */
-#define CRYPTO_EX_INDEX_USER		100
-
-
-/* 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 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_malloc_init()	CRYPTO_set_mem_functions(\
-	malloc, realloc, free)
-
-#if defined CRYPTO_MDEBUG_ALL || defined CRYPTO_MDEBUG_TIME || defined CRYPTO_MDEBUG_THREAD
-# ifndef CRYPTO_MDEBUG /* avoid duplicate #define */
-# define CRYPTO_MDEBUG
-# endif
-#endif
-
-/* Set standard debugging functions (not done by default
- * unless CRYPTO_MDEBUG is defined) */
-#define CRYPTO_malloc_debug_init()	do {\
-	CRYPTO_set_mem_debug_functions(\
-		CRYPTO_dbg_malloc,\
-		CRYPTO_dbg_realloc,\
-		CRYPTO_dbg_free,\
-		CRYPTO_dbg_set_options,\
-		CRYPTO_dbg_get_options);\
-	} while(0)
+# 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);
-int CRYPTO_is_mem_check_on(void);
-
-/* for applications */
-#define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON)
-#define MemCheck_stop()	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF)
-
-/* for library-internal use */
-#define MemCheck_on()	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE)
-#define MemCheck_off()	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)
-#define is_MemCheck_on() CRYPTO_is_mem_check_on()
 
-#define OPENSSL_malloc(num)	CRYPTO_malloc((int)num,__FILE__,__LINE__)
-#define OPENSSL_strdup(str)	CRYPTO_strdup((str),__FILE__,__LINE__)
-#define OPENSSL_realloc(addr,num) \
-	CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__)
-#define OPENSSL_realloc_clean(addr,old_num,num) \
-	CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__)
-#define OPENSSL_remalloc(addr,num) \
-	CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__)
-#define OPENSSL_freeFunc	CRYPTO_free
-#define OPENSSL_free(addr)	CRYPTO_free(addr)
-
-#define OPENSSL_malloc_locked(num) \
-	CRYPTO_malloc_locked((int)num,__FILE__,__LINE__)
-#define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr)
-
-
-const char *SSLeay_version(int type);
-unsigned long SSLeay(void);
+# 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);
 
-/* An opaque type representing an implementation of "ex_data" support */
-typedef struct st_CRYPTO_EX_DATA_IMPL	CRYPTO_EX_DATA_IMPL;
-/* Return an opaque pointer to the current "ex_data" implementation */
-const CRYPTO_EX_DATA_IMPL *CRYPTO_get_ex_data_implementation(void);
-/* Sets the "ex_data" implementation to be used (if it's not too late) */
-int CRYPTO_set_ex_data_implementation(const CRYPTO_EX_DATA_IMPL *i);
-/* Get a new "ex_data" class, and return the corresponding "class_index" */
-int CRYPTO_ex_data_new_class(void);
-/* Within a given class, get/register a new index */
-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);
-/* Initialise/duplicate/free CRYPTO_EX_DATA variables corresponding to a given
- * class (invokes whatever per-class callbacks are applicable) */
+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,
-		CRYPTO_EX_DATA *from);
+ 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) */
+
+/*
+ * 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);
-/* This function cleans up all "ex_data" state. It mustn't be called under
- * potential race-conditions. */
-void CRYPTO_cleanup_all_ex_data(void);
-
-int CRYPTO_get_new_lockid(char *name);
-
-int CRYPTO_num_locks(void); /* return CRYPTO_NUM_LOCKS (shared libs!) */
-void CRYPTO_lock(int mode, int type,const char *file,int line);
-void CRYPTO_set_locking_callback(void (*func)(int mode,int type,
-					 const char *file,int line));
-void (*CRYPTO_get_locking_callback(void))(int mode,int type,const char *file,
-		int line);
-void CRYPTO_set_add_lock_callback(int (*func)(int *num,int mount,int type,
-					 const char *file, int line));
-int (*CRYPTO_get_add_lock_callback(void))(int *num,int mount,int type,
-					 const char *file,int line);
-
-/* Don't use this structure directly. */
-typedef struct crypto_threadid_st
-	{
-	void *ptr;
-	unsigned long val;
-	} CRYPTO_THREADID;
-/* Only use CRYPTO_THREADID_set_[numeric|pointer]() within callbacks */
-void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val);
-void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr);
-int CRYPTO_THREADID_set_callback(void (*threadid_func)(CRYPTO_THREADID *));
-void (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *);
-void CRYPTO_THREADID_current(CRYPTO_THREADID *id);
-int CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a, const CRYPTO_THREADID *b);
-void CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest, const CRYPTO_THREADID *src);
-unsigned long CRYPTO_THREADID_hash(const CRYPTO_THREADID *id);
-#ifndef OPENSSL_NO_DEPRECATED
-void CRYPTO_set_id_callback(unsigned long (*func)(void));
-unsigned long (*CRYPTO_get_id_callback(void))(void);
-unsigned long CRYPTO_thread_id(void);
-#endif
+void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx);
 
-const char *CRYPTO_get_lock_name(int type);
-int CRYPTO_add_lock(int *pointer,int amount,int type, const char *file,
-		 int line);
-
-int CRYPTO_get_new_dynlockid(void);
-void CRYPTO_destroy_dynlockid(int i);
-struct CRYPTO_dynlock_value *CRYPTO_get_dynlock_value(int i);
-void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *(*dyn_create_function)(const char *file, int line));
-void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)(int mode, struct CRYPTO_dynlock_value *l, const char *file, int line));
-void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)(struct CRYPTO_dynlock_value *l, const char *file, int line));
-struct CRYPTO_dynlock_value *(*CRYPTO_get_dynlock_create_callback(void))(const char *file,int line);
-void (*CRYPTO_get_dynlock_lock_callback(void))(int mode, struct CRYPTO_dynlock_value *l, const char *file,int line);
-void (*CRYPTO_get_dynlock_destroy_callback(void))(struct CRYPTO_dynlock_value *l, const char *file,int line);
-
-/* CRYPTO_set_mem_functions includes CRYPTO_set_locked_mem_functions --
- * call the latter last if you need different functions */
-int CRYPTO_set_mem_functions(void *(*m)(size_t),void *(*r)(void *,size_t), void (*f)(void *));
-int CRYPTO_set_locked_mem_functions(void *(*m)(size_t), void (*free_func)(void *));
-int CRYPTO_set_mem_ex_functions(void *(*m)(size_t,const char *,int),
- void *(*r)(void *,size_t,const char *,int),
- void (*f)(void *));
-int CRYPTO_set_locked_mem_ex_functions(void *(*m)(size_t,const char *,int),
- void (*free_func)(void *));
-int CRYPTO_set_mem_debug_functions(void (*m)(void *,int,const char *,int,int),
-				 void (*r)(void *,void *,int,const char *,int,int),
-				 void (*f)(void *,int),
-				 void (*so)(long),
-				 long (*go)(void));
-void CRYPTO_get_mem_functions(void *(**m)(size_t),void *(**r)(void *, size_t), void (**f)(void *));
-void CRYPTO_get_locked_mem_functions(void *(**m)(size_t), void (**f)(void *));
-void CRYPTO_get_mem_ex_functions(void *(**m)(size_t,const char *,int),
- void *(**r)(void *, size_t,const char *,int),
- void (**f)(void *));
-void CRYPTO_get_locked_mem_ex_functions(void *(**m)(size_t,const char *,int),
- void (**f)(void *));
-void CRYPTO_get_mem_debug_functions(void (**m)(void *,int,const char *,int,int),
-				 void (**r)(void *,void *,int,const char *,int,int),
-				 void (**f)(void *,int),
-				 void (**so)(long),
-				 long (**go)(void));
-
-void *CRYPTO_malloc_locked(int num, const char *file, int line);
-void CRYPTO_free_locked(void *);
-void *CRYPTO_malloc(int num, const char *file, int line);
+# 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);
-void CRYPTO_free(void *);
-void *CRYPTO_realloc(void *addr,int num, const char *file, int line);
-void *CRYPTO_realloc_clean(void *addr,int old_num,int num,const char *file,
-			 int line);
-void *CRYPTO_remalloc(void *addr,int num, 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);
 
-void CRYPTO_set_mem_debug_options(long bits);
-long CRYPTO_get_mem_debug_options(void);
+# 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
 
-#define CRYPTO_push_info(info) \
- CRYPTO_push_info_(info, __FILE__, __LINE__);
-int CRYPTO_push_info_(const char *info, const char *file, int line);
-int CRYPTO_pop_info(void);
-int CRYPTO_remove_all_info(void);
+/* 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);
 
-/* Default debugging functions (enabled by CRYPTO_malloc_debug_init() macro;
- * used as default in CRYPTO_MDEBUG compilations): */
-/* The last 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_dbg_malloc(void *addr,int num,const char *file,int line,int before_p);
-void CRYPTO_dbg_realloc(void *addr1,void *addr2,int num,const char *file,int line,int before_p);
-void CRYPTO_dbg_free(void *addr,int before_p);
-/* Tell the debugging code about options. By default, the following values
- * apply:
- *
- * 0: Clear all options.
- * V_CRYPTO_MDEBUG_TIME (1): Set the "Show Time" option.
- * V_CRYPTO_MDEBUG_THREAD (2): Set the "Show Thread Number" option.
- * V_CRYPTO_MDEBUG_ALL (3): 1 + 2
+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.
 */
-void CRYPTO_dbg_set_options(long bits);
-long CRYPTO_dbg_get_options(void);
+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
 
-#ifndef OPENSSL_NO_FP_API
-void CRYPTO_mem_leaks_fp(FILE *);
-#endif
-void CRYPTO_mem_leaks(struct bio_st *bio);
-/* unsigned long order, char *file, int line, int num_bytes, char *addr */
-typedef void *CRYPTO_MEM_LEAK_CB(unsigned long, const char *, int, int, void *);
-void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb);
+int CRYPTO_THREAD_run_once(CRYPTO_ONCE *once, void (*init)(void));
 
-/* die if we have to */
-void OpenSSLDie(const char *file,int line,const char *assertion);
-#define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))
+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);
 
-unsigned long *OPENSSL_ia32cap_loc(void);
-#define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))
-int OPENSSL_isservice(void);
+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
+/*
+ * 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.
 */
-void ERR_load_CRYPTO_strings(void);
+
+int ERR_load_CRYPTO_strings(void);
 
 /* Error codes for the CRYPTO functions. */
 
 /* Function codes. */
-#define CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX		 100
-#define CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID		 103
-#define CRYPTO_F_CRYPTO_GET_NEW_LOCKID			 101
-#define CRYPTO_F_CRYPTO_SET_EX_DATA			 102
-#define CRYPTO_F_DEF_ADD_INDEX				 104
-#define CRYPTO_F_DEF_GET_CLASS				 105
-#define CRYPTO_F_INT_DUP_EX_DATA			 106
-#define CRYPTO_F_INT_FREE_EX_DATA			 107
-#define CRYPTO_F_INT_NEW_EX_DATA			 108
+# 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_NO_DYNLOCK_CREATE_CALLBACK		 100
+# 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
+# ifdef __cplusplus
 }
-#endif
+# endif
 #endif

gpac-0.8.0.tar.gz/extra_lib/include/openssl/ct.h Added

@@ -0,0 +1,533 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/openssl/des.h Added

@@ -0,0 +1,174 @@
+/*
+ * 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_cblock[8];
+typedef /* const */ unsigned char const_DES_cblock[8];
+/*
+ * 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 deslong[2];
+ } ks[16];
+} 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-0.7.1.tar.gz/extra_lib/include/openssl/dh.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/dh.h Changed

@@ -1,168 +1,115 @@
-/* crypto/dh/dh.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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
+# define HEADER_DH_H
 
-#include <openssl/e_os2.h>
+# include <openssl/opensslconf.h>
 
-#ifdef OPENSSL_NO_DH
-#error DH is disabled.
-#endif
+# 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
 
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#endif
-	
-#ifndef OPENSSL_DH_MAX_MODULUS_BITS
-# define OPENSSL_DH_MAX_MODULUS_BITS	10000
-#endif
+# ifdef __cplusplus
+extern "C" {
+# endif
 
-#define DH_FLAG_CACHE_MONT_P 0x01
-#define DH_FLAG_NO_EXP_CONSTTIME 0x02 /* new with 0.9.7h; the built-in DH
- * 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.
- */
+# ifndef OPENSSL_DH_MAX_MODULUS_BITS
+# define OPENSSL_DH_MAX_MODULUS_BITS 10000
+# endif
 
-#ifdef __cplusplus
-extern "C" {
-#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; */
 
-struct dh_method
-	{
-	const char *name;
-	/* Methods here */
-	int (*generate_key)(DH *dh);
-	int (*compute_key)(unsigned char *key,const BIGNUM *pub_key,DH *dh);
-	int (*bn_mod_exp)(const DH *dh, BIGNUM *r, const BIGNUM *a,
-				const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
-				BN_MONT_CTX *m_ctx); /* Can be null */
-
-	int (*init)(DH *dh);
-	int (*finish)(DH *dh);
-	int flags;
-	char *app_data;
-	/* If this is non-NULL, it will be used to generate parameters */
-	int (*generate_params)(DH *dh, int prime_len, int generator, BN_GENCB *cb);
-	};
-
-struct dh_st
-	{
-	/* This first argument is used to pick up errors when
-	 * a DH is passed instead of a EVP_PKEY */
-	int pad;
-	int version;
-	BIGNUM *p;
-	BIGNUM *g;
-	long length; /* optional */
-	BIGNUM *pub_key;	/* g^x */
-	BIGNUM *priv_key;	/* x */
-
-	int flags;
-	BN_MONT_CTX *method_mont_p;
-	/* Place holders if we want to do X9.42 DH */
-	BIGNUM *q;
-	BIGNUM *j;
-	unsigned char *seed;
-	int seedlen;
-	BIGNUM *counter;
-
-	int references;
-	CRYPTO_EX_DATA ex_data;
-	const DH_METHOD *meth;
-	ENGINE *engine;
-	};
-
-#define DH_GENERATOR_2		2
-/* #define DH_GENERATOR_3	3 */
-#define DH_GENERATOR_5		5
+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_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_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)
+/*
+ * 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 *);
 
@@ -173,88 +120,242 @@
 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_size(const DH *dh);
-int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	 CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
+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 */
-#ifndef OPENSSL_NO_DEPRECATED
-DH *	DH_generate_parameters(int prime_len,int generator,
-		void (*callback)(int,int,void *),void *cb_arg);
-#endif /* !defined(OPENSSL_NO_DEPRECATED) */
+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(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);
-DH *	d2i_DHparams(DH **a,const unsigned char **pp, long length);
-int	i2d_DHparams(const DH *a,unsigned char **pp);
-#ifndef OPENSSL_NO_FP_API
-int	DHparams_print_fp(FILE *fp, const DH *x);
-#endif
-#ifndef OPENSSL_NO_BIO
-int	DHparams_print(BIO *bp, const DH *x);
-#else
-int	DHparams_print(char *bp, const DH *x);
-#endif
-
-#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_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_CTRL_DH_PARAMGEN_PRIME_LEN	(EVP_PKEY_ALG_CTRL + 1)
-#define	EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR	(EVP_PKEY_ALG_CTRL + 2)
-		
+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
+/*
+ * 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.
 */
-void ERR_load_DH_strings(void);
+
+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_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_GENERATE_PARAMETERS			 104
-#define DH_F_PKEY_DH_DERIVE				 112
-#define DH_F_PKEY_DH_KEYGEN				 113
+# 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_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
-
-#ifdef __cplusplus
+# 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
 #endif

gpac-0.7.1.tar.gz/extra_lib/include/openssl/dsa.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/dsa.h Changed

@@ -1,307 +1,283 @@
-/* crypto/dsa/dsa.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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>. He basically did the
- * work and I have just tweaked them a little to fit into my
- * stylistic vision for SSLeay :-) */
+ * Steven Schoch <schoch@sheba.arc.nasa.gov>.
+ */
 
 #ifndef HEADER_DSA_H
-#define HEADER_DSA_H
+# define HEADER_DSA_H
 
-#include <openssl/e_os2.h>
-
-#ifdef OPENSSL_NO_DSA
-#error DSA is disabled.
-#endif
+# include <openssl/opensslconf.h>
 
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#include <openssl/crypto.h>
-#include <openssl/ossl_typ.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
 
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#ifndef OPENSSL_NO_DH
-# include <openssl/dh.h>
-#endif
-#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.
+ */
 
-#ifndef OPENSSL_DSA_MAX_MODULUS_BITS
-# define OPENSSL_DSA_MAX_MODULUS_BITS	10000
-#endif
+# define DSA_FLAG_FIPS_METHOD 0x0400
 
-#define DSA_FLAG_CACHE_MONT_P	0x01
-#define DSA_FLAG_NO_EXP_CONSTTIME 0x02 /* new with 0.9.7h; the built-in DSA
- * 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.
- */
+/*
+ * 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.
+ */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+# 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
-	{
-	BIGNUM *r;
-	BIGNUM *s;
-	} DSA_SIG;
-
-struct dsa_method
-	{
-	const char *name;
-	DSA_SIG * (*dsa_do_sign)(const unsigned char *dgst, int dlen, DSA *dsa);
-	int (*dsa_sign_setup)(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp,
-								BIGNUM **rp);
-	int (*dsa_do_verify)(const unsigned char *dgst, int dgst_len,
-			 DSA_SIG *sig, DSA *dsa);
-	int (*dsa_mod_exp)(DSA *dsa, BIGNUM *rr, BIGNUM *a1, BIGNUM *p1,
-			BIGNUM *a2, BIGNUM *p2, BIGNUM *m, BN_CTX *ctx,
-			BN_MONT_CTX *in_mont);
-	int (*bn_mod_exp)(DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
-				const BIGNUM *m, BN_CTX *ctx,
-				BN_MONT_CTX *m_ctx); /* Can be null */
-	int (*init)(DSA *dsa);
-	int (*finish)(DSA *dsa);
-	int flags;
-	char *app_data;
-	/* If this is non-NULL, it is used to generate DSA parameters */
-	int (*dsa_paramgen)(DSA *dsa, int bits,
-			const unsigned char *seed, int seed_len,
-			int *counter_ret, unsigned long *h_ret,
-			BN_GENCB *cb);
-	/* If this is non-NULL, it is used to generate DSA keys */
-	int (*dsa_keygen)(DSA *dsa);
-	};
-
-struct dsa_st
-	{
-	/* This first variable is used to pick up errors where
-	 * a DSA is passed instead of of a EVP_PKEY */
-	int pad;
-	long version;
-	int write_params;
-	BIGNUM *p;
-	BIGNUM *q;	/* == 20 */
-	BIGNUM *g;
-
-	BIGNUM *pub_key; /* y public key */
-	BIGNUM *priv_key; /* x private key */
-
-	BIGNUM *kinv;	/* Signing pre-calc */
-	BIGNUM *r;	/* Signing pre-calc */
-
-	int flags;
-	/* Normally used to cache montgomery values */
-	BN_MONT_CTX *method_mont_p;
-	int references;
-	CRYPTO_EX_DATA ex_data;
-	const DSA_METHOD *meth;
-	/* functional reference if 'meth' is ENGINE-provided */
-	ENGINE *engine;
-	};
-
-#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)
+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);
+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);
+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 *);
+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 *);
+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);
+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 *);
-	/* 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);
-int DSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	 CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
+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);
+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 */
-#ifndef OPENSSL_NO_DEPRECATED
-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);
-#endif /* !defined(OPENSSL_NO_DEPRECATED) */
+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);
-
-#ifndef OPENSSL_NO_BIO
-int	DSAparams_print(BIO *bp, const DSA *x);
-int	DSA_print(BIO *bp, const DSA *x, int off);
-#endif
-#ifndef OPENSSL_NO_FP_API
-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)
+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!) */
+# 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)
+# 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
+/*
+ * 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.
 */
-void ERR_load_DSA_strings(void);
+
+int ERR_load_DSA_strings(void);
 
 /* Error codes for the DSA functions. */
 
 /* Function codes. */
-#define DSA_F_D2I_DSA_SIG				 110
-#define DSA_F_DO_DSA_PRINT				 104
-#define DSA_F_DSAPARAMS_PRINT				 100
-#define DSA_F_DSAPARAMS_PRINT_FP			 101
-#define DSA_F_DSA_DO_SIGN				 112
-#define DSA_F_DSA_DO_VERIFY				 113
-#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				 109
-#define DSA_F_DSA_VERIFY				 108
-#define DSA_F_I2D_DSA_SIG				 111
-#define DSA_F_OLD_DSA_PRIV_DECODE			 122
-#define DSA_F_PKEY_DSA_CTRL				 120
-#define DSA_F_PKEY_DSA_KEYGEN				 121
-#define DSA_F_SIG_CB					 114
+# 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_DATA_TOO_LARGE_FOR_KEY_SIZE		 100
-#define DSA_R_DECODE_ERROR				 104
-#define DSA_R_INVALID_DIGEST_TYPE			 106
-#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
-
-#ifdef __cplusplus
+# 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
 #endif

gpac-0.7.1.tar.gz/extra_lib/include/openssl/dtls1.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/dtls1.h Changed

@@ -1,267 +1,56 @@
-/* ssl/dtls1.h */
-/* 
- * DTLS implementation written by Nagendra Modadugu
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 
- */
-/* ====================================================================
- * Copyright (c) 1999-2005 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+/*
+ * 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 
-
-#include <openssl/buffer.h>
-#include <openssl/pqueue.h>
-#ifdef OPENSSL_SYS_VMS
-#include <resource.h>
-#include <sys/timeb.h>
-#endif
-#ifdef OPENSSL_SYS_WIN32
-/* Needed for struct timeval */
-#include <winsock.h>
-#elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
-#include <sys/timeval.h>
-#else
-#include <sys/time.h>
-#endif
+#ifndef HEADER_DTLS1_H
+# define HEADER_DTLS1_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define DTLS1_VERSION			0xFEFF
-#define DTLS1_BAD_VER			0x0100
-
-#if 0
-/* this alert description is not specified anywhere... */
-#define DTLS1_AD_MISSING_HANDSHAKE_MESSAGE 110
-#endif
-
-/* lengths of messages */
-#define DTLS1_COOKIE_LENGTH 256
-
-#define DTLS1_RT_HEADER_LENGTH 13
+# 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_HM_HEADER_LENGTH 12
+# define DTLS1_BAD_VER 0x0100
 
-#define DTLS1_HM_BAD_FRAGMENT -2
-#define DTLS1_HM_FRAGMENT_RETRY -3
+/* Special value for method supporting multiple versions */
+# define DTLS_ANY_VERSION 0x1FFFF
 
-#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
-
-
-typedef struct dtls1_bitmap_st
-	{
-	unsigned long map;		/* track 32 packets on 32-bit systems
-					 and 64 - on 64-bit systems */
-	unsigned char max_seq_num[8];	/* max record number seen so far,
-					 64-bit value in big-endian
-					 encoding */
-	} DTLS1_BITMAP;
-
-struct dtls1_retransmit_state
-	{
-	EVP_CIPHER_CTX *enc_write_ctx;	/* cryptographic state */
-	EVP_MD_CTX *write_hash;			/* used for mac generation */
-#ifndef OPENSSL_NO_COMP
-	COMP_CTX *compress;				/* compression */
-#else
-	char *compress;	
-#endif
-	SSL_SESSION *session;
-	unsigned short epoch;
-	};
-
-struct hm_header_st
-	{
-	unsigned char type;
-	unsigned long msg_len;
-	unsigned short seq;
-	unsigned long frag_off;
-	unsigned long frag_len;
-	unsigned int is_ccs;
-	struct dtls1_retransmit_state saved_retransmit_state;
-	};
-
-struct ccs_header_st
-	{
-	unsigned char type;
-	unsigned short seq;
-	};
-
-struct dtls1_timeout_st
-	{
-	/* Number of read timeouts so far */
-	unsigned int read_timeouts;
-	
-	/* Number of write timeouts so far */
-	unsigned int write_timeouts;
-	
-	/* Number of alerts received so far */
-	unsigned int num_alerts;
-	};
-
-typedef struct record_pqueue_st
-	{
-	unsigned short epoch;
-	pqueue q;
-	} record_pqueue;
-
-typedef struct hm_fragment_st
-	{
-	struct hm_header_st msg_header;
-	unsigned char *fragment;
-	unsigned char *reassembly;
-	} hm_fragment;
-
-typedef struct dtls1_state_st
-	{
-	unsigned int send_cookie;
-	unsigned char cookie[DTLS1_COOKIE_LENGTH];
-	unsigned char rcvd_cookie[DTLS1_COOKIE_LENGTH];
-	unsigned int cookie_len;
-
-	/* 
-	 * The current data and handshake epoch. This is initially
-	 * undefined, and starts at zero once the initial handshake is
-	 * completed 
-	 */
-	unsigned short r_epoch;
-	unsigned short w_epoch;
-
-	/* records being received in the current epoch */
-	DTLS1_BITMAP bitmap;
-
-	/* renegotiation starts a new set of sequence numbers */
-	DTLS1_BITMAP next_bitmap;
-
-	/* handshake message numbers */
-	unsigned short handshake_write_seq;
-	unsigned short next_handshake_write_seq;
-
-	unsigned short handshake_read_seq;
-
-	/* save last sequence number for retransmissions */
-	unsigned char last_write_sequence[8];
-
-	/* Received handshake records (processed and unprocessed) */
-	record_pqueue unprocessed_rcds;
-	record_pqueue processed_rcds;
-
-	/* Buffered handshake messages */
-	pqueue buffered_messages;
-
-	/* Buffered (sent) handshake records */
-	pqueue sent_messages;
-
-	/* Buffered application records.
-	 * Only for records between CCS and Finished
-	 * to prevent either protocol violation or
-	 * unnecessary message loss.
-	 */
-	record_pqueue buffered_app_data;
-
-	/* Is set when listening for new connections with dtls1_listen() */
-	unsigned int listen;
-
-	unsigned int mtu; /* max DTLS packet size */
-
-	struct hm_header_st w_msg_hdr;
-	struct hm_header_st r_msg_hdr;
-
-	struct dtls1_timeout_st timeout;
-
-	/* Indicates when the last handshake msg sent will timeout */
-	struct timeval next_timeout;
+/* lengths of messages */
+# define DTLS1_COOKIE_LENGTH 256
 
-	/* Timeout duration */
-	unsigned short timeout_duration;
+# define DTLS1_RT_HEADER_LENGTH 13
 
-	/* storage for Alert/Handshake protocol data received but not
-	 * yet processed by ssl3_read_bytes: */
-	unsigned char alert_fragment[DTLS1_AL_HEADER_LENGTH];
-	unsigned int alert_fragment_len;
-	unsigned char handshake_fragment[DTLS1_HM_HEADER_LENGTH];
-	unsigned int handshake_fragment_len;
+# define DTLS1_HM_HEADER_LENGTH 12
 
-	unsigned int retransmitting;
-	unsigned int change_cipher_spec_ok;
+# define DTLS1_HM_BAD_FRAGMENT -2
+# define DTLS1_HM_FRAGMENT_RETRY -3
 
-	} DTLS1_STATE;
+# define DTLS1_CCS_HEADER_LENGTH 1
 
-typedef struct dtls1_record_data_st
-	{
-	unsigned char *packet;
-	unsigned int packet_length;
-	SSL3_BUFFER rbuf;
-	SSL3_RECORD rrec;
-	} DTLS1_RECORD_DATA;
+# 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_READ_COUNT 2
+# define DTLS1_TMO_WRITE_COUNT 2
 
-#define DTLS1_TMO_ALERT_COUNT 12
+# define DTLS1_TMO_ALERT_COUNT 12
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-

gpac-0.7.1.tar.gz/extra_lib/include/openssl/e_os2.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/e_os2.h Changed

@@ -1,62 +1,16 @@
-/* e_os2.h */
-/* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+/*
+ * 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
 */
 
-#include <openssl/opensslconf.h>
-
 #ifndef HEADER_E_OS2_H
-#define HEADER_E_OS2_H
+# define HEADER_E_OS2_H
+
+# include <openssl/opensslconf.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -68,220 +22,275 @@
 * However, if none is defined, Unix is assumed.
 **/
 
-#define OPENSSL_SYS_UNIX
-
-/* ----------------------- Macintosh, before MacOS X ----------------------- */
-#if defined(__MWERKS__) && defined(macintosh) || defined(OPENSSL_SYSNAME_MAC)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_MACINTOSH_CLASSIC
-#endif
-
-/* ----------------------- NetWare ----------------------------------------- */
-#if defined(NETWARE) || defined(OPENSSL_SYSNAME_NETWARE)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_NETWARE
-#endif
+# define OPENSSL_SYS_UNIX
 
-/* ---------------------- Microsoft operating systems ---------------------- */
+/* --------------------- Microsoft operating systems ---------------------- */
 
-/* Note that MSDOS actually denotes 32-bit environments running on top of
- MS-DOS, such as DJGPP one. */
-#if defined(OPENSSL_SYSNAME_MSDOS)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_MSDOS
-#endif
+/*
+ * 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... */
-#if defined(OPENSSL_SYSNAME_UWIN)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_WIN32_UWIN
-#else
-# if defined(__CYGWIN32__) || defined(OPENSSL_SYSNAME_CYGWIN32)
+/*
+ * 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
-# define OPENSSL_SYS_WIN32_CYGWIN
+# elif defined(OPENSSL_SYS_UWIN)
+# undef OPENSSL_SYS_UNIX
+# define OPENSSL_SYS_WIN32_UWIN
 # else
-# if defined(_WIN32) || defined(OPENSSL_SYSNAME_WIN32)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_WIN32
-# endif
-# if defined(OPENSSL_SYSNAME_WINNT)
+# if defined(__CYGWIN__) || defined(OPENSSL_SYS_CYGWIN)
 # undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_WINNT
-# endif
-# if defined(OPENSSL_SYSNAME_WINCE)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_WINCE
+# 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
-#endif
 
 /* Anything that tries to look like Microsoft is "Windows" */
-#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINNT) || defined(OPENSSL_SYS_WINCE)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_WINDOWS
-# ifndef OPENSSL_SYS_MSDOS
-# define OPENSSL_SYS_MSDOS
+# 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
-#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
+/*
+ * 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
-#endif
 
-/* -------------------------------- OpenVMS -------------------------------- */
-#if defined(__VMS) || defined(VMS) || defined(OPENSSL_SYSNAME_VMS)
-# undef OPENSSL_SYS_UNIX
-# 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
+/* ------------------------------- 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
-#endif
-
-/* --------------------------------- OS/2 ---------------------------------- */
-#if defined(__EMX__) || defined(__OS2__)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_OS2
-#endif
 
-/* --------------------------------- Unix ---------------------------------- */
-#ifdef OPENSSL_SYS_UNIX
-# if defined(linux) || defined(__linux__) || defined(OPENSSL_SYSNAME_LINUX)
-# define OPENSSL_SYS_LINUX
-# endif
-# ifdef OPENSSL_SYSNAME_MPE
-# define OPENSSL_SYS_MPE
-# endif
-# ifdef OPENSSL_SYSNAME_SNI
-# define OPENSSL_SYS_SNI
-# endif
-# ifdef OPENSSL_SYSNAME_ULTRASPARC
-# define OPENSSL_SYS_ULTRASPARC
-# endif
-# ifdef OPENSSL_SYSNAME_NEWS4
-# define OPENSSL_SYS_NEWS4
-# endif
-# ifdef OPENSSL_SYSNAME_MACOSX
-# define OPENSSL_SYS_MACOSX
-# endif
-# ifdef OPENSSL_SYSNAME_MACOSX_RHAPSODY
-# define OPENSSL_SYS_MACOSX_RHAPSODY
-# define OPENSSL_SYS_MACOSX
-# endif
-# ifdef OPENSSL_SYSNAME_SUNOS
-# define OPENSSL_SYS_SUNOS
-#endif
-# if defined(_CRAY) || defined(OPENSSL_SYSNAME_CRAY)
-# define OPENSSL_SYS_CRAY
-# endif
-# if defined(_AIX) || defined(OPENSSL_SYSNAME_AIX)
-# define OPENSSL_SYS_AIX
+/* -------------------------------- 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
-#endif
-
-/* --------------------------------- VOS ----------------------------------- */
-#ifdef OPENSSL_SYSNAME_VOS
-# define OPENSSL_SYS_VOS
-#endif
 
-/* ------------------------------- VxWorks --------------------------------- */
-#ifdef OPENSSL_SYSNAME_VXWORKS
-# define OPENSSL_SYS_VXWORKS
-#endif
-
-/* --------------------------------- BeOS ---------------------------------- */
-#if defined(__BEOS__)
-# define OPENSSL_SYS_BEOS
-# include <sys/socket.h>
-# if defined(BONE_VERSION)
-# define OPENSSL_SYS_BEOS_BONE
-# else
-# define OPENSSL_SYS_BEOS_R5
+/* -------------------------------- 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
-#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
+# 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
 
-/* 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 explicitely 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:
+/*-
+ * 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 SOME_BUILD_FLAG_MACRO
- # undef OPENSSL_EXTERN
- # define OPENSSL_EXTERN OPENSSL_EXPORT
- #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
 
- The default is to have OPENSSL_EXPORT, OPENSSL_IMPORT and OPENSSL_GLOBAL
- have some generally sensible values, and for OPENSSL_EXTERN to have the
- value OPENSSL_IMPORT.
-*/
+# if defined(OPENSSL_SYS_UEFI) && !defined(ossl_ssize_t)
+# define ossl_ssize_t INTN
+# define OSSL_SSIZE_MAX MAX_INTN
+# endif
 
-#if defined(OPENSSL_SYS_VMS_NODECC)
-# define OPENSSL_EXPORT globalref
-# define OPENSSL_IMPORT globalref
-# define OPENSSL_GLOBAL globaldef
-#elif defined(OPENSSL_SYS_WINDOWS) && defined(OPENSSL_OPT_WINDLL)
-# define OPENSSL_EXPORT extern __declspec(dllexport)
-# define OPENSSL_IMPORT extern __declspec(dllimport)
-# define OPENSSL_GLOBAL
-#else
-# define OPENSSL_EXPORT extern
-# define OPENSSL_IMPORT extern
-# define OPENSSL_GLOBAL
-#endif
-#define OPENSSL_EXTERN OPENSSL_IMPORT
+# 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
 
-/* 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:
+# ifdef DEBUG_UNUSED
+# define __owur __attribute__((__warn_unused_result__))
+# else
+# define __owur
+# endif
 
-	// 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
+/* 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
 }

gpac-0.8.0.tar.gz/extra_lib/include/openssl/ebcdic.h Added

gpac-0.7.1.tar.gz/extra_lib/include/openssl/ec.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/ec.h Changed

@@ -1,142 +1,70 @@
-/* crypto/ec/ec.h */
 /*
- * Originally written by Bodo Moeller for the OpenSSL project.
- */
-/**
- * \file crypto/ec/ec.h Include file for the OpenSSL EC functions
- * \author Originally written by Bodo Moeller for the OpenSSL project
- */
-/* ====================================================================
- * Copyright (c) 1998-2005 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+ * 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 
+ * 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 
+ * 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>
+# define HEADER_EC_H
 
-#ifdef OPENSSL_NO_EC
-#error EC is disabled.
-#endif
-
-#include <openssl/asn1.h>
-#include <openssl/symhacks.h>
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#endif
+# include <openssl/opensslconf.h>
 
-#ifdef __cplusplus
+# 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" {
-#elif defined(__SUNPRO_C)
-# if __SUNPRO_C >= 0x520
-# pragma error_messages (off,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
 # endif
-#endif
 
- 
-#ifndef OPENSSL_ECC_MAX_FIELD_BITS
-# define OPENSSL_ECC_MAX_FIELD_BITS 661
-#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 0x02 */
-	POINT_CONVERSION_UNCOMPRESSED = 4,
-	/** the point is encoded as z||x||y, where the octet z specifies
+ /** 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_HYBRID = 6
 } point_conversion_form_t;
 
-
 typedef struct ec_method_st EC_METHOD;
-
-typedef struct ec_group_st
-	/*
-	 EC_METHOD *meth;
-	 -- field definition
-	 -- curve coefficients
-	 -- optional generator with associated information (order, cofactor)
-	 -- optional extra data (precomputed table for fast computation of multiples of generator)
-	 -- ASN1 stuff
-	*/
-	EC_GROUP;
-
+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) */ 
+/* EC_METHODs for curves over GF(p) */
 /********************************************************************/
 
 /** Returns the basic GFp ec methods which provides the basis for the
- * optimized methods. 
+ * optimized methods.
 * \return EC_METHOD object
 */
 const EC_METHOD *EC_GFp_simple_method(void);
@@ -151,16 +79,34 @@
 */
 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 
+/** Returns the basic GF2m ec method
 * \return EC_METHOD object
 */
 const EC_METHOD *EC_GF2m_simple_method(void);
 
+# endif
 
 /********************************************************************/
 /* EC_GROUP functions */
@@ -197,7 +143,7 @@
 EC_GROUP *EC_GROUP_dup(const EC_GROUP *src);
 
 /** Returns the EC_METHOD of the EC_GROUP object.
- * \param group 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);
@@ -209,14 +155,15 @@
 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 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 occured
+ * \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);
+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
@@ -224,21 +171,46 @@
 */
 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 BN_CTX object (optional)
- * \return 1 on success and 0 if an error occured
+ * \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 BN_CTX object (optional)
- * \return 1 on success and 0 if an error occured
+ * \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);
+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
@@ -255,10 +227,11 @@
 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 *, point_conversion_form_t);
+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 *);
+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);
 
@@ -268,9 +241,10 @@
 * \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 occured
+ * \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);
+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
@@ -278,19 +252,22 @@
 * \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 occured
+ * \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);
+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 occured
+ * \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);
+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
@@ -298,11 +275,12 @@
 * \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 occured
+ * \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);
-
-/** Returns the number of bits needed to represent a field element 
+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
 */
@@ -326,12 +304,14 @@
 * \param a first EC_GROUP object
 * \param b second EC_GROUP object
 * \param ctx BN_CTX object (optional)
- * \return 0 if both groups are equal and 1 otherwise
+ * \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 */
+/*
+ * 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)
@@ -341,8 +321,9 @@
 * \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);
-
+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
@@ -351,7 +332,9 @@
 * \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);
+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
@@ -360,22 +343,57 @@
 */
 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;
+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 ist not zero nitems EC_builtin_curve structures 
- * are filled with the data of the first nitems internal groups */
+/*
+ * 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 */
@@ -400,7 +418,7 @@
 /** 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 occured
+ * \return 1 on success and 0 if an error occurred
 */
 int EC_POINT_copy(EC_POINT *dst, const EC_POINT *src);
 
@@ -408,11 +426,11 @@
 * 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 
+ * \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 
+
+/** Returns the EC_METHOD used in EC_POINT object
 * \param point EC_POINT object
 * \return the EC_METHOD used
 */
@@ -421,7 +439,7 @@
 /** 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 occured
+ * \return 1 on success and 0 if an error occurred
 */
 int EC_POINT_set_to_infinity(const EC_GROUP *group, EC_POINT *point);
 
@@ -432,10 +450,12 @@
 * \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 occured
+ * \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);
+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
@@ -444,10 +464,12 @@
 * \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 occured
+ * \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);
+ 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
@@ -455,10 +477,11 @@
 * \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 occured
+ * \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);
+ 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
@@ -466,10 +489,11 @@
 * \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 occured
+ * \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);
+ 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
@@ -477,21 +501,23 @@
 * \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 occured
+ * \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);
-
+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 occured
+ * \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);
+ 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
@@ -499,10 +525,11 @@
 * \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 occured
+ * \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);
+ 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
@@ -510,11 +537,12 @@
 * \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 occured
+ * \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);
-
+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
@@ -526,8 +554,8 @@
 * \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);
+ 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
@@ -535,50 +563,63 @@
 * \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 occured
+ * \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);
+ 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 *);
+ point_conversion_form_t form, BIGNUM *, BN_CTX *);
 EC_POINT *EC_POINT_bn2point(const EC_GROUP *, const BIGNUM *,
-	EC_POINT *, BN_CTX *);
+ EC_POINT *, BN_CTX *);
 char *EC_POINT_point2hex(const EC_GROUP *, const EC_POINT *,
-	point_conversion_form_t form, BN_CTX *);
+ point_conversion_form_t form, BN_CTX *);
 EC_POINT *EC_POINT_hex2point(const EC_GROUP *, const char *,
-	EC_POINT *, BN_CTX *);
-
+ EC_POINT *, BN_CTX *);
 
 /********************************************************************/
 /* functions for doing EC_POINT arithmetic */
 /********************************************************************/
 
-/** Computes the sum of two EC_POINT 
+/** 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 occured
+ * \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);
+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 a EC_POINT object
 * \param ctx BN_CTX object (optional)
- * \return 1 on success and 0 if an error occured
+ * \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);
+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 occured
+ * \return 1 on success and 0 if an error occurred
 */
 int EC_POINT_invert(const EC_GROUP *group, EC_POINT *a, BN_CTX *ctx);
 
@@ -589,37 +630,42 @@
 */
 int EC_POINT_is_at_infinity(const EC_GROUP *group, const EC_POINT *p);
 
-/** Checks whether the point is on the curve 
+/** 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 point if on the curve and 0 otherwise
+ * \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);
+int EC_POINT_is_on_curve(const EC_GROUP *group, const EC_POINT *point,
+ BN_CTX *ctx);
 
-/** Compares two EC_POINTs 
+/** 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 0 if both points are equal and a value != 0 otherwise
+ * \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_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b,
+ BN_CTX *ctx);
 
-int EC_POINT_make_affine(const EC_GROUP *, EC_POINT *, BN_CTX *);
-int EC_POINTs_make_affine(const EC_GROUP *, size_t num, EC_POINT *[], BN_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 p[i] * m[i]
+/** Computes r = generator * n + sum_{i=0}^{num-1} p[i] * m[i]
 * \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 futher summands
+ * \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 occured
+ * \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);
+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
@@ -628,14 +674,15 @@
 * \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 occured
+ * \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);
+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 occured
+ * \return 1 on success and 0 if an error occurred
 */
 int EC_GROUP_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
 
@@ -645,59 +692,72 @@
 */
 int EC_GROUP_have_precompute_mult(const EC_GROUP *group);
 
-
 /********************************************************************/
 /* ASN1 stuff */
 /********************************************************************/
 
-/* EC_GROUP_get_basis_type() returns the NID of the basis type
- * used to represent the field elements */
+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);
-
-#define OPENSSL_EC_NAMED_CURVE	0x001
+int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1,
+ unsigned int *k2, unsigned int *k3);
+# endif
 
-typedef struct ecpk_parameters_st ECPKPARAMETERS;
+# 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, \
+# 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))
-
-#ifndef OPENSSL_NO_BIO
-int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off);
-#endif
-#ifndef OPENSSL_NO_FP_API
-int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off);
-#endif
+# 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 */
 /********************************************************************/
 
-typedef struct ec_key_st EC_KEY;
-
 /* some values for the encoding_flag */
-#define EC_PKEY_NO_PARAMETERS	0x001
-#define EC_PKEY_NO_PUBKEY	0x002
+# 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. 
+ * \return EC_KEY object or NULL if an error occurred.
 */
 EC_KEY *EC_KEY_new_by_curve_name(int nid);
 
@@ -768,18 +828,19 @@
 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 *, unsigned int);
-point_conversion_form_t EC_KEY_get_conv_form(const EC_KEY *);
-void EC_KEY_set_conv_form(EC_KEY *, point_conversion_form_t);
-/* functions to set/get method specific data */
-void *EC_KEY_get_key_method_data(EC_KEY *, 
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));
-void EC_KEY_insert_key_method_data(EC_KEY *, void *data,
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));
+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 *, int);
+void EC_KEY_set_asn1_flag(EC_KEY *eckey, int asn1_flag);
 
-/** Creates a table of pre-computed multiples of the generator to 
+/** 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)
@@ -799,6 +860,68 @@
 */
 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 */
@@ -820,7 +943,6 @@
 */
 int i2d_ECPrivateKey(EC_KEY *key, unsigned char **out);
 
-
 /********************************************************************/
 /* de- and encoding functions for EC parameters */
 /********************************************************************/
@@ -835,14 +957,13 @@
 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 paramters to encode
+ * \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') */
@@ -863,238 +984,593 @@
 * of bytes needed).
 * \return 1 on success and 0 if an error occurred
 */
-int i2o_ECPublicKey(EC_KEY *key, unsigned char **out);
+int i2o_ECPublicKey(const EC_KEY *key, unsigned char **out);
 
-#ifndef OPENSSL_NO_BIO
 /** 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);
+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 
+ * \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);
+int EC_KEY_print(BIO *bp, const EC_KEY *key, int off);
 
-#endif
-#ifndef OPENSSL_NO_FP_API
+# 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);
+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 
+ * \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);
+int EC_KEY_print_fp(FILE *fp, const EC_KEY *key, int off);
 
-#endif
+# endif
 
-#define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x)
+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);
 
-#ifndef __cplusplus
-#if defined(__SUNPRO_C)
-# if __SUNPRO_C >= 0x520
-# pragma error_messages (default,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
+/********************************************************************/
+/* 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
-#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_CTRL_EC_PARAMGEN_CURVE_NID, nid, NULL)
-
 
-#define EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID		(EVP_PKEY_ALG_CTRL + 1)
+# 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
+/*
+ * 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.
 */
-void ERR_load_EC_strings(void);
+
+int ERR_load_EC_strings(void);
 
 /* Error codes for the EC functions. */
 
 /* Function codes. */
-#define EC_F_COMPUTE_WNAF				 143
-#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_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_NIST_MOD_192				 203
-#define EC_F_ECP_NIST_MOD_224				 204
-#define EC_F_ECP_NIST_MOD_256				 205
-#define EC_F_ECP_NIST_MOD_521				 206
-#define EC_F_EC_ASN1_GROUP2CURVE			 153
-#define EC_F_EC_ASN1_GROUP2FIELDID			 154
-#define EC_F_EC_ASN1_GROUP2PARAMETERS			 155
-#define EC_F_EC_ASN1_GROUP2PKPARAMETERS			 156
-#define EC_F_EC_ASN1_PARAMETERS2GROUP			 157
-#define EC_F_EC_ASN1_PKPARAMETERS2GROUP			 158
-#define EC_F_EC_EX_DATA_SET_DATA			 211
-#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_MONT_GROUP_SET_CURVE_GFP		 135
-#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_GROUP_SET_CURVE_GFP		 100
-#define EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR		 101
-#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_GET_AFFINE_COORDINATES_GFP 105
-#define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES	 168
-#define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES_GFP 128
-#define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES	 169
-#define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES_GFP 129
-#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_GET0_GENERATOR			 139
-#define EC_F_EC_GROUP_GET_COFACTOR			 140
-#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_ORDER				 141
-#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_PRECOMPUTE_MULT			 142
-#define EC_F_EC_GROUP_SET_CURVE_GF2M			 176
-#define EC_F_EC_GROUP_SET_CURVE_GFP			 109
-#define EC_F_EC_GROUP_SET_EXTRA_DATA			 110
-#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_PRINT				 180
-#define EC_F_EC_KEY_PRINT_FP				 181
-#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_MUL				 184
-#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_DUP				 207
-#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_O2I_ECPUBLICKEY				 152
-#define EC_F_OLD_EC_PRIV_DECODE				 222
-#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
+# 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_ASN1_UNKNOWN_FIELD				 116
-#define EC_R_BUFFER_TOO_SMALL				 100
-#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_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_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_PENTANOMIAL_BASIS			 132
-#define EC_R_INVALID_PRIVATE_KEY			 123
-#define EC_R_INVALID_TRINOMIAL_BASIS			 137
-#define EC_R_KEYS_NOT_SET				 140
-#define EC_R_MISSING_PARAMETERS				 124
-#define EC_R_MISSING_PRIVATE_KEY			 125
-#define EC_R_NOT_A_NIST_PRIME				 135
-#define EC_R_NOT_A_SUPPORTED_NIST_PRIME			 136
-#define EC_R_NOT_IMPLEMENTED				 126
-#define EC_R_NOT_INITIALIZED				 111
-#define EC_R_NO_FIELD_MOD				 133
-#define EC_R_NO_PARAMETERS_SET				 139
-#define EC_R_PASSED_NULL_PARAMETER			 134
-#define EC_R_PKPARAMETERS2GROUP_FAILURE			 127
-#define EC_R_POINT_AT_INFINITY				 106
-#define EC_R_POINT_IS_NOT_ON_CURVE			 107
-#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_ORDER				 130
-
-#ifdef __cplusplus
+# 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
 #endif

gpac-0.7.1.tar.gz/extra_lib/include/openssl/ecdh.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/ecdh.h Changed

@@ -1,123 +1,10 @@
-/* crypto/ecdh/ecdh.h */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
- * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
- * to the OpenSSL project.
- *
- * The ECC Code is licensed pursuant to the OpenSSL open source
- * license provided below.
- *
- * The ECDH software is originally written by Douglas Stebila of
- * Sun Microsystems Laboratories.
- *
- */
-/* ====================================================================
- * Copyright (c) 2000-2002 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+/*
+ * 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_ECDH_H
-#define HEADER_ECDH_H
-
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_NO_ECDH
-#error ECDH is disabled.
-#endif
 
 #include <openssl/ec.h>
-#include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-const ECDH_METHOD *ECDH_OpenSSL(void);
-
-void	 ECDH_set_default_method(const ECDH_METHOD *);
-const ECDH_METHOD *ECDH_get_default_method(void);
-int 	 ECDH_set_method(EC_KEY *, const ECDH_METHOD *);
-
-int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh,
- void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen));
-
-int 	 ECDH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new 
-		*new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int 	 ECDH_set_ex_data(EC_KEY *d, int idx, void *arg);
-void 	 *ECDH_get_ex_data(EC_KEY *d, int idx);
-
-
-/* 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.
- */
-void ERR_load_ECDH_strings(void);
-
-/* Error codes for the ECDH functions. */
-
-/* Function codes. */
-#define ECDH_F_ECDH_COMPUTE_KEY				 100
-#define ECDH_F_ECDH_DATA_NEW_METHOD			 101
-
-/* Reason codes. */
-#define ECDH_R_KDF_FAILED				 102
-#define ECDH_R_NO_PRIVATE_VALUE				 100
-#define ECDH_R_POINT_ARITHMETIC_FAILURE			 101
-
-#ifdef __cplusplus
-}
-#endif
-#endif

gpac-0.7.1.tar.gz/extra_lib/include/openssl/ecdsa.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/ecdsa.h Changed

@@ -1,258 +1,10 @@
-/* crypto/ecdsa/ecdsa.h */
-/**
- * \file crypto/ecdsa/ecdsa.h Include file for the OpenSSL ECDSA functions
- * \author Written by Nils Larsch for the OpenSSL project
- */
-/* ====================================================================
- * Copyright (c) 2000-2005 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+/*
+ * 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_ECDSA_H
-#define HEADER_ECDSA_H
-
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_NO_ECDSA
-#error ECDSA is disabled.
-#endif
 
 #include <openssl/ec.h>
-#include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct ECDSA_SIG_st
-	{
-	BIGNUM *r;
-	BIGNUM *s;
-	} 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);
-
-/** 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 (optioanl), 
- * 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);
-
-const ECDSA_METHOD *ECDSA_OpenSSL(void);
-
-/** Sets the default ECDSA method
- * \param meth new default ECDSA_METHOD
- */
-void	 ECDSA_set_default_method(const ECDSA_METHOD *meth);
-
-/** Returns the default ECDSA method
- * \return pointer to ECDSA_METHOD structure containing the default method
- */
-const ECDSA_METHOD *ECDSA_get_default_method(void);
-
-/** Sets method to be used for the ECDSA operations
- * \param eckey EC_KEY object
- * \param meth new method
- * \return 1 on success and 0 otherwise 
- */
-int 	 ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth);
-
-/** 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);
-
-/** 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 (optioanl), 
- * 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);
-
-/* the standard ex_data functions */
-int 	 ECDSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new 
-		*new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int 	 ECDSA_set_ex_data(EC_KEY *d, int idx, void *arg);
-void 	 *ECDSA_get_ex_data(EC_KEY *d, int idx);
-
-
-/* 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.
- */
-void ERR_load_ECDSA_strings(void);
-
-/* Error codes for the ECDSA functions. */
-
-/* Function codes. */
-#define ECDSA_F_ECDSA_DATA_NEW_METHOD			 100
-#define ECDSA_F_ECDSA_DO_SIGN				 101
-#define ECDSA_F_ECDSA_DO_VERIFY				 102
-#define ECDSA_F_ECDSA_SIGN_SETUP			 103
-
-/* Reason codes. */
-#define ECDSA_R_BAD_SIGNATURE				 100
-#define ECDSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE		 101
-#define ECDSA_R_ERR_EC_LIB				 102
-#define ECDSA_R_MISSING_PARAMETERS			 103
-#define ECDSA_R_NEED_NEW_SETUP_VALUES			 106
-#define ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED		 104
-#define ECDSA_R_SIGNATURE_MALLOC_FAILED			 105
-
-#ifdef __cplusplus
-}
-#endif
-#endif

gpac-0.8.0.tar.gz/extra_lib/include/openssl/engine.h Added

@@ -0,0 +1,840 @@
+/*
+ * 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-0.7.1.tar.gz/extra_lib/include/openssl/err.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/err.h Changed

@@ -1,384 +1,259 @@
-/* crypto/err/err.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+/*
+ * 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
+# define HEADER_ERR_H
 
-#include <openssl/e_os2.h>
+# include <openssl/e_os2.h>
 
-#ifndef OPENSSL_NO_FP_API
-#include <stdio.h>
-#include <stdlib.h>
-#endif
+# ifndef OPENSSL_NO_STDIO
+# include <stdio.h>
+# include <stdlib.h>
+# endif
 
-#include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#ifndef OPENSSL_NO_LHASH
-#include <openssl/lhash.h>
-#endif
+# include <openssl/ossl_typ.h>
+# include <openssl/bio.h>
+# include <openssl/lhash.h>
 
-#ifdef	__cplusplus
+#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
+# 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>
+# include <errno.h>
 
-#define ERR_TXT_MALLOCED	0x01
-#define ERR_TXT_STRING		0x02
+# define ERR_TXT_MALLOCED 0x01
+# define ERR_TXT_STRING 0x02
 
-#define ERR_FLAG_MARK		0x01
+# define ERR_FLAG_MARK 0x01
 
-#define ERR_NUM_ERRORS	16
-typedef struct err_state_st
-	{
-	CRYPTO_THREADID tid;
-	int err_flags[ERR_NUM_ERRORS];
-	unsigned long err_buffer[ERR_NUM_ERRORS];
-	char *err_data[ERR_NUM_ERRORS];
-	int err_data_flags[ERR_NUM_ERRORS];
-	const char *err_file[ERR_NUM_ERRORS];
-	int err_line[ERR_NUM_ERRORS];
-	int top,bottom;
-	} ERR_STATE;
+# define ERR_NUM_ERRORS 16
+typedef struct err_state_st {
+ int err_flags[ERR_NUM_ERRORS];
+ unsigned long err_buffer[ERR_NUM_ERRORS];
+ char *err_data[ERR_NUM_ERRORS];
+ int err_data_flags[ERR_NUM_ERRORS];
+ const char *err_file[ERR_NUM_ERRORS];
+ int err_line[ERR_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_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_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_USER		128
-
-#define SYSerr(f,r) ERR_PUT_error(ERR_LIB_SYS,(f),(r),__FILE__,__LINE__)
-#define BNerr(f,r) ERR_PUT_error(ERR_LIB_BN,(f),(r),__FILE__,__LINE__)
-#define RSAerr(f,r) ERR_PUT_error(ERR_LIB_RSA,(f),(r),__FILE__,__LINE__)
-#define DHerr(f,r) ERR_PUT_error(ERR_LIB_DH,(f),(r),__FILE__,__LINE__)
-#define EVPerr(f,r) ERR_PUT_error(ERR_LIB_EVP,(f),(r),__FILE__,__LINE__)
-#define BUFerr(f,r) ERR_PUT_error(ERR_LIB_BUF,(f),(r),__FILE__,__LINE__)
-#define OBJerr(f,r) ERR_PUT_error(ERR_LIB_OBJ,(f),(r),__FILE__,__LINE__)
-#define PEMerr(f,r) ERR_PUT_error(ERR_LIB_PEM,(f),(r),__FILE__,__LINE__)
-#define DSAerr(f,r) ERR_PUT_error(ERR_LIB_DSA,(f),(r),__FILE__,__LINE__)
-#define X509err(f,r) ERR_PUT_error(ERR_LIB_X509,(f),(r),__FILE__,__LINE__)
-#define ASN1err(f,r) ERR_PUT_error(ERR_LIB_ASN1,(f),(r),__FILE__,__LINE__)
-#define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),__FILE__,__LINE__)
-#define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),__FILE__,__LINE__)
-#define ECerr(f,r) ERR_PUT_error(ERR_LIB_EC,(f),(r),__FILE__,__LINE__)
-#define SSLerr(f,r) ERR_PUT_error(ERR_LIB_SSL,(f),(r),__FILE__,__LINE__)
-#define BIOerr(f,r) ERR_PUT_error(ERR_LIB_BIO,(f),(r),__FILE__,__LINE__)
-#define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),__FILE__,__LINE__)
-#define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),__FILE__,__LINE__)
-#define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),__FILE__,__LINE__)
-#define RANDerr(f,r) ERR_PUT_error(ERR_LIB_RAND,(f),(r),__FILE__,__LINE__)
-#define DSOerr(f,r) ERR_PUT_error(ERR_LIB_DSO,(f),(r),__FILE__,__LINE__)
-#define ENGINEerr(f,r) ERR_PUT_error(ERR_LIB_ENGINE,(f),(r),__FILE__,__LINE__)
-#define OCSPerr(f,r) ERR_PUT_error(ERR_LIB_OCSP,(f),(r),__FILE__,__LINE__)
-#define UIerr(f,r) ERR_PUT_error(ERR_LIB_UI,(f),(r),__FILE__,__LINE__)
-#define COMPerr(f,r) ERR_PUT_error(ERR_LIB_COMP,(f),(r),__FILE__,__LINE__)
-#define ECDSAerr(f,r) ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),__FILE__,__LINE__)
-#define ECDHerr(f,r) ERR_PUT_error(ERR_LIB_ECDH,(f),(r),__FILE__,__LINE__)
-#define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__)
-#define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),__FILE__,__LINE__)
-#define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__)
-#define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),__FILE__,__LINE__)
-#define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__)
-#define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__)
-
-/* Borland C seems too stupid to be able to shift and do longs in
- * the pre-processor :-( */
-#define ERR_PACK(l,f,r)		(((((unsigned long)l)&0xffL)*0x1000000)| \
-				((((unsigned long)f)&0xfffL)*0x1000)| \
-				((((unsigned long)r)&0xfffL)))
-#define ERR_GET_LIB(l)		(int)((((unsigned long)l)>>24L)&0xffL)
-#define ERR_GET_FUNC(l)		(int)((((unsigned long)l)>>12L)&0xfffL)
-#define ERR_GET_REASON(l)	(int)((l)&0xfffL)
-#define ERR_FATAL_ERROR(l)	(int)((l)&ERR_R_FATAL)
-
+# 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_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_CONF_LIB	ERR_LIB_CONF /* 14 */
-#define ERR_R_CRYPTO_LIB ERR_LIB_CRYPTO /* 15 */
-#define ERR_R_EC_LIB	ERR_LIB_EC /* 16 */
-#define ERR_R_SSL_LIB	ERR_LIB_SSL /* 20 */
-#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_PKCS12_LIB ERR_LIB_PKCS12 /* 35 */
-#define ERR_R_RAND_LIB	ERR_LIB_RAND /* 36 */
-#define ERR_R_DSO_LIB	ERR_LIB_DSO /* 37 */
-#define ERR_R_ENGINE_LIB ERR_LIB_ENGINE /* 38 */
-#define ERR_R_OCSP_LIB ERR_LIB_OCSP /* 39 */
-#define ERR_R_UI_LIB ERR_LIB_UI /* 40 */
-#define ERR_R_COMP_LIB	ERR_LIB_COMP /* 41 */
-#define ERR_R_ECDSA_LIB ERR_LIB_ECDSA	 /* 42 */
-#define ERR_R_ECDH_LIB ERR_LIB_ECDH	 /* 43 */
-#define ERR_R_STORE_LIB ERR_LIB_STORE /* 44 */
-#define ERR_R_TS_LIB	ERR_LIB_TS /* 45 */
-
-#define ERR_R_NESTED_ASN1_ERROR			58
-#define ERR_R_BAD_ASN1_OBJECT_HEADER		59
-#define ERR_R_BAD_GET_ASN1_OBJECT_CALL		60
-#define ERR_R_EXPECTING_AN_ASN1_SEQUENCE	61
-#define ERR_R_ASN1_LENGTH_MISMATCH		62
-#define ERR_R_MISSING_ASN1_EOS			63
+# 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)
-
-/* 99 is the maximum possible ERR_R_... code, higher values
- * are reserved for the individual libraries */
+# 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;
 
-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);
+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_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_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);
+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_FP_API
+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
-#ifndef OPENSSL_NO_BIO
+# 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
-void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
-void ERR_unload_strings(int lib,ERR_STRING_DATA str[]);
-void ERR_load_ERR_strings(void);
-void ERR_load_crypto_strings(void);
-void ERR_free_strings(void);
 
-void ERR_remove_thread_state(const CRYPTO_THREADID *tid);
-#ifndef OPENSSL_NO_DEPRECATED
-void ERR_remove_state(unsigned long pid); /* if zero we look it up */
-#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);
 
-#ifndef OPENSSL_NO_LHASH
-LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void);
-LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void);
-void ERR_release_err_state_table(LHASH_OF(ERR_STATE) **hash);
-#endif
-
 int ERR_get_next_error_library(void);
 
 int ERR_set_mark(void);
 int ERR_pop_to_mark(void);
 
-/* Already defined in ossl_typ.h */
-/* typedef struct st_ERR_FNS ERR_FNS; */
-/* An application can use this function and provide the return value to loaded
- * modules that should use the application's ERR state/functionality */
-const ERR_FNS *ERR_get_implementation(void);
-/* A loaded module should call this function prior to any ERR operations using
- * the application's "ERR_FNS". */
-int ERR_set_implementation(const ERR_FNS *fns);
-
-#ifdef	__cplusplus
+#ifdef __cplusplus
 }
 #endif

gpac-0.7.1.tar.gz/extra_lib/include/openssl/evp.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/evp.h Changed

@@ -1,678 +1,691 @@
-/* crypto/evp/evp.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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
+# define HEADER_ENVELOPE_H
 
-#ifdef OPENSSL_ALGORITHM_DEFINES
-# include <openssl/opensslconf.h>
-#else
-# define OPENSSL_ALGORITHM_DEFINES
 # include <openssl/opensslconf.h>
-# undef OPENSSL_ALGORITHM_DEFINES
-#endif
+# include <openssl/ossl_typ.h>
+# include <openssl/symhacks.h>
+# include <openssl/bio.h>
 
-#include <openssl/ossl_typ.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
 
-#include <openssl/symhacks.h>
-
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-
-/*
-#define EVP_RC2_KEY_SIZE		16
-#define EVP_RC4_KEY_SIZE		16
-#define EVP_BLOWFISH_KEY_SIZE		16
-#define EVP_CAST5_KEY_SIZE		16
-#define EVP_RC5_32_12_16_KEY_SIZE	16
-*/
-#define EVP_MAX_MD_SIZE			64	/* longest known is SHA512 */
-#define EVP_MAX_KEY_LENGTH		32
-#define EVP_MAX_IV_LENGTH		16
-#define EVP_MAX_BLOCK_LENGTH		32
-
-#define PKCS5_SALT_LEN			8
+# 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_PKT_EXP	0x1000 /* <= 512 bit key */
-
-#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_EC	NID_X9_62_id_ecPublicKey
-#define EVP_PKEY_HMAC	NID_hmac
-
-#ifdef	__cplusplus
+# 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
 
-/* Type needs to be a bit field
- * Sub-type needs to be for variations on the method, as in, can it do
- * arbitrary encryption.... */
-struct evp_pkey_st
-	{
-	int type;
-	int save_type;
-	int references;
-	const EVP_PKEY_ASN1_METHOD *ameth;
-	ENGINE *engine;
-	union	{
-		char *ptr;
-#ifndef OPENSSL_NO_RSA
-		struct rsa_st *rsa;	/* RSA */
-#endif
-#ifndef OPENSSL_NO_DSA
-		struct dsa_st *dsa;	/* DSA */
-#endif
-#ifndef OPENSSL_NO_DH
-		struct dh_st *dh;	/* DH */
-#endif
-#ifndef OPENSSL_NO_EC
-		struct ec_key_st *ec;	/* ECC */
-#endif
-		} pkey;
-	int save_parameters;
-	STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */
-	} /* EVP_PKEY */;
-
-#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
-struct env_md_st
-	{
-	int type;
-	int pkey_type;
-	int md_size;
-	unsigned long flags;
-	int (*init)(EVP_MD_CTX *ctx);
-	int (*update)(EVP_MD_CTX *ctx,const void *data,size_t count);
-	int (*final)(EVP_MD_CTX *ctx,unsigned char *md);
-	int (*copy)(EVP_MD_CTX *to,const EVP_MD_CTX *from);
-	int (*cleanup)(EVP_MD_CTX *ctx);
-
-	/* FIXME: prototype these some day */
-	int (*sign)(int type, const unsigned char *m, unsigned int m_length,
-		 unsigned char *sigret, unsigned int *siglen, void *key);
-	int (*verify)(int type, const unsigned char *m, unsigned int m_length,
-		 const unsigned char *sigbuf, unsigned int siglen,
-		 void *key);
-	int required_pkey_type[5]; /*EVP_PKEY_xxx */
-	int block_size;
-	int ctx_size; /* how big does the ctx->md_data need to be */
-	/* control function */
-	int (*md_ctrl)(EVP_MD_CTX *ctx, int cmd, int p1, void *p2);
-	} /* EVP_MD */;
-
-typedef int evp_sign_method(int type,const unsigned char *m,
-			 unsigned int m_length,unsigned char *sigret,
-			 unsigned int *siglen, void *key);
-typedef int evp_verify_method(int type,const unsigned char *m,
-			 unsigned int m_length,const unsigned char *sigbuf,
-			 unsigned int siglen, void *key);
-
-#define EVP_MD_FLAG_ONESHOT	0x0001 /* digest can only handle a single
-					* block */
-
-#define EVP_MD_FLAG_PKEY_DIGEST	0x0002 /* digest is a "clone" digest used
-					* which is a copy of an existing
-					* one for a specific public key type.
-					* EVP_dss1() etc */
-
-/* Digest uses EVP_PKEY_METHOD for signing instead of MD specific signing */
-
-#define EVP_MD_FLAG_PKEY_METHOD_SIGNATURE	0x0004
+# 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
+# define EVP_MD_FLAG_DIGALGID_MASK 0x0018
 
 /* NULL or absent parameter accepted. Use NULL */
 
-#define EVP_MD_FLAG_DIGALGID_NULL		0x0000
+# 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
+# define EVP_MD_FLAG_DIGALGID_ABSENT 0x0008
 
 /* Custom handling via ctrl */
 
-#define EVP_MD_FLAG_DIGALGID_CUSTOM		0x0018
+# 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
+# define EVP_MD_CTRL_DIGALGID 0x1
+# define EVP_MD_CTRL_MICALG 0x2
 
 /* Minimum Algorithm specific ctrl value */
 
-#define	EVP_MD_CTRL_ALG_CTRL			0x1000
-
-#define EVP_PKEY_NULL_method	NULL,NULL,{0,0,0,0}
-
-#ifndef OPENSSL_NO_DSA
-#define EVP_PKEY_DSA_method	(evp_sign_method *)DSA_sign, \
-				(evp_verify_method *)DSA_verify, \
-				{EVP_PKEY_DSA,EVP_PKEY_DSA2,EVP_PKEY_DSA3, \
-					EVP_PKEY_DSA4,0}
-#else
-#define EVP_PKEY_DSA_method	EVP_PKEY_NULL_method
-#endif
-
-#ifndef OPENSSL_NO_ECDSA
-#define EVP_PKEY_ECDSA_method (evp_sign_method *)ECDSA_sign, \
-				(evp_verify_method *)ECDSA_verify, \
- {EVP_PKEY_EC,0,0,0}
-#else 
-#define EVP_PKEY_ECDSA_method EVP_PKEY_NULL_method
-#endif
-
-#ifndef OPENSSL_NO_RSA
-#define EVP_PKEY_RSA_method	(evp_sign_method *)RSA_sign, \
-				(evp_verify_method *)RSA_verify, \
-				{EVP_PKEY_RSA,EVP_PKEY_RSA2,0,0}
-#define EVP_PKEY_RSA_ASN1_OCTET_STRING_method \
-				(evp_sign_method *)RSA_sign_ASN1_OCTET_STRING, \
-				(evp_verify_method *)RSA_verify_ASN1_OCTET_STRING, \
-				{EVP_PKEY_RSA,EVP_PKEY_RSA2,0,0}
-#else
-#define EVP_PKEY_RSA_method	EVP_PKEY_NULL_method
-#define EVP_PKEY_RSA_ASN1_OCTET_STRING_method EVP_PKEY_NULL_method
-#endif
+# define EVP_MD_CTRL_ALG_CTRL 0x1000
 
-#endif /* !EVP_MD */
-
-struct env_md_ctx_st
-	{
-	const EVP_MD *digest;
-	ENGINE *engine; /* functional reference if 'digest' is ENGINE-provided */
-	unsigned long flags;
-	void *md_data;
-	/* Public key context for sign/verify */
-	EVP_PKEY_CTX *pctx;
-	/* Update function: usually copied from EVP_MD */
-	int (*update)(EVP_MD_CTX *ctx,const void *data,size_t count);
-	} /* EVP_MD_CTX */;
+# 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_cleanup */
-/* 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_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 */
+# 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
+/*
+ * 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 */
-
-struct evp_cipher_st
-	{
-	int nid;
-	int block_size;
-	int key_len;		/* Default value for variable length ciphers */
-	int iv_len;
-	unsigned long flags;	/* Various flags */
-	int (*init)(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-		 const unsigned char *iv, int enc);	/* init key */
-	int (*do_cipher)(EVP_CIPHER_CTX *ctx, unsigned char *out,
-			 const unsigned char *in, size_t inl);/* encrypt/decrypt data */
-	int (*cleanup)(EVP_CIPHER_CTX *); /* cleanup ctx */
-	int ctx_size;		/* how big ctx->cipher_data needs to be */
-	int (*set_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *); /* Populate a ASN1_TYPE with parameters */
-	int (*get_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *); /* Get parameters from a ASN1_TYPE */
-	int (*ctrl)(EVP_CIPHER_CTX *, int type, int arg, void *ptr); /* Miscellaneous operations */
-	void *app_data;		/* Application data */
-	} /* EVP_CIPHER */;
+# 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_MODE			0xF0007
+# 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
+# define EVP_CIPH_VARIABLE_LENGTH 0x8
 /* Set if the iv handling should be done by the cipher itself */
-#define 	EVP_CIPH_CUSTOM_IV		0x10
+# 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
+# define EVP_CIPH_ALWAYS_CALL_INIT 0x20
 /* Call ctrl() to init cipher parameters */
-#define 	EVP_CIPH_CTRL_INIT		0x40
+# define EVP_CIPH_CTRL_INIT 0x40
 /* Don't use standard key length function */
-#define 	EVP_CIPH_CUSTOM_KEY_LENGTH	0x80
+# define EVP_CIPH_CUSTOM_KEY_LENGTH 0x80
 /* Don't use standard block padding */
-#define 	EVP_CIPH_NO_PADDING		0x100
+# define EVP_CIPH_NO_PADDING 0x100
 /* cipher handles random key generation */
-#define 	EVP_CIPH_RAND_KEY		0x200
+# define EVP_CIPH_RAND_KEY 0x200
 /* cipher has its own additional copying logic */
-#define 	EVP_CIPH_CUSTOM_COPY		0x400
+# define EVP_CIPH_CUSTOM_COPY 0x400
 /* Allow use default ASN1 get/set iv */
-#define		EVP_CIPH_FLAG_DEFAULT_ASN1	0x1000
+# define EVP_CIPH_FLAG_DEFAULT_ASN1 0x1000
 /* Buffer length in bits not bytes: CFB1 mode only */
-#define		EVP_CIPH_FLAG_LENGTH_BITS	0x2000
+# 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
-
-typedef struct evp_cipher_info_st
-	{
-	const EVP_CIPHER *cipher;
-	unsigned char iv[EVP_MAX_IV_LENGTH];
-	} EVP_CIPHER_INFO;
-
-struct evp_cipher_ctx_st
-	{
-	const EVP_CIPHER *cipher;
-	ENGINE *engine;	/* functional reference if 'cipher' is ENGINE-provided */
-	int encrypt;		/* encrypt or decrypt */
-	int buf_len;		/* number we have left */
-
-	unsigned char oiv[EVP_MAX_IV_LENGTH];	/* original iv */
-	unsigned char iv[EVP_MAX_IV_LENGTH];	/* working iv */
-	unsigned char buf[EVP_MAX_BLOCK_LENGTH];/* saved partial block */
-	int num;				/* used by cfb/ofb mode */
-
-	void *app_data;		/* application stuff */
-	int key_len;		/* May change for variable length cipher */
-	unsigned long flags;	/* Various flags */
-	void *cipher_data; /* per EVP data */
-	int final_used;
-	int block_mask;
-	unsigned char final[EVP_MAX_BLOCK_LENGTH];/* possible final block */
-	} /* EVP_CIPHER_CTX */;
-
-typedef struct evp_Encode_Ctx_st
-	{
-	int num;	/* number saved in a partial encode/decode */
-	int length;	/* The length is either the output line length
-			 * (in input bytes) or the shortest input line
-			 * length that is ok. Once decoding begins,
-			 * the length is adjusted up each time a longer
-			 * line is decoded */
-	unsigned char enc_data[80];	/* data to encode */
-	int line_num;	/* number read on current line */
-	int expect_nl;
-	} EVP_ENCODE_CTX;
+# 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
 
-/* 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);
+# 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
 
-#ifndef OPENSSL_NO_RSA
-#define EVP_PKEY_assign_RSA(pkey,rsa) EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\
-					(char *)(rsa))
-#endif
+# define EVP_CTRL_SSL3_MASTER_SECRET 0x1d
 
-#ifndef OPENSSL_NO_DSA
-#define EVP_PKEY_assign_DSA(pkey,dsa) EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\
-					(char *)(dsa))
-#endif
+/* 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 iv[EVP_MAX_IV_LENGTH];
+} EVP_CIPHER_INFO;
 
-#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,\
+/* 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
+# 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))
+# 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);	
+# 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);
-#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))
+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))
+# 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)
+# define EVP_CIPHER_mode(e) (EVP_CIPHER_flags(e) & EVP_CIPH_MODE)
 
-const EVP_CIPHER * EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx);
+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_get_app_data(const EVP_CIPHER_CTX *ctx);
 void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data);
-#define EVP_CIPHER_CTX_type(c) EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c))
-unsigned long EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx);
-#define EVP_CIPHER_CTX_mode(e)		(EVP_CIPHER_CTX_flags(e) & EVP_CIPH_MODE)
-
-#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)
+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
-#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)
-
-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);
-
-void	EVP_MD_CTX_init(EVP_MD_CTX *ctx);
-int	EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx);
-EVP_MD_CTX *EVP_MD_CTX_create(void);
-void	EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
-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);
-int	EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl);
-int	EVP_DigestUpdate(EVP_MD_CTX *ctx,const void *d,
-			 size_t cnt);
-int	EVP_DigestFinal_ex(EVP_MD_CTX *ctx,unsigned char *md,unsigned int *s);
-int	EVP_Digest(const void *data, size_t count,
-		unsigned char *md, unsigned int *size, const EVP_MD *type, ENGINE *impl);
-
-int EVP_MD_CTX_copy(EVP_MD_CTX *out,const EVP_MD_CTX *in); 
-int	EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
-int	EVP_DigestFinal(EVP_MD_CTX *ctx,unsigned char *md,unsigned int *s);
-
-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);
-
-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);
-
-int	EVP_EncryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher,
-		const unsigned char *key, const unsigned char *iv);
-int	EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
-		const unsigned char *key, const unsigned char *iv);
-int	EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-		int *outl, const unsigned char *in, int inl);
-int	EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-int	EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-
-int	EVP_DecryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher,
-		const unsigned char *key, const unsigned char *iv);
-int	EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
-		const unsigned char *key, const unsigned char *iv);
-int	EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-		int *outl, const unsigned char *in, int inl);
-int	EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-int	EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-
-int	EVP_CipherInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher,
-		 const unsigned char *key,const unsigned char *iv,
-		 int enc);
-int	EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
-		 const unsigned char *key,const unsigned char *iv,
-		 int enc);
-int	EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-		int *outl, const unsigned char *in, int inl);
-int	EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-int	EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-
-int	EVP_SignFinal(EVP_MD_CTX *ctx,unsigned char *md,unsigned int *s,
-		EVP_PKEY *pkey);
-
-int	EVP_VerifyFinal(EVP_MD_CTX *ctx,const unsigned char *sigbuf,
-		unsigned int siglen,EVP_PKEY *pkey);
-
-int	EVP_DigestSignInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-			const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey);
-int	EVP_DigestSignFinal(EVP_MD_CTX *ctx,
-			unsigned char *sigret, size_t *siglen);
-
-int	EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-			const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey);
-int	EVP_DigestVerifyFinal(EVP_MD_CTX *ctx,
-			unsigned char *sig, size_t siglen);
-
-int	EVP_OpenInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type,
-		const unsigned char *ek, int ekl, const unsigned char *iv,
-		EVP_PKEY *priv);
-int	EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-
-int	EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-		 unsigned char **ek, int *ekl, unsigned char *iv,
-		EVP_PKEY **pubk, int npubk);
-int	EVP_SealFinal(EVP_CIPHER_CTX *ctx,unsigned char *out,int *outl);
-
-void	EVP_EncodeInit(EVP_ENCODE_CTX *ctx);
-void	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);
-
-void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a);
-int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a);
+
+__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);
-void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a);
+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);
 
-#ifndef OPENSSL_NO_BIO
-BIO_METHOD *BIO_f_md(void);
-BIO_METHOD *BIO_f_base64(void);
-BIO_METHOD *BIO_f_cipher(void);
-BIO_METHOD *BIO_f_reliable(void);
-void BIO_set_cipher(BIO *b,const EVP_CIPHER *c,const unsigned char *k,
-		const unsigned char *i, int enc);
-#endif
+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
+# ifndef OPENSSL_NO_MD2
 const EVP_MD *EVP_md2(void);
-#endif
-#ifndef OPENSSL_NO_MD4
+# endif
+# ifndef OPENSSL_NO_MD4
 const EVP_MD *EVP_md4(void);
-#endif
-#ifndef OPENSSL_NO_MD5
+# endif
+# ifndef OPENSSL_NO_MD5
 const EVP_MD *EVP_md5(void);
-#endif
-#ifndef OPENSSL_NO_SHA
-const EVP_MD *EVP_sha(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_dss(void);
-const EVP_MD *EVP_dss1(void);
-const EVP_MD *EVP_ecdsa(void);
-#endif
-#ifndef OPENSSL_NO_SHA256
 const EVP_MD *EVP_sha224(void);
 const EVP_MD *EVP_sha256(void);
-#endif
-#ifndef OPENSSL_NO_SHA512
 const EVP_MD *EVP_sha384(void);
 const EVP_MD *EVP_sha512(void);
-#endif
-#ifndef OPENSSL_NO_MDC2
+# ifndef OPENSSL_NO_MDC2
 const EVP_MD *EVP_mdc2(void);
-#endif
-#ifndef OPENSSL_NO_RIPEMD
+# endif
+# ifndef OPENSSL_NO_RMD160
 const EVP_MD *EVP_ripemd160(void);
-#endif
-#ifndef OPENSSL_NO_WHIRLPOOL
+# 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
+# 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
+# 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
-#if 0
-const EVP_CIPHER *EVP_des_ede_cfb1(void);
-const EVP_CIPHER *EVP_des_ede_cfb8(void);
-#endif
+# 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
+# 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);
@@ -682,58 +695,57 @@
 const EVP_CIPHER *EVP_des_ede_cbc(void);
 const EVP_CIPHER *EVP_des_ede3_cbc(void);
 const EVP_CIPHER *EVP_desx_cbc(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? */
-#if 0
-# ifdef OPENSSL_OPENBSD_DEV_CRYPTO
-const EVP_CIPHER *EVP_dev_crypto_des_ede3_cbc(void);
-const EVP_CIPHER *EVP_dev_crypto_rc4(void);
-const EVP_MD *EVP_dev_crypto_md5(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
-#endif
-#endif
-#ifndef OPENSSL_NO_RC4
+# ifndef OPENSSL_NO_RC4
 const EVP_CIPHER *EVP_rc4(void);
 const EVP_CIPHER *EVP_rc4_40(void);
-#endif
-#ifndef OPENSSL_NO_IDEA
+# 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
+# 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
+# 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
+# define EVP_rc2_cfb EVP_rc2_cfb64
 const EVP_CIPHER *EVP_rc2_ofb(void);
-#endif
-#ifndef OPENSSL_NO_BF
+# 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
+# define EVP_bf_cfb EVP_bf_cfb64
 const EVP_CIPHER *EVP_bf_ofb(void);
-#endif
-#ifndef OPENSSL_NO_CAST
+# 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
+# define EVP_cast5_cfb EVP_cast5_cfb64
 const EVP_CIPHER *EVP_cast5_ofb(void);
-#endif
-#ifndef OPENSSL_NO_RC5
+# 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
+# define EVP_rc5_32_12_16_cfb EVP_rc5_32_12_16_cfb64
 const EVP_CIPHER *EVP_rc5_32_12_16_ofb(void);
-#endif
-#ifndef OPENSSL_NO_AES
+# 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);
@@ -741,9 +753,15 @@
 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);
-#if 0
 const EVP_CIPHER *EVP_aes_128_ctr(void);
-#endif
+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);
@@ -751,9 +769,14 @@
 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);
-#if 0
 const EVP_CIPHER *EVP_aes_192_ctr(void);
-#endif
+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);
@@ -761,142 +784,185 @@
 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);
-#if 0
 const EVP_CIPHER *EVP_aes_256_ctr(void);
-#endif
-#endif
-#ifndef OPENSSL_NO_CAMELLIA
+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
+# 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
+# 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
+# define EVP_camellia_256_cfb EVP_camellia_256_cfb128
 const EVP_CIPHER *EVP_camellia_256_ofb(void);
-#endif
+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
+# 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
+# define EVP_seed_cfb EVP_seed_cfb128
 const EVP_CIPHER *EVP_seed_ofb(void);
-#endif
-
-void OPENSSL_add_all_algorithms_noconf(void);
-void OPENSSL_add_all_algorithms_conf(void);
-
-#ifdef OPENSSL_LOAD_CONF
-#define OpenSSL_add_all_algorithms() \
-		OPENSSL_add_all_algorithms_conf()
-#else
-#define OpenSSL_add_all_algorithms() \
-		OPENSSL_add_all_algorithms_noconf()
-#endif
+# endif
 
-void OpenSSL_add_all_ciphers(void);
-void OpenSSL_add_all_digests(void);
-#define SSLeay_add_all_algorithms() OpenSSL_add_all_algorithms()
-#define SSLeay_add_all_ciphers() OpenSSL_add_all_ciphers()
-#define SSLeay_add_all_digests() OpenSSL_add_all_digests()
+# 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_cleanup(void);
-
-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(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(EVP_PKEY *pkey);
-
-#ifndef OPENSSL_NO_RSA
+
+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);
+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
+# endif
+# ifndef OPENSSL_NO_DSA
 struct dsa_st;
-int EVP_PKEY_set1_DSA(EVP_PKEY *pkey,struct dsa_st *key);
+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
+# endif
+# ifndef OPENSSL_NO_DH
 struct dh_st;
-int EVP_PKEY_set1_DH(EVP_PKEY *pkey,struct dh_st *key);
+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
+# endif
+# ifndef OPENSSL_NO_EC
 struct ec_key_st;
-int EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey,struct ec_key_st *key);
+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
+# endif
 
-EVP_PKEY *	EVP_PKEY_new(void);
-void		EVP_PKEY_free(EVP_PKEY *pkey);
+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_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);
+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_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 indent, ASN1_PCTX *pctx);
 int EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey,
-				int indent, ASN1_PCTX *pctx);
+ int indent, ASN1_PCTX *pctx);
 int EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey,
-				int indent, ASN1_PCTX *pctx);
+ 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 */
@@ -904,156 +970,224 @@
 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);
+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);
+ 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);
+ 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);
+ 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);
+ 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);
+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
+# define EVP_PBE_TYPE_OUTER 0x0
 /* Is an PRF type OID */
-#define EVP_PBE_TYPE_PRF	0x1
+# 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_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);
+ 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_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_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);
+ 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(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);
+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));
+ 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, 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));
+ 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));
+ 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 (*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));
-
-
-#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_SIG | EVP_PKEY_OP_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_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
+ 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_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_CMS_ENCRYPT 9
+# define EVP_PKEY_CTRL_CMS_DECRYPT 10
+# define EVP_PKEY_CTRL_CMS_SIGN 11
 
-#define EVP_PKEY_ALG_CTRL		0x1000
+# define EVP_PKEY_CTRL_CIPHER 12
 
+# define EVP_PKEY_CTRL_GET_MD 13
 
-#define EVP_PKEY_FLAG_AUTOARGLEN	2
+# 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);
+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);
 
@@ -1063,15 +1197,18 @@
 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 cmd, int p1, void *p2);
 int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *type,
-						const char *value);
+ 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,
-				unsigned char *key, int keylen);
+ 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);
@@ -1084,24 +1221,24 @@
 
 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
@@ -1120,205 +1257,334 @@
 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));
+ 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));
+ 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 (*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));
+ 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));
+ 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));
+ 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));
+ 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));
+ 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));
+ 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));
+ 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));
+ 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));
+ 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));
+ 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));
+ 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
+/*
+ * 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.
 */
-void ERR_load_EVP_strings(void);
+
+int ERR_load_EVP_strings(void);
 
 /* Error codes for the EVP functions. */
 
 /* Function codes. */
-#define EVP_F_AES_INIT_KEY				 133
-#define EVP_F_CAMELLIA_INIT_KEY				 159
-#define EVP_F_D2I_PKEY					 100
-#define EVP_F_DO_SIGVER_INIT				 161
-#define EVP_F_DSAPKEY2PKCS8				 134
-#define EVP_F_DSA_PKEY2PKCS8				 135
-#define EVP_F_ECDSA_PKEY2PKCS8				 129
-#define EVP_F_ECKEY_PKEY2PKCS8				 132
-#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_DIGESTINIT_EX				 128
-#define EVP_F_EVP_ENCRYPTFINAL_EX			 127
-#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_PKCS82PKEY				 111
-#define EVP_F_EVP_PKCS82PKEY_BROKEN			 136
-#define EVP_F_EVP_PKEY2PKCS8_BROKEN			 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_GET1_DH				 119
-#define EVP_F_EVP_PKEY_GET1_DSA				 120
-#define EVP_F_EVP_PKEY_GET1_ECDSA			 130
-#define EVP_F_EVP_PKEY_GET1_EC_KEY			 131
-#define EVP_F_EVP_PKEY_GET1_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_RIJNDAEL				 126
-#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_PKCS8_SET_BROKEN				 112
-#define EVP_F_PKEY_SET_TYPE				 158
-#define EVP_F_RC2_MAGIC_TO_METH				 109
-#define EVP_F_RC5_CTRL					 125
+# 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_ASN1_LIB					 140
-#define EVP_R_BAD_BLOCK_LENGTH				 136
-#define EVP_R_BAD_DECRYPT				 100
-#define EVP_R_BAD_KEY_LENGTH				 137
-#define EVP_R_BN_DECODE_ERROR				 112
-#define EVP_R_BN_PUBKEY_ERROR				 113
-#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_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_ENCODE_ERROR				 115
-#define EVP_R_EVP_PBE_CIPHERINIT_ERROR			 119
-#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_ECDSA_KEY			 141
-#define EVP_R_EXPECTING_A_EC_KEY			 142
-#define EVP_R_INITIALIZATION_ERROR			 134
-#define EVP_R_INPUT_NOT_INITIALIZED			 111
-#define EVP_R_INVALID_DIGEST				 152
-#define EVP_R_INVALID_KEY_LENGTH			 130
-#define EVP_R_INVALID_OPERATION				 148
-#define EVP_R_IV_TOO_LARGE				 102
-#define EVP_R_KEYGEN_FAILURE				 120
-#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_DSA_PARAMETERS				 116
-#define EVP_R_NO_KEY_SET				 154
-#define EVP_R_NO_OPERATION_SET				 149
-#define EVP_R_NO_SIGN_FUNCTION_CONFIGURED		 104
-#define EVP_R_NO_VERIFY_FUNCTION_CONFIGURED		 105
-#define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE	 150
-#define EVP_R_OPERATON_NOT_INITIALIZED			 151
-#define EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE			 117
-#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_PBE_ALGORITHM			 121
-#define EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS		 135
-#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_PRF				 125
-#define EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM		 118
-#define EVP_R_UNSUPPORTED_SALT_TYPE			 126
-#define EVP_R_WRONG_FINAL_BLOCK_LENGTH			 109
-#define EVP_R_WRONG_PUBLIC_KEY_TYPE			 110
-
-#ifdef __cplusplus
+# 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
 #endif

gpac-0.7.1.tar.gz/extra_lib/include/openssl/hmac.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/hmac.h Changed

@@ -1,107 +1,46 @@
-/* crypto/hmac/hmac.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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>
+#ifndef HEADER_HMAC_H
+# define HEADER_HMAC_H
 
-#ifdef OPENSSL_NO_HMAC
-#error HMAC is disabled.
-#endif
+# include <openssl/opensslconf.h>
 
-#include <openssl/evp.h>
+# include <openssl/evp.h>
 
-#define HMAC_MAX_MD_CBLOCK	128	/* largest known is SHA512 */
+# define HMAC_MAX_MD_CBLOCK 128/* largest known is SHA512 */
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct hmac_ctx_st
-	{
-	const EVP_MD *md;
-	EVP_MD_CTX md_ctx;
-	EVP_MD_CTX i_ctx;
-	EVP_MD_CTX o_ctx;
-	unsigned int key_length;
-	unsigned char key[HMAC_MAX_MD_CBLOCK];
-	} HMAC_CTX;
-
-#define HMAC_size(e)	(EVP_MD_size((e)->md))
-
-
-void HMAC_CTX_init(HMAC_CTX *ctx);
-void HMAC_CTX_cleanup(HMAC_CTX *ctx);
+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);
 
-#define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx) /* deprecated */
+DEPRECATEDIN_1_1_0(__owur int HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
+ const EVP_MD *md))
 
-int HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
-	 const EVP_MD *md); /* deprecated */
-int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
-		 const EVP_MD *md, ENGINE *impl);
-int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len);
-int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len);
+/*__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);
-int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
+ 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
 }

gpac-0.8.0.tar.gz/extra_lib/include/openssl/idea.h Added

@@ -0,0 +1,64 @@
+/*
+ * 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 data[9][6];
+} 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-0.8.0.tar.gz/extra_lib/include/openssl/kdf.h Added

@@ -0,0 +1,75 @@
+/*
+ * 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-0.7.1.tar.gz/extra_lib/include/openssl/lhash.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/lhash.h Changed

@@ -1,241 +1,217 @@
-/* crypto/lhash/lhash.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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
+/*
+ * Header for dynamic hash table routines Author - Eric Young
 */
 
 #ifndef HEADER_LHASH_H
-#define HEADER_LHASH_H
+# define HEADER_LHASH_H
 
-#include <openssl/e_os2.h>
-#ifndef OPENSSL_NO_FP_API
-#include <stdio.h>
-#endif
-
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
+# include <openssl/e_os2.h>
+# include <openssl/bio.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct lhash_node_st
-	{
-	void *data;
-	struct lhash_node_st *next;
-#ifndef OPENSSL_NO_HASH_COMP
-	unsigned long hash;
-#endif
-	} LHASH_NODE;
-
-typedef int (*LHASH_COMP_FN_TYPE)(const void *, const void *);
-typedef unsigned long (*LHASH_HASH_FN_TYPE)(const void *);
-typedef void (*LHASH_DOALL_FN_TYPE)(void *);
-typedef void (*LHASH_DOALL_ARG_FN_TYPE)(void *, void *);
-
-/* 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. */
+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
+# 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
-
-/* Third: "doall" functions */
-#define DECLARE_LHASH_DOALL_FN(name, o_type) \
-	void name##_LHASH_DOALL(void *);
-#define IMPLEMENT_LHASH_DOALL_FN(name, o_type) \
-	void name##_LHASH_DOALL(void *arg) { \
-		o_type *a = arg; \
-		name##_doall(a); }
-#define LHASH_DOALL_FN(name) name##_LHASH_DOALL
+# 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
-
-typedef struct lhash_st
-	{
-	LHASH_NODE **b;
-	LHASH_COMP_FN_TYPE comp;
-	LHASH_HASH_FN_TYPE hash;
-	unsigned int num_nodes;
-	unsigned int num_alloc_nodes;
-	unsigned int p;
-	unsigned int pmax;
-	unsigned long up_load; /* load times 256 */
-	unsigned long down_load; /* load times 256 */
-	unsigned long num_items;
-
-	unsigned long num_expands;
-	unsigned long num_expand_reallocs;
-	unsigned long num_contracts;
-	unsigned long num_contract_reallocs;
-	unsigned long num_hash_calls;
-	unsigned long num_comp_calls;
-	unsigned long num_insert;
-	unsigned long num_replace;
-	unsigned long num_delete;
-	unsigned long num_no_delete;
-	unsigned long num_retrieve;
-	unsigned long num_retrieve_miss;
-	unsigned long num_hash_comps;
-
-	int error;
-	} _LHASH;	/* Do not use _LHASH directly, use LHASH_OF
-			 * and friends */
-
-#define LH_LOAD_MULT	256
-
-/* Indicates a malloc() error in the last call, this is only bad
- * in lh_insert(). */
-#define lh_error(lh)	((lh)->error)
-
-_LHASH *lh_new(LHASH_HASH_FN_TYPE h, LHASH_COMP_FN_TYPE c);
-void lh_free(_LHASH *lh);
-void *lh_insert(_LHASH *lh, void *data);
-void *lh_delete(_LHASH *lh, const void *data);
-void *lh_retrieve(_LHASH *lh, const void *data);
-void lh_doall(_LHASH *lh, LHASH_DOALL_FN_TYPE func);
-void lh_doall_arg(_LHASH *lh, LHASH_DOALL_ARG_FN_TYPE func, void *arg);
-unsigned long lh_strhash(const char *c);
-unsigned long lh_num_items(const _LHASH *lh);
-
-#ifndef OPENSSL_NO_FP_API
-void lh_stats(const _LHASH *lh, FILE *out);
-void lh_node_stats(const _LHASH *lh, FILE *out);
-void lh_node_usage_stats(const _LHASH *lh, FILE *out);
-#endif
-
-#ifndef OPENSSL_NO_BIO
-void lh_stats_bio(const _LHASH *lh, BIO *out);
-void lh_node_stats_bio(const _LHASH *lh, BIO *out);
-void lh_node_usage_stats_bio(const _LHASH *lh, BIO *out);
-#endif
+# 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 DECLARE_LHASH_OF(type) LHASH_OF(type) { int dummy; }
-
-#define CHECKED_LHASH_OF(type,lh) \
- ((_LHASH *)CHECKED_PTR_OF(LHASH_OF(type),lh))
-
-/* Define wrapper functions. */
-#define LHM_lh_new(type, name) \
- ((LHASH_OF(type) *)lh_new(LHASH_HASH_FN(name), LHASH_COMP_FN(name)))
-#define LHM_lh_error(type, lh) \
- lh_error(CHECKED_LHASH_OF(type,lh))
-#define LHM_lh_insert(type, lh, inst) \
- ((type *)lh_insert(CHECKED_LHASH_OF(type, lh), \
-		 CHECKED_PTR_OF(type, inst)))
-#define LHM_lh_retrieve(type, lh, inst) \
- ((type *)lh_retrieve(CHECKED_LHASH_OF(type, lh), \
-		 CHECKED_PTR_OF(type, inst)))
-#define LHM_lh_delete(type, lh, inst) \
- ((type *)lh_delete(CHECKED_LHASH_OF(type, lh),			\
-		 CHECKED_PTR_OF(type, inst)))
-#define LHM_lh_doall(type, lh,fn) lh_doall(CHECKED_LHASH_OF(type, lh), fn)
-#define LHM_lh_doall_arg(type, lh, fn, arg_type, arg) \
- lh_doall_arg(CHECKED_LHASH_OF(type, lh), fn, CHECKED_PTR_OF(arg_type, arg))
-#define LHM_lh_num_items(type, lh) lh_num_items(CHECKED_LHASH_OF(type, lh))
-#define LHM_lh_down_load(type, lh) (CHECKED_LHASH_OF(type, lh)->down_load)
-#define LHM_lh_node_stats_bio(type, lh, out) \
- lh_node_stats_bio(CHECKED_LHASH_OF(type, lh), out)
-#define LHM_lh_node_usage_stats_bio(type, lh, out) \
- lh_node_usage_stats_bio(CHECKED_LHASH_OF(type, lh), out)
-#define LHM_lh_stats_bio(type, lh, out) \
- lh_stats_bio(CHECKED_LHASH_OF(type, lh), out)
-#define LHM_lh_free(type, lh) lh_free(CHECKED_LHASH_OF(type, lh))
-
-DECLARE_LHASH_OF(OPENSSL_STRING);
-DECLARE_LHASH_OF(OPENSSL_CSTRING);
+# 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-0.8.0.tar.gz/extra_lib/include/openssl/md2.h Added

@@ -0,0 +1,44 @@
+/*
+ * 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 data[MD2_BLOCK];
+ MD2_INT cksm[MD2_BLOCK];
+ MD2_INT state[MD2_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-0.8.0.tar.gz/extra_lib/include/openssl/md4.h Added

@@ -0,0 +1,51 @@
+/*
+ * 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 data[MD4_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-0.8.0.tar.gz/extra_lib/include/openssl/md5.h Added

@@ -0,0 +1,50 @@
+/*
+ * 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 data[MD5_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-0.8.0.tar.gz/extra_lib/include/openssl/mdc2.h Added

@@ -0,0 +1,42 @@
+/*
+ * 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 data[MDC2_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-0.8.0.tar.gz/extra_lib/include/openssl/modes.h Added

@@ -0,0 +1,203 @@
+/*
+ * 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 in[16],
+ unsigned char out[16], const void *key);
+
+typedef void (*cbc128_f) (const unsigned char *in, unsigned char *out,
+ size_t len, const void *key,
+ unsigned char ivec[16], int enc);
+
+typedef void (*ctr128_f) (const unsigned char *in, unsigned char *out,
+ size_t blocks, const void *key,
+ const unsigned char ivec[16]);
+
+typedef void (*ccm128_f) (const unsigned char *in, unsigned char *out,
+ size_t blocks, const void *key,
+ const unsigned char ivec[16],
+ unsigned char cmac[16]);
+
+void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
+ size_t len, const void *key,
+ unsigned char ivec[16], block128_f block);
+void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
+ size_t len, const void *key,
+ unsigned char ivec[16], block128_f block);
+
+void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out,
+ size_t len, const void *key,
+ unsigned char ivec[16],
+ unsigned char ecount_buf[16], 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 ivec[16],
+ unsigned char ecount_buf[16],
+ 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 ivec[16], int *num,
+ block128_f block);
+
+void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
+ size_t len, const void *key,
+ unsigned char ivec[16], 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 ivec[16], 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 ivec[16], 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 ivec[16],
+ block128_f block);
+size_t CRYPTO_cts128_encrypt(const unsigned char *in, unsigned char *out,
+ size_t len, const void *key,
+ unsigned char ivec[16], cbc128_f cbc);
+size_t CRYPTO_cts128_decrypt_block(const unsigned char *in,
+ unsigned char *out, size_t len,
+ const void *key, unsigned char ivec[16],
+ block128_f block);
+size_t CRYPTO_cts128_decrypt(const unsigned char *in, unsigned char *out,
+ size_t len, const void *key,
+ unsigned char ivec[16], cbc128_f cbc);
+
+size_t CRYPTO_nistcts128_encrypt_block(const unsigned char *in,
+ unsigned char *out, size_t len,
+ const void *key,
+ unsigned char ivec[16],
+ block128_f block);
+size_t CRYPTO_nistcts128_encrypt(const unsigned char *in, unsigned char *out,
+ size_t len, const void *key,
+ unsigned char ivec[16], cbc128_f cbc);
+size_t CRYPTO_nistcts128_decrypt_block(const unsigned char *in,
+ unsigned char *out, size_t len,
+ const void *key,
+ unsigned char ivec[16],
+ block128_f block);
+size_t CRYPTO_nistcts128_decrypt(const unsigned char *in, unsigned char *out,
+ size_t len, const void *key,
+ unsigned char ivec[16], 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 iv[16],
+ 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_i[16],
+ const unsigned char L_[][16],
+ unsigned char checksum[16]);
+
+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-0.7.1.tar.gz/extra_lib/include/openssl/obj_mac.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/obj_mac.h Changed

@@ -1,3914 +1,4577 @@
-/* crypto/objects/obj_mac.h */
-
-/* THIS FILE IS GENERATED FROM objects.txt by objects.pl via the
- * following command:
- * perl objects.pl objects.txt obj_mac.num obj_mac.h
- */
-
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * WARNING: do not edit!
+ * Generated by crypto/objects/objects.pl
  *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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_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_ct_asciiTextWithCRLF		"id-ct-asciiTextWithCRLF"
-#define NID_id_ct_asciiTextWithCRLF		787
-#define OBJ_id_ct_asciiTextWithCRLF		OBJ_id_smime_ct,27L
-
-#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_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_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_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_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 Distrubution 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_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_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		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_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_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_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_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 SN_id_aes128_wrap		"id-aes128-wrap"
-#define NID_id_aes128_wrap		788
-#define OBJ_id_aes128_wrap		OBJ_aes,5L
-
-#define SN_id_aes192_wrap		"id-aes192-wrap"
-#define NID_id_aes192_wrap		789
-#define OBJ_id_aes192_wrap		OBJ_aes,25L
-
-#define SN_id_aes256_wrap		"id-aes256-wrap"
-#define NID_id_aes256_wrap		790
-#define OBJ_id_aes256_wrap		OBJ_aes,45L
-
-#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 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_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_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_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_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 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_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_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_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_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-0.7.1.tar.gz/extra_lib/include/openssl/objects.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/objects.h Changed

@@ -1,1034 +1,989 @@
-/* crypto/objects/objects.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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
+# 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
+# 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 OBJ_des_cfb64 OBJ_algorithm,9L
 
-#define SN_des_cbc			"DES-CBC"
-#define LN_des_cbc			"des-cbc"
-#define NID_des_cbc			31
+# 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 OBJ_des_cbc OBJ_algorithm,7L
 
-#define SN_des_ede			"DES-EDE"
-#define LN_des_ede			"des-ede"
-#define NID_des_ede			32
+# 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
+# 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
+# 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 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_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_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
+# 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 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 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
+# 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
+# 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_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_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_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 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
+# 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 :-(
+/*-
+ * 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
+# 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
- *	}
+ * 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
+# 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_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_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_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_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
+# 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_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_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_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_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_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_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_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_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_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
+# 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 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_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_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_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_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_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 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_Version1 OBJ_pkcs12, 10L
 
-#define OBJ_pkcs12_BagIds	OBJ_pkcs12_Version1, 1L
+# 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_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_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_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_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_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_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_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 LN_localKeyID "localKeyID"
+# define NID_localKeyID 157
+# define OBJ_localKeyID OBJ_pkcs9, 21L
 
-#define OBJ_certTypes		OBJ_pkcs9, 22L
+# define OBJ_certTypes OBJ_pkcs9, 22L
 
-#define LN_x509Certificate	"x509Certificate"
-#define	NID_x509Certificate	158
-#define OBJ_x509Certificate	OBJ_certTypes, 1L
+# 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 LN_sdsiCertificate "sdsiCertificate"
+# define NID_sdsiCertificate 159
+# define OBJ_sdsiCertificate OBJ_certTypes, 2L
 
-#define OBJ_crlTypes		OBJ_pkcs9, 23L
+# define OBJ_crlTypes OBJ_pkcs9, 23L
 
-#define LN_x509Crl		"x509Crl"
-#define	NID_x509Crl		160
-#define OBJ_x509Crl		OBJ_crlTypes, 1L
+# 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_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_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
+# 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_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 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_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_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_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_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
+# 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_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 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_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_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_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_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_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_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_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 */
+# 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>
+# 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_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_NAME_ALIAS 0x8000
 
-#define OBJ_BSEARCH_VALUE_ON_NOMATCH		0x01
-#define OBJ_BSEARCH_FIRST_VALUE_ON_MATCH	0x02
+# 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)
+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);
+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)	\
+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)	\
+# 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)	\
+# 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:
@@ -1037,7 +992,7 @@
 * const void *a_;
 * const nid_triple const *a = a_;
 *
- * The assignement discards a const because what you really want is:
+ * The assignment discards a const because what you really want is:
 *
 * const int const * const *a = a_;
 *
@@ -1045,7 +1000,7 @@
 * which breaks comparison functions.
 *
 * Thus we end up having to cast, sadly, or unpack the
- * declarations. Or, as I finally did in this case, delcare nid_triple
+ * 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.
@@ -1055,8 +1010,8 @@
 * 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_)	\
+# 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_; \
@@ -1065,12 +1020,12 @@
 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); \
+ 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_)	\
+# 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_; \
@@ -1079,60 +1034,64 @@
 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); \
+ nm##_cmp_BSEARCH_CMP_FN); \
 } \
 extern void dummy_prototype(void)
 
-#define OBJ_bsearch(type1,key,type2,base,num,cmp)			 \
+# 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)))
+ 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)			\
+# 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)
+ 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);
 
-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);
-void		OBJ_cleanup(void );
-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);
 
-extern int obj_cleanup_defer;
-void check_defer(int nid);
-
 /* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
+/*
+ * 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.
 */
-void ERR_load_OBJ_strings(void);
+
+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
+# 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_MALLOC_FAILURE				 100
-#define OBJ_R_UNKNOWN_NID				 101
+# define OBJ_R_OID_EXISTS 102
+# define OBJ_R_UNKNOWN_NID 101
 
-#ifdef __cplusplus
+# ifdef __cplusplus
 }
-#endif
+# endif
 #endif

gpac-0.8.0.tar.gz/extra_lib/include/openssl/ocsp.h Added

@@ -0,0 +1,412 @@
+/*
+ * 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-0.7.1.tar.gz/extra_lib/include/openssl/opensslconf.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/opensslconf.h Changed

@@ -1,21 +1,29 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
+/*
+ * 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
+ */
 
-/* OpenSSL was configured with the following options: */
-#ifndef OPENSSL_SYSNAME_WIN32
-# define OPENSSL_SYSNAME_WIN32
+#ifdef __cplusplus
+extern "C" {
 #endif
-#ifndef OPENSSL_DOING_MAKEDEPEND
-
 
-#ifndef OPENSSL_NO_GMP
-# define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_JPAKE
-# define OPENSSL_NO_JPAKE
+#ifdef OPENSSL_ALGORITHM_DEFINES
+# error OPENSSL_ALGORITHM_DEFINES no longer supported
 #endif
-#ifndef OPENSSL_NO_KRB5
-# define OPENSSL_NO_KRB5
+
+/*
+ * 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
@@ -23,201 +31,142 @@
 #ifndef OPENSSL_NO_RC5
 # define OPENSSL_NO_RC5
 #endif
-#ifndef OPENSSL_NO_RFC3779
-# define OPENSSL_NO_RFC3779
+#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_STORE
-# define OPENSSL_NO_STORE
+#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
 
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
-# define OPENSSL_THREADS
-#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;
 
-/* The OPENSSL_NO_* macros are also defined as NO_* if the application
- asks for it. This is a transient feature that is provided for those
- who haven't had the time to do the appropriate changes in their
- applications. */
-#ifdef OPENSSL_ALGORITHM_DEFINES
-# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
-# define NO_GMP
-# endif
-# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
-# define NO_JPAKE
-# endif
-# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
-# define NO_KRB5
-# endif
-# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
-# define NO_MD2
-# endif
-# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
-# define NO_RC5
-# endif
-# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
-# define NO_RFC3779
-# endif
-# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
-# define NO_STORE
+/*
+ * 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
 
-#define OPENSSL_CPUID_OBJ
+#ifndef OPENSSL_MIN_API
+# define OPENSSL_MIN_API 0
+#endif
 
-/* crypto/opensslconf.h.in */
+#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API
+# undef OPENSSL_API_COMPAT
+# define OPENSSL_API_COMPAT OPENSSL_MIN_API
+#endif
 
-/* Generate 80386 code? */
-#undef I386_ONLY
+#if OPENSSL_API_COMPAT < 0x10100000L
+# define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f)
+#else
+# define DEPRECATEDIN_1_1_0(f)
+#endif
 
-#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
-#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "c:cygwinhomeAdministrateurbuildslavefull-windows_xp_32buildgpac_extra_libs/lib/engines"
-#define OPENSSLDIR "c:cygwinhomeAdministrateurbuildslavefull-windows_xp_32buildgpac_extra_libs/c:cygwinhomeAdministrateurbuildslavefull-windows_xp_32buildgpac_extra_libs/ssl"
+#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>
 
-#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
 #define OPENSSL_EXPORT_VAR_AS_FUNCTION
 
-#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
-#define IDEA_INT unsigned int
-#endif
-
-#if defined(HEADER_MD2_H) && !defined(MD2_INT)
-#define MD2_INT unsigned int
-#endif
-
-#if defined(HEADER_RC2_H) && !defined(RC2_INT)
-/* I need to put in a mod for the alpha - eay */
-#define RC2_INT unsigned int
-#endif
-
-#if defined(HEADER_RC4_H)
-#if !defined(RC4_INT)
-/* using int types make the structure larger but make the code faster
- * on most boxes I have tested - up to %20 faster. */
-/*
- * I don't know what does "most" mean, but declaring "int" is a must on:
- * - Intel P6 because partial register stalls are very expensive;
- * - elder Alpha because it lacks byte load/store instructions;
- */
-#define RC4_INT unsigned int
-#endif
-#if !defined(RC4_CHUNK)
 /*
- * This enables code handling data aligned at natural CPU word
- * boundary. See crypto/rc4/rc4_enc.c for further details.
+ * The following are cipher-specific, but are part of the public API.
 */
-#undef RC4_CHUNK
-#endif
-#endif
-
-#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
-/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
- * %20 speed up (longs are 8 bytes, int's are 4). */
-#ifndef DES_LONG
-#define DES_LONG unsigned long
-#endif
+#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
 
-#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
-#define CONFIG_HEADER_BN_H
-#define BN_LLONG
-
-/* Should we define BN_DIV2W here? */
+#define RC4_INT unsigned int
 
-/* Only one for the following should be defined */
-#undef SIXTY_FOUR_BIT_LONG
-#undef SIXTY_FOUR_BIT
-#define THIRTY_TWO_BIT
-#endif
-
-#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
-#define CONFIG_HEADER_RC4_LOCL_H
-/* if this is defined data[i] is used instead of *data, this is a %20
- * speedup on x86 */
-#define RC4_INDEX
-#endif
-
-#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
-#define CONFIG_HEADER_BF_LOCL_H
-#undef BF_PTR
-#endif /* HEADER_BF_LOCL_H */
-
-#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
-#define CONFIG_HEADER_DES_LOCL_H
-#ifndef DES_DEFAULT_OPTIONS
-/* the following is tweaked from a config script, that is why it is a
- * protected undef/define */
-#ifndef DES_PTR
-#undef DES_PTR
-#endif
-
-/* This helps C compiler generate the correct code for multiple functional
- * units. It reduces register dependancies at the expense of 2 more
- * registers */
-#ifndef DES_RISC1
-#undef DES_RISC1
-#endif
-
-#ifndef DES_RISC2
-#undef DES_RISC2
-#endif
-
-#if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
-#endif
-
-/* Unroll the inner loop, this sometimes helps, sometimes hinders.
- * Very mucy CPU dependant */
-#ifndef DES_UNROLL
-#undef DES_UNROLL
-#endif
-
-/* These default values were supplied by
- * Peter Gutman <pgut001@cs.auckland.ac.nz>
- * They are only used if nothing else has been defined */
-#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
-/* Special defines which change the way the code is built depending on the
- CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
- even newer MIPS CPU's, but at the moment one size fits all for
- optimization options. Older Sparc's work better with only UNROLL, but
- there's no way to tell at compile time what it is you're running on */
- 
-#if defined( sun )		/* Newer Sparc's */
-# define DES_PTR
-# define DES_RISC1
-# define DES_UNROLL
-#elif defined( __ultrix )	/* Older MIPS */
-# define DES_PTR
-# define DES_RISC2
-# define DES_UNROLL
-#elif defined( __osf1__ )	/* Alpha */
-# define DES_PTR
-# define DES_RISC2
-#elif defined ( _AIX )		/* RS6000 */
- /* Unknown */
-#elif defined( __hpux )		/* HP-PA */
- /* Unknown */
-#elif defined( __aux )		/* 68K */
- /* Unknown */
-#elif defined( __dgux )		/* 88K (but P6 in latest boxes) */
-# define DES_UNROLL
-#elif defined( __sgi )		/* Newer MIPS */
-# define DES_PTR
-# define DES_RISC2
-# define DES_UNROLL
-#elif defined(i386) || defined(__i386__)	/* x86 boxes, should be gcc */
-# define DES_PTR
-# define DES_RISC1
-# define DES_UNROLL
-#endif /* Systems-specific speed defines */
-#endif
-
-#endif /* DES_DEFAULT_OPTIONS */
-#endif /* HEADER_DES_LOCL_H */
+#ifdef __cplusplus
+}
+#endif

gpac-0.7.1.tar.gz/extra_lib/include/openssl/opensslv.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/opensslv.h Changed

@@ -1,19 +1,33 @@
+/*
+ * 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
+# define HEADER_OPENSSLV_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
 
-/* Numeric release version identifier:
+/*-
+ * 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-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
+ * 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
@@ -25,16 +39,15 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER	0x1000004fL
-#ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0d-fips 8 Feb 2011"
-#else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0d 8 Feb 2011"
-#endif
-#define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
+# 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, ...)
+/*-
+ * 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
@@ -42,11 +55,11 @@
  * 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
+ *      libcrypto.so.0.9
  *
- * Some unixen also make a softlink with the major verson number only:
+ * Some unixen also make a softlink with the major version number only:
  *
- *	libcrypto.so.0
+ *      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
@@ -61,11 +74,11 @@
  * 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
+ *      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.
@@ -82,8 +95,11 @@
  * 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.0.0"
+# define SHLIB_VERSION_HISTORY ""
+# define SHLIB_VERSION_NUMBER "1.1"
 
 
-#endif /* HEADER_OPENSSLV_H */
+#ifdef  __cplusplus
+}
+#endif
+#endif                          /* HEADER_OPENSSLV_H */

gpac-0.7.1.tar.gz/extra_lib/include/openssl/ossl_typ.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/ossl_typ.h Changed

@@ -1,81 +1,42 @@
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+/*
+ * 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 <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
+# 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;
@@ -91,24 +52,31 @@
 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_pctx_st ASN1_PCTX;
+# endif
 
-#ifdef OPENSSL_SYS_WIN32
-#undef X509_NAME
-#undef X509_EXTENSIONS
-#undef X509_CERT_PAIR
-#undef PKCS7_ISSUER_AND_SERIAL
-#undef OCSP_REQUEST
-#undef OCSP_RESPONSE
-#endif
+typedef struct asn1_object_st ASN1_OBJECT;
 
-#ifdef BIGNUM
-#undef BIGNUM
-#endif
+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;
@@ -120,8 +88,8 @@
 
 typedef struct evp_cipher_st EVP_CIPHER;
 typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX;
-typedef struct env_md_st EVP_MD;
-typedef struct env_md_ctx_st EVP_MD_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;
@@ -129,6 +97,10 @@
 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;
 
@@ -138,11 +110,12 @@
 typedef struct rsa_st RSA;
 typedef struct rsa_meth_st RSA_METHOD;
 
-typedef struct rand_meth_st RAND_METHOD;
+typedef struct ec_key_st EC_KEY;
+typedef struct ec_key_method_st EC_KEY_METHOD;
 
-typedef struct ecdh_method ECDH_METHOD;
-typedef struct ecdsa_method ECDSA_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;
@@ -153,23 +126,27 @@
 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 store_st STORE;
-typedef struct store_method_st STORE_METHOD;
+typedef struct ossl_init_settings_st OPENSSL_INIT_SETTINGS;
 
 typedef struct ui_st UI;
 typedef struct ui_method_st UI_METHOD;
 
-typedef struct st_ERR_FNS ERR_FNS;
-
 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;
@@ -180,21 +157,34 @@
 typedef struct ISSUING_DIST_POINT_st ISSUING_DIST_POINT;
 typedef struct NAME_CONSTRAINTS_st NAME_CONSTRAINTS;
 
- /* If placed in pkcs12.h, we end up with a circular depency with pkcs7.h */
-#define DECLARE_PKCS12_STACK_OF(type) /* Nothing */
-#define IMPLEMENT_PKCS12_STACK_OF(type) /* Nothing */
-
 typedef struct crypto_ex_data_st CRYPTO_EX_DATA;
-/* Callback types for crypto.h */
-typedef int 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, CRYPTO_EX_DATA *from, void *from_d, 
-					int idx, long argl, void *argp);
 
 typedef struct ocsp_req_ctx_st OCSP_REQ_CTX;
 typedef struct ocsp_response_st OCSP_RESPONSE;
 typedef struct ocsp_responder_id_st OCSP_RESPID;
 
-#endif /* def HEADER_OPENSSL_TYPES_H */
+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-0.7.1.tar.gz/extra_lib/include/openssl/pem.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/pem.h Changed

@@ -1,641 +1,501 @@
-/* crypto/pem/pem.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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
+# define HEADER_PEM_H
 
-#include <openssl/e_os2.h>
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#ifndef OPENSSL_NO_STACK
-#include <openssl/stack.h>
-#endif
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include <openssl/pem2.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_OBJ_UNDEF		0
-#define PEM_OBJ_X509		1
-#define PEM_OBJ_X509_REQ	2
-#define PEM_OBJ_CRL		3
-#define PEM_OBJ_SSL_SESSION	4
-#define PEM_OBJ_PRIV_KEY	10
-#define PEM_OBJ_PRIV_RSA	11
-#define PEM_OBJ_PRIV_DSA	12
-#define PEM_OBJ_PRIV_DH		13
-#define PEM_OBJ_PUB_RSA		14
-#define PEM_OBJ_PUB_DSA		15
-#define PEM_OBJ_PUB_DH		16
-#define PEM_OBJ_DHPARAMS	17
-#define PEM_OBJ_DSAPARAMS	18
-#define PEM_OBJ_PRIV_RSA_PUBLIC	19
-#define PEM_OBJ_PRIV_ECDSA	20
-#define PEM_OBJ_PUB_ECDSA	21
-#define PEM_OBJ_ECPARAMETERS	22
-
-#define PEM_ERROR		30
-#define PEM_DEK_DES_CBC 40
-#define PEM_DEK_IDEA_CBC 45
-#define PEM_DEK_DES_EDE 50
-#define PEM_DEK_DES_ECB 60
-#define PEM_DEK_RSA 70
-#define PEM_DEK_RSA_MD2 80
-#define PEM_DEK_RSA_MD5 90
-
-#define PEM_MD_MD2		NID_md2
-#define PEM_MD_MD5		NID_md5
-#define PEM_MD_SHA		NID_sha
-#define PEM_MD_MD2_RSA		NID_md2WithRSAEncryption
-#define PEM_MD_MD5_RSA		NID_md5WithRSAEncryption
-#define PEM_MD_SHA_RSA		NID_sha1WithRSAEncryption
-
-#define PEM_STRING_X509_OLD	"X509 CERTIFICATE"
-#define PEM_STRING_X509		"CERTIFICATE"
-#define PEM_STRING_X509_PAIR	"CERTIFICATE PAIR"
-#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_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"
-
- /* Note that this structure is initialised by PEM_SealInit and cleaned up
- by PEM_SealFinal (at least for now) */
-typedef struct PEM_Encode_Seal_st
-	{
-	EVP_ENCODE_CTX encode;
-	EVP_MD_CTX md;
-	EVP_CIPHER_CTX cipher;
-	} PEM_ENCODE_SEAL_CTX;
-
-/* enc_type is one off */
-#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 iv[8]; 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 iv[8]; */
-		} 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 iv[8]; */
-
-	
-	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(...)
+# 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 iv[8]; 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 iv[8]; */
+ } 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 iv[8]; */
+
+ 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_FP_API
-
-#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) /**/
+# ifdef OPENSSL_NO_STDIO
 
-#else
+# 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) \
+# 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) \
+# 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) \
+# 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) \
+# 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); \
-	}
+ 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) \
+# 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); \
-	}
+ 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
+# endif
 
-#define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
+# 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) \
+# 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) \
+# 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) \
+# 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); \
-	}
+ 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) \
+# 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); \
-	}
+ 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(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_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(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_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_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(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_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)
+# 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_FP_API)
-
-#define DECLARE_PEM_read_fp(name, type) /**/
-#define DECLARE_PEM_write_fp(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);
-
+# 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
 
-#ifndef OPENSSL_NO_BIO
-#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);
+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);
 
-#define DECLARE_PEM_write_bio_const(name, type) \
-	int PEM_write_bio_##name(BIO *bp, const type *x);
+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);
 
-#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);
-
-#else
-
-#define DECLARE_PEM_read_bio(name, type) /**/
-#define DECLARE_PEM_write_bio(name, type) /**/
-#define DECLARE_PEM_write_bio_const(name, type) /**/
-#define DECLARE_PEM_write_cb_bio(name, type) /**/
-
-#endif
-
-#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)
-
-#if 1
-/* "userdata": new with OpenSSL 0.9.4 */
-typedef int pem_password_cb(char *buf, int size, int rwflag, void *userdata);
-#else
-/* OpenSSL 0.9.3, 0.9.3a */
-typedef int pem_password_cb(char *buf, int size, int rwflag);
-#endif
-
-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);
-
-#ifndef OPENSSL_NO_BIO
-int	PEM_read_bio(BIO *bp, char **name, char **header,
-		unsigned char **data,long *len);
-int	PEM_write_bio(BIO *bp,const char *name,char *hdr,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);
-#endif
-
-int	PEM_read(FILE *fp, char **name, char **header,
-		unsigned char **data,long *len);
-int	PEM_write(FILE *fp,char *name,char *hdr,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);
-
-int	PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type,
-		EVP_MD *md_type, unsigned char **ek, int *ekl,
-		unsigned char *iv, EVP_PKEY **pubk, int npubk);
-void	PEM_SealUpdate(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *out, int *outl,
-		unsigned char *in, int inl);
-int	PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig,int *sigl,
-		unsigned char *out, int *outl, EVP_PKEY *priv);
-
-void PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type);
-void 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>
+# include <openssl/symhacks.h>
 
 DECLARE_PEM_rw(X509, X509)
-
 DECLARE_PEM_rw(X509_AUX, X509)
-
-DECLARE_PEM_rw(X509_CERT_PAIR, X509_CERT_PAIR)
-
 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
-
+# 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
-
+# 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
+# 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
-
+# endif
+# ifndef OPENSSL_NO_DH
 DECLARE_PEM_rw_const(DHparams, DH)
-
-#endif
-
+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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+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
+# 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
-
+ pem_password_cb *cb, void *u);
+# endif
+# endif
 
 /* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
+/*
+ * 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.
 */
-void ERR_load_PEM_strings(void);
+
+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_F_PEM_WRITE_PKCS8PRIVATEKEY		 118
-#define PEM_F_PEM_GET_EVP_CIPHER_INFO			 107
-#define PEM_F_PEM_PK8PKEY				 119
-#define PEM_F_PEM_READ					 108
-#define PEM_F_PEM_READ_BIO				 109
-#define PEM_F_PEM_READ_BIO_PARAMETERS			 140
-#define PEM_F_PEM_READ_BIO_PRIVATEKEY			 123
-#define PEM_F_PEM_READ_PRIVATEKEY			 124
-#define PEM_F_PEM_SEALFINAL				 110
-#define PEM_F_PEM_SEALINIT				 111
-#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
+# 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_INCONSISTENT_HEADER			 121
-#define PEM_R_KEYBLOB_HEADER_PARSE_ERROR		 122
-#define PEM_R_KEYBLOB_TOO_SHORT				 123
-#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_PUBLIC_KEY_NO_RSA				 110
-#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_UNSUPPORTED_CIPHER			 113
-#define PEM_R_UNSUPPORTED_ENCRYPTION			 114
-#define PEM_R_UNSUPPORTED_KEY_COMPONENTS		 126
-
-#ifdef __cplusplus
+# 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
 #endif

gpac-0.7.1.tar.gz/extra_lib/include/openssl/pem2.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/pem2.h Changed

@@ -1,60 +1,10 @@
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  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.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
 /*
- * This header only exists to break a circular dependency between pem and err
- * Ben 30 Jan 1999.
+ * 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
  */
 
 #ifdef __cplusplus
@@ -62,7 +12,7 @@
 #endif
 
 #ifndef HEADER_PEM_H
-void ERR_load_PEM_strings(void);
+int ERR_load_PEM_strings(void);
 #endif
 
 #ifdef __cplusplus

gpac-0.8.0.tar.gz/extra_lib/include/openssl/pkcs12.h Added

@@ -0,0 +1,282 @@
+/*
+ * 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-0.7.1.tar.gz/extra_lib/include/openssl/pkcs7.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/pkcs7.h Changed

@@ -1,292 +1,217 @@
-/* crypto/pkcs7/pkcs7.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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
+# define HEADER_PKCS7_H
 
-#include <openssl/asn1.h>
-#include <openssl/bio.h>
-#include <openssl/e_os2.h>
+# include <openssl/asn1.h>
+# include <openssl/bio.h>
+# include <openssl/e_os2.h>
 
-#include <openssl/symhacks.h>
-#include <openssl/ossl_typ.h>
+# include <openssl/symhacks.h>
+# include <openssl/ossl_typ.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef OPENSSL_SYS_WIN32
-/* Under Win32 thes are defined in wincrypt.h */
-#undef PKCS7_ISSUER_AND_SERIAL
-#undef PKCS7_SIGNER_INFO
-#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;
 /*
-Encryption_ID		DES-CBC
-Digest_ID		MD5
-Digest_Encryption_ID	rsaEncryption
-Key_Encryption_ID	rsaEncryption
-*/
+ * The above structure is very very similar to PKCS7_SIGN_ENVELOPE. How about
+ * merging the two
+ */
 
-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;
-
-DECLARE_STACK_OF(PKCS7_SIGNER_INFO)
-DECLARE_ASN1_SET_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;
-
-DECLARE_STACK_OF(PKCS7_RECIP_INFO)
-DECLARE_ASN1_SET_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;
-
-DECLARE_STACK_OF(PKCS7)
-DECLARE_ASN1_SET_OF(PKCS7)
-DECLARE_PKCS12_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_type_is_encrypted(a) \
-		(OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
-
-#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))
+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_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
+# 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_FP_API
-PKCS7 *d2i_PKCS7_fp(FILE *fp,PKCS7 **p7);
-int i2d_PKCS7_fp(FILE *fp,PKCS7 *p7);
-#endif
+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);
+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);
 
@@ -312,31 +237,30 @@
 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);
+ 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); 
+ BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si);
 int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
-								X509 *x509);
+ 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);
+ 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);
+ 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);
@@ -345,155 +269,136 @@
 
 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);
+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);
-
+ 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);
+ BIO *data, int flags);
 
 PKCS7_SIGNER_INFO *PKCS7_sign_add_signer(PKCS7 *p7,
-			X509 *signcert, EVP_PKEY *pkey, const EVP_MD *md,
-			int flags);
+ 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);
+ 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 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) *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);
+ 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
+/*
+ * 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.
 */
-void ERR_load_PKCS7_strings(void);
+
+int ERR_load_PKCS7_strings(void);
 
 /* Error codes for the PKCS7 functions. */
 
 /* Function codes. */
-#define PKCS7_F_B64_READ_PKCS7				 120
-#define PKCS7_F_B64_WRITE_PKCS7				 121
-#define PKCS7_F_DO_PKCS7_SIGNED_ATTRIB			 136
-#define PKCS7_F_I2D_PKCS7_BIO_STREAM			 140
-#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_DATASIGN				 106
-#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
-#define PKCS7_F_SMIME_READ_PKCS7			 122
-#define PKCS7_F_SMIME_TEXT				 123
+# 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_DECODE_ERROR				 130
-#define PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH		 100
-#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_MIME_TYPE			 131
-#define PKCS7_R_INVALID_NULL_POINTER			 143
-#define PKCS7_R_MIME_NO_CONTENT_TYPE			 132
-#define PKCS7_R_MIME_PARSE_ERROR			 133
-#define PKCS7_R_MIME_SIG_PARSE_ERROR			 134
-#define PKCS7_R_MISSING_CERIPEND_INFO			 103
-#define PKCS7_R_NO_CONTENT				 122
-#define PKCS7_R_NO_CONTENT_TYPE				 135
-#define PKCS7_R_NO_DEFAULT_DIGEST			 151
-#define PKCS7_R_NO_MATCHING_DIGEST_TYPE_FOUND		 154
-#define PKCS7_R_NO_MULTIPART_BODY_FAILURE		 136
-#define PKCS7_R_NO_MULTIPART_BOUNDARY			 137
-#define PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE	 115
-#define PKCS7_R_NO_RECIPIENT_MATCHES_KEY		 146
-#define PKCS7_R_NO_SIGNATURES_ON_DATA			 123
-#define PKCS7_R_NO_SIGNERS				 142
-#define PKCS7_R_NO_SIG_CONTENT_TYPE			 138
-#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_DATAFINAL				 126
-#define PKCS7_R_PKCS7_DATAFINAL_ERROR			 125
-#define PKCS7_R_PKCS7_DATASIGN				 145
-#define PKCS7_R_PKCS7_PARSE_ERROR			 139
-#define PKCS7_R_PKCS7_SIG_PARSE_ERROR			 140
-#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_SIG_INVALID_MIME_TYPE			 141
-#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
+# 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
 #endif

gpac-0.7.1.tar.gz/extra_lib/include/openssl/rand.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/rand.h Changed

@@ -1,140 +1,89 @@
-/* crypto/rand/rand.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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
+# define HEADER_RAND_H
 
-#include <stdlib.h>
-#include <openssl/ossl_typ.h>
-#include <openssl/e_os2.h>
-
-#if defined(OPENSSL_SYS_WINDOWS)
-#include <windows.h>
-#endif
+# include <stdlib.h>
+# include <openssl/ossl_typ.h>
+# include <openssl/e_os2.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if defined(OPENSSL_FIPS)
-#define FIPS_RAND_SIZE_T size_t
-#endif
-
 /* Already defined in ossl_typ.h */
 /* typedef struct rand_meth_st RAND_METHOD; */
 
-struct rand_meth_st
-	{
-	void (*seed)(const void *buf, int num);
-	int (*bytes)(unsigned char *buf, int num);
-	void (*cleanup)(void);
-	void (*add)(const void *buf, int num, double entropy);
-	int (*pseudorand)(unsigned char *buf, int num);
-	int (*status)(void);
-	};
+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
+# ifdef BN_DEBUG
 extern int rand_predictable;
-#endif
+# endif
 
 int RAND_set_rand_method(const RAND_METHOD *meth);
 const RAND_METHOD *RAND_get_rand_method(void);
-#ifndef OPENSSL_NO_ENGINE
+# 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
-RAND_METHOD *RAND_SSLeay(void);
-void RAND_cleanup(void );
-int RAND_bytes(unsigned char *buf,int num);
-int RAND_pseudo_bytes(unsigned char *buf,int num);
-void RAND_seed(const void *buf,int num);
-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);
+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);
+int RAND_egd_bytes(const char *path, int bytes);
+# endif
 int RAND_poll(void);
 
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-
-void RAND_screen(void);
-int RAND_event(UINT, WPARAM, LPARAM);
-
+#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
+/*
+ * 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.
 */
-void ERR_load_RAND_strings(void);
+
+int ERR_load_RAND_strings(void);
 
 /* Error codes for the RAND functions. */
 
 /* Function codes. */
-#define RAND_F_RAND_GET_RAND_METHOD			 101
-#define RAND_F_SSLEAY_RAND_BYTES			 100
+# define RAND_F_RAND_BYTES 100
 
 /* Reason codes. */
-#define RAND_R_PRNG_NOT_SEEDED				 100
+# define RAND_R_PRNG_NOT_SEEDED 100
 
-#ifdef __cplusplus
+# ifdef __cplusplus
 }
-#endif
+# endif
 #endif

gpac-0.8.0.tar.gz/extra_lib/include/openssl/rc2.h Added

@@ -0,0 +1,51 @@
+/*
+ * 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 data[64];
+} 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-0.8.0.tar.gz/extra_lib/include/openssl/rc4.h Added

gpac-0.8.0.tar.gz/extra_lib/include/openssl/rc5.h Added

@@ -0,0 +1,63 @@
+/*
+ * 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 data[2 * (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-0.8.0.tar.gz/extra_lib/include/openssl/ripemd.h Added

@@ -0,0 +1,47 @@
+/*
+ * 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 data[RIPEMD160_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-0.7.1.tar.gz/extra_lib/include/openssl/rsa.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/rsa.h Changed

@@ -1,503 +1,590 @@
-/* crypto/rsa/rsa.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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/asn1.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
 
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#include <openssl/crypto.h>
-#include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#endif
+/* The types RSA and RSA_METHOD are defined in ossl_typ.h */
 
-#ifdef OPENSSL_NO_RSA
-#error RSA is disabled.
-#endif
+# ifndef OPENSSL_RSA_MAX_MODULUS_BITS
+# define OPENSSL_RSA_MAX_MODULUS_BITS 16384
+# endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+# define OPENSSL_RSA_FIPS_MIN_MODULUS_BITS 1024
 
-/* Declared already in ossl_typ.h */
-/* typedef struct rsa_st RSA; */
-/* typedef struct rsa_meth_st RSA_METHOD; */
-
-struct rsa_meth_st
-	{
-	const char *name;
-	int (*rsa_pub_enc)(int flen,const unsigned char *from,
-			 unsigned char *to,
-			 RSA *rsa,int padding);
-	int (*rsa_pub_dec)(int flen,const unsigned char *from,
-			 unsigned char *to,
-			 RSA *rsa,int padding);
-	int (*rsa_priv_enc)(int flen,const unsigned char *from,
-			 unsigned char *to,
-			 RSA *rsa,int padding);
-	int (*rsa_priv_dec)(int flen,const unsigned char *from,
-			 unsigned char *to,
-			 RSA *rsa,int padding);
-	int (*rsa_mod_exp)(BIGNUM *r0,const BIGNUM *I,RSA *rsa,BN_CTX *ctx); /* Can be null */
-	int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-			 const BIGNUM *m, BN_CTX *ctx,
-			 BN_MONT_CTX *m_ctx); /* Can be null */
-	int (*init)(RSA *rsa);		/* called at new */
-	int (*finish)(RSA *rsa);	/* called at free */
-	int flags;			/* RSA_METHOD_FLAG_* things */
-	char *app_data;			/* may be needed! */
-/* New sign and verify functions: some libraries don't allow arbitrary data
- * to be signed/verified: this allows them to be used. Note: for this to work
- * the RSA_public_decrypt() and RSA_private_encrypt() should *NOT* be used
- * RSA_sign(), RSA_verify() should be used instead. Note: for backwards
- * compatibility this functionality is only enabled if the RSA_FLAG_SIGN_VER
- * option is set in 'flags'.
- */
-	int (*rsa_sign)(int type,
-		const unsigned char *m, unsigned int m_length,
-		unsigned char *sigret, unsigned int *siglen, const RSA *rsa);
-	int (*rsa_verify)(int dtype,
-		const unsigned char *m, unsigned int m_length,
-		const unsigned char *sigbuf, unsigned int siglen,
-								const RSA *rsa);
-/* If this callback is NULL, the builtin software RSA key-gen will be used. This
- * is for behavioural compatibility whilst the code gets rewired, but one day
- * it would be nice to assume there are no such things as "builtin software"
- * implementations. */
-	int (*rsa_keygen)(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
-	};
-
-struct rsa_st
-	{
-	/* The first parameter is used to pickup errors where
-	 * this is passed instead of aEVP_PKEY, it is set to 0 */
-	int pad;
-	long version;
-	const RSA_METHOD *meth;
-	/* functional reference if 'meth' is ENGINE-provided */
-	ENGINE *engine;
-	BIGNUM *n;
-	BIGNUM *e;
-	BIGNUM *d;
-	BIGNUM *p;
-	BIGNUM *q;
-	BIGNUM *dmp1;
-	BIGNUM *dmq1;
-	BIGNUM *iqmp;
-	/* be careful using this if the RSA structure is shared */
-	CRYPTO_EX_DATA ex_data;
-	int references;
-	int flags;
-
-	/* Used to cache montgomery values */
-	BN_MONT_CTX *_method_mod_n;
-	BN_MONT_CTX *_method_mod_p;
-	BN_MONT_CTX *_method_mod_q;
-
-	/* all BIGNUM values are actually in the following data, if it is not
-	 * NULL */
-	char *bignum_data;
-	BN_BLINDING *blinding;
-	BN_BLINDING *mt_blinding;
-	};
-
-#ifndef OPENSSL_RSA_MAX_MODULUS_BITS
-# define OPENSSL_RSA_MAX_MODULUS_BITS	16384
-#endif
+# ifndef OPENSSL_RSA_SMALL_MODULUS_BITS
+# define OPENSSL_RSA_SMALL_MODULUS_BITS 3072
+# endif
+# ifndef OPENSSL_RSA_MAX_PUBEXP_BITS
 
-#ifndef OPENSSL_RSA_SMALL_MODULUS_BITS
-# define OPENSSL_RSA_SMALL_MODULUS_BITS	3072
-#endif
-#ifndef OPENSSL_RSA_MAX_PUBEXP_BITS
-# define OPENSSL_RSA_MAX_PUBEXP_BITS	64 /* exponent limit enforced for "large" modulus only */
-#endif
+/* 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_3 0x3L
+# define RSA_F4 0x10001L
 
-#define RSA_METHOD_FLAG_NO_CHECK	0x0001 /* don't check pub/private match */
+# 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
+# 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.
+ * 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
+# define RSA_FLAG_EXT_PKEY 0x0020
 
-/* This flag in the RSA_METHOD enables the new rsa_sign, rsa_verify functions.
+/*
+ * 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_SIGN_VER		0x0040
-
-#define RSA_FLAG_NO_BLINDING		0x0080 /* 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_CONSTTIME		0x0100 /* new with 0.9.8f; the built-in RSA
-						* implementation now uses constant time
-						* operations by default in private key operations,
-						* e.g., constant time modular exponentiation, 
- * modular inverse without leaking branches, 
- * division without leaking branches. This 
- * flag disables these constant time 
- * operations and results in faster RSA 
- * private key operations.
- */ 
-#ifndef OPENSSL_NO_DEPRECATED
-#define RSA_FLAG_NO_EXP_CONSTTIME RSA_FLAG_NO_CONSTTIME /* 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.
- */
-#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_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_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_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 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
+# 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_size(const RSA *);
+# 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 */
-#ifndef OPENSSL_NO_DEPRECATED
-RSA *	RSA_generate_key(int bits, unsigned long e,void
-		(*callback)(int,int,void *),void *cb_arg);
-#endif /* !defined(OPENSSL_NO_DEPRECATED) */
+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_check_key(const RSA *);
-	/* 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);
+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_up_ref(RSA *r);
 
-int	RSA_flags(const 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);
 
-/* This function needs the memory locking malloc callbacks to be installed */
-int RSA_memory_lock(RSA *r);
-
-/* these are the actual SSLeay RSA functions */
-const RSA_METHOD *RSA_PKCS1_SSLeay(void);
+/* 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)
 
-#ifndef OPENSSL_NO_FP_API
-int	RSA_print_fp(FILE *fp, const RSA *r,int offset);
-#endif
+typedef struct rsa_pss_params_st {
+ X509_ALGOR *hashAlgorithm;
+ X509_ALGOR *maskGenAlgorithm;
+ ASN1_INTEGER *saltLength;
+ ASN1_INTEGER *trailerField;
+} RSA_PSS_PARAMS;
 
-#ifndef OPENSSL_NO_BIO
-int	RSA_print(BIO *bp, const RSA *r,int offset);
-#endif
+DECLARE_ASN1_FUNCTIONS(RSA_PSS_PARAMS)
 
-#ifndef OPENSSL_NO_RC4
-int i2d_RSA_NET(const RSA *a, unsigned char **pp,
-		int (*cb)(char *buf, int len, const char *prompt, int verify),
-		int sgckey);
-RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length,
-		 int (*cb)(char *buf, int len, const char *prompt, int verify),
-		 int sgckey);
-
-int i2d_Netscape_RSA(const RSA *a, unsigned char **pp,
-		 int (*cb)(char *buf, int len, const char *prompt,
-			 int verify));
-RSA *d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length,
-		 int (*cb)(char *buf, int len, const char *prompt,
-				int verify));
-#endif
+typedef struct rsa_oaep_params_st {
+ X509_ALGOR *hashFunc;
+ X509_ALGOR *maskGenFunc;
+ X509_ALGOR *pSourceFunc;
+} RSA_OAEP_PARAMS;
 
-/* The following 2 functions sign and verify a X509_SIG ASN1 object
- * inside PKCS#1 padded RSA encryption */
+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);
+ 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);
+ 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 */
+/*
+ * 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);
+ 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_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_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);
+ 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);
+ const unsigned char *mHash, const EVP_MD *Hash,
+ int sLen);
 
-int RSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int RSA_set_ex_data(RSA *r,int idx,void *arg);
+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
+/*
+ * 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.
 */
-void ERR_load_RSA_strings(void);
+
+int ERR_load_RSA_strings(void);
 
 /* Error codes for the RSA functions. */
 
 /* Function codes. */
-#define RSA_F_CHECK_PADDING_MD				 140
-#define RSA_F_DO_RSA_PRINT				 146
-#define RSA_F_INT_RSA_VERIFY				 145
-#define RSA_F_MEMORY_LOCK				 100
-#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_VERIFYRECOVER			 141
-#define RSA_F_RSA_BUILTIN_KEYGEN			 129
-#define RSA_F_RSA_CHECK_KEY				 123
-#define RSA_F_RSA_EAY_PRIVATE_DECRYPT			 101
-#define RSA_F_RSA_EAY_PRIVATE_ENCRYPT			 102
-#define RSA_F_RSA_EAY_PUBLIC_DECRYPT			 103
-#define RSA_F_RSA_EAY_PUBLIC_ENCRYPT			 104
-#define RSA_F_RSA_GENERATE_KEY				 105
-#define RSA_F_RSA_MEMORY_LOCK				 130
-#define RSA_F_RSA_NEW_METHOD				 106
-#define RSA_F_RSA_NULL					 124
-#define RSA_F_RSA_NULL_MOD_EXP				 131
-#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_PADDING_ADD_NONE			 107
-#define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP		 121
-#define RSA_F_RSA_PADDING_ADD_PKCS1_PSS			 125
-#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_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_DECODE				 137
-#define RSA_F_RSA_PRIV_ENCODE				 138
-#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			 126
+# 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_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_LENGTH			 143
-#define RSA_R_INVALID_HEADER				 137
-#define RSA_R_INVALID_KEYBITS				 145
-#define RSA_R_INVALID_MESSAGE_LENGTH			 131
-#define RSA_R_INVALID_PADDING				 138
-#define RSA_R_INVALID_PADDING_MODE			 141
-#define RSA_R_INVALID_PSS_SALTLEN			 146
-#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_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_PADDING_TYPE			 118
-#define RSA_R_VALUE_MISSING				 147
-#define RSA_R_WRONG_SIGNATURE_LENGTH			 119
-
-#ifdef __cplusplus
+# 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
 #endif

gpac-0.7.1.tar.gz/extra_lib/include/openssl/safestack.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/safestack.h Changed

@@ -1,103 +1,131 @@
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+/*
+ * 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
+# define HEADER_SAFESTACK_H
 
-#include <openssl/stack.h>
+# include <openssl/stack.h>
+# include <openssl/e_os2.h>
 
-#ifndef CHECKED_PTR_OF
-#define CHECKED_PTR_OF(type, p) \
- ((void*) (1 ? p : (type*)0))
+#ifdef __cplusplus
+extern "C" {
 #endif
 
-/* In C++ we get problems because an explicit cast is needed from (void *)
- * we use CHECKED_STACK_OF to ensure the correct type is passed in the macros
- * below. 
- */
-
-#define CHECKED_STACK_OF(type, p) \
- ((_STACK*) (1 ? p : (STACK_OF(type)*)0))
+# define STACK_OF(type) struct stack_st_##type
 
-#define CHECKED_SK_FREE_FUNC(type, p) \
- ((void (*)(void *)) ((1 ? p : (void (*)(type *))0)))
-
-#define CHECKED_SK_FREE_FUNC2(type, p) \
- ((void (*)(void *)) ((1 ? p : (void (*)(type))0)))
-
-#define CHECKED_SK_CMP_FUNC(type, p) \
- ((int (*)(const void *, const void *)) \
-	((1 ? p : (int (*)(const type * const *, const type * const *))0)))
-
-#define STACK_OF(type) struct stack_st_##type
-#define PREDECLARE_STACK_OF(type) STACK_OF(type);
-
-#define DECLARE_STACK_OF(type) \
-STACK_OF(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) \
 { \
- _STACK stack; \
- };
-#define DECLARE_SPECIAL_STACK_OF(type, type2) \
-STACK_OF(type) \
+ return OPENSSL_sk_num((const OPENSSL_STACK *)sk); \
+ } \
+ static ossl_inline t2 *sk_##t1##_value(const STACK_OF(t1) *sk, int idx) \
 { \
- _STACK stack; \
- };
-
-#define IMPLEMENT_STACK_OF(type) /* nada (obsolete in new safestack approach)*/
+ 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
+/*-
+ * 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.
@@ -106,2470 +134,31 @@
 * So, they need their own declarations. Especially important for
 * type-checking tools, such as Deputy.
 *
-o * In practice, however, it appears to be hard to have a const
+ * 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.
+/*-
+ * 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)
 
-DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
-
-/* Similarly, we sometimes use a block of characters, NOT
- * nul-terminated. These should also be distinguished from "normal"
- * stacks. */
-
+/*
+ * Similarly, we sometimes use a block of characters, NOT nul-terminated.
+ * These should also be distinguished from "normal" stacks.
+ */
 typedef void *OPENSSL_BLOCK;
-DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
-
-/* SKM_sk_... stack macros are internal to safestack.h:
- * never use them directly, use sk_<type>_... instead */
-#define SKM_sk_new(type, cmp) \
-	((STACK_OF(type) *)sk_new(CHECKED_SK_CMP_FUNC(type, cmp)))
-#define SKM_sk_new_null(type) \
-	((STACK_OF(type) *)sk_new_null())
-#define SKM_sk_free(type, st) \
-	sk_free(CHECKED_STACK_OF(type, st))
-#define SKM_sk_num(type, st) \
-	sk_num(CHECKED_STACK_OF(type, st))
-#define SKM_sk_value(type, st,i) \
-	((type *)sk_value(CHECKED_STACK_OF(type, st), i))
-#define SKM_sk_set(type, st,i,val) \
-	sk_set(CHECKED_STACK_OF(type, st), i, CHECKED_PTR_OF(type, val))
-#define SKM_sk_zero(type, st) \
-	sk_zero(CHECKED_STACK_OF(type, st))
-#define SKM_sk_push(type, st, val) \
-	sk_push(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))
-#define SKM_sk_unshift(type, st, val) \
-	sk_unshift(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))
-#define SKM_sk_find(type, st, val) \
-	sk_find(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))
-#define SKM_sk_find_ex(type, st, val) \
-	sk_find_ex(CHECKED_STACK_OF(type, st), \
-		 CHECKED_PTR_OF(type, val))
-#define SKM_sk_delete(type, st, i) \
-	(type *)sk_delete(CHECKED_STACK_OF(type, st), i)
-#define SKM_sk_delete_ptr(type, st, ptr) \
-	(type *)sk_delete_ptr(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, ptr))
-#define SKM_sk_insert(type, st,val, i) \
-	sk_insert(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val), i)
-#define SKM_sk_set_cmp_func(type, st, cmp) \
-	((int (*)(const type * const *,const type * const *)) \
-	sk_set_cmp_func(CHECKED_STACK_OF(type, st), CHECKED_SK_CMP_FUNC(type, cmp)))
-#define SKM_sk_dup(type, st) \
-	(STACK_OF(type) *)sk_dup(CHECKED_STACK_OF(type, st))
-#define SKM_sk_pop_free(type, st, free_func) \
-	sk_pop_free(CHECKED_STACK_OF(type, st), CHECKED_SK_FREE_FUNC(type, free_func))
-#define SKM_sk_shift(type, st) \
-	(type *)sk_shift(CHECKED_STACK_OF(type, st))
-#define SKM_sk_pop(type, st) \
-	(type *)sk_pop(CHECKED_STACK_OF(type, st))
-#define SKM_sk_sort(type, st) \
-	sk_sort(CHECKED_STACK_OF(type, st))
-#define SKM_sk_is_sorted(type, st) \
-	sk_is_sorted(CHECKED_STACK_OF(type, st))
-
-#define	SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
- (STACK_OF(type) *)d2i_ASN1_SET( \
-				(STACK_OF(OPENSSL_BLOCK) **)CHECKED_PTR_OF(STACK_OF(type)*, st), \
-				pp, length, \
-				CHECKED_D2I_OF(type, d2i_func), \
-				CHECKED_SK_FREE_FUNC(type, free_func), \
-				ex_tag, ex_class)
-
-#define	SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \
- i2d_ASN1_SET((STACK_OF(OPENSSL_BLOCK) *)CHECKED_STACK_OF(type, st), pp, \
-				CHECKED_I2D_OF(type, i2d_func), \
-				ex_tag, ex_class, is_set)
-
-#define	SKM_ASN1_seq_pack(type, st, i2d_func, buf, len) \
-	ASN1_seq_pack(CHECKED_PTR_OF(STACK_OF(type), st), \
-			CHECKED_I2D_OF(type, i2d_func), buf, len)
-
-#define	SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \
-	(STACK_OF(type) *)ASN1_seq_unpack(buf, len, CHECKED_D2I_OF(type, d2i_func), CHECKED_SK_FREE_FUNC(type, free_func))
-
-#define SKM_PKCS12_decrypt_d2i(type, algor, d2i_func, free_func, pass, passlen, oct, seq) \
-	(STACK_OF(type) *)PKCS12_decrypt_d2i(algor, \
-				CHECKED_D2I_OF(type, d2i_func), \
-				CHECKED_SK_FREE_FUNC(type, free_func), \
-				pass, passlen, oct, seq)
-
-/* This block of defines is updated by util/mkstack.pl, please do not touch! */
-#define sk_ACCESS_DESCRIPTION_new(cmp) SKM_sk_new(ACCESS_DESCRIPTION, (cmp))
-#define sk_ACCESS_DESCRIPTION_new_null() SKM_sk_new_null(ACCESS_DESCRIPTION)
-#define sk_ACCESS_DESCRIPTION_free(st) SKM_sk_free(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_num(st) SKM_sk_num(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_value(st, i) SKM_sk_value(ACCESS_DESCRIPTION, (st), (i))
-#define sk_ACCESS_DESCRIPTION_set(st, i, val) SKM_sk_set(ACCESS_DESCRIPTION, (st), (i), (val))
-#define sk_ACCESS_DESCRIPTION_zero(st) SKM_sk_zero(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_push(st, val) SKM_sk_push(ACCESS_DESCRIPTION, (st), (val))
-#define sk_ACCESS_DESCRIPTION_unshift(st, val) SKM_sk_unshift(ACCESS_DESCRIPTION, (st), (val))
-#define sk_ACCESS_DESCRIPTION_find(st, val) SKM_sk_find(ACCESS_DESCRIPTION, (st), (val))
-#define sk_ACCESS_DESCRIPTION_find_ex(st, val) SKM_sk_find_ex(ACCESS_DESCRIPTION, (st), (val))
-#define sk_ACCESS_DESCRIPTION_delete(st, i) SKM_sk_delete(ACCESS_DESCRIPTION, (st), (i))
-#define sk_ACCESS_DESCRIPTION_delete_ptr(st, ptr) SKM_sk_delete_ptr(ACCESS_DESCRIPTION, (st), (ptr))
-#define sk_ACCESS_DESCRIPTION_insert(st, val, i) SKM_sk_insert(ACCESS_DESCRIPTION, (st), (val), (i))
-#define sk_ACCESS_DESCRIPTION_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ACCESS_DESCRIPTION, (st), (cmp))
-#define sk_ACCESS_DESCRIPTION_dup(st) SKM_sk_dup(ACCESS_DESCRIPTION, st)
-#define sk_ACCESS_DESCRIPTION_pop_free(st, free_func) SKM_sk_pop_free(ACCESS_DESCRIPTION, (st), (free_func))
-#define sk_ACCESS_DESCRIPTION_shift(st) SKM_sk_shift(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_pop(st) SKM_sk_pop(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_sort(st) SKM_sk_sort(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_is_sorted(st) SKM_sk_is_sorted(ACCESS_DESCRIPTION, (st))
-
-#define sk_ASIdOrRange_new(cmp) SKM_sk_new(ASIdOrRange, (cmp))
-#define sk_ASIdOrRange_new_null() SKM_sk_new_null(ASIdOrRange)
-#define sk_ASIdOrRange_free(st) SKM_sk_free(ASIdOrRange, (st))
-#define sk_ASIdOrRange_num(st) SKM_sk_num(ASIdOrRange, (st))
-#define sk_ASIdOrRange_value(st, i) SKM_sk_value(ASIdOrRange, (st), (i))
-#define sk_ASIdOrRange_set(st, i, val) SKM_sk_set(ASIdOrRange, (st), (i), (val))
-#define sk_ASIdOrRange_zero(st) SKM_sk_zero(ASIdOrRange, (st))
-#define sk_ASIdOrRange_push(st, val) SKM_sk_push(ASIdOrRange, (st), (val))
-#define sk_ASIdOrRange_unshift(st, val) SKM_sk_unshift(ASIdOrRange, (st), (val))
-#define sk_ASIdOrRange_find(st, val) SKM_sk_find(ASIdOrRange, (st), (val))
-#define sk_ASIdOrRange_find_ex(st, val) SKM_sk_find_ex(ASIdOrRange, (st), (val))
-#define sk_ASIdOrRange_delete(st, i) SKM_sk_delete(ASIdOrRange, (st), (i))
-#define sk_ASIdOrRange_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASIdOrRange, (st), (ptr))
-#define sk_ASIdOrRange_insert(st, val, i) SKM_sk_insert(ASIdOrRange, (st), (val), (i))
-#define sk_ASIdOrRange_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASIdOrRange, (st), (cmp))
-#define sk_ASIdOrRange_dup(st) SKM_sk_dup(ASIdOrRange, st)
-#define sk_ASIdOrRange_pop_free(st, free_func) SKM_sk_pop_free(ASIdOrRange, (st), (free_func))
-#define sk_ASIdOrRange_shift(st) SKM_sk_shift(ASIdOrRange, (st))
-#define sk_ASIdOrRange_pop(st) SKM_sk_pop(ASIdOrRange, (st))
-#define sk_ASIdOrRange_sort(st) SKM_sk_sort(ASIdOrRange, (st))
-#define sk_ASIdOrRange_is_sorted(st) SKM_sk_is_sorted(ASIdOrRange, (st))
-
-#define sk_ASN1_GENERALSTRING_new(cmp) SKM_sk_new(ASN1_GENERALSTRING, (cmp))
-#define sk_ASN1_GENERALSTRING_new_null() SKM_sk_new_null(ASN1_GENERALSTRING)
-#define sk_ASN1_GENERALSTRING_free(st) SKM_sk_free(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_num(st) SKM_sk_num(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_value(st, i) SKM_sk_value(ASN1_GENERALSTRING, (st), (i))
-#define sk_ASN1_GENERALSTRING_set(st, i, val) SKM_sk_set(ASN1_GENERALSTRING, (st), (i), (val))
-#define sk_ASN1_GENERALSTRING_zero(st) SKM_sk_zero(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_push(st, val) SKM_sk_push(ASN1_GENERALSTRING, (st), (val))
-#define sk_ASN1_GENERALSTRING_unshift(st, val) SKM_sk_unshift(ASN1_GENERALSTRING, (st), (val))
-#define sk_ASN1_GENERALSTRING_find(st, val) SKM_sk_find(ASN1_GENERALSTRING, (st), (val))
-#define sk_ASN1_GENERALSTRING_find_ex(st, val) SKM_sk_find_ex(ASN1_GENERALSTRING, (st), (val))
-#define sk_ASN1_GENERALSTRING_delete(st, i) SKM_sk_delete(ASN1_GENERALSTRING, (st), (i))
-#define sk_ASN1_GENERALSTRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_GENERALSTRING, (st), (ptr))
-#define sk_ASN1_GENERALSTRING_insert(st, val, i) SKM_sk_insert(ASN1_GENERALSTRING, (st), (val), (i))
-#define sk_ASN1_GENERALSTRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_GENERALSTRING, (st), (cmp))
-#define sk_ASN1_GENERALSTRING_dup(st) SKM_sk_dup(ASN1_GENERALSTRING, st)
-#define sk_ASN1_GENERALSTRING_pop_free(st, free_func) SKM_sk_pop_free(ASN1_GENERALSTRING, (st), (free_func))
-#define sk_ASN1_GENERALSTRING_shift(st) SKM_sk_shift(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_pop(st) SKM_sk_pop(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_sort(st) SKM_sk_sort(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_is_sorted(st) SKM_sk_is_sorted(ASN1_GENERALSTRING, (st))
-
-#define sk_ASN1_INTEGER_new(cmp) SKM_sk_new(ASN1_INTEGER, (cmp))
-#define sk_ASN1_INTEGER_new_null() SKM_sk_new_null(ASN1_INTEGER)
-#define sk_ASN1_INTEGER_free(st) SKM_sk_free(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_num(st) SKM_sk_num(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_value(st, i) SKM_sk_value(ASN1_INTEGER, (st), (i))
-#define sk_ASN1_INTEGER_set(st, i, val) SKM_sk_set(ASN1_INTEGER, (st), (i), (val))
-#define sk_ASN1_INTEGER_zero(st) SKM_sk_zero(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_push(st, val) SKM_sk_push(ASN1_INTEGER, (st), (val))
-#define sk_ASN1_INTEGER_unshift(st, val) SKM_sk_unshift(ASN1_INTEGER, (st), (val))
-#define sk_ASN1_INTEGER_find(st, val) SKM_sk_find(ASN1_INTEGER, (st), (val))
-#define sk_ASN1_INTEGER_find_ex(st, val) SKM_sk_find_ex(ASN1_INTEGER, (st), (val))
-#define sk_ASN1_INTEGER_delete(st, i) SKM_sk_delete(ASN1_INTEGER, (st), (i))
-#define sk_ASN1_INTEGER_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_INTEGER, (st), (ptr))
-#define sk_ASN1_INTEGER_insert(st, val, i) SKM_sk_insert(ASN1_INTEGER, (st), (val), (i))
-#define sk_ASN1_INTEGER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_INTEGER, (st), (cmp))
-#define sk_ASN1_INTEGER_dup(st) SKM_sk_dup(ASN1_INTEGER, st)
-#define sk_ASN1_INTEGER_pop_free(st, free_func) SKM_sk_pop_free(ASN1_INTEGER, (st), (free_func))
-#define sk_ASN1_INTEGER_shift(st) SKM_sk_shift(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_pop(st) SKM_sk_pop(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_sort(st) SKM_sk_sort(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_is_sorted(st) SKM_sk_is_sorted(ASN1_INTEGER, (st))
-
-#define sk_ASN1_OBJECT_new(cmp) SKM_sk_new(ASN1_OBJECT, (cmp))
-#define sk_ASN1_OBJECT_new_null() SKM_sk_new_null(ASN1_OBJECT)
-#define sk_ASN1_OBJECT_free(st) SKM_sk_free(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_num(st) SKM_sk_num(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_value(st, i) SKM_sk_value(ASN1_OBJECT, (st), (i))
-#define sk_ASN1_OBJECT_set(st, i, val) SKM_sk_set(ASN1_OBJECT, (st), (i), (val))
-#define sk_ASN1_OBJECT_zero(st) SKM_sk_zero(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_push(st, val) SKM_sk_push(ASN1_OBJECT, (st), (val))
-#define sk_ASN1_OBJECT_unshift(st, val) SKM_sk_unshift(ASN1_OBJECT, (st), (val))
-#define sk_ASN1_OBJECT_find(st, val) SKM_sk_find(ASN1_OBJECT, (st), (val))
-#define sk_ASN1_OBJECT_find_ex(st, val) SKM_sk_find_ex(ASN1_OBJECT, (st), (val))
-#define sk_ASN1_OBJECT_delete(st, i) SKM_sk_delete(ASN1_OBJECT, (st), (i))
-#define sk_ASN1_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_OBJECT, (st), (ptr))
-#define sk_ASN1_OBJECT_insert(st, val, i) SKM_sk_insert(ASN1_OBJECT, (st), (val), (i))
-#define sk_ASN1_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_OBJECT, (st), (cmp))
-#define sk_ASN1_OBJECT_dup(st) SKM_sk_dup(ASN1_OBJECT, st)
-#define sk_ASN1_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(ASN1_OBJECT, (st), (free_func))
-#define sk_ASN1_OBJECT_shift(st) SKM_sk_shift(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_pop(st) SKM_sk_pop(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_sort(st) SKM_sk_sort(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_is_sorted(st) SKM_sk_is_sorted(ASN1_OBJECT, (st))
-
-#define sk_ASN1_STRING_TABLE_new(cmp) SKM_sk_new(ASN1_STRING_TABLE, (cmp))
-#define sk_ASN1_STRING_TABLE_new_null() SKM_sk_new_null(ASN1_STRING_TABLE)
-#define sk_ASN1_STRING_TABLE_free(st) SKM_sk_free(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_num(st) SKM_sk_num(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_value(st, i) SKM_sk_value(ASN1_STRING_TABLE, (st), (i))
-#define sk_ASN1_STRING_TABLE_set(st, i, val) SKM_sk_set(ASN1_STRING_TABLE, (st), (i), (val))
-#define sk_ASN1_STRING_TABLE_zero(st) SKM_sk_zero(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_push(st, val) SKM_sk_push(ASN1_STRING_TABLE, (st), (val))
-#define sk_ASN1_STRING_TABLE_unshift(st, val) SKM_sk_unshift(ASN1_STRING_TABLE, (st), (val))
-#define sk_ASN1_STRING_TABLE_find(st, val) SKM_sk_find(ASN1_STRING_TABLE, (st), (val))
-#define sk_ASN1_STRING_TABLE_find_ex(st, val) SKM_sk_find_ex(ASN1_STRING_TABLE, (st), (val))
-#define sk_ASN1_STRING_TABLE_delete(st, i) SKM_sk_delete(ASN1_STRING_TABLE, (st), (i))
-#define sk_ASN1_STRING_TABLE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_STRING_TABLE, (st), (ptr))
-#define sk_ASN1_STRING_TABLE_insert(st, val, i) SKM_sk_insert(ASN1_STRING_TABLE, (st), (val), (i))
-#define sk_ASN1_STRING_TABLE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_STRING_TABLE, (st), (cmp))
-#define sk_ASN1_STRING_TABLE_dup(st) SKM_sk_dup(ASN1_STRING_TABLE, st)
-#define sk_ASN1_STRING_TABLE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_STRING_TABLE, (st), (free_func))
-#define sk_ASN1_STRING_TABLE_shift(st) SKM_sk_shift(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_pop(st) SKM_sk_pop(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_sort(st) SKM_sk_sort(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_is_sorted(st) SKM_sk_is_sorted(ASN1_STRING_TABLE, (st))
-
-#define sk_ASN1_TYPE_new(cmp) SKM_sk_new(ASN1_TYPE, (cmp))
-#define sk_ASN1_TYPE_new_null() SKM_sk_new_null(ASN1_TYPE)
-#define sk_ASN1_TYPE_free(st) SKM_sk_free(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_num(st) SKM_sk_num(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_value(st, i) SKM_sk_value(ASN1_TYPE, (st), (i))
-#define sk_ASN1_TYPE_set(st, i, val) SKM_sk_set(ASN1_TYPE, (st), (i), (val))
-#define sk_ASN1_TYPE_zero(st) SKM_sk_zero(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_push(st, val) SKM_sk_push(ASN1_TYPE, (st), (val))
-#define sk_ASN1_TYPE_unshift(st, val) SKM_sk_unshift(ASN1_TYPE, (st), (val))
-#define sk_ASN1_TYPE_find(st, val) SKM_sk_find(ASN1_TYPE, (st), (val))
-#define sk_ASN1_TYPE_find_ex(st, val) SKM_sk_find_ex(ASN1_TYPE, (st), (val))
-#define sk_ASN1_TYPE_delete(st, i) SKM_sk_delete(ASN1_TYPE, (st), (i))
-#define sk_ASN1_TYPE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_TYPE, (st), (ptr))
-#define sk_ASN1_TYPE_insert(st, val, i) SKM_sk_insert(ASN1_TYPE, (st), (val), (i))
-#define sk_ASN1_TYPE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_TYPE, (st), (cmp))
-#define sk_ASN1_TYPE_dup(st) SKM_sk_dup(ASN1_TYPE, st)
-#define sk_ASN1_TYPE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_TYPE, (st), (free_func))
-#define sk_ASN1_TYPE_shift(st) SKM_sk_shift(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_pop(st) SKM_sk_pop(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_sort(st) SKM_sk_sort(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_is_sorted(st) SKM_sk_is_sorted(ASN1_TYPE, (st))
-
-#define sk_ASN1_UTF8STRING_new(cmp) SKM_sk_new(ASN1_UTF8STRING, (cmp))
-#define sk_ASN1_UTF8STRING_new_null() SKM_sk_new_null(ASN1_UTF8STRING)
-#define sk_ASN1_UTF8STRING_free(st) SKM_sk_free(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_num(st) SKM_sk_num(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_value(st, i) SKM_sk_value(ASN1_UTF8STRING, (st), (i))
-#define sk_ASN1_UTF8STRING_set(st, i, val) SKM_sk_set(ASN1_UTF8STRING, (st), (i), (val))
-#define sk_ASN1_UTF8STRING_zero(st) SKM_sk_zero(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_push(st, val) SKM_sk_push(ASN1_UTF8STRING, (st), (val))
-#define sk_ASN1_UTF8STRING_unshift(st, val) SKM_sk_unshift(ASN1_UTF8STRING, (st), (val))
-#define sk_ASN1_UTF8STRING_find(st, val) SKM_sk_find(ASN1_UTF8STRING, (st), (val))
-#define sk_ASN1_UTF8STRING_find_ex(st, val) SKM_sk_find_ex(ASN1_UTF8STRING, (st), (val))
-#define sk_ASN1_UTF8STRING_delete(st, i) SKM_sk_delete(ASN1_UTF8STRING, (st), (i))
-#define sk_ASN1_UTF8STRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_UTF8STRING, (st), (ptr))
-#define sk_ASN1_UTF8STRING_insert(st, val, i) SKM_sk_insert(ASN1_UTF8STRING, (st), (val), (i))
-#define sk_ASN1_UTF8STRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_UTF8STRING, (st), (cmp))
-#define sk_ASN1_UTF8STRING_dup(st) SKM_sk_dup(ASN1_UTF8STRING, st)
-#define sk_ASN1_UTF8STRING_pop_free(st, free_func) SKM_sk_pop_free(ASN1_UTF8STRING, (st), (free_func))
-#define sk_ASN1_UTF8STRING_shift(st) SKM_sk_shift(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_pop(st) SKM_sk_pop(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_sort(st) SKM_sk_sort(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_is_sorted(st) SKM_sk_is_sorted(ASN1_UTF8STRING, (st))
-
-#define sk_ASN1_VALUE_new(cmp) SKM_sk_new(ASN1_VALUE, (cmp))
-#define sk_ASN1_VALUE_new_null() SKM_sk_new_null(ASN1_VALUE)
-#define sk_ASN1_VALUE_free(st) SKM_sk_free(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_num(st) SKM_sk_num(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_value(st, i) SKM_sk_value(ASN1_VALUE, (st), (i))
-#define sk_ASN1_VALUE_set(st, i, val) SKM_sk_set(ASN1_VALUE, (st), (i), (val))
-#define sk_ASN1_VALUE_zero(st) SKM_sk_zero(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_push(st, val) SKM_sk_push(ASN1_VALUE, (st), (val))
-#define sk_ASN1_VALUE_unshift(st, val) SKM_sk_unshift(ASN1_VALUE, (st), (val))
-#define sk_ASN1_VALUE_find(st, val) SKM_sk_find(ASN1_VALUE, (st), (val))
-#define sk_ASN1_VALUE_find_ex(st, val) SKM_sk_find_ex(ASN1_VALUE, (st), (val))
-#define sk_ASN1_VALUE_delete(st, i) SKM_sk_delete(ASN1_VALUE, (st), (i))
-#define sk_ASN1_VALUE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_VALUE, (st), (ptr))
-#define sk_ASN1_VALUE_insert(st, val, i) SKM_sk_insert(ASN1_VALUE, (st), (val), (i))
-#define sk_ASN1_VALUE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_VALUE, (st), (cmp))
-#define sk_ASN1_VALUE_dup(st) SKM_sk_dup(ASN1_VALUE, st)
-#define sk_ASN1_VALUE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_VALUE, (st), (free_func))
-#define sk_ASN1_VALUE_shift(st) SKM_sk_shift(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_pop(st) SKM_sk_pop(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_sort(st) SKM_sk_sort(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_is_sorted(st) SKM_sk_is_sorted(ASN1_VALUE, (st))
-
-#define sk_BIO_new(cmp) SKM_sk_new(BIO, (cmp))
-#define sk_BIO_new_null() SKM_sk_new_null(BIO)
-#define sk_BIO_free(st) SKM_sk_free(BIO, (st))
-#define sk_BIO_num(st) SKM_sk_num(BIO, (st))
-#define sk_BIO_value(st, i) SKM_sk_value(BIO, (st), (i))
-#define sk_BIO_set(st, i, val) SKM_sk_set(BIO, (st), (i), (val))
-#define sk_BIO_zero(st) SKM_sk_zero(BIO, (st))
-#define sk_BIO_push(st, val) SKM_sk_push(BIO, (st), (val))
-#define sk_BIO_unshift(st, val) SKM_sk_unshift(BIO, (st), (val))
-#define sk_BIO_find(st, val) SKM_sk_find(BIO, (st), (val))
-#define sk_BIO_find_ex(st, val) SKM_sk_find_ex(BIO, (st), (val))
-#define sk_BIO_delete(st, i) SKM_sk_delete(BIO, (st), (i))
-#define sk_BIO_delete_ptr(st, ptr) SKM_sk_delete_ptr(BIO, (st), (ptr))
-#define sk_BIO_insert(st, val, i) SKM_sk_insert(BIO, (st), (val), (i))
-#define sk_BIO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BIO, (st), (cmp))
-#define sk_BIO_dup(st) SKM_sk_dup(BIO, st)
-#define sk_BIO_pop_free(st, free_func) SKM_sk_pop_free(BIO, (st), (free_func))
-#define sk_BIO_shift(st) SKM_sk_shift(BIO, (st))
-#define sk_BIO_pop(st) SKM_sk_pop(BIO, (st))
-#define sk_BIO_sort(st) SKM_sk_sort(BIO, (st))
-#define sk_BIO_is_sorted(st) SKM_sk_is_sorted(BIO, (st))
-
-#define sk_BY_DIR_ENTRY_new(cmp) SKM_sk_new(BY_DIR_ENTRY, (cmp))
-#define sk_BY_DIR_ENTRY_new_null() SKM_sk_new_null(BY_DIR_ENTRY)
-#define sk_BY_DIR_ENTRY_free(st) SKM_sk_free(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_num(st) SKM_sk_num(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_value(st, i) SKM_sk_value(BY_DIR_ENTRY, (st), (i))
-#define sk_BY_DIR_ENTRY_set(st, i, val) SKM_sk_set(BY_DIR_ENTRY, (st), (i), (val))
-#define sk_BY_DIR_ENTRY_zero(st) SKM_sk_zero(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_push(st, val) SKM_sk_push(BY_DIR_ENTRY, (st), (val))
-#define sk_BY_DIR_ENTRY_unshift(st, val) SKM_sk_unshift(BY_DIR_ENTRY, (st), (val))
-#define sk_BY_DIR_ENTRY_find(st, val) SKM_sk_find(BY_DIR_ENTRY, (st), (val))
-#define sk_BY_DIR_ENTRY_find_ex(st, val) SKM_sk_find_ex(BY_DIR_ENTRY, (st), (val))
-#define sk_BY_DIR_ENTRY_delete(st, i) SKM_sk_delete(BY_DIR_ENTRY, (st), (i))
-#define sk_BY_DIR_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(BY_DIR_ENTRY, (st), (ptr))
-#define sk_BY_DIR_ENTRY_insert(st, val, i) SKM_sk_insert(BY_DIR_ENTRY, (st), (val), (i))
-#define sk_BY_DIR_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BY_DIR_ENTRY, (st), (cmp))
-#define sk_BY_DIR_ENTRY_dup(st) SKM_sk_dup(BY_DIR_ENTRY, st)
-#define sk_BY_DIR_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(BY_DIR_ENTRY, (st), (free_func))
-#define sk_BY_DIR_ENTRY_shift(st) SKM_sk_shift(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_pop(st) SKM_sk_pop(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_sort(st) SKM_sk_sort(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_is_sorted(st) SKM_sk_is_sorted(BY_DIR_ENTRY, (st))
-
-#define sk_BY_DIR_HASH_new(cmp) SKM_sk_new(BY_DIR_HASH, (cmp))
-#define sk_BY_DIR_HASH_new_null() SKM_sk_new_null(BY_DIR_HASH)
-#define sk_BY_DIR_HASH_free(st) SKM_sk_free(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_num(st) SKM_sk_num(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_value(st, i) SKM_sk_value(BY_DIR_HASH, (st), (i))
-#define sk_BY_DIR_HASH_set(st, i, val) SKM_sk_set(BY_DIR_HASH, (st), (i), (val))
-#define sk_BY_DIR_HASH_zero(st) SKM_sk_zero(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_push(st, val) SKM_sk_push(BY_DIR_HASH, (st), (val))
-#define sk_BY_DIR_HASH_unshift(st, val) SKM_sk_unshift(BY_DIR_HASH, (st), (val))
-#define sk_BY_DIR_HASH_find(st, val) SKM_sk_find(BY_DIR_HASH, (st), (val))
-#define sk_BY_DIR_HASH_find_ex(st, val) SKM_sk_find_ex(BY_DIR_HASH, (st), (val))
-#define sk_BY_DIR_HASH_delete(st, i) SKM_sk_delete(BY_DIR_HASH, (st), (i))
-#define sk_BY_DIR_HASH_delete_ptr(st, ptr) SKM_sk_delete_ptr(BY_DIR_HASH, (st), (ptr))
-#define sk_BY_DIR_HASH_insert(st, val, i) SKM_sk_insert(BY_DIR_HASH, (st), (val), (i))
-#define sk_BY_DIR_HASH_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BY_DIR_HASH, (st), (cmp))
-#define sk_BY_DIR_HASH_dup(st) SKM_sk_dup(BY_DIR_HASH, st)
-#define sk_BY_DIR_HASH_pop_free(st, free_func) SKM_sk_pop_free(BY_DIR_HASH, (st), (free_func))
-#define sk_BY_DIR_HASH_shift(st) SKM_sk_shift(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_pop(st) SKM_sk_pop(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_sort(st) SKM_sk_sort(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_is_sorted(st) SKM_sk_is_sorted(BY_DIR_HASH, (st))
-
-#define sk_CMS_CertificateChoices_new(cmp) SKM_sk_new(CMS_CertificateChoices, (cmp))
-#define sk_CMS_CertificateChoices_new_null() SKM_sk_new_null(CMS_CertificateChoices)
-#define sk_CMS_CertificateChoices_free(st) SKM_sk_free(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_num(st) SKM_sk_num(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_value(st, i) SKM_sk_value(CMS_CertificateChoices, (st), (i))
-#define sk_CMS_CertificateChoices_set(st, i, val) SKM_sk_set(CMS_CertificateChoices, (st), (i), (val))
-#define sk_CMS_CertificateChoices_zero(st) SKM_sk_zero(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_push(st, val) SKM_sk_push(CMS_CertificateChoices, (st), (val))
-#define sk_CMS_CertificateChoices_unshift(st, val) SKM_sk_unshift(CMS_CertificateChoices, (st), (val))
-#define sk_CMS_CertificateChoices_find(st, val) SKM_sk_find(CMS_CertificateChoices, (st), (val))
-#define sk_CMS_CertificateChoices_find_ex(st, val) SKM_sk_find_ex(CMS_CertificateChoices, (st), (val))
-#define sk_CMS_CertificateChoices_delete(st, i) SKM_sk_delete(CMS_CertificateChoices, (st), (i))
-#define sk_CMS_CertificateChoices_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_CertificateChoices, (st), (ptr))
-#define sk_CMS_CertificateChoices_insert(st, val, i) SKM_sk_insert(CMS_CertificateChoices, (st), (val), (i))
-#define sk_CMS_CertificateChoices_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_CertificateChoices, (st), (cmp))
-#define sk_CMS_CertificateChoices_dup(st) SKM_sk_dup(CMS_CertificateChoices, st)
-#define sk_CMS_CertificateChoices_pop_free(st, free_func) SKM_sk_pop_free(CMS_CertificateChoices, (st), (free_func))
-#define sk_CMS_CertificateChoices_shift(st) SKM_sk_shift(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_pop(st) SKM_sk_pop(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_sort(st) SKM_sk_sort(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_is_sorted(st) SKM_sk_is_sorted(CMS_CertificateChoices, (st))
-
-#define sk_CMS_RecipientInfo_new(cmp) SKM_sk_new(CMS_RecipientInfo, (cmp))
-#define sk_CMS_RecipientInfo_new_null() SKM_sk_new_null(CMS_RecipientInfo)
-#define sk_CMS_RecipientInfo_free(st) SKM_sk_free(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_num(st) SKM_sk_num(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_value(st, i) SKM_sk_value(CMS_RecipientInfo, (st), (i))
-#define sk_CMS_RecipientInfo_set(st, i, val) SKM_sk_set(CMS_RecipientInfo, (st), (i), (val))
-#define sk_CMS_RecipientInfo_zero(st) SKM_sk_zero(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_push(st, val) SKM_sk_push(CMS_RecipientInfo, (st), (val))
-#define sk_CMS_RecipientInfo_unshift(st, val) SKM_sk_unshift(CMS_RecipientInfo, (st), (val))
-#define sk_CMS_RecipientInfo_find(st, val) SKM_sk_find(CMS_RecipientInfo, (st), (val))
-#define sk_CMS_RecipientInfo_find_ex(st, val) SKM_sk_find_ex(CMS_RecipientInfo, (st), (val))
-#define sk_CMS_RecipientInfo_delete(st, i) SKM_sk_delete(CMS_RecipientInfo, (st), (i))
-#define sk_CMS_RecipientInfo_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_RecipientInfo, (st), (ptr))
-#define sk_CMS_RecipientInfo_insert(st, val, i) SKM_sk_insert(CMS_RecipientInfo, (st), (val), (i))
-#define sk_CMS_RecipientInfo_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_RecipientInfo, (st), (cmp))
-#define sk_CMS_RecipientInfo_dup(st) SKM_sk_dup(CMS_RecipientInfo, st)
-#define sk_CMS_RecipientInfo_pop_free(st, free_func) SKM_sk_pop_free(CMS_RecipientInfo, (st), (free_func))
-#define sk_CMS_RecipientInfo_shift(st) SKM_sk_shift(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_pop(st) SKM_sk_pop(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_sort(st) SKM_sk_sort(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_is_sorted(st) SKM_sk_is_sorted(CMS_RecipientInfo, (st))
-
-#define sk_CMS_RevocationInfoChoice_new(cmp) SKM_sk_new(CMS_RevocationInfoChoice, (cmp))
-#define sk_CMS_RevocationInfoChoice_new_null() SKM_sk_new_null(CMS_RevocationInfoChoice)
-#define sk_CMS_RevocationInfoChoice_free(st) SKM_sk_free(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_num(st) SKM_sk_num(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_value(st, i) SKM_sk_value(CMS_RevocationInfoChoice, (st), (i))
-#define sk_CMS_RevocationInfoChoice_set(st, i, val) SKM_sk_set(CMS_RevocationInfoChoice, (st), (i), (val))
-#define sk_CMS_RevocationInfoChoice_zero(st) SKM_sk_zero(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_push(st, val) SKM_sk_push(CMS_RevocationInfoChoice, (st), (val))
-#define sk_CMS_RevocationInfoChoice_unshift(st, val) SKM_sk_unshift(CMS_RevocationInfoChoice, (st), (val))
-#define sk_CMS_RevocationInfoChoice_find(st, val) SKM_sk_find(CMS_RevocationInfoChoice, (st), (val))
-#define sk_CMS_RevocationInfoChoice_find_ex(st, val) SKM_sk_find_ex(CMS_RevocationInfoChoice, (st), (val))
-#define sk_CMS_RevocationInfoChoice_delete(st, i) SKM_sk_delete(CMS_RevocationInfoChoice, (st), (i))
-#define sk_CMS_RevocationInfoChoice_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_RevocationInfoChoice, (st), (ptr))
-#define sk_CMS_RevocationInfoChoice_insert(st, val, i) SKM_sk_insert(CMS_RevocationInfoChoice, (st), (val), (i))
-#define sk_CMS_RevocationInfoChoice_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_RevocationInfoChoice, (st), (cmp))
-#define sk_CMS_RevocationInfoChoice_dup(st) SKM_sk_dup(CMS_RevocationInfoChoice, st)
-#define sk_CMS_RevocationInfoChoice_pop_free(st, free_func) SKM_sk_pop_free(CMS_RevocationInfoChoice, (st), (free_func))
-#define sk_CMS_RevocationInfoChoice_shift(st) SKM_sk_shift(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_pop(st) SKM_sk_pop(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_sort(st) SKM_sk_sort(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_is_sorted(st) SKM_sk_is_sorted(CMS_RevocationInfoChoice, (st))
-
-#define sk_CMS_SignerInfo_new(cmp) SKM_sk_new(CMS_SignerInfo, (cmp))
-#define sk_CMS_SignerInfo_new_null() SKM_sk_new_null(CMS_SignerInfo)
-#define sk_CMS_SignerInfo_free(st) SKM_sk_free(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_num(st) SKM_sk_num(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_value(st, i) SKM_sk_value(CMS_SignerInfo, (st), (i))
-#define sk_CMS_SignerInfo_set(st, i, val) SKM_sk_set(CMS_SignerInfo, (st), (i), (val))
-#define sk_CMS_SignerInfo_zero(st) SKM_sk_zero(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_push(st, val) SKM_sk_push(CMS_SignerInfo, (st), (val))
-#define sk_CMS_SignerInfo_unshift(st, val) SKM_sk_unshift(CMS_SignerInfo, (st), (val))
-#define sk_CMS_SignerInfo_find(st, val) SKM_sk_find(CMS_SignerInfo, (st), (val))
-#define sk_CMS_SignerInfo_find_ex(st, val) SKM_sk_find_ex(CMS_SignerInfo, (st), (val))
-#define sk_CMS_SignerInfo_delete(st, i) SKM_sk_delete(CMS_SignerInfo, (st), (i))
-#define sk_CMS_SignerInfo_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_SignerInfo, (st), (ptr))
-#define sk_CMS_SignerInfo_insert(st, val, i) SKM_sk_insert(CMS_SignerInfo, (st), (val), (i))
-#define sk_CMS_SignerInfo_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_SignerInfo, (st), (cmp))
-#define sk_CMS_SignerInfo_dup(st) SKM_sk_dup(CMS_SignerInfo, st)
-#define sk_CMS_SignerInfo_pop_free(st, free_func) SKM_sk_pop_free(CMS_SignerInfo, (st), (free_func))
-#define sk_CMS_SignerInfo_shift(st) SKM_sk_shift(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_pop(st) SKM_sk_pop(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_sort(st) SKM_sk_sort(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_is_sorted(st) SKM_sk_is_sorted(CMS_SignerInfo, (st))
-
-#define sk_CONF_IMODULE_new(cmp) SKM_sk_new(CONF_IMODULE, (cmp))
-#define sk_CONF_IMODULE_new_null() SKM_sk_new_null(CONF_IMODULE)
-#define sk_CONF_IMODULE_free(st) SKM_sk_free(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_num(st) SKM_sk_num(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_value(st, i) SKM_sk_value(CONF_IMODULE, (st), (i))
-#define sk_CONF_IMODULE_set(st, i, val) SKM_sk_set(CONF_IMODULE, (st), (i), (val))
-#define sk_CONF_IMODULE_zero(st) SKM_sk_zero(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_push(st, val) SKM_sk_push(CONF_IMODULE, (st), (val))
-#define sk_CONF_IMODULE_unshift(st, val) SKM_sk_unshift(CONF_IMODULE, (st), (val))
-#define sk_CONF_IMODULE_find(st, val) SKM_sk_find(CONF_IMODULE, (st), (val))
-#define sk_CONF_IMODULE_find_ex(st, val) SKM_sk_find_ex(CONF_IMODULE, (st), (val))
-#define sk_CONF_IMODULE_delete(st, i) SKM_sk_delete(CONF_IMODULE, (st), (i))
-#define sk_CONF_IMODULE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_IMODULE, (st), (ptr))
-#define sk_CONF_IMODULE_insert(st, val, i) SKM_sk_insert(CONF_IMODULE, (st), (val), (i))
-#define sk_CONF_IMODULE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_IMODULE, (st), (cmp))
-#define sk_CONF_IMODULE_dup(st) SKM_sk_dup(CONF_IMODULE, st)
-#define sk_CONF_IMODULE_pop_free(st, free_func) SKM_sk_pop_free(CONF_IMODULE, (st), (free_func))
-#define sk_CONF_IMODULE_shift(st) SKM_sk_shift(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_pop(st) SKM_sk_pop(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_sort(st) SKM_sk_sort(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_is_sorted(st) SKM_sk_is_sorted(CONF_IMODULE, (st))
-
-#define sk_CONF_MODULE_new(cmp) SKM_sk_new(CONF_MODULE, (cmp))
-#define sk_CONF_MODULE_new_null() SKM_sk_new_null(CONF_MODULE)
-#define sk_CONF_MODULE_free(st) SKM_sk_free(CONF_MODULE, (st))
-#define sk_CONF_MODULE_num(st) SKM_sk_num(CONF_MODULE, (st))
-#define sk_CONF_MODULE_value(st, i) SKM_sk_value(CONF_MODULE, (st), (i))
-#define sk_CONF_MODULE_set(st, i, val) SKM_sk_set(CONF_MODULE, (st), (i), (val))
-#define sk_CONF_MODULE_zero(st) SKM_sk_zero(CONF_MODULE, (st))
-#define sk_CONF_MODULE_push(st, val) SKM_sk_push(CONF_MODULE, (st), (val))
-#define sk_CONF_MODULE_unshift(st, val) SKM_sk_unshift(CONF_MODULE, (st), (val))
-#define sk_CONF_MODULE_find(st, val) SKM_sk_find(CONF_MODULE, (st), (val))
-#define sk_CONF_MODULE_find_ex(st, val) SKM_sk_find_ex(CONF_MODULE, (st), (val))
-#define sk_CONF_MODULE_delete(st, i) SKM_sk_delete(CONF_MODULE, (st), (i))
-#define sk_CONF_MODULE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_MODULE, (st), (ptr))
-#define sk_CONF_MODULE_insert(st, val, i) SKM_sk_insert(CONF_MODULE, (st), (val), (i))
-#define sk_CONF_MODULE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_MODULE, (st), (cmp))
-#define sk_CONF_MODULE_dup(st) SKM_sk_dup(CONF_MODULE, st)
-#define sk_CONF_MODULE_pop_free(st, free_func) SKM_sk_pop_free(CONF_MODULE, (st), (free_func))
-#define sk_CONF_MODULE_shift(st) SKM_sk_shift(CONF_MODULE, (st))
-#define sk_CONF_MODULE_pop(st) SKM_sk_pop(CONF_MODULE, (st))
-#define sk_CONF_MODULE_sort(st) SKM_sk_sort(CONF_MODULE, (st))
-#define sk_CONF_MODULE_is_sorted(st) SKM_sk_is_sorted(CONF_MODULE, (st))
-
-#define sk_CONF_VALUE_new(cmp) SKM_sk_new(CONF_VALUE, (cmp))
-#define sk_CONF_VALUE_new_null() SKM_sk_new_null(CONF_VALUE)
-#define sk_CONF_VALUE_free(st) SKM_sk_free(CONF_VALUE, (st))
-#define sk_CONF_VALUE_num(st) SKM_sk_num(CONF_VALUE, (st))
-#define sk_CONF_VALUE_value(st, i) SKM_sk_value(CONF_VALUE, (st), (i))
-#define sk_CONF_VALUE_set(st, i, val) SKM_sk_set(CONF_VALUE, (st), (i), (val))
-#define sk_CONF_VALUE_zero(st) SKM_sk_zero(CONF_VALUE, (st))
-#define sk_CONF_VALUE_push(st, val) SKM_sk_push(CONF_VALUE, (st), (val))
-#define sk_CONF_VALUE_unshift(st, val) SKM_sk_unshift(CONF_VALUE, (st), (val))
-#define sk_CONF_VALUE_find(st, val) SKM_sk_find(CONF_VALUE, (st), (val))
-#define sk_CONF_VALUE_find_ex(st, val) SKM_sk_find_ex(CONF_VALUE, (st), (val))
-#define sk_CONF_VALUE_delete(st, i) SKM_sk_delete(CONF_VALUE, (st), (i))
-#define sk_CONF_VALUE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_VALUE, (st), (ptr))
-#define sk_CONF_VALUE_insert(st, val, i) SKM_sk_insert(CONF_VALUE, (st), (val), (i))
-#define sk_CONF_VALUE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_VALUE, (st), (cmp))
-#define sk_CONF_VALUE_dup(st) SKM_sk_dup(CONF_VALUE, st)
-#define sk_CONF_VALUE_pop_free(st, free_func) SKM_sk_pop_free(CONF_VALUE, (st), (free_func))
-#define sk_CONF_VALUE_shift(st) SKM_sk_shift(CONF_VALUE, (st))
-#define sk_CONF_VALUE_pop(st) SKM_sk_pop(CONF_VALUE, (st))
-#define sk_CONF_VALUE_sort(st) SKM_sk_sort(CONF_VALUE, (st))
-#define sk_CONF_VALUE_is_sorted(st) SKM_sk_is_sorted(CONF_VALUE, (st))
-
-#define sk_CRYPTO_EX_DATA_FUNCS_new(cmp) SKM_sk_new(CRYPTO_EX_DATA_FUNCS, (cmp))
-#define sk_CRYPTO_EX_DATA_FUNCS_new_null() SKM_sk_new_null(CRYPTO_EX_DATA_FUNCS)
-#define sk_CRYPTO_EX_DATA_FUNCS_free(st) SKM_sk_free(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_num(st) SKM_sk_num(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_value(st, i) SKM_sk_value(CRYPTO_EX_DATA_FUNCS, (st), (i))
-#define sk_CRYPTO_EX_DATA_FUNCS_set(st, i, val) SKM_sk_set(CRYPTO_EX_DATA_FUNCS, (st), (i), (val))
-#define sk_CRYPTO_EX_DATA_FUNCS_zero(st) SKM_sk_zero(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_push(st, val) SKM_sk_push(CRYPTO_EX_DATA_FUNCS, (st), (val))
-#define sk_CRYPTO_EX_DATA_FUNCS_unshift(st, val) SKM_sk_unshift(CRYPTO_EX_DATA_FUNCS, (st), (val))
-#define sk_CRYPTO_EX_DATA_FUNCS_find(st, val) SKM_sk_find(CRYPTO_EX_DATA_FUNCS, (st), (val))
-#define sk_CRYPTO_EX_DATA_FUNCS_find_ex(st, val) SKM_sk_find_ex(CRYPTO_EX_DATA_FUNCS, (st), (val))
-#define sk_CRYPTO_EX_DATA_FUNCS_delete(st, i) SKM_sk_delete(CRYPTO_EX_DATA_FUNCS, (st), (i))
-#define sk_CRYPTO_EX_DATA_FUNCS_delete_ptr(st, ptr) SKM_sk_delete_ptr(CRYPTO_EX_DATA_FUNCS, (st), (ptr))
-#define sk_CRYPTO_EX_DATA_FUNCS_insert(st, val, i) SKM_sk_insert(CRYPTO_EX_DATA_FUNCS, (st), (val), (i))
-#define sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CRYPTO_EX_DATA_FUNCS, (st), (cmp))
-#define sk_CRYPTO_EX_DATA_FUNCS_dup(st) SKM_sk_dup(CRYPTO_EX_DATA_FUNCS, st)
-#define sk_CRYPTO_EX_DATA_FUNCS_pop_free(st, free_func) SKM_sk_pop_free(CRYPTO_EX_DATA_FUNCS, (st), (free_func))
-#define sk_CRYPTO_EX_DATA_FUNCS_shift(st) SKM_sk_shift(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_pop(st) SKM_sk_pop(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_sort(st) SKM_sk_sort(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_is_sorted(st) SKM_sk_is_sorted(CRYPTO_EX_DATA_FUNCS, (st))
-
-#define sk_CRYPTO_dynlock_new(cmp) SKM_sk_new(CRYPTO_dynlock, (cmp))
-#define sk_CRYPTO_dynlock_new_null() SKM_sk_new_null(CRYPTO_dynlock)
-#define sk_CRYPTO_dynlock_free(st) SKM_sk_free(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_num(st) SKM_sk_num(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_value(st, i) SKM_sk_value(CRYPTO_dynlock, (st), (i))
-#define sk_CRYPTO_dynlock_set(st, i, val) SKM_sk_set(CRYPTO_dynlock, (st), (i), (val))
-#define sk_CRYPTO_dynlock_zero(st) SKM_sk_zero(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_push(st, val) SKM_sk_push(CRYPTO_dynlock, (st), (val))
-#define sk_CRYPTO_dynlock_unshift(st, val) SKM_sk_unshift(CRYPTO_dynlock, (st), (val))
-#define sk_CRYPTO_dynlock_find(st, val) SKM_sk_find(CRYPTO_dynlock, (st), (val))
-#define sk_CRYPTO_dynlock_find_ex(st, val) SKM_sk_find_ex(CRYPTO_dynlock, (st), (val))
-#define sk_CRYPTO_dynlock_delete(st, i) SKM_sk_delete(CRYPTO_dynlock, (st), (i))
-#define sk_CRYPTO_dynlock_delete_ptr(st, ptr) SKM_sk_delete_ptr(CRYPTO_dynlock, (st), (ptr))
-#define sk_CRYPTO_dynlock_insert(st, val, i) SKM_sk_insert(CRYPTO_dynlock, (st), (val), (i))
-#define sk_CRYPTO_dynlock_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CRYPTO_dynlock, (st), (cmp))
-#define sk_CRYPTO_dynlock_dup(st) SKM_sk_dup(CRYPTO_dynlock, st)
-#define sk_CRYPTO_dynlock_pop_free(st, free_func) SKM_sk_pop_free(CRYPTO_dynlock, (st), (free_func))
-#define sk_CRYPTO_dynlock_shift(st) SKM_sk_shift(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_pop(st) SKM_sk_pop(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_sort(st) SKM_sk_sort(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_is_sorted(st) SKM_sk_is_sorted(CRYPTO_dynlock, (st))
-
-#define sk_DIST_POINT_new(cmp) SKM_sk_new(DIST_POINT, (cmp))
-#define sk_DIST_POINT_new_null() SKM_sk_new_null(DIST_POINT)
-#define sk_DIST_POINT_free(st) SKM_sk_free(DIST_POINT, (st))
-#define sk_DIST_POINT_num(st) SKM_sk_num(DIST_POINT, (st))
-#define sk_DIST_POINT_value(st, i) SKM_sk_value(DIST_POINT, (st), (i))
-#define sk_DIST_POINT_set(st, i, val) SKM_sk_set(DIST_POINT, (st), (i), (val))
-#define sk_DIST_POINT_zero(st) SKM_sk_zero(DIST_POINT, (st))
-#define sk_DIST_POINT_push(st, val) SKM_sk_push(DIST_POINT, (st), (val))
-#define sk_DIST_POINT_unshift(st, val) SKM_sk_unshift(DIST_POINT, (st), (val))
-#define sk_DIST_POINT_find(st, val) SKM_sk_find(DIST_POINT, (st), (val))
-#define sk_DIST_POINT_find_ex(st, val) SKM_sk_find_ex(DIST_POINT, (st), (val))
-#define sk_DIST_POINT_delete(st, i) SKM_sk_delete(DIST_POINT, (st), (i))
-#define sk_DIST_POINT_delete_ptr(st, ptr) SKM_sk_delete_ptr(DIST_POINT, (st), (ptr))
-#define sk_DIST_POINT_insert(st, val, i) SKM_sk_insert(DIST_POINT, (st), (val), (i))
-#define sk_DIST_POINT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(DIST_POINT, (st), (cmp))
-#define sk_DIST_POINT_dup(st) SKM_sk_dup(DIST_POINT, st)
-#define sk_DIST_POINT_pop_free(st, free_func) SKM_sk_pop_free(DIST_POINT, (st), (free_func))
-#define sk_DIST_POINT_shift(st) SKM_sk_shift(DIST_POINT, (st))
-#define sk_DIST_POINT_pop(st) SKM_sk_pop(DIST_POINT, (st))
-#define sk_DIST_POINT_sort(st) SKM_sk_sort(DIST_POINT, (st))
-#define sk_DIST_POINT_is_sorted(st) SKM_sk_is_sorted(DIST_POINT, (st))
-
-#define sk_ENGINE_new(cmp) SKM_sk_new(ENGINE, (cmp))
-#define sk_ENGINE_new_null() SKM_sk_new_null(ENGINE)
-#define sk_ENGINE_free(st) SKM_sk_free(ENGINE, (st))
-#define sk_ENGINE_num(st) SKM_sk_num(ENGINE, (st))
-#define sk_ENGINE_value(st, i) SKM_sk_value(ENGINE, (st), (i))
-#define sk_ENGINE_set(st, i, val) SKM_sk_set(ENGINE, (st), (i), (val))
-#define sk_ENGINE_zero(st) SKM_sk_zero(ENGINE, (st))
-#define sk_ENGINE_push(st, val) SKM_sk_push(ENGINE, (st), (val))
-#define sk_ENGINE_unshift(st, val) SKM_sk_unshift(ENGINE, (st), (val))
-#define sk_ENGINE_find(st, val) SKM_sk_find(ENGINE, (st), (val))
-#define sk_ENGINE_find_ex(st, val) SKM_sk_find_ex(ENGINE, (st), (val))
-#define sk_ENGINE_delete(st, i) SKM_sk_delete(ENGINE, (st), (i))
-#define sk_ENGINE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE, (st), (ptr))
-#define sk_ENGINE_insert(st, val, i) SKM_sk_insert(ENGINE, (st), (val), (i))
-#define sk_ENGINE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE, (st), (cmp))
-#define sk_ENGINE_dup(st) SKM_sk_dup(ENGINE, st)
-#define sk_ENGINE_pop_free(st, free_func) SKM_sk_pop_free(ENGINE, (st), (free_func))
-#define sk_ENGINE_shift(st) SKM_sk_shift(ENGINE, (st))
-#define sk_ENGINE_pop(st) SKM_sk_pop(ENGINE, (st))
-#define sk_ENGINE_sort(st) SKM_sk_sort(ENGINE, (st))
-#define sk_ENGINE_is_sorted(st) SKM_sk_is_sorted(ENGINE, (st))
-
-#define sk_ENGINE_CLEANUP_ITEM_new(cmp) SKM_sk_new(ENGINE_CLEANUP_ITEM, (cmp))
-#define sk_ENGINE_CLEANUP_ITEM_new_null() SKM_sk_new_null(ENGINE_CLEANUP_ITEM)
-#define sk_ENGINE_CLEANUP_ITEM_free(st) SKM_sk_free(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_num(st) SKM_sk_num(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_value(st, i) SKM_sk_value(ENGINE_CLEANUP_ITEM, (st), (i))
-#define sk_ENGINE_CLEANUP_ITEM_set(st, i, val) SKM_sk_set(ENGINE_CLEANUP_ITEM, (st), (i), (val))
-#define sk_ENGINE_CLEANUP_ITEM_zero(st) SKM_sk_zero(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_push(st, val) SKM_sk_push(ENGINE_CLEANUP_ITEM, (st), (val))
-#define sk_ENGINE_CLEANUP_ITEM_unshift(st, val) SKM_sk_unshift(ENGINE_CLEANUP_ITEM, (st), (val))
-#define sk_ENGINE_CLEANUP_ITEM_find(st, val) SKM_sk_find(ENGINE_CLEANUP_ITEM, (st), (val))
-#define sk_ENGINE_CLEANUP_ITEM_find_ex(st, val) SKM_sk_find_ex(ENGINE_CLEANUP_ITEM, (st), (val))
-#define sk_ENGINE_CLEANUP_ITEM_delete(st, i) SKM_sk_delete(ENGINE_CLEANUP_ITEM, (st), (i))
-#define sk_ENGINE_CLEANUP_ITEM_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE_CLEANUP_ITEM, (st), (ptr))
-#define sk_ENGINE_CLEANUP_ITEM_insert(st, val, i) SKM_sk_insert(ENGINE_CLEANUP_ITEM, (st), (val), (i))
-#define sk_ENGINE_CLEANUP_ITEM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE_CLEANUP_ITEM, (st), (cmp))
-#define sk_ENGINE_CLEANUP_ITEM_dup(st) SKM_sk_dup(ENGINE_CLEANUP_ITEM, st)
-#define sk_ENGINE_CLEANUP_ITEM_pop_free(st, free_func) SKM_sk_pop_free(ENGINE_CLEANUP_ITEM, (st), (free_func))
-#define sk_ENGINE_CLEANUP_ITEM_shift(st) SKM_sk_shift(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_pop(st) SKM_sk_pop(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_sort(st) SKM_sk_sort(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_is_sorted(st) SKM_sk_is_sorted(ENGINE_CLEANUP_ITEM, (st))
-
-#define sk_ESS_CERT_ID_new(cmp) SKM_sk_new(ESS_CERT_ID, (cmp))
-#define sk_ESS_CERT_ID_new_null() SKM_sk_new_null(ESS_CERT_ID)
-#define sk_ESS_CERT_ID_free(st) SKM_sk_free(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_num(st) SKM_sk_num(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_value(st, i) SKM_sk_value(ESS_CERT_ID, (st), (i))
-#define sk_ESS_CERT_ID_set(st, i, val) SKM_sk_set(ESS_CERT_ID, (st), (i), (val))
-#define sk_ESS_CERT_ID_zero(st) SKM_sk_zero(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_push(st, val) SKM_sk_push(ESS_CERT_ID, (st), (val))
-#define sk_ESS_CERT_ID_unshift(st, val) SKM_sk_unshift(ESS_CERT_ID, (st), (val))
-#define sk_ESS_CERT_ID_find(st, val) SKM_sk_find(ESS_CERT_ID, (st), (val))
-#define sk_ESS_CERT_ID_find_ex(st, val) SKM_sk_find_ex(ESS_CERT_ID, (st), (val))
-#define sk_ESS_CERT_ID_delete(st, i) SKM_sk_delete(ESS_CERT_ID, (st), (i))
-#define sk_ESS_CERT_ID_delete_ptr(st, ptr) SKM_sk_delete_ptr(ESS_CERT_ID, (st), (ptr))
-#define sk_ESS_CERT_ID_insert(st, val, i) SKM_sk_insert(ESS_CERT_ID, (st), (val), (i))
-#define sk_ESS_CERT_ID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ESS_CERT_ID, (st), (cmp))
-#define sk_ESS_CERT_ID_dup(st) SKM_sk_dup(ESS_CERT_ID, st)
-#define sk_ESS_CERT_ID_pop_free(st, free_func) SKM_sk_pop_free(ESS_CERT_ID, (st), (free_func))
-#define sk_ESS_CERT_ID_shift(st) SKM_sk_shift(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_pop(st) SKM_sk_pop(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_sort(st) SKM_sk_sort(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_is_sorted(st) SKM_sk_is_sorted(ESS_CERT_ID, (st))
-
-#define sk_EVP_MD_new(cmp) SKM_sk_new(EVP_MD, (cmp))
-#define sk_EVP_MD_new_null() SKM_sk_new_null(EVP_MD)
-#define sk_EVP_MD_free(st) SKM_sk_free(EVP_MD, (st))
-#define sk_EVP_MD_num(st) SKM_sk_num(EVP_MD, (st))
-#define sk_EVP_MD_value(st, i) SKM_sk_value(EVP_MD, (st), (i))
-#define sk_EVP_MD_set(st, i, val) SKM_sk_set(EVP_MD, (st), (i), (val))
-#define sk_EVP_MD_zero(st) SKM_sk_zero(EVP_MD, (st))
-#define sk_EVP_MD_push(st, val) SKM_sk_push(EVP_MD, (st), (val))
-#define sk_EVP_MD_unshift(st, val) SKM_sk_unshift(EVP_MD, (st), (val))
-#define sk_EVP_MD_find(st, val) SKM_sk_find(EVP_MD, (st), (val))
-#define sk_EVP_MD_find_ex(st, val) SKM_sk_find_ex(EVP_MD, (st), (val))
-#define sk_EVP_MD_delete(st, i) SKM_sk_delete(EVP_MD, (st), (i))
-#define sk_EVP_MD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_MD, (st), (ptr))
-#define sk_EVP_MD_insert(st, val, i) SKM_sk_insert(EVP_MD, (st), (val), (i))
-#define sk_EVP_MD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_MD, (st), (cmp))
-#define sk_EVP_MD_dup(st) SKM_sk_dup(EVP_MD, st)
-#define sk_EVP_MD_pop_free(st, free_func) SKM_sk_pop_free(EVP_MD, (st), (free_func))
-#define sk_EVP_MD_shift(st) SKM_sk_shift(EVP_MD, (st))
-#define sk_EVP_MD_pop(st) SKM_sk_pop(EVP_MD, (st))
-#define sk_EVP_MD_sort(st) SKM_sk_sort(EVP_MD, (st))
-#define sk_EVP_MD_is_sorted(st) SKM_sk_is_sorted(EVP_MD, (st))
-
-#define sk_EVP_PBE_CTL_new(cmp) SKM_sk_new(EVP_PBE_CTL, (cmp))
-#define sk_EVP_PBE_CTL_new_null() SKM_sk_new_null(EVP_PBE_CTL)
-#define sk_EVP_PBE_CTL_free(st) SKM_sk_free(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_num(st) SKM_sk_num(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_value(st, i) SKM_sk_value(EVP_PBE_CTL, (st), (i))
-#define sk_EVP_PBE_CTL_set(st, i, val) SKM_sk_set(EVP_PBE_CTL, (st), (i), (val))
-#define sk_EVP_PBE_CTL_zero(st) SKM_sk_zero(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_push(st, val) SKM_sk_push(EVP_PBE_CTL, (st), (val))
-#define sk_EVP_PBE_CTL_unshift(st, val) SKM_sk_unshift(EVP_PBE_CTL, (st), (val))
-#define sk_EVP_PBE_CTL_find(st, val) SKM_sk_find(EVP_PBE_CTL, (st), (val))
-#define sk_EVP_PBE_CTL_find_ex(st, val) SKM_sk_find_ex(EVP_PBE_CTL, (st), (val))
-#define sk_EVP_PBE_CTL_delete(st, i) SKM_sk_delete(EVP_PBE_CTL, (st), (i))
-#define sk_EVP_PBE_CTL_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PBE_CTL, (st), (ptr))
-#define sk_EVP_PBE_CTL_insert(st, val, i) SKM_sk_insert(EVP_PBE_CTL, (st), (val), (i))
-#define sk_EVP_PBE_CTL_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PBE_CTL, (st), (cmp))
-#define sk_EVP_PBE_CTL_dup(st) SKM_sk_dup(EVP_PBE_CTL, st)
-#define sk_EVP_PBE_CTL_pop_free(st, free_func) SKM_sk_pop_free(EVP_PBE_CTL, (st), (free_func))
-#define sk_EVP_PBE_CTL_shift(st) SKM_sk_shift(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_pop(st) SKM_sk_pop(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_sort(st) SKM_sk_sort(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_is_sorted(st) SKM_sk_is_sorted(EVP_PBE_CTL, (st))
-
-#define sk_EVP_PKEY_ASN1_METHOD_new(cmp) SKM_sk_new(EVP_PKEY_ASN1_METHOD, (cmp))
-#define sk_EVP_PKEY_ASN1_METHOD_new_null() SKM_sk_new_null(EVP_PKEY_ASN1_METHOD)
-#define sk_EVP_PKEY_ASN1_METHOD_free(st) SKM_sk_free(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_num(st) SKM_sk_num(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_value(st, i) SKM_sk_value(EVP_PKEY_ASN1_METHOD, (st), (i))
-#define sk_EVP_PKEY_ASN1_METHOD_set(st, i, val) SKM_sk_set(EVP_PKEY_ASN1_METHOD, (st), (i), (val))
-#define sk_EVP_PKEY_ASN1_METHOD_zero(st) SKM_sk_zero(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_push(st, val) SKM_sk_push(EVP_PKEY_ASN1_METHOD, (st), (val))
-#define sk_EVP_PKEY_ASN1_METHOD_unshift(st, val) SKM_sk_unshift(EVP_PKEY_ASN1_METHOD, (st), (val))
-#define sk_EVP_PKEY_ASN1_METHOD_find(st, val) SKM_sk_find(EVP_PKEY_ASN1_METHOD, (st), (val))
-#define sk_EVP_PKEY_ASN1_METHOD_find_ex(st, val) SKM_sk_find_ex(EVP_PKEY_ASN1_METHOD, (st), (val))
-#define sk_EVP_PKEY_ASN1_METHOD_delete(st, i) SKM_sk_delete(EVP_PKEY_ASN1_METHOD, (st), (i))
-#define sk_EVP_PKEY_ASN1_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PKEY_ASN1_METHOD, (st), (ptr))
-#define sk_EVP_PKEY_ASN1_METHOD_insert(st, val, i) SKM_sk_insert(EVP_PKEY_ASN1_METHOD, (st), (val), (i))
-#define sk_EVP_PKEY_ASN1_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PKEY_ASN1_METHOD, (st), (cmp))
-#define sk_EVP_PKEY_ASN1_METHOD_dup(st) SKM_sk_dup(EVP_PKEY_ASN1_METHOD, st)
-#define sk_EVP_PKEY_ASN1_METHOD_pop_free(st, free_func) SKM_sk_pop_free(EVP_PKEY_ASN1_METHOD, (st), (free_func))
-#define sk_EVP_PKEY_ASN1_METHOD_shift(st) SKM_sk_shift(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_pop(st) SKM_sk_pop(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_sort(st) SKM_sk_sort(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_is_sorted(st) SKM_sk_is_sorted(EVP_PKEY_ASN1_METHOD, (st))
-
-#define sk_EVP_PKEY_METHOD_new(cmp) SKM_sk_new(EVP_PKEY_METHOD, (cmp))
-#define sk_EVP_PKEY_METHOD_new_null() SKM_sk_new_null(EVP_PKEY_METHOD)
-#define sk_EVP_PKEY_METHOD_free(st) SKM_sk_free(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_num(st) SKM_sk_num(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_value(st, i) SKM_sk_value(EVP_PKEY_METHOD, (st), (i))
-#define sk_EVP_PKEY_METHOD_set(st, i, val) SKM_sk_set(EVP_PKEY_METHOD, (st), (i), (val))
-#define sk_EVP_PKEY_METHOD_zero(st) SKM_sk_zero(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_push(st, val) SKM_sk_push(EVP_PKEY_METHOD, (st), (val))
-#define sk_EVP_PKEY_METHOD_unshift(st, val) SKM_sk_unshift(EVP_PKEY_METHOD, (st), (val))
-#define sk_EVP_PKEY_METHOD_find(st, val) SKM_sk_find(EVP_PKEY_METHOD, (st), (val))
-#define sk_EVP_PKEY_METHOD_find_ex(st, val) SKM_sk_find_ex(EVP_PKEY_METHOD, (st), (val))
-#define sk_EVP_PKEY_METHOD_delete(st, i) SKM_sk_delete(EVP_PKEY_METHOD, (st), (i))
-#define sk_EVP_PKEY_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PKEY_METHOD, (st), (ptr))
-#define sk_EVP_PKEY_METHOD_insert(st, val, i) SKM_sk_insert(EVP_PKEY_METHOD, (st), (val), (i))
-#define sk_EVP_PKEY_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PKEY_METHOD, (st), (cmp))
-#define sk_EVP_PKEY_METHOD_dup(st) SKM_sk_dup(EVP_PKEY_METHOD, st)
-#define sk_EVP_PKEY_METHOD_pop_free(st, free_func) SKM_sk_pop_free(EVP_PKEY_METHOD, (st), (free_func))
-#define sk_EVP_PKEY_METHOD_shift(st) SKM_sk_shift(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_pop(st) SKM_sk_pop(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_sort(st) SKM_sk_sort(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_is_sorted(st) SKM_sk_is_sorted(EVP_PKEY_METHOD, (st))
-
-#define sk_GENERAL_NAME_new(cmp) SKM_sk_new(GENERAL_NAME, (cmp))
-#define sk_GENERAL_NAME_new_null() SKM_sk_new_null(GENERAL_NAME)
-#define sk_GENERAL_NAME_free(st) SKM_sk_free(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_num(st) SKM_sk_num(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_value(st, i) SKM_sk_value(GENERAL_NAME, (st), (i))
-#define sk_GENERAL_NAME_set(st, i, val) SKM_sk_set(GENERAL_NAME, (st), (i), (val))
-#define sk_GENERAL_NAME_zero(st) SKM_sk_zero(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_push(st, val) SKM_sk_push(GENERAL_NAME, (st), (val))
-#define sk_GENERAL_NAME_unshift(st, val) SKM_sk_unshift(GENERAL_NAME, (st), (val))
-#define sk_GENERAL_NAME_find(st, val) SKM_sk_find(GENERAL_NAME, (st), (val))
-#define sk_GENERAL_NAME_find_ex(st, val) SKM_sk_find_ex(GENERAL_NAME, (st), (val))
-#define sk_GENERAL_NAME_delete(st, i) SKM_sk_delete(GENERAL_NAME, (st), (i))
-#define sk_GENERAL_NAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_NAME, (st), (ptr))
-#define sk_GENERAL_NAME_insert(st, val, i) SKM_sk_insert(GENERAL_NAME, (st), (val), (i))
-#define sk_GENERAL_NAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_NAME, (st), (cmp))
-#define sk_GENERAL_NAME_dup(st) SKM_sk_dup(GENERAL_NAME, st)
-#define sk_GENERAL_NAME_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_NAME, (st), (free_func))
-#define sk_GENERAL_NAME_shift(st) SKM_sk_shift(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_pop(st) SKM_sk_pop(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_sort(st) SKM_sk_sort(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_is_sorted(st) SKM_sk_is_sorted(GENERAL_NAME, (st))
-
-#define sk_GENERAL_NAMES_new(cmp) SKM_sk_new(GENERAL_NAMES, (cmp))
-#define sk_GENERAL_NAMES_new_null() SKM_sk_new_null(GENERAL_NAMES)
-#define sk_GENERAL_NAMES_free(st) SKM_sk_free(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_num(st) SKM_sk_num(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_value(st, i) SKM_sk_value(GENERAL_NAMES, (st), (i))
-#define sk_GENERAL_NAMES_set(st, i, val) SKM_sk_set(GENERAL_NAMES, (st), (i), (val))
-#define sk_GENERAL_NAMES_zero(st) SKM_sk_zero(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_push(st, val) SKM_sk_push(GENERAL_NAMES, (st), (val))
-#define sk_GENERAL_NAMES_unshift(st, val) SKM_sk_unshift(GENERAL_NAMES, (st), (val))
-#define sk_GENERAL_NAMES_find(st, val) SKM_sk_find(GENERAL_NAMES, (st), (val))
-#define sk_GENERAL_NAMES_find_ex(st, val) SKM_sk_find_ex(GENERAL_NAMES, (st), (val))
-#define sk_GENERAL_NAMES_delete(st, i) SKM_sk_delete(GENERAL_NAMES, (st), (i))
-#define sk_GENERAL_NAMES_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_NAMES, (st), (ptr))
-#define sk_GENERAL_NAMES_insert(st, val, i) SKM_sk_insert(GENERAL_NAMES, (st), (val), (i))
-#define sk_GENERAL_NAMES_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_NAMES, (st), (cmp))
-#define sk_GENERAL_NAMES_dup(st) SKM_sk_dup(GENERAL_NAMES, st)
-#define sk_GENERAL_NAMES_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_NAMES, (st), (free_func))
-#define sk_GENERAL_NAMES_shift(st) SKM_sk_shift(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_pop(st) SKM_sk_pop(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_sort(st) SKM_sk_sort(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_is_sorted(st) SKM_sk_is_sorted(GENERAL_NAMES, (st))
-
-#define sk_GENERAL_SUBTREE_new(cmp) SKM_sk_new(GENERAL_SUBTREE, (cmp))
-#define sk_GENERAL_SUBTREE_new_null() SKM_sk_new_null(GENERAL_SUBTREE)
-#define sk_GENERAL_SUBTREE_free(st) SKM_sk_free(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_num(st) SKM_sk_num(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_value(st, i) SKM_sk_value(GENERAL_SUBTREE, (st), (i))
-#define sk_GENERAL_SUBTREE_set(st, i, val) SKM_sk_set(GENERAL_SUBTREE, (st), (i), (val))
-#define sk_GENERAL_SUBTREE_zero(st) SKM_sk_zero(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_push(st, val) SKM_sk_push(GENERAL_SUBTREE, (st), (val))
-#define sk_GENERAL_SUBTREE_unshift(st, val) SKM_sk_unshift(GENERAL_SUBTREE, (st), (val))
-#define sk_GENERAL_SUBTREE_find(st, val) SKM_sk_find(GENERAL_SUBTREE, (st), (val))
-#define sk_GENERAL_SUBTREE_find_ex(st, val) SKM_sk_find_ex(GENERAL_SUBTREE, (st), (val))
-#define sk_GENERAL_SUBTREE_delete(st, i) SKM_sk_delete(GENERAL_SUBTREE, (st), (i))
-#define sk_GENERAL_SUBTREE_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_SUBTREE, (st), (ptr))
-#define sk_GENERAL_SUBTREE_insert(st, val, i) SKM_sk_insert(GENERAL_SUBTREE, (st), (val), (i))
-#define sk_GENERAL_SUBTREE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_SUBTREE, (st), (cmp))
-#define sk_GENERAL_SUBTREE_dup(st) SKM_sk_dup(GENERAL_SUBTREE, st)
-#define sk_GENERAL_SUBTREE_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_SUBTREE, (st), (free_func))
-#define sk_GENERAL_SUBTREE_shift(st) SKM_sk_shift(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_pop(st) SKM_sk_pop(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_sort(st) SKM_sk_sort(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_is_sorted(st) SKM_sk_is_sorted(GENERAL_SUBTREE, (st))
-
-#define sk_IPAddressFamily_new(cmp) SKM_sk_new(IPAddressFamily, (cmp))
-#define sk_IPAddressFamily_new_null() SKM_sk_new_null(IPAddressFamily)
-#define sk_IPAddressFamily_free(st) SKM_sk_free(IPAddressFamily, (st))
-#define sk_IPAddressFamily_num(st) SKM_sk_num(IPAddressFamily, (st))
-#define sk_IPAddressFamily_value(st, i) SKM_sk_value(IPAddressFamily, (st), (i))
-#define sk_IPAddressFamily_set(st, i, val) SKM_sk_set(IPAddressFamily, (st), (i), (val))
-#define sk_IPAddressFamily_zero(st) SKM_sk_zero(IPAddressFamily, (st))
-#define sk_IPAddressFamily_push(st, val) SKM_sk_push(IPAddressFamily, (st), (val))
-#define sk_IPAddressFamily_unshift(st, val) SKM_sk_unshift(IPAddressFamily, (st), (val))
-#define sk_IPAddressFamily_find(st, val) SKM_sk_find(IPAddressFamily, (st), (val))
-#define sk_IPAddressFamily_find_ex(st, val) SKM_sk_find_ex(IPAddressFamily, (st), (val))
-#define sk_IPAddressFamily_delete(st, i) SKM_sk_delete(IPAddressFamily, (st), (i))
-#define sk_IPAddressFamily_delete_ptr(st, ptr) SKM_sk_delete_ptr(IPAddressFamily, (st), (ptr))
-#define sk_IPAddressFamily_insert(st, val, i) SKM_sk_insert(IPAddressFamily, (st), (val), (i))
-#define sk_IPAddressFamily_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(IPAddressFamily, (st), (cmp))
-#define sk_IPAddressFamily_dup(st) SKM_sk_dup(IPAddressFamily, st)
-#define sk_IPAddressFamily_pop_free(st, free_func) SKM_sk_pop_free(IPAddressFamily, (st), (free_func))
-#define sk_IPAddressFamily_shift(st) SKM_sk_shift(IPAddressFamily, (st))
-#define sk_IPAddressFamily_pop(st) SKM_sk_pop(IPAddressFamily, (st))
-#define sk_IPAddressFamily_sort(st) SKM_sk_sort(IPAddressFamily, (st))
-#define sk_IPAddressFamily_is_sorted(st) SKM_sk_is_sorted(IPAddressFamily, (st))
-
-#define sk_IPAddressOrRange_new(cmp) SKM_sk_new(IPAddressOrRange, (cmp))
-#define sk_IPAddressOrRange_new_null() SKM_sk_new_null(IPAddressOrRange)
-#define sk_IPAddressOrRange_free(st) SKM_sk_free(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_num(st) SKM_sk_num(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_value(st, i) SKM_sk_value(IPAddressOrRange, (st), (i))
-#define sk_IPAddressOrRange_set(st, i, val) SKM_sk_set(IPAddressOrRange, (st), (i), (val))
-#define sk_IPAddressOrRange_zero(st) SKM_sk_zero(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_push(st, val) SKM_sk_push(IPAddressOrRange, (st), (val))
-#define sk_IPAddressOrRange_unshift(st, val) SKM_sk_unshift(IPAddressOrRange, (st), (val))
-#define sk_IPAddressOrRange_find(st, val) SKM_sk_find(IPAddressOrRange, (st), (val))
-#define sk_IPAddressOrRange_find_ex(st, val) SKM_sk_find_ex(IPAddressOrRange, (st), (val))
-#define sk_IPAddressOrRange_delete(st, i) SKM_sk_delete(IPAddressOrRange, (st), (i))
-#define sk_IPAddressOrRange_delete_ptr(st, ptr) SKM_sk_delete_ptr(IPAddressOrRange, (st), (ptr))
-#define sk_IPAddressOrRange_insert(st, val, i) SKM_sk_insert(IPAddressOrRange, (st), (val), (i))
-#define sk_IPAddressOrRange_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(IPAddressOrRange, (st), (cmp))
-#define sk_IPAddressOrRange_dup(st) SKM_sk_dup(IPAddressOrRange, st)
-#define sk_IPAddressOrRange_pop_free(st, free_func) SKM_sk_pop_free(IPAddressOrRange, (st), (free_func))
-#define sk_IPAddressOrRange_shift(st) SKM_sk_shift(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_pop(st) SKM_sk_pop(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_sort(st) SKM_sk_sort(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_is_sorted(st) SKM_sk_is_sorted(IPAddressOrRange, (st))
-
-#define sk_KRB5_APREQBODY_new(cmp) SKM_sk_new(KRB5_APREQBODY, (cmp))
-#define sk_KRB5_APREQBODY_new_null() SKM_sk_new_null(KRB5_APREQBODY)
-#define sk_KRB5_APREQBODY_free(st) SKM_sk_free(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_num(st) SKM_sk_num(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_value(st, i) SKM_sk_value(KRB5_APREQBODY, (st), (i))
-#define sk_KRB5_APREQBODY_set(st, i, val) SKM_sk_set(KRB5_APREQBODY, (st), (i), (val))
-#define sk_KRB5_APREQBODY_zero(st) SKM_sk_zero(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_push(st, val) SKM_sk_push(KRB5_APREQBODY, (st), (val))
-#define sk_KRB5_APREQBODY_unshift(st, val) SKM_sk_unshift(KRB5_APREQBODY, (st), (val))
-#define sk_KRB5_APREQBODY_find(st, val) SKM_sk_find(KRB5_APREQBODY, (st), (val))
-#define sk_KRB5_APREQBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_APREQBODY, (st), (val))
-#define sk_KRB5_APREQBODY_delete(st, i) SKM_sk_delete(KRB5_APREQBODY, (st), (i))
-#define sk_KRB5_APREQBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_APREQBODY, (st), (ptr))
-#define sk_KRB5_APREQBODY_insert(st, val, i) SKM_sk_insert(KRB5_APREQBODY, (st), (val), (i))
-#define sk_KRB5_APREQBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_APREQBODY, (st), (cmp))
-#define sk_KRB5_APREQBODY_dup(st) SKM_sk_dup(KRB5_APREQBODY, st)
-#define sk_KRB5_APREQBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_APREQBODY, (st), (free_func))
-#define sk_KRB5_APREQBODY_shift(st) SKM_sk_shift(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_pop(st) SKM_sk_pop(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_sort(st) SKM_sk_sort(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_APREQBODY, (st))
-
-#define sk_KRB5_AUTHDATA_new(cmp) SKM_sk_new(KRB5_AUTHDATA, (cmp))
-#define sk_KRB5_AUTHDATA_new_null() SKM_sk_new_null(KRB5_AUTHDATA)
-#define sk_KRB5_AUTHDATA_free(st) SKM_sk_free(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_num(st) SKM_sk_num(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_value(st, i) SKM_sk_value(KRB5_AUTHDATA, (st), (i))
-#define sk_KRB5_AUTHDATA_set(st, i, val) SKM_sk_set(KRB5_AUTHDATA, (st), (i), (val))
-#define sk_KRB5_AUTHDATA_zero(st) SKM_sk_zero(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_push(st, val) SKM_sk_push(KRB5_AUTHDATA, (st), (val))
-#define sk_KRB5_AUTHDATA_unshift(st, val) SKM_sk_unshift(KRB5_AUTHDATA, (st), (val))
-#define sk_KRB5_AUTHDATA_find(st, val) SKM_sk_find(KRB5_AUTHDATA, (st), (val))
-#define sk_KRB5_AUTHDATA_find_ex(st, val) SKM_sk_find_ex(KRB5_AUTHDATA, (st), (val))
-#define sk_KRB5_AUTHDATA_delete(st, i) SKM_sk_delete(KRB5_AUTHDATA, (st), (i))
-#define sk_KRB5_AUTHDATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_AUTHDATA, (st), (ptr))
-#define sk_KRB5_AUTHDATA_insert(st, val, i) SKM_sk_insert(KRB5_AUTHDATA, (st), (val), (i))
-#define sk_KRB5_AUTHDATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_AUTHDATA, (st), (cmp))
-#define sk_KRB5_AUTHDATA_dup(st) SKM_sk_dup(KRB5_AUTHDATA, st)
-#define sk_KRB5_AUTHDATA_pop_free(st, free_func) SKM_sk_pop_free(KRB5_AUTHDATA, (st), (free_func))
-#define sk_KRB5_AUTHDATA_shift(st) SKM_sk_shift(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_pop(st) SKM_sk_pop(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_sort(st) SKM_sk_sort(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_is_sorted(st) SKM_sk_is_sorted(KRB5_AUTHDATA, (st))
-
-#define sk_KRB5_AUTHENTBODY_new(cmp) SKM_sk_new(KRB5_AUTHENTBODY, (cmp))
-#define sk_KRB5_AUTHENTBODY_new_null() SKM_sk_new_null(KRB5_AUTHENTBODY)
-#define sk_KRB5_AUTHENTBODY_free(st) SKM_sk_free(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_num(st) SKM_sk_num(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_value(st, i) SKM_sk_value(KRB5_AUTHENTBODY, (st), (i))
-#define sk_KRB5_AUTHENTBODY_set(st, i, val) SKM_sk_set(KRB5_AUTHENTBODY, (st), (i), (val))
-#define sk_KRB5_AUTHENTBODY_zero(st) SKM_sk_zero(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_push(st, val) SKM_sk_push(KRB5_AUTHENTBODY, (st), (val))
-#define sk_KRB5_AUTHENTBODY_unshift(st, val) SKM_sk_unshift(KRB5_AUTHENTBODY, (st), (val))
-#define sk_KRB5_AUTHENTBODY_find(st, val) SKM_sk_find(KRB5_AUTHENTBODY, (st), (val))
-#define sk_KRB5_AUTHENTBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_AUTHENTBODY, (st), (val))
-#define sk_KRB5_AUTHENTBODY_delete(st, i) SKM_sk_delete(KRB5_AUTHENTBODY, (st), (i))
-#define sk_KRB5_AUTHENTBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_AUTHENTBODY, (st), (ptr))
-#define sk_KRB5_AUTHENTBODY_insert(st, val, i) SKM_sk_insert(KRB5_AUTHENTBODY, (st), (val), (i))
-#define sk_KRB5_AUTHENTBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_AUTHENTBODY, (st), (cmp))
-#define sk_KRB5_AUTHENTBODY_dup(st) SKM_sk_dup(KRB5_AUTHENTBODY, st)
-#define sk_KRB5_AUTHENTBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_AUTHENTBODY, (st), (free_func))
-#define sk_KRB5_AUTHENTBODY_shift(st) SKM_sk_shift(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_pop(st) SKM_sk_pop(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_sort(st) SKM_sk_sort(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_AUTHENTBODY, (st))
-
-#define sk_KRB5_CHECKSUM_new(cmp) SKM_sk_new(KRB5_CHECKSUM, (cmp))
-#define sk_KRB5_CHECKSUM_new_null() SKM_sk_new_null(KRB5_CHECKSUM)
-#define sk_KRB5_CHECKSUM_free(st) SKM_sk_free(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_num(st) SKM_sk_num(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_value(st, i) SKM_sk_value(KRB5_CHECKSUM, (st), (i))
-#define sk_KRB5_CHECKSUM_set(st, i, val) SKM_sk_set(KRB5_CHECKSUM, (st), (i), (val))
-#define sk_KRB5_CHECKSUM_zero(st) SKM_sk_zero(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_push(st, val) SKM_sk_push(KRB5_CHECKSUM, (st), (val))
-#define sk_KRB5_CHECKSUM_unshift(st, val) SKM_sk_unshift(KRB5_CHECKSUM, (st), (val))
-#define sk_KRB5_CHECKSUM_find(st, val) SKM_sk_find(KRB5_CHECKSUM, (st), (val))
-#define sk_KRB5_CHECKSUM_find_ex(st, val) SKM_sk_find_ex(KRB5_CHECKSUM, (st), (val))
-#define sk_KRB5_CHECKSUM_delete(st, i) SKM_sk_delete(KRB5_CHECKSUM, (st), (i))
-#define sk_KRB5_CHECKSUM_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_CHECKSUM, (st), (ptr))
-#define sk_KRB5_CHECKSUM_insert(st, val, i) SKM_sk_insert(KRB5_CHECKSUM, (st), (val), (i))
-#define sk_KRB5_CHECKSUM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_CHECKSUM, (st), (cmp))
-#define sk_KRB5_CHECKSUM_dup(st) SKM_sk_dup(KRB5_CHECKSUM, st)
-#define sk_KRB5_CHECKSUM_pop_free(st, free_func) SKM_sk_pop_free(KRB5_CHECKSUM, (st), (free_func))
-#define sk_KRB5_CHECKSUM_shift(st) SKM_sk_shift(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_pop(st) SKM_sk_pop(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_sort(st) SKM_sk_sort(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_is_sorted(st) SKM_sk_is_sorted(KRB5_CHECKSUM, (st))
-
-#define sk_KRB5_ENCDATA_new(cmp) SKM_sk_new(KRB5_ENCDATA, (cmp))
-#define sk_KRB5_ENCDATA_new_null() SKM_sk_new_null(KRB5_ENCDATA)
-#define sk_KRB5_ENCDATA_free(st) SKM_sk_free(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_num(st) SKM_sk_num(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_value(st, i) SKM_sk_value(KRB5_ENCDATA, (st), (i))
-#define sk_KRB5_ENCDATA_set(st, i, val) SKM_sk_set(KRB5_ENCDATA, (st), (i), (val))
-#define sk_KRB5_ENCDATA_zero(st) SKM_sk_zero(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_push(st, val) SKM_sk_push(KRB5_ENCDATA, (st), (val))
-#define sk_KRB5_ENCDATA_unshift(st, val) SKM_sk_unshift(KRB5_ENCDATA, (st), (val))
-#define sk_KRB5_ENCDATA_find(st, val) SKM_sk_find(KRB5_ENCDATA, (st), (val))
-#define sk_KRB5_ENCDATA_find_ex(st, val) SKM_sk_find_ex(KRB5_ENCDATA, (st), (val))
-#define sk_KRB5_ENCDATA_delete(st, i) SKM_sk_delete(KRB5_ENCDATA, (st), (i))
-#define sk_KRB5_ENCDATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_ENCDATA, (st), (ptr))
-#define sk_KRB5_ENCDATA_insert(st, val, i) SKM_sk_insert(KRB5_ENCDATA, (st), (val), (i))
-#define sk_KRB5_ENCDATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_ENCDATA, (st), (cmp))
-#define sk_KRB5_ENCDATA_dup(st) SKM_sk_dup(KRB5_ENCDATA, st)
-#define sk_KRB5_ENCDATA_pop_free(st, free_func) SKM_sk_pop_free(KRB5_ENCDATA, (st), (free_func))
-#define sk_KRB5_ENCDATA_shift(st) SKM_sk_shift(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_pop(st) SKM_sk_pop(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_sort(st) SKM_sk_sort(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_is_sorted(st) SKM_sk_is_sorted(KRB5_ENCDATA, (st))
-
-#define sk_KRB5_ENCKEY_new(cmp) SKM_sk_new(KRB5_ENCKEY, (cmp))
-#define sk_KRB5_ENCKEY_new_null() SKM_sk_new_null(KRB5_ENCKEY)
-#define sk_KRB5_ENCKEY_free(st) SKM_sk_free(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_num(st) SKM_sk_num(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_value(st, i) SKM_sk_value(KRB5_ENCKEY, (st), (i))
-#define sk_KRB5_ENCKEY_set(st, i, val) SKM_sk_set(KRB5_ENCKEY, (st), (i), (val))
-#define sk_KRB5_ENCKEY_zero(st) SKM_sk_zero(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_push(st, val) SKM_sk_push(KRB5_ENCKEY, (st), (val))
-#define sk_KRB5_ENCKEY_unshift(st, val) SKM_sk_unshift(KRB5_ENCKEY, (st), (val))
-#define sk_KRB5_ENCKEY_find(st, val) SKM_sk_find(KRB5_ENCKEY, (st), (val))
-#define sk_KRB5_ENCKEY_find_ex(st, val) SKM_sk_find_ex(KRB5_ENCKEY, (st), (val))
-#define sk_KRB5_ENCKEY_delete(st, i) SKM_sk_delete(KRB5_ENCKEY, (st), (i))
-#define sk_KRB5_ENCKEY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_ENCKEY, (st), (ptr))
-#define sk_KRB5_ENCKEY_insert(st, val, i) SKM_sk_insert(KRB5_ENCKEY, (st), (val), (i))
-#define sk_KRB5_ENCKEY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_ENCKEY, (st), (cmp))
-#define sk_KRB5_ENCKEY_dup(st) SKM_sk_dup(KRB5_ENCKEY, st)
-#define sk_KRB5_ENCKEY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_ENCKEY, (st), (free_func))
-#define sk_KRB5_ENCKEY_shift(st) SKM_sk_shift(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_pop(st) SKM_sk_pop(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_sort(st) SKM_sk_sort(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_is_sorted(st) SKM_sk_is_sorted(KRB5_ENCKEY, (st))
-
-#define sk_KRB5_PRINCNAME_new(cmp) SKM_sk_new(KRB5_PRINCNAME, (cmp))
-#define sk_KRB5_PRINCNAME_new_null() SKM_sk_new_null(KRB5_PRINCNAME)
-#define sk_KRB5_PRINCNAME_free(st) SKM_sk_free(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_num(st) SKM_sk_num(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_value(st, i) SKM_sk_value(KRB5_PRINCNAME, (st), (i))
-#define sk_KRB5_PRINCNAME_set(st, i, val) SKM_sk_set(KRB5_PRINCNAME, (st), (i), (val))
-#define sk_KRB5_PRINCNAME_zero(st) SKM_sk_zero(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_push(st, val) SKM_sk_push(KRB5_PRINCNAME, (st), (val))
-#define sk_KRB5_PRINCNAME_unshift(st, val) SKM_sk_unshift(KRB5_PRINCNAME, (st), (val))
-#define sk_KRB5_PRINCNAME_find(st, val) SKM_sk_find(KRB5_PRINCNAME, (st), (val))
-#define sk_KRB5_PRINCNAME_find_ex(st, val) SKM_sk_find_ex(KRB5_PRINCNAME, (st), (val))
-#define sk_KRB5_PRINCNAME_delete(st, i) SKM_sk_delete(KRB5_PRINCNAME, (st), (i))
-#define sk_KRB5_PRINCNAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_PRINCNAME, (st), (ptr))
-#define sk_KRB5_PRINCNAME_insert(st, val, i) SKM_sk_insert(KRB5_PRINCNAME, (st), (val), (i))
-#define sk_KRB5_PRINCNAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_PRINCNAME, (st), (cmp))
-#define sk_KRB5_PRINCNAME_dup(st) SKM_sk_dup(KRB5_PRINCNAME, st)
-#define sk_KRB5_PRINCNAME_pop_free(st, free_func) SKM_sk_pop_free(KRB5_PRINCNAME, (st), (free_func))
-#define sk_KRB5_PRINCNAME_shift(st) SKM_sk_shift(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_pop(st) SKM_sk_pop(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_sort(st) SKM_sk_sort(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_is_sorted(st) SKM_sk_is_sorted(KRB5_PRINCNAME, (st))
-
-#define sk_KRB5_TKTBODY_new(cmp) SKM_sk_new(KRB5_TKTBODY, (cmp))
-#define sk_KRB5_TKTBODY_new_null() SKM_sk_new_null(KRB5_TKTBODY)
-#define sk_KRB5_TKTBODY_free(st) SKM_sk_free(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_num(st) SKM_sk_num(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_value(st, i) SKM_sk_value(KRB5_TKTBODY, (st), (i))
-#define sk_KRB5_TKTBODY_set(st, i, val) SKM_sk_set(KRB5_TKTBODY, (st), (i), (val))
-#define sk_KRB5_TKTBODY_zero(st) SKM_sk_zero(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_push(st, val) SKM_sk_push(KRB5_TKTBODY, (st), (val))
-#define sk_KRB5_TKTBODY_unshift(st, val) SKM_sk_unshift(KRB5_TKTBODY, (st), (val))
-#define sk_KRB5_TKTBODY_find(st, val) SKM_sk_find(KRB5_TKTBODY, (st), (val))
-#define sk_KRB5_TKTBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_TKTBODY, (st), (val))
-#define sk_KRB5_TKTBODY_delete(st, i) SKM_sk_delete(KRB5_TKTBODY, (st), (i))
-#define sk_KRB5_TKTBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_TKTBODY, (st), (ptr))
-#define sk_KRB5_TKTBODY_insert(st, val, i) SKM_sk_insert(KRB5_TKTBODY, (st), (val), (i))
-#define sk_KRB5_TKTBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_TKTBODY, (st), (cmp))
-#define sk_KRB5_TKTBODY_dup(st) SKM_sk_dup(KRB5_TKTBODY, st)
-#define sk_KRB5_TKTBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_TKTBODY, (st), (free_func))
-#define sk_KRB5_TKTBODY_shift(st) SKM_sk_shift(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_pop(st) SKM_sk_pop(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_sort(st) SKM_sk_sort(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_TKTBODY, (st))
+DEFINE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 
-#define sk_MEM_OBJECT_DATA_new(cmp) SKM_sk_new(MEM_OBJECT_DATA, (cmp))
-#define sk_MEM_OBJECT_DATA_new_null() SKM_sk_new_null(MEM_OBJECT_DATA)
-#define sk_MEM_OBJECT_DATA_free(st) SKM_sk_free(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_num(st) SKM_sk_num(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_value(st, i) SKM_sk_value(MEM_OBJECT_DATA, (st), (i))
-#define sk_MEM_OBJECT_DATA_set(st, i, val) SKM_sk_set(MEM_OBJECT_DATA, (st), (i), (val))
-#define sk_MEM_OBJECT_DATA_zero(st) SKM_sk_zero(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_push(st, val) SKM_sk_push(MEM_OBJECT_DATA, (st), (val))
-#define sk_MEM_OBJECT_DATA_unshift(st, val) SKM_sk_unshift(MEM_OBJECT_DATA, (st), (val))
-#define sk_MEM_OBJECT_DATA_find(st, val) SKM_sk_find(MEM_OBJECT_DATA, (st), (val))
-#define sk_MEM_OBJECT_DATA_find_ex(st, val) SKM_sk_find_ex(MEM_OBJECT_DATA, (st), (val))
-#define sk_MEM_OBJECT_DATA_delete(st, i) SKM_sk_delete(MEM_OBJECT_DATA, (st), (i))
-#define sk_MEM_OBJECT_DATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(MEM_OBJECT_DATA, (st), (ptr))
-#define sk_MEM_OBJECT_DATA_insert(st, val, i) SKM_sk_insert(MEM_OBJECT_DATA, (st), (val), (i))
-#define sk_MEM_OBJECT_DATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MEM_OBJECT_DATA, (st), (cmp))
-#define sk_MEM_OBJECT_DATA_dup(st) SKM_sk_dup(MEM_OBJECT_DATA, st)
-#define sk_MEM_OBJECT_DATA_pop_free(st, free_func) SKM_sk_pop_free(MEM_OBJECT_DATA, (st), (free_func))
-#define sk_MEM_OBJECT_DATA_shift(st) SKM_sk_shift(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_pop(st) SKM_sk_pop(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_sort(st) SKM_sk_sort(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_is_sorted(st) SKM_sk_is_sorted(MEM_OBJECT_DATA, (st))
-
-#define sk_MIME_HEADER_new(cmp) SKM_sk_new(MIME_HEADER, (cmp))
-#define sk_MIME_HEADER_new_null() SKM_sk_new_null(MIME_HEADER)
-#define sk_MIME_HEADER_free(st) SKM_sk_free(MIME_HEADER, (st))
-#define sk_MIME_HEADER_num(st) SKM_sk_num(MIME_HEADER, (st))
-#define sk_MIME_HEADER_value(st, i) SKM_sk_value(MIME_HEADER, (st), (i))
-#define sk_MIME_HEADER_set(st, i, val) SKM_sk_set(MIME_HEADER, (st), (i), (val))
-#define sk_MIME_HEADER_zero(st) SKM_sk_zero(MIME_HEADER, (st))
-#define sk_MIME_HEADER_push(st, val) SKM_sk_push(MIME_HEADER, (st), (val))
-#define sk_MIME_HEADER_unshift(st, val) SKM_sk_unshift(MIME_HEADER, (st), (val))
-#define sk_MIME_HEADER_find(st, val) SKM_sk_find(MIME_HEADER, (st), (val))
-#define sk_MIME_HEADER_find_ex(st, val) SKM_sk_find_ex(MIME_HEADER, (st), (val))
-#define sk_MIME_HEADER_delete(st, i) SKM_sk_delete(MIME_HEADER, (st), (i))
-#define sk_MIME_HEADER_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_HEADER, (st), (ptr))
-#define sk_MIME_HEADER_insert(st, val, i) SKM_sk_insert(MIME_HEADER, (st), (val), (i))
-#define sk_MIME_HEADER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_HEADER, (st), (cmp))
-#define sk_MIME_HEADER_dup(st) SKM_sk_dup(MIME_HEADER, st)
-#define sk_MIME_HEADER_pop_free(st, free_func) SKM_sk_pop_free(MIME_HEADER, (st), (free_func))
-#define sk_MIME_HEADER_shift(st) SKM_sk_shift(MIME_HEADER, (st))
-#define sk_MIME_HEADER_pop(st) SKM_sk_pop(MIME_HEADER, (st))
-#define sk_MIME_HEADER_sort(st) SKM_sk_sort(MIME_HEADER, (st))
-#define sk_MIME_HEADER_is_sorted(st) SKM_sk_is_sorted(MIME_HEADER, (st))
-
-#define sk_MIME_PARAM_new(cmp) SKM_sk_new(MIME_PARAM, (cmp))
-#define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM)
-#define sk_MIME_PARAM_free(st) SKM_sk_free(MIME_PARAM, (st))
-#define sk_MIME_PARAM_num(st) SKM_sk_num(MIME_PARAM, (st))
-#define sk_MIME_PARAM_value(st, i) SKM_sk_value(MIME_PARAM, (st), (i))
-#define sk_MIME_PARAM_set(st, i, val) SKM_sk_set(MIME_PARAM, (st), (i), (val))
-#define sk_MIME_PARAM_zero(st) SKM_sk_zero(MIME_PARAM, (st))
-#define sk_MIME_PARAM_push(st, val) SKM_sk_push(MIME_PARAM, (st), (val))
-#define sk_MIME_PARAM_unshift(st, val) SKM_sk_unshift(MIME_PARAM, (st), (val))
-#define sk_MIME_PARAM_find(st, val) SKM_sk_find(MIME_PARAM, (st), (val))
-#define sk_MIME_PARAM_find_ex(st, val) SKM_sk_find_ex(MIME_PARAM, (st), (val))
-#define sk_MIME_PARAM_delete(st, i) SKM_sk_delete(MIME_PARAM, (st), (i))
-#define sk_MIME_PARAM_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_PARAM, (st), (ptr))
-#define sk_MIME_PARAM_insert(st, val, i) SKM_sk_insert(MIME_PARAM, (st), (val), (i))
-#define sk_MIME_PARAM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_PARAM, (st), (cmp))
-#define sk_MIME_PARAM_dup(st) SKM_sk_dup(MIME_PARAM, st)
-#define sk_MIME_PARAM_pop_free(st, free_func) SKM_sk_pop_free(MIME_PARAM, (st), (free_func))
-#define sk_MIME_PARAM_shift(st) SKM_sk_shift(MIME_PARAM, (st))
-#define sk_MIME_PARAM_pop(st) SKM_sk_pop(MIME_PARAM, (st))
-#define sk_MIME_PARAM_sort(st) SKM_sk_sort(MIME_PARAM, (st))
-#define sk_MIME_PARAM_is_sorted(st) SKM_sk_is_sorted(MIME_PARAM, (st))
-
-#define sk_NAME_FUNCS_new(cmp) SKM_sk_new(NAME_FUNCS, (cmp))
-#define sk_NAME_FUNCS_new_null() SKM_sk_new_null(NAME_FUNCS)
-#define sk_NAME_FUNCS_free(st) SKM_sk_free(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_num(st) SKM_sk_num(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_value(st, i) SKM_sk_value(NAME_FUNCS, (st), (i))
-#define sk_NAME_FUNCS_set(st, i, val) SKM_sk_set(NAME_FUNCS, (st), (i), (val))
-#define sk_NAME_FUNCS_zero(st) SKM_sk_zero(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_push(st, val) SKM_sk_push(NAME_FUNCS, (st), (val))
-#define sk_NAME_FUNCS_unshift(st, val) SKM_sk_unshift(NAME_FUNCS, (st), (val))
-#define sk_NAME_FUNCS_find(st, val) SKM_sk_find(NAME_FUNCS, (st), (val))
-#define sk_NAME_FUNCS_find_ex(st, val) SKM_sk_find_ex(NAME_FUNCS, (st), (val))
-#define sk_NAME_FUNCS_delete(st, i) SKM_sk_delete(NAME_FUNCS, (st), (i))
-#define sk_NAME_FUNCS_delete_ptr(st, ptr) SKM_sk_delete_ptr(NAME_FUNCS, (st), (ptr))
-#define sk_NAME_FUNCS_insert(st, val, i) SKM_sk_insert(NAME_FUNCS, (st), (val), (i))
-#define sk_NAME_FUNCS_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(NAME_FUNCS, (st), (cmp))
-#define sk_NAME_FUNCS_dup(st) SKM_sk_dup(NAME_FUNCS, st)
-#define sk_NAME_FUNCS_pop_free(st, free_func) SKM_sk_pop_free(NAME_FUNCS, (st), (free_func))
-#define sk_NAME_FUNCS_shift(st) SKM_sk_shift(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_pop(st) SKM_sk_pop(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_sort(st) SKM_sk_sort(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_is_sorted(st) SKM_sk_is_sorted(NAME_FUNCS, (st))
-
-#define sk_OCSP_CERTID_new(cmp) SKM_sk_new(OCSP_CERTID, (cmp))
-#define sk_OCSP_CERTID_new_null() SKM_sk_new_null(OCSP_CERTID)
-#define sk_OCSP_CERTID_free(st) SKM_sk_free(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_num(st) SKM_sk_num(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_value(st, i) SKM_sk_value(OCSP_CERTID, (st), (i))
-#define sk_OCSP_CERTID_set(st, i, val) SKM_sk_set(OCSP_CERTID, (st), (i), (val))
-#define sk_OCSP_CERTID_zero(st) SKM_sk_zero(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_push(st, val) SKM_sk_push(OCSP_CERTID, (st), (val))
-#define sk_OCSP_CERTID_unshift(st, val) SKM_sk_unshift(OCSP_CERTID, (st), (val))
-#define sk_OCSP_CERTID_find(st, val) SKM_sk_find(OCSP_CERTID, (st), (val))
-#define sk_OCSP_CERTID_find_ex(st, val) SKM_sk_find_ex(OCSP_CERTID, (st), (val))
-#define sk_OCSP_CERTID_delete(st, i) SKM_sk_delete(OCSP_CERTID, (st), (i))
-#define sk_OCSP_CERTID_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_CERTID, (st), (ptr))
-#define sk_OCSP_CERTID_insert(st, val, i) SKM_sk_insert(OCSP_CERTID, (st), (val), (i))
-#define sk_OCSP_CERTID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_CERTID, (st), (cmp))
-#define sk_OCSP_CERTID_dup(st) SKM_sk_dup(OCSP_CERTID, st)
-#define sk_OCSP_CERTID_pop_free(st, free_func) SKM_sk_pop_free(OCSP_CERTID, (st), (free_func))
-#define sk_OCSP_CERTID_shift(st) SKM_sk_shift(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_pop(st) SKM_sk_pop(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_sort(st) SKM_sk_sort(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_is_sorted(st) SKM_sk_is_sorted(OCSP_CERTID, (st))
-
-#define sk_OCSP_ONEREQ_new(cmp) SKM_sk_new(OCSP_ONEREQ, (cmp))
-#define sk_OCSP_ONEREQ_new_null() SKM_sk_new_null(OCSP_ONEREQ)
-#define sk_OCSP_ONEREQ_free(st) SKM_sk_free(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_num(st) SKM_sk_num(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_value(st, i) SKM_sk_value(OCSP_ONEREQ, (st), (i))
-#define sk_OCSP_ONEREQ_set(st, i, val) SKM_sk_set(OCSP_ONEREQ, (st), (i), (val))
-#define sk_OCSP_ONEREQ_zero(st) SKM_sk_zero(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_push(st, val) SKM_sk_push(OCSP_ONEREQ, (st), (val))
-#define sk_OCSP_ONEREQ_unshift(st, val) SKM_sk_unshift(OCSP_ONEREQ, (st), (val))
-#define sk_OCSP_ONEREQ_find(st, val) SKM_sk_find(OCSP_ONEREQ, (st), (val))
-#define sk_OCSP_ONEREQ_find_ex(st, val) SKM_sk_find_ex(OCSP_ONEREQ, (st), (val))
-#define sk_OCSP_ONEREQ_delete(st, i) SKM_sk_delete(OCSP_ONEREQ, (st), (i))
-#define sk_OCSP_ONEREQ_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_ONEREQ, (st), (ptr))
-#define sk_OCSP_ONEREQ_insert(st, val, i) SKM_sk_insert(OCSP_ONEREQ, (st), (val), (i))
-#define sk_OCSP_ONEREQ_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_ONEREQ, (st), (cmp))
-#define sk_OCSP_ONEREQ_dup(st) SKM_sk_dup(OCSP_ONEREQ, st)
-#define sk_OCSP_ONEREQ_pop_free(st, free_func) SKM_sk_pop_free(OCSP_ONEREQ, (st), (free_func))
-#define sk_OCSP_ONEREQ_shift(st) SKM_sk_shift(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_pop(st) SKM_sk_pop(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_sort(st) SKM_sk_sort(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_is_sorted(st) SKM_sk_is_sorted(OCSP_ONEREQ, (st))
-
-#define sk_OCSP_RESPID_new(cmp) SKM_sk_new(OCSP_RESPID, (cmp))
-#define sk_OCSP_RESPID_new_null() SKM_sk_new_null(OCSP_RESPID)
-#define sk_OCSP_RESPID_free(st) SKM_sk_free(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_num(st) SKM_sk_num(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_value(st, i) SKM_sk_value(OCSP_RESPID, (st), (i))
-#define sk_OCSP_RESPID_set(st, i, val) SKM_sk_set(OCSP_RESPID, (st), (i), (val))
-#define sk_OCSP_RESPID_zero(st) SKM_sk_zero(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_push(st, val) SKM_sk_push(OCSP_RESPID, (st), (val))
-#define sk_OCSP_RESPID_unshift(st, val) SKM_sk_unshift(OCSP_RESPID, (st), (val))
-#define sk_OCSP_RESPID_find(st, val) SKM_sk_find(OCSP_RESPID, (st), (val))
-#define sk_OCSP_RESPID_find_ex(st, val) SKM_sk_find_ex(OCSP_RESPID, (st), (val))
-#define sk_OCSP_RESPID_delete(st, i) SKM_sk_delete(OCSP_RESPID, (st), (i))
-#define sk_OCSP_RESPID_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_RESPID, (st), (ptr))
-#define sk_OCSP_RESPID_insert(st, val, i) SKM_sk_insert(OCSP_RESPID, (st), (val), (i))
-#define sk_OCSP_RESPID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_RESPID, (st), (cmp))
-#define sk_OCSP_RESPID_dup(st) SKM_sk_dup(OCSP_RESPID, st)
-#define sk_OCSP_RESPID_pop_free(st, free_func) SKM_sk_pop_free(OCSP_RESPID, (st), (free_func))
-#define sk_OCSP_RESPID_shift(st) SKM_sk_shift(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_pop(st) SKM_sk_pop(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_sort(st) SKM_sk_sort(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_is_sorted(st) SKM_sk_is_sorted(OCSP_RESPID, (st))
-
-#define sk_OCSP_SINGLERESP_new(cmp) SKM_sk_new(OCSP_SINGLERESP, (cmp))
-#define sk_OCSP_SINGLERESP_new_null() SKM_sk_new_null(OCSP_SINGLERESP)
-#define sk_OCSP_SINGLERESP_free(st) SKM_sk_free(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_num(st) SKM_sk_num(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_value(st, i) SKM_sk_value(OCSP_SINGLERESP, (st), (i))
-#define sk_OCSP_SINGLERESP_set(st, i, val) SKM_sk_set(OCSP_SINGLERESP, (st), (i), (val))
-#define sk_OCSP_SINGLERESP_zero(st) SKM_sk_zero(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_push(st, val) SKM_sk_push(OCSP_SINGLERESP, (st), (val))
-#define sk_OCSP_SINGLERESP_unshift(st, val) SKM_sk_unshift(OCSP_SINGLERESP, (st), (val))
-#define sk_OCSP_SINGLERESP_find(st, val) SKM_sk_find(OCSP_SINGLERESP, (st), (val))
-#define sk_OCSP_SINGLERESP_find_ex(st, val) SKM_sk_find_ex(OCSP_SINGLERESP, (st), (val))
-#define sk_OCSP_SINGLERESP_delete(st, i) SKM_sk_delete(OCSP_SINGLERESP, (st), (i))
-#define sk_OCSP_SINGLERESP_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_SINGLERESP, (st), (ptr))
-#define sk_OCSP_SINGLERESP_insert(st, val, i) SKM_sk_insert(OCSP_SINGLERESP, (st), (val), (i))
-#define sk_OCSP_SINGLERESP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_SINGLERESP, (st), (cmp))
-#define sk_OCSP_SINGLERESP_dup(st) SKM_sk_dup(OCSP_SINGLERESP, st)
-#define sk_OCSP_SINGLERESP_pop_free(st, free_func) SKM_sk_pop_free(OCSP_SINGLERESP, (st), (free_func))
-#define sk_OCSP_SINGLERESP_shift(st) SKM_sk_shift(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_pop(st) SKM_sk_pop(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_sort(st) SKM_sk_sort(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_is_sorted(st) SKM_sk_is_sorted(OCSP_SINGLERESP, (st))
-
-#define sk_PKCS12_SAFEBAG_new(cmp) SKM_sk_new(PKCS12_SAFEBAG, (cmp))
-#define sk_PKCS12_SAFEBAG_new_null() SKM_sk_new_null(PKCS12_SAFEBAG)
-#define sk_PKCS12_SAFEBAG_free(st) SKM_sk_free(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_num(st) SKM_sk_num(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_value(st, i) SKM_sk_value(PKCS12_SAFEBAG, (st), (i))
-#define sk_PKCS12_SAFEBAG_set(st, i, val) SKM_sk_set(PKCS12_SAFEBAG, (st), (i), (val))
-#define sk_PKCS12_SAFEBAG_zero(st) SKM_sk_zero(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_push(st, val) SKM_sk_push(PKCS12_SAFEBAG, (st), (val))
-#define sk_PKCS12_SAFEBAG_unshift(st, val) SKM_sk_unshift(PKCS12_SAFEBAG, (st), (val))
-#define sk_PKCS12_SAFEBAG_find(st, val) SKM_sk_find(PKCS12_SAFEBAG, (st), (val))
-#define sk_PKCS12_SAFEBAG_find_ex(st, val) SKM_sk_find_ex(PKCS12_SAFEBAG, (st), (val))
-#define sk_PKCS12_SAFEBAG_delete(st, i) SKM_sk_delete(PKCS12_SAFEBAG, (st), (i))
-#define sk_PKCS12_SAFEBAG_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS12_SAFEBAG, (st), (ptr))
-#define sk_PKCS12_SAFEBAG_insert(st, val, i) SKM_sk_insert(PKCS12_SAFEBAG, (st), (val), (i))
-#define sk_PKCS12_SAFEBAG_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS12_SAFEBAG, (st), (cmp))
-#define sk_PKCS12_SAFEBAG_dup(st) SKM_sk_dup(PKCS12_SAFEBAG, st)
-#define sk_PKCS12_SAFEBAG_pop_free(st, free_func) SKM_sk_pop_free(PKCS12_SAFEBAG, (st), (free_func))
-#define sk_PKCS12_SAFEBAG_shift(st) SKM_sk_shift(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_pop(st) SKM_sk_pop(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_sort(st) SKM_sk_sort(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_is_sorted(st) SKM_sk_is_sorted(PKCS12_SAFEBAG, (st))
-
-#define sk_PKCS7_new(cmp) SKM_sk_new(PKCS7, (cmp))
-#define sk_PKCS7_new_null() SKM_sk_new_null(PKCS7)
-#define sk_PKCS7_free(st) SKM_sk_free(PKCS7, (st))
-#define sk_PKCS7_num(st) SKM_sk_num(PKCS7, (st))
-#define sk_PKCS7_value(st, i) SKM_sk_value(PKCS7, (st), (i))
-#define sk_PKCS7_set(st, i, val) SKM_sk_set(PKCS7, (st), (i), (val))
-#define sk_PKCS7_zero(st) SKM_sk_zero(PKCS7, (st))
-#define sk_PKCS7_push(st, val) SKM_sk_push(PKCS7, (st), (val))
-#define sk_PKCS7_unshift(st, val) SKM_sk_unshift(PKCS7, (st), (val))
-#define sk_PKCS7_find(st, val) SKM_sk_find(PKCS7, (st), (val))
-#define sk_PKCS7_find_ex(st, val) SKM_sk_find_ex(PKCS7, (st), (val))
-#define sk_PKCS7_delete(st, i) SKM_sk_delete(PKCS7, (st), (i))
-#define sk_PKCS7_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7, (st), (ptr))
-#define sk_PKCS7_insert(st, val, i) SKM_sk_insert(PKCS7, (st), (val), (i))
-#define sk_PKCS7_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7, (st), (cmp))
-#define sk_PKCS7_dup(st) SKM_sk_dup(PKCS7, st)
-#define sk_PKCS7_pop_free(st, free_func) SKM_sk_pop_free(PKCS7, (st), (free_func))
-#define sk_PKCS7_shift(st) SKM_sk_shift(PKCS7, (st))
-#define sk_PKCS7_pop(st) SKM_sk_pop(PKCS7, (st))
-#define sk_PKCS7_sort(st) SKM_sk_sort(PKCS7, (st))
-#define sk_PKCS7_is_sorted(st) SKM_sk_is_sorted(PKCS7, (st))
-
-#define sk_PKCS7_RECIP_INFO_new(cmp) SKM_sk_new(PKCS7_RECIP_INFO, (cmp))
-#define sk_PKCS7_RECIP_INFO_new_null() SKM_sk_new_null(PKCS7_RECIP_INFO)
-#define sk_PKCS7_RECIP_INFO_free(st) SKM_sk_free(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_num(st) SKM_sk_num(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_value(st, i) SKM_sk_value(PKCS7_RECIP_INFO, (st), (i))
-#define sk_PKCS7_RECIP_INFO_set(st, i, val) SKM_sk_set(PKCS7_RECIP_INFO, (st), (i), (val))
-#define sk_PKCS7_RECIP_INFO_zero(st) SKM_sk_zero(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_push(st, val) SKM_sk_push(PKCS7_RECIP_INFO, (st), (val))
-#define sk_PKCS7_RECIP_INFO_unshift(st, val) SKM_sk_unshift(PKCS7_RECIP_INFO, (st), (val))
-#define sk_PKCS7_RECIP_INFO_find(st, val) SKM_sk_find(PKCS7_RECIP_INFO, (st), (val))
-#define sk_PKCS7_RECIP_INFO_find_ex(st, val) SKM_sk_find_ex(PKCS7_RECIP_INFO, (st), (val))
-#define sk_PKCS7_RECIP_INFO_delete(st, i) SKM_sk_delete(PKCS7_RECIP_INFO, (st), (i))
-#define sk_PKCS7_RECIP_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7_RECIP_INFO, (st), (ptr))
-#define sk_PKCS7_RECIP_INFO_insert(st, val, i) SKM_sk_insert(PKCS7_RECIP_INFO, (st), (val), (i))
-#define sk_PKCS7_RECIP_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7_RECIP_INFO, (st), (cmp))
-#define sk_PKCS7_RECIP_INFO_dup(st) SKM_sk_dup(PKCS7_RECIP_INFO, st)
-#define sk_PKCS7_RECIP_INFO_pop_free(st, free_func) SKM_sk_pop_free(PKCS7_RECIP_INFO, (st), (free_func))
-#define sk_PKCS7_RECIP_INFO_shift(st) SKM_sk_shift(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_pop(st) SKM_sk_pop(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_sort(st) SKM_sk_sort(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_is_sorted(st) SKM_sk_is_sorted(PKCS7_RECIP_INFO, (st))
-
-#define sk_PKCS7_SIGNER_INFO_new(cmp) SKM_sk_new(PKCS7_SIGNER_INFO, (cmp))
-#define sk_PKCS7_SIGNER_INFO_new_null() SKM_sk_new_null(PKCS7_SIGNER_INFO)
-#define sk_PKCS7_SIGNER_INFO_free(st) SKM_sk_free(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_num(st) SKM_sk_num(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_value(st, i) SKM_sk_value(PKCS7_SIGNER_INFO, (st), (i))
-#define sk_PKCS7_SIGNER_INFO_set(st, i, val) SKM_sk_set(PKCS7_SIGNER_INFO, (st), (i), (val))
-#define sk_PKCS7_SIGNER_INFO_zero(st) SKM_sk_zero(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_push(st, val) SKM_sk_push(PKCS7_SIGNER_INFO, (st), (val))
-#define sk_PKCS7_SIGNER_INFO_unshift(st, val) SKM_sk_unshift(PKCS7_SIGNER_INFO, (st), (val))
-#define sk_PKCS7_SIGNER_INFO_find(st, val) SKM_sk_find(PKCS7_SIGNER_INFO, (st), (val))
-#define sk_PKCS7_SIGNER_INFO_find_ex(st, val) SKM_sk_find_ex(PKCS7_SIGNER_INFO, (st), (val))
-#define sk_PKCS7_SIGNER_INFO_delete(st, i) SKM_sk_delete(PKCS7_SIGNER_INFO, (st), (i))
-#define sk_PKCS7_SIGNER_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7_SIGNER_INFO, (st), (ptr))
-#define sk_PKCS7_SIGNER_INFO_insert(st, val, i) SKM_sk_insert(PKCS7_SIGNER_INFO, (st), (val), (i))
-#define sk_PKCS7_SIGNER_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7_SIGNER_INFO, (st), (cmp))
-#define sk_PKCS7_SIGNER_INFO_dup(st) SKM_sk_dup(PKCS7_SIGNER_INFO, st)
-#define sk_PKCS7_SIGNER_INFO_pop_free(st, free_func) SKM_sk_pop_free(PKCS7_SIGNER_INFO, (st), (free_func))
-#define sk_PKCS7_SIGNER_INFO_shift(st) SKM_sk_shift(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_pop(st) SKM_sk_pop(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_sort(st) SKM_sk_sort(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_is_sorted(st) SKM_sk_is_sorted(PKCS7_SIGNER_INFO, (st))
-
-#define sk_POLICYINFO_new(cmp) SKM_sk_new(POLICYINFO, (cmp))
-#define sk_POLICYINFO_new_null() SKM_sk_new_null(POLICYINFO)
-#define sk_POLICYINFO_free(st) SKM_sk_free(POLICYINFO, (st))
-#define sk_POLICYINFO_num(st) SKM_sk_num(POLICYINFO, (st))
-#define sk_POLICYINFO_value(st, i) SKM_sk_value(POLICYINFO, (st), (i))
-#define sk_POLICYINFO_set(st, i, val) SKM_sk_set(POLICYINFO, (st), (i), (val))
-#define sk_POLICYINFO_zero(st) SKM_sk_zero(POLICYINFO, (st))
-#define sk_POLICYINFO_push(st, val) SKM_sk_push(POLICYINFO, (st), (val))
-#define sk_POLICYINFO_unshift(st, val) SKM_sk_unshift(POLICYINFO, (st), (val))
-#define sk_POLICYINFO_find(st, val) SKM_sk_find(POLICYINFO, (st), (val))
-#define sk_POLICYINFO_find_ex(st, val) SKM_sk_find_ex(POLICYINFO, (st), (val))
-#define sk_POLICYINFO_delete(st, i) SKM_sk_delete(POLICYINFO, (st), (i))
-#define sk_POLICYINFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICYINFO, (st), (ptr))
-#define sk_POLICYINFO_insert(st, val, i) SKM_sk_insert(POLICYINFO, (st), (val), (i))
-#define sk_POLICYINFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICYINFO, (st), (cmp))
-#define sk_POLICYINFO_dup(st) SKM_sk_dup(POLICYINFO, st)
-#define sk_POLICYINFO_pop_free(st, free_func) SKM_sk_pop_free(POLICYINFO, (st), (free_func))
-#define sk_POLICYINFO_shift(st) SKM_sk_shift(POLICYINFO, (st))
-#define sk_POLICYINFO_pop(st) SKM_sk_pop(POLICYINFO, (st))
-#define sk_POLICYINFO_sort(st) SKM_sk_sort(POLICYINFO, (st))
-#define sk_POLICYINFO_is_sorted(st) SKM_sk_is_sorted(POLICYINFO, (st))
-
-#define sk_POLICYQUALINFO_new(cmp) SKM_sk_new(POLICYQUALINFO, (cmp))
-#define sk_POLICYQUALINFO_new_null() SKM_sk_new_null(POLICYQUALINFO)
-#define sk_POLICYQUALINFO_free(st) SKM_sk_free(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_num(st) SKM_sk_num(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_value(st, i) SKM_sk_value(POLICYQUALINFO, (st), (i))
-#define sk_POLICYQUALINFO_set(st, i, val) SKM_sk_set(POLICYQUALINFO, (st), (i), (val))
-#define sk_POLICYQUALINFO_zero(st) SKM_sk_zero(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_push(st, val) SKM_sk_push(POLICYQUALINFO, (st), (val))
-#define sk_POLICYQUALINFO_unshift(st, val) SKM_sk_unshift(POLICYQUALINFO, (st), (val))
-#define sk_POLICYQUALINFO_find(st, val) SKM_sk_find(POLICYQUALINFO, (st), (val))
-#define sk_POLICYQUALINFO_find_ex(st, val) SKM_sk_find_ex(POLICYQUALINFO, (st), (val))
-#define sk_POLICYQUALINFO_delete(st, i) SKM_sk_delete(POLICYQUALINFO, (st), (i))
-#define sk_POLICYQUALINFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICYQUALINFO, (st), (ptr))
-#define sk_POLICYQUALINFO_insert(st, val, i) SKM_sk_insert(POLICYQUALINFO, (st), (val), (i))
-#define sk_POLICYQUALINFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICYQUALINFO, (st), (cmp))
-#define sk_POLICYQUALINFO_dup(st) SKM_sk_dup(POLICYQUALINFO, st)
-#define sk_POLICYQUALINFO_pop_free(st, free_func) SKM_sk_pop_free(POLICYQUALINFO, (st), (free_func))
-#define sk_POLICYQUALINFO_shift(st) SKM_sk_shift(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_pop(st) SKM_sk_pop(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_sort(st) SKM_sk_sort(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_is_sorted(st) SKM_sk_is_sorted(POLICYQUALINFO, (st))
-
-#define sk_POLICY_MAPPING_new(cmp) SKM_sk_new(POLICY_MAPPING, (cmp))
-#define sk_POLICY_MAPPING_new_null() SKM_sk_new_null(POLICY_MAPPING)
-#define sk_POLICY_MAPPING_free(st) SKM_sk_free(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_num(st) SKM_sk_num(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_value(st, i) SKM_sk_value(POLICY_MAPPING, (st), (i))
-#define sk_POLICY_MAPPING_set(st, i, val) SKM_sk_set(POLICY_MAPPING, (st), (i), (val))
-#define sk_POLICY_MAPPING_zero(st) SKM_sk_zero(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_push(st, val) SKM_sk_push(POLICY_MAPPING, (st), (val))
-#define sk_POLICY_MAPPING_unshift(st, val) SKM_sk_unshift(POLICY_MAPPING, (st), (val))
-#define sk_POLICY_MAPPING_find(st, val) SKM_sk_find(POLICY_MAPPING, (st), (val))
-#define sk_POLICY_MAPPING_find_ex(st, val) SKM_sk_find_ex(POLICY_MAPPING, (st), (val))
-#define sk_POLICY_MAPPING_delete(st, i) SKM_sk_delete(POLICY_MAPPING, (st), (i))
-#define sk_POLICY_MAPPING_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICY_MAPPING, (st), (ptr))
-#define sk_POLICY_MAPPING_insert(st, val, i) SKM_sk_insert(POLICY_MAPPING, (st), (val), (i))
-#define sk_POLICY_MAPPING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICY_MAPPING, (st), (cmp))
-#define sk_POLICY_MAPPING_dup(st) SKM_sk_dup(POLICY_MAPPING, st)
-#define sk_POLICY_MAPPING_pop_free(st, free_func) SKM_sk_pop_free(POLICY_MAPPING, (st), (free_func))
-#define sk_POLICY_MAPPING_shift(st) SKM_sk_shift(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_pop(st) SKM_sk_pop(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_sort(st) SKM_sk_sort(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_is_sorted(st) SKM_sk_is_sorted(POLICY_MAPPING, (st))
-
-#define sk_SSL_CIPHER_new(cmp) SKM_sk_new(SSL_CIPHER, (cmp))
-#define sk_SSL_CIPHER_new_null() SKM_sk_new_null(SSL_CIPHER)
-#define sk_SSL_CIPHER_free(st) SKM_sk_free(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_num(st) SKM_sk_num(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_value(st, i) SKM_sk_value(SSL_CIPHER, (st), (i))
-#define sk_SSL_CIPHER_set(st, i, val) SKM_sk_set(SSL_CIPHER, (st), (i), (val))
-#define sk_SSL_CIPHER_zero(st) SKM_sk_zero(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_push(st, val) SKM_sk_push(SSL_CIPHER, (st), (val))
-#define sk_SSL_CIPHER_unshift(st, val) SKM_sk_unshift(SSL_CIPHER, (st), (val))
-#define sk_SSL_CIPHER_find(st, val) SKM_sk_find(SSL_CIPHER, (st), (val))
-#define sk_SSL_CIPHER_find_ex(st, val) SKM_sk_find_ex(SSL_CIPHER, (st), (val))
-#define sk_SSL_CIPHER_delete(st, i) SKM_sk_delete(SSL_CIPHER, (st), (i))
-#define sk_SSL_CIPHER_delete_ptr(st, ptr) SKM_sk_delete_ptr(SSL_CIPHER, (st), (ptr))
-#define sk_SSL_CIPHER_insert(st, val, i) SKM_sk_insert(SSL_CIPHER, (st), (val), (i))
-#define sk_SSL_CIPHER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SSL_CIPHER, (st), (cmp))
-#define sk_SSL_CIPHER_dup(st) SKM_sk_dup(SSL_CIPHER, st)
-#define sk_SSL_CIPHER_pop_free(st, free_func) SKM_sk_pop_free(SSL_CIPHER, (st), (free_func))
-#define sk_SSL_CIPHER_shift(st) SKM_sk_shift(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_pop(st) SKM_sk_pop(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_sort(st) SKM_sk_sort(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_is_sorted(st) SKM_sk_is_sorted(SSL_CIPHER, (st))
-
-#define sk_SSL_COMP_new(cmp) SKM_sk_new(SSL_COMP, (cmp))
-#define sk_SSL_COMP_new_null() SKM_sk_new_null(SSL_COMP)
-#define sk_SSL_COMP_free(st) SKM_sk_free(SSL_COMP, (st))
-#define sk_SSL_COMP_num(st) SKM_sk_num(SSL_COMP, (st))
-#define sk_SSL_COMP_value(st, i) SKM_sk_value(SSL_COMP, (st), (i))
-#define sk_SSL_COMP_set(st, i, val) SKM_sk_set(SSL_COMP, (st), (i), (val))
-#define sk_SSL_COMP_zero(st) SKM_sk_zero(SSL_COMP, (st))
-#define sk_SSL_COMP_push(st, val) SKM_sk_push(SSL_COMP, (st), (val))
-#define sk_SSL_COMP_unshift(st, val) SKM_sk_unshift(SSL_COMP, (st), (val))
-#define sk_SSL_COMP_find(st, val) SKM_sk_find(SSL_COMP, (st), (val))
-#define sk_SSL_COMP_find_ex(st, val) SKM_sk_find_ex(SSL_COMP, (st), (val))
-#define sk_SSL_COMP_delete(st, i) SKM_sk_delete(SSL_COMP, (st), (i))
-#define sk_SSL_COMP_delete_ptr(st, ptr) SKM_sk_delete_ptr(SSL_COMP, (st), (ptr))
-#define sk_SSL_COMP_insert(st, val, i) SKM_sk_insert(SSL_COMP, (st), (val), (i))
-#define sk_SSL_COMP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SSL_COMP, (st), (cmp))
-#define sk_SSL_COMP_dup(st) SKM_sk_dup(SSL_COMP, st)
-#define sk_SSL_COMP_pop_free(st, free_func) SKM_sk_pop_free(SSL_COMP, (st), (free_func))
-#define sk_SSL_COMP_shift(st) SKM_sk_shift(SSL_COMP, (st))
-#define sk_SSL_COMP_pop(st) SKM_sk_pop(SSL_COMP, (st))
-#define sk_SSL_COMP_sort(st) SKM_sk_sort(SSL_COMP, (st))
-#define sk_SSL_COMP_is_sorted(st) SKM_sk_is_sorted(SSL_COMP, (st))
-
-#define sk_STACK_OF_X509_NAME_ENTRY_new(cmp) SKM_sk_new(STACK_OF_X509_NAME_ENTRY, (cmp))
-#define sk_STACK_OF_X509_NAME_ENTRY_new_null() SKM_sk_new_null(STACK_OF_X509_NAME_ENTRY)
-#define sk_STACK_OF_X509_NAME_ENTRY_free(st) SKM_sk_free(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_num(st) SKM_sk_num(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_value(st, i) SKM_sk_value(STACK_OF_X509_NAME_ENTRY, (st), (i))
-#define sk_STACK_OF_X509_NAME_ENTRY_set(st, i, val) SKM_sk_set(STACK_OF_X509_NAME_ENTRY, (st), (i), (val))
-#define sk_STACK_OF_X509_NAME_ENTRY_zero(st) SKM_sk_zero(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_push(st, val) SKM_sk_push(STACK_OF_X509_NAME_ENTRY, (st), (val))
-#define sk_STACK_OF_X509_NAME_ENTRY_unshift(st, val) SKM_sk_unshift(STACK_OF_X509_NAME_ENTRY, (st), (val))
-#define sk_STACK_OF_X509_NAME_ENTRY_find(st, val) SKM_sk_find(STACK_OF_X509_NAME_ENTRY, (st), (val))
-#define sk_STACK_OF_X509_NAME_ENTRY_find_ex(st, val) SKM_sk_find_ex(STACK_OF_X509_NAME_ENTRY, (st), (val))
-#define sk_STACK_OF_X509_NAME_ENTRY_delete(st, i) SKM_sk_delete(STACK_OF_X509_NAME_ENTRY, (st), (i))
-#define sk_STACK_OF_X509_NAME_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(STACK_OF_X509_NAME_ENTRY, (st), (ptr))
-#define sk_STACK_OF_X509_NAME_ENTRY_insert(st, val, i) SKM_sk_insert(STACK_OF_X509_NAME_ENTRY, (st), (val), (i))
-#define sk_STACK_OF_X509_NAME_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STACK_OF_X509_NAME_ENTRY, (st), (cmp))
-#define sk_STACK_OF_X509_NAME_ENTRY_dup(st) SKM_sk_dup(STACK_OF_X509_NAME_ENTRY, st)
-#define sk_STACK_OF_X509_NAME_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(STACK_OF_X509_NAME_ENTRY, (st), (free_func))
-#define sk_STACK_OF_X509_NAME_ENTRY_shift(st) SKM_sk_shift(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_pop(st) SKM_sk_pop(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_sort(st) SKM_sk_sort(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_is_sorted(st) SKM_sk_is_sorted(STACK_OF_X509_NAME_ENTRY, (st))
-
-#define sk_STORE_ATTR_INFO_new(cmp) SKM_sk_new(STORE_ATTR_INFO, (cmp))
-#define sk_STORE_ATTR_INFO_new_null() SKM_sk_new_null(STORE_ATTR_INFO)
-#define sk_STORE_ATTR_INFO_free(st) SKM_sk_free(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_num(st) SKM_sk_num(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_value(st, i) SKM_sk_value(STORE_ATTR_INFO, (st), (i))
-#define sk_STORE_ATTR_INFO_set(st, i, val) SKM_sk_set(STORE_ATTR_INFO, (st), (i), (val))
-#define sk_STORE_ATTR_INFO_zero(st) SKM_sk_zero(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_push(st, val) SKM_sk_push(STORE_ATTR_INFO, (st), (val))
-#define sk_STORE_ATTR_INFO_unshift(st, val) SKM_sk_unshift(STORE_ATTR_INFO, (st), (val))
-#define sk_STORE_ATTR_INFO_find(st, val) SKM_sk_find(STORE_ATTR_INFO, (st), (val))
-#define sk_STORE_ATTR_INFO_find_ex(st, val) SKM_sk_find_ex(STORE_ATTR_INFO, (st), (val))
-#define sk_STORE_ATTR_INFO_delete(st, i) SKM_sk_delete(STORE_ATTR_INFO, (st), (i))
-#define sk_STORE_ATTR_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(STORE_ATTR_INFO, (st), (ptr))
-#define sk_STORE_ATTR_INFO_insert(st, val, i) SKM_sk_insert(STORE_ATTR_INFO, (st), (val), (i))
-#define sk_STORE_ATTR_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STORE_ATTR_INFO, (st), (cmp))
-#define sk_STORE_ATTR_INFO_dup(st) SKM_sk_dup(STORE_ATTR_INFO, st)
-#define sk_STORE_ATTR_INFO_pop_free(st, free_func) SKM_sk_pop_free(STORE_ATTR_INFO, (st), (free_func))
-#define sk_STORE_ATTR_INFO_shift(st) SKM_sk_shift(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_pop(st) SKM_sk_pop(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_sort(st) SKM_sk_sort(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_is_sorted(st) SKM_sk_is_sorted(STORE_ATTR_INFO, (st))
-
-#define sk_STORE_OBJECT_new(cmp) SKM_sk_new(STORE_OBJECT, (cmp))
-#define sk_STORE_OBJECT_new_null() SKM_sk_new_null(STORE_OBJECT)
-#define sk_STORE_OBJECT_free(st) SKM_sk_free(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_num(st) SKM_sk_num(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_value(st, i) SKM_sk_value(STORE_OBJECT, (st), (i))
-#define sk_STORE_OBJECT_set(st, i, val) SKM_sk_set(STORE_OBJECT, (st), (i), (val))
-#define sk_STORE_OBJECT_zero(st) SKM_sk_zero(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_push(st, val) SKM_sk_push(STORE_OBJECT, (st), (val))
-#define sk_STORE_OBJECT_unshift(st, val) SKM_sk_unshift(STORE_OBJECT, (st), (val))
-#define sk_STORE_OBJECT_find(st, val) SKM_sk_find(STORE_OBJECT, (st), (val))
-#define sk_STORE_OBJECT_find_ex(st, val) SKM_sk_find_ex(STORE_OBJECT, (st), (val))
-#define sk_STORE_OBJECT_delete(st, i) SKM_sk_delete(STORE_OBJECT, (st), (i))
-#define sk_STORE_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(STORE_OBJECT, (st), (ptr))
-#define sk_STORE_OBJECT_insert(st, val, i) SKM_sk_insert(STORE_OBJECT, (st), (val), (i))
-#define sk_STORE_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STORE_OBJECT, (st), (cmp))
-#define sk_STORE_OBJECT_dup(st) SKM_sk_dup(STORE_OBJECT, st)
-#define sk_STORE_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(STORE_OBJECT, (st), (free_func))
-#define sk_STORE_OBJECT_shift(st) SKM_sk_shift(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_pop(st) SKM_sk_pop(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_sort(st) SKM_sk_sort(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_is_sorted(st) SKM_sk_is_sorted(STORE_OBJECT, (st))
-
-#define sk_SXNETID_new(cmp) SKM_sk_new(SXNETID, (cmp))
-#define sk_SXNETID_new_null() SKM_sk_new_null(SXNETID)
-#define sk_SXNETID_free(st) SKM_sk_free(SXNETID, (st))
-#define sk_SXNETID_num(st) SKM_sk_num(SXNETID, (st))
-#define sk_SXNETID_value(st, i) SKM_sk_value(SXNETID, (st), (i))
-#define sk_SXNETID_set(st, i, val) SKM_sk_set(SXNETID, (st), (i), (val))
-#define sk_SXNETID_zero(st) SKM_sk_zero(SXNETID, (st))
-#define sk_SXNETID_push(st, val) SKM_sk_push(SXNETID, (st), (val))
-#define sk_SXNETID_unshift(st, val) SKM_sk_unshift(SXNETID, (st), (val))
-#define sk_SXNETID_find(st, val) SKM_sk_find(SXNETID, (st), (val))
-#define sk_SXNETID_find_ex(st, val) SKM_sk_find_ex(SXNETID, (st), (val))
-#define sk_SXNETID_delete(st, i) SKM_sk_delete(SXNETID, (st), (i))
-#define sk_SXNETID_delete_ptr(st, ptr) SKM_sk_delete_ptr(SXNETID, (st), (ptr))
-#define sk_SXNETID_insert(st, val, i) SKM_sk_insert(SXNETID, (st), (val), (i))
-#define sk_SXNETID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SXNETID, (st), (cmp))
-#define sk_SXNETID_dup(st) SKM_sk_dup(SXNETID, st)
-#define sk_SXNETID_pop_free(st, free_func) SKM_sk_pop_free(SXNETID, (st), (free_func))
-#define sk_SXNETID_shift(st) SKM_sk_shift(SXNETID, (st))
-#define sk_SXNETID_pop(st) SKM_sk_pop(SXNETID, (st))
-#define sk_SXNETID_sort(st) SKM_sk_sort(SXNETID, (st))
-#define sk_SXNETID_is_sorted(st) SKM_sk_is_sorted(SXNETID, (st))
-
-#define sk_UI_STRING_new(cmp) SKM_sk_new(UI_STRING, (cmp))
-#define sk_UI_STRING_new_null() SKM_sk_new_null(UI_STRING)
-#define sk_UI_STRING_free(st) SKM_sk_free(UI_STRING, (st))
-#define sk_UI_STRING_num(st) SKM_sk_num(UI_STRING, (st))
-#define sk_UI_STRING_value(st, i) SKM_sk_value(UI_STRING, (st), (i))
-#define sk_UI_STRING_set(st, i, val) SKM_sk_set(UI_STRING, (st), (i), (val))
-#define sk_UI_STRING_zero(st) SKM_sk_zero(UI_STRING, (st))
-#define sk_UI_STRING_push(st, val) SKM_sk_push(UI_STRING, (st), (val))
-#define sk_UI_STRING_unshift(st, val) SKM_sk_unshift(UI_STRING, (st), (val))
-#define sk_UI_STRING_find(st, val) SKM_sk_find(UI_STRING, (st), (val))
-#define sk_UI_STRING_find_ex(st, val) SKM_sk_find_ex(UI_STRING, (st), (val))
-#define sk_UI_STRING_delete(st, i) SKM_sk_delete(UI_STRING, (st), (i))
-#define sk_UI_STRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(UI_STRING, (st), (ptr))
-#define sk_UI_STRING_insert(st, val, i) SKM_sk_insert(UI_STRING, (st), (val), (i))
-#define sk_UI_STRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(UI_STRING, (st), (cmp))
-#define sk_UI_STRING_dup(st) SKM_sk_dup(UI_STRING, st)
-#define sk_UI_STRING_pop_free(st, free_func) SKM_sk_pop_free(UI_STRING, (st), (free_func))
-#define sk_UI_STRING_shift(st) SKM_sk_shift(UI_STRING, (st))
-#define sk_UI_STRING_pop(st) SKM_sk_pop(UI_STRING, (st))
-#define sk_UI_STRING_sort(st) SKM_sk_sort(UI_STRING, (st))
-#define sk_UI_STRING_is_sorted(st) SKM_sk_is_sorted(UI_STRING, (st))
-
-#define sk_X509_new(cmp) SKM_sk_new(X509, (cmp))
-#define sk_X509_new_null() SKM_sk_new_null(X509)
-#define sk_X509_free(st) SKM_sk_free(X509, (st))
-#define sk_X509_num(st) SKM_sk_num(X509, (st))
-#define sk_X509_value(st, i) SKM_sk_value(X509, (st), (i))
-#define sk_X509_set(st, i, val) SKM_sk_set(X509, (st), (i), (val))
-#define sk_X509_zero(st) SKM_sk_zero(X509, (st))
-#define sk_X509_push(st, val) SKM_sk_push(X509, (st), (val))
-#define sk_X509_unshift(st, val) SKM_sk_unshift(X509, (st), (val))
-#define sk_X509_find(st, val) SKM_sk_find(X509, (st), (val))
-#define sk_X509_find_ex(st, val) SKM_sk_find_ex(X509, (st), (val))
-#define sk_X509_delete(st, i) SKM_sk_delete(X509, (st), (i))
-#define sk_X509_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509, (st), (ptr))
-#define sk_X509_insert(st, val, i) SKM_sk_insert(X509, (st), (val), (i))
-#define sk_X509_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509, (st), (cmp))
-#define sk_X509_dup(st) SKM_sk_dup(X509, st)
-#define sk_X509_pop_free(st, free_func) SKM_sk_pop_free(X509, (st), (free_func))
-#define sk_X509_shift(st) SKM_sk_shift(X509, (st))
-#define sk_X509_pop(st) SKM_sk_pop(X509, (st))
-#define sk_X509_sort(st) SKM_sk_sort(X509, (st))
-#define sk_X509_is_sorted(st) SKM_sk_is_sorted(X509, (st))
-
-#define sk_X509V3_EXT_METHOD_new(cmp) SKM_sk_new(X509V3_EXT_METHOD, (cmp))
-#define sk_X509V3_EXT_METHOD_new_null() SKM_sk_new_null(X509V3_EXT_METHOD)
-#define sk_X509V3_EXT_METHOD_free(st) SKM_sk_free(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_num(st) SKM_sk_num(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_value(st, i) SKM_sk_value(X509V3_EXT_METHOD, (st), (i))
-#define sk_X509V3_EXT_METHOD_set(st, i, val) SKM_sk_set(X509V3_EXT_METHOD, (st), (i), (val))
-#define sk_X509V3_EXT_METHOD_zero(st) SKM_sk_zero(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_push(st, val) SKM_sk_push(X509V3_EXT_METHOD, (st), (val))
-#define sk_X509V3_EXT_METHOD_unshift(st, val) SKM_sk_unshift(X509V3_EXT_METHOD, (st), (val))
-#define sk_X509V3_EXT_METHOD_find(st, val) SKM_sk_find(X509V3_EXT_METHOD, (st), (val))
-#define sk_X509V3_EXT_METHOD_find_ex(st, val) SKM_sk_find_ex(X509V3_EXT_METHOD, (st), (val))
-#define sk_X509V3_EXT_METHOD_delete(st, i) SKM_sk_delete(X509V3_EXT_METHOD, (st), (i))
-#define sk_X509V3_EXT_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509V3_EXT_METHOD, (st), (ptr))
-#define sk_X509V3_EXT_METHOD_insert(st, val, i) SKM_sk_insert(X509V3_EXT_METHOD, (st), (val), (i))
-#define sk_X509V3_EXT_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509V3_EXT_METHOD, (st), (cmp))
-#define sk_X509V3_EXT_METHOD_dup(st) SKM_sk_dup(X509V3_EXT_METHOD, st)
-#define sk_X509V3_EXT_METHOD_pop_free(st, free_func) SKM_sk_pop_free(X509V3_EXT_METHOD, (st), (free_func))
-#define sk_X509V3_EXT_METHOD_shift(st) SKM_sk_shift(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_pop(st) SKM_sk_pop(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_sort(st) SKM_sk_sort(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_is_sorted(st) SKM_sk_is_sorted(X509V3_EXT_METHOD, (st))
-
-#define sk_X509_ALGOR_new(cmp) SKM_sk_new(X509_ALGOR, (cmp))
-#define sk_X509_ALGOR_new_null() SKM_sk_new_null(X509_ALGOR)
-#define sk_X509_ALGOR_free(st) SKM_sk_free(X509_ALGOR, (st))
-#define sk_X509_ALGOR_num(st) SKM_sk_num(X509_ALGOR, (st))
-#define sk_X509_ALGOR_value(st, i) SKM_sk_value(X509_ALGOR, (st), (i))
-#define sk_X509_ALGOR_set(st, i, val) SKM_sk_set(X509_ALGOR, (st), (i), (val))
-#define sk_X509_ALGOR_zero(st) SKM_sk_zero(X509_ALGOR, (st))
-#define sk_X509_ALGOR_push(st, val) SKM_sk_push(X509_ALGOR, (st), (val))
-#define sk_X509_ALGOR_unshift(st, val) SKM_sk_unshift(X509_ALGOR, (st), (val))
-#define sk_X509_ALGOR_find(st, val) SKM_sk_find(X509_ALGOR, (st), (val))
-#define sk_X509_ALGOR_find_ex(st, val) SKM_sk_find_ex(X509_ALGOR, (st), (val))
-#define sk_X509_ALGOR_delete(st, i) SKM_sk_delete(X509_ALGOR, (st), (i))
-#define sk_X509_ALGOR_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_ALGOR, (st), (ptr))
-#define sk_X509_ALGOR_insert(st, val, i) SKM_sk_insert(X509_ALGOR, (st), (val), (i))
-#define sk_X509_ALGOR_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_ALGOR, (st), (cmp))
-#define sk_X509_ALGOR_dup(st) SKM_sk_dup(X509_ALGOR, st)
-#define sk_X509_ALGOR_pop_free(st, free_func) SKM_sk_pop_free(X509_ALGOR, (st), (free_func))
-#define sk_X509_ALGOR_shift(st) SKM_sk_shift(X509_ALGOR, (st))
-#define sk_X509_ALGOR_pop(st) SKM_sk_pop(X509_ALGOR, (st))
-#define sk_X509_ALGOR_sort(st) SKM_sk_sort(X509_ALGOR, (st))
-#define sk_X509_ALGOR_is_sorted(st) SKM_sk_is_sorted(X509_ALGOR, (st))
-
-#define sk_X509_ATTRIBUTE_new(cmp) SKM_sk_new(X509_ATTRIBUTE, (cmp))
-#define sk_X509_ATTRIBUTE_new_null() SKM_sk_new_null(X509_ATTRIBUTE)
-#define sk_X509_ATTRIBUTE_free(st) SKM_sk_free(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_num(st) SKM_sk_num(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_value(st, i) SKM_sk_value(X509_ATTRIBUTE, (st), (i))
-#define sk_X509_ATTRIBUTE_set(st, i, val) SKM_sk_set(X509_ATTRIBUTE, (st), (i), (val))
-#define sk_X509_ATTRIBUTE_zero(st) SKM_sk_zero(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_push(st, val) SKM_sk_push(X509_ATTRIBUTE, (st), (val))
-#define sk_X509_ATTRIBUTE_unshift(st, val) SKM_sk_unshift(X509_ATTRIBUTE, (st), (val))
-#define sk_X509_ATTRIBUTE_find(st, val) SKM_sk_find(X509_ATTRIBUTE, (st), (val))
-#define sk_X509_ATTRIBUTE_find_ex(st, val) SKM_sk_find_ex(X509_ATTRIBUTE, (st), (val))
-#define sk_X509_ATTRIBUTE_delete(st, i) SKM_sk_delete(X509_ATTRIBUTE, (st), (i))
-#define sk_X509_ATTRIBUTE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_ATTRIBUTE, (st), (ptr))
-#define sk_X509_ATTRIBUTE_insert(st, val, i) SKM_sk_insert(X509_ATTRIBUTE, (st), (val), (i))
-#define sk_X509_ATTRIBUTE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_ATTRIBUTE, (st), (cmp))
-#define sk_X509_ATTRIBUTE_dup(st) SKM_sk_dup(X509_ATTRIBUTE, st)
-#define sk_X509_ATTRIBUTE_pop_free(st, free_func) SKM_sk_pop_free(X509_ATTRIBUTE, (st), (free_func))
-#define sk_X509_ATTRIBUTE_shift(st) SKM_sk_shift(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_pop(st) SKM_sk_pop(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_sort(st) SKM_sk_sort(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_is_sorted(st) SKM_sk_is_sorted(X509_ATTRIBUTE, (st))
-
-#define sk_X509_CRL_new(cmp) SKM_sk_new(X509_CRL, (cmp))
-#define sk_X509_CRL_new_null() SKM_sk_new_null(X509_CRL)
-#define sk_X509_CRL_free(st) SKM_sk_free(X509_CRL, (st))
-#define sk_X509_CRL_num(st) SKM_sk_num(X509_CRL, (st))
-#define sk_X509_CRL_value(st, i) SKM_sk_value(X509_CRL, (st), (i))
-#define sk_X509_CRL_set(st, i, val) SKM_sk_set(X509_CRL, (st), (i), (val))
-#define sk_X509_CRL_zero(st) SKM_sk_zero(X509_CRL, (st))
-#define sk_X509_CRL_push(st, val) SKM_sk_push(X509_CRL, (st), (val))
-#define sk_X509_CRL_unshift(st, val) SKM_sk_unshift(X509_CRL, (st), (val))
-#define sk_X509_CRL_find(st, val) SKM_sk_find(X509_CRL, (st), (val))
-#define sk_X509_CRL_find_ex(st, val) SKM_sk_find_ex(X509_CRL, (st), (val))
-#define sk_X509_CRL_delete(st, i) SKM_sk_delete(X509_CRL, (st), (i))
-#define sk_X509_CRL_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_CRL, (st), (ptr))
-#define sk_X509_CRL_insert(st, val, i) SKM_sk_insert(X509_CRL, (st), (val), (i))
-#define sk_X509_CRL_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_CRL, (st), (cmp))
-#define sk_X509_CRL_dup(st) SKM_sk_dup(X509_CRL, st)
-#define sk_X509_CRL_pop_free(st, free_func) SKM_sk_pop_free(X509_CRL, (st), (free_func))
-#define sk_X509_CRL_shift(st) SKM_sk_shift(X509_CRL, (st))
-#define sk_X509_CRL_pop(st) SKM_sk_pop(X509_CRL, (st))
-#define sk_X509_CRL_sort(st) SKM_sk_sort(X509_CRL, (st))
-#define sk_X509_CRL_is_sorted(st) SKM_sk_is_sorted(X509_CRL, (st))
-
-#define sk_X509_EXTENSION_new(cmp) SKM_sk_new(X509_EXTENSION, (cmp))
-#define sk_X509_EXTENSION_new_null() SKM_sk_new_null(X509_EXTENSION)
-#define sk_X509_EXTENSION_free(st) SKM_sk_free(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_num(st) SKM_sk_num(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_value(st, i) SKM_sk_value(X509_EXTENSION, (st), (i))
-#define sk_X509_EXTENSION_set(st, i, val) SKM_sk_set(X509_EXTENSION, (st), (i), (val))
-#define sk_X509_EXTENSION_zero(st) SKM_sk_zero(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_push(st, val) SKM_sk_push(X509_EXTENSION, (st), (val))
-#define sk_X509_EXTENSION_unshift(st, val) SKM_sk_unshift(X509_EXTENSION, (st), (val))
-#define sk_X509_EXTENSION_find(st, val) SKM_sk_find(X509_EXTENSION, (st), (val))
-#define sk_X509_EXTENSION_find_ex(st, val) SKM_sk_find_ex(X509_EXTENSION, (st), (val))
-#define sk_X509_EXTENSION_delete(st, i) SKM_sk_delete(X509_EXTENSION, (st), (i))
-#define sk_X509_EXTENSION_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_EXTENSION, (st), (ptr))
-#define sk_X509_EXTENSION_insert(st, val, i) SKM_sk_insert(X509_EXTENSION, (st), (val), (i))
-#define sk_X509_EXTENSION_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_EXTENSION, (st), (cmp))
-#define sk_X509_EXTENSION_dup(st) SKM_sk_dup(X509_EXTENSION, st)
-#define sk_X509_EXTENSION_pop_free(st, free_func) SKM_sk_pop_free(X509_EXTENSION, (st), (free_func))
-#define sk_X509_EXTENSION_shift(st) SKM_sk_shift(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_pop(st) SKM_sk_pop(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_sort(st) SKM_sk_sort(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_is_sorted(st) SKM_sk_is_sorted(X509_EXTENSION, (st))
-
-#define sk_X509_INFO_new(cmp) SKM_sk_new(X509_INFO, (cmp))
-#define sk_X509_INFO_new_null() SKM_sk_new_null(X509_INFO)
-#define sk_X509_INFO_free(st) SKM_sk_free(X509_INFO, (st))
-#define sk_X509_INFO_num(st) SKM_sk_num(X509_INFO, (st))
-#define sk_X509_INFO_value(st, i) SKM_sk_value(X509_INFO, (st), (i))
-#define sk_X509_INFO_set(st, i, val) SKM_sk_set(X509_INFO, (st), (i), (val))
-#define sk_X509_INFO_zero(st) SKM_sk_zero(X509_INFO, (st))
-#define sk_X509_INFO_push(st, val) SKM_sk_push(X509_INFO, (st), (val))
-#define sk_X509_INFO_unshift(st, val) SKM_sk_unshift(X509_INFO, (st), (val))
-#define sk_X509_INFO_find(st, val) SKM_sk_find(X509_INFO, (st), (val))
-#define sk_X509_INFO_find_ex(st, val) SKM_sk_find_ex(X509_INFO, (st), (val))
-#define sk_X509_INFO_delete(st, i) SKM_sk_delete(X509_INFO, (st), (i))
-#define sk_X509_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_INFO, (st), (ptr))
-#define sk_X509_INFO_insert(st, val, i) SKM_sk_insert(X509_INFO, (st), (val), (i))
-#define sk_X509_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_INFO, (st), (cmp))
-#define sk_X509_INFO_dup(st) SKM_sk_dup(X509_INFO, st)
-#define sk_X509_INFO_pop_free(st, free_func) SKM_sk_pop_free(X509_INFO, (st), (free_func))
-#define sk_X509_INFO_shift(st) SKM_sk_shift(X509_INFO, (st))
-#define sk_X509_INFO_pop(st) SKM_sk_pop(X509_INFO, (st))
-#define sk_X509_INFO_sort(st) SKM_sk_sort(X509_INFO, (st))
-#define sk_X509_INFO_is_sorted(st) SKM_sk_is_sorted(X509_INFO, (st))
-
-#define sk_X509_LOOKUP_new(cmp) SKM_sk_new(X509_LOOKUP, (cmp))
-#define sk_X509_LOOKUP_new_null() SKM_sk_new_null(X509_LOOKUP)
-#define sk_X509_LOOKUP_free(st) SKM_sk_free(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_num(st) SKM_sk_num(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_value(st, i) SKM_sk_value(X509_LOOKUP, (st), (i))
-#define sk_X509_LOOKUP_set(st, i, val) SKM_sk_set(X509_LOOKUP, (st), (i), (val))
-#define sk_X509_LOOKUP_zero(st) SKM_sk_zero(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_push(st, val) SKM_sk_push(X509_LOOKUP, (st), (val))
-#define sk_X509_LOOKUP_unshift(st, val) SKM_sk_unshift(X509_LOOKUP, (st), (val))
-#define sk_X509_LOOKUP_find(st, val) SKM_sk_find(X509_LOOKUP, (st), (val))
-#define sk_X509_LOOKUP_find_ex(st, val) SKM_sk_find_ex(X509_LOOKUP, (st), (val))
-#define sk_X509_LOOKUP_delete(st, i) SKM_sk_delete(X509_LOOKUP, (st), (i))
-#define sk_X509_LOOKUP_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_LOOKUP, (st), (ptr))
-#define sk_X509_LOOKUP_insert(st, val, i) SKM_sk_insert(X509_LOOKUP, (st), (val), (i))
-#define sk_X509_LOOKUP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_LOOKUP, (st), (cmp))
-#define sk_X509_LOOKUP_dup(st) SKM_sk_dup(X509_LOOKUP, st)
-#define sk_X509_LOOKUP_pop_free(st, free_func) SKM_sk_pop_free(X509_LOOKUP, (st), (free_func))
-#define sk_X509_LOOKUP_shift(st) SKM_sk_shift(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_pop(st) SKM_sk_pop(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_sort(st) SKM_sk_sort(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_is_sorted(st) SKM_sk_is_sorted(X509_LOOKUP, (st))
-
-#define sk_X509_NAME_new(cmp) SKM_sk_new(X509_NAME, (cmp))
-#define sk_X509_NAME_new_null() SKM_sk_new_null(X509_NAME)
-#define sk_X509_NAME_free(st) SKM_sk_free(X509_NAME, (st))
-#define sk_X509_NAME_num(st) SKM_sk_num(X509_NAME, (st))
-#define sk_X509_NAME_value(st, i) SKM_sk_value(X509_NAME, (st), (i))
-#define sk_X509_NAME_set(st, i, val) SKM_sk_set(X509_NAME, (st), (i), (val))
-#define sk_X509_NAME_zero(st) SKM_sk_zero(X509_NAME, (st))
-#define sk_X509_NAME_push(st, val) SKM_sk_push(X509_NAME, (st), (val))
-#define sk_X509_NAME_unshift(st, val) SKM_sk_unshift(X509_NAME, (st), (val))
-#define sk_X509_NAME_find(st, val) SKM_sk_find(X509_NAME, (st), (val))
-#define sk_X509_NAME_find_ex(st, val) SKM_sk_find_ex(X509_NAME, (st), (val))
-#define sk_X509_NAME_delete(st, i) SKM_sk_delete(X509_NAME, (st), (i))
-#define sk_X509_NAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_NAME, (st), (ptr))
-#define sk_X509_NAME_insert(st, val, i) SKM_sk_insert(X509_NAME, (st), (val), (i))
-#define sk_X509_NAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_NAME, (st), (cmp))
-#define sk_X509_NAME_dup(st) SKM_sk_dup(X509_NAME, st)
-#define sk_X509_NAME_pop_free(st, free_func) SKM_sk_pop_free(X509_NAME, (st), (free_func))
-#define sk_X509_NAME_shift(st) SKM_sk_shift(X509_NAME, (st))
-#define sk_X509_NAME_pop(st) SKM_sk_pop(X509_NAME, (st))
-#define sk_X509_NAME_sort(st) SKM_sk_sort(X509_NAME, (st))
-#define sk_X509_NAME_is_sorted(st) SKM_sk_is_sorted(X509_NAME, (st))
-
-#define sk_X509_NAME_ENTRY_new(cmp) SKM_sk_new(X509_NAME_ENTRY, (cmp))
-#define sk_X509_NAME_ENTRY_new_null() SKM_sk_new_null(X509_NAME_ENTRY)
-#define sk_X509_NAME_ENTRY_free(st) SKM_sk_free(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_num(st) SKM_sk_num(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_value(st, i) SKM_sk_value(X509_NAME_ENTRY, (st), (i))
-#define sk_X509_NAME_ENTRY_set(st, i, val) SKM_sk_set(X509_NAME_ENTRY, (st), (i), (val))
-#define sk_X509_NAME_ENTRY_zero(st) SKM_sk_zero(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_push(st, val) SKM_sk_push(X509_NAME_ENTRY, (st), (val))
-#define sk_X509_NAME_ENTRY_unshift(st, val) SKM_sk_unshift(X509_NAME_ENTRY, (st), (val))
-#define sk_X509_NAME_ENTRY_find(st, val) SKM_sk_find(X509_NAME_ENTRY, (st), (val))
-#define sk_X509_NAME_ENTRY_find_ex(st, val) SKM_sk_find_ex(X509_NAME_ENTRY, (st), (val))
-#define sk_X509_NAME_ENTRY_delete(st, i) SKM_sk_delete(X509_NAME_ENTRY, (st), (i))
-#define sk_X509_NAME_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_NAME_ENTRY, (st), (ptr))
-#define sk_X509_NAME_ENTRY_insert(st, val, i) SKM_sk_insert(X509_NAME_ENTRY, (st), (val), (i))
-#define sk_X509_NAME_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_NAME_ENTRY, (st), (cmp))
-#define sk_X509_NAME_ENTRY_dup(st) SKM_sk_dup(X509_NAME_ENTRY, st)
-#define sk_X509_NAME_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(X509_NAME_ENTRY, (st), (free_func))
-#define sk_X509_NAME_ENTRY_shift(st) SKM_sk_shift(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_pop(st) SKM_sk_pop(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_sort(st) SKM_sk_sort(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_is_sorted(st) SKM_sk_is_sorted(X509_NAME_ENTRY, (st))
-
-#define sk_X509_OBJECT_new(cmp) SKM_sk_new(X509_OBJECT, (cmp))
-#define sk_X509_OBJECT_new_null() SKM_sk_new_null(X509_OBJECT)
-#define sk_X509_OBJECT_free(st) SKM_sk_free(X509_OBJECT, (st))
-#define sk_X509_OBJECT_num(st) SKM_sk_num(X509_OBJECT, (st))
-#define sk_X509_OBJECT_value(st, i) SKM_sk_value(X509_OBJECT, (st), (i))
-#define sk_X509_OBJECT_set(st, i, val) SKM_sk_set(X509_OBJECT, (st), (i), (val))
-#define sk_X509_OBJECT_zero(st) SKM_sk_zero(X509_OBJECT, (st))
-#define sk_X509_OBJECT_push(st, val) SKM_sk_push(X509_OBJECT, (st), (val))
-#define sk_X509_OBJECT_unshift(st, val) SKM_sk_unshift(X509_OBJECT, (st), (val))
-#define sk_X509_OBJECT_find(st, val) SKM_sk_find(X509_OBJECT, (st), (val))
-#define sk_X509_OBJECT_find_ex(st, val) SKM_sk_find_ex(X509_OBJECT, (st), (val))
-#define sk_X509_OBJECT_delete(st, i) SKM_sk_delete(X509_OBJECT, (st), (i))
-#define sk_X509_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_OBJECT, (st), (ptr))
-#define sk_X509_OBJECT_insert(st, val, i) SKM_sk_insert(X509_OBJECT, (st), (val), (i))
-#define sk_X509_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_OBJECT, (st), (cmp))
-#define sk_X509_OBJECT_dup(st) SKM_sk_dup(X509_OBJECT, st)
-#define sk_X509_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(X509_OBJECT, (st), (free_func))
-#define sk_X509_OBJECT_shift(st) SKM_sk_shift(X509_OBJECT, (st))
-#define sk_X509_OBJECT_pop(st) SKM_sk_pop(X509_OBJECT, (st))
-#define sk_X509_OBJECT_sort(st) SKM_sk_sort(X509_OBJECT, (st))
-#define sk_X509_OBJECT_is_sorted(st) SKM_sk_is_sorted(X509_OBJECT, (st))
-
-#define sk_X509_POLICY_DATA_new(cmp) SKM_sk_new(X509_POLICY_DATA, (cmp))
-#define sk_X509_POLICY_DATA_new_null() SKM_sk_new_null(X509_POLICY_DATA)
-#define sk_X509_POLICY_DATA_free(st) SKM_sk_free(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_num(st) SKM_sk_num(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_value(st, i) SKM_sk_value(X509_POLICY_DATA, (st), (i))
-#define sk_X509_POLICY_DATA_set(st, i, val) SKM_sk_set(X509_POLICY_DATA, (st), (i), (val))
-#define sk_X509_POLICY_DATA_zero(st) SKM_sk_zero(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_push(st, val) SKM_sk_push(X509_POLICY_DATA, (st), (val))
-#define sk_X509_POLICY_DATA_unshift(st, val) SKM_sk_unshift(X509_POLICY_DATA, (st), (val))
-#define sk_X509_POLICY_DATA_find(st, val) SKM_sk_find(X509_POLICY_DATA, (st), (val))
-#define sk_X509_POLICY_DATA_find_ex(st, val) SKM_sk_find_ex(X509_POLICY_DATA, (st), (val))
-#define sk_X509_POLICY_DATA_delete(st, i) SKM_sk_delete(X509_POLICY_DATA, (st), (i))
-#define sk_X509_POLICY_DATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_POLICY_DATA, (st), (ptr))
-#define sk_X509_POLICY_DATA_insert(st, val, i) SKM_sk_insert(X509_POLICY_DATA, (st), (val), (i))
-#define sk_X509_POLICY_DATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_POLICY_DATA, (st), (cmp))
-#define sk_X509_POLICY_DATA_dup(st) SKM_sk_dup(X509_POLICY_DATA, st)
-#define sk_X509_POLICY_DATA_pop_free(st, free_func) SKM_sk_pop_free(X509_POLICY_DATA, (st), (free_func))
-#define sk_X509_POLICY_DATA_shift(st) SKM_sk_shift(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_pop(st) SKM_sk_pop(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_sort(st) SKM_sk_sort(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_is_sorted(st) SKM_sk_is_sorted(X509_POLICY_DATA, (st))
-
-#define sk_X509_POLICY_NODE_new(cmp) SKM_sk_new(X509_POLICY_NODE, (cmp))
-#define sk_X509_POLICY_NODE_new_null() SKM_sk_new_null(X509_POLICY_NODE)
-#define sk_X509_POLICY_NODE_free(st) SKM_sk_free(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_num(st) SKM_sk_num(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_value(st, i) SKM_sk_value(X509_POLICY_NODE, (st), (i))
-#define sk_X509_POLICY_NODE_set(st, i, val) SKM_sk_set(X509_POLICY_NODE, (st), (i), (val))
-#define sk_X509_POLICY_NODE_zero(st) SKM_sk_zero(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_push(st, val) SKM_sk_push(X509_POLICY_NODE, (st), (val))
-#define sk_X509_POLICY_NODE_unshift(st, val) SKM_sk_unshift(X509_POLICY_NODE, (st), (val))
-#define sk_X509_POLICY_NODE_find(st, val) SKM_sk_find(X509_POLICY_NODE, (st), (val))
-#define sk_X509_POLICY_NODE_find_ex(st, val) SKM_sk_find_ex(X509_POLICY_NODE, (st), (val))
-#define sk_X509_POLICY_NODE_delete(st, i) SKM_sk_delete(X509_POLICY_NODE, (st), (i))
-#define sk_X509_POLICY_NODE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_POLICY_NODE, (st), (ptr))
-#define sk_X509_POLICY_NODE_insert(st, val, i) SKM_sk_insert(X509_POLICY_NODE, (st), (val), (i))
-#define sk_X509_POLICY_NODE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_POLICY_NODE, (st), (cmp))
-#define sk_X509_POLICY_NODE_dup(st) SKM_sk_dup(X509_POLICY_NODE, st)
-#define sk_X509_POLICY_NODE_pop_free(st, free_func) SKM_sk_pop_free(X509_POLICY_NODE, (st), (free_func))
-#define sk_X509_POLICY_NODE_shift(st) SKM_sk_shift(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_pop(st) SKM_sk_pop(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_sort(st) SKM_sk_sort(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_is_sorted(st) SKM_sk_is_sorted(X509_POLICY_NODE, (st))
-
-#define sk_X509_PURPOSE_new(cmp) SKM_sk_new(X509_PURPOSE, (cmp))
-#define sk_X509_PURPOSE_new_null() SKM_sk_new_null(X509_PURPOSE)
-#define sk_X509_PURPOSE_free(st) SKM_sk_free(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_num(st) SKM_sk_num(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_value(st, i) SKM_sk_value(X509_PURPOSE, (st), (i))
-#define sk_X509_PURPOSE_set(st, i, val) SKM_sk_set(X509_PURPOSE, (st), (i), (val))
-#define sk_X509_PURPOSE_zero(st) SKM_sk_zero(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_push(st, val) SKM_sk_push(X509_PURPOSE, (st), (val))
-#define sk_X509_PURPOSE_unshift(st, val) SKM_sk_unshift(X509_PURPOSE, (st), (val))
-#define sk_X509_PURPOSE_find(st, val) SKM_sk_find(X509_PURPOSE, (st), (val))
-#define sk_X509_PURPOSE_find_ex(st, val) SKM_sk_find_ex(X509_PURPOSE, (st), (val))
-#define sk_X509_PURPOSE_delete(st, i) SKM_sk_delete(X509_PURPOSE, (st), (i))
-#define sk_X509_PURPOSE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_PURPOSE, (st), (ptr))
-#define sk_X509_PURPOSE_insert(st, val, i) SKM_sk_insert(X509_PURPOSE, (st), (val), (i))
-#define sk_X509_PURPOSE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_PURPOSE, (st), (cmp))
-#define sk_X509_PURPOSE_dup(st) SKM_sk_dup(X509_PURPOSE, st)
-#define sk_X509_PURPOSE_pop_free(st, free_func) SKM_sk_pop_free(X509_PURPOSE, (st), (free_func))
-#define sk_X509_PURPOSE_shift(st) SKM_sk_shift(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_pop(st) SKM_sk_pop(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_sort(st) SKM_sk_sort(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_is_sorted(st) SKM_sk_is_sorted(X509_PURPOSE, (st))
-
-#define sk_X509_REVOKED_new(cmp) SKM_sk_new(X509_REVOKED, (cmp))
-#define sk_X509_REVOKED_new_null() SKM_sk_new_null(X509_REVOKED)
-#define sk_X509_REVOKED_free(st) SKM_sk_free(X509_REVOKED, (st))
-#define sk_X509_REVOKED_num(st) SKM_sk_num(X509_REVOKED, (st))
-#define sk_X509_REVOKED_value(st, i) SKM_sk_value(X509_REVOKED, (st), (i))
-#define sk_X509_REVOKED_set(st, i, val) SKM_sk_set(X509_REVOKED, (st), (i), (val))
-#define sk_X509_REVOKED_zero(st) SKM_sk_zero(X509_REVOKED, (st))
-#define sk_X509_REVOKED_push(st, val) SKM_sk_push(X509_REVOKED, (st), (val))
-#define sk_X509_REVOKED_unshift(st, val) SKM_sk_unshift(X509_REVOKED, (st), (val))
-#define sk_X509_REVOKED_find(st, val) SKM_sk_find(X509_REVOKED, (st), (val))
-#define sk_X509_REVOKED_find_ex(st, val) SKM_sk_find_ex(X509_REVOKED, (st), (val))
-#define sk_X509_REVOKED_delete(st, i) SKM_sk_delete(X509_REVOKED, (st), (i))
-#define sk_X509_REVOKED_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_REVOKED, (st), (ptr))
-#define sk_X509_REVOKED_insert(st, val, i) SKM_sk_insert(X509_REVOKED, (st), (val), (i))
-#define sk_X509_REVOKED_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_REVOKED, (st), (cmp))
-#define sk_X509_REVOKED_dup(st) SKM_sk_dup(X509_REVOKED, st)
-#define sk_X509_REVOKED_pop_free(st, free_func) SKM_sk_pop_free(X509_REVOKED, (st), (free_func))
-#define sk_X509_REVOKED_shift(st) SKM_sk_shift(X509_REVOKED, (st))
-#define sk_X509_REVOKED_pop(st) SKM_sk_pop(X509_REVOKED, (st))
-#define sk_X509_REVOKED_sort(st) SKM_sk_sort(X509_REVOKED, (st))
-#define sk_X509_REVOKED_is_sorted(st) SKM_sk_is_sorted(X509_REVOKED, (st))
-
-#define sk_X509_TRUST_new(cmp) SKM_sk_new(X509_TRUST, (cmp))
-#define sk_X509_TRUST_new_null() SKM_sk_new_null(X509_TRUST)
-#define sk_X509_TRUST_free(st) SKM_sk_free(X509_TRUST, (st))
-#define sk_X509_TRUST_num(st) SKM_sk_num(X509_TRUST, (st))
-#define sk_X509_TRUST_value(st, i) SKM_sk_value(X509_TRUST, (st), (i))
-#define sk_X509_TRUST_set(st, i, val) SKM_sk_set(X509_TRUST, (st), (i), (val))
-#define sk_X509_TRUST_zero(st) SKM_sk_zero(X509_TRUST, (st))
-#define sk_X509_TRUST_push(st, val) SKM_sk_push(X509_TRUST, (st), (val))
-#define sk_X509_TRUST_unshift(st, val) SKM_sk_unshift(X509_TRUST, (st), (val))
-#define sk_X509_TRUST_find(st, val) SKM_sk_find(X509_TRUST, (st), (val))
-#define sk_X509_TRUST_find_ex(st, val) SKM_sk_find_ex(X509_TRUST, (st), (val))
-#define sk_X509_TRUST_delete(st, i) SKM_sk_delete(X509_TRUST, (st), (i))
-#define sk_X509_TRUST_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_TRUST, (st), (ptr))
-#define sk_X509_TRUST_insert(st, val, i) SKM_sk_insert(X509_TRUST, (st), (val), (i))
-#define sk_X509_TRUST_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_TRUST, (st), (cmp))
-#define sk_X509_TRUST_dup(st) SKM_sk_dup(X509_TRUST, st)
-#define sk_X509_TRUST_pop_free(st, free_func) SKM_sk_pop_free(X509_TRUST, (st), (free_func))
-#define sk_X509_TRUST_shift(st) SKM_sk_shift(X509_TRUST, (st))
-#define sk_X509_TRUST_pop(st) SKM_sk_pop(X509_TRUST, (st))
-#define sk_X509_TRUST_sort(st) SKM_sk_sort(X509_TRUST, (st))
-#define sk_X509_TRUST_is_sorted(st) SKM_sk_is_sorted(X509_TRUST, (st))
-
-#define sk_X509_VERIFY_PARAM_new(cmp) SKM_sk_new(X509_VERIFY_PARAM, (cmp))
-#define sk_X509_VERIFY_PARAM_new_null() SKM_sk_new_null(X509_VERIFY_PARAM)
-#define sk_X509_VERIFY_PARAM_free(st) SKM_sk_free(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_num(st) SKM_sk_num(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_value(st, i) SKM_sk_value(X509_VERIFY_PARAM, (st), (i))
-#define sk_X509_VERIFY_PARAM_set(st, i, val) SKM_sk_set(X509_VERIFY_PARAM, (st), (i), (val))
-#define sk_X509_VERIFY_PARAM_zero(st) SKM_sk_zero(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_push(st, val) SKM_sk_push(X509_VERIFY_PARAM, (st), (val))
-#define sk_X509_VERIFY_PARAM_unshift(st, val) SKM_sk_unshift(X509_VERIFY_PARAM, (st), (val))
-#define sk_X509_VERIFY_PARAM_find(st, val) SKM_sk_find(X509_VERIFY_PARAM, (st), (val))
-#define sk_X509_VERIFY_PARAM_find_ex(st, val) SKM_sk_find_ex(X509_VERIFY_PARAM, (st), (val))
-#define sk_X509_VERIFY_PARAM_delete(st, i) SKM_sk_delete(X509_VERIFY_PARAM, (st), (i))
-#define sk_X509_VERIFY_PARAM_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_VERIFY_PARAM, (st), (ptr))
-#define sk_X509_VERIFY_PARAM_insert(st, val, i) SKM_sk_insert(X509_VERIFY_PARAM, (st), (val), (i))
-#define sk_X509_VERIFY_PARAM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_VERIFY_PARAM, (st), (cmp))
-#define sk_X509_VERIFY_PARAM_dup(st) SKM_sk_dup(X509_VERIFY_PARAM, st)
-#define sk_X509_VERIFY_PARAM_pop_free(st, free_func) SKM_sk_pop_free(X509_VERIFY_PARAM, (st), (free_func))
-#define sk_X509_VERIFY_PARAM_shift(st) SKM_sk_shift(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_pop(st) SKM_sk_pop(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_sort(st) SKM_sk_sort(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_is_sorted(st) SKM_sk_is_sorted(X509_VERIFY_PARAM, (st))
-
-#define sk_nid_triple_new(cmp) SKM_sk_new(nid_triple, (cmp))
-#define sk_nid_triple_new_null() SKM_sk_new_null(nid_triple)
-#define sk_nid_triple_free(st) SKM_sk_free(nid_triple, (st))
-#define sk_nid_triple_num(st) SKM_sk_num(nid_triple, (st))
-#define sk_nid_triple_value(st, i) SKM_sk_value(nid_triple, (st), (i))
-#define sk_nid_triple_set(st, i, val) SKM_sk_set(nid_triple, (st), (i), (val))
-#define sk_nid_triple_zero(st) SKM_sk_zero(nid_triple, (st))
-#define sk_nid_triple_push(st, val) SKM_sk_push(nid_triple, (st), (val))
-#define sk_nid_triple_unshift(st, val) SKM_sk_unshift(nid_triple, (st), (val))
-#define sk_nid_triple_find(st, val) SKM_sk_find(nid_triple, (st), (val))
-#define sk_nid_triple_find_ex(st, val) SKM_sk_find_ex(nid_triple, (st), (val))
-#define sk_nid_triple_delete(st, i) SKM_sk_delete(nid_triple, (st), (i))
-#define sk_nid_triple_delete_ptr(st, ptr) SKM_sk_delete_ptr(nid_triple, (st), (ptr))
-#define sk_nid_triple_insert(st, val, i) SKM_sk_insert(nid_triple, (st), (val), (i))
-#define sk_nid_triple_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(nid_triple, (st), (cmp))
-#define sk_nid_triple_dup(st) SKM_sk_dup(nid_triple, st)
-#define sk_nid_triple_pop_free(st, free_func) SKM_sk_pop_free(nid_triple, (st), (free_func))
-#define sk_nid_triple_shift(st) SKM_sk_shift(nid_triple, (st))
-#define sk_nid_triple_pop(st) SKM_sk_pop(nid_triple, (st))
-#define sk_nid_triple_sort(st) SKM_sk_sort(nid_triple, (st))
-#define sk_nid_triple_is_sorted(st) SKM_sk_is_sorted(nid_triple, (st))
-
-#define sk_void_new(cmp) SKM_sk_new(void, (cmp))
-#define sk_void_new_null() SKM_sk_new_null(void)
-#define sk_void_free(st) SKM_sk_free(void, (st))
-#define sk_void_num(st) SKM_sk_num(void, (st))
-#define sk_void_value(st, i) SKM_sk_value(void, (st), (i))
-#define sk_void_set(st, i, val) SKM_sk_set(void, (st), (i), (val))
-#define sk_void_zero(st) SKM_sk_zero(void, (st))
-#define sk_void_push(st, val) SKM_sk_push(void, (st), (val))
-#define sk_void_unshift(st, val) SKM_sk_unshift(void, (st), (val))
-#define sk_void_find(st, val) SKM_sk_find(void, (st), (val))
-#define sk_void_find_ex(st, val) SKM_sk_find_ex(void, (st), (val))
-#define sk_void_delete(st, i) SKM_sk_delete(void, (st), (i))
-#define sk_void_delete_ptr(st, ptr) SKM_sk_delete_ptr(void, (st), (ptr))
-#define sk_void_insert(st, val, i) SKM_sk_insert(void, (st), (val), (i))
-#define sk_void_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(void, (st), (cmp))
-#define sk_void_dup(st) SKM_sk_dup(void, st)
-#define sk_void_pop_free(st, free_func) SKM_sk_pop_free(void, (st), (free_func))
-#define sk_void_shift(st) SKM_sk_shift(void, (st))
-#define sk_void_pop(st) SKM_sk_pop(void, (st))
-#define sk_void_sort(st) SKM_sk_sort(void, (st))
-#define sk_void_is_sorted(st) SKM_sk_is_sorted(void, (st))
-
-#define sk_OPENSSL_STRING_new(cmp) ((STACK_OF(OPENSSL_STRING) *)sk_new(CHECKED_SK_CMP_FUNC(char, cmp)))
-#define sk_OPENSSL_STRING_new_null() ((STACK_OF(OPENSSL_STRING) *)sk_new_null())
-#define sk_OPENSSL_STRING_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_value(st, i) ((OPENSSL_STRING)sk_value(CHECKED_STACK_OF(OPENSSL_STRING, st), i))
-#define sk_OPENSSL_STRING_num(st) SKM_sk_num(OPENSSL_STRING, st)
-#define sk_OPENSSL_STRING_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_SK_FREE_FUNC2(OPENSSL_STRING, free_func))
-#define sk_OPENSSL_STRING_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val), i)
-#define sk_OPENSSL_STRING_free(st) SKM_sk_free(OPENSSL_STRING, st)
-#define sk_OPENSSL_STRING_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_STRING, st), i, CHECKED_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_zero(st) SKM_sk_zero(OPENSSL_STRING, (st))
-#define sk_OPENSSL_STRING_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_CONST_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_delete(st, i) SKM_sk_delete(OPENSSL_STRING, (st), (i))
-#define sk_OPENSSL_STRING_delete_ptr(st, ptr) (OPENSSL_STRING *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, ptr))
-#define sk_OPENSSL_STRING_set_cmp_func(st, cmp) \
-	((int (*)(const char * const *,const char * const *)) \
-	sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_SK_CMP_FUNC(char, cmp)))
-#define sk_OPENSSL_STRING_dup(st) SKM_sk_dup(OPENSSL_STRING, st)
-#define sk_OPENSSL_STRING_shift(st) SKM_sk_shift(OPENSSL_STRING, (st))
-#define sk_OPENSSL_STRING_pop(st) (char *)sk_pop(CHECKED_STACK_OF(OPENSSL_STRING, st))
-#define sk_OPENSSL_STRING_sort(st) SKM_sk_sort(OPENSSL_STRING, (st))
-#define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st))
-
-
-#define sk_OPENSSL_BLOCK_new(cmp) ((STACK_OF(OPENSSL_BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))
-#define sk_OPENSSL_BLOCK_new_null() ((STACK_OF(OPENSSL_BLOCK) *)sk_new_null())
-#define sk_OPENSSL_BLOCK_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_value(st, i) ((OPENSSL_BLOCK)sk_value(CHECKED_STACK_OF(OPENSSL_BLOCK, st), i))
-#define sk_OPENSSL_BLOCK_num(st) SKM_sk_num(OPENSSL_BLOCK, st)
-#define sk_OPENSSL_BLOCK_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_SK_FREE_FUNC2(OPENSSL_BLOCK, free_func))
-#define sk_OPENSSL_BLOCK_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val), i)
-#define sk_OPENSSL_BLOCK_free(st) SKM_sk_free(OPENSSL_BLOCK, st)
-#define sk_OPENSSL_BLOCK_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_BLOCK, st), i, CHECKED_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_zero(st) SKM_sk_zero(OPENSSL_BLOCK, (st))
-#define sk_OPENSSL_BLOCK_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_CONST_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_delete(st, i) SKM_sk_delete(OPENSSL_BLOCK, (st), (i))
-#define sk_OPENSSL_BLOCK_delete_ptr(st, ptr) (OPENSSL_BLOCK *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, ptr))
-#define sk_OPENSSL_BLOCK_set_cmp_func(st, cmp) \
-	((int (*)(const void * const *,const void * const *)) \
-	sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_SK_CMP_FUNC(void, cmp)))
-#define sk_OPENSSL_BLOCK_dup(st) SKM_sk_dup(OPENSSL_BLOCK, st)
-#define sk_OPENSSL_BLOCK_shift(st) SKM_sk_shift(OPENSSL_BLOCK, (st))
-#define sk_OPENSSL_BLOCK_pop(st) (void *)sk_pop(CHECKED_STACK_OF(OPENSSL_BLOCK, st))
-#define sk_OPENSSL_BLOCK_sort(st) SKM_sk_sort(OPENSSL_BLOCK, (st))
-#define sk_OPENSSL_BLOCK_is_sorted(st) SKM_sk_is_sorted(OPENSSL_BLOCK, (st))
-
-
-#define sk_OPENSSL_PSTRING_new(cmp) ((STACK_OF(OPENSSL_PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
-#define sk_OPENSSL_PSTRING_new_null() ((STACK_OF(OPENSSL_PSTRING) *)sk_new_null())
-#define sk_OPENSSL_PSTRING_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_value(st, i) ((OPENSSL_PSTRING)sk_value(CHECKED_STACK_OF(OPENSSL_PSTRING, st), i))
-#define sk_OPENSSL_PSTRING_num(st) SKM_sk_num(OPENSSL_PSTRING, st)
-#define sk_OPENSSL_PSTRING_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_SK_FREE_FUNC2(OPENSSL_PSTRING, free_func))
-#define sk_OPENSSL_PSTRING_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val), i)
-#define sk_OPENSSL_PSTRING_free(st) SKM_sk_free(OPENSSL_PSTRING, st)
-#define sk_OPENSSL_PSTRING_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_PSTRING, st), i, CHECKED_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_zero(st) SKM_sk_zero(OPENSSL_PSTRING, (st))
-#define sk_OPENSSL_PSTRING_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_CONST_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_delete(st, i) SKM_sk_delete(OPENSSL_PSTRING, (st), (i))
-#define sk_OPENSSL_PSTRING_delete_ptr(st, ptr) (OPENSSL_PSTRING *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, ptr))
-#define sk_OPENSSL_PSTRING_set_cmp_func(st, cmp) \
-	((int (*)(const OPENSSL_STRING * const *,const OPENSSL_STRING * const *)) \
-	sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
-#define sk_OPENSSL_PSTRING_dup(st) SKM_sk_dup(OPENSSL_PSTRING, st)
-#define sk_OPENSSL_PSTRING_shift(st) SKM_sk_shift(OPENSSL_PSTRING, (st))
-#define sk_OPENSSL_PSTRING_pop(st) (OPENSSL_STRING *)sk_pop(CHECKED_STACK_OF(OPENSSL_PSTRING, st))
-#define sk_OPENSSL_PSTRING_sort(st) SKM_sk_sort(OPENSSL_PSTRING, (st))
-#define sk_OPENSSL_PSTRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_PSTRING, (st))
-
-
-#define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ACCESS_DESCRIPTION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ACCESS_DESCRIPTION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ACCESS_DESCRIPTION(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ACCESS_DESCRIPTION, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ACCESS_DESCRIPTION(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ACCESS_DESCRIPTION, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_ASN1_INTEGER(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ASN1_INTEGER, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ASN1_INTEGER(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ASN1_INTEGER, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ASN1_INTEGER(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ASN1_INTEGER, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ASN1_INTEGER(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ASN1_INTEGER, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_ASN1_OBJECT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ASN1_OBJECT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ASN1_OBJECT(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ASN1_OBJECT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ASN1_OBJECT(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ASN1_OBJECT, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ASN1_OBJECT(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ASN1_OBJECT, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_ASN1_TYPE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ASN1_TYPE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ASN1_TYPE(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ASN1_TYPE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ASN1_TYPE(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ASN1_TYPE, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ASN1_TYPE(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ASN1_TYPE, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_ASN1_UTF8STRING(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ASN1_UTF8STRING, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ASN1_UTF8STRING(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ASN1_UTF8STRING, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ASN1_UTF8STRING(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ASN1_UTF8STRING, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ASN1_UTF8STRING(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ASN1_UTF8STRING, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_DIST_POINT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(DIST_POINT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_DIST_POINT(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(DIST_POINT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_DIST_POINT(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(DIST_POINT, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_DIST_POINT(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(DIST_POINT, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_ESS_CERT_ID(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ESS_CERT_ID, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ESS_CERT_ID(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ESS_CERT_ID, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ESS_CERT_ID(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ESS_CERT_ID, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ESS_CERT_ID(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ESS_CERT_ID, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_EVP_MD(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(EVP_MD, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_EVP_MD(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(EVP_MD, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_EVP_MD(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(EVP_MD, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_EVP_MD(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(EVP_MD, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_GENERAL_NAME(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(GENERAL_NAME, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_GENERAL_NAME(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(GENERAL_NAME, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_GENERAL_NAME(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(GENERAL_NAME, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_GENERAL_NAME(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(GENERAL_NAME, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_OCSP_ONEREQ(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(OCSP_ONEREQ, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_OCSP_ONEREQ(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(OCSP_ONEREQ, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_OCSP_ONEREQ(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(OCSP_ONEREQ, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_OCSP_ONEREQ(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(OCSP_ONEREQ, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(OCSP_SINGLERESP, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(OCSP_SINGLERESP, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_OCSP_SINGLERESP(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(OCSP_SINGLERESP, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_OCSP_SINGLERESP(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(OCSP_SINGLERESP, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(PKCS12_SAFEBAG, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(PKCS12_SAFEBAG, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_PKCS12_SAFEBAG(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(PKCS12_SAFEBAG, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_PKCS12_SAFEBAG(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(PKCS12_SAFEBAG, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_PKCS7(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(PKCS7, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_PKCS7(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(PKCS7, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_PKCS7(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(PKCS7, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_PKCS7(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(PKCS7, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(PKCS7_RECIP_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(PKCS7_RECIP_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_PKCS7_RECIP_INFO(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(PKCS7_RECIP_INFO, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_PKCS7_RECIP_INFO(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(PKCS7_RECIP_INFO, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(PKCS7_SIGNER_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(PKCS7_SIGNER_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_PKCS7_SIGNER_INFO(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(PKCS7_SIGNER_INFO, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_PKCS7_SIGNER_INFO(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(PKCS7_SIGNER_INFO, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_POLICYINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(POLICYINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_POLICYINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(POLICYINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_POLICYINFO(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(POLICYINFO, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_POLICYINFO(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(POLICYINFO, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_POLICYQUALINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(POLICYQUALINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_POLICYQUALINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(POLICYQUALINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_POLICYQUALINFO(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(POLICYQUALINFO, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_POLICYQUALINFO(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(POLICYQUALINFO, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_SXNETID(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(SXNETID, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_SXNETID(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(SXNETID, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_SXNETID(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(SXNETID, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_SXNETID(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(SXNETID, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_ALGOR(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_ALGOR, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_ALGOR(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_ALGOR, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_ALGOR(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_ALGOR, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_ALGOR(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_ALGOR, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_ATTRIBUTE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_ATTRIBUTE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_ATTRIBUTE(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_ATTRIBUTE, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_ATTRIBUTE(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_ATTRIBUTE, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_CRL(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_CRL, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_CRL(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_CRL, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_CRL(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_CRL, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_CRL(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_CRL, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_EXTENSION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_EXTENSION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_EXTENSION(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_EXTENSION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_EXTENSION(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_EXTENSION, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_EXTENSION(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_EXTENSION, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_NAME_ENTRY, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_NAME_ENTRY, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_NAME_ENTRY(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_NAME_ENTRY, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_NAME_ENTRY(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_NAME_ENTRY, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_REVOKED(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_REVOKED, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_REVOKED(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_REVOKED, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_REVOKED(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_REVOKED, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_REVOKED(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_REVOKED, (buf), (len), (d2i_func), (free_func))
-
-#define PKCS12_decrypt_d2i_PKCS12_SAFEBAG(algor, d2i_func, free_func, pass, passlen, oct, seq) \
-	SKM_PKCS12_decrypt_d2i(PKCS12_SAFEBAG, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
-
-#define PKCS12_decrypt_d2i_PKCS7(algor, d2i_func, free_func, pass, passlen, oct, seq) \
-	SKM_PKCS12_decrypt_d2i(PKCS7, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
-
-#define lh_ADDED_OBJ_new() LHM_lh_new(ADDED_OBJ,added_obj)
-#define lh_ADDED_OBJ_insert(lh,inst) LHM_lh_insert(ADDED_OBJ,lh,inst)
-#define lh_ADDED_OBJ_retrieve(lh,inst) LHM_lh_retrieve(ADDED_OBJ,lh,inst)
-#define lh_ADDED_OBJ_delete(lh,inst) LHM_lh_delete(ADDED_OBJ,lh,inst)
-#define lh_ADDED_OBJ_doall(lh,fn) LHM_lh_doall(ADDED_OBJ,lh,fn)
-#define lh_ADDED_OBJ_doall_arg(lh,fn,arg_type,arg) \
- LHM_lh_doall_arg(ADDED_OBJ,lh,fn,arg_type,arg)
-#define lh_ADDED_OBJ_error(lh) LHM_lh_error(ADDED_OBJ,lh)
-#define lh_ADDED_OBJ_num_items(lh) LHM_lh_num_items(ADDED_OBJ,lh)
-#define lh_ADDED_OBJ_down_load(lh) LHM_lh_down_load(ADDED_OBJ,lh)
-#define lh_ADDED_OBJ_node_stats_bio(lh,out) \
- LHM_lh_node_stats_bio(ADDED_OBJ,lh,out)
-#define lh_ADDED_OBJ_node_usage_stats_bio(lh,out) \
- LHM_lh_node_usage_stats_bio(ADDED_OBJ,lh,out)
-#define lh_ADDED_OBJ_stats_bio(lh,out) \
- LHM_lh_stats_bio(ADDED_OBJ,lh,out)
-#define lh_ADDED_OBJ_free(lh) LHM_lh_free(ADDED_OBJ,lh)
-
-#define lh_APP_INFO_new() LHM_lh_new(APP_INFO,app_info)
-#define lh_APP_INFO_insert(lh,inst) LHM_lh_insert(APP_INFO,lh,inst)
-#define lh_APP_INFO_retrieve(lh,inst) LHM_lh_retrieve(APP_INFO,lh,inst)
-#define lh_APP_INFO_delete(lh,inst) LHM_lh_delete(APP_INFO,lh,inst)
-#define lh_APP_INFO_doall(lh,fn) LHM_lh_doall(APP_INFO,lh,fn)
-#define lh_APP_INFO_doall_arg(lh,fn,arg_type,arg) \
- LHM_lh_doall_arg(APP_INFO,lh,fn,arg_type,arg)
-#define lh_APP_INFO_error(lh) LHM_lh_error(APP_INFO,lh)
-#define lh_APP_INFO_num_items(lh) LHM_lh_num_items(APP_INFO,lh)
-#define lh_APP_INFO_down_load(lh) LHM_lh_down_load(APP_INFO,lh)
-#define lh_APP_INFO_node_stats_bio(lh,out) \
- LHM_lh_node_stats_bio(APP_INFO,lh,out)
-#define lh_APP_INFO_node_usage_stats_bio(lh,out) \
- LHM_lh_node_usage_stats_bio(APP_INFO,lh,out)
-#define lh_APP_INFO_stats_bio(lh,out) \
- LHM_lh_stats_bio(APP_INFO,lh,out)
-#define lh_APP_INFO_free(lh) LHM_lh_free(APP_INFO,lh)
-
-#define lh_CONF_VALUE_new() LHM_lh_new(CONF_VALUE,conf_value)
-#define lh_CONF_VALUE_insert(lh,inst) LHM_lh_insert(CONF_VALUE,lh,inst)
-#define lh_CONF_VALUE_retrieve(lh,inst) LHM_lh_retrieve(CONF_VALUE,lh,inst)
-#define lh_CONF_VALUE_delete(lh,inst) LHM_lh_delete(CONF_VALUE,lh,inst)
-#define lh_CONF_VALUE_doall(lh,fn) LHM_lh_doall(CONF_VALUE,lh,fn)
-#define lh_CONF_VALUE_doall_arg(lh,fn,arg_type,arg) \
- LHM_lh_doall_arg(CONF_VALUE,lh,fn,arg_type,arg)
-#define lh_CONF_VALUE_error(lh) LHM_lh_error(CONF_VALUE,lh)
-#define lh_CONF_VALUE_num_items(lh) LHM_lh_num_items(CONF_VALUE,lh)
-#define lh_CONF_VALUE_down_load(lh) LHM_lh_down_load(CONF_VALUE,lh)
-#define lh_CONF_VALUE_node_stats_bio(lh,out) \
- LHM_lh_node_stats_bio(CONF_VALUE,lh,out)
-#define lh_CONF_VALUE_node_usage_stats_bio(lh,out) \
- LHM_lh_node_usage_stats_bio(CONF_VALUE,lh,out)
-#define lh_CONF_VALUE_stats_bio(lh,out) \
- LHM_lh_stats_bio(CONF_VALUE,lh,out)
-#define lh_CONF_VALUE_free(lh) LHM_lh_free(CONF_VALUE,lh)
-
-#define lh_ENGINE_PILE_new() LHM_lh_new(ENGINE_PILE,engine_pile)
-#define lh_ENGINE_PILE_insert(lh,inst) LHM_lh_insert(ENGINE_PILE,lh,inst)
-#define lh_ENGINE_PILE_retrieve(lh,inst) LHM_lh_retrieve(ENGINE_PILE,lh,inst)
-#define lh_ENGINE_PILE_delete(lh,inst) LHM_lh_delete(ENGINE_PILE,lh,inst)
-#define lh_ENGINE_PILE_doall(lh,fn) LHM_lh_doall(ENGINE_PILE,lh,fn)
-#define lh_ENGINE_PILE_doall_arg(lh,fn,arg_type,arg) \
- LHM_lh_doall_arg(ENGINE_PILE,lh,fn,arg_type,arg)
-#define lh_ENGINE_PILE_error(lh) LHM_lh_error(ENGINE_PILE,lh)
-#define lh_ENGINE_PILE_num_items(lh) LHM_lh_num_items(ENGINE_PILE,lh)
-#define lh_ENGINE_PILE_down_load(lh) LHM_lh_down_load(ENGINE_PILE,lh)
-#define lh_ENGINE_PILE_node_stats_bio(lh,out) \
- LHM_lh_node_stats_bio(ENGINE_PILE,lh,out)
-#define lh_ENGINE_PILE_node_usage_stats_bio(lh,out) \
- LHM_lh_node_usage_stats_bio(ENGINE_PILE,lh,out)
-#define lh_ENGINE_PILE_stats_bio(lh,out) \
- LHM_lh_stats_bio(ENGINE_PILE,lh,out)
-#define lh_ENGINE_PILE_free(lh) LHM_lh_free(ENGINE_PILE,lh)
-
-#define lh_ERR_STATE_new() LHM_lh_new(ERR_STATE,err_state)
-#define lh_ERR_STATE_insert(lh,inst) LHM_lh_insert(ERR_STATE,lh,inst)
-#define lh_ERR_STATE_retrieve(lh,inst) LHM_lh_retrieve(ERR_STATE,lh,inst)
-#define lh_ERR_STATE_delete(lh,inst) LHM_lh_delete(ERR_STATE,lh,inst)
-#define lh_ERR_STATE_doall(lh,fn) LHM_lh_doall(ERR_STATE,lh,fn)
-#define lh_ERR_STATE_doall_arg(lh,fn,arg_type,arg) \
- LHM_lh_doall_arg(ERR_STATE,lh,fn,arg_type,arg)
-#define lh_ERR_STATE_error(lh) LHM_lh_error(ERR_STATE,lh)
-#define lh_ERR_STATE_num_items(lh) LHM_lh_num_items(ERR_STATE,lh)
-#define lh_ERR_STATE_down_load(lh) LHM_lh_down_load(ERR_STATE,lh)
-#define lh_ERR_STATE_node_stats_bio(lh,out) \
- LHM_lh_node_stats_bio(ERR_STATE,lh,out)
-#define lh_ERR_STATE_node_usage_stats_bio(lh,out) \
- LHM_lh_node_usage_stats_bio(ERR_STATE,lh,out)
-#define lh_ERR_STATE_stats_bio(lh,out) \
- LHM_lh_stats_bio(ERR_STATE,lh,out)
-#define lh_ERR_STATE_free(lh) LHM_lh_free(ERR_STATE,lh)
-
-#define lh_ERR_STRING_DATA_new() LHM_lh_new(ERR_STRING_DATA,err_string_data)
-#define lh_ERR_STRING_DATA_insert(lh,inst) LHM_lh_insert(ERR_STRING_DATA,lh,inst)
-#define lh_ERR_STRING_DATA_retrieve(lh,inst) LHM_lh_retrieve(ERR_STRING_DATA,lh,inst)
-#define lh_ERR_STRING_DATA_delete(lh,inst) LHM_lh_delete(ERR_STRING_DATA,lh,inst)
-#define lh_ERR_STRING_DATA_doall(lh,fn) LHM_lh_doall(ERR_STRING_DATA,lh,fn)
-#define lh_ERR_STRING_DATA_doall_arg(lh,fn,arg_type,arg) \
- LHM_lh_doall_arg(ERR_STRING_DATA,lh,fn,arg_type,arg)
-#define lh_ERR_STRING_DATA_error(lh) LHM_lh_error(ERR_STRING_DATA,lh)
-#define lh_ERR_STRING_DATA_num_items(lh) LHM_lh_num_items(ERR_STRING_DATA,lh)
-#define lh_ERR_STRING_DATA_down_load(lh) LHM_lh_down_load(ERR_STRING_DATA,lh)
-#define lh_ERR_STRING_DATA_node_stats_bio(lh,out) \
- LHM_lh_node_stats_bio(ERR_STRING_DATA,lh,out)
-#define lh_ERR_STRING_DATA_node_usage_stats_bio(lh,out) \
- LHM_lh_node_usage_stats_bio(ERR_STRING_DATA,lh,out)
-#define lh_ERR_STRING_DATA_stats_bio(lh,out) \
- LHM_lh_stats_bio(ERR_STRING_DATA,lh,out)
-#define lh_ERR_STRING_DATA_free(lh) LHM_lh_free(ERR_STRING_DATA,lh)
-
-#define lh_EX_CLASS_ITEM_new() LHM_lh_new(EX_CLASS_ITEM,ex_class_item)
-#define lh_EX_CLASS_ITEM_insert(lh,inst) LHM_lh_insert(EX_CLASS_ITEM,lh,inst)
-#define lh_EX_CLASS_ITEM_retrieve(lh,inst) LHM_lh_retrieve(EX_CLASS_ITEM,lh,inst)
-#define lh_EX_CLASS_ITEM_delete(lh,inst) LHM_lh_delete(EX_CLASS_ITEM,lh,inst)
-#define lh_EX_CLASS_ITEM_doall(lh,fn) LHM_lh_doall(EX_CLASS_ITEM,lh,fn)
-#define lh_EX_CLASS_ITEM_doall_arg(lh,fn,arg_type,arg) \
- LHM_lh_doall_arg(EX_CLASS_ITEM,lh,fn,arg_type,arg)
-#define lh_EX_CLASS_ITEM_error(lh) LHM_lh_error(EX_CLASS_ITEM,lh)
-#define lh_EX_CLASS_ITEM_num_items(lh) LHM_lh_num_items(EX_CLASS_ITEM,lh)
-#define lh_EX_CLASS_ITEM_down_load(lh) LHM_lh_down_load(EX_CLASS_ITEM,lh)
-#define lh_EX_CLASS_ITEM_node_stats_bio(lh,out) \
- LHM_lh_node_stats_bio(EX_CLASS_ITEM,lh,out)
-#define lh_EX_CLASS_ITEM_node_usage_stats_bio(lh,out) \
- LHM_lh_node_usage_stats_bio(EX_CLASS_ITEM,lh,out)
-#define lh_EX_CLASS_ITEM_stats_bio(lh,out) \
- LHM_lh_stats_bio(EX_CLASS_ITEM,lh,out)
-#define lh_EX_CLASS_ITEM_free(lh) LHM_lh_free(EX_CLASS_ITEM,lh)
-
-#define lh_FUNCTION_new() LHM_lh_new(FUNCTION,function)
-#define lh_FUNCTION_insert(lh,inst) LHM_lh_insert(FUNCTION,lh,inst)
-#define lh_FUNCTION_retrieve(lh,inst) LHM_lh_retrieve(FUNCTION,lh,inst)
-#define lh_FUNCTION_delete(lh,inst) LHM_lh_delete(FUNCTION,lh,inst)
-#define lh_FUNCTION_doall(lh,fn) LHM_lh_doall(FUNCTION,lh,fn)
-#define lh_FUNCTION_doall_arg(lh,fn,arg_type,arg) \
- LHM_lh_doall_arg(FUNCTION,lh,fn,arg_type,arg)
-#define lh_FUNCTION_error(lh) LHM_lh_error(FUNCTION,lh)
-#define lh_FUNCTION_num_items(lh) LHM_lh_num_items(FUNCTION,lh)
-#define lh_FUNCTION_down_load(lh) LHM_lh_down_load(FUNCTION,lh)
-#define lh_FUNCTION_node_stats_bio(lh,out) \
- LHM_lh_node_stats_bio(FUNCTION,lh,out)
-#define lh_FUNCTION_node_usage_stats_bio(lh,out) \
- LHM_lh_node_usage_stats_bio(FUNCTION,lh,out)
-#define lh_FUNCTION_stats_bio(lh,out) \
- LHM_lh_stats_bio(FUNCTION,lh,out)
-#define lh_FUNCTION_free(lh) LHM_lh_free(FUNCTION,lh)
-
-#define lh_MEM_new() LHM_lh_new(MEM,mem)
-#define lh_MEM_insert(lh,inst) LHM_lh_insert(MEM,lh,inst)
-#define lh_MEM_retrieve(lh,inst) LHM_lh_retrieve(MEM,lh,inst)
-#define lh_MEM_delete(lh,inst) LHM_lh_delete(MEM,lh,inst)
-#define lh_MEM_doall(lh,fn) LHM_lh_doall(MEM,lh,fn)
-#define lh_MEM_doall_arg(lh,fn,arg_type,arg) \
- LHM_lh_doall_arg(MEM,lh,fn,arg_type,arg)
-#define lh_MEM_error(lh) LHM_lh_error(MEM,lh)
-#define lh_MEM_num_items(lh) LHM_lh_num_items(MEM,lh)
-#define lh_MEM_down_load(lh) LHM_lh_down_load(MEM,lh)
-#define lh_MEM_node_stats_bio(lh,out) \
- LHM_lh_node_stats_bio(MEM,lh,out)
-#define lh_MEM_node_usage_stats_bio(lh,out) \
- LHM_lh_node_usage_stats_bio(MEM,lh,out)
-#define lh_MEM_stats_bio(lh,out) \
- LHM_lh_stats_bio(MEM,lh,out)
-#define lh_MEM_free(lh) LHM_lh_free(MEM,lh)
-
-#define lh_OBJ_NAME_new() LHM_lh_new(OBJ_NAME,obj_name)
-#define lh_OBJ_NAME_insert(lh,inst) LHM_lh_insert(OBJ_NAME,lh,inst)
-#define lh_OBJ_NAME_retrieve(lh,inst) LHM_lh_retrieve(OBJ_NAME,lh,inst)
-#define lh_OBJ_NAME_delete(lh,inst) LHM_lh_delete(OBJ_NAME,lh,inst)
-#define lh_OBJ_NAME_doall(lh,fn) LHM_lh_doall(OBJ_NAME,lh,fn)
-#define lh_OBJ_NAME_doall_arg(lh,fn,arg_type,arg) \
- LHM_lh_doall_arg(OBJ_NAME,lh,fn,arg_type,arg)
-#define lh_OBJ_NAME_error(lh) LHM_lh_error(OBJ_NAME,lh)
-#define lh_OBJ_NAME_num_items(lh) LHM_lh_num_items(OBJ_NAME,lh)
-#define lh_OBJ_NAME_down_load(lh) LHM_lh_down_load(OBJ_NAME,lh)
-#define lh_OBJ_NAME_node_stats_bio(lh,out) \
- LHM_lh_node_stats_bio(OBJ_NAME,lh,out)
-#define lh_OBJ_NAME_node_usage_stats_bio(lh,out) \
- LHM_lh_node_usage_stats_bio(OBJ_NAME,lh,out)
-#define lh_OBJ_NAME_stats_bio(lh,out) \
- LHM_lh_stats_bio(OBJ_NAME,lh,out)
-#define lh_OBJ_NAME_free(lh) LHM_lh_free(OBJ_NAME,lh)
-
-#define lh_OPENSSL_CSTRING_new() LHM_lh_new(OPENSSL_CSTRING,openssl_cstring)
-#define lh_OPENSSL_CSTRING_insert(lh,inst) LHM_lh_insert(OPENSSL_CSTRING,lh,inst)
-#define lh_OPENSSL_CSTRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_CSTRING,lh,inst)
-#define lh_OPENSSL_CSTRING_delete(lh,inst) LHM_lh_delete(OPENSSL_CSTRING,lh,inst)
-#define lh_OPENSSL_CSTRING_doall(lh,fn) LHM_lh_doall(OPENSSL_CSTRING,lh,fn)
-#define lh_OPENSSL_CSTRING_doall_arg(lh,fn,arg_type,arg) \
- LHM_lh_doall_arg(OPENSSL_CSTRING,lh,fn,arg_type,arg)
-#define lh_OPENSSL_CSTRING_error(lh) LHM_lh_error(OPENSSL_CSTRING,lh)
-#define lh_OPENSSL_CSTRING_num_items(lh) LHM_lh_num_items(OPENSSL_CSTRING,lh)
-#define lh_OPENSSL_CSTRING_down_load(lh) LHM_lh_down_load(OPENSSL_CSTRING,lh)
-#define lh_OPENSSL_CSTRING_node_stats_bio(lh,out) \
- LHM_lh_node_stats_bio(OPENSSL_CSTRING,lh,out)
-#define lh_OPENSSL_CSTRING_node_usage_stats_bio(lh,out) \
- LHM_lh_node_usage_stats_bio(OPENSSL_CSTRING,lh,out)
-#define lh_OPENSSL_CSTRING_stats_bio(lh,out) \
- LHM_lh_stats_bio(OPENSSL_CSTRING,lh,out)
-#define lh_OPENSSL_CSTRING_free(lh) LHM_lh_free(OPENSSL_CSTRING,lh)
-
-#define lh_OPENSSL_STRING_new() LHM_lh_new(OPENSSL_STRING,openssl_string)
-#define lh_OPENSSL_STRING_insert(lh,inst) LHM_lh_insert(OPENSSL_STRING,lh,inst)
-#define lh_OPENSSL_STRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_STRING,lh,inst)
-#define lh_OPENSSL_STRING_delete(lh,inst) LHM_lh_delete(OPENSSL_STRING,lh,inst)
-#define lh_OPENSSL_STRING_doall(lh,fn) LHM_lh_doall(OPENSSL_STRING,lh,fn)
-#define lh_OPENSSL_STRING_doall_arg(lh,fn,arg_type,arg) \
- LHM_lh_doall_arg(OPENSSL_STRING,lh,fn,arg_type,arg)
-#define lh_OPENSSL_STRING_error(lh) LHM_lh_error(OPENSSL_STRING,lh)
-#define lh_OPENSSL_STRING_num_items(lh) LHM_lh_num_items(OPENSSL_STRING,lh)
-#define lh_OPENSSL_STRING_down_load(lh) LHM_lh_down_load(OPENSSL_STRING,lh)
-#define lh_OPENSSL_STRING_node_stats_bio(lh,out) \
- LHM_lh_node_stats_bio(OPENSSL_STRING,lh,out)
-#define lh_OPENSSL_STRING_node_usage_stats_bio(lh,out) \
- LHM_lh_node_usage_stats_bio(OPENSSL_STRING,lh,out)
-#define lh_OPENSSL_STRING_stats_bio(lh,out) \
- LHM_lh_stats_bio(OPENSSL_STRING,lh,out)
-#define lh_OPENSSL_STRING_free(lh) LHM_lh_free(OPENSSL_STRING,lh)
-
-#define lh_SSL_SESSION_new() LHM_lh_new(SSL_SESSION,ssl_session)
-#define lh_SSL_SESSION_insert(lh,inst) LHM_lh_insert(SSL_SESSION,lh,inst)
-#define lh_SSL_SESSION_retrieve(lh,inst) LHM_lh_retrieve(SSL_SESSION,lh,inst)
-#define lh_SSL_SESSION_delete(lh,inst) LHM_lh_delete(SSL_SESSION,lh,inst)
-#define lh_SSL_SESSION_doall(lh,fn) LHM_lh_doall(SSL_SESSION,lh,fn)
-#define lh_SSL_SESSION_doall_arg(lh,fn,arg_type,arg) \
- LHM_lh_doall_arg(SSL_SESSION,lh,fn,arg_type,arg)
-#define lh_SSL_SESSION_error(lh) LHM_lh_error(SSL_SESSION,lh)
-#define lh_SSL_SESSION_num_items(lh) LHM_lh_num_items(SSL_SESSION,lh)
-#define lh_SSL_SESSION_down_load(lh) LHM_lh_down_load(SSL_SESSION,lh)
-#define lh_SSL_SESSION_node_stats_bio(lh,out) \
- LHM_lh_node_stats_bio(SSL_SESSION,lh,out)
-#define lh_SSL_SESSION_node_usage_stats_bio(lh,out) \
- LHM_lh_node_usage_stats_bio(SSL_SESSION,lh,out)
-#define lh_SSL_SESSION_stats_bio(lh,out) \
- LHM_lh_stats_bio(SSL_SESSION,lh,out)
-#define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh)
-/* End of util/mkstack.pl block, you may now edit :-) */
-
-#endif /* !defined HEADER_SAFESTACK_H */
+# ifdef __cplusplus
+}
+# endif
+#endif

gpac-0.8.0.tar.gz/extra_lib/include/openssl/seed.h Added

@@ -0,0 +1,98 @@
+/*
+ * 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 data[32];
+# else
+ unsigned int data[32];
+# endif
+} SEED_KEY_SCHEDULE;
+
+void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],
+ SEED_KEY_SCHEDULE *ks);
+
+void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE],
+ unsigned char d[SEED_BLOCK_SIZE],
+ const SEED_KEY_SCHEDULE *ks);
+void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE],
+ unsigned char d[SEED_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 ivec[SEED_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 ivec[SEED_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 ivec[SEED_BLOCK_SIZE], int *num);
+
+# ifdef __cplusplus
+}
+# endif
+# endif
+
+#endif

gpac-0.7.1.tar.gz/extra_lib/include/openssl/sha.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/sha.h Changed

@@ -1,197 +1,116 @@
-/* crypto/sha/sha.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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
+# define HEADER_SHA_H
 
-#include <openssl/e_os2.h>
-#include <stddef.h>
+# include <openssl/e_os2.h>
+# include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if defined(OPENSSL_NO_SHA) || (defined(OPENSSL_NO_SHA0) && defined(OPENSSL_NO_SHA1))
-#error SHA is disabled.
-#endif
-
-#if defined(OPENSSL_FIPS)
-#define FIPS_SHA_SIZE_T size_t
-#endif
-
-/*
+/*-
 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! SHA_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! SHA_LONG_LOG2 has to be defined along. !
+ * ! 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 data[SHA_LBLOCK];
+ unsigned int num;
+} SHA_CTX;
 
-#if defined(__LP32__)
-#define SHA_LONG unsigned long
-#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#define SHA_LONG unsigned long
-#define SHA_LONG_LOG2 3
-#else
-#define SHA_LONG unsigned int
-#endif
-
-#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 data[SHA_LBLOCK];
-	unsigned int num;
-	} SHA_CTX;
-
-#ifndef OPENSSL_NO_SHA0
-int SHA_Init(SHA_CTX *c);
-int SHA_Update(SHA_CTX *c, const void *data, size_t len);
-int SHA_Final(unsigned char *md, SHA_CTX *c);
-unsigned char *SHA(const unsigned char *d, size_t n, unsigned char *md);
-void SHA_Transform(SHA_CTX *c, const unsigned char *data);
-#endif
-#ifndef OPENSSL_NO_SHA1
 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);
-#endif
 
-#define SHA256_CBLOCK	(SHA_LBLOCK*4)	/* SHA-256 treats input data as a
-					 * contiguous array of 32 bit
-					 * wide big-endian values. */
-#define SHA224_DIGEST_LENGTH	28
-#define SHA256_DIGEST_LENGTH	32
-
-typedef struct SHA256state_st
-	{
-	SHA_LONG h[8];
-	SHA_LONG Nl,Nh;
-	SHA_LONG data[SHA_LBLOCK];
-	unsigned int num,md_len;
-	} SHA256_CTX;
-
-#ifndef OPENSSL_NO_SHA256
+# 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 h[8];
+ SHA_LONG Nl, Nh;
+ SHA_LONG data[SHA_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);
+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);
+unsigned char *SHA256(const unsigned char *d, size_t n, unsigned char *md);
 void SHA256_Transform(SHA256_CTX *c, const unsigned char *data);
-#endif
 
-#define SHA384_DIGEST_LENGTH	48
-#define SHA512_DIGEST_LENGTH	64
+# define SHA224_DIGEST_LENGTH 28
+# define SHA256_DIGEST_LENGTH 32
+# define SHA384_DIGEST_LENGTH 48
+# define SHA512_DIGEST_LENGTH 64
 
-#ifndef OPENSSL_NO_SHA512
 /*
 * 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.
 */
-#define SHA512_CBLOCK	(SHA_LBLOCK*8)	/* SHA-512 treats input data as a
-					 * contiguous array of 64 bit
-					 * wide big-endian values. */
-#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 h[8];
-	SHA_LONG64 Nl,Nh;
-	union {
-		SHA_LONG64	d[SHA_LBLOCK];
-		unsigned char	p[SHA512_CBLOCK];
-	} u;
-	unsigned int num,md_len;
-	} SHA512_CTX;
-#endif
+/*
+ * 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 h[8];
+ SHA_LONG64 Nl, Nh;
+ union {
+ SHA_LONG64 d[SHA_LBLOCK];
+ unsigned char p[SHA512_CBLOCK];
+ } u;
+ unsigned int num, md_len;
+} SHA512_CTX;
 
-#ifndef OPENSSL_NO_SHA512
 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);
+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);
+unsigned char *SHA512(const unsigned char *d, size_t n, unsigned char *md);
 void SHA512_Transform(SHA512_CTX *c, const unsigned char *data);
-#endif
 
 #ifdef __cplusplus
 }

gpac-0.8.0.tar.gz/extra_lib/include/openssl/srp.h Added

@@ -0,0 +1,131 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/openssl/srtp.h Added

@@ -0,0 +1,50 @@
+/*
+ * 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-0.7.1.tar.gz/extra_lib/include/openssl/ssl.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/ssl.h Changed

@@ -1,116 +1,15 @@
-/* ssl/ssl.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2007 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+/*
+ * 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 
+ * ECC cipher suite support in OpenSSL originally developed by
 * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
 */
 /* ====================================================================
@@ -140,171 +39,141 @@
 * OTHERWISE.
 */
 
-#ifndef HEADER_SSL_H 
-#define HEADER_SSL_H 
+#ifndef HEADER_SSL_H
+# define HEADER_SSL_H
 
-#include <openssl/e_os2.h>
-
-#ifndef OPENSSL_NO_COMP
-#include <openssl/comp.h>
-#endif
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#ifndef OPENSSL_NO_DEPRECATED
-#ifndef OPENSSL_NO_X509
-#include <openssl/x509.h>
-#endif
-#include <openssl/crypto.h>
-#include <openssl/lhash.h>
-#include <openssl/buffer.h>
-#endif
-#include <openssl/pem.h>
-#include <openssl/hmac.h>
-
-#include <openssl/kssl.h>
-#include <openssl/safestack.h>
-#include <openssl/symhacks.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
 
-/* SSLeay version number for ASN.1 encoding of the session information */
-/* Version 0 - initial version
+/* 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_SESSION_ASN1_VERSION 0x0001
 
-/* text strings for the ciphers */
-#define SSL_TXT_NULL_WITH_MD5		SSL2_TXT_NULL_WITH_MD5			
-#define SSL_TXT_RC4_128_WITH_MD5	SSL2_TXT_RC4_128_WITH_MD5		
-#define SSL_TXT_RC4_128_EXPORT40_WITH_MD5 SSL2_TXT_RC4_128_EXPORT40_WITH_MD5	
-#define SSL_TXT_RC2_128_CBC_WITH_MD5	SSL2_TXT_RC2_128_CBC_WITH_MD5		
-#define SSL_TXT_RC2_128_CBC_EXPORT40_WITH_MD5 SSL2_TXT_RC2_128_CBC_EXPORT40_WITH_MD5	
-#define SSL_TXT_IDEA_128_CBC_WITH_MD5	SSL2_TXT_IDEA_128_CBC_WITH_MD5		
-#define SSL_TXT_DES_64_CBC_WITH_MD5	SSL2_TXT_DES_64_CBC_WITH_MD5		
-#define SSL_TXT_DES_64_CBC_WITH_SHA	SSL2_TXT_DES_64_CBC_WITH_SHA		
-#define SSL_TXT_DES_192_EDE3_CBC_WITH_MD5 SSL2_TXT_DES_192_EDE3_CBC_WITH_MD5	
-#define SSL_TXT_DES_192_EDE3_CBC_WITH_SHA SSL2_TXT_DES_192_EDE3_CBC_WITH_SHA	
-
-/* VRS Additional Kerberos5 entries
- */
-#define SSL_TXT_KRB5_DES_64_CBC_SHA SSL3_TXT_KRB5_DES_64_CBC_SHA
-#define SSL_TXT_KRB5_DES_192_CBC3_SHA SSL3_TXT_KRB5_DES_192_CBC3_SHA
-#define SSL_TXT_KRB5_RC4_128_SHA SSL3_TXT_KRB5_RC4_128_SHA
-#define SSL_TXT_KRB5_IDEA_128_CBC_SHA SSL3_TXT_KRB5_IDEA_128_CBC_SHA
-#define SSL_TXT_KRB5_DES_64_CBC_MD5 SSL3_TXT_KRB5_DES_64_CBC_MD5 
-#define SSL_TXT_KRB5_DES_192_CBC3_MD5 SSL3_TXT_KRB5_DES_192_CBC3_MD5 
-#define SSL_TXT_KRB5_RC4_128_MD5 SSL3_TXT_KRB5_RC4_128_MD5
-#define SSL_TXT_KRB5_IDEA_128_CBC_MD5 SSL3_TXT_KRB5_IDEA_128_CBC_MD5 
-
-#define SSL_TXT_KRB5_DES_40_CBC_SHA SSL3_TXT_KRB5_DES_40_CBC_SHA 
-#define SSL_TXT_KRB5_RC2_40_CBC_SHA SSL3_TXT_KRB5_RC2_40_CBC_SHA 
-#define SSL_TXT_KRB5_RC4_40_SHA	 SSL3_TXT_KRB5_RC4_40_SHA
-#define SSL_TXT_KRB5_DES_40_CBC_MD5 SSL3_TXT_KRB5_DES_40_CBC_MD5 
-#define SSL_TXT_KRB5_RC2_40_CBC_MD5 SSL3_TXT_KRB5_RC2_40_CBC_MD5 
-#define SSL_TXT_KRB5_RC4_40_MD5	 SSL3_TXT_KRB5_RC4_40_MD5
-
-#define SSL_TXT_KRB5_DES_40_CBC_SHA SSL3_TXT_KRB5_DES_40_CBC_SHA
-#define SSL_TXT_KRB5_DES_40_CBC_MD5 SSL3_TXT_KRB5_DES_40_CBC_MD5
-#define SSL_TXT_KRB5_DES_64_CBC_SHA SSL3_TXT_KRB5_DES_64_CBC_SHA
-#define SSL_TXT_KRB5_DES_64_CBC_MD5 SSL3_TXT_KRB5_DES_64_CBC_MD5
-#define SSL_TXT_KRB5_DES_192_CBC3_SHA SSL3_TXT_KRB5_DES_192_CBC3_SHA
-#define SSL_TXT_KRB5_DES_192_CBC3_MD5 SSL3_TXT_KRB5_DES_192_CBC3_MD5
-#define SSL_MAX_KRB5_PRINCIPAL_LENGTH 256
-
-#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
+# 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
 
-/* These are used to specify which ciphers to use and not to use */
+/* The maximum number of encrypt/decrypt pipelines we can support */
+# define SSL_MAX_PIPELINES 32
+
+/* text strings for the ciphers */
 
-#define SSL_TXT_EXP40		"EXPORT40"
-#define SSL_TXT_EXP56		"EXPORT56"
-#define SSL_TXT_LOW		"LOW"
-#define SSL_TXT_MEDIUM		"MEDIUM"
-#define SSL_TXT_HIGH		"HIGH"
-#define SSL_TXT_FIPS		"FIPS"
-
-#define SSL_TXT_kFZA		"kFZA" /* unused! */
-#define	SSL_TXT_aFZA		"aFZA" /* unused! */
-#define SSL_TXT_eFZA		"eFZA" /* unused! */
-#define SSL_TXT_FZA		"FZA" /* unused! */
-
-#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" /* no such ciphersuites supported! */
-#define SSL_TXT_kDHd		"kDHd" /* no such ciphersuites supported! */
-#define SSL_TXT_kDH 		"kDH" /* no such ciphersuites supported! */
-#define SSL_TXT_kEDH		"kEDH"
-#define SSL_TXT_kKRB5 	"kKRB5"
-#define SSL_TXT_kECDHr		"kECDHr"
-#define SSL_TXT_kECDHe		"kECDHe"
-#define SSL_TXT_kECDH		"kECDH"
-#define SSL_TXT_kEECDH		"kEECDH"
-#define SSL_TXT_kPSK "kPSK"
-#define SSL_TXT_kGOST		"kGOST"
-
-#define	SSL_TXT_aRSA		"aRSA"
-#define	SSL_TXT_aDSS		"aDSS"
-#define	SSL_TXT_aDH		"aDH" /* no such ciphersuites supported! */
-#define	SSL_TXT_aECDH		"aECDH"
-#define SSL_TXT_aKRB5 	"aKRB5"
-#define SSL_TXT_aECDSA		"aECDSA"
-#define SSL_TXT_aPSK "aPSK"
-#define SSL_TXT_aGOST94	"aGOST94"
-#define SSL_TXT_aGOST01 "aGOST01"
-#define SSL_TXT_aGOST "aGOST"
-
-#define	SSL_TXT_DSS		"DSS"
-#define SSL_TXT_DH		"DH"
-#define SSL_TXT_EDH		"EDH" /* same as "kEDH:-ADH" */
-#define SSL_TXT_ADH		"ADH"
-#define SSL_TXT_RSA		"RSA"
-#define SSL_TXT_ECDH		"ECDH"
-#define SSL_TXT_EECDH		"EECDH" /* same as "kEECDH:-AECDH" */
-#define SSL_TXT_AECDH		"AECDH"
-#define SSL_TXT_ECDSA		"ECDSA"
-#define SSL_TXT_KRB5 	"KRB5"
-#define SSL_TXT_PSK "PSK"
-
-#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_CAMELLIA128	"CAMELLIA128"
-#define SSL_TXT_CAMELLIA256	"CAMELLIA256"
-#define SSL_TXT_CAMELLIA	"CAMELLIA"
-
-#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_SSLV2		"SSLv2"
-#define SSL_TXT_SSLV3		"SSLv3"
-#define SSL_TXT_TLSV1		"TLSv1"
+/* These are used to specify which ciphers to use and not to use */
 
-#define SSL_TXT_EXP		"EXP"
-#define SSL_TXT_EXPORT		"EXPORT"
+# 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"
+# 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
@@ -318,23 +187,24 @@
 * 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"
+# 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:!aNULL:!eNULL:!SSLv2"
-/* As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always
+/*
+ * 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.)
+ * 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
+# define SSL_SENT_SHUTDOWN 1
+# define SSL_RECEIVED_SHUTDOWN 2
 
 #ifdef __cplusplus
 }
@@ -344,1959 +214,2335 @@
 extern "C" {
 #endif
 
-#if (defined(OPENSSL_NO_RSA) || defined(OPENSSL_NO_MD5)) && !defined(OPENSSL_NO_SSL2)
-#define OPENSSL_NO_SSL2
-#endif
-
-#define SSL_FILETYPE_ASN1	X509_FILETYPE_ASN1
-#define SSL_FILETYPE_PEM	X509_FILETYPE_PEM
+# 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. */
+/*
+ * 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);
 
-/* used to hold info on the particular ciphers used */
-typedef struct ssl_cipher_st
-	{
-	int valid;
-	const char *name;		/* text name */
-	unsigned long id;		/* id, 4 bytes, first is version */
-
-	/* changed in 0.9.9: these four used to be portions of a single value 'algorithms' */
-	unsigned long algorithm_mkey;	/* key exchange algorithm */
-	unsigned long algorithm_auth;	/* server authentication */
-	unsigned long algorithm_enc;	/* symmetric encryption */
-	unsigned long algorithm_mac;	/* symmetric authentication */
-	unsigned long algorithm_ssl;	/* (major) protocol version */
-
-	unsigned long algo_strength;	/* strength and export flags */
-	unsigned long algorithm2;	/* Extra flags */
-	int strength_bits;		/* Number of bits really used */
-	int alg_bits;			/* Number of bits for algorithm */
-	} SSL_CIPHER;
-
-DECLARE_STACK_OF(SSL_CIPHER)
-
-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, SSL_CIPHER **cipher, void *arg);
-
-/* Used to hold functions for SSLv2 or SSLv3/TLSv1 functions */
-typedef struct ssl_method_st
-	{
-	int version;
-	int (*ssl_new)(SSL *s);
-	void (*ssl_clear)(SSL *s);
-	void (*ssl_free)(SSL *s);
-	int (*ssl_accept)(SSL *s);
-	int (*ssl_connect)(SSL *s);
-	int (*ssl_read)(SSL *s,void *buf,int len);
-	int (*ssl_peek)(SSL *s,void *buf,int len);
-	int (*ssl_write)(SSL *s,const void *buf,int len);
-	int (*ssl_shutdown)(SSL *s);
-	int (*ssl_renegotiate)(SSL *s);
-	int (*ssl_renegotiate_check)(SSL *s);
-	long (*ssl_get_message)(SSL *s, int st1, int stn, int mt, long
-		max, int *ok);
-	int (*ssl_read_bytes)(SSL *s, int type, unsigned char *buf, int len, 
-		int peek);
-	int (*ssl_write_bytes)(SSL *s, int type, const void *buf_, int len);
-	int (*ssl_dispatch_alert)(SSL *s);
-	long (*ssl_ctrl)(SSL *s,int cmd,long larg,void *parg);
-	long (*ssl_ctx_ctrl)(SSL_CTX *ctx,int cmd,long larg,void *parg);
-	const SSL_CIPHER *(*get_cipher_by_char)(const unsigned char *ptr);
-	int (*put_cipher_by_char)(const SSL_CIPHER *cipher,unsigned char *ptr);
-	int (*ssl_pending)(const SSL *s);
-	int (*num_ciphers)(void);
-	const SSL_CIPHER *(*get_cipher)(unsigned ncipher);
-	const struct ssl_method_st *(*get_ssl_method)(int version);
-	long (*get_timeout)(void);
-	struct ssl3_enc_method *ssl3_enc; /* Extra SSLv3/TLS stuff */
-	int (*ssl_version)(void);
-	long (*ssl_callback_ctrl)(SSL *s, int cb_id, void (*fp)(void));
-	long (*ssl_ctx_callback_ctrl)(SSL_CTX *s, int cb_id, void (*fp)(void));
-	} SSL_METHOD;
-
-/* Lets make this into an ASN.1 type structure as follows
- * SSL_SESSION_ID ::= SEQUENCE {
- *	version 		INTEGER,	-- structure version number
- *	SSLversion 		INTEGER,	-- SSL version number
- *	Cipher 			OCTET STRING,	-- the 3 byte cipher ID
- *	Session_ID 		OCTET STRING,	-- the Session ID
- *	Master_key 		OCTET STRING,	-- the master key
- *	KRB5_principal		OCTET STRING	-- optional Kerberos principal
- *	Key_Arg [ 0 ] IMPLICIT	OCTET STRING,	-- the optional Key argument
- *	Time [ 1 ] EXPLICIT	INTEGER,	-- optional Start Time
- *	Timeout [ 2 ] EXPLICIT	INTEGER,	-- optional Timeout ins seconds
- *	Peer [ 3 ] EXPLICIT	X509,		-- optional Peer Certificate
- *	Session_ID_context [ 4 ] EXPLICIT OCTET STRING, -- the Session ID context
- *	Verify_result [ 5 ] EXPLICIT INTEGER, -- X509_V_... code for `Peer'
- *	HostName [ 6 ] EXPLICIT OCTET STRING, -- optional HostName from servername TLS extension 
- *	ECPointFormatList [ 7 ] OCTET STRING, -- optional EC point format list from TLS extension
- *	PSK_identity_hint [ 8 ] EXPLICIT OCTET STRING, -- optional PSK identity hint
- *	PSK_identity [ 9 ] EXPLICIT OCTET STRING -- optional PSK identity
- *	}
- * Look in ssl/ssl_asn1.c for more details
- * I'm using EXPLICIT tags so I can read the damn things using asn1parse :-).
- */
-typedef struct ssl_session_st
-	{
-	int ssl_version;	/* what ssl version session info is
-				 * being kept in here? */
-
-	/* only really used in SSLv2 */
-	unsigned int key_arg_length;
-	unsigned char key_arg[SSL_MAX_KEY_ARG_LENGTH];
-	int master_key_length;
-	unsigned char master_key[SSL_MAX_MASTER_KEY_LENGTH];
-	/* session_id - valid? */
-	unsigned int session_id_length;
-	unsigned char session_id[SSL_MAX_SSL_SESSION_ID_LENGTH];
-	/* this is used to determine whether the session is being reused in
-	 * the appropriate context. It is up to the application to set this,
-	 * via SSL_new */
-	unsigned int sid_ctx_length;
-	unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
-
-#ifndef OPENSSL_NO_KRB5
- unsigned int krb5_client_princ_len;
- unsigned char krb5_client_princ[SSL_MAX_KRB5_PRINCIPAL_LENGTH];
-#endif /* OPENSSL_NO_KRB5 */
-#ifndef OPENSSL_NO_PSK
-	char *psk_identity_hint;
-	char *psk_identity;
-#endif
-	int not_resumable;
+/* Typedef for verification callback */
+typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx);
 
-	/* The cert is the certificate used to establish this connection */
-	struct sess_cert_st /* SESS_CERT */ *sess_cert;
-
-	/* This is the cert for the other end.
-	 * On clients, it will be the same as sess_cert->peer_key->x509
-	 * (the latter is not enough as sess_cert is not retained
-	 * in the external representation of sessions, see ssl_asn1.c). */
-	X509 *peer;
-	/* when app_verify_callback accepts a session where the peer's certificate
-	 * is not ok, we must remember the error for session reuse: */
-	long verify_result; /* only for servers */
-
-	int references;
-	long timeout;
-	long time;
-
-	unsigned int compress_meth;	/* Need to lookup the method */
-
-	const SSL_CIPHER *cipher;
-	unsigned long cipher_id;	/* when ASN.1 loaded, this
-					 * needs to be used to load
-					 * the 'cipher' structure */
-
-	STACK_OF(SSL_CIPHER) *ciphers; /* shared ciphers? */
-
-	CRYPTO_EX_DATA ex_data; /* application specific data */
-
-	/* These are used to make removal of session-ids more
-	 * efficient and to implement a maximum cache size. */
-	struct ssl_session_st *prev,*next;
-#ifndef OPENSSL_NO_TLSEXT
-	char *tlsext_hostname;
-#ifndef OPENSSL_NO_EC
-	size_t tlsext_ecpointformatlist_length;
-	unsigned char *tlsext_ecpointformatlist; /* peer's list */
-	size_t tlsext_ellipticcurvelist_length;
-	unsigned char *tlsext_ellipticcurvelist; /* peer's list */
-#endif /* OPENSSL_NO_EC */
-	/* RFC4507 info */
-	unsigned char *tlsext_tick;	/* Session ticket */
-	size_t	tlsext_ticklen;		/* Session ticket length */	
-	long tlsext_tick_lifetime_hint;	/* Session lifetime hint in seconds */
-#endif
-	} SSL_SESSION;
-
-
-#define SSL_OP_MICROSOFT_SESS_ID_BUG			0x00000001L
-#define SSL_OP_NETSCAPE_CHALLENGE_BUG			0x00000002L
 /* Allow initial connection to servers that don't support RI */
-#define SSL_OP_LEGACY_SERVER_CONNECT			0x00000004L
-#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG		0x00000008L
-#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG		0x00000010L
-#define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER		0x00000020L
-#define SSL_OP_MSIE_SSLV2_RSA_PADDING			0x00000040L /* no effect since 0.9.7h and 0.9.8b */
-#define SSL_OP_SSLEAY_080_CLIENT_DH_BUG			0x00000080L
-#define SSL_OP_TLS_D5_BUG				0x00000100L
-#define SSL_OP_TLS_BLOCK_PADDING_BUG			0x00000200L
-
-/* 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. */
-#define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS 0x00000800L /* added in 0.9.6e */
-
-/* SSL_OP_ALL: various bug workarounds that should be rather harmless.
- * This used to be 0x000FFFFFL before 0.9.7. */
-#define SSL_OP_ALL					0x80000FFFL
+# 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 0x00001000L
+# define SSL_OP_NO_QUERY_MTU 0x00001000U
 /* Turn on Cookie Exchange (on relevant for servers) */
-#define SSL_OP_COOKIE_EXCHANGE 0x00002000L
+# define SSL_OP_COOKIE_EXCHANGE 0x00002000U
 /* Don't use RFC4507 ticket extension */
-#define SSL_OP_NO_TICKET	 0x00004000L
-/* Use Cisco's "speshul" version of DTLS_BAD_VER (as client) */
-#define SSL_OP_CISCO_ANYCONNECT		 0x00008000L
+# 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	0x00010000L
+# define SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION 0x00010000U
 /* Don't use compression even if supported */
-#define SSL_OP_NO_COMPRESSION				0x00020000L
+# define SSL_OP_NO_COMPRESSION 0x00020000U
 /* Permit unsafe legacy renegotiation */
-#define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION	0x00040000L
-/* If set, always create a new key when using tmp_ecdh parameters */
-#define SSL_OP_SINGLE_ECDH_USE				0x00080000L
-/* If set, always create a new key when using tmp_dh parameters */
-#define SSL_OP_SINGLE_DH_USE				0x00100000L
-/* Set to always use the tmp_rsa key when doing RSA operations,
- * even when this violates protocol specs */
-#define SSL_OP_EPHEMERAL_RSA				0x00200000L
-/* Set on servers to choose the cipher according to the server's
- * preferences */
-#define SSL_OP_CIPHER_SERVER_PREFERENCE			0x00400000L
-/* 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
+# 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				0x00800000L
-
-#define SSL_OP_NO_SSLv2					0x01000000L
-#define SSL_OP_NO_SSLv3					0x02000000L
-#define SSL_OP_NO_TLSv1					0x04000000L
-
-/* The next flag deliberately changes the ciphertest, this is a check
- * for the PKCS#1 attack */
-#define SSL_OP_PKCS1_CHECK_1				0x08000000L
-#define SSL_OP_PKCS1_CHECK_2				0x10000000L
-#define SSL_OP_NETSCAPE_CA_DN_BUG			0x20000000L
-#define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG		0x40000000L
-/* 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			0x80000000L
-
-/* 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 0x00000001L
-/* 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 0x00000002L
-/* Never bother the application with retries if the transport
- * is blocking: */
-#define SSL_MODE_AUTO_RETRY 0x00000004L
-/* Don't attempt to automatically build certificate chain */
-#define SSL_MODE_NO_AUTO_CHAIN 0x00000008L
-/* 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 0x00000010L
-
-/* Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value,
- * they cannot be used to clear bits. */
-
-#define SSL_CTX_set_options(ctx,op) \
-	SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL)
-#define SSL_CTX_clear_options(ctx,op) \
-	SSL_CTX_ctrl((ctx),SSL_CTRL_CLEAR_OPTIONS,(op),NULL)
-#define SSL_CTX_get_options(ctx) \
-	SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,0,NULL)
-#define SSL_set_options(ssl,op) \
-	SSL_ctrl((ssl),SSL_CTRL_OPTIONS,(op),NULL)
-#define SSL_clear_options(ssl,op) \
-	SSL_ctrl((ssl),SSL_CTRL_CLEAR_OPTIONS,(op),NULL)
-#define SSL_get_options(ssl) \
- SSL_ctrl((ssl),SSL_CTRL_OPTIONS,0,NULL)
-
-#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 SSL_get_secure_renegotiation_support(ssl) \
-	SSL_ctrl((ssl), SSL_CTRL_GET_RI_SUPPORT, 0, 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))
+ * 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
 
-#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32)
-#define SSL_MAX_CERT_LIST_DEFAULT 1024*30 /* 30k max cert list :-) */
-#else
-#define SSL_MAX_CERT_LIST_DEFAULT 1024*100 /* 100k max cert list :-) */
-#endif
+/*
+ * 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
 
-#define SSL_SESSION_CACHE_MAX_SIZE_DEFAULT	(1024*20)
+/*
+ * 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
 
-/* 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 SSLv2 this is 16 bytes, whereas SSLv3/TLSv1 it is 32 bytes. The callback
- * can alter this length to be less if desired, but under SSLv2 session IDs are
- * supposed to be fixed at 16 bytes so the id will be padded after the callback
- * returns in this case. 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);
-
-typedef struct ssl_comp_st
-	{
-	int id;
-	const char *name;
-#ifndef OPENSSL_NO_COMP
-	COMP_METHOD *method;
-#else
-	char *method;
-#endif
-	} SSL_COMP;
+/* 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
 
-DECLARE_STACK_OF(SSL_COMP)
-DECLARE_LHASH_OF(SSL_SESSION);
+/* 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
 
-struct ssl_ctx_st
-	{
-	const SSL_METHOD *method;
-
-	STACK_OF(SSL_CIPHER) *cipher_list;
-	/* same as above but sorted for lookup */
-	STACK_OF(SSL_CIPHER) *cipher_list_by_id;
-
-	struct x509_store_st /* X509_STORE */ *cert_store;
-	LHASH_OF(SSL_SESSION) *sessions;
-	/* Most session-ids that will be cached, default is
-	 * SSL_SESSION_CACHE_MAX_SIZE_DEFAULT. 0 is unlimited. */
-	unsigned long session_cache_size;
-	struct ssl_session_st *session_cache_head;
-	struct ssl_session_st *session_cache_tail;
-
-	/* This can have one of 2 values, ored together,
-	 * SSL_SESS_CACHE_CLIENT,
-	 * SSL_SESS_CACHE_SERVER,
-	 * Default is SSL_SESSION_CACHE_SERVER, which means only
-	 * SSL_accept which cache SSL_SESSIONS. */
-	int session_cache_mode;
-
-	/* If timeout is not 0, it is the default timeout value set
-	 * when SSL_new() is called. This has been put in to make
-	 * life easier to set things up */
-	long session_timeout;
-
-	/* If this callback is not null, it will be called each
-	 * time a session id is added to the cache. If this function
-	 * returns 1, it means that the callback will do a
-	 * SSL_SESSION_free() when it has finished using it. Otherwise,
-	 * on 0, it means the callback has finished with it.
-	 * If remove_session_cb is not null, it will be called when
-	 * a session-id is removed from the cache. After the call,
-	 * OpenSSL will SSL_SESSION_free() it. */
-	int (*new_session_cb)(struct ssl_st *ssl,SSL_SESSION *sess);
-	void (*remove_session_cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess);
-	SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl,
-		unsigned char *data,int len,int *copy);
-
-	struct
-		{
-		int sess_connect;	/* SSL new conn - started */
-		int sess_connect_renegotiate;/* SSL reneg - requested */
-		int sess_connect_good;	/* SSL new conne/reneg - finished */
-		int sess_accept;	/* SSL new accept - started */
-		int sess_accept_renegotiate;/* SSL reneg - requested */
-		int sess_accept_good;	/* SSL accept/reneg - finished */
-		int sess_miss;		/* session lookup misses */
-		int sess_timeout;	/* reuse attempt on timeouted session */
-		int sess_cache_full;	/* session removed due to full cache */
-		int sess_hit;		/* session reuse actually done */
-		int sess_cb_hit;	/* session-id that was not
-					 * in the cache was
-					 * passed back via the callback. This
-					 * indicates that the application is
-					 * supplying session-id's from other
-					 * processes - spooky :-) */
-		} stats;
-
-	int references;
-
-	/* if defined, these override the X509_verify_cert() calls */
-	int (*app_verify_callback)(X509_STORE_CTX *, void *);
-	void *app_verify_arg;
-	/* before OpenSSL 0.9.7, 'app_verify_arg' was ignored
-	 * ('app_verify_callback' was called with just one argument) */
-
-	/* Default password callback. */
-	pem_password_cb *default_passwd_callback;
-
-	/* Default password callback user data. */
-	void *default_passwd_callback_userdata;
-
-	/* get client cert callback */
-	int (*client_cert_cb)(SSL *ssl, X509 **x509, EVP_PKEY **pkey);
-
- /* cookie generate callback */
- int (*app_gen_cookie_cb)(SSL *ssl, unsigned char *cookie, 
- unsigned int *cookie_len);
-
- /* verify cookie callback */
- int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, 
- unsigned int cookie_len);
-
-	CRYPTO_EX_DATA ex_data;
-
-	const EVP_MD *rsa_md5;/* For SSLv2 - name is 'ssl2-md5' */
-	const EVP_MD *md5;	/* For SSLv3/TLSv1 'ssl3-md5' */
-	const EVP_MD *sha1; /* For SSLv3/TLSv1 'ssl3->sha1' */
-
-	STACK_OF(X509) *extra_certs;
-	STACK_OF(SSL_COMP) *comp_methods; /* stack of SSL_COMP, SSLv3/TLSv1 */
-
-
-	/* Default values used when no per-SSL value is defined follow */
-
-	void (*info_callback)(const SSL *ssl,int type,int val); /* used if SSL's info_callback is NULL */
-
-	/* what we put in client cert requests */
-	STACK_OF(X509_NAME) *client_CA;
-
-
-	/* Default values to use in SSL structures follow (these are copied by SSL_new) */
-
-	unsigned long options;
-	unsigned long mode;
-	long max_cert_list;
-
-	struct cert_st /* CERT */ *cert;
-	int read_ahead;
-
-	/* callback that allows applications to peek at protocol messages */
-	void (*msg_callback)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg);
-	void *msg_callback_arg;
-
-	int verify_mode;
-	unsigned int sid_ctx_length;
-	unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
-	int (*default_verify_callback)(int ok,X509_STORE_CTX *ctx); /* called 'verify_callback' in the SSL */
-
-	/* Default generate session ID callback. */
-	GEN_SESSION_CB generate_session_id;
-
-	X509_VERIFY_PARAM *param;
-
-#if 0
-	int purpose;		/* Purpose setting */
-	int trust;		/* Trust setting */
-#endif
+/*
+ * Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value, they
+ * cannot be used to clear bits.
+ */
 
-	int quiet_shutdown;
+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);
 
-	/* Maximum amount of data to send in one fragment.
-	 * actual record size can be more than this due to
-	 * padding and MAC overheads.
-	 */
-	unsigned int max_send_fragment;
-
-#ifndef OPENSSL_ENGINE
-	/* Engine to pass requests for client certs to
-	 */
-	ENGINE *client_cert_engine;
-#endif
+# endif
 
-#ifndef OPENSSL_NO_TLSEXT
-	/* TLS extensions servername callback */
-	int (*tlsext_servername_callback)(SSL*, int *, void *);
-	void *tlsext_servername_arg;
-	/* RFC 4507 session ticket keys */
-	unsigned char tlsext_tick_key_name[16];
-	unsigned char tlsext_tick_hmac_key[16];
-	unsigned char tlsext_tick_aes_key[16];
-	/* Callback to support customisation of ticket key setting */
-	int (*tlsext_ticket_key_cb)(SSL *ssl,
-					unsigned char *name, unsigned char *iv,
-					EVP_CIPHER_CTX *ectx,
- 					HMAC_CTX *hctx, int enc);
-
-	/* certificate status request info */
-	/* Callback for status request */
-	int (*tlsext_status_cb)(SSL *ssl, void *arg);
-	void *tlsext_status_arg;
-
-	/* draft-rescorla-tls-opaque-prf-input-00.txt information */
-	int (*tlsext_opaque_prf_input_callback)(SSL *, void *peerinput, size_t len, void *arg);
-	void *tlsext_opaque_prf_input_callback_arg;
-#endif
+/* 100k max cert list */
+# define SSL_MAX_CERT_LIST_DEFAULT 1024*100
 
-#ifndef OPENSSL_NO_PSK
-	char *psk_identity_hint;
-	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);
-	unsigned int (*psk_server_callback)(SSL *ssl, const char *identity,
-		unsigned char *psk, unsigned int max_psk_len);
-#endif
+# define SSL_SESSION_CACHE_MAX_SIZE_DEFAULT (1024*20)
 
-#ifndef OPENSSL_NO_BUF_FREELISTS
-#define SSL_MAX_BUF_FREELIST_LEN_DEFAULT 32
-	unsigned int freelist_max_len;
-	struct ssl3_buf_freelist_st *wbuf_freelist;
-	struct ssl3_buf_freelist_st *rbuf_freelist;
-#endif
-	};
+/*
+ * 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
+# 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)
+# 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, unsigned char *data,int len,int *copy));
-SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(struct ssl_st *ssl, 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
-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, unsigned char *cookie, unsigned int cookie_len));
+# 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));
+# 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));
-int SSL_CTX_use_psk_identity_hint(SSL_CTX *ctx, const char *identity_hint);
-int SSL_use_psk_identity_hint(SSL *s, const char *identity_hint);
+ 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
-
-#define SSL_NOTHING	1
-#define SSL_WRITING	2
-#define SSL_READING	3
-#define SSL_X509_LOOKUP	4
-
-/* 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_MAC_FLAG_READ_MAC_STREAM 1
-#define SSL_MAC_FLAG_WRITE_MAC_STREAM 2
-
-struct ssl_st
-	{
-	/* protocol version
-	 * (one of SSL2_VERSION, SSL3_VERSION, TLS1_VERSION, DTLS1_VERSION)
-	 */
-	int version;
-	int type; /* SSL_ST_CONNECT or SSL_ST_ACCEPT */
-
-	const SSL_METHOD *method; /* SSLv3 */
-
-	/* There are 2 BIO's even though they are normally both the
-	 * same. This is so data can be read and written to different
-	 * handlers */
-
-#ifndef OPENSSL_NO_BIO
-	BIO *rbio; /* used by SSL_read */
-	BIO *wbio; /* used by SSL_write */
-	BIO *bbio; /* used during session-id reuse to concatenate
-		 * messages */
-#else
-	char *rbio; /* used by SSL_read */
-	char *wbio; /* used by SSL_write */
-	char *bbio;
-#endif
-	/* This holds a variable that indicates what we were doing
-	 * when a 0 or -1 is returned. This is needed for
-	 * non-blocking IO so we know what request needs re-doing when
-	 * in SSL_accept or SSL_connect */
-	int rwstate;
-
-	/* true when we are actually in SSL_accept() or SSL_connect() */
-	int in_handshake;
-	int (*handshake_func)(SSL *);
-
-	/* Imagine that here's a boolean member "init" that is
-	 * switched as soon as SSL_set_{accept/connect}_state
-	 * is called for the first time, so that "state" and
-	 * "handshake_func" are properly initialized. But as
-	 * handshake_func is == 0 until then, we use this
-	 * test instead of an "init" member.
-	 */
-
-	int server;	/* are we the server side? - mostly used by SSL_clear*/
-
-	int new_session;/* 1 if we are to use a new session.
-	 * 2 if we are a server and are inside a handshake
-	 * (i.e. not just sending a HelloRequest)
-	 * NB: For servers, the 'new' session may actually be a previously
-	 * cached session or even the previous session unless
-	 * SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION is set */
-	int quiet_shutdown;/* don't send shutdown packets */
-	int shutdown;	/* we have shut things down, 0x01 sent, 0x02
-			 * for received */
-	int state;	/* where we are */
-	int rstate;	/* where we are when reading */
-
-	BUF_MEM *init_buf;	/* buffer used during init */
-	void *init_msg; 	/* pointer to handshake message body, set by ssl3_get_message() */
-	int init_num;		/* amount read/written */
-	int init_off;		/* amount read/written */
-
-	/* used internally to point at a raw packet */
-	unsigned char *packet;
-	unsigned int packet_length;
-
-	struct ssl2_state_st *s2; /* SSLv2 variables */
-	struct ssl3_state_st *s3; /* SSLv3 variables */
-	struct dtls1_state_st *d1; /* DTLSv1 variables */
-
-	int read_ahead;		/* Read as many input bytes as possible
-	 	 	 * (for non-blocking reads) */
-
-	/* callback that allows applications to peek at protocol messages */
-	void (*msg_callback)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg);
-	void *msg_callback_arg;
-
-	int hit;		/* reusing a previous session */
-
-	X509_VERIFY_PARAM *param;
-
-#if 0
-	int purpose;		/* Purpose setting */
-	int trust;		/* Trust setting */
-#endif
+# endif
 
-	/* crypto */
-	STACK_OF(SSL_CIPHER) *cipher_list;
-	STACK_OF(SSL_CIPHER) *cipher_list_by_id;
-
-	/* These are the ones being used, the ones in SSL_SESSION are
-	 * the ones to be 'copied' into these ones */
-	int mac_flags; 
-	EVP_CIPHER_CTX *enc_read_ctx;		/* cryptographic state */
-	EVP_MD_CTX *read_hash;		/* used for mac generation */
-#ifndef OPENSSL_NO_COMP
-	COMP_CTX *expand;			/* uncompress */
-#else
-	char *expand;
-#endif
+/* Register callbacks to handle custom TLS Extensions for client or server. */
 
-	EVP_CIPHER_CTX *enc_write_ctx;		/* cryptographic state */
-	EVP_MD_CTX *write_hash;		/* used for mac generation */
-#ifndef OPENSSL_NO_COMP
-	COMP_CTX *compress;			/* compression */
-#else
-	char *compress;	
-#endif
+__owur int SSL_CTX_has_client_custom_ext(const SSL_CTX *ctx,
+ unsigned int ext_type);
 
-	/* session info */
+__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
 
-	/* client cert? */
-	/* This is used to hold the server certificate used */
-	struct cert_st /* CERT */ *cert;
-
-	/* the session_id_context is used to ensure sessions are only reused
-	 * in the appropriate context */
-	unsigned int sid_ctx_length;
-	unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
-
-	/* This can also be in the session once a session is established */
-	SSL_SESSION *session;
-
-	/* Default generate session ID callback. */
-	GEN_SESSION_CB generate_session_id;
-
-	/* Used in SSL2 and SSL3 */
-	int verify_mode;	/* 0 don't care about verify failure.
-				 * 1 fail if verify fails */
-	int (*verify_callback)(int ok,X509_STORE_CTX *ctx); /* fail if callback returns 0 */
-
-	void (*info_callback)(const SSL *ssl,int type,int val); /* optional informational callback */
-
-	int error;		/* error bytes to be written */
-	int error_code;		/* actual code */
-
-#ifndef OPENSSL_NO_KRB5
-	KSSL_CTX *kssl_ctx; /* Kerberos 5 context */
-#endif	/* OPENSSL_NO_KRB5 */
-
-#ifndef OPENSSL_NO_PSK
-	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);
-	unsigned int (*psk_server_callback)(SSL *ssl, const char *identity,
-		unsigned char *psk, unsigned int max_psk_len);
-#endif
+/* 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)
 
-	SSL_CTX *ctx;
-	/* set this flag to 1 and a sleep(1) is put into all SSL_read()
-	 * and SSL_write() calls, good for nbio debuging :-) */
-	int debug;	
-
-	/* extra application data */
-	long verify_result;
-	CRYPTO_EX_DATA ex_data;
-
-	/* for server side, keep the list of CA_dn we can use */
-	STACK_OF(X509_NAME) *client_CA;
-
-	int references;
-	unsigned long options; /* protocol behaviour */
-	unsigned long mode; /* API behaviour */
-	long max_cert_list;
-	int first_packet;
-	int client_version;	/* what was passed, used for
-				 * SSLv3/TLS rollback check */
-	unsigned int max_send_fragment;
-#ifndef OPENSSL_NO_TLSEXT
-	/* TLS extension debug callback */
-	void (*tlsext_debug_cb)(SSL *s, int client_server, int type,
-					unsigned char *data, int len,
-					void *arg);
-	void *tlsext_debug_arg;
-	char *tlsext_hostname;
-	int servername_done; /* no further mod of servername 
-	 0 : call the servername extension callback.
-	 1 : prepare 2, allow last ack just after in server callback.
-	 2 : don't call servername callback, no ack in server hello
-	 */
-	/* certificate status request info */
-	/* Status type or -1 if no status type */
-	int tlsext_status_type;
-	/* Expect OCSP CertificateStatus message */
-	int tlsext_status_expected;
-	/* OCSP status request only */
-	STACK_OF(OCSP_RESPID) *tlsext_ocsp_ids;
-	X509_EXTENSIONS *tlsext_ocsp_exts;
-	/* OCSP response received or to be sent */
-	unsigned char *tlsext_ocsp_resp;
-	int tlsext_ocsp_resplen;
-
-	/* RFC4507 session ticket expected to be received or sent */
-	int tlsext_ticket_expected;
-#ifndef OPENSSL_NO_EC
-	size_t tlsext_ecpointformatlist_length;
-	unsigned char *tlsext_ecpointformatlist; /* our list */
-	size_t tlsext_ellipticcurvelist_length;
-	unsigned char *tlsext_ellipticcurvelist; /* our list */
-#endif /* OPENSSL_NO_EC */
-
-	/* draft-rescorla-tls-opaque-prf-input-00.txt information to be used for handshakes */
-	void *tlsext_opaque_prf_input;
-	size_t tlsext_opaque_prf_input_len;
-
-	/* TLS Session Ticket extension override */
-	TLS_SESSION_TICKET_EXT *tlsext_session_ticket;
-
-	/* TLS Session Ticket extension callback */
-	tls_session_ticket_ext_cb_fn tls_session_ticket_ext_cb;
-	void *tls_session_ticket_ext_cb_arg;
-
-	/* TLS pre-shared secret session resumption */
-	tls_session_secret_cb_fn tls_session_secret_cb;
-	void *tls_session_secret_cb_arg;
-
-	SSL_CTX * initial_ctx; /* initial ctx, used to store sessions */
-#define session_ctx initial_ctx
-#else
-#define session_ctx ctx
-#endif /* OPENSSL_NO_TLSEXT */
-	};
+# 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/ssl23.h>
+# 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))
-
-/* The following are the possible values for ssl->state are are
- * used to indicate where we are up to in the SSL connection establishment.
- * The macros that follow are about the only things you should need to use
- * and even then, only when using non-blocking IO.
- * It can also be useful to work out where you were when the connection
- * failed */
-
-#define SSL_ST_CONNECT			0x1000
-#define SSL_ST_ACCEPT			0x2000
-#define SSL_ST_MASK			0x0FFF
-#define SSL_ST_INIT			(SSL_ST_CONNECT|SSL_ST_ACCEPT)
-#define SSL_ST_BEFORE			0x4000
-#define SSL_ST_OK			0x03
-#define SSL_ST_RENEGOTIATE		(0x04|SSL_ST_INIT)
-
-#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
+# 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_get_state(a)		SSL_state(a)
-#define SSL_is_init_finished(a)		(SSL_state(a) == SSL_ST_OK)
-#define SSL_in_init(a)			(SSL_state(a)&SSL_ST_INIT)
-#define SSL_in_before(a)		(SSL_state(a)&SSL_ST_BEFORE)
-#define SSL_in_connect_init(a)		(SSL_state(a)&SSL_ST_CONNECT)
-#define SSL_in_accept_init(a)		(SSL_state(a)&SSL_ST_ACCEPT)
-
-/* The following 2 states are kept in ssl->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
+# 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);
 
-/* Obtain latest Finished message
+/*
+ * 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. */
+ * 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()
-#define SSLeay_add_ssl_algorithms()	SSL_library_init()
-
-/* this is for backward compatibility */
-#if 0 /* NEW_SSLEAY */
-#define SSL_CTX_set_default_verify(a,b,c) SSL_CTX_set_verify(a,b,c)
-#define SSL_set_pref_cipher(c,n)	SSL_set_cipher_list(c,n)
-#define SSL_add_session(a,b) SSL_CTX_add_session((a),(b))
-#define SSL_remove_session(a,b)		SSL_CTX_remove_session((a),(b))
-#define SSL_flush_sessions(a,b)		SSL_CTX_flush_sessions((a),(b))
-#endif
+/*
+ * 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 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)
+# 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_... */
-
+# 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
-#define SSL_AD_UNEXPECTED_MESSAGE	SSL3_AD_UNEXPECTED_MESSAGE /* fatal */
-#define SSL_AD_BAD_RECORD_MAC		SSL3_AD_BAD_RECORD_MAC /* fatal */
-#define SSL_AD_DECRYPTION_FAILED	TLS1_AD_DECRYPTION_FAILED
-#define SSL_AD_RECORD_OVERFLOW		TLS1_AD_RECORD_OVERFLOW
-#define SSL_AD_DECOMPRESSION_FAILURE	SSL3_AD_DECOMPRESSION_FAILURE/* fatal */
-#define SSL_AD_HANDSHAKE_FAILURE	SSL3_AD_HANDSHAKE_FAILURE/* fatal */
-#define SSL_AD_NO_CERTIFICATE		SSL3_AD_NO_CERTIFICATE /* Not for TLS */
-#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
-#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	/* fatal */
-#define SSL_AD_DECRYPT_ERROR		TLS1_AD_DECRYPT_ERROR
-#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	/* fatal */
-#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
-#define SSL_AD_UNKNOWN_PSK_IDENTITY TLS1_AD_UNKNOWN_PSK_IDENTITY /* fatal */
-
-#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_CTRL_NEED_TMP_RSA			1
-#define SSL_CTRL_SET_TMP_RSA			2
-#define SSL_CTRL_SET_TMP_DH			3
-#define SSL_CTRL_SET_TMP_ECDH			4
-#define SSL_CTRL_SET_TMP_RSA_CB			5
-#define SSL_CTRL_SET_TMP_DH_CB			6
-#define SSL_CTRL_SET_TMP_ECDH_CB		7
-
-#define SSL_CTRL_GET_SESSION_REUSED		8
-#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
-
+# 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
+# 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_OPTIONS			32
-#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
-
+# 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 */
-#ifndef OPENSSL_NO_TLSEXT
-#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_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
 
-#define DTLS_CTRL_GET_TIMEOUT		73
-#define DTLS_CTRL_HANDLE_TIMEOUT	74
-#define DTLS_CTRL_LISTEN			75
-
-#define SSL_CTRL_GET_RI_SUPPORT			76
-#define SSL_CTRL_CLEAR_OPTIONS			77
-#define SSL_CTRL_CLEAR_MODE			78
-
-#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 DTLSv1_listen(ssl, peer) \
-	SSL_ctrl(ssl,DTLS_CTRL_LISTEN,0, (void *)peer)
-
-#define SSL_session_reused(ssl) \
-	SSL_ctrl((ssl),SSL_CTRL_GET_SESSION_REUSED,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_need_tmp_RSA(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_NEED_TMP_RSA,0,NULL)
-#define SSL_CTX_set_tmp_rsa(ctx,rsa) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_RSA,0,(char *)rsa)
-#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_need_tmp_RSA(ssl) \
-	SSL_ctrl(ssl,SSL_CTRL_NEED_TMP_RSA,0,NULL)
-#define SSL_set_tmp_rsa(ssl,rsa) \
-	SSL_ctrl(ssl,SSL_CTRL_SET_TMP_RSA,0,(char *)rsa)
-#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)
-
-#ifndef OPENSSL_NO_BIO
-BIO_METHOD *BIO_f_ssl(void);
-BIO *BIO_new_ssl(SSL_CTX *ctx,int client);
-BIO *BIO_new_ssl_connect(SSL_CTX *ctx);
-BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx);
-int BIO_ssl_copy_session_id(BIO *to,BIO *from);
+__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);
 
-#endif
+__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);
 
-int	SSL_CTX_set_cipher_list(SSL_CTX *,const char *str);
-SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth);
-void	SSL_CTX_free(SSL_CTX *);
-long SSL_CTX_set_timeout(SSL_CTX *ctx,long t);
-long SSL_CTX_get_timeout(const SSL_CTX *ctx);
-X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *);
-void SSL_CTX_set_cert_store(SSL_CTX *,X509_STORE *);
-int SSL_want(const SSL *s);
-int	SSL_clear(SSL *s);
-
-void	SSL_CTX_flush_sessions(SSL_CTX *ctx,long tm);
-
-const SSL_CIPHER *SSL_get_current_cipher(const SSL *s);
-int	SSL_CIPHER_get_bits(const SSL_CIPHER *c,int *alg_bits);
-char *	SSL_CIPHER_get_version(const SSL_CIPHER *c);
-const char *	SSL_CIPHER_get_name(const SSL_CIPHER *c);
-
-int	SSL_get_fd(const SSL *s);
-int	SSL_get_rfd(const SSL *s);
-int	SSL_get_wfd(const SSL *s);
-const char * SSL_get_cipher_list(const SSL *s,int n);
-char *	SSL_get_shared_ciphers(const SSL *s, char *buf, int len);
-int	SSL_get_read_ahead(const SSL * s);
-int	SSL_pending(const SSL *s);
-#ifndef OPENSSL_NO_SOCK
-int	SSL_set_fd(SSL *s, int fd);
-int	SSL_set_rfd(SSL *s, int fd);
-int	SSL_set_wfd(SSL *s, int fd);
-#endif
-#ifndef OPENSSL_NO_BIO
-void	SSL_set_bio(SSL *s, BIO *rbio,BIO *wbio);
-BIO *	SSL_get_rbio(const SSL *s);
-BIO *	SSL_get_wbio(const SSL *s);
-#endif
-int	SSL_set_cipher_list(SSL *s, const char *str);
-void	SSL_set_read_ahead(SSL *s, int yes);
-int	SSL_get_verify_mode(const SSL *s);
-int	SSL_get_verify_depth(const SSL *s);
-int	(*SSL_get_verify_callback(const SSL *s))(int,X509_STORE_CTX *);
-void	SSL_set_verify(SSL *s, int mode,
-		 int (*callback)(int ok,X509_STORE_CTX *ctx));
-void	SSL_set_verify_depth(SSL *s, int depth);
 #ifndef OPENSSL_NO_RSA
-int	SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa);
-#endif
-int	SSL_use_RSAPrivateKey_ASN1(SSL *ssl, unsigned char *d, long len);
-int	SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey);
-int	SSL_use_PrivateKey_ASN1(int pk,SSL *ssl, const unsigned char *d, long len);
-int	SSL_use_certificate(SSL *ssl, X509 *x);
-int	SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len);
-
-#ifndef OPENSSL_NO_STDIO
-int	SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type);
-int	SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type);
-int	SSL_use_certificate_file(SSL *ssl, const char *file, int type);
-int	SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type);
-int	SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type);
-int	SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type);
-int	SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file); /* PEM type */
-STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
-int	SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
-					 const char *file);
-#ifndef OPENSSL_SYS_VMS
-#ifndef OPENSSL_SYS_MACINTOSH_CLASSIC /* XXXXX: Better scheme needed! [was: #ifndef MAC_OS_pre_X] */
-int	SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
-					 const char *dir);
-#endif
-#endif
-
-#endif
-
-void	SSL_load_error_strings(void );
-const char *SSL_state_string(const SSL *s);
-const char *SSL_rstate_string(const SSL *s);
-const char *SSL_state_string_long(const SSL *s);
-const char *SSL_rstate_string_long(const SSL *s);
-long	SSL_SESSION_get_time(const SSL_SESSION *s);
-long	SSL_SESSION_set_time(SSL_SESSION *s, long t);
-long	SSL_SESSION_get_timeout(const SSL_SESSION *s);
-long	SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
-void	SSL_copy_session_id(SSL *to,const SSL *from);
-
-SSL_SESSION *SSL_SESSION_new(void);
-const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s,
-					unsigned int *len);
-#ifndef OPENSSL_NO_FP_API
-int	SSL_SESSION_print_fp(FILE *fp,const SSL_SESSION *ses);
-#endif
-#ifndef OPENSSL_NO_BIO
-int	SSL_SESSION_print(BIO *fp,const SSL_SESSION *ses);
-#endif
-void	SSL_SESSION_free(SSL_SESSION *ses);
-int	i2d_SSL_SESSION(SSL_SESSION *in,unsigned char **pp);
-int	SSL_set_session(SSL *to, SSL_SESSION *session);
-int	SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c);
-int	SSL_CTX_remove_session(SSL_CTX *,SSL_SESSION *c);
-int	SSL_CTX_set_generate_session_id(SSL_CTX *, GEN_SESSION_CB);
-int	SSL_set_generate_session_id(SSL *, GEN_SESSION_CB);
-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
-X509 *	SSL_get_peer_certificate(const SSL *s);
+__owur int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type);
 #endif
 
-STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s);
+__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);
 
-int SSL_CTX_get_verify_mode(const SSL_CTX *ctx);
-int SSL_CTX_get_verify_depth(const SSL_CTX *ctx);
-int (*SSL_CTX_get_verify_callback(const SSL_CTX *ctx))(int,X509_STORE_CTX *);
-void SSL_CTX_set_verify(SSL_CTX *ctx,int mode,
-			int (*callback)(int, X509_STORE_CTX *));
-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);
 #ifndef OPENSSL_NO_RSA
-int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa);
+__owur int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type);
 #endif
-int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d, long len);
-int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey);
-int SSL_CTX_use_PrivateKey_ASN1(int pk,SSL_CTX *ctx,
-	const unsigned char *d, long len);
-int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x);
-int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len, const unsigned char *d);
+__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));
 
-int SSL_CTX_check_private_key(const SSL_CTX *ctx);
-int SSL_check_private_key(const SSL *ctx);
-
-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_set_session_id_context(SSL *ssl,const unsigned char *sid_ctx,
-				 unsigned int sid_ctx_len);
-
-int SSL_CTX_set_purpose(SSL_CTX *s, int purpose);
-int SSL_set_purpose(SSL *s, int purpose);
-int SSL_CTX_set_trust(SSL_CTX *s, int trust);
-int SSL_set_trust(SSL *s, int trust);
-
-int SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm);
-int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm);
-
-void	SSL_free(SSL *ssl);
-int 	SSL_accept(SSL *ssl);
-int 	SSL_connect(SSL *ssl);
-int 	SSL_read(SSL *ssl,void *buf,int num);
-int 	SSL_peek(SSL *ssl,void *buf,int num);
-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));
-
-int	SSL_get_error(const SSL *s,int ret_code);
-const char *SSL_get_version(const SSL *s);
+__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 */
-int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth);
-
-#ifndef OPENSSL_NO_SSL2
-const SSL_METHOD *SSLv2_method(void);		/* SSLv2 */
-const SSL_METHOD *SSLv2_server_method(void);	/* SSLv2 */
-const SSL_METHOD *SSLv2_client_method(void);	/* SSLv2 */
-#endif
+__owur int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth);
 
-const SSL_METHOD *SSLv3_method(void);		/* SSLv3 */
-const SSL_METHOD *SSLv3_server_method(void);	/* SSLv3 */
-const SSL_METHOD *SSLv3_client_method(void);	/* SSLv3 */
+# 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);
 
-const SSL_METHOD *SSLv23_method(void);	/* SSLv3 but can rollback to v2 */
-const SSL_METHOD *SSLv23_server_method(void);	/* SSLv3 but can rollback to v2 */
-const SSL_METHOD *SSLv23_client_method(void);	/* SSLv3 but can rollback to v2 */
-
-const SSL_METHOD *TLSv1_method(void);		/* TLSv1.0 */
-const SSL_METHOD *TLSv1_server_method(void);	/* TLSv1.0 */
-const SSL_METHOD *TLSv1_client_method(void);	/* TLSv1.0 */
-
-const SSL_METHOD *DTLSv1_method(void);		/* DTLSv1.0 */
-const SSL_METHOD *DTLSv1_server_method(void);	/* DTLSv1.0 */
-const SSL_METHOD *DTLSv1_client_method(void);	/* DTLSv1.0 */
-
-STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *s);
-
-int SSL_do_handshake(SSL *s);
+__owur int SSL_do_handshake(SSL *s);
 int SSL_renegotiate(SSL *s);
-int SSL_renegotiate_pending(SSL *s);
+__owur int SSL_renegotiate_abbreviated(SSL *s);
+__owur int SSL_renegotiate_pending(SSL *s);
 int SSL_shutdown(SSL *s);
 
-const SSL_METHOD *SSL_get_ssl_method(SSL *s);
-int SSL_set_ssl_method(SSL *s, const SSL_METHOD *method);
-const char *SSL_alert_type_string_long(int value);
-const char *SSL_alert_type_string(int value);
-const char *SSL_alert_desc_string_long(int value);
-const char *SSL_alert_desc_string(int value);
+__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);
-STACK_OF(X509_NAME) *SSL_get_client_CA_list(const SSL *s);
-STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(const SSL_CTX *s);
-int SSL_add_client_CA(SSL *ssl,X509 *x);
-int SSL_CTX_add_client_CA(SSL_CTX *ctx,X509 *x);
+__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);
 
-long SSL_get_default_timeout(const SSL *s);
+__owur long SSL_get_default_timeout(const SSL *s);
 
-int SSL_library_init(void );
+#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);
 
-char *SSL_CIPHER_description(const SSL_CIPHER *,char *buf,int size);
-STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk);
+__owur SSL *SSL_dup(SSL *ssl);
 
-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);
 
-X509 *SSL_get_certificate(const SSL *ssl);
-/* EVP_PKEY */ struct evp_pkey_st *SSL_get_privatekey(SSL *ssl);
-
-void SSL_CTX_set_quiet_shutdown(SSL_CTX *ctx,int mode);
-int SSL_CTX_get_quiet_shutdown(const SSL_CTX *ctx);
-void SSL_set_quiet_shutdown(SSL *ssl,int mode);
-int SSL_get_quiet_shutdown(const SSL *ssl);
-void SSL_set_shutdown(SSL *ssl,int mode);
-int SSL_get_shutdown(const SSL *ssl);
-int SSL_version(const SSL *ssl);
-int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx);
-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 */
-SSL_SESSION *SSL_get_session(const SSL *ssl);
-SSL_SESSION *SSL_get1_session(SSL *ssl); /* obtain a reference count */
-SSL_CTX *SSL_get_SSL_CTX(const SSL *ssl);
-SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX* ctx);
+__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);
-int SSL_state(const SSL *ssl);
-
-void SSL_set_verify_result(SSL *ssl,long v);
-long SSL_get_verify_result(const SSL *ssl);
-
-int SSL_set_ex_data(SSL *ssl,int idx,void *data);
-void *SSL_get_ex_data(const SSL *ssl,int idx);
-int SSL_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-
-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);
-int SSL_SESSION_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-
-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);
-int SSL_CTX_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-
-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)
+ 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)
 
- /* NB: the keylength is only applicable when is_export is true */
-#ifndef OPENSSL_NO_RSA
-void SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx,
-				 RSA *(*cb)(SSL *ssl,int is_export,
-					 int keylength));
-
-void SSL_set_tmp_rsa_callback(SSL *ssl,
-				 RSA *(*cb)(SSL *ssl,int is_export,
-					 int keylength));
-#endif
-#ifndef OPENSSL_NO_DH
+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));
+ 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
-#ifndef OPENSSL_NO_ECDH
-void SSL_CTX_set_tmp_ecdh_callback(SSL_CTX *ctx,
-				 EC_KEY *(*ecdh)(SSL *ssl,int is_export,
-					 int keylength));
-void SSL_set_tmp_ecdh_callback(SSL *ssl,
-				 EC_KEY *(*ecdh)(SSL *ssl,int is_export,
-					 int keylength));
-#endif
-
-#ifndef OPENSSL_NO_COMP
-const COMP_METHOD *SSL_get_current_compression(SSL *s);
-const COMP_METHOD *SSL_get_current_expansion(SSL *s);
-const char *SSL_COMP_get_name(const COMP_METHOD *comp);
+ 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);
-int SSL_COMP_add_compression_method(int id,COMP_METHOD *cm);
-#else
-const void *SSL_get_current_compression(SSL *s);
-const void *SSL_get_current_expansion(SSL *s);
-const char *SSL_COMP_get_name(const void *comp);
-void *SSL_COMP_get_compression_methods(void);
-int SSL_COMP_add_compression_method(int id,void *cm);
-#endif
+__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 */
-int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len);
+__owur int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len);
 
-int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,
-				 void *arg);
+__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 */
-int SSL_set_session_secret_cb(SSL *s, tls_session_secret_cb_fn tls_session_secret_cb, void *arg);
+__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
+/*
+ * 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.
 */
-void ERR_load_SSL_strings(void);
+
+int ERR_load_SSL_strings(void);
 
 /* Error codes for the SSL functions. */
 
 /* Function codes. */
-#define SSL_F_CLIENT_CERTIFICATE			 100
-#define SSL_F_CLIENT_FINISHED				 167
-#define SSL_F_CLIENT_HELLO				 101
-#define SSL_F_CLIENT_MASTER_KEY				 102
-#define SSL_F_D2I_SSL_SESSION				 103
-#define SSL_F_DO_DTLS1_WRITE				 245
-#define SSL_F_DO_SSL3_WRITE				 104
-#define SSL_F_DTLS1_ACCEPT				 246
-#define SSL_F_DTLS1_ADD_CERT_TO_BUF			 295
-#define SSL_F_DTLS1_BUFFER_RECORD			 247
-#define SSL_F_DTLS1_CLIENT_HELLO			 248
-#define SSL_F_DTLS1_CONNECT				 249
-#define SSL_F_DTLS1_ENC					 250
-#define SSL_F_DTLS1_GET_HELLO_VERIFY			 251
-#define SSL_F_DTLS1_GET_MESSAGE				 252
-#define SSL_F_DTLS1_GET_MESSAGE_FRAGMENT		 253
-#define SSL_F_DTLS1_GET_RECORD				 254
-#define SSL_F_DTLS1_HANDLE_TIMEOUT			 297
-#define SSL_F_DTLS1_OUTPUT_CERT_CHAIN			 255
-#define SSL_F_DTLS1_PREPROCESS_FRAGMENT			 288
-#define SSL_F_DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE		 256
-#define SSL_F_DTLS1_PROCESS_RECORD			 257
-#define SSL_F_DTLS1_READ_BYTES				 258
-#define SSL_F_DTLS1_READ_FAILED				 259
-#define SSL_F_DTLS1_SEND_CERTIFICATE_REQUEST		 260
-#define SSL_F_DTLS1_SEND_CLIENT_CERTIFICATE		 261
-#define SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE		 262
-#define SSL_F_DTLS1_SEND_CLIENT_VERIFY			 263
-#define SSL_F_DTLS1_SEND_HELLO_VERIFY_REQUEST		 264
-#define SSL_F_DTLS1_SEND_SERVER_CERTIFICATE		 265
-#define SSL_F_DTLS1_SEND_SERVER_HELLO			 266
-#define SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE		 267
-#define SSL_F_DTLS1_WRITE_APP_DATA_BYTES		 268
-#define SSL_F_GET_CLIENT_FINISHED			 105
-#define SSL_F_GET_CLIENT_HELLO				 106
-#define SSL_F_GET_CLIENT_MASTER_KEY			 107
-#define SSL_F_GET_SERVER_FINISHED			 108
-#define SSL_F_GET_SERVER_HELLO				 109
-#define SSL_F_GET_SERVER_VERIFY				 110
-#define SSL_F_I2D_SSL_SESSION				 111
-#define SSL_F_READ_N					 112
-#define SSL_F_REQUEST_CERTIFICATE			 113
-#define SSL_F_SERVER_FINISH				 239
-#define SSL_F_SERVER_HELLO				 114
-#define SSL_F_SERVER_VERIFY				 240
-#define SSL_F_SSL23_ACCEPT				 115
-#define SSL_F_SSL23_CLIENT_HELLO			 116
-#define SSL_F_SSL23_CONNECT				 117
-#define SSL_F_SSL23_GET_CLIENT_HELLO			 118
-#define SSL_F_SSL23_GET_SERVER_HELLO			 119
-#define SSL_F_SSL23_PEEK				 237
-#define SSL_F_SSL23_READ				 120
-#define SSL_F_SSL23_WRITE				 121
-#define SSL_F_SSL2_ACCEPT				 122
-#define SSL_F_SSL2_CONNECT				 123
-#define SSL_F_SSL2_ENC_INIT				 124
-#define SSL_F_SSL2_GENERATE_KEY_MATERIAL		 241
-#define SSL_F_SSL2_PEEK					 234
-#define SSL_F_SSL2_READ					 125
-#define SSL_F_SSL2_READ_INTERNAL			 236
-#define SSL_F_SSL2_SET_CERTIFICATE			 126
-#define SSL_F_SSL2_WRITE				 127
-#define SSL_F_SSL3_ACCEPT				 128
-#define SSL_F_SSL3_ADD_CERT_TO_BUF			 296
-#define SSL_F_SSL3_CALLBACK_CTRL			 233
-#define SSL_F_SSL3_CHANGE_CIPHER_STATE			 129
-#define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM		 130
-#define SSL_F_SSL3_CLIENT_HELLO				 131
-#define SSL_F_SSL3_CONNECT				 132
-#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_ENC					 134
-#define SSL_F_SSL3_GENERATE_KEY_BLOCK			 238
-#define SSL_F_SSL3_GET_CERTIFICATE_REQUEST		 135
-#define SSL_F_SSL3_GET_CERT_STATUS			 289
-#define SSL_F_SSL3_GET_CERT_VERIFY			 136
-#define SSL_F_SSL3_GET_CLIENT_CERTIFICATE		 137
-#define SSL_F_SSL3_GET_CLIENT_HELLO			 138
-#define SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE		 139
-#define SSL_F_SSL3_GET_FINISHED				 140
-#define SSL_F_SSL3_GET_KEY_EXCHANGE			 141
-#define SSL_F_SSL3_GET_MESSAGE				 142
-#define SSL_F_SSL3_GET_NEW_SESSION_TICKET		 283
-#define SSL_F_SSL3_GET_RECORD				 143
-#define SSL_F_SSL3_GET_SERVER_CERTIFICATE		 144
-#define SSL_F_SSL3_GET_SERVER_DONE			 145
-#define SSL_F_SSL3_GET_SERVER_HELLO			 146
-#define SSL_F_SSL3_HANDSHAKE_MAC			 285
-#define SSL_F_SSL3_NEW_SESSION_TICKET			 287
-#define SSL_F_SSL3_OUTPUT_CERT_CHAIN			 147
-#define SSL_F_SSL3_PEEK					 235
-#define SSL_F_SSL3_READ_BYTES				 148
-#define SSL_F_SSL3_READ_N				 149
-#define SSL_F_SSL3_SEND_CERTIFICATE_REQUEST		 150
-#define SSL_F_SSL3_SEND_CLIENT_CERTIFICATE		 151
-#define SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE		 152
-#define SSL_F_SSL3_SEND_CLIENT_VERIFY			 153
-#define SSL_F_SSL3_SEND_SERVER_CERTIFICATE		 154
-#define SSL_F_SSL3_SEND_SERVER_HELLO			 242
-#define SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE		 155
-#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_CLIENTHELLO_RENEGOTIATE_EXT	 298
-#define SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT		 277
-#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_BAD_METHOD				 160
-#define SSL_F_SSL_BYTES_TO_CIPHER_LIST			 161
-#define SSL_F_SSL_CERT_DUP				 221
-#define SSL_F_SSL_CERT_INST				 222
-#define SSL_F_SSL_CERT_INSTANTIATE			 214
-#define SSL_F_SSL_CERT_NEW				 162
-#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_CREATE_CIPHER_LIST			 166
-#define SSL_F_SSL_CTRL					 232
-#define SSL_F_SSL_CTX_CHECK_PRIVATE_KEY			 168
-#define SSL_F_SSL_CTX_NEW				 169
-#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_PURPOSE			 226
-#define SSL_F_SSL_CTX_SET_SESSION_ID_CONTEXT		 219
-#define SSL_F_SSL_CTX_SET_SSL_VERSION			 170
-#define SSL_F_SSL_CTX_SET_TRUST				 229
-#define SSL_F_SSL_CTX_USE_CERTIFICATE			 171
-#define SSL_F_SSL_CTX_USE_CERTIFICATE_ASN1		 172
-#define SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE	 220
-#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_DO_HANDSHAKE				 180
-#define SSL_F_SSL_GET_NEW_SESSION			 181
-#define SSL_F_SSL_GET_PREV_SESSION			 217
-#define SSL_F_SSL_GET_SERVER_SEND_CERT			 182
-#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_NEW					 186
-#define SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT	 300
-#define SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT		 302
-#define SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT	 301
-#define SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT		 303
-#define SSL_F_SSL_PEEK					 270
-#define SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT		 281
-#define SSL_F_SSL_PREPARE_SERVERHELLO_TLSEXT		 282
-#define SSL_F_SSL_READ					 223
-#define SSL_F_SSL_RSA_PRIVATE_DECRYPT			 187
-#define SSL_F_SSL_RSA_PUBLIC_ENCRYPT			 188
-#define SSL_F_SSL_SESSION_NEW				 189
-#define SSL_F_SSL_SESSION_PRINT_FP			 190
-#define SSL_F_SSL_SESS_CERT_NEW				 225
-#define SSL_F_SSL_SET_CERT				 191
-#define SSL_F_SSL_SET_CIPHER_LIST			 271
-#define SSL_F_SSL_SET_FD				 192
-#define SSL_F_SSL_SET_PKEY				 193
-#define SSL_F_SSL_SET_PURPOSE				 227
-#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_TRUST				 228
-#define SSL_F_SSL_SET_WFD				 196
-#define SSL_F_SSL_SHUTDOWN				 224
-#define SSL_F_SSL_UNDEFINED_CONST_FUNCTION		 243
-#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_VERIFY_CERT_CHAIN			 207
-#define SSL_F_SSL_WRITE					 208
-#define SSL_F_TLS1_CERT_VERIFY_MAC			 286
-#define SSL_F_TLS1_CHANGE_CIPHER_STATE			 209
-#define SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT		 274
-#define SSL_F_TLS1_ENC					 210
-#define SSL_F_TLS1_PREPARE_CLIENTHELLO_TLSEXT		 275
-#define SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT		 276
-#define SSL_F_TLS1_PRF					 284
-#define SSL_F_TLS1_SETUP_KEY_BLOCK			 211
-#define SSL_F_WRITE_PENDING				 212
+# 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_BAD_ALERT_RECORD				 101
-#define SSL_R_BAD_AUTHENTICATION_TYPE			 102
-#define SSL_R_BAD_CHANGE_CIPHER_SPEC			 103
-#define SSL_R_BAD_CHECKSUM				 104
-#define SSL_R_BAD_DATA_RETURNED_BY_CALLBACK		 106
-#define SSL_R_BAD_DECOMPRESSION				 107
-#define SSL_R_BAD_DH_G_LENGTH				 108
-#define SSL_R_BAD_DH_PUB_KEY_LENGTH			 109
-#define SSL_R_BAD_DH_P_LENGTH				 110
-#define SSL_R_BAD_DIGEST_LENGTH				 111
-#define SSL_R_BAD_DSA_SIGNATURE				 112
-#define SSL_R_BAD_ECC_CERT				 304
-#define SSL_R_BAD_ECDSA_SIGNATURE			 305
-#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_MAC_DECODE				 113
-#define SSL_R_BAD_MAC_LENGTH				 333
-#define SSL_R_BAD_MESSAGE_TYPE				 114
-#define SSL_R_BAD_PACKET_LENGTH				 115
-#define SSL_R_BAD_PROTOCOL_VERSION_NUMBER		 116
-#define SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH		 316
-#define SSL_R_BAD_RESPONSE_ARGUMENT			 117
-#define SSL_R_BAD_RSA_DECRYPT				 118
-#define SSL_R_BAD_RSA_ENCRYPT				 119
-#define SSL_R_BAD_RSA_E_LENGTH				 120
-#define SSL_R_BAD_RSA_MODULUS_LENGTH			 121
-#define SSL_R_BAD_RSA_SIGNATURE				 122
-#define SSL_R_BAD_SIGNATURE				 123
-#define SSL_R_BAD_SSL_FILETYPE				 124
-#define SSL_R_BAD_SSL_SESSION_ID_LENGTH			 125
-#define SSL_R_BAD_STATE					 126
-#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_DN_TOO_LONG				 132
-#define SSL_R_CCS_RECEIVED_EARLY			 133
-#define SSL_R_CERTIFICATE_VERIFY_FAILED			 134
-#define SSL_R_CERT_LENGTH_MISMATCH			 135
-#define SSL_R_CHALLENGE_IS_DIFFERENT			 136
-#define SSL_R_CIPHER_CODE_WRONG_LENGTH			 137
-#define SSL_R_CIPHER_OR_HASH_UNAVAILABLE		 138
-#define SSL_R_CIPHER_TABLE_SRC_ERROR			 139
-#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_ID_IS_DIFFERENT		 143
-#define SSL_R_CONNECTION_TYPE_NOT_SET			 144
-#define SSL_R_COOKIE_MISMATCH				 308
-#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_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_KEY_AGREEMENT		 317
-#define SSL_R_ECC_CERT_NOT_FOR_SIGNING			 318
-#define SSL_R_ECC_CERT_SHOULD_HAVE_RSA_SIGNATURE	 322
-#define SSL_R_ECC_CERT_SHOULD_HAVE_SHA1_SIGNATURE	 323
-#define SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER		 310
-#define SSL_R_ENCRYPTED_LENGTH_TOO_LONG			 150
-#define SSL_R_ERROR_GENERATING_TMP_RSA_KEY		 282
-#define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST		 151
-#define SSL_R_EXCESSIVE_MESSAGE_SIZE			 152
-#define SSL_R_EXTRA_DATA_IN_MESSAGE			 153
-#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_PADDING				 283
-#define SSL_R_INCONSISTENT_COMPRESSION			 340
-#define SSL_R_INVALID_CHALLENGE_LENGTH			 158
-#define SSL_R_INVALID_COMMAND				 280
-#define SSL_R_INVALID_COMPRESSION_ALGORITHM		 341
-#define SSL_R_INVALID_PURPOSE				 278
-#define SSL_R_INVALID_STATUS_RESPONSE			 328
-#define SSL_R_INVALID_TICKET_KEYS_LENGTH		 325
-#define SSL_R_INVALID_TRUST				 279
-#define SSL_R_KEY_ARG_TOO_LONG				 284
-#define SSL_R_KRB5					 285
-#define SSL_R_KRB5_C_CC_PRINC				 286
-#define SSL_R_KRB5_C_GET_CRED				 287
-#define SSL_R_KRB5_C_INIT				 288
-#define SSL_R_KRB5_C_MK_REQ				 289
-#define SSL_R_KRB5_S_BAD_TICKET				 290
-#define SSL_R_KRB5_S_INIT				 291
-#define SSL_R_KRB5_S_RD_REQ				 292
-#define SSL_R_KRB5_S_TKT_EXPIRED			 293
-#define SSL_R_KRB5_S_TKT_NYV				 294
-#define SSL_R_KRB5_S_TKT_SKEW				 295
-#define SSL_R_LENGTH_MISMATCH				 159
-#define SSL_R_LENGTH_TOO_SHORT				 160
-#define SSL_R_LIBRARY_BUG				 274
-#define SSL_R_LIBRARY_HAS_NO_CIPHERS			 161
-#define SSL_R_MESSAGE_TOO_LONG				 296
-#define SSL_R_MISSING_DH_DSA_CERT			 162
-#define SSL_R_MISSING_DH_KEY				 163
-#define SSL_R_MISSING_DH_RSA_CERT			 164
-#define SSL_R_MISSING_DSA_SIGNING_CERT			 165
-#define SSL_R_MISSING_EXPORT_TMP_DH_KEY			 166
-#define SSL_R_MISSING_EXPORT_TMP_RSA_KEY		 167
-#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_TMP_DH_KEY			 171
-#define SSL_R_MISSING_TMP_ECDH_KEY			 311
-#define SSL_R_MISSING_TMP_RSA_KEY			 172
-#define SSL_R_MISSING_TMP_RSA_PKEY			 173
-#define SSL_R_MISSING_VERIFY_MESSAGE			 174
-#define SSL_R_NON_SSLV2_INITIAL_PACKET			 175
-#define SSL_R_NO_CERTIFICATES_RETURNED			 176
-#define SSL_R_NO_CERTIFICATE_ASSIGNED			 177
-#define SSL_R_NO_CERTIFICATE_RETURNED			 178
-#define SSL_R_NO_CERTIFICATE_SET			 179
-#define SSL_R_NO_CERTIFICATE_SPECIFIED			 180
-#define SSL_R_NO_CIPHERS_AVAILABLE			 181
-#define SSL_R_NO_CIPHERS_PASSED				 182
-#define SSL_R_NO_CIPHERS_SPECIFIED			 183
-#define SSL_R_NO_CIPHER_LIST				 184
-#define SSL_R_NO_CIPHER_MATCH				 185
-#define SSL_R_NO_CLIENT_CERT_METHOD			 331
-#define SSL_R_NO_CLIENT_CERT_RECEIVED			 186
-#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_PRIVATEKEY				 189
-#define SSL_R_NO_PRIVATE_KEY_ASSIGNED			 190
-#define SSL_R_NO_PROTOCOLS_AVAILABLE			 191
-#define SSL_R_NO_PUBLICKEY				 192
-#define SSL_R_NO_RENEGOTIATION				 339
-#define SSL_R_NO_REQUIRED_DIGEST			 324
-#define SSL_R_NO_SHARED_CIPHER				 193
-#define SSL_R_NO_VERIFY_CALLBACK			 194
-#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_ONLY_TLS_ALLOWED_IN_FIPS_MODE		 297
-#define SSL_R_OPAQUE_PRF_INPUT_TOO_LONG			 327
-#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_PEER_ERROR				 200
-#define SSL_R_PEER_ERROR_CERTIFICATE			 201
-#define SSL_R_PEER_ERROR_NO_CERTIFICATE			 202
-#define SSL_R_PEER_ERROR_NO_CIPHER			 203
-#define SSL_R_PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE	 204
-#define SSL_R_PRE_MAC_LENGTH_TOO_LONG			 205
-#define SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS		 206
-#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_PUBLIC_KEY_ENCRYPT_ERROR			 208
-#define SSL_R_PUBLIC_KEY_IS_NOT_RSA			 209
-#define SSL_R_PUBLIC_KEY_NOT_RSA			 210
-#define SSL_R_READ_BIO_NOT_SET				 211
-#define SSL_R_READ_TIMEOUT_EXPIRED			 312
-#define SSL_R_READ_WRONG_PACKET_TYPE			 212
-#define SSL_R_RECORD_LENGTH_MISMATCH			 213
-#define SSL_R_RECORD_TOO_LARGE				 214
-#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_COMPRESSSION_ALGORITHM_MISSING	 342
-#define SSL_R_REUSE_CERT_LENGTH_NOT_ZERO		 216
-#define SSL_R_REUSE_CERT_TYPE_NOT_ZERO			 217
-#define SSL_R_REUSE_CIPHER_LIST_NOT_ZERO		 218
-#define SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING		 345
-#define SSL_R_SERVERHELLO_TLSEXT			 275
-#define SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED		 277
-#define SSL_R_SHORT_READ				 219
-#define SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE	 220
-#define SSL_R_SSL23_DOING_SESSION_ID_REUSE		 221
-#define SSL_R_SSL2_CONNECTION_ID_TOO_LONG		 299
-#define SSL_R_SSL3_EXT_INVALID_ECPOINTFORMAT		 321
-#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_SSL3_SESSION_ID_TOO_SHORT			 222
-#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_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_SESSION_ID_CALLBACK_FAILED		 301
-#define SSL_R_SSL_SESSION_ID_CONFLICT			 302
-#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_ID_IS_DIFFERENT		 231
-#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_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_CLIENT_CERT_REQ_WITH_ANON_CIPHER	 232
-#define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST		 157
-#define SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST 233
-#define SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG	 234
-#define SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER		 235
-#define SSL_R_UNABLE_TO_DECODE_DH_CERTS			 236
-#define SSL_R_UNABLE_TO_DECODE_ECDH_CERTS		 313
-#define SSL_R_UNABLE_TO_EXTRACT_PUBLIC_KEY		 237
-#define SSL_R_UNABLE_TO_FIND_DH_PARAMETERS		 238
-#define SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS		 314
-#define SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS	 239
-#define SSL_R_UNABLE_TO_FIND_SSL_METHOD			 240
-#define SSL_R_UNABLE_TO_LOAD_SSL2_MD5_ROUTINES		 241
-#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_KEY_EXCHANGE_TYPE			 250
-#define SSL_R_UNKNOWN_PKEY_TYPE				 251
-#define SSL_R_UNKNOWN_PROTOCOL				 252
-#define SSL_R_UNKNOWN_REMOTE_ERROR_TYPE			 253
-#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_CIPHER			 256
-#define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM		 257
-#define SSL_R_UNSUPPORTED_DIGEST_TYPE			 326
-#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_WRITE_BIO_NOT_SET				 260
-#define SSL_R_WRONG_CIPHER_RETURNED			 261
-#define SSL_R_WRONG_MESSAGE_TYPE			 262
-#define SSL_R_WRONG_NUMBER_OF_KEY_BITS			 263
-#define SSL_R_WRONG_SIGNATURE_LENGTH			 264
-#define SSL_R_WRONG_SIGNATURE_SIZE			 265
-#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
+# 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
+# ifdef __cplusplus
 }
-#endif
+# endif
 #endif

gpac-0.7.1.tar.gz/extra_lib/include/openssl/ssl2.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/ssl2.h Changed

@@ -1,268 +1,24 @@
-/* ssl/ssl2.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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_SSL2_H 
-#define HEADER_SSL2_H 
+#ifndef HEADER_SSL2_H
+# define HEADER_SSL2_H
 
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
-/* Protocol Version Codes */
-#define SSL2_VERSION		0x0002
-#define SSL2_VERSION_MAJOR	0x00
-#define SSL2_VERSION_MINOR	0x02
-/* #define SSL2_CLIENT_VERSION	0x0002 */
-/* #define SSL2_SERVER_VERSION	0x0002 */
+# define SSL2_VERSION            0x0002
 
-/* Protocol Message Codes */
-#define SSL2_MT_ERROR			0
-#define SSL2_MT_CLIENT_HELLO		1
-#define SSL2_MT_CLIENT_MASTER_KEY	2
-#define SSL2_MT_CLIENT_FINISHED		3
-#define SSL2_MT_SERVER_HELLO		4
-#define SSL2_MT_SERVER_VERIFY		5
-#define SSL2_MT_SERVER_FINISHED		6
-#define SSL2_MT_REQUEST_CERTIFICATE	7
-#define SSL2_MT_CLIENT_CERTIFICATE	8
-
-/* Error Message Codes */
-#define SSL2_PE_UNDEFINED_ERROR		0x0000
-#define SSL2_PE_NO_CIPHER		0x0001
-#define SSL2_PE_NO_CERTIFICATE		0x0002
-#define SSL2_PE_BAD_CERTIFICATE		0x0004
-#define SSL2_PE_UNSUPPORTED_CERTIFICATE_TYPE 0x0006
-
-/* Cipher Kind Values */
-#define SSL2_CK_NULL_WITH_MD5			0x02000000 /* v3 */
-#define SSL2_CK_RC4_128_WITH_MD5		0x02010080
-#define SSL2_CK_RC4_128_EXPORT40_WITH_MD5	0x02020080
-#define SSL2_CK_RC2_128_CBC_WITH_MD5		0x02030080
-#define SSL2_CK_RC2_128_CBC_EXPORT40_WITH_MD5	0x02040080
-#define SSL2_CK_IDEA_128_CBC_WITH_MD5		0x02050080
-#define SSL2_CK_DES_64_CBC_WITH_MD5		0x02060040
-#define SSL2_CK_DES_64_CBC_WITH_SHA		0x02060140 /* v3 */
-#define SSL2_CK_DES_192_EDE3_CBC_WITH_MD5	0x020700c0
-#define SSL2_CK_DES_192_EDE3_CBC_WITH_SHA	0x020701c0 /* v3 */
-#define SSL2_CK_RC4_64_WITH_MD5			0x02080080 /* MS hack */
- 
-#define SSL2_CK_DES_64_CFB64_WITH_MD5_1		0x02ff0800 /* SSLeay */
-#define SSL2_CK_NULL				0x02ff0810 /* SSLeay */
-
-#define SSL2_TXT_DES_64_CFB64_WITH_MD5_1	"DES-CFB-M1"
-#define SSL2_TXT_NULL_WITH_MD5			"NULL-MD5"
-#define SSL2_TXT_RC4_128_WITH_MD5		"RC4-MD5"
-#define SSL2_TXT_RC4_128_EXPORT40_WITH_MD5	"EXP-RC4-MD5"
-#define SSL2_TXT_RC2_128_CBC_WITH_MD5		"RC2-CBC-MD5"
-#define SSL2_TXT_RC2_128_CBC_EXPORT40_WITH_MD5	"EXP-RC2-CBC-MD5"
-#define SSL2_TXT_IDEA_128_CBC_WITH_MD5		"IDEA-CBC-MD5"
-#define SSL2_TXT_DES_64_CBC_WITH_MD5		"DES-CBC-MD5"
-#define SSL2_TXT_DES_64_CBC_WITH_SHA		"DES-CBC-SHA"
-#define SSL2_TXT_DES_192_EDE3_CBC_WITH_MD5	"DES-CBC3-MD5"
-#define SSL2_TXT_DES_192_EDE3_CBC_WITH_SHA	"DES-CBC3-SHA"
-#define SSL2_TXT_RC4_64_WITH_MD5		"RC4-64-MD5"
-
-#define SSL2_TXT_NULL				"NULL"
-
-/* Flags for the SSL_CIPHER.algorithm2 field */
-#define SSL2_CF_5_BYTE_ENC			0x01
-#define SSL2_CF_8_BYTE_ENC			0x02
-
-/* Certificate Type Codes */
-#define SSL2_CT_X509_CERTIFICATE		0x01
-
-/* Authentication Type Code */
-#define SSL2_AT_MD5_WITH_RSA_ENCRYPTION		0x01
-
-#define SSL2_MAX_SSL_SESSION_ID_LENGTH		32
-
-/* Upper/Lower Bounds */
-#define SSL2_MAX_MASTER_KEY_LENGTH_IN_BITS	256
-#ifdef OPENSSL_SYS_MPE
-#define SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER	29998u
-#else
-#define SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER	32767u  /* 2^15-1 */
-#endif
-#define SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER	16383 /* 2^14-1 */
-
-#define SSL2_CHALLENGE_LENGTH	16
-/*#define SSL2_CHALLENGE_LENGTH	32 */
-#define SSL2_MIN_CHALLENGE_LENGTH	16
-#define SSL2_MAX_CHALLENGE_LENGTH	32
-#define SSL2_CONNECTION_ID_LENGTH	16
-#define SSL2_MAX_CONNECTION_ID_LENGTH	16
-#define SSL2_SSL_SESSION_ID_LENGTH	16
-#define SSL2_MAX_CERT_CHALLENGE_LENGTH	32
-#define SSL2_MIN_CERT_CHALLENGE_LENGTH	16
-#define SSL2_MAX_KEY_MATERIAL_LENGTH	24
-
-#ifndef HEADER_SSL_LOCL_H
-#define  CERT		char
-#endif
-
-typedef struct ssl2_state_st
-	{
-	int three_byte_header;
-	int clear_text;		/* clear text */
-	int escape;		/* not used in SSLv2 */
-	int ssl2_rollback;	/* used if SSLv23 rolled back to SSLv2 */
-
-	/* non-blocking io info, used to make sure the same
-	 * args were passwd */
-	unsigned int wnum;	/* number of bytes sent so far */
-	int wpend_tot;
-	const unsigned char *wpend_buf;
-
-	int wpend_off;	/* offset to data to write */
-	int wpend_len; 	/* number of bytes passwd to write */
-	int wpend_ret; 	/* number of bytes to return to caller */
-
-	/* buffer raw data */
-	int rbuf_left;
-	int rbuf_offs;
-	unsigned char *rbuf;
-	unsigned char *wbuf;
-
-	unsigned char *write_ptr;/* used to point to the start due to
-				  * 2/3 byte header. */
-
-	unsigned int padding;
-	unsigned int rlength; /* passed to ssl2_enc */
-	int ract_data_length; /* Set when things are encrypted. */
-	unsigned int wlength; /* passed to ssl2_enc */
-	int wact_data_length; /* Set when things are decrypted. */
-	unsigned char *ract_data;
-	unsigned char *wact_data;
-	unsigned char *mac_data;
-
-	unsigned char *read_key;
-	unsigned char *write_key;
-
-		/* Stuff specifically to do with this SSL session */
-	unsigned int challenge_length;
-	unsigned char challenge[SSL2_MAX_CHALLENGE_LENGTH];
-	unsigned int conn_id_length;
-	unsigned char conn_id[SSL2_MAX_CONNECTION_ID_LENGTH];
-	unsigned int key_material_length;
-	unsigned char key_material[SSL2_MAX_KEY_MATERIAL_LENGTH*2];
-
-	unsigned long read_sequence;
-	unsigned long write_sequence;
-
-	struct	{
-		unsigned int conn_id_length;
-		unsigned int cert_type;	
-		unsigned int cert_length;
-		unsigned int csl; 
-		unsigned int clear;
-		unsigned int enc; 
-		unsigned char ccl[SSL2_MAX_CERT_CHALLENGE_LENGTH];
-		unsigned int cipher_spec_length;
-		unsigned int session_id_length;
-		unsigned int clen;
-		unsigned int rlen;
-		} tmp;
-	} SSL2_STATE;
-
-/* SSLv2 */
-/* client */
-#define SSL2_ST_SEND_CLIENT_HELLO_A		(0x10|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_HELLO_B		(0x11|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_HELLO_A		(0x20|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_HELLO_B		(0x21|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_MASTER_KEY_A	(0x30|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_MASTER_KEY_B	(0x31|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_FINISHED_A		(0x40|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_FINISHED_B		(0x41|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_A	(0x50|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_B	(0x51|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_C	(0x52|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_D	(0x53|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_VERIFY_A		(0x60|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_VERIFY_B		(0x61|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_FINISHED_A		(0x70|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_FINISHED_B		(0x71|SSL_ST_CONNECT)
-#define SSL2_ST_CLIENT_START_ENCRYPTION		(0x80|SSL_ST_CONNECT)
-#define SSL2_ST_X509_GET_CLIENT_CERTIFICATE	(0x90|SSL_ST_CONNECT)
-/* server */
-#define SSL2_ST_GET_CLIENT_HELLO_A		(0x10|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_HELLO_B		(0x11|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_HELLO_C		(0x12|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_HELLO_A		(0x20|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_HELLO_B		(0x21|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_MASTER_KEY_A		(0x30|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_MASTER_KEY_B		(0x31|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_VERIFY_A		(0x40|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_VERIFY_B		(0x41|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_VERIFY_C		(0x42|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_FINISHED_A		(0x50|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_FINISHED_B		(0x51|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_FINISHED_A		(0x60|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_FINISHED_B		(0x61|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_A	(0x70|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_B	(0x71|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_C	(0x72|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_D	(0x73|SSL_ST_ACCEPT)
-#define SSL2_ST_SERVER_START_ENCRYPTION		(0x80|SSL_ST_ACCEPT)
-#define SSL2_ST_X509_GET_SERVER_CERTIFICATE	(0x90|SSL_ST_ACCEPT)
+# define SSL2_MT_CLIENT_HELLO            1
 
 #ifdef  __cplusplus
 }
 #endif
 #endif
-

gpac-0.7.1.tar.gz/extra_lib/include/openssl/ssl3.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/ssl3.h Changed

@@ -1,637 +1,310 @@
-/* ssl/ssl3.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+/*
+ * 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 
+ * 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 
+#ifndef HEADER_SSL3_H
+# define HEADER_SSL3_H
 
-#ifndef OPENSSL_NO_COMP
-#include <openssl/comp.h>
-#endif
-#include <openssl/buffer.h>
-#include <openssl/evp.h>
-#include <openssl/ssl.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 draft-ietf-tls-renegotiation-03.txt */
-#define SSL3_CK_SCSV				0x030000FF
-
-#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_EDH_DSS_DES_40_CBC_SHA		0x03000011
-#define SSL3_CK_EDH_DSS_DES_64_CBC_SHA		0x03000012
-#define SSL3_CK_EDH_DSS_DES_192_CBC3_SHA	0x03000013
-#define SSL3_CK_EDH_RSA_DES_40_CBC_SHA		0x03000014
-#define SSL3_CK_EDH_RSA_DES_64_CBC_SHA		0x03000015
-#define SSL3_CK_EDH_RSA_DES_192_CBC3_SHA	0x03000016
-
-#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
-
-#if 0
-	#define SSL3_CK_FZA_DMS_NULL_SHA		0x0300001C
-	#define SSL3_CK_FZA_DMS_FZA_SHA			0x0300001D
-	#if 0 /* Because it clashes with KRB5, is never used any more, and is safe
-		 to remove according to David Hopwood <david.hopwood@zetnet.co.uk>
-		 of the ietf-tls list */
-	#define SSL3_CK_FZA_DMS_RC4_SHA			0x0300001E
-	#endif
-#endif
-
-/* VRS Additional Kerberos5 entries
+/*
+ * Signalling cipher suite value from RFC 5746
+ * (TLS_EMPTY_RENEGOTIATION_INFO_SCSV)
 */
-#define SSL3_CK_KRB5_DES_64_CBC_SHA		0x0300001E
-#define SSL3_CK_KRB5_DES_192_CBC3_SHA		0x0300001F
-#define SSL3_CK_KRB5_RC4_128_SHA		0x03000020
-#define SSL3_CK_KRB5_IDEA_128_CBC_SHA	 	0x03000021
-#define SSL3_CK_KRB5_DES_64_CBC_MD5 	0x03000022
-#define SSL3_CK_KRB5_DES_192_CBC3_MD5 	0x03000023
-#define SSL3_CK_KRB5_RC4_128_MD5	 	0x03000024
-#define SSL3_CK_KRB5_IDEA_128_CBC_MD5 		0x03000025
-
-#define SSL3_CK_KRB5_DES_40_CBC_SHA 		0x03000026
-#define SSL3_CK_KRB5_RC2_40_CBC_SHA 		0x03000027
-#define SSL3_CK_KRB5_RC4_40_SHA	 		0x03000028
-#define SSL3_CK_KRB5_DES_40_CBC_MD5 		0x03000029
-#define SSL3_CK_KRB5_RC2_40_CBC_MD5 		0x0300002A
-#define SSL3_CK_KRB5_RC4_40_MD5	 		0x0300002B
-
-#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_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"
-
-#if 0
-	#define SSL3_TXT_FZA_DMS_NULL_SHA		"FZA-NULL-SHA"
-	#define SSL3_TXT_FZA_DMS_FZA_SHA		"FZA-FZA-CBC-SHA"
-	#define SSL3_TXT_FZA_DMS_RC4_SHA		"FZA-RC4-SHA"
-#endif
+# define SSL3_CK_SCSV 0x030000FF
 
-#define SSL3_TXT_KRB5_DES_64_CBC_SHA		"KRB5-DES-CBC-SHA"
-#define SSL3_TXT_KRB5_DES_192_CBC3_SHA		"KRB5-DES-CBC3-SHA"
-#define SSL3_TXT_KRB5_RC4_128_SHA		"KRB5-RC4-SHA"
-#define SSL3_TXT_KRB5_IDEA_128_CBC_SHA	 	"KRB5-IDEA-CBC-SHA"
-#define SSL3_TXT_KRB5_DES_64_CBC_MD5 	"KRB5-DES-CBC-MD5"
-#define SSL3_TXT_KRB5_DES_192_CBC3_MD5 	"KRB5-DES-CBC3-MD5"
-#define SSL3_TXT_KRB5_RC4_128_MD5		"KRB5-RC4-MD5"
-#define SSL3_TXT_KRB5_IDEA_128_CBC_MD5 		"KRB5-IDEA-CBC-MD5"
-
-#define SSL3_TXT_KRB5_DES_40_CBC_SHA 		"EXP-KRB5-DES-CBC-SHA"
-#define SSL3_TXT_KRB5_RC2_40_CBC_SHA 		"EXP-KRB5-RC2-CBC-SHA"
-#define SSL3_TXT_KRB5_RC4_40_SHA	 	"EXP-KRB5-RC4-SHA"
-#define SSL3_TXT_KRB5_DES_40_CBC_MD5 		"EXP-KRB5-DES-CBC-MD5"
-#define SSL3_TXT_KRB5_RC2_40_CBC_MD5 		"EXP-KRB5-RC2-CBC-MD5"
-#define SSL3_TXT_KRB5_RC4_40_MD5	 	"EXP-KRB5-RC4-MD5"
-
-#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
-
-#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
+/*
+ * 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
-#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.
+/*
+ * 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
+# define SSL3_RT_MAX_MD_SIZE 64
 
-/* Maximum block size used in all ciphersuites. Currently 16 for AES.
+/*
+ * Maximum block size used in all ciphersuites. Currently 16 for AES.
 */
 
-#define	SSL_RT_MAX_CIPHER_BLOCK_SIZE		16
+# define SSL_RT_MAX_CIPHER_BLOCK_SIZE 16
 
-#define SSL3_RT_MAX_EXTRA			(16384)
+# define SSL3_RT_MAX_EXTRA (16384)
 
 /* Maximum plaintext length: defined by SSL/TLS standards */
-#define SSL3_RT_MAX_PLAIN_LENGTH		16384
+# define SSL3_RT_MAX_PLAIN_LENGTH 16384
 /* Maximum compression overhead: defined by SSL/TLS standards */
-#define SSL3_RT_MAX_COMPRESSED_OVERHEAD		1024
+# 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.
+/*
+ * 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)
+# 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.
+/*
+ * 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)
+# 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 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 */
-
-typedef struct ssl3_record_st
-	{
-/*r */	int type; /* type of record */
-/*rw*/	unsigned int length; /* How many bytes available */
-/*r */	unsigned int off; /* read/write offset into 'buf' */
-/*rw*/	unsigned char *data; /* pointer to the record data */
-/*rw*/	unsigned char *input; /* where the decode bytes are */
-/*r */	unsigned char *comp; /* only used with decompression - malloc()ed */
-/*r */ unsigned long epoch; /* epoch number, needed by DTLS1 */
-/*r */ unsigned char seq_num[8]; /* sequence number, needed by DTLS1 */
-	} SSL3_RECORD;
-
-typedef struct ssl3_buffer_st
-	{
-	unsigned char *buf; /* at least SSL3_RT_MAX_PACKET_SIZE bytes,
-	 * see ssl3_setup_buffers() */
-	size_t len; /* buffer size */
-	int offset; /* where to 'copy from' */
-	int left; /* how many bytes left */
-	} SSL3_BUFFER;
-
-#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.
+# 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
-#define SSL3_FLAGS_DELAY_CLIENT_FINISHED	0x0002
-#define SSL3_FLAGS_POP_BUFFER			0x0004
-#define TLS1_FLAGS_TLS_PADDING_BUG		0x0008
-#define TLS1_FLAGS_SKIP_CERT_VERIFY		0x0010
-
-typedef struct ssl3_state_st
-	{
-	long flags;
-	int delay_buf_pop_ret;
-
-	unsigned char read_sequence[8];
-	int read_mac_secret_size;
-	unsigned char read_mac_secret[EVP_MAX_MD_SIZE];
-	unsigned char write_sequence[8];
-	int write_mac_secret_size;
-	unsigned char write_mac_secret[EVP_MAX_MD_SIZE];
-
-	unsigned char server_random[SSL3_RANDOM_SIZE];
-	unsigned char client_random[SSL3_RANDOM_SIZE];
-
-	/* flags for countermeasure against known-IV weakness */
-	int need_empty_fragments;
-	int empty_fragment_done;
-
-	/* The value of 'extra' when the buffers were initialized */
-	int init_extra;
-
-	SSL3_BUFFER rbuf;	/* read IO goes into here */
-	SSL3_BUFFER wbuf;	/* write IO goes into here */
-
-	SSL3_RECORD rrec;	/* each decoded record goes in here */
-	SSL3_RECORD wrec;	/* goes out from here */
-
-	/* storage for Alert/Handshake protocol data received but not
-	 * yet processed by ssl3_read_bytes: */
-	unsigned char alert_fragment[2];
-	unsigned int alert_fragment_len;
-	unsigned char handshake_fragment[4];
-	unsigned int handshake_fragment_len;
-
-	/* partial write - check the numbers match */
-	unsigned int wnum;	/* number of bytes sent so far */
-	int wpend_tot;		/* number bytes written */
-	int wpend_type;
-	int wpend_ret;		/* number of bytes submitted */
-	const unsigned char *wpend_buf;
-
-	/* used during startup, digest all incoming/outgoing packets */
-	BIO *handshake_buffer;
-	/* When set of handshake digests is determined, buffer is hashed
-	 * and freed and MD_CTX-es for all required digests are stored in
-	 * this array */
-	EVP_MD_CTX **handshake_dgst;
-	/* this is set whenerver we see a change_cipher_spec message
-	 * come in when we are not looking for one */
-	int change_cipher_spec;
-
-	int warn_alert;
-	int fatal_alert;
-	/* we allow one fatal and one warning alert to be outstanding,
-	 * send close alert via the warning alert */
-	int alert_dispatch;
-	unsigned char send_alert[2];
-
-	/* This flag is set when we should renegotiate ASAP, basically when
-	 * there is no more data in the read or write buffers */
-	int renegotiate;
-	int total_renegotiations;
-	int num_renegotiations;
-
-	int in_read_app_data;
-
-	/* Opaque PRF input as used for the current handshake.
-	 * These fields are used only if TLSEXT_TYPE_opaque_prf_input is defined
-	 * (otherwise, they are merely present to improve binary compatibility) */
-	void *client_opaque_prf_input;
-	size_t client_opaque_prf_input_len;
-	void *server_opaque_prf_input;
-	size_t server_opaque_prf_input_len;
-
-	struct	{
-		/* actually only needs to be 16+20 */
-		unsigned char cert_verify_md[EVP_MAX_MD_SIZE*2];
-
-		/* actually only need to be 16+20 for SSLv3 and 12 for TLS */
-		unsigned char finish_md[EVP_MAX_MD_SIZE*2];
-		int finish_md_len;
-		unsigned char peer_finish_md[EVP_MAX_MD_SIZE*2];
-		int peer_finish_md_len;
-		
-		unsigned long message_size;
-		int message_type;
-
-		/* used to hold the new cipher we are going to use */
-		const SSL_CIPHER *new_cipher;
-#ifndef OPENSSL_NO_DH
-		DH *dh;
-#endif
-
-#ifndef OPENSSL_NO_ECDH
-		EC_KEY *ecdh; /* holds short lived ECDH key */
-#endif
-
-		/* used when SSL_ST_FLUSH_DATA is entered */
-		int next_state;			
-
-		int reuse_message;
-
-		/* used for certificate requests */
-		int cert_req;
-		int ctype_num;
-		char ctype[SSL3_CT_NUMBER];
-		STACK_OF(X509_NAME) *ca_names;
-
-		int use_rsa_tmp;
+# 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
 
-		int key_block_length;
-		unsigned char *key_block;
+/* Dummy message type for handling CCS like a normal handshake message */
+# define SSL3_MT_CHANGE_CIPHER_SPEC 0x0101
 
-		const EVP_CIPHER *new_sym_enc;
-		const EVP_MD *new_hash;
-		int new_mac_pkey_type;
-		int new_mac_secret_size;
-#ifndef OPENSSL_NO_COMP
-		const SSL_COMP *new_compression;
-#else
-		char *new_compression;
-#endif
-		int cert_request;
-		} tmp;
-
- /* Connection binding to prevent renegotiation attacks */
- unsigned char previous_client_finished[EVP_MAX_MD_SIZE];
- unsigned char previous_client_finished_len;
- unsigned char previous_server_finished[EVP_MAX_MD_SIZE];
- unsigned char previous_server_finished_len;
- int send_connection_binding; /* TODOEKR */
-	} SSL3_STATE;
-
-
-/* SSLv3 */
-/*client */
-/* extra state */
-#define SSL3_ST_CW_FLUSH		(0x100|SSL_ST_CONNECT)
-/* write to server */
-#define SSL3_ST_CW_CLNT_HELLO_A		(0x110|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CLNT_HELLO_B		(0x111|SSL_ST_CONNECT)
-/* read from server */
-#define SSL3_ST_CR_SRVR_HELLO_A		(0x120|SSL_ST_CONNECT)
-#define SSL3_ST_CR_SRVR_HELLO_B		(0x121|SSL_ST_CONNECT)
-#define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A (0x126|SSL_ST_CONNECT)
-#define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B (0x127|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CERT_A		(0x130|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CERT_B		(0x131|SSL_ST_CONNECT)
-#define SSL3_ST_CR_KEY_EXCH_A		(0x140|SSL_ST_CONNECT)
-#define SSL3_ST_CR_KEY_EXCH_B		(0x141|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CERT_REQ_A		(0x150|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CERT_REQ_B		(0x151|SSL_ST_CONNECT)
-#define SSL3_ST_CR_SRVR_DONE_A		(0x160|SSL_ST_CONNECT)
-#define SSL3_ST_CR_SRVR_DONE_B		(0x161|SSL_ST_CONNECT)
-/* write to server */
-#define SSL3_ST_CW_CERT_A		(0x170|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CERT_B		(0x171|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CERT_C		(0x172|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CERT_D		(0x173|SSL_ST_CONNECT)
-#define SSL3_ST_CW_KEY_EXCH_A		(0x180|SSL_ST_CONNECT)
-#define SSL3_ST_CW_KEY_EXCH_B		(0x181|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CERT_VRFY_A		(0x190|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CERT_VRFY_B		(0x191|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CHANGE_A		(0x1A0|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CHANGE_B		(0x1A1|SSL_ST_CONNECT)
-#define SSL3_ST_CW_FINISHED_A		(0x1B0|SSL_ST_CONNECT)
-#define SSL3_ST_CW_FINISHED_B		(0x1B1|SSL_ST_CONNECT)
-/* read from server */
-#define SSL3_ST_CR_CHANGE_A		(0x1C0|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CHANGE_B		(0x1C1|SSL_ST_CONNECT)
-#define SSL3_ST_CR_FINISHED_A		(0x1D0|SSL_ST_CONNECT)
-#define SSL3_ST_CR_FINISHED_B		(0x1D1|SSL_ST_CONNECT)
-#define SSL3_ST_CR_SESSION_TICKET_A	(0x1E0|SSL_ST_CONNECT)
-#define SSL3_ST_CR_SESSION_TICKET_B	(0x1E1|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CERT_STATUS_A	(0x1F0|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CERT_STATUS_B	(0x1F1|SSL_ST_CONNECT)
-
-/* server */
-/* extra state */
-#define SSL3_ST_SW_FLUSH		(0x100|SSL_ST_ACCEPT)
-/* read from client */
-/* Do not change the number values, they do matter */
-#define SSL3_ST_SR_CLNT_HELLO_A		(0x110|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CLNT_HELLO_B		(0x111|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CLNT_HELLO_C		(0x112|SSL_ST_ACCEPT)
-/* write to client */
-#define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A (0x113|SSL_ST_ACCEPT)
-#define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B (0x114|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_HELLO_REQ_A		(0x120|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_HELLO_REQ_B		(0x121|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_HELLO_REQ_C		(0x122|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_SRVR_HELLO_A		(0x130|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_SRVR_HELLO_B		(0x131|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CERT_A		(0x140|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CERT_B		(0x141|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_KEY_EXCH_A		(0x150|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_KEY_EXCH_B		(0x151|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CERT_REQ_A		(0x160|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CERT_REQ_B		(0x161|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_SRVR_DONE_A		(0x170|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_SRVR_DONE_B		(0x171|SSL_ST_ACCEPT)
-/* read from client */
-#define SSL3_ST_SR_CERT_A		(0x180|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CERT_B		(0x181|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_KEY_EXCH_A		(0x190|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_KEY_EXCH_B		(0x191|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CERT_VRFY_A		(0x1A0|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CERT_VRFY_B		(0x1A1|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CHANGE_A		(0x1B0|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CHANGE_B		(0x1B1|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_FINISHED_A		(0x1C0|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_FINISHED_B		(0x1C1|SSL_ST_ACCEPT)
-/* write to client */
-#define SSL3_ST_SW_CHANGE_A		(0x1D0|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CHANGE_B		(0x1D1|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_FINISHED_A		(0x1E0|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_FINISHED_B		(0x1E1|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_SESSION_TICKET_A	(0x1F0|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_SESSION_TICKET_B	(0x1F1|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CERT_STATUS_A	(0x200|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CERT_STATUS_B	(0x201|SSL_ST_ACCEPT)
-
-#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
-#define DTLS1_MT_HELLO_VERIFY_REQUEST 3
-
-
-#define SSL3_MT_CCS				1
+# 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)
+# 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-0.7.1.tar.gz/extra_lib/include/openssl/stack.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/stack.h Changed

@@ -1,105 +1,75 @@
-/* crypto/stack/stack.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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
+# define HEADER_STACK_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct stack_st
-	{
-	int num;
-	char **data;
-	int sorted;
+typedef struct stack_st OPENSSL_STACK; /* Use STACK_OF(...) instead */
 
-	int num_alloc;
-	int (*comp)(const void *, const void *);
-	} _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 *);
 
-#define M_sk_num(sk)		((sk) ? (sk)->num:-1)
-#define M_sk_value(sk,n)	((sk) ? (sk)->data[n] : NULL)
+int OPENSSL_sk_num(const OPENSSL_STACK *);
+void *OPENSSL_sk_value(const OPENSSL_STACK *, int);
 
-int sk_num(const _STACK *);
-void *sk_value(const _STACK *, int);
+void *OPENSSL_sk_set(OPENSSL_STACK *st, int i, const void *data);
 
-void *sk_set(_STACK *, int, void *);
+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);
 
-_STACK *sk_new(int (*cmp)(const void *, const void *));
-_STACK *sk_new_null(void);
-void sk_free(_STACK *);
-void sk_pop_free(_STACK *st, void (*func)(void *));
-int sk_insert(_STACK *sk, void *data, int where);
-void *sk_delete(_STACK *st, int loc);
-void *sk_delete_ptr(_STACK *st, void *p);
-int sk_find(_STACK *st, void *data);
-int sk_find_ex(_STACK *st, void *data);
-int sk_push(_STACK *st, void *data);
-int sk_unshift(_STACK *st, void *data);
-void *sk_shift(_STACK *st);
-void *sk_pop(_STACK *st);
-void sk_zero(_STACK *st);
-int (*sk_set_cmp_func(_STACK *sk, int (*c)(const void *, const void *)))
-	(const void *, const void *);
-_STACK *sk_dup(_STACK *st);
-void sk_sort(_STACK *st);
-int sk_is_sorted(const _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
 }

gpac-0.7.1.tar.gz/extra_lib/include/openssl/symhacks.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/symhacks.h Changed

@@ -1,449 +1,52 @@
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+/*
+ * 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>
-
-/* Hacks to solve the problem with linkers incapable of handling very long
- symbol names. In the case of VMS, the limit is 31 characters on VMS for
- VAX. */
-/* Note that this affects util/libeay.num and util/ssleay.num... you may
- change those manually, but that's not recommended, as those files are
- controlled centrally and updated on Unix, and the central definition
- may disagree with yours, which in turn may come with shareable library
- incompatibilities. */
-#ifdef OPENSSL_SYS_VMS
-
-/* Hack a long name in crypto/ex_data.c */
-#undef CRYPTO_get_ex_data_implementation
-#define CRYPTO_get_ex_data_implementation	CRYPTO_get_ex_data_impl
-#undef CRYPTO_set_ex_data_implementation
-#define CRYPTO_set_ex_data_implementation	CRYPTO_set_ex_data_impl
-
-/* Hack a long name in crypto/asn1/a_mbstr.c */
-#undef ASN1_STRING_set_default_mask_asc
-#define ASN1_STRING_set_default_mask_asc	ASN1_STRING_set_def_mask_asc
-
-#if 0 /* No longer needed, since safestack macro magic does the job */
-/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO) */
-#undef i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO
-#define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO	i2d_ASN1_SET_OF_PKCS7_SIGINF
-#undef d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO
-#define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO	d2i_ASN1_SET_OF_PKCS7_SIGINF
-#endif
-
-#if 0 /* No longer needed, since safestack macro magic does the job */
-/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO) */
-#undef i2d_ASN1_SET_OF_PKCS7_RECIP_INFO
-#define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO	i2d_ASN1_SET_OF_PKCS7_RECINF
-#undef d2i_ASN1_SET_OF_PKCS7_RECIP_INFO
-#define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO	d2i_ASN1_SET_OF_PKCS7_RECINF
-#endif
-
-#if 0 /* No longer needed, since safestack macro magic does the job */
-/* Hack the names created with DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION) */
-#undef i2d_ASN1_SET_OF_ACCESS_DESCRIPTION
-#define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION	i2d_ASN1_SET_OF_ACC_DESC
-#undef d2i_ASN1_SET_OF_ACCESS_DESCRIPTION
-#define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION	d2i_ASN1_SET_OF_ACC_DESC
-#endif
-
-/* Hack the names created with DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE) */
-#undef PEM_read_NETSCAPE_CERT_SEQUENCE
-#define PEM_read_NETSCAPE_CERT_SEQUENCE		PEM_read_NS_CERT_SEQ
-#undef PEM_write_NETSCAPE_CERT_SEQUENCE
-#define PEM_write_NETSCAPE_CERT_SEQUENCE	PEM_write_NS_CERT_SEQ
-#undef PEM_read_bio_NETSCAPE_CERT_SEQUENCE
-#define PEM_read_bio_NETSCAPE_CERT_SEQUENCE	PEM_read_bio_NS_CERT_SEQ
-#undef PEM_write_bio_NETSCAPE_CERT_SEQUENCE
-#define PEM_write_bio_NETSCAPE_CERT_SEQUENCE	PEM_write_bio_NS_CERT_SEQ
-#undef PEM_write_cb_bio_NETSCAPE_CERT_SEQUENCE
-#define PEM_write_cb_bio_NETSCAPE_CERT_SEQUENCE	PEM_write_cb_bio_NS_CERT_SEQ
-
-/* Hack the names created with DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO) */
-#undef PEM_read_PKCS8_PRIV_KEY_INFO
-#define PEM_read_PKCS8_PRIV_KEY_INFO		PEM_read_P8_PRIV_KEY_INFO
-#undef PEM_write_PKCS8_PRIV_KEY_INFO
-#define PEM_write_PKCS8_PRIV_KEY_INFO		PEM_write_P8_PRIV_KEY_INFO
-#undef PEM_read_bio_PKCS8_PRIV_KEY_INFO
-#define PEM_read_bio_PKCS8_PRIV_KEY_INFO	PEM_read_bio_P8_PRIV_KEY_INFO
-#undef PEM_write_bio_PKCS8_PRIV_KEY_INFO
-#define PEM_write_bio_PKCS8_PRIV_KEY_INFO	PEM_write_bio_P8_PRIV_KEY_INFO
-#undef PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO
-#define PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO	PEM_wrt_cb_bio_P8_PRIV_KEY_INFO
-
-/* Hack other PEM names */
-#undef PEM_write_bio_PKCS8PrivateKey_nid
-#define PEM_write_bio_PKCS8PrivateKey_nid	PEM_write_bio_PKCS8PrivKey_nid
-
-/* Hack some long X509 names */
-#undef X509_REVOKED_get_ext_by_critical
-#define X509_REVOKED_get_ext_by_critical	X509_REVOKED_get_ext_by_critic
-#undef X509_policy_tree_get0_user_policies
-#define X509_policy_tree_get0_user_policies	X509_pcy_tree_get0_usr_policies
-#undef X509_policy_node_get0_qualifiers
-#define X509_policy_node_get0_qualifiers	X509_pcy_node_get0_qualifiers
-#undef X509_STORE_CTX_get_explicit_policy
-#define X509_STORE_CTX_get_explicit_policy	X509_STORE_CTX_get_expl_policy
-#undef X509_STORE_CTX_get0_current_issuer
-#define X509_STORE_CTX_get0_current_issuer	X509_STORE_CTX_get0_cur_issuer
-
-/* Hack some long CRYPTO names */
-#undef CRYPTO_set_dynlock_destroy_callback
-#define CRYPTO_set_dynlock_destroy_callback CRYPTO_set_dynlock_destroy_cb
-#undef CRYPTO_set_dynlock_create_callback
-#define CRYPTO_set_dynlock_create_callback CRYPTO_set_dynlock_create_cb
-#undef CRYPTO_set_dynlock_lock_callback
-#define CRYPTO_set_dynlock_lock_callback	CRYPTO_set_dynlock_lock_cb
-#undef CRYPTO_get_dynlock_lock_callback
-#define CRYPTO_get_dynlock_lock_callback	CRYPTO_get_dynlock_lock_cb
-#undef CRYPTO_get_dynlock_destroy_callback
-#define CRYPTO_get_dynlock_destroy_callback CRYPTO_get_dynlock_destroy_cb
-#undef CRYPTO_get_dynlock_create_callback
-#define CRYPTO_get_dynlock_create_callback CRYPTO_get_dynlock_create_cb
-#undef CRYPTO_set_locked_mem_ex_functions
-#define CRYPTO_set_locked_mem_ex_functions CRYPTO_set_locked_mem_ex_funcs
-#undef CRYPTO_get_locked_mem_ex_functions
-#define CRYPTO_get_locked_mem_ex_functions CRYPTO_get_locked_mem_ex_funcs
-
-/* Hack some long SSL names */
-#undef SSL_CTX_set_default_verify_paths
-#define SSL_CTX_set_default_verify_paths	SSL_CTX_set_def_verify_paths
-#undef SSL_get_ex_data_X509_STORE_CTX_idx
-#define SSL_get_ex_data_X509_STORE_CTX_idx SSL_get_ex_d_X509_STORE_CTX_idx
-#undef SSL_add_file_cert_subjects_to_stack
-#define SSL_add_file_cert_subjects_to_stack SSL_add_file_cert_subjs_to_stk
-#undef SSL_add_dir_cert_subjects_to_stack
-#define SSL_add_dir_cert_subjects_to_stack SSL_add_dir_cert_subjs_to_stk
-#undef SSL_CTX_use_certificate_chain_file
-#define SSL_CTX_use_certificate_chain_file SSL_CTX_use_cert_chain_file
-#undef SSL_CTX_set_cert_verify_callback
-#define SSL_CTX_set_cert_verify_callback	SSL_CTX_set_cert_verify_cb
-#undef SSL_CTX_set_default_passwd_cb_userdata
-#define SSL_CTX_set_default_passwd_cb_userdata SSL_CTX_set_def_passwd_cb_ud
-#undef SSL_COMP_get_compression_methods
-#define SSL_COMP_get_compression_methods	SSL_COMP_get_compress_methods
-
-#undef ssl_add_clienthello_renegotiate_ext
-#define ssl_add_clienthello_renegotiate_ext	ssl_add_clienthello_reneg_ext
-#undef ssl_add_serverhello_renegotiate_ext
-#define ssl_add_serverhello_renegotiate_ext	ssl_add_serverhello_reneg_ext
-#undef ssl_parse_clienthello_renegotiate_ext
-#define ssl_parse_clienthello_renegotiate_ext	ssl_parse_clienthello_reneg_ext
-#undef ssl_parse_serverhello_renegotiate_ext
-#define ssl_parse_serverhello_renegotiate_ext	ssl_parse_serverhello_reneg_ext
-
-/* Hack some long ENGINE names */
-#undef ENGINE_get_default_BN_mod_exp_crt
-#define ENGINE_get_default_BN_mod_exp_crt	ENGINE_get_def_BN_mod_exp_crt
-#undef ENGINE_set_default_BN_mod_exp_crt
-#define ENGINE_set_default_BN_mod_exp_crt	ENGINE_set_def_BN_mod_exp_crt
-#undef ENGINE_set_load_privkey_function
-#define ENGINE_set_load_privkey_function	ENGINE_set_load_privkey_fn
-#undef ENGINE_get_load_privkey_function
-#define ENGINE_get_load_privkey_function	ENGINE_get_load_privkey_fn
-#undef ENGINE_unregister_pkey_asn1_meths
-#define ENGINE_unregister_pkey_asn1_meths	ENGINE_unreg_pkey_asn1_meths
-#undef ENGINE_register_all_pkey_asn1_meths
-#define ENGINE_register_all_pkey_asn1_meths	ENGINE_reg_all_pkey_asn1_meths
-#undef ENGINE_set_default_pkey_asn1_meths
-#define ENGINE_set_default_pkey_asn1_meths	ENGINE_set_def_pkey_asn1_meths
-#undef ENGINE_get_pkey_asn1_meth_engine
-#define ENGINE_get_pkey_asn1_meth_engine	ENGINE_get_pkey_asn1_meth_eng
-#undef ENGINE_set_load_ssl_client_cert_function
-#define ENGINE_set_load_ssl_client_cert_function \
-						ENGINE_set_ld_ssl_clnt_cert_fn
-#undef ENGINE_get_ssl_client_cert_function
-#define ENGINE_get_ssl_client_cert_function	ENGINE_get_ssl_client_cert_fn
-
-/* Hack some long OCSP names */
-#undef OCSP_REQUEST_get_ext_by_critical
-#define OCSP_REQUEST_get_ext_by_critical	OCSP_REQUEST_get_ext_by_crit
-#undef OCSP_BASICRESP_get_ext_by_critical
-#define OCSP_BASICRESP_get_ext_by_critical OCSP_BASICRESP_get_ext_by_crit
-#undef OCSP_SINGLERESP_get_ext_by_critical
-#define OCSP_SINGLERESP_get_ext_by_critical OCSP_SINGLERESP_get_ext_by_crit
-
-/* Hack some long DES names */
-#undef _ossl_old_des_ede3_cfb64_encrypt
-#define _ossl_old_des_ede3_cfb64_encrypt	_ossl_odes_ede3_cfb64_encrypt
-#undef _ossl_old_des_ede3_ofb64_encrypt
-#define _ossl_old_des_ede3_ofb64_encrypt	_ossl_odes_ede3_ofb64_encrypt
-
-/* Hack some long EVP names */
-#undef OPENSSL_add_all_algorithms_noconf
-#define OPENSSL_add_all_algorithms_noconf	OPENSSL_add_all_algo_noconf
-#undef OPENSSL_add_all_algorithms_conf
-#define OPENSSL_add_all_algorithms_conf		OPENSSL_add_all_algo_conf
-#undef EVP_PKEY_meth_set_verify_recover
-#define EVP_PKEY_meth_set_verify_recover	EVP_PKEY_meth_set_vrfy_recover
-
-/* Hack some long EC names */
-#undef EC_GROUP_set_point_conversion_form
-#define EC_GROUP_set_point_conversion_form	EC_GROUP_set_point_conv_form
-#undef EC_GROUP_get_point_conversion_form
-#define EC_GROUP_get_point_conversion_form	EC_GROUP_get_point_conv_form
-#undef EC_GROUP_clear_free_all_extra_data
-#define EC_GROUP_clear_free_all_extra_data	EC_GROUP_clr_free_all_xtra_data
-#undef EC_POINT_set_Jprojective_coordinates_GFp
-#define EC_POINT_set_Jprojective_coordinates_GFp \
- EC_POINT_set_Jproj_coords_GFp
-#undef EC_POINT_get_Jprojective_coordinates_GFp
-#define EC_POINT_get_Jprojective_coordinates_GFp \
- EC_POINT_get_Jproj_coords_GFp
-#undef EC_POINT_set_affine_coordinates_GFp
-#define EC_POINT_set_affine_coordinates_GFp EC_POINT_set_affine_coords_GFp
-#undef EC_POINT_get_affine_coordinates_GFp
-#define EC_POINT_get_affine_coordinates_GFp EC_POINT_get_affine_coords_GFp
-#undef EC_POINT_set_compressed_coordinates_GFp
-#define EC_POINT_set_compressed_coordinates_GFp EC_POINT_set_compr_coords_GFp
-#undef EC_POINT_set_affine_coordinates_GF2m
-#define EC_POINT_set_affine_coordinates_GF2m EC_POINT_set_affine_coords_GF2m
-#undef EC_POINT_get_affine_coordinates_GF2m
-#define EC_POINT_get_affine_coordinates_GF2m EC_POINT_get_affine_coords_GF2m
-#undef EC_POINT_set_compressed_coordinates_GF2m
-#define EC_POINT_set_compressed_coordinates_GF2m \
- EC_POINT_set_compr_coords_GF2m
-#undef ec_GF2m_simple_group_clear_finish
-#define ec_GF2m_simple_group_clear_finish	ec_GF2m_simple_grp_clr_finish
-#undef ec_GF2m_simple_group_check_discriminant
-#define ec_GF2m_simple_group_check_discriminant	ec_GF2m_simple_grp_chk_discrim
-#undef ec_GF2m_simple_point_clear_finish
-#define ec_GF2m_simple_point_clear_finish	ec_GF2m_simple_pt_clr_finish
-#undef ec_GF2m_simple_point_set_to_infinity
-#define ec_GF2m_simple_point_set_to_infinity	ec_GF2m_simple_pt_set_to_inf
-#undef ec_GF2m_simple_points_make_affine
-#define ec_GF2m_simple_points_make_affine	ec_GF2m_simple_pts_make_affine
-#undef ec_GF2m_simple_point_set_affine_coordinates
-#define ec_GF2m_simple_point_set_affine_coordinates \
- ec_GF2m_smp_pt_set_af_coords
-#undef ec_GF2m_simple_point_get_affine_coordinates
-#define ec_GF2m_simple_point_get_affine_coordinates \
- ec_GF2m_smp_pt_get_af_coords
-#undef ec_GF2m_simple_set_compressed_coordinates
-#define ec_GF2m_simple_set_compressed_coordinates \
- ec_GF2m_smp_set_compr_coords
-#undef ec_GFp_simple_group_set_curve_GFp
-#define ec_GFp_simple_group_set_curve_GFp ec_GFp_simple_grp_set_curve_GFp
-#undef ec_GFp_simple_group_get_curve_GFp
-#define ec_GFp_simple_group_get_curve_GFp ec_GFp_simple_grp_get_curve_GFp
-#undef ec_GFp_simple_group_clear_finish
-#define ec_GFp_simple_group_clear_finish	ec_GFp_simple_grp_clear_finish
-#undef ec_GFp_simple_group_set_generator
-#define ec_GFp_simple_group_set_generator ec_GFp_simple_grp_set_generator
-#undef ec_GFp_simple_group_get0_generator
-#define ec_GFp_simple_group_get0_generator ec_GFp_simple_grp_gt0_generator
-#undef ec_GFp_simple_group_get_cofactor
-#define ec_GFp_simple_group_get_cofactor	ec_GFp_simple_grp_get_cofactor
-#undef ec_GFp_simple_point_clear_finish
-#define ec_GFp_simple_point_clear_finish	ec_GFp_simple_pt_clear_finish
-#undef ec_GFp_simple_point_set_to_infinity
-#define ec_GFp_simple_point_set_to_infinity ec_GFp_simple_pt_set_to_inf
-#undef ec_GFp_simple_points_make_affine
-#define ec_GFp_simple_points_make_affine	ec_GFp_simple_pts_make_affine
-#undef ec_GFp_simple_group_get_curve_GFp
-#define ec_GFp_simple_group_get_curve_GFp ec_GFp_simple_grp_get_curve_GFp
-#undef ec_GFp_simple_set_Jprojective_coordinates_GFp
-#define ec_GFp_simple_set_Jprojective_coordinates_GFp \
- ec_GFp_smp_set_Jproj_coords_GFp
-#undef ec_GFp_simple_get_Jprojective_coordinates_GFp
-#define ec_GFp_simple_get_Jprojective_coordinates_GFp \
- ec_GFp_smp_get_Jproj_coords_GFp
-#undef ec_GFp_simple_point_set_affine_coordinates_GFp
-#define ec_GFp_simple_point_set_affine_coordinates_GFp \
- ec_GFp_smp_pt_set_af_coords_GFp
-#undef ec_GFp_simple_point_get_affine_coordinates_GFp
-#define ec_GFp_simple_point_get_affine_coordinates_GFp \
- ec_GFp_smp_pt_get_af_coords_GFp
-#undef ec_GFp_simple_set_compressed_coordinates_GFp
-#define ec_GFp_simple_set_compressed_coordinates_GFp \
- ec_GFp_smp_set_compr_coords_GFp
-#undef ec_GFp_simple_point_set_affine_coordinates
-#define ec_GFp_simple_point_set_affine_coordinates \
- ec_GFp_smp_pt_set_af_coords
-#undef ec_GFp_simple_point_get_affine_coordinates
-#define ec_GFp_simple_point_get_affine_coordinates \
- ec_GFp_smp_pt_get_af_coords
-#undef ec_GFp_simple_set_compressed_coordinates
-#define ec_GFp_simple_set_compressed_coordinates \
- ec_GFp_smp_set_compr_coords
-#undef ec_GFp_simple_group_check_discriminant
-#define ec_GFp_simple_group_check_discriminant	ec_GFp_simple_grp_chk_discrim
-
-/* Hack som long STORE names */
-#undef STORE_method_set_initialise_function
-#define STORE_method_set_initialise_function	STORE_meth_set_initialise_fn
-#undef STORE_method_set_cleanup_function
-#define STORE_method_set_cleanup_function	STORE_meth_set_cleanup_fn
-#undef STORE_method_set_generate_function
-#define STORE_method_set_generate_function	STORE_meth_set_generate_fn
-#undef STORE_method_set_modify_function
-#define STORE_method_set_modify_function	STORE_meth_set_modify_fn
-#undef STORE_method_set_revoke_function
-#define STORE_method_set_revoke_function	STORE_meth_set_revoke_fn
-#undef STORE_method_set_delete_function
-#define STORE_method_set_delete_function	STORE_meth_set_delete_fn
-#undef STORE_method_set_list_start_function
-#define STORE_method_set_list_start_function	STORE_meth_set_list_start_fn
-#undef STORE_method_set_list_next_function
-#define STORE_method_set_list_next_function	STORE_meth_set_list_next_fn
-#undef STORE_method_set_list_end_function
-#define STORE_method_set_list_end_function	STORE_meth_set_list_end_fn
-#undef STORE_method_set_update_store_function
-#define STORE_method_set_update_store_function	STORE_meth_set_update_store_fn
-#undef STORE_method_set_lock_store_function
-#define STORE_method_set_lock_store_function	STORE_meth_set_lock_store_fn
-#undef STORE_method_set_unlock_store_function
-#define STORE_method_set_unlock_store_function	STORE_meth_set_unlock_store_fn
-#undef STORE_method_get_initialise_function
-#define STORE_method_get_initialise_function	STORE_meth_get_initialise_fn
-#undef STORE_method_get_cleanup_function
-#define STORE_method_get_cleanup_function	STORE_meth_get_cleanup_fn
-#undef STORE_method_get_generate_function
-#define STORE_method_get_generate_function	STORE_meth_get_generate_fn
-#undef STORE_method_get_modify_function
-#define STORE_method_get_modify_function	STORE_meth_get_modify_fn
-#undef STORE_method_get_revoke_function
-#define STORE_method_get_revoke_function	STORE_meth_get_revoke_fn
-#undef STORE_method_get_delete_function
-#define STORE_method_get_delete_function	STORE_meth_get_delete_fn
-#undef STORE_method_get_list_start_function
-#define STORE_method_get_list_start_function	STORE_meth_get_list_start_fn
-#undef STORE_method_get_list_next_function
-#define STORE_method_get_list_next_function	STORE_meth_get_list_next_fn
-#undef STORE_method_get_list_end_function
-#define STORE_method_get_list_end_function	STORE_meth_get_list_end_fn
-#undef STORE_method_get_update_store_function
-#define STORE_method_get_update_store_function	STORE_meth_get_update_store_fn
-#undef STORE_method_get_lock_store_function
-#define STORE_method_get_lock_store_function	STORE_meth_get_lock_store_fn
-#undef STORE_method_get_unlock_store_function
-#define STORE_method_get_unlock_store_function	STORE_meth_get_unlock_store_fn
-
-/* Hack some long TS names */
-#undef TS_RESP_CTX_set_status_info_cond
-#define TS_RESP_CTX_set_status_info_cond	TS_RESP_CTX_set_stat_info_cond
-#undef TS_RESP_CTX_set_clock_precision_digits
-#define TS_RESP_CTX_set_clock_precision_digits	TS_RESP_CTX_set_clk_prec_digits
-#undef TS_CONF_set_clock_precision_digits
-#define TS_CONF_set_clock_precision_digits	TS_CONF_set_clk_prec_digits
-
-/* Hack some long CMS names */
-#undef CMS_RecipientInfo_ktri_get0_algs
-#define CMS_RecipientInfo_ktri_get0_algs	CMS_RecipInfo_ktri_get0_algs
-#undef CMS_RecipientInfo_ktri_get0_signer_id
-#define CMS_RecipientInfo_ktri_get0_signer_id	CMS_RecipInfo_ktri_get0_sigr_id
-#undef CMS_OtherRevocationInfoFormat_it
-#define CMS_OtherRevocationInfoFormat_it	CMS_OtherRevocInfoFormat_it
-#undef CMS_KeyAgreeRecipientIdentifier_it
-#define CMS_KeyAgreeRecipientIdentifier_it	CMS_KeyAgreeRecipIdentifier_it
-#undef CMS_OriginatorIdentifierOrKey_it
-#define CMS_OriginatorIdentifierOrKey_it	CMS_OriginatorIdOrKey_it
-#undef cms_SignerIdentifier_get0_signer_id
-#define cms_SignerIdentifier_get0_signer_id	cms_SignerId_get0_signer_id
-
-/* Hack some long DTLS1 names */
-#undef dtls1_retransmit_buffered_messages
-#define dtls1_retransmit_buffered_messages	dtls1_retransmit_buffered_msgs
-
-/* Hack some long UI names */
-#undef UI_method_get_prompt_constructor
-#define UI_method_get_prompt_constructor	UI_method_get_prompt_constructr
-#undef UI_method_set_prompt_constructor
-#define UI_method_set_prompt_constructor	UI_method_set_prompt_constructr
-
-#endif /* defined OPENSSL_SYS_VMS */
+# define HEADER_SYMHACKS_H
 
+# include <openssl/e_os2.h>
 
 /* Case insensitive linking causes problems.... */
-#if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2)
-#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
+# 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
+# undef cms_Data_create
+# define cms_Data_create priv_cms_Data_create
 
+# endif
 
-#endif /* ! defined HEADER_VMS_IDHACKS_H */
+#endif /* ! defined HEADER_VMS_IDHACKS_H */

gpac-0.7.1.tar.gz/extra_lib/include/openssl/tls1.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/tls1.h Changed

@@ -1,117 +1,16 @@
-/* ssl/tls1.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+/*
+ * 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 
+ * 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
@@ -148,383 +47,924 @@
 * OTHERWISE.
 */
 
-#ifndef HEADER_TLS1_H 
-#define HEADER_TLS1_H 
+#ifndef HEADER_TLS1_H
+# define HEADER_TLS1_H
 
-#include <openssl/buffer.h>
+# include <openssl/buffer.h>
+# include <openssl/x509.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES	0
-
-#define TLS1_VERSION			0x0301
-#define TLS1_VERSION_MAJOR		0x03
-#define TLS1_VERSION_MINOR		0x01
-
-#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_USER_CANCELLED		90
-#define TLS1_AD_NO_RENEGOTIATION	100
+/* 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 */
-
-/* ExtensionType values from RFC3546 / RFC4366 */
-#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
+# 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
-#define TLSEXT_TYPE_session_ticket		35
-/* ExtensionType value from draft-rescorla-tls-opaque-prf-input-00.txt */
-#if 0 /* will have to be provided externally for now ,
- * i.e. build with -DTLSEXT_TYPE_opaque_prf_input=38183
- * using whatever extension number you'd like to try */
-# define TLSEXT_TYPE_opaque_prf_input		?? */
-#endif
+# define TLSEXT_TYPE_elliptic_curves 10
+# define TLSEXT_TYPE_ec_point_formats 11
 
-/* Temporary extension type */
-#define TLSEXT_TYPE_renegotiate 0xff01
+/* 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
 
-/* NameType value from RFC 3546 */
-#define TLSEXT_NAMETYPE_host_name 0
-/* status request value from RFC 3546 */
-#define TLSEXT_STATUSTYPE_ocsp 1
+/* ExtensionType value from RFC5620 */
+# define TLSEXT_TYPE_heartbeat 15
 
-/* ECPointFormat values from draft-ietf-tls-ecc-12 */
-#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
+/* ExtensionType value from RFC7301 */
+# define TLSEXT_TYPE_application_layer_protocol_negotiation 16
 
-#ifndef OPENSSL_NO_TLSEXT
+/*
+ * 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);
 
-#define TLSEXT_MAXLEN_host_name 255
+int SSL_get_sigalgs(SSL *s, int idx,
+ int *psign, int *phash, int *psignandhash,
+ unsigned char *rsig, unsigned char *rhash);
 
-const char *SSL_get_servername(const SSL *s, const int type) ;
-int SSL_get_servername_type(const SSL *s) ;
+int SSL_get_shared_sigalgs(SSL *s, int idx,
+ int *psign, int *phash, int *psignandhash,
+ unsigned char *rsig, unsigned char *rhash);
 
-#define SSL_set_tlsext_host_name(s,name) \
+__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) \
+# 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) \
+# define SSL_set_tlsext_debug_arg(ssl, arg) \
 SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_ARG,0, (void *)arg)
 
-#define SSL_set_tlsext_status_type(ssl, type) \
+# 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) \
+# 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) \
+# 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) \
+# 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) \
+# 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) \
+# 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) \
+# 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) \
+# 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_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) \
+# 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_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_set_tlsext_status_cb(ssl, cb) \
+# 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_set_tlsext_status_arg(ssl, arg) \
+# 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_set_tlsext_opaque_prf_input(s, src, len) \
-SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT, len, src)
-#define SSL_CTX_set_tlsext_opaque_prf_input_callback(ctx, cb) \
-SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB, (void (*)(void))cb)
-#define SSL_CTX_set_tlsext_opaque_prf_input_callback_arg(ctx, arg) \
-SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG, 0, 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_set_tlsext_ticket_key_cb(ssl, cb) \
+#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)
 
-#endif
+# 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
-
-/* Additional TLS ciphersuites from expired Internet Draft
- * draft-ietf-tls-56-bit-ciphersuites-01.txt
- * (available if TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES is defined, see
- * s3_lib.c). We actually treat them like SSL 3.0 ciphers, which we probably
- * shouldn't. Note that the first two are actually not in the IDs. */
-#define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5		0x03000060 /* not in ID */
-#define TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5	0x03000061 /* not in ID */
-#define TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA		0x03000062
-#define TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA	0x03000063
-#define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA		0x03000064
-#define TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA	0x03000065
-#define TLS1_CK_DHE_DSS_WITH_RC4_128_SHA		0x03000066
+# 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
 
-#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
+/* 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_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
-
-#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
+# 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
-
-/* ECC ciphersuites from draft-ietf-tls-ecc-12.txt with changes soon to be in draft 13 */
-#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
-
-/* XXX
- * Inconsistency alert:
- * The OpenSSL names of ciphers with ephemeral DH here include the string
- * "DHE", while elsewhere it has always been "EDH".
- * (The alias for the list of all such ciphers also is "EDH".)
- * The specifications speak of "EDH"; maybe we should allow both forms
- * for everything. */
-#define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5		"EXP1024-RC4-MD5"
-#define TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5	"EXP1024-RC2-CBC-MD5"
-#define TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA	"EXP1024-DES-CBC-SHA"
-#define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA	"EXP1024-DHE-DSS-DES-CBC-SHA"
-#define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA		"EXP1024-RC4-SHA"
-#define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA	"EXP1024-DHE-DSS-RC4-SHA"
-#define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA		"DHE-DSS-RC4-SHA"
+# 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 draft-ietf-tls-ecc-01.txt (Mar 15, 2001) */
-#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"
+# 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_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"
+# 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"
-
-
-#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_GOST94_SIGN		21
-#define TLS_CT_GOST01_SIGN		22
-/* 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			20
-#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_SERVER_WRITE_KEY_CONST		"server write key"
-#define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE	16
-#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
-
-#ifdef CHARSET_EBCDIC
-#undef TLS_MD_CLIENT_FINISH_CONST
-#define TLS_MD_CLIENT_FINISH_CONST "\x63\x6c\x69\x65\x6e\x74\x20\x66\x69\x6e\x69\x73\x68\x65\x64" /*client finished*/
-#undef TLS_MD_SERVER_FINISH_CONST
-#define TLS_MD_SERVER_FINISH_CONST "\x73\x65\x72\x76\x65\x72\x20\x66\x69\x6e\x69\x73\x68\x65\x64" /*server finished*/
-#undef TLS_MD_SERVER_WRITE_KEY_CONST
-#define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79" /*server write key*/
-#undef TLS_MD_KEY_EXPANSION_CONST
-#define TLS_MD_KEY_EXPANSION_CONST "\x6b\x65\x79\x20\x65\x78\x70\x61\x6e\x73\x69\x6f\x6e" /*key expansion*/
-#undef TLS_MD_CLIENT_WRITE_KEY_CONST
-#define TLS_MD_CLIENT_WRITE_KEY_CONST "\x63\x6c\x69\x65\x6e\x74\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79" /*client write key*/
-#undef TLS_MD_SERVER_WRITE_KEY_CONST
-#define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79" /*server write key*/
-#undef TLS_MD_IV_BLOCK_CONST
-#define TLS_MD_IV_BLOCK_CONST "\x49\x56\x20\x62\x6c\x6f\x63\x6b" /*IV block*/
-#undef TLS_MD_MASTER_SECRET_CONST
-#define TLS_MD_MASTER_SECRET_CONST "\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74" /*master secret*/
-#endif
+# 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;
-	};
+struct tls_session_ticket_ext_st {
+ unsigned short length;
+ void *data;
+};
 
 #ifdef __cplusplus
 }

gpac-0.8.0.tar.gz/extra_lib/include/openssl/ts.h Added

@@ -0,0 +1,643 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/openssl/txt_db.h Added

@@ -0,0 +1,57 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/openssl/ui.h Added

@@ -0,0 +1,378 @@
+/*
+ * 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-0.8.0.tar.gz/extra_lib/include/openssl/whrlpool.h Added

@@ -0,0 +1,48 @@
+/*
+ * 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 c[WHIRLPOOL_DIGEST_LENGTH];
+ /* double q is here to ensure 64-bit alignment */
+ double q[WHIRLPOOL_DIGEST_LENGTH / sizeof(double)];
+ } H;
+ unsigned char data[WHIRLPOOL_BBLOCK / 8];
+ unsigned int bitoff;
+ size_t bitlen[WHIRLPOOL_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-0.7.1.tar.gz/extra_lib/include/openssl/x509.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/x509.h Changed

@@ -1,788 +1,492 @@
-/* crypto/x509/x509.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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 
+ * ECDH support in OpenSSL originally developed by
 * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
 */
 
 #ifndef HEADER_X509_H
-#define 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>
 
-#include <openssl/e_os2.h>
-#include <openssl/symhacks.h>
-#ifndef OPENSSL_NO_BUFFER
-#include <openssl/buffer.h>
-#endif
-#ifndef OPENSSL_NO_EVP
-#include <openssl/evp.h>
-#endif
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
+#ifdef __cplusplus
+extern "C" {
 #endif
-#include <openssl/stack.h>
-#include <openssl/asn1.h>
-#include <openssl/safestack.h>
 
-#ifndef OPENSSL_NO_EC
-#include <openssl/ec.h>
-#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 */ ;
 
-#ifndef OPENSSL_NO_ECDSA
-#include <openssl/ecdsa.h>
-#endif
+typedef STACK_OF(X509_ALGOR) X509_ALGORS;
 
-#ifndef OPENSSL_NO_ECDH
-#include <openssl/ecdh.h>
-#endif
+typedef struct X509_val_st {
+ ASN1_TIME *notBefore;
+ ASN1_TIME *notAfter;
+} X509_VAL;
 
-#ifndef OPENSSL_NO_DEPRECATED
-#ifndef OPENSSL_NO_RSA
-#include <openssl/rsa.h>
-#endif
-#ifndef OPENSSL_NO_DSA
-#include <openssl/dsa.h>
-#endif
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-#endif
-#endif
+typedef struct X509_sig_st X509_SIG;
 
-#ifndef OPENSSL_NO_SHA
-#include <openssl/sha.h>
-#endif
-#include <openssl/ossl_typ.h>
+typedef struct X509_name_entry_st X509_NAME_ENTRY;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+DEFINE_STACK_OF(X509_NAME_ENTRY)
 
-#ifdef OPENSSL_SYS_WIN32
-/* Under Win32 these are defined in wincrypt.h */
-#undef X509_NAME
-#undef X509_CERT_PAIR
-#undef X509_EXTENSIONS
-#endif
+DEFINE_STACK_OF(X509_NAME)
 
-#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
-
-typedef struct X509_objects_st
-	{
-	int nid;
-	int (*a2i)(void);
-	int (*i2a)(void);
-	} X509_OBJECTS;
-
-struct X509_algor_st
-	{
-	ASN1_OBJECT *algorithm;
-	ASN1_TYPE *parameter;
-	} /* X509_ALGOR */;
-
-DECLARE_ASN1_SET_OF(X509_ALGOR)
+# define X509_EX_V_NETSCAPE_HACK 0x8000
+# define X509_EX_V_INIT 0x0001
+typedef struct X509_extension_st X509_EXTENSION;
 
-typedef STACK_OF(X509_ALGOR) X509_ALGORS;
+typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS;
 
-typedef struct X509_val_st
-	{
-	ASN1_TIME *notBefore;
-	ASN1_TIME *notAfter;
-	} X509_VAL;
-
-struct X509_pubkey_st
-	{
-	X509_ALGOR *algor;
-	ASN1_BIT_STRING *public_key;
-	EVP_PKEY *pkey;
-	};
-
-typedef struct X509_sig_st
-	{
-	X509_ALGOR *algor;
-	ASN1_OCTET_STRING *digest;
-	} X509_SIG;
-
-typedef struct X509_name_entry_st
-	{
-	ASN1_OBJECT *object;
-	ASN1_STRING *value;
-	int set;
-	int size; 	/* temp variable */
-	} X509_NAME_ENTRY;
-
-DECLARE_STACK_OF(X509_NAME_ENTRY)
-DECLARE_ASN1_SET_OF(X509_NAME_ENTRY)
-
-/* we always keep X509_NAMEs in 2 forms. */
-struct X509_name_st
-	{
-	STACK_OF(X509_NAME_ENTRY) *entries;
-	int modified;	/* true if 'bytes' needs to be built */
-#ifndef OPENSSL_NO_BUFFER
-	BUF_MEM *bytes;
-#else
-	char *bytes;
-#endif
-/*	unsigned long hash; Keep the hash around for lookups */
-	unsigned char *canon_enc;
-	int canon_enclen;
-	} /* X509_NAME */;
-
-DECLARE_STACK_OF(X509_NAME)
-
-#define X509_EX_V_NETSCAPE_HACK		0x8000
-#define X509_EX_V_INIT			0x0001
-typedef struct X509_extension_st
-	{
-	ASN1_OBJECT *object;
-	ASN1_BOOLEAN critical;
-	ASN1_OCTET_STRING *value;
-	} X509_EXTENSION;
+DEFINE_STACK_OF(X509_EXTENSION)
 
-typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS;
+typedef struct x509_attributes_st X509_ATTRIBUTE;
 
-DECLARE_STACK_OF(X509_EXTENSION)
-DECLARE_ASN1_SET_OF(X509_EXTENSION)
-
-/* a sequence of these are used */
-typedef struct x509_attributes_st
-	{
-	ASN1_OBJECT *object;
-	int single; /* 0 for a set, 1 for a single item (which is wrong) */
-	union	{
-		char		*ptr;
-/* 0 */		STACK_OF(ASN1_TYPE) *set;
-/* 1 */		ASN1_TYPE	*single;
-		} value;
-	} X509_ATTRIBUTE;
-
-DECLARE_STACK_OF(X509_ATTRIBUTE)
-DECLARE_ASN1_SET_OF(X509_ATTRIBUTE)
-
-
-typedef struct X509_req_info_st
-	{
-	ASN1_ENCODING enc;
-	ASN1_INTEGER *version;
-	X509_NAME *subject;
-	X509_PUBKEY *pubkey;
-	/* d=2 hl=2 l= 0 cons: cont: 00 */
-	STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */
-	} X509_REQ_INFO;
-
-typedef struct X509_req_st
-	{
-	X509_REQ_INFO *req_info;
-	X509_ALGOR *sig_alg;
-	ASN1_BIT_STRING *signature;
-	int references;
-	} X509_REQ;
-
-typedef struct x509_cinf_st
-	{
-	ASN1_INTEGER *version;		/* [ 0 ] default of v1 */
-	ASN1_INTEGER *serialNumber;
-	X509_ALGOR *signature;
-	X509_NAME *issuer;
-	X509_VAL *validity;
-	X509_NAME *subject;
-	X509_PUBKEY *key;
-	ASN1_BIT_STRING *issuerUID;		/* [ 1 ] optional in v2 */
-	ASN1_BIT_STRING *subjectUID;		/* [ 2 ] optional in v2 */
-	STACK_OF(X509_EXTENSION) *extensions;	/* [ 3 ] optional in v3 */
-	ASN1_ENCODING enc;
-	} X509_CINF;
-
-/* This stuff is certificate "auxiliary info"
- * it contains details which are useful in certificate
- * stores and databases. When used this is tagged onto
- * the end of the certificate itself
- */
+DEFINE_STACK_OF(X509_ATTRIBUTE)
 
-typedef struct x509_cert_aux_st
-	{
-	STACK_OF(ASN1_OBJECT) *trust;		/* trusted uses */
-	STACK_OF(ASN1_OBJECT) *reject;		/* rejected uses */
-	ASN1_UTF8STRING *alias;			/* "friendly name" */
-	ASN1_OCTET_STRING *keyid;		/* key id of private key */
-	STACK_OF(X509_ALGOR) *other;		/* other unspecified info */
-	} X509_CERT_AUX;
-
-struct x509_st
-	{
-	X509_CINF *cert_info;
-	X509_ALGOR *sig_alg;
-	ASN1_BIT_STRING *signature;
-	int valid;
-	int references;
-	char *name;
-	CRYPTO_EX_DATA ex_data;
-	/* These contain copies of various extension values */
-	long ex_pathlen;
-	long ex_pcpathlen;
-	unsigned long ex_flags;
-	unsigned long ex_kusage;
-	unsigned long ex_xkusage;
-	unsigned long ex_nscert;
-	ASN1_OCTET_STRING *skid;
-	AUTHORITY_KEYID *akid;
-	X509_POLICY_CACHE *policy_cache;
-	STACK_OF(DIST_POINT) *crldp;
-	STACK_OF(GENERAL_NAME) *altname;
-	NAME_CONSTRAINTS *nc;
-#ifndef OPENSSL_NO_RFC3779
-	STACK_OF(IPAddressFamily) *rfc3779_addr;
-	struct ASIdentifiers_st *rfc3779_asid;
-#endif
-#ifndef OPENSSL_NO_SHA
-	unsigned char sha1_hash[SHA_DIGEST_LENGTH];
-#endif
-	X509_CERT_AUX *aux;
-	} /* X509 */;
+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;
 
-DECLARE_STACK_OF(X509)
-DECLARE_ASN1_SET_OF(X509)
+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;
+ int trust;
+ int flags;
+ int (*check_trust) (struct x509_trust_st *, X509 *, int);
+ char *name;
+ int arg1;
+ void *arg2;
 } X509_TRUST;
 
-DECLARE_STACK_OF(X509_TRUST)
-
-typedef struct x509_cert_pair_st {
-	X509 *forward;
-	X509 *reverse;
-} X509_CERT_PAIR;
+DEFINE_STACK_OF(X509_TRUST)
 
 /* standard trust ids */
 
-#define X509_TRUST_DEFAULT	-1	/* Only valid in purpose settings */
+# 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
+# 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
-
+# define X509_TRUST_MIN 1
+# define X509_TRUST_MAX 8
 
 /* trust_flags values */
-#define	X509_TRUST_DYNAMIC 	1
-#define	X509_TRUST_DYNAMIC_NAME	2
+# 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
+# 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)
-
-/* Flags specific to X509_NAME_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_SEP_MASK (0xf << 16)
 
-#define XN_FLAG_COMPAT		0		/* Traditional SSLeay: 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_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 */
+# 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_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_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 '=' */
+# define XN_FLAG_SPC_EQ (1 << 23)/* Put spaces round '=' */
 
-/* This determines if we dump fields we don't recognise:
- * RFC2253 requires this.
+/*
+ * This determines if we dump fields we don't recognise: RFC2253 requires
+ * this.
 */
 
-#define XN_FLAG_DUMP_UNKNOWN_FIELDS (1 << 24)
+# define XN_FLAG_DUMP_UNKNOWN_FIELDS (1 << 24)
 
-#define XN_FLAG_FN_ALIGN	(1 << 25)	/* Align field names to 20 characters */
+# 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)
+# 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)
+# 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)
-
-struct x509_revoked_st
-	{
-	ASN1_INTEGER *serialNumber;
-	ASN1_TIME *revocationDate;
-	STACK_OF(X509_EXTENSION) /* optional */ *extensions;
-	/* Set up if indirect CRL */
-	STACK_OF(GENERAL_NAME) *issuer;
-	/* Revocation reason */
-	int reason;
-	int sequence; /* load sequence */
-	};
-
-DECLARE_STACK_OF(X509_REVOKED)
-DECLARE_ASN1_SET_OF(X509_REVOKED)
-
-typedef struct X509_crl_info_st
-	{
-	ASN1_INTEGER *version;
-	X509_ALGOR *sig_alg;
-	X509_NAME *issuer;
-	ASN1_TIME *lastUpdate;
-	ASN1_TIME *nextUpdate;
-	STACK_OF(X509_REVOKED) *revoked;
-	STACK_OF(X509_EXTENSION) /* [0] */ *extensions;
-	ASN1_ENCODING enc;
-	} X509_CRL_INFO;
-
-struct X509_crl_st
-	{
-	/* actual signature */
-	X509_CRL_INFO *crl;
-	X509_ALGOR *sig_alg;
-	ASN1_BIT_STRING *signature;
-	int references;
-	int flags;
-	/* Copies of various extensions */
-	AUTHORITY_KEYID *akid;
-	ISSUING_DIST_POINT *idp;
-	/* Convenient breakdown of IDP */
-	int idp_flags;
-	int idp_reasons;
-	/* CRL and base CRL numbers for delta processing */
-	ASN1_INTEGER *crl_number;
-	ASN1_INTEGER *base_crl_number;
-#ifndef OPENSSL_NO_SHA
-	unsigned char sha1_hash[SHA_DIGEST_LENGTH];
-#endif
-	STACK_OF(GENERAL_NAMES) *issuers;
-	const X509_CRL_METHOD *meth;
-	void *meth_data;
-	} /* X509_CRL */;
-
-DECLARE_STACK_OF(X509_CRL)
-DECLARE_ASN1_SET_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;
-
-	int references;
-	} X509_PKEY;
-
-#ifndef OPENSSL_NO_EVP
-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;
-
-	int references;
-	} X509_INFO;
-
-DECLARE_STACK_OF(X509_INFO)
-#endif
-
-/* 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
+# 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;
+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;
+typedef struct Netscape_certificate_sequence {
+ ASN1_OBJECT *type;
+ STACK_OF(X509) *certs;
+} NETSCAPE_CERT_SEQUENCE;
 
-/* Unused (and iv length is wrong)
+/*- Unused (and iv length is wrong)
 typedef struct CBCParameter_st
-	{
-	unsigned char iv[8];
-	} CBC_PARAM;
+ {
+ unsigned char iv[8];
+ } CBC_PARAM;
 */
 
 /* Password based encryption structure */
 
 typedef struct PBEPARAM_st {
-ASN1_OCTET_STRING *salt;
-ASN1_INTEGER *iter;
+ ASN1_OCTET_STRING *salt;
+ ASN1_INTEGER *iter;
 } PBEPARAM;
 
 /* Password based encryption V2 structures */
 
 typedef struct PBE2PARAM_st {
-X509_ALGOR *keyfunc;
-X509_ALGOR *encryption;
+ X509_ALGOR *keyfunc;
+ X509_ALGOR *encryption;
 } PBE2PARAM;
 
 typedef struct PBKDF2PARAM_st {
-ASN1_TYPE *salt;	/* Usually OCTET STRING but could be anything */
-ASN1_INTEGER *iter;
-ASN1_INTEGER *keylength;
-X509_ALGOR *prf;
+/* Usually OCTET STRING but could be anything */
+ ASN1_TYPE *salt;
+ ASN1_INTEGER *iter;
+ ASN1_INTEGER *keylength;
+ X509_ALGOR *prf;
 } PBKDF2PARAM;
 
-
-/* PKCS#8 private key info structure */
-
-struct pkcs8_priv_key_info_st
- {
- int broken; /* Flag for various broken formats */
-#define PKCS8_OK		0
-#define PKCS8_NO_OCTET		1
-#define PKCS8_EMBEDDED_PARAM	2
-#define PKCS8_NS_DB		3
-#define PKCS8_NEG_PRIVKEY	4
- ASN1_INTEGER *version;
- X509_ALGOR *pkeyalg;
- ASN1_TYPE *pkey; /* Should be OCTET STRING but some are broken */
- STACK_OF(X509_ATTRIBUTE) *attributes;
- };
-
 #ifdef __cplusplus
 }
 #endif
 
-#include <openssl/x509_vfy.h>
-#include <openssl/pkcs7.h>
+# 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_get_version(x) ASN1_INTEGER_get((x)->cert_info->version)
-/* #define	X509_get_serialNumber(x) ((x)->cert_info->serialNumber) */
-#define		X509_get_notBefore(x) ((x)->cert_info->validity->notBefore)
-#define		X509_get_notAfter(x) ((x)->cert_info->validity->notAfter)
-#define		X509_extract_key(x)	X509_get_pubkey(x) /*****/
-#define		X509_REQ_get_version(x) ASN1_INTEGER_get((x)->req_info->version)
-#define		X509_REQ_get_subject_name(x) ((x)->req_info->subject)
-#define		X509_REQ_extract_key(a)	X509_REQ_get_pubkey(a)
-#define		X509_name_cmp(a,b)	X509_NAME_cmp((a),(b))
-#define		X509_get_signature_type(x) EVP_PKEY_type(OBJ_obj2nid((x)->sig_alg->algorithm))
-
-#define		X509_CRL_get_version(x) ASN1_INTEGER_get((x)->crl->version)
-#define 	X509_CRL_get_lastUpdate(x) ((x)->crl->lastUpdate)
-#define 	X509_CRL_get_nextUpdate(x) ((x)->crl->nextUpdate)
-#define		X509_CRL_get_issuer(x) ((x)->crl->issuer)
-#define		X509_CRL_get_REVOKED(x) ((x)->crl->revoked)
+# 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));
+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);
 
-/* This one is only used so that a binary form can output, as in
- * i2d_X509_NAME(X509_get_X509_PUBKEY(x),&buf) */
-#define 	X509_get_X509_PUBKEY(x) ((x)->cert_info->key)
-
-
 const char *X509_verify_cert_error_string(long n);
 
-#ifndef OPENSSL_NO_EVP
 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);
+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_print(BIO *bp,X509_ALGOR *alg, ASN1_STRING *sig);
+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);
-#endif
-
-#ifndef OPENSSL_NO_FP_API
+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
+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
+# 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);
+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);
+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);
+ 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
-
-#ifndef OPENSSL_NO_BIO
-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
+# 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
+# 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);
+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);
+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);
+ 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);
-#endif
 
 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(ASN1_OBJECT **paobj, int *pptype, void **ppval,
-						X509_ALGOR *algor);
+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);
+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 );
+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);
+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)
@@ -790,30 +494,32 @@
 
 DECLARE_ASN1_FUNCTIONS(X509_PUBKEY)
 
-int		X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey);
-EVP_PKEY *	X509_PUBKEY_get(X509_PUBKEY *key);
-int		X509_get_pubkey_parameters(EVP_PKEY *pkey,
-					 STACK_OF(X509) *chain);
-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
+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)
 
@@ -827,460 +533,591 @@
 
 DECLARE_ASN1_FUNCTIONS(X509_NAME)
 
-int		X509_NAME_set(X509_NAME **xn, X509_NAME *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)
 
-DECLARE_ASN1_FUNCTIONS(X509_CERT_PAIR)
-
-int X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	 CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
+#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 X509_alias_set1(X509 *x, unsigned char *name, int len);
-int X509_keyid_set1(X509 *x, 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 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, ASN1_OBJECT *obj);
-int X509_add1_reject_object(X509 *x, ASN1_OBJECT *obj);
+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);
+ 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);
-int		i2d_X509_PKEY(X509_PKEY *a,unsigned char **pp);
-X509_PKEY *	d2i_X509_PKEY(X509_PKEY **a,const unsigned char **pp,long length);
+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)
 
-#ifndef OPENSSL_NO_EVP
-X509_INFO *	X509_INFO_new(void);
-void		X509_INFO_free(X509_INFO *a);
-char *		X509_NAME_oneline(X509_NAME *a,char *buf,int size);
+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);
+ 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_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);
+ 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_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);
+ 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
 
-int 		X509_set_version(X509 *x,long version);
-int 		X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial);
-ASN1_INTEGER *	X509_get_serialNumber(X509 *x);
-int 		X509_set_issuer_name(X509 *x, X509_NAME *name);
-X509_NAME *	X509_get_issuer_name(X509 *a);
-int 		X509_set_subject_name(X509 *x, X509_NAME *name);
-X509_NAME *	X509_get_subject_name(X509 *a);
-int 		X509_set_notBefore(X509 *x, const ASN1_TIME *tm);
-int 		X509_set_notAfter(X509 *x, const ASN1_TIME *tm);
-int 		X509_set_pubkey(X509 *x, EVP_PKEY *pkey);
-EVP_PKEY *	X509_get_pubkey(X509 *x);
-ASN1_BIT_STRING * X509_get0_pubkey_bitstr(const X509 *x);
-int		X509_certificate_type(X509 *x,EVP_PKEY *pubkey /* optional */);
-
-int		X509_REQ_set_version(X509_REQ *x,long version);
-int		X509_REQ_set_subject_name(X509_REQ *req,X509_NAME *name);
-int		X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey);
-EVP_PKEY *	X509_REQ_get_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);
+
+/*
+ * 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 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, ASN1_OBJECT *obj,
-			 int lastpos);
+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);
+ 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 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);
+ 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_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm);
-int X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm);
+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);
 
-int X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial);
-int X509_REVOKED_set_revocationDate(X509_REVOKED *r, ASN1_TIME *tm);
-
-int		X509_REQ_check_private_key(X509_REQ *x509,EVP_PKEY *pkey);
-
-int		X509_check_private_key(X509 *x509,EVP_PKEY *pkey);
-
-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);
-#ifndef OPENSSL_NO_FP_API
-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, X509_NAME *nm, int indent, unsigned long flags);
-#endif
-
-#ifndef OPENSSL_NO_BIO
-int		X509_NAME_print(BIO *bp, X509_NAME *name, int obase);
-int X509_NAME_print_ex(BIO *out, 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_CERT_AUX_print(BIO *bp,X509_CERT_AUX *x, int indent);
-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);
+# if OPENSSL_API_COMPAT < 0x10100000L
+# define X509_CRL_set_lastUpdate X509_CRL_set1_lastUpdate
+# define X509_CRL_set_nextUpdate X509_CRL_set1_nextUpdate
 #endif
 
-int 		X509_NAME_entry_count(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, ASN1_OBJECT *obj,
-			char *buf,int len);
-
-/* NOTE: you should be passsing -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,ASN1_OBJECT *obj,
-			int lastpos);
-X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc);
+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,X509_NAME_ENTRY *ne,
-			int loc, int set);
-int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type,
-			unsigned char *bytes, int len, int loc, int set);
+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,
-			unsigned char *bytes, int len, int loc, int set);
+ 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);
+ 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,unsigned char *bytes, int len);
+ 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);
+ const unsigned char *bytes, int len, int loc,
+ int set);
 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
-			ASN1_OBJECT *obj, int type,const unsigned char *bytes,
-			int len);
-int 		X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne,
-			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(X509_NAME_ENTRY *ne);
-ASN1_STRING *	X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne);
-
-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,
-				 ASN1_OBJECT *obj,int lastpos);
-int		X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *x,
-					 int crit, int lastpos);
+ 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);
+ X509_EXTENSION *ex, int loc);
 
-int		X509_get_ext_count(X509 *x);
-int		X509_get_ext_by_NID(X509 *x, int nid, int lastpos);
-int		X509_get_ext_by_OBJ(X509 *x,ASN1_OBJECT *obj,int lastpos);
-int		X509_get_ext_by_critical(X509 *x, int crit, int lastpos);
-X509_EXTENSION *X509_get_ext(X509 *x, 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(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(X509_CRL *x);
-int		X509_CRL_get_ext_by_NID(X509_CRL *x, int nid, int lastpos);
-int		X509_CRL_get_ext_by_OBJ(X509_CRL *x,ASN1_OBJECT *obj,int lastpos);
-int		X509_CRL_get_ext_by_critical(X509_CRL *x, int crit, int lastpos);
-X509_EXTENSION *X509_CRL_get_ext(X509_CRL *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(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(X509_REVOKED *x);
-int		X509_REVOKED_get_ext_by_NID(X509_REVOKED *x, int nid, int lastpos);
-int		X509_REVOKED_get_ext_by_OBJ(X509_REVOKED *x,ASN1_OBJECT *obj,int lastpos);
-int		X509_REVOKED_get_ext_by_critical(X509_REVOKED *x, int crit, int lastpos);
-X509_EXTENSION *X509_REVOKED_get_ext(X509_REVOKED *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(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);
+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);
+ int nid, int crit,
+ ASN1_OCTET_STRING *data);
 X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex,
-			ASN1_OBJECT *obj,int crit,ASN1_OCTET_STRING *data);
-int		X509_EXTENSION_set_object(X509_EXTENSION *ex,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);
+ 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(X509_EXTENSION *ex);
+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, ASN1_OBJECT *obj,
-			 int lastpos);
+ 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);
+ 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,
-				ASN1_OBJECT *obj, int lastpos, int type);
+ 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);
+ 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);
+ 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);
+ 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(X509_ATTRIBUTE *attr);
+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, ASN1_OBJECT *obj,
-			 int lastpos);
+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);
+ 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 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);
+ const char *attrname, int type,
+ const unsigned char *bytes, int len);
 
-int		X509_verify_cert(X509_STORE_CTX *ctx);
+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);
+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);
+ const unsigned char *salt, int saltlen);
 
 X509_ALGOR *PKCS5_pbe_set(int alg, int iter,
-				const unsigned char *salt, int saltlen);
+ const unsigned char *salt, int saltlen);
 X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
-					 unsigned char *salt, int saltlen);
+ 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);
+ 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(PKCS8_PRIV_KEY_INFO *p8);
+EVP_PKEY *EVP_PKCS82PKEY(const PKCS8_PRIV_KEY_INFO *p8);
 PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey);
-PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8_broken(EVP_PKEY *pkey, int broken);
-PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken);
 
 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(ASN1_OBJECT **ppkalg,
-		const unsigned char **pk, int *ppklen,
-		X509_ALGOR **pa,
-		PKCS8_PRIV_KEY_INFO *p8);
+ 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 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);
+ 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);
+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),
-					char *name, int arg1, void *arg2);
+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(X509_TRUST *xp);
-char *X509_TRUST_get0_name(X509_TRUST *xp);
-int X509_TRUST_get_trust(X509_TRUST *xp);
+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
+/*
+ * 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.
 */
-void ERR_load_X509_strings(void);
+
+int ERR_load_X509_strings(void);
 
 /* Error codes for the X509 functions. */
 
 /* Function codes. */
-#define X509_F_ADD_CERT_DIR				 100
-#define X509_F_BY_FILE_CTRL				 101
-#define X509_F_CHECK_POLICY				 145
-#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_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_PRINT_EX_FP				 118
-#define X509_F_X509_PUBKEY_GET				 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
+# 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_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_ERR_ASN1_LIB				 102
-#define X509_R_INVALID_DIRECTORY			 113
-#define X509_R_INVALID_FIELD_NAME			 119
-#define X509_R_INVALID_TRUST				 123
-#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_NO_CERT_SET_FOR_US_TO_VERIFY		 105
-#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
+# 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
 #endif

gpac-0.7.1.tar.gz/extra_lib/include/openssl/x509_vfy.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/x509_vfy.h Changed

@@ -1,111 +1,41 @@
-/* crypto/x509/x509_vfy.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/*
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
 *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code. The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * "This product includes cryptographic software written by
- * Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
- * being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- * the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ * 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_H
-#include <openssl/x509.h>
-/* openssl/x509.h ends up #include-ing this file at about the only
- * appropriate moment. */
-#endif
-
 #ifndef HEADER_X509_VFY_H
-#define HEADER_X509_VFY_H
+# define HEADER_X509_VFY_H
 
-#include <openssl/opensslconf.h>
-#ifndef OPENSSL_NO_LHASH
-#include <openssl/lhash.h>
-#endif
-#include <openssl/bio.h>
-#include <openssl/crypto.h>
-#include <openssl/symhacks.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
 
-#if 0
-/* Outer object */
-typedef struct x509_hash_dir_st
-	{
-	int num_dirs;
-	char **dirs;
-	int *dirs_type;
-	int num_dirs_alloced;
-	} X509_HASH_DIR_CTX;
-#endif
+/*-
+SSL_CTX -> X509_STORE
+ -> X509_LOOKUP
+ ->X509_LOOKUP_METHOD
+ -> X509_LOOKUP
+ ->X509_LOOKUP_METHOD
 
-typedef struct x509_file_st
-	{
-	int num_paths;	/* number of paths to files or directories */
-	int num_alloced;
-	char **paths;	/* the list of paths or directories */
-	int *path_type;
-	} X509_CERT_FILE_CTX;
-
-/*******************************/
-/*
-SSL_CTX -> X509_STORE 
-		-> X509_LOOKUP
-			->X509_LOOKUP_METHOD
-		-> X509_LOOKUP
-			->X509_LOOKUP_METHOD
- 
-SSL	-> X509_STORE_CTX
-		->X509_STORE 
+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.
@@ -114,313 +44,283 @@
 certificate chain.
 */
 
-#define X509_LU_RETRY		-1
-#define X509_LU_FAIL		0
-#define X509_LU_X509		1
-#define X509_LU_CRL		2
-#define X509_LU_PKEY		3
-
-typedef struct x509_object_st
-	{
-	/* one of the above types */
-	int type;
-	union	{
-		char *ptr;
-		X509 *x509;
-		X509_CRL *crl;
-		EVP_PKEY *pkey;
-		} data;
-	} X509_OBJECT;
-
-typedef struct x509_lookup_st X509_LOOKUP;
-
-DECLARE_STACK_OF(X509_LOOKUP)
-DECLARE_STACK_OF(X509_OBJECT)
-
-/* This is a static that defines the function interface */
-typedef struct x509_lookup_method_st
-	{
-	const char *name;
-	int (*new_item)(X509_LOOKUP *ctx);
-	void (*free)(X509_LOOKUP *ctx);
-	int (*init)(X509_LOOKUP *ctx);
-	int (*shutdown)(X509_LOOKUP *ctx);
-	int (*ctrl)(X509_LOOKUP *ctx,int cmd,const char *argc,long argl,
-			char **ret);
-	int (*get_by_subject)(X509_LOOKUP *ctx,int type,X509_NAME *name,
-			 X509_OBJECT *ret);
-	int (*get_by_issuer_serial)(X509_LOOKUP *ctx,int type,X509_NAME *name,
-				 ASN1_INTEGER *serial,X509_OBJECT *ret);
-	int (*get_by_fingerprint)(X509_LOOKUP *ctx,int type,
-				 unsigned char *bytes,int len,
-				 X509_OBJECT *ret);
-	int (*get_by_alias)(X509_LOOKUP *ctx,int type,char *str,int len,
-			 X509_OBJECT *ret);
-	} X509_LOOKUP_METHOD;
-
-/* This structure hold all parameters associated with a verify operation
- * by including an X509_VERIFY_PARAM structure in related structures the
- * parameters used can be customized
- */
+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
 
-typedef struct X509_VERIFY_PARAM_st
-	{
-	char *name;
-	time_t check_time;	/* Time to use */
-	unsigned long inh_flags; /* Inheritance flags */
-	unsigned long flags;	/* Various verify flags */
-	int purpose;		/* purpose to check untrusted certificates */
-	int trust;		/* trust setting to check */
-	int depth;		/* Verify depth */
-	STACK_OF(ASN1_OBJECT) *policies;	/* Permissible policies */
-	} X509_VERIFY_PARAM;
-
-DECLARE_STACK_OF(X509_VERIFY_PARAM)
-
-/* This is used to hold everything. It is used for all certificate
- * validation. Once we have a certificate chain, the 'verify'
- * function is then called to actually check the cert chain. */
-struct x509_store_st
-	{
-	/* The following is a cache of trusted certs */
-	int cache; 	/* if true, stash any hits */
-	STACK_OF(X509_OBJECT) *objs;	/* Cache of all objects */
-
-	/* These are external lookup methods */
-	STACK_OF(X509_LOOKUP) *get_cert_methods;
-
-	X509_VERIFY_PARAM *param;
-
-	/* Callbacks for various operations */
-	int (*verify)(X509_STORE_CTX *ctx);	/* called to verify a certificate */
-	int (*verify_cb)(int ok,X509_STORE_CTX *ctx);	/* error callback */
-	int (*get_issuer)(X509 **issuer, X509_STORE_CTX *ctx, X509 *x);	/* get issuers cert from ctx */
-	int (*check_issued)(X509_STORE_CTX *ctx, X509 *x, X509 *issuer); /* check issued */
-	int (*check_revocation)(X509_STORE_CTX *ctx); /* Check revocation status of chain */
-	int (*get_crl)(X509_STORE_CTX *ctx, X509_CRL **crl, X509 *x); /* retrieve CRL */
-	int (*check_crl)(X509_STORE_CTX *ctx, X509_CRL *crl); /* Check CRL validity */
-	int (*cert_crl)(X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x); /* Check certificate against CRL */
-	STACK_OF(X509) * (*lookup_certs)(X509_STORE_CTX *ctx, X509_NAME *nm);
-	STACK_OF(X509_CRL) * (*lookup_crls)(X509_STORE_CTX *ctx, X509_NAME *nm);
-	int (*cleanup)(X509_STORE_CTX *ctx);
-
-	CRYPTO_EX_DATA ex_data;
-	int references;
-	} /* X509_STORE */;
+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);
 
-#define X509_STORE_set_verify_cb_func(ctx,func) ((ctx)->verify_cb=(func))
-#define X509_STORE_set_verify_func(ctx,func)	((ctx)->verify=(func))
-
-/* This is the functions plus an instance of the local variables. */
-struct x509_lookup_st
-	{
-	int init;			/* have we been started */
-	int skip;			/* don't use us. */
-	X509_LOOKUP_METHOD *method;	/* the functions */
-	char *method_data;		/* method data */
-
-	X509_STORE *store_ctx;	/* who owns us */
-	} /* X509_LOOKUP */;
-
-/* This is a used when verifying cert chains. Since the
- * gathering of the cert chain can take some time (and have to be
- * 'retried', this needs to be kept and passed around. */
-struct x509_store_ctx_st /* X509_STORE_CTX */
-	{
-	X509_STORE *ctx;
-	int current_method;	/* used when looking up certs */
-
-	/* The following are set by the caller */
-	X509 *cert;		/* The cert to check */
-	STACK_OF(X509) *untrusted;	/* chain of X509s - untrusted - passed in */
-	STACK_OF(X509_CRL) *crls;	/* set of CRLs passed in */
-
-	X509_VERIFY_PARAM *param;
-	void *other_ctx;	/* Other info for use with get_issuer() */
-
-	/* Callbacks for various operations */
-	int (*verify)(X509_STORE_CTX *ctx);	/* called to verify a certificate */
-	int (*verify_cb)(int ok,X509_STORE_CTX *ctx);		/* error callback */
-	int (*get_issuer)(X509 **issuer, X509_STORE_CTX *ctx, X509 *x);	/* get issuers cert from ctx */
-	int (*check_issued)(X509_STORE_CTX *ctx, X509 *x, X509 *issuer); /* check issued */
-	int (*check_revocation)(X509_STORE_CTX *ctx); /* Check revocation status of chain */
-	int (*get_crl)(X509_STORE_CTX *ctx, X509_CRL **crl, X509 *x); /* retrieve CRL */
-	int (*check_crl)(X509_STORE_CTX *ctx, X509_CRL *crl); /* Check CRL validity */
-	int (*cert_crl)(X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x); /* Check certificate against CRL */
-	int (*check_policy)(X509_STORE_CTX *ctx);
-	STACK_OF(X509) * (*lookup_certs)(X509_STORE_CTX *ctx, X509_NAME *nm);
-	STACK_OF(X509_CRL) * (*lookup_crls)(X509_STORE_CTX *ctx, X509_NAME *nm);
-	int (*cleanup)(X509_STORE_CTX *ctx);
-
-	/* The following is built up */
-	int valid;		/* if 0, rebuild chain */
-	int last_untrusted;	/* index of last untrusted cert */
-	STACK_OF(X509) *chain; 		/* chain of X509s - built up and trusted */
-	X509_POLICY_TREE *tree;	/* Valid policy tree */
-
-	int explicit_policy;	/* Require explicit policy value */
-
-	/* When something goes wrong, this is why */
-	int error_depth;
-	int error;
-	X509 *current_cert;
-	X509 *current_issuer;	/* cert currently being tested as valid issuer */
-	X509_CRL *current_crl;	/* current CRL */
-
-	int current_crl_score; /* score of current CRL */
-	unsigned int current_reasons; /* Reason mask */
-
-	X509_STORE_CTX *parent; /* For CRL path validation: parent context */
-
-	CRYPTO_EX_DATA ex_data;
-	} /* X509_STORE_CTX */;
+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
-/* illegal error (for uninitialized values, to avoid X509_V_OK): 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
+# 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
-#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
-
+# 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_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 */
 
-/* Send issuer+subject checks to verify_cb */
-#define	X509_V_FLAG_CB_ISSUER_CHECK		0x1
+# 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
+# define X509_V_FLAG_USE_CHECK_TIME 0x2
 /* Lookup CRLs */
-#define	X509_V_FLAG_CRL_CHECK			0x4
+# define X509_V_FLAG_CRL_CHECK 0x4
 /* Lookup CRLs for whole chain */
-#define	X509_V_FLAG_CRL_CHECK_ALL		0x8
+# define X509_V_FLAG_CRL_CHECK_ALL 0x8
 /* Ignore unhandled critical extensions */
-#define	X509_V_FLAG_IGNORE_CRITICAL		0x10
+# define X509_V_FLAG_IGNORE_CRITICAL 0x10
 /* Disable workarounds for broken certificates */
-#define	X509_V_FLAG_X509_STRICT			0x20
+# define X509_V_FLAG_X509_STRICT 0x20
 /* Enable proxy certificate validation */
-#define	X509_V_FLAG_ALLOW_PROXY_CERTS		0x40
+# define X509_V_FLAG_ALLOW_PROXY_CERTS 0x40
 /* Enable policy checking */
-#define X509_V_FLAG_POLICY_CHECK		0x80
+# define X509_V_FLAG_POLICY_CHECK 0x80
 /* Policy variable require-explicit-policy */
-#define X509_V_FLAG_EXPLICIT_POLICY		0x100
+# define X509_V_FLAG_EXPLICIT_POLICY 0x100
 /* Policy variable inhibit-any-policy */
-#define	X509_V_FLAG_INHIBIT_ANY			0x200
+# define X509_V_FLAG_INHIBIT_ANY 0x200
 /* Policy variable inhibit-policy-mapping */
-#define X509_V_FLAG_INHIBIT_MAP			0x400
+# define X509_V_FLAG_INHIBIT_MAP 0x400
 /* Notify callback that policy is OK */
-#define X509_V_FLAG_NOTIFY_POLICY		0x800
+# 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
+# define X509_V_FLAG_EXTENDED_CRL_SUPPORT 0x1000
 /* Delta CRL support */
-#define X509_V_FLAG_USE_DELTAS			0x2000
-/* Check selfsigned CA signature */
-#define X509_V_FLAG_CHECK_SS_SIGNATURE		0x4000
-
+# 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
+# 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, int type,
-	 X509_NAME *name);
-X509_OBJECT *X509_OBJECT_retrieve_by_subject(STACK_OF(X509_OBJECT) *h,int type,X509_NAME *name);
-X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h, X509_OBJECT *x);
-void X509_OBJECT_up_ref_count(X509_OBJECT *a);
-void X509_OBJECT_free_contents(X509_OBJECT *a);
-X509_STORE *X509_STORE_new(void );
+# 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_get1_certs(X509_STORE_CTX *st, X509_NAME *nm);
-STACK_OF(X509_CRL)* X509_STORE_get1_crls(X509_STORE_CTX *st, X509_NAME *nm);
+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,
-				 int (*verify_cb)(int, 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);
 
@@ -428,140 +328,217 @@
 
 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_trusted_stack(X509_STORE_CTX *ctx, STACK_OF(X509) *sk);
+ 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_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m);
+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_get_by_subject(X509_STORE_CTX *vs,int type,X509_NAME *name,
-	X509_OBJECT *ret);
+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);
+ long argl, char **ret);
 
-#ifndef OPENSSL_NO_STDIO
 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);
-#endif
-
 
 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, int type, X509_NAME *name,
-	X509_OBJECT *ret);
-int X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, int type, X509_NAME *name,
-	ASN1_INTEGER *serial, X509_OBJECT *ret);
-int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, int type,
-	unsigned char *bytes, int len, X509_OBJECT *ret);
-int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, int type, char *str,
-	int len, X509_OBJECT *ret);
+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);
 
-#ifndef OPENSSL_NO_STDIO
-int	X509_STORE_load_locations (X509_STORE *ctx,
-		const char *file, const char *dir);
-int	X509_STORE_set_default_paths(X509_STORE *ctx);
-#endif
-
-int X509_STORE_CTX_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-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);
-X509 *	X509_STORE_CTX_get_current_cert(X509_STORE_CTX *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_get_chain(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_set_chain(X509_STORE_CTX *c,STACK_OF(X509) *sk);
-void	X509_STORE_CTX_set0_crls(X509_STORE_CTX *c,STACK_OF(X509_CRL) *sk);
+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);
+ 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);
-void X509_STORE_CTX_set_verify_cb(X509_STORE_CTX *ctx,
-				 int (*verify_cb)(int, X509_STORE_CTX *));
- 
+ 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);
+ 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_set_flags(X509_VERIFY_PARAM *param,
+ unsigned long flags);
 int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
-							unsigned long flags);
+ 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);
+ 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);
+ 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);
+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_policies(const
+ X509_POLICY_TREE
+ *tree);
 
-STACK_OF(X509_POLICY_NODE) *
-	X509_policy_tree_get0_user_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);
+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);
+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-0.7.1.tar.gz/extra_lib/include/openssl/x509v3.h -> gpac-0.8.0.tar.gz/extra_lib/include/openssl/x509v3.h Changed

@@ -1,61 +1,12 @@
-/* x509v3.h */
 /*
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
- * 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999-2004 The OpenSSL Project. 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.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
+ * 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
 
@@ -67,12 +18,6 @@
 extern "C" {
 #endif
 
-# ifdef OPENSSL_SYS_WIN32
-/* Under Win32 these are defined in wincrypt.h */
-# undef X509_NAME
-# undef X509_EXTENSIONS
-# endif
-
 /* Forward reference */
 struct v3_ext_method;
 struct v3_ext_ctx;
@@ -123,8 +68,8 @@
 };
 
 typedef struct X509V3_CONF_METHOD_st {
- char *(*get_string) (void *db, char *section, char *value);
- STACK_OF(CONF_VALUE) *(*get_section) (void *db, char *section);
+ 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;
@@ -145,7 +90,7 @@
 
 typedef struct v3_ext_method X509V3_EXT_METHOD;
 
-DECLARE_STACK_OF(X509V3_EXT_METHOD)
+DEFINE_STACK_OF(X509V3_EXT_METHOD)
 
 /* ext_flags values */
 # define X509V3_EXT_DYNAMIC 0x1
@@ -206,8 +151,6 @@
 } d;
 } GENERAL_NAME;
 
-typedef STACK_OF(GENERAL_NAME) GENERAL_NAMES;
-
 typedef struct ACCESS_DESCRIPTION_st {
 ASN1_OBJECT *method;
 GENERAL_NAME *location;
@@ -217,9 +160,13 @@
 
 typedef STACK_OF(ASN1_OBJECT) EXTENDED_KEY_USAGE;
 
-DECLARE_STACK_OF(GENERAL_NAME)
+typedef STACK_OF(ASN1_INTEGER) TLS_FEATURE;
 
-DECLARE_STACK_OF(ACCESS_DESCRIPTION)
+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;
@@ -254,7 +201,7 @@
 
 typedef STACK_OF(DIST_POINT) CRL_DIST_POINTS;
 
-DECLARE_STACK_OF(DIST_POINT)
+DEFINE_STACK_OF(DIST_POINT)
 
 struct AUTHORITY_KEYID_st {
 ASN1_OCTET_STRING *keyid;
@@ -269,7 +216,7 @@
 ASN1_OCTET_STRING *user;
 } SXNETID;
 
-DECLARE_STACK_OF(SXNETID)
+DEFINE_STACK_OF(SXNETID)
 
 typedef struct SXNET_st {
 ASN1_INTEGER *version;
@@ -295,7 +242,7 @@
 } d;
 } POLICYQUALINFO;
 
-DECLARE_STACK_OF(POLICYQUALINFO)
+DEFINE_STACK_OF(POLICYQUALINFO)
 
 typedef struct POLICYINFO_st {
 ASN1_OBJECT *policyid;
@@ -304,14 +251,14 @@
 
 typedef STACK_OF(POLICYINFO) CERTIFICATEPOLICIES;
 
-DECLARE_STACK_OF(POLICYINFO)
+DEFINE_STACK_OF(POLICYINFO)
 
 typedef struct POLICY_MAPPING_st {
 ASN1_OBJECT *issuerDomainPolicy;
 ASN1_OBJECT *subjectDomainPolicy;
 } POLICY_MAPPING;
 
-DECLARE_STACK_OF(POLICY_MAPPING)
+DEFINE_STACK_OF(POLICY_MAPPING)
 
 typedef STACK_OF(POLICY_MAPPING) POLICY_MAPPINGS;
 
@@ -321,7 +268,7 @@
 ASN1_INTEGER *maximum;
 } GENERAL_SUBTREE;
 
-DECLARE_STACK_OF(GENERAL_SUBTREE)
+DEFINE_STACK_OF(GENERAL_SUBTREE)
 
 struct NAME_CONSTRAINTS_st {
 STACK_OF(GENERAL_SUBTREE) *permittedSubtrees;
@@ -408,6 +355,7 @@
 # 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
@@ -495,20 +443,20 @@
 # define X509V3_ADD_DELETE 5L
 # define X509V3_ADD_SILENT 0x10
 
-DECLARE_STACK_OF(X509_PURPOSE)
+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, char *zone, char *user, int userlen);
-int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user,
+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, char *user,
+int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, const char *user,
 int userlen);
 
-ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, char *zone);
+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);
 
@@ -528,7 +476,7 @@
 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, char *str);
+ X509V3_CTX *ctx, const char *str);
 
 STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
 GENERAL_NAME *gen,
@@ -554,12 +502,14 @@
 ASN1_OBJECT **poid, ASN1_TYPE **pvalue);
 
 char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
- ASN1_OCTET_STRING *ia5);
+ const ASN1_OCTET_STRING *ia5);
 ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, char *str);
+ X509V3_CTX *ctx, const char *str);
 
 DECLARE_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE)
-int i2a_ACCESS_DESCRIPTION(BIO *bp, ACCESS_DESCRIPTION *a);
+int i2a_ACCESS_DESCRIPTION(BIO *bp, const ACCESS_DESCRIPTION *a);
+
+DECLARE_ASN1_ALLOC_FUNCTIONS(TLS_FEATURE)
 
 DECLARE_ASN1_FUNCTIONS(CERTIFICATEPOLICIES)
 DECLARE_ASN1_FUNCTIONS(POLICYINFO)
@@ -575,6 +525,7 @@
 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)
@@ -594,8 +545,8 @@
 
 GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
 const X509V3_EXT_METHOD *method,
- X509V3_CTX *ctx, int gen_type, char *value,
- int is_nc);
+ 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,
@@ -607,40 +558,40 @@
 void X509V3_conf_free(CONF_VALUE *val);
 
 X509_EXTENSION *X509V3_EXT_nconf_nid(CONF *conf, X509V3_CTX *ctx, int ext_nid,
- char *value);
-X509_EXTENSION *X509V3_EXT_nconf(CONF *conf, X509V3_CTX *ctx, char *name,
- char *value);
-int X509V3_EXT_add_nconf_sk(CONF *conf, X509V3_CTX *ctx, char *section,
+ 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, char *section,
+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, char *section,
+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, char *section,
+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,
- char *value);
+ const char *value);
 X509_EXTENSION *X509V3_EXT_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
- char *name, char *value);
+ const char *name, const char *value);
 int X509V3_EXT_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
- char *section, X509 *cert);
+ const char *section, X509 *cert);
 int X509V3_EXT_REQ_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
- char *section, X509_REQ *req);
+ const char *section, X509_REQ *req);
 int X509V3_EXT_CRL_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
- char *section, X509_CRL *crl);
+ const char *section, X509_CRL *crl);
 
-int X509V3_add_value_bool_nf(char *name, int asn1_bool,
+int X509V3_add_value_bool_nf(const char *name, int asn1_bool,
 STACK_OF(CONF_VALUE) **extlist);
-int X509V3_get_value_bool(CONF_VALUE *value, int *asn1_bool);
-int X509V3_get_value_int(CONF_VALUE *value, ASN1_INTEGER **aint);
+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, char *name, char *section);
-STACK_OF(CONF_VALUE) *X509V3_get_section(X509V3_CTX *ctx, char *section);
+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,
@@ -652,13 +603,13 @@
 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, ASN1_INTEGER *aint,
+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, ASN1_INTEGER *aint);
-ASN1_INTEGER *s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth, char *value);
-char *i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint);
+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,
- ASN1_ENUMERATED *aint);
+ 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);
@@ -669,25 +620,28 @@
 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(STACK_OF(X509_EXTENSION) *x, int nid, int *crit,
+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);
 
-char *hex_to_string(const unsigned char *buffer, long len);
-unsigned char *string_to_hex(const char *str, long *len);
-int name_cmp(const char *name, const char *cmp);
+#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);
-
-int X509V3_extensions_print(BIO *out, char *title,
- STACK_OF(X509_EXTENSION) *exts,
+#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);
@@ -696,18 +650,27 @@
 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(char *sname);
+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),
- char *name, char *sname, void *arg);
-char *X509_PURPOSE_get0_name(X509_PURPOSE *xp);
-char *X509_PURPOSE_get0_sname(X509_PURPOSE *xp);
-int X509_PURPOSE_get_trust(X509_PURPOSE *xp);
+ 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(X509_PURPOSE *);
+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);
@@ -727,6 +690,8 @@
 # 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
@@ -744,13 +709,13 @@
 
 ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc);
 ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc);
-int a2i_ipadd(unsigned char *ipout, 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);
-DECLARE_STACK_OF(X509_POLICY_NODE)
+DEFINE_STACK_OF(X509_POLICY_NODE)
 
+#ifndef OPENSSL_NO_RFC3779
 typedef struct ASRange_st {
 ASN1_INTEGER *min, *max;
 } ASRange;
@@ -767,7 +732,7 @@
 } ASIdOrRange;
 
 typedef STACK_OF(ASIdOrRange) ASIdOrRanges;
-DECLARE_STACK_OF(ASIdOrRange)
+DEFINE_STACK_OF(ASIdOrRange)
 
 # define ASIdentifierChoice_inherit 0
 # define ASIdentifierChoice_asIdsOrRanges 1
@@ -805,7 +770,7 @@
 } IPAddressOrRange;
 
 typedef STACK_OF(IPAddressOrRange) IPAddressOrRanges;
-DECLARE_STACK_OF(IPAddressOrRange)
+DEFINE_STACK_OF(IPAddressOrRange)
 
 # define IPAddressChoice_inherit 0
 # define IPAddressChoice_addressesOrRanges 1
@@ -824,7 +789,7 @@
 } IPAddressFamily;
 
 typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
-DECLARE_STACK_OF(IPAddressFamily)
+DEFINE_STACK_OF(IPAddressFamily)
 
 DECLARE_ASN1_FUNCTIONS(IPAddressRange)
 DECLARE_ASN1_FUNCTIONS(IPAddressOrRange)
@@ -851,70 +816,72 @@
 * since some of the encodings (particularly for IP address prefixes
 * and ranges) are a bit tedious to work with directly.
 */
-int v3_asid_add_inherit(ASIdentifiers *asid, int which);
-int v3_asid_add_id_or_range(ASIdentifiers *asid, int which,
- ASN1_INTEGER *min, ASN1_INTEGER *max);
-int v3_addr_add_inherit(IPAddrBlocks *addr,
- const unsigned afi, const unsigned *safi);
-int v3_addr_add_prefix(IPAddrBlocks *addr,
- const unsigned afi, const unsigned *safi,
- unsigned char *a, const int prefixlen);
-int v3_addr_add_range(IPAddrBlocks *addr,
- const unsigned afi, const unsigned *safi,
- unsigned char *min, unsigned char *max);
-unsigned v3_addr_get_afi(const IPAddressFamily *f);
-int v3_addr_get_range(IPAddressOrRange *aor, const unsigned afi,
- unsigned char *min, unsigned char *max,
- const int length);
+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 v3_asid_is_canonical(ASIdentifiers *asid);
-int v3_addr_is_canonical(IPAddrBlocks *addr);
-int v3_asid_canonize(ASIdentifiers *asid);
-int v3_addr_canonize(IPAddrBlocks *addr);
+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 v3_asid_inherits(ASIdentifiers *asid);
-int v3_addr_inherits(IPAddrBlocks *addr);
-int v3_asid_subset(ASIdentifiers *a, ASIdentifiers *b);
-int v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b);
+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 v3_asid_validate_path(X509_STORE_CTX *);
-int v3_addr_validate_path(X509_STORE_CTX *);
-int v3_asid_validate_resource_set(STACK_OF(X509) *chain,
- ASIdentifiers *ext, int allow_inheritance);
-int v3_addr_validate_resource_set(STACK_OF(X509) *chain,
- IPAddrBlocks *ext, int allow_inheritance);
+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.
 */
-void ERR_load_X509V3_strings(void);
+
+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_CONF 124
 # define X509V3_F_DO_EXT_I2D 135
 # define X509V3_F_DO_EXT_NCONF 151
-# define X509V3_F_DO_I2V_NAME_CONSTRAINTS 148
 # define X509V3_F_GNAMES_FROM_SECTNAME 156
-# define X509V3_F_HEX_TO_STRING 111
 # define X509V3_F_I2S_ASN1_ENUMERATED 121
 # define X509V3_F_I2S_ASN1_IA5STRING 149
 # define X509V3_F_I2S_ASN1_INTEGER 120
@@ -928,10 +895,8 @@
 # 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_ASN1_SKEY_ID 114
 # define X509V3_F_S2I_SKEY_ID 115
 # define X509V3_F_SET_DIST_POINT_NAME 158
-# define X509V3_F_STRING_TO_HEX 113
 # define X509V3_F_SXNET_ADD_ID_ASC 125
 # define X509V3_F_SXNET_ADD_ID_INTEGER 126
 # define X509V3_F_SXNET_ADD_ID_ULONG 127
@@ -953,13 +918,12 @@
 # define X509V3_F_V2I_POLICY_CONSTRAINTS 146
 # define X509V3_F_V2I_POLICY_MAPPINGS 145
 # define X509V3_F_V2I_SUBJECT_ALT 154
-# define X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL 160
+# 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_CONF 107
 # define X509V3_F_X509V3_EXT_I2D 136
 # define X509V3_F_X509V3_EXT_NCONF 152
 # define X509V3_F_X509V3_GET_SECTION 142
@@ -987,15 +951,14 @@
 # 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_ILLEGAL_HEX_DIGIT 113
 # define X509V3_R_INCORRECT_POLICY_SYNTAX_TAG 152
-# define X509V3_R_INVALID_MULTIPLE_RDNS 161
 # 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
@@ -1020,13 +983,11 @@
 # 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_ODD_NUMBER_OF_DIGITS 112
 # 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_SYNTAX_NOT_CURRENTLY_SUPPORTED 158
 # 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
@@ -1039,7 +1000,7 @@
 # define X509V3_R_UNSUPPORTED_TYPE 167
 # define X509V3_R_USER_TOO_LONG 132
 
-#ifdef __cplusplus
+# ifdef __cplusplus
 }
-#endif
+# endif
 #endif

gpac-0.7.1.tar.gz/generate_installer.bat -> gpac-0.8.0.tar.gz/generate_installer.bat Changed

gpac-0.7.1.tar.gz/gpac.spec -> gpac-0.8.0.tar.gz/gpac.spec Changed

gpac-0.7.1.tar.gz/gui/extensions/H2B2VS/init.js -> gpac-0.8.0.tar.gz/gui/extensions/H2B2VS/init.js Changed

gpac-0.8.0.tar.gz/gui/extensions/about Added

gpac-0.8.0.tar.gz/gui/extensions/about/info.js Added

gpac-0.8.0.tar.gz/gui/extensions/about/info.svg Added

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<g>
+	<g>
+		<g>
+			<circle cx="256" cy="378.5" r="25"/>
+			<path d="M256,0C114.516,0,0,114.497,0,256c0,141.484,114.497,256,256,256c141.484,0,256-114.497,256-256
+				C512,114.516,397.503,0,256,0z M256,472c-119.377,0-216-96.607-216-216c0-119.377,96.607-216,216-216
+				c119.377,0,216,96.607,216,216C472,375.377,375.393,472,256,472z"/>
+			<path d="M256,128.5c-44.112,0-80,35.888-80,80c0,11.046,8.954,20,20,20s20-8.954,20-20c0-22.056,17.944-40,40-40
+				c22.056,0,40,17.944,40,40c0,22.056-17.944,40-40,40c-11.046,0-20,8.954-20,20v50c0,11.046,8.954,20,20,20
+				c11.046,0,20-8.954,20-20v-32.531c34.466-8.903,60-40.26,60-77.469C336,164.388,300.112,128.5,256,128.5z"/>
+		</g>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

gpac-0.8.0.tar.gz/gui/extensions/about/init.js Added

gpac-0.7.1.tar.gz/gui/extensions/player/fileopen.js -> gpac-0.8.0.tar.gz/gui/extensions/player/fileopen.js Changed

gpac-0.7.1.tar.gz/gui/extensions/player/player.js -> gpac-0.8.0.tar.gz/gui/extensions/player/player.js Changed

@@ -1008,7 +1008,7 @@
 
 //MP4Client options taking 2 args
 else if ((arg == '-rti') || (arg == '-rtix') || (arg == '-c') || (arg == '-cfg') || (arg == '-size') || (arg == '-lf') || (arg == '-log-file') || (arg == '-logs')
- || (arg == '-opt') || (arg == '-ifce') || (arg == '-views') || (arg == '-avi') || (arg == '-out') || (arg == '-ntp-shift') || (arg == '-fps') || (arg == '-scale') || (arg == '-run-for')
+ || (arg == '-opt') || (arg == '-ifce') || (arg == '-views') || (arg == '-mosaic') || (arg == '-avi') || (arg == '-out') || (arg == '-ntp-shift') || (arg == '-fps') || (arg == '-scale') || (arg == '-run-for')
 ) {
 			i++;
 } else if (arg == '-service') {
@@ -1068,6 +1068,7 @@
 
 this.controler.show();
 gw_hide_dock();
+
 },
 
 create_event_filter: function (__anobj) {
@@ -1619,6 +1620,8 @@
 
 				wnd.make_item = function (text, i) {
 					wnd.add_menu_item(text, function () {
+ 			 this.extension.stats_resources = [];
+ 			 this.extension.nb_objs_at_last_scan = 0;
 						this.extension.root_odm.select_service(this.extension.services[i].service_id);
 					});
 				}
@@ -1643,6 +1646,7 @@
 		if (root_odm && this.dynamic_scene) {
 			for (var res_i = 0; res_i < root_odm.nb_resources; res_i++) {
 				var m = root_odm.get_resource(res_i);
+				if (!m) continue;
 				if (root_odm.selected_service != m.service_id) continue;
 				if (m.get_srd() != null) continue;
 				
@@ -1711,6 +1715,7 @@
 for (var res_i = 0; res_i < root.nb_resources; res_i++) {
 var m = root.get_resource(res_i);
 if (!m) continue;
+ if (m.disabled) continue;
 if (m.service_id && (m.service_id != selected_service)) continue;
 
 			m.dependent_group_id=0;
@@ -1801,9 +1806,7 @@
 			}
 
 if (stat_obj) {
- if (m.ntp_diff > stat_obj.ntp_diff) {
- stat_obj.ntp_diff = m.ntp_diff;
- }
+ stat_obj.ntp_diff = m.ntp_diff >= 0 ? m.ntp_diff : m.ntp_diff/1000;
 } 
 
 if (wnd) {

gpac-0.7.1.tar.gz/gui/extensions/player/stats.js -> gpac-0.8.0.tar.gz/gui/extensions/player/stats.js Changed

gpac-0.7.1.tar.gz/gui/gwlib.js -> gpac-0.8.0.tar.gz/gui/gwlib.js Changed

@@ -552,6 +552,7 @@
 
 gwskin.tooltip_callback = function (obj, show) {
 
+ if (! obj._tooltip) return;
 if (!show) {
 gwskin.tooltip_timeout.obj = null;
 gwskin.tooltip_timeout.stop(0);
@@ -561,6 +562,8 @@
 gwskin.tooltip_timeout.obj = obj;
 gwskin.tooltip_timeout.on_active = function (val) {
 if (!val && gwskin.tooltip_timeout.obj) {
+ //deactivate tooltip after first run
+ obj._tooltip = false;
 gwskin.tooltip_exec(gwskin.tooltip_timeout.obj, true);
 }
 }
@@ -1875,7 +1878,7 @@
 }
 
 if (this.on_over) this.on_over(value);
- if (this._tooltip && gwskin.tooltip_callback) gwskin.tooltip_callback(this, value);
+ if (gwskin.tooltip_callback) gwskin.tooltip_callback(this, value);
 }
 };
 Browser.addRoute(obj._touch, 'isOver', obj, obj._on_over);
@@ -3119,15 +3122,17 @@
 }
 notif.set_size(0.8 * gw_display_width, 120);
 
- notif.timer = gw_new_timer(false);
- notif.timer.wnd = notif;
- notif.timer.set_timeout(gwskin.default_message_timeout, false);
- notif.timer.start(0);
- notif.timer.on_active = function (val) {
- if (!val) this.wnd.close();
+ if (arguments.length < 4) {
+ notif.timer = gw_new_timer(false);
+ notif.timer.wnd = notif;
+ notif.timer.set_timeout(gwskin.default_message_timeout, false);
+ notif.timer.start(0);
+ notif.timer.on_active = function (val) {
+ if (!val) this.wnd.close();
+ }
+ notif.show_effect = 'notif';
+ notif._no_focus = true;
 }
- notif.show_effect = 'notif';
- notif._no_focus = true;
 return notif;
 }

gpac-0.8.0.tar.gz/include/gpac/atsc.h Added

@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) TELECOM ParisTech 2011
+ */
+
+#ifndef _GF_ATSC_H_
+#define _GF_ATSC_H_
+
+#include <gpac/tools.h>
+
+#ifndef GPAC_DISABLE_ATSC
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ *	\file <gpac/atsc.h>
+ *	Specific extensions for ATSC ROUTE demux
+ */
+
+/*!The GF_ATSCDmx object.*/
+typedef struct __gf_atscdmx GF_ATSCDmx;
+
+/*!The types of events used to communicate withe the demuxer user.*/
+typedef enum
+{
+	/*! A new service detected, service ID is in evt_param*/
+	GF_ATSC_EVT_SERVICE_FOUND = 0,
+	/*! Service scan completed, no evt_param*/
+	GF_ATSC_EVT_SERVICE_SCAN,
+	/*! New MPD available for service, service ID is in evt_param*/
+	GF_ATSC_EVT_MPD,
+	/*! Init segment update, service ID is in evt_param, file info is in finfo*/
+	GF_ATSC_EVT_INIT_SEG,
+	/*! Segment reception, service ID is in evt_param, file info is in finfo*/
+	GF_ATSC_EVT_SEG,
+} GF_ATSCEventType;
+
+/*! Structure used to communicate file objects properties to the user*/
+typedef struct
+{
+	/*! original file name*/
+	const char *filename;
+	/*! data pointer*/
+	char *data;
+	/*! data size*/
+	u32 size;
+	/*! object TSI*/
+	u32 tsi;
+	/*! object TOI*/
+	u32 toi;
+	/*! download time in ms*/
+	u32 download_ms;
+	/*! flag set if file is corrupted*/
+	Bool corrupted;
+} GF_ATSCEventFileInfo;
+
+/*! Creates a new ATSC demultiplexer
+ \param ifce network interface to monitor, NULL for INADDR_ANY
+ \param dir output directory for files. If NULL, files are not written to disk and user callback will be called if set
+ \param sock_buffer_size default buffer size for the udp sockets. If 0, uses 0x2000
+ \return the ATSC demultiplexer created
+*/
+GF_ATSCDmx *gf_atsc3_dmx_new(const char *ifce, const char *dir, u32 sock_buffer_size);
+/*! Deletes an ATSC demultiplexer
+ \param atscd the ATSC demultiplexer to delete
+*/
+void gf_atsc3_dmx_del(GF_ATSCDmx *atscd);
+
+/*! Processes demultiplexing, returns when nothing to read
+ \param atscd the ATSC demultiplexer
+ \return error code if any, GF_IP_NETWORK_EMPTY if nothing was read
+ */
+GF_Err gf_atsc3_dmx_process(GF_ATSCDmx *atscd);
+
+/*! Sets user callback for disk-less operations
+ \param atscd the ATSC demultiplexer
+ \param on_event the user callback function
+ \param udta the user data passed back by the callback
+ \return error code if any
+ */
+GF_Err gf_atsc3_set_callback(GF_ATSCDmx *atscd, void (*on_event)(void *udta, GF_ATSCEventType evt, u32 evt_param, GF_ATSCEventFileInfo *finfo), void *udta);
+
+/*! Sets the maximum number of objects to store on disk per TSI
+ \param atscd the ATSC demultiplexer
+ \param max_segs max number of objects (segments) to store. If 0, all objects are kept
+ \return error code if any
+ */
+GF_Err gf_atsc3_set_max_objects_store(GF_ATSCDmx *atscd, u32 max_segs);
+
+/*! Sets the maximum number of objects to store on disk per TSI
+ \param atscd the ATSC demultiplexer
+ \param service_id ID of the service to tune in. 0 means no service, 0xFFFFFFFF means all services and 0xFFFFFFFE means first service found
+ \param tune_others if set, will tune all non-selected services to get the MPD, but won't receive any media data
+ \return error code if any
+ */
+GF_Err gf_atsc3_tune_in(GF_ATSCDmx *atscd, u32 service_id, Bool tune_others);
+
+
+/*! Gets the number of objects currently loaded in the service
+ \param atscd the ATSC demultiplexer
+ \param service_id ID of the service to query
+ \return number of objects in service
+ */
+u32 gf_atsc3_dmx_get_object_count(GF_ATSCDmx *atscd, u32 service_id);
+
+/*! Removes an object with a given filename
+ \param atscd the ATSC demultiplexer
+ \param service_id ID of the service to query
+ \param fileName name of the file associated with the object
+ \param purge_previous if set, indicates that all objects with the same TSI and a TOI less than TOI of the deleted object will be removed
+ */
+void gf_atsc3_dmx_remove_object_by_name(GF_ATSCDmx *atscd, u32 service_id, char *fileName, Bool purge_previous);
+
+/*! Removes the first object loaded in the service
+ \param atscd the ATSC demultiplexer
+ \param service_id ID of the service to query
+ */
+void gf_atsc3_dmx_remove_first_object(GF_ATSCDmx *atscd, u32 service_id);
+
+/*! Checks existence of a service
+ \param atscd the ATSC demultiplexer
+ \param service_id ID of the service to query
+ \return true if service is found, false otherwise
+ */
+Bool gf_atsc3_dmx_find_service(GF_ATSCDmx *atscd, u32 service_id);
+
+/*! Removes all non-signaling objects (ie TSI!=0), keeping only init segments and currently/last downloaded objects
+\note this is mostly usefull in case of looping session, or at MPD switch boundaries
+ \param atscd the ATSC demultiplexer
+ \param service_id ID of the service to cleanup
+ */
+void gf_atsc3_dmx_purge_objects(GF_ATSCDmx *atscd, u32 service_id);
+
+
+/*! Gets high resolution system time clock of the first packet received
+ \param atscd the ATSC demultiplexer
+ \return system clock in microseconds of first packet received
+ */
+u64 gf_atsc3_dmx_get_first_packet_time(GF_ATSCDmx *atscd);
+
+/*! Gets high resolution system time clock of the last packet received
+ \param atscd the ATSC demultiplexer
+ \return system clock in microseconds of last packet received
+ */
+u64 gf_atsc3_dmx_get_last_packet_time(GF_ATSCDmx *atscd);
+
+/*! Gets the number of packets received since start of the session, for all active services
+ \param atscd the ATSC demultiplexer
+ \return number of packets received
+ */
+u64 gf_atsc3_dmx_get_nb_packets(GF_ATSCDmx *atscd);
+
+/*! Gets the number of bytes received since start of the session, for all active services
+ \param atscd the ATSC demultiplexer
+ \return number of bytes received
+ */
+u64 gf_atsc3_dmx_get_recv_bytes(GF_ATSCDmx *atscd);
+
+/*! Gather only objects with given TSI (for debug purposes)
+ \param atscd the ATSC demultiplexer
+ \param tsi the target TSI, 0 for no filtering
+ */
+void gf_atsc3_dmx_debug_tsi(GF_ATSCDmx *atscd, u32 tsi);
+
+/*! Sets udta for given service id
+ \param atscd the ATSC demultiplexer
+ \param service_id the target service
+ \param udta the target user data
+ */
+void gf_atsc3_dmx_set_service_udta(GF_ATSCDmx *atscd, u32 service_id, void *udta);
+
+/*! Gets udta for given service id
+ \param atscd the ATSC demultiplexer
+ \param service_id the target service
+ \return the user data associated with the service
+ */
+void *gf_atsc3_dmx_get_service_udta(GF_ATSCDmx *atscd, u32 service_id);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GPAC_DISABLE_ATSC */
+
+#endif	//_GF_ATSC_H_
+

gpac-0.7.1.tar.gz/include/gpac/avparse.h -> gpac-0.8.0.tar.gz/include/gpac/avparse.h Changed

@@ -35,7 +35,7 @@
 *	\file <gpac/avparse.h>
 *	\brief Utility tools for audio and video raw media parsing.
 */
-	
+
 /*! \defgroup media_grp Media Tools
 *	You will find in this module the documentation of all media tools in GPAC.
 */
@@ -49,8 +49,8 @@
 *This section documents the audio and video parsing functions of the GPAC framework.
 *	@{
 */
-	
-	
+
+
 #include <gpac/bitstream.h>
 
 
@@ -62,7 +62,7 @@
 */
 void gf_media_reduce_aspect_ratio(u32 *width, u32 *height);
 
-/*! 
+/*!
 Reduces input FPS to a more compact value (eg 25000/1000 -> 25/1)
 \param timescale timescale of the aspect ratio
 \param sample_dur sample duration of the aspect ratio in the given timescale
@@ -86,7 +86,7 @@
 	u32 time_increment;
 	/*for MPEG 1/2*/
 	Double fps;
-	
+
 	u32 next_object_start;
 } GF_M4VDecSpecInfo;
 
@@ -150,22 +150,38 @@
 
 #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined (GPAC_DISABLE_OGG)
 
+/*ogg audio tools*/
+typedef struct ogg_audio_codec_desc_t
+{
+	const char* codec_name;
+	void *parserPrivateState;
+	int channels;
+	int sample_rate;
+
+	/*process the data and returns the sample block_size (i.e. duration)*/
+	GF_Err (*process)(struct ogg_audio_codec_desc_t *parserState, char *data, u32 data_length, void *importer, Bool *destroy_esd, u32 *track, u32 *di, u64 *duration, int *block_size);
+	/*release private state*/
+	void (*release)(struct ogg_audio_codec_desc_t *parserState);
+} ogg_audio_codec_desc;
+
 /*vorbis tools*/
 typedef struct
 {
-	u32 sample_rate, channels, version;
-	s32 max_r, avg_r, low_r;
+	u32 version, num_headers;
 	u32 min_block, max_block;
+	u32 max_r, avg_r, low_r;
 
 	/*do not touch, parser private*/
-	Bool is_init;
 	u32 modebits;
 	Bool mode_flag[64];
+	u32 nb_init;
+	GF_BitStream *vbs;
 } GF_VorbisParser;
 
-/*call with vorbis header packets - you MUST initialize the structure to 0 before!!
+/*call with vorbis header packets - initializes the parser on success, leave it to NULL otherwise
 returns 1 if success, 0 if error.*/
-Bool gf_vorbis_parse_header(GF_VorbisParser *vp, char *data, u32 data_len);
+Bool gf_vorbis_parse_header(ogg_audio_codec_desc *codec, char *data, u32 data_len);
+
 /*returns 0 if init error or not a vorbis frame, otherwise returns the number of audio samples
 in this frame*/
 u32 gf_vorbis_check_frame(GF_VorbisParser *vp, char *data, u32 data_length);
@@ -316,6 +332,39 @@
 GF_Err gf_img_png_enc(char *data, u32 width, u32 height, s32 stride, u32 pixel_format, char *dst, u32 *dst_size);
 GF_Err gf_img_png_enc_file(char *data, u32 width, u32 height, s32 stride, u32 pixel_format, char *dst_file);
 
+
+
+/*!\brief obu types. */
+typedef enum {
+	OBU_RESERVED_0 = 0,
+	OBU_SEQUENCE_HEADER = 1,
+	OBU_TEMPORAL_DELIMITER = 2,
+	OBU_FRAME_HEADER = 3,
+	OBU_TILE_GROUP = 4,
+	OBU_METADATA = 5,
+	OBU_FRAME = 6,
+	OBU_REDUNDANT_FRAME_HEADER = 7,
+	OBU_TILE_LIST = 8,
+	OBU_RESERVED_9 = 9,
+	OBU_RESERVED_10 = 10,
+	OBU_RESERVED_11 = 11,
+	OBU_RESERVED_12 = 12,
+	OBU_RESERVED_13 = 13,
+	OBU_RESERVED_14 = 14,
+	OBU_PADDING = 15,
+} ObuType;
+
+/*!\brief obu metadata types. */
+typedef enum {
+	OBU_METADATA_TYPE_HDR_CLL = 1,
+	OBU_METADATA_TYPE_HDR_MDCV = 2,
+	OBU_METADATA_TYPE_SCALABILITY = 3,
+	OBU_METADATA_TYPE_ITUT_T35 = 4,
+	OBU_METADATA_TYPE_TIMECODE = 5
+} ObuMetadataType;
+
+const char *av1_get_obu_name(ObuType obu_type);
+
 /*! @} */
 
 #ifdef __cplusplus

gpac-0.7.1.tar.gz/include/gpac/bitstream.h -> gpac-0.8.0.tar.gz/include/gpac/bitstream.h Changed

@@ -68,6 +68,18 @@
  *	does not write more than possible.
  */
 GF_BitStream *gf_bs_new(const char *buffer, u64 size, u32 mode);
+
+/*!
+ *	\brief bitstream reassignment
+ *
+ *	Reassigns a bitstream in GF_BITSTREAM_READ mode to a new buffer
+ *	\param bs the bitstream to reassign
+ *	\param buffer buffer to read
+ *	\param size size of the buffer given.
+ *	\return error code if any
+ */
+GF_Err gf_bs_reassign_buffer(GF_BitStream *bs, const char *buffer, u64 size);
+
 /*!
  *	\brief bitstream constructor from file handle
  *
@@ -83,7 +95,7 @@
  */
 GF_BitStream *gf_bs_from_file(FILE *f, u32 mode);
 /*!
- *	\brief bitstream constructor from file handle
+ *	\brief bitstream destructor from file handle
  *
  * Deletes the bitstream object. If the buffer was created by the bitstream, it is deleted if still present.
  */
@@ -216,6 +228,14 @@
  */
 u64 gf_bs_read_u64(GF_BitStream *bs);
 /*!
+*	\brief little endian integer reading
+*
+*	Reads an integer coded on 64 bits in little-endian order.
+*	\param bs the target bitstream
+*	\return the integer value read.
+*/
+u64 gf_bs_read_u64_le(GF_BitStream *bs);
+/*!
  *	\brief little endian integer reading
  *
  *	Reads an integer coded on 32 bits in little-endian order.
@@ -393,6 +413,15 @@
 void gf_bs_set_eos_callback(GF_BitStream *bs, void (*EndOfStream)(void *par), void *par);
 
 /*!
+ *	\brief bitstream alignment checking
+ *
+ *	Checks if bitstream position is aligned to a byte boundary.
+ *	\param bs the target bitstream
+ *	\return GF_TRUE if aligned with regard to the read/write mode, GF_FALSE otherwise
+ */
+Bool gf_bs_is_align(GF_BitStream *bs);
+
+/*!
  *	\brief bitstream alignment
  *
  *	Aligns bitstream to next byte boundary. In write mode, this will write 0 bit values until alignment.
@@ -413,13 +442,28 @@
  *
  *	Fetches the internal bitstream buffer in write mode. If a buffer was given at the bitstream construction, or if the bitstream is in read mode, this does nothing.
  *	\param bs the target bitstream
- *	\param output address of a memory block to be allocated for bitstream data.
- *	\param outSize set to the size of the allocated memory block.
+ *	\param output address of the memory block allocated by the bitstream.
+ *	\param outSize size of the allocated memory block.
  *	\note
 	* It is the user responsability to destroy the allocated buffer
 	* Once this function has been called, the internal bitstream buffer is reseted.
  */
 void gf_bs_get_content(GF_BitStream *bs, char **output, u32 *outSize);
+
+/*!
+ *	\brief buffer fetching
+ *
+ *	Fetches the internal bitstream buffer in write mode. If a buffer was given at the bitstream construction, or if the bitstream is in read mode, this does nothing. Retrieves both the allocated buffer size and the written size
+ *	\param bs the target bitstream
+ *	\param output address of the memory block allocated by the bitstream.
+ *	\param outSize  number of bytes written in the allocated memory block.
+ *	\param allocSize  size of the allocated memory block.
+ *	\note
+	* It is the user responsability to destroy the allocated buffer
+	* Once this function has been called, the internal bitstream buffer is reseted.
+ */
+void gf_bs_get_content_no_truncate(GF_BitStream *bs, char **output, u32 *outSize, u32 *allocSize);
+
 /*!
  *	\brief byte skipping
  *
@@ -504,14 +548,14 @@
  *
  *Returns the size of the associated buffer/file.
  *\param dst the target bitstream
- *\param src the source bitstream. This bitstream is empty after calling teh function
+ *\param src the source bitstream.
  *\return error if any
  */
 GF_Err gf_bs_transfer(GF_BitStream *dst, GF_BitStream *src);
 
 
 /*!
- *\brief Flushes bitstream contet to disk
+ *\brief Flushes bitstream content to disk
  *
  *Flushes bitstream contet to disk
  *\param bs the target bitstream
@@ -527,6 +571,25 @@
  */
 void gf_bs_reassign(GF_BitStream *bs, FILE *stream);
 
+/*!
+ *\brief Sets cookie
+ *
+ *Sets a 64 bit cookie (integer, pointer) on the bitstream, returning the current cookie value
+ *\param bs the target bitstream
+ *\param cookie the new cookie to assign
+ *\return the cookie value before re-assign
+ */
+u64 gf_bs_set_cookie(GF_BitStream *bs, u64 cookie);
+
+/*!
+ *\brief Gets cookie
+ *
+ *Gets the current cookie on the bitstream
+ *\param bs the target bitstream
+ *\return the current cookie value
+ */
+u64 gf_bs_get_cookie(GF_BitStream *bs);
+
 /*! @} */
 
 #ifdef __cplusplus

gpac-0.7.1.tar.gz/include/gpac/cache.h -> gpac-0.8.0.tar.gz/include/gpac/cache.h Changed

gpac-0.7.1.tar.gz/include/gpac/color.h -> gpac-0.8.0.tar.gz/include/gpac/color.h Changed

gpac-0.7.1.tar.gz/include/gpac/configuration.h -> gpac-0.8.0.tar.gz/include/gpac/configuration.h Changed

gpac-0.7.1.tar.gz/include/gpac/constants.h -> gpac-0.8.0.tar.gz/include/gpac/constants.h Changed

@@ -247,6 +247,8 @@
 	GF_PIXEL_NV21		=	GF_4CC('N','V','2','1'),
 	/*!420 Y planar VU interleaved (U and V swapped) */
 	GF_PIXEL_NV12		=	GF_4CC('N','V','1','2'),
+	/*!420 Y planar VU interleaved (U and V swapped), 10 bits */
+	GF_PIXEL_NV12_10	=	GF_4CC('N','1','2','0'),
 
 	/*!YV12 + Alpha plane*/
 	GF_PIXEL_YUVA		=	GF_4CC('Y', 'U', 'V', 'A'),
@@ -256,12 +258,12 @@
 
 	/*!YUV planar format in 10 bits mode, all components are stored as shorts*/
 	GF_PIXEL_YV12_10	=	GF_4CC('Y','0','1','0'),
-	
+
 	GF_PIXEL_YUV422		=	GF_4CC('Y','4','4','2'),
 	GF_PIXEL_YUV422_10	=	GF_4CC('Y','2','1','0'),
 	GF_PIXEL_YUV444		=	GF_4CC('Y','4','4','4'),
 	GF_PIXEL_YUV444_10	=	GF_4CC('Y','4','1','0')
-	
+
 } GF_PixelFormat;
 
 
@@ -312,6 +314,10 @@
 	GPAC_OTI_VIDEO_LHVC = 0x25,
 	/*!OTI for H264-SVC streams*/
 	GPAC_OTI_VIDEO_MVC = 0x29,
+	/*!OTI for AOM AV1 streams*/
+	GPAC_OTI_VIDEO_AV1 = 0x30,
+	/*!OTI for VP9 streams*/
+	GPAC_OTI_VIDEO_VP9 = 0x31,
 	/*!OTI for MPEG-4 AAC streams*/
 	GPAC_OTI_AUDIO_AAC_MPEG4 = 0x40,
 
@@ -452,6 +458,7 @@
 		}\endcode
 	*/
 	GPAC_OTI_MEDIA_OGG = 0xDD,
+	GPAC_OTI_MEDIA_OPUS = 0xDE,
 	GPAC_OTI_MEDIA_THEORA = 0xDF,
 
 	GPAC_OTI_MEDIA_SUBPIC = 0xE0,
@@ -537,17 +544,39 @@
 	/*!LFE Audio Channel*/
 	GF_AUDIO_CH_LFE = (1<<3),
 	/*!Back Left Audio Channel*/
-	GF_AUDIO_CH_BACK_LEFT = (1<<4),
+	GF_AUDIO_CH_BACK_LEFT = (1 << 4),
 	/*!Back Right Audio Channel*/
-	GF_AUDIO_CH_BACK_RIGHT = (1<<5),
+	GF_AUDIO_CH_BACK_RIGHT = (1 << 5),
+	/*Between left and center in front Audio Channel*/
+	GF_AUDIO_CH_LEFT_CENTER = (1 << 6),
+	/*Between right and center in front Audio Channel*/
+	GF_AUDIO_CH_RIGHT_CENTER = (1 << 7),
 	/*!Back Center Audio Channel*/
-	GF_AUDIO_CH_BACK_CENTER = (1<<6),
+	GF_AUDIO_CH_BACK_CENTER = (1 << 8),
 	/*!Side Left Audio Channel*/
-	GF_AUDIO_CH_SIDE_LEFT = (1<<7),
+	GF_AUDIO_CH_SIDE_LEFT = (1<<9),
 	/*!Side Right Audio Channel*/
-	GF_AUDIO_CH_SIDE_RIGHT = (1<<8)
+	GF_AUDIO_CH_SIDE_RIGHT = (1<<10),
+	/*!top Audio Channel*/
+	GF_AUDIO_CH_TOP_CENTER = (1 << 11),
+	/*!between left and center above Audio Channel*/
+	GF_AUDIO_CH_TOP_FRONT_LEFT = (1 << 12),
+	/*!above center Audio Channel*/
+	GF_AUDIO_CH_TOP_FRONT_CENTER = (1 << 13),
+	/*!between right and center above Audio Channel*/
+	GF_AUDIO_CH_TOP_FRONT_RIGHT = (1 << 14),
+	/*!Back Left High Audio Channel*/
+	GF_AUDIO_CH_TOP_BACK_LEFT = (1 << 15),
+	/*!Back top High Audio Channel*/
+	GF_AUDIO_CH_TOP_BACK_CENTER = (1 << 16),
+	/*!Back Right High Audio Channel*/
+	GF_AUDIO_CH_TOP_BACK_RIGHT = (1 << 17)
 };
 
+#define SPEAKER_TOP_BACK_LEFT 0x8000
+#define SPEAKER_TOP_BACK_CENTER 0x10000
+#define SPEAKER_TOP_BACK_RIGHT 0x20000
+
 
 
 /*DIMS unit flags */
@@ -643,7 +672,7 @@
 	/*! Type2 SI slice*/
 	GF_AVC_TYPE2_SI = 9
 };
-	
+
 /*!
 HEVC NAL unit types
 */
@@ -669,6 +698,14 @@
 	GF_HEVC_NALU_SLICE_RASL_N = 8,
 	/*! RASL R HEVC slice*/
 	GF_HEVC_NALU_SLICE_RASL_R = 9,
+	/*! Reserved non-IRAP SLNR VCL NAL unit types*/
+	GF_HEVC_NALU_SLICE_RSV_VCL_N10 = 10,
+	GF_HEVC_NALU_SLICE_RSV_VCL_N12 = 12,
+	GF_HEVC_NALU_SLICE_RSV_VCL_N14 = 14,
+	/*! Reserved non-IRAP sub-layer reference VCL NAL unit types*/
+	GF_HEVC_NALU_SLICE_RSV_VCL_R11 = 11,
+	GF_HEVC_NALU_SLICE_RSV_VCL_R13 = 13,
+	GF_HEVC_NALU_SLICE_RSV_VCL_R15 = 15,
 	/*! BLA LP HEVC slice*/
 	GF_HEVC_NALU_SLICE_BLA_W_LP = 16,
 	/*! BLA DLP HEVC slice*/
@@ -702,17 +739,17 @@
 };
 
 
-	
+
 /*! Number of defined QCELP rate sizes*/
 static const unsigned int GF_QCELP_RATE_TO_SIZE_NB = 7;
 /*! QCELP rate sizes - note that these sizes INCLUDE the rate_type header byte*/
 static const unsigned int GF_QCELP_RATE_TO_SIZE [] = {0, 1, 1, 4, 2, 8, 3, 17, 4, 35, 5, 8, 14, 1};
-	
+
 /*! Number of defined EVRC rate sizes*/
 static const unsigned int GF_SMV_EVRC_RATE_TO_SIZE_NB = 6;
 /*! EVRC rate sizes - note that these sizes INCLUDE the rate_type header byte*/
 static const unsigned int GF_SMV_EVRC_RATE_TO_SIZE [] = {0, 1, 1, 3, 2, 6, 3, 11, 4, 23, 5, 1};
-	
+
 /*! AMR frame sizes*/
 static const unsigned int GF_AMR_FRAME_SIZE[16] = { 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 };
 /*! AMR WB frame sizes*/
@@ -722,8 +759,157 @@
 /*! out-of-band sample description index for 3GPP (128 and 255 reserved in RFC)*/
 #define GF_RTP_TX3G_SIDX_OFFSET	129
 
+
+/*! RFC6381 codec name max length*/
+#define RFC6381_CODEC_NAME_SIZE_MAX 100
+
 /*! @} */
 
+#define GF_VENDOR_GPAC GF_4CC('G', 'P', 'A', 'C')
+
+/* ID3v2 tags from mpegts.c */
+typedef enum {
+	ID3V2_FRAME_AENC = GF_4CC('A','E','N','C'),
+	ID3V2_FRAME_APIC = GF_4CC('A','P','I','C'),
+	ID3V2_FRAME_COMM = GF_4CC('C','O','M','M'),
+	ID3V2_FRAME_COMR = GF_4CC('C','O','M','R'),
+	ID3V2_FRAME_ENCR = GF_4CC('E','N','C','R'),
+	ID3V2_FRAME_EQUA = GF_4CC('E','Q','U','A'),
+	ID3V2_FRAME_ETCO = GF_4CC('E','T','C','O'),
+	ID3V2_FRAME_GEOB = GF_4CC('G','E','O','B'),
+	ID3V2_FRAME_GRID = GF_4CC('G','R','I','D'),
+	ID3V2_FRAME_IPLS = GF_4CC('I','P','L','S'),
+	ID3V2_FRAME_LINK = GF_4CC('L','I','N','K'),
+	ID3V2_FRAME_MCDI = GF_4CC('M','C','D','I'),
+	ID3V2_FRAME_MLLT = GF_4CC('M','L','L','T'),
+	ID3V2_FRAME_OWNE = GF_4CC('O','W','N','E'),
+	ID3V2_FRAME_PRIV = GF_4CC('P','R','I','V'),
+	ID3V2_FRAME_PCNT = GF_4CC('P','C','N','T'),
+	ID3V2_FRAME_POPM = GF_4CC('P','O','P','M'),
+	ID3V2_FRAME_POSS = GF_4CC('P','O','S','S'),
+	ID3V2_FRAME_RBUF = GF_4CC('R','B','U','F'),
+	ID3V2_FRAME_RVAD = GF_4CC('R','V','A','D'),
+	ID3V2_FRAME_RVRB = GF_4CC('R','V','R','B'),
+	ID3V2_FRAME_SYLT = GF_4CC('S','Y','L','T'),
+	ID3V2_FRAME_SYTC = GF_4CC('S','Y','T','C'),
+	ID3V2_FRAME_TALB = GF_4CC('T','E','N','C'),
+	ID3V2_FRAME_TBPM = GF_4CC('T','B','P','M'),
+	ID3V2_FRAME_TCOM = GF_4CC('T','C','O','M'),
+	ID3V2_FRAME_TCON = GF_4CC('T','C','O','N'),
+	ID3V2_FRAME_TCOP = GF_4CC('T','C','O','P'),
+	ID3V2_FRAME_TDAT = GF_4CC('T','D','A','T'),
+	ID3V2_FRAME_TDLY = GF_4CC('T','D','L','Y'),
+	ID3V2_FRAME_TENC = GF_4CC('T','E','N','C'),
+	ID3V2_FRAME_TEXT = GF_4CC('T','E','X','T'),
+	ID3V2_FRAME_TFLT = GF_4CC('T','F','L','T'),
+	ID3V2_FRAME_TIME = GF_4CC('T','I','M','E'),
+	ID3V2_FRAME_TIT1 = GF_4CC('T','I','T','1'),
+	ID3V2_FRAME_TIT2 = GF_4CC('T','I','T','2'),
+	ID3V2_FRAME_TIT3 = GF_4CC('T','I','T','3'),
+	ID3V2_FRAME_TKEY = GF_4CC('T','K','E','Y'),
+	ID3V2_FRAME_TLAN = GF_4CC('T','L','A','N'),
+	ID3V2_FRAME_TLEN = GF_4CC('T','L','E','N'),
+	ID3V2_FRAME_TMED = GF_4CC('T','M','E','D'),
+	ID3V2_FRAME_TOAL = GF_4CC('T','O','A','L'),
+	ID3V2_FRAME_TOFN = GF_4CC('T','O','F','N'),
+	ID3V2_FRAME_TOLY = GF_4CC('T','O','L','Y'),
+	ID3V2_FRAME_TOPE = GF_4CC('T','O','P','E'),
+	ID3V2_FRAME_TORY = GF_4CC('T','O','R','Y'),
+	ID3V2_FRAME_TOWN = GF_4CC('T','O','W','N'),
+	ID3V2_FRAME_TPE1 = GF_4CC('T','P','E','1'),
+	ID3V2_FRAME_TPE2 = GF_4CC('T','P','E','2'),
+	ID3V2_FRAME_TPE3 = GF_4CC('T','P','E','3'),
+	ID3V2_FRAME_TPE4 = GF_4CC('T','P','E','4'),
+	ID3V2_FRAME_TPOS = GF_4CC('T','P','E','5'),
+	ID3V2_FRAME_TPUB = GF_4CC('T','P','U','B'),
+	ID3V2_FRAME_TRCK = GF_4CC('T','R','C','K'),
+	ID3V2_FRAME_TRDA = GF_4CC('T','R','D','A'),
+	ID3V2_FRAME_TRSN = GF_4CC('T','R','S','N'),
+	ID3V2_FRAME_TRSO = GF_4CC('T','R','S','O'),
+	ID3V2_FRAME_TSIZ = GF_4CC('T','S','I','Z'),
+	ID3V2_FRAME_TSRC = GF_4CC('T','S','R','C'),
+	ID3V2_FRAME_TSSE = GF_4CC('T','S','S','E'),
+	ID3V2_FRAME_TYER = GF_4CC('T','Y','E','R'),
+	ID3V2_FRAME_TXXX = GF_4CC('T','X','X','X'),
+	ID3V2_FRAME_UFID = GF_4CC('U','F','I','D'),
+	ID3V2_FRAME_USER = GF_4CC('U','S','E','R'),
+	ID3V2_FRAME_USLT = GF_4CC('U','S','L','T'),
+	ID3V2_FRAME_WCOM = GF_4CC('W','C','O','M'),
+	ID3V2_FRAME_WCOP = GF_4CC('W','C','O','P'),
+	ID3V2_FRAME_WOAF = GF_4CC('W','O','A','F'),
+	ID3V2_FRAME_WOAR = GF_4CC('W','O','A','R'),
+	ID3V2_FRAME_WOAS = GF_4CC('W','O','A','S'),
+	ID3V2_FRAME_WORS = GF_4CC('W','O','R','S'),
+	ID3V2_FRAME_WPAY = GF_4CC('W','P','A','Y'),
+	ID3V2_FRAME_WPUB = GF_4CC('W','P','U','B'),
+	ID3V2_FRAME_WXXX = GF_4CC('W','X','X','X')
+} GF_ID3v2FrameType;
+
+
+/* media types consts from media_import.c */
+enum {
+
+	GF_MEDIA_TYPE_AC3 	= GF_4CC('A','C','3',' '),
+	GF_MEDIA_TYPE_BIFS 	= GF_4CC('B','I','F','S'),
+	GF_MEDIA_TYPE_CHAP 	= GF_4CC('C','H','A','P'),
+	GF_MEDIA_TYPE_DAC3 	= GF_4CC('D','A','C','3'),
+	GF_MEDIA_TYPE_DEC3 	= GF_4CC('D','E','C','3'),
+	GF_MEDIA_TYPE_DTS 	= GF_4CC('D','T','S',' '),
+	GF_MEDIA_TYPE_H264 	= GF_4CC('H','2','6','4'),
+	GF_MEDIA_TYPE_HEVC 	= GF_4CC('H','E','V','C'),
+	GF_MEDIA_TYPE_ID3 	= GF_4CC('I','D','3',' '),
+	GF_MEDIA_TYPE_JPEG 	= GF_4CC('J','P','E','G'),
+	GF_MEDIA_TYPE_LASR 	= GF_4CC('L','A','S','R'),
+	GF_MEDIA_TYPE_LHVC 	= GF_4CC('L','H','V','C'),
+	GF_MEDIA_TYPE_LPCM 	= GF_4CC('L','P','C','M'),
+	GF_MEDIA_TYPE_M4SP 	= GF_4CC('M','4','S','P'),
+	GF_MEDIA_TYPE_M4SS 	= GF_4CC('M','4','S','S'),
+	GF_MEDIA_TYPE_MP1A 	= GF_4CC('M','P','1','A'),
+	GF_MEDIA_TYPE_MP1V 	= GF_4CC('M','P','1','V'),
+	GF_MEDIA_TYPE_MP2A 	= GF_4CC('M','P','2','A'),
+	GF_MEDIA_TYPE_MP2V 	= GF_4CC('M','P','2','V'),
+	GF_MEDIA_TYPE_MP4A 	= GF_4CC('M','P','4','A'),
+	GF_MEDIA_TYPE_MP4V 	= GF_4CC('M','P','4','V'),
+	GF_MEDIA_TYPE_MPG1 	= GF_4CC('M','P','G','1'),
+	GF_MEDIA_TYPE_MPG2 	= GF_4CC('M','P','G','2'),
+	GF_MEDIA_TYPE_MPGA 	= GF_4CC('M','P','G','A'),
+	GF_MEDIA_TYPE_NHNL 	= GF_4CC('N','H','n','l'),
+	GF_MEDIA_TYPE_NHNT 	= GF_4CC('N','H','n','t'),
+	GF_MEDIA_TYPE_PNG 	= GF_4CC('P','N','G',' '),
+	GF_MEDIA_TYPE_SVC 	= GF_4CC('S','V','C',' '),
+	GF_MEDIA_TYPE_THEO 	= GF_4CC('t','h','e','o'),
+	GF_MEDIA_TYPE_UNK 	= GF_4CC('U','N','K',' '),
+
+	/* from mpegts.c */
+	GF_MEDIA_STREAM_AC3	= GF_4CC('A','C','-','3'),
+	GF_MEDIA_STREAM_VC1	= GF_4CC('V','C','-','1'),
+
+	/* from m2ts_muc.c */
+	GF_MEDIA_LANG_UND	= GF_4CC('u','n','d',' '),
+
+};
+
+
+/* meta types from box_code_meta.c - fileimport.c */
+enum {
+
+	GF_META_ITEM_TYPE_MIME 	= GF_4CC('m', 'i', 'm', 'e'),
+	GF_META_ITEM_TYPE_URI 	= GF_4CC('u', 'r', 'i', ' '),
+	GF_META_ITEM_TYPE_PICT 	= GF_4CC('p', 'i', 'c', 't'),
+
+	GF_META_TYPE_SVG 	= GF_4CC('s','v','g',' '),
+	GF_META_TYPE_SVGZ 	= GF_4CC('s','v','g','z'),
+	GF_META_TYPE_SMIL 	= GF_4CC('s','m','i','l'),
+	GF_META_TYPE_SMLZ 	= GF_4CC('s','m','l','z'),
+	GF_META_TYPE_X3D 	= GF_4CC('x','3','d',' '),
+	GF_META_TYPE_X3DZ 	= GF_4CC('x','3','d','z'),
+	GF_META_TYPE_XMTA 	= GF_4CC('x','m','t','a'),
+	GF_META_TYPE_XMTZ 	= GF_4CC('x','m','t','z'),
+
+	GF_META_TYPE_RVCI 	= GF_4CC('r','v','c','i'),
+
+};
+
 #ifdef __cplusplus
 }
 #endif

gpac-0.7.1.tar.gz/include/gpac/crypt.h -> gpac-0.8.0.tar.gz/include/gpac/crypt.h Changed

@@ -1,52 +1,33 @@
 /*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- * This file is part of GPAC / Crypto Tools sub-project
- *
- * GPAC is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * GPAC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
+*			GPAC - Multimedia Framework C SDK
+*
+*			Authors: Jean Le Feuvre
+*			Copyright (c) Telecom ParisTech 2000-2018
+*					All rights reserved
+*
+* This file is part of GPAC / Crypto Tools sub-project
+*
+* GPAC is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* GPAC is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; see the file COPYING. If not, write to
+* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*/
 
 /*
-	The GPAC crypto lib is a simplified version of libmcrypt - not all algos are included.
-	Doc here is man mcrypt
-	Original libmcrypt license
+The GPAC crypto lib uses either openSSL 1.x or tiny-AES (https://github.com/kokke/tiny-AES-c) when not available
+The crypto lib only supports AES 128 bits in CBC and CTR modes
 */
 
-/*
- * Copyright (C) 1998,1999,2000 Nikos Mavroyanopoulos
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
 
 #ifndef _GF_CRYPT_H_
 #define _GF_CRYPT_H_
@@ -57,97 +38,60 @@
 #endif
 
 /*!
- *	\file <gpac/crypt.h>
- *	\brief Utility tools for encryption and decryption.
- */
-	
+*	\file <gpac/crypt.h>
+*	\brief Utility tools for encryption and decryption.
+*/
+
 /*!
- *	\addtogroup crypt_grp Cryptography
- *	\ingroup media_grp
- *	\brief Utility tools for encryption and decryption.
- *
- *This section documents the encryption and decryption routines used by GPAC, mostly AES 128 in CBC or CTR modes.
- *	@{
- */
+*	\addtogroup crypt_grp Cryptography
+*	\ingroup media_grp
+*	\brief Utility tools for encryption and decryption.
+*
+*This section documents the encryption and decryption routines used by GPAC, mostly AES 128 in CBC or CTR modes.
+*	@{
+*/
 
 #include <gpac/tools.h>
 
-#ifndef GPAC_DISABLE_MCRYPT
+/*crypto lib handler*/
+typedef struct _gf_crypt_context GF_Crypt;
 
+#define GF_AES_128_KEYSIZE 16
 
-/*max number of possible key sizes for all supported modes*/
-#define MAX_KEY_SIZES	4
+typedef enum {
+	GF_CBC = 0,
+	GF_CTR = 1
+} GF_CRYPTO_MODE;
 
-/*crypto lib handler*/
-typedef struct _tag_crypt_stream GF_Crypt;
-
-/*supported modes (case insensitive): "CBC", "CFB", "CTR", "ECB", "nCFB", "nOFB", "OFB", "STREAM"*/
-/*supported algos (case insensitive):
-	"AES-128" == "Rijndael-128"
-	"AES-192" == "Rijndael-192"
-	"AES-256" == "Rijndael-256"
-	"DES", "3DES"
-*/
+typedef enum {
+	GF_AES_128 = 0
+} GF_CRYPTO_ALGO;
 
 
-/*opens crypto context - algo and mode SHALL NOT be NULL*/
-GF_Crypt *gf_crypt_open(const char *algorithm, const char *mode);
+/*opens crypto context*/
+GF_Crypt *gf_crypt_open(GF_CRYPTO_ALGO algorithm, GF_CRYPTO_MODE mode);
 /*close crypto context*/
 void gf_crypt_close(GF_Crypt *gfc);
 
-/* sets the state of the algorithm. Can be used only with block algorithms and certain modes like CBC, CFB etc.
-It is usefully if you want to restart or start a different encryption quickly.
-*/
-GF_Err gf_crypt_set_state(GF_Crypt *gfc, const void *iv, int size);
-/*gets the state of the algorithm. Can be used only certain modes and algorithms.
-The size will hold the size of the state and the state must have enough bytes to hold it.
-*/
-GF_Err gf_crypt_get_state(GF_Crypt *gfc, void *iv, int *size);
-/*Returns 1 if the algorithm is a block algorithm or 0 if it is a stream algorithm.*/
-Bool gf_crypt_is_block_algorithm(GF_Crypt *gfc);
-/*Returns 1 if the mode is for use with block algorithms, otherwise it returns 0.*/
-Bool gf_crypt_is_block_algorithm_mode(GF_Crypt *gfc);
-/*Returns 1 if the mode outputs blocks of bytes or 0 if it outputs bytes. (eg. 1 for cbc and ecb, and 0 for cfb and stream)*/
-Bool gf_crypt_is_block_mode(GF_Crypt *gfc);
-/*Returns the block size of the algorithm specified by the encryption descriptor in bytes.*/
-u32 gf_crypt_get_block_size(GF_Crypt *gfc);
-/*Returns the maximum supported key size of the algorithm specified by the encryption descriptor in bytes.*/
-u32 gf_crypt_get_key_size(GF_Crypt *gfc);
-/*Returns the number of supported key sizes.
-@keys: array of at least MAX_KEY_SIZES size - will hold the supported sizes*/
-u32 gf_crypt_get_supported_key_sizes(GF_Crypt *gfc, u32 *key_sizes);
-/*Returns size (in bytes) of the IV of the algorithm specified for the context.
-If it is '0' then the IV is ignored in that algorithm.
-IV is used in CBC, CFB, OFB modes, and in some algorithms in STREAM mode.
-*/
-u32 gf_crypt_get_iv_size(GF_Crypt *gfc);
-/*Returns 1 if the mode needs an IV, 0 otherwise.
-Some 'stream' algorithms may need an IV even if the mode itself does not need an IV.
+/*
+This function initializes all buffers for the specified context
+@key: Key used. MUST be 16 bytes long
+@iv: Init Vector. It needs to be random and unique (but not secret). The same IV must be used
+for encryption/decryption. MUST be 16 bytes long
+After calling this function you can use the descriptor for encryption or decryption (not both).
 */
-Bool gf_crypt_mode_has_iv(GF_Crypt *gfc);
+GF_Err gf_crypt_init(GF_Crypt *gfc, void *key, const void *iv);
 
-/*guess what these do...*/
-const char *gf_crypt_get_algorithm_name(GF_Crypt *gfc);
-u32 gf_crypt_get_algorithm_version(GF_Crypt *gfc);
-const char *gf_crypt_get_mode_name(GF_Crypt *gfc);
-u32 gf_crypt_get_mode_version(GF_Crypt *gfc);
+/*changes key, does not touch IV - used for key roll*/
+GF_Err gf_crypt_set_key(GF_Crypt *gfc, void *key);
 
+/* sets the IV for the algorithm. Used for ISMA and CENC CTR.
+*/
+GF_Err gf_crypt_set_IV(GF_Crypt *gfc, const void *iv, u32 size);
 
-/*
-This function initializes all buffers for the specified context
-@Lenofkey: key size in BYTES - maximum value of lenofkey should be the one obtained by
-calling gf_crypt_get_key_size() and every value smaller than this is legal.
-@IV: usually size of the algorithms block size - get it by calling gf_crypt_get_iv_size().
-	IV is ignored in ECB. IV MUST exist in CFB, CBC, STREAM, nOFB and OFB modes.
-	It needs to be random and unique (but not secret). The same IV must be used
-	for encryption/decryption.
-After calling this function you can use the descriptor for encryption or decryption (not both).
+/*gets the IV of the algorithm. The size will hold the size of the state and the state must have enough bytes to hold it (17 is enough). In CTR mode, the first byte will be set to the counter value (number of bytes consummed in last block), or 0 if all bytes were consummed
 */
-GF_Err gf_crypt_init(GF_Crypt *gfc, void *key, u32 lenofkey, const void *IV);
-/*releases context buffers - you may call gf_crypt_init after that, or gf_crypt_close*/
-void gf_crypt_deinit(GF_Crypt *gfc);
-/*changes key and IV*/
-GF_Err gf_crypt_set_key(GF_Crypt *gfc, void *key, u32 keysize, const void *iv);
+GF_Err gf_crypt_get_IV(GF_Crypt *gfc, void *iv, u32 *size);
 
 /*
 main encryption function.
@@ -155,21 +99,10 @@
 which operated in blocks (cbc, ecb, nofb), or whatever when used in cfb or ofb which operate in streams.
 The plaintext is replaced by the ciphertext.
 */
-GF_Err gf_crypt_encrypt(GF_Crypt *gfc, void *plaintext, int len);
+GF_Err gf_crypt_encrypt(GF_Crypt *gfc, void *plaintext, u32 len);
 /*decryption function. It is almost the same with gf_crypt_generic.*/
-GF_Err gf_crypt_decrypt(GF_Crypt *gfc, void *ciphertext, int len);
+GF_Err gf_crypt_decrypt(GF_Crypt *gfc, void *ciphertext, u32 len);
 
-/*various queries on both modes and algo*/
-u32 gf_crypt_str_get_algorithm_version(const char *algorithm);
-u32 gf_crypt_str_get_mode_version(const char *mode);
-Bool gf_crypt_str_is_block_algorithm(const char *algorithm);
-Bool gf_crypt_str_is_block_algorithm_mode(const char *algorithm);
-Bool gf_crypt_str_is_block_mode(const char *mode);
-u32 gf_crypt_str_module_get_algo_block_size(const char *algorithm);
-u32 gf_crypt_str_module_get_algo_key_size(const char *algorithm);
-u32 gf_crypt_str_get_algo_supported_key_sizes(const char *algorithm, int *keys);
-
-#endif /*GPAC_DISABLE_MCRYPT*/
 
 /*! @} */
 
@@ -179,4 +112,3 @@
 #endif
 
 #endif	/*_GF_CRYPT_H_*/
-

gpac-0.7.1.tar.gz/include/gpac/dash.h -> gpac-0.8.0.tar.gz/include/gpac/dash.h Changed

@@ -61,7 +61,7 @@
 /*!
  * All the possible Mime-types for Smooth files
  */
-static const char * GF_DASH_SMOOTH_MIME_TYPES[] = { "application/vnd.ms-sstr+xml", NULL};
+static const char * const GF_DASH_SMOOTH_MIME_TYPES[] = { "application/vnd.ms-sstr+xml", NULL};
 
 /*! DASH Event type. The DASH client communitcaes with the user through a callback mechanism using events*/
 typedef enum
@@ -90,6 +90,10 @@
 	GF_DASH_EVENT_TIMESHIFT_OVERFLOW,
 	/*! event send when we need the decoding statistics*/
 	GF_DASH_EVENT_CODEC_STAT_QUERY,
+	/*! event send whenever cache is full, to allow client to dispatch any segment*/
+	GF_DASH_EVENT_CACHE_FULL,
+	/*! event send when all groups are done in a period*/
+	GF_DASH_EVENT_END_OF_PERIOD,
 } GF_DASHEventType;
 
 /*structure used for all IO operations for DASH*/
@@ -126,9 +130,9 @@
 	/*download the content - synchronous call: all the file shall be fetched before returning*/
 	GF_Err (*run)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
 
-	/*get URL of the file - i tmay be different from the original one if resource relocation happened*/
+	/*get URL of the file - it may be different from the original one if resource relocation happened*/
 	const char *(*get_url)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-	/*get the name of the cache file. If NULL is returned, the file cannot be cached and its associated UTL will be used when
+	/*get the name of the cache file. If NULL is returned, the file cannot be cached and its associated URL will be used when
 	the client request file to play*/
 	const char *(*get_cache_name)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
 	/*get the MIME type of the file*/
@@ -347,6 +351,9 @@
 /*get video info for this group if video*/
 GF_Err gf_dash_group_get_video_info(GF_DashClient *dash, u32 idx, u32 *max_width, u32 *max_height);
 
+/*seek only a given group*/
+void gf_dash_group_seek(GF_DashClient *dash, u32 group_idx, Double seek_to);
+
 /*sets playback speed of the session. Speed is used in adaptation logic*/
 void gf_dash_set_speed(GF_DashClient *dash, Double speed);
 
@@ -418,6 +425,9 @@
 //returns number of quality available for the given group
 u32 gf_dash_group_get_num_qualities(GF_DashClient *dash, u32 idx);
 
+//returns number of components in the given group
+u32 gf_dash_group_get_num_components(GF_DashClient *dash, u32 idx);
+
 void gf_dash_disable_speed_adaptation(GF_DashClient *dash, Bool disable);
 
 
@@ -503,15 +513,32 @@
  @use_threads: if true, threads are used to download files*/
 void gf_dash_set_threaded_download(GF_DashClient *dash, Bool use_threads);
 
+/*Ignores xlink on periods if some adaptation sets are specified in the period with xlink*/
+void gf_dash_ignore_xlink(GF_DashClient *dash, Bool ignore_xlink);
+
+/*returns true if all active groups in period are done*/
+Bool gf_dash_all_groups_done(GF_DashClient *dash);
+void gf_dash_set_period_xlink_query_string(GF_DashClient *dash, const char *query_string);
+
 typedef enum {
 	GF_DASH_ALGO_NONE = 0,
-	GF_DASH_ALGO_GPAC_LEGACY_RATE = 1,
-	GF_DASH_ALGO_GPAC_LEGACY_BUFFER = 2,
+	GF_DASH_ALGO_GPAC_LEGACY_RATE,
+	GF_DASH_ALGO_GPAC_LEGACY_BUFFER,
 
-	GF_DASH_ALGO_GPAC_TEST = 20,
+	GF_DASH_ALGO_BBA0,
+
+	GF_DASH_ALGO_BOLA_FINITE,
+	GF_DASH_ALGO_BOLA_BASIC,
+	GF_DASH_ALGO_BOLA_U,
+	GF_DASH_ALGO_BOLA_O
 } GF_DASHAdaptationAlgorithm;
+
+//sets adaptation logic algorithm
 void gf_dash_set_algo(GF_DashClient *dash, GF_DASHAdaptationAlgorithm algo);
 
+//sets availabilityStartTime shift for ATSC
+void gf_dash_set_atsc_ast_shift(GF_DashClient *dash, u32 ast_shift);
+
 #endif //GPAC_DISABLE_DASH_CLIENT
 
 /*!	@} */

gpac-0.7.1.tar.gz/include/gpac/esi.h -> gpac-0.8.0.tar.gz/include/gpac/esi.h Changed

@@ -54,7 +54,7 @@
 	*/
 	GF_ESI_INPUT_DATA_FLUSH,
 	/*pulls a COMPLETE AU from the stream
-		corresponding parameter: pointer to a GF_ESIPacket to fill. The indut data_len in the packet is used to indicate any padding in bytes
+		corresponding parameter: pointer to a GF_ESIPacket to fill. The input data_len in the packet is used to indicate any padding in bytes
 	*/
 	GF_ESI_INPUT_DATA_PULL,
 	/*releases the currently pulled AU from the stream - AU cannot be pulled after that, unless seek happens
@@ -160,9 +160,6 @@
 	/* MPEG-4 SL Config if any*/
 	GF_SLConfig *sl_config;
 
-	struct __esi_video_info info_video;
-	struct __esi_audio_info info_audio;
-
 	/*input ES control from caller*/
 	GF_Err (*input_ctrl)(struct __elementary_stream_ifce *_self, u32 ctrl_type, void *param);
 	/*input user data of interface - usually set by interface owner*/
@@ -177,32 +174,6 @@
 
 } GF_ESInterface;
 
-typedef struct __service_ifce
-{
-	u32 type;
-
-	/*input service control from caller*/
-	GF_Err (*input_ctrl)(struct __service_ifce *_self, u32 ctrl_type, void *param);
-	/*input user data of interface - usually set by interface owner*/
-	void *input_udta;
-
-	/*output service control of destination*/
-	GF_Err (*output_ctrl)(struct __service_ifce *_self, u32 ctrl_type, void *param);
-	/*output user data of interface - usually set during interface setup*/
-	void *output_udta;
-
-	GF_ESInterface **streams;
-	u32 nb_streams;
-} GF_ServiceInterface;
-
-
-typedef struct __data_io
-{
-	u32 (*read)(struct __data_io *_self, char *buffer, u32 nb_bytes);
-	u32 (*write)(struct __data_io *_self, char *buffer, u32 nb_bytes);
-	void *udta;
-} GF_DataIO;
-
 /*! @} */
 
 #ifdef __cplusplus

gpac-0.7.1.tar.gz/include/gpac/events.h -> gpac-0.8.0.tar.gz/include/gpac/events.h Changed

gpac-0.7.1.tar.gz/include/gpac/events_constants.h -> gpac-0.8.0.tar.gz/include/gpac/events_constants.h Changed

gpac-0.7.1.tar.gz/include/gpac/internal/camera.h -> gpac-0.8.0.tar.gz/include/gpac/internal/camera.h Changed

gpac-0.7.1.tar.gz/include/gpac/internal/compositor_dev.h -> gpac-0.8.0.tar.gz/include/gpac/internal/compositor_dev.h Changed

@@ -194,6 +194,7 @@
 	GF_Thread *VisualThread;
 	/*0: not init, 1: running, 2: exit requested, 3: done*/
 	u32 video_th_state;
+	Bool discard_input_events;
 
 	u32 video_th_id;
 
@@ -211,6 +212,7 @@
 
 	u32 inherit_type_3d;
 
+	Bool force_late_frame_draw;
 	/*all time nodes registered*/
 	GF_List *time_nodes;
 	/*all textures (texture handlers)*/
@@ -422,6 +424,8 @@
 	/*user rotation angle - ALWAYS CENTERED*/
 	Fixed rotation;
 
+	u32 auto_rotate;
+
 	/*0: flush to be done - 1: flush can be skipped - 2: forces flush*/
 	u32 skip_flush;
 #ifndef GPAC_DISABLE_SVG
@@ -553,6 +557,10 @@
 	Bool force_type_3d;
 	char *screen_buffer;
 	u32 screen_buffer_alloc_size;
+
+	u32 tile_visibility_nb_tests, tile_visibility_threshold;
+	Bool tile_visibility_debug, force_all_tiles_visible;
+	u32 vrhud_mode;
 #endif
 
 	Bool texture_from_decoder_memory;
@@ -580,6 +588,9 @@
 	/*display depth in pixels - if -1, it is the height of the display area*/
 	s32 display_depth;
 #endif
+
+	Bool gazer_enabled, simulate_gaze;
+	s32 gaze_x, gaze_y;
 };
 
 typedef struct
@@ -708,7 +719,10 @@
 GF_Err gf_sc_texture_play(GF_TextureHandler *txh, MFURL *url);
 GF_Err gf_sc_texture_play_from_to(GF_TextureHandler *txh, MFURL *url, Double start_offset, Double end_offset, Bool can_loop, Bool lock_scene_timeline);
 /*stops associated object*/
+void gf_sc_texture_stop_no_unregister(GF_TextureHandler *txh);
+/*stops associated object and unregister it*/
 void gf_sc_texture_stop(GF_TextureHandler *txh);
+
 /*restarts associated object - DO NOT CALL stop/start*/
 void gf_sc_texture_restart(GF_TextureHandler *txh);
 /*common routine for all video texture: fetches a frame and update the 2D texture object */
@@ -836,6 +850,10 @@
 	GF_List *viewpoints;
 #endif
 
+	/*disable partial sphere rendrering in VR*/
+	Bool disable_partial_sphere;
+
+	Bool reverse_backface;
 
 	/*current transformation from top-level*/
 	GF_Matrix2D transform;
@@ -972,6 +990,7 @@
 	GF_Plane clip_planes[MAX_USER_CLIP_PLANES];
 	u32 num_clip_planes;
 
+	Bool camera_was_dirty;
 
 	/*layer traversal state:
 		set to the first traversed layer3D when picking
@@ -1020,6 +1039,7 @@
 	Bool (*GetConfig)(struct _audiointerface *ai, Bool for_reconf);
 	/*updated cfg, or 0 otherwise*/
 	u32 chan, bps, samplerate, ch_cfg;
+	Bool forced_layout;
 } GF_AudioInterface;
 
 typedef struct __audiomix GF_AudioMixer;
@@ -1119,6 +1139,8 @@
 
 	Bool step_mode;
 
+	Fixed yaw, pitch, roll;
+
 } GF_AudioRenderer;
 
 /*creates audio renderer*/
@@ -1439,6 +1461,8 @@
 
 Bool compositor_handle_navigation(GF_Compositor *compositor, GF_Event *ev);
 
+void compositor_handle_auto_navigation(GF_Compositor *compositor);
+
 void gf_sc_next_frame_state(GF_Compositor *compositor, u32 state);

gpac-0.7.1.tar.gz/include/gpac/internal/crypt_dev.h -> gpac-0.8.0.tar.gz/include/gpac/internal/crypt_dev.h Changed

@@ -1,27 +1,27 @@
 /*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- * This file is part of GPAC / Crypto Tools sub-project
- *
- * GPAC is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * GPAC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
+*			GPAC - Multimedia Framework C SDK
+*
+*			Authors: Jean Le Feuvre
+*			Copyright (c) Telecom ParisTech 2000-2012
+*					All rights reserved
+*
+* This file is part of GPAC / Crypto Tools sub-project
+*
+* GPAC is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* GPAC is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; see the file COPYING. If not, write to
+* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*/
 
 #ifndef _GF_CRYPT_DEV_H_
 #define _GF_CRYPT_DEV_H_
@@ -32,127 +32,35 @@
 
 #include <gpac/crypt.h>
 
-#ifndef GPAC_DISABLE_MCRYPT
-
-/*the samllest version of the lib: only AES-128-CTR and AES-CBC supported*/
-#define GPAC_CRYPT_ISMA_ONLY
-
-
-typedef void (*mcryptfunc)(void*,void*);
-typedef GF_Err (*mcrypt_setkeystream)(void *, const void *, int, const void *, int);
-typedef GF_Err (*mcrypt_setkeyblock) (void *, const void *, int);
-typedef GF_Err (*mcrypt_docrypt) (void *, const void *, int);
-
 /*private - do not use*/
-typedef struct _tag_crypt_stream
+struct _gf_crypt_context
 {
-	const char *algo_name;
-	u32 algo_version;
-	const char *mode_name;
-	u32 mode_version;
-
-	/* Holds the algorithm's internal key */
-	char *akey;
-	/* holds the mode's internal buffers */
-	char *abuf;
-	/* holds the key */
-	char *keyword_given;
-
-	/*all below are static vars for mode and algo - sizes are in bytes*/
-
-	/*modes access*/
-	GF_Err (*_init_mcrypt) (void *, void *, int, void *, int);
-	void (*_end_mcrypt) (void *);
-	GF_Err (*_mcrypt) (void *, void *, int, int, void *, mcryptfunc func, mcryptfunc func2);
-	GF_Err (*_mdecrypt) (void *, void *, int, int, void *, mcryptfunc func, mcryptfunc func2);
-	GF_Err (*_mcrypt_set_state) (void *, void *, int );
-	GF_Err (*_mcrypt_get_state) (void *, void *, int *);
-	/*algo access*/
-	void *a_encrypt;
-	void *a_decrypt;
-	void *a_set_key;
-
-	u32 algo_size;
-	u32 algo_block_size;
-	u32 key_size;
-	u32 num_key_sizes;
-	u32 key_sizes[MAX_KEY_SIZES];
-	u32 algo_IV_size;
-
-	u32 mode_size;
-	Bool is_block_algo, is_block_algo_mode, is_block_mode, has_IV;
-} GF_CryptStream;
-
-/*modes*/
-void gf_crypt_register_cbc(GF_Crypt *td);
-void gf_crypt_register_cfb(GF_Crypt *td);
-void gf_crypt_register_ctr(GF_Crypt *td);
-void gf_crypt_register_ecb(GF_Crypt *td);
-void gf_crypt_register_ncfb(GF_Crypt *td);
-void gf_crypt_register_nofb(GF_Crypt *td);
-void gf_crypt_register_ofb(GF_Crypt *td);
-void gf_crypt_register_stream(GF_Crypt *td);
-/*algos*/
-void gf_crypt_register_des(GF_Crypt *td);
-void gf_crypt_register_3des(GF_Crypt *td);
-void gf_crypt_register_rijndael_128(GF_Crypt *td);
-void gf_crypt_register_rijndael_192(GF_Crypt *td);
-void gf_crypt_register_rijndael_256(GF_Crypt *td);
-
-
-#define rotl32(x,n) (((x) << ((u32)(n))) | ((x) >> (32 - (u32)(n))))
-#define rotr32(x,n) (((x) >> ((u32)(n))) | ((x) << (32 - (u32)(n))))
-#define rotl16(x,n) (((x) << ((u16)(n))) | ((x) >> (16 - (u16)(n))))
-#define rotr16(x,n) (((x) >> ((u16)(n))) | ((x) << (16 - (u16)(n))))
-
-/* Use hardware rotations.. when available */
-#ifdef swap32
-# define byteswap32(x) swap32(x)
-#else
-# ifdef swap_32
-# define byteswap32(x) swap_32(x)
-# else
-# ifdef bswap_32
-# define byteswap32(x) bswap_32(x)
-# else
-# define byteswap32(x)	((rotl32(x, 8) & 0x00ff00ff) | (rotr32(x, 8) & 0xff00ff00))
-# endif
-# endif
-#endif
-
-#ifdef swap16
-# define byteswap16(x) swap16(x)
+	GF_CRYPTO_ALGO algo; //single value for now
+	GF_CRYPTO_MODE mode; //CBC or CTR
+
+	/* Internal context for openSSL or tiny AES*/
+	void *context;
+
+	//ptr to encryption function
+	GF_Err(*_init_crypt) (GF_Crypt *ctx, void*, const void*);
+	void(*_deinit_crypt) (GF_Crypt *ctx);
+	void(*_end_crypt) (GF_Crypt *ctx);
+	void(*_set_key)(GF_Crypt *ctx, void*);
+	GF_Err(*_crypt) (GF_Crypt *ctx, u8 *buffer, u32 size);
+	GF_Err(*_decrypt) (GF_Crypt*, u8 *buffer, u32 size);
+	GF_Err(*_set_state) (GF_Crypt*, const u8 *IV, u32 IV_size);
+	GF_Err(*_get_state) (GF_Crypt*, u8 *IV, u32 *IV_size);
+};
+
+#ifdef GPAC_HAS_SSL
+GF_Err gf_crypt_open_open_openssl(GF_Crypt* td, GF_CRYPTO_MODE mode);
 #else
-# ifdef swap_16
-# define byteswap16(x) swap_16(x)
-# else
-# ifdef bswap_16
-# define byteswap16(x) bswap_16(x)
-# else
-# define byteswap16(x)	((rotl16(x, 8) & 0x00ff) | (rotr16(x, 8) & 0xff00))
-# endif
-# endif
+GF_Err gf_crypt_open_open_tinyaes(GF_Crypt* td, GF_CRYPTO_MODE mode);
 #endif
 
-GFINLINE static
-void memxor(unsigned char *o1, unsigned char *o2, int length)
-{
-	int i;
-
-	for (i = 0; i < length; i++) {
-		o1[i] ^= o2[i];
-	}
-	return;
-}
-
-
-#define Bzero(x, y) memset(x, 0, y)
-
-#endif /*GPAC_DISABLE_MCRYPT*/
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif	/*_GF_CRYPT_DEV_H_*/
-

gpac-0.7.1.tar.gz/include/gpac/internal/isomedia_dev.h -> gpac-0.8.0.tar.gz/include/gpac/internal/isomedia_dev.h Changed

@@ -32,94 +32,12 @@
 
 #include <gpac/isomedia.h>
 
-#ifndef GPAC_DISABLE_ISOM
-
-
-#if defined(GPAC_DISABLE_ISOM_FRAGMENTS) && !defined(GPAC_DISABLE_ISOM_ADOBE)
-#define GPAC_DISABLE_ISOM_ADOBE
-#endif
-
-	/*the default size is 64, cause we need to handle large boxes...
-
-	the other_boxes container is by default NOT created. When parsing a box and adding
-	a sub-box with gf_isom_box_add_default, the list is created.
-	This list is destroyed befaore calling the final box destructor
-	This list is automatically taken into account during size() and write() functions
-	*/
-#define GF_ISOM_BOX			\
-	u32 type;			\
-	u64 size;			\
-	const struct box_registry_entry *registry;\
-	GF_List *other_boxes;
-
-#define GF_ISOM_FULL_BOX		\
-	GF_ISOM_BOX			\
-	u8 version;			\
-	u32 flags;			\
- 
-#define GF_ISOM_UUID_BOX	\
-	GF_ISOM_BOX			\
-	u8 uuid[16];		\
-	u32 internal_4cc;		\
- 
-typedef struct
-{
-	GF_ISOM_BOX
-} GF_Box;
-
-typedef struct
-{
-	GF_ISOM_FULL_BOX
-} GF_FullBox;
-
-typedef struct
-{
-	GF_ISOM_UUID_BOX
-} GF_UUIDBox;
-
-
-#define ISOM_DECL_BOX_ALLOC(__TYPE, __4cc)	__TYPE *tmp; \
-	GF_SAFEALLOC(tmp, __TYPE);	\
-	if (tmp==NULL) return NULL;	\
-	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), __ptr->size, (bytes), __FILE__, __LINE__ )); \
-			return GF_ISOM_INVALID_FILE; \
-		}\
-		__ptr->size -= bytes; \
-
-/*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);
-
-GF_Err gf_isom_box_write(GF_Box *ptr, GF_BitStream *bs);
-GF_Err gf_isom_box_read(GF_Box *ptr, GF_BitStream *bs);
-void gf_isom_box_del(GF_Box *ptr);
-GF_Err gf_isom_box_size(GF_Box *ptr);
-
-GF_Err gf_isom_clone_box(GF_Box *src, GF_Box **dst);
-
-GF_Err gf_isom_box_parse(GF_Box **outBox, GF_BitStream *bs);
-GF_Err gf_isom_box_array_read(GF_Box *s, GF_BitStream *bs, GF_Err (*add_box)(GF_Box *par, GF_Box *b));
-GF_Err gf_isom_box_array_read_ex(GF_Box *parent, GF_BitStream *bs, GF_Err (*add_box)(GF_Box *par, GF_Box *b), u32 parent_type);
-GF_Err gf_isom_box_add_default(GF_Box *a, GF_Box *subbox);
-GF_Err gf_isom_box_parse_ex(GF_Box **outBox, GF_BitStream *bs, u32 parent_type, Bool is_root_box);
-
-//writes box header - shall be called at the begining of each xxxx_Write function
-//this function is not factorized in order to let box serializer modify box type before writing
-GF_Err gf_isom_box_write_header(GF_Box *ptr, GF_BitStream *bs);
-
-//writes box header then version+flags
-GF_Err gf_isom_full_box_write(GF_Box *s, GF_BitStream *bs);
-
-void gf_isom_box_array_del(GF_List *other_boxes);
-GF_Err gf_isom_box_array_write(GF_Box *parent, GF_List *list, GF_BitStream *bs);
-GF_Err gf_isom_box_array_size(GF_Box *parent, GF_List *list);
 
 enum
 {
+	//internal code type for unknown boxes
+	GF_ISOM_BOX_TYPE_UNKNOWN = GF_4CC( 'U', 'N', 'K', 'N' ),
+
 	GF_ISOM_BOX_TYPE_CO64	= GF_4CC( 'c', 'o', '6', '4' ),
 	GF_ISOM_BOX_TYPE_STCO	= GF_4CC( 's', 't', 'c', 'o' ),
 	GF_ISOM_BOX_TYPE_CTTS	= GF_4CC( 'c', 't', 't', 's' ),
@@ -247,8 +165,12 @@
 	GF_ISOM_BOX_TYPE_AVC4	= GF_4CC( 'a', 'v', 'c', '4' ),
 	GF_ISOM_BOX_TYPE_SVCC	= GF_4CC( 's', 'v', 'c', 'C' ),
 	GF_ISOM_BOX_TYPE_SVC1	= GF_4CC( 's', 'v', 'c', '1' ),
+	GF_ISOM_BOX_TYPE_SVC2	= GF_4CC( 's', 'v', 'c', '2' ),
 	GF_ISOM_BOX_TYPE_MVCC	= GF_4CC( 'm', 'v', 'c', 'C' ),
 	GF_ISOM_BOX_TYPE_MVC1	= GF_4CC( 'm', 'v', 'c', '1' ),
+	GF_ISOM_BOX_TYPE_MVC2	= GF_4CC( 'm', 'v', 'c', '2' ),
+	GF_ISOM_BOX_TYPE_MHC1	= GF_4CC( 'm', 'h', 'c', '1' ),
+	GF_ISOM_BOX_TYPE_MHV1	= GF_4CC( 'm', 'h', 'v', '1' ),
 
 	GF_ISOM_BOX_TYPE_HVCC	= GF_4CC( 'h', 'v', 'c', 'C' ),
 	GF_ISOM_BOX_TYPE_HVC1	= GF_4CC( 'h', 'v', 'c', '1' ),
@@ -259,9 +181,24 @@
 	GF_ISOM_BOX_TYPE_HEV2	= GF_4CC( 'h', 'e', 'v', '2' ),
 	GF_ISOM_BOX_TYPE_LHV1	= GF_4CC( 'l', 'h', 'v', '1' ),
 	GF_ISOM_BOX_TYPE_LHE1	= GF_4CC( 'l', 'h', 'e', '1' ),
+	GF_ISOM_BOX_TYPE_LHT1	= GF_4CC( 'l', 'h', 't', '1' ),
 
 	GF_ISOM_BOX_TYPE_LHVC	= GF_4CC( 'l', 'h', 'v', 'C' ),
 
+	GF_ISOM_BOX_TYPE_AV1C = GF_4CC('a', 'v', '1', 'C'),
+	GF_ISOM_BOX_TYPE_AV01 = GF_4CC('a', 'v', '0', '1'),
+
+	/*WebM*/
+	GF_ISOM_BOX_TYPE_VPCC = GF_4CC('v', 'p', 'c', 'C'),
+	GF_ISOM_BOX_TYPE_VP08 = GF_4CC('v', 'p', '0', '8'),
+	GF_ISOM_BOX_TYPE_VP09 = GF_4CC('v', 'p', '0', '9'),
+	GF_ISOM_BOX_TYPE_SMDM = GF_4CC('S', 'm', 'D', 'm'),
+	GF_ISOM_BOX_TYPE_COLL = GF_4CC('C', 'o', 'L', 'L'),
+
+	/*Opus*/
+	GF_ISOM_BOX_TYPE_OPUS = GF_4CC('O', 'p', 'u', 's'),
+	GF_ISOM_BOX_TYPE_DOPS = GF_4CC('d', 'O', 'p', 's'),
+
 	/*LASeR extension*/
 	GF_ISOM_BOX_TYPE_LSRC	= GF_4CC( 'l', 's', 'r', 'C' ),
 	GF_ISOM_BOX_TYPE_LSR1	= GF_4CC( 'l', 's', 'r', '1' ),
@@ -440,6 +377,8 @@
 	GF_ISOM_BOX_TYPE_DAC3	= GF_4CC( 'd', 'a', 'c', '3' ),
 	GF_ISOM_BOX_TYPE_EC3	= GF_4CC( 'e', 'c', '-', '3' ),
 	GF_ISOM_BOX_TYPE_DEC3	= GF_4CC( 'd', 'e', 'c', '3' ),
+	GF_ISOM_BOX_TYPE_DVCC	= GF_4CC( 'd', 'v', 'c', 'C' ),
+	GF_ISOM_BOX_TYPE_DVHE	= GF_4CC( 'd', 'v', 'h', 'e' ),
 
 	GF_ISOM_BOX_TYPE_SUBS	= GF_4CC( 's', 'u', 'b', 's' ),
 
@@ -472,22 +411,25 @@
 	GF_ISOM_BOX_TYPE_IPCO = GF_4CC( 'i', 'p', 'c', 'o' ),
 	GF_ISOM_BOX_TYPE_IPRP = GF_4CC( 'i', 'p', 'r', 'p' ),
 	GF_ISOM_BOX_TYPE_IPMA = GF_4CC( 'i', 'p', 'm', 'a' ),
-	GF_ISOM_BOX_TYPE_GRPL = GF_4CC('g', 'r', 'p', 'l'),
+	GF_ISOM_BOX_TYPE_GRPL = GF_4CC( 'g', 'r', 'p', 'l'),
 	GF_ISOM_BOX_TYPE_CCST	= GF_4CC( 'c', 'c', 's', 't' ),
 	GF_ISOM_BOX_TYPE_AUXC	= GF_4CC( 'a', 'u', 'x', 'C' ),
+	GF_ISOM_BOX_TYPE_AUXI	= GF_4CC( 'a', 'u', 'x', 'i' ),
 	GF_ISOM_BOX_TYPE_OINF	= GF_4CC( 'o', 'i', 'n', 'f' ),
 	GF_ISOM_BOX_TYPE_TOLS	= GF_4CC( 't', 'o', 'l', 's' ),
 
+	/* MIAF Boxes */
+	GF_ISOM_BOX_TYPE_CLLI	= GF_4CC('c', 'l', 'l', 'i'),
+	GF_ISOM_BOX_TYPE_MDCV	= GF_4CC('m', 'd', 'c', 'v'),
+
 	GF_ISOM_BOX_TYPE_ALTR	= GF_4CC( 'a', 'l', 't', 'r' ),
 
 	/*ALL INTERNAL BOXES - NEVER WRITTEN TO FILE!!*/
 
 	/*generic handlers*/
-	GF_ISOM_BOX_TYPE_GNRM	= GF_4CC( 'g', 'n', 'r', 'm' ),
-	GF_ISOM_BOX_TYPE_GNRV	= GF_4CC( 'g', 'n', 'r', 'v' ),
-	GF_ISOM_BOX_TYPE_GNRA	= GF_4CC( 'g', 'n', 'r', 'a' ),
-	/*storage of AU fragments (for MPEG-4 visual resync marker (video packets), located in stbl.*/
-	GF_ISOM_BOX_TYPE_STSF	= GF_4CC( 'S', 'T', 'S', 'F' ),
+	GF_ISOM_BOX_TYPE_GNRM	= GF_4CC( 'G', 'N', 'R', 'M' ),
+	GF_ISOM_BOX_TYPE_GNRV	= GF_4CC( 'G', 'N', 'R', 'V' ),
+	GF_ISOM_BOX_TYPE_GNRA	= GF_4CC( 'G', 'N', 'R', 'A' ),
 	/*base constructor of all hint formats (currently only RTP uses it)*/
 	GF_ISOM_BOX_TYPE_GHNT	= GF_4CC( 'g', 'h', 'n', 't' ),
 	/*for compatibility with old files hinted for DSS - needs special parsing*/
@@ -506,15 +448,180 @@
 	GF_ISOM_BOX_TYPE_BLOC	= GF_4CC( 'b', 'l', 'o', 'c' ),
 	GF_ISOM_BOX_TYPE_AINF	= GF_4CC( 'a', 'i', 'n', 'f' ),
 
-	GF_ISOM_BOX_TYPE_UNKNOWN = GF_4CC( 'U', 'N', 'K', 'N' ),
+	GF_ISOM_BOX_TYPE_IHDR	= GF_4CC('i','h','d','r'),
+	GF_ISOM_BOX_TYPE_JP 	= GF_4CC('j','P',' ',' '),
+	GF_ISOM_BOX_TYPE_JP2H	= GF_4CC('j','p','2','h'),
+	GF_ISOM_BOX_TYPE_JP2K	= GF_4CC('j','p','2','k'),
+	GF_ISOM_BOX_TYPE_JPEG	= GF_4CC('j','p','e','g'),
+	GF_ISOM_BOX_TYPE_PNG 	= GF_4CC('p','n','g',' '),
+
+	/* apple QT box */
+	GF_QT_BOX_TYPE_ALIS = GF_4CC('a','l','i','s'),
+	GF_QT_BOX_TYPE_WIDE = GF_4CC('w','i','d','e'),
+	GF_QT_BOX_TYPE_GMIN	= GF_4CC( 'g', 'm', 'i', 'n' ),
+	GF_QT_BOX_TYPE_TAPT	= GF_4CC( 't', 'a', 'p', 't' ),
+	GF_QT_BOX_TYPE_CLEF	= GF_4CC( 'c', 'l', 'e', 'f' ),
+	GF_QT_BOX_TYPE_PROF	= GF_4CC( 'p', 'r', 'o', 'f' ),
+	GF_QT_BOX_TYPE_ENOF	= GF_4CC( 'e', 'n', 'o', 'f' ),
+	GF_QT_BOX_TYPE_WAVE = GF_4CC('w','a','v','e'),
+	GF_QT_BOX_TYPE_CHAN = GF_4CC('c','h','a','n'),
+	GF_QT_BOX_TYPE_TERMINATOR 	= 0,
+	GF_QT_BOX_TYPE_ENDA = GF_4CC('e','n','d','a'),
+	GF_QT_BOX_TYPE_FRMA = GF_4CC('f','r','m','a'),
+	GF_QT_BOX_TYPE_TMCD = GF_4CC('t','m','c','d'),
+	GF_QT_BOX_TYPE_NAME = GF_4CC('n','a','m','e'),
+	GF_QT_BOX_TYPE_TCMI = GF_4CC('t','c','m','i'),
+	GF_QT_BOX_TYPE_FIEL = GF_4CC('f','i','e','l'),
+	GF_QT_BOX_TYPE_GAMA = GF_4CC('g','a','m','a'),
+	GF_QT_BOX_TYPE_CHRM = GF_4CC('c','h','r','m'),
+
+	GF_QT_BOX_TYPE_C608	= GF_4CC( 'c', '6', '0', '8' ),
+	GF_QT_BOX_TYPE_APCH	= GF_4CC( 'a', 'p', 'c', 'h' ),
+	GF_QT_BOX_TYPE_APCO	= GF_4CC( 'a', 'p', 'c', 'o' ),
+	GF_QT_BOX_TYPE_APCN	= GF_4CC( 'a', 'p', 'c', 'n' ),
+	GF_QT_BOX_TYPE_APCS	= GF_4CC( 'a', 'p', 'c', 's' ),
+	GF_QT_BOX_TYPE_APCF	= GF_4CC( 'a', 'p', 'c', 'f' ),
+	GF_QT_BOX_TYPE_AP4X	= GF_4CC( 'a', 'p', '4', 'x' ),
+	GF_QT_BOX_TYPE_AP4H	= GF_4CC( 'a', 'p', '4', 'h' ),
+
+	/* from drm_sample.c */
+	GF_ISOM_BOX_TYPE_264B 	= GF_4CC('2','6','4','b'),
+	GF_ISOM_BOX_TYPE_265B 	= GF_4CC('2','6','5','b'),
+	GF_ISOM_BOX_TYPE_AV1B 	= GF_4CC('a','v','1','b'),
+	GF_ISOM_BOX_TYPE_VP9B = GF_4CC('v','p','9','b'),
+
+	/*MPEG-H 3D audio*/
+	GF_ISOM_BOX_TYPE_MHA1 	= GF_4CC('m','h','a','1'),
+	GF_ISOM_BOX_TYPE_MHA2 	= GF_4CC('m','h','a','2'),
+	GF_ISOM_BOX_TYPE_MHM1 	= GF_4CC('m','h','m','1'),
+	GF_ISOM_BOX_TYPE_MHM2 	= GF_4CC('m','h','m','2'),
+	GF_ISOM_BOX_TYPE_MHAC 	= GF_4CC('m','h','a','C'),
+
+
+	GF_ISOM_BOX_TYPE_AUXV 	= GF_4CC('A','U','X','V'),
+
+	/*QTFF audio codes*/
+	GF_QT_BOX_TYPE_AUDIO_RAW 	= GF_4CC('r','a','w',' '),
+	GF_QT_BOX_TYPE_AUDIO_TWOS 	= GF_4CC('t','w','o','s'),
+	GF_QT_BOX_TYPE_AUDIO_SOWT 	= GF_4CC('s','o','w','t'),
+	GF_QT_BOX_TYPE_AUDIO_FL32 	= GF_4CC('f','l','3','2'),
+	GF_QT_BOX_TYPE_AUDIO_FL64 	= GF_4CC('f','l','6','4'),
+	GF_QT_BOX_TYPE_AUDIO_IN24 	= GF_4CC('i','n','2','4'),
+	GF_QT_BOX_TYPE_AUDIO_IN32 	= GF_4CC('i','n','3','2'),
+	GF_QT_BOX_TYPE_AUDIO_ULAW 	= GF_4CC('u','l','a','w'),
+	GF_QT_BOX_TYPE_AUDIO_ALAW 	= GF_4CC('a','l','a','w'),
+	GF_QT_BOX_TYPE_AUDIO_ADPCM 	= GF_4CC(0x6D,0x73,0x00,0x02),
+	GF_QT_BOX_TYPE_AUDIO_IMA_ADPCM 	= GF_4CC(0x6D,0x73,0x00,0x11),
+	GF_QT_BOX_TYPE_AUDIO_DVCA 	= GF_4CC('d','v','c','a'),
+	GF_QT_BOX_TYPE_AUDIO_QDMC 	= GF_4CC('Q','D','M','C'),
+	GF_QT_BOX_TYPE_AUDIO_QDMC2	= GF_4CC('Q','D','M','2'),
+	GF_QT_BOX_TYPE_AUDIO_QCELP	= GF_4CC('Q','c','l','p'),
+	GF_QT_BOX_TYPE_AUDIO_kMP3 	= GF_4CC(0x6D,0x73,0x00,0x55),
 };
 
+enum
+{
+	GF_ISOM_SAMPLE_ENTRY_UNKN = 0,
+	GF_ISOM_SAMPLE_ENTRY_VIDEO = GF_4CC('v','i','d','e'),
+	GF_ISOM_SAMPLE_ENTRY_AUDIO = GF_4CC('a','u','d','i')
+};
+
+#ifndef GPAC_DISABLE_ISOM
+
+
+#if defined(GPAC_DISABLE_ISOM_FRAGMENTS) && !defined(GPAC_DISABLE_ISOM_ADOBE)
+#define GPAC_DISABLE_ISOM_ADOBE
+#endif
+
+	/*the default size is 64, cause we need to handle large boxes...
+
+	the other_boxes container is by default NOT created. When parsing a box and adding
+	a sub-box with gf_isom_box_add_default, the list is created.
+	This list is destroyed befaore calling the final box destructor
+	This list is automatically taken into account during size() and write() functions
+	*/
+#define GF_ISOM_BOX			\
+	u32 type;			\
+	u64 size;			\
+	const struct box_registry_entry *registry;\
+	GF_List *other_boxes;
+
+#define GF_ISOM_FULL_BOX		\
+	GF_ISOM_BOX			\
+	u8 version;			\
+	u32 flags;			\
+
+#define GF_ISOM_UUID_BOX	\
+	GF_ISOM_BOX			\
+	u8 uuid[16];		\
+	u32 internal_4cc;		\
+
+typedef struct
+{
+	GF_ISOM_BOX
+} GF_Box;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+} GF_FullBox;
+
+typedef struct
+{
+	GF_ISOM_UUID_BOX
+} GF_UUIDBox;
+
+
+#define ISOM_DECL_BOX_ALLOC(__TYPE, __4cc)	__TYPE *tmp; \
+	GF_SAFEALLOC(tmp, __TYPE);	\
+	if (tmp==NULL) return NULL;	\
+	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), __ptr->size, (bytes), __FILE__, __LINE__ )); \
+			return GF_ISOM_INVALID_FILE; \
+		}\
+		__ptr->size -= bytes; \
+
+/*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_Err gf_isom_box_write(GF_Box *ptr, GF_BitStream *bs);
+GF_Err gf_isom_box_read(GF_Box *ptr, GF_BitStream *bs);
+void gf_isom_box_del(GF_Box *ptr);
+GF_Err gf_isom_box_size(GF_Box *ptr);
+
+GF_Err gf_isom_clone_box(GF_Box *src, GF_Box **dst);
+
+GF_Err gf_isom_box_parse(GF_Box **outBox, GF_BitStream *bs);
+GF_Err gf_isom_box_array_read(GF_Box *s, GF_BitStream *bs, GF_Err (*add_box)(GF_Box *par, GF_Box *b));
+GF_Err gf_isom_box_array_read_ex(GF_Box *parent, GF_BitStream *bs, GF_Err (*add_box)(GF_Box *par, GF_Box *b), u32 parent_type);
+GF_Err gf_isom_box_add_default(GF_Box *a, GF_Box *subbox);
+GF_Err gf_isom_box_parse_ex(GF_Box **outBox, GF_BitStream *bs, u32 parent_type, Bool is_root_box);
+
+//writes box header - shall be called at the beginning of each xxxx_Write function
+//this function is not factorized in order to let box serializer modify box type before writing
+GF_Err gf_isom_box_write_header(GF_Box *ptr, GF_BitStream *bs);
+
+//writes box header then version+flags
+GF_Err gf_isom_full_box_write(GF_Box *s, GF_BitStream *bs);
+
+void gf_isom_box_array_del(GF_List *other_boxes);
+GF_Err gf_isom_box_array_write(GF_Box *parent, GF_List *list, GF_BitStream *bs);
+GF_Err gf_isom_box_array_size(GF_Box *parent, GF_List *list);
+
+Bool gf_box_valid_in_parent(GF_Box *a, const char *parent_4cc);
+
 
 typedef struct
 {
 	GF_ISOM_BOX
 	/*note: the data is NEVER loaded to the mdat in this lib*/
 	u64 dataSize;
+	/* store the file offset when parsing to access the raw data */
+	u64 bsOffset;
 	char *data;
 } GF_MediaDataBox;
 
@@ -609,6 +716,7 @@
 	u64 segmentDuration;
 	s64 mediaTime;
 	u32 mediaRate;
+	Bool was_empty_dur;
 } GF_EdtsEntry;
 
 typedef struct
@@ -654,6 +762,8 @@
 
 	GF_ISOFile *mov;
 
+	Bool mvex_after_traks;
+
 } GF_MovieBox;
 
 typedef struct
@@ -719,6 +829,7 @@
 	/*private for SVC/MVC extractors resolution*/
 	s32 extractor_mode;
 	Bool has_base_layer;
+	u32 pack_num_samples;
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	u64 dts_at_seg_start;
@@ -775,6 +886,18 @@
 typedef struct
 {
 	GF_ISOM_FULL_BOX
+
+	u16 graphics_mode;
+	u16 op_color_red;
+	u16 op_color_green;
+	u16 op_color_blue;
+	u16 balance;
+	u16 reserved;
+} GF_GenericMediaHeaderInfoBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
 	u16 balance;
 	u16 reserved;
 } GF_SoundMediaHeaderBox;
@@ -816,6 +939,15 @@
 	GF_ISOM_FULL_BOX
 } GF_SceneMediaHeaderBox;
 
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+
+	u32 width;
+	u32 height;
+} GF_ApertureBox;
+
 typedef struct
 {
 	GF_ISOM_FULL_BOX
@@ -846,6 +978,12 @@
 {
 	GF_ISOM_FULL_BOX
 	GF_ISOM_DATAENTRY_FIELDS
+} GF_DataEntryAliasBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_ISOM_DATAENTRY_FIELDS
 	char *nameURN;
 } GF_DataEntryURNBox;
 
@@ -897,28 +1035,6 @@
 } GF_CompositionOffsetBox;
 
 
-typedef struct
-{
-	u32 SampleNumber;
-	u32 fragmentCount;
-	u16 *fragmentSizes;
-} GF_StsfEntry;
-
-typedef struct
-{
-	GF_ISOM_FULL_BOX
-	GF_List *entryList;
-#ifndef GPAC_DISABLE_ISOM_WRITE
-	/*Cache for write*/
-	GF_StsfEntry *w_currentEntry;
-	u32 w_currentEntryIndex;
-#endif
-	/*Cache for read*/
-	u32 r_currentEntryIndex;
-	GF_StsfEntry *r_currentEntry;
-} GF_SampleFragmentBox;
-
-
 #define GF_ISOM_SAMPLE_ENTRY_FIELDS		\
 	GF_ISOM_UUID_BOX					\
 	u16 dataReferenceIndex;				\
@@ -926,7 +1042,7 @@
 	u32 internal_type;					\
 	GF_List *protections;
 
-/*base sample entry box (never used but for typecasting)*/
+/*base sample entry box - used by some generic media sample descriptions of QT*/
 typedef struct
 {
 	GF_ISOM_SAMPLE_ENTRY_FIELDS
@@ -948,6 +1064,65 @@
 
 typedef struct
 {
+	GF_ISOM_SAMPLE_ENTRY_FIELDS
+
+	u32 flags;
+	u32 timescale;
+	u32 frame_duration;
+	u8 frames_per_sec;
+} GF_TimeCodeSampleEntryBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+
+ u16 text_font;
+ u16 text_face;
+ u16 text_size;
+ u16 text_color_red, text_color_green, text_color_blue;
+ u16 back_color_red, back_color_green, back_color_blue;
+ char *font;
+} GF_TimeCodeMediaInformationBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+
+ u8 field_count;
+ u8 field_order;
+} GF_FieldInfoBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+ u32 gama;
+} GF_GamaInfoBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+ u16 chroma;
+} GF_ChromaInfoBox;
+
+typedef struct
+{
+ u32 label;
+ u32 flags;
+ Float coordinates[3];
+} GF_AudioChannelDescription;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+
+ u32 layout_tag;
+ u32 bitmap;
+ u32 num_audio_description;
+ GF_AudioChannelDescription *audio_descs;
+} GF_ChannelLayoutInfoBox;
+
+typedef struct
+{
 	GF_ISOM_FULL_BOX
 	GF_ESD *desc;
 } GF_ESDBox;
@@ -1017,7 +1192,36 @@
 	u32 horizOffD;
 	u32 vertOffN;
 	u32 vertOffD;
-} GF_CleanAppertureBox;
+} GF_CleanApertureBox;
+
+typedef struct {
+	GF_ISOM_BOX
+	u32 colour_type;
+	u16 colour_primaries;
+	u16 transfer_characteristics;
+	u16 matrix_coefficients;
+	Bool full_range_flag;
+	u8* opaque;
+	u32 opaque_size;
+} GF_ColourInformationBox;
+
+typedef struct __ContentLightLevel {
+	GF_ISOM_BOX
+	u16 max_content_light_level;
+	u16 max_pic_average_light_level;
+} GF_ContentLightLevelBox;
+
+typedef struct ___MasteringDisplayColourVolume {
+	GF_ISOM_BOX
+	struct {
+		u16 x;
+		u16 y;
+	} display_primaries[3];
+	u16 white_point_x;
+	u16 white_point_y;
+	u32 max_display_mastering_luminance;
+	u32 min_display_mastering_luminance;
+} GF_MasteringDisplayColourVolumeBox;
 
 typedef struct
 {
@@ -1030,18 +1234,17 @@
 
 typedef struct
 {
+	GF_ISOM_FULL_BOX
+	char *aux_track_type;
+} GF_AuxiliaryTypeInfoBox;
+
+typedef struct
+{
 	GF_ISOM_BOX
 	u16 predefined_rvc_config;
 	u32 rvc_meta_idx;
 } GF_RVCConfigurationBox;
 
-enum
-{
-	GF_ISOM_SAMPLE_ENTRY_UNKN = 0,
-	GF_ISOM_SAMPLE_ENTRY_VIDEO = GF_4CC('v','i','d','e'),
-	GF_ISOM_SAMPLE_ENTRY_AUDIO = GF_4CC('a','u','d','i')
-};
-
 #define GF_ISOM_VISUAL_SAMPLE_ENTRY		\
 	GF_ISOM_SAMPLE_ENTRY_FIELDS			\
 	u16 version;						\
@@ -1057,10 +1260,16 @@
 	u16 bit_depth;						\
 	s16 color_table_index;				\
 	GF_PixelAspectRatioBox *pasp;		\
-	GF_CleanAppertureBox *clap;		\
-	struct __tag_protect_box *rinf;				\
+	GF_CleanApertureBox *clap;			\
+	GF_CodingConstraintsBox *ccst;		\
+	GF_AuxiliaryTypeInfoBox *auxi;		\
+	struct __tag_protect_box *rinf;		\
 	GF_RVCConfigurationBox *rvcc;		\
- 
+	GF_ColourInformationBox *colr;		\
+	GF_MasteringDisplayColourVolumeBox *mdcv;	\
+	GF_ContentLightLevelBox *clli;		\
+
+
 typedef struct
 {
 	GF_ISOM_VISUAL_SAMPLE_ENTRY
@@ -1090,6 +1299,65 @@
 typedef struct
 {
 	GF_ISOM_BOX
+	GF_AV1Config *config;
+} GF_AV1ConfigurationBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_VPConfig *config;
+} GF_VPConfigurationBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u16 primaryRChromaticity_x;
+	u16 primaryRChromaticity_y;
+	u16 primaryGChromaticity_x;
+	u16 primaryGChromaticity_y;
+	u16 primaryBChromaticity_x;
+	u16 primaryBChromaticity_y;
+	u16 whitePointChromaticity_x;
+	u16 whitePointChromaticity_y;
+	u32 luminanceMax;
+	u32 luminanceMin;
+} GF_SMPTE2086MasteringDisplayMetadataBox;
+
+typedef struct {
+	GF_ISOM_FULL_BOX
+		u16 maxCLL;
+	u16 maxFALL;
+} GF_VPContentLightLevelBox;
+
+typedef struct {
+	u8 dv_version_major;
+	u8 dv_version_minor;
+	u8 dv_profile; //7 bits
+	u8 dv_level; //6 bits
+	Bool rpu_present_flag;
+	Bool el_present_flag;
+	Bool bl_present_flag;
+	//const unsigned int (32)[5] reserved = 0;
+} GF_DOVIDecoderConfigurationRecord;
+
+typedef struct {
+	GF_ISOM_BOX
+	GF_DOVIDecoderConfigurationRecord DOVIConfig;
+} GF_DOVIConfigurationBox;
+
+/*typedef struct { //extends Box('hvcE')
+	GF_ISOM_BOX
+	GF_HEVCConfig HEVCConfig;
+} GF_DolbyVisionELHEVCConfigurationBox;*/
+
+typedef struct { //extends HEVCSampleEntry('dvhe')
+	GF_DOVIConfigurationBox config;
+	//TODO: GF_DolbyVisionELHEVCConfigurationBox ELConfig; // optional
+} GF_DolbyVisionHEVCSampleEntry;
+
+typedef struct
+{
+	GF_ISOM_BOX
 	GF_3GPConfig cfg;
 } GF_3GPPConfigBox;
 
@@ -1107,6 +1375,11 @@
 	/*hevc extension*/
 	GF_HEVCConfigurationBox *hevc_config;
 	GF_HEVCConfigurationBox *lhvc_config;
+	/*av1 extension*/
+	GF_AV1ConfigurationBox *av1_config;
+	/*vp8-9 extension*/
+	GF_VPConfigurationBox *vp_config;
+
 
 	/*ext descriptors*/
 	GF_MPEG4ExtensionDescriptorsBox *descr;
@@ -1147,10 +1420,11 @@
 	u16 bitspersample;				\
 	u16 compression_id;				\
 	u16 packet_size;				\
+	u32 is_qtff;					\
 	u16 samplerate_hi;				\
 	u16 samplerate_lo;				\
 	u8 extensions[36];				\
- 
+
 
 typedef struct
 {
@@ -1172,6 +1446,39 @@
 
 typedef struct
 {
+	GF_ISOM_BOX
+
+	/*OpusSpecificBox*/
+	u8 version; //1
+	u8 OutputChannelCount; //same value as the *Output Channel Count* field in the identification header defined in Ogg Opus [3]
+	u16 PreSkip; //The value of the PreSkip field shall be at least 80 milliseconds' worth of PCM samples even when removing any number of Opus samples which may or may not contain the priming samples. The PreSkip field is not used for discarding the priming samples at the whole playback at all since it is informative only, and that task falls on the Edit List Box.
+	u32 InputSampleRate; //The InputSampleRate field shall be set to the same value as the *Input Sample Rate* field in the identification header defined in Ogg Opus
+	s16 OutputGain; //The OutputGain field shall be set to the same value as the *Output Gain* field in the identification header define in Ogg Opus [3]. Note that the value is stored as 8.8 fixed-point.
+	u8 ChannelMappingFamily; //The ChannelMappingFamily field shall be set to the same value as the *Channel Mapping Family* field in the identification header defined in Ogg Opus [3]. Note that the value 255 may be used for an alternative to map channels by ISO Base Media native mapping. The details are described in 4.5.1.
+
+	u8 StreamCount; // The StreamCount field shall be set to the same value as the *Stream Count* field in the identification header defined in Ogg Opus [3].
+	u8 CoupledCount; // The CoupledCount field shall be set to the same value as the *Coupled Count* field in the identification header defined in Ogg Opus [3].
+	u8 ChannelMapping[255]; // The ChannelMapping field shall be set to the same octet string as *Channel Mapping* field in the identi- fication header defined in Ogg Opus [3].
+
+	/*for internal box use only*/
+//	int channels;
+} GF_OpusSpecificBox;
+
+GF_Err gf_isom_opus_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_OpusSpecificBox *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex);
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u8 configuration_version;
+	u8 mha_pl_indication;
+	u8 reference_channel_layout;
+	u16 mha_config_size;
+	char *mha_config;
+} GF_MHAConfigBox;
+
+
+typedef struct
+{
 	GF_ISOM_AUDIO_SAMPLE_ENTRY
 	//for MPEG4 audio
 	GF_ESDBox *esd;
@@ -1181,6 +1488,12 @@
 
 	//for AC3/EC3 audio
 	GF_AC3ConfigBox *cfg_ac3;
+
+	//for Opus
+	GF_OpusSpecificBox *cfg_opus;
+
+	//for MPEG-H audio
+	GF_MHAConfigBox *cfg_mha;
 } GF_MPEGAudioSampleEntryBox;
 
 /*this is the default visual sdst (to handle unknown media)*/
@@ -1293,6 +1606,9 @@
 	u32 firstSampleInCurrentChunk;
 	u32 currentChunk;
 	u32 ghostNumber;
+
+	u32 w_lastSampleNumber;
+	u32 w_lastChunkNumber;
 } GF_SampleToChunkBox;
 
 typedef struct
@@ -1409,6 +1725,11 @@
 	u64 offset_first_offset_field;
 } GF_SampleAuxiliaryInfoOffsetBox;
 
+typedef struct
+{
+	u32 nb_entries, nb_alloc;
+	u32 *sample_num;
+} GF_TrafToSampleMap;
 
 typedef struct
 {
@@ -1426,9 +1747,9 @@
 	GF_DegradationPriorityBox *DegradationPriority;
 	GF_PaddingBitsBox *PaddingBits;
 	GF_SampleDependencyTypeBox *SampleDep;
-	GF_SampleFragmentBox *Fragments;
 
-//	GF_SubSampleInformationBox *SubSamples;
+	GF_TrafToSampleMap *traf_map;
+
 	GF_List *sub_samples;
 
 	GF_List *sampleGroups;
@@ -1439,7 +1760,7 @@
 	GF_List *sai_sizes;
 	GF_List *sai_offsets;
 
-	u32 MaxSamplePerChunk;
+	u32 MaxSamplePerChunk, MaxChunkSize;
 	u16 groupID;
 	u16 trackPriority;
 	u32 currentEntryIndex;
@@ -1447,6 +1768,8 @@
 	Bool no_sync_found;
 } GF_SampleTableBox;
 
+void stbl_AppendTrafMap(GF_SampleTableBox *stbl);
+
 typedef struct __tag_media_info_box
 {
 	GF_ISOM_BOX
@@ -1459,6 +1782,7 @@
 } GF_MediaInformationBox;
 
 GF_Err stbl_AppendDependencyType(GF_SampleTableBox *stbl, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant);
+GF_Err stbl_AddDependencyType(GF_SampleTableBox *stbl, u32 sampleNumber, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant);
 
 typedef struct
 {
@@ -1470,6 +1794,11 @@
 
 typedef struct
 {
+	GF_ISOM_BOX
+} GF_WideBox; /*Apple*/
+
+typedef struct
+{
 	GF_ISOM_FULL_BOX
 	char packedLanguageCode[4];
 	char *notice;
@@ -1852,6 +2181,7 @@
 typedef struct {
 	GF_ISOM_BOX
 	GF_ItemPropertyContainerBox *property_container;
+	struct __item_association_box *property_association;
 } GF_ItemPropertiesBox;
 
 typedef struct {
@@ -1912,6 +2242,10 @@
 	u32 def_sample_size;
 	u32 def_sample_flags;
 	GF_TrackBox *track;
+
+	Bool cannot_use_default;
+	
+	GF_TrackFragmentRandomAccessBox *tfra;
 } GF_TrackExtendsBox;
 
 /*the TrackExtends contains default values for the track fragments*/
@@ -2042,6 +2376,8 @@
 
 	/*internal*/
 	u32 SAP_type;
+	/*internal*/
+	u32 nb_pack;
 } GF_TrunEntry;
 
 typedef struct
@@ -2408,17 +2744,22 @@
 
 typedef struct
 {
+	u8 level;
+	u32 range_size;
+} GF_SubsegmentRangeInfo;
+
+typedef struct
+{
 	u32 range_count;
-	u8 *levels;
-	u32 *range_sizes;
-} GF_Subsegment;
+	GF_SubsegmentRangeInfo *ranges;
+} GF_SubsegmentInfo;
 
 typedef struct __ssix_box
 {
 	GF_ISOM_FULL_BOX
 
 	u32 subsegment_count;
-	GF_Subsegment *subsegments;
+	GF_SubsegmentInfo *subsegments;
 } GF_SubsegmentIndexBox;
 
 typedef struct
@@ -2429,7 +2770,7 @@
 	u32 grouping_type;
 	u32 grouping_type_parameter;
 	u32 sub_track_id;
-} GF_LevelAssignment; 
+} GF_LevelAssignment;
 
 typedef struct __leva_box
 {
@@ -2601,6 +2942,11 @@
 	u8 SAP_type;
 } GF_SAPEntry;
 
+/*SAPEntry - 'sync' type*/
+typedef struct
+{
+	u8 NALU_type;
+} GF_SYNCEntry;
 
 /*Operating Points Information - 'oinf' type*/
 typedef struct
@@ -2781,11 +3127,11 @@
 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_ex(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID);
-void gf_isom_cenc_get_default_pattern_info_ex(GF_TrackBox *trak, u32 sampleDescriptionIndex, u8 *default_crypt_byte_block, u8 *default_skip_byte_block);
+void gf_isom_cenc_get_default_info_ex(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID, u8 *constant_IV_size, bin128 *constant_IV, u8 *crypt_byte_block, u8 *skip_byte_block);
+
+
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *senc, u32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID,
-										u8 *crypt_byte_block, u8 *skip_byte_block, u8 *constant_IV_size, bin128 *constant_IV);
+GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *senc, u32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID, u8 *crypt_byte_block, u8 *skip_byte_block, u8 *constant_IV_size, bin128 *constant_IV);
 GF_Err senc_Parse(GF_BitStream *bs, GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *ptr);
 #else
 GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, void *traf, uGF_SampleEncryptionBox *senc, 32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID,
@@ -2860,17 +3206,6 @@
 } GF_ImageSpatialExtentsPropertyBox;
 
 typedef struct {
-	GF_ISOM_BOX
-	u32 colour_type;
-	u16 colour_primaries;
-	u16 transfer_characteristics;
-	u16 matrix_coefficients;
-	Bool full_range_flag;
-	u8 *opaque;
-	u32 opaque_size;
-} GF_ColourInformationBox;
-
-typedef struct {
 	GF_ISOM_FULL_BOX
 	u8 num_channels;
 	u8 *bits_per_channel;
@@ -2893,7 +3228,7 @@
 	GF_List *property_index;
 } GF_ItemPropertyAssociationEntry;
 
-typedef struct {
+typedef struct __item_association_box {
 	GF_ISOM_FULL_BOX
 	GF_List *entries;
 } GF_ItemPropertyAssociationBox;
@@ -3019,11 +3354,13 @@
 */
 
 /*regular file IO*/
-#define GF_ISOM_DATA_FILE			0x01
-/*File Maping object, read-only mode on complete files (no download)*/
-#define GF_ISOM_DATA_FILE_MAPPING		0x02
+#define GF_ISOM_DATA_FILE 0x01
+/*File Mapping object, read-only mode on complete files (no download)*/
+#define GF_ISOM_DATA_FILE_MAPPING 0x02
 /*External file object. Needs implementation*/
-#define GF_ISOM_DATA_FILE_EXTERN		0x03
+#define GF_ISOM_DATA_FILE_EXTERN 0x03
+/*regular memory IO*/
+#define GF_ISOM_DATA_MEM 0x04
 
 /*Data Map modes*/
 enum
@@ -3188,12 +3525,13 @@
 	u64 segment_start;
 
 	GF_List *moof_list;
-	Bool use_segments, moof_first, append_segment, styp_written;
+	Bool use_segments, moof_first, append_segment, styp_written, force_moof_base_offset;
 
 	/*used when building single-indexed self initializing media segments*/
 	GF_SegmentIndexBox *root_sidx;
 	u64 root_sidx_offset;
 	u32 root_sidx_index;
+	GF_SubsegmentIndexBox *root_ssix;
 
 	Bool is_index_segment;
 
@@ -3201,6 +3539,9 @@
 	/* 0: no moof found yet, 1: 1 moof found, 2: next moof found */
 	Bool single_moof_mode;
 	u32 single_moof_state;
+
+	/* optional mfra box used in write mode */
+	GF_MovieFragmentRandomAccessBox *mfra;
 #endif
 	GF_ProducerReferenceTimeBox *last_producer_ref_time;
 
@@ -3252,6 +3593,13 @@
 GF_Err Media_FindDataRef(GF_DataReferenceBox *dref, char *URLname, char *URNname, u32 *dataRefIndex);
 Bool Media_IsSelfContained(GF_MediaBox *mdia, u32 StreamDescIndex);
 
+typedef enum
+{
+	ISOM_DREF_MIXED = 0,
+	ISOM_DREF_SELF,
+	ISOM_DREF_EXT,
+} GF_ISOMDataRefAllType;
+GF_ISOMDataRefAllType Media_SelfContainedType(GF_MediaBox *mdia);
 
 GF_TrackBox *GetTrackbyID(GF_MovieBox *moov, u32 TrackID);
 
@@ -3271,11 +3619,9 @@
 GF_Err stbl_GetSampleRAP(GF_SyncSampleBox *stss, u32 SampleNumber, SAPType *IsRAP, u32 *prevRAP, u32 *nextRAP);
 /*same as above but only look for open-gop RAPs and GDR (roll)*/
 GF_Err stbl_SearchSAPs(GF_SampleTableBox *stbl, u32 SampleNumber, SAPType *IsRAP, u32 *prevRAP, u32 *nextRAP);
-GF_Err stbl_GetSampleInfos(GF_SampleTableBox *stbl, u32 sampleNumber, u64 *offset, u32 *chunkNumber, u32 *descIndex, u8 *isEdited);
+GF_Err stbl_GetSampleInfos(GF_SampleTableBox *stbl, u32 sampleNumber, u64 *offset, u32 *chunkNumber, u32 *descIndex, GF_StscEntry **scsc_entry);
 GF_Err stbl_GetSampleShadow(GF_ShadowSyncBox *stsh, u32 *sampleNumber, u32 *syncNum);
 GF_Err stbl_GetPaddingBits(GF_PaddingBitsBox *padb, u32 SampleNumber, u8 *PadBits);
-u32 stbl_GetSampleFragmentCount(GF_SampleFragmentBox *stsf, u32 sampleNumber);
-u32 stbl_GetSampleFragmentSize(GF_SampleFragmentBox *stsf, u32 sampleNumber, u32 FragmentIndex);
 GF_Err stbl_GetSampleDepType(GF_SampleDependencyTypeBox *stbl, u32 SampleNumber, u32 *isLeading, u32 *dependsOn, u32 *dependedOn, u32 *redundant);
 
 
@@ -3306,17 +3652,19 @@
 GF_Err NewMedia(GF_MediaBox **mdia, u32 MediaType, u32 TimeScale);
 GF_Err Media_ParseODFrame(GF_MediaBox *mdia, const GF_ISOSample *sample, GF_ISOSample **od_samp);
 GF_Err Media_AddSample(GF_MediaBox *mdia, u64 data_offset, const GF_ISOSample *sample, u32 StreamDescIndex, u32 syncShadowNumber);
-GF_Err Media_CreateDataRef(GF_DataReferenceBox *dref, char *URLname, char *URNname, u32 *dataRefIndex);
+GF_Err Media_CreateDataRef(GF_ISOFile *file, GF_DataReferenceBox *dref, char *URLname, char *URNname, u32 *dataRefIndex);
+GF_Err Media_SetDrefURL(GF_DataEntryURLBox *dref_entry, const char *origName, const char *finalName);
+
 /*update a media sample. ONLY in edit mode*/
 GF_Err Media_UpdateSample(GF_MediaBox *mdia, u32 sampleNumber, GF_ISOSample *sample, Bool data_only);
 GF_Err Media_UpdateSampleReference(GF_MediaBox *mdia, u32 sampleNumber, GF_ISOSample *sample, u64 data_offset);
 /*addition in the sample tables*/
-GF_Err stbl_AddDTS(GF_SampleTableBox *stbl, u64 DTS, u32 *sampleNumber, u32 LastAUDefDuration);
+GF_Err stbl_AddDTS(GF_SampleTableBox *stbl, u64 DTS, u32 *sampleNumber, u32 LastAUDefDuration, u32 nb_pack_samples);
 GF_Err stbl_AddCTS(GF_SampleTableBox *stbl, u32 sampleNumber, s32 CTSoffset);
-GF_Err stbl_AddSize(GF_SampleSizeBox *stsz, u32 sampleNumber, u32 size);
+GF_Err stbl_AddSize(GF_SampleSizeBox *stsz, u32 sampleNumber, u32 size, u32 nb_pack_samples);
 GF_Err stbl_AddRAP(GF_SyncSampleBox *stss, u32 sampleNumber);
 GF_Err stbl_AddShadow(GF_ShadowSyncBox *stsh, u32 sampleNumber, u32 shadowNumber);
-GF_Err stbl_AddChunkOffset(GF_MediaBox *mdia, u32 sampleNumber, u32 StreamDescIndex, u64 offset);
+GF_Err stbl_AddChunkOffset(GF_MediaBox *mdia, u32 sampleNumber, u32 StreamDescIndex, u64 offset, u32 nb_pack_samples);
 /*NB - no add for padding, this is done only through SetPaddingBits*/
 
 GF_Err stbl_AddSampleFragment(GF_SampleTableBox *stbl, u32 sampleNumber, u16 size);
@@ -3332,7 +3680,7 @@
 /*for adding fragmented samples*/
 GF_Err stbl_SampleSizeAppend(GF_SampleSizeBox *stsz, u32 data_size);
 /*writing of the final chunk info in edit mode*/
-GF_Err stbl_SetChunkAndOffset(GF_SampleTableBox *stbl, u32 sampleNumber, u32 StreamDescIndex, GF_SampleToChunkBox *the_stsc, GF_Box **the_stco, u64 data_offset, u8 forceNewChunk);
+GF_Err stbl_SetChunkAndOffset(GF_SampleTableBox *stbl, u32 sampleNumber, u32 StreamDescIndex, GF_SampleToChunkBox *the_stsc, GF_Box **the_stco, u64 data_offset, Bool forceNewChunk, u32 nb_samp);
 /*EDIT LIST functions*/
 GF_EdtsEntry *CreateEditEntry(u64 EditDuration, u64 MediaTime, u8 EditMode);
 
@@ -3396,15 +3744,18 @@
 GF_Err AVC_HEVC_UpdateESD(GF_MPEGVisualSampleEntryBox *avc, GF_ESD *esd);
 void AVC_RewriteESDescriptorEx(GF_MPEGVisualSampleEntryBox *avc, GF_MediaBox *mdia);
 void AVC_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *avc);
-void HEVC_RewriteESDescriptorEx(GF_MPEGVisualSampleEntryBox *avc, GF_MediaBox *mdia);
-void HEVC_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *avc);
-
+void HEVC_RewriteESDescriptorEx(GF_MPEGVisualSampleEntryBox *hevc, GF_MediaBox *mdia);
+void HEVC_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *hevc);
+void VP9_RewriteESDescriptorEx(GF_MPEGVisualSampleEntryBox *vp9, GF_MediaBox *mdia);
+void VP9_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *vp9);
+void AV1_RewriteESDescriptorEx(GF_MPEGVisualSampleEntryBox *av1, GF_MediaBox *mdia);
+void AV1_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *av1);
 GF_Err reftype_AddRefTrack(GF_TrackReferenceTypeBox *ref, u32 trackID, u16 *outRefIndex);
 GF_XMLBox *gf_isom_get_meta_xml(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool *is_binary);
-Bool gf_isom_cenc_has_saiz_saio_track(GF_SampleTableBox *stbl);
+Bool gf_isom_cenc_has_saiz_saio_track(GF_SampleTableBox *stbl, u32 scheme_type);
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-Bool gf_isom_cenc_has_saiz_saio_traf(GF_TrackFragmentBox *traf);
+Bool gf_isom_cenc_has_saiz_saio_traf(GF_TrackFragmentBox *traf, u32 scheme_type);
 void gf_isom_cenc_set_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf, u32 len);
 #endif
 void gf_isom_cenc_merge_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, u64 offset, u32 len);
@@ -3665,15 +4016,17 @@
 
 /*do not throw fatal errors if boxes are duplicated, just warn and remove extra ones*/
 #define ERROR_ON_DUPLICATED_BOX(__abox, __parent) {	\
+		extern Bool use_dump_mode;\
 		char __ptype[5];\
 		strcpy(__ptype, gf_4cc_to_str(__parent->type) );\
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] extra box %s found in %s, deleting\n", gf_4cc_to_str(__abox->type), __ptype)); \
-		gf_isom_box_del(a);\
+		if (!use_dump_mode) gf_isom_box_del(__abox);\
+		__abox=NULL;\
 		return GF_OK;\
 	}
 
 
-#ifndef GPAC_DISABLE_VTT 
+#ifndef GPAC_DISABLE_VTT
 
 GF_Err gf_isom_update_webvtt_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, const char *config);
 GF_ISOSample *gf_isom_webvtt_to_sample(void *samp);
@@ -3704,6 +4057,8 @@
 GF_Err gf_isom_box_dump(void *ptr, FILE * trace);
 GF_Err gf_isom_box_array_dump(GF_List *list, FILE * trace);
 
+void gf_isom_registry_disable(u32 boxCode, Bool disable);
+
 /*Apple extensions*/
 GF_MetaBox *gf_isom_apple_get_meta_extensions(GF_ISOFile *mov);
 
@@ -3721,7 +4076,7 @@
 
 GF_Box *boxstring_new_with_data(u32 type, const char *string);
 
-GF_Err gf_isom_read_null_terminated_string(GF_Box *s, GF_BitStream *bs, u32 size, char **out_str);
+GF_Err gf_isom_read_null_terminated_string(GF_Box *s, GF_BitStream *bs, u64 size, char **out_str);
 
 #endif //GPAC_DISABLE_ISOM

gpac-0.7.1.tar.gz/include/gpac/internal/media_dev.h -> gpac-0.8.0.tar.gz/include/gpac/internal/media_dev.h Changed

@@ -28,6 +28,7 @@
 #define _GF_MEDIA_DEV_H_
 
 #include <gpac/media_tools.h>
+#include <gpac/mpeg4_odf.h>
 
 #ifndef GPAC_DISABLE_STREAMING
 #include <gpac/ietf.h>
@@ -62,10 +63,8 @@
 returns data_len if no startcode found and sets sc_size to 0 (last nal in payload)*/
 u32 gf_media_nalu_next_start_code(const u8 *data, u32 data_len, u32 *sc_size);
 
-/*returns NAL unit type - bitstream must be sync'ed!!*/
-u8 AVC_NALUType(GF_BitStream *bs);
-Bool SVC_NALUIsSlice(u8 type);
-
+u32 gf_media_nalu_emulation_bytes_remove_count(const char *buffer, u32 nal_size);
+u32 gf_media_nalu_remove_emulation_bytes(const char *buffer_src, char *buffer_dst, u32 nal_size);
 
 enum
 {
@@ -119,13 +118,13 @@
 	/*to be eventually completed by other vui members*/
 } AVC_VUI;
 
-typedef struct 
+typedef struct
 {
 	u32 left;
 	u32 right;
 	u32 top;
 	u32 bottom;
-	
+
 } AVC_CROP;
 
 
@@ -146,6 +145,7 @@
 	u8 chroma_format;
 	u8 luma_bit_depth_m8;
 	u8 chroma_bit_depth_m8;
+	u32 ChromaArrayType;
 
 	s16 offset_for_ref_frame[256];
 
@@ -158,6 +158,8 @@
 	/*used to discard repeated SPSs - 0: not parsed, 1 parsed, 2 sent*/
 	u32 state;
 
+	u32 sbusps_crc;
+
 	/*for SVC stats during import*/
 	u32 nb_ei, nb_ep, nb_eb;
 } AVC_SPS;
@@ -170,9 +172,15 @@
 	s32 pic_order_present;			/* pic_order_present_flag*/
 	s32 redundant_pic_cnt_present;	/* redundant_pic_cnt_present_flag */
 	u32 slice_group_count;			/* num_slice_groups_minus1 + 1*/
+	u32 mb_slice_group_map_type;
+	u32 pic_size_in_map_units_minus1;
+	u32 slice_group_change_rate_minus1;
 	/*used to discard repeated SPSs - 0: not parsed, 1 parsed, 2 sent*/
 	u32 status;
-
+	Bool weighted_pred_flag;
+	u8 weighted_bipred_idc;
+	Bool deblocking_filter_control_present_flag;
+	u32 num_ref_idx_l0_default_active_minus1, num_ref_idx_l1_default_active_minus1;
 } AVC_PPS;
 
 typedef struct
@@ -333,6 +341,10 @@
 	Bool poc_proportional_to_timing_flag;
 	u32 num_ticks_poc_diff_one_minus1;
 
+	Bool video_full_range_flag;
+	Bool colour_description_present_flag;
+	u8 colour_primaries, transfer_characteristic, matrix_coeffs;
+
 	u32 rep_format_idx;
 } HEVC_SPS;
 
@@ -447,6 +459,11 @@
 
 typedef struct _hevc_state
 {
+	//set by user
+	Bool full_slice_header_parse;
+
+	//all other vars set by parser
+
 	HEVC_SPS sps[16]; /* range allowed in the spec is 0..15 */
 	s8 sps_active_idx;	/*currently active sps; must be initalized to -1 in order to discard not yet decodable SEIs*/
 
@@ -456,6 +473,7 @@
 
 	HEVCSliceInfo s_info;
 	HEVC_SEI sei;
+
 	//-1 or the value of the vps/sps/pps ID of the nal just parsed
 	s32 last_parsed_vps_id;
 	s32 last_parsed_sps_id;
@@ -480,6 +498,139 @@
 
 GF_Err gf_hevc_get_sps_info_with_state(HEVCState *hevc_state, char *sps_data, u32 sps_size, u32 *sps_id, u32 *width, u32 *height, s32 *par_n, s32 *par_d);
 
+
+
+GF_Err gf_media_parse_ivf_file_header(GF_BitStream *bs, int *width, int *height, u32 *codec_fourcc, u32 *frame_rate, u32 *time_scale, u32 *num_frames);
+
+
+
+#define VP9_MAX_FRAMES_IN_SUPERFRAME 16
+
+GF_Err vp9_parse_sample(GF_BitStream *bs, GF_VPConfig *vp9_cfg, Bool *key_frame, int *FrameWidth, int *FrameHeight, int *renderWidth, int *renderHeight);
+GF_Err vp9_parse_superframe(GF_BitStream *bs, u64 ivf_frame_size, int *num_frames_in_superframe, u32 frame_sizes[VP9_MAX_FRAMES_IN_SUPERFRAME], int *superframe_index_size);
+
+
+
+#define AV1_MAX_TILE_ROWS 64
+#define AV1_MAX_TILE_COLS 64
+
+typedef enum {
+	AV1_KEY_FRAME = 0,
+	AV1_INTER_FRAME = 1,
+	AV1_INTRA_ONLY_FRAME = 2,
+	AV1_SWITCH_FRAME = 3,
+} AV1FrameType;
+
+typedef struct
+{
+	Bool is_first_frame;
+	Bool seen_frame_header, seen_seq_header;
+	Bool key_frame, show_frame;
+	AV1FrameType frame_type;
+	GF_List *header_obus, *frame_obus; /*GF_AV1_OBUArrayEntry*/
+	struct {
+		//offset in bytes after first byte of obu, including its header
+		u32 obu_start_offset;
+		u32 size;
+	} tiles[AV1_MAX_TILE_ROWS * AV1_MAX_TILE_COLS];
+	u32 nb_tiles_in_obu;
+	u8 refresh_frame_flags;
+	u8 order_hint;
+	u8 allow_high_precision_mv;
+	u8 show_existing_frame, frame_to_show_map_idx;
+	//indicates the size of the uncompressed_header syntax element. This is set back to 0 at the next OBU parsing
+	u16 uncompressed_header_bytes;
+} AV1StateFrame;
+
+#define AV1_NUM_REF_FRAMES	8
+
+typedef struct
+{
+	s32 coefs[AV1_NUM_REF_FRAMES][6];
+} AV1GMParams;
+
+typedef struct
+{
+	/*importing options*/
+	Bool keep_temporal_delim;
+
+	/*general sequence information*/
+	Bool frame_id_numbers_present_flag;
+	Bool reduced_still_picture_header;
+	Bool decoder_model_info_present_flag;
+	u16 OperatingPointIdc;
+	int width, height, UpscaledWidth;
+	double FPS;
+
+	Bool use_128x128_superblock;
+	u8 frame_width_bits_minus_1, frame_height_bits_minus_1;
+	u8 equal_picture_interval;
+	u8 delta_frame_id_length_minus_2;
+	u8 additional_frame_id_length_minus_1;
+	u8 seq_force_integer_mv;
+	u8 seq_force_screen_content_tools;
+	Bool enable_superres;
+	Bool enable_order_hint;
+	Bool enable_cdef;
+	Bool enable_restoration;
+	Bool enable_warped_motion;
+	u8 OrderHintBits;
+	Bool enable_ref_frame_mvs;
+	Bool film_grain_params_present;
+	u8 buffer_delay_length;
+	u8 frame_presentation_time_length;
+	u32 buffer_removal_time_length;
+	u8 operating_points_count;
+	u8 decoder_model_present_for_this_op[6];
+	u8 operating_point_idc[6];
+	
+	u32 tileRows, tileCols, tileRowsLog2, tileColsLog2;
+	u8 tile_size_bytes; /*coding tile header size*/
+	Bool separate_uv_delta_q;
+
+	/*Needed for RFC6381*/
+	Bool still_picture;
+	u8 bit_depth;
+	Bool color_description_present_flag;
+	u8 color_primaries, transfer_characteristics, matrix_coefficients;
+	Bool color_range;
+	/*shall not be null*/
+	GF_AV1Config *config;
+
+	/*OBU parsing state, reset at each obu*/
+	Bool obu_has_size_field, obu_extension_flag;
+	u8 temporal_id, spatial_id;
+
+	/*inter-frames state */
+	u8 RefOrderHint[AV1_NUM_REF_FRAMES];
+	u8 RefValid[AV1_NUM_REF_FRAMES];
+	u8 OrderHints[AV1_NUM_REF_FRAMES];
+
+	AV1GMParams GmParams;
+	AV1GMParams PrevGmParams;
+	AV1GMParams SavedGmParams[AV1_NUM_REF_FRAMES];
+	u8 RefFrameType[AV1_NUM_REF_FRAMES];
+
+	/*frame parsing state*/
+	AV1StateFrame frame_state;
+} AV1State;
+
+GF_Err aom_av1_parse_temporal_unit_from_section5(GF_BitStream *bs, AV1State *state);
+GF_Err aom_av1_parse_temporal_unit_from_annexb(GF_BitStream *bs, AV1State *state);
+GF_Err aom_av1_parse_temporal_unit_from_ivf(GF_BitStream *bs, AV1State *state);
+
+GF_Err gf_media_aom_parse_ivf_file_header(GF_BitStream *bs, AV1State *state);
+GF_Err gf_media_parse_ivf_frame_header(GF_BitStream *bs, u64 *frame_size, u64 *pts);
+
+Bool gf_media_probe_ivf(GF_BitStream *bs);
+Bool gf_media_aom_probe_annexb(GF_BitStream *bs);
+
+/*parses one OBU*/
+GF_Err gf_media_aom_av1_parse_obu(GF_BitStream *bs, ObuType *obu_type, u64 *obu_size, u32 *obu_hdr_size, AV1State *state);
+
+Bool av1_is_obu_header(ObuType obu_type);
+void av1_reset_frame_state(AV1StateFrame *frame_state);
+
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
 typedef struct
@@ -519,6 +670,7 @@
 	GF_DASH_TEMPLATE_TEMPLATE,
 	GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE,
 	GF_DASH_TEMPLATE_REPINDEX,
+	GF_DASH_TEMPLATE_SEGMENT_NO_OUTPUT
 } GF_DashTemplateSegmentType;
 
 GF_Err gf_media_mpd_format_segment_name(GF_DashTemplateSegmentType seg_type, Bool is_bs_switching, char *segment_name, const char *output_file_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);

gpac-0.7.1.tar.gz/include/gpac/internal/mesh.h -> gpac-0.8.0.tar.gz/include/gpac/internal/mesh.h Changed

gpac-0.7.1.tar.gz/include/gpac/internal/mpd.h -> gpac-0.8.0.tar.gz/include/gpac/internal/mpd.h Changed

@@ -49,7 +49,7 @@
 #define MPD_EXTENSIBLE	\
 	GF_List *attributes;	\
 	GF_List *children;	\
- 
+
 typedef struct
 {
 	MPD_EXTENSIBLE
@@ -95,6 +95,9 @@
 	char *URL;
 	char *service_location;
 	GF_MPD_ByteRange *byte_range;
+
+	//GPAC internal: redirection for that URL
+	char *redirection;
 } GF_MPD_BaseURL;
 
 typedef struct
@@ -127,7 +130,7 @@
 	Double availability_time_offset;	\
 	GF_MPD_URL *initialization_segment;	\
 	GF_MPD_URL *representation_index;	\
- 
+
 
 typedef struct
 {
@@ -141,7 +144,7 @@
 	u32 start_number;	\
 	GF_MPD_SegmentTimeline *segment_timeline;	\
 	GF_MPD_URL *bitstream_switching_url;	\
- 
+
 typedef struct
 {
 	GF_MPD_MULTIPLE_SEGMENT_BASE
@@ -213,7 +216,7 @@
 	GF_List *essential_properties;	\
 	GF_List *supplemental_properties;	\
 	GF_List *isobmf_tracks;	\
- 
+
 typedef struct {
 	GF_MPD_COMMON_ATTRIBUTES_ELEMENTS
 } GF_MPD_CommonAttributes;
@@ -242,6 +245,13 @@
 	Double prev_max_available_speed;
 	/*after switch we may have some buffered segments of the previous representation; so codec stats at this moment is unreliable. we should wait after the codec reset*/
 	Bool waiting_codec_reset;
+	// BOLA Utility
+	Double bola_v;
+
+	/*index of the next enhancement representation plus 1, 0 is reserved in case of the highest representation*/
+	u32 enhancement_rep_index_plus_one;
+
+	Bool broadcast_flag;
 } GF_DASH_RepresentationPlayback;
 
 typedef struct {
@@ -260,9 +270,6 @@
 
 	GF_List *sub_representations;
 
-	/*index of the next enhancement representation plus 1, 0 is reserved in case of the highest representation*/
-	u32 enhancement_rep_index_plus_one;
-
 	/*GPAC playback implementation*/
 	GF_DASH_RepresentationPlayback playback;
 	u32 m3u8_media_seq_min, m3u8_media_seq_max;
@@ -310,6 +317,10 @@
 	Bool xlink_actuate_on_load;
 } GF_MPD_AdaptationSet;
 
+typedef enum {
+	GF_MPD_TYPE_STATIC,
+	GF_MPD_TYPE_DYNAMIC,
+} GF_MPD_Type;
 
 typedef struct
 {
@@ -327,6 +338,8 @@
 	GF_List *subsets;
 	char *xlink_href;
 	Bool xlink_actuate_on_load;
+	char *origin_base_url;
+	GF_MPD_Type type;
 } GF_MPD_Period;
 
 typedef struct
@@ -339,11 +352,6 @@
 } GF_MPD_ProgramInfo;
 
 
-typedef enum {
-	GF_MPD_TYPE_STATIC,
-	GF_MPD_TYPE_DYNAMIC,
-} GF_MPD_Type;
-
 typedef struct {
 	MPD_EXTENSIBLE
 
@@ -389,6 +397,7 @@
 
 void gf_mpd_period_free(void *_item);
 
+GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out);
 GF_Err gf_mpd_write_file(GF_MPD const * const mpd, const char *file_name);
 
 
@@ -406,7 +415,7 @@
 
 /*converts M3U8 to MPD - getter is optional (download will still be processed if NULL)*/
 GF_Err gf_m3u8_to_mpd(const char *m3u8_file, const char *base_url, const char *mpd_file, u32 reload_count, char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates,
-                      GF_FileDownload *getter, GF_MPD *mpd, Bool parse_sub_playlist);
+                      GF_FileDownload *getter, GF_MPD *mpd, Bool parse_sub_playlist, Bool keep_files, Bool test_mode);
 
 GF_Err gf_m3u8_solve_representation_xlink(GF_MPD_Representation *rep, GF_FileDownload *getter, Bool *is_static, u64 *duration);
 
@@ -429,6 +438,8 @@
 	GF_MPD_RESOLVE_URL_INDEX,
 	//same as GF_MPD_RESOLVE_URL_MEDIA but does not replace $Time$ and $Number$
 	GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE,
+	//same as GF_MPD_RESOLVE_URL_MEDIA but does not use startNumber
+	GF_MPD_RESOLVE_URL_MEDIA_NOSTART,
 } GF_MPD_URLResolveType;
 
 /*resolves a URL based for a given segment, based on the MPD url, the type of resolution
@@ -473,6 +484,18 @@
 /*get the duration of media segments in seconds*/
 void gf_mpd_resolve_segment_duration(GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, u64 *out_duration, u32 *out_timescale, u64 *out_pts_offset, GF_MPD_SegmentTimeline **out_segment_timeline);
 
+
+typedef struct
+{
+	u32 sample_num;
+	u64 dts;
+	s64 cts;
+	Bool is_processed;
+} GF_DASHCueInfo;
+
+GF_Err gf_mpd_load_cues(const char *cues_file, u32 stream_id, u32 *cues_timescale, Bool *use_edit_list, GF_DASHCueInfo **out_cues, u32 *nb_cues);
+
+
 #endif /*GPAC_DISABLE_CORE_TOOLS*/
 
 #endif // _MPD_H_

gpac-0.7.1.tar.gz/include/gpac/internal/scenegraph_dev.h -> gpac-0.8.0.tar.gz/include/gpac/internal/scenegraph_dev.h Changed

@@ -194,12 +194,12 @@
 	/*all routes available*/
 	GF_List *Routes;
 
-	/*when a proto is instanciated it creates its own scene graph. BIFS/VRML specify that the namespace is the same
+	/*when a proto is instantiated it creates its own scene graph. BIFS/VRML specify that the namespace is the same
 	(eg cannot reuse a NodeID or route name/ID), but this could be done differently by some other stds
 	if NULL this is the main scenegraph*/
 	struct _proto_instance *pOwningProto;
 
-	/*all first-level protos of the graph (the only ones that can be instanciated in this graph)*/
+	/*all first-level protos of the graph (the only ones that can be instantiated in this graph)*/
 	GF_List *protos;
 	/*all first-level protos of the graph not currently registered - memory handling of graph only*/
 	GF_List *unregistered_protos;
@@ -527,7 +527,7 @@
 Bool gf_sg_proto_get_aq_info(GF_Node *Node, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits);
 GF_Err gf_sg_proto_get_field_ind_static(GF_Node *Node, u32 inField, u8 IndexMode, u32 *allField);
 GF_Node *gf_sg_proto_create_node(GF_SceneGraph *scene, GF_Proto *proto, GF_ProtoInstance *from_inst);
-void gf_sg_proto_instanciate(GF_ProtoInstance *proto_node);
+void gf_sg_proto_instantiate(GF_ProtoInstance *proto_node);
 
 /*get tag of first node in proto code - used for validation only*/
 u32 gf_sg_proto_get_root_tag(GF_Proto *proto);

gpac-0.7.1.tar.gz/include/gpac/internal/terminal_dev.h -> gpac-0.8.0.tar.gz/include/gpac/internal/terminal_dev.h Changed

@@ -76,6 +76,8 @@
 	u32 nb_ch_users;
 	/*number of attached remote ODM (OD URLs)*/
 	u32 nb_odm_users;
+	//original serviceID in case remote OD created the service
+	u32 serviceID;
 
 	/*clock objects. Kept at service level since ESID namespace is the service one*/
 	GF_List *Clocks;
@@ -210,8 +212,11 @@
 	/*URLs of current video, audio and subs (we can't store objects since they may be destroyed when seeking)*/
 	SFURL visual_url, audio_url, text_url, dims_url;
 
-	Bool is_srd, is_tiled_srd;
+	Bool is_tiled_srd;
+	u32 srd_type;
 	s32 srd_min_x, srd_max_x, srd_min_y, srd_max_y;
+	//ambisonic type of the scene
+	u32 ambisonic_type;
 
 
 	Bool end_of_scene;
@@ -247,6 +252,8 @@
 	//0: no pause - 1: paused and trigger pause command to net, 2: only clocks are paused but commands not sent
 	u32 first_frame_pause_type;
 	u32 vr_type;
+
+	Bool has_splicing_addons;
 };
 
 GF_Scene *gf_scene_new(GF_Scene *parentScene);
@@ -300,6 +307,7 @@
 
 void gf_scene_select_main_addon(GF_Scene *scene, GF_ObjectManager *odm, Bool set_on, u32 current_clock_time);
 void gf_scene_reset_addons(GF_Scene *scene);
+void gf_scene_reset_addon(GF_AddonMedia *addon, Bool disconnect);
 
 #ifndef GPAC_DISABLE_VRML
 
@@ -531,7 +539,7 @@
 /*forces scene composition*/
 void gf_term_invalidate_compositor(GF_Terminal *term);
 
-/*callbacks for scene graph library so that all related ESM nodes are properly instanciated*/
+/*callbacks for scene graph library so that all related ESM nodes are properly instantiated*/
 void gf_term_node_callback(void *_is, u32 type, GF_Node *node, void *param);
 
 /*add/rem node requiring a call to render without being present in traversed graph (VRML/MPEG-4 protos).
@@ -937,6 +945,7 @@
 	u32 force_cb_resize;
 	u32 profile_level;
 	Bool hybrid_layered_coded;
+	Bool in_splice, coding_config_changed;
 };
 
 GF_Codec *gf_codec_new(GF_ObjectManager *odm, GF_ESD *base_layer, s32 PL, GF_Err *e);
@@ -953,7 +962,7 @@
 GF_Codec *gf_codec_use_codec(GF_Codec *codec, GF_ObjectManager *odm);
 
 GF_Err gf_codec_resize_composition_buffer(GF_Codec *dec, u32 NewSize);
-GF_Err gf_codec_change_decoder(GF_Codec *codec);
+GF_Err gf_codec_change_decoder(GF_Codec *codec, GF_ESD *for_esd, Bool do_blacklist);
 
 /*OD manager*/
 
@@ -1003,6 +1012,7 @@
 	GF_ODM_STATE_PLAY,
 	GF_ODM_STATE_IN_SETUP,
 	GF_ODM_STATE_BLOCKED,
+	GF_ODM_STATE_STOP_NO_NET,
 };
 
 enum
@@ -1013,6 +1023,7 @@
 	GF_ODM_ACTION_SCENE_DISCONNECT,
 	GF_ODM_ACTION_SCENE_RECONNECT,
 	GF_ODM_ACTION_SCENE_INLINE_RESTART,
+	GF_ODM_ACTION_SETUP
 };
 
 struct _od_manager
@@ -1070,6 +1081,7 @@
 	u32 action_type;
 
 	Fixed set_speed;
+	Bool disable_buffer_at_next_play;
 
 //	u32 raw_media_frame_pending;
 	GF_Semaphore *raw_frame_sema;
@@ -1085,6 +1097,8 @@
 
 	//only set on root OD of addon subscene, which gather all the hybrid resources
 	GF_AddonMedia *addon;
+	//set for objects splicing the main content, indicates the media type (usually in @codec but no codec created for splicing)
+	u32 splice_addon_mtype;
 	//set to true if this is a scalable addon for an existing object
 	Bool scalable_addon;
 
@@ -1092,6 +1106,9 @@
 	struct _od_manager *upper_layer_odm;
 	//for a scalable ODM, this indicates the lower layer odm associated
 	struct _od_manager *lower_layer_odm;
+
+	//indicates channel order (1->N) if the object is a ambisonic channel
+	u32 ambi_ch_id;
 };
 
 GF_ObjectManager *gf_odm_new();
@@ -1149,6 +1166,8 @@
 
 void gf_odm_reset_media_control(GF_ObjectManager *odm, Bool signal_reset);
 
+void gf_odm_setup_task(GF_ObjectManager *odm);
+
 /*GF_MediaObject: link between real object manager and scene. although there is a one-to-one mapping between a
 MediaObject and an ObjectManager, we have to keep them separated in order to handle OD remove commands which destroy
 ObjectManagers. */
@@ -1235,6 +1254,7 @@
 u32 gf_mo_get_od_id(MFURL *url);
 
 void gf_scene_generate_views(GF_Scene *scene, char *url, char *parent_url);
+void gf_scene_generate_mosaic(GF_Scene *scene, char *url, char *parent_path);
 //sets pos and size of addon
 //	size is 1/2 height (0), 1/3 (1) or 1/4 (2)
 //	pos is bottom-left(0), top-left (1) bottom-right (2) or top-right (3)
@@ -1263,6 +1283,8 @@
 	GF_ADDON_TYPE_SCALABLE,
 	//multiview reconstruction - reassembly after the decoder(s)
 	GF_ADDON_TYPE_MULTIVIEW,
+	//addon used for temporary splicing
+	GF_ADDON_TYPE_SPLICED,
 };
 
 struct _gf_addon_media
@@ -1290,6 +1312,13 @@
 	Bool loop_detected;
 
 	u32 addon_type;
+
+	Double splice_start, splice_end;
+	u32 is_over;
+	Bool splice_in_pts;
+	u32 nb_splicing;
+	Bool min_dts_set;
+	u64 splice_min_dts;
 };
 
 void gf_scene_toggle_addons(GF_Scene *scene, Bool show_addons);

gpac-0.7.1.tar.gz/include/gpac/ismacryp.h -> gpac-0.8.0.tar.gz/include/gpac/ismacryp.h Changed

@@ -47,6 +47,11 @@
 
 #include <gpac/isomedia.h>
 
+#ifndef GPAC_DISABLE_AV_PARSERS
+//FIXME - we should move AVC and HEVC parsing to gpac/avparse.h
+#include <gpac/internal/media_dev.h>
+#endif
+
 /*loads key and salt from a LOCAL gpac-DRM file (cf MP4Box doc)*/
 GF_Err gf_ismacryp_gpac_get_info(u32 stream_id, char *drm_file, char *key, char *salt);
 
@@ -57,17 +62,17 @@
 enum
 {
 	/*ISMA E&A encryption*/
-	GF_CRYPT_ISMA_CRYPT_TYPE	= GF_4CC( 'i', 'A', 'E', 'C' ),
+	GF_CRYPT_TYPE_ISMA		= GF_4CC( 'i', 'A', 'E', 'C' ),
 	/*CENC CTR-128 encryption*/
-	GF_CRYPT_CENC_CRYPT_TYPE	= GF_4CC('c','e','n','c'),
+	GF_CRYPT_TYPE_CENC	= GF_4CC('c','e','n','c'),
 	/*CENC CBC-128 encryption*/
-	GF_CRYPT_CBC1_CRYPT_TYPE	= GF_4CC('c','b','c','1'),
-	/*Adobe CBC-128 encryption*/
-	GF_CRYPT_ADOBE_CRYPT_TYPE	= GF_4CC('a','d','k','m'),
+	GF_CRYPT_TYPE_CBC1	= GF_4CC('c','b','c','1'),
 	/*CENC CTR-128 pattern encryption*/
-	GF_CRYPT_CENS_CRYPT_TYPE	= GF_4CC('c','e','n','s'),
+	GF_CRYPT_TYPE_CENS	= GF_4CC('c','e','n','s'),
 	/*CENC CBC-128 pattern encryption*/
-	GF_CRYPT_CBCS_CRYPT_TYPE	= GF_4CC('c','b','c','s'),
+	GF_CRYPT_TYPE_CBCS	= GF_4CC('c','b','c','s'),
+	/*Adobe CBC-128 encryption*/
+	GF_CRYPT_TYPE_ADOBE	= GF_4CC('a','d','k','m'),
 };
 
 enum
@@ -75,19 +80,21 @@
 	/*no selective encryption*/
 	GF_CRYPT_SELENC_NONE = 0,
 	/*only encrypts RAP samples*/
-	GF_CRYPT_SELENC_RAP = 1,
+	GF_CRYPT_SELENC_RAP,
 	/*only encrypts non-RAP samples*/
-	GF_CRYPT_SELENC_NON_RAP = 2,
+	GF_CRYPT_SELENC_NON_RAP,
 	/*selective encryption of random samples*/
-	GF_CRYPT_SELENC_RAND = 3,
+	GF_CRYPT_SELENC_RAND,
 	/*selective encryption of a random sample in given range*/
-	GF_CRYPT_SELENC_RAND_RANGE = 4,
+	GF_CRYPT_SELENC_RAND_RANGE,
 	/*selective encryption of first sample in given range*/
-	GF_CRYPT_SELENC_RANGE = 5,
+	GF_CRYPT_SELENC_RANGE,
 	/*encryption of all samples but the preview range*/
-	GF_CRYPT_SELENC_PREVIEW = 6,
-	/*encryption of no samples*/
-	GF_CRYPT_SELENC_CLEAR = 7,
+	GF_CRYPT_SELENC_PREVIEW,
+	/*no encryption of samples, signaled as unencrypted sample group for CENC*/
+	GF_CRYPT_SELENC_CLEAR,
+	/*no encryption of samples, NOT signaled as unencrypted sample group for CENC*/
+	GF_CRYPT_SELENC_CLEAR_FORCED
 };
 
 typedef struct
@@ -112,7 +119,8 @@
 	u32 ipmp_desc_id;
 	/*type of box where sample auxiliary informations is saved, or 0 in case of ISMACrypt (it will be written in samples)*/
 	u32 sai_saved_box_type;
-
+	/*force protection scheme specified in crypt file*/
+	Bool force_type;
 	/*OMA extensions*/
 	/*0: none, 1: AES CBC, 2: AES CTR*/
 	u8 encryption;
@@ -131,16 +139,35 @@
 	unsigned char first_IV[16];
 	u32 defaultKeyIdx;
 	u32 keyRoll;
+	u32 clear_bytes;
 	u8 crypt_byte_block, skip_byte_block;
 	u8 constant_IV_size;
 	unsigned char constant_IV[16];
 	//true if using AES-CTR mode, false if using AES-CBC mode
 	Bool ctr_mode;
-	u32 cenc_scheme_type;
+	u32 scheme_type;
+	//for avc1 ctr CENC edition 1
+	Bool allow_encrypted_slice_header;
+	//force cenc and cbc1: 0: default, 1: no block alignment of encrypted data, 2: always block align even if producing non encrypted samples
+	u32 block_align;
+
 
 	char metadata[5000];
 	u32 metadata_len;
 
+#ifndef GPAC_DISABLE_AV_PARSERS
+	AVCState avc;
+#ifndef GPAC_DISABLE_HEVC
+	HEVCState hevc;
+#endif
+#ifndef GPAC_DISABLE_AV1
+	AV1State av1;
+#endif
+
+	Bool slice_header_clear;
+	Bool is_avc;
+#endif
+
 } GF_TrackCryptInfo;
 
 #if !defined(GPAC_DISABLE_MCRYPT) && !defined(GPAC_DISABLE_ISOM_WRITE)

gpac-0.7.1.tar.gz/include/gpac/isomedia.h -> gpac-0.8.0.tar.gz/include/gpac/isomedia.h Changed

@@ -37,7 +37,7 @@
 *	\file <gpac/isomedia.h>
 *	\brief ISOBMFF parsing and writing library.
 */
-	
+
 /*!
 *	\addtogroup iso_grp ISO Base Media File
 *	\ingroup isobmf_grp
@@ -159,9 +159,12 @@
 	GF_ISOM_REF_SCPT			= GF_4CC( 's', 'c', 'p', 't' ),
 	//nonprimary source description
 	GF_ISOM_REF_SSRC			= GF_4CC( 's', 's', 'r', 'c' ),
-	//layer audio track dependency 
+	//layer audio track dependency
 	GF_ISOM_REF_LYRA			= GF_4CC( 'l', 'y', 'r', 'a' ),
 
+	/* File Delivery Item Information Extension */
+	GF_ISOM_REF_FDEL			= GF_4CC( 'f', 'd', 'e', 'l' ),
+
 };
 
 //defined sample groups in GPAC
@@ -190,6 +193,7 @@
 	GF_ISOM_SAMPLE_GROUP_SYNC = GF_4CC( 's', 'y', 'n', 'c'), //p15
 	GF_ISOM_SAMPLE_GROUP_TSCL = GF_4CC( 't', 's', 'c', 'l'), //p15
 	GF_ISOM_SAMPLE_GROUP_VIPR = GF_4CC( 'v', 'i', 'p', 'r'), //p15
+	GF_ISOM_SAMPLE_GROUP_LBLI = GF_4CC( 'l', 'b', 'l', 'i'), //p15
 
 	GF_ISOM_SAMPLE_GROUP_3GAG = GF_4CC( '3', 'g', 'a', 'g'), //3gpp
 	GF_ISOM_SAMPLE_GROUP_AVCB = GF_4CC( 'a', 'v', 'c', 'b'), //3gpp
@@ -210,6 +214,8 @@
 {
 	/*base media types*/
 	GF_ISOM_MEDIA_VISUAL	= GF_4CC( 'v', 'i', 'd', 'e' ),
+ GF_ISOM_MEDIA_AUXV = GF_4CC( 'a', 'u', 'x', 'v' ),
+ GF_ISOM_MEDIA_PICT = GF_4CC( 'p', 'i', 'c', 't' ),
 	GF_ISOM_MEDIA_AUDIO		= GF_4CC( 's', 'o', 'u', 'n' ),
 	GF_ISOM_MEDIA_HINT		= GF_4CC( 'h', 'i', 'n', 't' ),
 	GF_ISOM_MEDIA_META		= GF_4CC( 'm', 'e', 't', 'a' ),
@@ -233,7 +239,14 @@
 	/*DIMS media type (same as scene but with a different mediaInfo)*/
 	GF_ISOM_MEDIA_DIMS		= GF_4CC( 'd', 'i', 'm', 's' ),
 
-	GF_ISOM_MEDIA_FLASH		= GF_4CC( 'f', 'l', 's', 'h' )
+	GF_ISOM_MEDIA_FLASH		= GF_4CC( 'f', 'l', 's', 'h' ),
+
+	GF_ISOM_MEDIA_QTVR		= GF_4CC( 'q', 't', 'v', 'r' ),
+
+	GF_ISOM_MEDIA_JPEG		= GF_4CC( 'j', 'p', 'e', 'g' ),
+	GF_ISOM_MEDIA_JP2		= GF_4CC( 'j', 'p', '2', ' ' ),
+	GF_ISOM_MEDIA_PNG		= GF_4CC( 'p', 'n', 'g', ' ' ),
+
 };
 
 
@@ -260,6 +273,9 @@
 	/* Pattern Encryption Scheme Type in the SchemeTypeInfoBox */
 	GF_ISOM_CENS_SCHEME	= GF_4CC('c','e','n','s'),
 	GF_ISOM_CBCS_SCHEME	= GF_4CC('c','b','c','s'),
+
+	GF_ISOM_ISMA_SCHEME = GF_4CC('i','s','m','a'),
+	GF_ISOM_ODRM_SCHEME = GF_4CC('o','d','r','m'),
 };
 
 
@@ -282,6 +298,8 @@
 	GF_ISOM_SUBTYPE_AVC4_H264		= GF_4CC( 'a', 'v', 'c', '4' ),
 	GF_ISOM_SUBTYPE_SVC_H264		= GF_4CC( 's', 'v', 'c', '1' ),
 	GF_ISOM_SUBTYPE_MVC_H264		= GF_4CC( 'm', 'v', 'c', '1' ),
+
+	/*HEVC media type*/
 	GF_ISOM_SUBTYPE_HVC1			= GF_4CC( 'h', 'v', 'c', '1' ),
 	GF_ISOM_SUBTYPE_HEV1			= GF_4CC( 'h', 'e', 'v', '1' ),
 	GF_ISOM_SUBTYPE_HVC2			= GF_4CC( 'h', 'v', 'c', '2' ),
@@ -290,6 +308,16 @@
 	GF_ISOM_SUBTYPE_LHE1			= GF_4CC( 'l', 'h', 'e', '1' ),
 	GF_ISOM_SUBTYPE_HVT1			= GF_4CC( 'h', 'v', 't', '1' ),
 
+	/*AV1 media type*/
+	GF_ISOM_SUBTYPE_AV01 = GF_4CC('a', 'v', '0', '1'),
+
+	/*Opus media type*/
+	GF_ISOM_SUBTYPE_OPUS = GF_4CC('O', 'p', 'u', 's'),
+
+	/* VP */
+	GF_ISOM_SUBTYPE_VP08 = GF_4CC('v', 'p', '0', '8'),
+	GF_ISOM_SUBTYPE_VP09 = GF_4CC('v', 'p', '0', '9'),
+
 	/*3GPP(2) extension subtypes*/
 	GF_ISOM_SUBTYPE_3GP_H263	= GF_4CC( 's', '2', '6', '3' ),
 	GF_ISOM_SUBTYPE_3GP_AMR		= GF_4CC( 's', 'a', 'm', 'r' ),
@@ -320,6 +348,27 @@
 	GF_ISOM_SUBTYPE_RRTP		= GF_4CC( 'r', 'r', 't', 'p' ),
 	GF_ISOM_SUBTYPE_RTCP		= GF_4CC( 'r', 't', 'c', 'p' ),
 	GF_ISOM_SUBTYPE_FLUTE		= GF_4CC( 'f', 'd', 'p', ' ' ),
+
+	/* Apple XDCAM */
+	GF_ISOM_SUBTYPE_XDVB		= GF_4CC( 'x', 'd', 'v', 'b' ),
+
+	GF_ISOM_SUBTYPE_H263		= GF_4CC( 'h', '2', '6', '3' ),
+
+	GF_ISOM_SUBTYPE_JPEG		= GF_4CC( 'j', 'p', 'e', 'g' ),
+	GF_ISOM_SUBTYPE_PNG 		= GF_4CC( 'p', 'n', 'g', ' ' ),
+	GF_ISOM_SUBTYPE_MJP2 		= GF_4CC( 'm', 'j', 'p', '2' ),
+
+	GF_ISOM_SUBTYPE_MH3D_MHA1	= GF_4CC( 'm', 'h', 'a', '1' ),
+	GF_ISOM_SUBTYPE_MH3D_MHA2	= GF_4CC( 'm', 'h', 'a', '2' ),
+	GF_ISOM_SUBTYPE_MH3D_MHM1	= GF_4CC( 'm', 'h', 'm', '1' ),
+	GF_ISOM_SUBTYPE_MH3D_MHM2	= GF_4CC( 'm', 'h', 'm', '2' ),
+
+
+	/* on-screen colours */
+	GF_ISOM_SUBTYPE_NCLX 		= GF_4CC( 'n', 'c', 'l', 'x' ),
+	GF_ISOM_SUBTYPE_NCLC 		= GF_4CC( 'n', 'c', 'l', 'c' ),
+	GF_ISOM_SUBTYPE_PROF 		= GF_4CC( 'p', 'r', 'o', 'f' ),
+	GF_ISOM_SUBTYPE_RICC 		= GF_4CC( 'r', 'I', 'C', 'C' ),
 };
 
 
@@ -371,6 +420,7 @@
 	/*final version of 3GPP file spec*/
 	GF_ISOM_BRAND_3GP6 = GF_4CC('3', 'g', 'p', '6'),
 	/*generci 3GPP file (several audio tracks, etc..)*/
+	GF_ISOM_BRAND_3GG5 = GF_4CC('3', 'g', 'g', '5'),
 	GF_ISOM_BRAND_3GG6 = GF_4CC('3', 'g', 'g', '6'),
 	/*3GPP2 file spec*/
 	GF_ISOM_BRAND_3G2A = GF_4CC('3', 'g', '2', 'a'),
@@ -383,6 +433,59 @@
 	/* Image File Format */
 	GF_ISOM_BRAND_MIF1 = GF_4CC('m', 'i', 'f', '1'),
 	GF_ISOM_BRAND_HEIC = GF_4CC('h', 'e', 'i', 'c'),
+
+	/*other iso media brands */
+	GF_ISOM_BRAND_ISO1 = GF_4CC( 'i', 's', 'o', '1' ),
+	GF_ISOM_BRAND_ISO3 = GF_4CC( 'i', 's', 'o', '3' ),
+	GF_ISOM_BRAND_ISO5 = GF_4CC( 'i', 's', 'o', '5' ),
+	GF_ISOM_BRAND_ISO6 = GF_4CC( 'i', 's', 'o', '6' ),
+
+	/* QT brand*/
+	GF_ISOM_BRAND_QT = GF_4CC( 'q', 't', ' ', ' ' ),
+
+	/* JPEG 2000 Image (.JP2) [ISO 15444-1] */
+	GF_ISOM_BRAND_JP2 = GF_4CC( 'j', 'p', '2', ' ' ),
+
+	/* MPEG-4 (.MP4) for SonyPSP */
+	GF_ISOM_BRAND_MSNV = GF_4CC( 'M', 'S', 'N', 'V' ),
+	/* Apple iTunes AAC-LC (.M4A) Audio */
+	GF_ISOM_BRAND_M4A = GF_4CC( 'M', '4', 'A', ' ' ),
+	/* Apple iTunes Video (.M4V) Video */
+	GF_ISOM_BRAND_M4V = GF_4CC( 'M', '4', 'V', ' ' ),
+
+	GF_ISOM_BRAND_HVCE = GF_4CC( 'h', 'v', 'c', 'e' ),
+	GF_ISOM_BRAND_HVCI = GF_4CC( 'h', 'v', 'c', 'i' ),
+
+	GF_ISOM_BRAND_AV01 = GF_4CC( 'a', 'v', '0', '1'),
+
+	GF_ISOM_BRAND_OPUS = GF_4CC( 'O', 'p', 'u', 's'),
+
+	GF_ISOM_BRAND_ISMA = GF_4CC( 'I', 'S', 'M', 'A' ),
+
+	/* dash related brands (ISO/IEC 23009-1) */
+	GF_ISOM_BRAND_DASH = GF_4CC('d','a','s','h'),
+	/* Media Segment conforming to the DASH Self-Initializing Media Segment format type */
+	GF_ISOM_BRAND_DSMS = GF_4CC('d','s','m','s'),
+	/* Media Segment conforming to the general format type */
+	GF_ISOM_BRAND_MSDH = GF_4CC('m','s','d','h'),
+	/* Media Segment conforming to the Indexed Media Segment format type */
+	GF_ISOM_BRAND_MSIX = GF_4CC('m','s','i','x'),
+	/* Representation Index Segment used to index MPEG-2 TS based Media Segments */
+	GF_ISOM_BRAND_RISX = GF_4CC('r','i','s','x'),
+	/* last Media Segment indicator for ISO base media file format */
+	GF_ISOM_BRAND_LMSG = GF_4CC('l','m','s','g'),
+	/* Single Index Segment used to index MPEG-2 TS based Media Segments */
+	GF_ISOM_BRAND_SISX = GF_4CC('s','i','s','x'),
+	/* Subsegment Index Segment used to index MPEG-2 TS based Media Segments */
+	GF_ISOM_BRAND_SSSS = GF_4CC('s','s','s','s'),
+
+
+	/* from ismacryp.c */
+	/* OMA DCF DRM Format 2.0 (OMA-TS-DRM-DCF-V2_0-20060303-A) */
+	GF_ISOM_BRAND_ODCF = GF_4CC('o','d','c','f'),
+	/* OMA PDCF DRM Format 2.1 (OMA-TS-DRM-DCF-V2_1-20070724-C) */
+	GF_ISOM_BRAND_OPF2 = GF_4CC('o','p','f','2'),
+
 };
 
 
@@ -431,6 +534,9 @@
 	/*relative offset for composition if needed*/
 	s32 CTS_Offset;
 	SAPType IsRAP;
+	/*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;
 } GF_ISOSample;
 
 
@@ -460,13 +566,20 @@
 u32 gf_isom_probe_file(const char *fileName);
 
 /*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.
 tmp_dir: for the 2 edit modes only, specifies a location for temp file. If NULL, the library will use the default
 OS temporary file management schemes.*/
 GF_ISOFile *gf_isom_open(const char *fileName, u32 OpenMode, const char *tmp_dir);
 
-/*close the file, write it if new/edited*/
+/*close the file, write it if new/edited - equivalent to gf_isom_write()+gf_isom_delete()*/
 GF_Err gf_isom_close(GF_ISOFile *the_file);
 
+/*write the file without deleting (gf_isom_delete())*/
+GF_Err gf_isom_write(GF_ISOFile *movie);
+
+/*get access to the data bitstream - see gf_isom_open()*/
+GF_Err gf_isom_get_bs(GF_ISOFile *movie, GF_BitStream **out_bs);
+
 /*delete the movie without saving it.*/
 void gf_isom_delete(GF_ISOFile *the_file);
 
@@ -635,6 +748,13 @@
 
 /*Get constant sample size, or 0 if size not constant*/
 u32 gf_isom_get_constant_sample_size(GF_ISOFile *the_file, u32 trackNumber);
+
+/*Get constant sample duration, or 0 if duration not constant*/
+u32 gf_isom_get_constant_sample_duration(GF_ISOFile *the_file, u32 trackNumber);
+
+/*sets max audio sample packing in a single ISOSample*/
+Bool gf_isom_enable_raw_pack(GF_ISOFile *the_file, u32 trackNumber, u32 pack_num_samples);
+
 /*returns total amount of media bytes in track*/
 u64 gf_isom_get_media_data_size(GF_ISOFile *the_file, u32 trackNumber);
 
@@ -685,6 +805,9 @@
 /*get the current tfdt of the track - this can be used to adjust sample time queries when edit list are used*/
 u64 gf_isom_get_current_tfdt(GF_ISOFile *the_file, u32 trackNumber);
 
+//returns true if the file init segment (moov) was generated from external meta-data (smooth streaming)
+Bool gf_isom_is_smooth_streaming_moov(GF_ISOFile *the_file);
+
 /*Track Edition functions*/
 
 /*return a sample given a desired time in the movie. MovieTime is IN MEDIA TIME SCALE , handles edit list.
@@ -706,13 +829,15 @@
 */
 GF_Err gf_isom_get_sample_for_movie_time(GF_ISOFile *the_file, u32 trackNumber, u64 movieTime, u32 *StreamDescriptionIndex, u8 SearchMode, GF_ISOSample **sample, u32 *sampleNumber);
 
-/*return 1 if true edit list, 0 if no edit list or if time-shifting only edit list, in which case mediaOffset is set to the DTS offset value (e.g., your app should add mediaOffset to all sample DTS)*/
+/*return 1 if true edit list, 0 if no edit list or if time-shifting only edit list,
+ in which case mediaOffset is set to the DTS offset value in the media track timescale
+ (e.g., your app should add mediaOffset to all sample DTS)*/
 Bool gf_isom_get_edit_list_type(GF_ISOFile *the_file, u32 trackNumber, s64 *mediaOffset);
 
 /*get the number of edited segment*/
 u32 gf_isom_get_edit_segment_count(GF_ISOFile *the_file, u32 trackNumber);
 
-/*Get the desired segment information*/
+/*get the desired segment information*/
 GF_Err gf_isom_get_edit_segment(GF_ISOFile *the_file, u32 trackNumber, u32 SegmentIndex, u64 *EditTime, u64 *SegmentDuration, u64 *MediaTime, u8 *EditMode);
 
 /*get the number of languages for the copyright*/
@@ -725,7 +850,7 @@
 /*get the number of chapter for movie or track if trackNumber !=0*/
 u32 gf_isom_get_chapter_count(GF_ISOFile *the_file, u32 trackNumber);
 /*get the given movie or track (trackNumber!=0) chapter time and name - index is 1-based
-@chapter_time: retrives start time in milliseconds - may be NULL.
+@chapter_time: retrieves start time in milliseconds - may be NULL.
 @name: retrieves chapter name - may be NULL - SHALL NOT be destroyed by user
 */
 GF_Err gf_isom_get_chapter(GF_ISOFile *the_file, u32 trackNumber, u32 Index, u64 *chapter_time, const char **name);
@@ -852,9 +977,12 @@
 /*returns track matrix info - all coord values are expressed as 16.16 fixed point floats*/
 GF_Err gf_isom_get_track_matrix(GF_ISOFile *the_file, u32 trackNumber, u32 matrix[9]);
 
-/*returns width and height of the given visual sample desc - error if not a visual track*/
+/*returns aspect ratio for the given visual sample desc - error if not a visual track*/
 GF_Err gf_isom_get_pixel_aspect_ratio(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 *hSpacing, u32 *vSpacing);
 
+/*returns color info for the given visual sample desc - error if not a visual track*/
+GF_Err gf_isom_get_color_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 *colour_type, u16 *colour_primaries, u16 *transfer_characteristics, u16 *matrix_coefficients, Bool *full_range_flag);
+
 /*gets RVC config of given sample description*/
 GF_Err gf_isom_get_rvc_config(GF_ISOFile *movie, u32 track, u32 sampleDescriptionIndex, u16 *rvc_predefined, char **data, u32 *size, const char **mime);
 
@@ -928,17 +1056,12 @@
 u32 *defaultRandomAccess, u8 *defaultPadding, u16 *defaultDegradationPriority);
 
 
-/*non standard extensions used for video packets in order to keep AU structure in the file format
-(no normative tables for that). Info is NOT written to disk.
-*/
-/*get number of fragments for a sample */
-u32 gf_isom_get_sample_fragment_count(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber);
-/*get sample fragment size*/
-u16 gf_isom_get_sample_fragment_size(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 FragmentIndex);
-
 /*returns 1 if file is single AV (max one audio, one video, one text and basic od/bifs)*/
 Bool gf_isom_is_single_av(GF_ISOFile *file);
 
+/*returns TRUE if this is a video track type (vide, auxv, pict, ...)*/
+Bool gf_isom_is_video_subtype(u32 mtype);
+
 /*guess which std this file refers to. return value:
 	GF_ISOM_BRAND_ISOM: unrecognized std
 	GF_ISOM_BRAND_3GP5: 3GP file (max 1 audio, 1 video) without text track
@@ -962,6 +1085,13 @@
 /*gets last UTC/timestamp values indicated for the reference track in the file if any. Returns 0 if no info found*/
 Bool gf_isom_get_last_producer_time_box(GF_ISOFile *file, u32 *refTrackID, u64 *ntp, u64 *timestamp, Bool reset_info);
 
+/*gets max/average rate info as indicated in ESDS or BTRT boxes
+if sampleDescIndex is 0, gather for all sample descriptions*/
+GF_Err gf_isom_get_bitrate(GF_ISOFile *movie, u32 trackNumber, u32 sampleDescIndex, u32 *average_bitrate, u32 *max_bitrate, u32 *decode_buffer_size);
+
+/*returns true if this sample was the first sample of a traf in a fragmented file, false otherwise*/
+Bool gf_isom_sample_was_traf_start(GF_ISOFile *movie, u32 trackNumber, u32 sampleNum);
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
@@ -999,6 +1129,9 @@
 /*Add samples to a track. Use streamDescriptionIndex to specify the desired stream (if several)*/
 GF_Err gf_isom_add_sample(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, const GF_ISOSample *sample);
 
+/*set depenecy info for given sample*/
+GF_Err gf_isom_sample_set_dep_info(GF_ISOFile *file, u32 track, u32 sampleNumber, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant);
+
 //copies all sample dependency, subSample and sample group information from the given sampleNumber in source file to the last added sample in dest file
 GF_Err gf_isom_copy_sample_info(GF_ISOFile *dst, u32 dst_track, GF_ISOFile *src, u32 src_track, u32 sampleNumber);
 
@@ -1023,7 +1156,8 @@
 GF_Err gf_isom_add_sample_reference(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_ISOSample *sample, u64 dataOffset);
 
 /*set the duration of the last media sample. If not set, the duration of the last sample is the
-duration of the previous one if any, or media TimeScale (default value).*/
+duration of the previous one if any, or media TimeScale (default value). This does not modify the edit list if any,
+you must modify this using gf_isom_set_edit_segment*/
 GF_Err gf_isom_set_last_sample_duration(GF_ISOFile *the_file, u32 trackNumber, u32 duration);
 
 /*sets a track reference*/
@@ -1032,6 +1166,9 @@
 /*removes a track reference*/
 GF_Err gf_isom_remove_track_reference(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType, u32 ReferenceIndex);
 
+/*removes all track references*/
+GF_Err gf_isom_remove_track_references(GF_ISOFile *the_file, u32 trackNumber);
+
 /*sets track handler name. name is either NULL (reset), a UTF-8 formatted string or a UTF8 file
 resource in the form "file://path/to/file_utf8" */
 GF_Err gf_isom_set_handler_name(GF_ISOFile *the_file, u32 trackNumber, const char *nameUTF8);
@@ -1125,7 +1262,7 @@
 WARNING: The first segment always have an EditTime of 0. You should insert an empty or dwelled segment first.*/
 GF_Err gf_isom_set_edit_segment(GF_ISOFile *the_file, u32 trackNumber, u64 EditTime, u64 EditDuration, u64 MediaTime, u8 EditMode);
 
-/*same as above except only modifies duartion type and mediaType*/
+/*same as above except only modifies duration type and mediaType*/
 GF_Err gf_isom_modify_edit_segment(GF_ISOFile *the_file, u32 trackNumber, u32 seg_index, u64 EditDuration, u64 MediaTime, u8 EditMode);
 /*same as above except only appends new segment*/
 GF_Err gf_isom_append_edit_segment(GF_ISOFile *the_file, u32 trackNumber, u64 EditDuration, u64 MediaTime, u8 EditMode);
@@ -1196,6 +1333,8 @@
 
 /*since v2 you must specify w/h of video tracks for authoring tools (no decode the video cfg / first sample)*/
 GF_Err gf_isom_set_visual_info(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 Width, u32 Height);
+/*since v2 you must specify w/h of video tracks for authoring tools (no decode the video cfg / first sample)*/
+GF_Err gf_isom_set_visual_bit_depth(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u16 bitDepth);
 
 /*mainly used for 3GPP text since most ISO-based formats ignore these (except MJ2K)
 all coord values are expressed as 16.16 fixed point floats*/
@@ -1204,19 +1343,30 @@
 /*sets track matrix - all coordinates are expressed as 16.16 floating points*/
 GF_Err gf_isom_set_track_matrix(GF_ISOFile *the_file, u32 trackNumber, u32 matrix[9]);
 
-GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing);
+GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing, Bool force_par);
+
+GF_Err gf_isom_set_clean_aperture(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 cleanApertureWidthN, u32 cleanApertureWidthD, u32 cleanApertureHeightN, u32 cleanApertureHeightD, u32 horizOffN, u32 horizOffD, u32 vertOffN, u32 vertOffD);
+
+typedef struct ___MasteringDisplayColourVolume GF_MasteringDisplayColourVolumeInfo;
+typedef struct __ContentLightLevel GF_ContentLightLevelInfo;
+GF_Err gf_isom_set_hdr(GF_ISOFile* movie, u32 trackNumber, u32 StreamDescriptionIndex, GF_MasteringDisplayColourVolumeInfo *mdcv, GF_ContentLightLevelInfo *clli);
 
-GF_Err gf_isom_set_clean_apperture(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 cleanApertureWidthN, u32 cleanApertureWidthD, u32 cleanApertureHeightN, u32 cleanApertureHeightD, u32 horizOffN, u32 horizOffD, u32 vertOffN, u32 vertOffD);
+GF_Err gf_isom_set_image_sequence_coding_constraints(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, Bool remove, Bool all_ref_pics_intra, Bool intra_pred_used, u32 max_ref_per_pic);
+GF_Err gf_isom_set_image_sequence_alpha(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, Bool remove);
+
+/*passing colour_type=0 will remove all color info*/
+GF_Err gf_isom_set_visual_color_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 colour_type, u16 colour_primaries, u16 transfer_characteristics, u16 matrix_coefficients, Bool full_range_flag, char *icc_data, u32 icc_size);
 
 /*set SR & nbChans for audio description*/
-GF_Err gf_isom_set_audio_info(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 sampleRate, u32 nbChannels, u8 bitsPerSample);
+typedef enum {
+	GF_IMPORT_AUDIO_SAMPLE_ENTRY_NOT_SET = 0,
+	GF_IMPORT_AUDIO_SAMPLE_ENTRY_v0_BS,
+	GF_IMPORT_AUDIO_SAMPLE_ENTRY_v0_2,
+	GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_MPEG,
+	GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF
+} GF_AudioSampleEntryImportMode;
 
-/*non standard extensions: set/remove a fragment of a sample - this is used for video packets
-in order to keep AU structure in the file format (no normative tables for that). Info is NOT written to disk*/
-GF_Err gf_isom_add_sample_fragment(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u16 FragmentSize);
-GF_Err gf_isom_remove_sample_fragment(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber);
-/*remove all sample fragment info for this track*/
-GF_Err gf_isom_remove_sample_fragments(GF_ISOFile *the_file, u32 trackNumber);
+GF_Err gf_isom_set_audio_info(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 sampleRate, u32 nbChannels, u8 bitsPerSample, GF_AudioSampleEntryImportMode asemode);
 
 /*set CTS unpack mode (used for B-frames & like): in unpack mode, each sample uses one entry in CTTS tables
 unpack=0: set unpack on - !!creates a CTTS table if none found!!
@@ -1225,6 +1375,9 @@
 GF_Err gf_isom_set_cts_packing(GF_ISOFile *the_file, u32 trackNumber, Bool unpack);
 /*modify CTS offset of a given sample (used for B-frames) - MUST be called in unpack mode only*/
 GF_Err gf_isom_modify_cts_offset(GF_ISOFile *the_file, u32 trackNumber, u32 sample_number, u32 offset);
+/*shift all CTS with the given offset - MUST be called in unpack mode only*/
+GF_Err gf_isom_shift_cts_offset(GF_ISOFile *the_file, u32 trackNumber, s32 offset_shift);
+
 /*remove CTS offset table (used for B-frames)*/
 GF_Err gf_isom_remove_cts_info(GF_ISOFile *the_file, u32 trackNumber);
 
@@ -1284,9 +1437,12 @@
 /*Add a system descriptor to the ESD of a stream - you have to delete the descriptor*/
 GF_Err gf_isom_add_desc_to_description(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_Descriptor *theDesc);
 
-/*updates average and max bitrate - if 0 for max, removes bitrate info*/
+/*updates average and max bitrate - if 0 for max and avg, removes bitrate info*/
 GF_Err gf_isom_update_bitrate(GF_ISOFile *movie, u32 trackNumber, u32 sampleDescriptionIndex, u32 average_bitrate, u32 max_bitrate, u32 decode_buffer_size);
 
+/*updates fields of given visual sample description - these fields are reserved in ISOBMFF, this should only be used for QT*/
+GF_Err gf_isom_update_video_sample_entry_fields(GF_ISOFile *file, u32 track, u32 stsd_idx, u16 revision, u32 vendor, u32 temporalQ, u32 spatialQ, u32 horiz_res, u32 vert_res, u16 frames_per_sample, char *compressor_name, s16 color_table_index);
+
 
 /*Default extensions*/
 
@@ -1310,11 +1466,14 @@
 /*clones all sampleDescription entries in new track, after an optional reset of existing entries*/
 GF_Err gf_isom_clone_sample_descriptions(GF_ISOFile *the_file, u32 trackNumber, GF_ISOFile *orig_file, u32 orig_track, Bool reset_existing);
 
+#define GF_ISOM_CLONE_TRACK_KEEP_DREF	1
+#define GF_ISOM_CLONE_TRACK_NO_QT	1<<1
+
 /*special shortcut: clones a track (everything except media data and sample info (DTS, CTS, RAPs, etc...)
 also clones sampleDescriptions
 @keep_data_ref: if set, all data references are kept (local ones become external pointing to orig_file name), otherwise all external data refs are removed (track media data will be self-contained)
 @dest_track: track number of cloned track*/
-GF_Err gf_isom_clone_track(GF_ISOFile *orig_file, u32 orig_track, GF_ISOFile *dest_file, Bool keep_data_ref, u32 *dest_track);
+GF_Err gf_isom_clone_track(GF_ISOFile *orig_file, u32 orig_track, GF_ISOFile *dest_file, u32 flags, u32 *dest_track);
 /*special shortcut: clones IOD PLs from orig to dest if any*/
 GF_Err gf_isom_clone_pl_indications(GF_ISOFile *orig, GF_ISOFile *dest);
 /*clones root OD from input to output file, without copying root OD track references*/
@@ -1324,7 +1483,7 @@
 kept if keep_hint_tracks is set
 if keep_pssh, all pssh boxes will be kept
 fragment information (mvex) is not kept*/
-GF_Err gf_isom_clone_movie(GF_ISOFile *orig_file, GF_ISOFile *dest_file, Bool clone_tracks, Bool keep_hint_tracks, Bool keep_pssh);
+GF_Err gf_isom_clone_movie(GF_ISOFile *orig_file, GF_ISOFile *dest_file, Bool clone_tracks, Bool keep_hint_tracks, Bool keep_pssh, Bool create_mvex_after_traks);
 
 /*returns true if same set of sample description in both tracks - this does include self-contained checking
 and reserved flags. The specific media cfg (DSI & co) is not analysed, only
@@ -1401,7 +1560,9 @@
 *DefaultSampleIsSync: default key-flag (RAP) of samples in this track
 *DefaultSamplePadding: default padding bits for samples in this track
 *DefaultDegradationPriority: default degradation priority for samples in this track
+*force_traf_flags: if 1, will ignore these default in each traf but will still write them in moov
 
+If all the defaults are 0, traf flags will alwaus be used to signal them.
 */
 GF_Err gf_isom_setup_track_fragment(GF_ISOFile *the_file, u32 TrackID,
 u32 DefaultStreamDescriptionIndex,
@@ -1409,7 +1570,8 @@
 u32 DefaultSampleSize,
 u8 DefaultSampleIsSync,
 u8 DefaultSamplePadding,
- u16 DefaultDegradationPriority);
+ u16 DefaultDegradationPriority,
+									u8 force_traf_flags);
 
 /*change the default parameters of an existing trak fragment - should not be used if samples have
 already been added - semantics are the same as in gf_isom_setup_track_fragment*/
@@ -1419,7 +1581,8 @@
 u32 DefaultSampleSize,
 u8 DefaultSampleIsSync,
 u8 DefaultSamplePadding,
- u16 DefaultDegradationPriority);
+ u16 DefaultDegradationPriority,
+ u8 force_traf_flags);
 
 /*flushes data to disk and prepare movie fragmentation
 @media_segment_type: 0 if no segments, 1 if regular segment, 2 if single segment*/
@@ -1438,16 +1601,24 @@
 /*sets the baseMediaDecodeTime of the first sample of the given track*/
 GF_Err gf_isom_set_traf_base_media_decode_time(GF_ISOFile *movie, u32 TrackID, u64 decode_time);
 
+/*enables mfra when writing movie fragments*/
+GF_Err gf_isom_enable_mfra(GF_ISOFile *file);
+
 /*sets Microsoft Smooth Streaming traf 'tfxd' box info, written at the end of each traf*/
 GF_Err gf_isom_set_traf_mss_timeext(GF_ISOFile *movie, u32 reference_track_ID, u64 ntp_in_10mhz, u64 traf_duration_in_10mhz);
 
 /*closes current segment - if fragments_per_sidx is <0, no sidx is used - if fragments_per_sidx is ==0, a single sidx is used
-timestamp_shift is the constant difference between media time and presentation time (derived from edit list)*/
-GF_Err gf_isom_close_segment(GF_ISOFile *movie, s32 subsegs_per_sidx, u32 referenceTrackID, u64 ref_track_decode_time, s32 timestamp_shift, u64 ref_track_next_cts, Bool daisy_chain_sidx, Bool last_segment, u32 segment_marker_4cc, u64 *index_start_range, u64 *index_end_range);
+timestamp_shift is the constant difference between media time and presentation time (derived from edit list)
+out_seg_size is optional, holds the segment size in bytes
+*/
+GF_Err gf_isom_close_segment(GF_ISOFile *movie, s32 subsegs_per_sidx, u32 referenceTrackID, u64 ref_track_decode_time, s32 timestamp_shift, u64 ref_track_next_cts, Bool daisy_chain_sidx, Bool use_ssix, Bool last_segment, Bool close_segment_handle, u32 segment_marker_4cc, u64 *index_start_range, u64 *index_end_range, u64 *out_seg_size);
 
 /*writes any pending fragment to file for low-latency output. shall only be used if no SIDX is used (subsegs_per_sidx<0 or flushing all fragments before calling gf_isom_close_segment)*/
 GF_Err gf_isom_flush_fragments(GF_ISOFile *movie, Bool last_segment);
 
+//gets name of current segment (or last segment if called between close_segment and start_segment)
+const char *gf_isom_get_segment_name(GF_ISOFile *movie);
+
 /*sets fragment prft box info, written just before the moof*/
 GF_Err gf_isom_set_fragment_reference_time(GF_ISOFile *movie, u32 reference_track_ID, u64 ntp, u64 timestamp);
 
@@ -1456,7 +1627,7 @@
 the pre-allocated SIDX is destroyed and sucessive calls to gf_isom_close_segment will create their own sidx (unless gf_isom_allocate_sidx is called again).
 frags_per_sidx, daisy_chain_sidx and frags_per_segment are currently ignored and reserved for future usages where multiple SIDX could be written
 if not NULL, start_range and end_range will contain the byte range of the SIDX box in the movie*/
-GF_Err gf_isom_allocate_sidx(GF_ISOFile *movie, s32 subsegs_per_sidx, Bool daisy_chain_sidx, u32 nb_segs, u32 *frags_per_segment, u32 *start_range, u32 *end_range);
+GF_Err gf_isom_allocate_sidx(GF_ISOFile *movie, s32 subsegs_per_sidx, Bool daisy_chain_sidx, u32 nb_segs, u32 *frags_per_segment, u32 *start_range, u32 *end_range, Bool use_ssix);
 
 enum
 {
@@ -1472,7 +1643,10 @@
 	media from a live source (typically audio-video), and greatly reduces file size
 	param: Number of samples (> 1) to cache before disk flushing. You shouldn't try
 	to cache too many samples since this will load your memory. base that on FPS/SR*/
-	GF_ISOM_TRAF_DATA_CACHE
+	GF_ISOM_TRAF_DATA_CACHE,
+	/*forces moof base offsets when traf based offsets would be chosen
+	param: on/off (0/1)*/
+	GF_ISOM_TFHD_FORCE_MOOF_BASE_OFFSET
 };
 
 /*set options. Options can be set at the beginning of each new fragment only, and for the
@@ -1506,6 +1680,12 @@
 /*reset internal info used with fragments and segment. Should be called when seeking (with keep_sample_count=0) or when loading a media segments with the same timing as the previously loaded segment*/
 void gf_isom_reset_fragment_info(GF_ISOFile *movie, Bool keep_sample_count);
 
+/*reset sample count to 0 and next moof number to 0. When doint scalable media, should be called before opening the segment containing
+the base layer in order to make sure the sample count base number is always the same (ie 1) on all tracks*/
+void gf_isom_reset_sample_count(GF_ISOFile *movie);
+
+void gf_isom_reset_seq_num(GF_ISOFile *movie);
+
 /*return the duration of the movie+fragments if known, 0 if error*/
 u64 gf_isom_get_fragmented_duration(GF_ISOFile *movie);
 /*returns the number of sidx boxes*/
@@ -1545,8 +1725,7 @@
 be written first*/
 GF_Err gf_isom_set_track_priority_in_group(GF_ISOFile *the_file, u32 trackNumber, u32 InversePriority);
 
-/*set the max SamplesPerChunk (for file optimization, mainly in FLAT and STREAMABLE modes)*/
-GF_Err gf_isom_set_max_samples_per_chunk(GF_ISOFile *the_file, u32 trackNumber, u32 maxSamplesPerChunk);
+GF_Err gf_isom_hint_max_chunk_size(GF_ISOFile *the_file, u32 trackNumber, u32 maxChunkSize);
 
 /*associate a given SL config with a given ESD while extracting the OD information
 all the SL params must be fixed by the calling app!
@@ -1857,6 +2036,12 @@
 /*gets LHVC config - user is responsible for deleting it*/
 GF_HEVCConfig *gf_isom_lhvc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
 
+/*gets AV1 config - user is responsible for deleting it*/
+GF_AV1Config *gf_isom_av1_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
+
+/*gets VP config - user is responsible for deleting it*/
+GF_VPConfig *gf_isom_vp_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
+
 /*return true if track dependencies implying extractors or implicit reconstruction are found*/
 Bool gf_isom_needs_layer_reconstruction(GF_ISOFile *file);
 
@@ -1901,12 +2086,15 @@
 /*deletes MVC config*/
 GF_Err gf_isom_mvc_config_del(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
 
-/*sets avc3 entry type (inband SPS/PPS) instead of of avc1 (SPS/PPS in avcC box)*/
+/*sets avc3 entry type (inband SPS/PPS) instead of avc1 (SPS/PPS in avcC box)*/
 GF_Err gf_isom_avc_set_inband_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
 
-/*sets hev1 entry type (inband SPS/PPS) instead of of hvc1 (SPS/PPS in avcC box)*/
+/*sets hev1 entry type (inband SPS/PPS) instead of hvc1 (SPS/PPS in hvcC box)*/
 GF_Err gf_isom_hevc_set_inband_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
 
+/*sets lhe1 entry type instead of lhc1 but keep lhcC box intact*/
+GF_Err gf_isom_lhvc_force_inband_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
+
 /*sets hvt1 entry type (tile track) or hev2/hvc2 type if is_base_track is set - cfg may be set to indicate sub-profile of the tile. It is the use responsability to set the tbas track reference to the base hevc track*/
 GF_Err gf_isom_hevc_set_tile_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg, Bool is_base_track);
 
@@ -1927,6 +2115,15 @@
 } GF_ISOMLHEVCTrackType;
 GF_Err gf_isom_lhvc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg, GF_ISOMLHEVCTrackType track_type);
 
+
+/*creates new VPx config*/
+GF_Err gf_isom_vp_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_VPConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex, Bool is_vp9);
+
+
+/*creates new AV1 config*/
+GF_Err gf_isom_av1_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AV1Config *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex);
+
+
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
@@ -2162,7 +2359,8 @@
 
 typedef struct
 {
-	u16 bytes_clear_data;
+	//16 bit stored but we use 32
+	u32 bytes_clear_data;
 	u32 bytes_encrypted_data;
 } GF_CENCSubSampleEntry;
 
@@ -2196,13 +2394,15 @@
 
 
 GF_Err gf_isom_cenc_allocate_storage(GF_ISOFile *the_file, u32 trackNumber, u32 container_type, u32 AlgorithmID, u8 IV_size, bin128 KID);
-GF_Err gf_isom_track_cenc_add_sample_info(GF_ISOFile *the_file, u32 trackNumber, u32 container_type, u8 IV_size, char *buf, u32 len);
+
+//if buf is NULL but len is given, this adds an unencrypted entry. otherwise, buf && len represent the sai cenc info to add
+GF_Err gf_isom_track_cenc_add_sample_info(GF_ISOFile *the_file, u32 trackNumber, u32 container_type, u8 IV_size, char *buf, u32 len, Bool use_subsamples, char *clear_IV);
 
 
 
 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_IV_size, bin128 default_KID,
-								 u8 default_crypt_byte_block, u8 default_skip_byte_block, 
+								 u8 default_crypt_byte_block, u8 default_skip_byte_block,
 								 u8 default_constant_IV_size, bin128 default_constant_IV);
 
 GF_Err gf_cenc_set_pssh(GF_ISOFile *mp4, bin128 systemID, u32 version, u32 KID_count, bin128 *KID, char *data, u32 len);
@@ -2229,15 +2429,16 @@
 /*boxType is type of box which contains the sample auxiliary information. Now we have two type: GF_ISOM_BOX_UUID_PSEC and GF_ISOM_BOX_TYPE_SENC*/
 GF_Err gf_isom_cenc_get_sample_aux_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, GF_CENCSampleAuxInfo **sai, u32 *container_type);
 
-void gf_isom_cenc_get_default_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID);
+void gf_isom_cenc_get_default_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID, u8 *constant_IV_size, bin128 *constant_IV, u8 *crypt_byte_block, u8 *skip_byte_block);
 
 Bool gf_isom_cenc_is_pattern_mode(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex);
-void gf_isom_cenc_get_default_pattern_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u8 *default_crypt_byte_block, u8 *default_skip_byte_block);
 
 u32 gf_isom_get_pssh_count(GF_ISOFile *file);
 /*index is 1-based, all pointers shall not be free*/
 GF_Err gf_isom_get_pssh_info(GF_ISOFile *file, u32 pssh_index, bin128 SystemID, u32 *KID_count, const bin128 **KIDs, const u8 **private_data, u32 *private_data_size);
 
+GF_Err gf_isom_get_pssh(GF_ISOFile *file, u32 pssh_index, u8 **pssh_data, u32 *pssh_size);
+
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
 /*xml dumpers*/
@@ -2281,6 +2482,7 @@
 /*gets item info for the given item
 	@item_num: 1-based index of item to query
 	@itemID (optional): item ID in file
+	@type: item 4CC type
 	@is_self_reference: item is the file itself
 	@item_name (optional): item name
 	@item_mime_type (optional): item mime type
@@ -2290,7 +2492,7 @@
 
 */
 GF_Err gf_isom_get_meta_item_info(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_num,
- u32 *itemID, u32 *protection_idx, Bool *is_self_reference,
+ u32 *itemID, u32 *type, u32 *protection_idx, Bool *is_self_reference,
 const char **item_name, const char **item_mime_type, const char **item_encoding,
 const char **item_url, const char **item_urn);
 
@@ -2307,7 +2509,7 @@
 /*extracts item from given meta in memory
 	@item_num: 1-based index of item to query
 */
-GF_Err gf_isom_extract_meta_item_mem(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, char **out_data, u32 *out_size, const char **mime_type);
+GF_Err gf_isom_extract_meta_item_mem(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, char **out_data, u32 *out_size, const char **mime_type, Bool use_annex_b);
 
 /*retirves primary item ID, 0 if none found (primary can also be stored through meta XML)*/
 u32 gf_isom_get_meta_primary_item_id(GF_ISOFile *file, Bool root_meta, u32 track_num);
@@ -2344,8 +2546,13 @@
 	u32 angle;
 	Bool hidden;
 	void *config;
-	GF_TileItemMode tile_mode; 
+	GF_TileItemMode tile_mode;
 	u32 single_tile_number;
+	double time;
+	char iccPath[GF_MAX_PATH];
+	Bool alpha;
+	u8 num_channels;
+	u8 bits_per_channel[3];
 } GF_ImageItemProperties;
 
 GF_Err gf_isom_meta_get_next_item_id(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 *item_id);
@@ -2366,6 +2573,8 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+GF_Err gf_isom_get_meta_image_props(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, GF_ImageItemProperties *prop);
+
 
 /********************************************************************
 				Timed Meta-Data extensions
@@ -2543,6 +2752,8 @@
 /*returns opaque data of sample group*/
 Bool gf_isom_get_sample_group_info(GF_ISOFile *the_file, u32 trackNumber, u32 sample_description_index, u32 grouping_type, u32 *default_index, const char **data, u32 *size);
 
+Bool gf_isom_has_cenc_sample_group(GF_ISOFile *the_file, u32 trackNumber);
+
 /*returns tile info */
 Bool gf_isom_get_tile_info(GF_ISOFile *file, u32 trackNumber, u32 sample_description_index, u32 *default_sample_group_index, u32 *id, u32 *independent, Bool *full_frame, u32 *x, u32 *y, u32 *w, u32 *h);
 
@@ -2563,6 +2774,8 @@
 GF_Err gf_isom_set_sample_cenc_group(GF_ISOFile *movie, u32 track, u32 sample_number, u8 isEncrypted, u8 IV_size, bin128 KeyID,
 									u8 crypt_byte_block, u8 skip_byte_block, u8 constant_IV_size, bin128 constant_IV);
 
+GF_Err gf_isom_set_sample_cenc_default(GF_ISOFile *movie, u32 track, u32 sample_number);
+
 GF_Err gf_isom_set_composition_offset_mode(GF_ISOFile *file, u32 track, Bool use_negative_offsets);
 
 //adds the given blob as a sample group description of the given grouping type. If default is set, the sample grouping will be marked as default.

gpac-0.7.1.tar.gz/include/gpac/list.h -> gpac-0.8.0.tar.gz/include/gpac/list.h Changed

gpac-0.7.1.tar.gz/include/gpac/maths.h -> gpac-0.8.0.tar.gz/include/gpac/maths.h Changed

gpac-0.7.1.tar.gz/include/gpac/media_tools.h -> gpac-0.8.0.tar.gz/include/gpac/media_tools.h Changed

@@ -68,10 +68,19 @@
 GF_ESD *gf_media_map_esd(GF_ISOFile *mp4, u32 track);
 
 /*!
+Creates (if needed) a GF_ESD for the given image item - THIS IS RESERVED for local playback
+only, since the OTI used when emulated is not standard...
+* \param mp4 source file
+* \param item_id item for which the esd is to be emulated
+* \return rebuilt ESD. It is the caller responsibility to delete it.
+*/
+GF_ESD *gf_media_map_item_esd(GF_ISOFile *mp4, u32 item_id);
+
+/*!
 * Get RFC 6381 description for a given track.
 * \param movie source movie
 * \param track track to check
- * \param szCodec a pointer to an already allocated string of size 20 bytes (to refine).
+ * \param szCodec a pointer to an already allocated string of size RFC6381_CODEC_NAME_SIZE_MAX bytes.
 * \param force_inband_xps force inband signaling of parameter sets.
 * \param force_sbr forces using explicit signaling for SBR.
 * \return error if any.
@@ -86,17 +95,27 @@
 * \param track target track
 * \param ar_num aspect ratio numerator
 * \param ar_den aspect ratio denominator
+ * \param force_par aspect ratio is always written even when not necessary
 * \return error if any
 */
-GF_Err gf_media_change_par(GF_ISOFile *file, u32 track, s32 ar_num, s32 ar_den);
+GF_Err gf_media_change_par(GF_ISOFile *file, u32 track, s32 ar_num, s32 ar_den, Bool force_par);
 
 /*!
 *Removes all non rap samples (sync and other RAP sample group info) from the track.
 * \param file target movie
 * \param track target track
+ * \param do_thin if set, removes only non-reference pictures
 * \return error if any
 */
-GF_Err gf_media_remove_non_rap(GF_ISOFile *file, u32 track);
+GF_Err gf_media_remove_non_rap(GF_ISOFile *file, u32 track, Bool non_ref_only);
+
+/*!
+ *updates bitrate info on given track.
+ * \param file target movie
+ * \param track target track
+ */
+void gf_media_update_bitrate(GF_ISOFile *file, u32 track);
+
 #endif
 
 /*! @} */
@@ -127,7 +146,7 @@
 	NOTE: if an ESD is specified, its decoderSpecificInfo is also updated
 
 */
-	
+
 /*!
 * Track importer flags
 *	\hideinitializer
@@ -169,7 +188,7 @@
 	GF_IMPORT_OVSBR = 1<<14,
 	/*! set subsample information with SVC*/
 	GF_IMPORT_SET_SUBSAMPLES = 1<<15,
-	/*! force to mark non-IDR frmaes with sync data (I slices,) to be marked as sync points points
+	/*! force to mark non-IDR frames with sync data (I slices,) to be marked as sync points points
 	THE RESULTING FILE IS NOT COMPLIANT*/
 	GF_IMPORT_FORCE_SYNC = 1<<16,
 	/*! keep trailing 0 bytes in AU payloads when any*/
@@ -192,6 +211,14 @@
 	GF_IMPORT_NO_VPS_EXTENSIONS = 1<<25,
 	/*! when set no SEI messages are imported*/
 	GF_IMPORT_NO_SEI = 1<<26,
+	/*! keeps track references when importing a single track*/
+	GF_IMPORT_KEEP_REFS = 1<<27,
+	/*! keeps AV1 temporal delimiter OBU in the samples*/
+	GF_IMPORT_KEEP_AV1_TEMPORAL_OBU = 1<<28,
+	/*! imports sample dependencies information*/
+	GF_IMPORT_SAMPLE_DEPS = 1<<29,
+	/*! when set a default ccst box is used in the sample entry */
+	GF_IMPORT_USE_CCST = 1<<30,
 
 	/*! when set by user during import, will abort*/
 	GF_IMPORT_DO_ABORT = 1<<31
@@ -214,6 +241,8 @@
 	u32 height;
 	/*! pixel aspect ratio expressed as 32 bits, high 16 bits being the numerator and low ones being the denominator*/
 	u32 par;
+	/*! temporal enhancement flag*/
+	Bool temporal_enhancement;
 	/*! Video frame rate*/
 	Double FPS;
 };
@@ -347,9 +376,17 @@
 	struct __program_import_info pg_info[GF_IMPORT_MAX_TRACKS];
 	/*! last error encountered during import, internal to the importer*/
 	GF_Err last_error;
+
+	GF_AudioSampleEntryImportMode asemode;
+
+	Bool audio_roll_change;
+	s16 audio_roll;
+
+	Bool is_alpha;
+	Bool keep_audelim;
 } GF_MediaImporter;
 
-/*! 
+/*!
 * Imports a media file
 \param importer the importer object
 \return error if any
@@ -360,7 +397,7 @@
 /*!
 Adds chapter info contained in file
 \param file target movie
- \param chap_file target chapter file 
+ \param chap_file target chapter file
 \param import_fps specifies the chapter frame rate (optional, ignored if 0 - defaults to 25). Most formats don't use this feature
 \return error if any
 */
@@ -377,7 +414,7 @@
 */
 GF_Err gf_media_make_isma(GF_ISOFile *file, Bool keepESIDs, Bool keepImage, Bool no_ocr);
 
-/*! 
+/*!
 Make the file 3GP compliant && sets profile
 \param file the target movie
 \return error if any
@@ -391,6 +428,13 @@
 */
 GF_Err gf_media_make_psp(GF_ISOFile *file);
 
+/*!
+ adjust file params for QT prores
+ \param file the target movie
+ \return error if any
+*/
+GF_Err gf_media_check_qt_prores(GF_ISOFile *mp4);
+
 /*! @} */
 
 /*!
@@ -412,7 +456,7 @@
 */
 GF_Err gf_media_change_pl(GF_ISOFile *file, u32 track, u32 profile, u32 level);
 
-/*! 
+/*!
 Rewrite AVC samples if nalu size_length has to be changed
 \param file the target movie
 \param track the target track
@@ -423,7 +467,7 @@
 GF_Err gf_media_avc_rewrite_samples(GF_ISOFile *file, u32 track, u32 prev_size_in_bits, u32 new_size_in_bits);
 
 /*!
- Split SVC layers 
+ Split SVC layers
 \param file the target movie
 \param track the target track
 \param splitAll if set each layers will be in a single track, otherwise all non-base layers will be in the same track
@@ -440,6 +484,17 @@
 */
 GF_Err gf_media_merge_svc(GF_ISOFile *file, u32 track, Bool mergeAll);
 
+
+typedef enum
+{
+	//use extractors
+	GF_LHVC_EXTRACTORS_ON,
+	//don't use extractors and keep base track inband/outofband param set signaling
+	GF_LHVC_EXTRACTORS_OFF,
+	//don't use extractors and force inband signaling in enhancement layer (for ATSC3)
+	GF_LHVC_EXTRACTORS_OFF_FORCE_INBAND,
+} GF_LHVCExtractoreMode;
+
 /* !
 Split L-HEVC layers
 \param file the target movie
@@ -449,7 +504,7 @@
 \param use_extractors if set, extractors are used in the enhancement layers.
 \return error if any
 */
-GF_Err gf_media_split_lhvc(GF_ISOFile *file, u32 track, Bool for_temporal_sublayers, Bool splitAll, Bool use_extractors);
+GF_Err gf_media_split_lhvc(GF_ISOFile *file, u32 track, Bool for_temporal_sublayers, Bool splitAll, GF_LHVCExtractoreMode extractor_mode);
 
 /* !
 Split HEVC tiles into different tracks
@@ -459,7 +514,7 @@
 */
 GF_Err gf_media_split_hevc_tiles(GF_ISOFile *file, u32 signal_only);
 
-	
+
 /* !
 Filter HEVC/L-HEVC NALUs by temporal IDs and layer IDs, removing all NALUs above the desired levels.
 \param file the target movie
@@ -528,6 +583,10 @@
 	u32 bandwidth;
 	/*! forced period duration (used when using empty periods or xlink periods without content)*/
 	Double period_duration;
+	/*! if true, the dasher inputs will open each time the segmentation function is called */
+	Bool no_cache;
+	/*! if true and only one media stream in target segment, the moov will use the media stream timescale*/
+	Bool sscale;
 } GF_DashSegmenterInput;
 
 /*!
@@ -610,7 +669,7 @@
 
 typedef struct __gf_dash_segmenter GF_DASHSegmenter;
 
-/*! 
+/*!
 Create a new DASH segmenter
 *	\param mpdName target MPD file name, cannot be changed
 *	\param profile target DASH profile, cannot be changed
@@ -664,10 +723,11 @@
 *	\param enable enable usage of URL template
 *	\param default_template template for the segment name
 *	\param default_extension extension for the segment name
+ *	\param default_extension extension for the initialization segment name
 *	\return error code if any
 */
-	
-GF_Err gf_dasher_enable_url_template(GF_DASHSegmenter *dasher, Bool enable, const char *default_template, const char *default_extension);
+
+GF_Err gf_dasher_enable_url_template(GF_DASHSegmenter *dasher, Bool enable, const char *default_template, const char *default_extension, const char *default_init_extension);
 
 /*!
 Enable Segment Timeline template - may be overriden by the current profile
@@ -686,7 +746,7 @@
 
 GF_Err gf_dasher_enable_single_segment(GF_DASHSegmenter *dasher, Bool enable);
 
-/*! 
+/*!
 Enable single file (with multiple segments) - may be overriden by the current profile
 *	\param dasher the DASH segmenter object
 *	\param enable enable or disable
@@ -706,11 +766,10 @@
 Sets segment and fragment durations.
 *	\param dasher the DASH segmenter object
 *	\param default_segment_duration the duration of a dash segment
- *	\param segment_duration_strict indicated is the duration is strict (otherwise we consider the mean duration)
 *	\param default_fragment_duration the duration of a dash fragment - if 0, same as default_segment_duration
 *	\return error code if any
 */
-GF_Err gf_dasher_set_durations(GF_DASHSegmenter *dasher, Double default_segment_duration, Bool segment_duration_strict, Double default_fragment_duration);
+GF_Err gf_dasher_set_durations(GF_DASHSegmenter *dasher, Double default_segment_duration, Double default_fragment_duration);
 
 /*!
 Enables spliting at RAP boundaries
@@ -736,9 +795,10 @@
 *	\param enable_sidx enable or disable
 *	\param subsegs_per_sidx number of subsegments per segment
 *	\param daisy_chain_sidx enable daisy chaining of sidx
+ *	\param use_ssix enables ssix generation, level 1 for I-frames, the rest of the segement not mapped
 *	\return error code if any
 */
-GF_Err gf_dasher_enable_sidx(GF_DASHSegmenter *dasher, Bool enable_sidx, u32 subsegs_per_sidx, Bool daisy_chain_sidx);
+GF_Err gf_dasher_enable_sidx(GF_DASHSegmenter *dasher, Bool enable_sidx, u32 subsegs_per_sidx, Bool daisy_chain_sidx, Bool use_ssix);
 
 /*!
 Sets mode for the dash segmenter.
@@ -784,19 +844,36 @@
 */
 GF_Err gf_dasher_set_initial_isobmf(GF_DASHSegmenter *dasher, u32 initial_moof_sn, u64 initial_tfdt);
 
+
+
+typedef enum
+{
+	//! PSSH box in moov only
+	GF_DASH_PSSH_MOOV = 0,
+	//! PSSH box in moof only
+	GF_DASH_PSSH_MOOF,
+	//! PSSH box in moov and MPD
+	GF_DASH_PSSH_MOOV_MPD,
+	//! PSSH box in moof and MPD
+	GF_DASH_PSSH_MOOF_MPD,
+	//! PSSH box in MPD only
+	GF_DASH_PSSH_MPD
+} GF_DASHPSSHMode;
+
 /*!
 Configure how default values for ISOBMFF are stored
 *	\param dasher the DASH segmenter object
 *	\param no_fragments_defaults if set, fragments default values are repeated in each traf and not set in trex. Default value is GF_FALSE
- *	\param pssh_moof if set, PSSH is stored in each moof, and not set in init segment. Default value is GF_FALSE
+ *	\param pssh_mode sets the storage mode of PSSH in moov/moof/mpd. 
 *	\param samplegroups_in_traf if set, all sample group definitions are stored in each traf and not set in init segment. Default value is GF_FALSE
 *	\param single_traf_per_moof if set, each moof will contain a single traf, even if source media is multiplexed. Default value is GF_FALSE
+ * \param tfdt_per_traf if set, each traf will contain a tfdt. Only applicable when single_traf_per_moof is GF_TRUE. Default value is GF_FALSE
 *	\return error code if any
 */
-GF_Err gf_dasher_configure_isobmf_default(GF_DASHSegmenter *dasher, Bool no_fragments_defaults, Bool pssh_moof, Bool samplegroups_in_traf, Bool single_traf_per_moof);
+GF_Err gf_dasher_configure_isobmf_default(GF_DASHSegmenter *dasher, Bool no_fragments_defaults, GF_DASHPSSHMode pssh_mode, Bool samplegroups_in_traf, Bool single_traf_per_moof, Bool tfdt_per_traf);
 
 /*!
- Enables insertion of UTC reference in the begining of segments
+ Enables insertion of UTC reference in the beginning of segments
 *	\param dasher the DASH segmenter object
 *	\param insert_utc if set, UTC will be inserted. Default value is disabled.
 *	\return error code if any
@@ -828,6 +905,63 @@
 */
 GF_Err gf_dasher_set_profile_extension(GF_DASHSegmenter *dasher, const char *dash_profile_extension);
 
+/*! Sets Dasher debug mode
+ *	\param dasher the DASH segmenter object
+ *	\param forceTestMode If true, disable generation date print in mpd
+ *	\return error code if any
+*/
+GF_Err gf_dasher_set_test_mode(GF_DASHSegmenter *dasher, Bool forceTestMode);
+
+/*!
+ Enable/Disable cached inputs .
+ *	\param dasher the DASH segmenter object
+ *	\param no_cache if true, input file will be reopen each time the dasher process function is called .
+ *	\return error code if any
+*/
+GF_Err gf_dasher_enable_cached_inputs(GF_DASHSegmenter *dasher, Bool no_cache);
+
+/*!
+ Enable/Disable loop inputs .
+ *	\param dasher the DASH segmenter object
+ *	\param do_loop if true, input files will be looped at the end of the file in a live simulation. Otherwise a new period will be created.
+ *	\return error code if any
+*/
+GF_Err gf_dasher_enable_loop_inputs(GF_DASHSegmenter *dasher, Bool do_loop);
+
+/*!
+ Enable/Disable split on bound mode.
+ *	\param dasher the DASH segmenter object
+ *	\param split_on_bound if true, video streams are segmented with the same method as audio streams
+ *	\return error code if any
+*/
+GF_Err gf_dasher_set_split_on_bound(GF_DASHSegmenter *dasher, Bool split_on_bound);
+
+/*!
+ Enable/Disable split on closest mode.
+ *	\param dasher the DASH segmenter object
+ *	\param split_on_bound if true, video streams are segmented as close to the segment boundary as possible
+ *	\return error code if any
+*/
+GF_Err gf_dasher_set_split_on_closest(GF_DASHSegmenter *dasher, Bool split_on_closest);
+
+/*!
+ Sets cue file for the session.
+ *	\param dasher the DASH segmenter object
+ *	\param cues_file name of the cue file. This is an XML document with root <DASHCues>, one or multiple <Stream> with attribute ID (trackID)
+ and timescale (trackTimescale), and a set of <cues> per Stream with attributes sampleNumber, dts or cts.
+ *	\param strict_cues if true will fail if one cue doesn't match a timestamp in the stream or if the split sample is not RAP
+ *	\return error code if any
+*/
+GF_Err gf_dasher_set_cues(GF_DASHSegmenter *dasher, const char *cues_file, Bool strict_cues);
+
+/*!
+ Sets ISOBMFF options.
+ *	\param dasher the DASH segmenter object
+ *	\param mvex_after_traks if true the mvex box will be after the trak boxes
+ *	\return error code if any
+ */
+GF_Err gf_dasher_set_isobmff_options(GF_DASHSegmenter *dasher, Bool mvex_after_traks);
+
 /*!
 Adds a media input to the DASHer
 *	\param dasher the DASH segmenter object
@@ -844,7 +978,7 @@
 */
 GF_Err gf_dasher_process(GF_DASHSegmenter *dasher, Double sub_duration);
 
-/*! 
+/*!
 Returns time to wait until end of currently generated segments
 *	\param dasher the DASH segmenter object
 * \param ms_ins_session if set, retrives the number of ms since the start of the dash session
@@ -853,7 +987,7 @@
 u32 gf_dasher_next_update_time(GF_DASHSegmenter *dasher, u64 *ms_ins_session);
 
 
-/*! 
+/*!
 Sets dasher start date, rather than use current time. Used for debugging purposes, such as simulating long lasting sessions.
 *	\param dasher the DASH segmenter object
 * \param dash_utc_start_date start date as UTC timstamp. If 0, current time is used
@@ -866,9 +1000,10 @@
 \param file the target file to be fragmented
 \param output_file name of the output file
 \param max_duration_sec max fragment duration in seconds
+ \param use_mfra insert track fragment movie fragments
 \return error if any
 */
-GF_Err gf_media_fragment_file(GF_ISOFile *file, const char *output_file, Double max_duration_sec);
+GF_Err gf_media_fragment_file(GF_ISOFile *file, const char *output_file, Double max_duration_sec, Bool use_mfra);
 #endif
 
 /*! @} */
@@ -1023,14 +1158,14 @@
 */
 void gf_hinter_track_del(GF_RTPHinter *tkHinter);
 
-/*! 
+/*!
 hints all samples in the media track
 \param tkHinter track hinter object
 \return error if any
 */
 GF_Err gf_hinter_track_process(GF_RTPHinter *tkHinter);
 
-/*! 
+/*!
 Gets media bandwidth in kbps
 \param tkHinter track hinter object
 \return media bandwidth in kbps
@@ -1044,7 +1179,7 @@
 */
 u32 gf_hinter_track_get_flags(GF_RTPHinter *tkHinter);
 
-/*! 
+/*!
 Gets rtp payload name
 \param tkHinter track hinter object
 \param payloadName static buffer for retrieval, minimum 30 bytes
@@ -1116,7 +1251,7 @@
 */
 GF_SAFMuxer *gf_saf_mux_new();
 
-/*! 
+/*!
 	SAF Multiplexer destructor
 \param mux the SAF multiplexer object
 */
@@ -1138,7 +1273,7 @@
 */
 GF_Err gf_saf_mux_stream_add(GF_SAFMuxer *mux, u32 stream_id, u32 ts_res, u32 buffersize_db, u8 stream_type, u8 object_type, char *mime_type, char *dsi, u32 dsi_len, char *remote_url);
 
-/*! 
+/*!
 Removes a stream from the SAF multiplex
 \param mux the SAF multiplexer object
 \param stream_id ID of the SAF stream to remove
@@ -1146,7 +1281,7 @@
 */
 GF_Err gf_saf_mux_stream_rem(GF_SAFMuxer *mux, u32 stream_id);
 
-/*! 
+/*!
 adds an AU to the given Warning, AU data will be freed by the multiplexer. AUs are NOT re-sorted by CTS, in order to enable audio interleaving.
 \param mux the SAF multiplexer object
 \param stream_id ID of the SAF stream to remove

gpac-0.7.1.tar.gz/include/gpac/mediaobject.h -> gpac-0.8.0.tar.gz/include/gpac/mediaobject.h Changed

@@ -148,6 +148,8 @@
 /*resyncs clock - only audio objects are allowed to use this*/
 void gf_mo_adjust_clock(GF_MediaObject *mo, s32 ms_drift);
 
+Bool gf_mo_is_started(GF_MediaObject *mo);
+
 u32 gf_mo_get_last_frame_time(GF_MediaObject *mo);
 
 Bool gf_mo_get_visual_info(GF_MediaObject *mo, u32 *width, u32 *height, u32 *stride, u32 *pixel_ar, u32 *pixelFormat, Bool *is_flipped);
@@ -156,7 +158,7 @@
 
 void gf_mo_get_nb_layers(GF_MediaObject *mo, int * nb_layers);
 
-Bool gf_mo_get_audio_info(GF_MediaObject *mo, u32 *sample_rate, u32 *bits_per_sample, u32 *num_channels, u32 *channel_config);
+Bool gf_mo_get_audio_info(GF_MediaObject *mo, u32 *sample_rate, u32 *bits_per_sample, u32 *num_channels, u32 *channel_config, Bool *forced_layout);
 
 Fixed gf_mo_get_current_speed(GF_MediaObject *mo);
 
@@ -179,6 +181,8 @@
 	GF_MO_IS_INIT = (1<<1),
 	/*used by animation stream to remove TEXT from display upon delete and URL change*/
 	GF_MO_DISPLAY_REMOVE = (1<<2),
+	/*used when resyncing a stream (droping late frames)*/
+	GF_MO_IN_RESYNC = (1<<3),
 };
 
 u32 gf_mo_get_flags(GF_MediaObject *mo);
@@ -208,6 +212,7 @@
 	u32 scene_width;
 	u32 scene_height;
 
+	Bool has_full_coverage;
 	Bool is_tiled_srd;
 } GF_MediaObjectVRInfo;

gpac-0.7.1.tar.gz/include/gpac/modules/codec.h -> gpac-0.8.0.tar.gz/include/gpac/modules/codec.h Changed

gpac-0.7.1.tar.gz/include/gpac/modules/service.h -> gpac-0.8.0.tar.gz/include/gpac/modules/service.h Changed

gpac-0.7.1.tar.gz/include/gpac/mpeg4_odf.h -> gpac-0.8.0.tar.gz/include/gpac/mpeg4_odf.h Changed

@@ -34,11 +34,11 @@
 *	\file <gpac/mpeg4_odf.h>
 *	\brief MPEG-4 Object Descriptor Framework.
 */
-	
+
 /*! \defgroup mpeg4sys_grp MPEG-4 Systems
 *	\brief MPEG-4 Systems.
 */
-	
+
 /*!
 *	\addtogroup odf_grp MPEG-4 OD
 *	\ingroup mpeg4sys_grp
@@ -183,6 +183,8 @@
 	GF_List *extensionDescriptors;
 	/*MPEG-2 (or other service mux formats) service ID*/
 	u16 ServiceID;
+	/*for ATSC, instructs client to keep OD alive even though URL string is set*/
+	u16 RedirectOnly;
 	/*pointer to the service interface (GF_InputService) of the service having declared the object
 	only used for DASH*/
 	void *service_ifce;
@@ -345,7 +347,7 @@
 	u8 tag;	\
 	u8 version;	\
 	u32 dataID;	\
- 
+
 /*! IPMPX base object used for type casting in many function*/
 typedef struct
 {
@@ -935,6 +937,8 @@
 	u8 chroma_bit_depth;
 	/*may be NULL*/
 	GF_List *sequenceParameterSetExtensions;
+
+	Bool write_annex_b;
 } GF_AVCConfig;
 
 
@@ -978,13 +982,64 @@
 	GF_List *param_array;
 	//used in LHVC config
 	Bool complete_representation;
-	
+
 	//following are internal to libgpac and NEVER serialized
-	
+
 	//set by libisomedia at import/export/parsing time to differentiate between lhcC and hvcC time
 	Bool is_lhvc;
+
+	Bool write_annex_b;
+
 } GF_HEVCConfig;
 
+/*! used for storing AV1 OBUs*/
+typedef struct
+{
+	u64 obu_length;
+	int obu_type; /*ObuType*/
+	u8 *obu;
+} GF_AV1_OBUArrayEntry;
+
+/*! AV1 config record - not a real MPEG-4 descriptor*/
+typedef struct
+{
+	Bool marker;
+	u8 version; /*7 bits*/
+	u8 seq_profile; /*3 bits*/
+	u8 seq_level_idx_0; /*5 bits*/
+	Bool seq_tier_0;
+	Bool high_bitdepth;
+	Bool twelve_bit;
+	Bool monochrome;
+	Bool chroma_subsampling_x;
+	Bool chroma_subsampling_y;
+	u8 chroma_sample_position; /*2 bits*/
+
+	Bool initial_presentation_delay_present;
+	u8 initial_presentation_delay_minus_one; /*4 bits*/
+	GF_List *obu_array; /*GF_AV1_OBUArrayEntry*/
+} GF_AV1Config;
+
+
+/*! VP8-9 config vpcC */
+typedef struct
+{
+	u8	profile;
+	u8	level;
+
+	u8 bit_depth; /*4 bits*/
+	u8 chroma_subsampling; /*3 bits*/
+	Bool video_fullRange_flag;
+
+	u8 colour_primaries;
+	u8 transfer_characteristics;
+	u8 matrix_coefficients;
+
+	/* MUST be 0 for VP8 and VP9 */
+	u16 codec_initdata_size;
+	u8* codec_initdata;
+} GF_VPConfig;
+
 /*! Media Segment Descriptor used for Media Control Extensions*/
 typedef struct
 {
@@ -1105,7 +1160,7 @@
 \param codec OD codec to destroy
 */
 void gf_odf_codec_del(GF_ODCodec *codec);
-/*! add a command to the codec command list. 
+/*! add a command to the codec command list.
 \param codec target codec
 \param command command to add
 \return error if any
@@ -1231,7 +1286,7 @@
 \return the decoded AVC config
 */
 GF_AVCConfig *gf_odf_avc_cfg_read(char *dsi, u32 dsi_size);
-/*! writes GF_AVCConfig as MPEG-4 DSI
+/*! writes GF_AVCConfig
 \param cfg the AVC config to encode
 \param outData encoded dsi buffer - it is the caller responsability to free this
 \param outSize encoded dsi buffer size
@@ -1239,19 +1294,30 @@
 */
 GF_Err gf_odf_avc_cfg_write(GF_AVCConfig *cfg, char **outData, u32 *outSize);
 
+/*! writes GF_AVCConfig to bitstream
+ \param cfg the AVC config to encode
+ \param bs bitstream in WRITE mode
+ \return error if any
+ */
+GF_EXPORT
+GF_Err gf_odf_avc_cfg_write_bs(GF_AVCConfig *cfg, GF_BitStream *bs);
+
 
 /*! HEVC config constructor
 \return the created HEVC config*/
 GF_HEVCConfig *gf_odf_hevc_cfg_new();
+
 /*! HEVC config destructor
 \param cfg the HEVC config to destroy*/
 void gf_odf_hevc_cfg_del(GF_HEVCConfig *cfg);
+
 /*! writes GF_HEVCConfig as MPEG-4 DSI in a bitstream object
 \param cfg the HEVC config to encode
 \param bs output bitstream object in which the config is written
 \return error if any
 */
 GF_Err gf_odf_hevc_cfg_write_bs(GF_HEVCConfig *cfg, GF_BitStream *bs);
+
 /*! 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
@@ -1259,12 +1325,14 @@
 \return error if any
 */
 GF_Err gf_odf_hevc_cfg_write(GF_HEVCConfig *cfg, char **outData, u32 *outSize);
+
 /*! gets GF_HEVCConfig from bitstream MPEG-4 DSI
 \param bs bitstream containing the encoded HEVC decoder specific info
 \param is_lhvc if GF_TRUE, indicates if the dsi is LHVC
 \return the decoded HEVC config
 */
 GF_HEVCConfig *gf_odf_hevc_cfg_read_bs(GF_BitStream *bs, Bool is_lhvc);
+
 /*! gets GF_HEVCConfig from MPEG-4 DSI
 \param dsi encoded HEVC decoder specific info
 \param dsi_size encoded HEVC decoder specific info size
@@ -1273,6 +1341,39 @@
 */
 GF_HEVCConfig *gf_odf_hevc_cfg_read(char *dsi, u32 dsi_size, Bool is_lhvc);
 
+
+/*! AV1 config constructor
+\return the created AV1 config*/
+GF_AV1Config *gf_odf_av1_cfg_new();
+
+/*! AV1 config destructor
+\param cfg the AV1 config to destroy*/
+void gf_odf_av1_cfg_del(GF_AV1Config *cfg);
+
+/*! writes GF_AV1Config as MPEG-4 DSI
+\param cfg the AV1 config to encode
+\param outData encoded dsi buffer - it is the caller responsability to free this
+\param outSize encoded dsi buffer size
+\return error if any
+*/
+GF_Err gf_odf_av1_cfg_write(GF_AV1Config *cfg, char **outData, u32 *outSize);
+
+/*! gets GF_AV1Config from bitstream MPEG-4 DSI
+\param bs bitstream containing the encoded AV1 decoder specific info
+\return the decoded HEVC config
+*/
+GF_Err gf_odf_av1_cfg_write_bs(GF_AV1Config *cfg, GF_BitStream *bs);
+
+
+/* VP8-9 descriptors functions */
+GF_VPConfig *gf_odf_vp_cfg_new();
+void gf_odf_vp_cfg_del(GF_VPConfig *cfg);
+GF_Err gf_odf_vp_cfg_write_bs(GF_VPConfig *cfg, GF_BitStream *bs, Bool is_v0);
+GF_Err gf_odf_vp_cfg_write(GF_VPConfig *cfg, char **outData, u32 *outSize, Bool is_v0);
+GF_VPConfig *gf_odf_vp_cfg_read_bs(GF_BitStream *bs, Bool is_v0);
+GF_VPConfig *gf_odf_vp_cfg_read(char *dsi, u32 dsi_size);
+
+
 /*! destroy the descriptors in a list but not the list
 \param descList descriptor list to destroy
 \return error if any
@@ -1346,7 +1447,7 @@
 \return NULL if unknown, otherwise value
 */
 const char *gf_odf_stream_type_name(u32 streamType);
-	
+
 /*! Gets the stream type based on stream type name
 \param streamType name of the stream type
 \return stream type GF_STREAM_XXX as defined in constants.h, 0 if unknown
@@ -1579,7 +1680,7 @@
 
 #define GF_IPMPX_AUTH_DESC	\
 	u8 tag;	\
- 
+
 /*! IPMPX authentication descriptor*/
 typedef struct
 {
@@ -1751,6 +1852,7 @@
 */
 typedef struct
 {
+	GF_IPMPX_DATA_BASE
 	GF_List *ipmp_tools;
 } GF_IPMPX_GetToolsResponse;

gpac-0.7.1.tar.gz/include/gpac/mpegts.h -> gpac-0.8.0.tar.gz/include/gpac/mpegts.h Changed

@@ -47,6 +47,10 @@
 #include <gpac/internal/odf_dev.h>
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 
 /*MPEG-2 Descriptor tags*/
 enum
@@ -230,11 +234,23 @@
 	GF_M2TS_VIDEO_H264				= 0x1B,
 	GF_M2TS_VIDEO_SVC				= 0x1F,
 	GF_M2TS_VIDEO_HEVC				= 0x24,
+	GF_M2TS_VIDEO_HEVC_TEMPORAL		= 0x25,
+	GF_M2TS_VIDEO_MVCD				= 0x26,
+	GF_M2TS_TEMI					= 0x27,
 	GF_M2TS_VIDEO_SHVC				= 0x28,
 	GF_M2TS_VIDEO_SHVC_TEMPORAL		= 0x29,
 	GF_M2TS_VIDEO_MHVC				= 0x2A,
 	GF_M2TS_VIDEO_MHVC_TEMPORAL		= 0x2B,
 
+	GF_M2TS_GREEN					= 0x2C,
+	GF_M2TS_MHAS_MAIN				= 0x2D,
+	GF_M2TS_MHAS_AUX				= 0x2E,
+
+	GF_M2TS_QUALITY_SEC				= 0x2F,
+	GF_M2TS_MORE_SEC				= 0x30,
+
+	GF_M2TS_VIDEO_HEVC_MCTS			= 0x31,
+
 	GF_M2TS_VIDEO_DCII				= 0x80,
 	GF_M2TS_AUDIO_AC3				= 0x81,
 	GF_M2TS_AUDIO_DTS				= 0x8A,
@@ -921,6 +937,7 @@
 	const char *network_type;
 	//for sockets, we need to reopen them after resume/restart....
 	char *socket_url;
+	u32 udp_buffer_size;
 	/* Set it to 1 if the TS is meant to be played during the demux */
 	Bool demux_and_play;
 	/* End of M2TSIn */
@@ -1138,6 +1155,7 @@
 
 	/*table tools*/
 	GF_M2TS_Mux_Table *tables;
+	u8 initial_version_number;
 	/*total table sizes for bitrate estimation (PMT/PAT/...)*/
 	u32 total_table_size;
 	/* used for on-the-fly packetization of sections */
@@ -1148,6 +1166,7 @@
 	Bool table_needs_update;
 	Bool table_needs_send;
 	Bool force_single_au;
+	Bool set_initial_disc;
 
 	/*minimal amount of bytes we are allowed to copy frome next AU in the current PES. If no more than this
 	is available in PES, don't copy from next*/
@@ -1235,6 +1254,7 @@
 	Bool initial_ts_set;
 	Bool pcr_init_time_set;
 	u32 pcr_offset;
+	Bool initial_disc_set;
 
 	GF_Descriptor *iod;
 	/*list of GF_M2TSDescriptor to add to the program descriptor loop. By default set to NULL, if non null will be reset and destroyed upon cleanup*/
@@ -1340,7 +1360,7 @@
 void gf_m2ts_mux_del(GF_M2TS_Mux *mux);
 //sets max interval between two PCR. Default/max interval is 100 ms
 void gf_m2ts_mux_set_pcr_max_interval(GF_M2TS_Mux *muxer, u32 pcr_update_ms);
-GF_M2TS_Mux_Program *gf_m2ts_mux_program_add(GF_M2TS_Mux *muxer, u32 program_number, u32 pmt_pid, u32 pmt_refresh_rate, u32 pcr_offset, Bool mpeg4_signaling);
+GF_M2TS_Mux_Program *gf_m2ts_mux_program_add(GF_M2TS_Mux *muxer, u32 program_number, u32 pmt_pid, u32 pmt_refresh_rate, u32 pcr_offset, Bool mpeg4_signaling, u32 pmt_version, Bool initial_disc);
 GF_M2TS_Mux_Stream *gf_m2ts_program_stream_add(GF_M2TS_Mux_Program *program, GF_ESInterface *ifce, u32 pid, Bool is_pcr, Bool force_pes_mode);
 void gf_m2ts_mux_update_config(GF_M2TS_Mux *mux, Bool reset_time);
 
@@ -1354,7 +1374,7 @@
 GF_Err gf_m2ts_mux_set_initial_pcr(GF_M2TS_Mux *muxer, u64 init_pcr_value);
 GF_Err gf_m2ts_mux_enable_pcr_only_packets(GF_M2TS_Mux *muxer, Bool enable_forced_pcr);
 
-/*user inteface functions*/
+/*user interface functions*/
 GF_Err gf_m2ts_program_stream_update_ts_scale(GF_ESInterface *_self, u32 time_scale);
 
 void gf_m2ts_mux_program_set_name(GF_M2TS_Mux_Program *program, const char *program_name, const char *mux_provider_name);
@@ -1407,4 +1427,10 @@
 
 /*! @} */
 
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif	//_GF_MPEG_TS_H_

gpac-0.7.1.tar.gz/include/gpac/network.h -> gpac-0.8.0.tar.gz/include/gpac/network.h Changed

@@ -209,10 +209,17 @@
  *\brief abstracted socket object
  *
  *The abstracted socket object allows you to build client and server applications very simply
- *with support for unicast and multicast (no IPv6 yet)
+ *with support for unicast and multicast
 */
 typedef struct __tag_socket GF_Socket;
 
+/*!
+ *\brief abstracted socket group object
+ *
+ *The abstracted socket group object allows querying multiple sockets in a group
+*/
+typedef struct __tag_sock_group GF_SockGroup;
+
 /*!Buffer size to pass for IP address retrieval*/
 #define GF_MAX_IP_NAME_LEN	516
 
@@ -304,8 +311,10 @@
  *\param length the allocated size of the reception buffer
  *\param start_from the offset in the reception buffer where to start writing
  *\param read the actual number of bytes received
+ *\return error if any, GF_IP_NETWORK_EMPTY if nothing to read
  */
 GF_Err gf_sk_receive(GF_Socket *sock, char *buffer, u32 length, u32 start_from, u32 *read);
+
 /*!
  *\brief socket listening
  *
@@ -434,6 +443,62 @@
  */
 s32 gf_sk_get_handle(GF_Socket *sock);
 
+/*!
+ *Sets the socket wait time in microseconds. Default wait time is 500 microseconds. Any value >= 1000000 will reset to default.
+ *\param sock the socket object
+ *\param usec_wait wait time in microseconds
+ */
+void gf_sk_set_usec_wait(GF_Socket *sock, u32 usec_wait);
+
+/*!
+ *Creates a new socket group
+ *\return socket group object
+ */
+GF_SockGroup *gf_sk_group_new();
+/*!
+ *Deletes a socket group
+ *\param sg socket group object
+ */
+void gf_sk_group_del(GF_SockGroup *sg);
+/*!
+ *Registers a socket to a socket group
+ *\param sg socket group object
+ *\param sk socket object to register
+ */
+void gf_sk_group_register(GF_SockGroup *sg, GF_Socket *sk);
+/*!
+ *Unregisters a socket from a socket group
+ *\param sg socket group object
+ *\param sk socket object to unregister
+ */
+void gf_sk_group_unregister(GF_SockGroup *sg, GF_Socket *sk);
+
+/*!
+ *Performs a select (wait) on the socket group
+ *\param sg socket group object
+ *\param wait_usec microseconds to wait (can be larger than one second)
+ *\return error if any
+ */
+GF_Err gf_sk_group_select(GF_SockGroup *sg, u32 wait_usec);
+/*!
+ *Checks if given socket is selected and can be read. This shall be called after gf_sk_group_select
+ *\param sg socket group object
+ *\param sk socket object to check
+ *\return GF_TRUE if socket is ready to read, 0 otherwise
+ */
+Bool gf_sk_group_sock_is_set(GF_SockGroup *sg, GF_Socket *sk);
+
+/*!
+ *Fetches data on a socket without performing any select (wait), to be used with socket group on sockets that are set in the selected socket group
+ *\param sock the socket object
+ *\param buffer the reception buffer where data is written
+ *\param length the allocated size of the reception buffer
+ *\param start_from the offset in the reception buffer where to start writing
+ *\param read the actual number of bytes received
+ *\return error if any, GF_IP_NETWORK_EMPTY if nothing to read
+ */
+GF_Err gf_sk_receive_no_select(GF_Socket *sock, char *buffer, u32 length, u32 start_from, u32 *read);
+
 
 /*!
  *\brief gets ipv6 support

gpac-0.7.1.tar.gz/include/gpac/scenegraph.h -> gpac-0.8.0.tar.gz/include/gpac/scenegraph.h Changed

@@ -203,7 +203,7 @@
 
 /*set 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
-VRML/MPEG4:  Instanciated Protos are handled internally as well as interpolators, valuators and scripts
+VRML/MPEG4:  Instantiated Protos are handled internally as well as interpolators, valuators and scripts
 @is_destroy: set when the node is about to be destroyed
 */
 GF_Err gf_node_set_callback_function(GF_Node *, void (*NodeFunction)(GF_Node *node, void *traverse_state, Bool is_destroy) );
@@ -396,6 +396,8 @@
 /*set the scene timer (fct returns time in sec)*/
 void gf_sg_set_scene_time_callback(GF_SceneGraph *scene, Double (*GetSceneTime)(void *user_priv) );
 
+GF_SceneGraph *gf_sg_get_parent(GF_SceneGraph *scene);
+
 enum
 {
 	/*function called upon node creation.
@@ -412,7 +414,7 @@
 };
 
 /*set node callback: function called upon node creation.
-Application should instanciate the node rendering stack and any desired callback*/
+Application should instantiate the node rendering stack and any desired callback*/
 void gf_sg_set_node_callback(GF_SceneGraph *sg, void (*NodeCallback)(void *user_priv, u32 type, GF_Node *node, void *ctxdata) );
 
 /*get/set the root node of the graph*/

gpac-0.7.1.tar.gz/include/gpac/scenegraph_vrml.h -> gpac-0.8.0.tar.gz/include/gpac/scenegraph_vrml.h Changed

@@ -515,7 +515,7 @@
 				proto handling
 
 	The lib allows you to construct prototype nodes as defined in VRML/MPEG4 by constructing
-	proto interfaces and instanciating them. An instanciated proto is handled as a single node for
+	proto interfaces and instantiating them. An instantiated proto is handled as a single node for
 	rendering, thus an application will never handle proto instances for rendering
 */
 
@@ -589,7 +589,7 @@
 /*creates the proto interface without the proto code.*/
 GF_Node *gf_sg_proto_create_instance(GF_SceneGraph *sg, GF_Proto *proto);
 
-/*lodes code in this instance - all subprotos are automatically created, thus you must only instanciate
+/*lodes code in this instance - all subprotos are automatically created, thus you must only instantiate
 top-level protos. VRML/BIFS doesn't allow for non top-level proto instanciation in the main graph
 All nodes created in this proto will be forwarded to the app for initialization*/
 GF_Err gf_sg_proto_load_code(GF_Node *proto_inst);

gpac-0.7.1.tar.gz/include/gpac/setup.h -> gpac-0.8.0.tar.gz/include/gpac/setup.h Changed

gpac-0.7.1.tar.gz/include/gpac/sync_layer.h -> gpac-0.8.0.tar.gz/include/gpac/sync_layer.h Changed

gpac-0.7.1.tar.gz/include/gpac/term_info.h -> gpac-0.8.0.tar.gz/include/gpac/term_info.h Changed

gpac-0.7.1.tar.gz/include/gpac/tools.h -> gpac-0.8.0.tar.gz/include/gpac/tools.h Changed

@@ -938,7 +938,7 @@
  * \param value the value parsed
  * \return error code if any
  */
-GF_Err gf_bin128_parse(char *string, bin128 value);
+GF_Err gf_bin128_parse(const char *string, bin128 value);
 
 /*!
  *	\brief Delete Directory
@@ -946,7 +946,7 @@
  *	Delete a  dir within the full path.
  *	\param DirPathName the file path name.
  */
-GF_Err gf_rmdir(char *DirPathName);
+GF_Err gf_rmdir(const char *DirPathName);
 
 /*!
  *	\brief Create Directory
@@ -954,7 +954,7 @@
  *	Create a directory within the full path.
  *	\param DirPathName the dir path name.
  */
-GF_Err gf_mkdir(char* DirPathName);
+GF_Err gf_mkdir(const char* DirPathName);
 
 /*!
  *	\brief Check Directory Exists
@@ -962,7 +962,7 @@
  *	Create a directory within the full path.
  *	\param DirPathName the dir path name.
  */
-Bool gf_dir_exists(char *DirPathName);
+Bool gf_dir_exists(const char *DirPathName);
 
 /*!
  *	\brief Create Directory
@@ -970,7 +970,7 @@
  *	Cleanup a directory within the full path, removing all the files and the directories.
  *	\param DirPathName the dir path name.
  */
-GF_Err gf_cleanup_dir(char* DirPathName);
+GF_Err gf_cleanup_dir(const char* DirPathName);
 
 
 /**
@@ -1010,7 +1010,7 @@
 
 
 /**
- * Compresses a data buffer in place using zlib. Buffer may be reallocated in the process.
+ * Compresses a data buffer in place using zlib/deflate. 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
  * \param out_size pointer for output buffer size
@@ -1019,7 +1019,7 @@
 GF_Err gf_gz_compress_payload(char **data, u32 data_len, u32 *out_size);
 
 /**
- * Decompresses a data buffer using zlib.
+ * Decompresses a data buffer using zlib/deflate.
  * \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.
@@ -1028,6 +1028,25 @@
  */
 GF_Err gf_gz_decompress_payload(char *data, u32 data_len, char **uncompressed_data, u32 *out_size);
 
+/**
+ * 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
+ * \param out_size pointer for output buffer size
+ * \return GF_OK if evertything went fine
+ */
+GF_Err gf_lz_compress_payload(char **data, u32 data_len, u32 *max_size);
+
+/**
+ * Decompresses a data buffer using LZMA.
+ * \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 out_size size of the uncompressed buffer
+ * \return GF_OK if evertything went fine
+ */
+GF_Err gf_lz_decompress_payload(char *data, u32 data_len, char **uncompressed_data, u32 *out_size);
+
 
 /*SHA1*/
 typedef struct __sha1_context GF_SHA1Context;
@@ -1067,6 +1086,7 @@
 
 /* \endcond */
 
+#define ARRAY_LENGTH(a) (sizeof(a) / sizeof((a)[0]))
 
 #ifdef __cplusplus
 }

gpac-0.7.1.tar.gz/include/gpac/version.h -> gpac-0.8.0.tar.gz/include/gpac/version.h Changed

gpac-0.7.1.tar.gz/mkdmg.sh -> gpac-0.8.0.tar.gz/mkdmg.sh Changed

@@ -31,26 +31,26 @@
 then
 rm -fr tmpdmg
 fi
-mkdir -p tmpdmg/Osmo4.app
-rsync -r --exclude=.git $source_path/build/osxdmg/Osmo4.app/ ./tmpdmg/Osmo4.app/
+mkdir -p tmpdmg/GPAC.app
+rsync -r --exclude=.git $source_path/packagers/osx/GPAC.app/ ./tmpdmg/GPAC.app/
 ln -s /Applications ./tmpdmg/Applications
 cp $source_path/README.md ./tmpdmg
 cp $source_path/COPYING ./tmpdmg
 
-mkdir -p tmpdmg/Osmo4.app/Contents/MacOS/modules
-mkdir -p tmpdmg/Osmo4.app/Contents/MacOS/lib
+mkdir -p tmpdmg/GPAC.app/Contents/MacOS/modules
+mkdir -p tmpdmg/GPAC.app/Contents/MacOS/lib
 
-cp bin/gcc/gm* tmpdmg/Osmo4.app/Contents/MacOS/modules
-cp bin/gcc/libgpac.dylib tmpdmg/Osmo4.app/Contents/MacOS/lib
-cp bin/gcc/MP4Client tmpdmg/Osmo4.app/Contents/MacOS/Osmo4
-cp bin/gcc/MP4Box tmpdmg/Osmo4.app/Contents/MacOS/MP4Box
-cp bin/gcc/MP42TS tmpdmg/Osmo4.app/Contents/MacOS/MP42TS
+cp bin/gcc/gm* tmpdmg/GPAC.app/Contents/MacOS/modules
+cp bin/gcc/libgpac.dylib tmpdmg/GPAC.app/Contents/MacOS/lib
+cp bin/gcc/MP4Client tmpdmg/GPAC.app/Contents/MacOS/Osmo4
+cp bin/gcc/MP4Box tmpdmg/GPAC.app/Contents/MacOS/MP4Box
+cp bin/gcc/MP42TS tmpdmg/GPAC.app/Contents/MacOS/MP42TS
 if [ -f bin/gcc/DashCast ]
 then
-cp bin/gcc/DashCast tmpdmg/Osmo4.app/Contents/MacOS/DashCast
+cp bin/gcc/DashCast tmpdmg/GPAC.app/Contents/MacOS/DashCast
 fi
 
-cd tmpdmg/Osmo4.app/Contents/MacOS/
+cd tmpdmg/GPAC.app/Contents/MacOS/
 
 #check all external deps, and copy them
 echo rewriting DYLIB dependencies
@@ -81,7 +81,8 @@
 cd ../../../..
 
 echo Copying GUI
-rsync -r --exclude=.git $source_path/gui ./tmpdmg/Osmo4.app/Contents/MacOS/
+rsync -r --exclude=.git $source_path/gui ./tmpdmg/GPAC.app/Contents/MacOS/
+rsync -r --exclude=.git $source_path/shaders ./tmpdmg/GPAC.app/Contents/MacOS/
 
 echo Building DMG
 version=`grep '#define GPAC_VERSION ' $source_path/include/gpac/version.h | cut -d '"' -f 2`
@@ -103,28 +104,31 @@
 	$rev = $(date +%Y%m%d)
 fi
 
-sed 's/<string>.*<\/string>/<string>'"$version"'<\/string>/' tmpdmg/Osmo4.app/Contents/Info.plist > tmpdmg/Osmo4.app/Contents/Info.plist.new && sed 's/<string>.*<\/string>/<string>'"$rev"'<\/string>/' tmpdmg/Osmo4.app/Contents/Info.plist.new > tmpdmg/Osmo4.app/Contents/Info.plist && rm tmpdmg/Osmo4.app/Contents/Info.plist.new
+sed 's/<string>.*<\/string>/<string>'"$version"'<\/string>/' tmpdmg/GPAC.app/Contents/Info.plist > tmpdmg/GPAC.app/Contents/Info.plist.new && sed 's/<string>.*<\/string>/<string>'"$rev"'<\/string>/' tmpdmg/GPAC.app/Contents/Info.plist.new > tmpdmg/GPAC.app/Contents/Info.plist && rm tmpdmg/GPAC.app/Contents/Info.plist.new
 
-#create dmg
-hdiutil create ./gpac.dmg -volname "GPAC for OSX" -srcfolder tmpdmg -ov
-rm -rf ./tmpdmg
+#GPAC.app now ready, build pkg
+echo "Building PKG"
+find ./tmpdmg/ -name '*.DS_Store' -type f -delete
+chmod -R 755 ./tmpdmg/
+xattr -rc ./tmpdmg/
 
-#add SLA
-echo "Adding licence"
-hdiutil convert -format UDCO -o gpac_sla.dmg gpac.dmg
-rm gpac.dmg
-hdiutil unflatten gpac_sla.dmg
-Rez /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/*.r $source_path/build/osxdmg/SLA.r -a -o gpac_sla.dmg
-hdiutil flatten gpac_sla.dmg
-hdiutil internet-enable -yes gpac_sla.dmg
+pkgbuild --install-location /Applications --component ./tmpdmg/GPAC.app --scripts ./packagers/osx/scripts --ownership preserve ./tmppkg.pkg
+cat ./packagers/osx/res/preamble.txt > ./packagers/osx/res/full_license.txt
+cat ./COPYING >> ./packagers/osx/res/full_license.txt
 
-pck_name="gpac-$full_version.dmg"
+productbuild --distribution packagers/osx/distribution.xml --resources ./packagers/osx/res --package-path ./tmppkg.pkg gpac.pkg
+
+rm ./packagers/osx/res/full_license.txt
+
+pck_name="gpac-$full_version.pkg"
 if [ "$1" = "snow-leopard" ]; then
-pck_name="gpac-$full_version-$1.dmg"
+pck_name="gpac-$full_version-$1.pkg"
 fi
+mv gpac.pkg $pck_name
+chmod 755 $pck_name
 
 echo "$pck_name ready"
-chmod o+rx gpac_sla.dmg
-chmod g+rx gpac_sla.dmg
-mv gpac_sla.dmg $pck_name
+rm -rf tmpdmg
+rm -rf tmppkg.pkg
+

gpac-0.7.1.tar.gz/modules/Makefile -> gpac-0.8.0.tar.gz/modules/Makefile Changed

gpac-0.7.1.tar.gz/modules/aac_in/faad_dec.c -> gpac-0.8.0.tar.gz/modules/aac_in/faad_dec.c Changed

@@ -37,7 +37,7 @@
 # endif
 #endif
 
-#include <faad.h>
+#include <neaacdec.h>
 
 #include <gpac/modules/codec.h>
 #include <gpac/constants.h>
@@ -46,8 +46,8 @@
 
 typedef struct
 {
-	faacDecHandle codec;
-	faacDecFrameInfo info;
+	NeAACDecHandle codec;
+	NeAACDecFrameInfo info;
 	u32 sample_rate, out_size, num_samples;
 	u8 num_channels;
 	/*no support for scalability in FAAD yet*/
@@ -78,8 +78,8 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] Attaching stream %d\n", esd->ESID));
 	}
 
-	if (ctx->codec) faacDecClose(ctx->codec);
-	ctx->codec = faacDecOpen();
+	if (ctx->codec) NeAACDecClose(ctx->codec);
+	ctx->codec = NeAACDecOpen();
 	if (!ctx->codec) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FAAD] Error initializing decoder\n"));
 		return GF_IO_ERR;
@@ -89,7 +89,7 @@
 	e = gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg);
 	if (e) return e;
 #endif
-	if (faacDecInit2(ctx->codec, (unsigned char *)esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, (unsigned long*)&ctx->sample_rate, (u8*)&ctx->num_channels) < 0)
+	if (NeAACDecInit2(ctx->codec, (unsigned char *)esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, (unsigned long*)&ctx->sample_rate, (u8*)&ctx->num_channels) < 0)
 	{
 #ifndef GPAC_DISABLE_AV_PARSERS
 		s8 res;
@@ -123,7 +123,7 @@
 		a_cfg.nb_chan = a_cfg.nb_chan > 2 ? 1 : a_cfg.nb_chan;
 
 		gf_m4a_write_config(&a_cfg, &dsi, &dsi_len);
-		res = faacDecInit2(ctx->codec, (unsigned char *) dsi, dsi_len, (unsigned long *) &ctx->sample_rate, (u8 *) &ctx->num_channels);
+		res = NeAACDecInit2(ctx->codec, (unsigned char *) dsi, dsi_len, (unsigned long *) &ctx->sample_rate, (u8 *) &ctx->num_channels);
 		gf_free(dsi);
 		if (res < 0)
 #endif
@@ -147,7 +147,7 @@
 {
 	FAADCTX();
 	if (ES_ID != ctx->ES_ID) return GF_BAD_PARAM;
-	if (ctx->codec) faacDecClose(ctx->codec);
+	if (ctx->codec) NeAACDecClose(ctx->codec);
 	ctx->codec = NULL;
 	ctx->ES_ID = 0;
 	ctx->sample_rate = ctx->out_size = ctx->num_samples = 0;
@@ -285,9 +285,6 @@
 	u32 i, j;
 	FAADCTX();
 
-	/*check not using scalabilty*/
-	if (ctx->ES_ID != ES_ID) return GF_BAD_PARAM;
-
 	/*if late or seeking don't decode*/
 	switch (mmlevel) {
 	case GF_CODEC_LEVEL_SEEK:
@@ -304,9 +301,9 @@
 	}
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] Decoding AU\n"));
-	buffer = faacDecDecode(ctx->codec, &ctx->info, (unsigned char *) inBuffer, inBufferLength);
+	buffer = NeAACDecDecode(ctx->codec, &ctx->info, (unsigned char *) inBuffer, inBufferLength);
 	if (ctx->info.error>0) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FAAD] Error decoding AU %s\n", faacDecGetErrorMessage(ctx->info.error) ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FAAD] Error decoding AU %s\n", NeAACDecGetErrorMessage(ctx->info.error) ));
 		*outBufferLength = 0;
 		//reinit if error
 		FAAD_AttachStream((GF_BaseDecoder *)ifcg, ctx->esd);
@@ -490,7 +487,7 @@
 void DeleteFAADDec(GF_BaseDecoder *ifcg)
 {
 	FAADCTX();
-	if (ctx->codec) faacDecClose(ctx->codec);
+	if (ctx->codec) NeAACDecClose(ctx->codec);
 	gf_free(ctx);
 	gf_free(ifcg);
 }

gpac-0.8.0.tar.gz/modules/atsc_in Added

gpac-0.8.0.tar.gz/modules/atsc_in/Makefile Added

gpac-0.8.0.tar.gz/modules/atsc_in/atsc_in.c Added

@@ -0,0 +1,362 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ * This file is part of GPAC / ATSC input module
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/atsc.h>
+
+#include <gpac/thread.h>
+#include <gpac/modules/service.h>
+
+#include <time.h>
+
+#ifndef GPAC_DISABLE_ATSC
+
+typedef struct
+{
+	GF_ClientService *service;
+	GF_InputService *input;
+
+	GF_DownloadManager *dm;
+
+	GF_Thread *th;
+	u32 state;
+	char *clock_init_seg;
+	GF_ATSCDmx *atsc_dmx;
+	u32 tune_service_id;
+
+	u32 sync_tsi, last_toi;
+} ATSCIn;
+
+
+static Bool ATSCIn_CanHandleURL(GF_InputService *plug, const char *url)
+{
+	if (!strnicmp(url, "atsc://", 7)) return GF_TRUE;
+	return GF_FALSE;
+}
+
+
+static void ATSCIn_del(ATSCIn *atscd)
+{
+	if (atscd->th) gf_th_del(atscd->th);
+	if (atscd->clock_init_seg) gf_free(atscd->clock_init_seg);
+	if (atscd->atsc_dmx) gf_atsc3_dmx_del(atscd->atsc_dmx);
+
+	gf_free(atscd);
+}
+
+static ATSCIn * ATSCIn_new()
+{
+	ATSCIn *atscd;
+	GF_SAFEALLOC(atscd, ATSCIn);
+	atscd->th = gf_th_new("ATSCDmx");
+	return atscd;
+}
+
+const DownloadedCacheEntry gf_dm_add_cache_entry(GF_DownloadManager *dm, const char *szURL, char *data, u64 size, u64 start_range, u64 end_range, const char *mime, Bool clone_memory, u32 download_time_ms);
+
+GF_Err gf_dm_force_headers(GF_DownloadManager *dm, const DownloadedCacheEntry entry, const char *headers);
+
+void ATSCIn_on_event(void *udta, GF_ATSCEventType evt, u32 evt_param, GF_ATSCEventFileInfo *finfo)
+{
+	char szPath[GF_MAX_PATH];
+	ATSCIn *atscd = (ATSCIn *)udta;
+	u32 nb_obj;
+	Bool is_init = GF_TRUE;
+	Bool is_loop = GF_FALSE;
+	DownloadedCacheEntry cache_entry;
+
+	switch (evt) {
+	case GF_ATSC_EVT_SERVICE_FOUND:
+		break;
+	case GF_ATSC_EVT_SERVICE_SCAN:
+		if (atscd->tune_service_id && !gf_atsc3_dmx_find_service(atscd->atsc_dmx, atscd->tune_service_id)) {
+
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSCDmx] Asked to tune to service %d but no such service, tuning to first one\n", atscd->tune_service_id));
+
+			atscd->tune_service_id = 0;
+			gf_atsc3_tune_in(atscd->atsc_dmx, (u32) -2, GF_TRUE);
+		}
+		break;
+	case GF_ATSC_EVT_MPD:
+	{
+		sprintf(szPath, "http://gpatsc/service%d/%s", evt_param, finfo->filename);
+
+		if (gf_atsc3_dmx_get_service_udta(atscd->atsc_dmx, evt_param)==NULL) {
+			GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
+			od->ServiceID = evt_param;
+			od->RedirectOnly = 1;
+			od->URLString = gf_strdup(szPath);
+			gf_service_declare_media(atscd->service, (GF_Descriptor *) od, GF_TRUE);
+		}
+		cache_entry = gf_dm_add_cache_entry(atscd->dm, szPath, finfo->data, finfo->size, 0, 0, "application/dash+xml", GF_TRUE, 0);
+
+		sprintf(szPath, "x-dash-atsc: %d\r\n", evt_param);
+		gf_dm_force_headers(atscd->dm, cache_entry, szPath);
+		gf_atsc3_dmx_set_service_udta(atscd->atsc_dmx, evt_param, cache_entry);
+
+		atscd->sync_tsi = 0;
+		atscd->last_toi = 0;
+		if (atscd->clock_init_seg) gf_free(atscd->clock_init_seg);
+		atscd->clock_init_seg = NULL;
+	}
+		break;
+	case GF_ATSC_EVT_SEG:
+		if (finfo->corrupted) return;
+		cache_entry = gf_atsc3_dmx_get_service_udta(atscd->atsc_dmx, evt_param);
+		if (cache_entry) {
+			if (!atscd->clock_init_seg) atscd->clock_init_seg = gf_strdup(finfo->filename);
+			sprintf(szPath, "x-dash-atsc: %d\r\nx-dash-first-seg: %s\r\n", evt_param, atscd->clock_init_seg);
+			gf_dm_force_headers(atscd->dm, cache_entry, szPath);
+		}
+		is_init = GF_FALSE;
+		if (!atscd->sync_tsi) {
+			atscd->sync_tsi = finfo->tsi;
+			atscd->last_toi = finfo->toi;
+		} else if (atscd->sync_tsi == finfo->tsi) {
+			if (atscd->last_toi > finfo->toi) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSCDmx] Loop detected on service %d for TSI %u: prev TOI %u this toi %u\n", atscd->tune_service_id, finfo->tsi, atscd->last_toi, finfo->toi));
+
+				gf_atsc3_dmx_purge_objects(atscd->atsc_dmx, evt_param);
+				is_loop = GF_TRUE;
+				if (cache_entry) {
+					if (atscd->clock_init_seg) gf_free(atscd->clock_init_seg);
+					atscd->clock_init_seg = gf_strdup(finfo->filename);
+					sprintf(szPath, "x-dash-atsc: %d\r\nx-dash-first-seg: %s\r\nx-atsc-loop: yes\r\n", evt_param, atscd->clock_init_seg);
+					gf_dm_force_headers(atscd->dm, cache_entry, szPath);
+				}
+			}
+			atscd->last_toi = finfo->toi;
+		}
+		//fallthrough
+
+	case GF_ATSC_EVT_INIT_SEG:
+		if (finfo->corrupted) return;
+
+		sprintf(szPath, "http://gpatsc/service%d/%s", evt_param, finfo->filename);
+		//we copy over the init segment, but only share the data pointer for segments
+
+		cache_entry = gf_dm_add_cache_entry(atscd->dm, szPath, finfo->data, finfo->size, 0, 0, "video/mp4", is_init ? GF_TRUE : GF_FALSE, finfo->download_ms);
+
+		if (cache_entry) gf_dm_force_headers(atscd->dm, cache_entry, "x-atsc: yes\r\n");
+
+		if (is_loop) break;
+
+		nb_obj = gf_atsc3_dmx_get_object_count(atscd->atsc_dmx, evt_param);
+		if (nb_obj>10) {
+			while (nb_obj>10) {
+				gf_atsc3_dmx_remove_first_object(atscd->atsc_dmx, evt_param);
+				nb_obj = gf_atsc3_dmx_get_object_count(atscd->atsc_dmx, evt_param);
+			}
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+static Bool ATSCIn_LocalCacheCbk(void *par, char *url, Bool is_destroy)
+{
+	ATSCIn *atscd = (ATSCIn *)par;
+	u32 sid=0;
+	char *subr;
+	if (strncmp(url, "http://gpatsc/service", 21)) return GF_FALSE;
+
+	subr = strchr(url+21, '/');
+	subr[0] = 0;
+	sid = atoi(url+21);
+	subr[0] = '/';
+	if (is_destroy) {
+		gf_atsc3_dmx_remove_object_by_name(atscd->atsc_dmx, sid, subr+1, GF_TRUE);
+	} else if (sid && (sid != atscd->tune_service_id)) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[ATSCDmx] Request on service %d but tuned on service %d, retuning\n", sid, atscd->tune_service_id));
+		atscd->tune_service_id = sid;
+		atscd->sync_tsi = 0;
+		atscd->last_toi = 0;
+		if (atscd->clock_init_seg) gf_free(atscd->clock_init_seg);
+		atscd->clock_init_seg = NULL;
+		gf_atsc3_tune_in(atscd->atsc_dmx, sid, GF_TRUE);
+	}
+	return GF_TRUE;
+}
+
+static u32 ATSCIn_Run(void *par)
+{
+	ATSCIn *atscd = (ATSCIn *)par;
+
+	gf_service_connect_ack(atscd->service, NULL, GF_OK);
+	gf_atsc3_set_callback(atscd->atsc_dmx, ATSCIn_on_event, atscd);
+	if (atscd->tune_service_id)
+		gf_atsc3_tune_in(atscd->atsc_dmx, atscd->tune_service_id, GF_FALSE);
+	else
+		gf_atsc3_tune_in(atscd->atsc_dmx, 0, GF_TRUE);
+
+	while (atscd->state==1) {
+		GF_Err e = gf_atsc3_dmx_process(atscd->atsc_dmx);
+		if (e == GF_IP_NETWORK_EMPTY) gf_sleep(1);
+	}
+	atscd->state = 3;
+	return 0;
+}
+
+GF_DownloadManager *gf_term_service_get_dm(GF_ClientService *ns);
+
+GF_Err gf_dm_set_localcache_provider(GF_DownloadManager *dm, Bool (*local_cache_url_provider_cbk)(void *udta, char *url, Bool is_cache_destroy), void *lc_udta);
+
+
+static GF_Err ATSCIn_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
+{
+	char *opts;
+	ATSCIn *atscd = plug->priv;
+	u32 buffer_size=0;
+	const char *ifce = gf_modules_get_option((GF_BaseInterface*)plug, "Network", "DefaultMCastInterface");
+	atscd->service = serv;
+
+
+	opts = (char *)url + 7;
+	if (opts[0]==0) opts = NULL;
+	while (opts) {
+		char *sep = strchr(opts, ':');
+		if (sep) sep[0] = 0;
+		if (!strncmp(opts, "service=", 8)) atscd->tune_service_id = atoi(opts+8);
+		else if (!strncmp(opts, "buffer=", 7)) buffer_size = atoi(opts+7);
+		else if (!strncmp(opts, "ifce=", 5)) ifce = opts+5;
+		if (!sep) break;
+		sep[0] = ':';
+		opts = sep+1;
+	}
+
+	if (!atscd->atsc_dmx) {
+		atscd->atsc_dmx = gf_atsc3_dmx_new(ifce, NULL, buffer_size);
+
+		atscd->dm = gf_term_service_get_dm(serv);
+		if (!atscd->dm) return GF_SERVICE_ERROR;
+		gf_dm_set_localcache_provider(atscd->dm, ATSCIn_LocalCacheCbk, atscd);
+	}
+
+	atscd->state = 1;
+	gf_th_run(atscd->th, ATSCIn_Run, atscd);
+	return GF_OK;
+}
+
+static GF_Err ATSCIn_CloseService(GF_InputService *plug)
+{
+	ATSCIn *atscd = plug->priv;
+	if (atscd->state<2) atscd->state = 2;
+	while (atscd->state==2) gf_sleep(1);
+	gf_service_disconnect_ack(atscd->service, NULL, GF_OK);
+	return GF_OK;
+}
+
+static GF_Descriptor *ATSCIn_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
+{
+	return NULL;
+}
+
+static GF_Err ATSCIn_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
+{
+	return GF_SERVICE_ERROR;
+}
+
+static GF_Err ATSCIn_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
+{
+	return GF_SERVICE_ERROR;
+}
+
+static GF_Err ATSCIn_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
+{
+	return GF_SERVICE_ERROR;
+}
+
+
+GF_InputService *ATSCIn_Load()
+{
+
+	GF_InputService *plug = gf_malloc(sizeof(GF_InputService));
+	memset(plug, 0, sizeof(GF_InputService));
+	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC ATSC3 Input", "gpac distribution")
+
+	plug->CanHandleURL = ATSCIn_CanHandleURL;
+	plug->ConnectService = ATSCIn_ConnectService;
+	plug->CloseService = ATSCIn_CloseService;
+	plug->GetServiceDescriptor = ATSCIn_GetServiceDesc;
+	plug->ConnectChannel = ATSCIn_ConnectChannel;
+	plug->DisconnectChannel = ATSCIn_DisconnectChannel;
+	plug->ServiceCommand = ATSCIn_ServiceCommand;
+
+	plug->priv = ATSCIn_new();
+	return plug;
+}
+
+void ATSCIn_Delete(void *ifce)
+{
+	ATSCIn *read;
+	GF_InputService *plug = (GF_InputService *) ifce;
+	if (!plug)
+		return;
+	read = plug->priv;
+	if (read) {
+		ATSCIn_del(read);
+		plug->priv = NULL;
+	}
+	gf_free(plug);
+}
+
+#endif /* GPAC_DISABLE_ATSC */
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_ATSC)
+		GF_NET_CLIENT_INTERFACE,
+#endif
+		0
+	};
+
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_ATSC)
+	if (InterfaceType == GF_NET_CLIENT_INTERFACE) return (GF_BaseInterface *)ATSCIn_Load();
+#endif
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_ATSC)
+	case GF_NET_CLIENT_INTERFACE:
+		ATSCIn_Delete(ifce);
+		break;
+#endif
+	}
+}
+
+GPAC_MODULE_STATIC_DECLARATION( atsc_in )
+

gpac-0.7.1.tar.gz/modules/dektec_out/dektec_video.cpp -> gpac-0.8.0.tar.gz/modules/dektec_out/dektec_video.cpp Changed

@@ -2,7 +2,9 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Romain Bouqueau
- *			Copyright (c) Romain Bouqueau @ GPAC Licensing
+ *			Copyright (c) 
+ * Romain Bouqueau @ GPAC Licensing
+ *			 Jean Le Feuvre
 *					All rights reserved
 *
 * This file is part of GPAC / Dektec SDI video render module
@@ -23,338 +25,767 @@
 *
 */
 
-#define _DTAPI_DISABLE_AUTO_LINK
+//#define _DTAPI_DISABLE_AUTO_LINK
 #include <DTAPI.h>
 
 extern "C" {
 
-	/*driver interfaces*/
+/*driver interfaces*/
 #include <gpac/modules/video_out.h>
 #include <gpac/modules/audio_out.h>
 #include <gpac/constants.h>
 #include <gpac/setup.h>
+#include <gpac/color.h>
+#include <gpac/thread.h>
 
-
-//#define DEKTEC_DUMP_UYVY
-#ifdef NDEBUG
-#define tru 1
+#if defined(WIN32) && !defined(__GNUC__)
+# include <intrin.h>
 #else
-#define tru 0
+# include <emmintrin.h>
 #endif
 
-//TODO: use gf_stretch_bits and get values from config file
-#if 1
-#define DWIDTH 1280
-#define DHEIGHT 720
-#define DFORMAT DTAPI_IOCONFIG_720P59_94
-#define DNUMFIELDS 1
-#else
-#define DWIDTH 1920
-#define DHEIGHT 1080
-#define DFORMAT DTAPI_IOCONFIG_1080I50
-#define DNUMFIELDS 2
-#endif
+typedef struct {
+	GF_VideoOutput *dr;
+	enum {
+		VIDEO,
+		AUDIO
+	} type;
+} DtCbkCtx;
+
+typedef struct
+{
+	unsigned char *pixels_YUV_source;
+
+	u32 width, height;
+	DtMxProcess *m_Matrix;
+
+	DtDevice *dvc;
+	Bool is_sending, is_configured, is_10b, clip_sdi;
+
+	DtCbkCtx audio_cbk_ctx, video_cbk_ctx;
+
+	s64 frameNum;
+	FILE *pFile;
+	Bool is_in_flush;
+	Bool frame_transfered;
+	
+	s64 lastFrameNum;
+	u64 init_clock, last_frame_time;
+
+	u32 frame_dur, frame_scale;
+	Bool needs_reconfigure;
+	u32 force_width, force_height;
+} DtContext;
+
+static void OnNewFrameAudio(DtMxData *pData, void *pOpaque) {
+	DTAPI_RESULT dr;
+
+	// Must have a valid frame
+	DtMxRowData &OurRow = pData->m_Rows[0];
+	if (OurRow.m_CurFrame->m_Status != DT_FRMSTATUS_OK) {
+		return; // Frame is not valid so we have to assume the frame buffers are unusable
+	}
 
-	typedef struct
-	{
-		char *pixels;
-		unsigned char *pixels_UYVY;
-		u32 width, height, pixel_format, bpp;
+	// Get frame audio data
+	DtMxAudioData& AudioData = OurRow.m_CurFrame->m_Audio;
+
+	// Init channel status word for all (valid) audio channels
+	dr = AudioData.InitChannelStatus();
+}
+
+static void OnNewFrameVideo(DtMxData *pData, void *opaque)
+{
+	u64 now = gf_sys_clock_high_res();
+	DtMxRowData& OurRow = pData->m_Rows[0];
+	GF_VideoOutput *dr = ((DtCbkCtx*)opaque)->dr;
+	DtContext *dtc = (DtContext*)dr->opaque;
+	if (!dtc->is_configured) return;
+	if (pData->m_NumSkippedFrames>0) {
+		GF_Event evt;
+		evt.type = GF_EVENT_SYNC_LOST;
+		evt.sync_loss.sync_loss_ms = (u32)((u64)pData->m_NumSkippedFrames * dtc->frame_dur * 1000) / dtc->frame_scale;
+		dr->on_event(dr->evt_cbk_hdl, &evt);
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] [%lld] #skipped frames=%d\n", pData->m_Frame, pData->m_NumSkippedFrames));
+	}
 
-		DtDevice *dvc;
-		DtFrameBuffer *dtf;
-		bool isSending;
-		s64 frameNum;
-	} DtContext;
+	if (!dtc->init_clock) {
+		dtc->init_clock = dtc->last_frame_time = now;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DekTecOut] output frame %d at %d ms - %d since last\n", dtc->frameNum, (u32) (now - dtc->init_clock)/1000, now-dtc->last_frame_time));
+	
+	dtc->last_frame_time = now;
+
+	if (dtc->lastFrameNum == dtc->frameNum) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTec Out] Skipping same frame %d - compositor in flush %d\n", dtc->frameNum, dtc->is_in_flush));
+		dtc->frame_transfered = GF_TRUE;
+		return;
+	}
 
+	dtc->lastFrameNum = dtc->frameNum;
 
-	void dx_copy_pixels(GF_VideoSurface *dst_s, const GF_VideoSurface *src_s, const GF_Window *src_wnd); //FIXME: referenced from dx
-	static GF_Err Dektec_Blit(GF_VideoOutput *dr, GF_VideoSurface *video_src, GF_Window *src_wnd, GF_Window *dst_wnd, u32 overlay_type)
+	// Must have a valid frame
+	if (OurRow.m_CurFrame->m_Status != DT_FRMSTATUS_OK)
 	{
-		DtContext *dtc = (DtContext*)dr->opaque;
-		GF_VideoSurface temp_surf;
-		memset(&temp_surf, 0, sizeof(GF_VideoSurface));
-		temp_surf.pixel_format = GF_PIXEL_UYVY;
-		temp_surf.video_buffer = (char*)dtc->pixels_UYVY;
-		temp_surf.pitch_y = dtc->width*2;
-		dx_copy_pixels(&temp_surf, video_src, src_wnd);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] Blit\n"));
-		return GF_OK;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Not valid frame 4k\n"));
+		dtc->frame_transfered = GF_TRUE;
+		exit(0);
+		return; // Frame is not valid so we have to assume the frame buffers are unusable
+	}
+	if (pData->m_NumSkippedFrames>0) {
+		GF_Event evt;
+		evt.type = GF_EVENT_SYNC_LOST;
+		evt.sync_loss.sync_loss_ms = (u32) ( (u64) pData->m_NumSkippedFrames * dtc->frame_dur * 1000) / dtc->frame_scale;
+		dr->on_event(dr->evt_cbk_hdl, &evt);
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] [%lld] #skipped frames=%d\n", pData->m_Frame, pData->m_NumSkippedFrames));
 	}
 
-	static GF_Err Dektec_Flush(GF_VideoOutput *dr, GF_Window *dest)
-	{
-		DtContext *dtc = (DtContext*)dr->opaque;
-		DtFrameBuffer *dtf = dtc->dtf;
-		DTAPI_RESULT res;
-		if (dest->w != DWIDTH || dest->h != DHEIGHT) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Dektec Out] Discard data with wrong dimensions\n"));
-			if (tru) return GF_OK;
-		}
-		if (!dtc->isSending) {
-			// Start transmission
-			res = dtf->Start();
-			if (tru && res != DTAPI_OK) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_MODULE, ("[Dektec Out] Can't start transmission: %s.\n", DtapiResult2Str(res)));
-			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Dektec Out] Transmission started.\n"));
-				dtc->isSending = true;
+	DtMxVideoBuf& VideoBuf = OurRow.m_CurFrame->m_Video[0];
+	unsigned char* pDstY = VideoBuf.m_Planes[0].m_pBuf;
+	unsigned char* pDstU = VideoBuf.m_Planes[1].m_pBuf;
+	unsigned char* pDstV = VideoBuf.m_Planes[2].m_pBuf;
+
+	if (dtc->is_10b) {
+		u32 nb_pix = 2*dtc->width*dtc->height;
+		int lineC = 2*dtc->width / 2;
+		unsigned char *pSrcY = dtc->pixels_YUV_source;
+		unsigned char *pSrcU = dtc->pixels_YUV_source + 2 * dtc->width*dtc->height;
+		unsigned char *pSrcV = pSrcU + (2 * dtc->width*dtc->height / 4);
+
+		if (dtc->clip_sdi) {
+			const u16 nYRangeMin = 4;
+			const u16 nYRangeMax = 1019;
+			const __m128i mMin = _mm_set1_epi16(nYRangeMin);
+			const __m128i mMax = _mm_set1_epi16(nYRangeMax);
+
+			for (u32 i = 0; i < nb_pix; i += 16) {
+				_mm_storeu_si128((__m128i *)&pDstY[i], _mm_max_epi16(mMin, _mm_min_epi16(mMax, _mm_loadu_si128((__m128i const *)&pSrcY[i]))));
 			}
-		}
-		s64 firstSafeFrame=-1, lastSafeFrame=-1;
-		res = dtf->WaitFrame(firstSafeFrame, lastSafeFrame);
-		if (tru && res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't get the next frame: %s\n", DtapiResult2Str(res)));
-			return GF_BAD_PARAM;
-		}
 
-		if (dtc->frameNum == -1)
-			dtc->frameNum = firstSafeFrame;
+			for (u32 h = 0; h < dtc->height/2; h++) {
+				for (u32 i = 0; i < dtc->width; i += 16) {
+					_mm_storeu_si128((__m128i *)&pDstU[i], _mm_max_epi16(mMin, _mm_min_epi16(mMax, _mm_loadu_si128((__m128i const *)&pSrcU[i]))));
+				}
+				//420->422: copy over each U and V line
+				memcpy(pDstU+lineC, pDstU, lineC);
+				pSrcU += lineC;
+				pDstU += 2 * lineC;
+			}
 
-		int numLines=-1, numWritten=DWIDTH*DHEIGHT*2/DNUMFIELDS;
-		res = dtf->WriteVideo(dtc->frameNum, dtc->pixels_UYVY, numWritten, DTAPI_SDI_FIELD1, DTAPI_SDI_8B, 1, numLines);
-		if (tru && res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't write frame "LLD": %s\n", dtc->frameNum, DtapiResult2Str(res)));
-			return GF_BAD_PARAM;
-		}
-		if (DNUMFIELDS > 1) {
-			assert(DNUMFIELDS == 2);
-			numLines=-1, numWritten=DWIDTH*DHEIGHT*2/DNUMFIELDS;
-			res = dtf->WriteVideo(dtc->frameNum, dtc->pixels_UYVY+numWritten, numWritten, DTAPI_SDI_FIELD2, DTAPI_SDI_8B, 1, numLines);
-			if (tru && res != DTAPI_OK) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't write frame "LLD": %s\n", dtc->frameNum, DtapiResult2Str(res)));
-				return GF_BAD_PARAM;
+			for (u32 h = 0; h < dtc->height / 2; h++) {
+				for (u32 i = 0; i < dtc->width; i += 16) {
+					_mm_storeu_si128((__m128i *)&pDstV[i], _mm_max_epi16(mMin, _mm_min_epi16(mMax, _mm_loadu_si128((__m128i const *)&pSrcV[i]))));
+				}
+				memcpy(pDstV + lineC, pDstV, lineC);
+				pSrcV += lineC;
+				pDstV += 2 * lineC;
+			}
+		} else {
+			memcpy(pDstY, dtc->pixels_YUV_source, 2 * dtc->width*dtc->height);
+	
+			//420->422: copy over each U and V line
+			for (u32 h = 0; h < dtc->height/2; h++) {
+				memcpy(pDstU, pSrcU, lineC);
+				memcpy(pDstU+lineC, pSrcU, lineC);
+				pSrcU += lineC;
+				pDstU += 2 * lineC;
+			}
+			for (u32 h = 0; h < dtc->height / 2; h++) {
+				memcpy(pDstV, pSrcV, lineC);
+				memcpy(pDstV + lineC, pSrcV, lineC);
+				pSrcV += lineC;
+				pDstV += 2 * lineC;
 			}
 		}
+	} else {
+		u32 nb_pix = dtc->width*dtc->height;
+		const int lineC = dtc->width / 2;
+		unsigned char *pSrcY = dtc->pixels_YUV_source;
+		unsigned char *pSrcU = dtc->pixels_YUV_source + dtc->width * dtc->height;
+		unsigned char *pSrcV = pSrcU + (dtc->width*dtc->height / 4);
+
+		if (dtc->clip_sdi) {
+			const u16 nYRangeMin = 4;
+			const u16 nYRangeMax = 1019;
+
+			for (u32 i = 0; i < nb_pix; i++) {
+				u16 srcy = ((u16)(*pSrcY)) << 2;
+				if (srcy < nYRangeMin) srcy = nYRangeMin;
+				else if (srcy > nYRangeMax) srcy = nYRangeMax;
+				*(short *)pDstY = srcy;
+
+				pSrcY++;
+				pDstY += sizeof(short); //char type but short buffer
+			}
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] Written frame "LLD" [(0x%X,0x%X,0x%X,0x%X)(0x%X,0x%X,0x%X,0x%X)(0x%X,0x%X,0x%X,0x%X)(0x%X,0x%X,0x%X,0x%X)]\n", dtc->frameNum, DWIDTH, DHEIGHT,
-		 dtc->pixels_UYVY[0], dtc->pixels_UYVY[1], dtc->pixels_UYVY[2], dtc->pixels_UYVY[3], dtc->pixels_UYVY[4], dtc->pixels_UYVY[5], dtc->pixels_UYVY[6], dtc->pixels_UYVY[7],
-		 dtc->pixels_UYVY[8], dtc->pixels_UYVY[9], dtc->pixels_UYVY[10], dtc->pixels_UYVY[11], dtc->pixels_UYVY[12], dtc->pixels_UYVY[13], dtc->pixels_UYVY[14], dtc->pixels_UYVY[15]));
+			nb_pix = dtc->width*dtc->height / 4;
+			for (u32 i = 0; i < nb_pix; i++) {
+				u16 srcu = ((u16)(*pSrcU)) << 2;
+				if (srcu < nYRangeMin) srcu = nYRangeMin;
+				else if (srcu > nYRangeMax) srcu = nYRangeMax;
 
-		// commit HANC/VANC - mandatory to form a valid frame
-		res = dtf->AncCommit(dtc->frameNum);
-		if (tru && res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't write VANC for frame "LLD": %s\n", dtc->frameNum, DtapiResult2Str(res)));
-			return GF_BAD_PARAM;
-		}
+				*(short *)pDstU = srcu;
+				*(short *)(pDstU + lineC) = srcu;
 
-		dtc->frameNum++;
+				pSrcU++;
+				pDstU += sizeof(short); //char type but short buffer
+			}
 
-#ifdef DEKTEC_DUMP_UYVY
-		char szName[1024];
-		sprintf(szName, "test.uyvy");
-		FILE *f = fopen(szName, "ab");
-		fwrite(dtc->pixels_UYVY, dtc->width*dtc->height*2, 1, f);
-		fclose(f);
-#endif
-		return GF_OK;
-	}
+			for (u32 i = 0; i < nb_pix; i++) {
+				u16 srcv = ((u16)(*pSrcV)) << 2;
+				if (srcv < nYRangeMin) srcv = nYRangeMin;
+				else if (srcv > nYRangeMax) srcv = nYRangeMax;
 
-	static GF_Err Dektec_LockBackBuffer(GF_VideoOutput *dr, GF_VideoSurface *vi, Bool do_lock)
-	{
-		DtContext *dtc = (DtContext*)dr->opaque;
-
-		if (do_lock) {
-			if (!vi) return GF_BAD_PARAM;
-			memset(vi, 0, sizeof(GF_VideoSurface));
-			vi->height = dtc->height;
-			vi->width = dtc->width;
-			vi->video_buffer = dtc->pixels;
-			vi->pitch_x = dtc->bpp;
-			vi->pitch_y = dtc->bpp * vi->width;/*the correct value here is dtc->pixel_format, but the soft raster only supports RGB*/
-			vi->pixel_format = GF_PIXEL_RGB_24;
+				*(short *)pDstV = srcv;
+				*(short *)(pDstV + lineC) = srcv;
+
+				pSrcV++;
+				pDstV += sizeof(short); //char type but short buffer
+			}
+		}
+		else {
+			memcpy(pDstY, pSrcY, dtc->width * dtc->height);
+			memcpy(pDstU, pSrcU, dtc->width * dtc->height / 4);
+			memcpy(pDstV, pSrcV, dtc->width * dtc->height / 4);
 		}
-		return GF_OK;
 	}
 
-	static void Dektec_Shutdown(GF_VideoOutput *dr)
-	{
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] Dektec_Shutdown\n"));
-		DtContext *dtc = (DtContext*)dr->opaque;
-		DtFrameBuffer *dtf = dtc->dtf;
-		DTAPI_RESULT res = dtf->Start(false);
-		if (tru && res != DTAPI_OK)
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't stop transmission: %s\n", DtapiResult2Str(res)));
-		dtf->Detach();
-		dtc->dvc->Detach();
-		dtc->isSending = false;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DekTecOut] wrote YUV data in "LLU" us\n", gf_sys_clock_high_res() - now));
+	dtc->frame_transfered = GF_TRUE;
+}
+
+static void OnNewFrame(DtMxData *pData, void *pOpaque) {
+	const DtCbkCtx *ctx = ((const DtCbkCtx*)pOpaque);
+	if (ctx->type == DtCbkCtx::VIDEO)
+		OnNewFrameVideo(pData, pOpaque);
+	else if (ctx->type == DtCbkCtx::AUDIO)
+		OnNewFrameAudio(pData, pOpaque);
+}
+
+static GF_Err Dektec_Flush(GF_VideoOutput *dr, GF_Window *dest)
+{
+	DtContext *dtc = (DtContext*)dr->opaque;
+	DtMxProcess *Matrix = dtc->m_Matrix;
+
+	if (!dtc->is_configured || !dtc->is_sending) return GF_OK;
+
+	dtc->is_in_flush = GF_TRUE;
+
+	dtc->frameNum++;
+	
+	//wait for vsync, eg wait for buffer to be read by the card
+	dtc->frame_transfered = GF_FALSE;
+	while (!dtc->frame_transfered) {
+		gf_sleep(0);
 	}
+	dtc->is_in_flush = GF_FALSE;
+	return GF_OK;
+}
 
-	static GF_Err Dektec_ProcessEvent(GF_VideoOutput *dr, GF_Event *evt)
-	{
-		DtFrameBuffer *dtf = (DtFrameBuffer*)(((DtContext*)dr->opaque)->dtf);
-
-		if (evt) {
-			switch (evt->type) {
-			case GF_EVENT_VIDEO_SETUP:
-				//FIXME: we do not know how to resize - Dektec_Shutdown(dr); Dektec_attach_start(dr);
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] resize (%ux%u) received.\n", evt->size.width, evt->size.height));
-				if (evt->size.width != DWIDTH || evt->size.height != DHEIGHT) {
-					GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Dektec Out] Bad resize (%ux%u) received. Expected %dx%d.\n", evt->size.width, evt->size.height, DWIDTH, DHEIGHT));
-					if (evt->size.width*evt->size.height > DWIDTH*DHEIGHT) //FIXME
-						return GF_BAD_PARAM;
-				}
-				return GF_OK;
+static GF_Err Dektec_LockBackBuffer(GF_VideoOutput *dr, GF_VideoSurface *vi, Bool do_lock)
+{
+	DtContext *dtc = (DtContext*)dr->opaque;
+
+	if (do_lock) {
+		return GF_NOT_SUPPORTED;
+	}
+	return GF_OK;
+}
+
+static void Dektec_Shutdown(GF_VideoOutput *dr)
+{
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DekTecOut] Dektec_Shutdown\n"));
+	DtContext *dtc = (DtContext*)dr->opaque;
+	DtMxProcess *Matrix = dtc->m_Matrix;
+	dtc->is_configured = GF_FALSE;
+
+	DTAPI_RESULT res = Matrix->Stop();
+	if ( res != DTAPI_OK)
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Can't stop transmission: %s\n", DtapiResult2Str(res)));
+
+	Matrix->Reset();
+	dtc->dvc->Detach();
+	dtc->is_sending = GF_FALSE;
+}
+
+static GF_Err Dektec_ProcessEvent(GF_VideoOutput *dr, GF_Event *evt)
+{
+	DtContext *dtc = (DtContext*)dr->opaque;
+
+	if (evt) {
+		switch (evt->type) {
+		case GF_EVENT_VIDEO_SETUP:
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DekTecOut] resize (%ux%u) received.\n", evt->size.width, evt->size.height));
+			dtc->needs_reconfigure = GF_TRUE;
+			return GF_OK;
+		}
+	}
+	return GF_OK;
+}
+
+GF_Err Dektec_Setup(GF_VideoOutput *dr, void *os_handle, void *os_display, u32 init_flags)
+{
+	const char *opt;
+	DTAPI_RESULT res;
+	DtContext *dtc = (DtContext*)dr->opaque;
+	DtDevice *dvc = dtc->dvc;
+
+	opt = gf_modules_get_option((GF_BaseInterface *)dr, "DektecVideo", "CardSlot");
+	if (opt) {
+		int PciBusNumber, SlotNumber;
+		sscanf(opt, "%d:%d", &PciBusNumber, &SlotNumber);
+
+		res = dvc->AttachToSlot(PciBusNumber, SlotNumber);
+		if ( res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] No DTA found on PIC bus %d slot %d: %s - trying enumerating cards\n", PciBusNumber, SlotNumber, DtapiResult2Str(res) ));
+		} else {
+			return GF_OK;
+		}
+	}
+	dtc->clip_sdi = GF_TRUE;
+	opt = gf_modules_get_option((GF_BaseInterface *)dr, "DektecVideo", "ClipSDI");
+	if (!opt) 
+		gf_modules_set_option((GF_BaseInterface *)dr, "DektecVideo", "ClipSDI", "yes");
+	else if (!strcmp(opt, "no"))
+		dtc->clip_sdi = GF_FALSE;
+
+	res = dvc->AttachToType(2174);
+	if ( res != DTAPI_OK) res = dvc->AttachToType(2154);
+
+	if ( res != DTAPI_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] No DTA 2174 or 2154 in system: %s\n", DtapiResult2Str(res)));
+		return GF_BAD_PARAM;
+	}
+	opt = gf_modules_get_option((GF_BaseInterface *)dr, "DektecVideo", "ForceRes");
+	if (!opt) {
+		gf_modules_set_option((GF_BaseInterface *)dr, "DektecVideo", "ForceRes", "no");
+		dtc->force_width = dtc->force_height = 0;
+	} else if (sscanf(opt, "%ux%u", &dtc->force_width, &dtc->force_height) == 2) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] Using forced resolution %ux%u\n", dtc->force_width, dtc->force_height));
+	} else {
+		dtc->force_width = dtc->force_height = 0;
+	}
+	return GF_OK;
+}
+
+GF_Err Dektec_Configure(GF_VideoOutput *dr, u32 width, u32 height, Bool is_10_bits)
+{
+	DTAPI_RESULT res;
+	int port = 1;
+	const char *opt;
+	Bool is4K = GF_FALSE;
+	DtContext *dtc = (DtContext*)dr->opaque;
+	DtDevice *dvc = dtc->dvc;
+
+	const char* sopt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "FrameRate");
+	if (!sopt) sopt = gf_modules_get_option((GF_BaseInterface *)dr, "Compositor", "FrameRate");
+	Double frameRate = 30.0;
+	int dFormat = -1, linkStd = -1;
+
+	if (sopt) frameRate = atof(sopt);
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] Reconfigure to %dx%d @ %g FPS %s bits src - SDI clipping: %s\n", width, height, frameRate, is_10_bits ? "10" : "8", dtc->clip_sdi ? "yes" : "no"));
+	if (dtc->is_configured) {
+		DtMxProcess *Matrix = dtc->m_Matrix;
+		if (dtc->is_sending) {
+			res = Matrix->Stop();
+			if ( res != DTAPI_OK) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Can't stop transmission: %s\n", DtapiResult2Str(res)));
 			}
 		}
-		return GF_OK;
+		Matrix->Reset();
+		dtc->is_configured = GF_FALSE;
+		dtc->is_sending = GF_FALSE;
 	}
 
-	static GF_Err Dektec_resize(GF_VideoOutput *dr, u32 w, u32 h)
-	{
-		DtContext *dtc = (DtContext*)dr->opaque;
-		if (dtc->pixels) gf_free(dtc->pixels);
-		if (dtc->pixels_UYVY) gf_free(dtc->pixels_UYVY);
-		dtc->width = w;
-		dtc->height = h;
-		dtc->pixels = (char*)gf_malloc(dtc->bpp * w * h);
-		if (!dtc->pixels) return GF_OUT_OF_MEM;
-		memset(dtc->pixels, 0, dtc->bpp * w * h);
-		dtc->pixels_UYVY = (unsigned char*)gf_malloc(2 * w * h);
-		if (!dtc->pixels_UYVY) return GF_OUT_OF_MEM;
-		memset(dtc->pixels_UYVY, 0, 2 * w * h);
-		return GF_OK;
+	dtc->width = width;
+	dtc->height = height;
+	dtc->is_10b = is_10_bits;
+
+	if (frameRate == 30.0) {
+		dtc->frame_scale = 30;
+		dtc->frame_dur = 1;
+		if ((dtc->width==1280) && (dtc->height==720)) {
+			dFormat = DTAPI_IOCONFIG_720P30;
+		} else if ((dtc->width==1920) && (dtc->height==1080)) {
+			dFormat = DTAPI_IOCONFIG_1080P30;
+		} else if ((dtc->width==3840) && (dtc->height==2160)) {
+			dFormat = DTAPI_VIDSTD_2160P30;
+		}
+	} else if (frameRate == 50.0) {
+		dtc->frame_scale = 50;
+		dtc->frame_dur = 1;
+		if ((dtc->width==1280) && (dtc->height==720)) {
+			dFormat = DTAPI_IOCONFIG_720P50;
+		} else if ((dtc->width==1920) && (dtc->height==1080)) {
+			dFormat = DTAPI_IOCONFIG_1080P50;
+		} else if ((dtc->width==3840) && (dtc->height==2160)) {
+			dFormat = DTAPI_VIDSTD_2160P50;
+		}
+	} else if (frameRate == 60.0) {
+		dtc->frame_scale = 60;
+		dtc->frame_dur = 1;
+		if ((dtc->width==1280) && (dtc->height==720)) {
+			dFormat = DTAPI_IOCONFIG_720P60;
+		} else if ((dtc->width==1920) && (dtc->height==1080)) {
+			dFormat = DTAPI_IOCONFIG_1080P60;
+		} else if ((dtc->width==3840) && (dtc->height==2160)) {
+			dFormat = DTAPI_VIDSTD_2160P60;
+		}
+	} else if (frameRate == 59.94) {
+		dtc->frame_scale = 3000;
+		dtc->frame_dur = 1001;
+
+		if ((dtc->width==1280) && (dtc->height==720)) {
+			dFormat = DTAPI_IOCONFIG_720P59_94;
+		} else if ((dtc->width==1920) && (dtc->height==1080)) {
+			dFormat = DTAPI_IOCONFIG_1080P59_94;
+		} else if ((dtc->width==3840) && (dtc->height==2160)) {
+			dFormat = DTAPI_VIDSTD_2160P59_94;
+		}
+	} else if (frameRate == 24.0) {
+		dtc->frame_scale = 24;
+		dtc->frame_dur = 1;
+		if ((dtc->width==1280) && (dtc->height==720)) {
+			dFormat = DTAPI_IOCONFIG_720P24;
+		} else if ((dtc->width==1920) && (dtc->height==1080)) {
+			dFormat = DTAPI_IOCONFIG_1080P24;
+		} else if ((dtc->width==3840) && (dtc->height==2160)) {
+			dFormat = DTAPI_VIDSTD_2160P24;
+		}
 	}
 
-	GF_Err Dektec_Setup(GF_VideoOutput *dr, void *os_handle, void *os_display, u32 init_flags)
+	if (dFormat==-1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Unsupported frame rate %f / resolution %dx%d\n", frameRate, dtc->width, dtc->height));
+		return GF_BAD_PARAM;
+	}
+
+	if ((dtc->width==3840) && (dtc->height==2160)) {
+		is4K = GF_TRUE;
+		linkStd = DTAPI_VIDLNK_4K_SMPTE425B;
+	}
+
+	if (frameRate == 60.0)
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Dealing with 60 fps video is not stable, use with caution.\n"));
+
+	opt = gf_modules_get_option((GF_BaseInterface *)dr, "DektecVideo", "SDIOutput");
+	if (opt) {
+		port = atoi(opt);
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] Using port %d (%s)\n", port, opt));
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] No port specified, using default port: %d\n", port));
+	}
+
+	DtMxPort mxPort;
+	if (!is4K)
 	{
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Dektec Out] Dektec_Setup\n"));
-		DtContext *dtc = (DtContext*)dr->opaque;
-		dtc->bpp = 3; //lock_buffer expects RGB
-		dtc->pixel_format = GF_PIXEL_YV12;
-		dtc->isSending = false;
-		Dektec_resize(dr, DWIDTH, DHEIGHT);
-
-		int port = 1;
-		const char *opt;
-		opt = gf_modules_get_option((GF_BaseInterface *)dr, "DektecVideo", "SDIOutput");
-		if (opt) {
-			port = atoi(opt);
-			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));
+		res = dvc->SetIoConfig(port, DTAPI_IOCONFIG_IODIR, DTAPI_IOCONFIG_OUTPUT, DTAPI_IOCONFIG_OUTPUT);
+		if ( res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Can't set I/O config for the device: %s\n", DtapiResult2Str(res)));
+			return GF_BAD_PARAM;
 		}
 
-		DtDevice *dvc = dtc->dvc;
-		DtFrameBuffer *dtf = dtc->dtf;
-		DTAPI_RESULT res;
-		res = dvc->AttachToType(2154);
-		if (tru && res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] No DTA-2154 in system: %s\n", DtapiResult2Str(res)));
+		int IoStdValue = -1, IoStdSubValue = -1;
+		res = DtapiVidStd2IoStd(dFormat, IoStdValue, IoStdSubValue);
+		if ( res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Unknown VidStd: %s\n", DtapiResult2Str(res)));
 			return GF_BAD_PARAM;
 		}
 
-		res = dvc->SetIoConfig(port, DTAPI_IOCONFIG_IODIR, DTAPI_IOCONFIG_OUTPUT, DTAPI_IOCONFIG_OUTPUT);
-		if (tru && res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't set I/O config for the device: %s\n", DtapiResult2Str(res)));
+		res = dvc->SetIoConfig(port, DTAPI_IOCONFIG_IOSTD, IoStdValue, IoStdSubValue);
+		if ( res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Can't set I/O config: %s\n", DtapiResult2Str(res)));
 			return GF_BAD_PARAM;
 		}
-
-		res = dtf->AttachToOutput(dvc, port, 0);
-		if (tru && res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't attach to port %d: %s\n", port, DtapiResult2Str(res)));
+		res = mxPort.AddPhysicalPort(dvc, port);
+		if (res != DTAPI_OK){
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Failed to add port %d to logical port", port));
 			return GF_BAD_PARAM;
 		}
+	}
+	else
+	{
+		DtMxPort mxPort4k(dFormat, linkStd);
+		for (int i = 0; i < 4; i++)
+		{
+			res = dvc->SetIoConfig(i+1, DTAPI_IOCONFIG_IODIR, DTAPI_IOCONFIG_OUTPUT, DTAPI_IOCONFIG_OUTPUT);
+			if ( res != DTAPI_OK) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Can't set I/O config for the device: %s\n", DtapiResult2Str(res)));
+				return GF_BAD_PARAM;
+			}
+		}
 
-		int IoStdValue=-1, IoStdSubValue=-1;
-		res = DtapiVidStd2IoStd(DFORMAT, IoStdValue, IoStdSubValue);
-		if (tru && res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Unknown VidStd: %s\n", DtapiResult2Str(res)));
+		int IoStdValue = -1, IoStdSubValue = -1;
+		res = DtapiVidStd2IoStd(dFormat, linkStd, IoStdValue, IoStdSubValue);
+		if ( res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Unknown VidStd: %s\n", DtapiResult2Str(res)));
 			return GF_BAD_PARAM;
 		}
 
-		res = dtf->SetIoConfig(DTAPI_IOCONFIG_IOSTD, IoStdValue, IoStdSubValue);
-		if (tru && res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] Can't set I/O config: %s\n", DtapiResult2Str(res)));
+		for (int i = 0; i < 4; i++)
+		{
+			res = dvc->SetIoConfig(i+1, DTAPI_IOCONFIG_IOSTD, IoStdValue, IoStdSubValue);
+			if ( res != DTAPI_OK) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Can't set I/O config: %s\n", DtapiResult2Str(res)));
+				return GF_BAD_PARAM;
+			}
+		}
+		for (int i = 0; i < 4; i++)
+		{
+			res = mxPort4k.AddPhysicalPort(dvc, i + 1);
+			if (res != DTAPI_OK){
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Failed to add port %d to logical 4k port", (i + 1)));
+				return GF_BAD_PARAM;
+			}
+		}
+		
+		DtIoConfig Cfg;
+		std::vector<DtIoConfig> IoConfigs;
+		DtHwFuncDesc* pHwf = dvc->m_pHwf;
+		for (int i = 0; i<dvc->m_pHwf->m_DvcDesc.m_NumPorts; i++, pHwf++)
+		{
+			// Check if the port has GENNREF capability
+			if ((pHwf->m_Flags & DTAPI_CAP_GENREF) == 0)
+				continue; // No GENREF cap
+
+			Cfg.m_Port = pHwf->m_Port;
+			Cfg.m_Group = DTAPI_IOCONFIG_GENREF;
+
+			// Check if this is the internal GENREF (has DTAPI_CAP_VIRTUAL)?
+			if ((pHwf->m_Flags & DTAPI_CAP_VIRTUAL) != 0)
+				Cfg.m_Value = DTAPI_IOCONFIG_TRUE; // The internal => enable as GENREF
+			else
+				Cfg.m_Value = DTAPI_IOCONFIG_FALSE; // Not the internal => disable as GENREF
+			Cfg.m_SubValue = -1;
+			Cfg.m_ParXtra[0] = Cfg.m_ParXtra[1] = -1;
+			// Add to list
+			IoConfigs.push_back(Cfg);
+
+			// Set the IO-standard for 'THE' GENREF port
+			if (Cfg.m_Value != DTAPI_IOCONFIG_TRUE)
+				continue;
+			Cfg.m_Group = DTAPI_IOCONFIG_IOSTD;
+			// Set a standard with matching frame rate
+			DtVidStdInfo VidInfo;
+			res = ::DtapiGetVidStdInfo(dFormat, linkStd, VidInfo);
+			Cfg.m_Value = DTAPI_IOCONFIG_HDSDI;
+			switch ((int)VidInfo.m_Fps)
+			{
+			case 23: Cfg.m_SubValue = DTAPI_IOCONFIG_720P23_98; break;
+			case 24: Cfg.m_SubValue = DTAPI_IOCONFIG_720P24; break;
+			case 25: Cfg.m_SubValue = DTAPI_IOCONFIG_720P25; break;
+			case 29: Cfg.m_SubValue = DTAPI_IOCONFIG_720P29_97; break;
+			case 30: Cfg.m_SubValue = DTAPI_IOCONFIG_720P30; break;
+			case 50: Cfg.m_SubValue = DTAPI_IOCONFIG_720P50; break;
+			case 59: Cfg.m_SubValue = DTAPI_IOCONFIG_720P59_94; break;
+			case 60: Cfg.m_SubValue = DTAPI_IOCONFIG_720P60; break;
+			}
+			Cfg.m_ParXtra[0] = Cfg.m_ParXtra[1] = -1;
+			// Add to list
+			IoConfigs.push_back(Cfg);
+		}
+		res = dvc->SetIoConfig(IoConfigs.data(), (int)IoConfigs.size());
+		if (res != DTAPI_OK){
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Failed to apply genref\n"));
 			return GF_BAD_PARAM;
 		}
+		mxPort = mxPort4k;
+	}
 
-		dtc->frameNum = -1;
-
-		return GF_OK;
+	res = dtc->m_Matrix->AttachRowToOutput(0, mxPort);
+	if ( res != DTAPI_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Can't attach to port %d: %s\n", port, DtapiResult2Str(res)));
+		return GF_BAD_PARAM;
 	}
 
-	GF_VideoOutput *NewDektecVideoOutput()
+	/* --- Set row configuration --- */
+	DtMxRowConfig RowConfig;
+	RowConfig.m_Enable = true;
+	RowConfig.m_RowSize = 1; // Keep a history of one frame
+
+	// Enable the video
+	RowConfig.m_VideoEnable = true;
+	RowConfig.m_Video.m_PixelFormat = DT_PXFMT_YUV422P_16B; // Use a planar format (16-bit)
+	RowConfig.m_Video.m_StartLine1 = RowConfig.m_Video.m_StartLine2 = 1;
+	RowConfig.m_Video.m_NumLines1 = RowConfig.m_Video.m_NumLines2 = -1;
+	RowConfig.m_Video.m_Scaling = DTAPI_SCALING_OFF; // No scaling for this row
+	RowConfig.m_Video.m_LineAlignment = 8; // Want an 8-byte alignment
+
+	// Enable audio
+	RowConfig.m_AudioEnable = true;
+	// We will add four channels (2x stereo)
+	for (int i = 0; i<4; i++)
 	{
-		GF_VideoOutput *driv = (GF_VideoOutput *) gf_malloc(sizeof(GF_VideoOutput));
-		memset(driv, 0, sizeof(GF_VideoOutput));
-		GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "Dektec Video Output", "gpac distribution")
-
-		DtDevice *dvc = new DtDevice;
-		DtFrameBuffer *dtf = new DtFrameBuffer;
-		if (!dtf || !dvc) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] DTA API couldn't be initialized.\n"));
-			delete dvc;
-			delete dtf;
-			gf_free(driv);
-			return NULL;
-		}
+		DtMxAudioConfig AudioConfig;
+		AudioConfig.m_Index = i;
+		AudioConfig.m_DeEmbed = false; // Nothing to de-embed for an output only row
+		AudioConfig.m_OutputMode = DT_OUTPUT_MODE_ADD; // We want to add audio samples
+		AudioConfig.m_Format = DT_AUDIO_SAMPLE_PCM; // We will add PCM samples
+
+		// Add to config list
+		RowConfig.m_Audio.push_back(AudioConfig);
+	}
 
-		DtContext *dtc = new DtContext;
-		memset(dtc, 0, sizeof(DtContext));
-		dtc->dvc = dvc;
-		dtc->dtf = dtf;
-		driv->opaque = (void*)dtc;
+	// Apply the row configuration
+	res = dtc->m_Matrix->SetRowConfig(0, RowConfig);
+	if (res != DTAPI_OK){
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Failed to set row 0 config"));
+		return GF_BAD_PARAM;
+	}
 
-		driv->Flush = Dektec_Flush;
-		driv->LockBackBuffer = Dektec_LockBackBuffer;
-		driv->Setup = Dektec_Setup;
-		driv->Shutdown = Dektec_Shutdown;
-		driv->ProcessEvent = Dektec_ProcessEvent;
-		driv->Blit = Dektec_Blit;
+	/* --- Final Configuration --- */
+	// Determine the default recommended end-to-end delay for this configuration
+
+	int DefEnd2EndDelay = 0;
+	double CbFrames = 0.0; // Time available for the call-back method
+	res = dtc->m_Matrix->GetDefEndToEndDelay(DefEnd2EndDelay, CbFrames);
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] Default end-to-end delay = %d Frames\n", DefEnd2EndDelay));
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] Time-for-Callback = %.1f Frame Period\n", CbFrames));
+	// Apply the default end-to-end delay
+	res = dtc->m_Matrix->SetEndToEndDelay(DefEnd2EndDelay);
+	if (res != DTAPI_OK){
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Failed to set the end-to-end delay (delay=%d)", DefEnd2EndDelay));
+		return GF_BAD_PARAM;
+	}
 
-		driv->hw_caps |= GF_VIDEO_HW_HAS_YUV_OVERLAY | GF_VIDEO_HW_HAS_YUV;
+	dtc->audio_cbk_ctx.type = DtCbkCtx::AUDIO;
+	res = dtc->m_Matrix->AddMatrixCbFunc(OnNewFrame, &dtc->audio_cbk_ctx);
+	if (res != DTAPI_OK){
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Failed register audio callback function"));
+		return GF_BAD_PARAM;
+	}
+	dtc->video_cbk_ctx.type = DtCbkCtx::VIDEO;
+	dtc->video_cbk_ctx.dr = dr;
+	res = dtc->m_Matrix->AddMatrixCbFunc(OnNewFrame, &dtc->video_cbk_ctx);
+	if (res != DTAPI_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Failed register video callback function"));
+		return GF_BAD_PARAM;
+	}
 
-		return driv;
+	dtc->frameNum = -1;
+	dtc->lastFrameNum = -1;
+	dtc->is_configured = GF_TRUE;
+	// Start transmission right now - this function is called during the blit(), and the object clock is initialized
+	//after the blit, starting now will reduce the number of skipped frames at the dektec startup
+	res = dtc->m_Matrix->Start();
+	if ( res != DTAPI_OK) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[DekTecOut] Can't start transmission: %s.\n", DtapiResult2Str(res)));
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] Transmission started.\n"));
+		dtc->is_sending = GF_TRUE;
+	}
+	return GF_OK;
+}
+
+static GF_Err Dektec_Blit(GF_VideoOutput *dr, GF_VideoSurface *video_src, GF_Window *src_wnd, GF_Window *dst_wnd, u32 overlay_type)
+{
+	DtContext *dtc = (DtContext*)dr->opaque;
+	u32 w = video_src->width;
+	u32 h = video_src->height;
+
+	if (dtc->needs_reconfigure) {
+		if ((w==1280) && (h==720)) {
+		} else if ((w==1920) && (h==1080)) {
+		} else if ((w==3840) && (h==2160)) {
+		} else {
+			return GF_NOT_SUPPORTED;
+		}
+		if (dtc->force_width && dtc->force_height) {
+			if ((w != dtc->force_width) || (h != dtc->force_height)) {
+				return GF_NOT_SUPPORTED;
+			}
+		}
+		dtc->needs_reconfigure = GF_FALSE;
+		Dektec_Configure(dr, w, h, (video_src->pixel_format==GF_PIXEL_YV12_10) ? GF_TRUE : GF_FALSE);
+	} else if ((w!=dtc->width) || (h != dtc->height)) {
+		return GF_NOT_SUPPORTED;
 	}
 
-	void DeleteDektecVideoOutput(void *ifce)
-	{
-		GF_VideoOutput *driv = (GF_VideoOutput *) ifce;
-		DtContext *dtc = (DtContext*)driv->opaque;
-		gf_free(dtc->pixels);
-		gf_free(dtc->pixels_UYVY);
-		delete(dtc->dtf);
-		delete(dtc->dvc);
-		delete(dtc);
+	dtc->pixels_YUV_source = (unsigned char*)video_src->video_buffer;
+	return GF_OK;
+}
+
+
+GF_VideoOutput *NewDektecVideoOutput()
+{
+	GF_VideoOutput *driv = (GF_VideoOutput *) gf_malloc(sizeof(GF_VideoOutput));
+	memset(driv, 0, sizeof(GF_VideoOutput));
+	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "Dektec Video Output", "gpac distribution")
+
+	DtDevice *dvc = new DtDevice;
+	DtMxProcess *Matrix = new DtMxProcess;
+	if (!Matrix || !dvc) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] DTA API couldn't be initialized.\n"));
+		delete dvc;
+		delete Matrix;
 		gf_free(driv);
+		return NULL;
 	}
 
+	DtContext *dtc = new DtContext;
+	memset(dtc, 0, sizeof(DtContext));
+	dtc->dvc = dvc;
+	dtc->m_Matrix = Matrix;
+	driv->opaque = (void*)dtc;
+
+	driv->Flush = Dektec_Flush;
+	driv->LockBackBuffer = Dektec_LockBackBuffer;
+	driv->Setup = Dektec_Setup;
+	driv->Shutdown = Dektec_Shutdown;
+	driv->ProcessEvent = Dektec_ProcessEvent;
+	driv->Blit = Dektec_Blit;
+	driv->hw_caps |= GF_VIDEO_HW_HAS_YUV_OVERLAY | GF_VIDEO_HW_HAS_YUV;
+	driv->max_screen_bpp = 10;
+
+	return driv;
+}
+
+void DeleteDektecVideoOutput(void *ifce)
+{
+	GF_VideoOutput *driv = (GF_VideoOutput *) ifce;
+	DtContext *dtc = (DtContext*)driv->opaque;
+
+	//delete(dtc->dtf);
+	delete(dtc->m_Matrix);
+	delete(dtc->dvc);
+	delete(dtc);
+	gf_free(driv);
+}
+
 
 #ifndef GPAC_STANDALONE_RENDER_2D
 
-	/*interface query*/
-	GPAC_MODULE_EXPORT
+/*interface query*/
+GPAC_MODULE_EXPORT
 	const u32 *QueryInterfaces()
-	{
-		static u32 si [] = {
-			GF_VIDEO_OUTPUT_INTERFACE,
-			0
-		};
-		return si;
-	}
-
-	/*interface create*/
-	GPAC_MODULE_EXPORT
+{
+	static u32 si [] = {
+		GF_VIDEO_OUTPUT_INTERFACE,
+		0
+	};
+	return si;
+}
+
+/*interface create*/
+GPAC_MODULE_EXPORT
 	GF_BaseInterface *LoadInterface(u32 InterfaceType)
-	{
-		if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return (GF_BaseInterface *) NewDektecVideoOutput();
-		return NULL;
-	}
+{
+	if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return (GF_BaseInterface *) NewDektecVideoOutput();
+	return NULL;
+}
 
-	/*interface destroy*/
-	GPAC_MODULE_EXPORT
+/*interface destroy*/
+GPAC_MODULE_EXPORT
 	void ShutdownInterface(GF_BaseInterface *ifce)
-	{
-		switch (ifce->InterfaceType) {
-		case GF_VIDEO_OUTPUT_INTERFACE:
-			DeleteDektecVideoOutput((GF_VideoOutput *)ifce);
-			break;
-		}
+{
+	switch (ifce->InterfaceType) {
+	case GF_VIDEO_OUTPUT_INTERFACE:
+		DeleteDektecVideoOutput((GF_VideoOutput *)ifce);
+		break;
 	}
+}
 
 
-	GPAC_MODULE_STATIC_DECLARATION( dektec_out )
+GPAC_MODULE_STATIC_DECLARATION( dektec_out )
 
 #endif

gpac-0.8.0.tar.gz/modules/dektec_out/dektec_video_old.cpp Added

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

gpac-0.7.1.tar.gz/modules/droid_cam/droid_cam.c -> gpac-0.8.0.tar.gz/modules/droid_cam/droid_cam.c Changed

@@ -265,6 +265,7 @@
 u32 unregisterFunc(void* data)
 {
 	unloadCameraControler(globReader);
+	return 0;
 }
 
 void loadCameraControler(ISOMReader *read)
@@ -279,7 +280,8 @@
 	if ( res == JNI_EDETACHED )
 	{
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] The current thread is not attached to the VM, assuming native thread\n"));
-		if ( res = (*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL) )
+		res = (*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
+		if ( res )
 		{
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] Attach current thread failed: %d\n", res));
 			return;
@@ -508,8 +510,8 @@
 	if ( res == JNI_EDETACHED )
 	{
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] The current thread is not attached to the VM, assuming native thread\n"));
-		if ( res = (*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL) )
-		{
+		res = (*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
+		if ( res ) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] Attach current thread failed: %d\n", res));
 			return;
 		}
@@ -650,6 +652,8 @@
 	/*nothing to do on MP4 for channel config*/
 	case GF_NET_CHAN_CONFIG:
 		return GF_OK;
+	default:
+		break;
 	}
 	return GF_NOT_SUPPORTED;
 }

gpac-0.7.1.tar.gz/modules/droid_mpegv/droid_mpegv.c -> gpac-0.8.0.tar.gz/modules/droid_mpegv/droid_mpegv.c Changed

gpac-0.7.1.tar.gz/modules/droid_out/droid_vout.c -> gpac-0.8.0.tar.gz/modules/droid_out/droid_vout.c Changed

gpac-0.7.1.tar.gz/modules/dummy_in/dummy_in.c -> gpac-0.8.0.tar.gz/modules/dummy_in/dummy_in.c Changed

gpac-0.7.1.tar.gz/modules/dx_hw/dx_audio.c -> gpac-0.8.0.tar.gz/modules/dx_hw/dx_audio.c Changed

@@ -186,8 +186,9 @@
 		format_ex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE);
 		format_ex.SubFormat = GPAC_KSDATAFORMAT_SUBTYPE_PCM;
 		format_ex.Samples.wValidBitsPerSample = *nbBitsPerSample;
-		format_ex.dwChannelMask = 0;
-		if (channel_cfg & GF_AUDIO_CH_FRONT_LEFT) format_ex.dwChannelMask |= SPEAKER_FRONT_LEFT;
+		//our channel config is exactly the same as ksmedia
+		format_ex.dwChannelMask = channel_cfg;
+/*		if (channel_cfg & GF_AUDIO_CH_FRONT_LEFT) format_ex.dwChannelMask |= SPEAKER_FRONT_LEFT;
 		if (channel_cfg & GF_AUDIO_CH_FRONT_RIGHT) format_ex.dwChannelMask |= SPEAKER_FRONT_RIGHT;
 		if (channel_cfg & GF_AUDIO_CH_FRONT_CENTER) format_ex.dwChannelMask |= SPEAKER_FRONT_CENTER;
 		if (channel_cfg & GF_AUDIO_CH_LFE) format_ex.dwChannelMask |= SPEAKER_LOW_FREQUENCY;
@@ -196,6 +197,8 @@
 		if (channel_cfg & GF_AUDIO_CH_BACK_CENTER) format_ex.dwChannelMask |= SPEAKER_BACK_CENTER;
 		if (channel_cfg & GF_AUDIO_CH_SIDE_LEFT) format_ex.dwChannelMask |= SPEAKER_SIDE_LEFT;
 		if (channel_cfg & GF_AUDIO_CH_SIDE_RIGHT) format_ex.dwChannelMask |= SPEAKER_SIDE_RIGHT;
+	*/
+
 		dsbBufferDesc.lpwfxFormat = (WAVEFORMATEX *) &format_ex;
 	}
 #endif

gpac-0.7.1.tar.gz/modules/dx_hw/dx_window.c -> gpac-0.8.0.tar.gz/modules/dx_hw/dx_window.c Changed

gpac-0.7.1.tar.gz/modules/ffmpeg_in/ffmpeg_decode.c -> gpac-0.8.0.tar.gz/modules/ffmpeg_in/ffmpeg_decode.c Changed

@@ -40,6 +40,10 @@
 
 //#define FFMPEG_DIRECT_DISPATCH
 
+#ifndef AV_INPUT_BUFFER_PADDING_SIZE
+#define AV_INPUT_BUFFER_PADDING_SIZE 0
+#endif
+
 /**
 * Allocates data for FFMPEG decoding
 * \param oldBuffer The oldBuffer (freed if not NULL)
@@ -49,7 +53,7 @@
 static uint8_t * ffmpeg_realloc_buffer(uint8_t * oldBuffer, u32 size) {
 	uint8_t * buffer;
 	/* Size of buffer must be larger, see avcodec_decode_video2 documentation */
-	u32 allocatedSz = sizeof( char ) * (FF_INPUT_BUFFER_PADDING_SIZE + size);
+	u32 allocatedSz = sizeof( char ) * (AV_INPUT_BUFFER_PADDING_SIZE + size);
 	if (oldBuffer)
 		gf_free(oldBuffer);
 	buffer = (uint8_t*)gf_malloc( allocatedSz );
@@ -67,7 +71,7 @@
 
 codec = avcodec_find_decoder(codec_4cc);
 if (codec) return codec;
- 
+
 	codec = avcodec_find_decoder_by_name(name);
 if (codec) return codec;
 strupr(name);
@@ -85,7 +89,7 @@
 else if (!stricmp(name, "samr") || !stricmp(name, "amr ")) codec = avcodec_find_decoder(CODEC_ID_AMR_NB);
 else if (!stricmp(name, "sawb")) codec = avcodec_find_decoder(CODEC_ID_AMR_WB);
 
-	
+
 	return codec;
 }
 
@@ -274,6 +278,16 @@
 				codec_id = CODEC_ID_PNG;
 				ffd->is_image = GF_TRUE;
 				break;
+#ifdef CODEC_ID_VP9
+			case GPAC_OTI_VIDEO_VP9:
+				codec_id = CODEC_ID_VP9;
+				break;
+#endif
+#ifdef CODEC_ID_AV1
+			case GPAC_OTI_VIDEO_AV1:
+				codec_id = CODEC_ID_AV1;
+				break;
+#endif
 			case 0xFF:
 				codec_id = CODEC_ID_SVQ3;
 				break;
@@ -298,6 +312,12 @@
 case GPAC_OTI_AUDIO_AAC_MPEG4:
 codec_id = CODEC_ID_AAC;
 break;
+#ifdef CODEC_ID_OPUS
+			case GPAC_OTI_MEDIA_OPUS:
+				codec_id = CODEC_ID_OPUS;
+				(*ctx)->frame_size = 2880;//use max frame size
+				break;
+#endif
 			}
 		}
 		else if ((ffd->st==GF_STREAM_ND_SUBPIC) && (ffd->oti==0xe0)) {
@@ -305,16 +325,24 @@
 		}
 		*codec = avcodec_find_decoder(codec_id);
 
- if (*codec && (codec_id == CODEC_ID_AAC)) {
- bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
- FFDEC_LoadDSI(ffd, bs, *codec, *ctx, GF_FALSE);
- gf_bs_del(bs);
- }
+ if (*codec) {
+ 	switch (codec_id) {
+ 	case CODEC_ID_AAC:
+#ifdef CODEC_ID_OPUS
+ 	case CODEC_ID_OPUS:
+				bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
+				FFDEC_LoadDSI(ffd, bs, *codec, *ctx, GF_FALSE);
+				gf_bs_del(bs);
+#endif
+				break;
+
+			}
+		}
 
 	}
 	/*should never happen*/
 	if (! (*codec)) return GF_OUT_OF_MEM;
-	
+
 	/*not sure this is the right way to do so, no doc in ffmpeg on this topic */
 #if 0
 	/*check HW accel*/
@@ -334,7 +362,11 @@
 	/*setup MPEG-4 video streams*/
 	if (ffd->st==GF_STREAM_VISUAL) {
 		/*for all MPEG-4 variants get size*/
-		if ((ffd->oti==GPAC_OTI_VIDEO_MPEG4_PART2) || (ffd->oti == GPAC_OTI_VIDEO_AVC) || (ffd->oti == GPAC_OTI_VIDEO_HEVC)) {
+		if ((ffd->oti==GPAC_OTI_VIDEO_MPEG4_PART2)
+		 	|| (ffd->oti == GPAC_OTI_VIDEO_AVC)
+		 	|| (ffd->oti == GPAC_OTI_VIDEO_HEVC)
+		 	|| (ffd->oti == GPAC_OTI_VIDEO_AV1)
+		) {
 			/*if not set this may be a remap of non-mpeg4 transport (eg, transport on MPEG-TS) where
 			the DSI is carried in-band*/
 			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
@@ -427,7 +459,7 @@
 		if (avcodec_open((*ctx), (*codec) )<0) return GF_NON_COMPLIANT_BITSTREAM;
 #endif
 	}
-	
+
 	/*setup audio streams*/
 	if (ffd->st==GF_STREAM_AUDIO) {
 		if ((*codec)->id == CODEC_ID_MP2) {
@@ -562,7 +594,7 @@
 		*sws = NULL;
 	}
 #endif
-	
+
 	return GF_OK;
 }
 
@@ -577,7 +609,7 @@
 		capability->cap.valueInt = 1;
 		return GF_OK;
 	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
+		capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
 		return GF_OK;
 	case GF_CODEC_REORDER:
 		capability->cap.valueInt = 1;
@@ -669,7 +701,7 @@
 		break;
 
 	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
+		capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
 		break;
 	default:
 		capability->cap.valueInt = 0;
@@ -706,7 +738,7 @@
 {
 
 	if (!out_pix_fmt || !ffd) return GF_BAD_PARAM;
-	
+
 	switch (pix_fmt) {
 		case PIX_FMT_YUV420P:
 			*out_pix_fmt = GF_PIXEL_YV12;
@@ -735,13 +767,13 @@
 		case PIX_FMT_BGR24:
 			*out_pix_fmt = GF_PIXEL_BGR_24;
 			break;
-			
+
 		default:
 			return GF_NOT_SUPPORTED;
-	
+
 		}
 		return GF_OK;
-		
+
 }
 
 
@@ -765,7 +797,7 @@
 	pkt.data = (uint8_t *)inBuffer;
 	pkt.size = inBufferLength;
 #endif
-	
+
 	(*outBufferLength) = 0;
 
 	/*seeking don't decode*/
@@ -807,7 +839,7 @@
 	/*first config*/
 	if (!ffd->out_size) {
 		u32 bpp = 2;
-		
+
 		if (ctx->channels * ctx->frame_size * bpp < gotpic) ctx->frame_size = gotpic / (bpp * ctx->channels);
 		ffd->out_size = ctx->channels * ctx->frame_size * bpp;
 	}
@@ -1015,7 +1047,8 @@
 	/*we have a valid frame not yet dispatched*/
 	if (ffd->had_pic) {
 		ffd->had_pic = GF_FALSE;
-		gotpic = 1;
+		gotpic = ffd->needs_output_resize ? 0 : 1;
+		ffd->needs_output_resize = 0;
 	} else {
 		if (ffd->check_h264_isma) {
 			/*for AVC bitstreams after ISMA decryption, in case (as we do) the decryption DRM tool
@@ -1124,19 +1157,19 @@
 	}
 
 	stride = frame->linesize[0];
-	
+
 	ret = FFDEC_GetOutputPixelFromat(ctx->pix_fmt, &out_pix_fmt, ffd);
 	if ( ret < 0)
 	{
 		return ret;
 	}
-	
+
 	/*recompute outsize in case on-the-fly change*/
 	if ((w != ctx->width) || (h != ctx->height)
 		|| (ffd->direct_output_mode && (stride != ffd->stride))
 		|| (ffd->out_pix_fmt != out_pix_fmt)
 		//need to realloc the conversion buffer
-		
+
 	 ) {
 
 		ffd->stride = (ffd->direct_output_mode) ? frame->linesize[0] : ctx->width;
@@ -1151,14 +1184,14 @@
 		{
 			outsize = ffd->stride * ctx->height * 3 /2 ;
 			ffd->out_pix_fmt = GF_PIXEL_YV12;
-			
+
 		}
-		
+
 		else if (ctx->pix_fmt == PIX_FMT_YUV422P)
 		{
 			outsize = ffd->stride * ctx->height * 2 ;
 			ffd->out_pix_fmt = GF_PIXEL_YUV422;
-		
+
 		}
 		else if (ctx->pix_fmt == PIX_FMT_YUV444P)
 		{
@@ -1183,8 +1216,8 @@
 				 outsize = ffd->stride * ctx->height * 3;
 		}
 #endif
-		
-		
+
+
 
 		if (ffd->depth_codec) {
 			outsize = 5 * ctx->width * ctx->height / 2;
@@ -1200,7 +1233,7 @@
 		video in the output buffer*/
 		if (!gotpic) {
 			ffd->needs_output_resize = GF_TRUE;
-			return GF_OK;
+//			return GF_OK;
 		}
 		*outBufferLength = ffd->out_size;
 		if (ffd->check_h264_isma) {
@@ -1217,7 +1250,7 @@
 
 		if (ffd->direct_output_mode) {
 			ffd->frame_size_changed = GF_TRUE;
-			
+
 		} else {
 			return GF_BUFFER_TOO_SMALL;
 		}
@@ -1262,7 +1295,7 @@
 		return GF_OK;
 	}
 
-	if (ES_ID == ffd->depth_ES_ID) {
+	if (ES_ID && (ES_ID == ffd->depth_ES_ID)) {
 		s32 i;
 		u8 *pYO, *pYD;
 
@@ -1320,7 +1353,7 @@
 		pict.data[0] = (uint8_t *)outBuffer;
 		pict.linesize[0] = 4*ctx->width;
 		pix_out = PIX_FMT_RGBA;
-	} else { 
+	} else {
 		if (ffd->out_pix_fmt == GF_PIXEL_YV12) {
 		pict.data[0] = (uint8_t *)outBuffer;
 		pict.data[1] = (uint8_t *)outBuffer + ffd->stride * ctx->height;
@@ -1427,7 +1460,7 @@
 	AVFrame *frame;
 
 	if (ffd->direct_output_mode != 1) return GF_BAD_PARAM;
-	
+
 	if (ES_ID && (ffd->depth_ES_ID==ES_ID)) {
 		frame = ffd->depth_frame;
 		*pY_or_RGB = frame->data[0];
@@ -1489,9 +1522,9 @@
 	FFDec *ffd = (FFDec*)ifcg->privateStack;
 
 	*needs_resize = GF_FALSE;
-	
+
 	if (!ffd->base_frame) return GF_BAD_PARAM;
-	
+
 	GF_SAFEALLOC(a_frame, GF_MediaDecoderFrame);
 	if (!a_frame) return GF_OUT_OF_MEM;
 	GF_SAFEALLOC(ff_frame, FF_Frame);
@@ -1505,7 +1538,7 @@
 
 	a_frame->Release = FFFrame_Release;
 	a_frame->GetPlane = FFFrame_GetPlane;
-	
+
 	*frame = a_frame;
 	if (ffd->frame_size_changed) {
 		ffd->frame_size_changed = GF_FALSE;
@@ -1535,7 +1568,7 @@
 
 	codec_id = 0;
 	check_4cc = GF_FALSE;
-	
+
 	/*private from FFMPEG input*/
 	if (ffd->oti == GPAC_OTI_MEDIA_FFMPEG) {
 		bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
@@ -1548,7 +1581,7 @@
 		codec_id = gf_bs_read_u32(bs);
 		check_4cc = GF_TRUE;
 		gf_bs_del(bs);
- 
+
 if (codec_id == GF_4CC('s','a','m','r')) {
 codec_id = CODEC_ID_AMR_NB;
 }
@@ -1577,6 +1610,12 @@
 if (avcodec_find_decoder(codec_id) != NULL)
 return GF_CODEC_MAYBE_SUPPORTED;
 break;
+#ifdef CODEC_ID_OPUS
+		case GPAC_OTI_MEDIA_OPUS:
+			if (avcodec_find_decoder(CODEC_ID_OPUS) != NULL)
+				return GF_CODEC_MAYBE_SUPPORTED;
+#endif
+			return GF_CODEC_NOT_SUPPORTED;
 		}
 	}
 
@@ -1651,6 +1690,20 @@
 				return GF_CODEC_MAYBE_SUPPORTED;
 			return GF_CODEC_NOT_SUPPORTED;
 
+#ifdef CODEC_ID_VP9
+		case GPAC_OTI_VIDEO_VP9:
+			if (avcodec_find_decoder(AV_CODEC_ID_VP9) != NULL)
+				return GF_CODEC_MAYBE_SUPPORTED;
+			return GF_CODEC_NOT_SUPPORTED;
+#endif
+
+#ifdef CODEC_ID_AV1
+		case GPAC_OTI_VIDEO_AV1:
+			if (avcodec_find_decoder(CODEC_ID_AV1) != NULL)
+				return GF_CODEC_MAYBE_SUPPORTED;
+#endif
+			return GF_CODEC_NOT_SUPPORTED;
+
 		default:
 			return GF_CODEC_NOT_SUPPORTED;
 		}
@@ -1728,7 +1781,7 @@
 #if defined(USE_AVCTX3) && defined(FFMPEG_DIRECT_DISPATCH)
 	ptr->GetOutputFrame = FFDEC_GetOutputFrame;
 #endif
-	
+
 	GF_REGISTER_MODULE_INTERFACE(ptr, GF_MEDIA_DECODER_INTERFACE, "FFMPEG decoder", "gpac distribution");
 	return (GF_BaseInterface *) ptr;
 }

gpac-0.7.1.tar.gz/modules/ffmpeg_in/ffmpeg_demux.c -> gpac-0.8.0.tar.gz/modules/ffmpeg_in/ffmpeg_demux.c Changed

gpac-0.7.1.tar.gz/modules/ffmpeg_in/ffmpeg_in.h -> gpac-0.8.0.tar.gz/modules/ffmpeg_in/ffmpeg_in.h Changed

gpac-0.7.1.tar.gz/modules/gpac_js/gpac_js.c -> gpac-0.8.0.tar.gz/modules/gpac_js/gpac_js.c Changed

@@ -150,6 +150,7 @@
 	GJS_OM_PROP_MAIN_ADDON_MEDIATIME = -51,
 	GJS_OM_PROP_DEPENDENT_GROUPS = -52,
 	GJS_OM_PROP_IS_VR_SCENE = -53,
+	GJS_OM_PROP_DISABLED = -54
 };
 
 enum {
@@ -552,6 +553,8 @@
 			return JS_TRUE;
 		}
 		opt = term->compositor->audio_renderer->filter_chain.filters->filter->GetOption(term->compositor->audio_renderer->filter_chain.filters->filter, key_name);
+	} else if (sec_name && !stricmp(sec_name, "General") && key_name && !strcmp(key_name, "Version")) {
+		opt = GPAC_FULL_VERSION;
 	} else if (key_name) {
 		opt = gf_cfg_get_key(term->user->config, sec_name, key_name);
 	} else if (idx>=0) {
@@ -1415,6 +1418,9 @@
 case GJS_OM_PROP_IS_VR_SCENE:
 	*vp = BOOLEAN_TO_JSVAL(odm->subscene && odm->subscene->vr_type ? JS_TRUE : JS_FALSE);
 	break;
+case GJS_OM_PROP_DISABLED:
+	*vp = BOOLEAN_TO_JSVAL(odm->OD->RedirectOnly ? JS_TRUE : JS_FALSE);
+	break;
 }
 return JS_TRUE;
 }
@@ -1928,7 +1934,7 @@
 	if (lock_fail) {
 		GF_Event *evt_clone;
 		gf_mx_p(gjs->event_mx);
-		evt_clone = gf_malloc(sizeof(GF_Event));;
+		evt_clone = gf_malloc(sizeof(GF_Event));
 		memcpy(evt_clone, evt, sizeof(GF_Event));
 		gf_list_add(gjs->event_queue, evt_clone);
 		GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[GPACJS] Couldn't lock % mutex, queing event\n", (lock_fail==2) ? "JavaScript" : "Compositor"));
@@ -2305,6 +2311,7 @@
 		SMJS_PROPERTY_SPEC("main_addon_media_time",		GJS_OM_PROP_MAIN_ADDON_MEDIATIME, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 		SMJS_PROPERTY_SPEC("dependent_groups",		GJS_OM_PROP_DEPENDENT_GROUPS, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 		SMJS_PROPERTY_SPEC("vr_scene",		GJS_OM_PROP_IS_VR_SCENE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("disabled",		GJS_OM_PROP_DISABLED, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 
 		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 	};

gpac-0.7.1.tar.gz/modules/img_in/Makefile -> gpac-0.8.0.tar.gz/modules/img_in/Makefile Changed

gpac-0.7.1.tar.gz/modules/img_in/jp2_dec.c -> gpac-0.8.0.tar.gz/modules/img_in/jp2_dec.c Changed

gpac-0.7.1.tar.gz/modules/ismacryp/isma_ea.c -> gpac-0.8.0.tar.gz/modules/ismacryp/isma_ea.c Changed

@@ -108,7 +108,7 @@
 
 	priv->state = ISMAEA_STATE_ERROR;
 
-	if (cfg->scheme_type != GF_4CC('i','A','E','C')) return GF_NOT_SUPPORTED;
+	if (cfg->scheme_type != GF_ISOM_ISMACRYP_SCHEME) return GF_NOT_SUPPORTED;
 	if (cfg->scheme_version != 1) return GF_NOT_SUPPORTED;
 
 	if (!cfg->kms_uri) return GF_NON_COMPLIANT_BITSTREAM;
@@ -175,7 +175,7 @@
 static GF_Err ISMA_Access(ISMAEAPriv *priv, GF_IPMPEvent *evt)
 {
 	GF_Err e;
-	char IV[16];
+	char IV[GF_AES_128_KEYSIZE];
 
 	if (evt->event_type==GF_IPMP_TOOL_GRANT_ACCESS) {
 		if (priv->state != ISMAEA_STATE_SETUP) return GF_SERVICE_ERROR;
@@ -185,12 +185,12 @@
 		//priv->nb_allow_play--;
 
 		/*init decrypter*/
-		priv->crypt = gf_crypt_open("AES-128", "CTR");
+		priv->crypt = gf_crypt_open(GF_AES_128, GF_CTR);
 		if (!priv->crypt) return GF_IO_ERR;
 
 		memset(IV, 0, sizeof(char)*16);
 		memcpy(IV, priv->salt, sizeof(char)*8);
-		e = gf_crypt_init(priv->crypt, priv->key, 16, IV);
+		e = gf_crypt_init(priv->crypt, priv->key, IV);
 		if (e) return e;
 
 		priv->state = ISMAEA_STATE_PLAY;
@@ -214,7 +214,7 @@
 
 	/*resync IV*/
 	if (!priv->last_IV || (priv->last_IV != evt->isma_BSO)) {
-		char IV[17];
+		char IV[GF_AES_128_KEYSIZE + 1];
 		u64 count;
 		u32 remain;
 		GF_BitStream *bs;
@@ -227,7 +227,7 @@
 		gf_bs_write_data(bs, priv->salt, 8);
 		gf_bs_write_u64(bs, (s64) count);
 		gf_bs_del(bs);
-		gf_crypt_set_state(priv->crypt, IV, 17);
+		gf_crypt_set_IV(priv->crypt, IV, 17);
 
 		/*decrypt remain bytes*/
 		if (remain) {
@@ -251,7 +251,7 @@
 
 	priv->state = ISMAEA_STATE_ERROR;
 
-	if (cfg->scheme_type != GF_4CC('o','d','k','m')) return GF_NOT_SUPPORTED;
+	if (cfg->scheme_type != GF_ISOM_OMADRM_SCHEME) return GF_NOT_SUPPORTED;
 	if (cfg->scheme_version != 0x00000200) return GF_NOT_SUPPORTED;
 
 	hdr_pos = 0;
@@ -286,7 +286,7 @@
 
 	priv->state = ISMAEA_STATE_ERROR;
 
-	if ((cfg->scheme_type != GF_4CC('c', 'e', 'n', 'c')) && (cfg->scheme_type != GF_4CC('c','b','c','1')) && (cfg->scheme_type != GF_4CC('c', 'e', 'n', 's')) && (cfg->scheme_type != GF_4CC('c','b','c','s'))) 
+	if ((cfg->scheme_type != GF_ISOM_CENC_SCHEME) && (cfg->scheme_type != GF_ISOM_CBC_SCHEME) && (cfg->scheme_type != GF_ISOM_CENS_SCHEME) && (cfg->scheme_type != GF_ISOM_CBCS_SCHEME))
 		return GF_NOT_SUPPORTED;
 	if (cfg->scheme_version != 0x00010000) return GF_NOT_SUPPORTED;
 
@@ -320,12 +320,12 @@
 			gf_bin128_parse("0x6770616363656E6364726D746F6F6C31", cypherKey);
 			gf_bin128_parse("0x00000000000000000000000000000001", cypherIV);
 
-			mc = gf_crypt_open("AES-128", "CTR");
+			mc = gf_crypt_open(GF_AES_128, GF_CTR);
 			if (!mc) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open AES-128 CTR\n"));
 				return GF_IO_ERR;
 			}
-			gf_crypt_init(mc, cypherKey, 16, cypherIV);
+			gf_crypt_init(mc, cypherKey, cypherIV);
 			gf_crypt_decrypt(mc, pssh->private_data+cypherOffset, pssh->private_data_size-cypherOffset);
 			gf_crypt_close(mc);
 
@@ -347,7 +347,7 @@
 		}
 	}
 
-	if ((cfg->scheme_type == GF_4CC('c', 'e', 'n', 'c')) || (cfg->scheme_type == GF_4CC('c', 'e', 'n', 's')))
+	if ((cfg->scheme_type == GF_ISOM_CENC_SCHEME) || (cfg->scheme_type == GF_ISOM_CENS_SCHEME))
 		priv->is_cenc = GF_TRUE;
 	else
 		priv->is_cbc = GF_TRUE;
@@ -368,9 +368,9 @@
 
 		/*open decrypter - we do NOT initialize decrypter; it wil be done when we decrypt the first crypted sample*/
 		if (priv->is_cenc)
-			priv->crypt = gf_crypt_open("AES-128", "CTR");
+			priv->crypt = gf_crypt_open(GF_AES_128, GF_CTR);
 		else
-			priv->crypt = gf_crypt_open("AES-128", "CBC");
+			priv->crypt = gf_crypt_open(GF_AES_128, GF_CBC);
 		if (!priv->crypt) return GF_IO_ERR;
 
 		priv->first_crypted_samp = GF_TRUE;
@@ -391,14 +391,15 @@
 static GF_Err CENC_ProcessData(ISMAEAPriv *priv, GF_IPMPEvent *evt)
 {
 	GF_Err e;
-	GF_BitStream *pleintext_bs, *cyphertext_bs, *sai_bs;
-	char IV[17];
+	GF_BitStream *plaintext_bs, *cyphertext_bs, *sai_bs;
+	char IV[GF_AES_128_KEYSIZE + 1];
+
 	bin128 KID;
 	char *buffer;
 	u32 max_size, i, subsample_count;
 	GF_CENCSampleAuxInfo *sai;
 
-	pleintext_bs = cyphertext_bs = sai_bs = NULL;
+	plaintext_bs = cyphertext_bs = sai_bs = NULL;
 	buffer = NULL;
 	max_size = 4096;
 
@@ -408,7 +409,7 @@
 
 	cyphertext_bs = gf_bs_new(evt->data, evt->data_size, GF_BITSTREAM_READ);
 	sai_bs = gf_bs_new(evt->sai, evt->saiz, GF_BITSTREAM_READ);
-	pleintext_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	plaintext_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	buffer = (char*)gf_malloc(sizeof(char) * max_size);
 
 	sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
@@ -448,7 +449,7 @@
 			if (evt->constant_IV_size == 8)
 				memset(IV+8, 0, sizeof(char)*8);
 		}
-		e = gf_crypt_init(priv->crypt, priv->key, 16, IV);
+		e = gf_crypt_init(priv->crypt, priv->key, IV);
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot initialize AES-128 AES-128 %s (%s)\n", priv->is_cenc ? "CTR" : "CBC", gf_error_to_string(e)) );
 			e = GF_IO_ERR;
@@ -464,9 +465,9 @@
 			if (sai->IV_size == 8)
 				gf_bs_write_u64(bs, 0); /*0-padded if IV_size == 8*/
 			gf_bs_del(bs);
-			gf_crypt_set_state(priv->crypt, IV, 17);
+			gf_crypt_set_IV(priv->crypt, IV, 17);
 		}
-		e = gf_crypt_set_key(priv->crypt, priv->key, 16, IV);
+		e = gf_crypt_set_key(priv->crypt, priv->key);
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot set key AES-128 %s (%s)\n", priv->is_cenc ? "CTR" : "CBC", gf_error_to_string(e)) );
 			e = GF_IO_ERR;
@@ -484,18 +485,18 @@
 				memmove(IV, evt->constant_IV, evt->constant_IV_size);
 				if (evt->constant_IV_size == 8)
 					memset(IV+8, 0, sizeof(char)*8);
-				gf_crypt_set_state(priv->crypt, IV, 16);
+				gf_crypt_set_IV(priv->crypt, IV, 16);
 			}
 
-			/*read clear data and write it to pleintext bitstream*/
+			/*read clear data and write it to plaintext_bs bitstream*/
 			if (max_size < sai->subsamples[subsample_count].bytes_clear_data) {
 				buffer = (char*)gf_realloc(buffer, sizeof(char)*sai->subsamples[subsample_count].bytes_clear_data);
 				max_size = sai->subsamples[subsample_count].bytes_clear_data;
 			}
 			gf_bs_read_data(cyphertext_bs, buffer, sai->subsamples[subsample_count].bytes_clear_data);
-			gf_bs_write_data(pleintext_bs, buffer, sai->subsamples[subsample_count].bytes_clear_data);
+			gf_bs_write_data(plaintext_bs, buffer, sai->subsamples[subsample_count].bytes_clear_data);
 
-			/*now read encrypted data, decrypted it and write to pleintext bitstream*/
+			/*now read encrypted data, decrypted it and write to plaintext_bs bitstream*/
 			if (max_size < sai->subsamples[subsample_count].bytes_encrypted_data) {
 				buffer = (char*)gf_realloc(buffer, sizeof(char)*sai->subsamples[subsample_count].bytes_encrypted_data);
 				max_size = sai->subsamples[subsample_count].bytes_encrypted_data;
@@ -517,12 +518,12 @@
 			} else {
 				gf_crypt_decrypt(priv->crypt, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
 			}
-			gf_bs_write_data(pleintext_bs, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
+			gf_bs_write_data(plaintext_bs, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
 
 			subsample_count++;
 		}
 		if (buffer) gf_free(buffer);
-		gf_bs_get_content(pleintext_bs, &buffer, &evt->data_size);
+		gf_bs_get_content(plaintext_bs, &buffer, &evt->data_size);
 	}
 	//full sample encryption
 	else {
@@ -530,7 +531,7 @@
 			buffer = (char*)gf_realloc(buffer, sizeof(char)*evt->data_size);
 		}
 		gf_bs_read_data(cyphertext_bs, buffer, evt->data_size);
-		if (priv->is_cenc) {			
+		if (priv->is_cenc) {
 			gf_crypt_decrypt(priv->crypt, buffer, evt->data_size);
 		} else {
 			u32 ret = evt->data_size % 16;
@@ -542,7 +543,7 @@
 	memmove(evt->data, buffer, evt->data_size);
 
 exit:
-	if (pleintext_bs) gf_bs_del(pleintext_bs);
+	if (plaintext_bs) gf_bs_del(plaintext_bs);
 	if (sai_bs) gf_bs_del(sai_bs);
 	if (cyphertext_bs) gf_bs_del(cyphertext_bs);
 	if (buffer) gf_free(buffer);
@@ -558,11 +559,11 @@
 
 	switch (evt->event_type) {
 	case GF_IPMP_TOOL_SETUP:
-		if (evt->config_data_code == GF_4CC('i','s','m','a')) return ISMA_Setup(priv, evt);
+		if (evt->config_data_code == GF_ISOM_ISMA_SCHEME) return ISMA_Setup(priv, evt);
 #ifdef OMA_DRM_MP4MC
-		if (evt->config_data_code == GF_4CC('o','d','r','m')) return OMA_DRM_Setup(priv, evt);
+		if (evt->config_data_code == GF_ISOM_ODRM_SCHEME) return OMA_DRM_Setup(priv, evt);
 #endif
-		if((evt->config_data_code == GF_4CC('c', 'e', 'n', 'c')) || (evt->config_data_code == GF_4CC('c','b','c','1')) || (evt->config_data_code == GF_4CC('c', 'e', 'n', 's')) || (evt->config_data_code == GF_4CC('c','b','c','s'))) 
+		if((evt->config_data_code == GF_ISOM_CENC_SCHEME) || (evt->config_data_code == GF_ISOM_CBC_SCHEME) || (evt->config_data_code == GF_ISOM_CENS_SCHEME) || (evt->config_data_code == GF_ISOM_CBCS_SCHEME))
 			return CENC_Setup(priv, evt);
 		return GF_NOT_SUPPORTED;

gpac-0.7.1.tar.gz/modules/isom_in/isom_cache.c -> gpac-0.8.0.tar.gz/modules/isom_in/isom_cache.c Changed

gpac-0.7.1.tar.gz/modules/isom_in/isom_in.h -> gpac-0.8.0.tar.gz/modules/isom_in/isom_in.h Changed

gpac-0.7.1.tar.gz/modules/isom_in/load.c -> gpac-0.8.0.tar.gz/modules/isom_in/load.c Changed

@@ -96,12 +96,16 @@
 	count = gf_isom_get_track_count(read->mov);
 	for (i=0; i<count; i++) {
 		u32 m_subtype;
+ u32 mtype;
 		if (!gf_isom_is_track_enabled(read->mov, i+1))
 			continue;
 
-		switch (gf_isom_get_media_type(read->mov, i+1)) {
+ mtype = gf_isom_get_media_type(read->mov, i+1);
+		switch (mtype) {
 		case GF_ISOM_MEDIA_AUDIO:
 		case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
 		case GF_ISOM_MEDIA_TEXT:
 		case GF_ISOM_MEDIA_SUBT:
 		case GF_ISOM_MEDIA_SUBPIC:
@@ -141,7 +145,7 @@
 			}
 		}
 
-		if ((gf_isom_get_media_type(read->mov, i+1) == GF_ISOM_MEDIA_VISUAL) && !highest_stream)
+		if (gf_isom_is_video_subtype(mtype) && !highest_stream)
 			continue;
 		esd = gf_media_map_esd(read->mov, i+1);
 		if (esd) {
@@ -250,9 +254,10 @@
 
 				/*don't display cover art when video is present*/
 				for (i=0; i<gf_isom_get_track_count(read->mov); i++) {
+ u32 mtype = gf_isom_get_media_type(read->mov, i+1);
 					if (!gf_isom_is_track_enabled(read->mov, i+1))
 						continue;
-					if (gf_isom_get_media_type(read->mov, i+1) == GF_ISOM_MEDIA_VISUAL) {
+					if (gf_isom_is_video_subtype(mtype) ) {
 						isom_contains_video = GF_TRUE;
 						break;
 					}
@@ -272,6 +277,26 @@
 			}
 		}
 	}
+	count = gf_isom_get_meta_item_count(read->mov, GF_TRUE, 0);
+	if (count) {
+		u32 item_id = gf_isom_get_meta_primary_item_id(read->mov, GF_TRUE, 0);
+		if (item_id) {
+			esd = gf_media_map_item_esd(read->mov, item_id);
+			if (esd) {
+				od = (GF_ObjectDescriptor *)gf_odf_desc_new(GF_ODF_OD_TAG);
+				od->service_ifce = read->input;
+				od->objectDescriptorID = 0;
+				gf_list_add(od->ESDescriptors, esd);
+
+				if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
+					send_proxy_command(read, GF_FALSE, GF_TRUE, GF_OK, (GF_Descriptor*)od, NULL);
+				}
+				else {
+					gf_service_declare_media(read->service, (GF_Descriptor*)od, GF_TRUE);
+				}
+			}
+		}
+	}
 	if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
 		send_proxy_command(read, GF_FALSE, GF_TRUE, GF_OK, NULL, NULL);
 	} else {

gpac-0.7.1.tar.gz/modules/isom_in/read.c -> gpac-0.8.0.tar.gz/modules/isom_in/read.c Changed

@@ -75,6 +75,8 @@
 	"audio/3gpp2", "3g2 3gp2", "3GPP2/MMS Music",
 	"video/iso.segment", "iso", "ISOBMF Fragments",
 	"audio/iso.segment", "iso", "ISOBMF Fragments",
+	"image/heif", "heif", "HEIF Images",
+	"image/heic", "heic", "HEIF Images",
 	NULL
 };
 
@@ -180,7 +182,9 @@
 			} else {
 				do_buffer = ch->buffering;
 			}
-			buffer_level = (u32) ( (done - data_offset) / mov_rate * 1000);
+			buffer_level = 0;
+			if (done > data_offset)
+				buffer_level = (u32) ( (done - data_offset) / mov_rate * 1000);
 #else
 			//we only send buffer on/off based on remainging playback time in channel
 			time_remain_ch -= (samp->DTS + samp->CTS_Offset);
@@ -426,7 +430,7 @@
 			gf_service_connect_ack(read->service, NULL, GF_OK);
 		}
 
-		if (read->no_service_desc) isor_declare_objects(read);
+		if (read->no_service_desc)	isor_declare_objects(read);
 
 	} else {
 		/*setup downloader*/
@@ -585,7 +589,7 @@
 		for (i=0; i<gf_isom_get_track_count(read->mov); i++) {
 			u32 type = gf_isom_get_media_type(read->mov, i+1);
 			if (
-			 ((type==GF_ISOM_MEDIA_VISUAL) && (expect_type==GF_MEDIA_OBJECT_VIDEO))
+			 (gf_isom_is_video_subtype(type) && (expect_type==GF_MEDIA_OBJECT_VIDEO))
 			 || ((type==GF_ISOM_MEDIA_AUDIO) && (expect_type==GF_MEDIA_OBJECT_AUDIO)) ) {
 				trackID = gf_isom_get_track_id(read->mov, i+1);
 				break;
@@ -698,6 +702,9 @@
 	gf_isom_get_cenc_info(ch->owner->mov, ch->track, 1, NULL, &com.drm_cfg.scheme_type, &com.drm_cfg.scheme_version, NULL);
 
 	com.drm_cfg.PSSH_count = gf_isom_get_pssh_count(ch->owner->mov);
+	//no pssh, skip event
+	if (!com.drm_cfg.PSSH_count) return;
+
 	com.drm_cfg.PSSHs = gf_malloc(sizeof(GF_NetComDRMConfigPSSH)*(com.drm_cfg.PSSH_count) );
 
 	/*fill PSSH in the structure. We will free it in CENC_Setup*/
@@ -724,12 +731,14 @@
 	ISOMChannel *ch;
 	GF_NetworkCommand com;
 	u32 track;
+	u32 item_idx;
 	Bool is_esd_url;
 	GF_Err e;
 	ISOMReader *read;
 	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
 	read = (ISOMReader *) plug->priv;
 
+	item_idx = 0;
 	track = 0;
 	ch = NULL;
 	is_esd_url = GF_FALSE;
@@ -775,8 +784,11 @@
 	}
 	track = gf_isom_get_track_by_id(read->mov, (u32) ESID);
 	if (!track) {
-		e = GF_STREAM_NOT_FOUND;
-		goto exit;
+		item_idx = gf_isom_get_meta_item_by_id(read->mov, GF_TRUE, 0, ESID);
+		if (!item_idx) {
+			e = GF_STREAM_NOT_FOUND;
+			goto exit;
+		}
 	}
 
 	GF_SAFEALLOC(ch, ISOMChannel);
@@ -787,34 +799,42 @@
 	ch->owner = read;
 	ch->channel = channel;
 	gf_list_add(read->channels, ch);
-	ch->track = track;
-	ch->track_id = gf_isom_get_track_id(read->mov, ch->track);
-	switch (gf_isom_get_media_type(ch->owner->mov, ch->track)) {
-	case GF_ISOM_MEDIA_OCR:
-		ch->streamType = GF_STREAM_OCR;
-		break;
-	case GF_ISOM_MEDIA_SCENE:
-		ch->streamType = GF_STREAM_SCENE;
-		break;
-	case GF_ISOM_MEDIA_VISUAL:
-		gf_isom_get_reference(ch->owner->mov, ch->track, GF_ISOM_REF_BASE, 1, &ch->base_track);
-		//use base track only if avc/svc or hevc/lhvc. If avc+lhvc we need different rules
-		if ( gf_isom_get_avc_svc_type(ch->owner->mov, ch->base_track, 1) == GF_ISOM_AVCTYPE_AVC_ONLY) {
-			if ( gf_isom_get_hevc_lhvc_type(ch->owner->mov, ch->track, 1) >= GF_ISOM_HEVCTYPE_HEVC_ONLY) {
-				ch->base_track=0;
+	if (!item_idx) {
+		ch->track = track;
+		ch->track_id = gf_isom_get_track_id(read->mov, ch->track);
+		switch (gf_isom_get_media_type(ch->owner->mov, ch->track)) {
+		case GF_ISOM_MEDIA_OCR:
+			ch->streamType = GF_STREAM_OCR;
+			break;
+		case GF_ISOM_MEDIA_SCENE:
+			ch->streamType = GF_STREAM_SCENE;
+			break;
+		case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
+			gf_isom_get_reference(ch->owner->mov, ch->track, GF_ISOM_REF_BASE, 1, &ch->base_track);
+			//use base track only if avc/svc or hevc/lhvc. If avc+lhvc we need different rules
+			if (gf_isom_get_avc_svc_type(ch->owner->mov, ch->base_track, 1) == GF_ISOM_AVCTYPE_AVC_ONLY) {
+				if (gf_isom_get_hevc_lhvc_type(ch->owner->mov, ch->track, 1) >= GF_ISOM_HEVCTYPE_HEVC_ONLY) {
+					ch->base_track = 0;
+				}
 			}
+
+			ch->next_track = 0;
+			break;
 		}
-		
-		ch->next_track = 0;
-		/*in scalable mode add SPS/PPS in-band*/
-		ch->nalu_extract_mode = GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG /*| GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG*/;
-		gf_isom_set_nalu_extract_mode(ch->owner->mov, ch->track, ch->nalu_extract_mode);
-		break;
+		ch->has_edit_list = gf_isom_get_edit_list_type(ch->owner->mov, ch->track, &ch->dts_offset) ? GF_TRUE : GF_FALSE;
+		ch->has_rap = (gf_isom_has_sync_points(ch->owner->mov, ch->track) == 1) ? GF_TRUE : GF_FALSE;
+		ch->time_scale = gf_isom_get_media_timescale(ch->owner->mov, ch->track);
+	}
+	else {
+		ch->item_id = ESID;
+		ch->item_idx = item_idx;
+		ch->use_item = GF_TRUE;
+		ch->has_edit_list = GF_FALSE;
+		ch->has_rap = GF_TRUE;
+		ch->time_scale = 1000;
 	}
-
-	ch->has_edit_list = gf_isom_get_edit_list_type(ch->owner->mov, ch->track, &ch->dts_offset) ? GF_TRUE : GF_FALSE;
-	ch->has_rap = (gf_isom_has_sync_points(ch->owner->mov, ch->track)==1) ? GF_TRUE : GF_FALSE;
-	ch->time_scale = gf_isom_get_media_timescale(ch->owner->mov, ch->track);
 
 exit:
 	if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
@@ -870,6 +890,11 @@
 			isor_send_cenc_config(ch);
 		}
 	}
+	if (!ch->is_encrypted) {
+		/*in scalable mode add SPS/PPS in-band*/
+		ch->nalu_extract_mode = GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG /*| GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG*/;
+		gf_isom_set_nalu_extract_mode(ch->owner->mov, ch->track, ch->nalu_extract_mode);
+	}
 	return e;
 }
 
@@ -927,7 +952,12 @@
 	if (!ch->sample) {
 		/*get sample*/
 		gf_mx_p(read->segment_mutex);
-		isor_reader_get_sample(ch);
+		if (!ch->use_item) {
+			isor_reader_get_sample(ch);
+		}
+		else {
+			isor_reader_get_sample_from_item(ch);
+		}
 		gf_mx_v(read->segment_mutex);
 		*is_new_data = ch->sample ? GF_TRUE : GF_FALSE;
 	}
@@ -1070,11 +1100,6 @@
 		isor_flush_data(read, 1, com->proxy_data.is_chunk);
 		return GF_OK;
 	}
-	if (com->command_type == GF_NET_SERVICE_FLUSH_DATA) {
-		if (read->nb_playing && plug->query_proxy)
-			isor_flush_data(read, 0, 0);
-		return GF_OK;
-	}
 	if (com->command_type == GF_NET_SERVICE_CAN_REVERSE_PLAYBACK)
 		return GF_OK;
 
@@ -1164,6 +1189,9 @@
 
 		//and check buffer level on play request
 		isor_check_buffer_level(read);
+		if (!read->nb_playing)
+			gf_isom_reset_seq_num(read->mov);
+
 		read->nb_playing++;
 		return GF_OK;
 	case GF_NET_CHAN_STOP:

gpac-0.7.1.tar.gz/modules/isom_in/read_ch.c -> gpac-0.8.0.tar.gz/modules/isom_in/read_ch.c Changed

@@ -184,10 +184,10 @@
 					u64 bytesMissing=0;
 					e = gf_isom_refresh_fragmented(read->mov, &bytesMissing, read->use_memory ? param.url_query.next_url : NULL);
 
-					if (e) {
+					if (e && (e!= GF_ISOM_INCOMPLETE_FILE)) {
 						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Failed to reparse segment %s: %s\n", param.url_query.next_url, gf_error_to_string(e) ));
 					} else {
-						GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[IsoMedia] LowLatency mode: Reparsing segment %s boxes at UTC "LLU" - "LLU" bytes still missing\n", param.url_query.next_url, gf_net_get_utc(), bytesMissing ));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] LowLatency mode: Reparsing segment %s boxes at UTC "LLU" - "LLU" bytes still missing\n", param.url_query.next_url, gf_net_get_utc(), bytesMissing ));
 					}
 #ifndef GPAC_DISABLE_LOG
 					if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_DEBUG)) {
@@ -217,23 +217,49 @@
 			e = GF_OK;
 			if (param.url_query.next_url_init_or_switch_segment) {
 				u64 tfdt = gf_isom_get_current_tfdt(read->mov, 1);
-				char *tfdt_val = strstr(param.url_query.next_url_init_or_switch_segment, "tfdt=");
+
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Switching between files - opening new init segment %s (time offset="LLU")\n", param.url_query.next_url_init_or_switch_segment, tfdt));
-				if (tfdt_val) {
-					sprintf(tfdt_val+5, LLU, tfdt);
-				} else {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[IsoMedia] Error finding init time for init segment %s at UTC "LLU"\n", param.url_query.next_url_init_or_switch_segment, gf_net_get_utc() ));
+
+				if (gf_isom_is_smooth_streaming_moov(read->mov)) {
+					char *tfdt_val = strstr(param.url_query.next_url_init_or_switch_segment, "tfdt=");
+
+					//smooth adressing, replace tfdt=0000000000000000000 with proper value
+					if (tfdt_val) {
+						sprintf(tfdt_val+5, LLU, tfdt);
+					} else {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[IsoMedia] Error finding init time for init segment %s at UTC "LLU"\n", param.url_query.next_url_init_or_switch_segment, gf_net_get_utc() ));
+					}
 				}
+
 				if (read->mov) gf_isom_close(read->mov);
 				e = gf_isom_open_progressive(param.url_query.next_url_init_or_switch_segment, param.url_query.switch_start_range, param.url_query.switch_end_range, &read->mov, &read->missing_bytes);
 				if (e < 0) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Error opening init segment %s at UTC "LLU": %s\n", param.url_query.next_url_init_or_switch_segment, gf_net_get_utc(), gf_error_to_string(e) ));
+				} else {
+					for (i=0; i<count; i++) {
+						ISOMChannel *ch = gf_list_get(read->channels, i);
+						ch->track_id = gf_isom_get_track_id(read->mov, ch->track);
+						ch->has_edit_list = gf_isom_get_edit_list_type(ch->owner->mov, ch->track, &ch->dts_offset) ? GF_TRUE : GF_FALSE;
+						ch->has_rap = (gf_isom_has_sync_points(ch->owner->mov, ch->track) == 1) ? GF_TRUE : GF_FALSE;
+						ch->time_scale = gf_isom_get_media_timescale(ch->owner->mov, ch->track);
+						ch->start = 0;
+					}
 				}
 			}
 			if (!e) {
 				flags = 0;
 				if (read->no_order_check) flags |= GF_ISOM_SEGMENT_NO_ORDER_FLAG;
 				if (scalable_segment) flags |= GF_ISOM_SEGMENT_SCALABLE_FLAG;
+				else {
+					//whenever we load a base segment, reset all sample count info
+					gf_isom_reset_sample_count(read->mov);
+					for (i=0; i<count; i++) {
+						ISOMChannel *ch = gf_list_get(read->channels, i);
+						if (ch) ch->sample_num = 0;
+					}
+				}
+
+
 				e = gf_isom_open_segment(read->mov, param.url_query.next_url, param.url_query.start_range, param.url_query.end_range, flags);
 
 				if (param.url_query.current_download && (e==GF_ISOM_INCOMPLETE_FILE)) {
@@ -399,6 +425,12 @@
 		if (ch->has_rap && ch->has_edit_list) {
 			ch->edit_sync_frame = ch->sample_num;
 		}
+
+		if (ch->sample && !ch->sample->data && ch->owner->frag_type && !ch->has_edit_list) {
+			gf_isom_sample_del(&ch->sample);
+			ch->sample_num = 1;
+			ch->sample = gf_isom_get_sample(ch->owner->mov, ch->track, ch->sample_num, &sample_desc_index);
+		}
 	}
 
 	/*no sample means we're not in the track range - stop*/
@@ -415,6 +447,7 @@
 		} else if (ch->sample_num) {
 			ch->last_state = (ch->owner->frag_type==1) ? GF_OK : GF_EOS;
 			ch->to_init = 0;
+			ch->last_sample_desc_index = 1;
 		}
 		return;
 	}
@@ -442,7 +475,7 @@
 	} else {
 		ch->current_slh.decodingTimeStamp = ch->start;
 		ch->current_slh.compositionTimeStamp = ch->start;
-		
+
 		//TODO - we need to notify scene decoder how many secs elapsed between RAP and seek point
 		if (ch->current_slh.compositionTimeStamp != ch->sample->DTS + ch->sample->CTS_Offset) {
 			ch->current_slh.seekFlag = 1;
@@ -454,7 +487,24 @@
 	ch->owner->no_order_check = ch->speed < 0 ? GF_TRUE : GF_FALSE;
 }
 
-
+void isor_reader_get_sample_from_item(ISOMChannel *ch)
+{
+	if (ch->current_slh.AU_sequenceNumber) {
+		ch->last_state = GF_EOS;
+		return;
+	}
+	ch->sample_time = 0;
+	ch->last_state = GF_OK;
+	ch->sample = gf_isom_sample_new();
+	ch->sample->IsRAP = RAP;
+	ch->current_slh.accessUnitEndFlag = ch->current_slh.accessUnitStartFlag = 1;
+	ch->current_slh.au_duration = 1000;
+	ch->current_slh.randomAccessPointFlag = ch->sample->IsRAP;
+	ch->current_slh.compositionTimeStampFlag = 1;
+	ch->current_slh.decodingTimeStampFlag = 1;
+	gf_isom_extract_meta_item_mem(ch->owner->mov, GF_TRUE, 0, ch->item_id, &ch->sample->data, &ch->sample->dataLength, NULL, GF_FALSE);
+	ch->current_slh.accessUnitLength = ch->sample->dataLength;
+}
 
 void isor_reader_get_sample(ISOMChannel *ch)
 {
@@ -648,6 +698,8 @@
 		u32 mtype = gf_isom_get_media_type(ch->owner->mov, ch->track);
 		switch (mtype) {
 		case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
 			//code is here as a reminder, but by default we use inband param set extraction so no need for it
 #if 0
 			if ( ! (ch->nalu_extract_mode & GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG) ) {
@@ -715,6 +767,7 @@
 	}
 	ch->current_slh.randomAccessPointFlag = ch->sample->IsRAP;
 	ch->current_slh.OCRflag = ch->owner->clock_discontinuity ? 2 : 0;
+	ch->current_slh.ts_res = ch->time_scale;
 	ch->owner->clock_discontinuity = 0;
 
 	//handle negative ctts
@@ -857,7 +910,7 @@
 			read->in_data_flush = 0;
 			gf_mx_v(read->segment_mutex);
 			if (count) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Buffer level %d ms higher than max allowed %d ms - skipping dispatch\n", com.buffer.occupancy, com.buffer.max));
+//				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Buffer level %d ms higher than max allowed %d ms - skipping dispatch\n", com.buffer.occupancy, com.buffer.max));
 			}
 			return;
 		}
@@ -916,6 +969,10 @@
 		if (read->has_pending_segments) {
 			read->has_pending_segments--;
 		}
+		if (param.url_query.discontinuity_type==2) {
+			gf_isom_reset_fragment_info(read->mov, 0);
+			read->clock_discontinuity = 1;
+		}
 
 		if (e==GF_EOS) {
 			for (i=0; i<count; i++) {

gpac-0.7.1.tar.gz/modules/mediacodec_dec/mediacodec_dec.c -> gpac-0.8.0.tar.gz/modules/mediacodec_dec/mediacodec_dec.c Changed

@@ -1,72 +1,74 @@
 #include <gpac/internal/media_dev.h>
 #include <gpac/constants.h>
 
-#include "../../src/compositor/gl_inc.h"
-
-#include <jni.h>
-
-#include "media/NdkMediaCodec.h"
-#include "media/NdkMediaExtractor.h"
-#include "media/NdkMediaFormat.h"
+#include <media/NdkMediaCodec.h>
+#include <media/NdkMediaExtractor.h>
+#include <media/NdkMediaFormat.h>
 #include "mediacodec_dec.h"
 
 typedef struct 
 {
- AMediaCodec *codec;
- AMediaFormat *format;
- ANativeWindow * window;
-	char * frame;
+	AMediaCodec *codec;
+	AMediaFormat *format;
+	ANativeWindow *window;
+	char *frame, *decoder_name;
 	Bool use_gl_textures;
- u32 dequeue_timeout;
-
- u32 width, height, stride, out_size;
- u32 pixel_ar, pix_fmt;
+	u32 dequeue_timeout;
+	u32 width, height, stride, out_size;
+	u32 pixel_ar, pix_fmt;
 	u32 crop_left, crop_right, crop_top, crop_bottom;
 	int crop_unitX, crop_unitY;
-
- const char *mime;
-
- u8 chroma_format, luma_bit_depth, chroma_bit_depth;
- GF_ESD *esd;
+	const char *mime;
+	u8 chroma_format, luma_bit_depth, chroma_bit_depth;
+	GF_ESD *esd;
 	Float frame_rate;
+	Bool is_adaptive;
 	Bool surface_rendering;
 	Bool frame_size_changed;
- Bool inputEOS, outputEOS;
+	Bool inputEOS, outputEOS;
 	Bool raw_frame_dispatch;
- //NAL-based specific
-	GF_List *SPSs, *PPSs;
-	s32 active_sps, active_pps;
- char *sps, *pps;
- u32 sps_size, pps_size;
+	Bool can_init_decoder;
+	MC_SurfaceTexture surfaceTex;
+	//NAL-based specific
+	GF_List *SPSs, *PPSs, *VPSs;
+	s32 active_sps, active_pps, active_vps;
 	AVCState avc;
+	HEVCState hevc;
 	u32 decoded_frames_pending;
 	Bool reconfig_needed;
- u32 nalu_size_length;
-
- //hevc
- char *vps;
- u32 luma_bpp, chroma_bpp, dec_frames;
- u8 chroma_format_idc;
- u16 ES_ID;
- u32 vps_size;
+	Bool before_exit_registered;
+	u32 nalu_size_length;
+	//hevc
+	char *vps;
+	u32 luma_bpp, chroma_bpp, dec_frames;
+	u8 chroma_format_idc;
+	u16 ES_ID;
 	AMediaCodecBufferInfo info;
 	ssize_t outIndex;
-	u32 gl_tex_id;
-
+	GLuint tex_id;
 } MCDec;
+
 typedef struct {
 	char * frame;
 	MCDec * ctx;
 	ssize_t outIndex;
 	Bool flushed;
-	
 } MC_Frame;
-u8 sdkInt() 
+
+enum {
+	PPS = 0,
+	SPS,
+	VPS,
+};
+
+#if 0
+u8 sdkInt()
 {
 char sdk_str[3] = "0";
 __system_property_get("ro.build.version.sdk", sdk_str, "0");
 return atoi(sdk_str);
 }
+#endif
 
 
 //prepend the inBuffer with the start code i.e. 0x00 0x00 0x00 0x01
@@ -222,93 +224,63 @@
 
 GF_Err MCDec_InitHevcDecoder(MCDec *ctx) 
 {
- u32 i, j;
- GF_HEVCConfig *cfg = NULL;
-
- ctx->ES_ID = ctx->esd->ESID;
- ctx->width = ctx->height = ctx->out_size = ctx->luma_bpp = ctx->chroma_bpp = ctx->chroma_format_idc = 0;
-
- if (ctx->esd->decoderConfig->decoderSpecificInfo && ctx->esd->decoderConfig->decoderSpecificInfo->data) {
- HEVCState hevc;
- memset(&hevc, 0, sizeof(HEVCState));
-
- cfg = gf_odf_hevc_cfg_read(ctx->esd->decoderConfig->decoderSpecificInfo->data, ctx->esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
- if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
- ctx->nalu_size_length = cfg->nal_unit_size;
-
- for (i=0; i< gf_list_count(cfg->param_array); i++) {
- GF_HEVCParamArray *ar = (GF_HEVCParamArray *)gf_list_get(cfg->param_array, i);
- for (j=0; j< gf_list_count(ar->nalus); j++) {
- GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j);
- s32 idx;
- u16 hdr = sl->data[0] << 8 | sl->data[1];
-
- if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
- idx = gf_media_hevc_read_sps(sl->data, sl->size, &hevc);
- ctx->width = MAX(hevc.sps[idx].width, ctx->width);
- ctx->height = MAX(hevc.sps[idx].height, ctx->height);
- ctx->luma_bpp = MAX(hevc.sps[idx].bit_depth_luma, ctx->luma_bpp);
- ctx->chroma_bpp = MAX(hevc.sps[idx].bit_depth_chroma, ctx->chroma_bpp);
- ctx->chroma_format_idc = hevc.sps[idx].chroma_format_idc;
-
- ctx->sps = (char *) malloc(4 + sl->size);
- ctx->sps_size = sl->size;
- prependStartCode(sl->data, ctx->sps, &ctx->sps_size);
- }
- else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
- gf_media_hevc_read_vps(sl->data, sl->size, &hevc);
-
- ctx->vps = (char *) malloc(4 + sl->size);
- ctx->vps_size = sl->size;
- prependStartCode(sl->data, ctx->vps, &ctx->vps_size);
- }
- else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
- gf_media_hevc_read_pps(sl->data, sl->size, &hevc);
-
- ctx->pps = (char *) malloc(4 + sl->size);
- ctx->pps_size = sl->size;
- prependStartCode(sl->data, ctx->pps, &ctx->pps_size); 
- }
- }
- }
- gf_odf_hevc_cfg_del(cfg);
- } else {
- ctx->nalu_size_length = 0;
- }
-
- ctx->stride = ((ctx->luma_bpp==8) && (ctx->chroma_bpp==8)) ? ctx->width : ctx->width * 2;
- if ( ctx->chroma_format_idc == 1) { // 4:2:0
- ctx->out_size = ctx->stride * ctx->height * 3 / 2;
- }
- else if ( ctx->chroma_format_idc == 2) { // 4:2:2
- ctx->out_size = ctx->stride * ctx->height * 2 ;
- }
- else if ( ctx->chroma_format_idc == 3) { // 4:4:4
- ctx->out_size = ctx->stride * ctx->height * 3;
- }
- else {
- return GF_NOT_SUPPORTED;
- }
- 
- ctx->mime = "video/hevc";
- 
- u32 csd0_size = ctx->sps_size + ctx-> pps_size + ctx->vps_size;
- char *csd0 = (char *) malloc(csd0_size);
+	s32 idx;
+	char *dsi_data = NULL;
+	u32 dsi_data_size = 0;
+	
+	if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs) && gf_list_count(ctx->VPSs)) {
+		u32 i;
+		GF_HEVCConfig *cfg ;
+		GF_AVCConfigSlot *sps = NULL;
+		GF_AVCConfigSlot *pps = NULL;
+		GF_AVCConfigSlot *vps = NULL;
+		
+		for (i=0; i<gf_list_count(ctx->SPSs); i++) {
+			sps = gf_list_get(ctx->SPSs, i);
+			if (ctx->active_sps<0) ctx->active_sps = sps->id;
 
- u32 k;
+			if (sps->id==ctx->active_sps) break;
+			sps = NULL;
+		}
+		if (!sps) return GF_NON_COMPLIANT_BITSTREAM;
+		for (i=0; i<gf_list_count(ctx->PPSs); i++) {
+			pps = gf_list_get(ctx->PPSs, i);
+			if (ctx->active_pps<0) ctx->active_pps = pps->id;
 
- for(k = 0; k < csd0_size; k++) {
+			if (pps->id==ctx->active_pps) break;
+			pps = NULL;
+		}
+		for (i=0; i<gf_list_count(ctx->VPSs); i++) {
+			vps = gf_list_get(ctx->VPSs, i);
+			if (ctx->active_vps<0) ctx->active_vps = vps->id;
 
- if(k < ctx->vps_size) {
- csd0[k] = ctx->vps[k];
- }
- else if (k < ctx-> vps_size + ctx->sps_size ) {
- csd0[k] = ctx->sps[k - ctx->vps_size];
- }
- else csd0[k] = ctx->pps[k - ctx->vps_size - ctx->sps_size];
+			if (vps->id==ctx->active_vps) break;
+			vps = NULL;
+		}
+		if (!vps) return GF_NON_COMPLIANT_BITSTREAM;
+		ctx->reconfig_needed = GF_FALSE;
+		idx = ctx->active_sps;
+		ctx->width = ctx->hevc.sps[idx].width;
+		ctx->height = ctx->hevc.sps[idx].height;
+		ctx->luma_bpp = ctx->hevc.sps[idx].bit_depth_luma;
+		ctx->chroma_bpp = ctx->hevc.sps[idx].bit_depth_chroma;
+		ctx->chroma_format_idc = ctx->hevc.sps[idx].chroma_format_idc;
+
+		ctx->stride = ((ctx->luma_bpp==8) && (ctx->chroma_bpp==8)) ? ctx->width : ctx->width * 2;
+		if ( ctx->chroma_format_idc == 1) { // 4:2:0
+			ctx->out_size = ctx->stride * ctx->height * 3 / 2;
+		}
+		else if ( ctx->chroma_format_idc == 2) { // 4:2:2
+			ctx->out_size = ctx->stride * ctx->height * 2 ;
+		}
+		else if ( ctx->chroma_format_idc == 3) { // 4:4:4
+			ctx->out_size = ctx->stride * ctx->height * 3;
+		}
+		else {
+			return GF_NOT_SUPPORTED;
+		}
 }
-
- AMediaFormat_setBuffer(ctx->format, "csd-0", csd0, csd0_size);
+	ctx->frame_size_changed = GF_TRUE;
 return GF_OK;
 }
 
@@ -352,17 +324,26 @@
 ctx->stride = ctx->width;
 initMediaFormat(ctx, ctx->format);
 
- ctx->codec = AMediaCodec_createDecoderByType(ctx->mime);
+ if(!ctx->codec) {
+		ctx->decoder_name = MCDec_FindDecoder(ctx->mime, ctx->width, ctx->height, &ctx->is_adaptive);
+		if(!ctx->decoder_name) return GF_PROFILE_NOT_SUPPORTED;
+
+		ctx->codec = AMediaCodec_createCodecByName(ctx->decoder_name);
+		gf_free(ctx->decoder_name);
+		ctx->decoder_name = NULL;
+	}
 
 if(!ctx->codec) {
- GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("AMediaCodec_createDecoderByType failed"));
+ GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("AMediaCodec_createDecoderByType failed"));
 return GF_CODEC_NOT_FOUND;
 }
 
- if(!ctx->window) 
-		MCDec_CreateSurface(&ctx->window,&ctx->gl_tex_id, &ctx->surface_rendering);
-
- if( AMediaCodec_configure(
+ if(!ctx->window){
+		if(MCDec_CreateSurface(ctx->tex_id, &ctx->window, &ctx->surface_rendering, &ctx->surfaceTex) != GF_OK)
+			return GF_BAD_PARAM;
+	}
+	
+	if( AMediaCodec_configure(
 ctx->codec, // codec 
 ctx->format, // format
 (ctx->surface_rendering) ? ctx->window : NULL, //surface 
@@ -384,14 +365,14 @@
 	 GF_LOG(GF_LOG_INFO, GF_LOG_CODEC,("Video size: %d x %d", ctx->width, ctx->height));
 return GF_OK;
 }
-static void MCDec_RegisterParameterSet(MCDec *ctx, char *data, u32 size, Bool is_sps)
+static void MCDec_RegisterParameterSet(MCDec *ctx, char *data, u32 size, u8 xps)
 {
 	Bool add = GF_TRUE;
 	u32 i, count;
 	s32 ps_id;
-	GF_List *dest = is_sps ? ctx->SPSs : ctx->PPSs;
+	GF_List *dest = (xps == SPS) ? ctx->SPSs : ctx->PPSs;
 
-	if (is_sps) {
+	if (xps == SPS) {
 		ps_id = gf_media_avc_read_sps(data, size, &ctx->avc, 0, NULL);
 		if (ps_id<0) return;
 	}
@@ -425,63 +406,125 @@
 		gf_list_add(dest, slc);
 	
 		//force re-activation of sps/pps
-		if (is_sps) ctx->active_sps = -1;
+		if (xps == SPS) ctx->active_sps = -1;
 		else ctx->active_pps = -1;
 	}
 }
 
+static void MCDec_RegisterHEVCParameterSet(MCDec *ctx, char *data, u32 size, u8 xps)
+{
+	Bool add = GF_TRUE;
+	u32 i, count;
+	s32 ps_id;
+	GF_List *dest = NULL; 
+	
+	switch(xps) {
+		case SPS:
+			dest = ctx->SPSs;
+			ps_id = gf_media_hevc_read_sps(data, size, &ctx->hevc);
+			if (ps_id<0) return;
+			break;
+		case PPS:
+			dest = ctx->PPSs;
+			ps_id = gf_media_hevc_read_pps(data, size, &ctx->hevc);
+			if (ps_id<0) return;
+			break;
+		case VPS:
+			dest = ctx->VPSs;
+			ps_id = gf_media_hevc_read_vps(data, size, &ctx->hevc);
+			if (ps_id<0) return;
+			break;
+		default:
+			break;
+	}
+	
+	count = gf_list_count(dest);
+	for (i = 0; i<count; i++) {
+		GF_AVCConfigSlot *a_slc = gf_list_get(dest, i);
+		if (a_slc->id != ps_id) continue;
+		//not same size or different content but same ID, remove old xPS
+		if ((a_slc->size != size) || memcmp(a_slc->data, data, size)) {
+			gf_free(a_slc->data);
+			gf_free(a_slc);
+			gf_list_rem(dest, i);
+			break;
+		}
+		else {
+			add = GF_FALSE;
+		}
+		break;
+	}
+	if (add && dest) {
+		GF_AVCConfigSlot *slc;
+		GF_SAFEALLOC(slc, GF_AVCConfigSlot);
+		slc->data = gf_malloc(size);
+		memcpy(slc->data, data, size);
+		slc->size = size;
+		slc->id = ps_id;
+		gf_list_add(dest, slc);
+		
+		//force re-activation of sps/pps/vps
+		if (xps == SPS) ctx->active_sps = -1;
+		else if (xps == PPS) ctx->active_pps = -1;
+		else ctx->active_vps = -1;
+	}
+}
+
 static GF_Err MCDec_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
 {
 MCDec *ctx = (MCDec *)ifcg->privateStack;
 ctx->esd = esd;
 GF_Err e;
 
- //check AVC config
+ if(!ctx->tex_id)
+ glGenTextures(1, &ctx->tex_id);
+
+	//check AVC config
 if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_AVC) {
-		ctx->SPSs = gf_list_new();
-		ctx->PPSs = gf_list_new();
-		ctx->mime = "video/avc";
-		ctx->avc.sps_active_idx = -1;
-		ctx->active_sps = ctx->active_pps = -1;
+	ctx->SPSs = gf_list_new();
+	ctx->PPSs = gf_list_new();
+	ctx->mime = "video/avc";
+	ctx->avc.sps_active_idx = -1;
+	ctx->active_sps = ctx->active_pps = -1;
 if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) {
 ctx->width=ctx->height=128;
 ctx->out_size = ctx->width*ctx->height*3/2;
 ctx->pix_fmt = GF_PIXEL_NV12;
 return GF_OK;
 } else {
-			u32 i;
-			GF_AVCConfigSlot *slc;
-			GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-			for (i = 0; i<gf_list_count(cfg->sequenceParameterSets); i++) {
-				slc = gf_list_get(cfg->sequenceParameterSets, i);
-				slc->id = -1;
-				MCDec_RegisterParameterSet(ctx, slc->data, slc->size, GF_TRUE);
-			}
-
-			for (i = 0; i<gf_list_count(cfg->pictureParameterSets); i++) {
-				slc = gf_list_get(cfg->pictureParameterSets, i);
-				slc->id = -1;
-				MCDec_RegisterParameterSet(ctx, slc->data, slc->size, GF_FALSE);
-			}
-
-			slc = gf_list_get(ctx->SPSs, 0);
-			if (slc) ctx->active_sps = slc->id;
-
-			slc = gf_list_get(ctx->PPSs, 0);
-			if (slc) ctx->active_pps = slc->id;
+ u32 i;
+ GF_AVCConfigSlot *slc;
+ GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+ for (i = 0; i<gf_list_count(cfg->sequenceParameterSets); i++) {
+		 slc = gf_list_get(cfg->sequenceParameterSets, i);
+		 slc->id = -1;
+		 MCDec_RegisterParameterSet(ctx, slc->data, slc->size, SPS);
+	 }
+
+	 for (i = 0; i<gf_list_count(cfg->pictureParameterSets); i++) {
+		 slc = gf_list_get(cfg->pictureParameterSets, i);
+		 slc->id = -1;
+		 MCDec_RegisterParameterSet(ctx, slc->data, slc->size, PPS);
+	 }
+
+	 slc = gf_list_get(ctx->SPSs, 0);
+	 if (slc) ctx->active_sps = slc->id;
+
+	 slc = gf_list_get(ctx->PPSs, 0);
+	 if (slc) ctx->active_pps = slc->id;
 			
-			ctx->nalu_size_length = cfg->nal_unit_size;
+	 ctx->nalu_size_length = cfg->nal_unit_size;
 		
 			
-			if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs)) {
-				e = MCDec_InitDecoder(ctx);
-			}
-			else {
-				e = GF_OK;
-			}
-			gf_odf_avc_cfg_del(cfg);
-			return e;
-		}
+	 if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs)) {
+	 e = MCDec_InitDecoder(ctx);
+	 if (e) return e;
+ } else {
+		e = GF_OK;
+	 }
+	 gf_odf_avc_cfg_del(cfg);
+	 return e;
+	}
 }
 
 if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_MPEG4_PART2) {
@@ -496,40 +539,85 @@
 ctx->height = vcfg.height;
 ctx->out_size = ctx->width*ctx->height*3/2;
 ctx->pix_fmt = GF_PIXEL_NV12;
-
- return MCDec_InitDecoder(ctx);
+	 return MCDec_InitDecoder(ctx);
 }
 }
 
 if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_HEVC) {
 ctx->esd= esd;
+	ctx->SPSs = gf_list_new();
+	ctx->PPSs = gf_list_new();
+	ctx->VPSs = gf_list_new();
+	ctx->mime = "video/hevc";
 if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) {
 ctx->width=ctx->height=128;
 ctx->out_size = ctx->width*ctx->height*3/2;
 ctx->pix_fmt = GF_PIXEL_NV12;
+	 return GF_OK;
 } else {
- return MCDec_InitDecoder(ctx);
+	 GF_HEVCConfig *hvcc = NULL;
+	 GF_AVCConfigSlot *sl;
+	 HEVCState hevc;
+	 u32 i,j;
+	 memset(&hevc, 0, sizeof(HEVCState));
+
+	 hvcc = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
+	 if (!hvcc) return GF_NON_COMPLIANT_BITSTREAM;
+	 ctx->nalu_size_length = hvcc->nal_unit_size;
+
+	 for (i=0; i< gf_list_count(hvcc->param_array); i++) {
+		 GF_HEVCParamArray *ar = (GF_HEVCParamArray *)gf_list_get(hvcc->param_array, i);
+		 for (j=0; j< gf_list_count(ar->nalus); j++) {
+			 GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j);
+			 s32 idx;
+			 u16 hdr = sl->data[0] << 8 | sl->data[1];
+
+			 if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
+			 sl->id = -1;
+			 MCDec_RegisterHEVCParameterSet(ctx, sl->data, sl->size, SPS);
+			 }
+			 else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
+				 sl->id = -1;
+				 MCDec_RegisterHEVCParameterSet(ctx, sl->data, sl->size, VPS);
+			 }
+			 else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
+				 sl->id = -1;
+				 MCDec_RegisterHEVCParameterSet(ctx, sl->data, sl->size, PPS);
+			 }
+		 }
+	 }
+	 sl = gf_list_get(ctx->SPSs, 0);
+	 if (sl) ctx->active_sps = sl->id;
+
+	 sl = gf_list_get(ctx->PPSs, 0);
+	 if (sl) ctx->active_pps = sl->id;
+			
+	 sl = gf_list_get(ctx->VPSs, 0);
+	 if (sl) ctx->active_vps = sl->id;
+			
+	 if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs) && gf_list_count(ctx->VPSs) ) {
+		e = MCDec_InitDecoder(ctx);
+	 } else {
+		e = GF_OK;
+	 }
+	 gf_odf_hevc_cfg_del(hvcc);
+ return e;
 }
 }
-
- return MCDec_InitDecoder(ctx);
+	return MCDec_InitDecoder(ctx);
 }
 
-
-
 static GF_Err MCDec_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
 {
 MCDec *ctx = (MCDec *)ifcg->privateStack;
 
- if(AMediaCodec_stop(ctx->codec) != AMEDIA_OK) {
+ if(ctx->codec && AMediaCodec_stop(ctx->codec) != AMEDIA_OK) {
 GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("AMediaCodec_stop failed"));
 }
- MCDec_DeleteSurface();
-
+ 
 return GF_OK;
 }
 
-
 static GF_Err MCDec_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
 {
 MCDec *ctx = (MCDec *)ifcg->privateStack;
@@ -539,14 +627,14 @@
 capability->cap.valueInt = 1; 
 break;
 case GF_CODEC_WIDTH:
- capability->cap.valueInt = ctx->width; 
-		break;
+	capability->cap.valueInt = ctx->width;
+	break;
 case GF_CODEC_HEIGHT:
- capability->cap.valueInt = ctx->height; 
- break;
+	capability->cap.valueInt = ctx->height;
+	break;
 case GF_CODEC_STRIDE:
 capability->cap.valueInt = ctx->stride;
-		break;
+	break;
 case GF_CODEC_FPS:
 capability->cap.valueFloat = ctx->frame_rate;
 break;
@@ -558,7 +646,7 @@
 break;
 case GF_CODEC_PIXEL_FORMAT:
 capability->cap.valueInt = ctx->pix_fmt; 
-		break;
+	break;
 case GF_CODEC_BUFFER_MIN:
 capability->cap.valueInt = 1; 
 break;
@@ -574,17 +662,17 @@
 capability->cap.valueInt = 1; 
 break;
 case GF_CODEC_WANTS_THREAD:
- capability->cap.valueInt = 0; 
- break;
+ capability->cap.valueInt = 1;
+	break;
 case GF_CODEC_FRAME_OUTPUT:
 capability->cap.valueInt = 1; 
 break;
-	case GF_CODEC_FORCE_ANNEXB:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_TRUSTED_CTS:
-		capability->cap.valueInt = 1;
-		break;
+ case GF_CODEC_FORCE_ANNEXB:
+	capability->cap.valueInt = 1;
+	break;
+ case GF_CODEC_TRUSTED_CTS:
+	capability->cap.valueInt = 1;
+	break;
 	/*not known at our level...*/
 case GF_CODEC_CU_DURATION: 
 default:
@@ -606,7 +694,6 @@
 		*out_buffer = NULL;
 		*out_size = 0;
 	}
-	
 	if (!ctx->nalu_size_length) {
 		sc_size = 0;
 		nal_size = gf_media_nalu_next_start_code((u8 *)inBuffer, inBufferLength, &sc_size);
@@ -635,11 +722,11 @@
 		nal_type = nal_hdr & 0x1F;
 		switch (nal_type) {
 			case GF_AVC_NALU_SEQ_PARAM:
-				MCDec_RegisterParameterSet(ctx, ptr, nal_size, GF_TRUE);
+				MCDec_RegisterParameterSet(ctx, ptr, nal_size, SPS);
 				add_nal = GF_FALSE;
 				break;
 			case GF_AVC_NALU_PIC_PARAM:
-				MCDec_RegisterParameterSet(ctx, ptr, nal_size, GF_FALSE);
+				MCDec_RegisterParameterSet(ctx, ptr, nal_size, PPS);
 				add_nal = GF_FALSE;
 				break;
 			case GF_AVC_NALU_ACCESS_UNIT:
@@ -664,8 +751,8 @@
 
 		//if sps and pps are ready, init decoder
 		if (!ctx->codec && gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs)) {
-			e = MCDec_InitDecoder(ctx);
-			if (e) return e;
+			ctx->reconfig_needed = 1;
+			return GF_OK;
 		}
 		if (!out_buffer) add_nal = GF_FALSE;
 		else if (add_nal && !ctx->codec) add_nal = GF_FALSE;
@@ -694,6 +781,69 @@
 	}
 	return e;
 }
+static GF_Err MCDec_ParseHEVCNALs(MCDec *ctx, char *inBuffer, u32 inBufferLength)
+{
+	u32 i, sc_size;
+	char *ptr = inBuffer;
+	u32 nal_size;
+	GF_Err e = GF_OK;
+	GF_BitStream *bs = NULL;
+	
+	sc_size = 0;
+	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);
+	inBufferLength -= nal_size + sc_size;
+	
+	while (inBufferLength) {
+		Bool add_nal = GF_TRUE;
+		u8 nal_type;
+		u16 nal_hdr ;
+		u8 type, quality_id, temporal_id;
+		
+		nal_size = gf_media_nalu_next_start_code(ptr, inBufferLength, &sc_size);
+		gf_media_hevc_parse_nalu(ptr, nal_size, &ctx->hevc, &type, &temporal_id, &quality_id);
+		switch(type) {
+			case GF_HEVC_NALU_SEQ_PARAM:
+				MCDec_RegisterHEVCParameterSet(ctx, ptr, nal_size, SPS);
+				break;
+			case GF_HEVC_NALU_PIC_PARAM:
+				MCDec_RegisterHEVCParameterSet(ctx, ptr, nal_size, PPS);
+				break;
+			case GF_HEVC_NALU_VID_PARAM:
+				MCDec_RegisterHEVCParameterSet(ctx, ptr, nal_size, VPS);
+				break;
+			default:
+				break;
+		}
+		
+		if ((nal_type <= GF_HEVC_NALU_SLICE_CRA) && ctx->hevc.s_info.sps) {
+			if ((ctx->hevc.sps_active_idx != ctx->active_sps) || (ctx->hevc.sps[ctx->active_sps].vps_id != ctx->active_vps)) {
+				ctx->reconfig_needed = 1;
+				ctx->active_sps = ctx->hevc.sps_active_idx;
+				ctx->active_pps = ctx->hevc.s_info.pps->id;
+				ctx->active_vps = ctx->hevc.sps[ctx->active_sps].vps_id;
+				return GF_OK;
+			}
+		}
+
+		//if sps, pps and vps are ready, init decoder
+		if (!ctx->codec && gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs) && gf_list_count(ctx->VPSs) ) {
+			e = MCDec_InitDecoder(ctx);
+			if (e) return e;
+		}
+		
+		ptr += nal_size;
+		if (!sc_size || (inBufferLength < nal_size + sc_size)) break;
+			inBufferLength -= nal_size + sc_size;
+			ptr += sc_size;
+	}
+	
+	return e;
+}
+
+
 static GF_Err MCDec_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
 {
 MCDec *ctx = (MCDec *)ifcg->privateStack;
@@ -722,8 +872,19 @@
 MCDec *ctx = (MCDec *)ifcg->privateStack;
 	ctx->nalu_size_length = 0;
 	Bool mcdec_buffer_available = GF_FALSE;
-	if (!ctx->reconfig_needed)
-		MCDec_ParseNALs(ctx, inBuffer, inBufferLength, NULL, NULL);
+	
+	if(!ctx->before_exit_registered) {
+		ctx->before_exit_registered = GF_TRUE;
+		if (gf_register_before_exit_function(gf_th_current(), &MCDec_BeforeExit) != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("Failed to register exit function for the decoder thread %p, try to continue anyway...\n", gf_th_current()));
+		}
+	}
+	if (!ctx->reconfig_needed && (!(ctx->codec && ctx->is_adaptive))) {
+		if(ctx->esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_AVC)
+			MCDec_ParseNALs(ctx, inBuffer, inBufferLength, NULL, NULL);
+		else if(ctx->esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_HEVC)
+			MCDec_ParseHEVCNALs(ctx, inBuffer, inBufferLength);
+	}		
 	
 	if (ctx->reconfig_needed) {
 		if (ctx->raw_frame_dispatch && ctx->decoded_frames_pending) {
@@ -734,14 +895,12 @@
 		if (ctx->codec) {
 			AMediaCodec_flush(ctx->codec);
 			AMediaCodec_stop(ctx->codec);
-			AMediaCodec_delete(ctx->codec);
-			ctx->codec = NULL;
 		}
 		MCDec_InitDecoder(ctx);
-			 if (ctx->out_size != *outBufferLength) {
-				 *outBufferLength = ctx->out_size;
-				 return GF_BUFFER_TOO_SMALL;
-			 }
+		if (ctx->out_size != *outBufferLength) {
+			*outBufferLength = ctx->out_size;
+			return GF_BUFFER_TOO_SMALL;
+		}
 	}
 	
 	if(!ctx->inputEOS) {
@@ -754,41 +913,10 @@
 
 if (inBufferLength > inSize) {
 GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("The returned buffer is too small"));
- return GF_BUFFER_TOO_SMALL;
+ return GF_BUFFER_TOO_SMALL;
 }
-
- switch (ctx->esd->decoderConfig->objectTypeIndication) {
-
- case GPAC_OTI_VIDEO_AVC:
-					memcpy(buffer, inBuffer, inBufferLength);
-					break;
-
-
- case GPAC_OTI_VIDEO_HEVC:
-
- if(inBuffer[4] == 0x40) { //check for vps
- u32 start = ctx->vps_size + ctx->sps_size + ctx->pps_size;
- u32 i;
- 
- for (i = start; i < inBufferLength ; ++i) {
- buffer[i - start] = inBuffer[i];
- }
-					buffer[0] = 0x00;
-					buffer[1] = 0x00;
-					buffer[2] = 0x00;
-					buffer[3] = 0x01;
- }
- else {
- memcpy(buffer, inBuffer, inBufferLength);
- }
-				
-				break;
-
- default:
- memcpy(buffer, inBuffer, inBufferLength);
- break;
- }
-
+			memcpy(buffer, inBuffer, inBufferLength);
+			
 if(!inBuffer || inBufferLength == 0){
 GF_LOG(GF_LOG_INFO, GF_LOG_CODEC,("AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM input"));
 				 ctx->inputEOS = GF_TRUE;
@@ -815,11 +943,21 @@
 *outBufferLength=0;
 
 switch(ctx->outIndex) {
-	 case AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED:
- GF_LOG(GF_LOG_INFO, GF_LOG_CODEC,("AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED"));
- ctx->format = AMediaCodec_getOutputFormat(ctx->codec);
+ case AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED:
+			{
+				u32 width, height, stride;
+				GF_LOG(GF_LOG_INFO, GF_LOG_CODEC,("AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED"));
+				ctx->format = AMediaCodec_getOutputFormat(ctx->codec);
+				AMediaFormat_getInt32(ctx->format, AMEDIAFORMAT_KEY_WIDTH, &width);
+				AMediaFormat_getInt32(ctx->format, AMEDIAFORMAT_KEY_HEIGHT, &height);
+				AMediaFormat_getInt32(ctx->format, AMEDIAFORMAT_KEY_STRIDE, &stride);
+				if((ctx->width != width) || (ctx->height != height) || (ctx->stride != stride)){
+					ctx->out_size = ctx->stride * ctx->height * 3 / 2;
+					*outBufferLength = ctx->out_size;
+					ctx->frame_size_changed = GF_TRUE;
+				}
 break;
-
+			}
 case AMEDIACODEC_INFO_OUTPUT_BUFFERS_CHANGED:
 GF_LOG(GF_LOG_INFO, GF_LOG_CODEC,("AMEDIACODEC_INFO_OUTPUT_BUFFERS_CHANGED"));
 break;
@@ -872,9 +1010,12 @@
 
 switch (esd->decoderConfig->objectTypeIndication) {
 case GPAC_OTI_VIDEO_AVC:
- return GF_CODEC_SUPPORTED;
+			return GF_CODEC_SUPPORTED;
 case GPAC_OTI_VIDEO_HEVC:
-			return GF_CODEC_NOT_SUPPORTED;
+//			if(sdkInt() >= 21) {
+				return GF_CODEC_SUPPORTED;
+//			}
+			break;
 		case GPAC_OTI_VIDEO_MPEG4_PART2:
 return GF_CODEC_SUPPORTED;
 }
@@ -928,17 +1069,18 @@
 GF_Err MCFrame_GetGLTexture(GF_MediaDecoderFrame *frame, u32 plane_idx, u32 *gl_tex_format, u32 *gl_tex_id, GF_CodecMatrix * texcoordmatrix)
 {		
 	MC_Frame *f = (MC_Frame *)frame->user_data;
- int i = 0;
+ 	if (!gl_tex_format || !gl_tex_id) return GF_BAD_PARAM;
 	*gl_tex_format = GL_TEXTURE_EXTERNAL_OES;
-	*gl_tex_id = f->ctx->gl_tex_id;
+	*gl_tex_id = f->ctx->tex_id;
 	
 	if(!f->flushed && f->ctx->codec) {
 		if (AMediaCodec_releaseOutputBuffer(f->ctx->codec, f->outIndex, GF_TRUE) != AMEDIA_OK) {
 			 GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("NOT Release Output Buffer Index: %d to surface", f->outIndex));
 			 return GF_OK;
 		}
-		MCFrame_UpdateTexImage();
-		MCFrame_GetTransformMatrix(texcoordmatrix);
+		if(MCFrame_UpdateTexImage(f->ctx->surfaceTex) != GF_OK) return GF_BAD_PARAM;
+		if(MCFrame_GetTransformMatrix(texcoordmatrix, f->ctx->surfaceTex) != GF_OK) return GF_BAD_PARAM;
+		
 		f->flushed = GF_TRUE;
 	}
 	return GF_OK;
@@ -1051,18 +1193,25 @@
 }
 
 if(ctx->window) {
-		ANativeWindow_release(ctx->window);
-		ctx->window = NULL;
+	ANativeWindow_release(ctx->window);
+	ctx->window = NULL;
 }
 
+ if(ctx->codec)
+	MCDec_DeleteSurface(ctx->surfaceTex);
 	
+ if(ctx->tex_id) glDeleteTextures (1, &ctx->tex_id);
+
+ MCDec_DelParamList(ctx->SPSs);
+ ctx->SPSs = NULL;
+ MCDec_DelParamList(ctx->PPSs);
+ ctx->PPSs = NULL;
+ MCDec_DelParamList(ctx->VPSs);
+ ctx->VPSs = NULL;
+
 gf_free(ctx);
 gf_free(ifcg);
 	
-	MCDec_DelParamList(ctx->SPSs);
-	ctx->SPSs = NULL;
-	MCDec_DelParamList(ctx->PPSs);
-	ctx->PPSs = NULL;
 }

gpac-0.7.1.tar.gz/modules/mediacodec_dec/mediacodec_dec.h -> gpac-0.8.0.tar.gz/modules/mediacodec_dec/mediacodec_dec.h Changed

gpac-0.7.1.tar.gz/modules/mediacodec_dec/mediacodec_dec_jni.c -> gpac-0.8.0.tar.gz/modules/mediacodec_dec/mediacodec_dec_jni.c Changed

@@ -29,30 +29,75 @@
 #include <android/native_window_jni.h>
 #include <android/asset_manager.h>
 #include <android/asset_manager_jni.h>
-#include <jni.h>
-#ifdef GPAC_USE_GLES2
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#else
-#include <GLES/gl.h>
-#include <GLES/glext.h>
-#endif
 #include "mediacodec_dec.h"
+#define RANDOM_JAVA_APP_CLASS "com/gpac/Osmo4/GPACInstance"
+#define ALL_CODECS 1
 
 static jclass cSurfaceTexture = NULL;
 static jclass cSurface = NULL;
-static jobject oSurfaceTex = NULL;
-static jobject oSurface = NULL;
+static jclass cMediaCodecList = NULL;
+static jclass cMediaFormat = NULL;
 static jmethodID mUpdateTexImage;
 static jmethodID mSurfaceTexConstructor;
 static jmethodID mSurfaceConstructor;
 static jmethodID mSurfaceRelease;
 static jmethodID mGetTransformMatrix;
+static jmethodID mFindClassMethod;
+static jmethodID mMediaCodecListConstructor;
+static jmethodID mFindDecoderForFormat;
+static jmethodID mCreateVideoFormat;
+static jmethodID mSetFeatureEnabled;
+static jobject oClassLoader = NULL;
 static JavaVM* javaVM = 0;
 
+static void HandleJNIError(JNIEnv *env)
+{
+	(*env)->ExceptionDescribe(env);
+	(*env)->ExceptionClear(env);
+}
+static jclass FindAppClass(JNIEnv* env, const char* name)
+{
+
+	return (jclass)((*env)->CallObjectMethod(env, oClassLoader, mFindClassMethod, (*env)->NewStringUTF(env, name)));
+}
+
+static GF_Err CacheAppClassLoader(JNIEnv* env, const char* name)
+{
+	GF_Err ret = GF_BAD_PARAM;
+	jclass randomClass = (*env)->FindClass(env, name);
+	if (!randomClass) goto cache_calassloader_failed;
+	jclass classClass = (*env)->GetObjectClass(env, randomClass);
+	if (!classClass) goto cache_calassloader_failed;
+ 	jclass classLoaderClass = (*env)->FindClass(env, "java/lang/ClassLoader");
+	if (!classLoaderClass) goto cache_calassloader_failed;
+ 	jmethodID getClassLoaderMethod = (*env)->GetMethodID(env, classClass, "getClassLoader", "()Ljava/lang/ClassLoader;");
+	if (!getClassLoaderMethod) goto cache_calassloader_failed;
+	oClassLoader = (jobject) (*env)->NewGlobalRef(env,(*env)->CallObjectMethod(env,randomClass, getClassLoaderMethod));
+	if(!oClassLoader) goto cache_calassloader_failed;
+ 	mFindClassMethod = (*env)->GetMethodID(env, classLoaderClass, "findClass", "(Ljava/lang/String;)Ljava/lang/Class;");
+	if(!mFindClassMethod) goto cache_calassloader_failed;
+	ret = GF_OK;
+
+cache_calassloader_failed:
+	if(randomClass)
+		 (*env)->DeleteLocalRef(env, randomClass);
+	 if(classClass)
+		 (*env)->DeleteLocalRef(env, classClass);
+	 if(classLoaderClass)
+		 (*env)->DeleteLocalRef(env, classLoaderClass);
+	return ret;
+}
+
 jint JNI_OnLoad(JavaVM* vm, void* reserved)
 {
+	JNIEnv* env = NULL;
+	jint res = 0;
 	javaVM = vm;
+	
+	if ((*javaVM)->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2) != JNI_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("GetEnv failed"));
+		return GF_BAD_PARAM;
+	}
 	return JNI_VERSION_1_2;
 }
 
@@ -68,71 +113,209 @@
 	return javaVM;
 }
 
-GF_Err MCDec_CreateSurface (ANativeWindow ** window, u32 *gl_tex_id, Bool * surface_rendering)
+u32 MCDec_BeforeExit(void * param) {
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC,(" [Android Mediacodec decoder] Detach decoder thread %p...\n", gf_th_current()));
+	(*GetJavaVM())->DetachCurrentThread(GetJavaVM());
+	
+	return GF_OK;
+}
+
+GF_Err MCDec_CreateSurface (GLuint tex_id, ANativeWindow ** window, Bool * surface_rendering, MC_SurfaceTexture * surfaceTex)
 {
 	JNIEnv* env = NULL;
 	jobject otmp= NULL;
 	jclass ctmp = NULL;
 	jint res = 0;
+	jobject oSurface = NULL;
+	GF_Err ret = GF_BAD_PARAM;
+	u32 gl_tex_id;
 	
 	res = (*GetJavaVM())->GetEnv(GetJavaVM(), (void**)&env, JNI_VERSION_1_2);
 	if ( res == JNI_EDETACHED ) {
 		(*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
 	}
-	if (!env) return GF_BAD_PARAM;
+	if (!env) goto create_surface_failed;
 	
 	// cache classes
 	if (!cSurfaceTexture) {
 		ctmp = (*env)->FindClass(env, "android/graphics/SurfaceTexture");
 		cSurfaceTexture = (*env)->NewGlobalRef(env, ctmp);
-		if(!cSurfaceTexture) GF_BAD_PARAM;
+		if(!cSurfaceTexture) goto create_surface_failed;
 	}
 	if (!cSurface) {
 		ctmp = (*env)->FindClass(env, "android/view/Surface");
 		cSurface = (*env)->NewGlobalRef(env, ctmp);
-		if (!cSurface) return GF_BAD_PARAM;
+		if (!cSurface) goto create_surface_failed;
 	}
 	
-	/* TOFIX : here we call glGenTextures without creating or getting opengl context*/
-	//glGenTextures(1, gl_tex_id); The texture is created by the HW
-	
 	// cache methods
 	if(!mSurfaceTexConstructor) {
 		mSurfaceTexConstructor = (*env)->GetMethodID(env, cSurfaceTexture, "<init>", "(I)V");
-		if(!mSurfaceTexConstructor) return GF_BAD_PARAM;
+		if(!mSurfaceTexConstructor) goto create_surface_failed;
 	}
 	if(!mSurfaceConstructor) {
 		mSurfaceConstructor = (*env)->GetMethodID(env, cSurface, "<init>", "(Landroid/graphics/SurfaceTexture;)V");
-		if(!mSurfaceConstructor) return GF_BAD_PARAM;
+		if(!mSurfaceConstructor) goto create_surface_failed;
 	}
 	if(!mSurfaceRelease) {
 		mSurfaceRelease = (*env)->GetMethodID(env, cSurface, "release", "()V");
-		if(!mSurfaceRelease) return GF_BAD_PARAM;
+		if(!mSurfaceRelease) goto create_surface_failed;
 	}
 	if(!mUpdateTexImage) {
 		mUpdateTexImage = (*env)->GetMethodID(env, cSurfaceTexture, "updateTexImage", "()V");
-		if(!mUpdateTexImage) return GF_BAD_PARAM;
+		if(!mUpdateTexImage) goto create_surface_failed;
 	}
 	if(!mGetTransformMatrix) {
 		mGetTransformMatrix = (*env)->GetMethodID(env, cSurfaceTexture, "getTransformMatrix", "([F)V");
-		if(!mGetTransformMatrix) return GF_BAD_PARAM;
+		if(!mGetTransformMatrix) goto create_surface_failed;
 	}
 	
+	surfaceTex->texture_id = tex_id;
 	// create objects
-	otmp = (*env)->NewObject(env, cSurfaceTexture, mSurfaceTexConstructor, *gl_tex_id);
-	oSurfaceTex = (jobject) (*env)->NewGlobalRef(env,otmp);
-	if(!oSurfaceTex) return GF_BAD_PARAM;
+	otmp = (*env)->NewObject(env, cSurfaceTexture, mSurfaceTexConstructor, surfaceTex->texture_id);
+	surfaceTex->oSurfaceTex = (jobject) (*env)->NewGlobalRef(env,otmp);
+	if(!surfaceTex->oSurfaceTex) goto create_surface_failed;
+	
+	oSurface = (*env)->NewObject(env, cSurface, mSurfaceConstructor, surfaceTex->oSurfaceTex);
+	if(!oSurface) goto create_surface_failed;
 	
-	oSurface = (*env)->NewObject(env, cSurface, mSurfaceConstructor, oSurfaceTex);
-	if(!oSurface) return GF_BAD_PARAM;
 	*window = ANativeWindow_fromSurface(env, oSurface);
 	*surface_rendering = (*window) ? GF_TRUE : GF_FALSE;
 	(*env)->CallVoidMethod(env, oSurface, mSurfaceRelease);
+	if ((*env)->ExceptionCheck(env)) {
+		HandleJNIError(env);
+	}
+	ret = GF_OK;
 	
-	return GF_OK;
+create_surface_failed:
+	if(otmp)
+		 (*env)->DeleteLocalRef(env, otmp);
+	 if(ctmp)
+		 (*env)->DeleteLocalRef(env, ctmp);
+	 if(oSurface)
+		 (*env)->DeleteLocalRef(env, oSurface);
+	 
+	 return ret;
+}
+
+static char * MCDec_GetDecoderName(JNIEnv * env, jobject mediaCodecList, jmethodID findId, jobject mediaFomat)
+{
+	jint res = 0;
+	jstring jdecoder_name;
+	char * decoder_name = NULL;
+
+	jdecoder_name = (*env)->CallObjectMethod(env, mediaCodecList, findId, mediaFomat);
+	if ((*env)->ExceptionCheck(env)) {
+		HandleJNIError(env);
+		goto get_decoder_exit;
+	}
+	if(jdecoder_name) {
+		const char *decoder_name_tmp;
+		decoder_name_tmp = (*env)->GetStringUTFChars(env, jdecoder_name, 0);
+		decoder_name = gf_strdup(decoder_name_tmp);
+		(*env)->ReleaseStringUTFChars(env, jdecoder_name, decoder_name_tmp);
+	}
+
+get_decoder_exit:
+	if(jdecoder_name)
+		(*env)->DeleteLocalRef(env, jdecoder_name);
+
+	return decoder_name;
 }
 
-GF_Err MCFrame_UpdateTexImage()
+char * MCDec_FindDecoder(const char * mime, u32 width, u32 height, Bool * is_adaptive)
+{
+	JNIEnv* env = NULL;
+	jobject oMediaCodecList = NULL, oMediaFormat = NULL;
+	jclass ctmp = NULL;
+	jint res = 0;
+	jstring jmime, jfeature;
+	char *decoder_name = NULL, *decoder_name_tmp;
+
+
+	if(!mime || !is_adaptive) goto find_decoder_exit;
+
+	res = (*GetJavaVM())->GetEnv(GetJavaVM(), (void**)&env, JNI_VERSION_1_2);
+	if ( res == JNI_EDETACHED ) {
+		(*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
+	}
+	if (!env) goto find_decoder_exit;
+
+	// cache classes
+	if (!cMediaCodecList) {
+		ctmp = (*env)->FindClass(env, "android/media/MediaCodecList");
+		cMediaCodecList = (*env)->NewGlobalRef(env, ctmp);
+		if(!cMediaCodecList) goto find_decoder_exit;
+	}
+	if (!cMediaFormat) {
+		ctmp = (*env)->FindClass(env, "android/media/MediaFormat");
+		cMediaFormat = (*env)->NewGlobalRef(env, ctmp);
+		if(!cMediaFormat) goto find_decoder_exit;
+	}
+
+	//methods
+	if(!mMediaCodecListConstructor) {
+		mMediaCodecListConstructor = (*env)->GetMethodID(env, cMediaCodecList, "<init>", "(I)V");
+		if(!mMediaCodecListConstructor) goto find_decoder_exit;
+	}
+	if(!mFindDecoderForFormat) {
+		mFindDecoderForFormat = (*env)->GetMethodID(env, cMediaCodecList, "findDecoderForFormat", "(Landroid/media/MediaFormat;)Ljava/lang/String;");
+		if(!mFindDecoderForFormat) goto find_decoder_exit;
+	}
+	if(!mCreateVideoFormat) {
+		mCreateVideoFormat = (*env)->GetStaticMethodID(env, cMediaFormat, "createVideoFormat", "(Ljava/lang/String;II)Landroid/media/MediaFormat;");
+		if(!mCreateVideoFormat) goto find_decoder_exit;
+	}
+	if(!mSetFeatureEnabled ) {
+		mSetFeatureEnabled = (*env)->GetMethodID(env, cMediaFormat, "setFeatureEnabled", "(Ljava/lang/String;Z)V");
+		if(!mSetFeatureEnabled) goto find_decoder_exit;
+	}
+	oMediaCodecList = (*env)->NewObject(env, cMediaCodecList, mMediaCodecListConstructor, ALL_CODECS);
+	if(!oMediaCodecList) goto find_decoder_exit;
+
+	jmime = (*env)->NewStringUTF(env, mime);
+	oMediaFormat = (*env)->CallStaticObjectMethod(env, cMediaFormat, mCreateVideoFormat, jmime, width, height);
+	if ((*env)->ExceptionCheck(env)) {
+		HandleJNIError(env);
+		goto find_decoder_exit;
+	}
+	decoder_name_tmp = MCDec_GetDecoderName(env, oMediaCodecList, mFindDecoderForFormat, oMediaFormat);
+	if(!decoder_name_tmp) goto find_decoder_exit;
+
+	jfeature = (*env)->NewStringUTF(env, "adaptive-playback");
+	(*env)->CallVoidMethod(env, oMediaFormat, mSetFeatureEnabled, jfeature, JNI_TRUE);
+	if ((*env)->ExceptionCheck(env)) {
+		HandleJNIError(env);
+		goto find_decoder_exit;
+	}
+	decoder_name = MCDec_GetDecoderName(env, oMediaCodecList, mFindDecoderForFormat, oMediaFormat);
+	if(decoder_name){
+		*is_adaptive = GF_TRUE;
+		gf_free(decoder_name_tmp);
+		decoder_name_tmp = NULL;
+	} else {
+		*is_adaptive = GF_FALSE;
+		decoder_name = decoder_name_tmp;
+	}
+
+find_decoder_exit:
+	if(ctmp)
+		(*env)->DeleteLocalRef(env, ctmp);
+	if(oMediaCodecList)
+		(*env)->DeleteLocalRef(env, oMediaCodecList);
+	if(oMediaFormat)
+		(*env)->DeleteLocalRef(env, oMediaFormat);
+	if(jmime)
+		(*env)->DeleteLocalRef(env, jmime);
+	if(jfeature)
+		(*env)->DeleteLocalRef(env, jfeature);
+
+	return decoder_name;
+
+}
+
+GF_Err MCFrame_UpdateTexImage(MC_SurfaceTexture surfaceTex)
 {
 	JNIEnv* env = NULL;
 	jint res = 0;
@@ -142,47 +325,62 @@
 	}
 	if (!env) return GF_BAD_PARAM;
 	
-	if(oSurfaceTex) {
-		(*env)->CallVoidMethod(env, oSurfaceTex, mUpdateTexImage);
+	(*env)->CallVoidMethod(env, surfaceTex.oSurfaceTex, mUpdateTexImage);
+	if ((*env)->ExceptionCheck(env)) {
+		HandleJNIError(env);
+		return GF_BAD_PARAM;
 	}
 	return GF_OK;
 }
-GF_Err MCFrame_GetTransformMatrix(GF_CodecMatrix * mx)
+
+GF_Err MCFrame_GetTransformMatrix(GF_CodecMatrix * mx, MC_SurfaceTexture surfaceTex)
 {
 	JNIEnv* env = NULL;
 	jint res = 0;
 	int i =0;
 	jfloatArray texMx;
+	jsize len = 0;
+	jfloat *body;
+	GF_Err ret = GF_BAD_PARAM;
 	
 	res = (*GetJavaVM())->GetEnv(GetJavaVM(), (void**)&env, JNI_VERSION_1_2);
 	if ( res == JNI_EDETACHED ) {
 		(*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
 	}
-	if (!env) return GF_BAD_PARAM;
+	if (!env) goto get_matrix_failed;
+	
+	texMx = (*env)->NewFloatArray(env, 16);
+	if (texMx == NULL) goto get_matrix_failed;
 	
-	if(oSurfaceTex) {
-		texMx = (*env)->NewFloatArray(env,16);
-		if (texMx == NULL) {
-			return GF_BAD_PARAM; /* out of memory error thrown */
-		}
-		
-		(*env)->CallVoidMethod(env, oSurfaceTex, mGetTransformMatrix,texMx);
-		
-		jsize len = (*env)->GetArrayLength(env, texMx);
-		
-		jfloat *body = (*env)->GetFloatArrayElements(env, texMx, 0);
-		
-		for (i=0; i<len; i++) {
-			mx->m[i] = FLT2FIX(body[i]);
-		}
-		
-		(*env)->ReleaseFloatArrayElements(env, texMx, body, 0);
-		
+	(*env)->CallVoidMethod(env, surfaceTex.oSurfaceTex, mGetTransformMatrix,texMx);
+	if ((*env)->ExceptionCheck(env)) {
+		HandleJNIError(env);
+		goto get_matrix_failed;
 	}
-	return GF_OK;
+	len = (*env)->GetArrayLength(env, texMx);
+	body = (*env)->GetFloatArrayElements(env, texMx, 0);
+	if ((*env)->ExceptionCheck(env)) {
+		HandleJNIError(env);
+		goto get_matrix_failed;
+	}
+	for (i=0; i<len; i++) {
+		mx->m[i] = FLT2FIX(body[i]);
+	}
+	
+	(*env)->ReleaseFloatArrayElements(env, texMx, body, 0);
+	if ((*env)->ExceptionCheck(env)) {
+		HandleJNIError(env);
+		goto get_matrix_failed;
+	}
+	ret = GF_OK;
+	
+get_matrix_failed:
+	if(texMx)
+		(*env)->DeleteLocalRef(env, texMx);
+	return ret;
 }
 
-GF_Err MCDec_DeleteSurface()
+GF_Err MCDec_DeleteSurface(MC_SurfaceTexture surfaceTex)
 {
 	JNIEnv* env = NULL;
 	jint res = 0;
@@ -192,12 +390,17 @@
 		(*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
 	} 
 	if (!env) return GF_BAD_PARAM;
-	(*env)->DeleteGlobalRef(env,cSurface);
+	
+	(*env)->DeleteGlobalRef(env, cSurface);
 	cSurface = NULL;
-	(*env)->DeleteGlobalRef(env,cSurfaceTexture);
+	(*env)->DeleteGlobalRef(env, cSurfaceTexture);
 	cSurfaceTexture = NULL;
-	(*env)->DeleteGlobalRef(env,oSurfaceTex);
-	oSurfaceTex = NULL;
+	(*env)->DeleteGlobalRef(env, cMediaCodecList);
+	cMediaCodecList = NULL;
+	(*env)->DeleteGlobalRef(env, cMediaFormat);
+	cMediaFormat = NULL;
+	(*env)->DeleteGlobalRef(env, surfaceTex.oSurfaceTex);
+	surfaceTex.oSurfaceTex = NULL;
 	
 	return GF_OK;
 }

gpac-0.7.1.tar.gz/modules/mp3_in/mad_dec.c -> gpac-0.8.0.tar.gz/modules/mp3_in/mad_dec.c Changed

gpac-0.7.1.tar.gz/modules/mpd_in/mpd_in.c -> gpac-0.8.0.tar.gz/modules/mpd_in/mpd_in.c Changed

@@ -37,6 +37,13 @@
 	MPDIN_BUFFER_SEGMENTS=2
 } MpdInBuffer;
 
+typedef enum
+{
+	MPDIN_LOW_LATENCY_NONE=0,
+	MPDIN_LOW_LATENCY_CHUNK=1,
+	MPDIN_LOW_LATENCY_ALWAYS=2
+} MpdInLowLatency;
+
 typedef struct __mpd_module
 {
 	/* GPAC Service object (i.e. how this module is seen by the terminal)*/
@@ -45,17 +52,21 @@
 
 	GF_DashClient *dash;
 	Bool closed;
+	Bool at_period_switch;
 	/*interface to mpd parser*/
 	GF_DASHFileIO dash_io;
 
 	Bool connection_ack_sent;
 	Bool memory_storage;
 	Bool use_max_res, immediate_switch, allow_http_abort;
-	u32 use_low_latency;
+	Bool disable_continuity;
+	MpdInLowLatency low_latency_mode;
 	MpdInBuffer buffer_mode;
 	u32 nb_playing;
+	Bool has_muxed_groups;
 
 	GF_DASHAdaptationAlgorithm adaptation_algorithm;
+	GF_List *groups;
 
 	/*max width & height in all active representations*/
 	u32 width, height;
@@ -78,10 +89,14 @@
 	u32 idx;
 	GF_DownloadSession *sess;
 	Bool is_timestamp_based, pto_setup;
+	u32 force_init_next;
 	u32 timescale;
 	s64 pto;
 	s64 max_cts_in_period;
 	bin128 key_IV;
+	u32 nb_comp;
+	char *mime;
+	u64 last_dts;
 } GF_MPDGroup;
 
 const char * MPD_MPD_DESC = "MPEG-DASH Streaming";
@@ -162,9 +177,11 @@
 void mpdin_data_packet(GF_ClientService *service, LPNETCHANNEL ns, char *data, u32 data_size, GF_SLHeader *hdr, GF_Err reception_status)
 {
 	s32 i;
+	u32 timescale = 0;
 	GF_MPD_In *mpdin = (GF_MPD_In*) service->ifce->priv;
 	GF_Channel *ch;
 	GF_MPDGroup *group;
+	GF_SLHeader s_hdr;
 	Bool do_map_time = GF_FALSE;
 	if (!ns || !hdr) {
 		mpdin->fn_data_packet(service, ns, data, data_size, hdr, reception_status);
@@ -173,6 +190,11 @@
 
 	ch = (GF_Channel *) ns;
 	assert(ch->odm && ch->odm->OD);
+	timescale = ch->esd->slConfig->timestampResolution;
+	if (hdr->ts_res)
+		timescale = hdr->ts_res;
+	if (!timescale) timescale=90000;
+
 
 	i = gf_dash_get_group_idx_from_service(mpdin, (GF_InputService *) ch->odm->OD->service_ifce);
 	if (i<0) {
@@ -182,6 +204,9 @@
 
 	group = gf_dash_get_group_udta(mpdin->dash, i);
 
+	s_hdr = *hdr;
+	hdr = &s_hdr;
+
 	if (gf_dash_is_m3u8(mpdin->dash)) {
 		mpdin->fn_data_packet(service, ns, data, data_size, hdr, reception_status);
 		if (!group->pto_setup) {
@@ -200,29 +225,29 @@
 	//if sync is based on timestamps do not adjust the timestamps back
 	if (! group->is_timestamp_based) {
 		if (!group->pto_setup) {
-			Double scale;
 			s64 start, dur;
 			u64 pto;
 			gf_dash_group_get_presentation_time_offset(mpdin->dash, i, &pto, &group->timescale);
 			group->pto = (s64) pto;
 			group->pto_setup = 1;
 
-			if (group->timescale && (group->timescale != ch->esd->slConfig->timestampResolution)) {
-				group->pto *= ch->esd->slConfig->timestampResolution;
+			if (group->timescale && (group->timescale != timescale)) {
+				group->pto *= timescale;
 				group->pto /= group->timescale;
 			}
-			scale = ch->esd->slConfig->timestampResolution;
-			scale /= 1000;
 
-			dur = (u64) (scale * gf_dash_get_period_duration(mpdin->dash));
+			dur = (u64) (timescale * gf_dash_get_period_duration(mpdin->dash) / 1000);
 			if (dur) {
 				group->max_cts_in_period = group->pto + dur;
 			} else {
 				group->max_cts_in_period = 0;
 			}
 
-			start = (u64) (scale * gf_dash_get_period_start(mpdin->dash));
+			start = (u64) (timescale * gf_dash_get_period_start(mpdin->dash) / 1000);
 			group->pto -= start;
+
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] PTO setup for group %d : PTO "LLD" - period start "LLD" - last dts "LLU")\n", i, group->pto, start, group->last_dts));
+
 		}
 
 		//filter any packet outside the current period
@@ -240,6 +265,10 @@
 				hdr->decodingTimeStamp = 0;
 				hdr->seekFlag = 1;
 			}
+			if (timescale != ch->esd->slConfig->timestampResolution) {
+				hdr->decodingTimeStamp *= ch->esd->slConfig->timestampResolution;
+				hdr->decodingTimeStamp /= timescale;
+			}
 		}
 		if (hdr->compositionTimeStampFlag) {
 			if ((s64) hdr->compositionTimeStamp >= group->pto)
@@ -249,6 +278,10 @@
 				hdr->compositionTimeStamp = 0;
 				hdr->seekFlag = 1;
 			}
+			if (timescale != ch->esd->slConfig->timestampResolution) {
+				hdr->compositionTimeStamp *= ch->esd->slConfig->timestampResolution;
+				hdr->compositionTimeStamp /= timescale;
+			}
 		}
 
 		if (hdr->OCRflag) {
@@ -271,6 +304,14 @@
 		group->pto_setup = 1;
 	}
 
+	if (group->last_dts>hdr->decodingTimeStamp) {
+		u32 diff = (u32) (group->last_dts - hdr->decodingTimeStamp);
+		if (diff*100 < timescale) {
+			return;
+		}
+	}
+	group->last_dts = hdr->decodingTimeStamp;
+
 	mpdin->fn_data_packet(service, ns, data, data_size, hdr, reception_status);
 
 	if (do_map_time) {
@@ -338,7 +379,7 @@
 		Bool discard_first_cache_entry = param->url_query.drop_first_segment;
 		Bool check_current_download = param->url_query.current_download;
 		u32 timer = gf_sys_clock();
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Service Query Next request from input service %s\n", ifce->module_name));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Service Query Next request from input service %s (drop first seg %d)\n", ifce->module_name, discard_first_cache_entry));
 
 
 		param->url_query.current_download = 0;
@@ -364,10 +405,12 @@
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] New AdaptationSet detected after MPD update ?\n"));
 		}
 
-		if (discard_first_cache_entry) {
+		if (discard_first_cache_entry || (group->force_init_next==1)) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Discarding first segment in cache\n"));
 			gf_dash_group_discard_segment(mpdin->dash, group_idx);
 		}
+		if (group->force_init_next==1)
+			group->force_init_next = 2;
 
 		while (gf_dash_is_running(mpdin->dash)) {
 			group_done=0;
@@ -376,16 +419,24 @@
 				break;
 
 			if (group_done) {
-				if (!gf_dash_get_period_switch_status(mpdin->dash) && !gf_dash_in_last_period(mpdin->dash, GF_TRUE)) {
+				if (gf_dash_is_group_selected(mpdin->dash, group_idx)
+				&& !gf_dash_get_period_switch_status(mpdin->dash)
+				&& !gf_dash_in_last_period(mpdin->dash, GF_TRUE)
+				&& gf_dash_all_groups_done(mpdin->dash)
+				) {
 					GF_NetworkCommand com;
 					param->url_query.in_end_of_period = 1;
 					memset(&com, 0, sizeof(GF_NetworkCommand));
 					com.command_type = GF_NET_BUFFER_QUERY;
 					if (gf_dash_get_period_switch_status(mpdin->dash) != 1) {
-						gf_service_command(mpdin->service, &com, GF_OK);
+						//if muxed groups, flush all otherwise we will try not to destroy the service
+						if (mpdin->has_muxed_groups)
+							gf_service_command(mpdin->service, &com, GF_OK);
+
 						//we only switch period once no more data is in our buffers
 						if (!com.buffer.occupancy) {
 							param->url_query.in_end_of_period = 0;
+							mpdin->at_period_switch = GF_TRUE;
 							gf_dash_request_period_switch(mpdin->dash);
 						}
 					}
@@ -396,7 +447,7 @@
 				}
 			}
 
-			if (check_current_download && mpdin->use_low_latency) {
+			if (check_current_download && mpdin->low_latency_mode) {
 				Bool is_switched=GF_FALSE;
 				gf_dash_group_probe_current_download_segment_location(mpdin->dash, group_idx, &param->url_query.next_url, NULL, &param->url_query.next_url_init_or_switch_segment, &src_url, &is_switched);
 
@@ -414,6 +465,8 @@
 			return GF_BUFFER_TOO_SMALL;
 		}
 
+		mpdin->at_period_switch = GF_FALSE;
+
 		param->url_query.current_download = 0;
 		nb_segments_cached = gf_dash_group_get_num_segments_ready(mpdin->dash, group_idx, &group_done);
 		if (nb_segments_cached < 1) {
@@ -430,9 +483,15 @@
 			return e;
 
 		param->url_query.key_IV = &group->key_IV;
+		if (group->force_init_next==2) {
+			group->force_init_next = 0;
+			param->url_query.next_url_init_or_switch_segment = gf_dash_group_get_segment_init_url(mpdin->dash, group_idx, &param->url_query.switch_start_range, &param->url_query.switch_end_range);
+		}
 
-		if (gf_dash_group_loop_detected(mpdin->dash, group_idx))
+		if (gf_dash_group_loop_detected(mpdin->dash, group_idx)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD_IN] Clock discontinuity found\n"));
 			param->url_query.discontinuity_type = 2;
+		}
 
 
 #ifndef GPAC_DISABLE_LOG
@@ -466,6 +525,17 @@
 	u32 i;
 	const char *sPlug;
 	if (mime) {
+		for (i=0; i<gf_list_count(mpdin->groups); i++) {
+			GF_MPDGroup *group = gf_list_get(mpdin->groups, i);
+			if (group->mime && !strcmp(group->mime, mime)) {
+				group->pto_setup=GF_FALSE;
+				group->idx = group_index;
+				group->force_init_next = strstr(mime, "mp4") ? GF_TRUE : GF_FALSE;
+				gf_dash_set_group_udta(mpdin->dash, group_index, group);
+				return GF_OK;
+			}
+
+		}
 		/* Check MIME type to start the right InputService */
 		sPlug = gf_cfg_get_key(mpdin->service->term->user->config, "MimeTypes", mime);
 		if (sPlug) sPlug = strrchr(sPlug, '"');
@@ -482,7 +552,12 @@
 				group->segment_ifce->query_proxy = MPD_ClientQuery;
 				group->mpdin = mpdin;
 				group->idx = group_index;
+				group->mime = gf_strdup(mime);
+				if ( gf_dash_group_get_num_components(mpdin->dash, group_index)>1) {
+					mpdin->has_muxed_groups = GF_TRUE;
+				}
 				gf_dash_set_group_udta(mpdin->dash, group_index, group);
+				gf_list_add(mpdin->groups, group);
 				return GF_OK;
 			}
 		}
@@ -569,6 +644,7 @@
 static void mpdin_dash_segment_netio(void *cbk, GF_NETIO_Parameter *param)
 {
 	GF_MPDGroup *group = (GF_MPDGroup *)cbk;
+	u32 bytes_per_sec;
 
 	if (param->msg_type == GF_NETIO_PARSE_HEADER) {
 		if (!strcmp(param->name, "Dash-Newest-Segment")) {
@@ -580,14 +656,15 @@
 		group->has_new_data = 1;
 
 		if (param->reply) {
-			u32 bytes_per_sec;
+			//u32 bytes_per_sec;
 			const char *url;
 			gf_dm_sess_get_stats(group->sess, NULL, &url, NULL, NULL, &bytes_per_sec, NULL);
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] End of chunk received for %s at UTC "LLU" ms - estimated bandwidth %d kbps - chunk start at UTC "LLU"\n", url, gf_net_get_utc(), 8*bytes_per_sec/1000, gf_dm_sess_get_utc_start(group->sess)));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DEBUG. 2. redowload at max %d \n", 8*bytes_per_sec/1000));
 
-			if (group->mpdin->use_low_latency)
+			if (group->mpdin->low_latency_mode)
 				MPD_NotifyData(group, 1);
-		} else if (group->mpdin->use_low_latency==2) {
+		} else if (group->mpdin->low_latency_mode==MPDIN_LOW_LATENCY_ALWAYS) {
 			MPD_NotifyData(group, 1);
 		}
 
@@ -599,6 +676,7 @@
 		const char *url;
 		gf_dm_sess_get_stats(group->sess, NULL, &url, NULL, NULL, &bytes_per_sec, NULL);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] End of file %s download at UTC "LLU" ms - estimated bandwidth %d kbps - started file or last chunk at UTC "LLU"\n", url, gf_net_get_utc(), 8*bytes_per_sec/1000, gf_dm_sess_get_utc_start(group->sess)));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DEBUG1. %d \n", 8*bytes_per_sec/1000));
 	}
 }
 
@@ -698,6 +776,7 @@
 		bps = gf_dm_get_data_rate(mpdin->service->term->downloader);
 		bps/=8;
 	}
+	//GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DEBUG. 2. max max max %d \n", bps*8));
 	return bps;
 }
 u32 mpdin_dash_io_get_total_size(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
@@ -732,7 +811,7 @@
 
 	if (dash_evt==GF_DASH_EVENT_SELECT_GROUPS) {
 		//configure buffer in dynamic mode without low latency: we indicate how much the player will buffer
-		if (gf_dash_is_dynamic_mpd(mpdin->dash) && !mpdin->use_low_latency) {
+		if (gf_dash_is_dynamic_mpd(mpdin->dash) && (mpdin->low_latency_mode==MPDIN_LOW_LATENCY_NONE) ) {
 			u32 buffer_ms = 0;
 			const char *opt = gf_modules_get_option((GF_BaseInterface *)mpdin->plug, "Network", "BufferLength");
 			if (opt) buffer_ms = atoi(opt);
@@ -754,6 +833,8 @@
 
 	/*for all selected groups, create input service and connect to init/first segment*/
 	if (dash_evt==GF_DASH_EVENT_CREATE_PLAYBACK) {
+		mpdin->has_muxed_groups = mpdin->disable_continuity ? GF_TRUE : GF_FALSE;
+
 		/*select input services if possible*/
 		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
 			const char *mime, *init_segment;
@@ -803,13 +884,16 @@
 					mpdin->width = w;
 					mpdin->height = h;
 				}
-
-				e = group->segment_ifce->ConnectService(group->segment_ifce, mpdin->service, init_segment);
-				if (e) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD_IN] Unable to connect input service to %s\n", init_segment));
-					gf_dash_group_select(mpdin->dash, i, GF_FALSE);
+				if (!group->service_connected) {
+					e = group->segment_ifce->ConnectService(group->segment_ifce, mpdin->service, init_segment);
+					if (e) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD_IN] Unable to connect input service to %s\n", init_segment));
+						gf_dash_group_select(mpdin->dash, i, GF_FALSE);
+					} else {
+						group->service_connected = 1;
+					}
 				} else {
-					group->service_connected = 1;
+					gf_dash_group_select(mpdin->dash, i, GF_TRUE);
 				}
 				if (mpdin->closed) return GF_OK;
 			}
@@ -819,6 +903,7 @@
 			mpdin->fn_connect_ack(mpdin->service, NULL, GF_OK);
 			mpdin->connection_ack_sent=1;
 		}
+		mpdin->at_period_switch = GF_FALSE;
 
 		//we had a seek outside of the period we were setting up, during period setup !
 		//request the seek again from the player
@@ -835,6 +920,9 @@
 
 	/*for all running services, stop service*/
 	if (dash_evt==GF_DASH_EVENT_DESTROY_PLAYBACK) {
+		//all groups are single-media, and we are at period switch: try to use period continuity
+		if (mpdin->at_period_switch && !mpdin->has_muxed_groups)
+			return GF_OK;
 
 		mpdin->service->subservice_disconnect = 1;
 		gf_service_disconnect_ack(mpdin->service, NULL, GF_OK);
@@ -850,6 +938,8 @@
 				}
 				gf_modules_close_interface((GF_BaseInterface *) group->segment_ifce);
 			}
+			gf_list_del_item(mpdin->groups, group);
+			if (group->mime) gf_free(group->mime);
 			gf_free(group);
 			gf_dash_set_group_udta(mpdin->dash, i, NULL);
 		}
@@ -912,7 +1002,13 @@
 		gf_service_command(mpdin->service, &com, GF_OK);
 		gf_dash_group_set_buffer_levels(mpdin->dash, group_idx, com.buffer.min, com.buffer.max, com.buffer.occupancy);
 	}
-
+	if ((dash_evt==GF_DASH_EVENT_CACHE_FULL) || (dash_evt==GF_DASH_EVENT_END_OF_PERIOD) ) {
+		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
+			GF_MPDGroup *group = gf_dash_get_group_udta(mpdin->dash, i);
+			if (group && gf_dash_is_group_selected(mpdin->dash, i))
+				MPD_NotifyData(group, 0);
+		}
+	}
 	return GF_OK;
 }
 
@@ -944,7 +1040,7 @@
 	GF_Err e;
 	s32 shift_utc_ms, debug_adaptation_set;
 	u32 max_cache_duration, auto_switch_count, init_timeshift, tiles_rate_decrease;
-	Bool use_server_utc;
+	Bool use_server_utc, ignore_xlink;
 	GF_DASHInitialSelectionMode first_select_mode;
 	GF_DASHTileAdaptationMode tile_adapt_mode;
 	Bool keep_files, disable_switching, use_threads;
@@ -1006,8 +1102,20 @@
 	else if (!strcmp(opt, "buffer")) {
 		mpdin->adaptation_algorithm = GF_DASH_ALGO_GPAC_LEGACY_BUFFER;
 	}
-	else if (!strcmp(opt, "test")) {
-		mpdin->adaptation_algorithm = GF_DASH_ALGO_GPAC_TEST;
+	else if (!strcmp(opt, "BBA-0")) {
+		mpdin->adaptation_algorithm = GF_DASH_ALGO_BBA0;
+	}
+	else if (!strcmp(opt, "BOLA_FINITE")) {
+		mpdin->adaptation_algorithm = GF_DASH_ALGO_BOLA_FINITE;
+	}
+	else if (!strcmp(opt, "BOLA_BASIC")) {
+		mpdin->adaptation_algorithm = GF_DASH_ALGO_BOLA_BASIC;
+	}
+	else if (!strcmp(opt, "BOLA_U")) {
+		mpdin->adaptation_algorithm = GF_DASH_ALGO_BOLA_U;
+	}
+	else if (!strcmp(opt, "BOLA_O")) {
+		mpdin->adaptation_algorithm = GF_DASH_ALGO_BOLA_O;
 	}
 
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "StartRepresentation");
@@ -1046,9 +1154,9 @@
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "LowLatency");
 	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "LowLatency", "no");
 
-	if (opt && !strcmp(opt, "chunk")) mpdin->use_low_latency = 1;
-	else if (opt && !strcmp(opt, "always")) mpdin->use_low_latency = 2;
-	else mpdin->use_low_latency = 0;
+	if (opt && !strcmp(opt, "chunk")) mpdin->low_latency_mode = MPDIN_LOW_LATENCY_CHUNK;
+	else if (opt && !strcmp(opt, "always")) mpdin->low_latency_mode = MPDIN_LOW_LATENCY_CHUNK;
+	else mpdin->low_latency_mode = MPDIN_LOW_LATENCY_NONE;
 
 	
 	use_threads = GF_FALSE;
@@ -1056,7 +1164,7 @@
 	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "ThreadedDownload", "no");
 	if (opt && !strcmp(opt, "yes")) use_threads = GF_TRUE;
 
-	if (mpdin->use_low_latency) use_threads = GF_TRUE;
+	if (mpdin->low_latency_mode) use_threads = GF_TRUE;
 	
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "AllowAbort");
 	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "AllowAbort", "no");
@@ -1068,7 +1176,7 @@
 
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "UseServerUTC");
 	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "UseServerUTC", "yes");
-	use_server_utc = (opt && !strcmp(opt, "yes")) ? 1 : 0;
+	use_server_utc = (!opt || !strcmp(opt, "yes")) ? 1 : 0;
 
 	mpdin->nb_playing = 0;
 
@@ -1077,6 +1185,10 @@
 	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "InitialTimeshift", "0");
 	if (opt) init_timeshift = atoi(opt);
 
+	ignore_xlink = GF_FALSE;
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "IgnoreXLink");
+	if (opt && !strcmp(opt, "yes")) ignore_xlink = GF_TRUE;
+
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "TileAdaptation");
 	if (!opt) {
 		gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "TileAdaptation", "none");
@@ -1122,6 +1234,7 @@
 	gf_dash_enable_utc_drift_compensation(mpdin->dash, use_server_utc);
 	gf_dash_set_tile_adaptation_mode(mpdin->dash, tile_adapt_mode, tiles_rate_decrease);
 	gf_dash_set_threaded_download(mpdin->dash, use_threads);
+	gf_dash_ignore_xlink(mpdin->dash, ignore_xlink);
 
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "UseScreenResolution");
 	//default mode is no for the time being
@@ -1172,6 +1285,16 @@
 		gf_dash_disable_speed_adaptation(mpdin->dash, GF_TRUE);
 
 
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "UTCShiftATSC");
+	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "UTCShiftATSC", "1000");
+	else gf_dash_set_atsc_ast_shift(mpdin->dash, atoi(opt) );
+
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "NoContinuity");
+	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "NoContinuity", "no");
+	else if (!strcmp(opt, "yes")) mpdin->disable_continuity = GF_TRUE;
+
+	gf_dash_set_period_xlink_query_string(mpdin->dash, gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "XLinkQuery") );
+
 	/*dash thread starts at the end of gf_dash_open */
 	e = gf_dash_open(mpdin->dash, url);
 	if (e) {
@@ -1212,11 +1335,26 @@
 	assert(mpdin);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Close Service (%p) request from terminal\n", mpdin->service));
 
+	if (mpdin->service && mpdin->service->subservice_disconnect) return GF_OK;
+
 	mpdin->closed = 1;
 
 	if (mpdin->dash)
 		gf_dash_close(mpdin->dash);
 
+	while (gf_list_count(mpdin->groups)) {
+		GF_MPDGroup *group = gf_list_pop_back(mpdin->groups);
+		if (group->segment_ifce) {
+			if (group->service_connected) {
+				group->segment_ifce->CloseService(group->segment_ifce);
+				group->service_connected = 0;
+			}
+			gf_modules_close_interface((GF_BaseInterface *) group->segment_ifce);
+		}
+		if (group->mime) gf_free(group->mime);
+		gf_free(group);
+	}
+
 	gf_service_disconnect_ack(mpdin->service, NULL, GF_OK);
 
 	return GF_OK;
@@ -1265,7 +1403,6 @@
 	}
 	/*we could get it from MPD*/
 	case GF_NET_SERVICE_HAS_AUDIO:
-	case GF_NET_SERVICE_FLUSH_DATA:
 		if (segment_ifce) {
 			/* defer to the real input service */
 			return segment_ifce->ServiceCommand(segment_ifce, com);
@@ -1397,7 +1534,7 @@
 
 		e = gf_dash_group_get_quality_info(mpdin->dash, g_idx, com->quality_query.index-1, &qinfo);
 		if (e) return e;
-		
+		//group->bandwidth = qinfo.bandwidth;
 		com->quality_query.bandwidth = qinfo.bandwidth;
 		com->quality_query.ID = qinfo.ID;
 		com->quality_query.mime = qinfo.mime;
@@ -1510,11 +1647,18 @@
 				if (ms<1000) ms = 0;
 				gf_dash_set_timeshift(mpdin->dash, ms);
 			}
-			gf_dash_seek(mpdin->dash, com->play.start_range);
+			if (!com->play.initial_broadcast_play || !mpdin->at_period_switch)
+				gf_dash_seek(mpdin->dash, com->play.start_range);
 
 			//to remove once we manage to keep the service alive
 			/*don't forward commands if a switch of period is to be scheduled, we are killing the service anyway ...*/
 			if (gf_dash_get_period_switch_status(mpdin->dash)) return GF_OK;
+		} else if (!com->play.initial_broadcast_play) {
+			/*don't forward commands if a switch of period is to be scheduled, we are killing the service anyway ...*/
+			if (gf_dash_get_period_switch_status(mpdin->dash)) return GF_OK;
+
+			//seek on a single group
+			gf_dash_group_seek(mpdin->dash, idx, com->play.start_range);
 		}
 
 		//check if current segment playback should be aborted
@@ -1627,6 +1771,7 @@
 		gf_free(plug);
 		return NULL;
 	}
+	mpdin->groups = gf_list_new();
 	plug->priv = mpdin;
 	mpdin->plug = plug;
 	
@@ -1658,6 +1803,7 @@
 	if (mpdin->dash)
 		gf_dash_del(mpdin->dash);
 
+	gf_list_del(mpdin->groups);
 	gf_free(mpdin);
 	gf_free(bi);
 }

gpac-0.7.1.tar.gz/modules/mpegts_in/mpegts_in.c -> gpac-0.8.0.tar.gz/modules/mpegts_in/mpegts_in.c Changed

@@ -212,6 +212,8 @@
 		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_SVC;
 		break;
 	case GF_M2TS_VIDEO_HEVC:
+	case GF_M2TS_VIDEO_HEVC_TEMPORAL:
+	case GF_M2TS_VIDEO_HEVC_MCTS:
 		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
 		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_HEVC;
 		break;
@@ -319,15 +321,16 @@
 			GF_ESD *the_esd;
 			the_esd = MP2TS_GetESD(m2ts, (GF_M2TS_PES *)es, dsi, dsi_size);
 			if (the_esd) {
-				if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) && (the_esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_LHVC)) {
+				if (/*(esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) &&*/ the_esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_LHVC) {
 					esd->has_scalable_layers = GF_FALSE;
 				}
 				the_esd->has_scalable_layers = GF_TRUE;
 
 				the_esd->dependsOnESID = cur_ES;
 				gf_list_add(od->ESDescriptors, the_esd);
+
+				cur_ES = the_esd->ESID;
 			}
-			cur_ES = the_esd->ESID;
 		}
 	}
 
@@ -993,7 +996,7 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M2TS In] Cannot query next file: not yet downloaded\n"));
 	} else if ((query_ret==GF_OK) && query_type && !param.url_query.next_url) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[M2TS In] Cannot query next file: no file provided but no error raised\n"));
-	} else if (query_ret) {
+	} else if (query_ret && query_type!=INIT_RANGE && query_type!=DROP_NEXT_SEGMENT) {
 		GF_LOG((query_ret<0) ? GF_LOG_ERROR : GF_LOG_INFO, GF_LOG_DASH, ("[M2TS In] Cannot query next file: error: %s\n", gf_error_to_string(query_ret)));
 	} else {
 		if (out_url) *out_url = param.url_query.next_url;
@@ -1135,6 +1138,9 @@
 	m2ts->force_temi_url = gf_modules_get_option((GF_BaseInterface *)m2ts->owner, "M2TS", "ForceTEMILocation");
 	if (m2ts->force_temi_url && !strlen(m2ts->force_temi_url)) m2ts->force_temi_url = NULL;
 
+	opt = gf_modules_get_option((GF_BaseInterface *)m2ts->owner, "M2TS", "UDPBufferSize");
+	if (opt) m2ts->ts->udp_buffer_size = (u32)atoi(opt);
+
 	opt = gf_modules_get_option((GF_BaseInterface *)m2ts->owner, "DSMCC", "Activated");
 	if (opt && !strcmp(opt, "yes")) {
 		gf_m2ts_demux_dmscc_init(m2ts->ts);
@@ -1463,11 +1469,6 @@
 		m2ts_flush_data(m2ts, com->proxy_data.is_chunk ? GF_M2TS_PUSH_CHUNK : GF_M2TS_PUSH_SEGMENT);
 		return GF_OK;
 	}
-	if (com->command_type == GF_NET_SERVICE_FLUSH_DATA) {
-		if (plug->query_proxy)
-			m2ts_flush_data(m2ts, GF_M2TS_FLUSH_DATA);
-		return GF_OK;
-	}
 	//get info on the first running program
 	if (com->command_type==GF_NET_SERVICE_INFO) {
 		u32 id = com->info.service_id;

gpac-0.7.1.tar.gz/modules/mse_in/mse_in.c -> gpac-0.8.0.tar.gz/modules/mse_in/mse_in.c Changed

gpac-0.8.0.tar.gz/modules/netctrl Added

gpac-0.8.0.tar.gz/modules/netctrl/Makefile Added

gpac-0.8.0.tar.gz/modules/netctrl/netctrl.c Added

@@ -0,0 +1,212 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2011-2012
+ *			All rights reserved
+ *
+ * This file is part of GPAC / Sampe On-Scvreen Display sub-project
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/modules/term_ext.h>
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/nodes_mpeg4.h>
+#include <gpac/network.h>
+
+#define XMIN 160
+#define XMAX 480
+
+#define YMAX 360
+#define YMIN 120
+
+typedef struct
+{
+	GF_Terminal *term;
+	GF_Socket *sock;
+	Bool mouse_down;
+	u32 cnt;
+	Float last_min_x, last_max_x, last_min_y, last_max_y;
+} GF_NetControl;
+
+static Bool netctrl_process(GF_TermExt *termext, u32 action, void *param)
+{
+	const char *sOpt, *server_ip;
+	int port;
+	Float face_min_x, face_max_x, face_min_y, face_max_y, gaze_x, gaze_y;
+	GF_Event event;
+	GF_NetControl *netctrl = termext->udta;
+	char message[1024];
+	GF_Err e;
+	u32 bytes;
+	u32 face = 0;
+
+	switch (action) {
+	case GF_TERM_EXT_START:
+		netctrl->term = (GF_Terminal *) param;
+
+		sOpt = gf_modules_get_option((GF_BaseInterface*)termext, "NetControler", "Enabled");
+		if (!sOpt || strcmp(sOpt, "yes")) return 0;
+		sOpt = gf_cfg_get_key(netctrl->term->compositor->user->config, "NetControler", "ServerIP");
+		if (sOpt) server_ip = sOpt;
+		else server_ip = "127.0.0.1";
+		sOpt = gf_cfg_get_key(netctrl->term->compositor->user->config, "NetControler", "Port");
+		if (sOpt) port = atoi(sOpt);
+		else port = 20320;
+
+		termext->caps |= GF_TERM_EXTENSION_NOT_THREADED;
+		netctrl->sock = gf_sk_new(GF_SOCK_TYPE_UDP);
+
+		if (netctrl->sock < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[NetControl] Failed to open socket for %s:%d\n", server_ip, port));
+			return 0;
+		}
+
+		e = gf_sk_bind(netctrl->sock, server_ip, port, NULL, 0, 0);
+		if (e != GF_OK) {
+			if (netctrl->sock) gf_sk_del(netctrl->sock);
+			netctrl->sock = NULL;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[NetControl] Failed to bind to socket %s:%d\n", server_ip, port));
+			return 0;
+		}
+
+		return 1;
+
+	case GF_TERM_EXT_STOP:
+		if (netctrl->sock) gf_sk_del(netctrl->sock);
+		break;
+
+	case GF_TERM_EXT_PROCESS:
+		gf_sk_receive(netctrl->sock, message, 1024, 0, &bytes);
+		if (!bytes) break;
+		message[bytes] = '\0';
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[NetControl] received message %s\n", message));
+
+		if (!strncmp(message, "gpac splice ", 12) || !strncmp(message, "gpac add ", 9)
+			|| !strncmp(message, "gpac select ", 12)
+		) {
+			gf_term_scene_update(netctrl->term, NULL, message);
+			break;
+		}
+
+		if (strncmp(message, "gpac:face=", 10)) break;
+
+		sscanf(message, "gpac:face=%d,%f,%f,%f,%f", &face, &face_min_x, &face_max_x, &face_min_y, &face_max_y);
+
+
+		memset(&event, 0, sizeof(GF_Event));
+		event.mouse.button = GF_MOUSE_LEFT;
+		if (face == 0) {
+			if (netctrl->last_min_x < 0.01) {
+				netctrl->term->compositor->auto_rotate = 2;
+			} else if (netctrl->last_max_x > 0.90) {
+				netctrl->term->compositor->auto_rotate = 1;
+			} else if (netctrl->last_min_y < 0.01) {
+				netctrl->term->compositor->auto_rotate = 4;
+			} else if (netctrl->last_max_y > 0.90) {
+				netctrl->term->compositor->auto_rotate = 3;
+			} else {
+				netctrl->cnt++;
+				if ((netctrl->cnt>=50) && (netctrl->mouse_down)) {
+					netctrl->term->compositor->auto_rotate = 0;
+					netctrl->mouse_down = GF_FALSE;
+					event.type = GF_EVENT_MOUSEUP;
+					netctrl->term->compositor->video_out->on_event(netctrl->term->compositor->video_out->evt_cbk_hdl, &event);
+				}
+			}
+			break;
+		}
+
+		netctrl->last_min_x = face_min_x;
+		netctrl->last_max_x = face_max_x;
+		netctrl->last_min_y = face_min_y;
+		netctrl->last_max_y = face_max_y;
+
+		gaze_x = (face_min_x+face_max_x)/2;
+		gaze_y = (face_min_y+face_max_y)/2;
+
+		event.mouse.x = (1-gaze_x) * netctrl->term->compositor->display_width;
+		event.mouse.y = (1-gaze_y) * netctrl->term->compositor->display_height;
+
+		if (!netctrl->mouse_down) {
+			//don't grab if mouse is down
+			if (netctrl->term->compositor->navigation_state) break;
+			netctrl->mouse_down = GF_TRUE;
+			event.type = GF_EVENT_MOUSEDOWN;
+			netctrl->term->compositor->video_out->on_event(netctrl->term->compositor->video_out->evt_cbk_hdl, &event);
+			netctrl->cnt = 0;
+		}
+		event.type = GF_EVENT_MOUSEMOVE;
+		netctrl->term->compositor->video_out->on_event(netctrl->term->compositor->video_out->evt_cbk_hdl, &event);
+		break;
+	}
+	return 0;
+}
+
+
+GF_TermExt *netctrl_new()
+{
+	GF_TermExt *dr;
+	GF_NetControl *netctrl;
+	dr = (GF_TermExt*)gf_malloc(sizeof(GF_TermExt));
+	memset(dr, 0, sizeof(GF_TermExt));
+	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "GPAC NetControl", "gpac distribution");
+
+	GF_SAFEALLOC(netctrl, GF_NetControl);
+	dr->process = netctrl_process;
+	dr->udta = netctrl;
+	return dr;
+}
+
+
+void netctrl_delete(GF_BaseInterface *ifce)
+{
+	GF_TermExt *dr = (GF_TermExt *) ifce;
+	GF_NetControl *netctrl = dr->udta;
+	gf_free(netctrl);
+	gf_free(dr);
+}
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+		GF_TERM_EXT_INTERFACE,
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)netctrl_new();
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+	case GF_TERM_EXT_INTERFACE:
+		netctrl_delete(ifce);
+		break;
+	}
+}
+
+GPAC_MODULE_STATIC_DECLARATION( netctrl )

gpac-0.8.0.tar.gz/modules/nvdec Added

gpac-0.8.0.tar.gz/modules/nvdec/Makefile Added

@@ -0,0 +1,62 @@
+include ../../config.mak
+
+vpath %.c $(SRC_PATH)/modules/nvdec
+
+CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
+
+ifeq ($(DEBUGBUILD), yes)
+CFLAGS+=-g
+LDFLAGS+=-g
+endif
+
+ifeq ($(GPROFBUILD), yes)
+CFLAGS+=-pg
+LDFLAGS+=-pg
+endif
+
+#common obj
+OBJS=nvdec.o cuda_sdk.o
+
+SRCS := $(OBJS:.o=.c) 
+
+
+ifeq ($(CONFIG_WIN32), yes)
+else
+EXTRALIBS+=-ldl
+endif
+
+ifeq ($(HAS_OPENGL), yes)
+CFLAGS+=$(OGL_INCLS)
+EXTRALIBS+=$(OGL_LIBS)
+
+ifeq ($(CONFIG_DARWIN),yes)
+EXTRALIBS+=-lGL -lGLU
+endif
+
+endif
+
+
+LIB=gm_nvdec$(DYN_LIB_SUFFIX)
+
+all: $(LIB)
+
+
+$(LIB): $(OBJS)
+	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS) $(LDFLAGS)
+ifeq ($(STATICBUILD),yes)
+	$(CC) $(SHFLAGS) -o ../../bin/gcc/gm_nvdec-static$(DYN_LIB_SUFFIX) $(OBJS) -L../../bin/gcc -lgpac_static $(EXTRALIBS) $(LDFLAGS)
+endif
+
+clean: 
+	rm -f $(OBJS) ../../bin/gcc/$(LIB)
+
+dep: depend
+
+depend:
+	rm -f .depend	
+	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+
+distclean: clean
+	rm -f Makefile.bak .depend
+
+-include .depend

gpac-0.8.0.tar.gz/modules/nvdec/cuda_sdk.c Added

@@ -0,0 +1,701 @@
+/*
+ * Copyright 1993-2015 NVIDIA Corporation. All rights reserved.
+ *
+ * Please refer to the NVIDIA end user license agreement (EULA) associated
+ * with this source code for terms and conditions that govern your use of
+ * this software. Any use, reproduction, disclosure, or distribution of
+ * this software and related documentation outside the terms of the EULA
+ * is strictly prohibited.
+ *
+ */
+
+
+// With these flags defined, this source file will dynamically
+// load the corresponding functions. Disabled by default.
+#define __CUDA_API_VERSION 4000
+
+#include <stdio.h>
+#include <string.h>
+#include "cuda_sdk.h"
+
+tcuInit *_cuInit;
+tcuDriverGetVersion *cuDriverGetVersion;
+tcuDeviceGet *cuDeviceGet;
+tcuDeviceGetCount *cuDeviceGetCount;
+tcuDeviceGetName *cuDeviceGetName;
+tcuDeviceComputeCapability *cuDeviceComputeCapability;
+tcuDeviceTotalMem *cuDeviceTotalMem;
+tcuDeviceGetProperties *cuDeviceGetProperties;
+tcuDeviceGetAttribute *cuDeviceGetAttribute;
+tcuCtxCreate *cuCtxCreate;
+tcuCtxDestroy *cuCtxDestroy;
+tcuCtxAttach *cuCtxAttach;
+tcuCtxDetach *cuCtxDetach;
+tcuCtxPushCurrent *cuCtxPushCurrent;
+tcuCtxPopCurrent *cuCtxPopCurrent;
+tcuCtxGetCurrent *cuCtxGetCurrent;
+tcuCtxSetCurrent *cuCtxSetCurrent;
+tcuCtxGetDevice *cuCtxGetDevice;
+tcuCtxSynchronize *cuCtxSynchronize;
+tcuModuleLoad *cuModuleLoad;
+tcuModuleLoadData *cuModuleLoadData;
+tcuModuleLoadDataEx *cuModuleLoadDataEx;
+tcuModuleLoadFatBinary *cuModuleLoadFatBinary;
+tcuModuleUnload *cuModuleUnload;
+tcuModuleGetFunction *cuModuleGetFunction;
+tcuModuleGetGlobal *cuModuleGetGlobal;
+tcuModuleGetTexRef *cuModuleGetTexRef;
+tcuModuleGetSurfRef *cuModuleGetSurfRef;
+tcuMemGetInfo *cuMemGetInfo;
+tcuMemAlloc *cuMemAlloc;
+tcuMemAllocPitch *cuMemAllocPitch;
+tcuMemFree *cuMemFree;
+tcuMemGetAddressRange *cuMemGetAddressRange;
+tcuMemAllocHost *cuMemAllocHost;
+tcuMemFreeHost *cuMemFreeHost;
+tcuMemHostAlloc *cuMemHostAlloc;
+tcuMemHostGetDevicePointer *cuMemHostGetDevicePointer;
+tcuMemHostRegister *cuMemHostRegister;
+tcuMemHostUnregister *cuMemHostUnregister;
+tcuMemcpyHtoD *cuMemcpyHtoD;
+tcuMemcpyDtoH *cuMemcpyDtoH;
+tcuMemcpyDtoD *cuMemcpyDtoD;
+tcuMemcpyDtoA *cuMemcpyDtoA;
+tcuMemcpyAtoD *cuMemcpyAtoD;
+tcuMemcpyHtoA *cuMemcpyHtoA;
+tcuMemcpyAtoH *cuMemcpyAtoH;
+tcuMemcpyAtoA *cuMemcpyAtoA;
+tcuMemcpy2D *cuMemcpy2D;
+tcuMemcpy2DUnaligned *cuMemcpy2DUnaligned;
+tcuMemcpy3D *cuMemcpy3D;
+tcuMemcpyHtoDAsync *cuMemcpyHtoDAsync;
+tcuMemcpyDtoHAsync *cuMemcpyDtoHAsync;
+tcuMemcpyDtoDAsync *cuMemcpyDtoDAsync;
+tcuMemcpyHtoAAsync *cuMemcpyHtoAAsync;
+tcuMemcpyAtoHAsync *cuMemcpyAtoHAsync;
+tcuMemcpy2DAsync *cuMemcpy2DAsync;
+tcuMemcpy3DAsync *cuMemcpy3DAsync;
+tcuMemcpy *cuMemcpy;
+tcuMemcpyPeer *cuMemcpyPeer;
+tcuMemsetD8 *cuMemsetD8;
+tcuMemsetD16 *cuMemsetD16;
+tcuMemsetD32 *cuMemsetD32;
+tcuMemsetD2D8 *cuMemsetD2D8;
+tcuMemsetD2D16 *cuMemsetD2D16;
+tcuMemsetD2D32 *cuMemsetD2D32;
+tcuFuncSetBlockShape *cuFuncSetBlockShape;
+tcuFuncSetSharedSize *cuFuncSetSharedSize;
+tcuFuncGetAttribute *cuFuncGetAttribute;
+tcuFuncSetCacheConfig *cuFuncSetCacheConfig;
+tcuLaunchKernel *cuLaunchKernel;
+tcuArrayCreate *cuArrayCreate;
+tcuArrayGetDescriptor *cuArrayGetDescriptor;
+tcuArrayDestroy *cuArrayDestroy;
+tcuArray3DCreate *cuArray3DCreate;
+tcuArray3DGetDescriptor *cuArray3DGetDescriptor;
+tcuTexRefCreate *cuTexRefCreate;
+tcuTexRefDestroy *cuTexRefDestroy;
+tcuTexRefSetArray *cuTexRefSetArray;
+tcuTexRefSetAddress *cuTexRefSetAddress;
+tcuTexRefSetAddress2D *cuTexRefSetAddress2D;
+tcuTexRefSetFormat *cuTexRefSetFormat;
+tcuTexRefSetAddressMode *cuTexRefSetAddressMode;
+tcuTexRefSetFilterMode *cuTexRefSetFilterMode;
+tcuTexRefSetFlags *cuTexRefSetFlags;
+tcuTexRefGetAddress *cuTexRefGetAddress;
+tcuTexRefGetArray *cuTexRefGetArray;
+tcuTexRefGetAddressMode *cuTexRefGetAddressMode;
+tcuTexRefGetFilterMode *cuTexRefGetFilterMode;
+tcuTexRefGetFormat *cuTexRefGetFormat;
+tcuTexRefGetFlags *cuTexRefGetFlags;
+tcuSurfRefSetArray *cuSurfRefSetArray;
+tcuSurfRefGetArray *cuSurfRefGetArray;
+tcuParamSetSize *cuParamSetSize;
+tcuParamSeti *cuParamSeti;
+tcuParamSetf *cuParamSetf;
+tcuParamSetv *cuParamSetv;
+tcuParamSetTexRef *cuParamSetTexRef;
+tcuLaunch *cuLaunch;
+tcuLaunchGrid *cuLaunchGrid;
+tcuLaunchGridAsync *cuLaunchGridAsync;
+tcuEventCreate *cuEventCreate;
+tcuEventRecord *cuEventRecord;
+tcuEventQuery *cuEventQuery;
+tcuEventSynchronize *cuEventSynchronize;
+tcuEventDestroy *cuEventDestroy;
+tcuEventElapsedTime *cuEventElapsedTime;
+tcuStreamCreate *cuStreamCreate;
+tcuStreamQuery *cuStreamQuery;
+tcuStreamSynchronize *cuStreamSynchronize;
+tcuStreamDestroy *cuStreamDestroy;
+tcuGraphicsUnregisterResource *cuGraphicsUnregisterResource;
+tcuGraphicsSubResourceGetMappedArray *cuGraphicsSubResourceGetMappedArray;
+tcuGraphicsResourceGetMappedPointer *cuGraphicsResourceGetMappedPointer;
+tcuGraphicsResourceSetMapFlags *cuGraphicsResourceSetMapFlags;
+tcuGraphicsMapResources *cuGraphicsMapResources;
+tcuGraphicsUnmapResources *cuGraphicsUnmapResources;
+tcuGetExportTable *cuGetExportTable;
+tcuCtxSetLimit *cuCtxSetLimit;
+tcuCtxGetLimit *cuCtxGetLimit;
+tcuMemHostGetFlags *cuMemHostGetFlags;
+
+ // GL/CUDA interop
+ #if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+ tcuWGLGetDevice *cuWGLGetDevice;
+ #endif
+
+ //#if __CUDA_API_VERSION >= 3020
+ tcuGLCtxCreate *cuGLCtxCreate;
+ tcuGLCtxCreate *cuGLCtxCreate_v2;
+ tcuGLMapBufferObject *cuGLMapBufferObject;
+ tcuGLMapBufferObject *cuGLMapBufferObject_v2;
+ tcuGLMapBufferObjectAsync *cuGLMapBufferObjectAsync;
+ //#endif
+
+#if __CUDA_API_VERSION >= 6050
+ tcuGLGetDevices *cuGLGetDevices;
+#endif
+
+ tcuGLInit *cuGLInit; // deprecated in CUDA 3.0
+ tcuGraphicsGLRegisterBuffer *cuGraphicsGLRegisterBuffer;
+ tcuGraphicsGLRegisterImage *cuGraphicsGLRegisterImage;
+ tcuGLSetBufferObjectMapFlags *cuGLSetBufferObjectMapFlags;
+ tcuGLRegisterBufferObject *cuGLRegisterBufferObject;
+
+ tcuGLUnmapBufferObject *cuGLUnmapBufferObject;
+ tcuGLUnmapBufferObjectAsync *cuGLUnmapBufferObjectAsync;
+
+ tcuGLUnregisterBufferObject *cuGLUnregisterBufferObject;
+ tcuGLGetDevices *cuGLGetDevices; // CUDA 6.5 only
+
+
+
+tcuvidCreateVideoSource *cuvidCreateVideoSource;
+tcuvidCreateVideoSourceW *cuvidCreateVideoSourceW;
+tcuvidDestroyVideoSource *cuvidDestroyVideoSource;
+tcuvidSetVideoSourceState *cuvidSetVideoSourceState;
+tcuvidGetVideoSourceState *cuvidGetVideoSourceState;
+tcuvidGetSourceVideoFormat *cuvidGetSourceVideoFormat;
+tcuvidGetSourceAudioFormat *cuvidGetSourceAudioFormat;
+
+tcuvidCreateVideoParser *cuvidCreateVideoParser;
+tcuvidParseVideoData *cuvidParseVideoData;
+tcuvidDestroyVideoParser *cuvidDestroyVideoParser;
+
+tcuvidCreateDecoder *cuvidCreateDecoder;
+tcuvidDestroyDecoder *cuvidDestroyDecoder;
+tcuvidDecodePicture *cuvidDecodePicture;
+
+tcuvidMapVideoFrame *cuvidMapVideoFrame;
+tcuvidUnmapVideoFrame *cuvidUnmapVideoFrame;
+
+#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
+tcuvidMapVideoFrame64 *cuvidMapVideoFrame64;
+tcuvidUnmapVideoFrame64 *cuvidUnmapVideoFrame64;
+#endif
+
+//tcuvidGetVideoFrameSurface *cuvidGetVideoFrameSurface;
+tcuvidCtxLockCreate *cuvidCtxLockCreate;
+tcuvidCtxLockDestroy *cuvidCtxLockDestroy;
+tcuvidCtxLock *cuvidCtxLock;
+tcuvidCtxUnlock *cuvidCtxUnlock;
+
+
+
+#define STRINGIFY(X) #X
+
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+#include <Windows.h>
+
+#ifdef UNICODE
+static LPCWSTR __CudaLibName = L"nvcuda.dll";
+static LPCWSTR __CuvidLibName = L"nvcuvid.dll";
+#else
+static LPCSTR __CudaLibName = "nvcuda.dll";
+static LPCSTR __CuvidLibName = "nvcuvid.dll";
+#endif
+
+typedef HMODULE CUDADRIVER;
+typedef HMODULE CUVIDDRIVER;
+
+static CUresult LOAD_LIBRARY_CUDA(CUDADRIVER *pInstance)
+{
+ *pInstance = LoadLibrary(__CudaLibName);
+ if (*pInstance == NULL) {
+ printf("LoadLibrary \"%s\" failed!\n", __CudaLibName);
+ return CUDA_ERROR_UNKNOWN;
+ }
+ return CUDA_SUCCESS;
+}
+
+static CUresult LOAD_LIBRARY_CUVID(CUVIDDRIVER *pInstance)
+{
+ *pInstance = LoadLibrary(__CuvidLibName);
+ if (*pInstance == NULL) {
+ printf("LoadLibrary \"%s\" failed!\n", __CuvidLibName);
+ return CUDA_ERROR_UNKNOWN;
+ }
+ return CUDA_SUCCESS;
+}
+
+#define GET_PROC_EX(name, alias, required) \
+ alias = (t##name *)GetProcAddress(curr_lib, #name); \
+ if (alias == NULL && required) { \
+ printf("Failed to find required function \"%s\" \n", \
+ #name); \
+ }
+
+#define GET_PROC_EX_V2(name, alias, required) \
+ alias = (t##name *)GetProcAddress(curr_lib, STRINGIFY(name##_v2));\
+ if (alias == NULL && required) { \
+ printf("Failed to find required function \"%s\" \n", \
+ STRINGIFY(name##_v2)); \
+ }
+
+#elif defined(__unix__) || defined(__APPLE__) || defined(__MACOSX)
+
+#include <dlfcn.h>
+
+#if defined(__APPLE__) || defined(__MACOSX)
+static char __CudaLibName[] = "/usr/local/cuda/lib/libcuda.dylib";
+#else
+static char __CudaLibName[] = "libcuda.so";
+#endif
+
+static char __CuvidLibName[] = "libnvcuvid.so";
+
+typedef void *CUDADRIVER;
+typedef void *CUVIDDRIVER;
+
+static CUresult LOAD_LIBRARY_CUDA(CUDADRIVER *pInstance)
+{
+ *pInstance = dlopen(__CudaLibName, RTLD_NOW);
+ if (*pInstance == NULL) {
+ printf("dlopen \"%s\" failed!\n", __CudaLibName);
+ return CUDA_ERROR_UNKNOWN;
+ }
+ return CUDA_SUCCESS;
+}
+
+static CUresult LOAD_LIBRARY_CUVID(CUVIDDRIVER *pInstance)
+{
+ *pInstance = dlopen(__CuvidLibName, RTLD_NOW);
+ if (*pInstance == NULL) {
+ printf("dlopen \"%s\" failed!\n", __CuvidLibName);
+ return CUDA_ERROR_UNKNOWN;
+ }
+ return CUDA_SUCCESS;
+}
+
+#define GET_PROC_EX(name, alias, required) \
+ alias = (t##name *)dlsym(curr_lib, #name); \
+ if (alias == NULL && required) { \
+ printf("Failed to find required function \"%s\"\n", \
+ #name); \
+ }
+
+#define GET_PROC_EX_V2(name, alias, required) \
+ alias = (t##name *)dlsym(curr_lib, STRINGIFY(name##_v2)); \
+ if (alias == NULL && required) { \
+ printf("Failed to find required function \"%s\"\n", \
+ STRINGIFY(name##_v2)); \
+ }
+
+#else
+#error unsupported platform
+#endif
+
+#define CHECKED_CALL(call) \
+ do { \
+ CUresult result = (call); \
+ if (CUDA_SUCCESS != result) { \
+ return result; \
+ } \
+ } while(0)
+
+#define GET_PROC_REQUIRED(name) GET_PROC_EX(name,name,1)
+#define GET_PROC_OPTIONAL(name) GET_PROC_EX(name,name,0)
+#define GET_PROC(name) GET_PROC_REQUIRED(name)
+#define GET_PROC_V2(name) GET_PROC_EX_V2(name,name,1)
+
+CUresult CUDAAPI cuInitGL(unsigned int Flags, int cudaVersion, CUDADRIVER curr_lib)
+{
+
+ return CUDA_SUCCESS;
+}
+
+CUDADRIVER CudaDrvLib=0;
+CUVIDDRIVER CuvidDrvLib = 0;
+
+void CUDAAPI cuUninit()
+{
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+	if (CudaDrvLib) FreeLibrary((HMODULE)CudaDrvLib);
+	if (CuvidDrvLib) FreeLibrary((HMODULE)CuvidDrvLib);
+#else
+	if (CudaDrvLib) dlclose(CudaDrvLib);
+	if (CuvidDrvLib) dlclose(CuvidDrvLib);
+#endif
+	CudaDrvLib = 0;
+	CuvidDrvLib = 0;
+}
+
+CUresult CUDAAPI cuInit(unsigned int Flags, int cudaVersion)
+{
+ int driverVer = 1000;
+	CUDADRIVER curr_lib ;
+
+	if (CudaDrvLib) return CUDA_SUCCESS;
+	
+	assert(CudaDrvLib == 0);
+	
+	CHECKED_CALL(LOAD_LIBRARY_CUDA(&CudaDrvLib));
+	curr_lib = CudaDrvLib;
+
+	// cuInit is required; alias it to _cuInit
+ GET_PROC_EX(cuInit, _cuInit, 1);
+ CHECKED_CALL(_cuInit(Flags));
+
+ // available since 2.2. if not present, version 1.0 is assumed
+ GET_PROC_OPTIONAL(cuDriverGetVersion);
+
+ if (cuDriverGetVersion)
+ {
+ CHECKED_CALL(cuDriverGetVersion(&driverVer));
+ }
+
+ // fetch all function pointers
+ GET_PROC(cuDeviceGet);
+ GET_PROC(cuDeviceGetCount);
+ GET_PROC(cuDeviceGetName);
+ GET_PROC(cuDeviceComputeCapability);
+ GET_PROC(cuDeviceGetProperties);
+ GET_PROC(cuDeviceGetAttribute);
+ GET_PROC(cuCtxDestroy);
+ GET_PROC(cuCtxAttach);
+ GET_PROC(cuCtxDetach);
+ GET_PROC(cuCtxPushCurrent);
+ GET_PROC(cuCtxPopCurrent);
+ GET_PROC(cuCtxGetDevice);
+ GET_PROC(cuCtxSynchronize);
+ GET_PROC(cuModuleLoad);
+ GET_PROC(cuModuleLoadData);
+ GET_PROC(cuModuleUnload);
+ GET_PROC(cuModuleGetFunction);
+ GET_PROC(cuModuleGetTexRef);
+ GET_PROC(cuMemFreeHost);
+ GET_PROC(cuMemHostAlloc);
+ GET_PROC(cuFuncSetBlockShape);
+ GET_PROC(cuFuncSetSharedSize);
+ GET_PROC(cuFuncGetAttribute);
+ GET_PROC(cuArrayDestroy);
+ GET_PROC(cuTexRefCreate);
+ GET_PROC(cuTexRefDestroy);
+ GET_PROC(cuTexRefSetArray);
+ GET_PROC(cuTexRefSetFormat);
+ GET_PROC(cuTexRefSetAddressMode);
+ GET_PROC(cuTexRefSetFilterMode);
+ GET_PROC(cuTexRefSetFlags);
+ GET_PROC(cuTexRefGetArray);
+ GET_PROC(cuTexRefGetAddressMode);
+ GET_PROC(cuTexRefGetFilterMode);
+ GET_PROC(cuTexRefGetFormat);
+ GET_PROC(cuTexRefGetFlags);
+ GET_PROC(cuParamSetSize);
+ GET_PROC(cuParamSeti);
+ GET_PROC(cuParamSetf);
+ GET_PROC(cuParamSetv);
+ GET_PROC(cuParamSetTexRef);
+ GET_PROC(cuLaunch);
+ GET_PROC(cuLaunchGrid);
+ GET_PROC(cuLaunchGridAsync);
+ GET_PROC(cuEventCreate);
+ GET_PROC(cuEventRecord);
+ GET_PROC(cuEventQuery);
+ GET_PROC(cuEventSynchronize);
+ GET_PROC(cuEventDestroy);
+ GET_PROC(cuEventElapsedTime);
+ GET_PROC(cuStreamCreate);
+ GET_PROC(cuStreamQuery);
+ GET_PROC(cuStreamSynchronize);
+ GET_PROC(cuStreamDestroy);
+
+ // These could be _v2 interfaces
+ if (cudaVersion >= 4000)
+ {
+ GET_PROC_V2(cuCtxDestroy);
+ GET_PROC_V2(cuCtxPopCurrent);
+ GET_PROC_V2(cuCtxPushCurrent);
+ GET_PROC_V2(cuStreamDestroy);
+ GET_PROC_V2(cuEventDestroy);
+ }
+
+ if (cudaVersion >= 3020)
+ {
+ GET_PROC_V2(cuDeviceTotalMem);
+ GET_PROC_V2(cuCtxCreate);
+ GET_PROC_V2(cuModuleGetGlobal);
+ GET_PROC_V2(cuMemGetInfo);
+ GET_PROC_V2(cuMemAlloc);
+ GET_PROC_V2(cuMemAllocPitch);
+ GET_PROC_V2(cuMemFree);
+ GET_PROC_V2(cuMemGetAddressRange);
+ GET_PROC_V2(cuMemAllocHost);
+ GET_PROC_V2(cuMemHostGetDevicePointer);
+ GET_PROC_V2(cuMemcpyHtoD);
+ GET_PROC_V2(cuMemcpyDtoH);
+ GET_PROC_V2(cuMemcpyDtoD);
+ GET_PROC_V2(cuMemcpyDtoA);
+ GET_PROC_V2(cuMemcpyAtoD);
+ GET_PROC_V2(cuMemcpyHtoA);
+ GET_PROC_V2(cuMemcpyAtoH);
+ GET_PROC_V2(cuMemcpyAtoA);
+ GET_PROC_V2(cuMemcpy2D);
+ GET_PROC_V2(cuMemcpy2DUnaligned);
+ GET_PROC_V2(cuMemcpy3D);
+ GET_PROC_V2(cuMemcpyHtoDAsync);
+ GET_PROC_V2(cuMemcpyDtoHAsync);
+ GET_PROC_V2(cuMemcpyHtoAAsync);
+ GET_PROC_V2(cuMemcpyAtoHAsync);
+ GET_PROC_V2(cuMemcpy2DAsync);
+ GET_PROC_V2(cuMemcpy3DAsync);
+ GET_PROC_V2(cuMemsetD8);
+ GET_PROC_V2(cuMemsetD16);
+ GET_PROC_V2(cuMemsetD32);
+ GET_PROC_V2(cuMemsetD2D8);
+ GET_PROC_V2(cuMemsetD2D16);
+ GET_PROC_V2(cuMemsetD2D32);
+ GET_PROC_V2(cuArrayCreate);
+ GET_PROC_V2(cuArrayGetDescriptor);
+ GET_PROC_V2(cuArray3DCreate);
+ GET_PROC_V2(cuArray3DGetDescriptor);
+ GET_PROC_V2(cuTexRefSetAddress);
+ GET_PROC_V2(cuTexRefSetAddress2D);
+ GET_PROC_V2(cuTexRefGetAddress);
+ }
+ else
+ {
+ GET_PROC(cuDeviceTotalMem);
+ GET_PROC(cuCtxCreate);
+ GET_PROC(cuModuleGetGlobal);
+ GET_PROC(cuMemGetInfo);
+ GET_PROC(cuMemAlloc);
+ GET_PROC(cuMemAllocPitch);
+ GET_PROC(cuMemFree);
+ GET_PROC(cuMemGetAddressRange);
+ GET_PROC(cuMemAllocHost);
+ GET_PROC(cuMemHostGetDevicePointer);
+ GET_PROC(cuMemcpyHtoD);
+ GET_PROC(cuMemcpyDtoH);
+ GET_PROC(cuMemcpyDtoD);
+ GET_PROC(cuMemcpyDtoA);
+ GET_PROC(cuMemcpyAtoD);
+ GET_PROC(cuMemcpyHtoA);
+ GET_PROC(cuMemcpyAtoH);
+ GET_PROC(cuMemcpyAtoA);
+ GET_PROC(cuMemcpy2D);
+ GET_PROC(cuMemcpy2DUnaligned);
+ GET_PROC(cuMemcpy3D);
+ GET_PROC(cuMemcpyHtoDAsync);
+ GET_PROC(cuMemcpyDtoHAsync);
+ GET_PROC(cuMemcpyHtoAAsync);
+ GET_PROC(cuMemcpyAtoHAsync);
+ GET_PROC(cuMemcpy2DAsync);
+ GET_PROC(cuMemcpy3DAsync);
+ GET_PROC(cuMemsetD8);
+ GET_PROC(cuMemsetD16);
+ GET_PROC(cuMemsetD32);
+ GET_PROC(cuMemsetD2D8);
+ GET_PROC(cuMemsetD2D16);
+ GET_PROC(cuMemsetD2D32);
+ GET_PROC(cuArrayCreate);
+ GET_PROC(cuArrayGetDescriptor);
+ GET_PROC(cuArray3DCreate);
+ GET_PROC(cuArray3DGetDescriptor);
+ GET_PROC(cuTexRefSetAddress);
+ GET_PROC(cuTexRefSetAddress2D);
+ GET_PROC(cuTexRefGetAddress);
+ }
+
+ // The following functions are specific to CUDA versions
+ if (driverVer >= 2010)
+ {
+ GET_PROC(cuModuleLoadDataEx);
+ GET_PROC(cuModuleLoadFatBinary);
+ }
+
+ if (driverVer >= 2030)
+ {
+ GET_PROC(cuMemHostGetFlags);
+ }
+
+ if (driverVer >= 3000)
+ {
+ GET_PROC(cuMemcpyDtoDAsync);
+ GET_PROC(cuFuncSetCacheConfig);
+
+ GET_PROC(cuGraphicsUnregisterResource);
+ GET_PROC(cuGraphicsSubResourceGetMappedArray);
+
+#if (__CUDA_API_VERSION >= 3020)
+ if (cudaVersion >= 3020)
+ {
+ GET_PROC_V2(cuGraphicsResourceGetMappedPointer);
+ }
+ else
+ {
+ GET_PROC(cuGraphicsResourceGetMappedPointer);
+ }
+#endif
+ GET_PROC(cuGraphicsResourceSetMapFlags);
+ GET_PROC(cuGraphicsMapResources);
+ GET_PROC(cuGraphicsUnmapResources);
+ GET_PROC(cuGetExportTable);
+ }
+
+ if (driverVer >= 3010)
+ {
+ GET_PROC(cuModuleGetSurfRef);
+ GET_PROC(cuSurfRefSetArray);
+ GET_PROC(cuSurfRefGetArray);
+ GET_PROC(cuCtxSetLimit);
+ GET_PROC(cuCtxGetLimit);
+ }
+
+ if (driverVer >= 4000)
+ {
+ GET_PROC(cuCtxSetCurrent);
+ GET_PROC(cuCtxGetCurrent);
+ GET_PROC(cuMemHostRegister);
+ GET_PROC(cuMemHostUnregister);
+ GET_PROC(cuMemcpy);
+ GET_PROC(cuMemcpyPeer);
+ GET_PROC(cuLaunchKernel);
+ }
+
+	/*load openGL*/
+ if (cudaVersion >= 2010)
+ {
+ GET_PROC(cuGLCtxCreate);
+ GET_PROC(cuGraphicsGLRegisterBuffer);
+ GET_PROC(cuGraphicsGLRegisterImage);
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+ GET_PROC(cuWGLGetDevice);
+#endif
+ }
+ if (cudaVersion >= 2030)
+ {
+ GET_PROC(cuGraphicsGLRegisterBuffer);
+ GET_PROC(cuGraphicsGLRegisterImage);
+ }
+ if (cudaVersion >= 3000)
+ {
+ GET_PROC(cuGLGetDevices);
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+ GET_PROC(cuWGLGetDevice);
+#endif
+ GET_PROC_V2(cuGLCtxCreate);
+
+ GET_PROC_V2(cuGLMapBufferObject);
+ GET_PROC(cuGLUnmapBufferObject);
+ GET_PROC(cuGLMapBufferObjectAsync);
+ GET_PROC(cuGLUnmapBufferObjectAsync);
+ GET_PROC(cuGLRegisterBufferObject);
+ GET_PROC(cuGLUnregisterBufferObject);
+ GET_PROC(cuGLSetBufferObjectMapFlags);
+ }
+
+	//init cuvid
+ CHECKED_CALL(LOAD_LIBRARY_CUVID(&CuvidDrvLib));
+
+	curr_lib = CuvidDrvLib;
+ // fetch all function pointers
+ GET_PROC(cuvidCreateVideoSource);
+ GET_PROC(cuvidCreateVideoSourceW);
+ GET_PROC(cuvidDestroyVideoSource);
+ GET_PROC(cuvidSetVideoSourceState);
+ GET_PROC(cuvidGetVideoSourceState);
+ GET_PROC(cuvidGetSourceVideoFormat);
+ GET_PROC(cuvidGetSourceAudioFormat);
+
+ GET_PROC(cuvidCreateVideoParser);
+ GET_PROC(cuvidParseVideoData);
+ GET_PROC(cuvidDestroyVideoParser);
+
+ GET_PROC(cuvidCreateDecoder);
+ GET_PROC(cuvidDestroyDecoder);
+ GET_PROC(cuvidDecodePicture);
+
+#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
+ GET_PROC(cuvidMapVideoFrame64);
+ GET_PROC(cuvidUnmapVideoFrame64);
+ cuvidMapVideoFrame = cuvidMapVideoFrame64;
+ cuvidUnmapVideoFrame = cuvidUnmapVideoFrame64;
+#else
+ GET_PROC(cuvidMapVideoFrame);
+ GET_PROC(cuvidUnmapVideoFrame);
+#endif
+
+// GET_PROC(cuvidGetVideoFrameSurface);
+ GET_PROC(cuvidCtxLockCreate);
+ GET_PROC(cuvidCtxLockDestroy);
+ GET_PROC(cuvidCtxLock);
+ GET_PROC(cuvidCtxUnlock);
+
+
+	return CUDA_SUCCESS;
+}
+
+
+// CUDA Driver API errors
+const char *cudaGetErrorEnum(CUresult error)
+{
+	switch (error) {
+	case CUDA_SUCCESS: return "CUDA_SUCCESS";
+	case CUDA_ERROR_INVALID_VALUE: return "CUDA_ERROR_INVALID_VALUE";
+	case CUDA_ERROR_OUT_OF_MEMORY:	return "CUDA_ERROR_OUT_OF_MEMORY";
+	case CUDA_ERROR_NOT_INITIALIZED: return "CUDA_ERROR_NOT_INITIALIZED";
+	case CUDA_ERROR_DEINITIALIZED:	return "CUDA_ERROR_DEINITIALIZED";
+	case CUDA_ERROR_PROFILER_DISABLED:	return "CUDA_ERROR_PROFILER_DISABLED";
+	case CUDA_ERROR_PROFILER_NOT_INITIALIZED:	return "CUDA_ERROR_PROFILER_NOT_INITIALIZED";
+	case CUDA_ERROR_PROFILER_ALREADY_STARTED:	return "CUDA_ERROR_PROFILER_ALREADY_STARTED";
+	case CUDA_ERROR_PROFILER_ALREADY_STOPPED:	return "CUDA_ERROR_PROFILER_ALREADY_STOPPED";
+	case CUDA_ERROR_NO_DEVICE:	return "CUDA_ERROR_NO_DEVICE";
+	case CUDA_ERROR_INVALID_DEVICE:	return "CUDA_ERROR_INVALID_DEVICE";
+	case CUDA_ERROR_INVALID_IMAGE:	return "CUDA_ERROR_INVALID_IMAGE";
+	case CUDA_ERROR_INVALID_CONTEXT:	return "CUDA_ERROR_INVALID_CONTEXT";
+	case CUDA_ERROR_CONTEXT_ALREADY_CURRENT:	return "CUDA_ERROR_CONTEXT_ALREADY_CURRENT";
+	case CUDA_ERROR_MAP_FAILED:	return "CUDA_ERROR_MAP_FAILED";
+	case CUDA_ERROR_UNMAP_FAILED:	return "CUDA_ERROR_UNMAP_FAILED";
+	case CUDA_ERROR_ARRAY_IS_MAPPED:	return "CUDA_ERROR_ARRAY_IS_MAPPED";
+	case CUDA_ERROR_ALREADY_MAPPED:	return "CUDA_ERROR_ALREADY_MAPPED";
+	case CUDA_ERROR_NO_BINARY_FOR_GPU:	return "CUDA_ERROR_NO_BINARY_FOR_GPU";
+	case CUDA_ERROR_ALREADY_ACQUIRED:	return "CUDA_ERROR_ALREADY_ACQUIRED";
+	case CUDA_ERROR_NOT_MAPPED:	return "CUDA_ERROR_NOT_MAPPED";
+	case CUDA_ERROR_NOT_MAPPED_AS_ARRAY:	return "CUDA_ERROR_NOT_MAPPED_AS_ARRAY";
+	case CUDA_ERROR_NOT_MAPPED_AS_POINTER:	return "CUDA_ERROR_NOT_MAPPED_AS_POINTER";
+	case CUDA_ERROR_ECC_UNCORRECTABLE:	return "CUDA_ERROR_ECC_UNCORRECTABLE";
+	case CUDA_ERROR_UNSUPPORTED_LIMIT:	return "CUDA_ERROR_UNSUPPORTED_LIMIT";
+	case CUDA_ERROR_CONTEXT_ALREADY_IN_USE:	return "CUDA_ERROR_CONTEXT_ALREADY_IN_USE";
+	case CUDA_ERROR_INVALID_SOURCE:	return "CUDA_ERROR_INVALID_SOURCE";
+	case CUDA_ERROR_FILE_NOT_FOUND:	return "CUDA_ERROR_FILE_NOT_FOUND";
+	case CUDA_ERROR_SHARED_OBJECT_SYMBOL_NOT_FOUND:	return "CUDA_ERROR_SHARED_OBJECT_SYMBOL_NOT_FOUND";
+	case CUDA_ERROR_SHARED_OBJECT_INIT_FAILED:	return "CUDA_ERROR_SHARED_OBJECT_INIT_FAILED";
+	case CUDA_ERROR_OPERATING_SYSTEM:	return "CUDA_ERROR_OPERATING_SYSTEM";
+	case CUDA_ERROR_INVALID_HANDLE:	return "CUDA_ERROR_INVALID_HANDLE";
+	case CUDA_ERROR_NOT_FOUND:	return "CUDA_ERROR_NOT_FOUND";
+	case CUDA_ERROR_NOT_READY:	return "CUDA_ERROR_NOT_READY";
+	case CUDA_ERROR_LAUNCH_FAILED:	return "CUDA_ERROR_LAUNCH_FAILED";
+	case CUDA_ERROR_LAUNCH_OUT_OF_RESOURCES:	return "CUDA_ERROR_LAUNCH_OUT_OF_RESOURCES";
+	case CUDA_ERROR_LAUNCH_TIMEOUT:	return "CUDA_ERROR_LAUNCH_TIMEOUT";
+	case CUDA_ERROR_LAUNCH_INCOMPATIBLE_TEXTURING:	return "CUDA_ERROR_LAUNCH_INCOMPATIBLE_TEXTURING";
+	case CUDA_ERROR_PEER_ACCESS_ALREADY_ENABLED:	return "CUDA_ERROR_PEER_ACCESS_ALREADY_ENABLED";
+	case CUDA_ERROR_PEER_ACCESS_NOT_ENABLED:	return "CUDA_ERROR_PEER_ACCESS_NOT_ENABLED";
+	case CUDA_ERROR_PRIMARY_CONTEXT_ACTIVE:	return "CUDA_ERROR_PRIMARY_CONTEXT_ACTIVE";
+	case CUDA_ERROR_CONTEXT_IS_DESTROYED:	return "CUDA_ERROR_CONTEXT_IS_DESTROYED";
+	case CUDA_ERROR_PEER_MEMORY_ALREADY_REGISTERED:	return "CUDA_ERROR_PEER_MEMORY_ALREADY_REGISTERED";
+	case CUDA_ERROR_PEER_MEMORY_NOT_REGISTERED:	return "CUDA_ERROR_PEER_MEMORY_NOT_REGISTERED";
+	case CUDA_ERROR_UNKNOWN: return "CUDA_ERROR_UNKNOWN";
+	}
+	return "<unknown>";
+}

gpac-0.8.0.tar.gz/modules/nvdec/cuda_sdk.h Added

@@ -0,0 +1,2883 @@
+/*
+ * Copyright 1993-2015 NVIDIA Corporation. All rights reserved.
+ *
+ * Please refer to the NVIDIA end user license agreement (EULA) associated
+ * with this source code for terms and conditions that govern your use of
+ * this software. Any use, reproduction, disclosure, or distribution of
+ * this software and related documentation outside the terms of the EULA
+ * is strictly prohibited.
+ *
+ */
+
+#ifndef __cuda_tools_h__
+#define __cuda_tools_h__
+
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef __CUDA_API_VERSION
+#define __CUDA_API_VERSION 4000
+#endif
+
+/**
+ * \defgroup CUDA_DRIVER CUDA Driver API
+ *
+ * This section describes the low-level CUDA driver application programming
+ * interface.
+ *
+ * @{
+ */
+
+/**
+ * \defgroup CUDA_TYPES Data types used by CUDA driver
+ * @{
+ */
+
+/**
+ * CUDA API version number
+ */
+#define CUDA_VERSION 4000 /* 4.0 */
+
+/**
+ * CUDA device pointer
+ */
+#if __CUDA_API_VERSION >= 3020
+
+#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined(__aarch64__)
+ typedef unsigned long long CUdeviceptr;
+#else
+ typedef unsigned int CUdeviceptr;
+#endif
+
+#endif /* __CUDA_API_VERSION >= 3020 */
+
+typedef int CUdevice; /**< CUDA device */
+typedef struct CUctx_st *CUcontext; /**< CUDA context */
+typedef struct CUmod_st *CUmodule; /**< CUDA module */
+typedef struct CUfunc_st *CUfunction; /**< CUDA function */
+typedef struct CUarray_st *CUarray; /**< CUDA array */
+typedef struct CUtexref_st *CUtexref; /**< CUDA texture reference */
+typedef struct CUsurfref_st *CUsurfref; /**< CUDA surface reference */
+typedef struct CUevent_st *CUevent; /**< CUDA event */
+typedef struct CUstream_st *CUstream; /**< CUDA stream */
+typedef struct CUgraphicsResource_st *CUgraphicsResource; /**< CUDA graphics interop resource */
+
+typedef struct CUuuid_st /**< CUDA definition of UUID */
+{
+ char bytes[16];
+} CUuuid;
+
+/**
+ * Context creation flags
+ */
+typedef enum CUctx_flags_enum
+{
+ CU_CTX_SCHED_AUTO = 0x00, /**< Automatic scheduling */
+ CU_CTX_SCHED_SPIN = 0x01, /**< Set spin as default scheduling */
+ CU_CTX_SCHED_YIELD = 0x02, /**< Set yield as default scheduling */
+ CU_CTX_SCHED_BLOCKING_SYNC = 0x04, /**< Set blocking synchronization as default scheduling */
+ CU_CTX_BLOCKING_SYNC = 0x04, /**< Set blocking synchronization as default scheduling \deprecated */
+ CU_CTX_MAP_HOST = 0x08, /**< Support mapped pinned allocations */
+ CU_CTX_LMEM_RESIZE_TO_MAX = 0x10, /**< Keep local memory allocation after launch */
+#if __CUDA_API_VERSION < 4000
+ CU_CTX_SCHED_MASK = 0x03,
+ CU_CTX_FLAGS_MASK = 0x1f
+#else
+ CU_CTX_SCHED_MASK = 0x07,
+ CU_CTX_PRIMARY = 0x20, /**< Initialize and return the primary context */
+ CU_CTX_FLAGS_MASK = 0x3f
+#endif
+} CUctx_flags;
+
+/**
+ * Event creation flags
+ */
+typedef enum CUevent_flags_enum
+{
+ CU_EVENT_DEFAULT = 0, /**< Default event flag */
+ CU_EVENT_BLOCKING_SYNC = 1, /**< Event uses blocking synchronization */
+ CU_EVENT_DISABLE_TIMING = 2 /**< Event will not record timing data */
+} CUevent_flags;
+
+/**
+ * Array formats
+ */
+typedef enum CUarray_format_enum
+{
+ CU_AD_FORMAT_UNSIGNED_INT8 = 0x01, /**< Unsigned 8-bit integers */
+ CU_AD_FORMAT_UNSIGNED_INT16 = 0x02, /**< Unsigned 16-bit integers */
+ CU_AD_FORMAT_UNSIGNED_INT32 = 0x03, /**< Unsigned 32-bit integers */
+ CU_AD_FORMAT_SIGNED_INT8 = 0x08, /**< Signed 8-bit integers */
+ CU_AD_FORMAT_SIGNED_INT16 = 0x09, /**< Signed 16-bit integers */
+ CU_AD_FORMAT_SIGNED_INT32 = 0x0a, /**< Signed 32-bit integers */
+ CU_AD_FORMAT_HALF = 0x10, /**< 16-bit floating point */
+ CU_AD_FORMAT_FLOAT = 0x20 /**< 32-bit floating point */
+} CUarray_format;
+
+/**
+ * Texture reference addressing modes
+ */
+typedef enum CUaddress_mode_enum
+{
+ CU_TR_ADDRESS_MODE_WRAP = 0, /**< Wrapping address mode */
+ CU_TR_ADDRESS_MODE_CLAMP = 1, /**< Clamp to edge address mode */
+ CU_TR_ADDRESS_MODE_MIRROR = 2, /**< Mirror address mode */
+ CU_TR_ADDRESS_MODE_BORDER = 3 /**< Border address mode */
+} CUaddress_mode;
+
+/**
+ * Texture reference filtering modes
+ */
+typedef enum CUfilter_mode_enum
+{
+ CU_TR_FILTER_MODE_POINT = 0, /**< Point filter mode */
+ CU_TR_FILTER_MODE_LINEAR = 1 /**< Linear filter mode */
+} CUfilter_mode;
+
+/**
+ * Device properties
+ */
+typedef enum CUdevice_attribute_enum
+{
+ CU_DEVICE_ATTRIBUTE_MAX_THREADS_PER_BLOCK = 1, /**< Maximum number of threads per block */
+ CU_DEVICE_ATTRIBUTE_MAX_BLOCK_DIM_X = 2, /**< Maximum block dimension X */
+ CU_DEVICE_ATTRIBUTE_MAX_BLOCK_DIM_Y = 3, /**< Maximum block dimension Y */
+ CU_DEVICE_ATTRIBUTE_MAX_BLOCK_DIM_Z = 4, /**< Maximum block dimension Z */
+ CU_DEVICE_ATTRIBUTE_MAX_GRID_DIM_X = 5, /**< Maximum grid dimension X */
+ CU_DEVICE_ATTRIBUTE_MAX_GRID_DIM_Y = 6, /**< Maximum grid dimension Y */
+ CU_DEVICE_ATTRIBUTE_MAX_GRID_DIM_Z = 7, /**< Maximum grid dimension Z */
+ CU_DEVICE_ATTRIBUTE_MAX_SHARED_MEMORY_PER_BLOCK = 8, /**< Maximum shared memory available per block in bytes */
+ CU_DEVICE_ATTRIBUTE_SHARED_MEMORY_PER_BLOCK = 8, /**< Deprecated, use CU_DEVICE_ATTRIBUTE_MAX_SHARED_MEMORY_PER_BLOCK */
+ CU_DEVICE_ATTRIBUTE_TOTAL_CONSTANT_MEMORY = 9, /**< Memory available on device for __constant__ variables in a CUDA C kernel in bytes */
+ CU_DEVICE_ATTRIBUTE_WARP_SIZE = 10, /**< Warp size in threads */
+ CU_DEVICE_ATTRIBUTE_MAX_PITCH = 11, /**< Maximum pitch in bytes allowed by memory copies */
+ CU_DEVICE_ATTRIBUTE_MAX_REGISTERS_PER_BLOCK = 12, /**< Maximum number of 32-bit registers available per block */
+ CU_DEVICE_ATTRIBUTE_REGISTERS_PER_BLOCK = 12, /**< Deprecated, use CU_DEVICE_ATTRIBUTE_MAX_REGISTERS_PER_BLOCK */
+ CU_DEVICE_ATTRIBUTE_CLOCK_RATE = 13, /**< Peak clock frequency in kilohertz */
+ CU_DEVICE_ATTRIBUTE_TEXTURE_ALIGNMENT = 14, /**< Alignment requirement for textures */
+ CU_DEVICE_ATTRIBUTE_GPU_OVERLAP = 15, /**< Device can possibly copy memory and execute a kernel concurrently */
+ CU_DEVICE_ATTRIBUTE_MULTIPROCESSOR_COUNT = 16, /**< Number of multiprocessors on device */
+ CU_DEVICE_ATTRIBUTE_KERNEL_EXEC_TIMEOUT = 17, /**< Specifies whether there is a run time limit on kernels */
+ CU_DEVICE_ATTRIBUTE_INTEGRATED = 18, /**< Device is integrated with host memory */
+ CU_DEVICE_ATTRIBUTE_CAN_MAP_HOST_MEMORY = 19, /**< Device can map host memory into CUDA address space */
+ CU_DEVICE_ATTRIBUTE_COMPUTE_MODE = 20, /**< Compute mode (See ::CUcomputemode for details) */
+ CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE1D_WIDTH = 21, /**< Maximum 1D texture width */
+ CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_WIDTH = 22, /**< Maximum 2D texture width */
+ CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_HEIGHT = 23, /**< Maximum 2D texture height */
+ CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE3D_WIDTH = 24, /**< Maximum 3D texture width */
+ CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE3D_HEIGHT = 25, /**< Maximum 3D texture height */
+ CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE3D_DEPTH = 26, /**< Maximum 3D texture depth */
+ CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_ARRAY_WIDTH = 27, /**< Maximum texture array width */
+ CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_ARRAY_HEIGHT = 28, /**< Maximum texture array height */
+ CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_ARRAY_NUMSLICES = 29, /**< Maximum slices in a texture array */
+ CU_DEVICE_ATTRIBUTE_SURFACE_ALIGNMENT = 30, /**< Alignment requirement for surfaces */
+ CU_DEVICE_ATTRIBUTE_CONCURRENT_KERNELS = 31, /**< Device can possibly execute multiple kernels concurrently */
+ CU_DEVICE_ATTRIBUTE_ECC_ENABLED = 32, /**< Device has ECC support enabled */
+ CU_DEVICE_ATTRIBUTE_PCI_BUS_ID = 33, /**< PCI bus ID of the device */
+ CU_DEVICE_ATTRIBUTE_PCI_DEVICE_ID = 34, /**< PCI device ID of the device */
+ CU_DEVICE_ATTRIBUTE_TCC_DRIVER = 35 /**< Device is using TCC driver model */
+#if __CUDA_API_VERSION >= 4000
+ , CU_DEVICE_ATTRIBUTE_MEMORY_CLOCK_RATE = 36, /**< Peak memory clock frequency in kilohertz */
+ CU_DEVICE_ATTRIBUTE_GLOBAL_MEMORY_BUS_WIDTH = 37, /**< Global memory bus width in bits */
+ CU_DEVICE_ATTRIBUTE_L2_CACHE_SIZE = 38, /**< Size of L2 cache in bytes */
+ CU_DEVICE_ATTRIBUTE_MAX_THREADS_PER_MULTIPROCESSOR = 39, /**< Maximum resident threads per multiprocessor */
+ CU_DEVICE_ATTRIBUTE_ASYNC_ENGINE_COUNT = 40, /**< Number of asynchronous engines */
+ CU_DEVICE_ATTRIBUTE_UNIFIED_ADDRESSING = 41, /**< Device uses shares a unified address space with the host */
+ CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE1D_LAYERED_WIDTH = 42, /**< Maximum 1D layered texture width */
+ CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE1D_LAYERED_LAYERS = 43 /**< Maximum layers in a 1D layered texture */
+#endif
+} CUdevice_attribute;
+
+/**
+ * Legacy device properties
+ */
+typedef struct CUdevprop_st
+{
+ int maxThreadsPerBlock; /**< Maximum number of threads per block */
+ int maxThreadsDim[3]; /**< Maximum size of each dimension of a block */
+ int maxGridSize[3]; /**< Maximum size of each dimension of a grid */
+ int sharedMemPerBlock; /**< Shared memory available per block in bytes */
+ int totalConstantMemory; /**< Constant memory available on device in bytes */
+ int SIMDWidth; /**< Warp size in threads */
+ int memPitch; /**< Maximum pitch in bytes allowed by memory copies */
+ int regsPerBlock; /**< 32-bit registers available per block */
+ int clockRate; /**< Clock frequency in kilohertz */
+ int textureAlign; /**< Alignment requirement for textures */
+} CUdevprop;
+
+/**
+ * Function properties
+ */
+typedef enum CUfunction_attribute_enum
+{
+ /**
+ * The maximum number of threads per block, beyond which a launch of the
+ * function would fail. This number depends on both the function and the
+ * device on which the function is currently loaded.
+ */
+ CU_FUNC_ATTRIBUTE_MAX_THREADS_PER_BLOCK = 0,
+
+ /**
+ * The size in bytes of statically-allocated shared memory required by
+ * this function. This does not include dynamically-allocated shared
+ * memory requested by the user at runtime.
+ */
+ CU_FUNC_ATTRIBUTE_SHARED_SIZE_BYTES = 1,
+
+ /**
+ * The size in bytes of user-allocated constant memory required by this
+ * function.
+ */
+ CU_FUNC_ATTRIBUTE_CONST_SIZE_BYTES = 2,
+
+ /**
+ * The size in bytes of local memory used by each thread of this function.
+ */
+ CU_FUNC_ATTRIBUTE_LOCAL_SIZE_BYTES = 3,
+
+ /**
+ * The number of registers used by each thread of this function.
+ */
+ CU_FUNC_ATTRIBUTE_NUM_REGS = 4,
+
+ /**
+ * The PTX virtual architecture version for which the function was
+ * compiled. This value is the major PTX version * 10 + the minor PTX
+ * version, so a PTX version 1.3 function would return the value 13.
+ * Note that this may return the undefined value of 0 for cubins
+ * compiled prior to CUDA 3.0.
+ */
+ CU_FUNC_ATTRIBUTE_PTX_VERSION = 5,
+
+ /**
+ * The binary architecture version for which the function was compiled.
+ * This value is the major binary version * 10 + the minor binary version,
+ * so a binary version 1.3 function would return the value 13. Note that
+ * this will return a value of 10 for legacy cubins that do not have a
+ * properly-encoded binary architecture version.
+ */
+ CU_FUNC_ATTRIBUTE_BINARY_VERSION = 6,
+
+ CU_FUNC_ATTRIBUTE_MAX
+} CUfunction_attribute;
+
+/**
+ * Function cache configurations
+ */
+typedef enum CUfunc_cache_enum
+{
+ CU_FUNC_CACHE_PREFER_NONE = 0x00, /**< no preference for shared memory or L1 (default) */
+ CU_FUNC_CACHE_PREFER_SHARED = 0x01, /**< prefer larger shared memory and smaller L1 cache */
+ CU_FUNC_CACHE_PREFER_L1 = 0x02 /**< prefer larger L1 cache and smaller shared memory */
+} CUfunc_cache;
+
+/**
+ * Memory types
+ */
+typedef enum CUmemorytype_enum
+{
+ CU_MEMORYTYPE_HOST = 0x01, /**< Host memory */
+ CU_MEMORYTYPE_DEVICE = 0x02, /**< Device memory */
+ CU_MEMORYTYPE_ARRAY = 0x03 /**< Array memory */
+#if __CUDA_API_VERSION >= 4000
+ , CU_MEMORYTYPE_UNIFIED = 0x04 /**< Unified device or host memory */
+#endif
+} CUmemorytype;
+
+/**
+ * Compute Modes
+ */
+typedef enum CUcomputemode_enum
+{
+ CU_COMPUTEMODE_DEFAULT = 0, /**< Default compute mode (Multiple contexts allowed per device) */
+ CU_COMPUTEMODE_EXCLUSIVE = 1, /**< Compute-exclusive-thread mode (Only one context used by a single thread can be present on this device at a time) */
+ CU_COMPUTEMODE_PROHIBITED = 2 /**< Compute-prohibited mode (No contexts can be created on this device at this time) */
+#if __CUDA_API_VERSION >= 4000
+ , CU_COMPUTEMODE_EXCLUSIVE_PROCESS = 3 /**< Compute-exclusive-process mode (Only one context used by a single process can be present on this device at a time) */
+#endif
+} CUcomputemode;
+
+/**
+ * Online compiler options
+ */
+typedef enum CUjit_option_enum
+{
+ /**
+ * Max number of registers that a thread may use.\n
+ * Option type: unsigned int
+ */
+ CU_JIT_MAX_REGISTERS = 0,
+
+ /**
+ * IN: Specifies minimum number of threads per block to target compilation
+ * for\n
+ * OUT: Returns the number of threads the compiler actually targeted.
+ * This restricts the resource utilization fo the compiler (e.g. max
+ * registers) such that a block with the given number of threads should be
+ * able to launch based on register limitations. Note, this option does not
+ * currently take into account any other resource limitations, such as
+ * shared memory utilization.\n
+ * Option type: unsigned int
+ */
+ CU_JIT_THREADS_PER_BLOCK,
+
+ /**
+ * Returns a float value in the option of the wall clock time, in
+ * milliseconds, spent creating the cubin\n
+ * Option type: float
+ */
+ CU_JIT_WALL_TIME,
+
+ /**
+ * Pointer to a buffer in which to print any log messsages from PTXAS
+ * that are informational in nature (the buffer size is specified via
+ * option ::CU_JIT_INFO_LOG_BUFFER_SIZE_BYTES) \n
+ * Option type: char*
+ */
+ CU_JIT_INFO_LOG_BUFFER,
+
+ /**
+ * IN: Log buffer size in bytes. Log messages will be capped at this size
+ * (including null terminator)\n
+ * OUT: Amount of log buffer filled with messages\n
+ * Option type: unsigned int
+ */
+ CU_JIT_INFO_LOG_BUFFER_SIZE_BYTES,
+
+ /**
+ * Pointer to a buffer in which to print any log messages from PTXAS that
+ * reflect errors (the buffer size is specified via option
+ * ::CU_JIT_ERROR_LOG_BUFFER_SIZE_BYTES)\n
+ * Option type: char*
+ */
+ CU_JIT_ERROR_LOG_BUFFER,
+
+ /**
+ * IN: Log buffer size in bytes. Log messages will be capped at this size
+ * (including null terminator)\n
+ * OUT: Amount of log buffer filled with messages\n
+ * Option type: unsigned int
+ */
+ CU_JIT_ERROR_LOG_BUFFER_SIZE_BYTES,
+
+ /**
+ * Level of optimizations to apply to generated code (0 - 4), with 4
+ * being the default and highest level of optimizations.\n
+ * Option type: unsigned int
+ */
+ CU_JIT_OPTIMIZATION_LEVEL,
+
+ /**
+ * No option value required. Determines the target based on the current
+ * attached context (default)\n
+ * Option type: No option value needed
+ */
+ CU_JIT_TARGET_FROM_CUCONTEXT,
+
+ /**
+ * Target is chosen based on supplied ::CUjit_target_enum.\n
+ * Option type: unsigned int for enumerated type ::CUjit_target_enum
+ */
+ CU_JIT_TARGET,
+
+ /**
+ * Specifies choice of fallback strategy if matching cubin is not found.
+ * Choice is based on supplied ::CUjit_fallback_enum.\n
+ * Option type: unsigned int for enumerated type ::CUjit_fallback_enum
+ */
+ CU_JIT_FALLBACK_STRATEGY
+
+} CUjit_option;
+
+/**
+ * Online compilation targets
+ */
+typedef enum CUjit_target_enum
+{
+ CU_TARGET_COMPUTE_10 = 0, /**< Compute device class 1.0 */
+ CU_TARGET_COMPUTE_11, /**< Compute device class 1.1 */
+ CU_TARGET_COMPUTE_12, /**< Compute device class 1.2 */
+ CU_TARGET_COMPUTE_13, /**< Compute device class 1.3 */
+ CU_TARGET_COMPUTE_20, /**< Compute device class 2.0 */
+ CU_TARGET_COMPUTE_21 /**< Compute device class 2.1 */
+} CUjit_target;
+
+/**
+ * Cubin matching fallback strategies
+ */
+typedef enum CUjit_fallback_enum
+{
+ CU_PREFER_PTX = 0, /**< Prefer to compile ptx */
+
+ CU_PREFER_BINARY /**< Prefer to fall back to compatible binary code */
+
+} CUjit_fallback;
+
+/**
+ * Flags to register a graphics resource
+ */
+typedef enum CUgraphicsRegisterFlags_enum
+{
+ CU_GRAPHICS_REGISTER_FLAGS_NONE = 0x00,
+ CU_GRAPHICS_REGISTER_FLAGS_READ_ONLY = 0x01,
+ CU_GRAPHICS_REGISTER_FLAGS_WRITE_DISCARD = 0x02,
+ CU_GRAPHICS_REGISTER_FLAGS_SURFACE_LDST = 0x04
+} CUgraphicsRegisterFlags;
+
+/**
+ * Flags for mapping and unmapping interop resources
+ */
+typedef enum CUgraphicsMapResourceFlags_enum
+{
+ CU_GRAPHICS_MAP_RESOURCE_FLAGS_NONE = 0x00,
+ CU_GRAPHICS_MAP_RESOURCE_FLAGS_READ_ONLY = 0x01,
+ CU_GRAPHICS_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02
+} CUgraphicsMapResourceFlags;
+
+/**
+ * Array indices for cube faces
+ */
+typedef enum CUarray_cubemap_face_enum
+{
+ CU_CUBEMAP_FACE_POSITIVE_X = 0x00, /**< Positive X face of cubemap */
+ CU_CUBEMAP_FACE_NEGATIVE_X = 0x01, /**< Negative X face of cubemap */
+ CU_CUBEMAP_FACE_POSITIVE_Y = 0x02, /**< Positive Y face of cubemap */
+ CU_CUBEMAP_FACE_NEGATIVE_Y = 0x03, /**< Negative Y face of cubemap */
+ CU_CUBEMAP_FACE_POSITIVE_Z = 0x04, /**< Positive Z face of cubemap */
+ CU_CUBEMAP_FACE_NEGATIVE_Z = 0x05 /**< Negative Z face of cubemap */
+} CUarray_cubemap_face;
+
+/**
+ * Limits
+ */
+typedef enum CUlimit_enum
+{
+ CU_LIMIT_STACK_SIZE = 0x00, /**< GPU thread stack size */
+ CU_LIMIT_PRINTF_FIFO_SIZE = 0x01, /**< GPU printf FIFO size */
+ CU_LIMIT_MALLOC_HEAP_SIZE = 0x02 /**< GPU malloc heap size */
+} CUlimit;
+
+/**
+ * Error codes
+ */
+typedef enum cudaError_enum
+{
+ /**
+ * The API call returned with no errors. In the case of query calls, this
+ * can also mean that the operation being queried is complete (see
+ * ::cuEventQuery() and ::cuStreamQuery()).
+ */
+ CUDA_SUCCESS = 0,
+
+ /**
+ * This indicates that one or more of the parameters passed to the API call
+ * is not within an acceptable range of values.
+ */
+ CUDA_ERROR_INVALID_VALUE = 1,
+
+ /**
+ * The API call failed because it was unable to allocate enough memory to
+ * perform the requested operation.
+ */
+ CUDA_ERROR_OUT_OF_MEMORY = 2,
+
+ /**
+ * This indicates that the CUDA driver has not been initialized with
+ * ::cuInit() or that initialization has failed.
+ */
+ CUDA_ERROR_NOT_INITIALIZED = 3,
+
+ /**
+ * This indicates that the CUDA driver is in the process of shutting down.
+ */
+ CUDA_ERROR_DEINITIALIZED = 4,
+
+ /**
+ * This indicates profiling APIs are called while application is running
+ * in visual profiler mode.
+ */
+ CUDA_ERROR_PROFILER_DISABLED = 5,
+ /**
+ * This indicates profiling has not been initialized for this context.
+ * Call cuProfilerInitialize() to resolve this.
+ */
+ CUDA_ERROR_PROFILER_NOT_INITIALIZED = 6,
+ /**
+ * This indicates profiler has already been started and probably
+ * cuProfilerStart() is incorrectly called.
+ */
+ CUDA_ERROR_PROFILER_ALREADY_STARTED = 7,
+ /**
+ * This indicates profiler has already been stopped and probably
+ * cuProfilerStop() is incorrectly called.
+ */
+ CUDA_ERROR_PROFILER_ALREADY_STOPPED = 8,
+ /**
+ * This indicates that no CUDA-capable devices were detected by the installed
+ * CUDA driver.
+ */
+ CUDA_ERROR_NO_DEVICE = 100,
+
+ /**
+ * This indicates that the device ordinal supplied by the user does not
+ * correspond to a valid CUDA device.
+ */
+ CUDA_ERROR_INVALID_DEVICE = 101,
+
+
+ /**
+ * This indicates that the device kernel image is invalid. This can also
+ * indicate an invalid CUDA module.
+ */
+ CUDA_ERROR_INVALID_IMAGE = 200,
+
+ /**
+ * This most frequently indicates that there is no context bound to the
+ * current thread. This can also be returned if the context passed to an
+ * API call is not a valid handle (such as a context that has had
+ * ::cuCtxDestroy() invoked on it). This can also be returned if a user
+ * mixes different API versions (i.e. 3010 context with 3020 API calls).
+ * See ::cuCtxGetApiVersion() for more details.
+ */
+ CUDA_ERROR_INVALID_CONTEXT = 201,
+
+ /**
+ * This indicated that the context being supplied as a parameter to the
+ * API call was already the active context.
+ * \deprecated
+ * This error return is deprecated as of CUDA 3.2. It is no longer an
+ * error to attempt to push the active context via ::cuCtxPushCurrent().
+ */
+ CUDA_ERROR_CONTEXT_ALREADY_CURRENT = 202,
+
+ /**
+ * This indicates that a map or register operation has failed.
+ */
+ CUDA_ERROR_MAP_FAILED = 205,
+
+ /**
+ * This indicates that an unmap or unregister operation has failed.
+ */
+ CUDA_ERROR_UNMAP_FAILED = 206,
+
+ /**
+ * This indicates that the specified array is currently mapped and thus
+ * cannot be destroyed.
+ */
+ CUDA_ERROR_ARRAY_IS_MAPPED = 207,
+
+ /**
+ * This indicates that the resource is already mapped.
+ */
+ CUDA_ERROR_ALREADY_MAPPED = 208,
+
+ /**
+ * This indicates that there is no kernel image available that is suitable
+ * for the device. This can occur when a user specifies code generation
+ * options for a particular CUDA source file that do not include the
+ * corresponding device configuration.
+ */
+ CUDA_ERROR_NO_BINARY_FOR_GPU = 209,
+
+ /**
+ * This indicates that a resource has already been acquired.
+ */
+ CUDA_ERROR_ALREADY_ACQUIRED = 210,
+
+ /**
+ * This indicates that a resource is not mapped.
+ */
+ CUDA_ERROR_NOT_MAPPED = 211,
+
+ /**
+ * This indicates that a mapped resource is not available for access as an
+ * array.
+ */
+ CUDA_ERROR_NOT_MAPPED_AS_ARRAY = 212,
+
+ /**
+ * This indicates that a mapped resource is not available for access as a
+ * pointer.
+ */
+ CUDA_ERROR_NOT_MAPPED_AS_POINTER = 213,
+
+ /**
+ * This indicates that an uncorrectable ECC error was detected during
+ * execution.
+ */
+ CUDA_ERROR_ECC_UNCORRECTABLE = 214,
+
+ /**
+ * This indicates that the ::CUlimit passed to the API call is not
+ * supported by the active device.
+ */
+ CUDA_ERROR_UNSUPPORTED_LIMIT = 215,
+
+ /**
+ * This indicates that the ::CUcontext passed to the API call can
+ * only be bound to a single CPU thread at a time but is already
+ * bound to a CPU thread.
+ */
+ CUDA_ERROR_CONTEXT_ALREADY_IN_USE = 216,
+
+ /**
+ * This indicates that the device kernel source is invalid.
+ */
+ CUDA_ERROR_INVALID_SOURCE = 300,
+
+ /**
+ * This indicates that the file specified was not found.
+ */
+ CUDA_ERROR_FILE_NOT_FOUND = 301,
+
+ /**
+ * This indicates that a link to a shared object failed to resolve.
+ */
+ CUDA_ERROR_SHARED_OBJECT_SYMBOL_NOT_FOUND = 302,
+
+ /**
+ * This indicates that initialization of a shared object failed.
+ */
+ CUDA_ERROR_SHARED_OBJECT_INIT_FAILED = 303,
+
+ /**
+ * This indicates that an OS call failed.
+ */
+ CUDA_ERROR_OPERATING_SYSTEM = 304,
+
+
+ /**
+ * This indicates that a resource handle passed to the API call was not
+ * valid. Resource handles are opaque types like ::CUstream and ::CUevent.
+ */
+ CUDA_ERROR_INVALID_HANDLE = 400,
+
+
+ /**
+ * This indicates that a named symbol was not found. Examples of symbols
+ * are global/constant variable names, texture names, and surface names.
+ */
+ CUDA_ERROR_NOT_FOUND = 500,
+
+
+ /**
+ * This indicates that asynchronous operations issued previously have not
+ * completed yet. This result is not actually an error, but must be indicated
+ * differently than ::CUDA_SUCCESS (which indicates completion). Calls that
+ * may return this value include ::cuEventQuery() and ::cuStreamQuery().
+ */
+ CUDA_ERROR_NOT_READY = 600,
+
+
+ /**
+ * An exception occurred on the device while executing a kernel. Common
+ * causes include dereferencing an invalid device pointer and accessing
+ * out of bounds shared memory. The context cannot be used, so it must
+ * be destroyed (and a new one should be created). All existing device
+ * memory allocations from this context are invalid and must be
+ * reconstructed if the program is to continue using CUDA.
+ */
+ CUDA_ERROR_LAUNCH_FAILED = 700,
+
+ /**
+ * This indicates that a launch did not occur because it did not have
+ * appropriate resources. This error usually indicates that the user has
+ * attempted to pass too many arguments to the device kernel, or the
+ * kernel launch specifies too many threads for the kernel's register
+ * count. Passing arguments of the wrong size (i.e. a 64-bit pointer
+ * when a 32-bit int is expected) is equivalent to passing too many
+ * arguments and can also result in this error.
+ */
+ CUDA_ERROR_LAUNCH_OUT_OF_RESOURCES = 701,
+
+ /**
+ * This indicates that the device kernel took too long to execute. This can
+ * only occur if timeouts are enabled - see the device attribute
+ * ::CU_DEVICE_ATTRIBUTE_KERNEL_EXEC_TIMEOUT for more information. The
+ * context cannot be used (and must be destroyed similar to
+ * ::CUDA_ERROR_LAUNCH_FAILED). All existing device memory allocations from
+ * this context are invalid and must be reconstructed if the program is to
+ * continue using CUDA.
+ */
+ CUDA_ERROR_LAUNCH_TIMEOUT = 702,
+
+ /**
+ * This error indicates a kernel launch that uses an incompatible texturing
+ * mode.
+ */
+ CUDA_ERROR_LAUNCH_INCOMPATIBLE_TEXTURING = 703,
+
+ /**
+ * This error indicates that a call to ::cuCtxEnablePeerAccess() is
+ * trying to re-enable peer access to a context which has already
+ * had peer access to it enabled.
+ */
+ CUDA_ERROR_PEER_ACCESS_ALREADY_ENABLED = 704,
+
+ /**
+ * This error indicates that a call to ::cuMemPeerRegister is trying to
+ * register memory from a context which has not had peer access
+ * enabled yet via ::cuCtxEnablePeerAccess(), or that
+ * ::cuCtxDisablePeerAccess() is trying to disable peer access
+ * which has not been enabled yet.
+ */
+ CUDA_ERROR_PEER_ACCESS_NOT_ENABLED = 705,
+
+ /**
+ * This error indicates that a call to ::cuMemPeerRegister is trying to
+ * register already-registered memory.
+ */
+ CUDA_ERROR_PEER_MEMORY_ALREADY_REGISTERED = 706,
+
+ /**
+ * This error indicates that a call to ::cuMemPeerUnregister is trying to
+ * unregister memory that has not been registered.
+ */
+ CUDA_ERROR_PEER_MEMORY_NOT_REGISTERED = 707,
+
+ /**
+ * This error indicates that ::cuCtxCreate was called with the flag
+ * ::CU_CTX_PRIMARY on a device which already has initialized its
+ * primary context.
+ */
+ CUDA_ERROR_PRIMARY_CONTEXT_ACTIVE = 708,
+
+ /**
+ * This error indicates that the context current to the calling thread
+ * has been destroyed using ::cuCtxDestroy, or is a primary context which
+ * has not yet been initialized.
+ */
+ CUDA_ERROR_CONTEXT_IS_DESTROYED = 709,
+
+ /**
+ * This indicates that an unknown internal error has occurred.
+ */
+ CUDA_ERROR_UNKNOWN = 999
+} CUresult;
+
+#if __CUDA_API_VERSION >= 4000
+/**
+ * If set, host memory is portable between CUDA contexts.
+ * Flag for ::cuMemHostAlloc()
+ */
+#define CU_MEMHOSTALLOC_PORTABLE 0x01
+
+/**
+ * If set, host memory is mapped into CUDA address space and
+ * ::cuMemHostGetDevicePointer() may be called on the host pointer.
+ * Flag for ::cuMemHostAlloc()
+ */
+#define CU_MEMHOSTALLOC_DEVICEMAP 0x02
+
+/**
+ * If set, host memory is allocated as write-combined - fast to write,
+ * faster to DMA, slow to read except via SSE4 streaming load instruction
+ * (MOVNTDQA).
+ * Flag for ::cuMemHostAlloc()
+ */
+#define CU_MEMHOSTALLOC_WRITECOMBINED 0x04
+
+/**
+ * If set, host memory is portable between CUDA contexts.
+ * Flag for ::cuMemHostRegister()
+ */
+#define CU_MEMHOSTREGISTER_PORTABLE 0x01
+
+/**
+ * If set, host memory is mapped into CUDA address space and
+ * ::cuMemHostGetDevicePointer() may be called on the host pointer.
+ * Flag for ::cuMemHostRegister()
+ */
+#define CU_MEMHOSTREGISTER_DEVICEMAP 0x02
+
+/**
+ * If set, peer memory is mapped into CUDA address space and
+ * ::cuMemPeerGetDevicePointer() may be called on the host pointer.
+ * Flag for ::cuMemPeerRegister()
+ */
+#define CU_MEMPEERREGISTER_DEVICEMAP 0x02
+#endif
+
+#if __CUDA_API_VERSION >= 3020
+/**
+ * 2D memory copy parameters
+ */
+typedef struct CUDA_MEMCPY2D_st
+{
+ size_t srcXInBytes; /**< Source X in bytes */
+ size_t srcY; /**< Source Y */
+
+ CUmemorytype srcMemoryType; /**< Source memory type (host, device, array) */
+ const void *srcHost; /**< Source host pointer */
+ CUdeviceptr srcDevice; /**< Source device pointer */
+ CUarray srcArray; /**< Source array reference */
+ size_t srcPitch; /**< Source pitch (ignored when src is array) */
+
+ size_t dstXInBytes; /**< Destination X in bytes */
+ size_t dstY; /**< Destination Y */
+
+ CUmemorytype dstMemoryType; /**< Destination memory type (host, device, array) */
+ void *dstHost; /**< Destination host pointer */
+ CUdeviceptr dstDevice; /**< Destination device pointer */
+ CUarray dstArray; /**< Destination array reference */
+ size_t dstPitch; /**< Destination pitch (ignored when dst is array) */
+
+ size_t WidthInBytes; /**< Width of 2D memory copy in bytes */
+ size_t Height; /**< Height of 2D memory copy */
+} CUDA_MEMCPY2D;
+
+/**
+ * 3D memory copy parameters
+ */
+typedef struct CUDA_MEMCPY3D_st
+{
+ size_t srcXInBytes; /**< Source X in bytes */
+ size_t srcY; /**< Source Y */
+ size_t srcZ; /**< Source Z */
+ size_t srcLOD; /**< Source LOD */
+ CUmemorytype srcMemoryType; /**< Source memory type (host, device, array) */
+ const void *srcHost; /**< Source host pointer */
+ CUdeviceptr srcDevice; /**< Source device pointer */
+ CUarray srcArray; /**< Source array reference */
+ void *reserved0; /**< Must be NULL */
+ size_t srcPitch; /**< Source pitch (ignored when src is array) */
+ size_t srcHeight; /**< Source height (ignored when src is array; may be 0 if Depth==1) */
+
+ size_t dstXInBytes; /**< Destination X in bytes */
+ size_t dstY; /**< Destination Y */
+ size_t dstZ; /**< Destination Z */
+ size_t dstLOD; /**< Destination LOD */
+ CUmemorytype dstMemoryType; /**< Destination memory type (host, device, array) */
+ void *dstHost; /**< Destination host pointer */
+ CUdeviceptr dstDevice; /**< Destination device pointer */
+ CUarray dstArray; /**< Destination array reference */
+ void *reserved1; /**< Must be NULL */
+ size_t dstPitch; /**< Destination pitch (ignored when dst is array) */
+ size_t dstHeight; /**< Destination height (ignored when dst is array; may be 0 if Depth==1) */
+
+ size_t WidthInBytes; /**< Width of 3D memory copy in bytes */
+ size_t Height; /**< Height of 3D memory copy */
+ size_t Depth; /**< Depth of 3D memory copy */
+} CUDA_MEMCPY3D;
+
+/**
+ * 3D memory cross-context copy parameters
+ */
+typedef struct CUDA_MEMCPY3D_PEER_st
+{
+ size_t srcXInBytes; /**< Source X in bytes */
+ size_t srcY; /**< Source Y */
+ size_t srcZ; /**< Source Z */
+ size_t srcLOD; /**< Source LOD */
+ CUmemorytype srcMemoryType; /**< Source memory type (host, device, array) */
+ const void *srcHost; /**< Source host pointer */
+ CUdeviceptr srcDevice; /**< Source device pointer */
+ CUarray srcArray; /**< Source array reference */
+ CUcontext srcContext; /**< Source context (ignored with srcMemoryType is ::CU_MEMORYTYPE_ARRAY) */
+ size_t srcPitch; /**< Source pitch (ignored when src is array) */
+ size_t srcHeight; /**< Source height (ignored when src is array; may be 0 if Depth==1) */
+
+ size_t dstXInBytes; /**< Destination X in bytes */
+ size_t dstY; /**< Destination Y */
+ size_t dstZ; /**< Destination Z */
+ size_t dstLOD; /**< Destination LOD */
+ CUmemorytype dstMemoryType; /**< Destination memory type (host, device, array) */
+ void *dstHost; /**< Destination host pointer */
+ CUdeviceptr dstDevice; /**< Destination device pointer */
+ CUarray dstArray; /**< Destination array reference */
+ CUcontext dstContext; /**< Destination context (ignored with dstMemoryType is ::CU_MEMORYTYPE_ARRAY) */
+ size_t dstPitch; /**< Destination pitch (ignored when dst is array) */
+ size_t dstHeight; /**< Destination height (ignored when dst is array; may be 0 if Depth==1) */
+
+ size_t WidthInBytes; /**< Width of 3D memory copy in bytes */
+ size_t Height; /**< Height of 3D memory copy */
+ size_t Depth; /**< Depth of 3D memory copy */
+} CUDA_MEMCPY3D_PEER;
+
+/**
+ * Array descriptor
+ */
+typedef struct CUDA_ARRAY_DESCRIPTOR_st
+{
+ size_t Width; /**< Width of array */
+ size_t Height; /**< Height of array */
+
+ CUarray_format Format; /**< Array format */
+ unsigned int NumChannels; /**< Channels per array element */
+} CUDA_ARRAY_DESCRIPTOR;
+
+/**
+ * 3D array descriptor
+ */
+typedef struct CUDA_ARRAY3D_DESCRIPTOR_st
+{
+ size_t Width; /**< Width of 3D array */
+ size_t Height; /**< Height of 3D array */
+ size_t Depth; /**< Depth of 3D array */
+
+ CUarray_format Format; /**< Array format */
+ unsigned int NumChannels; /**< Channels per array element */
+ unsigned int Flags; /**< Flags */
+} CUDA_ARRAY3D_DESCRIPTOR;
+
+#endif /* __CUDA_API_VERSION >= 3020 */
+
+/**
+ * If set, the CUDA array is a collection of layers, where each layer is either a 1D
+ * or a 2D array and the Depth member of CUDA_ARRAY3D_DESCRIPTOR specifies the number
+ * of layers, not the depth of a 3D array.
+ */
+#define CUDA_ARRAY3D_LAYERED 0x01
+
+/**
+ * Deprecated, use CUDA_ARRAY3D_LAYERED
+ */
+#define CUDA_ARRAY3D_2DARRAY 0x01
+
+/**
+ * This flag must be set in order to bind a surface reference
+ * to the CUDA array
+ */
+#define CUDA_ARRAY3D_SURFACE_LDST 0x02
+
+/**
+ * Override the texref format with a format inferred from the array.
+ * Flag for ::cuTexRefSetArray()
+ */
+#define CU_TRSA_OVERRIDE_FORMAT 0x01
+
+/**
+ * Read the texture as integers rather than promoting the values to floats
+ * in the range [0,1].
+ * Flag for ::cuTexRefSetFlags()
+ */
+#define CU_TRSF_READ_AS_INTEGER 0x01
+
+/**
+ * Use normalized texture coordinates in the range [0,1) instead of [0,dim).
+ * Flag for ::cuTexRefSetFlags()
+ */
+#define CU_TRSF_NORMALIZED_COORDINATES 0x02
+
+/**
+ * Perform sRGB->linear conversion during texture read.
+ * Flag for ::cuTexRefSetFlags()
+ */
+#define CU_TRSF_SRGB 0x10
+
+/**
+ * End of array terminator for the \p extra parameter to
+ * ::cuLaunchKernel
+ */
+#define CU_LAUNCH_PARAM_END ((void*)0x00)
+
+/**
+ * Indicator that the next value in the \p extra parameter to
+ * ::cuLaunchKernel will be a pointer to a buffer containing all kernel
+ * parameters used for launching kernel \p f. This buffer needs to
+ * honor all alignment/padding requirements of the individual parameters.
+ * If ::CU_LAUNCH_PARAM_BUFFER_SIZE is not also specified in the
+ * \p extra array, then ::CU_LAUNCH_PARAM_BUFFER_POINTER will have no
+ * effect.
+ */
+#define CU_LAUNCH_PARAM_BUFFER_POINTER ((void*)0x01)
+
+/**
+ * Indicator that the next value in the \p extra parameter to
+ * ::cuLaunchKernel will be a pointer to a size_t which contains the
+ * size of the buffer specified with ::CU_LAUNCH_PARAM_BUFFER_POINTER.
+ * It is required that ::CU_LAUNCH_PARAM_BUFFER_POINTER also be specified
+ * in the \p extra array if the value associated with
+ * ::CU_LAUNCH_PARAM_BUFFER_SIZE is not zero.
+ */
+#define CU_LAUNCH_PARAM_BUFFER_SIZE ((void*)0x02)
+
+/**
+ * For texture references loaded into the module, use default texunit from
+ * texture reference.
+ */
+#define CU_PARAM_TR_DEFAULT -1
+
+/**
+ * CUDA API made obselete at API version 3020
+ */
+#if defined(__CUDA_API_VERSION_INTERNAL)
+ #define CUdeviceptr CUdeviceptr_v1
+ #define CUDA_MEMCPY2D_st CUDA_MEMCPY2D_v1_st
+ #define CUDA_MEMCPY2D CUDA_MEMCPY2D_v1
+ #define CUDA_MEMCPY3D_st CUDA_MEMCPY3D_v1_st
+ #define CUDA_MEMCPY3D CUDA_MEMCPY3D_v1
+ #define CUDA_ARRAY_DESCRIPTOR_st CUDA_ARRAY_DESCRIPTOR_v1_st
+ #define CUDA_ARRAY_DESCRIPTOR CUDA_ARRAY_DESCRIPTOR_v1
+ #define CUDA_ARRAY3D_DESCRIPTOR_st CUDA_ARRAY3D_DESCRIPTOR_v1_st
+ #define CUDA_ARRAY3D_DESCRIPTOR CUDA_ARRAY3D_DESCRIPTOR_v1
+#endif /* CUDA_FORCE_LEGACY32_INTERNAL */
+
+#if defined(__CUDA_API_VERSION_INTERNAL) || __CUDA_API_VERSION < 3020
+typedef unsigned int CUdeviceptr;
+
+typedef struct CUDA_MEMCPY2D_st
+{
+ unsigned int srcXInBytes; /**< Source X in bytes */
+ unsigned int srcY; /**< Source Y */
+ CUmemorytype srcMemoryType; /**< Source memory type (host, device, array) */
+ const void *srcHost; /**< Source host pointer */
+ CUdeviceptr srcDevice; /**< Source device pointer */
+ CUarray srcArray; /**< Source array reference */
+ unsigned int srcPitch; /**< Source pitch (ignored when src is array) */
+
+ unsigned int dstXInBytes; /**< Destination X in bytes */
+ unsigned int dstY; /**< Destination Y */
+ CUmemorytype dstMemoryType; /**< Destination memory type (host, device, array) */
+ void *dstHost; /**< Destination host pointer */
+ CUdeviceptr dstDevice; /**< Destination device pointer */
+ CUarray dstArray; /**< Destination array reference */
+ unsigned int dstPitch; /**< Destination pitch (ignored when dst is array) */
+
+ unsigned int WidthInBytes; /**< Width of 2D memory copy in bytes */
+ unsigned int Height; /**< Height of 2D memory copy */
+} CUDA_MEMCPY2D;
+
+typedef struct CUDA_MEMCPY3D_st
+{
+ unsigned int srcXInBytes; /**< Source X in bytes */
+ unsigned int srcY; /**< Source Y */
+ unsigned int srcZ; /**< Source Z */
+ unsigned int srcLOD; /**< Source LOD */
+ CUmemorytype srcMemoryType; /**< Source memory type (host, device, array) */
+ const void *srcHost; /**< Source host pointer */
+ CUdeviceptr srcDevice; /**< Source device pointer */
+ CUarray srcArray; /**< Source array reference */
+ void *reserved0; /**< Must be NULL */
+ unsigned int srcPitch; /**< Source pitch (ignored when src is array) */
+ unsigned int srcHeight; /**< Source height (ignored when src is array; may be 0 if Depth==1) */
+
+ unsigned int dstXInBytes; /**< Destination X in bytes */
+ unsigned int dstY; /**< Destination Y */
+ unsigned int dstZ; /**< Destination Z */
+ unsigned int dstLOD; /**< Destination LOD */
+ CUmemorytype dstMemoryType; /**< Destination memory type (host, device, array) */
+ void *dstHost; /**< Destination host pointer */
+ CUdeviceptr dstDevice; /**< Destination device pointer */
+ CUarray dstArray; /**< Destination array reference */
+ void *reserved1; /**< Must be NULL */
+ unsigned int dstPitch; /**< Destination pitch (ignored when dst is array) */
+ unsigned int dstHeight; /**< Destination height (ignored when dst is array; may be 0 if Depth==1) */
+
+ unsigned int WidthInBytes; /**< Width of 3D memory copy in bytes */
+ unsigned int Height; /**< Height of 3D memory copy */
+ unsigned int Depth; /**< Depth of 3D memory copy */
+} CUDA_MEMCPY3D;
+
+typedef struct CUDA_ARRAY_DESCRIPTOR_st
+{
+ unsigned int Width; /**< Width of array */
+ unsigned int Height; /**< Height of array */
+
+ CUarray_format Format; /**< Array format */
+ unsigned int NumChannels; /**< Channels per array element */
+} CUDA_ARRAY_DESCRIPTOR;
+
+typedef struct CUDA_ARRAY3D_DESCRIPTOR_st
+{
+ unsigned int Width; /**< Width of 3D array */
+ unsigned int Height; /**< Height of 3D array */
+ unsigned int Depth; /**< Depth of 3D array */
+
+ CUarray_format Format; /**< Array format */
+ unsigned int NumChannels; /**< Channels per array element */
+ unsigned int Flags; /**< Flags */
+} CUDA_ARRAY3D_DESCRIPTOR;
+
+#endif /* (__CUDA_API_VERSION_INTERNAL) || __CUDA_API_VERSION < 3020 */
+
+/*
+ * If set, the CUDA array contains an array of 2D slices
+ * and the Depth member of CUDA_ARRAY3D_DESCRIPTOR specifies
+ * the number of slices, not the depth of a 3D array.
+ */
+#define CUDA_ARRAY3D_2DARRAY 0x01
+
+/**
+ * This flag must be set in order to bind a surface reference
+ * to the CUDA array
+ */
+#define CUDA_ARRAY3D_SURFACE_LDST 0x02
+
+/**
+ * Override the texref format with a format inferred from the array.
+ * Flag for ::cuTexRefSetArray()
+ */
+#define CU_TRSA_OVERRIDE_FORMAT 0x01
+
+/**
+ * Read the texture as integers rather than promoting the values to floats
+ * in the range [0,1].
+ * Flag for ::cuTexRefSetFlags()
+ */
+#define CU_TRSF_READ_AS_INTEGER 0x01
+
+/**
+ * Use normalized texture coordinates in the range [0,1) instead of [0,dim).
+ * Flag for ::cuTexRefSetFlags()
+ */
+#define CU_TRSF_NORMALIZED_COORDINATES 0x02
+
+/**
+ * Perform sRGB->linear conversion during texture read.
+ * Flag for ::cuTexRefSetFlags()
+ */
+#define CU_TRSF_SRGB 0x10
+
+/**
+ * For texture references loaded into the module, use default texunit from
+ * texture reference.
+ */
+#define CU_PARAM_TR_DEFAULT -1
+
+/** @} */ /* END CUDA_TYPES */
+
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+ #define CUDAAPI __stdcall
+#else
+ #define CUDAAPI
+#endif
+
+/**
+ * \defgroup CUDA_INITIALIZE Initialization
+ *
+ * This section describes the initialization functions of the low-level CUDA
+ * driver application programming interface.
+ *
+ * @{
+ */
+
+/*********************************
+ ** Initialization
+ *********************************/
+typedef CUresult CUDAAPI tcuInit(unsigned int Flags);
+
+/*********************************
+ ** Driver Version Query
+ *********************************/
+typedef CUresult CUDAAPI tcuDriverGetVersion(int *driverVersion);
+
+/************************************
+ **
+ ** Device management
+ **
+ ***********************************/
+
+typedef CUresult CUDAAPI tcuDeviceGet(CUdevice *device, int ordinal);
+typedef CUresult CUDAAPI tcuDeviceGetCount(int *count);
+typedef CUresult CUDAAPI tcuDeviceGetName(char *name, int len, CUdevice dev);
+typedef CUresult CUDAAPI tcuDeviceComputeCapability(int *major, int *minor, CUdevice dev);
+#if __CUDA_API_VERSION >= 3020
+ typedef CUresult CUDAAPI tcuDeviceTotalMem(size_t *bytes, CUdevice dev);
+#else
+ typedef CUresult CUDAAPI tcuDeviceTotalMem(unsigned int *bytes, CUdevice dev);
+#endif
+
+typedef CUresult CUDAAPI tcuDeviceGetProperties(CUdevprop *prop, CUdevice dev);
+typedef CUresult CUDAAPI tcuDeviceGetAttribute(int *pi, CUdevice_attribute attrib, CUdevice dev);
+
+/************************************
+ **
+ ** Context management
+ **
+ ***********************************/
+typedef CUresult CUDAAPI tcuCtxCreate(CUcontext *pctx, unsigned int flags, CUdevice dev);
+typedef CUresult CUDAAPI tcuCtxDestroy(CUcontext ctx);
+typedef CUresult CUDAAPI tcuCtxAttach(CUcontext *pctx, unsigned int flags);
+typedef CUresult CUDAAPI tcuCtxDetach(CUcontext ctx);
+typedef CUresult CUDAAPI tcuCtxPushCurrent(CUcontext ctx);
+typedef CUresult CUDAAPI tcuCtxPopCurrent(CUcontext *pctx);
+
+typedef CUresult CUDAAPI tcuCtxSetCurrent(CUcontext ctx);
+typedef CUresult CUDAAPI tcuCtxGetCurrent(CUcontext *pctx);
+
+typedef CUresult CUDAAPI tcuCtxGetDevice(CUdevice *device);
+typedef CUresult CUDAAPI tcuCtxSynchronize(void);
+
+
+/************************************
+ **
+ ** Module management
+ **
+ ***********************************/
+typedef CUresult CUDAAPI tcuModuleLoad(CUmodule *module, const char *fname);
+typedef CUresult CUDAAPI tcuModuleLoadData(CUmodule *module, const void *image);
+typedef CUresult CUDAAPI tcuModuleLoadDataEx(CUmodule *module, const void *image, unsigned int numOptions, CUjit_option *options, void **optionValues);
+typedef CUresult CUDAAPI tcuModuleLoadFatBinary(CUmodule *module, const void *fatCubin);
+typedef CUresult CUDAAPI tcuModuleUnload(CUmodule hmod);
+typedef CUresult CUDAAPI tcuModuleGetFunction(CUfunction *hfunc, CUmodule hmod, const char *name);
+
+#if __CUDA_API_VERSION >= 3020
+ typedef CUresult CUDAAPI tcuModuleGetGlobal(CUdeviceptr *dptr, size_t *bytes, CUmodule hmod, const char *name);
+#else
+ typedef CUresult CUDAAPI tcuModuleGetGlobal(CUdeviceptr *dptr, unsigned int *bytes, CUmodule hmod, const char *name);
+#endif
+
+typedef CUresult CUDAAPI tcuModuleGetTexRef(CUtexref *pTexRef, CUmodule hmod, const char *name);
+typedef CUresult CUDAAPI tcuModuleGetSurfRef(CUsurfref *pSurfRef, CUmodule hmod, const char *name);
+
+/************************************
+ **
+ ** Memory management
+ **
+ ***********************************/
+#if __CUDA_API_VERSION >= 3020
+ typedef CUresult CUDAAPI tcuMemGetInfo(size_t *free, size_t *total);
+ typedef CUresult CUDAAPI tcuMemAlloc(CUdeviceptr *dptr, size_t bytesize);
+ typedef CUresult CUDAAPI tcuMemGetAddressRange(CUdeviceptr *pbase, size_t *psize, CUdeviceptr dptr);
+ typedef CUresult CUDAAPI tcuMemAllocPitch(CUdeviceptr *dptr,
+ size_t *pPitch,
+ size_t WidthInBytes,
+ size_t Height,
+ // size of biggest r/w to be performed by kernels on this memory
+ // 4, 8 or 16 bytes
+ unsigned int ElementSizeBytes
+ );
+#else
+ typedef CUresult CUDAAPI tcuMemGetInfo(unsigned int *free, unsigned int *total);
+ typedef CUresult CUDAAPI tcuMemAlloc(CUdeviceptr *dptr, unsigned int bytesize);
+ typedef CUresult CUDAAPI tcuMemGetAddressRange(CUdeviceptr *pbase, unsigned int *psize, CUdeviceptr dptr);
+ typedef CUresult CUDAAPI tcuMemAllocPitch(CUdeviceptr *dptr,
+ unsigned int *pPitch,
+ unsigned int WidthInBytes,
+ unsigned int Height,
+ // size of biggest r/w to be performed by kernels on this memory
+ // 4, 8 or 16 bytes
+ unsigned int ElementSizeBytes
+ );
+#endif
+
+typedef CUresult CUDAAPI tcuMemFree(CUdeviceptr dptr);
+
+#if __CUDA_API_VERSION >= 3020
+ typedef CUresult CUDAAPI tcuMemAllocHost(void **pp, size_t bytesize);
+#else
+ typedef CUresult CUDAAPI tcuMemAllocHost(void **pp, unsigned int bytesize);
+#endif
+
+typedef CUresult CUDAAPI tcuMemFreeHost(void *p);
+typedef CUresult CUDAAPI tcuMemHostAlloc(void **pp, size_t bytesize, unsigned int Flags);
+
+typedef CUresult CUDAAPI tcuMemHostGetDevicePointer(CUdeviceptr *pdptr, void *p, unsigned int Flags);
+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 tcuMemcpy(CUdeviceptr dst, CUdeviceptr src, size_t ByteCount);
+typedef CUresult CUDAAPI tcuMemcpyPeer(CUdeviceptr dstDevice, CUcontext dstContext, CUdeviceptr srcDevice, CUcontext srcContext, size_t ByteCount);
+
+/************************************
+ **
+ ** Synchronous Memcpy
+ **
+ ** Intra-device memcpy's done with these functions may execute in parallel with the CPU,
+ ** but if host memory is involved, they wait until the copy is done before returning.
+ **
+ ***********************************/
+// 1D functions
+#if __CUDA_API_VERSION >= 3020
+ // system <-> device memory
+ typedef CUresult CUDAAPI tcuMemcpyHtoD(CUdeviceptr dstDevice, const void *srcHost, size_t ByteCount);
+ typedef CUresult CUDAAPI tcuMemcpyDtoH(void *dstHost, CUdeviceptr srcDevice, size_t ByteCount);
+
+ // device <-> device memory
+ typedef CUresult CUDAAPI tcuMemcpyDtoD(CUdeviceptr dstDevice, CUdeviceptr srcDevice, size_t ByteCount);
+
+ // device <-> array memory
+ typedef CUresult CUDAAPI tcuMemcpyDtoA(CUarray dstArray, size_t dstOffset, CUdeviceptr srcDevice, size_t ByteCount);
+ typedef CUresult CUDAAPI tcuMemcpyAtoD(CUdeviceptr dstDevice, CUarray srcArray, size_t srcOffset, size_t ByteCount);
+
+ // system <-> array memory
+ typedef CUresult CUDAAPI tcuMemcpyHtoA(CUarray dstArray, size_t dstOffset, const void *srcHost, size_t ByteCount);
+ typedef CUresult CUDAAPI tcuMemcpyAtoH(void *dstHost, CUarray srcArray, size_t srcOffset, size_t ByteCount);
+
+ // array <-> array memory
+ typedef CUresult CUDAAPI tcuMemcpyAtoA(CUarray dstArray, size_t dstOffset, CUarray srcArray, size_t srcOffset, size_t ByteCount);
+#else
+ // system <-> device memory
+ typedef CUresult CUDAAPI tcuMemcpyHtoD(CUdeviceptr dstDevice, const void *srcHost, unsigned int ByteCount);
+ typedef CUresult CUDAAPI tcuMemcpyDtoH(void *dstHost, CUdeviceptr srcDevice, unsigned int ByteCount);
+
+ // device <-> device memory
+ typedef CUresult CUDAAPI tcuMemcpyDtoD(CUdeviceptr dstDevice, CUdeviceptr srcDevice, unsigned int ByteCount);
+
+ // device <-> array memory
+ typedef CUresult CUDAAPI tcuMemcpyDtoA(CUarray dstArray, unsigned int dstOffset, CUdeviceptr srcDevice, unsigned int ByteCount);
+ typedef CUresult CUDAAPI tcuMemcpyAtoD(CUdeviceptr dstDevice, CUarray srcArray, unsigned int srcOffset, unsigned int ByteCount);
+
+ // system <-> array memory
+ typedef CUresult CUDAAPI tcuMemcpyHtoA(CUarray dstArray, unsigned int dstOffset, const void *srcHost, unsigned int ByteCount);
+ typedef CUresult CUDAAPI tcuMemcpyAtoH(void *dstHost, CUarray srcArray, unsigned int srcOffset, unsigned int ByteCount);
+
+ // array <-> array memory
+ typedef CUresult CUDAAPI tcuMemcpyAtoA(CUarray dstArray, unsigned int dstOffset, CUarray srcArray, unsigned int srcOffset, unsigned int ByteCount);
+#endif
+
+// 2D memcpy
+typedef CUresult CUDAAPI tcuMemcpy2D(const CUDA_MEMCPY2D *pCopy);
+typedef CUresult CUDAAPI tcuMemcpy2DUnaligned(const CUDA_MEMCPY2D *pCopy);
+
+// 3D memcpy
+typedef CUresult CUDAAPI tcuMemcpy3D(const CUDA_MEMCPY3D *pCopy);
+
+/************************************
+ **
+ ** Asynchronous Memcpy
+ **
+ ** Any host memory involved must be DMA'able (e.g., allocated with cuMemAllocHost).
+ ** memcpy's done with these functions execute in parallel with the CPU and, if
+ ** the hardware is available, may execute in parallel with the GPU.
+ ** Asynchronous memcpy must be accompanied by appropriate stream synchronization.
+ **
+ ***********************************/
+
+// 1D functions
+#if __CUDA_API_VERSION >= 3020
+ // system <-> device memory
+ typedef CUresult CUDAAPI tcuMemcpyHtoDAsync(CUdeviceptr dstDevice,
+ const void *srcHost, size_t ByteCount, CUstream hStream);
+ typedef CUresult CUDAAPI tcuMemcpyDtoHAsync(void *dstHost,
+ CUdeviceptr srcDevice, size_t ByteCount, CUstream hStream);
+
+ // device <-> device memory
+ typedef CUresult CUDAAPI tcuMemcpyDtoDAsync(CUdeviceptr dstDevice,
+ CUdeviceptr srcDevice, size_t ByteCount, CUstream hStream);
+
+ // system <-> array memory
+ typedef CUresult CUDAAPI tcuMemcpyHtoAAsync(CUarray dstArray, size_t dstOffset,
+ const void *srcHost, size_t ByteCount, CUstream hStream);
+ typedef CUresult CUDAAPI tcuMemcpyAtoHAsync(void *dstHost, CUarray srcArray, size_t srcOffset,
+ size_t ByteCount, CUstream hStream);
+#else
+ // system <-> device memory
+ typedef CUresult CUDAAPI tcuMemcpyHtoDAsync(CUdeviceptr dstDevice,
+ const void *srcHost, unsigned int ByteCount, CUstream hStream);
+ typedef CUresult CUDAAPI tcuMemcpyDtoHAsync(void *dstHost,
+ CUdeviceptr srcDevice, unsigned int ByteCount, CUstream hStream);
+
+ // device <-> device memory
+ typedef CUresult CUDAAPI tcuMemcpyDtoDAsync(CUdeviceptr dstDevice,
+ CUdeviceptr srcDevice, unsigned int ByteCount, CUstream hStream);
+
+ // system <-> array memory
+ typedef CUresult CUDAAPI tcuMemcpyHtoAAsync(CUarray dstArray, unsigned int dstOffset,
+ const void *srcHost, unsigned int ByteCount, CUstream hStream);
+ typedef CUresult CUDAAPI tcuMemcpyAtoHAsync(void *dstHost, CUarray srcArray, unsigned int srcOffset,
+ unsigned int ByteCount, CUstream hStream);
+#endif
+
+// 2D memcpy
+typedef CUresult CUDAAPI tcuMemcpy2DAsync(const CUDA_MEMCPY2D *pCopy, CUstream hStream);
+
+// 3D memcpy
+typedef CUresult CUDAAPI tcuMemcpy3DAsync(const CUDA_MEMCPY3D *pCopy, CUstream hStream);
+
+/************************************
+ **
+ ** Memset
+ **
+ ***********************************/
+typedef CUresult CUDAAPI tcuMemsetD8(CUdeviceptr dstDevice, unsigned char uc, unsigned int N);
+typedef CUresult CUDAAPI tcuMemsetD16(CUdeviceptr dstDevice, unsigned short us, unsigned int N);
+typedef CUresult CUDAAPI tcuMemsetD32(CUdeviceptr dstDevice, unsigned int ui, unsigned int N);
+
+#if __CUDA_API_VERSION >= 3020
+ typedef CUresult CUDAAPI tcuMemsetD2D8(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned char uc, size_t Width, size_t Height);
+ typedef CUresult CUDAAPI tcuMemsetD2D16(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned short us, size_t Width, size_t Height);
+ typedef CUresult CUDAAPI tcuMemsetD2D32(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned int ui, size_t Width, size_t Height);
+#else
+ typedef CUresult CUDAAPI tcuMemsetD2D8(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned char uc, unsigned int Width, unsigned int Height);
+ typedef CUresult CUDAAPI tcuMemsetD2D16(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned short us, unsigned int Width, unsigned int Height);
+ typedef CUresult CUDAAPI tcuMemsetD2D32(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned int ui, unsigned int Width, unsigned int Height);
+#endif
+
+/************************************
+ **
+ ** Function management
+ **
+ ***********************************/
+
+
+typedef CUresult CUDAAPI tcuFuncSetBlockShape(CUfunction hfunc, int x, int y, int z);
+typedef CUresult CUDAAPI tcuFuncSetSharedSize(CUfunction hfunc, unsigned int bytes);
+typedef CUresult CUDAAPI tcuFuncGetAttribute(int *pi, CUfunction_attribute attrib, CUfunction hfunc);
+typedef CUresult CUDAAPI tcuFuncSetCacheConfig(CUfunction hfunc, CUfunc_cache config);
+typedef CUresult CUDAAPI tcuLaunchKernel(CUfunction f,
+ unsigned int gridDimX, unsigned int gridDimY, unsigned int gridDimZ,
+ unsigned int blockDimX, unsigned int blockDimY, unsigned int blockDimZ,
+ unsigned int sharedMemBytes,
+ CUstream hStream, void **kernelParams, void **extra);
+
+/************************************
+ **
+ ** Array management
+ **
+ ***********************************/
+
+typedef CUresult CUDAAPI tcuArrayCreate(CUarray *pHandle, const CUDA_ARRAY_DESCRIPTOR *pAllocateArray);
+typedef CUresult CUDAAPI tcuArrayGetDescriptor(CUDA_ARRAY_DESCRIPTOR *pArrayDescriptor, CUarray hArray);
+typedef CUresult CUDAAPI tcuArrayDestroy(CUarray hArray);
+
+typedef CUresult CUDAAPI tcuArray3DCreate(CUarray *pHandle, const CUDA_ARRAY3D_DESCRIPTOR *pAllocateArray);
+typedef CUresult CUDAAPI tcuArray3DGetDescriptor(CUDA_ARRAY3D_DESCRIPTOR *pArrayDescriptor, CUarray hArray);
+
+
+/************************************
+ **
+ ** Texture reference management
+ **
+ ***********************************/
+typedef CUresult CUDAAPI tcuTexRefCreate(CUtexref *pTexRef);
+typedef CUresult CUDAAPI tcuTexRefDestroy(CUtexref hTexRef);
+
+typedef CUresult CUDAAPI tcuTexRefSetArray(CUtexref hTexRef, CUarray hArray, unsigned int Flags);
+
+#if __CUDA_API_VERSION >= 3020
+ typedef CUresult CUDAAPI tcuTexRefSetAddress(size_t *ByteOffset, CUtexref hTexRef, CUdeviceptr dptr, size_t bytes);
+ typedef CUresult CUDAAPI tcuTexRefSetAddress2D(CUtexref hTexRef, const CUDA_ARRAY_DESCRIPTOR *desc, CUdeviceptr dptr, size_t Pitch);
+#else
+ typedef CUresult CUDAAPI tcuTexRefSetAddress(unsigned int *ByteOffset, CUtexref hTexRef, CUdeviceptr dptr, unsigned int bytes);
+ typedef CUresult CUDAAPI tcuTexRefSetAddress2D(CUtexref hTexRef, const CUDA_ARRAY_DESCRIPTOR *desc, CUdeviceptr dptr, unsigned int Pitch);
+#endif
+
+typedef CUresult CUDAAPI tcuTexRefSetFormat(CUtexref hTexRef, CUarray_format fmt, int NumPackedComponents);
+typedef CUresult CUDAAPI tcuTexRefSetAddressMode(CUtexref hTexRef, int dim, CUaddress_mode am);
+typedef CUresult CUDAAPI tcuTexRefSetFilterMode(CUtexref hTexRef, CUfilter_mode fm);
+typedef CUresult CUDAAPI tcuTexRefSetFlags(CUtexref hTexRef, unsigned int Flags);
+
+typedef CUresult CUDAAPI tcuTexRefGetAddress(CUdeviceptr *pdptr, CUtexref hTexRef);
+typedef CUresult CUDAAPI tcuTexRefGetArray(CUarray *phArray, CUtexref hTexRef);
+typedef CUresult CUDAAPI tcuTexRefGetAddressMode(CUaddress_mode *pam, CUtexref hTexRef, int dim);
+typedef CUresult CUDAAPI tcuTexRefGetFilterMode(CUfilter_mode *pfm, CUtexref hTexRef);
+typedef CUresult CUDAAPI tcuTexRefGetFormat(CUarray_format *pFormat, int *pNumChannels, CUtexref hTexRef);
+typedef CUresult CUDAAPI tcuTexRefGetFlags(unsigned int *pFlags, CUtexref hTexRef);
+
+/************************************
+ **
+ ** Surface reference management
+ **
+ ***********************************/
+typedef CUresult CUDAAPI tcuSurfRefSetArray(CUsurfref hSurfRef, CUarray hArray, unsigned int Flags);
+typedef CUresult CUDAAPI tcuSurfRefGetArray(CUarray *phArray, CUsurfref hSurfRef);
+
+/************************************
+ **
+ ** Parameter management
+ **
+ ***********************************/
+
+typedef CUresult CUDAAPI tcuParamSetSize(CUfunction hfunc, unsigned int numbytes);
+typedef CUresult CUDAAPI tcuParamSeti(CUfunction hfunc, int offset, unsigned int value);
+typedef CUresult CUDAAPI tcuParamSetf(CUfunction hfunc, int offset, float value);
+typedef CUresult CUDAAPI tcuParamSetv(CUfunction hfunc, int offset, void *ptr, unsigned int numbytes);
+typedef CUresult CUDAAPI tcuParamSetTexRef(CUfunction hfunc, int texunit, CUtexref hTexRef);
+
+
+/************************************
+ **
+ ** Launch functions
+ **
+ ***********************************/
+
+typedef CUresult CUDAAPI tcuLaunch(CUfunction f);
+typedef CUresult CUDAAPI tcuLaunchGrid(CUfunction f, int grid_width, int grid_height);
+typedef CUresult CUDAAPI tcuLaunchGridAsync(CUfunction f, int grid_width, int grid_height, CUstream hStream);
+
+/************************************
+ **
+ ** Events
+ **
+ ***********************************/
+typedef CUresult CUDAAPI tcuEventCreate(CUevent *phEvent, unsigned int Flags);
+typedef CUresult CUDAAPI tcuEventRecord(CUevent hEvent, CUstream hStream);
+typedef CUresult CUDAAPI tcuEventQuery(CUevent hEvent);
+typedef CUresult CUDAAPI tcuEventSynchronize(CUevent hEvent);
+typedef CUresult CUDAAPI tcuEventDestroy(CUevent hEvent);
+typedef CUresult CUDAAPI tcuEventElapsedTime(float *pMilliseconds, CUevent hStart, CUevent hEnd);
+
+/************************************
+ **
+ ** Streams
+ **
+ ***********************************/
+typedef CUresult CUDAAPI tcuStreamCreate(CUstream *phStream, unsigned int Flags);
+typedef CUresult CUDAAPI tcuStreamQuery(CUstream hStream);
+typedef CUresult CUDAAPI tcuStreamSynchronize(CUstream hStream);
+typedef CUresult CUDAAPI tcuStreamDestroy(CUstream hStream);
+
+/************************************
+ **
+ ** Graphics interop
+ **
+ ***********************************/
+typedef CUresult CUDAAPI tcuGraphicsUnregisterResource(CUgraphicsResource resource);
+typedef CUresult CUDAAPI tcuGraphicsSubResourceGetMappedArray(CUarray *pArray, CUgraphicsResource resource, unsigned int arrayIndex, unsigned int mipLevel);
+
+#if __CUDA_API_VERSION >= 3020
+ typedef CUresult CUDAAPI tcuGraphicsResourceGetMappedPointer(CUdeviceptr *pDevPtr, size_t *pSize, CUgraphicsResource resource);
+#else
+ typedef CUresult CUDAAPI tcuGraphicsResourceGetMappedPointer(CUdeviceptr *pDevPtr, unsigned int *pSize, CUgraphicsResource resource);
+#endif
+
+typedef CUresult CUDAAPI tcuGraphicsResourceSetMapFlags(CUgraphicsResource resource, unsigned int flags);
+typedef CUresult CUDAAPI tcuGraphicsMapResources(unsigned int count, CUgraphicsResource *resources, CUstream hStream);
+typedef CUresult CUDAAPI tcuGraphicsUnmapResources(unsigned int count, CUgraphicsResource *resources, CUstream hStream);
+
+/************************************
+ **
+ ** Export tables
+ **
+ ***********************************/
+typedef CUresult CUDAAPI tcuGetExportTable(const void **ppExportTable, const CUuuid *pExportTableId);
+
+/************************************
+ **
+ ** Limits
+ **
+ ***********************************/
+
+typedef CUresult CUDAAPI tcuCtxSetLimit(CUlimit limit, size_t value);
+typedef CUresult CUDAAPI tcuCtxGetLimit(size_t *pvalue, CUlimit limit);
+
+
+extern tcuDriverGetVersion *cuDriverGetVersion;
+extern tcuDeviceGet *cuDeviceGet;
+extern tcuDeviceGetCount *cuDeviceGetCount;
+extern tcuDeviceGetName *cuDeviceGetName;
+extern tcuDeviceComputeCapability *cuDeviceComputeCapability;
+extern tcuDeviceGetProperties *cuDeviceGetProperties;
+extern tcuDeviceGetAttribute *cuDeviceGetAttribute;
+extern tcuCtxDestroy *cuCtxDestroy;
+extern tcuCtxAttach *cuCtxAttach;
+extern tcuCtxDetach *cuCtxDetach;
+extern tcuCtxPushCurrent *cuCtxPushCurrent;
+extern tcuCtxPopCurrent *cuCtxPopCurrent;
+
+extern tcuCtxSetCurrent *cuCtxSetCurrent;
+extern tcuCtxGetCurrent *cuCtxGetCurrent;
+
+extern tcuCtxGetDevice *cuCtxGetDevice;
+extern tcuCtxSynchronize *cuCtxSynchronize;
+extern tcuModuleLoad *cuModuleLoad;
+extern tcuModuleLoadData *cuModuleLoadData;
+extern tcuModuleLoadDataEx *cuModuleLoadDataEx;
+extern tcuModuleLoadFatBinary *cuModuleLoadFatBinary;
+extern tcuModuleUnload *cuModuleUnload;
+extern tcuModuleGetFunction *cuModuleGetFunction;
+extern tcuModuleGetTexRef *cuModuleGetTexRef;
+extern tcuModuleGetSurfRef *cuModuleGetSurfRef;
+extern tcuMemFreeHost *cuMemFreeHost;
+extern tcuMemHostAlloc *cuMemHostAlloc;
+extern tcuMemHostGetFlags *cuMemHostGetFlags;
+
+extern tcuMemHostRegister *cuMemHostRegister;
+extern tcuMemHostUnregister *cuMemHostUnregister;
+extern tcuMemcpy *cuMemcpy;
+extern tcuMemcpyPeer *cuMemcpyPeer;
+
+extern tcuDeviceTotalMem *cuDeviceTotalMem;
+extern tcuCtxCreate *cuCtxCreate;
+extern tcuModuleGetGlobal *cuModuleGetGlobal;
+extern tcuMemGetInfo *cuMemGetInfo;
+extern tcuMemAlloc *cuMemAlloc;
+extern tcuMemAllocPitch *cuMemAllocPitch;
+extern tcuMemFree *cuMemFree;
+extern tcuMemGetAddressRange *cuMemGetAddressRange;
+extern tcuMemAllocHost *cuMemAllocHost;
+extern tcuMemHostGetDevicePointer *cuMemHostGetDevicePointer;
+extern tcuFuncSetBlockShape *cuFuncSetBlockShape;
+extern tcuFuncSetSharedSize *cuFuncSetSharedSize;
+extern tcuFuncGetAttribute *cuFuncGetAttribute;
+extern tcuFuncSetCacheConfig *cuFuncSetCacheConfig;
+extern tcuLaunchKernel *cuLaunchKernel;
+extern tcuArrayDestroy *cuArrayDestroy;
+extern tcuTexRefCreate *cuTexRefCreate;
+extern tcuTexRefDestroy *cuTexRefDestroy;
+extern tcuTexRefSetArray *cuTexRefSetArray;
+extern tcuTexRefSetFormat *cuTexRefSetFormat;
+extern tcuTexRefSetAddressMode *cuTexRefSetAddressMode;
+extern tcuTexRefSetFilterMode *cuTexRefSetFilterMode;
+extern tcuTexRefSetFlags *cuTexRefSetFlags;
+extern tcuTexRefGetArray *cuTexRefGetArray;
+extern tcuTexRefGetAddressMode *cuTexRefGetAddressMode;
+extern tcuTexRefGetFilterMode *cuTexRefGetFilterMode;
+extern tcuTexRefGetFormat *cuTexRefGetFormat;
+extern tcuTexRefGetFlags *cuTexRefGetFlags;
+extern tcuSurfRefSetArray *cuSurfRefSetArray;
+extern tcuSurfRefGetArray *cuSurfRefGetArray;
+extern tcuParamSetSize *cuParamSetSize;
+extern tcuParamSeti *cuParamSeti;
+extern tcuParamSetf *cuParamSetf;
+extern tcuParamSetv *cuParamSetv;
+extern tcuParamSetTexRef *cuParamSetTexRef;
+extern tcuLaunch *cuLaunch;
+extern tcuLaunchGrid *cuLaunchGrid;
+extern tcuLaunchGridAsync *cuLaunchGridAsync;
+extern tcuEventCreate *cuEventCreate;
+extern tcuEventRecord *cuEventRecord;
+extern tcuEventQuery *cuEventQuery;
+extern tcuEventSynchronize *cuEventSynchronize;
+extern tcuEventDestroy *cuEventDestroy;
+extern tcuEventElapsedTime *cuEventElapsedTime;
+extern tcuStreamCreate *cuStreamCreate;
+extern tcuStreamQuery *cuStreamQuery;
+extern tcuStreamSynchronize *cuStreamSynchronize;
+extern tcuStreamDestroy *cuStreamDestroy;
+extern tcuGraphicsUnregisterResource *cuGraphicsUnregisterResource;
+extern tcuGraphicsSubResourceGetMappedArray *cuGraphicsSubResourceGetMappedArray;
+extern tcuGraphicsResourceSetMapFlags *cuGraphicsResourceSetMapFlags;
+extern tcuGraphicsMapResources *cuGraphicsMapResources;
+extern tcuGraphicsUnmapResources *cuGraphicsUnmapResources;
+extern tcuGetExportTable *cuGetExportTable;
+extern tcuCtxSetLimit *cuCtxSetLimit;
+extern tcuCtxGetLimit *cuCtxGetLimit;
+
+// These functions could be using the CUDA 3.2 interface (_v2)
+extern tcuMemcpyHtoD *cuMemcpyHtoD;
+extern tcuMemcpyDtoH *cuMemcpyDtoH;
+extern tcuMemcpyDtoD *cuMemcpyDtoD;
+extern tcuMemcpyDtoA *cuMemcpyDtoA;
+extern tcuMemcpyAtoD *cuMemcpyAtoD;
+extern tcuMemcpyHtoA *cuMemcpyHtoA;
+extern tcuMemcpyAtoH *cuMemcpyAtoH;
+extern tcuMemcpyAtoA *cuMemcpyAtoA;
+extern tcuMemcpy2D *cuMemcpy2D;
+extern tcuMemcpy2DUnaligned *cuMemcpy2DUnaligned;
+extern tcuMemcpy3D *cuMemcpy3D;
+extern tcuMemcpyHtoDAsync *cuMemcpyHtoDAsync;
+extern tcuMemcpyDtoHAsync *cuMemcpyDtoHAsync;
+extern tcuMemcpyDtoDAsync *cuMemcpyDtoDAsync;
+extern tcuMemcpyHtoAAsync *cuMemcpyHtoAAsync;
+extern tcuMemcpyAtoHAsync *cuMemcpyAtoHAsync;
+extern tcuMemcpy2DAsync *cuMemcpy2DAsync;
+extern tcuMemcpy3DAsync *cuMemcpy3DAsync;
+extern tcuMemsetD8 *cuMemsetD8;
+extern tcuMemsetD16 *cuMemsetD16;
+extern tcuMemsetD32 *cuMemsetD32;
+extern tcuMemsetD2D8 *cuMemsetD2D8;
+extern tcuMemsetD2D16 *cuMemsetD2D16;
+extern tcuMemsetD2D32 *cuMemsetD2D32;
+extern tcuArrayCreate *cuArrayCreate;
+extern tcuArrayGetDescriptor *cuArrayGetDescriptor;
+extern tcuArray3DCreate *cuArray3DCreate;
+extern tcuArray3DGetDescriptor *cuArray3DGetDescriptor;
+extern tcuTexRefSetAddress *cuTexRefSetAddress;
+extern tcuTexRefSetAddress2D *cuTexRefSetAddress2D;
+extern tcuTexRefGetAddress *cuTexRefGetAddress;
+extern tcuGraphicsResourceGetMappedPointer *cuGraphicsResourceGetMappedPointer;
+
+/************************************/
+CUresult CUDAAPI cuInit (unsigned int, int cudaVersion);
+void CUDAAPI cuUninit();
+/************************************/
+
+
+#ifndef __CUDA_API_VERSION
+#define __CUDA_API_VERSION 4000
+#endif
+
+
+#include <gpac/setup.h>
+#include "../../src/compositor/gl_inc.h"
+
+/**
+ * \file dynlink_cudaGL.h
+ * \brief Header file for the OpenGL interoperability functions of the
+ * low-level CUDA driver application programming interface.
+ */
+
+/**
+ * \defgroup CUDA_GL OpenGL Interoperability
+ * \ingroup CUDA_DRIVER
+ *
+ * ___MANBRIEF___ OpenGL interoperability functions of the low-level CUDA
+ * driver API (___CURRENT_FILE___) ___ENDMANBRIEF___
+ *
+ * This section describes the OpenGL interoperability functions of the
+ * low-level CUDA driver application programming interface. Note that mapping 
+ * of OpenGL resources is performed with the graphics API agnostic, resource 
+ * mapping interface described in \ref CUDA_GRAPHICS "Graphics Interoperability".
+ *
+ * @{
+ */
+
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+#if !defined(WGL_NV_gpu_affinity)
+typedef void* HGPUNV;
+#endif
+#endif /* _WIN32 */
+
+typedef CUresult CUDAAPI tcuGraphicsGLRegisterBuffer(CUgraphicsResource *pCudaResource, GLuint buffer, unsigned int Flags);
+typedef CUresult CUDAAPI tcuGraphicsGLRegisterImage(CUgraphicsResource *pCudaResource, GLuint image, GLenum target, unsigned int Flags);
+
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+typedef CUresult CUDAAPI tcuWGLGetDevice(CUdevice *pDevice, HGPUNV hGpu);
+#endif /* _WIN32 */
+
+/**
+ * CUDA devices corresponding to an OpenGL device
+ */
+typedef enum CUGLDeviceList_enum {
+ CU_GL_DEVICE_LIST_ALL = 0x01, /**< The CUDA devices for all GPUs used by the current OpenGL context */
+ CU_GL_DEVICE_LIST_CURRENT_FRAME = 0x02, /**< The CUDA devices for the GPUs used by the current OpenGL context in its currently rendering frame */
+ CU_GL_DEVICE_LIST_NEXT_FRAME = 0x03, /**< The CUDA devices for the GPUs to be used by the current OpenGL context in the next frame */
+} CUGLDeviceList;
+
+#if __CUDA_API_VERSION >= 6050
+typedef CUresult CUDAAPI tcuGLGetDevices(unsigned int *pCudaDeviceCount, CUdevice *pCudaDevices, unsigned int cudaDeviceCount, CUGLDeviceList deviceList);
+#endif /* __CUDA_API_VERSION >= 6050 */
+
+/**
+ * \defgroup CUDA_GL_DEPRECATED OpenGL Interoperability [DEPRECATED]
+ *
+ * ___MANBRIEF___ deprecated OpenGL interoperability functions of the low-level
+ * CUDA driver API (___CURRENT_FILE___) ___ENDMANBRIEF___
+ *
+ * This section describes deprecated OpenGL interoperability functionality.
+ *
+ * @{
+ */
+
+/** Flags to map or unmap a resource */
+typedef enum CUGLmap_flags_enum {
+ CU_GL_MAP_RESOURCE_FLAGS_NONE = 0x00,
+ CU_GL_MAP_RESOURCE_FLAGS_READ_ONLY = 0x01,
+ CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02, 
+} CUGLmap_flags;
+
+//#if __CUDA_API_VERSION >= 3020
+typedef CUresult CUDAAPI tcuGLCtxCreate(CUcontext *pCtx, unsigned int Flags, CUdevice device);
+//#endif /* __CUDA_API_VERSION >= 3020 */
+
+typedef CUresult CUDAAPI tcuGLInit(void);
+typedef CUresult CUDAAPI tcuGLRegisterBufferObject(GLuint buffer);
+
+#if __CUDA_API_VERSION >= 3020
+typedef CUresult CUDAAPI tcuGLMapBufferObject(CUdeviceptr *dptr, size_t *size, GLuint buffer);
+#endif /* __CUDA_API_VERSION >= 3020 */
+
+typedef CUresult CUDAAPI tcuGLUnmapBufferObject(GLuint buffer);
+typedef CUresult CUDAAPI tcuGLUnregisterBufferObject(GLuint buffer);
+typedef CUresult CUDAAPI tcuGLSetBufferObjectMapFlags(GLuint buffer, unsigned int Flags);
+
+#if __CUDA_API_VERSION >= 3020
+typedef CUresult CUDAAPI tcuGLMapBufferObjectAsync(CUdeviceptr *dptr, size_t *size, GLuint buffer, CUstream hStream);
+#endif /* __CUDA_API_VERSION >= 3020 */
+
+typedef CUresult CUDAAPI tcuGLUnmapBufferObjectAsync(GLuint buffer, CUstream hStream);
+typedef CUresult CUDAAPI tcuGLGetDevices(unsigned int *pCudaDeviceCount, CUdevice *pCudaDevices, unsigned int cudaDeviceCount, CUGLDeviceList deviceList);
+
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+extern tcuWGLGetDevice *cuWGLGetDevice;
+#endif
+
+extern tcuGLCtxCreate *cuGLCtxCreate;
+extern tcuGLCtxCreate *cuGLCtxCreate_v2;
+extern tcuGLMapBufferObject *cuGLMapBufferObject;
+extern tcuGLMapBufferObject *cuGLMapBufferObject_v2;
+extern tcuGLMapBufferObjectAsync *cuGLMapBufferObjectAsync;
+
+#if __CUDA_API_VERSION >= 6050
+extern tcuGLGetDevices *cuGLGetDevices;
+#endif
+
+extern tcuGraphicsGLRegisterBuffer *cuGraphicsGLRegisterBuffer;
+extern tcuGraphicsGLRegisterImage *cuGraphicsGLRegisterImage;
+extern tcuGLSetBufferObjectMapFlags *cuGLSetBufferObjectMapFlags;
+extern tcuGLRegisterBufferObject *cuGLRegisterBufferObject;
+
+extern tcuGLUnmapBufferObject *cuGLUnmapBufferObject;
+extern tcuGLUnmapBufferObjectAsync *cuGLUnmapBufferObjectAsync;
+
+extern tcuGLUnregisterBufferObject *cuGLUnregisterBufferObject;
+extern tcuGLGetDevices *cuGLGetDevices; // CUDA 6.5 only
+
+
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+#include <Windows.h>
+typedef HMODULE CUDADRIVER;
+#else
+typedef void *CUDADRIVER;
+#endif
+
+
+
+
+#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
+#if (CUDA_VERSION >= 3020) && (!defined(CUDA_FORCE_API_VERSION) || (CUDA_FORCE_API_VERSION >= 3020))
+#define __CUVID_DEVPTR64
+#endif
+#endif
+
+
+typedef void *CUvideodecoder;
+typedef struct _CUcontextlock_st *CUvideoctxlock;
+
+/**
+ * \addtogroup VIDEO_DECODER Video Decoder
+ * @{
+ */
+
+/*!
+ * \enum cudaVideoCodec
+ * Video Codec Enums
+ */
+typedef enum cudaVideoCodec_enum {
+ cudaVideoCodec_MPEG1=0, /**< MPEG1 */
+ cudaVideoCodec_MPEG2, /**< MPEG2 */
+ cudaVideoCodec_MPEG4, /**< MPEG4 */
+ cudaVideoCodec_VC1, /**< VC1 */
+ cudaVideoCodec_H264, /**< H264 */
+ cudaVideoCodec_JPEG, /**< JPEG */
+ cudaVideoCodec_H264_SVC, /**< H264-SVC */
+ cudaVideoCodec_H264_MVC, /**< H264-MVC */
+ cudaVideoCodec_HEVC, /**< HEVC */
+ cudaVideoCodec_VP8, /**< VP8 */
+ cudaVideoCodec_VP9, /**< VP9 */
+ cudaVideoCodec_NumCodecs, /**< Max COdecs */
+ // Uncompressed YUV
+ cudaVideoCodec_YUV420 = (('I'<<24)|('Y'<<16)|('U'<<8)|('V')), /**< Y,U,V (4:2:0) */
+ cudaVideoCodec_YV12 = (('Y'<<24)|('V'<<16)|('1'<<8)|('2')), /**< Y,V,U (4:2:0) */
+ cudaVideoCodec_NV12 = (('N'<<24)|('V'<<16)|('1'<<8)|('2')), /**< Y,UV (4:2:0) */
+ cudaVideoCodec_YUYV = (('Y'<<24)|('U'<<16)|('Y'<<8)|('V')), /**< YUYV/YUY2 (4:2:2) */
+ cudaVideoCodec_UYVY = (('U'<<24)|('Y'<<16)|('V'<<8)|('Y')) /**< UYVY (4:2:2) */
+} cudaVideoCodec;
+
+/*!
+ * \enum cudaVideoSurfaceFormat
+ * Video Surface Formats Enums
+ */
+typedef enum cudaVideoSurfaceFormat_enum {
+ cudaVideoSurfaceFormat_NV12=0, /**< NV12 (currently the only supported output format) */
+	cudaVideoSurfaceFormat_P016=1
+} cudaVideoSurfaceFormat;
+
+/*!
+ * \enum cudaVideoDeinterlaceMode
+ * Deinterlacing Modes Enums
+ */
+typedef enum cudaVideoDeinterlaceMode_enum {
+ cudaVideoDeinterlaceMode_Weave=0, /**< Weave both fields (no deinterlacing) */
+ cudaVideoDeinterlaceMode_Bob, /**< Drop one field */
+ cudaVideoDeinterlaceMode_Adaptive /**< Adaptive deinterlacing */
+} cudaVideoDeinterlaceMode;
+
+/*!
+ * \enum cudaVideoChromaFormat
+ * Chroma Formats Enums
+ */
+typedef enum cudaVideoChromaFormat_enum {
+ cudaVideoChromaFormat_Monochrome=0, /**< MonoChrome */
+ cudaVideoChromaFormat_420, /**< 4:2:0 */
+ cudaVideoChromaFormat_422, /**< 4:2:2 */
+ cudaVideoChromaFormat_444 /**< 4:4:4 */
+} cudaVideoChromaFormat;
+
+/*!
+ * \enum cudaVideoCreateFlags
+ * Decoder Flags Enums
+ */
+typedef enum cudaVideoCreateFlags_enum {
+ cudaVideoCreate_Default = 0x00, /**< Default operation mode: use dedicated video engines */
+ cudaVideoCreate_PreferCUDA = 0x01, /**< Use a CUDA-based decoder if faster than dedicated engines (requires a valid vidLock object for multi-threading) */
+ cudaVideoCreate_PreferDXVA = 0x02, /**< Go through DXVA internally if possible (requires D3D9 interop) */
+ cudaVideoCreate_PreferCUVID = 0x04 /**< Use dedicated video engines directly */
+} cudaVideoCreateFlags;
+
+/*!
+ * \struct CUVIDDECODECREATEINFO
+ * Struct used in create decoder
+ */
+typedef struct _CUVIDDECODECREATEINFO
+{
+ unsigned long ulWidth; /**< Coded Sequence Width */
+ unsigned long ulHeight; /**< Coded Sequence Height */
+ unsigned long ulNumDecodeSurfaces; /**< Maximum number of internal decode surfaces */
+ cudaVideoCodec CodecType; /**< cudaVideoCodec_XXX */
+ cudaVideoChromaFormat ChromaFormat; /**< cudaVideoChromaFormat_XXX (only 4:2:0 is currently supported) */
+ unsigned long ulCreationFlags; /**< Decoder creation flags (cudaVideoCreateFlags_XXX) */
+ unsigned long bitDepthMinus8;
+ unsigned long Reserved1[4]; /**< Reserved for future use - set to zero */
+ /**
+ * area of the frame that should be displayed
+ */
+ struct {
+ short left;
+ short top;
+ short right;
+ short bottom;
+ } display_area;
+
+ cudaVideoSurfaceFormat OutputFormat; /**< cudaVideoSurfaceFormat_XXX */
+ cudaVideoDeinterlaceMode DeinterlaceMode; /**< cudaVideoDeinterlaceMode_XXX */
+ unsigned long ulTargetWidth; /**< Post-processed Output Width (Should be aligned to 2) */
+ unsigned long ulTargetHeight; /**< Post-processed Output Height (Should be aligbed to 2) */
+ unsigned long ulNumOutputSurfaces; /**< Maximum number of output surfaces simultaneously mapped */
+ CUvideoctxlock vidLock; /**< If non-NULL, context lock used for synchronizing ownership of the cuda context */
+ /**
+ * target rectangle in the output frame (for aspect ratio conversion)
+ * if a null rectangle is specified, {0,0,ulTargetWidth,ulTargetHeight} will be used
+ */
+ struct {
+ short left;
+ short top;
+ short right;
+ short bottom;
+ } target_rect;
+ unsigned long Reserved2[5]; /**< Reserved for future use - set to zero */
+} CUVIDDECODECREATEINFO;
+
+/*!
+ * \struct CUVIDH264DPBENTRY
+ * H.264 DPB Entry
+ */
+typedef struct _CUVIDH264DPBENTRY
+{
+ int PicIdx; /**< picture index of reference frame */
+ int FrameIdx; /**< frame_num(short-term) or LongTermFrameIdx(long-term) */
+ int is_long_term; /**< 0=short term reference, 1=long term reference */
+ int not_existing; /**< non-existing reference frame (corresponding PicIdx should be set to -1) */
+ int used_for_reference; /**< 0=unused, 1=top_field, 2=bottom_field, 3=both_fields */
+ int FieldOrderCnt[2]; /**< field order count of top and bottom fields */
+} CUVIDH264DPBENTRY;
+
+/*!
+ * \struct CUVIDH264MVCEXT
+ * H.264 MVC Picture Parameters Ext
+ */
+typedef struct _CUVIDH264MVCEXT
+{
+ int num_views_minus1;
+ int view_id;
+ unsigned char inter_view_flag;
+ unsigned char num_inter_view_refs_l0;
+ unsigned char num_inter_view_refs_l1;
+ unsigned char MVCReserved8Bits;
+ int InterViewRefsL0[16];
+ int InterViewRefsL1[16];
+} CUVIDH264MVCEXT;
+
+/*!
+ * \struct CUVIDH264SVCEXT
+ * H.264 SVC Picture Parameters Ext
+ */
+typedef struct _CUVIDH264SVCEXT
+{
+ unsigned char profile_idc;
+ unsigned char level_idc;
+ unsigned char DQId;
+ unsigned char DQIdMax;
+ unsigned char disable_inter_layer_deblocking_filter_idc;
+ unsigned char ref_layer_chroma_phase_y_plus1;
+ signed char inter_layer_slice_alpha_c0_offset_div2;
+ signed char inter_layer_slice_beta_offset_div2;
+
+ unsigned short DPBEntryValidFlag;
+ unsigned char inter_layer_deblocking_filter_control_present_flag;
+ unsigned char extended_spatial_scalability_idc;
+ unsigned char adaptive_tcoeff_level_prediction_flag;
+ unsigned char slice_header_restriction_flag;
+ unsigned char chroma_phase_x_plus1_flag;
+ unsigned char chroma_phase_y_plus1;
+
+ unsigned char tcoeff_level_prediction_flag;
+ unsigned char constrained_intra_resampling_flag;
+ unsigned char ref_layer_chroma_phase_x_plus1_flag;
+ unsigned char store_ref_base_pic_flag;
+ unsigned char Reserved8BitsA;
+ unsigned char Reserved8BitsB;
+ // For the 4 scaled_ref_layer_XX fields below,
+ // if (extended_spatial_scalability_idc == 1), SPS field, G.7.3.2.1.4, add prefix "seq_"
+ // if (extended_spatial_scalability_idc == 2), SLH field, G.7.3.3.4,
+ short scaled_ref_layer_left_offset;
+ short scaled_ref_layer_top_offset;
+ short scaled_ref_layer_right_offset;
+ short scaled_ref_layer_bottom_offset;
+ unsigned short Reserved16Bits;
+ struct _CUVIDPICPARAMS *pNextLayer; /**< Points to the picparams for the next layer to be decoded. Linked list ends at the target layer. */
+ int bRefBaseLayer; /**< whether to store ref base pic */
+} CUVIDH264SVCEXT;
+
+/*!
+ * \struct CUVIDH264PICPARAMS
+ * H.264 Picture Parameters
+ */
+typedef struct _CUVIDH264PICPARAMS
+{
+ // SPS
+ int log2_max_frame_num_minus4;
+ int pic_order_cnt_type;
+ int log2_max_pic_order_cnt_lsb_minus4;
+ int delta_pic_order_always_zero_flag;
+ int frame_mbs_only_flag;
+ int direct_8x8_inference_flag;
+ int num_ref_frames; // NOTE: shall meet level 4.1 restrictions
+ unsigned char residual_colour_transform_flag;
+ unsigned char bit_depth_luma_minus8; // Must be 0 (only 8-bit supported)
+ unsigned char bit_depth_chroma_minus8; // Must be 0 (only 8-bit supported)
+ unsigned char qpprime_y_zero_transform_bypass_flag;
+ // PPS
+ int entropy_coding_mode_flag;
+ int pic_order_present_flag;
+ int num_ref_idx_l0_active_minus1;
+ int num_ref_idx_l1_active_minus1;
+ int weighted_pred_flag;
+ int weighted_bipred_idc;
+ int pic_init_qp_minus26;
+ int deblocking_filter_control_present_flag;
+ int redundant_pic_cnt_present_flag;
+ int transform_8x8_mode_flag;
+ int MbaffFrameFlag;
+ int constrained_intra_pred_flag;
+ int chroma_qp_index_offset;
+ int second_chroma_qp_index_offset;
+ int ref_pic_flag;
+ int frame_num;
+ int CurrFieldOrderCnt[2];
+ // DPB
+ CUVIDH264DPBENTRY dpb[16]; // List of reference frames within the DPB
+ // Quantization Matrices (raster-order)
+ unsigned char WeightScale4x4[6][16];
+ unsigned char WeightScale8x8[2][64];
+ // FMO/ASO
+ unsigned char fmo_aso_enable;
+ unsigned char num_slice_groups_minus1;
+ unsigned char slice_group_map_type;
+ signed char pic_init_qs_minus26;
+ unsigned int slice_group_change_rate_minus1;
+ union
+ {
+ unsigned long long slice_group_map_addr;
+ const unsigned char *pMb2SliceGroupMap;
+ } fmo;
+ unsigned int Reserved[12];
+ // SVC/MVC
+ union
+ {
+ CUVIDH264MVCEXT mvcext;
+ CUVIDH264SVCEXT svcext;
+ };
+} CUVIDH264PICPARAMS;
+
+
+/*!
+ * \struct CUVIDMPEG2PICPARAMS
+ * MPEG-2 Picture Parameters
+ */
+typedef struct _CUVIDMPEG2PICPARAMS
+{
+ int ForwardRefIdx; // Picture index of forward reference (P/B-frames)
+ int BackwardRefIdx; // Picture index of backward reference (B-frames)
+ int picture_coding_type;
+ int full_pel_forward_vector;
+ int full_pel_backward_vector;
+ int f_code[2][2];
+ int intra_dc_precision;
+ int frame_pred_frame_dct;
+ int concealment_motion_vectors;
+ int q_scale_type;
+ int intra_vlc_format;
+ int alternate_scan;
+ int top_field_first;
+ // Quantization matrices (raster order)
+ unsigned char QuantMatrixIntra[64];
+ unsigned char QuantMatrixInter[64];
+} CUVIDMPEG2PICPARAMS;
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+//
+// MPEG-4 Picture Parameters
+//
+
+// MPEG-4 has VOP types instead of Picture types
+#define I_VOP 0
+#define P_VOP 1
+#define B_VOP 2
+#define S_VOP 3
+
+/*!
+ * \struct CUVIDMPEG4PICPARAMS
+ * MPEG-4 Picture Parameters
+ */
+typedef struct _CUVIDMPEG4PICPARAMS
+{
+ int ForwardRefIdx; // Picture index of forward reference (P/B-frames)
+ int BackwardRefIdx; // Picture index of backward reference (B-frames)
+ // VOL
+ int video_object_layer_width;
+ int video_object_layer_height;
+ int vop_time_increment_bitcount;
+ int top_field_first;
+ int resync_marker_disable;
+ int quant_type;
+ int quarter_sample;
+ int short_video_header;
+ int divx_flags;
+ // VOP
+ int vop_coding_type;
+ int vop_coded;
+ int vop_rounding_type;
+ int alternate_vertical_scan_flag;
+ int interlaced;
+ int vop_fcode_forward;
+ int vop_fcode_backward;
+ int trd[2];
+ int trb[2];
+ // Quantization matrices (raster order)
+ unsigned char QuantMatrixIntra[64];
+ unsigned char QuantMatrixInter[64];
+ int gmc_enabled;
+} CUVIDMPEG4PICPARAMS;
+
+/*!
+ * \struct CUVIDVC1PICPARAMS
+ * VC1 Picture Parameters
+ */
+typedef struct _CUVIDVC1PICPARAMS
+{
+ int ForwardRefIdx; /**< Picture index of forward reference (P/B-frames) */
+ int BackwardRefIdx; /**< Picture index of backward reference (B-frames) */
+ int FrameWidth; /**< Actual frame width */
+ int FrameHeight; /**< Actual frame height */
+ // PICTURE
+ int intra_pic_flag; /**< Set to 1 for I,BI frames */
+ int ref_pic_flag; /**< Set to 1 for I,P frames */
+ int progressive_fcm; /**< Progressive frame */
+ // SEQUENCE
+ int profile;
+ int postprocflag;
+ int pulldown;
+ int interlace;
+ int tfcntrflag;
+ int finterpflag;
+ int psf;
+ int multires;
+ int syncmarker;
+ int rangered;
+ int maxbframes;
+ // ENTRYPOINT
+ int panscan_flag;
+ int refdist_flag;
+ int extended_mv;
+ int dquant;
+ int vstransform;
+ int loopfilter;
+ int fastuvmc;
+ int overlap;
+ int quantizer;
+ int extended_dmv;
+ int range_mapy_flag;
+ int range_mapy;
+ int range_mapuv_flag;
+ int range_mapuv;
+ int rangeredfrm; // range reduction state
+} CUVIDVC1PICPARAMS;
+
+/*!
+ * \struct CUVIDJPEGPICPARAMS
+ * JPEG Picture Parameters
+ */
+typedef struct _CUVIDJPEGPICPARAMS
+{
+ int Reserved;
+} CUVIDJPEGPICPARAMS;
+
+
+ /*!
+ * \struct CUVIDHEVCPICPARAMS
+ * HEVC Picture Parameters
+ */
+typedef struct _CUVIDHEVCPICPARAMS
+{
+ // sps
+ int pic_width_in_luma_samples;
+ int pic_height_in_luma_samples;
+ unsigned char log2_min_luma_coding_block_size_minus3;
+ unsigned char log2_diff_max_min_luma_coding_block_size;
+ unsigned char log2_min_transform_block_size_minus2;
+ unsigned char log2_diff_max_min_transform_block_size;
+ unsigned char pcm_enabled_flag;
+ unsigned char log2_min_pcm_luma_coding_block_size_minus3;
+ unsigned char log2_diff_max_min_pcm_luma_coding_block_size;
+ unsigned char pcm_sample_bit_depth_luma_minus1;
+
+ unsigned char pcm_sample_bit_depth_chroma_minus1;
+ unsigned char pcm_loop_filter_disabled_flag;
+ unsigned char strong_intra_smoothing_enabled_flag;
+ unsigned char max_transform_hierarchy_depth_intra;
+ unsigned char max_transform_hierarchy_depth_inter;
+ unsigned char amp_enabled_flag;
+ unsigned char separate_colour_plane_flag;
+ unsigned char log2_max_pic_order_cnt_lsb_minus4;
+
+ unsigned char num_short_term_ref_pic_sets;
+ unsigned char long_term_ref_pics_present_flag;
+ unsigned char num_long_term_ref_pics_sps;
+ unsigned char sps_temporal_mvp_enabled_flag;
+ unsigned char sample_adaptive_offset_enabled_flag;
+ unsigned char scaling_list_enable_flag;
+ unsigned char IrapPicFlag;
+ unsigned char IdrPicFlag;
+
+ unsigned char bit_depth_luma_minus8;
+ unsigned char bit_depth_chroma_minus8;
+ unsigned char reserved1[14];
+
+ // pps
+ unsigned char dependent_slice_segments_enabled_flag;
+ unsigned char slice_segment_header_extension_present_flag;
+ unsigned char sign_data_hiding_enabled_flag;
+ unsigned char cu_qp_delta_enabled_flag;
+ unsigned char diff_cu_qp_delta_depth;
+ signed char init_qp_minus26;
+ signed char pps_cb_qp_offset;
+ signed char pps_cr_qp_offset;
+
+ unsigned char constrained_intra_pred_flag;
+ unsigned char weighted_pred_flag;
+ unsigned char weighted_bipred_flag;
+ unsigned char transform_skip_enabled_flag;
+ unsigned char transquant_bypass_enabled_flag;
+ unsigned char entropy_coding_sync_enabled_flag;
+ unsigned char log2_parallel_merge_level_minus2;
+ unsigned char num_extra_slice_header_bits;
+
+ unsigned char loop_filter_across_tiles_enabled_flag;
+ unsigned char loop_filter_across_slices_enabled_flag;
+ unsigned char output_flag_present_flag;
+ unsigned char num_ref_idx_l0_default_active_minus1;
+ unsigned char num_ref_idx_l1_default_active_minus1;
+ unsigned char lists_modification_present_flag;
+ unsigned char cabac_init_present_flag;
+ unsigned char pps_slice_chroma_qp_offsets_present_flag;
+
+ unsigned char deblocking_filter_override_enabled_flag;
+ unsigned char pps_deblocking_filter_disabled_flag;
+ signed char pps_beta_offset_div2;
+ signed char pps_tc_offset_div2;
+ unsigned char tiles_enabled_flag;
+ unsigned char uniform_spacing_flag;
+ unsigned char num_tile_columns_minus1;
+ unsigned char num_tile_rows_minus1;
+
+ unsigned short column_width_minus1[21];
+ unsigned short row_height_minus1[21];
+ unsigned int reserved3[15];
+
+ // RefPicSets
+ int NumBitsForShortTermRPSInSlice;
+ int NumDeltaPocsOfRefRpsIdx;
+ int NumPocTotalCurr;
+ int NumPocStCurrBefore;
+ int NumPocStCurrAfter;
+ int NumPocLtCurr;
+ int CurrPicOrderCntVal;
+ int RefPicIdx[16]; // [refpic] Indices of valid reference pictures (-1 if unused for reference)
+ int PicOrderCntVal[16]; // [refpic]
+ unsigned char IsLongTerm[16]; // [refpic] 0=not a long-term reference, 1=long-term reference
+ unsigned char RefPicSetStCurrBefore[8]; // [0..NumPocStCurrBefore-1] -> refpic (0..15)
+ unsigned char RefPicSetStCurrAfter[8]; // [0..NumPocStCurrAfter-1] -> refpic (0..15)
+ unsigned char RefPicSetLtCurr[8]; // [0..NumPocLtCurr-1] -> refpic (0..15)
+ unsigned char RefPicSetInterLayer0[8];
+ unsigned char RefPicSetInterLayer1[8];
+ unsigned int reserved4[12];
+
+ // scaling lists (diag order)
+ unsigned char ScalingList4x4[6][16]; // [matrixId][i]
+ unsigned char ScalingList8x8[6][64]; // [matrixId][i]
+ unsigned char ScalingList16x16[6][64]; // [matrixId][i]
+ unsigned char ScalingList32x32[2][64]; // [matrixId][i]
+ unsigned char ScalingListDCCoeff16x16[6]; // [matrixId]
+ unsigned char ScalingListDCCoeff32x32[2]; // [matrixId]
+} CUVIDHEVCPICPARAMS;
+
+
+/*!
+ * \struct CUVIDVP8PICPARAMS
+ * VP8 Picture Parameters
+ */
+typedef struct _CUVIDVP8PICPARAMS
+{
+ int width;
+ int height;
+ unsigned int first_partition_size;
+ //Frame Indexes
+ unsigned char LastRefIdx;
+ unsigned char GoldenRefIdx;
+ unsigned char AltRefIdx;
+ union {
+ struct {
+ unsigned char frame_type : 1; /**< 0 = KEYFRAME, 1 = INTERFRAME */
+ unsigned char version : 3;
+ unsigned char show_frame : 1;
+ unsigned char update_mb_segmentation_data : 1; /**< Must be 0 if segmentation is not enabled */
+ unsigned char Reserved2Bits : 2;
+ };
+ unsigned char wFrameTagFlags;
+ };
+ unsigned char Reserved1[4];
+ unsigned int Reserved2[3];
+} CUVIDVP8PICPARAMS;
+
+/*!
+ * \struct CUVIDVP9PICPARAMS
+ * VP9 Picture Parameters
+ */
+typedef struct _CUVIDVP9PICPARAMS
+{
+ unsigned int width;
+ unsigned int height;
+
+ //Frame Indices
+ unsigned char LastRefIdx;
+ unsigned char GoldenRefIdx;
+ unsigned char AltRefIdx;
+ unsigned char colorSpace;
+
+ unsigned short profile : 3;
+ unsigned short frameContextIdx : 2;
+ unsigned short frameType : 1;
+ unsigned short showFrame : 1;
+ unsigned short errorResilient : 1;
+ unsigned short frameParallelDecoding : 1;
+ unsigned short subSamplingX : 1;
+ unsigned short subSamplingY : 1;
+ unsigned short intraOnly : 1;
+ unsigned short allow_high_precision_mv : 1;
+ unsigned short refreshEntropyProbs : 1;
+ unsigned short reserved2Bits : 2;
+
+ unsigned short reserved16Bits;
+
+ unsigned char refFrameSignBias[4];
+
+ unsigned char bitDepthMinus8Luma;
+ unsigned char bitDepthMinus8Chroma;
+ unsigned char loopFilterLevel;
+ unsigned char loopFilterSharpness;
+
+ unsigned char modeRefLfEnabled;
+ unsigned char log2_tile_columns;
+ unsigned char log2_tile_rows;
+
+ unsigned char segmentEnabled : 1;
+ unsigned char segmentMapUpdate : 1;
+ unsigned char segmentMapTemporalUpdate : 1;
+ unsigned char segmentFeatureMode : 1;
+ unsigned char reserved4Bits : 4;
+
+
+ unsigned char segmentFeatureEnable[8][4];
+ short segmentFeatureData[8][4];
+ unsigned char mb_segment_tree_probs[7];
+ unsigned char segment_pred_probs[3];
+ unsigned char reservedSegment16Bits[2];
+
+ int qpYAc;
+ int qpYDc;
+ int qpChDc;
+ int qpChAc;
+
+ unsigned int activeRefIdx[3];
+ unsigned int resetFrameContext;
+ unsigned int mcomp_filter_type;
+ unsigned int mbRefLfDelta[4];
+ unsigned int mbModeLfDelta[2];
+ unsigned int frameTagSize;
+ unsigned int offsetToDctParts;
+ unsigned int reserved128Bits[4];
+
+} CUVIDVP9PICPARAMS;
+
+
+/*!
+ * \struct CUVIDPICPARAMS
+ * Picture Parameters for Decoding
+ */
+typedef struct _CUVIDPICPARAMS
+{
+ int PicWidthInMbs; /**< Coded Frame Size */
+ int FrameHeightInMbs; /**< Coded Frame Height */
+ int CurrPicIdx; /**< Output index of the current picture */
+ int field_pic_flag; /**< 0=frame picture, 1=field picture */
+ int bottom_field_flag; /**< 0=top field, 1=bottom field (ignored if field_pic_flag=0) */
+ int second_field; /**< Second field of a complementary field pair */
+ // Bitstream data
+ unsigned int nBitstreamDataLen; /**< Number of bytes in bitstream data buffer */
+ const unsigned char *pBitstreamData; /**< Ptr to bitstream data for this picture (slice-layer) */
+ unsigned int nNumSlices; /**< Number of slices in this picture */
+ const unsigned int *pSliceDataOffsets; /**< nNumSlices entries, contains offset of each slice within the bitstream data buffer */
+ int ref_pic_flag; /**< This picture is a reference picture */
+ int intra_pic_flag; /**< This picture is entirely intra coded */
+ unsigned int Reserved[30]; /**< Reserved for future use */
+ // Codec-specific data
+ union {
+ CUVIDMPEG2PICPARAMS mpeg2; /**< Also used for MPEG-1 */
+ CUVIDH264PICPARAMS h264;
+ CUVIDVC1PICPARAMS vc1;
+ CUVIDMPEG4PICPARAMS mpeg4;
+ CUVIDJPEGPICPARAMS jpeg;
+ CUVIDHEVCPICPARAMS hevc;
+ CUVIDVP8PICPARAMS vp8;
+ CUVIDVP9PICPARAMS vp9;
+ unsigned int CodecReserved[1024];
+ } CodecSpecific;
+} CUVIDPICPARAMS;
+
+
+/*!
+ * \struct CUVIDPROCPARAMS
+ * Picture Parameters for Postprocessing
+ */
+typedef struct _CUVIDPROCPARAMS
+{
+ int progressive_frame; /**< Input is progressive (deinterlace_mode will be ignored) */
+ int second_field; /**< Output the second field (ignored if deinterlace mode is Weave) */
+ int top_field_first; /**< Input frame is top field first (1st field is top, 2nd field is bottom) */
+ int unpaired_field; /**< Input only contains one field (2nd field is invalid) */
+ // The fields below are used for raw YUV input
+ unsigned int reserved_flags; /**< Reserved for future use (set to zero) */
+ unsigned int reserved_zero; /**< Reserved (set to zero) */
+ unsigned long long raw_input_dptr; /**< Input CUdeviceptr for raw YUV extensions */
+ unsigned int raw_input_pitch; /**< pitch in bytes of raw YUV input (should be aligned appropriately) */
+ unsigned int raw_input_format; /**< Reserved for future use (set to zero) */
+ unsigned long long raw_output_dptr; /**< Reserved for future use (set to zero) */
+ unsigned int raw_output_pitch; /**< Reserved for future use (set to zero) */
+ unsigned int Reserved[48];
+ void *Reserved3[3];
+} CUVIDPROCPARAMS;
+
+
+/**
+ *
+ * In order to minimize decode latencies, there should be always at least 2 pictures in the decode
+ * queue at any time, in order to make sure that all decode engines are always busy.
+ *
+ * Overall data flow:
+ * - cuvidCreateDecoder(...)
+ * For each picture:
+ * - cuvidDecodePicture(N)
+ * - cuvidMapVideoFrame(N-4)
+ * - do some processing in cuda
+ * - cuvidUnmapVideoFrame(N-4)
+ * - cuvidDecodePicture(N+1)
+ * - cuvidMapVideoFrame(N-3)
+ * ...
+ * - cuvidDestroyDecoder(...)
+ *
+ * NOTE:
+ * - When the cuda context is created from a D3D device, the D3D device must also be created
+ * with the D3DCREATE_MULTITHREADED flag.
+ * - There is a limit to how many pictures can be mapped simultaneously (ulNumOutputSurfaces)
+ * - cuVidDecodePicture may block the calling thread if there are too many pictures pending
+ * in the decode queue
+ */
+
+/**
+ * \fn CUresult CUDAAPI cuvidCreateDecoder(CUvideodecoder *phDecoder, CUVIDDECODECREATEINFO *pdci)
+ * Create the decoder object
+ */
+typedef CUresult CUDAAPI tcuvidCreateDecoder(CUvideodecoder *phDecoder, CUVIDDECODECREATEINFO *pdci);
+
+/**
+ * \fn CUresult CUDAAPI cuvidDestroyDecoder(CUvideodecoder hDecoder)
+ * Destroy the decoder object
+ */
+typedef CUresult CUDAAPI tcuvidDestroyDecoder(CUvideodecoder hDecoder);
+
+/**
+ * \fn CUresult CUDAAPI cuvidDecodePicture(CUvideodecoder hDecoder, CUVIDPICPARAMS *pPicParams)
+ * Decode a single picture (field or frame)
+ */
+typedef CUresult CUDAAPI tcuvidDecodePicture(CUvideodecoder hDecoder, CUVIDPICPARAMS *pPicParams);
+
+
+#if !defined(__CUVID_DEVPTR64) || defined(__CUVID_INTERNAL)
+/**
+ * \fn CUresult CUDAAPI cuvidMapVideoFrame(CUvideodecoder hDecoder, int nPicIdx, unsigned int *pDevPtr, unsigned int *pPitch, CUVIDPROCPARAMS *pVPP);
+ * Post-process and map a video frame for use in cuda
+ */
+typedef CUresult CUDAAPI tcuvidMapVideoFrame(CUvideodecoder hDecoder, int nPicIdx,
+ unsigned int *pDevPtr, unsigned int *pPitch,
+ CUVIDPROCPARAMS *pVPP);
+
+/**
+ * \fn CUresult CUDAAPI cuvidUnmapVideoFrame(CUvideodecoder hDecoder, unsigned int DevPtr)
+ * Unmap a previously mapped video frame
+ */
+typedef CUresult CUDAAPI tcuvidUnmapVideoFrame(CUvideodecoder hDecoder, unsigned int DevPtr);
+#endif
+
+#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
+/**
+ * \fn CUresult CUDAAPI cuvidMapVideoFrame64(CUvideodecoder hDecoder, int nPicIdx, unsigned long long *pDevPtr, unsigned int *pPitch, CUVIDPROCPARAMS *pVPP);
+ * map a video frame
+ */
+typedef CUresult CUDAAPI tcuvidMapVideoFrame64(CUvideodecoder hDecoder, int nPicIdx, unsigned long long *pDevPtr,
+ unsigned int *pPitch, CUVIDPROCPARAMS *pVPP);
+
+/**
+ * \fn CUresult CUDAAPI cuvidUnmapVideoFrame64(CUvideodecoder hDecoder, unsigned long long DevPtr);
+ * Unmap a previously mapped video frame
+ */
+typedef CUresult CUDAAPI tcuvidUnmapVideoFrame64(CUvideodecoder hDecoder, unsigned long long DevPtr);
+
+#if defined(__CUVID_DEVPTR64) && !defined(__CUVID_INTERNAL)
+#define tcuvidMapVideoFrame tcuvidMapVideoFrame64
+#define tcuvidUnmapVideoFrame tcuvidUnmapVideoFrame64
+#endif
+#endif
+
+
+
+/**
+ *
+ * Context-locking: to facilitate multi-threaded implementations, the following 4 functions
+ * provide a simple mutex-style host synchronization. If a non-NULL context is specified
+ * in CUVIDDECODECREATEINFO, the codec library will acquire the mutex associated with the given
+ * context before making any cuda calls.
+ * A multi-threaded application could create a lock associated with a context handle so that
+ * multiple threads can safely share the same cuda context:
+ * - use cuCtxPopCurrent immediately after context creation in order to create a 'floating' context
+ * that can be passed to cuvidCtxLockCreate.
+ * - When using a floating context, all cuda calls should only be made within a cuvidCtxLock/cuvidCtxUnlock section.
+ *
+ * NOTE: This is a safer alternative to cuCtxPushCurrent and cuCtxPopCurrent, and is not related to video
+ * decoder in any way (implemented as a critical section associated with cuCtx{Push|Pop}Current calls).
+*/
+
+/**
+ * \fn CUresult CUDAAPI cuvidCtxLockCreate(CUvideoctxlock *pLock, CUcontext ctx)
+ */
+typedef CUresult CUDAAPI tcuvidCtxLockCreate(CUvideoctxlock *pLock, CUcontext ctx);
+
+/**
+ * \fn CUresult CUDAAPI cuvidCtxLockDestroy(CUvideoctxlock lck)
+ */
+typedef CUresult CUDAAPI tcuvidCtxLockDestroy(CUvideoctxlock lck);
+
+/**
+ * \fn CUresult CUDAAPI cuvidCtxLock(CUvideoctxlock lck, unsigned int reserved_flags)
+ */
+typedef CUresult CUDAAPI tcuvidCtxLock(CUvideoctxlock lck, unsigned int reserved_flags);
+
+/**
+ * \fn CUresult CUDAAPI cuvidCtxUnlock(CUvideoctxlock lck, unsigned int reserved_flags)
+ */
+typedef CUresult CUDAAPI tcuvidCtxUnlock(CUvideoctxlock lck, unsigned int reserved_flags);
+
+/** @} */ /* End VIDEO_DECODER */
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+extern tcuvidCreateDecoder *cuvidCreateDecoder;
+extern tcuvidDestroyDecoder *cuvidDestroyDecoder;
+extern tcuvidDecodePicture *cuvidDecodePicture;
+extern tcuvidMapVideoFrame *cuvidMapVideoFrame;
+extern tcuvidUnmapVideoFrame *cuvidUnmapVideoFrame;
+
+#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
+extern tcuvidMapVideoFrame64 *cuvidMapVideoFrame64;
+extern tcuvidUnmapVideoFrame64 *cuvidUnmapVideoFrame64;
+#endif
+
+//extern tcuvidGetVideoFrameSurface *cuvidGetVideoFrameSurface;
+
+extern tcuvidCtxLockCreate *cuvidCtxLockCreate;
+extern tcuvidCtxLockDestroy *cuvidCtxLockDestroy;
+extern tcuvidCtxLock *cuvidCtxLock;
+extern tcuvidCtxUnlock *cuvidCtxUnlock;
+ 
+////////////////////////////////////////////////////////////////////////////////////////////////
+//
+// High-level helper APIs for video sources
+//
+
+typedef void *CUvideosource;
+typedef void *CUvideoparser;
+typedef long long CUvideotimestamp;
+
+/**
+ * \addtogroup VIDEO_PARSER Video Parser
+ * @{
+ */
+
+/*!
+ * \enum cudaVideoState
+ * Video Source State
+ */
+typedef enum {
+ cudaVideoState_Error = -1, /**< Error state (invalid source) */
+ cudaVideoState_Stopped = 0, /**< Source is stopped (or reached end-of-stream) */
+ cudaVideoState_Started = 1 /**< Source is running and delivering data */
+} cudaVideoState;
+
+/*!
+ * \enum cudaAudioCodec
+ * Audio compression
+ */
+typedef enum {
+ cudaAudioCodec_MPEG1=0, /**< MPEG-1 Audio */
+ cudaAudioCodec_MPEG2, /**< MPEG-2 Audio */
+ cudaAudioCodec_MP3, /**< MPEG-1 Layer III Audio */
+ cudaAudioCodec_AC3, /**< Dolby Digital (AC3) Audio */
+ cudaAudioCodec_LPCM /**< PCM Audio */
+} cudaAudioCodec;
+
+/*!
+ * \struct CUVIDEOFORMAT
+ * Video format
+ */
+typedef struct
+{
+ cudaVideoCodec codec; /**< Compression format */
+ /**
+ * frame rate = numerator / denominator (for example: 30000/1001)
+ */
+ struct {
+ unsigned int numerator; /**< frame rate numerator (0 = unspecified or variable frame rate) */
+ unsigned int denominator; /**< frame rate denominator (0 = unspecified or variable frame rate) */
+ } frame_rate;
+ unsigned char progressive_sequence; /**< 0=interlaced, 1=progressive */
+ unsigned char bit_depth_luma_minus8; /**< high bit depth Luma */
+ unsigned char bit_depth_chroma_minus8; /**< high bit depth Chroma */
+ unsigned char reserved1; /**< Reserved for future use */
+ unsigned int coded_width; /**< coded frame width */
+ unsigned int coded_height; /**< coded frame height */
+ /**
+ * area of the frame that should be displayed
+ * typical example:
+ * coded_width = 1920, coded_height = 1088
+ * display_area = { 0,0,1920,1080 }
+ */
+ struct {
+ int left; /**< left position of display rect */
+ int top; /**< top position of display rect */
+ int right; /**< right position of display rect */
+ int bottom; /**< bottom position of display rect */
+ } display_area;
+ cudaVideoChromaFormat chroma_format; /**< Chroma format */
+ unsigned int bitrate; /**< video bitrate (bps, 0=unknown) */
+ /**
+ * Display Aspect Ratio = x:y (4:3, 16:9, etc)
+ */
+ struct {
+ int x;
+ int y;
+ } display_aspect_ratio;
+ /**
+ * Video Signal Description
+ */
+ struct {
+ unsigned char video_format : 3;
+ unsigned char video_full_range_flag : 1;
+ unsigned char reserved_zero_bits : 4;
+ unsigned char color_primaries;
+ unsigned char transfer_characteristics;
+ unsigned char matrix_coefficients;
+ } video_signal_description;
+ unsigned int seqhdr_data_length; /**< Additional bytes following (CUVIDEOFORMATEX) */
+} CUVIDEOFORMAT;
+
+/*!
+ * \struct CUVIDEOFORMATEX
+ * Video format including raw sequence header information
+ */
+typedef struct
+{
+ CUVIDEOFORMAT format;
+ unsigned char raw_seqhdr_data[1024];
+} CUVIDEOFORMATEX;
+
+/*!
+ * \struct CUAUDIOFORMAT
+ * Audio Formats
+ */
+typedef struct
+{
+ cudaAudioCodec codec; /**< Compression format */
+ unsigned int channels; /**< number of audio channels */
+ unsigned int samplespersec; /**< sampling frequency */
+ unsigned int bitrate; /**< For uncompressed, can also be used to determine bits per sample */
+ unsigned int reserved1; /**< Reserved for future use */
+ unsigned int reserved2; /**< Reserved for future use */
+} CUAUDIOFORMAT;
+
+
+/*!
+ * \enum CUvideopacketflags
+ * Data packet flags
+ */
+typedef enum {
+ CUVID_PKT_ENDOFSTREAM = 0x01, /**< Set when this is the last packet for this stream */
+ CUVID_PKT_TIMESTAMP = 0x02, /**< Timestamp is valid */
+ CUVID_PKT_DISCONTINUITY = 0x04 /**< Set when a discontinuity has to be signalled */
+} CUvideopacketflags;
+
+/*!
+ * \struct CUVIDSOURCEDATAPACKET
+ * Data Packet
+ */
+typedef struct _CUVIDSOURCEDATAPACKET
+{
+ unsigned long flags; /**< Combination of CUVID_PKT_XXX flags */
+ unsigned long payload_size; /**< number of bytes in the payload (may be zero if EOS flag is set) */
+ const unsigned char *payload; /**< Pointer to packet payload data (may be NULL if EOS flag is set) */
+ CUvideotimestamp timestamp; /**< Presentation timestamp (10MHz clock), only valid if CUVID_PKT_TIMESTAMP flag is set */
+} CUVIDSOURCEDATAPACKET;
+
+// Callback for packet delivery
+typedef int (CUDAAPI *PFNVIDSOURCECALLBACK)(void *, CUVIDSOURCEDATAPACKET *);
+
+/*!
+ * \struct CUVIDSOURCEPARAMS
+ * Source Params
+ */
+typedef struct _CUVIDSOURCEPARAMS
+{
+ unsigned int ulClockRate; /**< Timestamp units in Hz (0=default=10000000Hz) */
+ unsigned int uReserved1[7]; /**< Reserved for future use - set to zero */
+ void *pUserData; /**< Parameter passed in to the data handlers */
+ PFNVIDSOURCECALLBACK pfnVideoDataHandler; /**< Called to deliver audio packets */
+ PFNVIDSOURCECALLBACK pfnAudioDataHandler; /**< Called to deliver video packets */
+ void *pvReserved2[8]; /**< Reserved for future use - set to NULL */
+} CUVIDSOURCEPARAMS;
+
+/*!
+ * \enum CUvideosourceformat_flags
+ * CUvideosourceformat_flags
+ */
+typedef enum {
+ CUVID_FMT_EXTFORMATINFO = 0x100 /**< Return extended format structure (CUVIDEOFORMATEX) */
+} CUvideosourceformat_flags;
+
+#if !defined(__APPLE__)
+/**
+ * \fn CUresult CUDAAPI cuvidCreateVideoSource(CUvideosource *pObj, const char *pszFileName, CUVIDSOURCEPARAMS *pParams)
+ * Create Video Source
+ */
+typedef CUresult CUDAAPI tcuvidCreateVideoSource(CUvideosource *pObj, const char *pszFileName, CUVIDSOURCEPARAMS *pParams);
+
+/**
+ * \fn CUresult CUDAAPI cuvidCreateVideoSourceW(CUvideosource *pObj, const wchar_t *pwszFileName, CUVIDSOURCEPARAMS *pParams)
+ * Create Video Source
+ */
+typedef CUresult CUDAAPI tcuvidCreateVideoSourceW(CUvideosource *pObj, const wchar_t *pwszFileName, CUVIDSOURCEPARAMS *pParams);
+
+/**
+ * \fn CUresult CUDAAPI cuvidDestroyVideoSource(CUvideosource obj)
+ * Destroy Video Source
+ */
+typedef CUresult CUDAAPI tcuvidDestroyVideoSource(CUvideosource obj);
+
+/**
+ * \fn CUresult CUDAAPI cuvidSetVideoSourceState(CUvideosource obj, cudaVideoState state)
+ * Set Video Source state
+ */
+typedef CUresult CUDAAPI tcuvidSetVideoSourceState(CUvideosource obj, cudaVideoState state);
+
+/**
+ * \fn cudaVideoState CUDAAPI cuvidGetVideoSourceState(CUvideosource obj)
+ * Get Video Source state
+ */
+typedef cudaVideoState CUDAAPI tcuvidGetVideoSourceState(CUvideosource obj);
+
+/**
+ * \fn CUresult CUDAAPI cuvidGetSourceVideoFormat(CUvideosource obj, CUVIDEOFORMAT *pvidfmt, unsigned int flags)
+ * Get Video Source Format
+ */
+typedef CUresult CUDAAPI tcuvidGetSourceVideoFormat(CUvideosource obj, CUVIDEOFORMAT *pvidfmt, unsigned int flags);
+
+/**
+ * \fn CUresult CUDAAPI cuvidGetSourceAudioFormat(CUvideosource obj, CUAUDIOFORMAT *paudfmt, unsigned int flags)
+ * Set Video Source state
+ */
+typedef CUresult CUDAAPI tcuvidGetSourceAudioFormat(CUvideosource obj, CUAUDIOFORMAT *paudfmt, unsigned int flags);
+
+#endif
+
+/**
+ * \struct CUVIDPARSERDISPINFO
+ */
+typedef struct _CUVIDPARSERDISPINFO
+{
+ int picture_index; /**< */
+ int progressive_frame; /**< */
+ int top_field_first; /**< */
+ int repeat_first_field; /**< Number of additional fields (1=ivtc, 2=frame doubling, 4=frame tripling, -1=unpaired field) */
+ CUvideotimestamp timestamp; /**< */
+} CUVIDPARSERDISPINFO;
+
+//
+// Parser callbacks
+// The parser will call these synchronously from within cuvidParseVideoData(), whenever a picture is ready to
+// be decoded and/or displayed.
+//
+typedef int (CUDAAPI *PFNVIDSEQUENCECALLBACK)(void *, CUVIDEOFORMAT *);
+typedef int (CUDAAPI *PFNVIDDECODECALLBACK)(void *, CUVIDPICPARAMS *);
+typedef int (CUDAAPI *PFNVIDDISPLAYCALLBACK)(void *, CUVIDPARSERDISPINFO *);
+
+/**
+ * \struct CUVIDPARSERPARAMS
+ */
+typedef struct _CUVIDPARSERPARAMS
+{
+ cudaVideoCodec CodecType; /**< cudaVideoCodec_XXX */
+ unsigned int ulMaxNumDecodeSurfaces; /**< Max # of decode surfaces (parser will cycle through these) */
+ unsigned int ulClockRate; /**< Timestamp units in Hz (0=default=10000000Hz) */
+ unsigned int ulErrorThreshold; /**< % Error threshold (0-100) for calling pfnDecodePicture (100=always call pfnDecodePicture even if picture bitstream is fully corrupted) */
+ unsigned int ulMaxDisplayDelay; /**< Max display queue delay (improves pipelining of decode with display) - 0=no delay (recommended values: 2..4) */
+ unsigned int uReserved1[5]; /**< Reserved for future use - set to 0 */
+ void *pUserData; /**< User data for callbacks */
+ PFNVIDSEQUENCECALLBACK pfnSequenceCallback; /**< Called before decoding frames and/or whenever there is a format change */
+ PFNVIDDECODECALLBACK pfnDecodePicture; /**< Called when a picture is ready to be decoded (decode order) */
+ PFNVIDDISPLAYCALLBACK pfnDisplayPicture; /**< Called whenever a picture is ready to be displayed (display order) */
+ void *pvReserved2[7]; /**< Reserved for future use - set to NULL */
+ CUVIDEOFORMATEX *pExtVideoInfo; /**< [Optional] sequence header data from system layer */
+} CUVIDPARSERPARAMS;
+
+/**
+ * \fn CUresult CUDAAPI cuvidCreateVideoParser(CUvideoparser *pObj, CUVIDPARSERPARAMS *pParams)
+ */
+typedef CUresult CUDAAPI tcuvidCreateVideoParser(CUvideoparser *pObj, CUVIDPARSERPARAMS *pParams);
+
+/**
+ * \fn CUresult CUDAAPI cuvidParseVideoData(CUvideoparser obj, CUVIDSOURCEDATAPACKET *pPacket)
+ */
+typedef CUresult CUDAAPI tcuvidParseVideoData(CUvideoparser obj, CUVIDSOURCEDATAPACKET *pPacket);
+
+/**
+ * \fn CUresult CUDAAPI cuvidDestroyVideoParser(CUvideoparser obj)
+ */
+typedef CUresult CUDAAPI tcuvidDestroyVideoParser(CUvideoparser obj);
+
+extern tcuvidCreateVideoSource *cuvidCreateVideoSource;
+extern tcuvidCreateVideoSourceW *cuvidCreateVideoSourceW;
+extern tcuvidDestroyVideoSource *cuvidDestroyVideoSource;
+extern tcuvidSetVideoSourceState *cuvidSetVideoSourceState;
+extern tcuvidGetVideoSourceState *cuvidGetVideoSourceState;
+extern tcuvidGetSourceVideoFormat *cuvidGetSourceVideoFormat;
+extern tcuvidGetSourceAudioFormat *cuvidGetSourceAudioFormat;
+
+extern tcuvidCreateVideoParser *cuvidCreateVideoParser;
+extern tcuvidParseVideoData *cuvidParseVideoData;
+extern tcuvidDestroyVideoParser *cuvidDestroyVideoParser;
+
+/** @} */ /* END VIDEO_PARSER */
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+const char *cudaGetErrorEnum(CUresult error);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //__cuda_tools_h__

gpac-0.8.0.tar.gz/modules/nvdec/nvdec.c Added

@@ -0,0 +1,1254 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ * This file is part of GPAC / codec pack module
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/thread.h>
+#include <gpac/modules/codec.h>
+#include <gpac/internal/media_dev.h>
+#include <gpac/constants.h>
+
+#include "../../src/compositor/gl_inc.h"
+
+#include "cuda_sdk.h"
+
+#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
+# pragma comment(lib, "opengl32")
+#endif
+
+
+#ifdef LOAD_GL_1_5
+GLDECL_STATIC(glGenBuffers);
+GLDECL_STATIC(glBindBuffer);
+GLDECL_STATIC(glBufferData);
+#endif
+
+typedef struct _nv_dec_inst NVDecInstance;
+
+typedef struct _nv_dec_ctx
+{
+	GF_ESD *esd;
+	Bool use_gl_texture;
+	u32 width, height, bpp_luma, bpp_chroma;
+	cudaVideoCodec codec_type;
+	cudaVideoChromaFormat chroma_fmt;
+	
+	u32 pixel_ar, out_size, stride, pix_fmt;
+	u32 reload_decoder_state;
+	Bool skip_next_frame;
+	CUresult decode_error, dec_create_error;
+	Bool frame_size_changed;
+	u32 num_surfaces;
+	Bool needs_resetup;
+	u32 unload_inactive_mode;
+	unsigned long prefer_dec_mode;
+
+	NVDecInstance *dec_inst;
+
+	GF_List *frames;
+	GF_List *frames_res;
+
+	struct __nv_frame *pending_frame;
+
+	GLint y_tx_id, uv_tx_id;
+	GLint y_pbo_id, uv_pbo_id;
+} NVDecCtx;
+
+
+struct _nv_dec_inst 
+{
+	u32 width, height, bpp_luma, bpp_chroma, stride;
+	cudaVideoCodec codec_type;
+	cudaVideoChromaFormat chroma_fmt;
+	u32 id;
+	u32 th_id;
+
+	//allocated video parser and decoder
+	CUvideoparser cu_parser;
+	CUvideodecoder cu_decoder;
+
+	//current associated context, 0 is none
+	NVDecCtx *ctx;
+};
+
+
+typedef struct __nv_frame
+{
+	CUVIDPARSERDISPINFO frame_info;
+	NVDecCtx *ctx;
+	GF_MediaDecoderFrame gframe;
+	Bool y_mapped, uv_mapped;
+} NVDecFrame;
+
+static GF_List *global_unactive_decoders=NULL;
+static u32 global_nb_loaded_nvdec = 0;
+static u32 global_nb_loaded_decoders = 0;
+static GF_Mutex *global_inst_mutex = NULL;
+static CUdevice cuda_dev = -1;
+static CUcontext cuda_ctx = NULL;
+static Bool cuda_ctx_gl = GF_FALSE;
+
+
+//#define ENABLE_10BIT_OUTPUT
+
+static GF_Err nvdec_init_decoder(NVDecCtx *ctx)
+{
+	CUresult res;
+	CUVIDDECODECREATEINFO cuvid_info;
+
+	assert(ctx->dec_inst);
+
+	memset(&cuvid_info, 0, sizeof(CUVIDDECODECREATEINFO));
+	cuvid_info.CodecType = ctx->codec_type;
+	cuvid_info.ulWidth = ctx->width;
+	cuvid_info.ulHeight = ctx->height;
+	cuvid_info.ulNumDecodeSurfaces = ctx->num_surfaces;
+	cuvid_info.ChromaFormat = ctx->chroma_fmt;
+	cuvid_info.OutputFormat = cudaVideoSurfaceFormat_NV12;
+#ifdef ENABLE_10BIT_OUTPUT
+	if (ctx->bpp_luma + ctx->bpp_chroma > 16)
+		cuvid_info.OutputFormat = cudaVideoSurfaceFormat_P016;
+#endif
+ cuvid_info.DeinterlaceMode = cudaVideoDeinterlaceMode_Adaptive;
+	cuvid_info.bitDepthMinus8 = ctx->bpp_luma - 8;
+	cuvid_info.ulTargetWidth = ctx->width;
+	cuvid_info.ulTargetHeight = ctx->height;
+ cuvid_info.display_area.left = 0;
+ cuvid_info.display_area.right = ctx->width;
+ cuvid_info.display_area.top = 0;
+	cuvid_info.display_area.bottom = ctx->height;
+
+ cuvid_info.ulNumOutputSurfaces = 1;
+	cuvid_info.ulCreationFlags = ctx->prefer_dec_mode;
+
+ // create the decoder
+	res = cuvidCreateDecoder(&ctx->dec_inst->cu_decoder, &cuvid_info);
+	if (res != CUDA_SUCCESS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to create cuvid decoder %s\n", cudaGetErrorEnum(res) ) );
+		ctx->dec_create_error = res;
+		return GF_IO_ERR;
+	}
+	global_nb_loaded_decoders++;
+	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) );
+	return GF_OK;
+}
+
+Bool load_inactive_dec(NVDecCtx *ctx)
+{
+	u32 i, count;
+	//look for unactive decoder with same settings
+	if (global_unactive_decoders) {
+
+		gf_mx_p(global_inst_mutex);
+		count = gf_list_count(global_unactive_decoders);
+		for (i=0; i<count; i++) {
+			NVDecInstance *inst = gf_list_get(global_unactive_decoders, i);
+			if ((inst->width==ctx->width) && (inst->height==ctx->height) && (inst->bpp_luma == ctx->bpp_luma )
+				&& (inst->bpp_chroma == ctx->bpp_chroma ) && (inst->codec_type == ctx->codec_type) && (inst->chroma_fmt == ctx->chroma_fmt )
+				) {
+
+					gf_list_rem(global_unactive_decoders, i);
+					ctx->dec_inst = inst;
+					inst->ctx = ctx;
+					gf_mx_v(global_inst_mutex);
+					return GF_TRUE;
+			}
+		}
+		if (ctx->dec_inst && !ctx->dec_inst->cu_decoder) {
+			ctx->dec_inst->ctx = ctx;
+			gf_mx_v(global_inst_mutex);
+			return GF_FALSE;
+		}
+		if (ctx->dec_inst) {
+			NVDecInstance *inst = ctx->dec_inst;
+			if ((inst->width==ctx->width) && (inst->height==ctx->height) && (inst->bpp_luma == ctx->bpp_luma )
+				&& (inst->bpp_chroma == ctx->bpp_chroma ) && (inst->codec_type == ctx->codec_type) && (inst->chroma_fmt == ctx->chroma_fmt )
+				) {
+				ctx->dec_inst = inst;
+				inst->ctx = ctx;
+				gf_mx_v(global_inst_mutex);
+				return GF_TRUE;
+			}
+		} else {
+			ctx->dec_inst = gf_list_pop_back(global_unactive_decoders);
+		}
+		gf_mx_v(global_inst_mutex);
+	}
+	if (!ctx->dec_inst) {
+		GF_SAFEALLOC(ctx->dec_inst, NVDecInstance);
+	}
+	ctx->dec_inst->ctx = ctx;
+	return GF_FALSE;
+}
+
+static void nvdec_destroy_decoder(NVDecInstance *inst)
+{
+	if (inst->cu_decoder) {
+		cuvidDestroyDecoder(inst->cu_decoder);
+		inst->cu_decoder = NULL;
+		global_nb_loaded_decoders--;
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] decoder instance %d destruction - %d decoders still loaded\n", inst->id, global_nb_loaded_decoders ) );
+	}
+}
+
+static void update_pix_fmt(NVDecCtx *ctx, Bool use_10bits)
+{
+	switch (ctx->chroma_fmt) {
+	case cudaVideoChromaFormat_420:
+		ctx->pix_fmt = use_10bits ? GF_PIXEL_NV12_10 : GF_PIXEL_NV12;
+		ctx->out_size = ctx->stride * ctx->height * 3 / 2;
+		break;
+	case cudaVideoChromaFormat_422:
+		ctx->pix_fmt = use_10bits ? GF_PIXEL_YUV422_10 : GF_PIXEL_YUV422;
+		ctx->out_size = ctx->stride * ctx->height * 2;
+		break;
+	case cudaVideoChromaFormat_444:
+		ctx->pix_fmt = use_10bits ? GF_PIXEL_YUV444_10 : GF_PIXEL_YUV444;
+		ctx->out_size = ctx->stride * ctx->height * 3;
+		break;
+	default:
+		ctx->pix_fmt = 0;
+		ctx->out_size = 0;
+	}
+}
+
+static int CUDAAPI HandleVideoSequence(void *pUserData, CUVIDEOFORMAT *pFormat)
+{
+	Bool use_10bits=GF_FALSE;
+	Bool skip_output_resize=GF_FALSE;
+	NVDecInstance *inst= (NVDecInstance *)pUserData;
+	NVDecCtx *ctx = inst->ctx;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] Decoder instance %d Video sequence change detected - new setup %u x %u, %u bpp\n", inst->id, pFormat->coded_width, pFormat->coded_height, pFormat->bit_depth_luma_minus8 + 8) );
+	//no change in config
+	if ((ctx->width == pFormat->coded_width) 
+		&& (ctx->height == pFormat->coded_height)
+		&& (ctx->bpp_luma == 8 + pFormat->bit_depth_luma_minus8)
+		&& (ctx->bpp_chroma == 8 + pFormat->bit_depth_chroma_minus8)
+		&& (ctx->codec_type == pFormat->codec)
+		&& (ctx->chroma_fmt == pFormat->chroma_format)
+	) {
+		if (ctx->dec_inst && ctx->dec_inst->cu_decoder)
+			return 1;
+		skip_output_resize = GF_TRUE;
+	}
+	
+	//commented out since this falls back to soft decoding !
+#ifdef ENABLE_10BIT_OUTPUT
+	if (ctx->bpp_luma + ctx->bpp_chroma > 16) use_10bits = GF_TRUE;
+#endif
+
+	ctx->width = pFormat->coded_width;
+	ctx->height = pFormat->coded_height;
+	ctx->bpp_luma = 8 + pFormat->bit_depth_luma_minus8;
+	ctx->bpp_chroma = 8 + pFormat->bit_depth_chroma_minus8;
+	ctx->codec_type = pFormat->codec;
+	ctx->chroma_fmt = pFormat->chroma_format;
+
+	//if load_inatcive returns TRUE, we are reusing an existing decoder with the same config, no need to recreate one
+	if (load_inactive_dec(ctx)) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] reusing inactive decoder %dx%d - %d total decoders loaded\n", ctx->width, ctx->height, global_nb_loaded_decoders) );
+		ctx->stride = ctx->dec_inst->stride;
+		//initial config, need to trigger output resize
+		if (!ctx->out_size) ctx->reload_decoder_state = 1;
+
+		update_pix_fmt(ctx, use_10bits);
+		return GF_OK;
+	}
+	if (!ctx->dec_inst) return GF_OUT_OF_MEM;
+	//if we have an existing decoder but with a different config, let's reload
+	nvdec_destroy_decoder(ctx->dec_inst);
+
+	ctx->dec_inst->width = ctx->width;
+	ctx->dec_inst->height = ctx->height;
+	ctx->dec_inst->bpp_luma = ctx->bpp_luma;
+	ctx->dec_inst->bpp_chroma = ctx->bpp_chroma;
+	ctx->dec_inst->codec_type = ctx->codec_type;
+	ctx->dec_inst->chroma_fmt = ctx->chroma_fmt;
+	ctx->dec_inst->ctx = ctx;
+	ctx->stride = use_10bits ? 2*ctx->width : ctx->width;
+
+	update_pix_fmt(ctx, use_10bits);
+
+	assert(ctx->out_size);
+	assert(ctx->stride);
+	ctx->dec_inst->stride = ctx->stride;
+
+	if (! ctx->dec_inst->cu_decoder) {
+		nvdec_init_decoder(ctx);
+		if (!skip_output_resize) {
+			ctx->reload_decoder_state = 1;
+		}
+	} else {
+		ctx->reload_decoder_state = 2;
+	}
+	return 1;
+}
+
+static int CUDAAPI HandlePictureDecode(void *pUserData, CUVIDPICPARAMS *pPicParams)
+{
+	NVDecInstance *inst = (NVDecInstance *)pUserData;
+	inst->ctx->decode_error = cuvidDecodePicture(inst->cu_decoder, pPicParams);
+
+	if (inst->ctx->decode_error != CUDA_SUCCESS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] decoder instance %d failed to decode picture %s\n", inst->id, cudaGetErrorEnum(inst->ctx->decode_error) ) );
+		return GF_IO_ERR;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[NVDec] decoded picture %u OK\n", pPicParams->CurrPicIdx ) );
+
+	return 1;
+}
+
+static int CUDAAPI HandlePictureDisplay(void *pUserData, CUVIDPARSERDISPINFO *pPicParams)
+{
+	u32 i, count;
+	NVDecFrame *f;
+	NVDecInstance *inst = (NVDecInstance *)pUserData;
+	NVDecCtx *ctx = (NVDecCtx *)inst->ctx;
+
+	if (pPicParams->timestamp > 0xFFFFFFFF) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[NVDec] picture %u CTS %u seek flag, discarding\n", pPicParams->picture_index, (u32) (pPicParams->timestamp & 0xFFFFFFFF)) );
+		return 1;
+	} 
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[NVDec] picture %u CTS %u ready for display, queuing it\n", pPicParams->picture_index, (u32) (pPicParams->timestamp & 0xFFFFFFFF)) );
+
+	f = gf_list_pop_back(ctx->frames_res);
+	if (!f) {
+		GF_SAFEALLOC(f, NVDecFrame);
+	}
+	f->frame_info = *pPicParams;
+	f->frame_info.timestamp = (u32) (pPicParams->timestamp & 0xFFFFFFFF);
+	f->ctx = ctx;
+	count = gf_list_count(ctx->frames);
+	for (i=0; i<count; i++) {
+		NVDecFrame *af = gf_list_get(ctx->frames, i);
+		if (af->frame_info.timestamp > f->frame_info.timestamp) {
+			gf_list_insert(ctx->frames, f, i);
+			return 1;
+		}
+	}
+	gf_list_add(ctx->frames, f);
+	return 1;
+}
+
+static GF_Err NVDec_ConfigureStream(GF_BaseDecoder *ifcg)
+{
+	CUresult res;
+ CUVIDPARSERPARAMS oVideoParserParameters;
+	NVDecCtx *ctx = (NVDecCtx *)ifcg->privateStack;
+
+	//create a video parser and a video decoder
+ memset(&oVideoParserParameters, 0, sizeof(CUVIDPARSERPARAMS));
+	ctx->needs_resetup = GF_FALSE;
+
+	switch (ctx->esd->decoderConfig->objectTypeIndication) {
+	case GPAC_OTI_VIDEO_MPEG1: 
+		ctx->codec_type = cudaVideoCodec_MPEG1;
+		break;
+	case GPAC_OTI_VIDEO_MPEG2_SIMPLE: 
+	case GPAC_OTI_VIDEO_MPEG2_MAIN: 
+	case GPAC_OTI_VIDEO_MPEG2_SNR: 
+	case GPAC_OTI_VIDEO_MPEG2_SPATIAL: 
+	case GPAC_OTI_VIDEO_MPEG2_HIGH: 
+	case GPAC_OTI_VIDEO_MPEG2_422: 
+		ctx->codec_type = cudaVideoCodec_MPEG2;
+		break;
+	case GPAC_OTI_VIDEO_MPEG4_PART2: 
+		ctx->codec_type = cudaVideoCodec_MPEG4;
+		break;
+	case GPAC_OTI_VIDEO_AVC: 
+		ctx->codec_type = cudaVideoCodec_H264;
+		break;
+	case GPAC_OTI_VIDEO_HEVC: 
+		ctx->codec_type = cudaVideoCodec_HEVC;
+		break;
+	}
+
+	if (load_inactive_dec(ctx)) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] reusing inactive decoder %dx%d - %d total decoders loaded\n", ctx->width, ctx->height, global_nb_loaded_decoders ) );
+		ctx->stride = ctx->dec_inst->stride;
+	}
+	if (!ctx->dec_inst) return GF_OUT_OF_MEM;
+
+	ctx->decode_error = CUDA_SUCCESS;
+
+	oVideoParserParameters.CodecType = ctx->codec_type;
+ oVideoParserParameters.ulMaxNumDecodeSurfaces = ctx->num_surfaces;
+ oVideoParserParameters.ulMaxDisplayDelay = 4;
+	oVideoParserParameters.ulClockRate = 1000;
+ oVideoParserParameters.pExtVideoInfo = NULL;
+ oVideoParserParameters.pfnSequenceCallback = HandleVideoSequence; // Called before decoding frames and/or whenever there is a format change
+ oVideoParserParameters.pfnDecodePicture = HandlePictureDecode; // Called when a picture is ready to be decoded (decode order)
+ oVideoParserParameters.pfnDisplayPicture = HandlePictureDisplay; // Called whenever a picture is ready to be displayed (display order)
+	oVideoParserParameters.pUserData = ctx->dec_inst;
+
+ res = cuCtxPushCurrent(cuda_ctx);
+	if (res != CUDA_SUCCESS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to push CUDA CTX %s\n", cudaGetErrorEnum(res) ) );
+	}
+	res = cuvidCreateVideoParser(&ctx->dec_inst->cu_parser, &oVideoParserParameters);
+	cuCtxPopCurrent(NULL);
+
+	if (res != CUDA_SUCCESS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to create CUVID parserCTX %s\n", cudaGetErrorEnum(res) ) );
+		return GF_PROFILE_NOT_SUPPORTED;
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[NVDec] video parser init OK\n") );
+
+	return GF_OK;
+}
+
+static GF_Err NVDec_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
+{
+	const char *opt;
+	CUresult res;
+	NVDecCtx *ctx = (NVDecCtx *)ifcg->privateStack;
+	
+	if (ctx->esd) return GF_NOT_SUPPORTED;
+	ctx->esd = esd;
+
+	if (! cuda_ctx) {
+	 int major, minor;
+	 char deviceName[256];
+		res = cuDeviceGet(&cuda_dev, 0);
+		if (res != CUDA_SUCCESS) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to init cuda device %s\n", cudaGetErrorEnum(res) ) );
+			return GF_IO_ERR;
+		}
+
+		cuDeviceComputeCapability(&major, &minor, cuda_dev);
+		cuDeviceGetName(deviceName, 256, cuda_dev);
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] GPU Device %s (idx 0) has SM %d.%d compute capability\n", deviceName, major, minor));
+
+		if (ctx->use_gl_texture) {
+			res = cuGLCtxCreate(&cuda_ctx, CU_CTX_BLOCKING_SYNC, cuda_dev);
+
+#ifdef LOAD_GL_1_5
+			GET_GLFUN(glGenBuffers);
+			GET_GLFUN(glBindBuffer);
+			GET_GLFUN(glBufferData);
+#endif
+			cuda_ctx_gl = GF_TRUE;
+
+		} else {
+			res = cuCtxCreate(&cuda_ctx, CU_CTX_BLOCKING_SYNC, cuda_dev);
+			cuda_ctx_gl = GF_FALSE;
+		}		
+		if (res != CUDA_SUCCESS) {
+			if (ctx->use_gl_texture) {
+				cuda_ctx_gl = GF_FALSE;
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[NVDec] Couldn't initialize cuda OpenGL context %s\n\tcheck you started the player without compositor thread (-no-cthread option)\n\tRetrying without OpenGL support\n", cudaGetErrorEnum(res) ) );
+				res = cuCtxCreate(&cuda_ctx, CU_CTX_BLOCKING_SYNC, cuda_dev);
+				if (res != CUDA_SUCCESS) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to init cuda context %s\n", cudaGetErrorEnum(res) ) );
+				} else {
+					ctx->use_gl_texture = GF_FALSE;
+				}
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to init cuda context %s\n", cudaGetErrorEnum(res) ) );
+			}
+
+			if (res != CUDA_SUCCESS) {
+				return GF_IO_ERR;
+			}
+		}
+	}
+
+	opt = gf_modules_get_option((GF_BaseInterface *)ifcg, "NVDec", "NumSurfaces");
+	if (!opt) {
+		gf_modules_set_option((GF_BaseInterface *)ifcg, "NVDec", "NumSurfaces", "20");
+		ctx->num_surfaces = 20;
+	} else {
+		ctx->num_surfaces = atoi(opt);
+		if (!ctx->num_surfaces) ctx->num_surfaces = 20;
+	}
+
+	opt = gf_modules_get_option((GF_BaseInterface *)ifcg, "NVDec", "UnloadInactive");
+	if (!opt) {
+		gf_modules_set_option((GF_BaseInterface *)ifcg, "NVDec", "UnloadInactive", "no");
+	} else if (!strcmp(opt, "destroy")) {
+		ctx->unload_inactive_mode = 1;
+	} else if (!strcmp(opt, "reuse")) {
+		ctx->unload_inactive_mode = 2;
+	}
+
+	if (ctx->unload_inactive_mode == 2) {
+		global_nb_loaded_nvdec++;
+		if (!global_inst_mutex ) global_inst_mutex = gf_mx_new("NVDecGlobal");
+		gf_mx_p(global_inst_mutex);
+		if (!global_unactive_decoders) global_unactive_decoders = gf_list_new();
+		gf_mx_v(global_inst_mutex);
+	}
+
+ ctx->prefer_dec_mode = cudaVideoCreate_PreferCUVID;
+	opt = gf_modules_get_option((GF_BaseInterface *)ifcg, "NVDec", "PreferMode");
+	if (opt && !stricmp(opt, "dxva")) {
+	 ctx->prefer_dec_mode = cudaVideoCreate_PreferDXVA;
+	} else if (opt && !stricmp(opt, "cuda")) {
+	 ctx->prefer_dec_mode = cudaVideoCreate_PreferCUDA;
+	} else if (!opt) {
+		gf_modules_set_option((GF_BaseInterface *)ifcg, "NVDec", "PreferMode", "cuvid");
+	}
+
+
+	ctx->needs_resetup = GF_TRUE;
+
+	return GF_OK;
+}
+
+static GF_Err NVDec_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
+{
+	NVDecCtx *ctx = (NVDecCtx *)ifcg->privateStack;
+	ctx->esd = NULL;
+	ctx->dec_create_error = 0;
+
+	if (ctx->unload_inactive_mode == 2) {
+		global_nb_loaded_nvdec--;
+		if (ctx->dec_inst) {
+			assert(global_unactive_decoders);
+			gf_mx_p(global_inst_mutex);
+			ctx->dec_inst->ctx = NULL;
+			gf_list_add(global_unactive_decoders, ctx->dec_inst);
+			ctx->dec_inst = NULL;
+			gf_mx_v(global_inst_mutex);
+		}
+	}
+	return GF_OK;
+}
+
+static Bool NVDec_check_cuda_gl(NVDecCtx *ctx)
+{
+ int major, minor;
+ char deviceName[256];
+	CUresult res;
+
+	if (cuda_ctx) return cuda_ctx_gl;
+
+	res = cuDeviceGet(&cuda_dev, 0);
+	if (res != CUDA_SUCCESS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to init cuda device %s\n", cudaGetErrorEnum(res) ) );
+		return GF_IO_ERR;
+	}
+
+	cuDeviceComputeCapability(&major, &minor, cuda_dev);
+	cuDeviceGetName(deviceName, 256, cuda_dev);
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] GPU Device %s (idx 0) has SM %d.%d compute capability\n", deviceName, major, minor));
+
+	res = cuGLCtxCreate(&cuda_ctx, CU_CTX_BLOCKING_SYNC, cuda_dev);
+
+	if (res == CUDA_SUCCESS) {
+#ifdef LOAD_GL_1_5
+		GET_GLFUN(glGenBuffers);
+		GET_GLFUN(glBindBuffer);
+		GET_GLFUN(glBufferData);
+#endif
+		cuda_ctx_gl = GF_TRUE;
+	} else {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[NVDec] Couldn't initialize cuda OpenGL context %s\n\tcheck you started the player without compositor thread (-no-cthread option)\n\tDisabling OpenGL support\n", cudaGetErrorEnum(res) ) );
+	}
+	return cuda_ctx_gl;
+}
+
+static GF_Err NVDec_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
+{
+	NVDecCtx *ctx = (NVDecCtx *)ifcg->privateStack;
+	const char *opt;
+	
+	switch (capability->CapCode) {
+	case GF_CODEC_RESILIENT:
+		capability->cap.valueInt = 1;
+		break;
+	case GF_CODEC_WIDTH:
+		capability->cap.valueInt = ctx->width;
+		break;
+	case GF_CODEC_HEIGHT:
+		capability->cap.valueInt = ctx->height;
+		break;
+	case GF_CODEC_STRIDE:
+		capability->cap.valueInt = ctx->stride;
+		break;
+	case GF_CODEC_FPS:
+		capability->cap.valueFloat = 30.0;
+		break;
+	case GF_CODEC_PAR:
+		capability->cap.valueInt = ctx->pixel_ar;
+		break;
+	case GF_CODEC_OUTPUT_SIZE:
+		capability->cap.valueInt = ctx->out_size;
+		break;
+	case GF_CODEC_PIXEL_FORMAT:
+		capability->cap.valueInt = ctx->pix_fmt;
+		break;
+	case GF_CODEC_BUFFER_MIN:
+		capability->cap.valueInt = 1;
+		break;
+	case GF_CODEC_BUFFER_MAX:
+		//since we do the temporal de-interleaving ask for more CUs to avoid displaying refs before reordered frames
+		capability->cap.valueInt = ctx->use_gl_texture ? 6 : 4;
+		break;
+	/*by default we use 4 bytes padding (otherwise it happens that XviD crashes on some videos...)*/
+	case GF_CODEC_PADDING_BYTES:
+		capability->cap.valueInt = 0;
+		break;
+	/*reorder is up to us*/
+	case GF_CODEC_REORDER:
+		capability->cap.valueInt = 0;
+		break;
+	case GF_CODEC_WANTS_THREAD:
+		capability->cap.valueInt = 0;
+		break;
+	case GF_CODEC_FRAME_OUTPUT:
+		opt = gf_modules_get_option((GF_BaseInterface *)ifcg, "NVDec", "DisableGL");
+		capability->cap.valueInt = (!opt || strcmp(opt, "yes")) ? 1 : 0;
+		if (capability->cap.valueInt && !NVDec_check_cuda_gl(ctx)) {
+			capability->cap.valueInt = 0;
+		}
+		break;
+	case GF_CODEC_FORCE_ANNEXB:
+		capability->cap.valueInt = 1;
+		break;
+	/*not known at our level...*/
+	case GF_CODEC_CU_DURATION:
+	default:
+		capability->cap.valueInt = 0;
+		break;
+	}
+	return GF_OK;
+}
+
+static GF_Err NVDec_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
+{
+	NVDecCtx *ctx = (NVDecCtx *)ifcg->privateStack;
+	
+	switch (capability.CapCode) {
+	case GF_CODEC_FRAME_OUTPUT:
+		if (capability.cap.valueInt == 2) {
+			ctx->use_gl_texture = GF_TRUE;
+		} else if (capability.cap.valueInt == 0) {
+			ctx->use_gl_texture = GF_FALSE;
+		} else {
+			return GF_NOT_SUPPORTED;
+		}
+		return GF_OK;
+
+	case GF_CODEC_ABORT:
+		while (gf_list_count(ctx->frames)) {
+			NVDecFrame *f = (NVDecFrame *) gf_list_pop_back(ctx->frames);
+			memset(f, 0, sizeof(NVDecFrame));
+			gf_list_add(ctx->frames_res, f);
+		}
+		if (ctx->unload_inactive_mode == 2) {
+			if (ctx->dec_inst) {
+				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 = GF_TRUE;
+			ctx->dec_create_error = CUDA_SUCCESS;
+		} else if (ctx->unload_inactive_mode == 1) {
+			if (ctx->dec_inst) {
+				nvdec_destroy_decoder(ctx->dec_inst);
+			}
+			ctx->needs_resetup = GF_TRUE;
+			ctx->dec_create_error = CUDA_SUCCESS;
+		}
+		return GF_OK;
+	}
+
+	/*return unsupported to avoid confusion by the player (like color space changing ...) */
+	return GF_NOT_SUPPORTED;
+}
+
+
+static GF_Err NVDec_ProcessData(GF_MediaDecoder *ifcg,
+ char *inBuffer, u32 inBufferLength,
+ u16 ES_ID, u32 *CTS,
+ char *outBuffer, u32 *outBufferLength,
+ u8 PaddingBits, u32 mmlevel)
+{
+	NVDecFrame *f;
+ CUdeviceptr map_mem = 0;
+	CUVIDPROCPARAMS params;
+	unsigned int pitch = 0;
+	GF_Err e;
+ CUVIDSOURCEDATAPACKET cu_pkt;
+	CUresult res;
+	NVDecCtx *ctx = (NVDecCtx *)ifcg->privateStack;
+
+	if (ctx->needs_resetup) {
+		NVDec_ConfigureStream((GF_BaseDecoder*)ifcg);
+	}
+
+	memset(&cu_pkt, 0, sizeof(CUVIDSOURCEDATAPACKET));
+	cu_pkt.flags = CUVID_PKT_TIMESTAMP;
+	if (!inBuffer) {
+		cu_pkt.flags |= CUVID_PKT_ENDOFSTREAM;
+		ctx->skip_next_frame = GF_FALSE;
+	}
+
+	if (ctx->dec_create_error) 
+		return GF_IO_ERR;
+	
+	cu_pkt.payload_size = inBufferLength;
+	cu_pkt.payload = inBuffer;
+	cu_pkt.timestamp = *CTS;
+	if (mmlevel == GF_CODEC_LEVEL_SEEK) 
+		cu_pkt.timestamp |= 0x1FFFFFFFFUL;
+
+	assert(!ctx->dec_inst->th_id || (ctx->dec_inst->th_id == gf_th_id() ) );
+
+ res = cuCtxPushCurrent(cuda_ctx);
+	if (res != CUDA_SUCCESS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to push CUDA CTX %s\n", cudaGetErrorEnum(res) ) );
+	}
+	if (ctx->skip_next_frame) {
+		ctx->skip_next_frame = GF_FALSE;
+	} else {
+		res = cuvidParseVideoData(ctx->dec_inst->cu_parser, &cu_pkt);
+		if (res != CUDA_SUCCESS) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] decoder instance %d failed to parse data %s\n", ctx->dec_inst->id, cudaGetErrorEnum(res) ) );
+		}
+	}
+	
+	*outBufferLength = 0;
+	e = GF_OK;
+	if (ctx->reload_decoder_state) {
+		if (ctx->reload_decoder_state==2) {
+			nvdec_destroy_decoder(ctx->dec_inst);
+		} else {
+			ctx->skip_next_frame = GF_TRUE;
+		}
+
+		ctx->reload_decoder_state = 0;
+		if (!ctx->out_size || !ctx->pix_fmt) {
+			cuCtxPopCurrent(NULL);
+			return GF_NOT_SUPPORTED;
+		}
+
+		//need to setup decoder
+		if (! ctx->dec_inst->cu_decoder) {
+			nvdec_init_decoder(ctx);
+		}
+		cuCtxPopCurrent(NULL);
+		*outBufferLength = ctx->out_size;
+		ctx->frame_size_changed = GF_TRUE;
+		return GF_BUFFER_TOO_SMALL;
+	}
+
+
+	f = gf_list_pop_front(ctx->frames);
+	if (!f) {
+		cuCtxPopCurrent(NULL);
+		return GF_OK;
+	}
+	if (ctx->use_gl_texture) {
+		*outBufferLength = ctx->out_size;
+		*CTS = (u32) f->frame_info.timestamp;
+		assert(!ctx->pending_frame);
+		ctx->pending_frame = f;
+		return GF_OK;
+	}
+
+	assert(ctx->out_size);
+	memset(&params, 0, sizeof(params));
+	params.progressive_frame = f->frame_info.progressive_frame;
+	//params.second_field = 0;
+	params.top_field_first = f->frame_info.top_field_first;
+
+	e = GF_OK;
+	res = cuvidMapVideoFrame(ctx->dec_inst->cu_decoder, f->frame_info.picture_index, &map_mem , &pitch, &params);
+	if (res == CUDA_SUCCESS) {
+ CUDA_MEMCPY2D mcpi;
+		memset(&mcpi, 0, sizeof(CUDA_MEMCPY2D));
+		mcpi.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+		mcpi.srcDevice = map_mem;
+		mcpi.srcPitch = pitch;
+
+		mcpi.dstMemoryType = CU_MEMORYTYPE_HOST;
+		mcpi.dstHost = outBuffer;
+		mcpi.dstPitch = ctx->stride;
+		mcpi.WidthInBytes = MIN(pitch, ctx->stride);
+		mcpi.Height = ctx->height;
+
+		res = cuMemcpy2D(&mcpi);
+		if (res != CUDA_SUCCESS) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to copy Y video plane from GPU to host mem %s\n", cudaGetErrorEnum(res) ) );
+			e = GF_IO_ERR;
+		} else {
+
+			mcpi.srcDevice = map_mem + ctx->height * pitch;
+			mcpi.dstHost = outBuffer + ctx->stride * ctx->height;
+			mcpi.Height = ctx->height/2;
+
+			res = cuMemcpy2D(&mcpi);
+			if (res != CUDA_SUCCESS) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to copy UV video plane from GPU to host mem %s\n", cudaGetErrorEnum(res) ) );
+				e = GF_IO_ERR;
+			} else {
+				*outBufferLength = ctx->out_size;
+				*CTS = (u32) f->frame_info.timestamp;
+			}
+		}
+		cuvidUnmapVideoFrame(ctx->dec_inst->cu_decoder, map_mem);
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to map video frame data %s\n", cudaGetErrorEnum(res) ) );
+		e = GF_IO_ERR;
+	}
+	cuCtxPopCurrent(NULL);
+
+	memset(f, 0, sizeof(NVDecFrame));
+	gf_list_add(ctx->frames_res, f);
+
+	return e;
+}
+
+void NVDecFrame_Release(GF_MediaDecoderFrame *frame)
+{
+	NVDecFrame *f = (NVDecFrame *)frame->user_data;
+	NVDecCtx *ctx = (NVDecCtx *)f->ctx;
+	memset(f, 0, sizeof(NVDecFrame));
+	gf_list_add(ctx->frames_res, f);
+}
+
+GF_Err NVDecFrame_GetGLTexture(GF_MediaDecoderFrame *frame, u32 plane_idx, u32 *gl_tex_format, u32 *gl_tex_id, GF_CodecMatrix * texcoordmatrix)
+{
+	CUDA_MEMCPY2D mcpi;
+	CUVIDPROCPARAMS params;
+	CUresult res;
+	GF_Err e = GF_OK;
+	CUdeviceptr tx_data, vid_data;
+	size_t tx_pitch;
+	u32 vid_pitch;
+	u32 pbo_id, tx_id, gl_fmt, gl_btype = GL_UNSIGNED_BYTE;
+	NVDecFrame *f = (NVDecFrame *)frame->user_data;
+	NVDecCtx *ctx = (NVDecCtx *)f->ctx;
+
+	if (plane_idx>1) return GF_BAD_PARAM;
+	
+	res = cuCtxPushCurrent(cuda_ctx);
+	if (res != CUDA_SUCCESS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to push CUDA CTX %s\n", cudaGetErrorEnum(res) ) );
+	}
+
+	if (! *gl_tex_id && ! plane_idx && ctx->y_tx_id ) {
+		cuGLUnregisterBufferObject(ctx->y_pbo_id);
+		ctx->y_pbo_id = 0;
+		ctx->y_tx_id = 0;
+	}
+	if (! *gl_tex_id && plane_idx && ctx->uv_tx_id ) {
+		cuGLUnregisterBufferObject(ctx->uv_pbo_id);
+		ctx->uv_pbo_id = 0;
+		ctx->uv_tx_id = 0;
+	}
+
+#ifdef ENABLE_10BIT_OUTPUT
+	if ((ctx->bpp_luma>8) || (ctx->bpp_chroma>8)) {
+		gl_btype = GL_UNSIGNED_SHORT;
+	}
+#endif
+	if (!plane_idx) {
+		if (!ctx->y_pbo_id) {
+			glGenBuffers(1, &ctx->y_pbo_id);
+			glGenTextures(1, &ctx->y_tx_id);
+
+	 glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, ctx->y_pbo_id);
+			glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, ctx->stride * ctx->height, NULL, GL_STREAM_DRAW_ARB);
+			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+
+			cuGLRegisterBufferObject(ctx->y_pbo_id);
+
+			glBindTexture(GL_TEXTURE_2D, ctx->y_tx_id);
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, ctx->width, ctx->height, 0, GL_LUMINANCE, gl_btype, NULL);
+			glBindTexture(GL_TEXTURE_2D, 0);
+
+			f->y_mapped = GF_FALSE;
+		}
+		*gl_tex_format = GL_TEXTURE_2D;
+		*gl_tex_id = tx_id = ctx->y_tx_id;
+		if (f->y_mapped) {
+			cuCtxPopCurrent(NULL);
+			return GF_OK;
+		}
+		f->y_mapped = GF_TRUE;
+		pbo_id = ctx->y_pbo_id;
+		gl_fmt = GL_LUMINANCE;
+	} else {
+		if (!ctx->uv_pbo_id) {
+			glGenBuffers(1, &ctx->uv_pbo_id);
+			glGenTextures(1, &ctx->uv_tx_id);
+
+	 glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, ctx->uv_pbo_id);
+			glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, ctx->stride * ctx->height / 2, NULL, GL_STREAM_DRAW_ARB);
+			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+
+			cuGLRegisterBufferObject(ctx->uv_pbo_id);
+
+		 glBindTexture(GL_TEXTURE_2D, ctx->uv_tx_id);
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA, ctx->width/2, ctx->height/2, 0, GL_LUMINANCE_ALPHA, gl_btype, NULL);
+			glBindTexture(GL_TEXTURE_2D, 0);
+			f->uv_mapped = GF_FALSE;
+		}
+		*gl_tex_format = GL_TEXTURE_2D;
+		*gl_tex_id = tx_id = ctx->uv_tx_id;
+		if (f->uv_mapped) {
+			cuCtxPopCurrent(NULL);
+			return GF_OK;
+		}
+		f->uv_mapped = GF_TRUE;
+		pbo_id = ctx->uv_pbo_id;
+		gl_fmt = GL_LUMINANCE_ALPHA;
+	}
+
+	cuGLMapBufferObject(&tx_data, &tx_pitch, pbo_id);
+	if (res != CUDA_SUCCESS) {
+		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);
+
+	memset(&params, 0, sizeof(params));
+	params.progressive_frame = f->frame_info.progressive_frame;
+	//params.second_field = 0;
+	params.top_field_first = f->frame_info.top_field_first;
+	res = cuvidMapVideoFrame(ctx->dec_inst->cu_decoder, f->frame_info.picture_index, &vid_data, &vid_pitch, &params);
+	
+	if (res != CUDA_SUCCESS) {
+		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);
+
+	memset(&mcpi, 0, sizeof(CUDA_MEMCPY2D));
+	mcpi.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+	if (plane_idx) {
+		mcpi.srcDevice = vid_data + ctx->height * vid_pitch;
+		tx_pitch *= 2; //2 bytes per pixel
+	} else {
+		mcpi.srcDevice = vid_data;
+	}
+	mcpi.srcPitch = vid_pitch;
+
+	mcpi.dstMemoryType = CU_MEMORYTYPE_DEVICE;
+	mcpi.dstDevice = tx_data;
+	mcpi.dstPitch = tx_pitch / ctx->height;
+
+	mcpi.WidthInBytes = MIN(mcpi.dstPitch, vid_pitch);
+	mcpi.Height = ctx->height;
+	if (plane_idx) mcpi.Height /= 2;
+
+	res = cuMemcpy2D(&mcpi);
+	if (res != CUDA_SUCCESS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to copy Y video plane from GPU to host mem %s\n", cudaGetErrorEnum(res) ) );
+		e = GF_IO_ERR;
+	}
+
+	cuvidUnmapVideoFrame(ctx->dec_inst->cu_decoder, vid_data);
+	cuGLUnmapBufferObject(pbo_id);
+
+
+	cuCtxPopCurrent(NULL);
+
+	/*bind PBO to texture and call glTexSubImage2D only after PBO transfer is queued, otherwise we'll have a one frame delay*/
+	glBindTexture(GL_TEXTURE_2D, tx_id);
+	glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_id);
+
+#ifdef ENABLE_10BIT_OUTPUT
+	if (ctx->bpp_chroma+ctx->bpp_luma>16) {
+		Float a, b;
+#error "FIX NVDEC GL color mapping in 10 bit"
+		a = 65535.0f / (65472.0f - 63.0f);
+		b = -63.0f * a / 65535.0f;
+
+		glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
+		//glPixelStorei(GL_UNPACK_SWAP_BYTES, 1);
+		//glPixelStorei(GL_UNPACK_LSB_FIRST, 1);
+		//we use 10 bits but GL will normalise using 16 bits, so we need to multiply the nomralized result by 2^6
+		//glPixelTransferf(GL_RED_BIAS, 0.00096317f);
+		//glPixelTransferf(GL_RED_SCALE, 0.000015288f);
+		
+		glPixelTransferf(GL_RED_SCALE, a);
+		glPixelTransferf(GL_RED_BIAS, b);
+
+		if (plane_idx) {
+			glPixelTransferf(GL_ALPHA_SCALE, a);
+			glPixelTransferf(GL_ALPHA_BIAS, b);
+		}
+	}
+#endif
+	if (!plane_idx) {
+		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, ctx->width, ctx->height, gl_fmt , gl_btype, NULL);
+	} else {
+		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, ctx->width/2, ctx->height/2, gl_fmt , gl_btype, NULL);
+	}
+
+	glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+	glBindTexture(GL_TEXTURE_2D, 0);
+
+	return e;
+}
+
+GF_Err NVDec_GetOutputFrame(struct _mediadecoder *dec, u16 ES_ID, GF_MediaDecoderFrame **frame, Bool *needs_resize)
+{
+	NVDecFrame *f;
+	NVDecCtx *ctx = (NVDecCtx *)dec->privateStack;
+	
+	*needs_resize = GF_FALSE;
+	
+	if (!ctx->pending_frame) return GF_BAD_PARAM;
+	f = ctx->pending_frame;
+	ctx->pending_frame = NULL;
+
+	f->gframe.user_data = f;
+	f->gframe.Release = NVDecFrame_Release;
+	f->gframe.GetPlane = NULL;
+	f->gframe.GetGLTexture = NVDecFrame_GetGLTexture;
+
+	*frame = &f->gframe;
+	if (ctx->frame_size_changed) {
+		ctx->frame_size_changed = GF_FALSE;
+		*needs_resize = GF_TRUE;
+	}
+	return GF_OK;
+}
+
+
+static u32 NVDec_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
+{
+	const char *opt;
+	if (StreamType != GF_STREAM_VISUAL) return GF_CODEC_NOT_SUPPORTED;
+	/*media type query*/
+	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
+
+	opt = gf_modules_get_option((GF_BaseInterface *)dec, "NVDec", "Enabled");
+	if (!opt) {
+		gf_modules_set_option((GF_BaseInterface *)dec, "NVDec", "Enabled", "no");
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[NVDec] nvdec disabled by default, enable it in config file NVDec:Enabled=yes\n") );
+		return GF_CODEC_NOT_SUPPORTED;
+	} else if (!strcmp(opt, "no")) {
+		return GF_CODEC_NOT_SUPPORTED;
+	}
+
+	switch (esd->decoderConfig->objectTypeIndication) {
+	case GPAC_OTI_VIDEO_HEVC:
+		return GF_CODEC_SUPPORTED * 2;
+	case GPAC_OTI_VIDEO_AVC:
+		return GF_CODEC_SUPPORTED * 2;
+
+	case GPAC_OTI_VIDEO_MPEG4_PART2:
+		return GF_CODEC_SUPPORTED * 2;
+
+	case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
+	case GPAC_OTI_VIDEO_MPEG2_MAIN:
+	case GPAC_OTI_VIDEO_MPEG2_SNR:
+	case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
+	case GPAC_OTI_VIDEO_MPEG2_HIGH:
+	case GPAC_OTI_VIDEO_MPEG2_422:
+		return GF_CODEC_SUPPORTED * 2;
+	}
+	return GF_CODEC_NOT_SUPPORTED;
+}
+
+static const char *NVDec_GetCodecName(GF_BaseDecoder *dec)
+{
+	NVDecCtx *ctx = (NVDecCtx *)dec->privateStack;
+	switch (ctx->codec_type) {
+	case cudaVideoCodec_MPEG1:
+		return ctx->use_gl_texture ? "NVidia HWGL MPEG-1" : "NVidia HW MPEG-1";
+	case cudaVideoCodec_MPEG2:
+		return ctx->use_gl_texture ? "NVidia HWGLMPEG-2" : "NVidia HW MPEG-2";
+	case cudaVideoCodec_MPEG4:
+		return ctx->use_gl_texture ? "NVidia HWGL MPEG-4 part2" : "NVidia HW MPEG-4 part2";
+	case cudaVideoCodec_H264:
+		return ctx->use_gl_texture ? "NVidia HWGL AVC|H264" : "NVidia HW AVC|H264";
+	case cudaVideoCodec_HEVC:
+		return ctx->use_gl_texture ? "NVidia HWGL HEVC" : "NVidia HW HEVC";
+	case cudaVideoCodec_VC1:
+		return ctx->use_gl_texture ? "NVidia HWGL VC1" : "NVidia HW VC1";
+	default:
+		break;
+	}
+	return ctx->use_gl_texture ? "NVidia HWGL unknown decoder" : "NVidia HW unknown decoder";
+}
+
+
+static u32 cuvid_load_state = 0;
+static u32 nb_cuvid_inst=0;
+static void init_cuda_sdk()
+{
+	if (!cuvid_load_state) {
+		CUresult res;
+		int device_count;
+	 res = cuInit(0, __CUDA_API_VERSION);
+		nb_cuvid_inst++;
+		cuvid_load_state = 1;
+		if (res != CUDA_SUCCESS) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to init cuda %s\n", cudaGetErrorEnum(res) ) );
+		} else {
+			res = cuDeviceGetCount(&device_count);
+			if (res != CUDA_SUCCESS) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to query cuda/nvidia cards %s\n", cudaGetErrorEnum(res) ) );
+			} else {
+				if (! device_count) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] no device found\n" ) );
+				} else {
+					cuvid_load_state = 2;
+				}
+			}
+		}
+	} else {
+		nb_cuvid_inst++;
+	}
+}
+
+GF_BaseDecoder *NewNVDec()
+{
+	GF_MediaDecoder *ifcd;
+	NVDecCtx *dec;
+
+	init_cuda_sdk();
+
+	if (cuvid_load_state != 2) return NULL;
+
+	GF_SAFEALLOC(ifcd, GF_MediaDecoder);
+	if (!ifcd) return NULL;
+	GF_SAFEALLOC(dec, NVDecCtx);
+	if (!dec) {
+		gf_free(ifcd);
+		return NULL;
+	}
+	GF_REGISTER_MODULE_INTERFACE(ifcd, GF_MEDIA_DECODER_INTERFACE, "NVidia HW Decoder", "gpac distribution")
+
+	dec->frames = gf_list_new();
+	dec->frames_res = gf_list_new();
+	ifcd->privateStack = dec;
+
+	/*setup our own interface*/
+	ifcd->AttachStream = NVDec_AttachStream;
+	ifcd->DetachStream = NVDec_DetachStream;
+	ifcd->GetCapabilities = NVDec_GetCapabilities;
+	ifcd->SetCapabilities = NVDec_SetCapabilities;
+	ifcd->GetName = NVDec_GetCodecName;
+	ifcd->CanHandleStream = NVDec_CanHandleStream;
+
+	ifcd->ProcessData = NVDec_ProcessData;
+	ifcd->GetOutputFrame = NVDec_GetOutputFrame;
+
+	return (GF_BaseDecoder *) ifcd;
+}
+
+void DeleteNVDec(GF_BaseDecoder *ifcg)
+{
+	NVDecCtx *ctx= (NVDecCtx *)ifcg->privateStack;
+
+	if (!global_nb_loaded_nvdec && global_unactive_decoders) {
+		while (gf_list_count(global_unactive_decoders)) {
+			NVDecInstance *inst = gf_list_pop_back(global_unactive_decoders);
+			nvdec_destroy_decoder(inst);
+			if (inst->cu_parser) cuvidDestroyVideoParser(inst->cu_parser);
+			gf_free(inst);
+		}
+		gf_list_del(global_unactive_decoders);
+
+		gf_mx_del(global_inst_mutex);
+	}
+
+	if (ctx->dec_inst) {
+		nvdec_destroy_decoder(ctx->dec_inst);
+		if (ctx->dec_inst->cu_parser) cuvidDestroyVideoParser(ctx->dec_inst->cu_parser);
+		gf_free(ctx->dec_inst);
+	}
+
+
+	assert(nb_cuvid_inst);
+	nb_cuvid_inst--;
+	if (!nb_cuvid_inst) {
+		if (cuda_ctx) cuCtxDestroy(cuda_ctx);
+		cuda_ctx = NULL;
+		cuUninit();
+		cuvid_load_state = 0;
+	}
+	while (gf_list_count(ctx->frames)) {
+		NVDecFrame *f = (NVDecFrame *) gf_list_pop_back(ctx->frames);
+		gf_free(f);
+	}
+	gf_list_del(ctx->frames);
+	while (gf_list_count(ctx->frames_res)) {
+		NVDecFrame *f = (NVDecFrame *) gf_list_pop_back(ctx->frames_res);
+		gf_free(f);
+	}
+	gf_list_del(ctx->frames_res);
+	gf_free(ctx);
+	gf_free(ifcg);
+
+}
+
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+		GF_MEDIA_DECODER_INTERFACE,
+		0
+	};
+
+	init_cuda_sdk();
+
+	if (cuvid_load_state != 2) return NULL;
+
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewNVDec();
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+	case GF_MEDIA_DECODER_INTERFACE:
+		DeleteNVDec((GF_BaseDecoder*)ifce);
+		break;
+	}
+}
+
+GPAC_MODULE_STATIC_DECLARATION( nvdec )

gpac-0.7.1.tar.gz/modules/ogg/ogg_in.c -> gpac-0.8.0.tar.gz/modules/ogg/ogg_in.c Changed

gpac-0.7.1.tar.gz/modules/openhevc_dec/openhevc_dec.c -> gpac-0.8.0.tar.gz/modules/openhevc_dec/openhevc_dec.c Changed

@@ -28,18 +28,17 @@
 #include <gpac/avparse.h>
 #include <gpac/constants.h>
 #include <gpac/internal/media_dev.h>
-#include <openHevcWrapper.h>
-
+#include <libopenhevc/openhevc.h>
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 
 #define OPEN_SHVC
 
 #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__)
-# pragma comment(lib, "libLibOpenHevcWrapper")
+# pragma comment(lib, "openhevc")
 
 #if !defined _WIN64
-void libOpenHevcSetViewLayers(OpenHevc_Handle openHevcHandle, int val)
+void oh_select_view_layer(OHHandle codec, int val)
 {
 }
 #endif
@@ -59,27 +58,28 @@
 	Bool direct_output, has_pic;
 
 	GF_ESD *esd;
-	OpenHevc_Handle openHevcHandle;
-	u32 nb_layers, cur_layer;
+	OHHandle codec;
+	u32 nb_layers, cur_layer, prev_cur_layer;
 	u32 output_cb_size;
 
 	Bool decoder_started;
-	
+
 	u32 frame_idx;
 	Bool pack_mode;
+	Bool reset_dec;
 	u32 dec_frames;
 	u8 chroma_format_idc;
 
 	u32 nb_views;
+	Bool force_stereo, force_stereo_reset;
 
-#ifdef OPENHEVC_HAS_AVC_BASE
+#ifdef OHCONFIG_AVCBASE
 	u32 avc_base_id;
 	u32 avc_nalu_size_length;
 	char *avc_base;
 	u32 avc_base_size;
 	u32 avc_base_pts;
 #endif
-
 	FILE *raw_out;
 } HEVCDec;
 
@@ -91,37 +91,38 @@
 	GF_BitStream *bs;
 	u32 i, j;
 
-	if (!ctx->openHevcHandle) return GF_NOT_SUPPORTED;
+	if (!ctx->codec) return GF_NOT_SUPPORTED;
 	if (! esd->has_scalable_layers) return GF_OK;
 
 	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) {
 		ctx->nb_layers++;
+		ctx->prev_cur_layer = ctx->cur_layer;
 		ctx->cur_layer++;
-		libOpenHevcSetActiveDecoders(ctx->openHevcHandle, ctx->cur_layer-1);
-		libOpenHevcSetViewLayers(ctx->openHevcHandle, ctx->cur_layer-1);
+		oh_select_active_layer(ctx->codec, ctx->cur_layer-1);
+		oh_select_view_layer(ctx->codec, ctx->cur_layer-1);
 		return GF_OK;
 	}
-	
+
 	if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_LHVC) {
 		cfg = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
 	} else {
 		cfg = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
 	}
-	
+
 	if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
 	if (!ctx->hevc_nalu_size_length) ctx->hevc_nalu_size_length = cfg->nal_unit_size;
 	else if (ctx->hevc_nalu_size_length != cfg->nal_unit_size)
 		return GF_NON_COMPLIANT_BITSTREAM;
-	
+
 	ctx->nb_layers++;
 	ctx->cur_layer++;
-	libOpenHevcSetActiveDecoders(ctx->openHevcHandle, ctx->nb_layers-1);
-	libOpenHevcSetViewLayers(ctx->openHevcHandle, ctx->nb_layers-1);
+	oh_select_active_layer(ctx->codec, ctx->nb_layers-1);
+	oh_select_view_layer(ctx->codec, ctx->nb_layers-1);
 
-#ifdef OPENHEVC_HAS_AVC_BASE
+#ifdef OHCONFIG_AVCBASE
 	//LHVC mode with base AVC layer: set extradata for LHVC
 	if (ctx->avc_base_id) {
-		libOpenShvcCopyExtraData(ctx->openHevcHandle, NULL, (u8 *) esd->decoderConfig->decoderSpecificInfo->data, 0, esd->decoderConfig->decoderSpecificInfo->dataLength);
+		oh_extradata_cpy_lhvc(ctx->codec, NULL, (u8 *) esd->decoderConfig->decoderSpecificInfo->data, 0, esd->decoderConfig->decoderSpecificInfo->dataLength);
 	} else
 #endif
 	//LHVC mode with base HEVC layer: decode the LHVC SPS/PPS/VPS
@@ -140,19 +141,20 @@
 		gf_bs_del(bs);
 		//the decoder may not be already started
 		if (!ctx->decoder_started) {
-			libOpenHevcStartDecoder(ctx->openHevcHandle);
+			oh_start(ctx->codec);
 			ctx->decoder_started=1;
 		}
-		
-		libOpenHevcDecode(ctx->openHevcHandle, (u8 *)data, data_len, 0);
+
+		oh_decode(ctx->codec, (u8 *)data, data_len, 0);
 		if (ctx->raw_out) fwrite((u8 *)data, 1, data_len, ctx->raw_out);
 
 		gf_free(data);
 	}
+	gf_odf_hevc_cfg_del(cfg);
 	return GF_OK;
 }
 
-#if defined(OPENHEVC_HAS_AVC_BASE) && !defined(GPAC_DISABLE_LOG)
+#if defined(OHCONFIG_AVCBASE) && !defined(GPAC_DISABLE_LOG)
 void openhevc_log_callback(void *udta, int l, const char*fmt, va_list vl)
 {
 	u32 level = GF_LOG_DEBUG;
@@ -178,14 +180,14 @@
 	ctx->cur_layer = 1;
 
 	if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC)
-#ifdef OPENHEVC_HAS_AVC_BASE
+#ifdef OHCONFIG_AVCBASE
 		ctx->avc_base_id=esd->ESID;
 #else
 	return GF_NOT_SUPPORTED;
 #endif
-	
+
 	if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-#ifdef OPENHEVC_HAS_AVC_BASE
+#ifdef OHCONFIG_AVCBASE
 		if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) {
 			GF_AVCConfig *avcc = NULL;
 			AVCState avc;
@@ -231,7 +233,7 @@
 					ctx->luma_bpp = MAX(hevc.sps[idx].bit_depth_luma, ctx->luma_bpp);
 					ctx->chroma_bpp = MAX(hevc.sps[idx].bit_depth_chroma, ctx->chroma_bpp);
 					ctx->chroma_format_idc = hevc.sps[idx].chroma_format_idc;
-					
+
 					if (hdr & 0x1f8) {
 						ctx->nb_layers ++;
 					}
@@ -246,41 +248,48 @@
 		}
 		gf_odf_hevc_cfg_del(hvcc);
 	}
-	
+
 	}
 
-#ifdef OPENHEVC_HAS_AVC_BASE
+#ifdef OHCONFIG_AVCBASE
 	if (ctx->avc_base_id) {
-		ctx->openHevcHandle = libOpenShvcInit(ctx->nb_threads, ctx->threading_type);
+		ctx->codec = oh_init_lhvc(ctx->nb_threads, ctx->threading_type);
 	} else
 #endif
 	{
-		ctx->openHevcHandle = libOpenHevcInit(ctx->nb_threads, ctx->threading_type);
+		ctx->codec = oh_init(ctx->nb_threads, ctx->threading_type);
 	}
 
-#if defined(OPENHEVC_HAS_AVC_BASE) && !defined(GPAC_DISABLE_LOG)
+#if defined(OHCONFIG_AVCBASE) && !defined(GPAC_DISABLE_LOG)
 
 	if (gf_log_tool_level_on(GF_LOG_CODEC, GF_LOG_DEBUG) ) {
-		libOpenHevcSetDebugMode(ctx->openHevcHandle, OHEVC_LOG_DEBUG);
+		oh_set_log_level(ctx->codec, OHEVC_LOG_DEBUG);
 	} else if (gf_log_tool_level_on(GF_LOG_CODEC, GF_LOG_INFO) ) {
-		libOpenHevcSetDebugMode(ctx->openHevcHandle, OHEVC_LOG_INFO);
+		oh_set_log_level(ctx->codec, OHEVC_LOG_INFO);
 	} else if (gf_log_tool_level_on(GF_LOG_CODEC, GF_LOG_WARNING) ) {
-		libOpenHevcSetDebugMode(ctx->openHevcHandle, OHEVC_LOG_WARNING);
+		oh_set_log_level(ctx->codec, OHEVC_LOG_WARNING);
 	} else {
-		libOpenHevcSetDebugMode(ctx->openHevcHandle, OHEVC_LOG_ERROR);
+		oh_set_log_level(ctx->codec, OHEVC_LOG_ERROR);
 	}
-	libOpenHevcSetLogCallback(ctx->openHevcHandle, openhevc_log_callback);
+	oh_set_log_callback(ctx->codec, openhevc_log_callback);
 #endif
 
 	if (esd->decoderConfig && esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-		libOpenHevcSetActiveDecoders(ctx->openHevcHandle, 1);
-		libOpenHevcSetViewLayers(ctx->openHevcHandle, 0);
-#ifdef OPENHEVC_HAS_AVC_BASE
+		if (esd->has_scalable_layers) {
+			ctx->cur_layer = ctx->nb_layers;
+			oh_select_active_layer(ctx->codec, ctx->cur_layer-1);
+			oh_select_view_layer(ctx->codec, ctx->cur_layer-1);
+		} else {
+			oh_select_active_layer(ctx->codec, 1);
+			oh_select_view_layer(ctx->codec, 0);
+		}
+
+#ifdef OHCONFIG_AVCBASE
 		if (ctx->avc_base_id) {
-			libOpenShvcCopyExtraData(ctx->openHevcHandle, (u8 *) esd->decoderConfig->decoderSpecificInfo->data, NULL, esd->decoderConfig->decoderSpecificInfo->dataLength, 0);
+			oh_extradata_cpy_lhvc(ctx->codec, (u8 *) esd->decoderConfig->decoderSpecificInfo->data, NULL, esd->decoderConfig->decoderSpecificInfo->dataLength, 0);
 		} else
 #endif
-			libOpenHevcCopyExtraData(ctx->openHevcHandle, (u8 *) esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+			oh_extradata_cpy(ctx->codec, (u8 *) esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
 	}else{
 		//decode and display layer 0 by default - will be changed when attaching enhancement layers
 
@@ -290,8 +299,8 @@
 			ctx->nb_layers = 2;
 			ctx->cur_layer = 2;
 		}
-		libOpenHevcSetActiveDecoders(ctx->openHevcHandle, ctx->cur_layer-1);
-		libOpenHevcSetViewLayers(ctx->openHevcHandle, ctx->cur_layer-1);
+		oh_select_active_layer(ctx->codec, ctx->cur_layer-1);
+		oh_select_view_layer(ctx->codec, ctx->cur_layer-1);
 	}
 
 	//in case we don't have a config record
@@ -301,6 +310,8 @@
 
 	//FIXME - we need to get the views info from the decoder ...
 	if (ctx->nb_views>1) stride_mul = ctx->nb_layers;
+	else if (ctx->force_stereo && ctx->nb_layers>1)
+		stride_mul = ctx->nb_layers;
 
 	ctx->stride = ((ctx->luma_bpp==8) && (ctx->chroma_bpp==8)) ? ctx->width : ctx->width * 2;
 	if ( ctx->chroma_format_idc == 1) { // 4:2:0
@@ -315,8 +326,8 @@
 	else {
 		return GF_NOT_SUPPORTED;
 	}
-	
- 
+
+
 	ctx->dec_frames = 0;
 	return GF_OK;
 }
@@ -353,6 +364,8 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[OpenHEVC] Initializing with %d threads but only %d available cores detected on the system\n", ctx->nb_threads, rti.nb_cores));
 		}
 	}
+	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "ForceStereo");
+	if (sOpt && !strcmp(sOpt, "yes")) ctx->force_stereo = GF_TRUE;
 
 	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "ThreadingType");
 	if (sOpt && !strcmp(sOpt, "wpp")) ctx->threading_type = 2;
@@ -361,7 +374,7 @@
 		ctx->threading_type = 1;
 		if (!sOpt) gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "ThreadingType", "frame");
 	}
-	
+
 	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "CBUnits");
 	if (!sOpt) gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "CBUnits", "4");
 	if (sOpt) ctx->output_cb_size = atoi(sOpt);
@@ -371,6 +384,10 @@
 	if (sOpt && !strcmp(sOpt, "yes") && !ctx->direct_output ) ctx->pack_mode = GF_TRUE;
 	else if (!sOpt) gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "PackHFR", "no");
 
+	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "ResetAtReinit");
+	if (sOpt && !strcmp(sOpt, "yes") ) ctx->reset_dec = GF_TRUE;
+	else if (!sOpt) gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "ResetAtReinit", "no");
+
 	if (!ctx->raw_out) {
 		sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "InputRipFile");
 		if (sOpt) ctx->raw_out = fopen(sOpt, "wb");
@@ -385,9 +402,9 @@
 {
 	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
 
-	if (ctx->openHevcHandle) {
-		libOpenHevcClose(ctx->openHevcHandle);
-		ctx->openHevcHandle = NULL;
+	if (ctx->codec) {
+		oh_close(ctx->codec);
+		ctx->codec = NULL;
 	}
 	ctx->is_init = GF_FALSE;
 	ctx->width = ctx->height = ctx->out_size = 0;
@@ -395,7 +412,7 @@
 }
 
 static u32 HEVC_GetPixelFormat( u32 luma_bpp, u8 chroma_format_idc)
-{ 
+{
 	u32 ret = 0;
 	if (chroma_format_idc == 1)
 	{
@@ -409,16 +426,16 @@
 	{
 		ret = (luma_bpp==10) ? GF_PIXEL_YUV444_10 : GF_PIXEL_YUV444;
 	}
-	
+
 	return ret;
-	
+
 }
 
 
 static GF_Err HEVC_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
 {
 	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
-	
+
 	switch (capability->CapCode) {
 	case GF_CODEC_RESILIENT:
 		capability->cap.valueInt = 1;
@@ -433,7 +450,10 @@
 		capability->cap.valueInt = ctx->height;
 		if (ctx->pack_mode) {
 			capability->cap.valueInt *= 2;
+		} else if (ctx->force_stereo && ctx->cur_layer>1) {
+			capability->cap.valueInt *= 2;
 		}
+
 		break;
 	case GF_CODEC_STRIDE:
 		capability->cap.valueInt = ctx->stride;
@@ -451,10 +471,10 @@
 		}
 		break;
 	case GF_CODEC_NBVIEWS:
-		capability->cap.valueInt = ctx->nb_views;
+		capability->cap.valueInt = ctx->force_stereo ? 1 : ctx->nb_views;
 		break;
 	case GF_CODEC_NBLAYERS:
-		capability->cap.valueInt = ctx->nb_layers;
+		capability->cap.valueInt = ctx->force_stereo ? 1 : ctx->nb_layers;
 		break;
 	case GF_CODEC_PIXEL_FORMAT:
 		capability->cap.valueInt = HEVC_GetPixelFormat(ctx->luma_bpp, ctx->chroma_format_idc);
@@ -480,6 +500,15 @@
 	case GF_CODEC_RAW_MEMORY:
 		capability->cap.valueBool = GF_TRUE;
 		break;
+	case GF_CODEC_FORCE_ANNEXB:
+	{
+		const char *opt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "ForceAnnexB");
+		if (!opt)
+			gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "ForceAnnexB", "no");
+		else if ( !strcmp(opt, "yes"))
+			capability->cap.valueBool = GF_TRUE;
+	}
+		break;
 	/*not known at our level...*/
 	case GF_CODEC_CU_DURATION:
 	default:
@@ -494,16 +523,33 @@
 	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
 	switch (capability.CapCode) {
 	case GF_CODEC_WAIT_RAP:
-		if (ctx->dec_frames) {
+		if (ctx->reset_dec && ctx->dec_frames) {
+			u32 cl = ctx->cur_layer;
+			u32 nl = ctx->nb_layers;
+
 			//quick hack, we have an issue with openHEVC resuming after being flushed ...
 			ctx->had_pic = GF_FALSE;
-			libOpenHevcClose(ctx->openHevcHandle);
-			ctx->openHevcHandle = NULL;
+			oh_close(ctx->codec);
+			ctx->codec = NULL;
 			ctx->decoder_started = GF_FALSE;
 			ctx->is_init = GF_FALSE;
 			HEVC_ConfigureStream(ctx, ctx->esd);
+			ctx->cur_layer = cl;
+			ctx->nb_layers = nl;
+			if (ctx->codec) {
+				oh_select_active_layer(ctx->codec, ctx->cur_layer-1);
+				oh_select_view_layer(ctx->codec, ctx->cur_layer-1);
+			}
 		}
 		return GF_OK;
+	case GF_CODEC_MEDIA_LAYER_DETACH:
+		if (ctx->cur_layer<=1) return GF_OK;
+		ctx->cur_layer--;
+		if (ctx->nb_layers>1) ctx->nb_layers--;
+		oh_select_view_layer(ctx->codec, ctx->cur_layer-1);
+		oh_select_active_layer(ctx->codec, ctx->cur_layer-1);
+		ctx->force_stereo_reset = ctx->force_stereo;
+		return GF_OK;
 	case GF_CODEC_MEDIA_SWITCH_QUALITY:
 		if (ctx->nb_layers==1) return GF_OK;
 		if (ctx->nb_layers==1 || ctx->nb_views!=1) return GF_OK;
@@ -515,17 +561,18 @@
 			if (ctx->cur_layer<=1) return GF_OK;
 			ctx->cur_layer--;
 		}
-		libOpenHevcSetViewLayers(ctx->openHevcHandle, ctx->cur_layer-1);
-		libOpenHevcSetActiveDecoders(ctx->openHevcHandle, ctx->cur_layer-1);
+		oh_select_view_layer(ctx->codec, ctx->cur_layer-1);
+		oh_select_active_layer(ctx->codec, ctx->cur_layer-1);
+		ctx->force_stereo_reset = ctx->force_stereo;
 		return GF_OK;
 	case GF_CODEC_RAW_MEMORY:
 		ctx->direct_output = GF_TRUE;
 		ctx->pack_mode = GF_FALSE;
 		return GF_OK;
 	case GF_CODEC_CAN_INIT:
-		if (!ctx->decoder_started && ctx->openHevcHandle) {
+		if (!ctx->decoder_started && ctx->codec) {
 			ctx->decoder_started=1;
-			libOpenHevcStartDecoder(ctx->openHevcHandle);
+			oh_start(ctx->codec);
 		}
 		return GF_OK;
 	}
@@ -537,34 +584,53 @@
 static GF_Err HEVC_flush_picture(HEVCDec *ctx, char *outBuffer, u32 *outBufferLength, u32 *CTS)
 {
 	unsigned int a_w, a_h, a_stride, bit_depth;
-	OpenHevc_Frame_cpy openHevcFrame_FL, openHevcFrame_SL;
+	OHFrame_cpy openHevcFrame_FL, openHevcFrame_SL;
 	int chromat_format;
 
 	if (ctx->direct_output){
-		libOpenHevcGetPictureInfo(ctx->openHevcHandle, &openHevcFrame_FL.frameInfo);
+		oh_frameinfo_update(ctx->codec, &openHevcFrame_FL.frame_par);
 	}else{
-		libOpenHevcGetPictureInfoCpy(ctx->openHevcHandle, &openHevcFrame_FL.frameInfo);
-		if (ctx->nb_layers == 2) libOpenHevcGetPictureInfoCpy(ctx->openHevcHandle, &openHevcFrame_SL.frameInfo);
-	}
-
-	a_w = openHevcFrame_FL.frameInfo.nWidth;
-	a_h = openHevcFrame_FL.frameInfo.nHeight;
-	a_stride = openHevcFrame_FL.frameInfo.nYPitch;
-	bit_depth = openHevcFrame_FL.frameInfo.nBitDepth;
-	chromat_format = openHevcFrame_FL.frameInfo.chromat_format;
-	*CTS = (u32) openHevcFrame_FL.frameInfo.nTimeStamp;
-	
-	if (!ctx->out_size || (ctx->width != a_w) || (ctx->height!=a_h) || (ctx->stride != a_stride) || (ctx->luma_bpp!= bit_depth) || (ctx->chroma_bpp != bit_depth) || (ctx->chroma_format_idc != (chromat_format + 1)) ){
+		oh_cropped_frameinfo(ctx->codec, &openHevcFrame_FL.frame_par);
+		if (ctx->nb_layers == 2) {
+			int res = oh_cropped_frameinfo_from_layer(ctx->codec, &openHevcFrame_SL.frame_par, 1);
+			if ( (res==1) && (ctx->prev_cur_layer != ctx->cur_layer)) {
+				ctx->prev_cur_layer = ctx->cur_layer;
+				ctx->force_stereo_reset = GF_TRUE;
+			}
+		}
+	}
+
+	a_w = openHevcFrame_FL.frame_par.width;
+	a_h = openHevcFrame_FL.frame_par.height;
+	a_stride = openHevcFrame_FL.frame_par.linesize_y;
+	bit_depth = openHevcFrame_FL.frame_par.bitdepth;
+	chromat_format = openHevcFrame_FL.frame_par.chromat_format;
+	*CTS = (u32) openHevcFrame_FL.frame_par.pts;
+
+	if (ctx->force_stereo_reset || !ctx->out_size || (ctx->width != a_w) || (ctx->height!=a_h) || (ctx->stride != a_stride) || (ctx->luma_bpp!= bit_depth) || (ctx->chroma_bpp != bit_depth) || (ctx->chroma_format_idc != (chromat_format + 1)) )
+	{
+		/*u32 stride_mul = 1;*/
 		ctx->width = a_w;
 		ctx->stride = a_stride;
 		ctx->height = a_h;
-		if( chromat_format == YUV420 ) {
+		ctx->force_stereo_reset = GF_FALSE;
+
+		/*if (ctx->nb_views>1) stride_mul = ctx->cur_layer;
+		else if (ctx->force_stereo && ctx->cur_layer>1)
+			stride_mul = ctx->cur_layer;*/
+
+		if( chromat_format == OH_YUV420 ) {
 			ctx->out_size = ctx->stride * ctx->height * 3 / 2;
-		} else if ( chromat_format == YUV422 ) {
+		} else if ( chromat_format == OH_YUV422 ) {
 			ctx->out_size = ctx->stride * ctx->height * 2;
-		} else if ( chromat_format == YUV444 ) {
+		} else if ( chromat_format == OH_YUV444 ) {
 			ctx->out_size = ctx->stride * ctx->height * 3;
-		} 
+		}
+		//force top/bottom output of left and right frame, double height
+		if ((ctx->cur_layer==2) && !ctx->direct_output && (ctx->nb_views>1 || ctx->force_stereo) ){
+			ctx->out_size *= 2;
+		}
+
 		ctx->had_pic = GF_TRUE;
 		ctx->luma_bpp = ctx->chroma_bpp = bit_depth;
 		ctx->chroma_format_idc = chromat_format + 1;
@@ -581,7 +647,7 @@
 
 
 	if (ctx->pack_mode) {
-		OpenHevc_Frame openHFrame;
+		OHFrame openHFrame;
 		u8 *pY, *pU, *pV;
 
 		u32 idx_w, idx_h;
@@ -589,25 +655,25 @@
 		idx_h = ((ctx->frame_idx==0) || (ctx->frame_idx==1)) ? 0 : ctx->height*2*ctx->stride;
 
 		pY = (u8*) (outBuffer + idx_h + idx_w );
-		
 
-		if (chromat_format == YUV422) {
+
+		if (chromat_format == OH_YUV422) {
 			pU = (u8*)(outBuffer + 4 * ctx->stride * ctx->height + idx_w / 2 + idx_h / 2);
 			pV = (u8*)(outBuffer + 4 * (3 * ctx->stride * ctx->height /2) + idx_w / 2 + idx_h / 2);
-		} else if (chromat_format == YUV444) {
+		} else if (chromat_format == OH_YUV444) {
 			pU = (u8*)(outBuffer + 4 * ctx->stride * ctx->height + idx_w + idx_h);
 			pV = (u8*)(outBuffer + 4 * ( 2 * ctx->stride * ctx->height) + idx_w + idx_h);
 		} else {
 			pU = (u8*)(outBuffer + 2 * ctx->stride * 2 * ctx->height + idx_w / 2 + idx_h / 4);
 			pV = (u8*)(outBuffer + 4 * ( 5 *ctx->stride * ctx->height / 4) + idx_w / 2 + idx_h / 4);
-		
+
 		}
-		
+
 		*outBufferLength = 0;
-		if (libOpenHevcGetOutput(ctx->openHevcHandle, 1, &openHFrame)) {
+		if (oh_output_update(ctx->codec, 1, &openHFrame)) {
 			u32 i, s_stride, hs_stride, qs_stride, d_stride, dd_stride, hd_stride;
 
-			s_stride = openHFrame.frameInfo.nYPitch;
+			s_stride = openHFrame.frame_par.linesize_y;
 			qs_stride = s_stride / 4;
 			hs_stride = s_stride / 2;
 
@@ -615,44 +681,44 @@
 			dd_stride = 2*ctx->stride;
 			hd_stride = ctx->stride/2;
 
-			if (chromat_format == YUV422) {
+			if (chromat_format == OH_YUV422) {
 
 				for (i = 0; i < ctx->height; i++) {
 
-					memcpy(pY, (u8 *)openHFrame.pvY + i*s_stride, d_stride);
+					memcpy(pY, (u8 *)openHFrame.data_y_p + i*s_stride, d_stride);
 					pY += dd_stride;
 
-					memcpy(pU, (u8 *)openHFrame.pvU + i*hs_stride, hd_stride);
+					memcpy(pU, (u8 *)openHFrame.data_cb_p + i*hs_stride, hd_stride);
 					pU += d_stride;
 
-					memcpy(pV, (u8 *)openHFrame.pvV + i*hs_stride, hd_stride);
+					memcpy(pV, (u8 *)openHFrame.data_cr_p + i*hs_stride, hd_stride);
 					pV += d_stride;
 				}
 			}
-			else if (chromat_format == YUV444) {
+			else if (chromat_format == OH_YUV444) {
 
 				for (i = 0; i < ctx->height; i++) {
 
-					memcpy(pY, (u8 *)openHFrame.pvY + i*s_stride, d_stride);
+					memcpy(pY, (u8 *)openHFrame.data_y_p + i*s_stride, d_stride);
 					pY += dd_stride;
 
-					memcpy(pU, (u8 *)openHFrame.pvU + i*s_stride, d_stride);
+					memcpy(pU, (u8 *)openHFrame.data_cb_p + i*s_stride, d_stride);
 					pU += dd_stride;
 
-					memcpy(pV, (u8 *)openHFrame.pvV + i*s_stride, d_stride);
+					memcpy(pV, (u8 *)openHFrame.data_cr_p + i*s_stride, d_stride);
 					pV += dd_stride;
 				}
 			}
 			else {
 				for (i = 0; i<ctx->height; i++) {
-					memcpy(pY, (u8 *)openHFrame.pvY + i*s_stride, d_stride);
+					memcpy(pY, (u8 *)openHFrame.data_y_p + i*s_stride, d_stride);
 					pY += dd_stride;
 
 					if (!(i % 2)) {
-						memcpy(pU, (u8 *)openHFrame.pvU + i*qs_stride, hd_stride);
+						memcpy(pU, (u8 *)openHFrame.data_cb_p + i*qs_stride, hd_stride);
 						pU += d_stride;
 
-						memcpy(pV, (u8 *)openHFrame.pvV + i*qs_stride, hd_stride);
+						memcpy(pV, (u8 *)openHFrame.data_cr_p + i*qs_stride, hd_stride);
 						pV += d_stride;
 					}
 				}
@@ -669,35 +735,33 @@
 
 
 	*outBufferLength = 0;
-	openHevcFrame_FL.pvY = (void*) outBuffer;
-	if (ctx->nb_layers==2 && ctx->nb_views>1 && !ctx->direct_output){
+	openHevcFrame_FL.data_y = (void*) outBuffer;
+	if ((ctx->cur_layer==2) && !ctx->direct_output && (ctx->nb_views>1 || ctx->force_stereo) ){
 		int out1, out2;
-		if( chromat_format == YUV420){
-			openHevcFrame_SL.pvY = (void*) (outBuffer + ctx->stride * ctx->height);
-			openHevcFrame_FL.pvU = (void*) (outBuffer + 2*ctx->stride * ctx->height);
-			openHevcFrame_SL.pvU = (void*) (outBuffer + 9*ctx->stride * ctx->height/4);
-			openHevcFrame_FL.pvV = (void*) (outBuffer + 5*ctx->stride * ctx->height/2);
-			openHevcFrame_SL.pvV = (void*) (outBuffer + 11*ctx->stride * ctx->height/4);
+		if( chromat_format == OH_YUV420){
+			openHevcFrame_SL.data_y = (void*) (outBuffer + ctx->stride * ctx->height);
+			openHevcFrame_FL.data_cb = (void*) (outBuffer + 2*ctx->stride * ctx->height);
+			openHevcFrame_SL.data_cb = (void*) (outBuffer + 9*ctx->stride * ctx->height/4);
+			openHevcFrame_FL.data_cr = (void*) (outBuffer + 5*ctx->stride * ctx->height/2);
+			openHevcFrame_SL.data_cr = (void*) (outBuffer + 11*ctx->stride * ctx->height/4);
 		}
 
-		libOpenHevcSetViewLayers(ctx->openHevcHandle, 0);
-		out1 = libOpenHevcGetOutputCpy(ctx->openHevcHandle, 1, &openHevcFrame_FL);
-		libOpenHevcSetViewLayers(ctx->openHevcHandle, 1);
-		out2 = libOpenHevcGetOutputCpy(ctx->openHevcHandle, 1, &openHevcFrame_SL);
-		
+		out1 = oh_output_cropped_cpy_from_layer(ctx->codec, &openHevcFrame_FL, 0);
+		out2 = oh_output_cropped_cpy_from_layer(ctx->codec, &openHevcFrame_SL, 1);
+
 		if (out1 && out2) *outBufferLength = ctx->out_size*2;
 
 	}else{
-		openHevcFrame_FL.pvU = (void*) (outBuffer + ctx->stride * ctx->height);
-		if( chromat_format == YUV420) {
-			openHevcFrame_FL.pvV = (void*) (outBuffer + 5*ctx->stride * ctx->height/4);
-		} else if (chromat_format == YUV422) {
-			openHevcFrame_FL.pvV = (void*) (outBuffer + 3*ctx->stride * ctx->height/2);
-		} else if ( chromat_format == YUV444) {
-			openHevcFrame_FL.pvV = (void*) (outBuffer + 2*ctx->stride * ctx->height);
+		openHevcFrame_FL.data_cb = (void*) (outBuffer + ctx->stride * ctx->height);
+		if( chromat_format == OH_YUV420) {
+			openHevcFrame_FL.data_cr = (void*) (outBuffer + 5*ctx->stride * ctx->height/4);
+		} else if (chromat_format == OH_YUV422) {
+			openHevcFrame_FL.data_cr = (void*) (outBuffer + 3*ctx->stride * ctx->height/2);
+		} else if ( chromat_format == OH_YUV444) {
+			openHevcFrame_FL.data_cr = (void*) (outBuffer + 2*ctx->stride * ctx->height);
 		}
 
-		if (libOpenHevcGetOutputCpy(ctx->openHevcHandle, 1, &openHevcFrame_FL))
+		if (oh_output_cropped_cpy(ctx->codec, &openHevcFrame_FL))
 			*outBufferLength = ctx->out_size;
 	}
 	return GF_OK;
@@ -714,28 +778,21 @@
 	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
 
 	if (!ctx->decoder_started) {
-		libOpenHevcStartDecoder(ctx->openHevcHandle);
+		oh_start(ctx->codec);
 		ctx->decoder_started=1;
 	}
 
 	if (!inBuffer) {
-#ifdef OPENHEVC_HAS_AVC_BASE
+#ifdef OHCONFIG_AVCBASE
 		if (ctx->avc_base_id)
-			got_pic = libOpenShvcDecode2(ctx->openHevcHandle, NULL, NULL, 0, 0, 0, 0);
+			got_pic = oh_decode_lhvc(ctx->codec, NULL, NULL, 0, 0, 0, 0);
 		else
 #endif
-			got_pic = libOpenHevcDecode(ctx->openHevcHandle, NULL, 0, 0);
-	
+			got_pic = oh_decode(ctx->codec, NULL, 0, 0);
+
 		if ( got_pic ) {
 			return HEVC_flush_picture(ctx, outBuffer, outBufferLength, CTS);
 		}
-		//quick hack, we have an issue with openHEVC resuming after being flushed ...
-		ctx->had_pic = GF_FALSE;
-		libOpenHevcClose(ctx->openHevcHandle);
-		ctx->openHevcHandle = NULL;
-		ctx->is_init = GF_FALSE;
-		HEVC_ConfigureStream(ctx, ctx->esd);
-
 		return GF_OK;
 	}
 
@@ -758,11 +815,11 @@
 	ctx->dec_frames++;
 	got_pic = 0;
 
-#ifdef OPENHEVC_HAS_AVC_BASE
+#ifdef OHCONFIG_AVCBASE
 	if (ctx->avc_base_id) {
 		if (ctx->avc_base_id == ES_ID) {
 			if (ctx->cur_layer<=1) {
-				got_pic = libOpenShvcDecode2(ctx->openHevcHandle, (u8 *) inBuffer, NULL, inBufferLength, 0, *CTS, 0);
+				got_pic = oh_decode_lhvc(ctx->codec, (u8 *) inBuffer, NULL, inBufferLength, 0, *CTS, 0);
 				if (ctx->avc_base) {
 					gf_free(ctx->avc_base);
 					ctx->avc_base=NULL;
@@ -776,7 +833,7 @@
 				ctx->avc_base_pts = *CTS;
 			}
 		} else if (ctx->cur_layer>1) {
-			got_pic = libOpenShvcDecode2(ctx->openHevcHandle, (u8*)ctx->avc_base, (u8 *) inBuffer, ctx->avc_base_size, inBufferLength, ctx->avc_base_pts	, *CTS);
+			got_pic = oh_decode_lhvc(ctx->codec, (u8*)ctx->avc_base, (u8 *) inBuffer, ctx->avc_base_size, inBufferLength, ctx->avc_base_pts, *CTS);
 			if (ctx->avc_base) {
 				gf_free(ctx->avc_base);
 				ctx->avc_base = NULL;
@@ -786,7 +843,7 @@
 	}
 	else
 #endif
-		got_pic = libOpenHevcDecode(ctx->openHevcHandle, (u8 *) inBuffer, inBufferLength, *CTS);
+		got_pic = oh_decode(ctx->codec, (u8 *) inBuffer, inBufferLength, *CTS);
 
 	if (ctx->raw_out) fwrite((u8 *) inBuffer, 1, inBufferLength, ctx->raw_out);
 
@@ -803,18 +860,18 @@
 static GF_Err HEVC_GetOutputBuffer(GF_MediaDecoder *ifcg, u16 ESID, u8 **pY_or_RGB, u8 **pU, u8 **pV)
 {
 	s32 res;
-	OpenHevc_Frame openHevcFrame;
+	OHFrame openHevcFrame;
 	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
 	if (!ctx->has_pic) return GF_BAD_PARAM;
 	ctx->has_pic = GF_FALSE;
 
-	res = libOpenHevcGetOutput(ctx->openHevcHandle, 1, &openHevcFrame);
-	if ((res<=0) || !openHevcFrame.pvY || !openHevcFrame.pvU || !openHevcFrame.pvV)
+	res = oh_output_update(ctx->codec, 1, &openHevcFrame);
+	if ((res<=0) || !openHevcFrame.data_y_p || !openHevcFrame.data_cb_p || !openHevcFrame.data_cr_p)
 		return GF_SERVICE_ERROR;
 
-	*pY_or_RGB = (u8 *) openHevcFrame.pvY;
-	*pU = (u8 *) openHevcFrame.pvU;
-	*pV = (u8 *) openHevcFrame.pvV;
+	*pY_or_RGB = (u8 *) openHevcFrame.data_y_p;
+	*pU = (u8 *) openHevcFrame.data_cb_p;
+	*pV = (u8 *) openHevcFrame.data_cr_p;
 	return GF_OK;
 }
 
@@ -832,7 +889,7 @@
 	case GPAC_OTI_VIDEO_LHVC:
 		return GF_CODEC_SUPPORTED;
 	case GPAC_OTI_VIDEO_AVC:
-#ifdef OPENHEVC_HAS_AVC_BASE
+#ifdef OHCONFIG_AVCBASE
 		return GF_CODEC_MAYBE_SUPPORTED;
 #else
 		return GF_CODEC_NOT_SUPPORTED;
@@ -844,7 +901,7 @@
 static const char *HEVC_GetCodecName(GF_BaseDecoder *dec)
 {
 	HEVCDec *ctx = (HEVCDec*) dec->privateStack;
-#ifdef OPENHEVC_HAS_AVC_BASE
+#ifdef OHCONFIG_AVCBASE
 	if (ctx->avc_base_id) {
 		if (ctx->cur_layer==1) return "OpenHEVC v"NV_VERSION" - H264";
 		else return "OpenHEVC v"NV_VERSION" - H264+LHVC";
@@ -852,7 +909,7 @@
 	if (ctx->cur_layer==1) return "OpenHEVC v"NV_VERSION;
 	else return "OpenHEVC v"NV_VERSION" - LHVC";
 #else
-	return libOpenHevcVersion(ctx->openHevcHandle);
+	return openhevc_ident();
 #endif
 }

gpac-0.7.1.tar.gz/modules/platinum/GPACMediaRenderer.cpp -> gpac-0.8.0.tar.gz/modules/platinum/GPACMediaRenderer.cpp Changed

gpac-0.7.1.tar.gz/modules/platinum/GPACPlatinum.cpp -> gpac-0.8.0.tar.gz/modules/platinum/GPACPlatinum.cpp Changed

gpac-0.8.0.tar.gz/modules/psvr Added

gpac-0.8.0.tar.gz/modules/psvr/Makefile Added

gpac-0.8.0.tar.gz/modules/psvr/psvr.c Added

@@ -0,0 +1,213 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2011-2012
+ *			All rights reserved
+ *
+ * This file is part of GPAC / PSVR input sub-project
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/modules/term_ext.h>
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/nodes_mpeg4.h>
+
+#include <hidapi/hidapi.h>
+
+typedef struct
+{
+	GF_ObjectManager *odm;
+	GF_Terminal *term;
+	GF_Thread *th;
+	Bool do_run;
+	void * device;
+
+	Float yaw, pitch, roll;
+	GF_TermEventFilter evt_filter;
+	Bool reset_mx;
+	Bool is_active;
+} GF_PSVR;
+
+#define PSVR_VENDOR_ID	0x054c
+#define PSVR_PRODUCT_ID	0x09af
+
+#define ACCELERATION_COEF 0.00003125f * GF_PI / 180
+
+static s16 read_s16(unsigned char *buffer, int offset)
+{
+	int16_t v;
+	v = buffer[offset];
+	v |= buffer[offset+1] << 8;
+	return v;
+}
+
+Bool psvr_on_event(void *udta, GF_Event *event, Bool consumed_by_compositor)
+{
+	GF_PSVR *psvr = (GF_PSVR *)udta;
+	if (event->type==GF_EVENT_KEYDOWN) {
+		if (event->key.key_code==GF_KEY_HOME) {
+			psvr->reset_mx = GF_TRUE;
+		}
+	}
+	else if (event->type==GF_EVENT_SENSOR_REQUEST) {
+		if (event->activate_sensor.sensor_type==GF_EVENT_SENSOR_ORIENTATION) {
+			psvr->is_active = event->activate_sensor.activate;
+			return GF_TRUE;
+		}
+	}
+	return GF_FALSE;
+}
+
+static u32 psvr_run(void *__psvr)
+{
+	GF_PSVR *psvr = (GF_PSVR *)__psvr;
+
+	hid_init();
+
+	psvr->device = hid_open(PSVR_VENDOR_ID, PSVR_PRODUCT_ID, 0);
+	if(!psvr->device) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PSVR] Failed to open PSVR HID device\n"));
+		return 0;
+	}
+
+	psvr->evt_filter.udta = psvr;
+	psvr->evt_filter.on_event = psvr_on_event;
+	gf_term_add_event_filter(psvr->term, &psvr->evt_filter);
+
+	psvr->is_active = GF_TRUE;
+	psvr->do_run = GF_TRUE;
+	while (psvr->do_run && psvr->device) {
+		unsigned char buffer[64];
+		//read device with 1 ms timeout
+		int size = hid_read_timeout(psvr->device, buffer, 64, 1);
+
+		if (size == 64) {
+			GF_Event evt;
+			s32 x_acc = read_s16(buffer, 20) + read_s16(buffer, 36);
+			s32 y_acc = read_s16(buffer, 22) + read_s16(buffer, 38);
+			s32 z_acc = read_s16(buffer, 24) + read_s16(buffer, 40);
+
+			if (psvr->reset_mx) {
+				psvr->reset_mx = 0;
+				psvr->yaw = psvr->pitch = psvr->roll = 0;
+			}
+
+			psvr->roll += -y_acc * ACCELERATION_COEF;
+			psvr->yaw += x_acc * ACCELERATION_COEF;
+			psvr->pitch += z_acc * ACCELERATION_COEF;
+
+			if (!psvr->is_active ) continue;
+
+			//post our event
+			memset(&evt, 0, sizeof(GF_Event));
+			evt.type = GF_EVENT_SENSOR_ORIENTATION;
+			evt.sensor.x = psvr->yaw - GF_PI;
+			evt.sensor.y = psvr->pitch;
+			evt.sensor.z = GF_PI2 - psvr->roll;
+			evt.sensor.w = 0;
+
+			gf_term_user_event(psvr->term, &evt);
+		}
+	}
+	if (psvr->device) {
+		hid_close(psvr->device);
+		psvr->device = 0;
+	}
+	gf_term_remove_event_filter(psvr->term, &psvr->evt_filter);
+	psvr->term = NULL;
+	hid_exit();
+	return 0;
+}
+
+static Bool psvr_process(GF_TermExt *termext, u32 action, void *param)
+{
+	const char *opt;
+	GF_PSVR *psvr = termext->udta;
+
+	switch (action) {
+	case GF_TERM_EXT_START:
+		psvr->term = (GF_Terminal *) param;
+		opt = gf_modules_get_option((GF_BaseInterface*)termext, "PSVR", "Enabled");
+		if (!opt || strcmp(opt, "yes")) return 0;
+
+		gf_th_run(psvr->th, psvr_run, psvr);
+		return 1;
+
+	case GF_TERM_EXT_STOP:
+		psvr->do_run = GF_FALSE;
+		break;
+	}
+	return 0;
+}
+
+
+GF_TermExt *psvr_new()
+{
+	GF_TermExt *dr;
+	GF_PSVR *psvr;
+	dr = (GF_TermExt*)gf_malloc(sizeof(GF_TermExt));
+	memset(dr, 0, sizeof(GF_TermExt));
+	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "PSVR Input", "gpac distribution");
+
+	GF_SAFEALLOC(psvr, GF_PSVR);
+	dr->process = psvr_process;
+	dr->udta = psvr;
+	psvr->th = gf_th_new("PSVR");
+
+	return dr;
+}
+
+
+void psvr_delete(GF_BaseInterface *ifce)
+{
+	GF_TermExt *dr = (GF_TermExt *) ifce;
+	GF_PSVR *psvr= dr->udta;
+	gf_th_del(psvr->th);
+	gf_free(psvr);
+	gf_free(dr);
+}
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+		GF_TERM_EXT_INTERFACE,
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)psvr_new();
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+	case GF_TERM_EXT_INTERFACE:
+		psvr_delete(ifce);
+		break;
+	}
+}
+
+GPAC_MODULE_STATIC_DECLARATION( osd )

gpac-0.7.1.tar.gz/modules/redirect_av/ffmpeg_ts_muxer.c -> gpac-0.8.0.tar.gz/modules/redirect_av/ffmpeg_ts_muxer.c Changed

gpac-0.7.1.tar.gz/modules/rtp_in/rtp_in.c -> gpac-0.8.0.tar.gz/modules/rtp_in/rtp_in.c Changed

gpac-0.7.1.tar.gz/modules/rtp_in/rtp_stream.c -> gpac-0.8.0.tar.gz/modules/rtp_in/rtp_stream.c Changed

gpac-0.7.1.tar.gz/modules/sdl_out/video.c -> gpac-0.8.0.tar.gz/modules/sdl_out/video.c Changed

gpac-0.7.1.tar.gz/modules/soft_raster/ftgrays.c -> gpac-0.8.0.tar.gz/modules/soft_raster/ftgrays.c Changed

gpac-0.7.1.tar.gz/modules/soft_raster/surface.c -> gpac-0.8.0.tar.gz/modules/soft_raster/surface.c Changed

gpac-0.7.1.tar.gz/modules/vtb_decode/vtb_decode.c -> gpac-0.8.0.tar.gz/modules/vtb_decode/vtb_decode.c Changed

@@ -83,11 +83,14 @@
 	char *cached_annex_b;
 	u32 cached_annex_b_size;
 	u32 nalu_size_length;
-	GF_List *SPSs, *PPSs;
-	s32 active_sps, active_pps;
+	GF_List *SPSs, *PPSs, *VPSs;
+	s32 active_sps, active_pps, active_vps;
 	AVCState avc;
 	Bool check_h264_isma;
 
+	HEVCState hevc;
+	Bool is_hevc;
+
 	//openGL output
 #ifdef GPAC_IPHONE
 	Bool use_gl_textures;
@@ -166,7 +169,7 @@
 	
 //	kColorSpace = kCVPixelFormatType_420YpCbCr8Planar;
 //	ctx->pix_fmt = GF_PIXEL_YV12;
-	
+
 	kColorSpace = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
 	ctx->pix_fmt = GF_PIXEL_NV12;
 	
@@ -250,11 +253,13 @@
 			cfg->nal_unit_size = 4;
 				
 			gf_list_add(cfg->sequenceParameterSets, sps);
-			gf_list_add(cfg->pictureParameterSets, pps);
-				
+			//we send all PPS
+			gf_list_del(cfg->pictureParameterSets);
+			cfg->pictureParameterSets = ctx->PPSs;
+
 			gf_odf_avc_cfg_write(cfg, &dsi_data, &dsi_data_size);
 			gf_list_reset(cfg->sequenceParameterSets);
-			gf_list_reset(cfg->pictureParameterSets);
+			cfg->pictureParameterSets = NULL;
 			gf_odf_avc_cfg_del((cfg));
 			
 			dsi = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
@@ -269,6 +274,159 @@
 			gf_free(dsi_data);
 		}
 break;
+
+ case GPAC_OTI_VIDEO_HEVC:
+		if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs) && gf_list_count(ctx->VPSs)) {
+			s32 idx;
+			u32 i;
+			GF_HEVCConfig *cfg;
+			GF_HEVCParamArray *vpsa = NULL;
+			GF_HEVCParamArray *spsa = NULL;
+			GF_HEVCParamArray *ppsa = NULL;
+			GF_AVCConfigSlot *vps = NULL;
+			GF_AVCConfigSlot *sps = NULL;
+			GF_AVCConfigSlot *pps = NULL;
+
+			for (i=0; i<gf_list_count(ctx->VPSs); i++) {
+				vps = gf_list_get(ctx->VPSs, i);
+				if (ctx->active_vps<0) ctx->active_vps = vps->id;
+
+				if (vps->id==ctx->active_vps) break;
+				vps = NULL;
+			}
+			if (!vps) return GF_NON_COMPLIANT_BITSTREAM;
+
+			for (i=0; i<gf_list_count(ctx->SPSs); i++) {
+				sps = gf_list_get(ctx->SPSs, i);
+				if (ctx->active_sps<0) ctx->active_sps = sps->id;
+
+				if (sps->id==ctx->active_sps) break;
+				sps = NULL;
+			}
+			if (!sps) return GF_NON_COMPLIANT_BITSTREAM;
+			for (i=0; i<gf_list_count(ctx->PPSs); i++) {
+				pps = gf_list_get(ctx->PPSs, i);
+				if (ctx->active_pps<0) ctx->active_pps = pps->id;
+
+				if (pps->id==ctx->active_pps) break;
+				pps = NULL;
+			}
+			if (!pps) return GF_NON_COMPLIANT_BITSTREAM;
+			ctx->reconfig_needed = GF_FALSE;
+
+			ctx->vtb_type = kCMVideoCodecType_HEVC;
+
+			idx = ctx->active_sps;
+			ctx->width = ctx->hevc.sps[idx].width;
+			ctx->height = ctx->hevc.sps[idx].height;
+			if (ctx->hevc.sps[idx].aspect_ratio_info_present_flag && ctx->hevc.sps[idx].sar_width && ctx->hevc.sps[idx].sar_height) {
+				ctx->pixel_ar = ctx->hevc.sps[idx].sar_width;
+				ctx->pixel_ar <<= 16;
+				ctx->pixel_ar |= ctx->hevc.sps[idx].sar_height;
+			}
+			ctx->chroma_format = ctx->hevc.sps[idx].chroma_format_idc;
+			ctx->luma_bit_depth = ctx->hevc.sps[idx].bit_depth_luma;
+			ctx->chroma_bit_depth = ctx->hevc.sps[idx].bit_depth_chroma;
+
+			switch (ctx->chroma_format) {
+			case 2:
+#ifndef GPAC_IPHONE
+				//422 decoding doesn't seem supported ...
+				if (ctx->luma_bit_depth>8) {
+					kColorSpace = kCVPixelFormatType_422YpCbCr10;
+					ctx->pix_fmt = GF_PIXEL_YUV422_10;
+				} else
+#endif
+				{
+					kColorSpace = kCVPixelFormatType_422YpCbCr8;
+					ctx->pix_fmt = GF_PIXEL_YUV422;
+				}
+				break;
+			case 3:
+#ifndef GPAC_IPHONE
+				if (ctx->luma_bit_depth>8) {
+					kColorSpace = kCVPixelFormatType_444YpCbCr10;
+					ctx->pix_fmt = GF_PIXEL_YUV444_10;
+				} else
+#endif
+				{
+					kColorSpace = kCVPixelFormatType_444YpCbCr8;
+					ctx->pix_fmt = GF_PIXEL_YUV444;
+				}
+				break;
+			default:
+				//we disable support for 10bit output on ios and old OSX, defaulting back to 8 bits
+#if !defined(GPAC_IPHONE) && defined(AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER)
+				if (ctx->luma_bit_depth>8) {
+					kColorSpace = kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange;
+					ctx->pix_fmt = GF_PIXEL_NV12_10;
+				}
+#endif
+				break;
+			}
+			//always rewrite with cirrent sps and pps
+			cfg = gf_odf_hevc_cfg_new();
+			cfg->configurationVersion = 1;
+			cfg->profile_space = ctx->hevc.sps[idx].ptl.profile_space;
+			cfg->tier_flag = ctx->hevc.sps[idx].ptl.tier_flag;
+			cfg->profile_idc = ctx->hevc.sps[idx].ptl.profile_idc;
+			cfg->general_profile_compatibility_flags = ctx->hevc.sps[idx].ptl.profile_compatibility_flag;
+			cfg->progressive_source_flag = ctx->hevc.sps[idx].ptl.general_progressive_source_flag;
+			cfg->interlaced_source_flag = ctx->hevc.sps[idx].ptl.general_interlaced_source_flag;
+			cfg->non_packed_constraint_flag = ctx->hevc.sps[idx].ptl.general_non_packed_constraint_flag;
+			cfg->frame_only_constraint_flag = ctx->hevc.sps[idx].ptl.general_frame_only_constraint_flag;
+
+			cfg->constraint_indicator_flags = ctx->hevc.sps[idx].ptl.general_reserved_44bits;
+			cfg->level_idc = ctx->hevc.sps[idx].ptl.level_idc;
+
+			cfg->luma_bit_depth = ctx->hevc.sps[idx].bit_depth_luma;
+			cfg->chroma_bit_depth = ctx->hevc.sps[idx].bit_depth_chroma;
+			cfg->chromaFormat = ctx->hevc.sps[idx].chroma_format_idc;
+			cfg->complete_representation = GF_TRUE;
+
+			cfg->nal_unit_size = 4;
+
+			GF_SAFEALLOC(vpsa, GF_HEVCParamArray);
+			vpsa->array_completeness = 1;
+			vpsa->type = GF_HEVC_NALU_VID_PARAM;
+			vpsa->nalus = gf_list_new();
+			gf_list_add(vpsa->nalus, vps);
+			gf_list_add(cfg->param_array, vpsa);
+
+			GF_SAFEALLOC(spsa, GF_HEVCParamArray);
+			spsa->array_completeness = 1;
+			spsa->type = GF_HEVC_NALU_SEQ_PARAM;
+			spsa->nalus = gf_list_new();
+			gf_list_add(spsa->nalus, sps);
+			gf_list_add(cfg->param_array, spsa);
+
+			GF_SAFEALLOC(ppsa, GF_HEVCParamArray);
+			ppsa->array_completeness = 1;
+			ppsa->type = GF_HEVC_NALU_PIC_PARAM;
+			//we send all PPS
+			ppsa->nalus = ctx->PPSs;
+
+			gf_list_add(cfg->param_array, ppsa);
+
+			gf_odf_hevc_cfg_write(cfg, &dsi_data, &dsi_data_size);
+			gf_list_reset(vpsa->nalus);
+			gf_list_reset(spsa->nalus);
+			ppsa->nalus = NULL;
+			gf_odf_hevc_cfg_del(cfg);
+
+			dsi = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+			data = CFDataCreate(kCFAllocatorDefault, (const UInt8*)dsi_data, dsi_data_size);
+			if (data) {
+				CFDictionarySetValue(dsi, CFSTR("hvcC"), data);
+				CFDictionarySetValue(dec_dsi, kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms, dsi);
+				CFRelease(data);
+			}
+			CFRelease(dsi);
+
+			gf_free(dsi_data);
+		}
+ break;
+
 	case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
 	case GPAC_OTI_VIDEO_MPEG2_MAIN:
 	case GPAC_OTI_VIDEO_MPEG2_SNR:
@@ -424,19 +582,42 @@
 	return GF_OK;
 }
 
-static void VTB_RegisterParameterSet(VTBDec *ctx, char *data, u32 size, Bool is_sps)
+static void VTB_RegisterParameterSet(VTBDec *ctx, char *data, u32 size, Bool is_sps, u8 hevc_nal_type)
 {
 	Bool add = GF_TRUE;
 	u32 i, count;
 	s32 ps_id;
-	GF_List *dest = is_sps ? ctx->SPSs : ctx->PPSs;
-	
-	if (is_sps) {
-		ps_id = gf_media_avc_read_sps(data, size, &ctx->avc, 0, NULL);
-		if (ps_id<0) return;
+	GF_List *dest = NULL;
+
+	if (hevc_nal_type) {
+		is_sps = GF_FALSE;
+		if (hevc_nal_type==GF_HEVC_NALU_SEQ_PARAM) {
+			dest = ctx->SPSs;
+			ps_id = gf_media_hevc_read_sps(data, size, &ctx->hevc);
+			if (ps_id<0) return;
+			is_sps = GF_TRUE;
+		}
+		else if (hevc_nal_type==GF_HEVC_NALU_PIC_PARAM) {
+			dest = ctx->PPSs;
+			ps_id = gf_media_hevc_read_pps(data, size, &ctx->hevc);
+			if (ps_id<0) return;
+		}
+		else if (hevc_nal_type==GF_HEVC_NALU_VID_PARAM) {
+			dest = ctx->VPSs;
+			ps_id = gf_media_hevc_read_vps(data, size, &ctx->hevc);
+			if (ps_id<0) return;
+		}
+
 	} else {
-		ps_id = gf_media_avc_read_pps(data, size, &ctx->avc);
-		if (ps_id<0) return;
+		dest = is_sps ? ctx->SPSs : ctx->PPSs;
+
+		if (is_sps) {
+			ps_id = gf_media_avc_read_sps(data, size, &ctx->avc, 0, NULL);
+			if (ps_id<0) return;
+		} else {
+			ps_id = gf_media_avc_read_pps(data, size, &ctx->avc);
+			if (ps_id<0) return;
+		}
 	}
 	
 	count = gf_list_count(dest);
@@ -498,13 +679,13 @@
 			for (i=0; i<gf_list_count(cfg->sequenceParameterSets); i++) {
 				slc = gf_list_get(cfg->sequenceParameterSets, i);
 				slc->id = -1;
-				VTB_RegisterParameterSet(ctx, slc->data, slc->size, GF_TRUE);
+				VTB_RegisterParameterSet(ctx, slc->data, slc->size, GF_TRUE, 0);
 			}
 
 			for (i=0; i<gf_list_count(cfg->pictureParameterSets); i++) {
 				slc = gf_list_get(cfg->pictureParameterSets, i);
 				slc->id = -1;
-				VTB_RegisterParameterSet(ctx, slc->data, slc->size, GF_FALSE);
+				VTB_RegisterParameterSet(ctx, slc->data, slc->size, GF_FALSE, 0);
 			}
 
 			slc = gf_list_get(ctx->SPSs, 0);
@@ -524,6 +705,59 @@
 		}
 	}
 
+	//check HEVC config
+	if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) {
+		ctx->SPSs = gf_list_new();
+		ctx->PPSs = gf_list_new();
+		ctx->VPSs = gf_list_new();
+		ctx->is_hevc = GF_TRUE;
+
+		ctx->hevc.sps_active_idx = -1;
+		ctx->active_sps = ctx->active_pps = ctx->active_vps = -1;
+
+		if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) {
+			ctx->is_annex_b = GF_TRUE;
+			ctx->width=ctx->height=128;
+			ctx->out_size = ctx->width*ctx->height*3/2;
+			ctx->pix_fmt = GF_PIXEL_YV12;
+			return GF_OK;
+		} else {
+			u32 i, j;
+			GF_AVCConfigSlot *slc;
+			GF_HEVCConfig *cfg = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
+
+			for (i=0; i<gf_list_count(cfg->param_array); i++) {
+				GF_HEVCParamArray *pa = gf_list_get(cfg->param_array, i);
+
+
+				for (j=0; j<gf_list_count(pa->nalus); j++) {
+					slc = gf_list_get(pa->nalus, j);
+					slc->id = -1;
+
+					VTB_RegisterParameterSet(ctx, slc->data, slc->size, GF_FALSE, pa->type);
+				}
+			}
+
+			slc = gf_list_get(ctx->SPSs, 0);
+			if (slc) ctx->active_sps = slc->id;
+
+			slc = gf_list_get(ctx->PPSs, 0);
+			if (slc) ctx->active_pps = slc->id;
+
+			slc = gf_list_get(ctx->VPSs, 0);
+			if (slc) ctx->active_vps = slc->id;
+
+			ctx->nalu_size_length = cfg->nal_unit_size;
+			if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs) && gf_list_count(ctx->VPSs) ) {
+				e = VTBDec_InitDecoder(ctx);
+			} else {
+				e = GF_OK;
+			}
+			gf_odf_hevc_cfg_del(cfg);
+			return e;
+		}
+	}
+
 	//check VOSH config
 	if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) {
 		if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) {
@@ -563,6 +797,8 @@
 	ctx->SPSs = NULL;
 	VTB_DelParamList(ctx->PPSs);
 	ctx->PPSs = NULL;
+	VTB_DelParamList(ctx->VPSs);
+	ctx->VPSs = NULL;
 }
 
 static GF_Err VTBDec_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
@@ -604,7 +840,7 @@
 		break;
 	case GF_CODEC_BUFFER_MAX:
 		//since we do the temporal de-interleaving ask for more CUs to avoid displaying refs before reordered frames
-		capability->cap.valueInt = 6;
+		capability->cap.valueInt = 8;
 		break;
 	/*by default we use 4 bytes padding (otherwise it happens that XviD crashes on some videos...)*/
 	case GF_CODEC_PADDING_BYTES:
@@ -683,37 +919,71 @@
 		} else {
 			nal_size = gf_media_nalu_next_start_code((const u8 *) ptr, inBufferLength, &sc_size);
 		}
-		nal_bs = gf_bs_new(ptr, nal_size, GF_BITSTREAM_READ);
-		nal_hdr = gf_bs_read_u8(nal_bs);
-		nal_type = nal_hdr & 0x1F;
-		switch (nal_type) {
-		case GF_AVC_NALU_SEQ_PARAM:
-			VTB_RegisterParameterSet(ctx, ptr, nal_size, GF_TRUE);
-			add_nal = GF_FALSE;
-			break;
-		case GF_AVC_NALU_PIC_PARAM:
-			VTB_RegisterParameterSet(ctx, ptr, nal_size, GF_FALSE);
-			add_nal = GF_FALSE;
-			break;
-		case GF_AVC_NALU_ACCESS_UNIT:
-		case GF_AVC_NALU_END_OF_SEQ:
-		case GF_AVC_NALU_END_OF_STREAM:
-		case GF_AVC_NALU_FILLER_DATA:
-			add_nal = GF_FALSE;
-			break;
-		default:
-			break;
-		}
-		
-		gf_media_avc_parse_nalu(nal_bs, nal_hdr, &ctx->avc);
-		gf_bs_del(nal_bs);
-		
-		if ((nal_type<=GF_AVC_NALU_IDR_SLICE) && ctx->avc.s_info.sps) {
-			if (ctx->avc.sps_active_idx != ctx->active_sps) {
-				ctx->reconfig_needed = 1;
-				ctx->active_sps = ctx->avc.sps_active_idx;
-				ctx->active_pps = ctx->avc.s_info.pps->id;
-				return GF_OK;
+
+		if (ctx->is_avc) {
+			nal_bs = gf_bs_new(ptr, nal_size, GF_BITSTREAM_READ);
+			nal_hdr = gf_bs_read_u8(nal_bs);
+			nal_type = nal_hdr & 0x1F;
+			switch (nal_type) {
+			case GF_AVC_NALU_SEQ_PARAM:
+				VTB_RegisterParameterSet(ctx, ptr, nal_size, GF_TRUE, 0);
+				add_nal = GF_FALSE;
+				break;
+			case GF_AVC_NALU_PIC_PARAM:
+				VTB_RegisterParameterSet(ctx, ptr, nal_size, GF_FALSE, 0);
+				add_nal = GF_FALSE;
+				break;
+			case GF_AVC_NALU_ACCESS_UNIT:
+			case GF_AVC_NALU_END_OF_SEQ:
+			case GF_AVC_NALU_END_OF_STREAM:
+			case GF_AVC_NALU_FILLER_DATA:
+				add_nal = GF_FALSE;
+				break;
+			default:
+				break;
+			}
+
+			gf_media_avc_parse_nalu(nal_bs, nal_hdr, &ctx->avc);
+			gf_bs_del(nal_bs);
+
+			if ((nal_type<=GF_AVC_NALU_IDR_SLICE) && ctx->avc.s_info.sps) {
+				if (ctx->avc.sps_active_idx != ctx->active_sps) {
+					ctx->reconfig_needed = 1;
+					ctx->active_sps = ctx->avc.sps_active_idx;
+					ctx->active_pps = ctx->avc.s_info.pps->id;
+					return GF_OK;
+				}
+			}
+		} else if (ctx->is_hevc) {
+			u8 temporal_id, ayer_id;
+			s32 res = gf_media_hevc_parse_nalu(ptr, nal_size, &ctx->hevc, &nal_type, &temporal_id, &ayer_id);
+			if (res>=0) {
+				switch (nal_type) {
+				case GF_HEVC_NALU_VID_PARAM:
+				case GF_HEVC_NALU_SEQ_PARAM:
+				case GF_HEVC_NALU_PIC_PARAM:
+					VTB_RegisterParameterSet(ctx, ptr, nal_size, GF_FALSE, nal_type);
+					add_nal = GF_FALSE;
+					break;
+				case GF_HEVC_NALU_ACCESS_UNIT:
+				case GF_HEVC_NALU_END_OF_SEQ:
+				case GF_HEVC_NALU_END_OF_STREAM:
+				case GF_HEVC_NALU_FILLER_DATA:
+					add_nal = GF_FALSE;
+					break;
+				default:
+					break;
+				}
+
+				if ((nal_type<=GF_HEVC_NALU_SLICE_CRA) && ctx->hevc.s_info.sps) {
+					if (ctx->hevc.sps_active_idx != ctx->active_sps) {
+						ctx->reconfig_needed = 1;
+						ctx->active_sps = ctx->hevc.sps_active_idx;
+						ctx->active_pps = ctx->hevc.s_info.pps->id;
+						ctx->active_vps = ctx->hevc.s_info.sps->vps_id;
+						return GF_OK;
+					}
+				}
 			}
 		}
 		
@@ -1169,9 +1439,6 @@
 		*needs_resize = GF_TRUE;
 	}
 	vtb_frame->cts = ctx->cts;
-	if (ctx->cts==960) {
-		vtb_frame->cts = 960;
-	}
 	ctx->decoded_frames_pending++;
 	return GF_OK;
 }
@@ -1190,8 +1457,9 @@
 	switch (esd->decoderConfig->objectTypeIndication) {
 	case GPAC_OTI_VIDEO_AVC:
 		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-			GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
 			Bool cp_ok = GF_TRUE;
+			GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+			if (!cfg) return GF_CODEC_NOT_SUPPORTED;
 			if (!cfg->chroma_format) {
 				GF_AVCConfigSlot *s = gf_list_get(cfg->sequenceParameterSets, 0);
 				if (s) {
@@ -1213,6 +1481,38 @@
 		}
 		return ret_val_OK;
 
+	case GPAC_OTI_VIDEO_HEVC:
+		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
+			Bool cp_ok = GF_TRUE;
+			GF_HEVCConfig *cfg = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
+			if (!cfg) return GF_CODEC_NOT_SUPPORTED;
+			if (!cfg->chromaFormat) {
+				u32 i=0;
+				for (i=0; i<gf_list_count(cfg->param_array); i++) {
+					GF_AVCConfigSlot *s;
+					GF_HEVCParamArray *pa = gf_list_get(cfg->param_array, i);
+					if (pa->type!=GF_HEVC_NALU_SEQ_PARAM) continue;
+					s = gf_list_get(pa->nalus, 0);
+					if (s) {
+						HEVCState hevc;
+						s32 idx;
+						memset(&hevc, 0, sizeof(HEVCState));
+						hevc.sps_active_idx = -1;
+						idx = gf_media_hevc_read_sps(s->data, s->size, &hevc);
+						cfg->chromaFormat = hevc.sps[idx].chroma_format_idc;
+						cfg->luma_bit_depth = 8 + hevc.sps[idx].bit_depth_luma;
+						cfg->chroma_bit_depth = 8 + hevc.sps[idx].bit_depth_chroma;
+					}
+				}
+			}
+			if ((cfg->chroma_bit_depth>8) || (cfg->luma_bit_depth > 8) || (cfg->chromaFormat>1)) {
+				cp_ok = GF_FALSE;
+			}
+			gf_odf_hevc_cfg_del(cfg);
+			if (!cp_ok) return GF_CODEC_PROFILE_NOT_SUPPORTED;
+		}
+		return ret_val_OK;
+
 	case GPAC_OTI_VIDEO_MPEG4_PART2:
 		return ret_val_OK;
 
@@ -1248,6 +1548,8 @@
 	switch (ctx->vtb_type) {
 	case kCMVideoCodecType_H264:
 		return ctx->is_hardware ? "VTB hardware AVC|H264" : "VTB software AVC|H264";
+	case kCMVideoCodecType_HEVC:
+		return ctx->is_hardware ? "VTB hardware HEVC" : "VTB software HEVC";
 	case kCMVideoCodecType_MPEG2Video:
 		return ctx->is_hardware ? "VTB hardware MPEG-2" : "VTB software MPEG-2";
 case kCMVideoCodecType_MPEG4Video:

gpac-0.7.1.tar.gz/modules/widgetman/widgetman.c -> gpac-0.8.0.tar.gz/modules/widgetman/widgetman.c Changed

gpac-0.7.1.tar.gz/modules/x11_out/x11_out.c -> gpac-0.8.0.tar.gz/modules/x11_out/x11_out.c Changed

@@ -34,6 +34,11 @@
 
 void X11_SetupWindow (GF_VideoOutput * vout);
 
+#ifdef GPAC_HAS_OPENGL
+PFNGLXSWAPINTERVALEXTPROC my_glXSwapIntervalEXT;
+PFNGLXSWAPINTERVALMESAPROC my_glXSwapIntervalMESA;
+PFNGLXSWAPINTERVALSGIPROC my_glXSwapIntervalSGI;
+#endif
 
 #ifdef GPAC_HAS_X11_XV
 static void X11_DestroyOverlay(XWindow *xwin)
@@ -928,6 +933,9 @@
 static GF_Err X11_SetupGL(GF_VideoOutput *vout)
 {
 	GF_Event evt;
+#ifdef GPAC_HAS_OPENGL
+	const char *opt;
+#endif
 	XWindow *xWin = (XWindow *)vout->opaque;
 
 	if (!xWin->glx_visualinfo) return GF_IO_ERR;
@@ -944,6 +952,26 @@
 		evt.setup.hw_reset = 1;
 	}
 	if ( ! glXMakeCurrent(xWin->display, xWin->fullscreen ? xWin->full_wnd : xWin->wnd, xWin->glx_context) ) return GF_IO_ERR;
+
+#ifdef GPAC_HAS_OPENGL
+	opt = gf_modules_get_option((GF_BaseInterface *)vout, "Video", "DisableVSync");
+	if (opt && !strcmp(opt, "yes")) {
+		my_glXSwapIntervalEXT = (PFNGLXSWAPINTERVALEXTPROC)glXGetProcAddress( (const GLubyte*)"glXSwapIntervalEXT");
+		if (my_glXSwapIntervalEXT != NULL) {
+			my_glXSwapIntervalEXT(xWin->display, xWin->wnd, 0);
+		} else {
+			my_glXSwapIntervalMESA = (PFNGLXSWAPINTERVALMESAPROC)glXGetProcAddress( (const GLubyte*)"glXSwapIntervalMESA");
+			if (my_glXSwapIntervalMESA != NULL ) {
+				my_glXSwapIntervalMESA(0);
+			} else {
+				my_glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)glXGetProcAddress( (const GLubyte*)"glXSwapIntervalSGI");
+				if (my_glXSwapIntervalSGI != NULL ) {
+					my_glXSwapIntervalSGI(0);
+				}
+			}
+		}
+	}
+#endif
 	XSync(xWin->display, False);
 
 	evt.type = GF_EVENT_VIDEO_SETUP;
@@ -1806,7 +1834,7 @@
 	};
 	return si;
 }
-	
+
 
 /*
  * interface create

gpac-0.8.0.tar.gz/packagers/osx Added

gpac-0.8.0.tar.gz/packagers/osx/GPAC.app Added

gpac-0.8.0.tar.gz/packagers/osx/GPAC.app/Contents Added

gpac-0.8.0.tar.gz/packagers/osx/GPAC.app/Contents/Info.plist Changed

gpac-0.8.0.tar.gz/packagers/osx/GPAC.app/Contents/PkgInfo Changed

gpac-0.8.0.tar.gz/packagers/osx/GPAC.app/Contents/Resources Added

gpac-0.8.0.tar.gz/packagers/osx/GPAC.app/Contents/Resources/osmo.icns Changed

gpac-0.8.0.tar.gz/packagers/osx/GPAC.app/Contents/Resources/osmo_audio.icns Changed

gpac-0.8.0.tar.gz/packagers/osx/GPAC.app/Contents/Resources/osmo_generic.icns Changed

gpac-0.8.0.tar.gz/packagers/osx/GPAC.app/Contents/Resources/osmo_model.icns Changed

gpac-0.8.0.tar.gz/packagers/osx/GPAC.app/Contents/Resources/osmo_subs.icns Changed

gpac-0.8.0.tar.gz/packagers/osx/GPAC.app/Contents/Resources/osmo_video.icns Changed

gpac-0.8.0.tar.gz/packagers/osx/GPAC.app/Contents/Resources/osmo_widget.icns Changed

gpac-0.8.0.tar.gz/packagers/osx/SLA.r Changed

gpac-0.8.0.tar.gz/packagers/osx/distribution.xml Added

gpac-0.8.0.tar.gz/packagers/osx/res Added

gpac-0.8.0.tar.gz/packagers/osx/res/background.png Added

gpac-0.8.0.tar.gz/packagers/osx/res/preamble.txt Added

gpac-0.8.0.tar.gz/packagers/osx/scripts Added

gpac-0.8.0.tar.gz/packagers/osx/scripts/postinstall Added

gpac-0.7.1.tar.gz/packagers/win32_64/nsis/gpac_installer.nsi -> gpac-0.8.0.tar.gz/packagers/win32_64/nsis/gpac_installer.nsi Changed

@@ -1,6 +1,6 @@
 ;--------------------------------
 ;General
-!define GPAC_VERSION 0.7.1
+!define GPAC_VERSION 0.8.0
 !include default.out
 
 !define GPAC_ROOT ..\..\..
@@ -50,6 +50,7 @@
 Var DIALOG
 Var Label
 Var Confirm
+Var VSRedistSetupError
 
 LangString PAGE_TITLE ${LANG_ENGLISH} "Title"
 LangString PAGE_SUBTITLE ${LANG_ENGLISH} "Subtitle"
@@ -60,9 +61,9 @@
 	GetDlgItem $0 $HWNDPARENT 1
 	${If} $R1 == ${BST_CHECKED}
 EnableWindow $0 1
- ${Else} 
+ ${Else}
 EnableWindow $0 0
- ${Endif} 
+ ${Endif}
 FunctionEnd
 
 Function customPage
@@ -79,8 +80,8 @@
 Pop $Confirm
 	GetFunctionAddress $0 EnableNext
 	nsDialogs::OnClick $Confirm $0
- 
- 
+
+
 nsDialogs::Show
 FunctionEnd
 
@@ -88,14 +89,14 @@
 ;Pages
 
 !insertmacro MUI_PAGE_WELCOME
- !insertmacro MUI_PAGE_LICENSE "${GPAC_ROOT}\COPYING" 
+ !insertmacro MUI_PAGE_LICENSE "${GPAC_ROOT}\COPYING"
 Page custom customPage
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
- 
+
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH
- 
+
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
 
@@ -126,7 +127,7 @@
 StrCmp $R0 "HKCR" +1 +3
 WriteRegStr HKCR $R1 $R2 $R3
 goto lbl_end
- 
+
 #has current user admin privileges?
 userInfo::getAccountType
 Pop $0
@@ -154,7 +155,7 @@
 Push "${VALUESTR}"
 Call FctWriteRegStrAuth
 !macroend
- 
+
 !define WriteRegStrAuth "!insertmacro WriteRegStrAuth"
 
 
@@ -173,16 +174,16 @@
 StrCmp $R0 "HKCR" +1 +3
 DeleteRegKey HKCR $R1
 goto lbl_end
- 
+
 #has current user admin privileges?
 userInfo::getAccountType
 Pop $0
 StrCmp $0 "Admin" lbl_admin lbl_not_admin
- 
+
 lbl_admin:
 DeleteRegKey HKLM $R1
 goto lbl_end
- 
+
 lbl_not_admin:
 DeleteRegKey HKCU $R1
 
@@ -197,7 +198,7 @@
 Push "${SUBREG}"
 Call un.FctDeleteRegKeyAuth
 !macroend
- 
+
 !define DeleteRegKeyAuth "!insertmacro DeleteRegKeyAuth"
 
 Function InsertGDIPLUS
@@ -235,9 +236,7 @@
 StrCmp $R1 '5.2' lbl_done	;.NET server
 
 lbl_add:
- !ifndef IS_WIN64
- File "${GPAC_BIN}\Gdiplus.dll"
- !endif
+
 
 lbl_xp:
 File "${GPAC_BIN}\gm_gdip_raster.dll"
@@ -258,14 +257,14 @@
 File "${GPAC_ROOT}\doc\osmo4.ico"
 File "${GPAC_BIN}\libgpac.dll"
 File "${GPAC_BIN}\js.dll"
- File "${GPAC_BIN}\libeay32.dll"
- File "${GPAC_BIN}\ssleay32.dll"
+ File "${GPAC_BIN}\libcryptoMD.dll"
+ File "${GPAC_BIN}\libsslMD.dll"
 
 ;create default cache
 SetOutPath $INSTDIR\cache
 
 SetOutPath $INSTDIR
- 
+
 ${WriteRegStrAuth} HKCU "SOFTWARE\GPAC" "InstallDir" "$INSTDIR"
 ${WriteRegStrAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPAC" "DisplayName" "GPAC (remove only)"
 ${WriteRegStrAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPAC" "UninstallString" "$INSTDIR\uninstall.exe"
@@ -277,9 +276,8 @@
 Section "GPAC Player" SecOsmo4
 SectionIn 1
 
- !ifndef IS_WIN64
- File "${GPAC_BIN}\Osmo4.exe"
- !endif
+ File "${GPAC_BIN}\MP4Client.exe"
+
 File "${GPAC_BIN}\gm_dummy_in.dll"
 File "${GPAC_BIN}\gm_dx_hw.dll"
 File "${GPAC_BIN}\gm_gpac_js.dll"
@@ -425,6 +423,11 @@
 File "${GPAC_BIN}\gm_ft_font.dll"
 SectionEnd
 
+Section "ATSC" SecATSC
+ SectionIn 1
+ File "${GPAC_BIN}\gm_atsc_in.dll"
+SectionEnd
+
 Section "Windows MME Audio" SecWAVE
 SectionIn 1
 File "${GPAC_BIN}\gm_wav_out.dll"
@@ -443,15 +446,25 @@
 
 Section "OpenHEVC Decoder" SecOHEVC
 SectionIn 1
- File "${GPAC_BIN}\libLibOpenHevcWrapper.dll"
+ File "${GPAC_BIN}\openhevc-1.dll"
 File "${GPAC_BIN}\gm_openhevc_dec.dll"
 SectionEnd
 
+Section "NVidia Hardware Decoder" SecNVDEC
+ SectionIn 1
+ File "${GPAC_BIN}\gm_nvdec.dll"
+SectionEnd
+
 Section "MPEG DASH Support" SecDASH
 SectionIn 1
 File "${GPAC_BIN}\gm_mpd_in.dll"
 SectionEnd
 
+Section "RAW audio-video output" SecRAW
+ SectionIn 1
+ File "${GPAC_BIN}\gm_raw_out.dll"
+SectionEnd
+
 Section "HTML 5 Media Source Extensions Support" SecMSE
 SectionIn 1
 File "${GPAC_BIN}\gm_mse_in.dll"
@@ -473,6 +486,11 @@
 ; File "..\MobileSession.dll"
 ;SectionEnd
 
+Section "DekTec output" SecDecTek
+ SectionIn 1
+ File "${GPAC_BIN}\gm_dektec_out.dll"
+SectionEnd
+
 SubSectionEnd
 
 
@@ -510,50 +528,40 @@
 File ${GPAC_EXTRA_LIB}\js.lib
 SectionEnd
 
-
-!ifndef IS_WIN64
-!define HK_MOZ "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0"
-
-Section "Osmozilla" SecZILLA
- SectionIn 1
- SetOutPath $INSTDIR
- File "${GPAC_BIN}\nposmozilla.dll"
- File "${GPAC_BIN}\nposmozilla.xpt"
-
- ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Path" "$INSTDIR\nposmozilla.dll"
- ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "XPTPath" "$INSTDIR\nposmozilla.xpt"
- ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Version" "${GPAC_VERSION}"
- ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Vendor" "GPAC"
- ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Description" "GPAC plugin"
- ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "ProductName" "Osmozilla"
-SectionEnd
-!endif
-
+!if /FileExists "${GPAC_BIN}\GPAX.dll"
 Section "GPAX" SecGPAX
 SectionIn 1
 SetOutPath $INSTDIR
 File "${GPAC_BIN}\GPAX.dll"
 RegDLL "$INSTDIR\GPAX.dll"
 SectionEnd
+!endif
 
-
-Section "MP4Client" SecMP4C
- SectionIn 1
- SetOutPath $INSTDIR
- File "${GPAC_BIN}\MP4Client.exe"
-SectionEnd 
- 
- 
- 
-Section "Windows Runtime Libraries" SecMSVCRT
- SectionIn 1
+;Section "Windows Runtime Libraries" SecMSVCRT
+; SectionIn 1
 ; File "..\Microsoft.VC100.CRT.manifest"
-; File "..\Microsoft.VC100.MFC.manifest" 
- File "${GPAC_BIN}\msvcr100.dll"
- File "${GPAC_BIN}\mfc100.dll"
-SectionEnd
+; File "..\Microsoft.VC100.MFC.manifest"
+; File "${GPAC_BIN}\msvcr100.dll"
+; File "${GPAC_BIN}\mfc100.dll"
+;SectionEnd
 
 
+!ifdef IS_WIN64
+!define TARGET_ARCHITECTURE "x64"
+!else
+!define TARGET_ARCHITECTURE "x86"
+!endif
+
+Section "VS2015 C++ re-distributable Package (${TARGET_ARCHITECTURE})" SEC_VCREDIST1
+DetailPrint "Running VS2015 re-distributable setup..."
+ SectionIn 1
+ SetOutPath "$TEMP\vc2015"
+ File "${GPAC_ROOT}\packagers\win32_64\nsis\vc_redist.${TARGET_ARCHITECTURE}.exe"
+ ExecWait '"$TEMP\vc2015\vc_redist.${TARGET_ARCHITECTURE}.exe" /install /quiet /norestart' $VSRedistSetupError
+ RMDir /r "$TEMP\vc2015"
+ DetailPrint "Finished VS2015 re-distributable setup"
+ SetOutPath "$INSTDIR"
+SectionEnd
 
 
 SubSection "GPAC Shortcuts"
@@ -567,60 +575,14 @@
 SetShellVarContext all
 CreateDirectory "$SMPROGRAMS\GPAC"
 CreateShortCut "$SMPROGRAMS\GPAC\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
- CreateShortCut "$SMPROGRAMS\GPAC\Osmo4.lnk" "$INSTDIR\MP4Client.exe" "" 
+ CreateShortCut "$SMPROGRAMS\GPAC\Osmo4.lnk" "$INSTDIR\MP4Client.exe" ""
 CreateShortCut "$SMPROGRAMS\GPAC\Osmo4 (with Console).lnk" "$INSTDIR\MP4Client.exe" "-guid"
- !ifndef IS_WIN64
- CreateShortCut "$SMPROGRAMS\GPAC\Osmo4 (Old UI).lnk" "$INSTDIR\Osmo4.exe" ""
- !endif
 CreateShortCut "$SMPROGRAMS\GPAC\Readme.lnk" "$INSTDIR\ReadMe.txt"
 CreateShortCut "$SMPROGRAMS\GPAC\License.lnk" "$INSTDIR\License.txt"
 CreateShortCut "$SMPROGRAMS\GPAC\History.lnk" "$INSTDIR\changelog.txt"
 CreateShortCut "$SMPROGRAMS\GPAC\Configuration Info.lnk" "$INSTDIR\configuration.html"
 SectionEnd
 
-!ifndef IS_WIN64
-Section "Add shortcut to QuickLaunch"
- SectionIn 1
- CreateShortCut "$QUICKLAUNCH\GPAC.lnk" "$INSTDIR\Osmo4.exe" "" "$INSTDIR\Osmo4.exe" 0
-SectionEnd
-
-Section "Add shortcut to Desktop"
- SectionIn 1
- CreateShortCut "$DESKTOP\Osmo4.lnk" "$INSTDIR\Osmo4.exe" "" "$INSTDIR\Osmo4.exe" 0
-SectionEnd
-
-!define SHCNE_ASSOCCHANGED 0x08000000
-!define SHCNF_IDLIST 0
-
-Section "Make Osmo4 the default MPEG-4 Player"
- SectionIn 1
- ;write file association
- ${WriteRegStrAuth} HKCR GPAC\mp4\DefaultIcon "" "$INSTDIR\Osmo4.ico, 0"
- ${WriteRegStrAuth} HKCR GPAC\mp4\Shell\open\command "" "$INSTDIR\Osmo4.exe %L"
- ${WriteRegStrAuth} HKCR .mp4 "" "GPAC\mp4"
- !system 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
-
-SectionEnd
-
-Section "Associate 3GPP files (3GP) with Osmo4"
- SectionIn 1
- ;write file association
- ${WriteRegStrAuth} HKCR GPAC\3gp\DefaultIcon "" "$INSTDIR\Osmo4.ico, 0"
- ${WriteRegStrAuth} HKCR GPAC\3gp\Shell\open\command "" "$INSTDIR\Osmo4.exe %L"
- ${WriteRegStrAuth} HKCR .3gp "" "GPAC\3gp"
- !system 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
-SectionEnd
-
-Section "Associate 3GPP2 files (3G2) with Osmo4"
- SectionIn 1
- ;write file association
- ${WriteRegStrAuth} HKCR GPAC\3g2\DefaultIcon "" "$INSTDIR\Osmo4.ico, 0"
- ${WriteRegStrAuth} HKCR GPAC\3g2\Shell\open\command "" "$INSTDIR\Osmo4.exe %L"
- ${WriteRegStrAuth} HKCR .3g2 "" "GPAC\3g2"
- !system 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
-SectionEnd
-!endif
- 
 SubSectionEnd
 
 
@@ -650,15 +612,19 @@
 !insertmacro MUI_DESCRIPTION_TEXT ${SecGDIP} "GDIPlus-based rasterizer"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecG2DS} "GPAC software rasterizer"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecFT} "FreeType font parsing"
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecATSC} "ATSC3 support"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecWAVE} "Windows MME Audio output support"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecXIPH} "Support for XIPP OGG, Vorbis and Theora media"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecOSVC} "Support for SVC decoding through OpenSVC Decoder"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecOHEVC} "Support for HEVC decoding through OpenHEVC Decoder"
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecNVDEC} "Support for hardware decoding through NVidia cuvid"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecDASH} "HTTP Streaming using MPEG DASH"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecMSE} "HTTP Streaming using HTML 5 Media Source Extensions"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecUPnP} "Support for UPnP based on Platinum"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecMPEGU} "Support for W3C and MPEG-U Widgets"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecMobIP} "UNIGE Mobile IP Framework"
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecDecTek} "DekTek 3G SDI output support"
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecRAW} "RAW audio-video output support"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecOffisComp} "OFFIS Audio Compressor"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecMP4B} "MP4Box command-line tool for various multimedia operations"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecMP42TS} "MP42TS command-line tool for MPEG-2 TS multiplexing"
@@ -667,7 +633,7 @@
 !insertmacro MUI_DESCRIPTION_TEXT ${SecZILLA} "GPAC playback support NPAPI-based browsers (FireFox/Gecko, Safari/WebKit)"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecGPAX} "GPAC playback support using ActiveX component (Internet Explorer)"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecMP4C} "GPAC command-line player and AVI dumper"
- 
+
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 
@@ -735,77 +701,111 @@
 !endif
 !endif
 
-; AddToPath - Adds the given dir to the search path.
-; Input - head of the stack
-; Note - Win9x systems requires reboot
+;--------------------------------------------------------------------
+; Path functions
+;
+; Based on example from:
+; http://nsis.sourceforge.net/Path_Manipulation
+;
+
+
+!include "WinMessages.nsh"
+
+; Registry Entry for environment (NT4,2000,XP)
+; All users:
+;!define Environ 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
+; Current user only:
+!define Environ 'HKCU "Environment"'
+
+
+; AddToPath - Appends dir to PATH
+; (does not work on Win9x/ME)
+;
+; Usage:
+; Push "dir"
+; Call AddToPath
 
 Function AddToPath
 Exch $0
 Push $1
 Push $2
 Push $3
- 
- # don't add if the path doesn't exist
- IfFileExists "$0\*.*" "" AddToPath_done
- 
- ReadEnvStr $1 PATH
+ Push $4
+
+ ; NSIS ReadRegStr returns empty string on string overflow
+ ; Native calls are used here to check actual length of PATH
+
+ ; $4 = RegOpenKey(HKEY_CURRENT_USER, "Environment", &$3)
+ System::Call "advapi32::RegOpenKey(i 0x80000001, t'Environment', *i.r3) i.r4"
+ IntCmp $4 0 0 done done
+ ; $4 = RegQueryValueEx($3, "PATH", (DWORD*)0, (DWORD*)0, &$1, ($2=NSIS_MAX_STRLEN, &$2))
+ ; RegCloseKey($3)
+ System::Call "advapi32::RegQueryValueEx(i $3, t'PATH', i 0, i 0, t.r1, *i ${NSIS_MAX_STRLEN} r2) i.r4"
+ System::Call "advapi32::RegCloseKey(i $3)"
+
+ ${If} $4 = 234 ; ERROR_MORE_DATA
+ DetailPrint "AddToPath: original length $2 > ${NSIS_MAX_STRLEN}"
+ MessageBox MB_OK "PATH not updated, original length $2 > ${NSIS_MAX_STRLEN}" /SD IDOK
+ Goto done
+ ${EndIf}
+
+ ${If} $4 <> 0 ; NO_ERROR
+ ${If} $4 <> 2 ; ERROR_FILE_NOT_FOUND
+ DetailPrint "AddToPath: unexpected error code $4"
+ Goto done
+ ${EndIf}
+ StrCpy $1 ""
+ ${EndIf}
+
+ ; Check if already in PATH
 Push "$1;"
 Push "$0;"
 Call StrStr
 Pop $2
- StrCmp $2 "" "" AddToPath_done
+ StrCmp $2 "" 0 done
 Push "$1;"
 Push "$0\;"
 Call StrStr
 Pop $2
- StrCmp $2 "" "" AddToPath_done
- GetFullPathName /SHORT $3 $0
- Push "$1;"
- Push "$3;"
- Call StrStr
- Pop $2
- StrCmp $2 "" "" AddToPath_done
- Push "$1;"
- Push "$3\;"
- Call StrStr
+ StrCmp $2 "" 0 done
+
+ ; Prevent NSIS string overflow
+ StrLen $2 $0
+ StrLen $3 $1
+ IntOp $2 $2 + $3
+ IntOp $2 $2 + 2 ; $2 = strlen(dir) + strlen(PATH) + sizeof(";")
+ ${If} $2 > ${NSIS_MAX_STRLEN}
+ DetailPrint "AddToPath: new length $2 > ${NSIS_MAX_STRLEN}"
+ MessageBox MB_OK "PATH not updated, new length $2 > ${NSIS_MAX_STRLEN}." /SD IDOK
+ Goto done
+ ${EndIf}
+
+ ; Append dir to PATH
+ DetailPrint "Add to PATH: $0"
+ StrCpy $2 $1 1 -1
+ ${If} $2 == ";"
+ StrCpy $1 $1 -1 ; remove trailing ';'
+ ${EndIf}
+ ${If} $1 != "" ; no leading ';'
+ StrCpy $0 "$1;$0"
+ ${EndIf}
+ WriteRegExpandStr ${Environ} "PATH" $0
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+
+done:
+ Pop $4
+ Pop $3
 Pop $2
- StrCmp $2 "" "" AddToPath_done
- 
- Call IsNT
 Pop $1
- StrCmp $1 1 AddToPath_NT
- ; Not on NT
- StrCpy $1 $WINDIR 2
- FileOpen $1 "$1\autoexec.bat" a
- FileSeek $1 -1 END
- FileReadByte $1 $2
- IntCmp $2 26 0 +2 +2 # DOS EOF
- FileSeek $1 -1 END # write over EOF
- FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
- FileClose $1
- SetRebootFlag true
- Goto AddToPath_done
- 
- AddToPath_NT:
- ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
- StrCpy $2 $1 1 -1 # copy last char
- StrCmp $2 ";" 0 +2 # if last char == ;
- StrCpy $1 $1 -1 # remove last char
- StrCmp $1 "" AddToPath_NTdoIt
- StrCpy $0 "$1;$0"
- AddToPath_NTdoIt:
- WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $0
- SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
- AddToPath_done:
- Pop $3
- Pop $2
- Pop $1
- Pop $0
+ Pop $0
 FunctionEnd
 
-; RemoveFromPath - Remove a given dir from the path
-; Input: head of the stack
+
+; RemoveFromPath - Removes dir from PATH
+;
+; Usage:
+; Push "dir"
+; Call RemoveFromPath
 
 Function un.RemoveFromPath
 Exch $0
@@ -815,81 +815,42 @@
 Push $4
 Push $5
 Push $6
- 
- IntFmt $6 "%c" 26 # DOS EOF
- 
- Call un.IsNT
+
+ ReadRegStr $1 ${Environ} "PATH"
+ StrCpy $5 $1 1 -1
+ ${If} $5 != ";"
+ StrCpy $1 "$1;" ; ensure trailing ';'
+ ${EndIf}
+ Push $1
+ Push "$0;"
+ Call un.StrStr
+ Pop $2 ; pos of our dir
+ StrCmp $2 "" done
+
+ DetailPrint "Remove from PATH: $0"
+ StrLen $3 "$0;"
+ StrLen $4 $2
+ StrCpy $5 $1 -$4 ; $5 is now the part before the path to remove
+ StrCpy $6 $2 "" $3 ; $6 is now the part after the path to remove
+ StrCpy $3 "$5$6"
+ StrCpy $5 $3 1 -1
+ ${If} $5 == ";"
+ StrCpy $3 $3 -1 ; remove trailing ';'
+ ${EndIf}
+ WriteRegExpandStr ${Environ} "PATH" $3
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+
+done:
+ Pop $6
+ Pop $5
+ Pop $4
+ Pop $3
+ Pop $2
 Pop $1
- StrCmp $1 1 unRemoveFromPath_NT
- ; Not on NT
- StrCpy $1 $WINDIR 2
- FileOpen $1 "$1\autoexec.bat" r
- GetTempFileName $4
- FileOpen $2 $4 w
- GetFullPathName /SHORT $0 $0
- StrCpy $0 "SET PATH=%PATH%;$0"
- Goto unRemoveFromPath_dosLoop
- 
- unRemoveFromPath_dosLoop:
- FileRead $1 $3
- StrCpy $5 $3 1 -1 # read last char
- StrCmp $5 $6 0 +2 # if DOS EOF
- StrCpy $3 $3 -1 # remove DOS EOF so we can compare
- StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
- StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
- StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
- StrCmp $3 "" unRemoveFromPath_dosLoopEnd
- FileWrite $2 $3
- Goto unRemoveFromPath_dosLoop
- unRemoveFromPath_dosLoopRemoveLine:
- SetRebootFlag true
- Goto unRemoveFromPath_dosLoop
- 
- unRemoveFromPath_dosLoopEnd:
- FileClose $2
- FileClose $1
- StrCpy $1 $WINDIR 2
- Delete "$1\autoexec.bat"
- CopyFiles /SILENT $4 "$1\autoexec.bat"
- Delete $4
- Goto unRemoveFromPath_done
- 
- unRemoveFromPath_NT:
- ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
- StrCpy $5 $1 1 -1 # copy last char
- StrCmp $5 ";" +2 # if last char != ;
- StrCpy $1 "$1;" # append ;
- Push $1
- Push "$0;"
- Call un.StrStr ; Find `$0;` in $1
- Pop $2 ; pos of our dir
- StrCmp $2 "" unRemoveFromPath_done
- ; else, it is in path
- # $0 - path to add
- # $1 - path var
- StrLen $3 "$0;"
- StrLen $4 $2
- StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
- StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
- StrCpy $3 $5$6
- 
- StrCpy $5 $3 1 -1 # copy last char
- StrCmp $5 ";" 0 +2 # if last char == ;
- StrCpy $3 $3 -1 # remove last char
- 
- WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $3
- SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
- unRemoveFromPath_done:
- Pop $6
- Pop $5
- Pop $4
- Pop $3
- Pop $2
- Pop $1
- Pop $0
+ Pop $0
 FunctionEnd
 
+
 ###########################################
 # Utility Functions #
 ###########################################
@@ -912,7 +873,7 @@
 Pop $0
 Push 0
 Return
- 
+
 IsNT_yes:
 ; NT!!!
 Pop $0

gpac-0.7.1.tar.gz/shaders/fragment.glsl -> gpac-0.8.0.tar.gz/shaders/fragment.glsl Changed

gpac-0.7.1.tar.gz/src/Makefile -> gpac-0.8.0.tar.gz/src/Makefile Changed

@@ -17,11 +17,11 @@
 ## libgpac objects gathering: src/utils
 LIBGPAC_UTILS=utils/os_divers.o utils/os_file.o utils/list.o utils/bitstream.o utils/error.o utils/alloc.o utils/url.o utils/configfile.o 
 ifeq ($(DISABLE_CORE_TOOLS), no)
-LIBGPAC_UTILS+=utils/sha1.o  utils/base_encoding.o utils/os_net.o utils/os_thread.o utils/os_config_init.o utils/cache.o utils/downloader.o utils/xml_parser.o utils/utf.o utils/token.o utils/color.o 
+LIBGPAC_UTILS+=utils/sha1.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/xml_parser.o utils/utf.o utils/token.o utils/color.o 
 endif
 
 ifeq ($(DISABLE_PLAYER), no)
-LIBGPAC_UTILS+=utils/os_module.o utils/math.o utils/path2d.o utils/path2d_stroker.o utils/module.o utils/uni_bidi.o utils/ringbuffer.o utils/unicode.o utils/map.o 
+LIBGPAC_UTILS+=utils/os_module.o utils/path2d.o utils/path2d_stroker.o utils/module.o utils/uni_bidi.o utils/ringbuffer.o utils/unicode.o utils/map.o 
 endif
 
 ## libgpac objects gathering: src/ietf
@@ -74,14 +74,15 @@
 ## libgpac objects gathering: src/scenegraph
 LIBGPAC_SCENE=scenegraph/base_scenegraph.o scenegraph/mpeg4_animators.o scenegraph/commands.o scenegraph/mpeg4_nodes.o scenegraph/mpeg4_valuator.o scenegraph/vrml_interpolators.o scenegraph/vrml_proto.o scenegraph/vrml_route.o scenegraph/vrml_script.o scenegraph/vrml_smjs.o scenegraph/vrml_tools.o scenegraph/x3d_nodes.o scenegraph/svg_attributes.o scenegraph/svg_types.o scenegraph/svg_smjs.o scenegraph/smil_anim.o scenegraph/smil_timing.o scenegraph/svg_properties.o scenegraph/dom_events.o  scenegraph/dom_smjs.o scenegraph/xbl_process.o scenegraph/xml_ns.o scenegraph/html5_media_smjs.o scenegraph/html5_mse_smjs.o scenegraph/webvtt_smjs.o
 
-## libgpac objects gathering: src/mcrypt
-LIBGPAC_MCRYPT=
-ifeq ($(DISABLE_MCRYPT), no)
-LIBGPAC_MCRYPT+=mcrypt/cbc.o mcrypt/cfb.o mcrypt/ctr.o mcrypt/des.o mcrypt/ecb.o mcrypt/g_crypt.o mcrypt/ncfb.o mcrypt/nofb.o mcrypt/ofb.o mcrypt/rijndael-128.o mcrypt/rijndael-192.o mcrypt/rijndael-256.o mcrypt/stream.o mcrypt/tripledes.o 
+## libgpac objects gathering: src/crypto
+LIBGPAC_CRYPTO=
+ifeq ($(DISABLE_CRYPTO), no)
+LIBGPAC_CRYPTO+=crypto/g_crypt.o crypto/g_crypt_openssl.o crypto/g_crypt_tinyaes.o crypto/tiny_aes.o
 endif
 
 ## libgpac objects gathering: src/media tools
-LIBGPAC_MEDIATOOLS=media_tools/isom_tools.o media_tools/dash_segmenter.o media_tools/av_parsers.o
+LIBGPAC_MEDIATOOLS=media_tools/isom_tools.o media_tools/dash_segmenter.o media_tools/av_parsers.o media_tools/atsc_dmx.o
+
 ifeq ($(DISABLE_AV_PARSERS), no)
 LIBGPAC_MEDIATOOLS+=media_tools/img.o
 endif
@@ -118,7 +119,7 @@
 ifeq ($(DISABLE_OGG), no)
 LIBGPAC_MEDIATOOLS+=media_tools/gpac_ogg.o
 endif
-ifeq ($(DISABLE_MCRYPT), no)
+ifeq ($(DISABLE_CRYPTO), no)
 LIBGPAC_MEDIATOOLS+=media_tools/ismacryp.o
 endif
 ifeq ($(DISABLE_ISOFF_HINT), no)
@@ -204,7 +205,7 @@
 endif
 
 ## libgpac objects gathering: 
-OBJS=$(LIBGPAC_UTILS) $(LIBGPAC_MCRYPT) $(LIBGPAC_SCENE) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ISOM) $(LIBGPAC_ODF) $(LIBGPAC_MEDIATOOLS) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) $(LIBGPAC_COMPOSITOR) $(LIBGPAC_LASER)
+OBJS=$(LIBGPAC_UTILS) $(LIBGPAC_CRYPTO) $(LIBGPAC_SCENE) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ISOM) $(LIBGPAC_ODF) $(LIBGPAC_MEDIATOOLS) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) $(LIBGPAC_COMPOSITOR) $(LIBGPAC_LASER)
 
 SCENEGRAPH_CFLAGS=
 MEDIATOOLS_CFLAGS=$(JS_FLAGS)
@@ -235,6 +236,7 @@
 EXTRALIBS+= -lrt
 endif
 
+
 SRCS := $(OBJS:.o=.c) 
 
 all: lib
@@ -242,8 +244,8 @@
 lib: ../bin/gcc/$(LIB)
 
 #there's a bunch of warnings in there, get rid of them
-mcrypt: CFLAGS= $(OPTFLAGS) -w -I"$(SRC_PATH)/include"
-mcrypt: $(LIBGPAC_MCRYPT)
+crypto: CFLAGS= $(OPTFLAGS) -w -I"$(SRC_PATH)/include"
+crypto: $(LIBGPAC_CRYPTO)
 
 scenegraph: CFLAGS += $(SCENEGRAPH_CFLAGS)
 scenegraph: $(LIBGPAC_SCENE)
@@ -261,7 +263,7 @@
 .deps/compositor/%: CFLAGS += $(COMPOSITOR_CFLAGS)
 
 
-../bin/gcc/$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph media_tools mcrypt $(OBJS)
+../bin/gcc/$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph media_tools crypto $(OBJS)
 	@echo "OBJS $(OBJS)"
 	@echo "LIBS $(EXTRALIBS)"

gpac-0.7.1.tar.gz/src/bifs/field_decode.c -> gpac-0.8.0.tar.gz/src/bifs/field_decode.c Changed

gpac-0.7.1.tar.gz/src/bifs/field_encode.c -> gpac-0.8.0.tar.gz/src/bifs/field_encode.c Changed

gpac-0.7.1.tar.gz/src/compositor/audio_input.c -> gpac-0.8.0.tar.gz/src/compositor/audio_input.c Changed

gpac-0.7.1.tar.gz/src/compositor/audio_mixer.c -> gpac-0.8.0.tar.gz/src/compositor/audio_mixer.c Changed

@@ -26,7 +26,7 @@
 #include <gpac/internal/compositor_dev.h>
 
 /*max number of channels we support in mixer*/
-#define GF_SR_MAX_CHANNELS	16
+#define GF_SR_MAX_CHANNELS	24
 
 /*
 	Notes about the mixer:
@@ -102,6 +102,7 @@
 	return am->must_reconfig;
 }
 
+GF_EXPORT
 void gf_mixer_del(GF_AudioMixer *am)
 {
 	gf_mixer_remove_all(am);
@@ -303,11 +304,25 @@
 			if ((count==1) && (max_channels!=in->src->chan)) {
 				cfg_changed = 1;
 				max_channels = in->src->chan;
-				if (in->src->chan>2) ch_cfg |= in->src->ch_cfg;
-			} else if (max_channels < in->src->chan) {
-				cfg_changed = 1;
-				max_channels = in->src->chan;
-				if (in->src->chan>2) ch_cfg |= in->src->ch_cfg;
+				if (in->src->forced_layout)
+					ch_cfg |= in->src->ch_cfg;
+			}
+			else {
+				u32 nb_ch = in->src->chan;
+				if (in->src->forced_layout) {
+					u32 cfg = in->src->ch_cfg;
+					nb_ch = 0;
+					while (cfg) {
+						nb_ch++;
+						cfg >>= 1;
+					}
+					ch_cfg |= in->src->ch_cfg;
+				}
+				if (max_channels < nb_ch) {
+					cfg_changed = 1;
+					max_channels = nb_ch;
+					if (nb_ch > 2) ch_cfg |= in->src->ch_cfg;
+				}
 			}
 		}
 
@@ -316,7 +331,7 @@
 		/*cfg has changed, we must reconfig everything*/
 		if (cfg_changed || (max_sample_rate != am->sample_rate) ) {
 			in->has_prev = GF_FALSE;
-			memset(&in->last_channels, 0, sizeof(s16)*GF_SR_MAX_CHANNELS);
+			memset(&in->last_channels, 0, sizeof(s32)*GF_SR_MAX_CHANNELS);
 		}
 	}
 
@@ -364,13 +379,30 @@
 }
 
 /*this is crude, we'd need a matrix or something*/
-static GFINLINE void gf_mixer_map_channels(s32 *inChan, u32 nb_in, u32 in_cfg, u32 nb_out, u32 out_cfg)
+static GFINLINE void gf_mixer_map_channels(s32 *inChan, u32 nb_in, u32 in_cfg, Bool forced_layout, u32 nb_out, u32 out_cfg)
 {
 	u32 i;
 	if (nb_in==1) {
 		/*mono to stereo*/
 		if (nb_out==2) {
-			inChan[1] = inChan[0];
+			//layout forced, don't copy
+			if (in_cfg && forced_layout) {
+				u32 idx = 0;
+				while (1) {
+					in_cfg >>= 1;
+					if (!in_cfg) break;
+					idx++;
+				}
+				if (idx) {
+//					inChan[idx] = inChan[0];
+//					inChan[0] = 0;
+					inChan[1] = inChan[0];
+				} else {
+					inChan[1] = inChan[0];
+				}
+			} else {
+				inChan[1] = inChan[0];
+			}
 		}
 		else if (nb_out>2) {
 			/*if center channel use it (we assume we always have stereo channels)*/
@@ -460,15 +492,22 @@
 	}
 }
 
+static GFINLINE s32 make_s24_int(u8 *ptr) 
+{
+	s16 res = * (s16 *) (ptr+1);
+	return (((s32)res) << 8 ) | ptr[0];
+}
 
 static void gf_mixer_fetch_input(GF_AudioMixer *am, MixerInput *in, u32 audio_delay)
 {
 	u32 i, j, in_ch, out_ch, prev, next, src_samp, ratio, src_size;
 	Bool use_prev;
-	s16 *in_s16;
-	s8 *in_s8;
+	s32 *in_s32 = NULL;
+	s16 *in_s16 = NULL;
+	s8 *in_s24 = NULL;
+	s8 *in_s8 = NULL;
 	s32 frac, inChan[GF_SR_MAX_CHANNELS], inChanNext[GF_SR_MAX_CHANNELS];
-
+	
 	in_s8 = (s8 *) in->src->FetchFrame(in->src->callback, &src_size, audio_delay);
 	if (!in_s8 || !src_size) {
 		in->has_prev = GF_FALSE;
@@ -476,15 +515,20 @@
 		in->out_samples_to_write = 0;
 		return;
 	}
-
+	
 	ratio = (u32) (in->src->samplerate * FIX2INT(255*in->speed) / am->sample_rate);
 	src_samp = (u32) (src_size * 8 / in->src->bps / in->src->chan);
 	in_ch = in->src->chan;
 	out_ch = am->nb_channels;
-	if (in->src->bps == 8) {
-		in_s16 = NULL;
-	} else {
-		in_s16 = (s16 *) in_s8;
+	if (in->src->bps == 16) {
+		in_s16 = (s16 *)in_s8;
+		in_s8 = NULL;
+	}
+	else if (in->src->bps == 24) {
+		in_s24 = (s8 *)in_s8;
+		in_s8 = NULL;
+	} else if (in->src->bps == 32) {
+		in_s32 = (s32 *)in_s8;
 		in_s8 = NULL;
 	}
 
@@ -492,13 +536,14 @@
 	interpolate audio*/
 	if (src_samp==1) {
 		in->has_prev = GF_TRUE;
-		for (j=0; j<in_ch; j++) in->last_channels[j] = in_s16 ? in_s16[j] : in_s8[j];
+		for (j=0; j<in_ch; j++) in->last_channels[j] = in_s32 ? in_s32[j] : (in_s24 ? make_s24_int(&in_s24[3*j]) : (in_s16 ? in_s16[j] : in_s8[j] ) );
 		in->in_bytes_used = src_size;
 		return;
 	}
 
 	/*while space to fill and input data, convert*/
 	use_prev = in->has_prev;
+	memset(inChan, 0, sizeof(s32)*GF_SR_MAX_CHANNELS);
 	memset(inChanNext, 0, sizeof(s32)*GF_SR_MAX_CHANNELS);
 	i = 0;
 	next = prev = 0;
@@ -512,11 +557,23 @@
 		if (use_prev && prev)
 			use_prev = GF_FALSE;
 
-		if (in_s16) {
-			for (j=0; j<in_ch; j++) {
+		if (in_s32) {
+			for (j = 0; j < in_ch; j++) {
+				inChan[j] = use_prev ? in->last_channels[j] : in_s32[in_ch*prev + j];
+				inChanNext[j] = in_s32[in_ch*next + j];
+				inChan[j] = (frac*inChanNext[j] + (255 - frac)*inChan[j]) / 255;
+			}
+		} else if (in_s24) {
+			for (j = 0; j<in_ch; j++) {
+				inChan[j] = use_prev ? in->last_channels[j] : make_s24_int(&in_s24[3*(in_ch*prev + j)]);
+				inChanNext[j] = make_s24_int(&in_s24[3*(in_ch*next + j)]);
+				inChan[j] = (frac*inChanNext[j] + (255 - frac)*inChan[j]) / 255;
+			}
+		} else if (in_s16) {
+			for (j = 0; j<in_ch; j++) {
 				inChan[j] = use_prev ? in->last_channels[j] : in_s16[in_ch*prev + j];
 				inChanNext[j] = in_s16[in_ch*next + j];
-				inChan[j] = (frac*inChanNext[j] + (255-frac)*inChan[j]) / 255;
+				inChan[j] = (frac*inChanNext[j] + (255 - frac)*inChan[j]) / 255;
 			}
 		} else {
 			for (j=0; j<in_ch; j++) {
@@ -525,11 +582,17 @@
 				inChan[j] = (frac*inChanNext[j] + (255-frac)*inChan[j]) / 255;
 			}
 		}
-
-		gf_mixer_map_channels(inChan, in_ch, in->src->ch_cfg, out_ch, am->channel_cfg);
-		//Fixe me - we nee to uderstand how to map pan from N channels to K channels ...
-		for (j=0; j<out_ch ; j++) {
-			*(in->ch_buf[j] + in->out_samples_written) = (s32) (inChan[j] * FIX2INT(100*in->pan[j]) / 100 );
+		//map inChannel to the output channel config
+		gf_mixer_map_channels(inChan, in_ch, in->src->ch_cfg, in->src->forced_layout, out_ch, am->channel_cfg);
+		//don't apply pan when forced layout is used
+		if (!in->src->forced_layout) {
+			for (j=0; j<out_ch ; j++) {
+				*(in->ch_buf[j] + in->out_samples_written) = (s32) (inChan[j] * FIX2INT(100*in->pan[j]) / 100 );
+			}
+		} else {
+			for (j=0; j<out_ch ; j++) {
+				*(in->ch_buf[j] + in->out_samples_written) = (s32) inChan[j];
+			}
 		}
 
 		in->out_samples_written ++;
@@ -559,7 +622,7 @@
 				idx = (prev>=src_samp) ? in_ch*(src_samp-1) : in_ch*prev;
 				for (j=0; j<in_ch; j++) {
 					assert(idx + j < src_size/2);
-					in->last_channels[j] = in_s16 ? in_s16[idx + j] : in_s8[idx + j];
+					in->last_channels[j] = in_s32 ? in_s32[idx + j] : (in_s24 ? make_s24_int(&in_s24[3*(idx + j)]) : (in_s16 ? in_s16[idx + j] : in_s8[idx + j]) );
 				}
 			}
 		}
@@ -757,15 +820,38 @@
 
 	nb_written = 0;
 	for (i=0; i<count; i++) {
+		u32 k;
 		out_mix = am->output;
 		in = (MixerInput *)gf_list_get(am->sources, i);
 		if (!in->out_samples_to_write) continue;
 		/*only write what has been filled in the source buffer (may be less than output size)*/
-		for (j=0; j<in->out_samples_written; j++) {
-			u32 k;
-			for (k=0; k<am->nb_channels; k++) {
-				(*out_mix) += * (in->ch_buf[k] + j);
-				out_mix += 1;
+		if (am->bits_per_sample > in->src->bps) {
+			s32 mul = am->bits_per_sample - in->src->bps;
+			for (j = 0; j < in->out_samples_written; j++) {
+				for (k = 0; k < am->nb_channels; k++) {
+					s32 res = *(in->ch_buf[k] + j);
+					res <<= mul;
+					(*out_mix) += res;
+					out_mix += 1;
+				}
+			}
+		}
+		else if (am->bits_per_sample < in->src->bps) {
+			s32 div = in->src->bps - am->bits_per_sample;
+			for (j = 0; j < in->out_samples_written; j++) {
+				for (k = 0; k < am->nb_channels; k++) {
+					s32 res = *(in->ch_buf[k] + j);
+					res >>= div;
+					(*out_mix) += res;
+					out_mix += 1;
+				}
+			}
+		} else {
+			for (j = 0; j < in->out_samples_written; j++) {
+				for (k = 0; k < am->nb_channels; k++) {
+					(*out_mix) += *(in->ch_buf[k] + j);
+					out_mix += 1;
+				}
 			}
 		}
 		if (nb_written < in->out_samples_written) nb_written = in->out_samples_written;
@@ -776,13 +862,44 @@
 		return 0;
 	}
 
+	//TODO big-endian support (output is assumed to be little endian PCM)
+
 	//we do not re-normalize based on the numbner of input, this is the author's responsability
 	out_mix = am->output;
-	if (am->bits_per_sample==16) {
-		s16 *out_s16 = (s16 *) buffer;
-		for (i=0; i<nb_written; i++) {
-			for (j=0; j<am->nb_channels; j++) {
-				s32 samp = (*out_mix );
+	if (am->bits_per_sample == 32) {
+		s32 *out_s32 = (s32 *)buffer;
+		for (i = 0; i < nb_written; i++) {
+			for (j = 0; j < am->nb_channels; j++) {
+				s32 samp = (*out_mix);
+				(*out_s32) = samp;
+				out_s32 += 1;
+				out_mix += 1;
+			}
+		}
+	}
+	else if (am->bits_per_sample == 24) {
+#define GF_S24_MAX	8388607
+#define GF_S24_MIN	-8388608
+		s8 *out_s24 = (s8 *)buffer;
+		for (i = 0; i<nb_written; i++) {
+			for (j = 0; j<am->nb_channels; j++) {
+				s32 samp = (*out_mix);
+				u8 lsb;
+				if (samp > GF_S24_MAX) samp = GF_S24_MAX;
+				else if (samp < GF_S24_MIN) samp = GF_S24_MIN;
+				lsb = (samp) & 0xFF;
+				samp >>= 8;
+				*((s16 *)&out_s24[1]) = (s16)samp;
+				out_s24[0] = lsb;
+				out_s24 += 3;
+				out_mix += 1;
+			}
+		}
+	} else if (am->bits_per_sample == 16) {
+		s16 *out_s16 = (s16 *)buffer;
+		for (i = 0; i<nb_written; i++) {
+			for (j = 0; j<am->nb_channels; j++) {
+				s32 samp = (*out_mix);
 				if (samp > GF_SHORT_MAX) samp = GF_SHORT_MAX;
 				else if (samp < GF_SHORT_MIN) samp = GF_SHORT_MIN;
 				(*out_s16) = samp;
@@ -790,7 +907,8 @@
 				out_mix += 1;
 			}
 		}
-	} else {
+	}
+	else {
 		s8 *out_s8 = (s8 *) buffer;
 		for (i=0; i<nb_written; i++) {
 			for (j=0; j<am->nb_channels; j++) {

gpac-0.7.1.tar.gz/src/compositor/audio_render.c -> gpac-0.8.0.tar.gz/src/compositor/audio_render.c Changed

@@ -229,13 +229,38 @@
 static GF_Err gf_ar_setup_output_format(GF_AudioRenderer *ar)
 {
 	GF_Err e;
+	const char *opt;
+	Bool skip_hw_config = GF_FALSE;
 	u32 freq, nb_bits, nb_chan, ch_cfg;
 	u32 in_ch, in_cfg, in_bps, in_freq;
 
-	gf_mixer_get_config(ar->mixer, &freq, &nb_chan, &nb_bits, &ch_cfg);
+	freq = nb_bits = nb_chan = ch_cfg = 0;
+	opt = gf_cfg_get_key(ar->user->config, "Audio", "ForceFrequency");
+	if (!opt) gf_cfg_set_key(ar->user->config, "Audio", "ForceFrequency", "0");
+	else freq = atoi(opt);
+	opt = gf_cfg_get_key(ar->user->config, "Audio", "ForceChannels");
+	if (!opt) gf_cfg_set_key(ar->user->config, "Audio", "ForceChannels", "0");
+	else nb_chan = atoi(opt);
+	opt = gf_cfg_get_key(ar->user->config, "Audio", "ForceLayout");
+	if (!opt) gf_cfg_set_key(ar->user->config, "Audio", "ForceLayout", "0");
+	else {
+		if (!strnicmp(opt, "0x", 2)) sscanf(opt+2, "%x", &ch_cfg);
+		else sscanf(opt, "%x", &ch_cfg);
+    }
+	opt = gf_cfg_get_key(ar->user->config, "Audio", "ForceBPS");
+	if (!opt) gf_cfg_set_key(ar->user->config, "Audio", "ForceBPS", "0");
+	else nb_bits = atoi(opt);
+
+	if (!freq || !nb_bits || !nb_chan || !ch_cfg) {
+		gf_mixer_get_config(ar->mixer, &freq, &nb_chan, &nb_bits, &ch_cfg);
+
+		/*user disabled multichannel audio*/
+		if (ar->disable_multichannel && (nb_chan>2) ) nb_chan = 2;
+	} else {
+		if (ar->config_forced) skip_hw_config = GF_TRUE;
+		else ar->config_forced++;
+	}
 
-	/*user disabled multichannel audio*/
-	if (ar->disable_multichannel && (nb_chan>2) ) nb_chan = 2;
 
 	in_ch = nb_chan;
 	in_cfg = ch_cfg;
@@ -262,8 +287,10 @@
 			ar->filter_chain.enable_filters = GF_FALSE;
 			e = ar->audio_out->ConfigureOutput(ar->audio_out, &freq, &nb_chan, &nb_bits, ch_cfg);
 		}
-	} else {
+	} else if (!skip_hw_config) {
 		e = ar->audio_out->ConfigureOutput(ar->audio_out, &freq, &nb_chan, &nb_bits, ch_cfg);
+	} else {
+		e = GF_OK;
 	}
 
 	if (e) {
@@ -276,15 +303,15 @@
 		}
 		if (e) return e;
 	}
-	gf_mixer_set_config(ar->mixer, freq, nb_chan, nb_bits, in_cfg);
-	ar->audio_delay = ar->audio_out->GetAudioDelay(ar->audio_out);
-
-	ar->audio_out->SetVolume(ar->audio_out, ar->volume);
-	ar->audio_out->SetPan(ar->audio_out, ar->pan);
 
 	ar->time_at_last_config = ar->current_time;
 	ar->bytes_requested = 0;
 	ar->bytes_per_second = freq * nb_chan * nb_bits / 8;
+	gf_mixer_set_config(ar->mixer, freq, nb_chan, nb_bits, in_cfg);
+
+	ar->audio_delay = ar->audio_out->GetAudioDelay(ar->audio_out);
+	ar->audio_out->SetVolume(ar->audio_out, ar->volume);
+	ar->audio_out->SetPan(ar->audio_out, ar->pan);
 
 	if (ar->audio_listeners) {
 		u32 k=0;
@@ -322,7 +349,8 @@
 {
 	u32 written;
 	GF_AudioRenderer *ar = (GF_AudioRenderer *) ptr;
-	if (!ar->need_reconfig) {
+	//we are configured (ar->bytes_per_second != 0) and don't need reconfig
+	if (!ar->need_reconfig && ar->bytes_per_second) {
 		u32 delay_ms = ar->disable_resync ?	0 : ar->audio_delay;
 
 		if (ar->Frozen) {
@@ -387,6 +415,8 @@
 		}
 		//always return buffer size (eg requested input size to be filled), since the clock is always increased by buffer_size (cf above line)
 		return buffer_size;
+	} else {
+		memset(buffer, 0, buffer_size);
 	}
 	return 0;
 }

gpac-0.7.1.tar.gz/src/compositor/compositor.c -> gpac-0.8.0.tar.gz/src/compositor/compositor.c Changed

@@ -35,6 +35,8 @@
 #include "visual_manager.h"
 #include "texturing.h"
 
+static void gf_sc_recompute_ar(GF_Compositor *compositor, GF_Node *top_node);
+
 #define SC_DEF_WIDTH	320
 #define SC_DEF_HEIGHT	240
 
@@ -175,12 +177,14 @@
 			GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Changing display size to %d x %d\n", compositor->new_width, compositor->new_height));
 			fs_width = fs_height = 0;
 			if (restore_fs) {
+#if defined(GPAC_ANDROID) || defined(GPAC_IPHONE)
 				if ((compositor->new_width>compositor->display_width) || (compositor->new_height>compositor->display_height)) {
 					u32 w = compositor->display_width;
 					compositor->display_width = compositor->display_height;
 					compositor->display_height = w;
 					compositor->recompute_ar = 1;
 				}
+#endif
 				fs_width = compositor->display_width;
 				fs_height = compositor->display_height;
 			}
@@ -514,6 +518,20 @@
 
 	compositor->scene_sampled_clock = 0;
 	compositor->video_th_id = gf_th_id();
+
+	gf_sc_set_option(compositor, GF_OPT_RELOAD_CONFIG, 1);
+	compositor->display_width = 320;
+	compositor->display_height = 240;
+	compositor->recompute_ar = GF_TRUE;
+	compositor->scene_sampled_clock = 0;
+	if (compositor->autoconfig_opengl || compositor->hybrid_opengl)
+		gf_sc_recompute_ar(compositor, NULL);
+
+	/*try to load GL extensions*/
+#ifndef GPAC_DISABLE_3D
+	gf_sc_load_opengl_extensions(compositor, GF_FALSE);
+#endif
+
 	return GF_OK;
 }
 
@@ -562,6 +580,7 @@
 	return 0;
 }
 
+GF_EXPORT
 GF_Compositor *gf_sc_new(GF_User *user, Bool self_threaded, GF_Terminal *term)
 {
 	GF_Err e;
@@ -629,21 +648,17 @@
 	if ((tmp->user->init_flags & GF_TERM_NO_REGULATION) || !tmp->VisualThread)
 		tmp->no_regulation = GF_TRUE;
 	
-	/*try to load GL extensions*/
-#ifndef GPAC_DISABLE_3D
-	gf_sc_load_opengl_extensions(tmp, GF_FALSE);
-#endif
-
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTI, ("[RTI]\tCompositor Cycle Log\tNetworks\tDecoders\tFrame\tDirect Draw\tVisual Config\tEvent\tRoute\tSMIL Timing\tTime node\tTexture\tSMIL Anim\tTraverse setup\tTraverse (and direct Draw)\tTraverse (and direct Draw) without anim\tIndirect Draw\tTraverse And Draw (Indirect or Not)\tFlush\tCycle\n"));
 	return tmp;
 }
 
-
+GF_EXPORT
 void gf_sc_del(GF_Compositor *compositor)
 {
 	if (!compositor) return;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Destroying\n"));
+	compositor->discard_input_events = GF_TRUE;
 	gf_sc_lock(compositor, GF_TRUE);
 
 	if (compositor->VisualThread) {
@@ -752,6 +767,7 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Destroyed\n"));
 }
 
+GF_EXPORT
 void gf_sc_set_fps(GF_Compositor *compositor, Double fps)
 {
 	if (fps) {
@@ -786,6 +802,7 @@
 	}
 }
 
+GF_EXPORT
 u32 gf_sc_get_clock(GF_Compositor *compositor)
 {
 	if (!compositor->bench_mode) {
@@ -794,6 +811,7 @@
 	return compositor->scene_sampled_clock;
 }
 
+GF_EXPORT
 GF_Err gf_sc_set_scene_size(GF_Compositor *compositor, u32 Width, u32 Height, Bool force_size)
 {
 	if (!Width || !Height) {
@@ -964,7 +982,11 @@
 	if (!compositor) return GF_BAD_PARAM;
 
 	gf_sc_lock(compositor, 1);
-	GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, (scene_graph ? "[Compositor] Attaching new scene\n" : "[Compositor] Detaching scene\n"));
+	if (scene_graph && !compositor->scene) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Attaching new scene\n"));
+	} else if (!scene_graph && compositor->scene) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Detaching scene\n"));
+	}
 
 	if (compositor->audio_renderer && (compositor->scene != scene_graph)) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Reseting audio compositor\n"));
@@ -1277,7 +1299,11 @@
 		sOpt = (compositor->video_out->max_screen_bpp > 8) ? "no" : "yes";
 		gf_cfg_set_key(compositor->user->config, "Compositor", "Output8bit", sOpt);
 	}
-	if (sOpt && !strcmp(sOpt, "yes")) compositor->output_as_8bit = GF_TRUE;
+	if (compositor->video_out->max_screen_bpp <= 8) {
+		if (sOpt && !strcmp(sOpt, "yes")) compositor->output_as_8bit = GF_TRUE;
+	} else if (sOpt && !strcmp(sOpt, "forced")) {
+		compositor->output_as_8bit = GF_TRUE;
+	}
 
 	if (compositor->audio_renderer) {
 		sOpt = gf_cfg_get_key(compositor->user->config, "Audio", "NoResync");
@@ -1494,6 +1520,28 @@
 	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "ReverseViews");
 	if (sOpt && !strcmp(sOpt, "yes")) compositor->visual->reverse_views = 1;
 
+	compositor->tile_visibility_nb_tests = 30;
+	compositor->tile_visibility_threshold = 0;
+	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "TileVisibilityTest");
+	if (!sOpt || !strstr(sOpt, "-")) {
+		gf_cfg_set_key(compositor->user->config, "Compositor", "TileVisibilityTest", "30-0");
+	} else {
+		sscanf(sOpt, "%u-%u", &compositor->tile_visibility_nb_tests, &compositor->tile_visibility_threshold);
+	}
+
+	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "TileVisibilityDebug");
+	if (!sOpt) {
+		gf_cfg_set_key(compositor->user->config, "Compositor", "TileVisibilityDebug", "no");
+	} else if (!strcmp(sOpt, "yes")) {
+		compositor->tile_visibility_debug = GF_TRUE;
+	}
+	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "TileVisibilityForced");
+	if (!sOpt) {
+		gf_cfg_set_key(compositor->user->config, "Compositor", "TileVisibilityForced", "no");
+	} else if (!strcmp(sOpt, "yes")) {
+		compositor->force_all_tiles_visible = GF_TRUE;
+	}
+
 #endif //GPAC_DISABLE_3D
 
 
@@ -1546,6 +1594,11 @@
 
 #endif
 
+	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "SimulateGaze");
+	if (!sOpt) gf_cfg_set_key(compositor->user->config, "Compositor", "SimulateGaze", "no");
+	compositor->simulate_gaze = (sOpt && !strcmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
+	if (compositor->simulate_gaze) compositor->gazer_enabled = GF_TRUE;
+
 
 	gf_sc_reset_graphics(compositor);
 	gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
@@ -1816,6 +1869,7 @@
 	return 1;
 }
 
+GF_EXPORT
 u32 gf_sc_get_option(GF_Compositor *compositor, u32 type)
 {
 	switch (type) {
@@ -1916,6 +1970,7 @@
 	}
 }
 
+GF_EXPORT
 void gf_sc_map_point(GF_Compositor *compositor, s32 X, s32 Y, Fixed *bifsX, Fixed *bifsY)
 {
 	/*coordinates are in user-like OS....*/
@@ -2021,6 +2076,7 @@
 	return fps;
 }
 
+GF_EXPORT
 void gf_sc_register_time_node(GF_Compositor *compositor, GF_TimeNode *tn)
 {
 	/*may happen with DEF/USE */
@@ -2029,13 +2085,15 @@
 	gf_list_add(compositor->time_nodes, tn);
 	tn->is_registered = 1;
 }
+
+GF_EXPORT
 void gf_sc_unregister_time_node(GF_Compositor *compositor, GF_TimeNode *tn)
 {
 	gf_list_del_item(compositor->time_nodes, tn);
 }
 
 
-
+GF_EXPORT
 GF_Node *gf_sc_pick_node(GF_Compositor *compositor, s32 X, s32 Y)
 {
 	return NULL;
@@ -2336,6 +2394,7 @@
 	gf_sc_lock(compositor, 1);
 }
 
+GF_EXPORT
 void gf_sc_render_frame(GF_Compositor *compositor)
 {
 #ifndef GPAC_DISABLE_SCENEGRAPH
@@ -2439,6 +2498,9 @@
 	compositor->ms_until_next_frame = GF_INT_MAX;
 	frame_duration = compositor->frame_duration;
 
+	if (compositor->auto_rotate) 
+		compositor_handle_auto_navigation(compositor);
+
 #ifndef GPAC_DISABLE_LOG
 	texture_time = gf_sys_clock();
 #endif
@@ -2469,6 +2531,7 @@
 		return;
 	}
 
+	compositor->force_late_frame_draw = GF_FALSE;
 
 #ifndef GPAC_DISABLE_LOG
 	texture_time = gf_sys_clock() - texture_time;
@@ -3023,7 +3086,7 @@
 static Bool gf_sc_on_event_ex(GF_Compositor *compositor , GF_Event *event, Bool from_user)
 {
 	/*not assigned yet*/
-	if (!compositor || !compositor->visual) return GF_FALSE;
+	if (!compositor || !compositor->visual || compositor->discard_input_events) return GF_FALSE;
 	/*we're reconfiguring the video output, cancel all messages except GL reconfig (context lost)*/
 	if (compositor->msg_type & GF_SR_IN_RECONFIG) {
 		if (event->type==GF_EVENT_VIDEO_SETUP) {
@@ -3170,6 +3233,9 @@
 			event->message.message = NULL;
 		}
 		break;
+	case GF_EVENT_SYNC_LOST:
+		compositor->force_late_frame_draw = GF_TRUE;
+		break;
 	/*when we process events we don't forward them to the user*/
 	default:
 		return gf_term_send_event(compositor->term, event);
@@ -3183,6 +3249,7 @@
 	return gf_sc_on_event_ex((GF_Compositor *)cbck, event, GF_FALSE);
 }
 
+GF_EXPORT
 Bool gf_sc_user_event(GF_Compositor *compositor, GF_Event *event)
 {
 	switch (event->type) {

gpac-0.7.1.tar.gz/src/compositor/compositor_2d.c -> gpac-0.8.0.tar.gz/src/compositor/compositor_2d.c Changed

gpac-0.7.1.tar.gz/src/compositor/compositor_node_init.c -> gpac-0.8.0.tar.gz/src/compositor/compositor_node_init.c Changed

gpac-0.7.1.tar.gz/src/compositor/events.c -> gpac-0.8.0.tar.gz/src/compositor/events.c Changed

@@ -1003,7 +1003,6 @@
 		gf_sc_reset_collide_cursor(compositor);
 	}
 	if (res) {
-#if 1
 		GF_SceneGraph *sg;
 		/*apply event cascade - this is needed for cases where several events are processed inbetween
 		2 simulation tick. If we don't flush the routes stack, the result will likely be wrong
@@ -1013,7 +1012,6 @@
 		while ((sg = (GF_SceneGraph*)gf_list_enum(compositor->extra_scenes, &i))) {
 			gf_sg_activate_routes(sg);
 		}
-#endif
 		return 1;
 	}
 	return GF_FALSE;
@@ -1995,6 +1993,23 @@
 	Bool switch_coords = GF_FALSE;
 	Bool ret = GF_FALSE;
 	if (evt->type<=GF_EVENT_MOUSEWHEEL) {
+		if (compositor->simulate_gaze) {
+			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)) {
+			if (evt->mouse.x > compositor->visual->camera.proj_vp.width)
+				evt->mouse.x -= FIX2INT(compositor->visual->camera.proj_vp.width);
+			evt->mouse.x *= 2;
+		}
+		else if (compositor->visual->autostereo_type==GF_3D_STEREO_TOP) {
+			if (evt->mouse.y > compositor->visual->camera.proj_vp.height)
+				evt->mouse.y -= FIX2INT(compositor->visual->camera.proj_vp.height);
+			evt->mouse.y *= 2;
+		}
+#endif
+
 		if (compositor->visual->center_coords) {
 			x = evt->mouse.x;
 			y = evt->mouse.y;
@@ -2016,6 +2031,7 @@
 	if (switch_coords) {
 		evt->mouse.x = x;
 		evt->mouse.y = y;
+
 	}
 
 	if (!ret) {

gpac-0.7.1.tar.gz/src/compositor/font_engine.c -> gpac-0.8.0.tar.gz/src/compositor/font_engine.c Changed

gpac-0.7.1.tar.gz/src/compositor/hardcoded_protos.c -> gpac-0.8.0.tar.gz/src/compositor/hardcoded_protos.c Changed

@@ -912,7 +912,6 @@
 
 		memcpy(&backup_cam, tr_state->camera, sizeof(GF_Camera));
 
-
 		camera_invalidate(tr_state->camera);
 		tr_state->camera->is_3D = GF_FALSE;
 		tr_state->camera->flags |= CAM_NO_LOOKAT;
@@ -921,7 +920,7 @@
 
 
 		if (tr_state->traversing_mode == TRAVERSE_SORT) {
-			visual_3d_set_viewport(tr_state->visual, tr_state->camera->vp);
+			visual_3d_set_viewport(tr_state->visual, tr_state->camera->proj_vp);
 			visual_3d_projection_matrix_modified(tr_state->visual);
 
 			gf_node_traverse_children((GF_Node *)&stack->untr, tr_state);
@@ -931,7 +930,7 @@
 
 			visual_3d_projection_matrix_modified(tr_state->visual);
 
-			visual_3d_set_viewport(tr_state->visual, tr_state->camera->vp);
+			visual_3d_set_viewport(tr_state->visual, tr_state->camera->proj_vp);
 		} else if (tr_state->traversing_mode == TRAVERSE_PICK) {
 			Fixed prev_dist = tr_state->visual->compositor->hit_square_dist;
 			GF_Ray r = tr_state->ray;
@@ -1292,7 +1291,7 @@
 	GF_TextureHandler *txh;
 	GF_MediaObjectVRInfo vrinfo;
 	GF_MeshSphereAngles sphere_angles;
-
+	Bool mesh_was_reset = GF_FALSE;
 	GF_TraverseState *tr_state = (GF_TraverseState *)rs;
 	Drawable3D *stack = (Drawable3D *)gf_node_get_private(node);
 
@@ -1310,7 +1309,12 @@
 	if (gf_node_dirty_get(node) || (tr_state->traversing_mode==TRAVERSE_DRAW_3D)) {
 		if (! gf_mo_get_srd_info(txh->stream, &vrinfo))
 			return;
-			
+
+		if (vrinfo.has_full_coverage && tr_state->disable_partial_sphere) {
+			if ((vrinfo.srd_w!=vrinfo.srd_max_x) || (vrinfo.srd_h!=vrinfo.srd_max_y))
+				return;
+		}
+
 		sphere_angles.min_phi = -GF_PI2 + GF_PI * vrinfo.srd_y / vrinfo.srd_max_y;
 		sphere_angles.max_phi = -GF_PI2 + GF_PI * (vrinfo.srd_h + vrinfo.srd_y) / vrinfo.srd_max_y;
 
@@ -1322,7 +1326,7 @@
 			mesh_reset(stack->mesh);
 
 			radius = MAX(vrinfo.scene_width, vrinfo.scene_height) / 4;
-			//may happen that we don't have an scene width/height, use hardcoded 100 units radius (size actually doesn't matter
+			//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;
@@ -1334,67 +1338,120 @@
 				txh->flags &= ~GF_SR_TEXTURE_REPEAT_S;
 				txh->flags &= ~GF_SR_TEXTURE_REPEAT_T;
 			}
+			mesh_was_reset = GF_TRUE;
 			gf_node_dirty_clear(node, GF_SG_NODE_DIRTY);
 		}
 		
 		
 		if (tr_state->traversing_mode==TRAVERSE_DRAW_3D) {
-			GF_Vec center, target, ref;
-			Fixed r, theta_angle, phi_angle;
-			DrawAspect2D asp;
 			Bool visible = GF_FALSE;
-			Fixed center_phi = sphere_angles.min_phi + (sphere_angles.max_phi - sphere_angles.min_phi) / 2;
-			Fixed center_theta = sphere_angles.min_theta + (sphere_angles.max_theta - sphere_angles.min_theta) / 2;
 
-			visual_3d_enable_depth_buffer(tr_state->visual, GF_FALSE);
+			if (! tr_state->camera_was_dirty && !mesh_was_reset) {
+				visible = (stack->mesh->flags & MESH_WAS_VISIBLE) ? GF_TRUE : GF_FALSE;
+			} else if ((vrinfo.srd_w==vrinfo.srd_max_x) && (vrinfo.srd_h==vrinfo.srd_max_y)) {
+				visible = GF_TRUE;
+			}
+			else if (txh->compositor->force_all_tiles_visible) {
+				visible = GF_TRUE;
+			//estimate visibility asap, even if texture not yet ready (we have SRD info):
+			//this allows sending stop commands which will free inactive decoder HW context
+			} else {
+				u32 i, j;
+				u32 nb_visible=0;
+				u32 nb_tests = tr_state->visual->compositor->tile_visibility_nb_tests;
+				u32 min_visible_threshold = tr_state->visual->compositor->tile_visibility_threshold;
+				u32 stride;
+
+				//pick nb_tests vertices spaced every stride in the mesh
+				stride = stack->mesh->v_count;
+				stride /= nb_tests;
+				for (i=0; i<nb_tests; i++) {
+					Bool vis = GF_TRUE;
+					GF_Vec pt = stack->mesh->vertices[i*stride].pos;
+					//check the point is in our frustum - don't test far plane
+					for (j=1; j<6; j++) {
+						Fixed d = gf_plane_get_distance(&tr_state->camera->planes[j], &pt);
+						if (d<0) {
+							vis = GF_FALSE;
+							break;
+						}
+					}
+					if (vis) {
+						nb_visible++;
+						//abort test if more visible points than our threshold
+						if (nb_visible > min_visible_threshold)
+							break;
+					}
+				}
+				if (nb_visible > min_visible_threshold) 
+					visible = GF_TRUE;
+				GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Texture %d Partial sphere is %s - %d sample points visible out of %d\n", txh->stream->OD_ID, visible ? "visible" : "hidden", nb_visible, i));
+			}
+
+			if (visible) {
+				stack->mesh->flags |= MESH_WAS_VISIBLE;
+			} else {
+				stack->mesh->flags &= ~MESH_WAS_VISIBLE;
+			}
 
-			visual_3d_enable_antialias(tr_state->visual, GF_FALSE);
-			visual_3d_draw(tr_state, stack->mesh);
+			if (visible && (vrinfo.srd_w != vrinfo.srd_max_x) && tr_state->visual->compositor->gazer_enabled) {
+				s32 gx, gy;
+				tr_state->visual->compositor->hit_node = NULL;
+				tr_state->visual->compositor->hit_square_dist = 0;
 
-			visual_3d_enable_depth_buffer(tr_state->visual, GF_TRUE);
+				//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) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Texture %d Partial sphere is under gaze coord %d %d\n", txh->stream->OD_ID, tr_state->visual->compositor->gaze_x, tr_state->visual->compositor->gaze_y));
+
+					tr_state->visual->compositor->hit_node = NULL;
+				} else {
+					visible = GF_FALSE;
+				}
 
-			/*notify decoder/network stack on whether the geometry was visible or not (maybe a % of what is visible would be nicer)*/
-			memset(&asp, 0, sizeof(DrawAspect2D));
-			drawable_get_aspect_2d_mpeg4(node, &asp, tr_state);
-		
-			center.y = gf_sin(center_phi);
-			r = gf_sqrt(FIX_ONE - gf_mulfix(center.y, center.y) );
-			center.x = gf_mulfix(r, gf_cos(center_theta) );
-			center.z = gf_mulfix(r, gf_sin(center_theta) );
-			gf_vec_norm(&center);
-
-			ref = center;
-			ref.y = 0;
-			gf_vec_norm(&ref);
-			target = camera_get_target_dir(tr_state->camera);
-			target.y=0;
-			gf_vec_norm(&target);
-			theta_angle = gf_acos( gf_vec_dot(target, ref) );
-			theta_angle-=GF_PI;
-			if (theta_angle<0) theta_angle = -theta_angle;
-
-			ref = center;
-			ref.x = 0;
-			gf_vec_norm(&ref);
-			target = camera_get_target_dir(tr_state->camera);
-			target.x=0;
-			gf_vec_norm(&target);
-			phi_angle = gf_acos( gf_vec_dot(target, ref) );
-			phi_angle-=GF_PI;
-			if (phi_angle<-GF_PI2) phi_angle += GF_PI;
-			
-			if ((theta_angle < tr_state->camera->fieldOfView/2 + (sphere_angles.max_theta-sphere_angles.min_theta)/2)
-				&& (phi_angle < tr_state->camera->fieldOfView/2 + (sphere_angles.max_phi-sphere_angles.min_phi) /2)
-			) {
-				visible = GF_TRUE;
 			}
-			
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Texure %d Partial sphere is %s - Angle center-cam is %.02f h %.02f v\n", txh->stream->OD_ID, visible ? "visible" : "hidden", theta_angle, phi_angle));
 
-			if (visible) {
-				gf_mo_hint_quality_degradation(asp.fill_texture->stream, 0);
+			if (vrinfo.has_full_coverage) {
+				if (visible) {
+					if (!txh->is_open) {
+						GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Texture %d stoped on visible partial sphere - starting it\n", txh->stream->OD_ID));
+						assert(txh->stream && txh->stream->odm);
+						txh->stream->odm->disable_buffer_at_next_play = GF_TRUE;
+
+						gf_sc_texture_play(txh, NULL);
+					}
+					if (txh->data) {
+						visual_3d_enable_depth_buffer(tr_state->visual, GF_FALSE);
+						visual_3d_enable_antialias(tr_state->visual, GF_FALSE);
+						if (!tr_state->visual->compositor->tile_visibility_debug || (vrinfo.srd_w != vrinfo.srd_max_x)) {
+							visual_3d_draw(tr_state, stack->mesh);
+						}
+						visual_3d_enable_depth_buffer(tr_state->visual, GF_TRUE);
+					}
+				} else {
+					if (txh->is_open) {
+						GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Texture %d playing on hidden partial sphere - stoping it\n", txh->stream->OD_ID));
+						gf_sc_texture_stop_no_unregister(txh);
+					}
+				}
 			} else {
-				gf_mo_hint_quality_degradation(asp.fill_texture->stream, 100);
+				if (txh->data) {
+					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->disable_partial_sphere) {
+					if (visible) {
+						gf_mo_hint_quality_degradation(txh->stream, 0);
+					} else {
+						gf_mo_hint_quality_degradation(txh->stream, 100);
+					}
+				}
 			}
 		}
 	}
@@ -1410,6 +1467,183 @@
 	gf_node_set_callback_function(node, TraverseVRGeometry);
 }
 
+#define VRHUD_SCALE	6
+static void TraverseVRHUD(GF_Node *node, void *rs, Bool is_destroy)
+{
+	GF_TraverseState *tr_state = (GF_TraverseState *) rs;
+	GF_Matrix mv_bck, proj_bck, cam_bck;
+	/*SFVec3f target;*/
+	GF_Rect vp, orig_vp;
+	u32 mode, i, cull_bck;
+	Fixed angle_yaw/*, angle_pitch*/;
+	SFVec3f axis;
+	Fixed dlen;
+	GF_Node *subtree = gf_node_get_private(node);
+	if (is_destroy) return;
+
+	if (!tr_state->camera) return;
+	mode = tr_state->visual->compositor->vrhud_mode;
+	if (!mode) return;
+
+	gf_mx_copy(mv_bck, tr_state->model_matrix);
+	gf_mx_copy(cam_bck, tr_state->camera->modelview);
+
+	tr_state->disable_partial_sphere = GF_TRUE;
+	/*target = tr_state->camera->target;*/
+	orig_vp = tr_state->camera->proj_vp;
+
+	//compute pitch (elevation)
+	dlen = tr_state->camera->target.x*tr_state->camera->target.x + tr_state->camera->target.z*tr_state->camera->target.z;
+	dlen = gf_sqrt(dlen);
+	/*angle_pitch = gf_atan2(tr_state->camera->target.y, dlen);*/
+	//compute yaw (rotation Y)
+	angle_yaw = gf_atan2(tr_state->camera->target.z, tr_state->camera->target.x);
+
+	//compute axis for the pitch
+	axis = tr_state->camera->target;
+	axis.y=0;
+	gf_vec_norm(&axis);
+
+	visual_3d_enable_depth_buffer(tr_state->visual, GF_FALSE);
+
+	if (mode==2) {
+		//rear mirror, reverse x-axis on projection
+		tr_state->camera->projection.m[0] *= -1;
+		visual_3d_projection_matrix_modified(tr_state->visual);
+		//inverse backface culling
+		tr_state->reverse_backface = GF_TRUE;
+		vp = orig_vp;
+		vp.width/=VRHUD_SCALE;
+		vp.height/=VRHUD_SCALE;
+		vp.x = orig_vp.x + (orig_vp.width-vp.width)/2;
+		vp.y = orig_vp.y + orig_vp.height-vp.height;
+
+		visual_3d_set_viewport(tr_state->visual, vp);
+
+		gf_mx_add_rotation(&tr_state->model_matrix, GF_PI, tr_state->camera->up.x, tr_state->camera->up.y, tr_state->camera->up.z);
+		gf_node_traverse(subtree, rs);
+		tr_state->camera->projection.m[0] *= -1;
+		visual_3d_projection_matrix_modified(tr_state->visual);
+	} else if (mode==1) {
+		gf_mx_copy(proj_bck, tr_state->camera->projection);
+		gf_mx_init(tr_state->camera->modelview);
+
+		//force projection with PI/2 fov and AR 1:1
+		tr_state->camera->projection.m[0] = -1;
+		tr_state->camera->projection.m[5] = 1;
+		visual_3d_projection_matrix_modified(tr_state->visual);
+		//force cull inside
+		cull_bck = tr_state->cull_flag;
+		tr_state->cull_flag = CULL_INSIDE;
+		//inverse backface culling
+		tr_state->reverse_backface = GF_TRUE;
+
+		//draw 3 viewports, each separated by PI/2 rotation
+		for (i=0; i<3; i++) {
+			vp = orig_vp;
+			vp.height/=VRHUD_SCALE;
+			vp.width=vp.height;
+			//we reverse X in the projection, so reverse the viewports
+			vp.x = orig_vp.x + orig_vp.width/2 - 3*vp.width/2 + (3-i-1)*vp.width;
+			vp.y = orig_vp.y + orig_vp.height - vp.height;
+			visual_3d_set_viewport(tr_state->visual, vp);
+			tr_state->disable_cull = GF_TRUE;
+
+			gf_mx_init(tr_state->model_matrix);
+			gf_mx_add_rotation(&tr_state->model_matrix, angle_yaw-GF_PI, 0, 1, 0);
+			gf_mx_add_rotation(&tr_state->model_matrix, i*GF_PI2, 0, 1, 0);
+
+			gf_node_traverse(subtree, rs);
+		}
+		gf_mx_copy(tr_state->camera->projection, proj_bck);
+		visual_3d_projection_matrix_modified(tr_state->visual);
+		tr_state->cull_flag = cull_bck;
+		gf_mx_copy(tr_state->camera->modelview, cam_bck);
+	}
+	else if ((mode==4) || (mode==3)) {
+		// mirror, reverse x-axis on projection
+		tr_state->camera->projection.m[0] *= -1;
+		visual_3d_projection_matrix_modified(tr_state->visual);
+		//inverse backface culling
+		tr_state->reverse_backface = GF_TRUE;
+
+		//side left view
+		vp = orig_vp;
+		vp.width/=VRHUD_SCALE;
+		vp.height/=VRHUD_SCALE;
+		if (mode==3) {
+			vp.x = orig_vp.x;
+		} else {
+			vp.x = orig_vp.x + orig_vp.width/2 - 2*vp.width;
+		}
+		vp.y = orig_vp.y + orig_vp.height - vp.height;
+		visual_3d_set_viewport(tr_state->visual, vp);
+
+		gf_mx_add_rotation(&tr_state->model_matrix, -2*GF_PI/3, 0, 1, 0);
+
+		gf_node_traverse(subtree, rs);
+
+		//side right view
+		if (mode==3) {
+			vp.x = orig_vp.x + orig_vp.width - vp.width;
+		} else {
+			vp.x = orig_vp.x + orig_vp.width/2+vp.width;
+		}
+		visual_3d_set_viewport(tr_state->visual, vp);
+
+		gf_mx_copy(tr_state->model_matrix, mv_bck);
+		gf_mx_add_rotation(&tr_state->model_matrix, 2*GF_PI/3, 0, 1, 0);
+
+		gf_node_traverse(subtree, rs);
+
+		if (mode==4) {
+			//upper view
+			vp.x = orig_vp.x + orig_vp.width/2 - vp.width;
+			visual_3d_set_viewport(tr_state->visual, vp);
+
+			gf_mx_copy(tr_state->model_matrix, mv_bck);
+			gf_mx_add_rotation(&tr_state->model_matrix, - GF_PI2, -axis.z, 0, axis.x);
+			gf_node_traverse(subtree, rs);
+
+			//down view
+			vp.x = orig_vp.x + orig_vp.width/2;
+			visual_3d_set_viewport(tr_state->visual, vp);
+
+			gf_mx_copy(tr_state->model_matrix, mv_bck);
+			gf_mx_add_rotation(&tr_state->model_matrix, GF_PI2, -axis.z, 0, axis.x);
+
+			gf_node_traverse(subtree, rs);
+		}
+
+		tr_state->camera->projection.m[0] *= -1;
+		visual_3d_projection_matrix_modified(tr_state->visual);
+	}
+
+	//restore camera and VP
+	gf_mx_copy(tr_state->model_matrix, mv_bck);
+	visual_3d_set_viewport(tr_state->visual, orig_vp);
+	visual_3d_enable_depth_buffer(tr_state->visual, GF_TRUE);
+	tr_state->disable_partial_sphere = GF_FALSE;
+	tr_state->reverse_backface = GF_FALSE;
+}
+
+void compositor_init_vrhud(GF_Compositor *compositor, GF_Node *node)
+{
+	GF_Node *n;
+	GF_SceneGraph *sg = gf_node_get_graph(node);
+	sg = gf_sg_get_parent(sg);
+
+	n = gf_sg_find_node_by_name(sg, "DYN_TRANS");
+	if (!n) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Unable to initialize VRHUD group, no main scene\n"));
+	} else {
+		gf_node_set_callback_function(node, TraverseVRHUD);
+		gf_node_proto_set_grouping(node);
+		gf_node_set_private(node, n);
+	}
+}
+
+
 #endif //GPAC_DISABLE_3D
 
 /*hardcoded proto loading - this is mainly used for module development and testing...*/
@@ -1429,22 +1663,26 @@
 if (!url) continue;
 
 #ifndef GPAC_DISABLE_3D
-	if (!strcmp(url, "urn:inet:gpac:builtin:PathExtrusion")) {
-		compositor_init_path_extrusion(compositor, node);
-		return;
-	}
-	if (!strcmp(url, "urn:inet:gpac:builtin:PlanarExtrusion")) {
-		compositor_init_planar_extrusion(compositor, node);
-		return;
-	}
-	if (!strcmp(url, "urn:inet:gpac:builtin:PlaneClipper")) {
-		compositor_init_plane_clipper(compositor, node);
-		return;
-	}
+		if (!strcmp(url, "urn:inet:gpac:builtin:PathExtrusion")) {
+			compositor_init_path_extrusion(compositor, node);
+			return;
+		}
+		if (!strcmp(url, "urn:inet:gpac:builtin:PlanarExtrusion")) {
+			compositor_init_planar_extrusion(compositor, node);
+			return;
+		}
+		if (!strcmp(url, "urn:inet:gpac:builtin:PlaneClipper")) {
+			compositor_init_plane_clipper(compositor, node);
+			return;
+		}
 if (!strcmp(url, "urn:inet:gpac:builtin:VRGeometry")) {
 compositor_init_vr_geometry(compositor, node);
 return;
 }
+ if (!strcmp(url, "urn:inet:gpac:builtin:VRHUD")) {
+ compositor_init_vrhud(compositor, node);
+ return;
+ }
 #endif
 		if (!strcmp(url, "urn:inet:gpac:builtin:TextureText")) {
 			compositor_init_texture_text(compositor, node);
@@ -1486,7 +1724,7 @@
 compositor_init_custom_texture(compositor, node);
 return;
 }
-		
+
 
 		/*check proto modules*/
 		if (compositor->proto_modules) {

gpac-0.7.1.tar.gz/src/compositor/mesh.c -> gpac-0.8.0.tar.gz/src/compositor/mesh.c Changed

gpac-0.7.1.tar.gz/src/compositor/mesh_collide.c -> gpac-0.8.0.tar.gz/src/compositor/mesh_collide.c Changed

@@ -156,7 +156,7 @@
 		res[1] = gf_mulfix(res[1], res[1]);
 		num_pos = aabb_split(mesh, node, 2);
 		res[2] = gf_divfix(INT2FIX(num_pos), INT2FIX(node->nb_idx)) - FIX_ONE/2;
-		res[2] = gf_mulfix(res[2], res[2]);;
+		res[2] = gf_mulfix(res[2], res[2]);
 
 		axis = 0;
 		if (res[1] < res[axis])	axis = 1;
@@ -341,7 +341,7 @@
 			gf_vec_add(*outPoint, ray->orig, *outPoint);
 		}
 		if (outNormal) {
-			IDX_TYPE *idx = &mesh->indices[3*n->indices[inters_idx]];;
+			IDX_TYPE *idx = &mesh->indices[3*n->indices[inters_idx]];
 			if (mesh->flags & MESH_IS_SMOOTHED) {
 				gf_vec_diff(v1, mesh->vertices[idx[1]].pos, mesh->vertices[idx[0]].pos);
 				gf_vec_diff(v2, mesh->vertices[idx[2]].pos, mesh->vertices[idx[0]].pos);
@@ -352,7 +352,7 @@
 			}
 		}
 		if (outTexCoords) {
-			IDX_TYPE *idx = &mesh->indices[3*n->indices[inters_idx]];;
+			IDX_TYPE *idx = &mesh->indices[3*n->indices[inters_idx]];
 			ray_hit_triangle_get_u_v(ray,
 			 &mesh->vertices[idx[0]].pos, &mesh->vertices[idx[1]].pos, &mesh->vertices[idx[2]].pos,
 			 &outTexCoords->x, &outTexCoords->y);

gpac-0.7.1.tar.gz/src/compositor/mpeg4_geometry_2d.c -> gpac-0.8.0.tar.gz/src/compositor/mpeg4_geometry_2d.c Changed

@@ -27,6 +27,7 @@
 
 #include "nodes_stacks.h"
 #include "visual_manager.h"
+#include <gpac/internal/terminal_dev.h>
 
 Bool compositor_get_2d_plane_intersection(GF_Ray *ray, SFVec3f *res)
 {
@@ -318,6 +319,69 @@
 		drawable_mark_modified(stack, tr_state);
 	}
 }
+
+Bool rectangle_check_adaptation(GF_Node *node, Drawable *stack, GF_TraverseState *tr_state)
+{
+	GF_TextureHandler *txh;
+	GF_MediaObjectVRInfo vrinfo;
+	s32 tx, ty;
+	Bool is_visible = GF_FALSE;
+	if (! tr_state->visual->compositor->gazer_enabled)
+		return GF_TRUE;
+
+	if (!tr_state->appear || ! ((M_Appearance *)tr_state->appear)->texture)
+		return GF_TRUE;
+	
+	txh = gf_sc_texture_get_handler( ((M_Appearance *) tr_state->appear)->texture );
+	if (!txh->stream) return GF_TRUE;
+
+	if (! gf_mo_get_srd_info(txh->stream, &vrinfo))
+		return GF_TRUE;
+
+	tx = tr_state->visual->compositor->gaze_x;
+	tx *= vrinfo.srd_max_x;
+	tx /= tr_state->visual->width;
+
+	ty = tr_state->visual->compositor->gaze_y;
+	ty *= vrinfo.srd_max_y;
+	ty /= tr_state->visual->height;
+
+	//simple test condition: only keep the first row
+	if ((tx>=vrinfo.srd_x) && (tx<=vrinfo.srd_x+vrinfo.srd_w) && (ty>=vrinfo.srd_y) && (ty<=vrinfo.srd_y+vrinfo.srd_h)) {
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Texture %d Partial plane is under gaze coord %d %d\n", txh->stream->OD_ID, tr_state->visual->compositor->gaze_x, tr_state->visual->compositor->gaze_y));
+		is_visible = GF_TRUE;
+	}
+
+	if (vrinfo.has_full_coverage) {
+		if (is_visible) {
+			if (!txh->is_open) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Texture %d stoped on visible partial plane - starting it\n", txh->stream->OD_ID));
+				assert(txh->stream && txh->stream->odm);
+				txh->stream->odm->disable_buffer_at_next_play = GF_TRUE;
+
+				gf_sc_texture_play(txh, NULL);
+			}
+			if (! txh->data) return GF_FALSE;
+			return GF_TRUE;
+		} else {
+			if (txh->is_open) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Texure %d playing on hidden partial plane - stoping it\n", txh->stream->OD_ID));
+				gf_sc_texture_stop_no_unregister(txh);
+			}
+			return GF_FALSE;
+		}
+	} else {
+		if (is_visible) {
+			gf_mo_hint_quality_degradation(txh->stream, 0);
+			if (! txh->data) return GF_FALSE;
+		} else {
+			gf_mo_hint_quality_degradation(txh->stream, 100);
+		}
+	}
+	return GF_TRUE;
+}
+
 static void TraverseRectangle(GF_Node *node, void *rs, Bool is_destroy)
 {
 	DrawableContext *ctx;
@@ -331,6 +395,9 @@
 
 	rectangle_check_changes(node, stack, tr_state);
 
+	if (! rectangle_check_adaptation(node, stack, tr_state))
+		return;
+
 	switch (tr_state->traversing_mode) {
 	case TRAVERSE_DRAW_2D:
 		compositor_2d_draw_rectangle(tr_state);

gpac-0.7.1.tar.gz/src/compositor/mpeg4_text.c -> gpac-0.8.0.tar.gz/src/compositor/mpeg4_text.c Changed

gpac-0.7.1.tar.gz/src/compositor/mpeg4_viewport.c -> gpac-0.8.0.tar.gz/src/compositor/mpeg4_viewport.c Changed

gpac-0.7.1.tar.gz/src/compositor/navigate.c -> gpac-0.8.0.tar.gz/src/compositor/navigate.c Changed

@@ -282,7 +282,61 @@
 	return 1;
 }
 
-//#define SCALE_NAV
+static void handle_mouse_move_3d(GF_Compositor *compositor, GF_Camera *cam, u32 keys, Fixed dx, Fixed dy)
+{
+	Fixed trans_scale = cam->width/20;
+	//if default VP is quite far from center use larger dz/dy moves
+	if (cam->vp_dist>100) trans_scale *= 10;
+
+	switch (cam->navigate_mode) {
+	/*FIXME- we'll likely need a "step" value for walk at some point*/
+	case GF_NAVIGATE_WALK:
+	case GF_NAVIGATE_FLY:
+		view_pan_x(compositor, cam, -dx);
+		if (keys & GF_KEY_MOD_CTRL) view_pan_y(compositor, cam, dy);
+		else view_translate_z(compositor, cam, gf_mulfix(dy, trans_scale));
+		break;
+	case GF_NAVIGATE_VR:
+		view_pan_x(compositor, cam, -dx);
+		if (keys & GF_KEY_MOD_CTRL) view_zoom(compositor, cam, dy);
+		else view_pan_y(compositor, cam, dy);
+		break;
+	case GF_NAVIGATE_PAN:
+		view_pan_x(compositor, cam, -dx);
+		if (keys & GF_KEY_MOD_CTRL) view_translate_z(compositor, cam, gf_mulfix(dy, trans_scale));
+		else view_pan_y(compositor, cam, dy);
+		break;
+	case GF_NAVIGATE_SLIDE:
+		view_translate_x(compositor, cam, gf_mulfix(dx, trans_scale));
+		if (keys & GF_KEY_MOD_CTRL) view_translate_z(compositor, cam, gf_mulfix(dy, trans_scale));
+		else view_translate_y(compositor, cam, gf_mulfix(dy, trans_scale));
+		break;
+	case GF_NAVIGATE_EXAMINE:
+		if (keys & GF_KEY_MOD_CTRL) {
+			view_translate_z(compositor, cam, gf_mulfix(dy, trans_scale));
+			view_roll(compositor, cam, gf_mulfix(dx, trans_scale));
+		} else {
+			if (ABS(dx) > ABS(dy)) {
+				view_exam_x(compositor, cam, -gf_mulfix(GF_PI, dx));
+			} else {
+				view_exam_y(compositor, cam, gf_mulfix(GF_PI, dy));
+			}
+		}
+		break;
+	case GF_NAVIGATE_ORBIT:
+		if (keys & GF_KEY_MOD_CTRL) {
+			view_translate_z(compositor, cam, gf_mulfix(dy, trans_scale));
+		} else {
+			view_orbit_x(compositor, cam, -gf_mulfix(GF_PI, dx));
+			view_orbit_y(compositor, cam, gf_mulfix(GF_PI, dy));
+		}
+		break;
+	case GF_NAVIGATE_GAME:
+		view_pan_x(compositor, cam, -dx);
+		view_pan_y(compositor, cam, dy);
+		break;
+	}
+}
 
 static Bool compositor_handle_navigation_3d(GF_Compositor *compositor, GF_Event *ev)
 {
@@ -290,9 +344,6 @@
 	Fixed dx, dy, key_trans, key_pan, key_exam;
 	s32 key_inv;
 	u32 keys;
-#ifdef SCALE_NAV
-	Bool is_pixel_metrics;
-#endif
 	GF_Camera *cam;
 	Fixed zoom = compositor->zoom;
 
@@ -300,9 +351,6 @@
 #ifndef GPAC_DISABLE_VRML
 	if (compositor->active_layer) {
 		cam = compositor_layer3d_get_camera(compositor->active_layer);
-#ifdef SCALE_NAV
-		is_pixel_metrics = gf_sg_use_pixel_metrics(gf_node_get_graph(compositor->active_layer));
-#endif
 	}
 #endif
 
@@ -310,9 +358,6 @@
 		cam = &compositor->visual->camera;
 		assert(compositor);
 		assert(compositor->scene);
-#ifdef SCALE_NAV
-		is_pixel_metrics = compositor->traverse_state->pixel_metrics;
-#endif
 	}
 	if (!cam || (cam->navigate_mode==GF_NAVIGATE_NONE)) return 0;
 
@@ -328,21 +373,16 @@
 	dx = (x - compositor->grab_x);
 	dy = (compositor->grab_y - y);
 
-#ifdef SCALE_NAV
-	trans_scale = is_pixel_metrics ? cam->width/2 : INT2FIX(10);
-	key_trans = is_pixel_metrics ? INT2FIX(10) : cam->avatar_size.x;
-#else
 	trans_scale = cam->width/20;
 	key_trans = cam->avatar_size.x/2;
 	//if default VP is quite far from center use larger dz/dy moves
 	if (cam->vp_dist>100) trans_scale *= 10;
-#endif
 
 	if (cam->world_bbox.is_set && (key_trans*5 > cam->world_bbox.radius)) {
 		key_trans = cam->world_bbox.radius / 100;
 	}
 
-	key_pan = FIX_ONE/25;
+	key_pan = FIX_ONE/20;
 	key_exam = FIX_ONE/20;
 	key_inv = 1;
 
@@ -354,6 +394,14 @@
 		key_trans*=4;
 	}
 
+	if (!gf_term_get_option(compositor->term, GF_OPT_ORIENTATION_SENSORS_ACTIVE)) {
+		Fixed yaw, pitch, roll;
+		gf_mx_get_yaw_pitch_roll(&compositor->visual->camera.modelview, &yaw, &pitch, &roll);
+		compositor->audio_renderer->yaw = yaw;
+		compositor->audio_renderer->pitch = pitch;
+		compositor->audio_renderer->roll = roll;
+	}
+
 	switch (ev->type) {
 	case GF_EVENT_MOUSEDOWN:
 		/*left*/
@@ -383,7 +431,6 @@
 		}
 		break;
 
-	/* note: shortcuts are mostly the same as blaxxun contact, I don't feel like remembering 2 sets...*/
 	case GF_EVENT_MOUSEMOVE:
 		if (gf_term_get_option(compositor->term, GF_OPT_ORIENTATION_SENSORS_ACTIVE)) return 0;
 		if (!compositor->navigation_state) {
@@ -393,58 +440,19 @@
 				compositor->grab_y = y;
 				compositor->navigation_state = 1;
 			}
+			compositor->auto_rotate=0;
 			return 0;
 		}
 		compositor->navigation_state++;
 
-		switch (cam->navigate_mode) {
-		/*FIXME- we'll likely need a "step" value for walk at some point*/
-		case GF_NAVIGATE_WALK:
-		case GF_NAVIGATE_FLY:
-			view_pan_x(compositor, cam, -dx);
-			if (keys & GF_KEY_MOD_CTRL) view_pan_y(compositor, cam, dy);
-			else view_translate_z(compositor, cam, gf_mulfix(dy, trans_scale));
-			break;
-		case GF_NAVIGATE_VR:
-			view_pan_x(compositor, cam, -dx);
-			if (keys & GF_KEY_MOD_CTRL) view_zoom(compositor, cam, dy);
-			else view_pan_y(compositor, cam, dy);
-			break;
-		case GF_NAVIGATE_PAN:
-			view_pan_x(compositor, cam, -dx);
-			if (keys & GF_KEY_MOD_CTRL) view_translate_z(compositor, cam, gf_mulfix(dy, trans_scale));
-			else view_pan_y(compositor, cam, dy);
-			break;
-		case GF_NAVIGATE_SLIDE:
-			view_translate_x(compositor, cam, gf_mulfix(dx, trans_scale));
-			if (keys & GF_KEY_MOD_CTRL) view_translate_z(compositor, cam, gf_mulfix(dy, trans_scale));
-			else view_translate_y(compositor, cam, gf_mulfix(dy, trans_scale));
-			break;
-		case GF_NAVIGATE_EXAMINE:
-			if (keys & GF_KEY_MOD_CTRL) {
-				view_translate_z(compositor, cam, gf_mulfix(dy, trans_scale));
-				view_roll(compositor, cam, gf_mulfix(dx, trans_scale));
-			} else {
-				if (ABS(dx) > ABS(dy)) {
-					view_exam_x(compositor, cam, -gf_mulfix(GF_PI, dx));
-				} else {
-					view_exam_y(compositor, cam, gf_mulfix(GF_PI, dy));
-				}
-			}
-			break;
-		case GF_NAVIGATE_ORBIT:
-			if (keys & GF_KEY_MOD_CTRL) {
-				view_translate_z(compositor, cam, gf_mulfix(dy, trans_scale));
-			} else {
-				view_orbit_x(compositor, cam, -gf_mulfix(GF_PI, dx));
-				view_orbit_y(compositor, cam, gf_mulfix(GF_PI, dy));
-			}
-			break;
-		case GF_NAVIGATE_GAME:
-			view_pan_x(compositor, cam, -dx);
-			view_pan_y(compositor, cam, dy);
-			break;
-		}
+		if (x <= -0.49) compositor->auto_rotate = 1;
+		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;
+
+		handle_mouse_move_3d(compositor, cam, keys, dx, dy);
+
 		compositor->grab_x = x;
 		compositor->grab_y = y;
 		return 1;
@@ -472,6 +480,7 @@
 		return 1;
 
 	case GF_EVENT_MOUSEUP:
+		compositor->auto_rotate=0;
 		if (ev->mouse.button==GF_MOUSE_LEFT) compositor->navigation_state = 0;
 		break;
 
@@ -607,6 +616,28 @@
 				return 1;
 			}
 			break;
+		case GF_KEY_D:
+			if (keys & GF_KEY_MOD_CTRL) {
+				compositor->tile_visibility_debug = !compositor->tile_visibility_debug;
+				gf_sc_invalidate(compositor, NULL);
+				return 1;
+			}
+			break;
+		case GF_KEY_G:
+			if (keys & GF_KEY_MOD_CTRL) {
+				compositor->vrhud_mode++;
+				if (compositor->vrhud_mode==5) compositor->vrhud_mode=0;
+				gf_sc_invalidate(compositor, NULL);
+				return 1;
+			}
+			break;
+		case GF_KEY_A:
+			if (keys & GF_KEY_MOD_CTRL) {
+				compositor->force_all_tiles_visible = !compositor->force_all_tiles_visible;
+				gf_sc_invalidate(compositor, NULL);
+				return 1;
+			}
+			break;
 		}
 		break;
 	case GF_EVENT_SENSOR_ORIENTATION:
@@ -615,27 +646,25 @@
 		GF_Vec target;
 		GF_Matrix mx;
 
-#ifndef GPAC_ANDROID
-		/*
-		 * In iOS we get x, y, z in quaternions (first measurement is the frame of reference)
-		 */
-		x = ev->sensor.x;
-		y = ev->sensor.y;
-		z = ev->sensor.z;
-		w = ev->sensor.w;
+		/* In iOS we get x, y, z in quaternions (first measurement is the frame of reference) */
+		if (ev->sensor.w) {
+			x = ev->sensor.x;
+			y = ev->sensor.y;
+			z = ev->sensor.z;
+			w = ev->sensor.w;
 		
-		yaw = gf_atan2(2*gf_mulfix(z,w) - 2*gf_mulfix(y,x) , 1 - 2*gf_mulfix(z,z) - 2*gf_mulfix(x,x));
-		//pitch = asin(2*y*z + 2*x*w);
-		roll = gf_atan2(2*gf_mulfix(y,w) - 2*gf_mulfix(z,x) , 1 - 2*gf_mulfix(y,y) - 2*gf_mulfix(x,x));
-#else
-		/*
-		 * In Android we get yaw, pitch, roll values (in rad)
-		 * The frame of reference is absolute
-		 */
-		yaw = ev->sensor.x;
-		//pitch = ev->sensor.y;
-		roll = ev->sensor.z;
-#endif
+			yaw = gf_atan2(2*gf_mulfix(z,w) - 2*gf_mulfix(y,x) , 1 - 2*gf_mulfix(z,z) - 2*gf_mulfix(x,x));
+			//pitch = asin(2*y*z + 2*x*w);
+			roll = gf_atan2(2*gf_mulfix(y,w) - 2*gf_mulfix(z,x) , 1 - 2*gf_mulfix(y,y) - 2*gf_mulfix(x,x));
+		} else {
+			/*
+			 * In Android we get yaw, pitch, roll values (in rad)
+			 * The frame of reference is absolute
+			 */
+			yaw = ev->sensor.x;
+			//pitch = ev->sensor.y;
+			roll = ev->sensor.z;
+		}
 		target.x = 0;
 		target.y = -FIX_ONE;
 		target.z = 0;
@@ -826,6 +855,40 @@
 	return 0;
 }
 
+void compositor_handle_auto_navigation(GF_Compositor *compositor)
+{
+#ifndef GPAC_DISABLE_3D
+	GF_Camera *cam = NULL;
+	Fixed dx, dy;
+#ifndef GPAC_DISABLE_VRML
+	if (compositor->active_layer) {
+		cam = compositor_layer3d_get_camera(compositor->active_layer);
+	}
+	if (!cam)
+		cam = &compositor->visual->camera;
+#endif
+
+	dx = dy = 0;
+	switch (compositor->auto_rotate) {
+	case 1:
+		dx = -FIX_ONE/100;
+		break;
+	case 2:
+		dx = FIX_ONE/100;
+		break;
+	case 3:
+		dy = FIX_ONE/100;
+		break;
+	case 4:
+		dy = -FIX_ONE/100;
+		break;
+	default:
+		return;
+	}
+	handle_mouse_move_3d(compositor, cam, 0, dx, dy);
+#endif
+}
+
 Bool compositor_handle_navigation(GF_Compositor *compositor, GF_Event *ev)
 {
 	if (!compositor->scene) return 0;

gpac-0.7.1.tar.gz/src/compositor/nodes_stacks.h -> gpac-0.8.0.tar.gz/src/compositor/nodes_stacks.h Changed

gpac-0.7.1.tar.gz/src/compositor/svg_grouping.c -> gpac-0.8.0.tar.gz/src/compositor/svg_grouping.c Changed

gpac-0.7.1.tar.gz/src/compositor/texturing.c -> gpac-0.8.0.tar.gz/src/compositor/texturing.c Changed

@@ -89,6 +89,7 @@
 {
 	if (!txh->stream) {
 		GF_Err e;
+		if (!url) return GF_BAD_PARAM;
 		e = gf_sc_texture_open(txh, url, lock_scene_timeline);
 		if (e != GF_OK) return e;
 	}
@@ -119,6 +120,24 @@
 
 
 GF_EXPORT
+void gf_sc_texture_stop_no_unregister(GF_TextureHandler *txh)
+{
+	if (!txh->is_open) return;
+	/*release texture WITHOUT droping frame*/
+	if (txh->needs_release) {
+		gf_mo_release_data(txh->stream, 0xFFFFFFFF, 1);
+		txh->needs_release = 0;
+		txh->frame = NULL;
+	}
+	gf_sc_invalidate(txh->compositor, NULL);
+	gf_mo_stop(txh->stream);
+	txh->data = txh->pU = txh->pV = NULL;
+	txh->frame = NULL;
+
+	txh->is_open = 0;
+}
+
+GF_EXPORT
 void gf_sc_texture_stop(GF_TextureHandler *txh)
 {
 	if (!txh->is_open) return;
@@ -133,7 +152,7 @@
 		txh->data = NULL;
 	}
 	txh->is_open = 0;
-	
+
 	/*and deassociate object*/
 	gf_mo_unregister(txh->owner, txh->stream);
 	txh->stream = NULL;
@@ -353,8 +372,10 @@
 		return compositor_svg_get_image_texture(n);
 #endif
 
+#ifndef GPAC_DISABLE_VRML
     case TAG_ProtoNode:
         return gf_sc_hardcoded_proto_get_texture_handler(n);
+#endif
 	default:
 		return NULL;
 	}

gpac-0.7.1.tar.gz/src/compositor/texturing_gl.c -> gpac-0.8.0.tar.gz/src/compositor/texturing_gl.c Changed

@@ -44,7 +44,6 @@
 #endif
 
 
-
 /*tx flags*/
 enum
 {
@@ -122,6 +121,13 @@
 			if(txh->raw_memory)
 				txh->tx_io->conv_data = (char*)gf_realloc(txh->tx_io->conv_data, 3 * sizeof(char)* txh->stride * txh->height / 2);
 		}
+		else if (txh->pixelformat == GF_PIXEL_NV12_10) {
+			txh->stride /= 2;
+			txh->tx_io->conv_to_8bit = GF_TRUE;
+			txh->pixelformat = GF_PIXEL_NV12;
+			if(txh->raw_memory)
+				txh->tx_io->conv_data = (char*)gf_realloc(txh->tx_io->conv_data, 3 * sizeof(char)* txh->stride * txh->height / 2);
+		}
 		else if (txh->pixelformat == GF_PIXEL_YUV422_10) {
 			txh->stride /= 2;
 			txh->tx_io->conv_to_8bit = GF_TRUE;
@@ -248,8 +254,8 @@
 
 			if (txh->raw_memory) {
 				txh->data = dst.video_buffer;
-				txh->pU = dst.video_buffer + dst.pitch_y * txh->height;
-				txh->pV = dst.video_buffer + 2 * dst.pitch_y * txh->height;
+				txh->pU = (u8*) dst.video_buffer + dst.pitch_y * txh->height;
+				txh->pV = (u8*) dst.video_buffer + 2 * dst.pitch_y * txh->height;
 			}
 		}
 	}
@@ -548,6 +554,7 @@
 	case GF_PIXEL_YUV444_10:
 	case GF_PIXEL_NV21:
 	case GF_PIXEL_NV12:
+	case GF_PIXEL_NV12_10:
 #ifndef GPAC_USE_GLES1X
 		if (compositor->gl_caps.has_shaders && (is_pow2 || compositor->visual->compositor->shader_only_mode) ) {
 			use_yuv_shaders = 1;
@@ -645,9 +652,13 @@
 		txh->tx_io->gl_format = GL_LUMINANCE;
 		txh->tx_io->nb_comp = 1;
 		txh->tx_io->yuv_shader = 1;
-		if (txh->pixelformat==GF_PIXEL_YV12_10 || txh->pixelformat==GF_PIXEL_YUV422_10 ||txh->pixelformat==GF_PIXEL_YUV444_10 ) {
-			
+		switch (txh->pixelformat) {
+		case GF_PIXEL_YV12_10:
+		case GF_PIXEL_NV12_10:
+		case GF_PIXEL_YUV422_10:
+		case GF_PIXEL_YUV444_10:
 			txh->tx_io->gl_dtype = GL_UNSIGNED_SHORT;
+			break;
 		}
 		txh->compositor->visual->yuv_pixelformat_type = txh->pixelformat;
 	}
@@ -708,7 +719,7 @@
 		}
 #endif
 
-		if (txh->tx_io->yuv_shader && (txh->pixelformat==GF_PIXEL_YV12_10 || txh->pixelformat==GF_PIXEL_YUV422_10 ||txh->pixelformat==GF_PIXEL_YUV444_10)) {
+		if (txh->tx_io->yuv_shader && ((txh->pixelformat==GF_PIXEL_YV12_10) || (txh->pixelformat==GF_PIXEL_NV12_10) || (txh->pixelformat==GF_PIXEL_YUV422_10) || (txh->pixelformat==GF_PIXEL_YUV444_10)) ) {
 			//will never happen on GLES for now since we don't have GLES2 support yet ...
 			//FIXME - allow 10bit support in GLES2
 #if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
@@ -838,6 +849,7 @@
     case GF_PIXEL_YUV444_10:
 	case GF_PIXEL_NV21:
 	case GF_PIXEL_NV12:
+	case GF_PIXEL_NV12_10:
 	case GF_PIXEL_I420:
 		if (txh->tx_io->gl_format == compositor->gl_caps.yuv_texture) {
 			txh->tx_io->conv_format = GF_PIXEL_YVYU;
@@ -900,6 +912,7 @@
     case GF_PIXEL_YUV444_10:
 	case GF_PIXEL_NV21:
 	case GF_PIXEL_NV12:
+	case GF_PIXEL_NV12_10:
 	case GF_PIXEL_I420:
 	case GF_PIXEL_BGR_24:
 	case GF_PIXEL_BGR_32:
@@ -1033,7 +1046,8 @@
 	char *data;
 	Bool first_load = 0;
 	GLint tx_mode;
-	u32 pixel_format, w, h, nb_views=1, nb_layers=1, nb_frames=1;
+	u32 pixel_format, w, h;
+	int nb_views = 1, nb_layers = 1, nb_frames = 1;
 	u32 push_time;
 
 	if (txh->stream) {
@@ -1070,7 +1084,7 @@
 	if (! (txh->tx_io->flags & TX_NEEDS_HW_LOAD) ) return 1;
 
 	/*in case the ID has been lost, resetup*/
-	if (!txh->tx_io->id) {
+	if (!txh->tx_io->id && !txh->tx_io->use_external_textures) {
 		glGenTextures(1, &txh->tx_io->id);
 		/*force setup of image*/
 		txh->needs_refresh = 1;
@@ -1142,29 +1156,32 @@
 					txh->tx_io->use_external_textures = GF_TRUE;
 				}
 					
-				if (txh->frame->GetGLTexture(txh->frame, 0, &gl_format, &txh->tx_io->id, &txh->tx_io->texcoordmatrix) == GF_OK) {
+				if (txh->frame->GetGLTexture(txh->frame, 0, &gl_format, &txh->tx_io->id, &txh->tx_io->texcoordmatrix) != GF_OK) {
+					return 0;
+				}
+				glBindTexture(gl_format, txh->tx_io->id);
+				GLTEXPARAM(gl_format, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+				GLTEXPARAM(gl_format, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+				GLTEXPARAM(gl_format, GL_TEXTURE_MAG_FILTER, txh->compositor->high_speed ? GL_NEAREST : GL_LINEAR);
+				GLTEXPARAM(gl_format, GL_TEXTURE_MIN_FILTER, txh->compositor->high_speed ? GL_NEAREST : GL_LINEAR);
 
-					glBindTexture(gl_format, txh->tx_io->id);
-					GLTEXPARAM(gl_format, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-					GLTEXPARAM(gl_format, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-					GLTEXPARAM(gl_format, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-					GLTEXPARAM(gl_format, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 #ifdef GPAC_ANDROID
-					if ( gl_format == GL_TEXTURE_EXTERNAL_OES) {
-						txh->tx_io->flags |= TX_IS_FLIPPED;
-						txh->tx_io->gl_type = GL_TEXTURE_EXTERNAL_OES;
-						goto push_exit;
-					}
+				if ( gl_format == GL_TEXTURE_EXTERNAL_OES) {
+					txh->tx_io->flags |= TX_IS_FLIPPED;
+					txh->tx_io->gl_type = GL_TEXTURE_EXTERNAL_OES;
+					goto push_exit;
+				}
 #endif // GPAC_ANDROID
 					
-					if (txh->frame->GetGLTexture(txh->frame, 1, &gl_format, &txh->tx_io->u_id, &txh->tx_io->texcoordmatrix) == GF_OK) {
-						glBindTexture(gl_format, txh->tx_io->u_id);
-						GLTEXPARAM(gl_format, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-						GLTEXPARAM(gl_format, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-						GLTEXPARAM(gl_format, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-						GLTEXPARAM(gl_format, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-					}	
+				if (txh->frame->GetGLTexture(txh->frame, 1, &gl_format, &txh->tx_io->u_id, &txh->tx_io->texcoordmatrix) != GF_OK) {
+					return 0;
 				}
+				glBindTexture(gl_format, txh->tx_io->u_id);
+				GLTEXPARAM(gl_format, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+				GLTEXPARAM(gl_format, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+				GLTEXPARAM(gl_format, GL_TEXTURE_MAG_FILTER, txh->compositor->high_speed ? GL_NEAREST : GL_LINEAR);
+				GLTEXPARAM(gl_format, GL_TEXTURE_MIN_FILTER, txh->compositor->high_speed ? GL_NEAREST : GL_LINEAR);
+
 				goto push_exit;
 			}
 			
@@ -1204,6 +1221,7 @@
 				break;
 			case GF_PIXEL_NV21:
 			case GF_PIXEL_NV12:
+			case GF_PIXEL_NV12_10:
 				if (!stride_chroma)
 					stride_chroma = stride_luma/2;
 				break;
@@ -1216,10 +1234,15 @@
 
 #if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
 		
-			if (txh->pixelformat==GF_PIXEL_YV12_10 || txh->pixelformat==GF_PIXEL_YUV422_10 ||txh->pixelformat==GF_PIXEL_YUV444_10) {
+			switch (txh->pixelformat) {
+			case GF_PIXEL_YV12_10:
+			case GF_PIXEL_YUV422_10:
+			case GF_PIXEL_YUV444_10:
+			case GF_PIXEL_NV12_10:
 				glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
 				//we use 10 bits but GL will normalise using 16 bits, so we need to multiply the nomralized result by 2^6
 				glPixelTransferi(GL_RED_SCALE, 64);
+				break;
 			}
 #endif
 
@@ -1231,7 +1254,7 @@
 			 * the following (wxh)/2 bytes is UV plane.
 			 * Reference: http://stackoverflow.com/questions/22456884/how-to-render-androids-yuv-nv21-camera-image-on-the-background-in-libgdx-with-o
 			 */
-			if ((txh->pixelformat == GF_PIXEL_NV21) || (txh->pixelformat == GF_PIXEL_NV12)) {
+			if ((txh->pixelformat == GF_PIXEL_NV21) || (txh->pixelformat == GF_PIXEL_NV12) || (txh->pixelformat == GF_PIXEL_NV12_10)) {
 				u32 fmt = txh->tx_io->gl_format;
 				txh->tx_io->gl_format = GL_LUMINANCE_ALPHA;
 				glBindTexture(txh->tx_io->gl_type, txh->tx_io->u_id);
@@ -1474,7 +1497,7 @@
 Bool gf_sc_texture_get_transform(GF_TextureHandler *txh, GF_Node *tx_transform, GF_Matrix *mx, Bool for_picking)
 {
 #ifndef GPAC_DISABLE_3D
-	u32 nb_views=1;
+	int nb_views=1;
 #endif
 	Bool ret = 0;
 	gf_mx_init(*mx);
@@ -1584,6 +1607,7 @@
 		}
 	}
 #endif /*GPAC_DISABLE_X3D*/
+
 	return ret;
 }
 
@@ -2013,16 +2037,19 @@
 		GL_CHECK_ERR
 		
 #ifdef GPAC_ANDROID
-		if (txh->tx_io->gl_type != GL_TEXTURE_EXTERNAL_OES) {
+		if (txh->tx_io->gl_type != GL_TEXTURE_EXTERNAL_OES)
 #endif // GPAC_ANDROID
-			glActiveTexture(GL_TEXTURE2);
-			glBindTexture(txh->tx_io->gl_type, txh->tx_io->v_id);
-
-			glActiveTexture(GL_TEXTURE1);
-			glBindTexture(txh->tx_io->gl_type, txh->tx_io->u_id);
-#ifdef GPAC_ANDROID
+		{
+			if (txh->tx_io->v_id) {
+				glActiveTexture(GL_TEXTURE2);
+				glBindTexture(txh->tx_io->gl_type, txh->tx_io->v_id);
+			}
+			if (txh->tx_io->u_id) {
+				glActiveTexture(GL_TEXTURE1);
+				glBindTexture(txh->tx_io->gl_type, txh->tx_io->u_id);
+			}
 		}
-#endif // GPAC_ANDROID
+
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(txh->tx_io->gl_type, txh->tx_io->id);

gpac-0.7.1.tar.gz/src/compositor/visual_manager_2d.c -> gpac-0.8.0.tar.gz/src/compositor/visual_manager_2d.c Changed

@@ -804,12 +804,12 @@
 skip_background:
 
 #ifndef GPAC_DISABLE_LOG
-	if (gf_log_tool_level_on(GF_LOG_COMPOSE, GF_LOG_INFO)) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Visual2D] Redraw %d / %d nodes (all: %s - %d dirty rects\n)", num_changed, num_nodes, redraw_all ? "yes" : "no", visual->to_redraw.count));
+	if (gf_log_tool_level_on(GF_LOG_COMPOSE, GF_LOG_DEBUG)) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] Redraw %d / %d nodes (all: %s - %d dirty rects\n)", num_changed, num_nodes, redraw_all ? "yes" : "no", visual->to_redraw.count));
 		if (visual->to_redraw.count>1) GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("\n"));
 
 		for (i=0; i<visual->to_redraw.count; i++) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("\tDirtyRect #%d: %d:%d@%dx%d\n", i+1, visual->to_redraw.list[i].rect.x, visual->to_redraw.list[i].rect.y, visual->to_redraw.list[i].rect.width, visual->to_redraw.list[i].rect.height));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("\tDirtyRect #%d: %d:%d@%dx%d\n", i+1, visual->to_redraw.list[i].rect.x, visual->to_redraw.list[i].rect.y, visual->to_redraw.list[i].rect.width, visual->to_redraw.list[i].rect.height));
 			assert(visual->to_redraw.list[i].rect.width);
 		}
 	}

gpac-0.7.1.tar.gz/src/compositor/visual_manager_3d.c -> gpac-0.8.0.tar.gz/src/compositor/visual_manager_3d.c Changed

@@ -363,6 +363,9 @@
 			}
 		}
 
+
+	tr_state->camera_was_dirty = GF_FALSE;
+
 	if (tr_state->visual->nb_views>1) {
 		s32 view_idx;
 		Fixed interocular_dist_pixel;
@@ -379,8 +382,10 @@
 		if (tr_state->visual->reverse_views) delta = - delta;
 
 		tr_state->camera->flags |= CAM_IS_DIRTY;
+		tr_state->camera_was_dirty = GF_TRUE;
 		camera_update_stereo(tr_state->camera, &tr_state->transform, tr_state->visual->center_coords, delta, tr_state->visual->compositor->video_out->view_distance, tr_state->visual->compositor->focus_distance, tr_state->visual->camera_layout);
 	} else {
+		if (tr_state->camera->flags & CAM_IS_DIRTY) tr_state->camera_was_dirty = GF_TRUE;
 		camera_update(tr_state->camera, &tr_state->transform, tr_state->visual->center_coords);
 	}
 
@@ -542,6 +547,8 @@
 	/*turn off depth buffer in 2D*/
 	visual_3d_enable_depth_buffer(tr_state->visual, tr_state->camera->is_3D);
 
+	tr_state->camera->proj_vp = tr_state->camera->vp;
+
 	if ((tr_state->visual->autostereo_type==GF_3D_STEREO_SIDE) || (tr_state->visual->autostereo_type==GF_3D_STEREO_HEADSET)) {
 		GF_Rect orig_vp = tr_state->camera->vp;
 		Fixed vp_width = orig_vp.width;
@@ -599,6 +606,7 @@
 		/*setup projection*/
 		visual_3d_setup_projection(tr_state, layer_type);
 
+		tr_state->camera->proj_vp = tr_state->camera->vp;
 		tr_state->camera->vp = orig_vp;
 		tr_state->camera->width = old_w;
 		tr_state->camera->height = old_h;
@@ -627,6 +635,7 @@
 		/*setup projection*/
 		visual_3d_setup_projection(tr_state, layer_type);
 
+		tr_state->camera->proj_vp = tr_state->camera->vp;
 		tr_state->camera->vp = orig_vp;
 	} else {
 		visual_3d_set_viewport(tr_state->visual, tr_state->camera->vp);
@@ -1243,17 +1252,14 @@
 #endif
 }
 
-void visual_3d_pick_node(GF_VisualManager *visual, GF_TraverseState *tr_state, GF_Event *ev, GF_ChildNodeItem *children)
+Bool visual_3d_setup_ray(GF_VisualManager *visual, GF_TraverseState *tr_state, s32 ix, s32 iy)
 {
 	Fixed in_x, in_y, x, y;
 	SFVec3f start, end;
 	SFVec4f res;
 
-	visual_3d_setup_traversing_state(visual, tr_state);
-	visual_3d_setup_projection(tr_state, 0);
-
-	x = INT2FIX(ev->mouse.x);
-	y = INT2FIX(ev->mouse.y);
+	x = INT2FIX(ix);
+	y = INT2FIX(iy);
 
 	/*if coordinate system is not centered, move to centered coord before applying camera transform
 	because the (un)projection matrices include this transform*/
@@ -1287,20 +1293,20 @@
 
 	res.x = in_x;
 	res.y = in_y;
-	res.z = -FIX_ONE;
+	res.z = -FIX_ONE/2;
 	res.q = FIX_ONE;
 	gf_mx_apply_vec_4x4(&visual->camera.unprojection, &res);
-	if (!res.q) return;
+	if (!res.q) return GF_FALSE;
 	start.x = gf_divfix(res.x, res.q);
 	start.y = gf_divfix(res.y, res.q);
 	start.z = gf_divfix(res.z, res.q);
 
 	res.x = in_x;
 	res.y = in_y;
-	res.z = FIX_ONE;
+	res.z = FIX_ONE/2;
 	res.q = FIX_ONE;
 	gf_mx_apply_vec_4x4(&visual->camera.unprojection, &res);
-	if (!res.q) return;
+	if (!res.q) return GF_FALSE;
 	end.x = gf_divfix(res.x, res.q);
 	end.y = gf_divfix(res.y, res.q);
 	end.z = gf_divfix(res.z, res.q);
@@ -1309,13 +1315,24 @@
 	/*also update hit info world ray in case we have a grabbed sensor with mouse off*/
 	visual->compositor->hit_world_ray = tr_state->ray;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Picking] cast ray\n\tOrigin %.4f %.4f %.4f - End %.4f %.4f %.4f\n\tDir %.4f %.4f %.4f\n",
+	return GF_TRUE;
+}
+
+void visual_3d_pick_node(GF_VisualManager *visual, GF_TraverseState *tr_state, GF_Event *ev, GF_ChildNodeItem *children)
+{
+
+	visual_3d_setup_traversing_state(visual, tr_state);
+	visual_3d_setup_projection(tr_state, 0);
+
+
+	if (!visual_3d_setup_ray(visual, tr_state, ev->mouse.x, ev->mouse.y))
+		return;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Picking] cast ray Origin %.4f %.4f %.4f Direction %.4f %.4f %.4f\n",
 	                                      FIX2FLT(tr_state->ray.orig.x), FIX2FLT(tr_state->ray.orig.y), FIX2FLT(tr_state->ray.orig.z),
-	                                      FIX2FLT(end.x), FIX2FLT(end.y), FIX2FLT(end.z),
 	                                      FIX2FLT(tr_state->ray.dir.x), FIX2FLT(tr_state->ray.dir.y), FIX2FLT(tr_state->ray.dir.z)));
 
 
-
 	visual->compositor->hit_square_dist = 0;
 	visual->compositor->hit_node = NULL;
 	gf_list_reset(visual->compositor->sensors);
@@ -1868,47 +1885,50 @@
 #ifndef GPAC_DISABLE_VRML
 	GF_TextureHandler *txh;
 	tr_state->mesh_num_textures = 0;
-	if (!tr_state->appear) return 0;
+	if (!tr_state->appear) return GF_TRUE;
 
 	gf_node_dirty_reset(tr_state->appear, 0);
 
 	txh = gf_sc_texture_get_handler(((M_Appearance *)tr_state->appear)->texture);
-	if (txh) {
-		gf_sc_texture_set_blend_mode(txh, gf_sc_texture_is_transparent(txh) ? TX_MODULATE : TX_REPLACE);
-		tr_state->mesh_num_textures = gf_sc_texture_enable(txh, ((M_Appearance *)tr_state->appear)->textureTransform);
-		if (tr_state->mesh_num_textures) {
-			Fixed v[4];
-			switch (txh->pixelformat) {
-			/*override diffuse color with full intensity, but keep material alpha (cf VRML lighting)*/
-			case GF_PIXEL_RGB_24:
-				if (tr_state->visual->has_material_2d) {
-					SFColor c;
-					c.red = c.green = c.blue = FIX_ONE;
-					visual_3d_set_material_2d(tr_state->visual, c, diffuse_alpha);
-				} else {
-					v[0] = v[1] = v[2] = FIX_ONE;
-					v[3] = diffuse_alpha;
-					visual_3d_set_material(tr_state->visual, V3D_MATERIAL_DIFFUSE, v);
-				}
-				break;
-			/*override diffuse color AND material alpha (cf VRML lighting)*/
-			case GF_PIXEL_RGBA:
-				if (!tr_state->visual->has_material_2d) {
-					v[0] = v[1] = v[2] = v[3] = FIX_ONE;
-					visual_3d_set_material(tr_state->visual, V3D_MATERIAL_DIFFUSE, v);
-				}
-				tr_state->mesh_is_transparent = 1;
-				break;
-				/*			case GF_PIXEL_GREYSCALE:
-								tr_state->mesh_num_textures = 2;
-								break;
-				*/
+	//no texture, return TRUE (eg draw)
+	if (!txh)
+		return GF_TRUE;
+
+	gf_sc_texture_set_blend_mode(txh, gf_sc_texture_is_transparent(txh) ? TX_MODULATE : TX_REPLACE);
+	tr_state->mesh_num_textures = gf_sc_texture_enable(txh, ((M_Appearance *)tr_state->appear)->textureTransform);
+	if (tr_state->mesh_num_textures) {
+		Fixed v[4];
+		switch (txh->pixelformat) {
+		/*override diffuse color with full intensity, but keep material alpha (cf VRML lighting)*/
+		case GF_PIXEL_RGB_24:
+			if (tr_state->visual->has_material_2d) {
+				SFColor c;
+				c.red = c.green = c.blue = FIX_ONE;
+				visual_3d_set_material_2d(tr_state->visual, c, diffuse_alpha);
+			} else {
+				v[0] = v[1] = v[2] = FIX_ONE;
+				v[3] = diffuse_alpha;
+				visual_3d_set_material(tr_state->visual, V3D_MATERIAL_DIFFUSE, v);
+			}
+			break;
+		/*override diffuse color AND material alpha (cf VRML lighting)*/
+		case GF_PIXEL_RGBA:
+			if (!tr_state->visual->has_material_2d) {
+				v[0] = v[1] = v[2] = v[3] = FIX_ONE;
+				visual_3d_set_material(tr_state->visual, V3D_MATERIAL_DIFFUSE, v);
 			}
+			tr_state->mesh_is_transparent = 1;
+			break;
+			/*			case GF_PIXEL_GREYSCALE:
+							tr_state->mesh_num_textures = 2;
+							break;
+			*/
 		}
-		return tr_state->mesh_num_textures;
 	}
+	return tr_state->mesh_num_textures ? GF_TRUE : GF_FALSE;
+#else
+	return GF_TRUE;
 #endif /*GPAC_DISABLE_VRML*/
-	return 0;
 }
 
 void visual_3d_disable_texture(GF_TraverseState *tr_state)
@@ -1927,7 +1947,7 @@
 	/*setup material and check if 100% transparent - in which case don't draw*/
 	if (!visual_3d_setup_material(tr_state, 0, &diff_a)) return 0;
 	/*setup texture*/
-	visual_3d_setup_texture(tr_state, diff_a);
+	if (! visual_3d_setup_texture(tr_state, diff_a)) return 0;
 	return 1;
 }
 
@@ -1997,7 +2017,7 @@
 		visual->mat_2d.red = INT2FIX( GF_COL_R(col) ) / 255;
 		visual->mat_2d.green = INT2FIX( GF_COL_G(col) ) / 255;
 		visual->mat_2d.blue = INT2FIX( GF_COL_B(col) ) / 255;
-		visual->mat_2d.alpha = INT2FIX( a ) / 255;;
+		visual->mat_2d.alpha = INT2FIX( a ) / 255;
 	}
 }
 
@@ -2060,6 +2080,7 @@
 	if (mx) gf_mx_copy(visual->tx_matrix, *mx);
 }
 
+
 void visual_3d_has_inactive_light(GF_VisualManager *visual)
 {
 	visual->has_inactive_lights = GF_TRUE;

gpac-0.7.1.tar.gz/src/compositor/visual_manager_3d.h -> gpac-0.8.0.tar.gz/src/compositor/visual_manager_3d.h Changed

@@ -41,6 +41,8 @@
 /*draw frame, performing collisions, camera displacement and drawing*/
 Bool visual_3d_draw_frame(GF_VisualManager *visual, GF_Node *root, GF_TraverseState *tr_state, Bool is_root_visual);
 
+Bool visual_3d_setup_ray(GF_VisualManager *visual, GF_TraverseState *tr_state, s32 ix, s32 iy);
+
 /*traverse the scene and picks the node under the current ray, if any*/
 void visual_3d_pick_node(GF_VisualManager *visual, GF_TraverseState *tr_state, GF_Event *ev, GF_ChildNodeItem *children);
 
@@ -84,7 +86,7 @@
 /*sets 3D material. Returns false is object is not visible due to appearance
 	- exported for text drawing*/
 Bool visual_3d_setup_appearance(GF_TraverseState *tr_state);
-/*sets 3D texture. Returns true if a texture is found and successfully bound
+/*sets 3D texture. Returns true if a texture is found and successfully bound or no texture found, FALSE otherwise (texture failure)
 	- exported for text drawing*/
 Bool visual_3d_setup_texture(GF_TraverseState *tr_state, Fixed diffuse_alpha);
 /*disables texture
@@ -224,7 +226,6 @@
 void visual_3d_projection_matrix_modified(GF_VisualManager *visual);
 
 
-
 /*setup viewport (vp: top-left, width, height)*/
 void visual_3d_set_viewport(GF_VisualManager *visual, GF_Rect vp);

gpac-0.7.1.tar.gz/src/compositor/visual_manager_3d_gl.c -> gpac-0.8.0.tar.gz/src/compositor/visual_manager_3d_gl.c Changed

@@ -850,7 +850,7 @@
 
 	glGetProgramiv(progObj, GL_ACTIVE_UNIFORMS, &numUniforms);
 	glGetProgramiv(progObj, GL_ACTIVE_UNIFORM_MAX_LENGTH, &maxUniformLen);
-	uniformName = malloc(sizeof(char) * maxUniformLen);
+	uniformName = gf_malloc(sizeof(char) * maxUniformLen);
 	for(index = 0; index < numUniforms; index++) {
 		GLint size;
 		GLenum type;
@@ -897,6 +897,7 @@
 			break;
 		}
 	}
+	gf_free(uniformName);
 }
 
 static void gf_glQueryAttributes(GF_SHADERID progObj)
@@ -909,7 +910,7 @@
 	printf("Listing Attribs... \n");
 	glGetProgramiv(progObj, GL_ACTIVE_ATTRIBUTES, &numAttributes);
 	glGetProgramiv(progObj, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, &maxAttributeLen);
-	attributeName = malloc(sizeof(char) * maxAttributeLen);
+	attributeName = gf_malloc(sizeof(char) * maxAttributeLen);
 	for(index = 0; index < numAttributes; index++) {
 		GLint size;
 		GLenum type;
@@ -956,6 +957,7 @@
 			break;
 		}
 	}
+	gf_free(attributeName);
 }
 #endif
 
@@ -1570,8 +1572,11 @@
 
 void visual_3d_enable_depth_buffer(GF_VisualManager *visual, Bool on)
 {
-	if (on) glEnable(GL_DEPTH_TEST);
-	else glDisable(GL_DEPTH_TEST);
+	if (on) {
+		glEnable(GL_DEPTH_TEST);
+	} else {
+		glDisable(GL_DEPTH_TEST);
+	}
 }
 
 void visual_3d_set_viewport(GF_VisualManager *visual, GF_Rect vp)
@@ -2664,8 +2669,14 @@
 			loc = gf_glGetUniformLocation(visual->glsl_program, "yuvPixelFormat");
 			if (loc>=0) {
 				int yuv_mode = 0;
-				if (visual->yuv_pixelformat_type == GF_PIXEL_NV21) yuv_mode = 1;
-				else if (visual->yuv_pixelformat_type == GF_PIXEL_NV12) yuv_mode = 2;
+				switch (visual->yuv_pixelformat_type) {
+				case GF_PIXEL_NV21:
+					yuv_mode = 1;
+					break;
+				case GF_PIXEL_NV12:
+					yuv_mode = 2;
+					break;
+				}
 			
 				glUniform1i(loc, yuv_mode);
 			}
@@ -2692,7 +2703,11 @@
 		 && (!tr_state->mesh_is_transparent || (visual->compositor->backcull ==GF_BACK_CULL_ALPHA) )
 		 && (mesh->flags & MESH_IS_SOLID)) {
 			glEnable(GL_CULL_FACE);
-			glFrontFace((mesh->flags & MESH_IS_CW) ? GL_CW : GL_CCW);
+			if (tr_state->reverse_backface) {
+				glFrontFace((mesh->flags & MESH_IS_CW) ? GL_CCW : GL_CW);
+			} else {
+				glFrontFace((mesh->flags & MESH_IS_CW) ? GL_CW : GL_CCW);
+			}
 		} else {
 			glDisable(GL_CULL_FACE);
 		}
@@ -3955,7 +3970,7 @@
 		if (!tr_state->pixel_metrics) inc /= FIX2FLT(tr_state->min_hsize);
 //		x = 0;
 		y = 1;
-		y = gf_mulfix(y, INT2FIX(txh->height/2));;
+		y = gf_mulfix(y, INT2FIX(txh->height/2));
 		if (!tr_state->pixel_metrics) y = gf_divfix(y, tr_state->min_hsize);
 
 		in_strip = 0;

gpac-0.8.0.tar.gz/src/crypto Added

gpac-0.8.0.tar.gz/src/crypto/g_crypt.c Added

@@ -0,0 +1,105 @@
+/*
+*			GPAC - Multimedia Framework C SDK
+*
+*			Authors: Jean Le Feuvre
+*			Copyright (c) Telecom ParisTech 2000-2018
+*					All rights reserved
+*
+* This file is part of GPAC / crypto lib sub-project
+*
+* GPAC is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* GPAC is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; see the file COPYING. If not, write to
+* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*/
+
+#include <gpac/internal/crypt_dev.h>
+
+GF_EXPORT
+GF_Crypt *gf_crypt_open(GF_CRYPTO_ALGO algorithm, GF_CRYPTO_MODE mode)
+{
+	GF_Crypt *td;
+	GF_Err e;
+
+	GF_SAFEALLOC(td, GF_Crypt);
+	if (td == NULL) return NULL;
+
+#ifdef GPAC_HAS_SSL
+	e = gf_crypt_open_open_openssl(td, mode);
+#else
+	e = gf_crypt_open_open_tinyaes(td, mode);
+#endif
+
+	if (e != GF_OK) {
+		gf_free(td);
+		return NULL;
+	}
+	return td;
+}
+
+GF_EXPORT
+void gf_crypt_close(GF_Crypt *td)
+{
+	if (!td) return;
+	td->_deinit_crypt(td);
+	gf_free(td->context);
+	gf_free(td);
+}
+
+GF_EXPORT
+GF_Err gf_crypt_set_key(GF_Crypt *td, void *key)
+{
+	td->_set_key(td, key);
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_crypt_set_IV(GF_Crypt *td, const void *iv, u32 size)
+{
+	if (!td) return GF_BAD_PARAM;
+	return td->_set_state(td, (void *)iv, size);
+}
+
+GF_Err gf_crypt_get_IV(GF_Crypt *td, void *iv, u32 *size)
+{
+	if (!td) return GF_BAD_PARAM;
+	return td->_get_state(td, iv, size);
+}
+
+
+GF_EXPORT
+GF_Err gf_crypt_init(GF_Crypt *td, void *key, const void *IV)
+{
+	GF_Err e;
+
+	e = td->_init_crypt(td, key, IV);
+	if (e != GF_OK) gf_crypt_close(td);
+	//need for openssl we have 2 passes init
+	td->_set_key(td, key);
+	return e;
+}
+
+GF_EXPORT
+GF_Err gf_crypt_encrypt(GF_Crypt *td, void *plaintext, u32 len)
+{
+	if (!td) return GF_BAD_PARAM;
+	return td->_crypt(td, plaintext, len);
+}
+
+GF_EXPORT
+GF_Err gf_crypt_decrypt(GF_Crypt *td, void *ciphertext, u32 len)
+{
+	if (!td) return GF_BAD_PARAM;
+	if (!len) return GF_OK;
+	return td->_decrypt(td, ciphertext, len);
+}

gpac-0.8.0.tar.gz/src/crypto/g_crypt_openssl.c Added

@@ -0,0 +1,222 @@
+/*
+*			GPAC - Multimedia Framework C SDK
+*
+*			Authors: Rodolphe Fouquet
+*			Copyright (c) Motion Spell 2016
+*					All rights reserved
+*
+* This file is part of GPAC / crypto lib sub-project
+*
+* GPAC is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* GPAC is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; see the file COPYING. If not, write to
+* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*/
+
+#include <gpac/internal/crypt_dev.h>
+
+#ifdef GPAC_HAS_SSL
+#include <openssl/aes.h>
+#include <openssl/modes.h>
+
+#include <math.h>
+
+typedef struct {
+	AES_KEY enc_key, dec_key;
+
+	u8 block[AES_BLOCK_SIZE];
+	u8 padded_input[AES_BLOCK_SIZE]; // use only when the input length is inferior to the algo block size
+	u8 previous_ciphertext[AES_BLOCK_SIZE];
+} Openssl_ctx_cbc;
+
+/** CBC STUFF **/
+
+GF_Err gf_crypt_init_openssl_cbc(GF_Crypt* td, void *key, const void *iv)
+{
+	Openssl_ctx_cbc *ctx = (Openssl_ctx_cbc*)td->context;
+	GF_SAFEALLOC(ctx, Openssl_ctx_cbc);
+	if (ctx == NULL) return GF_OUT_OF_MEM;
+	td->context = ctx;
+
+	if (iv != NULL) {
+		memcpy(ctx->previous_ciphertext, iv, AES_BLOCK_SIZE);
+	}
+	return GF_OK;
+}
+
+void gf_crypt_deinit_openssl_cbc(GF_Crypt* td)
+{
+}
+
+void gf_set_key_openssl_cbc(GF_Crypt* td, void *key)
+{
+	Openssl_ctx_cbc* ctx = (Openssl_ctx_cbc*)td->context;
+	AES_set_encrypt_key(key, 128, &(ctx->enc_key));
+	AES_set_decrypt_key(key, 128, &(ctx->dec_key));
+}
+
+GF_Err gf_crypt_set_IV_openssl_cbc(GF_Crypt* td, const u8 *iv, u32 iv_size)
+{
+	Openssl_ctx_cbc* ctx = (Openssl_ctx_cbc*)td->context;
+	memcpy(ctx->previous_ciphertext, iv, iv_size);
+	return GF_OK;
+}
+
+GF_Err gf_crypt_get_IV_openssl_cbc(GF_Crypt* td, u8 *iv, u32 *iv_size)
+{
+	Openssl_ctx_cbc* ctx = (Openssl_ctx_cbc*)td->context;
+	*iv_size = AES_BLOCK_SIZE;
+	memcpy(iv, ctx->previous_ciphertext, AES_BLOCK_SIZE);
+	return GF_OK;
+}
+
+GF_Err gf_crypt_crypt_openssl_cbc(GF_Crypt* td, u8 *plaintext, u32 len, u32 aes_crypt_type) {
+	Openssl_ctx_cbc* ctx = (Openssl_ctx_cbc*)td->context;
+	u32 iteration;
+	AES_KEY *key = aes_crypt_type ? &ctx->enc_key : &ctx->dec_key;
+	u32 numberOfIterations = len / AES_BLOCK_SIZE;
+	if (numberOfIterations * AES_BLOCK_SIZE < len) numberOfIterations++;
+
+	for (iteration = 0; iteration < numberOfIterations; ++iteration) {
+		if (len - iteration*AES_BLOCK_SIZE < AES_BLOCK_SIZE) {
+			memset(ctx->padded_input, 0, AES_BLOCK_SIZE);
+			memcpy(ctx->padded_input, plaintext, len - iteration*AES_BLOCK_SIZE);
+			AES_cbc_encrypt(plaintext + iteration*AES_BLOCK_SIZE, ctx->block, AES_BLOCK_SIZE, key, ctx->previous_ciphertext, aes_crypt_type);
+			memcpy(plaintext + iteration*AES_BLOCK_SIZE, ctx->block, len - iteration*AES_BLOCK_SIZE);
+		} else {
+			AES_cbc_encrypt(plaintext + iteration*AES_BLOCK_SIZE, plaintext + iteration*AES_BLOCK_SIZE, AES_BLOCK_SIZE, key, ctx->previous_ciphertext, aes_crypt_type);
+		}
+	}
+	return GF_OK;
+}
+
+GF_Err gf_crypt_encrypt_openssl_cbc(GF_Crypt* td, u8 *plaintext, u32 len)
+{
+	return gf_crypt_crypt_openssl_cbc(td, plaintext, len, AES_ENCRYPT);
+}
+
+GF_Err gf_crypt_decrypt_openssl_cbc(GF_Crypt* td, u8 *ciphertext, u32 len)
+{
+	return gf_crypt_crypt_openssl_cbc(td, ciphertext, len, AES_DECRYPT);
+}
+
+typedef struct {
+	AES_KEY key;
+
+	u8 cyphered_iv[16];
+	u8 iv[16];
+	unsigned int c_counter_pos;
+} Openssl_ctx_ctr;
+
+
+/** CTR STUFF **/
+
+void gf_set_key_openssl_ctr(GF_Crypt* td, void *key)
+{
+	Openssl_ctx_ctr* ctx = (Openssl_ctx_ctr*)td->context;
+	AES_set_encrypt_key(key, 128, &(ctx->key));
+}
+
+GF_Err gf_crypt_set_IV_openssl_ctr(GF_Crypt* td, const u8 *iv, u32 iv_size)
+{
+	Openssl_ctx_ctr* ctx = (Openssl_ctx_ctr*)td->context;
+
+	ctx->c_counter_pos = ((u8*)iv)[0];
+	memcpy(ctx->iv, &((u8*)iv)[1], iv_size - 1);
+	memset(ctx->cyphered_iv, 0, 16);
+	return GF_OK;
+}
+
+GF_Err gf_crypt_get_IV_openssl_ctr(GF_Crypt* td, u8 *iv, u32 *iv_size)
+{
+	Openssl_ctx_ctr* ctx = (Openssl_ctx_ctr*)td->context;
+
+	*iv_size = AES_BLOCK_SIZE + 1;
+
+	((u8 *)iv)[0] = ctx->c_counter_pos;
+	memcpy(&((u8 *)iv)[1], ctx->iv, AES_BLOCK_SIZE);
+	return GF_OK;
+}
+
+GF_Err gf_crypt_init_openssl_ctr(GF_Crypt* td, void *key, const void *iv)
+{
+	Openssl_ctx_ctr *ctx = (Openssl_ctx_ctr*)td->context;
+	GF_SAFEALLOC(ctx, Openssl_ctx_ctr);
+	if (!ctx) return GF_OUT_OF_MEM;
+
+	td->context = ctx;
+	ctx->c_counter_pos = 0;
+	if (iv != NULL) {
+		memcpy(ctx->iv, &((u8*)iv)[0], AES_BLOCK_SIZE);
+	}
+
+	return GF_OK;
+}
+
+void gf_crypt_deinit_openssl_ctr(GF_Crypt* td)
+{
+}
+
+GF_Err gf_crypt_crypt_openssl_ctr(GF_Crypt* td, u8 *plaintext, u32 len)
+{
+	Openssl_ctx_ctr* ctx = (Openssl_ctx_ctr*)td->context;
+
+	CRYPTO_ctr128_encrypt(plaintext, plaintext, len, &ctx->key, ctx->iv, ctx->cyphered_iv, &ctx->c_counter_pos, (block128_f)AES_encrypt);
+
+	return GF_OK;
+}
+
+GF_Err gf_crypt_encrypt_openssl_ctr(GF_Crypt* td, u8 *plaintext, u32 len)
+{
+	return gf_crypt_crypt_openssl_ctr(td, plaintext, len);
+}
+
+GF_Err gf_crypt_decrypt_openssl_ctr(GF_Crypt* td, u8 *ciphertext, u32 len)
+{
+	return gf_crypt_crypt_openssl_ctr(td, ciphertext, len);
+}
+
+
+GF_Err gf_crypt_open_open_openssl(GF_Crypt* td, GF_CRYPTO_MODE mode)
+{
+	td->mode = mode;
+	switch (td->mode) {
+	case GF_CBC:
+		td->_init_crypt = gf_crypt_init_openssl_cbc;
+		td->_deinit_crypt = gf_crypt_deinit_openssl_cbc;
+		td->_set_key = gf_set_key_openssl_cbc;
+		td->_crypt = gf_crypt_encrypt_openssl_cbc;
+		td->_decrypt = gf_crypt_decrypt_openssl_cbc;
+		td->_get_state = gf_crypt_get_IV_openssl_cbc;
+		td->_set_state = gf_crypt_set_IV_openssl_cbc;
+		break;
+	case GF_CTR:
+		td->_init_crypt = gf_crypt_init_openssl_ctr;
+		td->_deinit_crypt = gf_crypt_deinit_openssl_ctr;
+		td->_set_key = gf_set_key_openssl_ctr;
+		td->_crypt = gf_crypt_encrypt_openssl_ctr;
+		td->_decrypt = gf_crypt_decrypt_openssl_ctr;
+		td->_get_state = gf_crypt_get_IV_openssl_ctr;
+		td->_set_state = gf_crypt_set_IV_openssl_ctr;
+		break;
+	default:
+		return GF_BAD_PARAM;
+		break;
+	}
+
+	td->algo = GF_AES_128;
+	return GF_OK;
+}
+
+#endif
+

gpac-0.8.0.tar.gz/src/crypto/g_crypt_tinyaes.c Added

@@ -0,0 +1,196 @@
+/*
+*			GPAC - Multimedia Framework C SDK
+*
+*			Authors: Jean Le Feuvre
+*			Copyright (c) Telecom ParisTech 2018
+*					All rights reserved
+*
+* This file is part of GPAC / crypto lib sub-project
+*
+* GPAC is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* GPAC is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; see the file COPYING. If not, write to
+* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*/
+
+#include <gpac/internal/crypt_dev.h>
+
+#ifndef GPAC_HAS_SSL
+#include "tiny_aes.h"
+
+#include <math.h>
+
+/** CBC mode **/
+
+GF_Err gf_crypt_init_tinyaes_cbc(GF_Crypt* td, void *key, const void *iv)
+{
+	struct AES_ctx *ctx;
+	GF_SAFEALLOC(ctx, struct AES_ctx);
+	if (ctx == NULL) return GF_OUT_OF_MEM;
+
+	td->context = ctx;
+
+	if (iv != NULL) {
+		AES_init_ctx_iv(ctx, key, iv);
+	} else {
+		AES_init_ctx(ctx, key);
+	}
+	return GF_OK;
+}
+
+void gf_crypt_deinit_tinyaes_cbc(GF_Crypt* td)
+{
+}
+
+void gf_set_key_tinyaes_cbc(GF_Crypt* td, void *key)
+{
+	struct AES_ctx* ctx = (struct AES_ctx *)td->context;
+	AES_init_ctx(ctx, key);
+}
+
+GF_Err gf_crypt_set_IV_tinyaes_cbc(GF_Crypt* td, const u8 *iv, u32 iv_size)
+{
+	struct AES_ctx* ctx = (struct AES_ctx *)td->context;
+	if (iv_size>AES_BLOCKLEN) return GF_BAD_PARAM;
+
+	AES_ctx_set_iv(ctx, iv);
+	return GF_OK;
+}
+
+GF_Err gf_crypt_get_IV_tinyaes_cbc(GF_Crypt* td, u8 *iv, u32 *iv_size)
+{
+	struct AES_ctx* ctx = (struct AES_ctx *)td->context;
+	AES_ctx_get_iv(ctx, iv);
+	*iv_size = AES_BLOCKLEN;
+
+	return GF_OK;
+}
+
+
+GF_Err gf_crypt_encrypt_tinyaes_cbc(GF_Crypt* td, u8 *plaintext, u32 len)
+{
+	struct AES_ctx* ctx = (struct AES_ctx *)td->context;
+	AES_CBC_encrypt_buffer(ctx, plaintext, len);
+	return GF_OK;
+}
+
+GF_Err gf_crypt_decrypt_tinyaes_cbc(GF_Crypt* td, u8 *ciphertext, u32 len)
+{
+	struct AES_ctx* ctx = (struct AES_ctx *)td->context;
+	if (len<AES_BLOCKLEN) return GF_OK;
+	while (len % AES_BLOCKLEN)
+		len--;
+	AES_CBC_decrypt_buffer(ctx, ciphertext, len);
+	return GF_OK;
+}
+
+
+/** CTR mode **/
+
+void gf_set_key_tinyaes_ctr(GF_Crypt* td, void *key)
+{
+	struct AES_ctx* ctx = (struct AES_ctx *)td->context;
+	AES_init_ctx(ctx, key);
+}
+
+GF_Err gf_crypt_set_IV_tinyaes_ctr(GF_Crypt* td, const u8 *iv, u32 iv_size)
+{
+	struct AES_ctx* ctx = (struct AES_ctx *)td->context;
+
+	if (iv_size>AES_BLOCKLEN) {
+		ctx->counter_pos = iv[0];
+		AES_ctx_set_iv(ctx, &((u8*)iv)[1]);
+	} else {
+		AES_ctx_set_iv(ctx, iv);
+	}
+	return GF_OK;
+}
+
+GF_Err gf_crypt_get_IV_tinyaes_ctr(GF_Crypt* td, u8 *iv, u32 *iv_size)
+{
+	struct AES_ctx* ctx = (struct AES_ctx *)td->context;
+	*iv_size = AES_BLOCKLEN + 1;
+	iv[0] = ctx->counter_pos;
+	AES_ctx_get_iv(ctx, iv + 1);
+	return GF_OK;
+}
+
+GF_Err gf_crypt_init_tinyaes_ctr(GF_Crypt* td, void *key, const void *iv)
+{
+	struct AES_ctx* ctx;
+
+	GF_SAFEALLOC(ctx, struct AES_ctx);
+	td->context = ctx;
+
+	/* For ctr */
+	if (iv) {
+		AES_init_ctx_iv(ctx, key, iv);
+	} else {
+		AES_init_ctx(ctx, key);
+	}
+	return GF_OK;
+}
+
+void gf_crypt_deinit_tinyaes_ctr(GF_Crypt* td)
+{
+}
+
+
+GF_Err gf_crypt_encrypt_tinyaes_ctr(GF_Crypt* td, u8 *plaintext, u32 len)
+{
+	struct AES_ctx* ctx = (struct AES_ctx *)td->context;
+	AES_CTR_xcrypt_buffer(ctx, plaintext, len);
+	return GF_OK;
+}
+
+GF_Err gf_crypt_decrypt_tinyaes_ctr(GF_Crypt* td, u8 *ciphertext, u32 len)
+{
+	struct AES_ctx* ctx = (struct AES_ctx *)td->context;
+	AES_CTR_xcrypt_buffer(ctx, ciphertext, len);
+	return GF_OK;
+}
+
+
+GF_Err gf_crypt_open_open_tinyaes(GF_Crypt* td, GF_CRYPTO_MODE mode)
+{
+	td->mode = mode;
+	switch (td->mode) {
+	case GF_CBC:
+		td->_init_crypt = gf_crypt_init_tinyaes_cbc;
+		td->_deinit_crypt = gf_crypt_deinit_tinyaes_cbc;
+		td->_set_key = gf_set_key_tinyaes_cbc;
+		td->_crypt = gf_crypt_encrypt_tinyaes_cbc;
+		td->_decrypt = gf_crypt_decrypt_tinyaes_cbc;
+		td->_get_state = gf_crypt_get_IV_tinyaes_cbc;
+		td->_set_state = gf_crypt_set_IV_tinyaes_cbc;
+		break;
+	case GF_CTR:
+		td->_init_crypt = gf_crypt_init_tinyaes_ctr;
+		td->_deinit_crypt = gf_crypt_deinit_tinyaes_ctr;
+		td->_set_key = gf_set_key_tinyaes_ctr;
+		td->_crypt = gf_crypt_encrypt_tinyaes_ctr;
+		td->_decrypt = gf_crypt_decrypt_tinyaes_ctr;
+		td->_get_state = gf_crypt_get_IV_tinyaes_ctr;
+		td->_set_state = gf_crypt_set_IV_tinyaes_ctr;
+		break;
+	default:
+		return GF_BAD_PARAM;
+		break;
+
+	}
+	td->algo = GF_AES_128;
+	return GF_OK;
+}
+
+#endif
+

gpac-0.8.0.tar.gz/src/crypto/tiny_aes.c Added

@@ -0,0 +1,586 @@
+/*
+
+This is an implementation of the AES algorithm, specifically ECB, CTR and CBC mode.
+Block size can be chosen in aes.h - available choices are AES128, AES192, AES256.
+
+The implementation is verified against the test vectors in:
+ National Institute of Standards and Technology Special Publication 800-38A 2001 ED
+
+ECB-AES128
+----------
+
+ plain-text:
+ 6bc1bee22e409f96e93d7e117393172a
+ ae2d8a571e03ac9c9eb76fac45af8e51
+ 30c81c46a35ce411e5fbc1191a0a52ef
+ f69f2445df4f9b17ad2b417be66c3710
+
+ key:
+ 2b7e151628aed2a6abf7158809cf4f3c
+
+ resulting cipher
+ 3ad77bb40d7a3660a89ecaf32466ef97 
+ f5d3d58503b9699de785895a96fdbaaf 
+ 43b1cd7f598ece23881b00e3ed030688 
+ 7b0c785e27e8ad3f8223207104725dd4 
+
+
+NOTE: String length must be evenly divisible by 16byte (str_len % 16 == 0)
+ You should pad the end of the string with zeros if this is not the case.
+ For AES192/256 the key size is proportionally larger.
+
+*/
+
+
+/*****************************************************************************/
+/* Includes: */
+/*****************************************************************************/
+
+#include "tiny_aes.h"
+
+#ifndef GPAC_HAS_SSL
+
+/*****************************************************************************/
+/* Defines: */
+/*****************************************************************************/
+// The number of columns comprising a state in AES. This is a constant in AES. Value=4
+#define Nb 4
+
+#if defined(AES256) && (AES256 == 1)
+ #define Nk 8
+ #define Nr 14
+#elif defined(AES192) && (AES192 == 1)
+ #define Nk 6
+ #define Nr 12
+#else
+ #define Nk 4 // The number of 32 bit words in a key.
+ #define Nr 10 // The number of rounds in AES Cipher.
+#endif
+
+// jcallan@github points out that declaring Multiply as a function 
+// reduces code size considerably with the Keil ARM compiler.
+// See this link for more information: https://github.com/kokke/tiny-AES-C/pull/3
+#ifndef MULTIPLY_AS_A_FUNCTION
+ #define MULTIPLY_AS_A_FUNCTION 0
+#endif
+
+
+
+
+/*****************************************************************************/
+/* Private variables: */
+/*****************************************************************************/
+// state - array holding the intermediate results during decryption.
+typedef u8 state_t[4][4];
+
+
+
+// The lookup-tables are marked const so they can be placed in read-only storage instead of RAM
+// The numbers below can be computed dynamically trading ROM for RAM - 
+// This can be useful in (embedded) bootloader applications, where ROM is often limited.
+static const u8 sbox[256] = {
+ //0 1 2 3 4 5 6 7 8 9 A B C D E F
+ 0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
+ 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
+ 0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+ 0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
+ 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
+ 0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+ 0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
+ 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
+ 0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+ 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
+ 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
+ 0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+ 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
+ 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
+ 0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+ 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16 };
+
+static const u8 rsbox[256] = {
+ 0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb,
+ 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb,
+ 0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
+ 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25,
+ 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92,
+ 0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
+ 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06,
+ 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b,
+ 0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
+ 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e,
+ 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b,
+ 0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
+ 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f,
+ 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef,
+ 0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
+ 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d };
+
+// The round constant word array, Rcon[i], contains the values given by 
+// x to the power (i-1) being powers of x (x is denoted as {02}) in the field GF(2^8)
+static const u8 Rcon[11] = {
+ 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36 };
+
+/*
+ * Jordan Goulder points out in PR #12 (https://github.com/kokke/tiny-AES-C/pull/12),
+ * that you can remove most of the elements in the Rcon array, because they are unused.
+ *
+ * From Wikipedia's article on the Rijndael key schedule @ https://en.wikipedia.org/wiki/Rijndael_key_schedule#Rcon
+ * 
+ * "Only the first some of these constants are actually used – up to rcon[10] for AES-128 (as 11 round keys are needed), 
+ * up to rcon[8] for AES-192, up to rcon[7] for AES-256. rcon[0] is not used in AES algorithm."
+ */
+
+
+/*****************************************************************************/
+/* Private functions: */
+/*****************************************************************************/
+/*
+static u8 getSBoxValue(u8 num)
+{
+ return sbox[num];
+}
+*/
+#define getSBoxValue(num) (sbox[(num)])
+/*
+static u8 getSBoxInvert(u8 num)
+{
+ return rsbox[num];
+}
+*/
+#define getSBoxInvert(num) (rsbox[(num)])
+
+// This function produces Nb(Nr+1) round keys. The round keys are used in each round to decrypt the states. 
+static void KeyExpansion(u8* RoundKey, const u8* Key)
+{
+ unsigned i, j, k;
+ u8 tempa[4]; // Used for the column/row operations
+ 
+ // The first round key is the key itself.
+ for (i = 0; i < Nk; ++i)
+ {
+ RoundKey[(i * 4) + 0] = Key[(i * 4) + 0];
+ RoundKey[(i * 4) + 1] = Key[(i * 4) + 1];
+ RoundKey[(i * 4) + 2] = Key[(i * 4) + 2];
+ RoundKey[(i * 4) + 3] = Key[(i * 4) + 3];
+ }
+
+ // All other round keys are found from the previous round keys.
+ for (i = Nk; i < Nb * (Nr + 1); ++i)
+ {
+ {
+ k = (i - 1) * 4;
+ tempa[0]=RoundKey[k + 0];
+ tempa[1]=RoundKey[k + 1];
+ tempa[2]=RoundKey[k + 2];
+ tempa[3]=RoundKey[k + 3];
+
+ }
+
+ if (i % Nk == 0)
+ {
+ // This function shifts the 4 bytes in a word to the left once.
+ // [a0,a1,a2,a3] becomes [a1,a2,a3,a0]
+
+ // Function RotWord()
+ {
+ k = tempa[0];
+ tempa[0] = tempa[1];
+ tempa[1] = tempa[2];
+ tempa[2] = tempa[3];
+ tempa[3] = k;
+ }
+
+ // SubWord() is a function that takes a four-byte input word and 
+ // applies the S-box to each of the four bytes to produce an output word.
+
+ // Function Subword()
+ {
+ tempa[0] = getSBoxValue(tempa[0]);
+ tempa[1] = getSBoxValue(tempa[1]);
+ tempa[2] = getSBoxValue(tempa[2]);
+ tempa[3] = getSBoxValue(tempa[3]);
+ }
+
+ tempa[0] = tempa[0] ^ Rcon[i/Nk];
+ }
+#if defined(AES256) && (AES256 == 1)
+ if (i % Nk == 4)
+ {
+ // Function Subword()
+ {
+ tempa[0] = getSBoxValue(tempa[0]);
+ tempa[1] = getSBoxValue(tempa[1]);
+ tempa[2] = getSBoxValue(tempa[2]);
+ tempa[3] = getSBoxValue(tempa[3]);
+ }
+ }
+#endif
+ j = i * 4; k=(i - Nk) * 4;
+ RoundKey[j + 0] = RoundKey[k + 0] ^ tempa[0];
+ RoundKey[j + 1] = RoundKey[k + 1] ^ tempa[1];
+ RoundKey[j + 2] = RoundKey[k + 2] ^ tempa[2];
+ RoundKey[j + 3] = RoundKey[k + 3] ^ tempa[3];
+ }
+}
+
+void AES_init_ctx(struct AES_ctx* ctx, const u8* key)
+{
+ KeyExpansion(ctx->RoundKey, key);
+#if (defined(CTR) && (CTR == 1))
+	ctx->counter_pos = 0;
+#endif
+}
+
+#if (defined(CBC) && (CBC == 1)) || (defined(CTR) && (CTR == 1))
+void AES_init_ctx_iv(struct AES_ctx* ctx, const u8* key, const u8* iv)
+{
+ KeyExpansion(ctx->RoundKey, key);
+#if (defined(CTR) && (CTR == 1))
+	ctx->counter_pos = 0;
+#endif
+ memcpy (ctx->Iv, iv, AES_BLOCKLEN);
+}
+void AES_ctx_set_iv(struct AES_ctx* ctx, const u8* iv)
+{
+ memcpy (ctx->Iv, iv, AES_BLOCKLEN);
+}
+void AES_ctx_get_iv(struct AES_ctx* ctx, u8* iv)
+{
+ memcpy(iv, ctx->Iv, AES_BLOCKLEN);
+}
+#endif
+
+// This function adds the round key to state.
+// The round key is added to the state by an XOR function.
+static void AddRoundKey(u8 round,state_t* state,u8* RoundKey)
+{
+ u8 i,j;
+ for (i = 0; i < 4; ++i)
+ {
+ for (j = 0; j < 4; ++j)
+ {
+ (*state)[i][j] ^= RoundKey[(round * Nb * 4) + (i * Nb) + j];
+ }
+ }
+}
+
+// The SubBytes Function Substitutes the values in the
+// state matrix with values in an S-box.
+static void SubBytes(state_t* state)
+{
+ u8 i, j;
+ for (i = 0; i < 4; ++i)
+ {
+ for (j = 0; j < 4; ++j)
+ {
+ (*state)[j][i] = getSBoxValue((*state)[j][i]);
+ }
+ }
+}
+
+// The ShiftRows() function shifts the rows in the state to the left.
+// Each row is shifted with different offset.
+// Offset = Row number. So the first row is not shifted.
+static void ShiftRows(state_t* state)
+{
+ u8 temp;
+
+ // Rotate first row 1 columns to left 
+ temp = (*state)[0][1];
+ (*state)[0][1] = (*state)[1][1];
+ (*state)[1][1] = (*state)[2][1];
+ (*state)[2][1] = (*state)[3][1];
+ (*state)[3][1] = temp;
+
+ // Rotate second row 2 columns to left 
+ temp = (*state)[0][2];
+ (*state)[0][2] = (*state)[2][2];
+ (*state)[2][2] = temp;
+
+ temp = (*state)[1][2];
+ (*state)[1][2] = (*state)[3][2];
+ (*state)[3][2] = temp;
+
+ // Rotate third row 3 columns to left
+ temp = (*state)[0][3];
+ (*state)[0][3] = (*state)[3][3];
+ (*state)[3][3] = (*state)[2][3];
+ (*state)[2][3] = (*state)[1][3];
+ (*state)[1][3] = temp;
+}
+
+static u8 xtime(u8 x)
+{
+ return ((x<<1) ^ (((x>>7) & 1) * 0x1b));
+}
+
+// MixColumns function mixes the columns of the state matrix
+static void MixColumns(state_t* state)
+{
+ u8 i;
+ u8 Tmp, Tm, t;
+ for (i = 0; i < 4; ++i)
+ { 
+ t = (*state)[i][0];
+ Tmp = (*state)[i][0] ^ (*state)[i][1] ^ (*state)[i][2] ^ (*state)[i][3] ;
+ Tm = (*state)[i][0] ^ (*state)[i][1] ; Tm = xtime(Tm); (*state)[i][0] ^= Tm ^ Tmp ;
+ Tm = (*state)[i][1] ^ (*state)[i][2] ; Tm = xtime(Tm); (*state)[i][1] ^= Tm ^ Tmp ;
+ Tm = (*state)[i][2] ^ (*state)[i][3] ; Tm = xtime(Tm); (*state)[i][2] ^= Tm ^ Tmp ;
+ Tm = (*state)[i][3] ^ t ; Tm = xtime(Tm); (*state)[i][3] ^= Tm ^ Tmp ;
+ }
+}
+
+// Multiply is used to multiply numbers in the field GF(2^8)
+// Note: The last call to xtime() is unneeded, but often ends up generating a smaller binary
+// The compiler seems to be able to vectorize the operation better this way.
+// See https://github.com/kokke/tiny-AES-c/pull/34
+#if MULTIPLY_AS_A_FUNCTION
+static u8 Multiply(u8 x, u8 y)
+{
+ return (((y & 1) * x) ^
+ ((y>>1 & 1) * xtime(x)) ^
+ ((y>>2 & 1) * xtime(xtime(x))) ^
+ ((y>>3 & 1) * xtime(xtime(xtime(x)))) ^
+ ((y>>4 & 1) * xtime(xtime(xtime(xtime(x)))))); /* this last call to xtime() can be omitted */
+ }
+#else
+#define Multiply(x, y) \
+ ( ((y & 1) * x) ^ \
+ ((y>>1 & 1) * xtime(x)) ^ \
+ ((y>>2 & 1) * xtime(xtime(x))) ^ \
+ ((y>>3 & 1) * xtime(xtime(xtime(x)))) ^ \
+ ((y>>4 & 1) * xtime(xtime(xtime(xtime(x)))))) \
+
+#endif
+
+// MixColumns function mixes the columns of the state matrix.
+// The method used to multiply may be difficult to understand for the inexperienced.
+// Please use the references to gain more information.
+static void InvMixColumns(state_t* state)
+{
+ int i;
+ u8 a, b, c, d;
+ for (i = 0; i < 4; ++i)
+ { 
+ a = (*state)[i][0];
+ b = (*state)[i][1];
+ c = (*state)[i][2];
+ d = (*state)[i][3];
+
+ (*state)[i][0] = Multiply(a, 0x0e) ^ Multiply(b, 0x0b) ^ Multiply(c, 0x0d) ^ Multiply(d, 0x09);
+ (*state)[i][1] = Multiply(a, 0x09) ^ Multiply(b, 0x0e) ^ Multiply(c, 0x0b) ^ Multiply(d, 0x0d);
+ (*state)[i][2] = Multiply(a, 0x0d) ^ Multiply(b, 0x09) ^ Multiply(c, 0x0e) ^ Multiply(d, 0x0b);
+ (*state)[i][3] = Multiply(a, 0x0b) ^ Multiply(b, 0x0d) ^ Multiply(c, 0x09) ^ Multiply(d, 0x0e);
+ }
+}
+
+
+// The SubBytes Function Substitutes the values in the
+// state matrix with values in an S-box.
+static void InvSubBytes(state_t* state)
+{
+ u8 i, j;
+ for (i = 0; i < 4; ++i)
+ {
+ for (j = 0; j < 4; ++j)
+ {
+ (*state)[j][i] = getSBoxInvert((*state)[j][i]);
+ }
+ }
+}
+
+static void InvShiftRows(state_t* state)
+{
+ u8 temp;
+
+ // Rotate first row 1 columns to right 
+ temp = (*state)[3][1];
+ (*state)[3][1] = (*state)[2][1];
+ (*state)[2][1] = (*state)[1][1];
+ (*state)[1][1] = (*state)[0][1];
+ (*state)[0][1] = temp;
+
+ // Rotate second row 2 columns to right 
+ temp = (*state)[0][2];
+ (*state)[0][2] = (*state)[2][2];
+ (*state)[2][2] = temp;
+
+ temp = (*state)[1][2];
+ (*state)[1][2] = (*state)[3][2];
+ (*state)[3][2] = temp;
+
+ // Rotate third row 3 columns to right
+ temp = (*state)[0][3];
+ (*state)[0][3] = (*state)[1][3];
+ (*state)[1][3] = (*state)[2][3];
+ (*state)[2][3] = (*state)[3][3];
+ (*state)[3][3] = temp;
+}
+
+
+// Cipher is the main function that encrypts the PlainText.
+static void Cipher(state_t* state, u8* RoundKey)
+{
+ u8 round = 0;
+
+ // Add the First round key to the state before starting the rounds.
+ AddRoundKey(0, state, RoundKey); 
+ 
+ // There will be Nr rounds.
+ // The first Nr-1 rounds are identical.
+ // These Nr-1 rounds are executed in the loop below.
+ for (round = 1; round < Nr; ++round)
+ {
+ SubBytes(state);
+ ShiftRows(state);
+ MixColumns(state);
+ AddRoundKey(round, state, RoundKey);
+ }
+ 
+ // The last round is given below.
+ // The MixColumns function is not here in the last round.
+ SubBytes(state);
+ ShiftRows(state);
+ AddRoundKey(Nr, state, RoundKey);
+}
+
+static void InvCipher(state_t* state,u8* RoundKey)
+{
+ u8 round = 0;
+
+ // Add the First round key to the state before starting the rounds.
+ AddRoundKey(Nr, state, RoundKey); 
+
+ // There will be Nr rounds.
+ // The first Nr-1 rounds are identical.
+ // These Nr-1 rounds are executed in the loop below.
+ for (round = (Nr - 1); round > 0; --round)
+ {
+ InvShiftRows(state);
+ InvSubBytes(state);
+ AddRoundKey(round, state, RoundKey);
+ InvMixColumns(state);
+ }
+ 
+ // The last round is given below.
+ // The MixColumns function is not here in the last round.
+ InvShiftRows(state);
+ InvSubBytes(state);
+ AddRoundKey(0, state, RoundKey);
+}
+
+
+/*****************************************************************************/
+/* Public functions: */
+/*****************************************************************************/
+#if defined(ECB) && (ECB == 1)
+
+
+void AES_ECB_encrypt(struct AES_ctx *ctx,const u8* buf)
+{
+ // The next function call encrypts the PlainText with the Key using AES algorithm.
+ Cipher((state_t*)buf, ctx->RoundKey);
+}
+
+void AES_ECB_decrypt(struct AES_ctx* ctx,const u8* buf)
+{
+ // The next function call decrypts the PlainText with the Key using AES algorithm.
+ InvCipher((state_t*)buf, ctx->RoundKey);
+}
+
+
+#endif // #if defined(ECB) && (ECB == 1)
+
+
+
+
+
+#if defined(CBC) && (CBC == 1)
+
+
+static void XorWithIv(u8* buf, u8* Iv)
+{
+ u8 i;
+ for (i = 0; i < AES_BLOCKLEN; ++i) // The block in AES is always 128bit no matter the key size
+ {
+ buf[i] ^= Iv[i];
+ }
+}
+
+void AES_CBC_encrypt_buffer(struct AES_ctx *ctx,u8* buf, u32 length)
+{
+ uintptr_t i;
+ u8 *Iv = ctx->Iv;
+ for (i = 0; i < length; i += AES_BLOCKLEN)
+ {
+ XorWithIv(buf, Iv);
+ Cipher((state_t*)buf, ctx->RoundKey);
+ Iv = buf;
+ buf += AES_BLOCKLEN;
+ //printf("Step %d - %d", i/16, i);
+ }
+ /* store Iv in ctx for next call */
+ memcpy(ctx->Iv, Iv, AES_BLOCKLEN);
+}
+
+void AES_CBC_decrypt_buffer(struct AES_ctx* ctx, u8* buf, u32 length)
+{
+ uintptr_t i;
+ u8 storeNextIv[AES_BLOCKLEN];
+ for (i = 0; i < length; i += AES_BLOCKLEN)
+ {
+ memcpy(storeNextIv, buf, AES_BLOCKLEN);
+ InvCipher((state_t*)buf, ctx->RoundKey);
+ XorWithIv(buf, ctx->Iv);
+ memcpy(ctx->Iv, storeNextIv, AES_BLOCKLEN);
+ buf += AES_BLOCKLEN;
+ }
+
+}
+
+#endif // #if defined(CBC) && (CBC == 1)
+
+
+
+#if defined(CTR) && (CTR == 1)
+
+/* Symmetrical operation: same function for encrypting as for decrypting. Note any IV/nonce should never be reused with the same key */
+void AES_CTR_xcrypt_buffer(struct AES_ctx* ctx, u8* buf, u32 length)
+{
+ unsigned i;
+ int bi = (AES_BLOCKLEN - ctx->counter_pos);
+ assert(ctx->counter_pos<AES_BLOCKLEN);
+
+ for (i = 0; i < length; ++i, ++bi)
+ {
+ if (bi == AES_BLOCKLEN) /* we need to regen xor compliment in buffer */
+ {
+ 
+ memcpy(ctx->buffer, ctx->Iv, AES_BLOCKLEN);
+ Cipher((state_t*)ctx->buffer,ctx->RoundKey);
+
+ /* Increment Iv and handle overflow */
+ for (bi = (AES_BLOCKLEN - 1); bi >= 0; --bi)
+ {
+	/* inc will owerflow */
+ if (ctx->Iv[bi] == 255)
+	{
+ ctx->Iv[bi] = 0;
+ continue;
+ } 
+ ctx->Iv[bi] += 1;
+ break; 
+ }
+ bi = 0;
+ }
+
+ buf[i] = (buf[i] ^ ctx->buffer[bi]);
+ }
+ ctx->counter_pos = (AES_BLOCKLEN - bi);
+}
+
+#endif // #if defined(CTR) && (CTR == 1)
+
+#endif //GPAC_HAS_SSL
+
+

gpac-0.8.0.tar.gz/src/crypto/tiny_aes.h Added

@@ -0,0 +1,93 @@
+#ifndef _AES_H_
+#define _AES_H_
+
+#include <gpac/setup.h>
+
+// #define the macros below to 1/0 to enable/disable the mode of operation.
+//
+// CBC enables AES encryption in CBC-mode of operation.
+// CTR enables encryption in counter-mode.
+// ECB enables the basic ECB 16-byte block algorithm. All can be enabled simultaneously.
+
+// The #ifndef-guard allows it to be configured before #include'ing or at compile time.
+#ifndef CBC
+ #define CBC 1
+#endif
+
+#ifndef ECB
+ #define ECB 1
+#endif
+
+#ifndef CTR
+ #define CTR 1
+#endif
+
+
+#define AES128 1
+//#define AES192 1
+//#define AES256 1
+
+#define AES_BLOCKLEN 16 //Block length in bytes AES is 128b block only
+
+#if defined(AES256) && (AES256 == 1)
+ #define AES_KEYLEN 32
+ #define AES_keyExpSize 240
+#elif defined(AES192) && (AES192 == 1)
+ #define AES_KEYLEN 24
+ #define AES_keyExpSize 208
+#else
+ #define AES_KEYLEN 16 // Key length in bytes
+ #define AES_keyExpSize 176
+#endif
+
+struct AES_ctx
+{
+ u8 RoundKey[AES_keyExpSize];
+#if (defined(CBC) && (CBC == 1)) || (defined(CTR) && (CTR == 1))
+ u8 Iv[AES_BLOCKLEN];
+ u8 counter_pos;
+ u8 buffer[AES_BLOCKLEN];
+#endif
+};
+
+void AES_init_ctx(struct AES_ctx* ctx, const u8* key);
+#if (defined(CBC) && (CBC == 1)) || (defined(CTR) && (CTR == 1))
+void AES_init_ctx_iv(struct AES_ctx* ctx, const u8* key, const u8* iv);
+void AES_ctx_set_iv(struct AES_ctx* ctx, const u8* iv);
+void AES_ctx_get_iv(struct AES_ctx* ctx, u8* iv);
+#endif
+
+#if defined(ECB) && (ECB == 1)
+// buffer size is exactly AES_BLOCKLEN bytes; 
+// you need only AES_init_ctx as IV is not used in ECB 
+// NB: ECB is considered insecure for most uses
+void AES_ECB_encrypt(struct AES_ctx* ctx, const u8* buf);
+void AES_ECB_decrypt(struct AES_ctx* ctx, const u8* buf);
+
+#endif // #if defined(ECB) && (ECB == !)
+
+
+#if defined(CBC) && (CBC == 1)
+// buffer size MUST be mutile of AES_BLOCKLEN;
+// Suggest https://en.wikipedia.org/wiki/Padding_(cryptography)#PKCS7 for padding scheme
+// NOTES: you need to set IV in ctx via AES_init_ctx_iv() or AES_ctx_set_iv()
+// no IV should ever be reused with the same key 
+void AES_CBC_encrypt_buffer(struct AES_ctx* ctx, u8* buf, u32 length);
+void AES_CBC_decrypt_buffer(struct AES_ctx* ctx, u8* buf, u32 length);
+
+#endif // #if defined(CBC) && (CBC == 1)
+
+
+#if defined(CTR) && (CTR == 1)
+
+// Same function for encrypting as for decrypting. 
+// IV is incremented for every block, and used after encryption as XOR-compliment for output
+// Suggesting https://en.wikipedia.org/wiki/Padding_(cryptography)#PKCS7 for padding scheme
+// NOTES: you need to set IV in ctx with AES_init_ctx_iv() or AES_ctx_set_iv()
+// no IV should ever be reused with the same key 
+void AES_CTR_xcrypt_buffer(struct AES_ctx* ctx, u8* buf, u32 length);
+
+#endif // #if defined(CTR) && (CTR == 1)
+
+
+#endif //_AES_H_

gpac-0.7.1.tar.gz/src/dir_info -> gpac-0.8.0.tar.gz/src/dir_info Changed

gpac-0.7.1.tar.gz/src/export.cpp -> gpac-0.8.0.tar.gz/src/export.cpp Changed

@@ -94,10 +94,10 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_prompt_get_char) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_prompt_set_echo_off) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_crc_32) )
-#ifndef GPAC_DISABLE_ZLIB
 #pragma comment (linker, EXPORT_SYMBOL(gf_gz_compress_payload) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_gz_decompress_payload) )
-#endif
+#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) )
 
 /* Memory */
@@ -109,6 +109,7 @@
 #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) )
@@ -127,6 +128,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_ringbuffer_write) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_ringbuffer_available_for_read ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_ringbuffer_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_ringbuffer_available_for_read) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_ringbuffer_available_for_write) )
 #endif
 
 
@@ -221,6 +224,18 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_set_output_buffering) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_transfer) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_flush) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_bits_available) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_bit_offset) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_bit_position) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_content_no_truncate) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_output_buffering) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_u16_le) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_u32_le) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_rewind_bits) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_truncate) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_write_byte) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_write_u16_le) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_write_u32_le) )
 
 
 /* Thread */
@@ -269,6 +284,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sk_is_multicast_address) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sk_send_wait) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sk_receive_wait) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sk_receive_no_select) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_url_is_local) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_url_get_absolute_path) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_url_concatenate) )
@@ -276,6 +292,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_url_get_resource_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_url_remove_last_delimiter) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_url_get_ressource_extension) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_url_to_fs_path) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_utc_time_since_1970) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_gettimeofday) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_get_ntp) )
@@ -322,6 +339,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_get_filename) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_set_filename) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_discard_changes) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_cfg_get_ikey) )
 
 #ifndef GPAC_DISABLE_PLAYER
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_new) )
@@ -445,6 +463,9 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dom_get_key_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dom_get_key_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dom_event_get_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dom_event_fire_ex) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dom_listener_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dom_listener_get) )
 #endif
 
 #ifdef GPAC_FIXED_POINT
@@ -531,12 +552,18 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mx_decompose) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mx_rotate_vector) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mx_rotation_matrix_from_vectors) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mx_apply_bbox_sphere) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mx_get_yaw_pitch_roll) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mx_transpose) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mx2d_from_mx) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mx_apply_plane) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_plane_get_distance) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_plane_intersect_line) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_closest_point_to_line) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_plane_get_p_vertex_idx) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_plane_exists_intersection) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_plane_intersect_plane) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_plane_intersect_planes) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bbox_plane_relation) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mx_apply_ray) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_ray) )
@@ -594,6 +621,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_polygone2d_get_convexity) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_path_get_outline) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_path_point_over) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_path_clone) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_path_is_empty) )
 
 #endif //GPAC_DISABLE_PLAYER
 
@@ -634,10 +663,26 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_read) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_write) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_write_bs) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_read) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_del) )
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_av1_cfg_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_av1_cfg_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_av1_cfg_write) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_av1_cfg_write_bs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_write_bs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_read_bs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_write) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_write_bs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_vp_cfg_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_vp_cfg_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_vp_cfg_read) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_vp_cfg_read_bs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_vp_cfg_write) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_vp_cfg_write_bs) )
+
 #ifndef GPAC_MINIMAL_ODF
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_add_desc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_list_read) )
@@ -676,6 +721,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_get_bs) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_delete) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_file_size) )
@@ -684,6 +731,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_parse) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_xml_metadata_description) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_ac3_config_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_dims_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_stxt_get_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_new_xml_subtitle_description) )
@@ -773,8 +821,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_user_data) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_generic_sample_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_fragment_defaults) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_fragment_count) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_fragment_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_default_sync_track) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_3gp_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_ac3_config_get) )
@@ -812,6 +858,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_meta_xml) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_extract_meta_xml) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_extract_meta_item) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_extract_meta_item_mem) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_meta_image_props) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_movie) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_segment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_segment_get_fragment_count) )
@@ -836,6 +884,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_rvc_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_rap_roll_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_reset_fragment_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_reset_sample_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_reset_seq_num) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_original_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_nalu_extract_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_nalu_extract_mode) )
@@ -843,6 +893,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_needs_layer_reconstruction) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_last_producer_time_box) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_current_tfdt) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_smooth_streaming_moov) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_adobe_protection_media) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_adobe_protection_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_group_info) )
@@ -851,6 +902,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_oinf_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_udta_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_udta_type) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_video_subtype) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_sample_was_traf_start) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_constant_sample_size) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_constant_sample_duration) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_enable_raw_pack) )
+
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sync_table) )
@@ -897,6 +954,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_last_sample_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_reference) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_track_reference) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_track_references) )
 #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) )
@@ -934,12 +992,16 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_reset_alt_brands) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sample_padding_bits) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_visual_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_visual_color_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_visual_bit_depth) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_pixel_aspect_ratio) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_layout_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_matrix) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_audio_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_cts_packing) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_modify_cts_offset) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_shift_cts_offset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_cts_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_name) )
@@ -968,7 +1030,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sync_shadow) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_interleaving_group) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_priority_in_group) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_max_samples_per_chunk) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_hint_max_chunk_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_extraction_slc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_extraction_slc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_group) )
@@ -1004,6 +1066,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_hevc_config_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_hevc_config_update) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_hevc_set_inband_config) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_lhvc_force_inband_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_lhvc_config_update) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_3gp_config_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_3gp_config_update) )
@@ -1063,12 +1126,11 @@
 #endif /*GPAC_DISABLE_ISOM_HINTING*/
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_sample_fragment) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_sample_fragment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_setup_track_fragment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_finalize_for_fragment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_start_fragment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_flush_fragments) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_segment_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_fragment_reference_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_traf_mss_timeext) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_fragment_option) )
@@ -1115,10 +1177,40 @@
 #endif
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_map_esd) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_map_item_esd) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_get_file_hash) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_reduce_aspect_ratio) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_get_reduced_frame_rate) )
 
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_av1_config_get) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_av1_config_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_add_default) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_equal) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_write_header) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_cenc_is_pattern_mode) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_close_fragments) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_delete_xml_subtitle_sample) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_extract_meta_item_extended) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_bitrate) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_pssh) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_cenc_info_ex) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_hevc_set_tile_config) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_mvc_config_get) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_mvc_config_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_parse_xml_subtitle_sample) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_sample_set_dep_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_JPEG2000) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_hdr) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_clean_aperture) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_image_sequence_alpha) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_image_sequence_coding_constraints) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sample_cenc_default) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_streamer_get_current_time) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_svc_config_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_vp_config_get) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_vp_config_new) )
+
 #endif /*GPAC_DISABLE_ISOM*/
 
 
@@ -1169,7 +1261,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_set_flag) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_min_frame_dur) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_clock_drift) )
-
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_event_target_add_node) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_nb_layers) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_nb_views) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_raw_image_planes) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_is_raw_memory) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_is_started) )
 
 #ifndef GPAC_DISABLE_SVG
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_load_xlink_resource) )
@@ -1311,8 +1408,10 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_make_isma) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_make_3gpp) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_make_psp) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_check_qt_prores) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_import) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_import_chapters) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_import_chapters_file) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_change_pl) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_nalu_next_start_code_bs) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_nalu_payload_end_bs) )
@@ -1329,14 +1428,18 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_change_par) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_remove_non_rap) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_update_bitrate) )
 #endif
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_nalu_next_start_code) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_nalu_remove_emulation_bytes) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_avc_get_sps_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_avc_get_pps_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_avc_get_profile_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_avc_hevc_get_chroma_format_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_avc_is_rext_profile) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_avc_parse_nalu) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_avc_read_sps) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_avc_read_pps) )
@@ -1345,6 +1448,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_vps) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_vps_ex) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_sps) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_sps_ex) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_pps) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_hevc_get_sps_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_hevc_get_profile_name) )
@@ -1353,6 +1457,8 @@
 
 #endif //GPAC_DISABLE_HEVC
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_aom_av1_parse_obu) )
+
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
 
@@ -1361,16 +1467,17 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_export_nhml) )
 #endif /*GPAC_DISABLE_MEDIA_EXPORT*/
 
-/*mcrypt exports*/
-#ifndef GPAC_DISABLE_MCRYPT
+/*crypto exports*/
+#ifndef GPAC_DISABLE_CRYPTO
 #pragma comment (linker, EXPORT_SYMBOL(gf_crypt_open) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_crypt_close) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_crypt_init) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_crypt_decrypt) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_crypt_encrypt) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_crypt_set_key) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_crypt_set_state) )
-#endif GPAC_DISABLE_MCRYPT
+#pragma comment (linker, EXPORT_SYMBOL(gf_crypt_set_IV) )
+#endif GPAC_DISABLE_CRYPTO
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_sha1_csum) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sha1_csum_hexa) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sha1_file) )
@@ -1396,6 +1503,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4a_get_channel_cfg) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4a_write_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4a_write_config_bs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m4a_parse_config) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_ac3_parser_bs) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_eac3_parser_bs) )
@@ -1462,6 +1570,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_load_run) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_load_suspend) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_import_bifs_subtitle) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sm_get_mux_info) )
 #endif
 
 #ifndef GPAC_DISABLE_LOADER_BT
@@ -1478,6 +1587,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_dump) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_dump_command_list) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_dump_graph) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sm_dumper_set_extra_graph) )
 #ifndef GPAC_DISABLE_OD_DUMP
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_dump_au) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_dump_com) )
@@ -1522,8 +1632,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_decode_au) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_decode_command_list) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_get_aq_info) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_bifs_get_node_type) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_bifs_proto_field_set_aq_info) )
 #ifndef GPAC_DISABLE_BIFS_ENC
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_encoder_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_encoder_del) )
@@ -1594,6 +1702,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_command_field_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_get_next_available_node_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_get_max_node_id) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sg_node_get_tag_by_class_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_get_field_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_list_add_child) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_list_add_child_last) )
@@ -1605,6 +1714,17 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_list_del_child_idx) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_dump_attribute) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_node_dirty_parent_graph) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_node_dirty_parents) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_node_get_proto_parent) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_node_get_proto_root) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_node_is_proto_root) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_node_list_append_child) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_node_proto_is_grouping) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_node_proto_set_grouping) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_node_remove_id) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_node_set_cyclic_traverse_flag) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_node_store_embedded_data) )
 
 
 #ifndef GPAC_DISABLE_SVG
@@ -1635,6 +1755,9 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_unregister_iri) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_svg_parse_element_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_svg_is_animation_tag) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_svg_apply_animations) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_svg_attributes_copy) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_svg_path_build) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_get_element_tag) )
 
 
@@ -1675,6 +1798,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_vrml_mf_reset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_vrml_field_copy) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_vrml_field_equal) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sg_vrml_field_clone) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_route_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_route_new_to_callback) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_route_del) )
@@ -1775,6 +1899,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_object_subscene_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_select_object) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_select_service) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_term_find_service) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_toggle_addons) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_object_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_download_info) )
@@ -1822,6 +1947,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_lock_media_queue) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_current_service_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_clock) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_term_forward_event) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_term_get_mfurl_from_xlink) )
 
 /*terminal_dev exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_new) )
@@ -1848,6 +1975,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_clock_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_get_media_object_ex) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_resume_live) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_scene_set_timeshift_depth) )
 
 #endif
 
@@ -1912,6 +2040,10 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_audio_restart) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_reload_config) )
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_sc_audio_check_url) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sc_texture_open) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sc_texture_stop_no_unregister) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_font_manager_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_font_manager_set_font) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_font_manager_create_span) )
@@ -1937,6 +2069,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_get_sdt_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_abort_parsing) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_pause_demux) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_probe_file) )
 
 
 /* carousel.h */
@@ -1977,6 +2110,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_solve_segment_list_xlink) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_delete_segment_list) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m3u8_parse_master_playlist) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mpd_write) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_write_file) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_get_base_url_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_resolve_url) )
@@ -1984,6 +2118,10 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_get_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_resolve_segment_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_init_smooth_from_dom) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mpd_complete_from_dom) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mpd_get_segment_start_time_with_timescale) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mpd_seek_in_period) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mpd_seek_to_time) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demuxer_setup))
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demuxer_play) )
@@ -2056,6 +2194,14 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dasher_add_input) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dasher_process) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_start_date) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_enable_cached_inputs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_enable_loop_inputs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_split_on_bound) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_split_on_closest) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_cues) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_isobmff_options) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_test_mode) )
+
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_dasher_next_update_time) )
 
@@ -2067,6 +2213,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dvb_mpe_init) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dvb_mpe_section_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dvb_mpe_shutdown) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dvb_get_freq_from_url) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_print_mpe_info) )
 #endif
 
@@ -2092,6 +2239,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_segment_init_url) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_segment_init_keys) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_select) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_seek) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_groups_set_language) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_in_last_period) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_period_switch_status) )
@@ -2157,6 +2305,11 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_set_visible_rect) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_utc_drift_estimate) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_algo) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_atsc_ast_shift) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_ignore_xlink) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_num_components) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_all_groups_done) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_period_xlink_query_string) )
 
 #endif
 
@@ -2179,3 +2332,43 @@
 #endif
 
 #pragma comment (linker, EXPORT_SYMBOL(utf8_to_ucs4) )
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_tune_in) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_set_callback) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_process) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_get_object_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_remove_object_by_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_remove_first_object) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_find_service) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_purge_objects) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_get_first_packet_time) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_get_last_packet_time) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_get_nb_packets) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_get_recv_bytes) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_set_service_udta) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_get_service_udta) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_debug_tsi) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_set_max_objects_store) )
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_dm_add_cache_entry) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dm_force_headers) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_term_service_get_dm) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dm_set_localcache_provider) )
+
+#pragma comment (linker, EXPORT_SYMBOL(av1_get_obu_name) )
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_get_next_pow2) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_htonl) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_htons) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_ntohl) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_tohs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_inline_is_default_viewpoint) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mpegv12_get_config) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_text_import_swf) )
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_smil_set_media_duration) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_smil_timing_init_runtime_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_smil_timing_insert_clock) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_smil_timing_is_active) )

gpac-0.7.1.tar.gz/src/ietf/rtp.c -> gpac-0.8.0.tar.gz/src/ietf/rtp.c Changed

gpac-0.7.1.tar.gz/src/ietf/rtp_depacketizer.c -> gpac-0.8.0.tar.gz/src/ietf/rtp_depacketizer.c Changed

@@ -30,6 +30,7 @@
 #include <gpac/esi.h>
 #include <gpac/base_coding.h>
 #include <gpac/constants.h>
+#include <gpac/isomedia.h>
 #include <gpac/mpeg4_odf.h>
 #include <gpac/avparse.h>
 
@@ -605,12 +606,13 @@
 		data[3] = nal_s&0xFF;
 	}
 	/*set F-bit since nal is corrupted*/
-	if (missed_end) data[4] |= 0x80;
+//	if (missed_end) data[4] |= 0x80;
 
 	rtp->sl_hdr.accessUnitEndFlag = (rtp->flags & GF_RTP_UNRELIABLE_M) ? 0 : hdr->Marker;
 	rtp->sl_hdr.compositionTimeStampFlag = 1;
 	rtp->sl_hdr.compositionTimeStamp = hdr->TimeStamp;
 	rtp->sl_hdr.decodingTimeStampFlag = 0;
+
 	rtp->on_sl_packet(rtp->udta, data, data_size, &rtp->sl_hdr, GF_OK);
 	rtp->sl_hdr.accessUnitStartFlag = 0;
 	rtp->sl_hdr.randomAccessPointFlag = 0;
@@ -644,7 +646,7 @@
 
 	/*single NALU*/
 	if (nal_type<23) {
-		if (nal_type==5) {
+		if (nal_type==GF_AVC_NALU_IDR_SLICE) {
 			rtp->sl_hdr.randomAccessPointFlag = 1;
 			rtp->flags &= ~GF_RTP_AVC_WAIT_RAP;
 		}
@@ -684,7 +686,7 @@
 			nal_size<<=8;
 			nal_size |= (u8) payload[offset+1];
 			offset += 2;
-			if ((payload[offset] & 0x1F) == 5) {
+			if ((payload[offset] & 0x1F) == GF_AVC_NALU_IDR_SLICE) {
 				rtp->sl_hdr.randomAccessPointFlag = 1;
 				rtp->flags &= ~GF_RTP_AVC_WAIT_RAP;
 			}
@@ -719,7 +721,7 @@
 		/*flush*/
 		if (is_start) gf_rtp_h264_flush(rtp, hdr, GF_TRUE);
 
-		if ((payload[1] & 0x1F) == 5) {
+		if ((payload[1] & 0x1F) == GF_AVC_NALU_IDR_SLICE) {
 			rtp->flags &= ~GF_RTP_AVC_WAIT_RAP;
 			rtp->sl_hdr.randomAccessPointFlag = 1;
 		} else if (rtp->flags & GF_RTP_AVC_WAIT_RAP)
@@ -732,7 +734,7 @@
 			/*copy F and NRI*/
 			nal_hdr = payload[0] & 0xE0;
 			/*start bit not set, signal corrupted data (we missed start packet)*/
-			if (!is_start) nal_hdr |= 0x80;
+//			if (!is_start) nal_hdr |= 0x80;
 			/*copy NALU type*/
 			nal_hdr |= (payload[1] & 0x1F);
 			/*dummy size field*/
@@ -1171,7 +1173,7 @@
 	} /*ISMACryp config*/
 	else if (!stricmp(param_name, "ISMACrypCryptoSuite")) {
 		if (!stricmp(param_val, "AES_CTR_128"))
-			rtp->isma_scheme = GF_4CC('i','A','E','C');
+			rtp->isma_scheme = GF_ISOM_ISMACRYP_SCHEME;
 		else
 			rtp->isma_scheme = 0;
 	}
@@ -1285,7 +1287,7 @@
 		/*mark if AU header is present*/
 		rtp->sl_map.auh_first_min_len = 0;
 		if (rtp->flags & GF_RTP_HAS_ISMACRYP) {
-			if (!rtp->isma_scheme) rtp->isma_scheme = GF_4CC('i','A','E','C');
+			if (!rtp->isma_scheme) rtp->isma_scheme = GF_ISOM_ISMACRYP_SCHEME;
 			if (!rtp->sl_map.IV_length) rtp->sl_map.IV_length = 4;
 
 			if (rtp->flags & GF_RTP_ISMA_SEL_ENC) rtp->sl_map.auh_first_min_len += 8;
@@ -1363,12 +1365,12 @@
 		/*create DSI*/
 		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		if (rtp->payt == GF_RTP_PAYT_AMR) {
-			gf_bs_write_u32(bs, GF_4CC('s', 'a', 'm', 'r'));
+			gf_bs_write_u32(bs, GF_ISOM_SUBTYPE_3GP_AMR);
 			gf_bs_write_u32(bs, 8000);
 			gf_bs_write_u16(bs, 1);
 			gf_bs_write_u16(bs, 160);
 		} else {
-			gf_bs_write_u32(bs, GF_4CC('s', 'a', 'w', 'b'));
+			gf_bs_write_u32(bs, GF_ISOM_SUBTYPE_3GP_AMR_WB);
 			gf_bs_write_u32(bs, 16000);
 			gf_bs_write_u16(bs, 1);
 			gf_bs_write_u16(bs, 320);
@@ -1398,7 +1400,7 @@
 		rtp->sl_map.ObjectTypeIndication = GPAC_OTI_MEDIA_GENERIC;
 		/*create DSI*/
 		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		gf_bs_write_u32(bs, GF_4CC('h', '2', '6', '3'));
+		gf_bs_write_u32(bs, GF_ISOM_SUBTYPE_H263);
 		gf_bs_write_u16(bs, w);
 		gf_bs_write_u16(bs, h);
 		gf_bs_get_content(bs, &rtp->sl_map.config, &rtp->sl_map.configSize);
@@ -1466,18 +1468,22 @@
 		}
 		a_tx3g = tx3g;
 		gf_bs_write_u8(bs, nb_desc);
+		nb_desc = 1;
 		while (1) {
 			char *next_tx3g, szOut[1000];
-			u32 len;
-			strcpy(a_tx3g, tx3g);
+			u32 len, s_len;
 			next_tx3g = strchr(a_tx3g, ',');
-			if (next_tx3g) next_tx3g[0] = 0;
-			len = gf_base64_decode(a_tx3g, (u32) strlen(a_tx3g), szOut, 1000);
+			if (next_tx3g) s_len = (u32) (next_tx3g - a_tx3g - 1);
+			else s_len = (u32) strlen(a_tx3g);
+
+			len = gf_base64_decode(a_tx3g, s_len, szOut, 1000);
+			nb_desc++;
 			gf_bs_write_data(bs, szOut, len);
-			tx3g = strchr(tx3g, ',');
-			if (!tx3g) break;
-			tx3g += 1;
-			while (tx3g[0] == ' ') tx3g += 1;
+			if (!next_tx3g) break;
+			a_tx3g = strchr(a_tx3g, ',');
+			if (!a_tx3g) break;
+			a_tx3g += 1;
+			while (a_tx3g[0] == ' ') a_tx3g += 1;
 		}
 
 		/*write video cfg*/
@@ -1554,7 +1560,11 @@
 				}
 			}
 		}
-		gf_odf_avc_cfg_write(avcc, &rtp->sl_map.config, &rtp->sl_map.configSize);
+		if (gf_list_count(avcc->sequenceParameterSets) && gf_list_count(avcc->pictureParameterSets)) {
+			gf_odf_avc_cfg_write(avcc, &rtp->sl_map.config, &rtp->sl_map.configSize);
+		} else {
+			rtp->flags |= GF_RTP_AVC_USE_ANNEX_B;
+		}
 		gf_odf_avc_cfg_del(avcc);
 	}
 		/*assign depacketizer*/

gpac-0.7.1.tar.gz/src/ietf/rtp_pck_3gpp.c -> gpac-0.8.0.tar.gz/src/ietf/rtp_pck_3gpp.c Changed

gpac-0.7.1.tar.gz/src/ietf/rtp_streamer.c -> gpac-0.8.0.tar.gz/src/ietf/rtp_streamer.c Changed

@@ -395,6 +395,14 @@
 			OfficialPayloadType = 14;
 			required_rate = 90000;
 			break;
+
+		case GF_ISOM_SUBTYPE_TEXT:
+		case GF_ISOM_SUBTYPE_TX3G:
+			rtp_type = GF_RTP_PAYT_3GPP_TEXT;
+			/*fixme - this works cos there's only one PL for text in mpeg4 at the current time*/
+			PL_ID = 0x10;
+			break;
+
 		}
 		break;
 
@@ -526,6 +534,8 @@
 		switch (gf_isom_get_media_type(file, i+1)) {
 		case GF_ISOM_MEDIA_SCENE:
 		case GF_ISOM_MEDIA_VISUAL:
+        case GF_ISOM_MEDIA_AUXV:
+        case GF_ISOM_MEDIA_PICT:
 			gf_isom_get_track_layout_info(file, i+1, &w, &h, &tx, &ty, &l);
 			if (w>m_w) m_w = w;
 			if (h>m_h) m_h = h;
@@ -800,6 +810,7 @@
 	return gf_rtp_streamer_append_sdp_extended(rtp, ESID, dsi, dsi_len, NULL, 0, KMS_URI, 0, 0, out_sdp_buffer);
 }
 
+GF_EXPORT
 GF_Err gf_rtp_streamer_send_data(GF_RTPStreamer *rtp, char *data, u32 size, u32 fullsize, u64 cts, u64 dts, Bool is_rap, Bool au_start, Bool au_end, u32 au_sn, u32 sampleDuration, u32 sampleDescIndex)
 {
 	rtp->packetizer->sl_header.compositionTimeStamp = (u64) (cts*rtp->ts_scale);
@@ -814,6 +825,7 @@
 	return gf_rtp_builder_process(rtp->packetizer, data, size, (u8) au_end, fullsize, sampleDuration, sampleDescIndex);
 }
 
+GF_EXPORT
 GF_Err gf_rtp_streamer_send_au(GF_RTPStreamer *rtp, char *data, u32 size, u64 cts, u64 dts, Bool is_rap)
 {
 	return gf_rtp_streamer_send_data(rtp, data, size, size, cts, dts, is_rap, GF_TRUE, GF_TRUE, 0, 0, 0);

gpac-0.7.1.tar.gz/src/ietf/rtsp_session.c -> gpac-0.8.0.tar.gz/src/ietf/rtsp_session.c Changed

gpac-0.7.1.tar.gz/src/isomedia/avc_ext.c -> gpac-0.8.0.tar.gz/src/isomedia/avc_ext.c Changed

@@ -36,26 +36,27 @@
 Bool gf_isom_is_nalu_based_entry(GF_MediaBox *mdia, GF_SampleEntryBox *_entry)
 {
 	GF_MPEGVisualSampleEntryBox *entry;
-	if (mdia->handler->handlerType != GF_ISOM_MEDIA_VISUAL) return GF_FALSE;
+	if (!gf_isom_is_video_subtype(mdia->handler->handlerType))
+		return GF_FALSE;
 	switch (_entry->type) {
-	case GF_4CC('a','v','c','1'):
-	case GF_4CC('a','v','c','2'):
-	case GF_4CC('a','v','c','3'):
-	case GF_4CC('a','v','c','4'):
-	case GF_4CC('s','v','c','1'):
-	case GF_4CC('s','v','c','2'):
-	case GF_4CC('m','v','c','1'):
-	case GF_4CC('m','v','c','2'):
-	case GF_4CC('h','v','c','1'):
-	case GF_4CC('h','e','v','1'):
-	case GF_4CC('h','v','c','2'):
-	case GF_4CC('h','e','v','2'):
-	case GF_4CC('l','h','v','1'):
-	case GF_4CC('l','h','e','1'):
-	case GF_4CC('m','h','v','1'):
-	case GF_4CC('m','h','c','1'):
-	case GF_4CC('h','v','t','1'):
-	case GF_4CC('l','h','t','1'):
+	case GF_ISOM_BOX_TYPE_AVC1:
+	case GF_ISOM_BOX_TYPE_AVC2:
+	case GF_ISOM_BOX_TYPE_AVC3:
+	case GF_ISOM_BOX_TYPE_AVC4:
+	case GF_ISOM_BOX_TYPE_SVC1:
+	case GF_ISOM_BOX_TYPE_SVC2:
+	case GF_ISOM_BOX_TYPE_MVC1:
+	case GF_ISOM_BOX_TYPE_MVC2:
+	case GF_ISOM_BOX_TYPE_HVC1:
+	case GF_ISOM_BOX_TYPE_HEV1:
+	case GF_ISOM_BOX_TYPE_HVC2:
+	case GF_ISOM_BOX_TYPE_HEV2:
+	case GF_ISOM_BOX_TYPE_LHV1:
+	case GF_ISOM_BOX_TYPE_LHE1:
+	case GF_ISOM_BOX_TYPE_MHV1:
+	case GF_ISOM_BOX_TYPE_MHC1:
+	case GF_ISOM_BOX_TYPE_HVT1:
+	case GF_ISOM_BOX_TYPE_LHT1:
 		return GF_TRUE;
 	case GF_ISOM_BOX_TYPE_GNRV:
 	case GF_ISOM_BOX_TYPE_GNRA:
@@ -95,7 +96,7 @@
 	char*buffer = NULL;
 	u32 max_size = 0;
 	u32 last_byte, ref_sample_num, prev_ref_sample_num;
-
+	Bool header_written = GF_FALSE;
 	nb_bytes_nalh = is_hevc ? 2 : 1;
 
 	switch (extractor_mode) {
@@ -107,21 +108,32 @@
 			//hevc extractors use constructors
 			if (is_hevc) xmode = gf_bs_read_u8(src_bs);
 			if (xmode) {
-				u8 len = gf_bs_read_u8(src_bs);
-				while (len) {
+				u8 done=0, len = gf_bs_read_u8(src_bs);
+				while (done<len) {
 					u8 c = gf_bs_read_u8(src_bs);
-					gf_bs_write_u8(dst_bs, c);
-					len--;
+					done++;
+					if (header_written) {
+						gf_bs_write_u8(dst_bs, c);
+					} else if (done==nal_unit_size_field) {
+						if (rewrite_start_codes) {
+							gf_bs_write_int(dst_bs, 1, 32);
+						} else {
+							gf_bs_write_u8(dst_bs, c);
+						}
+						header_written = GF_TRUE;
+					} else if (!rewrite_start_codes) {
+						gf_bs_write_u8(dst_bs, c);
+					}
 				}
 				continue;
 			}
-			
+
 			ref_track_index = gf_bs_read_u8(src_bs);
 			sample_offset = (s8) gf_bs_read_int(src_bs, 8);
 			data_offset = gf_bs_read_int(src_bs, nal_unit_size_field*8);
 			data_length = gf_bs_read_int(src_bs, nal_unit_size_field*8);
 
-			Track_FindRef(mdia->mediaTrack, GF_4CC('s','c','a','l'), &dpnd);
+			Track_FindRef(mdia->mediaTrack, GF_ISOM_REF_SCAL, &dpnd);
 			ref_track_num = 0;
 			if (dpnd && ref_track_index && (ref_track_index<=dpnd->trackIDCount))
 				ref_track_num = gf_isom_get_track_by_id(file, dpnd->trackIDs[ref_track_index-1]);
@@ -154,7 +166,8 @@
 			e = Media_GetSample(ref_trak->Media, ref_sample_num, &ref_samp, &di, GF_FALSE, NULL);
 			if (e) return e;
 
-			if (rewrite_start_codes) {
+#if 0
+			if (!header_written && rewrite_start_codes) {
 				gf_bs_write_int(dst_bs, 1, 32);
 				if (is_hevc) {
 					gf_bs_write_int(dst_bs, 0, 1);
@@ -168,15 +181,26 @@
 					gf_bs_write_int(dst_bs, 0xF0 , 8); /*7 "all supported NALUs" (=111) + rbsp trailing (10000)*/;
 				}
 			}
+#endif
 			ref_bs = gf_bs_new(ref_samp->data + data_offset, ref_samp->dataLength - data_offset, GF_BITSTREAM_READ);
-			if (!data_length)
-				data_length = ref_samp->dataLength - data_offset;
 
 			if (ref_samp->dataLength - data_offset >= data_length) {
 
 				while (data_length && gf_bs_available(ref_bs)) {
-					ref_nalu_size = gf_bs_read_int(ref_bs, 8*nal_unit_size_field);
-					assert(ref_nalu_size <= data_length);
+					if (!header_written) {
+						ref_nalu_size = gf_bs_read_int(ref_bs, 8*nal_unit_size_field);
+
+						if (!data_length)
+							data_length = ref_nalu_size + nal_unit_size_field;
+
+						assert(data_length>nal_unit_size_field);
+						data_length -= nal_unit_size_field;
+						if (data_length > gf_bs_available(ref_bs)) {
+							data_length = (u32)gf_bs_available(ref_bs);
+						}
+					} else {
+						ref_nalu_size = data_length;
+					}
 
 					if (ref_nalu_size > max_size) {
 						buffer = (char*) gf_realloc(buffer, sizeof(char) * ref_nalu_size );
@@ -184,13 +208,18 @@
 					}
 					gf_bs_read_data(ref_bs, buffer, ref_nalu_size);
 
-					if (rewrite_start_codes)
-						gf_bs_write_u32(dst_bs, 1);
-					else
-						gf_bs_write_int(dst_bs, ref_nalu_size, 8*nal_unit_size_field);
-
+					if (!header_written) {
+						if (rewrite_start_codes)
+							gf_bs_write_u32(dst_bs, 1);
+						else
+							gf_bs_write_int(dst_bs, ref_nalu_size, 8*nal_unit_size_field);
+					}
+					assert(data_length >= ref_nalu_size);
 					gf_bs_write_data(dst_bs, buffer, ref_nalu_size);
-					data_length -= ref_nalu_size + nal_unit_size_field;
+					data_length -= ref_nalu_size;
+
+					header_written = GF_FALSE;
+
 				}
 			} else {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("ISOBMF: Extractor size is larger than refered sample size - skipping.\n"));
@@ -202,7 +231,7 @@
 			if (buffer) gf_free(buffer);
 			buffer = NULL;
 			gf_isom_set_nalu_extract_mode(file, ref_track_num, cur_extract_mode);
-			
+
 			if (!is_hevc) break;
 		}
 		break;
@@ -374,9 +403,10 @@
 //	Bool check_cra_bla = (mdia->information->sampleTable->SyncSample && mdia->information->sampleTable->SyncSample->nb_entries>1) ? 0 : 1;
 	Bool check_cra_bla = GF_TRUE;
 	Bool insert_nalu_delim = GF_TRUE;
+	Bool force_sei_inspect = GF_FALSE;
 	GF_Err e = GF_OK;
 	GF_ISOSample *ref_samp;
-	GF_BitStream *src_bs, *ref_bs, *dst_bs, *ps_bs;
+	GF_BitStream *src_bs, *ref_bs, *dst_bs, *ps_bs, *sei_suffix_bs;
 	u32 nal_size, max_size, nal_unit_size_field, extractor_mode;
 	Bool rewrite_ps, rewrite_start_codes, insert_vdrd_code;
 	s8 nal_type;
@@ -386,11 +416,11 @@
 	GF_ISOFile *file = mdia->mediaTrack->moov->mov;
 	GF_TrackReferenceTypeBox *scal = NULL;
 
-	src_bs = ref_bs = dst_bs = ps_bs = NULL;
+	src_bs = ref_bs = dst_bs = ps_bs = sei_suffix_bs = NULL;
 	ref_samp = NULL;
 	buffer = NULL;
 
-	Track_FindRef(mdia->mediaTrack, GF_4CC('s','c','a','l'), &scal);
+	Track_FindRef(mdia->mediaTrack, GF_ISOM_REF_SCAL, &scal);
 
 	rewrite_ps = (mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG) ? GF_TRUE : GF_FALSE;
 	rewrite_start_codes = (mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG) ? GF_TRUE : GF_FALSE;
@@ -407,8 +437,7 @@
 	if ( (extractor_mode != GF_ISOM_NALU_EXTRACT_INSPECT) && !(mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_TILE_ONLY) ) {
 		u32 ref_track, di;
 		//aggregate all sabt samples with the same DTS
-
-		if (entry->lhvc_config && !entry->hevc_config) {
+		if (entry->lhvc_config && !entry->hevc_config && !(mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_LAYER_ONLY)) {
 			GF_ISOSample *base_samp;
 			if (gf_isom_get_reference_count(mdia->mediaTrack->moov->mov, track_num, GF_ISOM_REF_SCAL) <= 0) {
 				//FIXME - for now we only support two layers (base + enh) in implicit
@@ -428,7 +457,7 @@
 							sample->dataLength += base_samp->dataLength;
 						}
 						if (base_samp) gf_isom_sample_del(&base_samp);
-						Track_FindRef(mdia->mediaTrack, GF_4CC('s','b','a','s'), &scal);
+						Track_FindRef(mdia->mediaTrack, GF_ISOM_REF_BASE, &scal);
 						break;
 					}
 				}
@@ -436,7 +465,8 @@
 		}
 
 		sabt_ref = gf_isom_get_reference_count(mdia->mediaTrack->moov->mov, track_num, GF_ISOM_REF_SABT);
-		if ((s32) sabt_ref >= 0) {
+		if ((s32) sabt_ref > 0) {
+			force_sei_inspect = GF_TRUE;
 			for (i=0; i<sabt_ref; i++) {
 				GF_ISOSample *tile_samp;
 				gf_isom_get_reference(mdia->mediaTrack->moov->mov, track_num, GF_ISOM_REF_SABT, i+1, &ref_track);
@@ -497,7 +527,7 @@
 	}
 
 	/*otherwise do nothing*/
-	else if (!rewrite_ps && !rewrite_start_codes && !scal) {
+	else if (!rewrite_ps && !rewrite_start_codes && !scal && !force_sei_inspect) {
 		return GF_OK;
 	}
 
@@ -523,7 +553,8 @@
 		//we are SVC, don't write NALU delim, only insert VDRD NALU
 		if (insert_vdrd_code) {
 			if (is_hevc) {
-				//spec is not clear here, we insert a NALU AU delimiter before the layer starts
+				//spec is not clear here, we don't insert an NALU AU delimiter before the layer starts since it breaks openHEVC
+//				insert_nalu_delim=0;
 			} else {
 				gf_bs_write_int(dst_bs, 1, 32);
 				gf_bs_write_int(dst_bs, GF_AVC_NALU_VDRD , 8);
@@ -605,7 +636,7 @@
 	}
 
 	/*little optimization if we are not asked to rewrite extractors or start codes: copy over the sample*/
-	if (!scal && !rewrite_start_codes && !rewrite_ps) {
+	if (!scal && !rewrite_start_codes && !rewrite_ps && !force_sei_inspect) {
 		if (ps_bs)
 		{
 			gf_bs_transfer(dst_bs, ps_bs);
@@ -642,6 +673,7 @@
 		}
 
 		if (is_hevc) {
+			GF_BitStream *write_to_bs = dst_bs;
 			if (ps_bs) {
 				gf_bs_transfer(dst_bs, ps_bs);
 				gf_bs_del(ps_bs);
@@ -703,13 +735,19 @@
 					goto exit;
 				}
 				gf_bs_read_data(src_bs, buffer, nal_size-2);
+
+				if (nal_type==GF_HEVC_NALU_SEI_SUFFIX) {
+					if (!sei_suffix_bs) sei_suffix_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+					write_to_bs = sei_suffix_bs;
+				}
+
 				if (rewrite_start_codes)
-					gf_bs_write_u32(dst_bs, 1);
+					gf_bs_write_u32(write_to_bs, 1);
 				else
-					gf_bs_write_int(dst_bs, nal_size, 8*nal_unit_size_field);
+					gf_bs_write_int(write_to_bs, nal_size, 8*nal_unit_size_field);
 
-				gf_bs_write_u16(dst_bs, nal_hdr);
-				gf_bs_write_data(dst_bs, buffer, nal_size-2);
+				gf_bs_write_u16(write_to_bs, nal_hdr);
+				gf_bs_write_data(write_to_bs, buffer, nal_size-2);
 			}
 #endif
 
@@ -754,6 +792,10 @@
 		}
 	}
 
+	if (sei_suffix_bs) {
+		gf_bs_transfer(dst_bs, sei_suffix_bs);
+		gf_bs_del(sei_suffix_bs);
+	}
 	/*done*/
 	gf_free(sample->data);
 	sample->data = NULL;
@@ -770,6 +812,7 @@
 	if (src_bs) gf_bs_del(src_bs);
 	if (ref_bs) gf_bs_del(ref_bs);
 	if (dst_bs) gf_bs_del(dst_bs);
+	if (ps_bs) gf_bs_del(ps_bs);
 	if (buffer) gf_free(buffer);
 	return e;
 }
@@ -800,7 +843,10 @@
 {
 	u32 i, count;
 	GF_AVCConfigSlot *p1, *p2;
-	GF_AVCConfig *cfg_new = gf_odf_avc_cfg_new();
+	GF_AVCConfig *cfg_new;
+	if (!cfg)
+		return NULL;
+	cfg_new = gf_odf_avc_cfg_new();
 	cfg_new->AVCLevelIndication = cfg->AVCLevelIndication;
 	cfg_new->AVCProfileIndication = cfg->AVCProfileIndication;
 	cfg_new->configurationVersion = cfg->configurationVersion;
@@ -853,7 +899,7 @@
 {
 	GF_AVCConfig *cfg = AVC_DuplicateConfig(src_cfg);
 	if (!cfg || !dst_cfg) return;
-	
+
 	while (gf_list_count(cfg->sequenceParameterSets)) {
 		GF_AVCConfigSlot *p = (GF_AVCConfigSlot*)gf_list_get(cfg->sequenceParameterSets, 0);
 		gf_list_rem(cfg->sequenceParameterSets, 0);
@@ -921,7 +967,7 @@
 {
 	u32 i;
 	GF_TrackReferenceTypeBox *scal = NULL;
-	Track_FindRef(mdia->mediaTrack, GF_4CC('s','c','a','l'), &scal);
+	Track_FindRef(mdia->mediaTrack, GF_ISOM_REF_SCAL, &scal);
 
 	if (!scal) return;
 
@@ -1153,6 +1199,136 @@
 }
 
 
+
+static GF_AV1Config* AV1_DuplicateConfig(GF_AV1Config const * const cfg) {
+	u32 i = 0;
+	GF_AV1Config *out = gf_malloc(sizeof(GF_AV1Config));
+
+	out->marker = cfg->marker;
+	out->version = cfg->version;
+	out->seq_profile = cfg->seq_profile;
+	out->seq_level_idx_0 = cfg->seq_level_idx_0;
+	out->seq_tier_0 = cfg->seq_tier_0;
+	out->high_bitdepth = cfg->high_bitdepth;
+	out->twelve_bit = cfg->twelve_bit;
+	out->monochrome = cfg->monochrome;
+	out->chroma_subsampling_x = cfg->chroma_subsampling_x;
+	out->chroma_subsampling_y = cfg->chroma_subsampling_y;
+	out->chroma_sample_position = cfg->chroma_sample_position;
+
+	out->initial_presentation_delay_present = cfg->initial_presentation_delay_present;
+	out->initial_presentation_delay_minus_one = cfg->initial_presentation_delay_minus_one;
+	out->obu_array = gf_list_new();
+	for (i = 0; i<gf_list_count(cfg->obu_array); ++i) {
+		GF_AV1_OBUArrayEntry *dst = gf_malloc(sizeof(GF_AV1_OBUArrayEntry)), *src = gf_list_get(cfg->obu_array, i);
+		dst->obu_length = src->obu_length;
+		dst->obu_type = src->obu_type;
+		dst->obu = gf_malloc((size_t)dst->obu_length);
+		memcpy(dst->obu, src->obu, (size_t)src->obu_length);
+		gf_list_add(out->obu_array, dst);
+	}
+	return out;
+}
+
+void AV1_RewriteESDescriptorEx(GF_MPEGVisualSampleEntryBox *av1, GF_MediaBox *mdia)
+{
+	GF_BitRateBox *btrt = gf_isom_sample_entry_get_bitrate((GF_SampleEntryBox *)av1, GF_FALSE);
+
+	if (av1->emul_esd) gf_odf_desc_del((GF_Descriptor *)av1->emul_esd);
+	av1->emul_esd = gf_odf_desc_esd_new(2);
+	av1->emul_esd->decoderConfig->streamType = GF_STREAM_VISUAL;
+	av1->emul_esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_AV1;
+
+	if (btrt) {
+		av1->emul_esd->decoderConfig->bufferSizeDB = btrt->bufferSizeDB;
+		av1->emul_esd->decoderConfig->avgBitrate = btrt->avgBitrate;
+		av1->emul_esd->decoderConfig->maxBitrate = btrt->maxBitrate;
+	}
+	if (av1->descr) {
+		GF_Descriptor *desc, *clone;
+		u32 i = 0;
+		while ((desc = (GF_Descriptor *)gf_list_enum(av1->descr->descriptors, &i))) {
+			clone = NULL;
+			gf_odf_desc_copy(desc, &clone);
+			if (gf_odf_desc_add_desc((GF_Descriptor *)av1->emul_esd, clone) != GF_OK)
+				gf_odf_desc_del(clone);
+		}
+	}
+
+	if (av1->av1_config) {
+		GF_AV1Config *av1_cfg = AV1_DuplicateConfig(av1->av1_config->config);
+		if (av1_cfg) {
+			gf_odf_av1_cfg_write(av1_cfg, &av1->emul_esd->decoderConfig->decoderSpecificInfo->data, &av1->emul_esd->decoderConfig->decoderSpecificInfo->dataLength);
+			gf_odf_av1_cfg_del(av1_cfg);
+		}
+	}
+}
+
+void AV1_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *av1)
+{
+	AV1_RewriteESDescriptorEx(av1, NULL);
+}
+
+
+
+static GF_VPConfig* VP_DuplicateConfig(GF_VPConfig const * const cfg)
+{
+	GF_VPConfig *out = gf_odf_vp_cfg_new();
+	if (out) {
+		out->profile = cfg->profile;
+		out->level = cfg->level;
+		out->bit_depth = cfg->bit_depth;
+		out->chroma_subsampling = cfg->chroma_subsampling;
+		out->video_fullRange_flag = cfg->video_fullRange_flag;
+		out->colour_primaries = cfg->colour_primaries;
+		out->transfer_characteristics = cfg->transfer_characteristics;
+		out->matrix_coefficients = cfg->matrix_coefficients;
+	}
+
+	return out;
+}
+
+void VP9_RewriteESDescriptorEx(GF_MPEGVisualSampleEntryBox *vp9, GF_MediaBox *mdia)
+{
+	GF_BitRateBox *btrt = gf_isom_sample_entry_get_bitrate((GF_SampleEntryBox *)vp9, GF_FALSE);
+
+	if (vp9->emul_esd) gf_odf_desc_del((GF_Descriptor *)vp9->emul_esd);
+	vp9->emul_esd = gf_odf_desc_esd_new(2);
+	vp9->emul_esd->decoderConfig->streamType = GF_STREAM_VISUAL;
+	vp9->emul_esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_VP9;
+
+	if (btrt) {
+		vp9->emul_esd->decoderConfig->bufferSizeDB = btrt->bufferSizeDB;
+		vp9->emul_esd->decoderConfig->avgBitrate = btrt->avgBitrate;
+		vp9->emul_esd->decoderConfig->maxBitrate = btrt->maxBitrate;
+	}
+	if (vp9->descr) {
+		GF_Descriptor *desc, *clone;
+		u32 i = 0;
+		while ((desc = (GF_Descriptor *)gf_list_enum(vp9->descr->descriptors, &i))) {
+			clone = NULL;
+			gf_odf_desc_copy(desc, &clone);
+			if (gf_odf_desc_add_desc((GF_Descriptor *)vp9->emul_esd, clone) != GF_OK)
+				gf_odf_desc_del(clone);
+		}
+	}
+
+	if (vp9->vp_config) {
+		GF_VPConfig *vp9_cfg = VP_DuplicateConfig(vp9->vp_config->config);
+		if (vp9_cfg) {
+			gf_odf_vp_cfg_write(vp9_cfg, &vp9->emul_esd->decoderConfig->decoderSpecificInfo->data, &vp9->emul_esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
+			gf_odf_vp_cfg_del(vp9_cfg);
+		}
+	}
+}
+
+void VP9_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *vp9)
+{
+	VP9_RewriteESDescriptorEx(vp9, NULL);
+}
+
+
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 GF_EXPORT
 GF_Err gf_isom_avc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex)
@@ -1172,7 +1348,7 @@
 	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 	if (e) return e;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(the_file, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
 	if (!the_file->keep_utc)
@@ -1313,6 +1489,7 @@
 	return gf_isom_avc_config_update_ex(the_file, trackNumber, DescriptionIndex, cfg, 0);
 }
 
+GF_EXPORT
 GF_Err gf_isom_svc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_AVCConfig *cfg, Bool is_add)
 {
 	return gf_isom_avc_config_update_ex(the_file, trackNumber, DescriptionIndex, cfg, is_add ? 1 : 2);
@@ -1421,7 +1598,7 @@
 	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 	if (e) return e;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(the_file, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
 	if (!the_file->keep_utc)
@@ -1477,7 +1654,7 @@
 	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 	if (e) return e;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(the_file, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
 	if (!the_file->keep_utc)
@@ -1495,6 +1672,81 @@
 	return e;
 }
 
+GF_EXPORT
+GF_Err gf_isom_vp_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_VPConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex, Bool is_vp9)
+{
+	GF_TrackBox *trak;
+	GF_Err e;
+	u32 dataRefIndex;
+	GF_MPEGVisualSampleEntryBox *entry;
+
+	e = CanAccessMovie(the_file, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !trak->Media || !cfg) return GF_BAD_PARAM;
+
+	//get or create the data ref
+	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+	if (e) return e;
+	if (!dataRefIndex) {
+		e = Media_CreateDataRef(the_file, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		if (e) return e;
+	}
+	if (!the_file->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	//create a new entry
+	if (is_vp9) entry = (GF_MPEGVisualSampleEntryBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_VP09);
+	else entry = (GF_MPEGVisualSampleEntryBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_VP08);
+	if (!entry) return GF_OUT_OF_MEM;
+	entry->vp_config = (GF_VPConfigurationBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_VPCC);
+	if (!entry->vp_config) return GF_OUT_OF_MEM;
+	entry->vp_config->config = VP_DuplicateConfig(cfg);
+	strncpy(entry->compressor_name, "\012VPC Coding", sizeof(entry->compressor_name)-1);
+	entry->dataReferenceIndex = dataRefIndex;
+	e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, entry);
+	*outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+	return e;
+}
+
+GF_EXPORT
+GF_Err gf_isom_av1_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AV1Config *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex)
+{
+	GF_TrackBox *trak;
+	GF_Err e;
+	u32 dataRefIndex;
+	GF_MPEGVisualSampleEntryBox *entry;
+
+	e = CanAccessMovie(the_file, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !trak->Media || !cfg) return GF_BAD_PARAM;
+
+	//get or create the data ref
+	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+	if (e) return e;
+	if (!dataRefIndex) {
+		e = Media_CreateDataRef(the_file, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		if (e) return e;
+	}
+	if (!the_file->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	//create a new entry
+	entry = (GF_MPEGVisualSampleEntryBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_AV01);
+	if (!entry) return GF_OUT_OF_MEM;
+	entry->av1_config = (GF_AV1ConfigurationBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_AV1C);
+	if (!entry->av1_config) return GF_OUT_OF_MEM;
+	entry->av1_config->config = AV1_DuplicateConfig(cfg);
+	entry->dataReferenceIndex = dataRefIndex;
+	e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, entry);
+	*outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+	return e;
+}
+
+
 typedef enum
 {
 	GF_ISOM_HVCC_UPDATE = 0,
@@ -1504,6 +1756,7 @@
 	GF_ISOM_HVCC_SET_LHVC,
 	GF_ISOM_HVCC_SET_LHVC_WITH_BASE,
 	GF_ISOM_HVCC_SET_LHVC_WITH_BASE_BACKWARD,
+	GF_ISOM_LHCC_SET_INBAND
 } HevcConfigUpdateType;
 
 static Bool hevc_cleanup_config(GF_HEVCConfig *cfg, HevcConfigUpdateType operand_type)
@@ -1516,12 +1769,9 @@
 		GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(cfg->param_array, i);
 
 		/*we want to force hev1*/
-		if (operand_type==GF_ISOM_HVCC_SET_INBAND)
+		if (operand_type==GF_ISOM_HVCC_SET_INBAND) {
 			ar->array_completeness = 0;
 
-		if (!ar->array_completeness) {
-			array_incomplete = 1;
-
 			while (gf_list_count(ar->nalus)) {
 				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot*)gf_list_get(ar->nalus, 0);
 				gf_list_rem(ar->nalus, 0);
@@ -1530,10 +1780,12 @@
 			}
 			gf_list_del(ar->nalus);
 			gf_free(ar);
+			ar=NULL;
 			gf_list_rem(cfg->param_array, i);
 			i--;
-
 		}
+		if (ar && !ar->array_completeness)
+			array_incomplete = 1;
 	}
 	return array_incomplete;
 }
@@ -1649,6 +1901,10 @@
 			if ((entry->type==GF_ISOM_BOX_TYPE_HEV1) || (entry->type==GF_ISOM_BOX_TYPE_HEV2)) entry->type = GF_ISOM_BOX_TYPE_LHE1;
 			else entry->type = GF_ISOM_BOX_TYPE_LHV1;
 		}
+		/*LHEVC inband, no config change*/
+		else if (operand_type==GF_ISOM_LHCC_SET_INBAND) {
+			entry->type = GF_ISOM_BOX_TYPE_LHE1;
+		}
 	}
 
 	HEVC_RewriteESDescriptor(entry);
@@ -1668,11 +1924,19 @@
 }
 
 GF_EXPORT
+GF_Err gf_isom_lhvc_force_inband_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
+{
+	return gf_isom_hevc_config_update_ex(the_file, trackNumber, DescriptionIndex, NULL, GF_ISOM_LHCC_SET_INBAND);
+}
+
+
+GF_EXPORT
 GF_Err gf_isom_hevc_set_tile_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg, Bool is_base_track)
 {
 	return gf_isom_hevc_config_update_ex(the_file, trackNumber, DescriptionIndex, cfg, is_base_track ? GF_ISOM_HVCC_SET_TILE_BASE_TRACK : GF_ISOM_HVCC_SET_TILE);
 }
 
+GF_EXPORT
 GF_Err gf_isom_lhvc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg, GF_ISOMLHEVCTrackType track_type)
 {
 	if (cfg) cfg->is_lhvc = GF_TRUE;
@@ -1690,8 +1954,8 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_EXPORT 
-GF_Box *gf_isom_clone_config_box(GF_Box *box) 
+GF_EXPORT
+GF_Box *gf_isom_clone_config_box(GF_Box *box)
 {
 	GF_Box *clone;
 	switch (box->type)
@@ -1706,6 +1970,10 @@
 		clone = gf_isom_box_new(box->type);
 		((GF_HEVCConfigurationBox *)clone)->config = HEVC_DuplicateConfig(((GF_HEVCConfigurationBox *)box)->config);
 		break;
+	case GF_ISOM_BOX_TYPE_AV1C:
+		clone = gf_isom_box_new(box->type);
+		((GF_AV1ConfigurationBox *)clone)->config = AV1_DuplicateConfig(((GF_AV1ConfigurationBox *)box)->config);
+		break;
 	default:
 		clone = NULL;
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Cloning of config not supported for type %s\n", gf_4cc_to_str(box->type)));
@@ -1784,6 +2052,36 @@
 	return AVC_DuplicateConfig(entry->mvc_config->config);
 }
 
+GF_EXPORT
+GF_AV1Config *gf_isom_av1_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
+{
+	GF_TrackBox *trak;
+	GF_MPEGVisualSampleEntryBox *entry;
+	if (gf_isom_get_reference_count(the_file, trackNumber, GF_ISOM_REF_TBAS)) {
+		u32 ref_track;
+		GF_Err e = gf_isom_get_reference(the_file, trackNumber, GF_ISOM_REF_TBAS, 1, &ref_track);
+		if (e == GF_OK) {
+			trackNumber = ref_track;
+		}
+	}
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !trak->Media || !DescriptionIndex) return NULL;
+	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex - 1);
+	if (!entry || !entry->av1_config) return NULL;
+	return AV1_DuplicateConfig(entry->av1_config->config);
+}
+
+GF_EXPORT
+GF_VPConfig *gf_isom_vp_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
+{
+	GF_TrackBox *trak;
+	GF_MPEGVisualSampleEntryBox *entry;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !trak->Media || !DescriptionIndex) return NULL;
+	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex - 1);
+	if (!entry || !entry->vp_config) return NULL;
+	return VP_DuplicateConfig(entry->vp_config->config);
+}
 
 GF_EXPORT
 u32 gf_isom_get_avc_svc_type(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
@@ -1793,7 +2091,9 @@
 	GF_MPEGVisualSampleEntryBox *entry;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !trak->Media || !DescriptionIndex) return GF_ISOM_AVCTYPE_NONE;
-	if (trak->Media->handler->handlerType != GF_ISOM_MEDIA_VISUAL) return GF_ISOM_AVCTYPE_NONE;
+	if (!gf_isom_is_video_subtype(trak->Media->handler->handlerType))
+		return GF_ISOM_AVCTYPE_NONE;
+
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex-1);
 	if (!entry) return GF_ISOM_AVCTYPE_NONE;
 
@@ -1834,7 +2134,8 @@
 	GF_MPEGVisualSampleEntryBox *entry;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !trak->Media || !DescriptionIndex) return GF_ISOM_HEVCTYPE_NONE;
-	if (trak->Media->handler->handlerType != GF_ISOM_MEDIA_VISUAL) return GF_ISOM_HEVCTYPE_NONE;
+	if (!gf_isom_is_video_subtype(trak->Media->handler->handlerType))
+		return GF_ISOM_HEVCTYPE_NONE;
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex-1);
 	if (!entry) return GF_ISOM_AVCTYPE_NONE;
 	type = entry->type;
@@ -2009,6 +2310,7 @@
 {
 	GF_AVCConfigurationBox *ptr = (GF_AVCConfigurationBox *)s;
 	if (ptr->config) gf_odf_avc_cfg_del(ptr->config);
+	ptr->config = NULL;
 	gf_free(ptr);
 }
 
@@ -2066,7 +2368,7 @@
 				AVCState avc;
 				s32 idx, vui_flag_pos;
 				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot*)gf_list_get(ptr->config->sequenceParameterSets, 0);
-				idx = gf_media_avc_read_sps(sl->data+1, sl->size-1, &avc, 0, (u32 *) &vui_flag_pos);
+				idx = sl ? gf_media_avc_read_sps(sl->data+1, sl->size-1, &avc, 0, (u32 *) &vui_flag_pos) : -1;
 				if (idx>=0) {
 					ptr->config->chroma_format = avc.sps[idx].chroma_format;
 					ptr->config->luma_bit_depth = 8 + avc.sps[idx].luma_bit_depth_m8;
@@ -2238,6 +2540,7 @@
 
 	return ptr->config ? GF_OK : GF_ISOM_INVALID_FILE;
 }
+
 GF_Box *hvcc_New()
 {
 	GF_HEVCConfigurationBox *tmp = (GF_HEVCConfigurationBox *) gf_malloc(sizeof(GF_HEVCConfigurationBox));
@@ -2259,6 +2562,7 @@
 
 	return gf_odf_hevc_cfg_write_bs(ptr->config, bs);
 }
+
 GF_Err hvcc_Size(GF_Box *s)
 {
 	u32 i, count, j, subcount;
@@ -2268,7 +2572,7 @@
 		ptr->size = 0;
 		return GF_OK;
 	}
-	
+
 	if (!ptr->config->is_lhvc)
 		ptr->size += 23;
 	else
@@ -2285,8 +2589,315 @@
 	}
 	return GF_OK;
 }
+
+GF_Box *av1c_New() {
+	GF_AV1ConfigurationBox *tmp = (GF_AV1ConfigurationBox *)gf_malloc(sizeof(GF_AV1ConfigurationBox));
+	if (tmp == NULL) return NULL;
+	memset(tmp, 0, sizeof(GF_AV1ConfigurationBox));
+	tmp->type = GF_ISOM_BOX_TYPE_AV1C;
+	return (GF_Box *)tmp;
+}
+
+void av1c_del(GF_Box *s) {
+	GF_AV1ConfigurationBox *ptr = (GF_AV1ConfigurationBox*)s;
+	if (ptr->config) gf_odf_av1_cfg_del(ptr->config);
+	gf_free(ptr);
+}
+
+Bool av1_is_obu_header(ObuType obu_type);
+GF_Err av1c_Read(GF_Box *s, GF_BitStream *bs) {
+	AV1State state;
+	u8 reserved;
+	u64 read = 0;
+	GF_AV1ConfigurationBox *ptr = (GF_AV1ConfigurationBox*)s;
+
+	if (ptr->config) gf_odf_av1_cfg_del(ptr->config);
+	GF_SAFEALLOC(ptr->config, GF_AV1Config);
+	memset(&state, 0, sizeof(AV1State));
+	state.config = ptr->config;
+
+	ptr->config->marker = gf_bs_read_int(bs, 1);
+	ptr->config->version = gf_bs_read_int(bs, 7);
+	ptr->config->seq_profile = gf_bs_read_int(bs, 3);
+	ptr->config->seq_level_idx_0 = gf_bs_read_int(bs, 5);
+	ptr->config->seq_tier_0 = gf_bs_read_int(bs, 1);
+	ptr->config->high_bitdepth = gf_bs_read_int(bs, 1);
+	ptr->config->twelve_bit = gf_bs_read_int(bs, 1);
+	ptr->config->monochrome = gf_bs_read_int(bs, 1);
+	ptr->config->chroma_subsampling_x = gf_bs_read_int(bs, 1);
+	ptr->config->chroma_subsampling_y = gf_bs_read_int(bs, 1);
+	ptr->config->chroma_sample_position = gf_bs_read_int(bs, 2);
+
+	reserved = gf_bs_read_int(bs, 3);
+	if (reserved != 0 || ptr->config->marker != 1 || ptr->config->version != 1)
+		return GF_NOT_SUPPORTED;
+	ptr->config->initial_presentation_delay_present = gf_bs_read_int(bs, 1);
+	if (ptr->config->initial_presentation_delay_present) {
+		ptr->config->initial_presentation_delay_minus_one = gf_bs_read_int(bs, 4);
+	} else {
+		reserved = gf_bs_read_int(bs, 4);
+		ptr->config->initial_presentation_delay_minus_one = 0;
+	}
+	read += 4;
+	ptr->config->obu_array = gf_list_new();
+
+	while (read < ptr->size && gf_bs_available(bs)) {
+		u64 pos, obu_size;
+		ObuType obu_type;
+		GF_AV1_OBUArrayEntry *a;
+
+		pos = gf_bs_get_position(bs);
+		obu_size = 0;
+		if (gf_media_aom_av1_parse_obu(bs, &obu_type, &obu_size, NULL, &state) != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMFF] could not parse AV1 OBU at position "LLU". Leaving parsing.\n", pos));
+			break;
+		}
+		assert(obu_size == gf_bs_get_position(bs) - pos);
+		read += obu_size;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ISOBMFF] parsed AV1 OBU type=%u size="LLU" at position "LLU".\n", obu_type, obu_size, pos));
+
+		if (!av1_is_obu_header(obu_type)) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ISOBMFF] AV1 unexpected OBU type=%u size="LLU" found at position "LLU". Forwarding.\n", pos));
+		}
+		GF_SAFEALLOC(a, GF_AV1_OBUArrayEntry);
+		a->obu = gf_malloc((size_t)obu_size);
+		gf_bs_seek(bs, pos);
+		gf_bs_read_data(bs, (char *) a->obu, (u32)obu_size);
+		a->obu_length = obu_size;
+		a->obu_type = obu_type;
+		gf_list_add(ptr->config->obu_array, a);
+	}
+
+	if (read < ptr->size)
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ISOBMFF] AV1ConfigurationBox: read only "LLU" bytes (expected "LLU").\n", read, ptr->size));
+	if (read > ptr->size)
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMFF] AV1ConfigurationBox overflow read "LLU" bytes, of box size "LLU".\n", read, ptr->size));
+
+	av1_reset_frame_state(& state.frame_state);
+	return GF_OK;
+}
+
+GF_Err av1c_Write(GF_Box *s, GF_BitStream *bs) {
+	GF_Err e;
+	GF_AV1ConfigurationBox *ptr = (GF_AV1ConfigurationBox*)s;
+	if (!s) return GF_BAD_PARAM;
+	if (!ptr->config) return GF_BAD_PARAM;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
+	return gf_odf_av1_cfg_write_bs(ptr->config, bs);
+}
+
+GF_Err av1c_Size(GF_Box *s) {
+	u32 i;
+	GF_AV1ConfigurationBox *ptr = (GF_AV1ConfigurationBox *)s;
+
+	if (!ptr->config) {
+		ptr->size = 0;
+		return GF_BAD_PARAM;
+	}
+
+	ptr->size += 4;
+
+	for (i = 0; i < gf_list_count(ptr->config->obu_array); ++i) {
+		GF_AV1_OBUArrayEntry *a = gf_list_get(ptr->config->obu_array, i);
+		ptr->size += a->obu_length;
+	}
+
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+
+
+void vpcc_del(GF_Box *s)
+{
+	GF_VPConfigurationBox *ptr = (GF_VPConfigurationBox*)s;
+	if (ptr->config) gf_odf_vp_cfg_del(ptr->config);
+	ptr->config = NULL;
+	gf_free(ptr);
+}
+
+GF_Err vpcc_Read(GF_Box *s, GF_BitStream *bs)
+{
+	u64 pos;
+	GF_VPConfigurationBox *ptr = (GF_VPConfigurationBox *)s;
+
+	if (ptr->config) gf_odf_vp_cfg_del(ptr->config);
+	ptr->config = NULL;
+
+	pos = gf_bs_get_position(bs);
+	ptr->config = gf_odf_vp_cfg_read_bs(bs, ptr->version == 0);
+	pos = gf_bs_get_position(bs) - pos ;
+
+	if (pos < ptr->size)
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ISOBMFF] VPConfigurationBox: read only "LLU" bytes (expected "LLU").\n", pos, ptr->size));
+	if (pos > ptr->size)
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMFF] VPConfigurationBox overflow read "LLU" bytes, of box size "LLU".\n", pos, ptr->size));
+
+	return ptr->config ? GF_OK : GF_ISOM_INVALID_FILE;
+}
+
+GF_Box *vpcc_New()
+{
+	GF_VPConfigurationBox *tmp = (GF_VPConfigurationBox *) gf_malloc(sizeof(GF_VPConfigurationBox));
+	if (tmp == NULL) return NULL;
+	memset(tmp, 0, sizeof(GF_VPConfigurationBox));
+	tmp->type = GF_ISOM_BOX_TYPE_VPCC;
+	tmp->version = 1;
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err vpcc_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_VPConfigurationBox *ptr = (GF_VPConfigurationBox *) s;
+	if (!s) return GF_BAD_PARAM;
+	if (!ptr->config) return GF_OK;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	return gf_odf_vp_cfg_write_bs(ptr->config, bs, ptr->version == 0);
+}
+#endif
+
+GF_Err vpcc_Size(GF_Box *s)
+{
+	GF_VPConfigurationBox *ptr = (GF_VPConfigurationBox *)s;
+
+	if (!ptr->config) {
+		ptr->size = 0;
+		return GF_OK;
+	}
+
+	if (ptr->version == 0) {
+		ptr->size += 6;
+	} else {
+		if (ptr->config->codec_initdata_size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMFF] VPConfigurationBox: codec_initdata_size MUST be 0, was %d\n", ptr->config->codec_initdata_size));
+			return GF_ISOM_INVALID_FILE;
+		}
+
+		ptr->size += 8;
+	}
+
+	return GF_OK;
+}
+
+
+GF_Box *SmDm_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_SMPTE2086MasteringDisplayMetadataBox, GF_ISOM_BOX_TYPE_SMDM);
+	return (GF_Box *)tmp;
+}
+
+void SmDm_del(GF_Box *a)
+{
+	GF_SMPTE2086MasteringDisplayMetadataBox *p = (GF_SMPTE2086MasteringDisplayMetadataBox *)a;
+	gf_free(p);
+}
+
+GF_Err SmDm_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_SMPTE2086MasteringDisplayMetadataBox *p = (GF_SMPTE2086MasteringDisplayMetadataBox *)s;
+	p->primaryRChromaticity_x = gf_bs_read_u16(bs);
+	p->primaryRChromaticity_y = gf_bs_read_u16(bs);
+	p->primaryGChromaticity_x = gf_bs_read_u16(bs);
+	p->primaryGChromaticity_y = gf_bs_read_u16(bs);
+	p->primaryBChromaticity_x = gf_bs_read_u16(bs);
+	p->primaryBChromaticity_y = gf_bs_read_u16(bs);
+	p->whitePointChromaticity_x = gf_bs_read_u16(bs);
+	p->whitePointChromaticity_y = gf_bs_read_u16(bs);
+	p->luminanceMax = gf_bs_read_u32(bs);
+	p->luminanceMin = gf_bs_read_u32(bs);
+
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err SmDm_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_SMPTE2086MasteringDisplayMetadataBox *p = (GF_SMPTE2086MasteringDisplayMetadataBox*)s;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	gf_bs_write_u16(bs, p->primaryRChromaticity_x);
+	gf_bs_write_u16(bs, p->primaryRChromaticity_y);
+	gf_bs_write_u16(bs, p->primaryGChromaticity_x);
+	gf_bs_write_u16(bs, p->primaryGChromaticity_y);
+	gf_bs_write_u16(bs, p->primaryBChromaticity_x);
+	gf_bs_write_u16(bs, p->primaryBChromaticity_y);
+	gf_bs_write_u16(bs, p->whitePointChromaticity_x);
+	gf_bs_write_u16(bs, p->whitePointChromaticity_y);
+	gf_bs_write_u32(bs, p->luminanceMax);
+	gf_bs_write_u32(bs, p->luminanceMin);
+
+	return GF_OK;
+}
+
+GF_Err SmDm_Size(GF_Box *s)
+{
+	GF_SMPTE2086MasteringDisplayMetadataBox *p = (GF_SMPTE2086MasteringDisplayMetadataBox*)s;
+	p->size += 24;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+GF_Box *CoLL_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_VPContentLightLevelBox, GF_ISOM_BOX_TYPE_COLL);
+	return (GF_Box *)tmp;
+}
+
+void CoLL_del(GF_Box *a)
+{
+	GF_VPContentLightLevelBox *p = (GF_VPContentLightLevelBox *)a;
+	gf_free(p);
+}
+
+GF_Err CoLL_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_VPContentLightLevelBox *p = (GF_VPContentLightLevelBox *)s;
+	p->maxCLL = gf_bs_read_u16(bs);
+	p->maxFALL = gf_bs_read_u16(bs);
+
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err CoLL_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_VPContentLightLevelBox *p = (GF_VPContentLightLevelBox*)s;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	gf_bs_write_u16(bs, p->maxCLL);
+	gf_bs_write_u16(bs, p->maxFALL);
+
+	return GF_OK;
+}
+
+GF_Err CoLL_Size(GF_Box *s)
+{
+	GF_VPContentLightLevelBox *p = (GF_VPContentLightLevelBox*)s;
+	p->size += 4;
+	return GF_OK;
+}
+
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+
+
 GF_OperatingPointsInformation *gf_isom_oinf_new_entry()
 {
 	GF_OperatingPointsInformation* ptr;
@@ -2361,6 +2972,8 @@
 		op->output_layer_set_idx = gf_bs_read_u16(bs);
 		op->max_temporal_id = gf_bs_read_u8(bs);
 		op->layer_count = gf_bs_read_u8(bs);
+		if (op->layer_count > ARRAY_LENGTH(op->layers_info))
+			return GF_NON_COMPLIANT_BITSTREAM;
 		for (j = 0; j < op->layer_count; j++) {
 			op->layers_info[j].ptl_idx = gf_bs_read_u8(bs);
 			op->layers_info[j].layer_id = gf_bs_read_int(bs, 6);
@@ -2394,6 +3007,10 @@
 		if (!dep) return GF_OUT_OF_MEM;
 		dep->dependent_layerID = gf_bs_read_u8(bs);
 		dep->num_layers_dependent_on = gf_bs_read_u8(bs);
+		if (dep->num_layers_dependent_on > ARRAY_LENGTH(dep->dependent_on_layerID)) {
+			gf_free(dep);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
 		for (j = 0; j < dep->num_layers_dependent_on; j++)
 			dep->dependent_on_layerID[j] = gf_bs_read_u8(bs);
 		for (j = 0; j < 16; j++) {
@@ -2428,7 +3045,7 @@
 	count=gf_list_count(ptr->operating_points);
 	gf_bs_write_u16(bs, count);
 	for (i = 0; i < count; i++) {
-		LHEVC_OperatingPoint *op = (LHEVC_OperatingPoint *)gf_list_get(ptr->operating_points, i);;
+		LHEVC_OperatingPoint *op = (LHEVC_OperatingPoint *)gf_list_get(ptr->operating_points, i);
 		gf_bs_write_u16(bs, op->output_layer_set_idx);
 		gf_bs_write_u8(bs, op->max_temporal_id);
 		gf_bs_write_u8(bs, op->layer_count);
@@ -2486,7 +3103,7 @@
 	size += 2;//num_operating_points
 	count=gf_list_count(ptr->operating_points);
 	for (i = 0; i < count; i++) {
-		LHEVC_OperatingPoint *op = (LHEVC_OperatingPoint *)gf_list_get(ptr->operating_points, i);;
+		LHEVC_OperatingPoint *op = (LHEVC_OperatingPoint *)gf_list_get(ptr->operating_points, i);
 		size += 2/*output_layer_set_idx*/ + 1/*max_temporal_id*/ + 1/*layer_count*/;
 		size += op->layer_count * 2;
 		size += 9;
@@ -2501,7 +3118,7 @@
 	count=gf_list_count(ptr->dependency_layers);
 	for (i = 0; i < count; i++) {
 		LHEVC_DependentLayer *dep = (LHEVC_DependentLayer *)gf_list_get(ptr->dependency_layers, i);
-		size += 1/*dependent_layerID*/ + 1/*num_layers_dependent_on*/; 
+		size += 1/*dependent_layerID*/ + 1/*num_layers_dependent_on*/;
 		size += dep->num_layers_dependent_on * 1;//dependent_on_layerID
 		for (j = 0; j < 16; j++) {
 			if (ptr->scalability_mask & (1 << j))
@@ -2517,7 +3134,7 @@
 	GF_LHVCLayerInformation* ptr;
 	GF_SAFEALLOC(ptr, GF_LHVCLayerInformation);
 	if (ptr) ptr->num_layers_in_track = gf_list_new();
-	
+
 	return ptr;
 
 }

gpac-0.7.1.tar.gz/src/isomedia/box_code_3gpp.c -> gpac-0.8.0.tar.gz/src/isomedia/box_code_3gpp.c Changed

@@ -338,8 +338,9 @@
 	gf_bs_read_data(bs, ptr->foreground_color, 6);	/*Foreground color*/
 	ISOM_DECREASE_SIZE(ptr, 51);
 
+	/*ffmpeg compatibility with iPod streams: no pascal string*/
 	if (!ptr->size)
-		return GF_OK; /*ffmpeg compatibility with iPod streams: no pascal string*/
+		return GF_OK;
 
 	pSize = gf_bs_read_u8(bs); /*a Pascal string begins with its size: get textName size*/
 	ISOM_DECREASE_SIZE(ptr, 1);
@@ -382,8 +383,7 @@
 		ptr->textName[pSize] = '\0';				/*Font name*/
 	}
 	ISOM_DECREASE_SIZE(ptr, pSize);
-
-	return GF_OK;
+	return gf_isom_box_array_read(s, bs, gf_isom_box_add_default);
 }
 
 void gpp_write_rgba(GF_BitStream *bs, u32 col)
@@ -671,7 +671,7 @@
 GF_Err krok_Size(GF_Box *s)
 {
 	GF_TextKaraokeBox*ptr = (GF_TextKaraokeBox*)s;
-	s->size += 6 * 8*ptr->nb_entries;
+	s->size += 6 + 8*ptr->nb_entries;
 	return GF_OK;
 }
 
@@ -1022,7 +1022,7 @@
 GF_Err dimC_Write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_DIMSSceneConfigBox *p = (GF_DIMSSceneConfigBox *)s;
-	GF_Err e = gf_isom_full_box_write(s, bs);
+	GF_Err e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 	gf_bs_write_u8(bs, p->profile);
 	gf_bs_write_u8(bs, p->level);

gpac-0.7.1.tar.gz/src/isomedia/box_code_adobe.c -> gpac-0.8.0.tar.gz/src/isomedia/box_code_adobe.c Changed

gpac-0.7.1.tar.gz/src/isomedia/box_code_apple.c -> gpac-0.8.0.tar.gz/src/isomedia/box_code_apple.c Changed

@@ -44,8 +44,18 @@
 		/*if no ilst type coded, break*/
 		sub_type = gf_bs_peek_bits(bs, 32, 0);
 		if (sub_type) {
-			e = gf_isom_box_parse(&a, bs);
-			if (e) return e;
+			e = gf_isom_box_parse_ex(&a, bs, s->type, GF_FALSE);
+
+			/* the macro will return in this case before we can free */
+			if (!e && ptr->size < a->size) {
+				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), ptr->size, a->size, __FILE__, __LINE__ )); \
+				e = GF_ISOM_INVALID_FILE;
+			}
+			if (e) {
+				if (a) gf_isom_box_del(a);
+				return e;
+			}
+
 			ISOM_DECREASE_SIZE(ptr, a->size);
 			gf_list_add(ptr->other_boxes, a);
 		} else {
@@ -101,16 +111,31 @@
 	u32 sub_type;
 	GF_Box *a = NULL;
 	GF_ListItemBox *ptr = (GF_ListItemBox *)s;
-
 	/*iTunes way: there's a data atom containing the data*/
 	sub_type = gf_bs_peek_bits(bs, 32, 4);
 	if (sub_type == GF_ISOM_BOX_TYPE_DATA ) {
 		e = gf_isom_box_parse(&a, bs);
-		if (e) return e;
+
+		if (!e && ptr->size < a->size) {
+			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), ptr->size, a->size, __FILE__, __LINE__ )); \
+			e = GF_ISOM_INVALID_FILE;
+		}
+		if (e) {
+			if (a) gf_isom_box_del(a);
+			return e;
+		}
+
 		ISOM_DECREASE_SIZE(ptr, a->size);
 
 		if (a && ptr->data) gf_isom_box_del((GF_Box *) ptr->data);
-		ptr->data = (GF_DataBox *)a;
+
+		/* otherwise a->data will always overflow */
+		if (a && a->size > 4 && a->type != GF_ISOM_BOX_TYPE_VOID)
+			ptr->data = (GF_DataBox *)a;
+		else {
+			ptr->data = NULL;
+			gf_isom_box_del(a);
+		}
 	}
 	/*QT way*/
 	else {
@@ -125,9 +150,9 @@
 	return GF_OK;
 }
 
-GF_Box *ilst_item_New(u32 type)
+GF_Box *ilst_item_New()
 {
-	ISOM_DECL_BOX_ALLOC(GF_ListItemBox, type);
+	ISOM_DECL_BOX_ALLOC(GF_ListItemBox, GF_ISOM_BOX_TYPE_CPIL); //type will be overwrite
 
 	tmp->data = (GF_DataBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_DATA);
 
@@ -242,6 +267,81 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+void alis_del(GF_Box *s)
+{
+	GF_DataEntryAliasBox *ptr = (GF_DataEntryAliasBox *)s;
+	if (ptr == NULL) return;
+	gf_free(ptr);
+}
+
+GF_Err alis_Read(GF_Box *s, GF_BitStream *bs)
+{
+//	GF_DataEntryAliasBox *ptr = (GF_DataEntryAliasBox *)s;
+	return GF_OK;
+}
+
+GF_Box *alis_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_DataEntryAliasBox, GF_QT_BOX_TYPE_ALIS);
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err alis_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+//	GF_DataEntryAliasBox *ptr = (GF_DataEntryAliasBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	return GF_OK;
+}
+
+GF_Err alis_Size(GF_Box *s)
+{
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+void wide_del(GF_Box *s)
+{
+	if (s == NULL) return;
+	gf_free(s);
+}
+
+
+GF_Err wide_Read(GF_Box *s, GF_BitStream *bs)
+{
+	gf_bs_skip_bytes(bs, s->size);
+	s->size = 0;
+	return GF_OK;
+}
+
+GF_Box *wide_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_WideBox, GF_QT_BOX_TYPE_WIDE);
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err wide_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	return GF_OK;
+}
+
+GF_Err wide_Size(GF_Box *s)
+{
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
 GF_MetaBox *gf_isom_apple_get_meta_extensions(GF_ISOFile *mov)
 {
 	u32 i;
@@ -306,4 +406,472 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
+
+void gmin_del(GF_Box *s)
+{
+	gf_free(s);
+}
+
+GF_Err gmin_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_GenericMediaHeaderInfoBox *ptr = (GF_GenericMediaHeaderInfoBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 12);
+	ptr->graphics_mode = gf_bs_read_u16(bs);
+	ptr->op_color_red = gf_bs_read_u16(bs);
+	ptr->op_color_green = gf_bs_read_u16(bs);
+	ptr->op_color_blue = gf_bs_read_u16(bs);
+	ptr->balance = gf_bs_read_u16(bs);
+	ptr->reserved = gf_bs_read_u16(bs);
+	return GF_OK;
+}
+
+GF_Box *gmin_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_GenericMediaHeaderInfoBox, GF_QT_BOX_TYPE_GMIN);
+	return (GF_Box *)tmp;
+}
+
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err gmin_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_GenericMediaHeaderInfoBox *ptr = (GF_GenericMediaHeaderInfoBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	gf_bs_write_u16(bs, ptr->graphics_mode);
+	gf_bs_write_u16(bs, ptr->op_color_red);
+	gf_bs_write_u16(bs, ptr->op_color_green);
+	gf_bs_write_u16(bs, ptr->op_color_blue);
+	gf_bs_write_u16(bs, ptr->balance);
+	gf_bs_write_u16(bs, ptr->reserved);
+	return GF_OK;
+}
+
+GF_Err gmin_Size(GF_Box *s)
+{
+	GF_VideoMediaHeaderBox *ptr = (GF_VideoMediaHeaderBox *)s;
+	ptr->size += 12;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+
+
+void clef_del(GF_Box *s)
+{
+	gf_free(s);
+}
+
+GF_Err clef_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_ApertureBox *ptr = (GF_ApertureBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 8);
+	ptr->width = gf_bs_read_u32(bs);
+	ptr->height = gf_bs_read_u32(bs);
+	return GF_OK;
+}
+
+GF_Box *clef_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ApertureBox, GF_QT_BOX_TYPE_CLEF);
+	return (GF_Box *)tmp;
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err clef_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_ApertureBox *ptr = (GF_ApertureBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	gf_bs_write_u32(bs, ptr->width);
+	gf_bs_write_u32(bs, ptr->height);
+	return GF_OK;
+}
+
+GF_Err clef_Size(GF_Box *s)
+{
+	s->size += 8;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+void tmcd_del(GF_Box *s)
+{
+	if (s == NULL) return;
+	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
+	gf_free(s);
+}
+
+
+GF_Err tmcd_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_TimeCodeSampleEntryBox *ptr = (GF_TimeCodeSampleEntryBox *)s;
+	GF_Err e = gf_isom_base_sample_entry_read((GF_SampleEntryBox *)s, bs);
+	if (e) return e;
+
+	ISOM_DECREASE_SIZE(s, 26);
+	gf_bs_read_u32(bs); //reserved
+	ptr->flags = gf_bs_read_u32(bs);
+	ptr->timescale = gf_bs_read_u32(bs);
+	ptr->frame_duration = gf_bs_read_u32(bs);
+	ptr->frames_per_sec = gf_bs_read_u8(bs);
+	gf_bs_read_u8(bs); //reserved
+
+	return gf_isom_box_array_read(s, bs, gf_isom_box_add_default);
+}
+
+GF_Box *tmcd_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_TimeCodeSampleEntryBox, GF_QT_BOX_TYPE_TMCD);
+	gf_isom_sample_entry_init((GF_SampleEntryBox*)tmp);
+	return (GF_Box *)tmp;
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err tmcd_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_TimeCodeSampleEntryBox *ptr = (GF_TimeCodeSampleEntryBox *)s;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
+	gf_bs_write_data(bs, ptr->reserved, 6);
+	gf_bs_write_u16(bs, ptr->dataReferenceIndex);
+
+	gf_bs_write_u32(bs, 0); //reserved
+	gf_bs_write_u32(bs, ptr->flags);
+	gf_bs_write_u32(bs, ptr->timescale);
+	gf_bs_write_u32(bs, ptr->frame_duration);
+	gf_bs_write_u8(bs, ptr->frames_per_sec);
+	gf_bs_write_u8(bs, 0); //reserved
+
+	return gf_isom_box_array_write(s, ptr->protections, bs);
+}
+
+GF_Err tmcd_Size(GF_Box *s)
+{
+	GF_SampleEntryBox *ptr = (GF_SampleEntryBox *)s;
+	ptr->size += 8 + 18;
+	return gf_isom_box_array_size(s, ptr->protections);
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+void tcmi_del(GF_Box *s)
+{
+	GF_TimeCodeMediaInformationBox *ptr = (GF_TimeCodeMediaInformationBox *)s;
+	if (ptr->font) gf_free(ptr->font);
+	gf_free(s);
+}
+
+
+GF_Err tcmi_Read(GF_Box *s, GF_BitStream *bs)
+{
+	u32 len;
+	GF_TimeCodeMediaInformationBox *ptr = (GF_TimeCodeMediaInformationBox *)s;
+
+	ISOM_DECREASE_SIZE(s, 21);
+
+	ptr->text_font = gf_bs_read_u16(bs);
+	ptr->text_face = gf_bs_read_u16(bs);
+	ptr->text_size = gf_bs_read_u16(bs);
+	gf_bs_read_u16(bs);
+	ptr->text_color_red = gf_bs_read_u16(bs);
+	ptr->text_color_green = gf_bs_read_u16(bs);
+	ptr->text_color_blue = gf_bs_read_u16(bs);
+	ptr->back_color_red = gf_bs_read_u16(bs);
+	ptr->back_color_green = gf_bs_read_u16(bs);
+	ptr->back_color_blue = gf_bs_read_u16(bs);
+	len = gf_bs_read_u8(bs);
+	if (len > ptr->size)
+		len = (u32) ptr->size;
+	if (len) {
+		ptr->font = gf_malloc(len+1);
+		gf_bs_read_data(bs, ptr->font, len);
+		ptr->size -= len;
+		ptr->font[len]=0;
+	}
+	return GF_OK;
+}
+
+GF_Box *tcmi_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_TimeCodeMediaInformationBox, GF_QT_BOX_TYPE_TMCD);
+	tmp->text_size = 12;
+	tmp->text_color_red = 0xFFFF;
+	tmp->text_color_green = 0xFFFF;
+	tmp->text_color_blue = 0xFFFF;
+	return (GF_Box *)tmp;
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err tcmi_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	u32 len;
+	GF_TimeCodeMediaInformationBox *ptr = (GF_TimeCodeMediaInformationBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	gf_bs_write_u16(bs, ptr->text_font);
+	gf_bs_write_u16(bs, ptr->text_face);
+	gf_bs_write_u16(bs, ptr->text_size);
+	gf_bs_write_u16(bs, 0);
+	gf_bs_write_u16(bs, ptr->text_color_red);
+	gf_bs_write_u16(bs, ptr->text_color_green);
+	gf_bs_write_u16(bs, ptr->text_color_blue);
+	gf_bs_write_u16(bs, ptr->back_color_red);
+	gf_bs_write_u16(bs, ptr->back_color_green);
+	gf_bs_write_u16(bs, ptr->back_color_blue);
+	len = ptr->font ? (u32) strlen(ptr->font) : 0;
+	gf_bs_write_u8(bs, len);
+	if (ptr->font)
+		gf_bs_write_data(bs, ptr->font, len);
+
+	return GF_OK;
+}
+
+GF_Err tcmi_Size(GF_Box *s)
+{
+	GF_TimeCodeMediaInformationBox *ptr = (GF_TimeCodeMediaInformationBox *)s;
+	ptr->size += 21;
+	if (ptr->font)
+ 	ptr->size += strlen(ptr->font);
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+void fiel_del(GF_Box *s)
+{
+	gf_free(s);
+}
+
+
+GF_Err fiel_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_FieldInfoBox *ptr = (GF_FieldInfoBox *)s;
+
+	ISOM_DECREASE_SIZE(s, 2);
+
+ ptr->field_count = gf_bs_read_u8(bs);
+ ptr->field_order = gf_bs_read_u8(bs);
+	return GF_OK;
+}
+
+GF_Box *fiel_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_FieldInfoBox, GF_QT_BOX_TYPE_FIEL);
+	return (GF_Box *)tmp;
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err fiel_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_FieldInfoBox *ptr = (GF_FieldInfoBox *)s;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	gf_bs_write_u8(bs, ptr->field_count);
+	gf_bs_write_u8(bs, ptr->field_order);
+	return GF_OK;
+}
+
+GF_Err fiel_Size(GF_Box *s)
+{
+	s->size += 2;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+void gama_del(GF_Box *s)
+{
+	gf_free(s);
+}
+
+
+GF_Err gama_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_GamaInfoBox *ptr = (GF_GamaInfoBox *)s;
+
+	ISOM_DECREASE_SIZE(s, 4);
+
+ ptr->gama = gf_bs_read_u32(bs);
+	return GF_OK;
+}
+
+GF_Box *gama_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_GamaInfoBox, GF_QT_BOX_TYPE_GAMA);
+	return (GF_Box *)tmp;
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err gama_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_GamaInfoBox *ptr = (GF_GamaInfoBox *)s;
+	GF_Err e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	gf_bs_write_u32(bs, ptr->gama);
+	return GF_OK;
+}
+
+GF_Err gama_Size(GF_Box *s)
+{
+	s->size += 4;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+void chrm_del(GF_Box *s)
+{
+	gf_free(s);
+}
+
+
+GF_Err chrm_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_ChromaInfoBox *ptr = (GF_ChromaInfoBox *)s;
+
+	ISOM_DECREASE_SIZE(s, 2);
+
+ ptr->chroma = gf_bs_read_u16(bs);
+	return GF_OK;
+}
+
+GF_Box *chrm_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ChromaInfoBox, GF_QT_BOX_TYPE_CHRM);
+	return (GF_Box *)tmp;
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err chrm_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_ChromaInfoBox *ptr = (GF_ChromaInfoBox *)s;
+	GF_Err e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	gf_bs_write_u16(bs, ptr->chroma);
+	return GF_OK;
+}
+
+GF_Err chrm_Size(GF_Box *s)
+{
+	s->size += 2;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+void chan_del(GF_Box *s)
+{
+	GF_ChannelLayoutInfoBox *ptr = (GF_ChannelLayoutInfoBox *)s;
+	if (ptr->audio_descs) gf_free(ptr->audio_descs);
+	gf_free(s);
+}
+
+
+GF_Err chan_Read(GF_Box *s, GF_BitStream *bs)
+{
+	u32 i;
+	GF_ChannelLayoutInfoBox *ptr = (GF_ChannelLayoutInfoBox *)s;
+
+	ISOM_DECREASE_SIZE(s, 12);
+	ptr->layout_tag = gf_bs_read_u32(bs);
+	ptr->bitmap = gf_bs_read_u32(bs);
+	ptr->num_audio_description = gf_bs_read_u32(bs);
+
+	ptr->audio_descs = gf_malloc(sizeof(GF_AudioChannelDescription) * ptr->num_audio_description);
+	for (i=0; i<ptr->num_audio_description; i++) {
+		GF_AudioChannelDescription *adesc = &ptr->audio_descs[i];
+		ISOM_DECREASE_SIZE(s, 20);
+		adesc->label = gf_bs_read_u32(bs);
+		adesc->flags = gf_bs_read_u32(bs);
+		adesc->coordinates[0] = gf_bs_read_float(bs);
+		adesc->coordinates[1] = gf_bs_read_float(bs);
+		adesc->coordinates[2] = gf_bs_read_float(bs);
+	}
+	//avoids warning on most files
+	if (ptr->size==20) {
+		ptr->size=0;
+		gf_bs_skip_bytes(bs, 20);
+	}
+	return GF_OK;
+}
+
+GF_Box *chan_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ChannelLayoutInfoBox, GF_QT_BOX_TYPE_CHAN);
+	return (GF_Box *)tmp;
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err chan_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	u32 i;
+	GF_ChannelLayoutInfoBox *ptr = (GF_ChannelLayoutInfoBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+
+	gf_bs_write_u32(bs, ptr->layout_tag);
+	gf_bs_write_u32(bs, ptr->bitmap);
+	gf_bs_write_u32(bs, ptr->num_audio_description);
+	for (i=0; i<ptr->num_audio_description; i++) {
+		GF_AudioChannelDescription *adesc = &ptr->audio_descs[i];
+		gf_bs_write_u32(bs, adesc->label);
+		gf_bs_write_u32(bs, adesc->flags);
+		gf_bs_write_float(bs, adesc->coordinates[0]);
+		gf_bs_write_float(bs, adesc->coordinates[1]);
+		gf_bs_write_float(bs, adesc->coordinates[2]);
+	}
+
+	return GF_OK;
+}
+
+GF_Err chan_Size(GF_Box *s)
+{
+	GF_ChannelLayoutInfoBox *ptr = (GF_ChannelLayoutInfoBox *)s;
+	s->size += 12 + 20 * ptr->num_audio_description;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.7.1.tar.gz/src/isomedia/box_code_base.c -> gpac-0.8.0.tar.gz/src/isomedia/box_code_base.c Changed

@@ -632,7 +632,7 @@
 
 	//then get the break
 	i = 0;
-	while ( (tmpName[i] != 0) && (i < to_read) ) {
+	while ( (i < to_read) && (tmpName[i] != 0) ) {
 		i++;
 	}
 	//check the data is consistent
@@ -652,15 +652,22 @@
 		gf_free(tmpName);
 		return GF_OUT_OF_MEM;
 	}
-	ptr->location = (char*)gf_malloc(sizeof(char) * (to_read - i - 1));
-	if (!ptr->location) {
-		gf_free(tmpName);
-		gf_free(ptr->nameURN);
-		ptr->nameURN = NULL;
-		return GF_OUT_OF_MEM;
-	}
 	memcpy(ptr->nameURN, tmpName, i + 1);
-	memcpy(ptr->location, tmpName + i + 1, (to_read - i - 1));
+
+	if (tmpName[to_read - 1] != 0) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] urn box cointains invalid location field\n" ));
+	}
+	else {
+		ptr->location = (char*)gf_malloc(sizeof(char) * (to_read - i - 1));
+		if (!ptr->location) {
+			gf_free(tmpName);
+			gf_free(ptr->nameURN);
+			ptr->nameURN = NULL;
+			return GF_OUT_OF_MEM;
+		}
+		memcpy(ptr->location, tmpName + i + 1, (to_read - i - 1));
+	}
+
 	gf_free(tmpName);
 	return GF_OK;
 }
@@ -767,10 +774,9 @@
 	return GF_OK;
 }
 
-GF_Box *unkn_New(u32 box_type)
+GF_Box *unkn_New()
 {
 	ISOM_DECL_BOX_ALLOC(GF_UnknownBox, GF_ISOM_BOX_TYPE_UNKNOWN);
-	tmp->original_4cc = box_type;
 	return (GF_Box *) tmp;
 }
 
@@ -782,9 +788,9 @@
 	u32 type = s->type;
 	GF_UnknownBox *ptr = (GF_UnknownBox *)s;
 	if (!s) return GF_BAD_PARAM;
-	s->type = ptr->original_4cc;
+	ptr->type = ptr->original_4cc;
 	e = gf_isom_box_write_header(s, bs);
-	s->type = type;
+	ptr->type = type;
 	if (e) return e;
 
 	if (ptr->dataSize && ptr->data) {
@@ -925,8 +931,11 @@
 		return e;
 	}
 	if (!((GF_DataInformationBox *)s)->dref) {
+		GF_Box* dref;
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Missing dref box in dinf\n"));
-		((GF_DataInformationBox *)s)->dref = (GF_DataReferenceBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_DREF);
+		dref = gf_isom_box_new(GF_ISOM_BOX_TYPE_DREF);
+		((GF_DataInformationBox *)s)->dref = (GF_DataReferenceBox *)dref;
+		gf_isom_box_add_for_dump_mode(s, dref);
 	}
 	return GF_OK;
 }
@@ -977,16 +986,7 @@
 
 GF_Err dref_AddDataEntry(GF_Box *ptr, GF_Box *entry)
 {
-	if (entry->type==GF_4CC('a','l','i','s')) {
-		GF_DataEntryURLBox *urle = (GF_DataEntryURLBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_URL);
-		urle->flags = 1;
-		gf_isom_box_del(entry);
-		gf_isom_box_add_default(ptr, (GF_Box *)urle);
-		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[iso file] Apple \'alis\' box found, not supported - converting to self-pointing \'url \' \n" ));
-	} else {
-		return gf_isom_box_add_default(ptr, entry);
-	}
-	return GF_OK;
+	return gf_isom_box_add_default(ptr, entry);
 }
 
 GF_Err dref_Read(GF_Box *s, GF_BitStream *bs)
@@ -1120,9 +1120,6 @@
 	gf_free(ptr);
 }
 
-
-
-
 GF_Err elst_Read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 entries;
@@ -1147,7 +1144,7 @@
 	}
 
 
-	for (entries = 0; entries < nb_entries; entries++ ) {
+	for (entries = 0; entries < nb_entries; entries++) {
 		p = (GF_EdtsEntry *) gf_malloc(sizeof(GF_EdtsEntry));
 		if (!p) return GF_OUT_OF_MEM;
 		if (ptr->version == 1) {
@@ -2554,8 +2551,8 @@
 GF_Err payt_Size(GF_Box *s)
 {
 	GF_PAYTBox *ptr = (GF_PAYTBox *)s;
-	s->size += 4;
-	if (ptr->payloadString) ptr->size += strlen(ptr->payloadString) + 1;
+	s->size += 4 + 1;
+	if (ptr->payloadString) ptr->size += strlen(ptr->payloadString);
 	return GF_OK;
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
@@ -2846,6 +2843,8 @@
 	if (ptr == NULL) return GF_BAD_PARAM;
 
 	ptr->dataSize = s->size;
+	ptr->bsOffset = gf_bs_get_position(bs);
+
 	//then skip these bytes
 	gf_bs_skip_bytes(bs, ptr->dataSize);
 	return GF_OK;
@@ -3142,6 +3141,9 @@
 	GF_Err e;
 	GF_MovieFragmentRandomAccessBox *ptr = (GF_MovieFragmentRandomAccessBox *)s;
 
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
 	e = gf_isom_box_array_write(s, ptr->tfra_list, bs);
 	if (e) return e;
 	if (ptr->mfro) {
@@ -3187,21 +3189,24 @@
 	GF_RandomAccessEntry *p = 0;
 	GF_TrackFragmentRandomAccessBox *ptr = (GF_TrackFragmentRandomAccessBox *)s;
 
-	if (ptr->size<12) return GF_ISOM_INVALID_FILE;
+	if (ptr->size < 12)
+		return GF_ISOM_INVALID_FILE;
 
 	ptr->track_id = gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
 
-	if (gf_bs_read_int(bs, 26) !=0) return GF_ISOM_INVALID_FILE;
-	ptr->traf_bits = (gf_bs_read_int(bs, 2)+1)*8;
-	ptr->trun_bits = (gf_bs_read_int(bs, 2)+1)*8;
-	ptr->sample_bits = (gf_bs_read_int(bs, 2)+1)*8;
+	if (gf_bs_read_int(bs, 26) != 0)
+		return GF_ISOM_INVALID_FILE;
+
+	ptr->traf_bits = (gf_bs_read_int(bs, 2) + 1) * 8;
+	ptr->trun_bits = (gf_bs_read_int(bs, 2) + 1) * 8;
+	ptr->sample_bits = (gf_bs_read_int(bs, 2) + 1) * 8;
 	ISOM_DECREASE_SIZE(ptr, 4);
 
 	ptr->nb_entries = gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
 
-	if (ptr->version==1) {
+	if (ptr->version == 1) {
 		if (ptr->nb_entries > ptr->size / (16+(ptr->traf_bits+ptr->trun_bits+ptr->sample_bits)/8)) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid number of entries %d in traf\n", ptr->nb_entries));
 			return GF_ISOM_INVALID_FILE;
@@ -3213,8 +3218,7 @@
 		}
 	}
 
-	if (ptr->nb_entries)
-	{
+	if (ptr->nb_entries) {
 		p = (GF_RandomAccessEntry *) gf_malloc(sizeof(GF_RandomAccessEntry) * ptr->nb_entries);
 		if (!p) return GF_OUT_OF_MEM;
 	}
@@ -3224,12 +3228,10 @@
 	for (i=0; i<ptr->nb_entries; i++) {
 		memset(p, 0, sizeof(GF_RandomAccessEntry));
 
-		if (ptr->version==1) {
+		if (ptr->version == 1) {
 			p->time = gf_bs_read_u64(bs);
 			p->moof_offset = gf_bs_read_u64(bs);
-		}
-		else
-		{
+		} else {
 			p->time = gf_bs_read_u32(bs);
 			p->moof_offset = gf_bs_read_u32(bs);
 		}
@@ -3239,6 +3241,7 @@
 
 		++p;
 	}
+
 	return GF_OK;
 }
 
@@ -3264,7 +3267,7 @@
 	gf_bs_write_u32(bs, ptr->nb_entries);
 
 	for (i=0; i<ptr->nb_entries; i++) {
-		GF_RandomAccessEntry *p = &ptr->entries[i];;
+		GF_RandomAccessEntry *p = &ptr->entries[i];
 		if (ptr->version==1) {
 			gf_bs_write_u64(bs, p->time);
 			gf_bs_write_u64(bs, p->moof_offset);
@@ -3285,7 +3288,7 @@
 
 	ptr->size += 12;
 
-	ptr->size += ptr->nb_entries * ( ((ptr->version==1) ? 16 : 8 ) + ptr->traf_bits + ptr->trun_bits + ptr->sample_bits);
+	ptr->size += ptr->nb_entries * ( ((ptr->version==1) ? 16 : 8 ) + ptr->traf_bits/8 + ptr->trun_bits/8 + ptr->sample_bits/8);
 	return GF_OK;
 }
 
@@ -3795,7 +3798,7 @@
 		if (e) return e;
 	}
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	if (ptr->mvex) {
+	if (ptr->mvex && !ptr->mvex_after_traks) {
 		e = gf_isom_box_write((GF_Box *) ptr->mvex, bs);
 		if (e) return e;
 	}
@@ -3804,6 +3807,13 @@
 	e = gf_isom_box_array_write(s, ptr->trackList, bs);
 	if (e) return e;
 
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	if (ptr->mvex && ptr->mvex_after_traks) {
+		e = gf_isom_box_write((GF_Box *) ptr->mvex, bs);
+		if (e) return e;
+	}
+#endif
+
 	if (ptr->udta) {
 		e = gf_isom_box_write((GF_Box *) ptr->udta, bs);
 		if (e) return e;
@@ -3855,8 +3865,10 @@
 	if (ptr == NULL) return;
 	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
 
-	if (ptr->esd) gf_isom_box_del((GF_Box *)ptr->esd);
+	if (ptr->esd && (ptr->is_qtff!=2))
+		gf_isom_box_del((GF_Box *)ptr->esd);
 	if (ptr->slc) gf_odf_desc_del((GF_Descriptor *)ptr->slc);
+	if (ptr->cfg_opus) gf_isom_box_del((GF_Box *)ptr->cfg_opus);
 	if (ptr->cfg_ac3) gf_isom_box_del((GF_Box *)ptr->cfg_ac3);
 	if (ptr->cfg_3gpp) gf_isom_box_del((GF_Box *)ptr->cfg_3gpp);
 	gf_free(ptr);
@@ -3864,11 +3876,14 @@
 
 GF_Err audio_sample_entry_AddBox(GF_Box *s, GF_Box *a)
 {
+	GF_UnknownBox *wave = NULL;
+	Bool drop_wave=GF_FALSE;
 	GF_MPEGAudioSampleEntryBox *ptr = (GF_MPEGAudioSampleEntryBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_ESDS:
 		if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
 			ptr->esd = (GF_ESDBox *)a;
+		ptr->is_qtff = 0;
 		break;
 	case GF_ISOM_BOX_TYPE_SINF:
 		gf_list_add(ptr->protections, a);
@@ -3882,43 +3897,88 @@
 		ptr->cfg_3gpp->cfg.type = ptr->type;
 		break;
 
+	case GF_ISOM_BOX_TYPE_DOPS:
+		ptr->cfg_opus = (GF_OpusSpecificBox *)a;
+		break;
 	case GF_ISOM_BOX_TYPE_DAC3:
 		ptr->cfg_ac3 = (GF_AC3ConfigBox *) a;
 		break;
 	case GF_ISOM_BOX_TYPE_DEC3:
 		ptr->cfg_ac3 = (GF_AC3ConfigBox *) a;
 		break;
+	case GF_ISOM_BOX_TYPE_MHA1:
+	case GF_ISOM_BOX_TYPE_MHA2:
+	case GF_ISOM_BOX_TYPE_MHM1:
+	case GF_ISOM_BOX_TYPE_MHM2:
+		ptr->cfg_mha = (GF_MHAConfigBox *) a;
+		break;
 
 	case GF_ISOM_BOX_TYPE_UNKNOWN:
-		if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			/*HACK for QT files: get the esds box from the track*/
-		{
-			GF_UnknownBox *wave = (GF_UnknownBox *)a;
- 			if (wave->original_4cc == GF_4CC('w','a','v','e')) {
-				u32 offset = 0;
-				while ((wave->data[offset + 4] != 'e') && (wave->data[offset + 5] != 's')) {
-					offset++;
-					if (offset == wave->dataSize) break;
+		wave = (GF_UnknownBox *)a;
+		/*HACK for QT files: get the esds box from the track*/
+		if (s->type == GF_ISOM_BOX_TYPE_MP4A) {
+			if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
+
+			//wave subboxes may have been properly parsed
+ 			if ((wave->original_4cc == GF_QT_BOX_TYPE_WAVE) && gf_list_count(wave->other_boxes)) {
+ 				u32 i;
+ for (i =0; i<gf_list_count(wave->other_boxes); i++) {
+ GF_Box *inner_box = (GF_Box *)gf_list_get(wave->other_boxes, i);
+ if (inner_box->type == GF_ISOM_BOX_TYPE_ESDS) {
+ ptr->esd = (GF_ESDBox *)inner_box;
+ 						if (ptr->is_qtff & 1<<16) {
+ 	gf_list_rem(a->other_boxes, i);
+ 	drop_wave=GF_TRUE;
+						}
+ }
+ }
+				if (drop_wave) {
+					gf_isom_box_del(a);
+ 	ptr->is_qtff = 0;
+					return GF_OK;
 				}
-				if (offset < wave->dataSize) {
-					GF_Box *a;
-					GF_Err e;
-					GF_BitStream *bs = gf_bs_new(wave->data + offset, wave->dataSize - offset, GF_BITSTREAM_READ);
-					e = gf_isom_box_parse(&a, bs);
-					gf_bs_del(bs);
-					if (e) return e;
-					ptr->esd = (GF_ESDBox *)a;
-					gf_isom_box_add_for_dump_mode((GF_Box *)ptr, a);
+ ptr->is_qtff = 2;
+ return gf_isom_box_add_default(s, a);
+ }
+ gf_isom_box_del(a);
+ return GF_ISOM_INVALID_MEDIA;
 
+		}
+ 		ptr->is_qtff &= ~(1<<16);
+
+ 		if ((wave->original_4cc == GF_QT_BOX_TYPE_WAVE) && gf_list_count(wave->other_boxes)) {
+			ptr->is_qtff = 2;
+		}
+		return gf_isom_box_add_default(s, a);
+	case GF_QT_BOX_TYPE_WAVE:
+		if (s->type == GF_ISOM_BOX_TYPE_MP4A) {
+			if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
+
+			//wave subboxes may have been properly parsed
+ 			if (gf_list_count(a->other_boxes)) {
+ 				u32 i;
+ for (i =0; i<gf_list_count(a->other_boxes); i++) {
+ GF_Box *inner_box = (GF_Box *)gf_list_get(a->other_boxes, i);
+ if (inner_box->type == GF_ISOM_BOX_TYPE_ESDS) {
+ ptr->esd = (GF_ESDBox *)inner_box;
+ 						if (ptr->is_qtff & 1<<16) {
+ 	gf_list_rem(a->other_boxes, i);
+ 	drop_wave=GF_TRUE;
+						}
+						break;
+ }
+ }
+				if (drop_wave) {
+					gf_isom_box_del(a);
+ 	ptr->is_qtff = 0;
+					return GF_OK;
 				}
-			}
-			else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Cannot process box %s\n!", gf_4cc_to_str(a->type)));
-			}
-			gf_isom_box_del(a);
-			return GF_ISOM_INVALID_MEDIA;
+ ptr->is_qtff = 2;
+ return gf_isom_box_add_default(s, a);
+ }
 		}
-		break;
+ 		ptr->is_qtff = 2;
+		return gf_isom_box_add_default(s, a);
 	default:
 		return gf_isom_box_add_default(s, a);
 	}
@@ -3928,28 +3988,60 @@
 {
 	GF_MPEGAudioSampleEntryBox *ptr;
 	char *data;
-	u32 i, size;
+	u8 a, b, c, d;
+	u32 i, size, v, nb_alnum;
 	GF_Err e;
-	u64 pos;
+	u64 pos, start;
+
+	ptr = (GF_MPEGAudioSampleEntryBox *)s;
 
+	start = gf_bs_get_position(bs);
+	gf_bs_seek(bs, start + 8);
+	v = gf_bs_read_u16(bs);
+	if (v)
+		ptr->is_qtff = 1;
+
+	//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);
+		a = gf_bs_read_u8(bs);
+		b = gf_bs_read_u8(bs);
+		c = gf_bs_read_u8(bs);
+		d = gf_bs_read_u8(bs);
+		nb_alnum = 0;
+		if (isalnum(a)) nb_alnum++;
+		if (isalnum(b)) nb_alnum++;
+		if (isalnum(c)) nb_alnum++;
+		if (isalnum(d)) nb_alnum++;
+		if (nb_alnum>2) ptr->is_qtff = 0;
+	}
+
+	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);
 	size = (u32) s->size;
 
+	//when cookie is set on bs, always convert qtff-style mp4a to isobmff-style
+	//since the conversion is done in addBox and we don't have the bitstream there (arg...), flag the box
+ 	if (gf_bs_get_cookie(bs)) {
+ 		ptr->is_qtff |= 1<<16;
+ 	}
+
 	e = gf_isom_box_array_read(s, bs, audio_sample_entry_AddBox);
 	if (!e) return GF_OK;
 	if (size<8) return GF_ISOM_INVALID_FILE;
 
 	/*hack for some weird files (possibly recorded with live.com tools, needs further investigations)*/
-	ptr = (GF_MPEGAudioSampleEntryBox *)s;
 	gf_bs_seek(bs, pos);
 	data = (char*)gf_malloc(sizeof(char) * size);
 	gf_bs_read_data(bs, data, size);
 	for (i=0; i<size-8; i++) {
-		if (GF_4CC(data[i+4], data[i+5], data[i+6], data[i+7]) == GF_ISOM_BOX_TYPE_ESDS) {
+		if (GF_4CC((u32)data[i+4], (u8)data[i+5], (u8)data[i+6], (u8)data[i+7]) == GF_ISOM_BOX_TYPE_ESDS) {
 			GF_BitStream *mybs = gf_bs_new(data + i, size - i, GF_BITSTREAM_READ);
 			e = gf_isom_box_parse((GF_Box **)&ptr->esd, mybs);
+			if (!e) gf_isom_box_add_for_dump_mode((GF_Box*)ptr, (GF_Box*)ptr->esd);
 			gf_bs_del(mybs);
 			break;
 		}
@@ -3982,6 +4074,10 @@
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 	gf_isom_audio_sample_entry_write((GF_AudioSampleEntryBox*)s, bs);
+
+	if (ptr->is_qtff)
+		return gf_isom_box_array_write(s, ptr->protections, bs);
+
 	if (ptr->esd) {
 		e = gf_isom_box_write((GF_Box *)ptr->esd, bs);
 		if (e) return e;
@@ -3990,6 +4086,10 @@
 		e = gf_isom_box_write((GF_Box *)ptr->cfg_3gpp, bs);
 		if (e) return e;
 	}
+	if (ptr->cfg_opus) {
+		e = gf_isom_box_write((GF_Box *)ptr->cfg_opus, bs);
+		if (e) return e;
+	}
 	if (ptr->cfg_ac3) {
 		e = gf_isom_box_write((GF_Box *)ptr->cfg_ac3, bs);
 		if (e) return e;
@@ -4003,6 +4103,10 @@
 	GF_MPEGAudioSampleEntryBox *ptr = (GF_MPEGAudioSampleEntryBox *)s;
 
 	gf_isom_audio_sample_entry_size((GF_AudioSampleEntryBox*)s);
+
+	if (ptr->is_qtff)
+		return gf_isom_box_array_size(s, ptr->protections);
+
 	if (ptr->esd) {
 		e = gf_isom_box_size((GF_Box *)ptr->esd);
 		if (e) return e;
@@ -4013,6 +4117,11 @@
 		if (e) return e;
 		ptr->size += ptr->cfg_3gpp->size;
 	}
+	if (ptr->cfg_opus) {
+		e = gf_isom_box_size((GF_Box *)ptr->cfg_opus);
+		if (e) return e;
+		ptr->size += ptr->cfg_opus->size;
+	}
 	if (ptr->cfg_ac3) {
 		e = gf_isom_box_size((GF_Box *)ptr->cfg_ac3);
 		if (e) return e;
@@ -4024,6 +4133,54 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
+void gen_sample_entry_del(GF_Box *s)
+{
+	GF_SampleEntryBox *ptr = (GF_SampleEntryBox *)s;
+	if (ptr == NULL) return;
+	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
+	gf_free(ptr);
+}
+
+
+GF_Err gen_sample_entry_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e = gf_isom_base_sample_entry_read((GF_SampleEntryBox *)s, bs);
+	if (e) return e;
+	ISOM_DECREASE_SIZE(s, 8);
+	return gf_isom_box_array_read(s, bs, gf_isom_box_add_default);
+}
+
+GF_Box *gen_sample_entry_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_SampleEntryBox, GF_QT_BOX_TYPE_C608);//type will be overriten
+	gf_isom_sample_entry_init((GF_SampleEntryBox*)tmp);
+	return (GF_Box *)tmp;
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err gen_sample_entry_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_SampleEntryBox *ptr = (GF_SampleEntryBox *)s;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
+	gf_bs_write_data(bs, ptr->reserved, 6);
+	gf_bs_write_u16(bs, ptr->dataReferenceIndex);
+	return gf_isom_box_array_write(s, ptr->protections, bs);
+}
+
+GF_Err gen_sample_entry_Size(GF_Box *s)
+{
+	GF_SampleEntryBox *ptr = (GF_SampleEntryBox *)s;
+	ptr->size += 8;
+	return gf_isom_box_array_size(s, ptr->protections);
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
 void mp4s_del(GF_Box *s)
 {
 	GF_MPEGSampleEntryBox *ptr = (GF_MPEGSampleEntryBox *)s;
@@ -4125,6 +4282,8 @@
 	if (ptr->mvc_config) gf_isom_box_del((GF_Box *) ptr->mvc_config);
 	if (ptr->hevc_config) gf_isom_box_del((GF_Box *) ptr->hevc_config);
 	if (ptr->lhvc_config) gf_isom_box_del((GF_Box *) ptr->lhvc_config);
+	if (ptr->av1_config) gf_isom_box_del((GF_Box *)ptr->av1_config);
+	if (ptr->vp_config) gf_isom_box_del((GF_Box *)ptr->vp_config);
 	if (ptr->cfg_3gpp) gf_isom_box_del((GF_Box *)ptr->cfg_3gpp);
 
 	if (ptr->descr) gf_isom_box_del((GF_Box *) ptr->descr);
@@ -4132,9 +4291,14 @@
 
 	if (ptr->pasp) gf_isom_box_del((GF_Box *)ptr->pasp);
 	if (ptr->clap) gf_isom_box_del((GF_Box *)ptr->clap);
+	if (ptr->colr) gf_isom_box_del((GF_Box*)ptr->colr);
+	if (ptr->mdcv) gf_isom_box_del((GF_Box*)ptr->mdcv);
+	if (ptr->clli) gf_isom_box_del((GF_Box*)ptr->clli);
 	if (ptr->rinf) gf_isom_box_del((GF_Box *)ptr->rinf);
+	if (ptr->ccst) gf_isom_box_del((GF_Box *)ptr->ccst);
 
 	if (ptr->rvcc) gf_isom_box_del((GF_Box *)ptr->rvcc);
+	if (ptr->auxi) gf_isom_box_del((GF_Box *)ptr->auxi);
 
 	gf_free(ptr);
 }
@@ -4174,6 +4338,14 @@
 		if (ptr->lhvc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
 			ptr->lhvc_config = (GF_HEVCConfigurationBox *)a;
 		break;
+	case GF_ISOM_BOX_TYPE_AV1C:
+		if (ptr->av1_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
+			ptr->av1_config = (GF_AV1ConfigurationBox *)a;
+		break;
+	case GF_ISOM_BOX_TYPE_VPCC:
+		if (ptr->vp_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
+			ptr->vp_config = (GF_VPConfigurationBox *)a;
+		break;
 	case GF_ISOM_BOX_TYPE_M4DS:
 		if (ptr->descr) ERROR_ON_DUPLICATED_BOX(a, ptr)
 			ptr->descr = (GF_MPEG4ExtensionDescriptorsBox *)a;
@@ -4191,7 +4363,6 @@
 		/*for 3GP config, remember sample entry type in config*/
 		ptr->cfg_3gpp->cfg.type = ptr->type;
 		break;
-		break;
 
 	case GF_ISOM_BOX_TYPE_PASP:
 		if (ptr->pasp) ERROR_ON_DUPLICATED_BOX(a, ptr)
@@ -4199,7 +4370,27 @@
 		break;
 	case GF_ISOM_BOX_TYPE_CLAP:
 		if (ptr->clap) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->clap = (GF_CleanAppertureBox *)a;
+			ptr->clap = (GF_CleanApertureBox *)a;
+		break;
+	case GF_ISOM_BOX_TYPE_COLR:
+		if (ptr->colr) ERROR_ON_DUPLICATED_BOX(a, ptr)
+			ptr->colr = (GF_ColourInformationBox*)a;
+		break;
+	case GF_ISOM_BOX_TYPE_MDCV:
+		if (ptr->mdcv) ERROR_ON_DUPLICATED_BOX(a, ptr)
+			ptr->mdcv = (GF_MasteringDisplayColourVolumeBox*)a;
+		break;
+	case GF_ISOM_BOX_TYPE_CLLI:
+		if (ptr->clli) ERROR_ON_DUPLICATED_BOX(a, ptr)
+			ptr->clli = (GF_ContentLightLevelBox*)a;
+		break;
+	case GF_ISOM_BOX_TYPE_CCST:
+		if (ptr->ccst) ERROR_ON_DUPLICATED_BOX(a, ptr)
+			ptr->ccst = (GF_CodingConstraintsBox *)a;
+		break;
+	case GF_ISOM_BOX_TYPE_AUXI:
+		if (ptr->auxi) ERROR_ON_DUPLICATED_BOX(a, ptr)
+			ptr->auxi = (GF_AuxiliaryTypeInfoBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_RVCC:
 		if (ptr->rvcc) ERROR_ON_DUPLICATED_BOX(a, ptr)
@@ -4224,6 +4415,9 @@
 	/*this is an HEVC sample desc*/
 	if (mp4v->hevc_config || mp4v->lhvc_config || (mp4v->type==GF_ISOM_BOX_TYPE_HVT1))
 		HEVC_RewriteESDescriptor(mp4v);
+	/*this is an AV1 sample desc*/
+	if (mp4v->av1_config)
+		AV1_RewriteESDescriptor(mp4v);
 	return GF_OK;
 }
 
@@ -4258,7 +4452,7 @@
 		e = gf_isom_box_write((GF_Box *)ptr->cfg_3gpp, bs);
 		if (e) return e;
 	}
-	/*avc or hevc*/
+	/*avc or hevc or av1*/
 	else {
 		if (ptr->avc_config && ptr->avc_config->config) {
 			e = gf_isom_box_write((GF_Box *) ptr->avc_config, bs);
@@ -4288,13 +4482,41 @@
 			e = gf_isom_box_write((GF_Box *) ptr->lhvc_config, bs);
 			if (e) return e;
 		}
+		if (ptr->av1_config && ptr->av1_config->config) {
+			e = gf_isom_box_write((GF_Box *)ptr->av1_config, bs);
+			if (e) return e;
+		}
+		if (ptr->vp_config && ptr->vp_config->config) {
+			e = gf_isom_box_write((GF_Box *)ptr->vp_config, bs);
+			if (e) return e;
+		}
+	}
+	if (ptr->clap) {
+		e = gf_isom_box_write((GF_Box*)ptr->clap, bs);
+		if (e) return e;
 	}
 	if (ptr->pasp) {
 		e = gf_isom_box_write((GF_Box *)ptr->pasp, bs);
 		if (e) return e;
 	}
-	if (ptr->clap) {
-		e = gf_isom_box_write((GF_Box *)ptr->clap, bs);
+	if (ptr->colr) {
+		e = gf_isom_box_write((GF_Box*)ptr->colr, bs);
+		if (e) return e;
+	}
+	if (ptr->mdcv) {
+		e = gf_isom_box_write((GF_Box*)ptr->mdcv, bs);
+		if (e) return e;
+	}
+	if (ptr->clli) {
+		e = gf_isom_box_write((GF_Box*)ptr->clli, bs);
+		if (e) return e;
+	}
+	if (ptr->ccst) {
+		e = gf_isom_box_write((GF_Box *)ptr->ccst, bs);
+		if (e) return e;
+	}
+	if (ptr->auxi) {
+		e = gf_isom_box_write((GF_Box *)ptr->auxi, bs);
 		if (e) return e;
 	}
 	if (ptr->rvcc) {
@@ -4324,8 +4546,44 @@
 		if (e) return e;
 		ptr->size += ptr->cfg_3gpp->size;
 	} else {
-		if (!ptr->avc_config && !ptr->svc_config && !ptr->hevc_config && !ptr->lhvc_config && (ptr->type!=GF_ISOM_BOX_TYPE_HVT1) ) {
-			return GF_ISOM_INVALID_FILE;
+		switch (ptr->type) {
+		case GF_ISOM_BOX_TYPE_AVC1:
+		case GF_ISOM_BOX_TYPE_AVC2:
+		case GF_ISOM_BOX_TYPE_AVC3:
+		case GF_ISOM_BOX_TYPE_AVC4:
+		case GF_ISOM_BOX_TYPE_SVC1:
+		case GF_ISOM_BOX_TYPE_SVC2:
+		case GF_ISOM_BOX_TYPE_MVC1:
+		case GF_ISOM_BOX_TYPE_MVC2:
+			if (!ptr->avc_config && !ptr->svc_config && !ptr->mvc_config)
+				return GF_ISOM_INVALID_FILE;
+			break;
+		case GF_ISOM_BOX_TYPE_VP08:
+		case GF_ISOM_BOX_TYPE_VP09:
+			if (!ptr->vp_config) {
+				return GF_ISOM_INVALID_FILE;
+			}
+			break;
+		case GF_ISOM_BOX_TYPE_AV01:
+			if (!ptr->av1_config) {
+				return GF_ISOM_INVALID_FILE;
+			}
+			break;
+		case GF_ISOM_BOX_TYPE_HVC1:
+		case GF_ISOM_BOX_TYPE_HEV1:
+		case GF_ISOM_BOX_TYPE_HVC2:
+		case GF_ISOM_BOX_TYPE_HEV2:
+		case GF_ISOM_BOX_TYPE_LHV1:
+		case GF_ISOM_BOX_TYPE_LHE1:
+		//commented on purpose, HVT1 tracks have no config associated
+//		case GF_ISOM_BOX_TYPE_HVT1:
+//		case GF_ISOM_BOX_TYPE_HVT2:
+			if (!ptr->hevc_config && !ptr->lhvc_config) {
+				return GF_ISOM_INVALID_FILE;
+			}
+			break;
+		default:
+			break;
 		}
 
 		if (ptr->hevc_config && ptr->hevc_config->config) {
@@ -4358,6 +4616,18 @@
 			ptr->size += ptr->lhvc_config->size;
 		}
 
+		if (ptr->av1_config && ptr->av1_config->config) {
+			e = gf_isom_box_size((GF_Box *)ptr->av1_config);
+			if (e) return e;
+			ptr->size += ptr->av1_config->size;
+		}
+
+		if (ptr->vp_config && ptr->vp_config->config) {
+			e = gf_isom_box_size((GF_Box *)ptr->vp_config);
+			if (e) return e;
+			ptr->size += ptr->vp_config->size;
+		}
+
 		if (ptr->ipod_ext) {
 			e = gf_isom_box_size((GF_Box *) ptr->ipod_ext);
 			if (e) return e;
@@ -4374,11 +4644,36 @@
 		if (e) return e;
 		ptr->size += ptr->pasp->size;
 	}
+	if (ptr->colr) {
+		e = gf_isom_box_size((GF_Box*)ptr->colr);
+		if (e) return e;
+		ptr->size += ptr->colr->size;
+	}
+	if (ptr->mdcv) {
+		e = gf_isom_box_size((GF_Box*)ptr->mdcv);
+		if (e) return e;
+		ptr->size += ptr->mdcv->size;
+	}
+	if (ptr->clli) {
+		e = gf_isom_box_size((GF_Box*)ptr->clli);
+		if (e) return e;
+		ptr->size += ptr->clli->size;
+	}
 	if (ptr->clap) {
 		e = gf_isom_box_size((GF_Box *)ptr->clap);
 		if (e) return e;
 		ptr->size += ptr->clap->size;
 	}
+	if (ptr->ccst) {
+		e = gf_isom_box_size((GF_Box *)ptr->ccst);
+		if (e) return e;
+		ptr->size += ptr->ccst->size;
+	}
+	if (ptr->auxi) {
+		e = gf_isom_box_size((GF_Box *)ptr->auxi);
+		if (e) return e;
+		ptr->size += ptr->auxi->size;
+	}
 	if (ptr->rvcc) {
 		e = gf_isom_box_size((GF_Box *)ptr->rvcc);
 		if (e) return e;
@@ -4405,6 +4700,9 @@
 	if (ptr->mehd) gf_isom_box_del((GF_Box*)ptr->mehd);
 	gf_isom_box_array_del(ptr->TrackExList);
 	gf_isom_box_array_del(ptr->TrackExPropList);
+	ptr->mehd = NULL;
+	ptr->TrackExList = NULL;
+	ptr->TrackExPropList = NULL;
 	gf_free(ptr);
 }
 
@@ -4945,8 +5243,6 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-#define WRITE_SAMPLE_FRAGMENTS		1
-
 void stbl_del(GF_Box *s)
 {
 	GF_SampleTableBox *ptr = (GF_SampleTableBox *)s;
@@ -4964,13 +5260,16 @@
 	if (ptr->TimeToSample) gf_isom_box_del((GF_Box *) ptr->TimeToSample);
 	if (ptr->SampleDep) gf_isom_box_del((GF_Box *) ptr->SampleDep);
 	if (ptr->PaddingBits) gf_isom_box_del((GF_Box *) ptr->PaddingBits);
-	if (ptr->Fragments) gf_isom_box_del((GF_Box *) ptr->Fragments);
 	if (ptr->sub_samples) gf_isom_box_array_del(ptr->sub_samples);
 	if (ptr->sampleGroups) gf_isom_box_array_del(ptr->sampleGroups);
 	if (ptr->sampleGroupsDescription) gf_isom_box_array_del(ptr->sampleGroupsDescription);
 
 	if (ptr->sai_sizes) gf_isom_box_array_del(ptr->sai_sizes);
 	if (ptr->sai_offsets) gf_isom_box_array_del(ptr->sai_offsets);
+	if (ptr->traf_map) {
+		if (ptr->traf_map->sample_num) gf_free(ptr->traf_map->sample_num);
+		gf_free(ptr->traf_map);
+	}
 
 	gf_free(ptr);
 }
@@ -5035,11 +5334,6 @@
 			ptr->SampleDep= (GF_SampleDependencyTypeBox *)a;
 		break;
 
-	case GF_ISOM_BOX_TYPE_STSF:
-		if (ptr->Fragments) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->Fragments = (GF_SampleFragmentBox *)a;
-		break;
-
 	case GF_ISOM_BOX_TYPE_SUBS:
 		if (!ptr->sub_samples) ptr->sub_samples = gf_list_new();
 		gf_list_add(ptr->sub_samples, a);
@@ -5047,7 +5341,11 @@
 		{
 			GF_SubSampleInformationBox *subs = (GF_SubSampleInformationBox *)a;
 			GF_SubSampleInfoEntry *ent = gf_list_get(subs->Samples, 0);
-			if (ent->sample_delta==0) {
+			if (!ent) {
+				gf_list_rem(subs->Samples, 0);
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] first entry in SubSample in track SampleTable is invalid\n"));
+			}
+			else if (ent->sample_delta==0) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] first entry in SubSample in track SampleTable has sample_delta of 0, should be one. Fixing\n"));
 				ent->sample_delta = 1;
 			}
@@ -5187,14 +5485,6 @@
 		e = gf_isom_box_array_write(s, ptr->sai_offsets, bs);
 		if (e) return e;
 	}
-
-#if WRITE_SAMPLE_FRAGMENTS
-	//sampleFragments
-	if (ptr->Fragments) {
-		e = gf_isom_box_write((GF_Box *) ptr->Fragments, bs);
-		if (e) return e;
-	}
-#endif
 	return GF_OK;
 }
 
@@ -5267,14 +5557,6 @@
 		if (e) return e;
 		ptr->size += ptr->PaddingBits->size;
 	}
-#if WRITE_SAMPLE_FRAGMENTS
-	//sample fragments
-	if (ptr->Fragments) {
-		e = gf_isom_box_size((GF_Box *) ptr->Fragments);
-		if (e) return e;
-		ptr->size += ptr->Fragments->size;
-	}
-#endif
 
 	if (ptr->sub_samples) {
 		e = gf_isom_box_array_size(s, ptr->sub_samples);
@@ -5528,56 +5810,10 @@
 	GF_SampleDescriptionBox *ptr = (GF_SampleDescriptionBox *)s;
 	if (!a) return GF_OK;
 
-	switch (a->type) {
-	case GF_ISOM_BOX_TYPE_MP4S:
-	case GF_ISOM_BOX_TYPE_ENCS:
-	case GF_ISOM_BOX_TYPE_MP4A:
-	case GF_ISOM_BOX_TYPE_ENCA:
-	case GF_ISOM_BOX_TYPE_MP4V:
-	case GF_ISOM_BOX_TYPE_ENCV:
-	case GF_ISOM_BOX_TYPE_RESV:
-	case GF_ISOM_BOX_TYPE_GHNT:
-	case GF_ISOM_BOX_TYPE_RTP_STSD:
-	case GF_ISOM_BOX_TYPE_SRTP_STSD:
-	case GF_ISOM_BOX_TYPE_FDP_STSD:
-	case GF_ISOM_BOX_TYPE_RRTP_STSD:
-	case GF_ISOM_BOX_TYPE_RTCP_STSD:
-	case GF_ISOM_BOX_TYPE_AVC1:
-	case GF_ISOM_BOX_TYPE_AVC2:
-	case GF_ISOM_BOX_TYPE_AVC3:
-	case GF_ISOM_BOX_TYPE_AVC4:
-	case GF_ISOM_BOX_TYPE_SVC1:
-	case GF_ISOM_BOX_TYPE_MVC1:
-	case GF_ISOM_BOX_TYPE_HVC1:
-	case GF_ISOM_BOX_TYPE_HEV1:
-	case GF_ISOM_BOX_TYPE_HVC2:
-	case GF_ISOM_BOX_TYPE_HEV2:
-	case GF_ISOM_BOX_TYPE_HVT1:
-	case GF_ISOM_BOX_TYPE_LHV1:
-	case GF_ISOM_BOX_TYPE_LHE1:
-	case GF_ISOM_BOX_TYPE_TX3G:
-	case GF_ISOM_BOX_TYPE_TEXT:
-	case GF_ISOM_BOX_TYPE_ENCT:
-	case GF_ISOM_BOX_TYPE_METX:
-	case GF_ISOM_BOX_TYPE_METT:
-	case GF_ISOM_BOX_TYPE_STXT:
-	case GF_ISOM_BOX_TYPE_DIMS:
-	case GF_ISOM_BOX_TYPE_AC3:
-	case GF_ISOM_BOX_TYPE_EC3:
-	case GF_ISOM_BOX_TYPE_LSR1:
-	case GF_ISOM_BOX_TYPE_WVTT:
-	case GF_ISOM_BOX_TYPE_STPP:
-	case GF_ISOM_BOX_TYPE_SBTT:
-	case GF_ISOM_BOX_TYPE_ELNG:
-	case GF_ISOM_BOX_TYPE_MP3:
-	case GF_ISOM_SUBTYPE_3GP_AMR:
-	case GF_ISOM_SUBTYPE_3GP_AMR_WB:
-	case GF_ISOM_SUBTYPE_3GP_EVRC:
-	case GF_ISOM_SUBTYPE_3GP_QCELP:
-	case GF_ISOM_SUBTYPE_3GP_SMV:
-	case GF_ISOM_SUBTYPE_3GP_H263:
+	if (gf_box_valid_in_parent(a, "stsd")) {
 		return gf_isom_box_add_default((GF_Box*)ptr, a);
-
+	}
+	switch (a->type) {
 	//unknown sample description: we need a specific box to handle the data ref index
 	//rather than a default box ...
 	case GF_ISOM_BOX_TYPE_UNKNOWN:
@@ -5585,7 +5821,7 @@
 		/*we need at least 8 bytes for unknown sample entries*/
 		if (def->dataSize < 8) {
 			gf_isom_box_del(a);
-			return GF_OK;
+			return GF_ISOM_INVALID_MEDIA;
 		}
 		return gf_isom_box_add_default((GF_Box*)ptr, a);
 
@@ -5601,7 +5837,7 @@
 	gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(s, 4)
 
-	return gf_isom_box_array_read(s, bs, stsd_AddBox);
+	return gf_isom_box_array_read_ex(s, bs, stsd_AddBox, GF_ISOM_BOX_TYPE_STSD);
 }
 
 GF_Box *stsd_New()
@@ -5636,114 +5872,6 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void stsf_del(GF_Box *s)
-{
-	u32 nb_entries;
-	u32 i;
-	GF_StsfEntry *pe;
-	GF_SampleFragmentBox *ptr = (GF_SampleFragmentBox *)s;
-	if (ptr == NULL) return;
-
-	if (ptr->entryList) {
-		nb_entries = gf_list_count(ptr->entryList);
-		for ( i = 0; i < nb_entries; i++ ) {
-			pe = (GF_StsfEntry*)gf_list_get(ptr->entryList, i);
-			if (pe->fragmentSizes) gf_free(pe->fragmentSizes);
-			gf_free(pe);
-		}
-		gf_list_del(ptr->entryList);
-	}
-	gf_free(ptr);
-}
-
-
-
-GF_Err stsf_Read(GF_Box *s, GF_BitStream *bs)
-{
-	u32 entries, i;
-	u32 nb_entries;
-	GF_StsfEntry *p;
-	GF_SampleFragmentBox *ptr = (GF_SampleFragmentBox *)s;
-
-	p = NULL;
-	if (!ptr) return GF_BAD_PARAM;
-	nb_entries = gf_bs_read_u32(bs);
-
-	p = NULL;
-	for ( entries = 0; entries < nb_entries; entries++ ) {
-		p = (GF_StsfEntry *) gf_malloc(sizeof(GF_StsfEntry));
-		if (!p) return GF_OUT_OF_MEM;
-		p->SampleNumber = gf_bs_read_u32(bs);
-		p->fragmentCount = gf_bs_read_u32(bs);
-		p->fragmentSizes = (u16*)gf_malloc(sizeof(GF_StsfEntry) * p->fragmentCount);
-		for (i=0; i<p->fragmentCount; i++) {
-			p->fragmentSizes[i] = gf_bs_read_u16(bs);
-		}
-		gf_list_add(ptr->entryList, p);
-	}
-#ifndef GPAC_DISABLE_ISOM_WRITE
-	ptr->w_currentEntry = p;
-	ptr->w_currentEntryIndex = nb_entries-1;
-#endif
-	return GF_OK;
-}
-
-GF_Box *stsf_New()
-{
-	ISOM_DECL_BOX_ALLOC(GF_SampleFragmentBox, GF_ISOM_BOX_TYPE_STSF);
-
-	tmp->entryList = gf_list_new();
-	if (! tmp->entryList) {
-		gf_free(tmp);
-		return NULL;
-	}
-	return (GF_Box *) tmp;
-}
-
-
-
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-
-GF_Err stsf_Write(GF_Box *s, GF_BitStream *bs)
-{
-	GF_Err e;
-	u32 i, j;
-	u32 nb_entries;
-	GF_StsfEntry *p;
-	GF_SampleFragmentBox *ptr = (GF_SampleFragmentBox *)s;
-
-	e = gf_isom_full_box_write(s, bs);
-	if (e) return e;
-	nb_entries = gf_list_count(ptr->entryList);
-	gf_bs_write_u32(bs, nb_entries);
-	for ( i = 0; i < nb_entries; i++ ) {
-		p = (GF_StsfEntry*)gf_list_get(ptr->entryList, i);
-		gf_bs_write_u32(bs, p->SampleNumber);
-		gf_bs_write_u32(bs, p->fragmentCount);
-		for (j=0; j<p->fragmentCount; j++) {
-			gf_bs_write_u16(bs, p->fragmentSizes[j]);
-		}
-	}
-	return GF_OK;
-}
-
-GF_Err stsf_Size(GF_Box *s)
-{
-	GF_StsfEntry *p;
-	u32 nb_entries, i;
-	GF_SampleFragmentBox *ptr = (GF_SampleFragmentBox *) s;
-
-	nb_entries = gf_list_count(ptr->entryList);
-	ptr->size += 4;
-	for (i=0; i<nb_entries; i++) {
-		p = (GF_StsfEntry *)gf_list_get(ptr->entryList, i);
-		ptr->size += 8 + 2*p->fragmentCount;
-	}
-	return GF_OK;
-}
-
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 void stsh_del(GF_Box *s)
 {
@@ -6147,7 +6275,7 @@
 		ptr->entries[i].sampleDelta = gf_bs_read_u32(bs);
 #ifndef GPAC_DISABLE_ISOM_WRITE
 		ptr->w_currentSampleNum += ptr->entries[i].sampleCount;
-		ptr->w_LastDTS += ptr->entries[i].sampleCount * ptr->entries[i].sampleDelta;
+		ptr->w_LastDTS += (u64)ptr->entries[i].sampleCount * ptr->entries[i].sampleDelta;
 #endif
 
 		if (!ptr->entries[i].sampleDelta) {
@@ -6656,13 +6784,15 @@
 		e = gf_isom_box_array_write(s, ptr->sai_offsets, bs);
 		if (e) return e;
 	}
-	e = gf_isom_box_array_write(s, ptr->TrackRuns, bs);
-	if (e) return e;
 
 	if (ptr->sample_encryption) {
 		e = gf_isom_box_write((GF_Box *) ptr->sample_encryption, bs);
 		if (e) return e;
 	}
+
+	e = gf_isom_box_array_write(s, ptr->TrackRuns, bs);
+	if (e) return e;
+
 	//tfxd should be last ...
 	if (ptr->tfxd) {
 		e = gf_isom_box_write((GF_Box *) ptr->tfxd, bs);
@@ -6759,11 +6889,13 @@
 	if (!trak->Media->information->sampleTable) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Track with no sample table !\n" ));
 		trak->Media->information->sampleTable = (GF_SampleTableBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STBL);
+		gf_isom_box_add_for_dump_mode((GF_Box *)trak->Media->information, (GF_Box *)trak->Media->information->sampleTable);
 	}
 
 	if (!trak->Media->information->sampleTable->SampleDescription) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Track with no sample description box !\n" ));
 		trak->Media->information->sampleTable->SampleDescription = (GF_SampleDescriptionBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSD);
+		gf_isom_box_add_for_dump_mode((GF_Box *)trak->Media->information->sampleTable, (GF_Box *)trak->Media->information->sampleTable->SampleDescription);
 		return;
 	}
 
@@ -6805,10 +6937,15 @@
 		case GF_ISOM_BOX_TYPE_HVT1:
 		case GF_ISOM_BOX_TYPE_LHV1:
 		case GF_ISOM_BOX_TYPE_LHE1:
+		case GF_ISOM_BOX_TYPE_AV01:
+		case GF_ISOM_BOX_TYPE_VP08:
+		case GF_ISOM_BOX_TYPE_VP09:
+		case GF_ISOM_BOX_TYPE_AV1C:
 		case GF_ISOM_BOX_TYPE_TX3G:
 		case GF_ISOM_BOX_TYPE_TEXT:
 		case GF_ISOM_BOX_TYPE_ENCT:
 		case GF_ISOM_BOX_TYPE_DIMS:
+		case GF_ISOM_BOX_TYPE_OPUS:
 		case GF_ISOM_BOX_TYPE_AC3:
 		case GF_ISOM_BOX_TYPE_EC3:
 		case GF_ISOM_BOX_TYPE_LSR1:
@@ -6816,10 +6953,37 @@
 		case GF_ISOM_BOX_TYPE_STPP:
 		case GF_ISOM_BOX_TYPE_SBTT:
 		case GF_ISOM_BOX_TYPE_MP3:
+		case GF_ISOM_BOX_TYPE_JPEG:
+		case GF_ISOM_BOX_TYPE_PNG:
+		case GF_ISOM_BOX_TYPE_JP2K:
+		case GF_ISOM_BOX_TYPE_MHA1:
+		case GF_ISOM_BOX_TYPE_MHA2:
+		case GF_ISOM_BOX_TYPE_MHM1:
+		case GF_ISOM_BOX_TYPE_MHM2:
+		case GF_QT_BOX_TYPE_AUDIO_RAW:
+		case GF_QT_BOX_TYPE_AUDIO_TWOS:
+		case GF_QT_BOX_TYPE_AUDIO_SOWT:
+		case GF_QT_BOX_TYPE_AUDIO_FL32:
+		case GF_QT_BOX_TYPE_AUDIO_FL64:
+		case GF_QT_BOX_TYPE_AUDIO_IN24:
+		case GF_QT_BOX_TYPE_AUDIO_IN32:
+		case GF_QT_BOX_TYPE_AUDIO_ULAW:
+		case GF_QT_BOX_TYPE_AUDIO_ALAW:
+		case GF_QT_BOX_TYPE_AUDIO_ADPCM:
+		case GF_QT_BOX_TYPE_AUDIO_IMA_ADPCM:
+		case GF_QT_BOX_TYPE_AUDIO_DVCA:
+		case GF_QT_BOX_TYPE_AUDIO_QDMC:
+		case GF_QT_BOX_TYPE_AUDIO_QDMC2:
+		case GF_QT_BOX_TYPE_AUDIO_QCELP:
+		case GF_QT_BOX_TYPE_AUDIO_kMP3:
 			continue;
+
 		case GF_ISOM_BOX_TYPE_UNKNOWN:
 			break;
 		default:
+			if (gf_box_valid_in_parent((GF_Box *) a, "stsd")) {
+				continue;
+			}
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Unexpected box %s in stsd!\n", gf_4cc_to_str(a->type)));
 			continue;
 		}
@@ -6835,125 +6999,76 @@
 			continue;
 		}
 
+#define STSD_SWITCH_BOX(_box) \
+		if (gf_bs_available(bs)) { \
+			u64 pos = gf_bs_get_position(bs); \
+			u32 count_subb = 0; \
+			GF_Err e;\
+			gf_bs_set_cookie(bs, 1);\
+			e = gf_isom_box_array_read((GF_Box *) _box, bs, gf_isom_box_add_default); \
+			count_subb = _box->other_boxes ? gf_list_count(_box->other_boxes) : 0; \
+			if (!count_subb || e) { \
+				gf_bs_seek(bs, pos); \
+				_box->data_size = (u32) gf_bs_available(bs); \
+				if (_box->data_size) { \
+					_box->data = a->data; \
+					a->data = NULL; \
+					memmove(_box->data, _box->data + pos, _box->data_size); \
+				} \
+			} else { \
+				_box->data_size = 0; \
+			} \
+		} \
+		gf_bs_del(bs); \
+		if (!_box->data_size && _box->data) { \
+			gf_free(_box->data); \
+			_box->data = NULL; \
+		} \
+		_box->size = 0; \
+		_box->EntryType = a->original_4cc; \
+		gf_list_rem(trak->Media->information->sampleTable->SampleDescription->other_boxes, i-1); \
+		gf_isom_box_del((GF_Box *)a); \
+		gf_list_insert(trak->Media->information->sampleTable->SampleDescription->other_boxes, _box, i-1); \
+
+
 		/*only process visual or audio*/
 		switch (trak->Media->handler->handlerType) {
-		case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_VISUAL:
+		case GF_ISOM_MEDIA_AUXV:
+		case GF_ISOM_MEDIA_PICT:
 		{
-			GF_GenericVisualSampleEntryBox *genv;
-			/*remove entry*/
-			gf_list_rem(trak->Media->information->sampleTable->SampleDescription->other_boxes, i-1);
-			genv = (GF_GenericVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRV);
+			GF_GenericVisualSampleEntryBox *genv = (GF_GenericVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRV);
 			bs = gf_bs_new(a->data, a->dataSize, GF_BITSTREAM_READ);
 			genv->size = a->size-8;
 			gf_isom_video_sample_entry_read((GF_VisualSampleEntryBox *) genv, bs);
 
-			if (gf_bs_available(bs)) {
-				u64 pos = gf_bs_get_position(bs);
-				//try to parse as boxes
-				GF_Err e = gf_isom_box_array_read((GF_Box *) genv, bs, gf_isom_box_add_default);
-				if (e) {
-					gf_bs_seek(bs, pos);
-					genv->data_size = (u32) gf_bs_available(bs);
-					if (genv->data_size) {
-						genv->data = a->data;
-						a->data = NULL;
-						memmove(genv->data, genv->data + pos, genv->data_size);
-					}
-				} else {
-					genv->data_size = 0;
-				}
-			}
-			gf_bs_del(bs);
-			if (!genv->data_size && genv->data) {
-				gf_free(genv->data);
-				genv->data = NULL;
-			}
+			STSD_SWITCH_BOX(genv)
 
-			genv->size = 0;
-			genv->EntryType = a->original_4cc;
-			gf_isom_box_del((GF_Box *)a);
-			gf_list_insert(trak->Media->information->sampleTable->SampleDescription->other_boxes, genv, i-1);
 		}
 		break;
 		case GF_ISOM_MEDIA_AUDIO:
 		{
-			GF_GenericAudioSampleEntryBox *gena;
-			/*remove entry*/
-			gf_list_rem(trak->Media->information->sampleTable->SampleDescription->other_boxes, i-1);
-			gena = (GF_GenericAudioSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRA);
+			GF_GenericAudioSampleEntryBox *gena = (GF_GenericAudioSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRA);
 			gena->size = a->size-8;
 			bs = gf_bs_new(a->data, a->dataSize, GF_BITSTREAM_READ);
 			gf_isom_audio_sample_entry_read((GF_AudioSampleEntryBox *) gena, bs);
 
-			if (gf_bs_available(bs)) {
-				u64 pos = gf_bs_get_position(bs);
-				//try to parse as boxes
-				GF_Err e = gf_isom_box_array_read((GF_Box *) gena, bs, gf_isom_box_add_default);
-				if (e) {
-					gf_bs_seek(bs, pos);
-					gena->data_size = (u32) gf_bs_available(bs);
-					if (gena->data_size) {
-						gena->data = a->data;
-						a->data = NULL;
-						memmove(gena->data, gena->data + pos, gena->data_size);
-					}
-				} else {
-					gena->data_size = 0;
-				}
-			}
-			gf_bs_del(bs);
-			if (!gena->data_size && gena->data) {
-				gf_free(gena->data);
-				gena->data = NULL;
-			}
-			gena->size = 0;
-			gena->EntryType = a->original_4cc;
-			gf_isom_box_del((GF_Box *)a);
-			gf_list_insert(trak->Media->information->sampleTable->SampleDescription->other_boxes, gena, i-1);
+			STSD_SWITCH_BOX(gena)
+
 		}
 		break;
 
 		default:
 		{
 			GF_Err e;
-			GF_GenericSampleEntryBox *genm;
-			/*remove entry*/
-			gf_list_rem(trak->Media->information->sampleTable->SampleDescription->other_boxes, i-1);
-			genm = (GF_GenericSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRM);
+			GF_GenericSampleEntryBox *genm = (GF_GenericSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRM);
 			genm->size = a->size-8;
 			bs = gf_bs_new(a->data, a->dataSize, GF_BITSTREAM_READ);
 
 			e = gf_isom_base_sample_entry_read((GF_SampleEntryBox *)genm, bs);
 			if (e) return;
 
-			genm->size -= 8;
-
-			if (gf_bs_available(bs)) {
-				u64 pos = gf_bs_get_position(bs);
-				//try to parse as boxes
-				GF_Err e = gf_isom_box_array_read((GF_Box *) genm, bs, gf_isom_box_add_default);
-				if (e) {
-					gf_bs_seek(bs, pos);
-					genm->data_size = (u32) gf_bs_available(bs);
-					if (genm->data_size) {
-						genm->data = a->data;
-						a->data = NULL;
-						memmove(genm->data, genm->data + pos, genm->data_size);
-					}
-				} else {
-					genm->data_size = 0;
-				}
-			}
-			gf_bs_del(bs);
-			if (!genm->data_size && genm->data) {
-				gf_free(genm->data);
-				genm->data = NULL;
-			}
-			genm->size = 0;
-
-			genm->EntryType = a->original_4cc;
-			gf_isom_box_del((GF_Box *)a);
-			gf_list_insert(trak->Media->information->sampleTable->SampleDescription->other_boxes, genm, i-1);
+			STSD_SWITCH_BOX(genm)
 		}
 		break;
 		}
@@ -7015,6 +7130,7 @@
 GF_Err trak_Read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
+	u32 i;
 	GF_TrackBox *ptr = (GF_TrackBox *)s;
 	e = gf_isom_box_array_read(s, bs, trak_AddBox);
 	if (e) return e;
@@ -7028,7 +7144,22 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Missing MediaBox\n"));
 		return GF_ISOM_INVALID_FILE;
 	}
+	if (!ptr->Media->information || !ptr->Media->information->sampleTable) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid MediaBox\n"));
+		return GF_ISOM_INVALID_FILE;
+	}
 
+	for (i=0; i<gf_list_count(ptr->Media->information->sampleTable->other_boxes); i++) {
+		GF_Box *a = gf_list_get(ptr->Media->information->sampleTable->other_boxes, i);
+		if ((a->type ==GF_ISOM_BOX_TYPE_UUID) && (((GF_UUIDBox *)a)->internal_4cc == GF_ISOM_BOX_UUID_PSEC)) {
+			ptr->sample_encryption = (struct __sample_encryption_box *) a;
+			break;
+		}
+		else if (a->type == GF_ISOM_BOX_TYPE_SENC) {
+			ptr->sample_encryption = (struct __sample_encryption_box *)a;
+			break;
+		}
+	}
 	return e;
 }
 
@@ -7475,11 +7606,6 @@
 	ptr->def_sample_duration = gf_bs_read_u32(bs);
 	ptr->def_sample_size = gf_bs_read_u32(bs);
 	ptr->def_sample_flags = gf_bs_read_u32(bs);
-
-	if (!ptr->def_sample_desc_index) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] TREX with default sample description set to 0, likely broken ! Fixing to 1\n" ));
-		ptr->def_sample_desc_index = 1;
-	}
 	return GF_OK;
 }
 
@@ -7503,7 +7629,8 @@
 	if (e) return e;
 
 	gf_bs_write_u32(bs, ptr->trackID);
-	gf_bs_write_u32(bs, ptr->def_sample_desc_index);
+	//we always write 1 in trex default sample desc as using 0 breaks chrome/opera/...
+	gf_bs_write_u32(bs, ptr->def_sample_desc_index ? ptr->def_sample_desc_index : 1);
 	gf_bs_write_u32(bs, ptr->def_sample_duration);
 	gf_bs_write_u32(bs, ptr->def_sample_size);
 	gf_bs_write_u32(bs, ptr->def_sample_flags);
@@ -7609,6 +7736,7 @@
 		return GF_ISOM_INVALID_FILE;
 
 	ptr->sample_count = gf_bs_read_u32(bs);
+	ISOM_DECREASE_SIZE(ptr, 4);
 
 	//The rest depends on the flags
 	if (ptr->flags & GF_ISOM_TRUN_DATA_OFFSET) {
@@ -7619,6 +7747,12 @@
 		ptr->first_sample_flags = gf_bs_read_u32(bs);
 		ISOM_DECREASE_SIZE(ptr, 4);
 	}
+	if (! (ptr->flags & (GF_ISOM_TRUN_DURATION | GF_ISOM_TRUN_SIZE | GF_ISOM_TRUN_FLAGS | GF_ISOM_TRUN_CTS_OFFSET) ) ) {
+		GF_SAFEALLOC(p, GF_TrunEntry);
+		p->nb_pack = ptr->sample_count;
+		gf_list_add(ptr->entries, p);
+		return GF_OK;
+	}
 
 	//read each entry (even though nothing may be written)
 	for (i=0; i<ptr->sample_count; i++) {
@@ -7687,7 +7821,10 @@
 		gf_bs_write_u32(bs, ptr->first_sample_flags);
 	}
 
-	//if nothing to do, this will be skipped automatically
+	if (! (ptr->flags & (GF_ISOM_TRUN_DURATION | GF_ISOM_TRUN_SIZE | GF_ISOM_TRUN_FLAGS | GF_ISOM_TRUN_CTS_OFFSET) ) ) {
+		return GF_OK;
+	}
+
 	count = gf_list_count(ptr->entries);
 	for (i=0; i<count; i++) {
 		p = (GF_TrunEntry*)gf_list_get(ptr->entries, i);
@@ -7723,6 +7860,10 @@
 	if (ptr->flags & GF_ISOM_TRUN_DATA_OFFSET) ptr->size += 4;
 	if (ptr->flags & GF_ISOM_TRUN_FIRST_FLAG) ptr->size += 4;
 
+	if (! (ptr->flags & (GF_ISOM_TRUN_DURATION | GF_ISOM_TRUN_SIZE | GF_ISOM_TRUN_FLAGS | GF_ISOM_TRUN_CTS_OFFSET) ) ) {
+		return GF_OK;
+	}
+
 	//if nothing to do, this will be skipped automatically
 	count = gf_list_count(ptr->entries);
 	for (i=0; i<count; i++) {
@@ -7854,7 +7995,16 @@
 
 GF_Err udta_Read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, udta_AddBox);
+	GF_Err e = gf_isom_box_array_read(s, bs, udta_AddBox);
+	if (e) return e;
+	if (s->size==4) {
+		u32 val = gf_bs_read_u32(bs);
+		s->size = 0;
+		if (val) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] udta has 4 remaining bytes set to %08X but they should be 0\n", val));
+		}
+	}
+	return GF_OK;
 }
 
 GF_Box *udta_New()
@@ -7957,7 +8107,6 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-
 void void_del(GF_Box *s)
 {
 	gf_free(s);
@@ -8160,14 +8309,14 @@
 
 GF_Box *clap_New()
 {
-	ISOM_DECL_BOX_ALLOC(GF_CleanAppertureBox, GF_ISOM_BOX_TYPE_CLAP);
+	ISOM_DECL_BOX_ALLOC(GF_CleanApertureBox, GF_ISOM_BOX_TYPE_CLAP);
 	return (GF_Box *)tmp;
 }
 
 
 void clap_del(GF_Box *s)
 {
-	GF_CleanAppertureBox *ptr = (GF_CleanAppertureBox*)s;
+	GF_CleanApertureBox *ptr = (GF_CleanApertureBox*)s;
 	if (ptr == NULL) return;
 	gf_free(ptr);
 }
@@ -8175,7 +8324,7 @@
 
 GF_Err clap_Read(GF_Box *s, GF_BitStream *bs)
 {
-	GF_CleanAppertureBox *ptr = (GF_CleanAppertureBox*)s;
+	GF_CleanApertureBox *ptr = (GF_CleanApertureBox*)s;
 	ISOM_DECREASE_SIZE(ptr, 32);
 	ptr->cleanApertureWidthN = gf_bs_read_u32(bs);
 	ptr->cleanApertureWidthD = gf_bs_read_u32(bs);
@@ -8193,7 +8342,7 @@
 
 GF_Err clap_Write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_CleanAppertureBox *ptr = (GF_CleanAppertureBox *)s;
+	GF_CleanApertureBox *ptr = (GF_CleanApertureBox *)s;
 	GF_Err e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 	gf_bs_write_u32(bs, ptr->cleanApertureWidthN);
@@ -8278,11 +8427,18 @@
 	while (size) {
 		str[i] = gf_bs_read_u8(bs);
 		size--;
-		if (!str[i])
+		if (!str[i]) {
+			i++;
 			break;
+		}
 		i++;
 	}
-	if (i) {
+	if (!size && i>1 && str[i-1]) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] metx read invalid string\n"));
+		gf_free(str);
+		return GF_ISOM_INVALID_FILE;
+	}
+	if (i>1) {
 		if (ptr->type==GF_ISOM_BOX_TYPE_STPP) {
 			ptr->xml_namespace = gf_strdup(str);
 		} else {
@@ -8294,12 +8450,19 @@
 	while (size) {
 		str[i] = gf_bs_read_u8(bs);
 		size--;
-		if (!str[i])
+		if (!str[i]) {
+			i++;
 			break;
+		}
 		i++;
 	}
+	if (!size && i>1 && str[i-1]) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] metx read invalid string\n"));
+		gf_free(str);
+		return GF_ISOM_INVALID_FILE;
+	}
 	if ((ptr->type==GF_ISOM_BOX_TYPE_METX) || (ptr->type==GF_ISOM_BOX_TYPE_STPP)) {
-		if (i) {
+		if (i>1) {
 			if (ptr->type==GF_ISOM_BOX_TYPE_STPP) {
 				ptr->xml_schema_loc = gf_strdup(str);
 			} else {
@@ -8311,11 +8474,18 @@
 		while (size) {
 			str[i] = gf_bs_read_u8(bs);
 			size--;
-			if (!str[i])
+			if (!str[i]) {
+				i++;
 				break;
+			}
 			i++;
 		}
-		if (i) {
+		if (!size && i>1 && str[i-1]) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] metx read invalid string\n"));
+			gf_free(str);
+			return GF_ISOM_INVALID_FILE;
+		}
+		if (i>1) {
 			if (ptr->type==GF_ISOM_BOX_TYPE_STPP) {
 				ptr->mime_type = gf_strdup(str);
 			} else {
@@ -8325,7 +8495,7 @@
 	}
 	//mett, sbtt, stxt, stpp
 	else {
-		if (i) ptr->mime_type = gf_strdup(str);
+		if (i>1) ptr->mime_type = gf_strdup(str);
 	}
 	ptr->size = size;
 	gf_free(str);
@@ -8867,9 +9037,8 @@
 	if (ptr == NULL) return;
 	if (ptr->subsegments) {
 		for (i = 0; i < ptr->subsegment_count; i++) {
-			GF_Subsegment *subsegment = &ptr->subsegments[i];
-			if (subsegment->levels) gf_free(subsegment->levels);
-			if (subsegment->range_sizes) gf_free(subsegment->range_sizes);
+			GF_SubsegmentInfo *subsegment = &ptr->subsegments[i];
+			if (subsegment->ranges) gf_free(subsegment->ranges);
 		}
 		gf_free(ptr->subsegments);
 	}
@@ -8884,18 +9053,17 @@
 	if (ptr->size < 4) return GF_BAD_PARAM;
 	ptr->subsegment_count = gf_bs_read_u32(bs);
 	ptr->size -= 4;
-	ptr->subsegments = gf_malloc(ptr->subsegment_count*sizeof(GF_Subsegment));
+	ptr->subsegments = gf_malloc(ptr->subsegment_count*sizeof(GF_SubsegmentInfo));
 	for (i = 0; i < ptr->subsegment_count; i++) {
-		GF_Subsegment *subseg = &ptr->subsegments[i];
+		GF_SubsegmentInfo *subseg = &ptr->subsegments[i];
 		if (ptr->size < 4) return GF_BAD_PARAM;
 		subseg->range_count = gf_bs_read_u32(bs);
 		ptr->size -= 4;
 		if (ptr->size < subseg->range_count*4) return GF_BAD_PARAM;
-		subseg->levels = gf_malloc(sizeof(u8)*subseg->range_count);
-		subseg->range_sizes = gf_malloc(sizeof(u32)*subseg->range_count);
+		subseg->ranges = (GF_SubsegmentRangeInfo*) gf_malloc(sizeof(GF_SubsegmentRangeInfo) * subseg->range_count);
 		for (j = 0; j < subseg->range_count; j++) {
-			subseg->levels[j] = gf_bs_read_u8(bs);
-			subseg->range_sizes[j] = gf_bs_read_u24(bs);
+			subseg->ranges[j].level = gf_bs_read_u8(bs);
+			subseg->ranges[j].range_size = gf_bs_read_u24(bs);
 			ptr->size -= 4;
 		}
 	}
@@ -8923,9 +9091,9 @@
 	gf_bs_write_u32(bs, ptr->subsegment_count);
 	for (i = 0; i<ptr->subsegment_count; i++) {
 		gf_bs_write_u32(bs, ptr->subsegments[i].range_count);
-		for (j = 0; j < ptr->subsegment_count; j++) {
-			gf_bs_write_u8(bs, ptr->subsegments[i].levels[j]);
-			gf_bs_write_u24(bs, ptr->subsegments[i].range_sizes[j]);
+		for (j = 0; j < ptr->subsegments[i].range_count; j++) {
+			gf_bs_write_u8(bs, ptr->subsegments[i].ranges[j].level);
+			gf_bs_write_u24(bs, ptr->subsegments[i].ranges[j].range_size);
 		}
 	}
 	return GF_OK;
@@ -9435,6 +9603,8 @@
 
 static void *sgpd_parse_entry(u32 grouping_type, GF_BitStream *bs, u32 entry_size, u32 *total_bytes)
 {
+	Bool null_size_ok = GF_FALSE;
+
 	GF_DefaultSampleGroupDescriptionEntry *ptr;
 	switch (grouping_type) {
 	case GF_ISOM_SAMPLE_GROUP_ROLL:
@@ -9468,6 +9638,16 @@
 		*total_bytes = 1;
 		return ptr;
 	}
+	case GF_ISOM_SAMPLE_GROUP_SYNC:
+	{
+		GF_SYNCEntry *ptr;
+		GF_SAFEALLOC(ptr, GF_SYNCEntry);
+		if (!ptr) return NULL;
+		gf_bs_read_int(bs, 2);
+		ptr->NALU_type = gf_bs_read_int(bs, 6);
+		*total_bytes = 1;
+		return ptr;
+	}
 	case GF_ISOM_SAMPLE_GROUP_TELE:
 	{
 		GF_TemporalLevelEntry *ptr;
@@ -9556,26 +9736,41 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] nalm sample group does not indicate entry size, deprecated in spec\n"));
 		}
 		break;
+
+	case GF_ISOM_SAMPLE_GROUP_TSAS:
+	case GF_ISOM_SAMPLE_GROUP_STSA:
+		null_size_ok = GF_TRUE;
+		break;
+	//TODO, add support for these ones ?
+	case GF_ISOM_SAMPLE_GROUP_TSCL:
+		entry_size = 20;
+		break;
+	case GF_ISOM_SAMPLE_GROUP_LBLI:
+		entry_size = 2;
+		break;
 	default:
 		break;
 	}
 
-	if (!entry_size) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] %s sample group does not indicate entry size, cannot parse!\n", gf_4cc_to_str( grouping_type) ));
+	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) ));
 		return NULL;
 	}
 	GF_SAFEALLOC(ptr, GF_DefaultSampleGroupDescriptionEntry);
 	if (!ptr) return NULL;
-	ptr->length = entry_size;
-	ptr->data = (u8 *) gf_malloc(sizeof(u8)*ptr->length);
-	gf_bs_read_data(bs, (char *) ptr->data, ptr->length);
-	*total_bytes = entry_size;
+	if (entry_size) {
+		ptr->length = entry_size;
+		ptr->data = (u8 *) gf_malloc(sizeof(u8)*ptr->length);
+		gf_bs_read_data(bs, (char *) ptr->data, ptr->length);
+		*total_bytes = entry_size;
+	}
 	return ptr;
 }
 
 static void	sgpd_del_entry(u32 grouping_type, void *entry)
 {
 	switch (grouping_type) {
+	case GF_ISOM_SAMPLE_GROUP_SYNC:
 	case GF_ISOM_SAMPLE_GROUP_ROLL:
 	case GF_ISOM_SAMPLE_GROUP_PROL:
 	case GF_ISOM_SAMPLE_GROUP_RAP:
@@ -9615,6 +9810,10 @@
 		gf_bs_write_int(bs, 0, 3);
 		gf_bs_write_int(bs, ((GF_SAPEntry*)entry)->SAP_type, 4);
 		return;
+	case GF_ISOM_SAMPLE_GROUP_SYNC:
+		gf_bs_write_int(bs, 0, 2);
+		gf_bs_write_int(bs, ((GF_SYNCEntry*)entry)->NALU_type, 6);
+		return;
 	case GF_ISOM_SAMPLE_GROUP_TELE:
 		gf_bs_write_int(bs, ((GF_TemporalLevelEntry*)entry)->level_independently_decodable, 1);
 		gf_bs_write_int(bs, 0, 7);
@@ -9640,7 +9839,8 @@
 	default:
 	{
 		GF_DefaultSampleGroupDescriptionEntry *ptr = (GF_DefaultSampleGroupDescriptionEntry *)entry;
-		gf_bs_write_data(bs, (char *) ptr->data, ptr->length);
+		if (ptr->length)
+			gf_bs_write_data(bs, (char *) ptr->data, ptr->length);
 	}
 	}
 }
@@ -9655,7 +9855,15 @@
 	case GF_ISOM_SAMPLE_GROUP_TELE:
 	case GF_ISOM_SAMPLE_GROUP_RAP:
 	case GF_ISOM_SAMPLE_GROUP_SAP:
+	case GF_ISOM_SAMPLE_GROUP_SYNC:
 		return 1;
+	case GF_ISOM_SAMPLE_GROUP_TSCL:
+		return 20;
+	case GF_ISOM_SAMPLE_GROUP_LBLI:
+		return 2;
+	case GF_ISOM_SAMPLE_GROUP_TSAS:
+	case GF_ISOM_SAMPLE_GROUP_STSA:
+		return 0;
 	case GF_ISOM_SAMPLE_GROUP_SEIG:
 		return ((((GF_CENCSampleEncryptionGroupEntry *)entry)->IsProtected == 1) && !((GF_CENCSampleEncryptionGroupEntry *)entry)->Per_Sample_IV_size) ? 21 + ((GF_CENCSampleEncryptionGroupEntry *)entry)->constant_IV_size : 20;
 	case GF_ISOM_SAMPLE_GROUP_OINF:
@@ -9713,14 +9921,15 @@
 
 	while (entry_count) {
 		void *ptr;
-		u32 parsed_bytes;
+		u32 parsed_bytes=0;
 		u32 size = p->default_length;
 		if ((p->version>=1) && !size) {
 			size = gf_bs_read_u32(bs);
 			ISOM_DECREASE_SIZE(p, 4);
 		}
 		ptr = sgpd_parse_entry(p->grouping_type, bs, size, &parsed_bytes);
-		if (!ptr) return GF_ISOM_INVALID_FILE;
+		//don't return an error, just stop parsing so that we skip over the sgpd box
+		if (!ptr) return GF_OK;
 
 		ISOM_DECREASE_SIZE(p, parsed_bytes);
 
@@ -9960,12 +10169,17 @@
 	if (ptr->flags & 1) ptr->size += 8;
 	ptr->size += 4;
 	//a little optim here: in cenc, the saio always points to a single data block, only one entry is needed
-	if (ptr->aux_info_type == GF_4CC('c', 'e', 'n', 'c')) {
+	switch (ptr->aux_info_type) {
+	case GF_ISOM_CENC_SCHEME:
+	case GF_ISOM_CBC_SCHEME:
+	case GF_ISOM_CENS_SCHEME:
+	case GF_ISOM_CBCS_SCHEME:
 		if (ptr->offsets_large) gf_free(ptr->offsets_large);
 		if (ptr->offsets) gf_free(ptr->offsets);
 		ptr->offsets_large = NULL;
 		ptr->offsets = NULL;
 		ptr->entry_count = 1;
+		break;
 	}
 
 	ptr->size += ((ptr->version==1) ? 8 : 4) * ptr->entry_count;
@@ -10338,6 +10552,9 @@
 	FDPartitionEntryBox *ptr = (FDPartitionEntryBox *) s;
 	if (!s) return GF_BAD_PARAM;
 
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
 	if (ptr->blocks_and_symbols) {
 		e = gf_isom_box_write((GF_Box *)ptr->blocks_and_symbols, bs);
 		if (e) return e;
@@ -10397,7 +10614,7 @@
 	gf_free(ptr);
 }
 
-GF_Err gf_isom_read_null_terminated_string(GF_Box *s, GF_BitStream *bs, u32 size, char **out_str)
+GF_Err gf_isom_read_null_terminated_string(GF_Box *s, GF_BitStream *bs, u64 size, char **out_str)
 {
 	u32 len=10;
 	u32 i=0;
@@ -10495,7 +10712,7 @@
 {
 	FilePartitionBox *ptr = (FilePartitionBox *)s;
 
-	ptr->size+= 13 + ptr->version ? 8 : 4;
+	ptr->size += 13 + (ptr->version ? 8 : 4);
 	if (ptr->scheme_specific_info)
 		ptr->size += strlen(ptr->scheme_specific_info);
 
@@ -10596,6 +10813,7 @@
 	ptr->num_session_groups = gf_bs_read_u16(bs);
 	if (ptr->num_session_groups*3>ptr->size) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid number of entries %d in segr\n", ptr->num_session_groups));
+		ptr->num_session_groups = 0;
 		return GF_ISOM_INVALID_FILE;
 	}
 
@@ -10625,9 +10843,13 @@
 GF_Err segr_Write(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i, k;
+	GF_Err e;
 	FDSessionGroupBox *ptr = (FDSessionGroupBox *) s;
 	if (!s) return GF_BAD_PARAM;
 
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
 	gf_bs_write_u16(bs, ptr->num_session_groups);
 	for (i=0; i<ptr->num_session_groups; i++) {
 		gf_bs_write_u8(bs, ptr->session_groups[i].nb_groups);
@@ -10800,10 +11022,14 @@
 
 GF_Err fdpa_Write(GF_Box *s, GF_BitStream *bs)
 {
+	GF_Err e;
 	u32 i;
 	GF_FDpacketBox *ptr = (GF_FDpacketBox *) s;
 	if (!s) return GF_BAD_PARAM;
 
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
 	gf_bs_write_int(bs, ptr->info.sender_current_time_present, 1);
 	gf_bs_write_int(bs, ptr->info.expected_residual_time_present, 1);
 	gf_bs_write_int(bs, ptr->info.session_close_bit, 1);
@@ -10869,7 +11095,7 @@
 
 	e = gf_isom_box_parse((GF_Box**) &ptr->feci, bs);
 	if (e) return e;
-	if (ptr->feci->size>ptr->size) return GF_ISOM_INVALID_MEDIA;
+	if (!ptr->feci || ptr->feci->size > ptr->size) return GF_ISOM_INVALID_MEDIA;
 	ptr->data_length = (u32) (ptr->size - ptr->feci->size);
 	ptr->data = gf_malloc(sizeof(char)*ptr->data_length);
 	gf_bs_read_data(bs, ptr->data, ptr->data_length);
@@ -10885,6 +11111,10 @@
 	GF_Err e;
 	GF_ExtraDataBox *ptr = (GF_ExtraDataBox *) s;
 	if (!s) return GF_BAD_PARAM;
+
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
 	if (ptr->feci) {
 		e = gf_isom_box_write((GF_Box *)ptr->feci, bs);
 		if (e) return e;
@@ -10958,6 +11188,9 @@
 	GF_HintSample *ptr = (GF_HintSample *) s;
 	if (!s) return GF_BAD_PARAM;
 
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
 	e = gf_isom_box_array_write(s, ptr->packetTable, bs);
 	if (e) return e;
 	if (ptr->extra_data) {
@@ -11135,6 +11368,146 @@
 	return GF_OK;
 }
 
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+void mhac_del(GF_Box *s)
+{
+	GF_MHAConfigBox *ptr = (GF_MHAConfigBox *) s;
+	if (ptr->mha_config) gf_free(ptr->mha_config);
+	gf_free(s);
+}
+
+GF_Err mhac_Read(GF_Box *s,GF_BitStream *bs)
+{
+	GF_MHAConfigBox *ptr = (GF_MHAConfigBox *) s;
+
+	ISOM_DECREASE_SIZE(s, 5)
+	ptr->configuration_version = gf_bs_read_u8(bs);
+	ptr->mha_pl_indication = gf_bs_read_u8(bs);
+	ptr->reference_channel_layout = gf_bs_read_u8(bs);
+	ptr->mha_config_size = gf_bs_read_u16(bs);
+	if (ptr->mha_config_size) {
+		ISOM_DECREASE_SIZE(s, ptr->mha_config_size)
+		ptr->mha_config = gf_malloc(sizeof(char)*ptr->mha_config_size);
+		gf_bs_read_data(bs, ptr->mha_config, ptr->mha_config_size);
+	}
+	return GF_OK;
+}
+
+GF_Box *mhac_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_MHAConfigBox, GF_ISOM_BOX_TYPE_MHAC);
+	tmp->configuration_version = 1;
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err mhac_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_MHAConfigBox *ptr = (GF_MHAConfigBox *) s;
+
+	e = gf_isom_box_write(s, bs);
+	if (e) return e;
+	gf_bs_write_u8(bs, ptr->configuration_version);
+	gf_bs_write_u8(bs, ptr->mha_pl_indication);
+	gf_bs_write_u8(bs, ptr->reference_channel_layout);
+	gf_bs_write_u16(bs, ptr->mha_config ? ptr->mha_config_size : 0);
+	if (ptr->mha_config && ptr->mha_config_size)
+		gf_bs_write_data(bs, ptr->mha_config, ptr->mha_config_size);
+
+	return GF_OK;
+}
+
+GF_Err mhac_Size(GF_Box *s)
+{
+	GF_MHAConfigBox *ptr = (GF_MHAConfigBox *) s;
+	s->size += 5;
+	if (ptr->mha_config_size && ptr->mha_config) s->size += ptr->mha_config_size;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+/* Dolby Vision */
+
+GF_Box *dvcC_New()
+{
+	GF_DOVIConfigurationBox *tmp = (GF_DOVIConfigurationBox *)gf_malloc(sizeof(GF_DOVIConfigurationBox));
+	if (tmp == NULL) return NULL;
+	memset(tmp, 0, sizeof(GF_DOVIConfigurationBox));
+	tmp->type = GF_ISOM_BOX_TYPE_DVCC;
+	return (GF_Box *)tmp;
+}
+
+void dvcC_del(GF_Box *s)
+{
+	GF_DOVIConfigurationBox *ptr = (GF_DOVIConfigurationBox*)s;
+	gf_free(ptr);
+}
+
+GF_Err dvcC_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_DOVIConfigurationBox *ptr = (GF_DOVIConfigurationBox *)s;
+
+	//GF_DOVIDecoderConfigurationRecord
+	ptr->DOVIConfig.dv_version_major = gf_bs_read_u8(bs);
+	ptr->DOVIConfig.dv_version_minor = gf_bs_read_u8(bs);
+	ptr->DOVIConfig.dv_profile = gf_bs_read_int(bs, 7);
+	ptr->DOVIConfig.dv_level = gf_bs_read_int(bs, 6);
+	ptr->DOVIConfig.rpu_present_flag = gf_bs_read_int(bs, 1);
+	ptr->DOVIConfig.el_present_flag = gf_bs_read_int(bs, 1);
+	ptr->DOVIConfig.bl_present_flag = gf_bs_read_int(bs, 1);
+	{
+		int i = 0;
+		u32 data[5];
+		memset(data, 0, sizeof(data));
+		gf_bs_read_data(bs, (char*)data, 20);
+		for (i = 0; i < 5; ++i) {
+			if (data[i] != 0) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] dvcC reserved bytes are not zero\n"));
+				//return GF_ISOM_INVALID_FILE;
+			}
+		}
+	}
+
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err dvcC_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_DOVIConfigurationBox *ptr = (GF_DOVIConfigurationBox *) s;
+	if (!s) return GF_BAD_PARAM;
+
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
+	//GF_DOVIDecoderConfigurationRecord
+	gf_bs_write_u8(bs, ptr->DOVIConfig.dv_version_major);
+	gf_bs_write_u8(bs, ptr->DOVIConfig.dv_version_minor);
+	gf_bs_write_int(bs, ptr->DOVIConfig.dv_profile, 7);
+	gf_bs_write_int(bs, ptr->DOVIConfig.dv_level, 6);
+	gf_bs_write_int(bs, ptr->DOVIConfig.rpu_present_flag, 1);
+	gf_bs_write_int(bs, ptr->DOVIConfig.el_present_flag, 1);
+	gf_bs_write_int(bs, ptr->DOVIConfig.bl_present_flag, 1);
+	gf_bs_write_int(bs, 0, 5*32);
+
+	return GF_OK;
+}
+
+GF_Err dvcC_Size(GF_Box *s)
+{
+	GF_DOVIConfigurationBox *ptr = (GF_DOVIConfigurationBox *)s;
+
+	ptr->size += 24;
+	return GF_OK;
+}
+
 #endif /*GPAC_DISABLE_ISOM_WRITE*/

gpac-0.7.1.tar.gz/src/isomedia/box_code_drm.c -> gpac-0.8.0.tar.gz/src/isomedia/box_code_drm.c Changed

@@ -483,8 +483,12 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 GF_Err iSLT_Write(GF_Box *s, GF_BitStream *bs)
 {
+	GF_Err e;
 	GF_ISMACrypSaltBox *ptr = (GF_ISMACrypSaltBox *)s;
 	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
 	gf_bs_write_u64(bs, ptr->salt);
 	return GF_OK;
 }
@@ -1109,7 +1113,6 @@
 
 GF_Err piff_psec_Read(GF_Box *s, GF_BitStream *bs)
 {
-	u32 sample_count;
 	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox *)s;
 	if (ptr->size<4) return GF_ISOM_INVALID_FILE;
 	ptr->version = gf_bs_read_u8(bs);
@@ -1127,13 +1130,14 @@
 
 	ptr->bs_offset = gf_bs_get_position(bs);
 
-	sample_count = gf_bs_read_u32(bs);
+	/*u32 sample_count = */gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
 	if (ptr->IV_size != 8 && ptr->IV_size != 16) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] PIFF PSEC box incorrect IV size: %u - shall be 8 or 16\n", ptr->IV_size));
 		return GF_BAD_PARAM;
 	}
 	//as for senc, we skip parsing of the box until we have all saiz/saio info
+	gf_bs_skip_bytes(bs, ptr->size);
 	ptr->size = 0;
 	return GF_OK;
 }
@@ -1229,7 +1233,7 @@
 		for (i = 0; i < sample_count; i++) {
 			GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
 			if (! sai->IV_size) continue;
-			ptr->size += 18 + 6*sai->subsample_count;
+			ptr->size += 2 + sai->IV_size + 6*sai->subsample_count;
 		}
 	}
 	return GF_OK;
@@ -1335,18 +1339,34 @@
 		if (trak) samp_count += trak->sample_count_at_seg_start;
 #endif
 
-		e = gf_isom_get_sample_cenc_info_ex(trak, traf, senc, samp_count, &is_encrypted, &sai->IV_size, NULL, NULL, NULL, NULL, NULL);
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isobmf] could not get cenc info for sample %d: %s\n", samp_count, gf_error_to_string(e) ));
-			return e;
+		if (trak) {
+			e = gf_isom_get_sample_cenc_info_ex(trak, traf, senc, samp_count, &is_encrypted, &sai->IV_size, NULL, NULL, NULL, NULL, NULL);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isobmf] could not get cenc info for sample %d: %s\n", samp_count, gf_error_to_string(e) ));
+				return e;
+			}
 		}
+		//no init movie setup (segment dump/inspaction, assume default encrypted and 16 bytes IV
+		else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[isobmf] no moov found, cannot get cenc default info, assuming isEncrypted, IV size 16\n" ));
+			is_encrypted = GF_TRUE;
+			sai->IV_size = 16;
+		}
+		//while this would technically be correct, senc mandates that sample_count = all samples in traf/track
+		//regardless of their encryption state
+		//if (is_encrypted)
+		{
+			if (sai->IV_size)
+				gf_bs_read_data(bs, (char *)sai->IV, sai->IV_size);
 
-		if (is_encrypted) {
-			gf_bs_read_data(bs, (char *)sai->IV, sai->IV_size);
 			if (senc->flags & 0x00000002) {
 				sai->subsample_count = gf_bs_read_u16(bs);
 				sai->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sai->subsample_count*sizeof(GF_CENCSubSampleEntry));
 				for (j = 0; j < sai->subsample_count; j++) {
+					if (gf_bs_get_size(bs) - gf_bs_get_position(bs) < 6) {
+						gf_isom_cenc_samp_aux_info_del(sai);
+						return GF_ISOM_INVALID_FILE;
+					}
 					sai->subsamples[j].bytes_clear_data = gf_bs_read_u16(bs);
 					sai->subsamples[j].bytes_encrypted_data = gf_bs_read_u32(bs);
 				}
@@ -1379,6 +1399,7 @@
 GF_Err senc_Write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
+	u32 i, j;
 	u32 sample_count;
 	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox *) s;
 	e = gf_isom_box_write_header(s, bs);
@@ -1390,16 +1411,17 @@
 	sample_count = gf_list_count(ptr->samp_aux_info);
 	gf_bs_write_u32(bs, sample_count);
 	if (sample_count) {
-		u32 i, j;
 
 		e = store_senc_info(ptr, bs);
 		if (e) return e;
 
 		for (i = 0; i < sample_count; i++) {
 			GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
+
 			//for cbcs scheme, IV_size is 0, constant IV shall be used. It is written in tenc box rather than in sai
 			if (sai->IV_size)
 				gf_bs_write_data(bs, (char *)sai->IV, sai->IV_size);
+
 			if (ptr->flags & 0x00000002) {
 				gf_bs_write_u16(bs, sai->subsample_count);
 				for (j = 0; j < sai->subsample_count; j++) {
@@ -1425,8 +1447,9 @@
 	if (sample_count) {
 		for (i = 0; i < sample_count; i++) {
 			GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
-			//if (! sai->IV_size) continue;
+
 			ptr->size += sai->IV_size;
+
 			if (ptr->flags & 0x00000002)
 				ptr->size += 2 + 6*sai->subsample_count;
 		}

gpac-0.7.1.tar.gz/src/isomedia/box_code_meta.c -> gpac-0.8.0.tar.gz/src/isomedia/box_code_meta.c Changed

@@ -24,6 +24,7 @@
 */
 
 #include <gpac/internal/isomedia_dev.h>
+#include <gpac/constants.h>
 
 #ifndef GPAC_DISABLE_ISOM
 
@@ -36,27 +37,33 @@
 
 void meta_reset(GF_Box *s)
 {
+	extern Bool use_dump_mode;
+
 	GF_MetaBox *ptr = (GF_MetaBox *)s;
 	if (ptr == NULL) return;
 
-	gf_isom_box_del((GF_Box *)ptr->handler);
+	if (!use_dump_mode) {
+		gf_isom_box_del((GF_Box *)ptr->handler);
+		if (ptr->primary_resource) gf_isom_box_del((GF_Box *)ptr->primary_resource);
+		if (ptr->file_locations) gf_isom_box_del((GF_Box *)ptr->file_locations);
+		if (ptr->item_locations) gf_isom_box_del((GF_Box *)ptr->item_locations);
+		if (ptr->protections) gf_isom_box_del((GF_Box *)ptr->protections);
+		if (ptr->item_infos) gf_isom_box_del((GF_Box *)ptr->item_infos);
+		if (ptr->IPMP_control) gf_isom_box_del((GF_Box *)ptr->IPMP_control);
+		if (ptr->item_refs) gf_isom_box_del((GF_Box *)ptr->item_refs);
+		if (ptr->item_props) gf_isom_box_del((GF_Box *)ptr->item_props);
+	}
+
 	ptr->handler = NULL;
-	if (ptr->primary_resource) gf_isom_box_del((GF_Box *)ptr->primary_resource);
 	ptr->primary_resource = NULL;
-	if (ptr->file_locations) gf_isom_box_del((GF_Box *)ptr->file_locations);
 	ptr->file_locations = NULL;
-	if (ptr->item_locations) gf_isom_box_del((GF_Box *)ptr->item_locations);
 	ptr->item_locations = NULL;
-	if (ptr->protections) gf_isom_box_del((GF_Box *)ptr->protections);
 	ptr->protections = NULL;
-	if (ptr->item_infos) gf_isom_box_del((GF_Box *)ptr->item_infos);
 	ptr->item_infos = NULL;
-	if (ptr->IPMP_control) gf_isom_box_del((GF_Box *)ptr->IPMP_control);
 	ptr->IPMP_control = NULL;
-	if (ptr->item_refs) gf_isom_box_del((GF_Box *)ptr->item_refs);
 	ptr->item_refs = NULL;
-	if (ptr->item_props) gf_isom_box_del((GF_Box *)ptr->item_props);
 	ptr->item_props = NULL;
+
 	if (ptr->other_boxes) gf_isom_box_array_del(ptr->other_boxes);
 	ptr->other_boxes = NULL;
 }
@@ -398,7 +405,7 @@
 			GF_ItemExtentEntry *extent_entry = (GF_ItemExtentEntry *)gf_malloc(sizeof(GF_ItemExtentEntry));
 			gf_list_add(location_entry->extent_entries, extent_entry);
 			if ((ptr->version == 1 || ptr->version == 2) && ptr->index_size > 0) {
-				extent_entry->extent_index = gf_bs_read_int(bs, 8 * ptr->index_size);;
+				extent_entry->extent_index = gf_bs_read_int(bs, 8 * ptr->index_size);
 			}
 			else {
 				extent_entry->extent_index = 0;
@@ -702,7 +709,7 @@
 	} else {
 		gf_bs_write_byte(bs, 0, 1);
 	}
-	if (ptr->item_type == GF_4CC('m', 'i', 'm', 'e') || ptr->item_type == GF_4CC('u', 'r', 'i', ' ')) {
+	if (ptr->item_type == GF_META_ITEM_TYPE_MIME || ptr->item_type == GF_META_ITEM_TYPE_URI) {
 		if (ptr->content_type) {
 			len = (u32)strlen(ptr->content_type) + 1;
 			gf_bs_write_data(bs, ptr->content_type, len);
@@ -711,7 +718,7 @@
 			gf_bs_write_byte(bs, 0, 1);
 		}
 	}
-	if (ptr->item_type == GF_4CC('m', 'i', 'm', 'e')) {
+	if (ptr->item_type == GF_META_ITEM_TYPE_MIME) {
 		if (ptr->content_encoding) {
 			len = (u32)strlen(ptr->content_encoding) + 1;
 			gf_bs_write_data(bs, ptr->content_encoding, len);
@@ -745,11 +752,11 @@
 	}
 	if (ptr->item_name) ptr->size += strlen(ptr->item_name)+1;
 	else ptr->size += 1;
-	if (ptr->item_type == GF_4CC('m', 'i', 'm', 'e') || ptr->item_type == GF_4CC('u', 'r', 'i', ' ')) {
+	if (ptr->item_type == GF_META_ITEM_TYPE_MIME || ptr->item_type == GF_META_ITEM_TYPE_URI) {
 		if (ptr->content_type) ptr->size += strlen(ptr->content_type) + 1;
 		else ptr->size += 1;
 	}
-	if (ptr->item_type == GF_4CC('m','i','m','e')) {
+	if (ptr->item_type == GF_META_ITEM_TYPE_MIME) {
 		if (ptr->content_encoding) ptr->size += strlen(ptr->content_encoding) + 1;
 		else ptr->size += 1;
 	}
@@ -813,7 +820,10 @@
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	count = gf_list_count(ptr->item_infos);
-	gf_bs_write_u16(bs, count);
+	if (ptr->version == 0)
+		gf_bs_write_u16(bs, count);
+	else
+		gf_bs_write_u32(bs, count);
 
 	if (count) {
 		gf_isom_box_array_write(s, ptr->item_infos, bs);
@@ -826,7 +836,7 @@
 	u32 count;
 	GF_ItemInfoBox *ptr = (GF_ItemInfoBox *)s;
 	if (!s) return GF_BAD_PARAM;
-	ptr->size += 2;
+	ptr->size += (ptr->version == 0) ? 2 : 4;
 	if ((count = gf_list_count(ptr->item_infos))) {
 		gf_isom_box_array_size(s, ptr->item_infos);
 	}
@@ -851,6 +861,7 @@
 		gf_isom_box_del(a);
 	}
 	gf_list_del(ptr->references);
+	ptr->references = NULL;
 	gf_free(ptr);
 }
 
@@ -888,14 +899,14 @@
 
 GF_Err iref_Size(GF_Box *s)
 {
-	GF_Err e;
+	GF_Err e = GF_OK;
 	u32 count, i;
 	GF_ItemReferenceBox *ptr = (GF_ItemReferenceBox *)s;
 	if (!s) return GF_BAD_PARAM;
 	count = gf_list_count(ptr->references);
 	for (i = 0; i < count; i++) {
 		GF_Box *a = (GF_Box *)gf_list_get(ptr->references, i);
-		e = gf_isom_box_size(a);		
+		e = gf_isom_box_size(a);
 		if (e) return e;
 		s->size += a->size;
 	}

gpac-0.7.1.tar.gz/src/isomedia/box_dump.c -> gpac-0.8.0.tar.gz/src/isomedia/box_dump.c Changed

@@ -28,6 +28,7 @@
 #include <gpac/network.h>
 #include <gpac/color.h>
 #include <gpac/avparse.h>
+#include <gpac/base_coding.h>
 #include <time.h>
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
@@ -114,13 +115,18 @@
 GF_Err gf_isom_dump(GF_ISOFile *mov, FILE * trace)
 {
 	u32 i;
+	const char *fname;
 	GF_Box *box;
 	if (!mov || !trace) return GF_BAD_PARAM;
 
 	use_dump_mode = mov->dump_mode_alloc;
 	fprintf(trace, "\n");
 
-	fprintf(trace, "<IsoMediaFile xmlns=\"urn:mpeg:isobmff:schema:file:2016\" Name=\"%s\">\n", mov->fileName);
+	fname = strrchr(mov->fileName, '/');
+	if (!fname) fname = strrchr(mov->fileName, '\\');
+	if (!fname) fname = mov->fileName;
+	else fname+=1;
+	fprintf(trace, "<IsoMediaFile xmlns=\"urn:mpeg:isobmff:schema:file:2016\" Name=\"%s\">\n", fname);
 
 	i=0;
 	while ((box = (GF_Box *)gf_list_enum(mov->TopBoxes, &i))) {
@@ -186,6 +192,14 @@
 	return GF_OK;
 }
 
+GF_Err wide_dump(GF_Box *a, FILE * trace)
+{
+	gf_isom_box_dump_start(a, "WideBox", trace);
+	fprintf(trace, ">\n");
+	gf_isom_box_dump_done("WideBox", a, trace);
+	return GF_OK;
+}
+
 GF_Err mdat_dump(GF_Box *a, FILE * trace)
 {
 	GF_MediaDataBox *p;
@@ -259,6 +273,31 @@
 	return GF_OK;
 }
 
+GF_Err gmin_dump(GF_Box *a, FILE * trace)
+{
+	GF_GenericMediaHeaderInfoBox *p = (GF_GenericMediaHeaderInfoBox *)a;
+	gf_isom_box_dump_start(a, "GenericMediaHeaderInformationBox", trace);
+	fprintf(trace, " graphicsMode=\"%d\" opcolorRed=\"%d\" opcolorGreen=\"%d\" opcolorBlue=\"%d\" balance=\"%d\">\n",
+		p->graphics_mode, p->op_color_red, p->op_color_green, p->op_color_blue, p->balance);
+	gf_isom_box_dump_done("GenericMediaHeaderInformationBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err clef_dump(GF_Box *a, FILE * trace)
+{
+	const char *name = "TrackCleanApertureDimensionsBox";
+	GF_ApertureBox *p = (GF_ApertureBox *)a;
+	if (p->type==GF_QT_BOX_TYPE_PROF)
+		name = "TrackProductionApertureDimensionsBox";
+	else if (p->type==GF_QT_BOX_TYPE_ENOF)
+		name = "TrackEncodedPixelsDimensionsBox";
+
+	gf_isom_box_dump_start(a, name, trace);
+	fprintf(trace, " width=\"%d.%d\" height=\"%d.%d\">\n", (p->width>>16), p->width&0xFFFF, p->height>>16, p->height&0xFFFF);
+	gf_isom_box_dump_done(name, a, trace);
+	return GF_OK;
+}
+
 GF_Err smhd_dump(GF_Box *a, FILE * trace)
 {
 	gf_isom_box_dump_start(a, "SoundMediaHeaderBox", trace);
@@ -318,7 +357,6 @@
 	if (p->DegradationPriority) gf_isom_box_dump(p->DegradationPriority, trace);
 	if (p->SampleDep) gf_isom_box_dump(p->SampleDep, trace);
 	if (p->PaddingBits) gf_isom_box_dump(p->PaddingBits, trace);
-	if (p->Fragments) gf_isom_box_dump(p->Fragments, trace);
 	if (p->sub_samples) gf_isom_box_array_dump(p->sub_samples, trace);
 	if (p->sampleGroupsDescription) gf_isom_box_array_dump(p->sampleGroupsDescription, trace);
 	if (p->sampleGroups) gf_isom_box_array_dump(p->sampleGroups, trace);
@@ -391,6 +429,16 @@
 	return GF_OK;
 }
 
+GF_Err alis_dump(GF_Box *a, FILE * trace)
+{
+//	GF_DataEntryAliasBox *p = (GF_DataEntryAliasBox *)a;
+	gf_isom_box_dump_start(a, "AliasDataEntryBox", trace);
+	fprintf(trace, ">\n");
+
+	gf_isom_box_dump_done("AliasDataEntryBox", a, trace);
+	return GF_OK;
+}
+
 GF_Err cprt_dump(GF_Box *a, FILE * trace)
 {
 	GF_CopyrightBox *p;
@@ -484,7 +532,7 @@
 {
 	GF_HandlerBox *p = (GF_HandlerBox *)a;
 	gf_isom_box_dump_start(a, "HandlerBox", trace);
-	if (p->nameUTF8 && (u32) p->nameUTF8[0] == strlen(p->nameUTF8+1)) {
+	if (p->nameUTF8 && (u32) p->nameUTF8[0] == strlen(p->nameUTF8)-1) {
 		fprintf(trace, "hdlrType=\"%s\" Name=\"%s\" ", gf_4cc_to_str(p->handlerType), p->nameUTF8+1);
 	} else {
 		fprintf(trace, "hdlrType=\"%s\" Name=\"%s\" ", gf_4cc_to_str(p->handlerType), p->nameUTF8);
@@ -563,6 +611,7 @@
 
 GF_Err video_sample_entry_dump(GF_Box *a, FILE * trace)
 {
+	Bool full_dump=GF_FALSE;
 	GF_MPEGVisualSampleEntryBox *p = (GF_MPEGVisualSampleEntryBox *)a;
 	const char *name;
 
@@ -589,19 +638,40 @@
 	case GF_ISOM_SUBTYPE_LHE1:
 		name = "LHEVCSampleEntryBox";
 		break;
+	case GF_ISOM_SUBTYPE_AV01:
+		name = "AV1SampleEntryBox";
+		break;
 	case GF_ISOM_SUBTYPE_3GP_H263:
 		name = "H263SampleDescriptionBox";
 		break;
+	case GF_QT_BOX_TYPE_APCH:
+	case GF_QT_BOX_TYPE_APCO:
+	case GF_QT_BOX_TYPE_APCN:
+	case GF_QT_BOX_TYPE_APCS:
+	case GF_QT_BOX_TYPE_APCF:
+	case GF_QT_BOX_TYPE_AP4X:
+	case GF_QT_BOX_TYPE_AP4H:
+		name = "ProResSampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
 	default:
+		//DO NOT TOUCH FOR NOW, this breaks all hashes
 		name = "MPEGVisualSampleDescriptionBox";
 	}
 
+
 	gf_isom_box_dump_start(a, name, trace);
 
 	fprintf(trace, " DataReferenceIndex=\"%d\" Width=\"%d\" Height=\"%d\"", p->dataReferenceIndex, p->Width, p->Height);
 
-	//dump reserved info
-	fprintf(trace, " XDPI=\"%d\" YDPI=\"%d\" BitDepth=\"%d\"", p->horiz_res, p->vert_res, p->bit_depth);
+	if (full_dump) {
+		fprintf(trace, " Version=\"%d\" Revision=\"%d\" Vendor=\"%s\" TemporalQuality=\"%d\" SpatialQuality=\"%d\" FramesPerSample=\"%d\" ColorTableIndex=\"%d\"",
+			p->version, p->revision, gf_4cc_to_str(p->vendor), p->temporal_quality, p->spatial_quality, p->frames_per_sample, p->color_table_index);
+		fprintf(trace, " XDPI=\"%d.%d\" YDPI=\"%d.%d\" BitDepth=\"%d\"", p->horiz_res>>16, p->horiz_res&0xFFFF, p->vert_res>>16, p->vert_res&0xFFFF, p->bit_depth);
+	} else {
+		//dump reserved info
+		fprintf(trace, " XDPI=\"%d\" YDPI=\"%d\" BitDepth=\"%d\"", p->horiz_res, p->vert_res, p->bit_depth);
+	}
 	if (strlen((const char*)p->compressor_name) )
 		fprintf(trace, " CompressorName=\"%s\"\n", p->compressor_name+1);
 
@@ -618,12 +688,19 @@
 		if (p->svc_config) gf_isom_box_dump(p->svc_config, trace);
 		if (p->mvc_config) gf_isom_box_dump(p->mvc_config, trace);
 		if (p->lhvc_config) gf_isom_box_dump(p->lhvc_config, trace);
+		if (p->av1_config) gf_isom_box_dump(p->av1_config, trace);
 		if (p->cfg_3gpp) gf_isom_box_dump(p->cfg_3gpp, trace);
 	}
 	if (a->type == GF_ISOM_BOX_TYPE_ENCV) {
 		gf_isom_box_array_dump(p->protections, trace);
 	}
 	if (p->pasp) gf_isom_box_dump(p->pasp, trace);
+	if (p->mdcv) gf_isom_box_dump(p->colr, trace);
+	if (p->mdcv) gf_isom_box_dump(p->mdcv, trace);
+	if (p->clli) gf_isom_box_dump(p->clli, trace);
+	if (p->clap) gf_isom_box_dump(p->clap, trace);
+	if (p->ccst) gf_isom_box_dump(p->ccst, trace);
+	if (p->auxi) gf_isom_box_dump(p->auxi, trace);
 	if (p->rvcc) gf_isom_box_dump(p->rvcc, trace);
 	if (p->rinf) gf_isom_box_dump(p->rinf, trace);
 
@@ -634,45 +711,72 @@
 
 void base_audio_entry_dump(GF_AudioSampleEntryBox *p, FILE * trace)
 {
-	fprintf(trace, " DataReferenceIndex=\"%d\" SampleRate=\"%d\"", p->dataReferenceIndex, p->samplerate_hi);
+	fprintf(trace, " DataReferenceIndex=\"%d\"", p->dataReferenceIndex);
+	if (p->version)
+		fprintf(trace, " Version=\"%d\"", p->version);
+	fprintf(trace, " SampleRate=\"%d\"", p->samplerate_hi);
 	fprintf(trace, " Channels=\"%d\" BitsPerSample=\"%d\"", p->channel_count, p->bitspersample);
+	if (p->is_qtff)
+		fprintf(trace, " isQTFF=\"%d\"", p->is_qtff);
+
 }
 
 GF_Err audio_sample_entry_dump(GF_Box *a, FILE * trace)
 {
 	char *szName;
-	Bool is_3gpp = GF_FALSE;
+	const char *error=NULL;
+	/*Bool is_3gpp = GF_FALSE;
+	Bool is_mp4a = GF_FALSE;*/
 	GF_MPEGAudioSampleEntryBox *p = (GF_MPEGAudioSampleEntryBox *)a;
 
 	switch (p->type) {
 	case GF_ISOM_SUBTYPE_3GP_AMR:
 		szName = "AMRSampleDescriptionBox";
-		is_3gpp = GF_TRUE;
+		if (!p->cfg_3gpp)
+		 	error = "";
 		break;
 	case GF_ISOM_SUBTYPE_3GP_AMR_WB:
 		szName = "AMR_WB_SampleDescriptionBox";
-		is_3gpp = GF_TRUE;
+		if (!p->cfg_3gpp)
+		 	error = "";
 		break;
 	case GF_ISOM_SUBTYPE_3GP_EVRC:
 		szName = "EVRCSampleDescriptionBox";
-		is_3gpp = GF_TRUE;
+		if (!p->cfg_3gpp)
+		 	error = "";
 		break;
 	case GF_ISOM_SUBTYPE_3GP_QCELP:
 		szName = "QCELPSampleDescriptionBox";
-		is_3gpp = GF_TRUE;
+		if (!p->cfg_3gpp)
+		 	error = "";
 		break;
 	case GF_ISOM_SUBTYPE_3GP_SMV:
 		szName = "SMVSampleDescriptionBox";
-		is_3gpp = GF_TRUE;
+		if (!p->cfg_3gpp)
+		 	error = "";
 		break;
 	case GF_ISOM_BOX_TYPE_MP4A:
 		szName = "MPEGAudioSampleDescriptionBox";
+		if (!p->esd)
+		 	error = "";
 		break;
 	case GF_ISOM_BOX_TYPE_AC3:
 		szName = "AC3SampleEntryBox";
+		if (!p->cfg_ac3)
+		 	error = "";
 		break;
 	case GF_ISOM_BOX_TYPE_EC3:
 		szName = "EC3SampleEntryBox";
+		if (!p->cfg_ac3)
+		 	error = "";
+		break;
+	case GF_ISOM_BOX_TYPE_MHA1:
+	case GF_ISOM_BOX_TYPE_MHA2:
+		if (!p->cfg_mha)
+		 	error = "";
+	case GF_ISOM_BOX_TYPE_MHM1:
+	case GF_ISOM_BOX_TYPE_MHM2:
+		szName = "MHASampleEntry";
 		break;
 	default:
 		szName = "AudioSampleDescriptionBox";
@@ -683,22 +787,25 @@
 	base_audio_entry_dump((GF_AudioSampleEntryBox *)p, trace);
 	fprintf(trace, ">\n");
 
-	if (p->esd) {
-		gf_isom_box_dump(p->esd, trace);
-	} else if (p->cfg_3gpp) {
-		gf_isom_box_dump(p->cfg_3gpp, trace);
+	if (error) {
+		fprintf(trace, "%s\n", error);
+	} else {
+		if (p->esd)
+			gf_isom_box_dump(p->esd, trace);
+
+		if (p->cfg_3gpp)
+			gf_isom_box_dump(p->cfg_3gpp, trace);
 
-	} else if (p->cfg_ac3) {
-		if (p->size)
+		if (p->cfg_opus)
+			gf_isom_box_dump(p->cfg_opus, trace);
+
+		if (p->cfg_ac3)
 			gf_isom_box_dump(p->cfg_ac3, trace);
 
-	} else if (p->size) {
-		if (is_3gpp) {
-			fprintf(trace, "\n");
-		} else {
-			fprintf(trace, "\n");
-		}
+		if (p->cfg_mha)
+			gf_isom_box_dump(p->cfg_mha, trace);
 	}
+
 	if (a->type == GF_ISOM_BOX_TYPE_ENCA) {
 		gf_isom_box_array_dump(p->protections, trace);
 	}
@@ -706,16 +813,40 @@
 	return GF_OK;
 }
 
+GF_Err gen_sample_entry_dump(GF_Box *a, FILE * trace)
+{
+	char *szName;
+	GF_SampleEntryBox *p = (GF_SampleEntryBox *)a;
+
+	switch (p->type) {
+	case GF_QT_BOX_TYPE_C608:
+		szName = "ClosedCaption";
+		break;
+	default:
+		szName = "GenericSampleDescriptionBox";
+		break;
+	}
+
+	gf_isom_box_dump_start(a, szName, trace);
+	fprintf(trace, ">\n");
+
+	if (p->protections && gf_list_count(p->protections) ) {
+		gf_isom_box_array_dump(p->protections, trace);
+	}
+	gf_isom_box_dump_done(szName, a, trace);
+	return GF_OK;
+}
+
 GF_Err gnrm_dump(GF_Box *a, FILE * trace)
 {
 	GF_GenericSampleEntryBox *p = (GF_GenericSampleEntryBox *)a;
 	if (p->EntryType)
 		a->type = p->EntryType;
 
-	gf_isom_box_dump_start(a, "SampleDescriptionBox", trace);
+	gf_isom_box_dump_start(a, "SampleDescriptionEntryBox", trace);
 	fprintf(trace, "DataReferenceIndex=\"%d\" ExtensionDataSize=\"%d\">\n", p->dataReferenceIndex, p->data_size);
 	a->type = GF_ISOM_BOX_TYPE_GNRM;
-	gf_isom_box_dump_done("SampleDescriptionBox", a, trace);
+	gf_isom_box_dump_done("SampleDescriptionEntryBox", a, trace);
 	return GF_OK;
 }
 
@@ -789,8 +920,10 @@
 
 GF_Err stsd_dump(GF_Box *a, FILE * trace)
 {
-//	GF_SampleDescriptionBox *p = (GF_SampleDescriptionBox *)a;
+	GF_SampleDescriptionBox *p = (GF_SampleDescriptionBox *)a;
 	gf_isom_box_dump_start(a, "SampleDescriptionBox", trace);
+	if (p->version)
+		fprintf(trace, " version=\"%d\"", p->version);
 	fprintf(trace, ">\n");
 	gf_isom_box_dump_done("SampleDescriptionBox", a, trace);
 	return GF_OK;
@@ -1050,51 +1183,44 @@
 		fprintf(trace, "\n");
 	} else {
 		for (i=0; i<p->sampleCount; i++) {
+			const char *type;
 			u8 flag = p->sample_info[i];
 			fprintf(trace, "<SampleDependencyEntry ");
+			switch ( (flag >> 6) & 3) {
+			case 1: type="openGOP"; break;
+			case 2: type="no"; break;
+			case 3: type="SAP2"; break;
+			default:
+			case 0: type="unknown"; break;
+			}
+			fprintf(trace, "isLeading=\"%s\" ", type);
+
 			switch ( (flag >> 4) & 3) {
-			case 0:
-				fprintf(trace, "dependsOnOther=\"unknown\" ");
-				break;
-			case 1:
-				fprintf(trace, "dependsOnOther=\"yes\" ");
-				break;
-			case 2:
-				fprintf(trace, "dependsOnOther=\"no\" ");
-				break;
-			case 3:
-				fprintf(trace, "dependsOnOther=\"RESERVED\" ");
-				break;
+			case 1: type="yes"; break;
+			case 2: type="no"; break;
+			case 3: type="RESERVED"; break;
+			default:
+			case 0: type="unknown"; break;
 			}
+			fprintf(trace, "dependsOnOther=\"%s\" ", type);
+
 			switch ( (flag >> 2) & 3) {
-			case 0:
-				fprintf(trace, "dependedOn=\"unknown\" ");
-				break;
-			case 1:
-				fprintf(trace, "dependedOn=\"yes\" ");
-				break;
-			case 2:
-				fprintf(trace, "dependedOn=\"no\" ");
-				break;
-			case 3:
-				fprintf(trace, "dependedOn=\"RESERVED\" ");
-				break;
+			case 1: type="yes"; break;
+			case 2: type="no"; break;
+			case 3: type="RESERVED"; break;
+			default:
+			case 0: type="unknown"; break;
 			}
+			fprintf(trace, "dependedOn=\"%s\" ", type);
+
 			switch ( flag & 3) {
-			case 0:
-				fprintf(trace, "hasRedundancy=\"unknown\" ");
-				break;
-			case 1:
-				fprintf(trace, "hasRedundancy=\"yes\" ");
-				break;
-			case 2:
-				fprintf(trace, "hasRedundancy=\"no\" ");
-				break;
-			case 3:
-				fprintf(trace, "hasRedundancy=\"RESERVED\" ");
-				break;
+			case 1: type="yes"; break;
+			case 2: type="no"; break;
+			case 3: type="RESERVED"; break;
+			default:
+			case 0: type="unknown"; break;
 			}
-			fprintf(trace, " />\n");
+			fprintf(trace, "hasRedundancy=\"%s\"/>\n", type);
 		}
 	}
 	if (!p->size) {
@@ -1275,14 +1401,18 @@
 
 GF_Err unkn_dump(GF_Box *a, FILE * trace)
 {
+	const char *name = "UnknownBox";
 	GF_UnknownBox *u = (GF_UnknownBox *)a;
-	u->type = u->original_4cc;
-	gf_isom_box_dump_start(a, "UnknownBox", trace);
-	u->type = GF_ISOM_BOX_TYPE_UNKNOWN;
-	if (u->dataSize<100)
+	if (!a->type && (a->size==8))
+		name = "TerminatorBox";
+
+	gf_isom_box_dump_start(a, name, trace);
+
+	if (u->dataSize && u->dataSize<100)
 		dump_data_attribute(trace, "data", u->data, u->dataSize);
+
 	fprintf(trace, ">\n");
-	gf_isom_box_dump_done("UnknownBox", a, trace);
+	gf_isom_box_dump_done(name, a, trace);
 	return GF_OK;
 }
 
@@ -1339,64 +1469,36 @@
 	return GF_OK;
 }
 
-GF_Err stsf_dump(GF_Box *a, FILE * trace)
-{
-	GF_SampleFragmentBox *p;
-	GF_StsfEntry *ent;
-	u32 i, j, count;
-
-
-	p = (GF_SampleFragmentBox *)a;
-	count = gf_list_count(p->entryList);
-	gf_isom_box_dump_start(a, "SampleFragmentBox", trace);
-	fprintf(trace, "EntryCount=\"%d\">\n", count);
-
-	for (i=0; i<count; i++) {
-		ent = (GF_StsfEntry *)gf_list_get(p->entryList, i);
-		fprintf(trace, "<SampleFragmentEntry SampleNumber=\"%d\" FragmentCount=\"%d\">\n", ent->SampleNumber, ent->fragmentCount);
-		for (j=0; j<ent->fragmentCount; j++) fprintf(trace, "<FragmentSizeEntry size=\"%d\"/>\n", ent->fragmentSizes[j]);
-		fprintf(trace, "</SampleFragmentEntry>\n");
-	}
-	if (!p->size) {
-		fprintf(trace, "<SampleFragmentEntry SampleNumber=\"\" FragmentCount=\"\">\n");
-		fprintf(trace, "<FragmentSizeEntry size=\"\"/>\n");
-		fprintf(trace, "</SampleFragmentEntry>\n");
-	}
-	gf_isom_box_dump_done("SampleFragmentBox", a, trace);
-	return GF_OK;
-}
-
 GF_Err gppc_dump(GF_Box *a, FILE * trace)
 {
 	GF_3GPPConfigBox *p = (GF_3GPPConfigBox *)a;
-	const char *name = gf_4cc_to_str(p->cfg.vendor);
 	switch (p->cfg.type) {
 	case GF_ISOM_SUBTYPE_3GP_AMR:
 	case GF_ISOM_SUBTYPE_3GP_AMR_WB:
 		gf_isom_box_dump_start(a, "AMRConfigurationBox", trace);
-		fprintf(trace, "Vendor=\"%s\" Version=\"%d\"", name, p->cfg.decoder_version);
+		fprintf(trace, "Vendor=\"%s\" Version=\"%d\"", gf_4cc_to_str(p->cfg.vendor), p->cfg.decoder_version);
 		fprintf(trace, " FramesPerSample=\"%d\" SupportedModes=\"%x\" ModeRotating=\"%d\"", p->cfg.frames_per_sample, p->cfg.AMR_mode_set, p->cfg.AMR_mode_change_period);
 		fprintf(trace, ">\n");
 		gf_isom_box_dump_done("AMRConfigurationBox", a, trace);
 		break;
 	case GF_ISOM_SUBTYPE_3GP_EVRC:
 		gf_isom_box_dump_start(a, "EVRCConfigurationBox", trace);
-		fprintf(trace, "Vendor=\"%s\" Version=\"%d\" FramesPerSample=\"%d\" >\n", name, p->cfg.decoder_version, p->cfg.frames_per_sample);
+		fprintf(trace, "Vendor=\"%s\" Version=\"%d\" FramesPerSample=\"%d\" >\n", gf_4cc_to_str(p->cfg.vendor), p->cfg.decoder_version, p->cfg.frames_per_sample);
 		gf_isom_box_dump_done("EVRCConfigurationBox", a, trace);
 		break;
 	case GF_ISOM_SUBTYPE_3GP_QCELP:
 		gf_isom_box_dump_start(a, "QCELPConfigurationBox", trace);
-		fprintf(trace, "Vendor=\"%s\" Version=\"%d\" FramesPerSample=\"%d\" >\n", name, p->cfg.decoder_version, p->cfg.frames_per_sample);
+		fprintf(trace, "Vendor=\"%s\" Version=\"%d\" FramesPerSample=\"%d\" >\n", gf_4cc_to_str(p->cfg.vendor), p->cfg.decoder_version, p->cfg.frames_per_sample);
 		gf_isom_box_dump_done("QCELPConfigurationBox", a, trace);
 		break;
 	case GF_ISOM_SUBTYPE_3GP_SMV:
 		gf_isom_box_dump_start(a, "SMVConfigurationBox", trace);
-		fprintf(trace, "Vendor=\"%s\" Version=\"%d\" FramesPerSample=\"%d\" >\n", name, p->cfg.decoder_version, p->cfg.frames_per_sample);
+		fprintf(trace, "Vendor=\"%s\" Version=\"%d\" FramesPerSample=\"%d\" >\n", gf_4cc_to_str(p->cfg.vendor), p->cfg.decoder_version, p->cfg.frames_per_sample);
 		gf_isom_box_dump_done("SMVConfigurationBox", a, trace);
 		break;
 	case GF_ISOM_SUBTYPE_3GP_H263:
 		gf_isom_box_dump_start(a, "H263ConfigurationBox", trace);
-		fprintf(trace, "Vendor=\"%s\" Version=\"%d\"", name, p->cfg.decoder_version);
+		fprintf(trace, "Vendor=\"%s\" Version=\"%d\"", gf_4cc_to_str(p->cfg.vendor), p->cfg.decoder_version);
 		fprintf(trace, " Profile=\"%d\" Level=\"%d\"", p->cfg.H263_profile, p->cfg.H263_level);
 		fprintf(trace, ">\n");
 		gf_isom_box_dump_done("H263ConfigurationBox", a, trace);
@@ -1563,6 +1665,79 @@
 	return GF_OK;
 }
 
+GF_Err av1c_dump(GF_Box *a, FILE *trace) {
+	GF_AV1ConfigurationBox *ptr = (GF_AV1ConfigurationBox*)a;
+	fprintf(trace, "<AV1ConfigurationBox>\n");
+	if (ptr->config) {
+		u32 i, obu_count = gf_list_count(ptr->config->obu_array);
+
+		fprintf(trace, "<AV1Config version=\"%u\" profile=\"%u\" level_idx0=\"%u\" tier=\"%u\" ", (u32)ptr->config->version, (u32)ptr->config->seq_profile, (u32)ptr->config->seq_level_idx_0, (u32)ptr->config->seq_tier_0);
+		fprintf(trace, "high_bitdepth=\"%u\" twelve_bit=\"%u\" monochrome=\"%u\" ", (u32)ptr->config->high_bitdepth, (u32)ptr->config->twelve_bit, (u32)ptr->config->monochrome);
+		fprintf(trace, "chroma_subsampling_x=\"%u\" chroma_subsampling_y=\"%u\" chroma_sample_position=\"%u\" ", (u32)ptr->config->chroma_subsampling_x, (u32)ptr->config->chroma_subsampling_y, (u32)ptr->config->chroma_sample_position);
+		fprintf(trace, "initial_presentation_delay=\"%u\" OBUs_count=\"%u\">\n", ptr->config->initial_presentation_delay_minus_one+1, obu_count);
+
+		for (i=0; i<obu_count; i++) {
+			GF_AV1_OBUArrayEntry *a = gf_list_get(ptr->config->obu_array, i);
+			fprintf(trace, "<OBU type=\"%d\" name=\"%s\" size=\"%d\" content=\"", a->obu_type, av1_get_obu_name(a->obu_type), (u32) a->obu_length);
+			dump_data(trace, (char *)a->obu, (u32) a->obu_length);
+			fprintf(trace, "\"/>\n");
+		}
+		fprintf(trace, "</AV1Config>\n");
+	}
+	fprintf(trace, "</AV1ConfigurationBox>\n");
+	return GF_OK;
+}
+
+
+GF_Err vpcc_dump(GF_Box *a, FILE *trace) {
+	GF_VPConfigurationBox *ptr = (GF_VPConfigurationBox*)a;
+	fprintf(trace, "<VPConfigurationBox>\n");
+	if (ptr->config) {
+		fprintf(trace, "<VPConfig");
+
+		fprintf(trace, " profile=\"%u\"", ptr->config->profile);
+		fprintf(trace, " level=\"%u\"", ptr->config->level);
+		fprintf(trace, " bit_depth=\"%u\"", ptr->config->bit_depth);
+		fprintf(trace, " chroma_subsampling=\"%u\"", ptr->config->chroma_subsampling);
+		fprintf(trace, " video_fullRange_flag=\"%u\"", ptr->config->video_fullRange_flag);
+		fprintf(trace, " colour_primaries=\"%u\"", ptr->config->colour_primaries);
+		fprintf(trace, " transfer_characteristics=\"%u\"", ptr->config->transfer_characteristics);
+		fprintf(trace, " matrix_coefficients=\"%u\"", ptr->config->matrix_coefficients);
+		fprintf(trace, " codec_initdata_size=\"%u\"", ptr->config->codec_initdata_size);
+
+		fprintf(trace, ">\n</VPConfig>\n");
+	}
+	fprintf(trace, "</VPConfigurationBox>\n");
+	return GF_OK;
+}
+
+GF_Err SmDm_dump(GF_Box *a, FILE *trace) {
+	GF_SMPTE2086MasteringDisplayMetadataBox * ptr = (GF_SMPTE2086MasteringDisplayMetadataBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	gf_isom_box_dump_start(a, "SMPTE2086MasteringDisplayMetadataBox", trace);
+	fprintf(trace, "primaryRChromaticity_x=\"%u\" ", ptr->primaryRChromaticity_x);
+	fprintf(trace, "primaryRChromaticity_y=\"%u\" ", ptr->primaryRChromaticity_y);
+	fprintf(trace, "primaryGChromaticity_x=\"%u\" ", ptr->primaryGChromaticity_x);
+	fprintf(trace, "primaryGChromaticity_y=\"%u\" ", ptr->primaryGChromaticity_y);
+	fprintf(trace, "primaryBChromaticity_x=\"%u\" ", ptr->primaryBChromaticity_x);
+	fprintf(trace, "primaryBChromaticity_y=\"%u\" ", ptr->primaryBChromaticity_y);
+	fprintf(trace, "whitePointChromaticity_x=\"%u\" ", ptr->whitePointChromaticity_x);
+	fprintf(trace, "whitePointChromaticity_y=\"%u\" ", ptr->whitePointChromaticity_y);
+	fprintf(trace, "luminanceMax=\"%u\" ", ptr->luminanceMax);
+	fprintf(trace, "luminanceMin=\"%u\">\n", ptr->luminanceMin);
+	gf_isom_box_dump_done("SMPTE2086MasteringDisplayMetadataBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err CoLL_dump(GF_Box *a, FILE *trace) {
+	GF_VPContentLightLevelBox * ptr = (GF_VPContentLightLevelBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	gf_isom_box_dump_start(a, "VPContentLightLevelBox", trace);
+	fprintf(trace, "maxCLL=\"%u\" maxFALL=\"%u\">\n", ptr->maxCLL, ptr->maxFALL);
+	gf_isom_box_dump_done("VPContentLightLevelBox", a, trace);
+	return GF_OK;
+}
+
 GF_Err m4ds_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
@@ -1646,7 +1821,7 @@
 	fprintf(trace, ">\n");
 	fprintf(trace, "<DefaultBox>\n");
 	tx3g_dump_box(trace, &p->default_box);
-	gf_isom_box_dump_done("DefaultBox", a, trace);
+
 	fprintf(trace, "<DefaultStyle>\n");
 	tx3g_dump_style(trace, &p->default_style);
 	fprintf(trace, "</DefaultStyle>\n");
@@ -3179,7 +3354,7 @@
 
 	fprintf(nhmlFile, "</NHNTStream>\n");
 	gf_fclose(nhmlFile);
-
+	gf_delete_file(nhmlFileName);
 	if (count) gf_set_progress("SRT Extract", i, count);
 	return GF_OK;
 }
@@ -3712,14 +3887,14 @@
 
 GF_Err clap_dump(GF_Box *a, FILE * trace)
 {
-	GF_CleanAppertureBox *ptr = (GF_CleanAppertureBox*)a;
-	gf_isom_box_dump_start(a, "CleanAppertureBox", trace);
+	GF_CleanApertureBox *ptr = (GF_CleanApertureBox*)a;
+	gf_isom_box_dump_start(a, "CleanApertureBox", trace);
 	fprintf(trace, "cleanApertureWidthN=\"%d\" cleanApertureWidthD=\"%d\" ", ptr->cleanApertureWidthN, ptr->cleanApertureWidthD);
 	fprintf(trace, "cleanApertureHeightN=\"%d\" cleanApertureHeightD=\"%d\" ", ptr->cleanApertureHeightN, ptr->cleanApertureHeightD);
 	fprintf(trace, "horizOffN=\"%d\" horizOffD=\"%d\" ", ptr->horizOffN, ptr->horizOffD);
 	fprintf(trace, "vertOffN=\"%d\" vertOffD=\"%d\"", ptr->vertOffN, ptr->vertOffD);
 	fprintf(trace, ">\n");
-	gf_isom_box_dump_done("CleanAppertureBox", a, trace);
+	gf_isom_box_dump_done("CleanApertureBox", a, trace);
 	return GF_OK;
 }
 
@@ -3839,6 +4014,28 @@
 }
 
 
+GF_Err dOps_dump(GF_Box *a, FILE * trace)
+{
+	GF_OpusSpecificBox *p = (GF_OpusSpecificBox *)a;
+
+	gf_isom_box_dump_start(a, "OpusSpecificBox", trace);
+	fprintf(trace, "version=\"%d\" OutputChannelCount=\"%d\" PreSkip=\"%d\" InputSampleRate=\"%d\" OutputGain=\"%d\" ChannelMappingFamily=\"%d\"",
+		p->version, p->OutputChannelCount, p->PreSkip, p->InputSampleRate, p->OutputGain, p->ChannelMappingFamily);
+
+	if (p->ChannelMappingFamily) {
+		u32 i;
+		fprintf(trace, " StreamCount=\"%d\" CoupledStreamCount=\"%d\" channelMapping=\"", p->StreamCount, p->CoupledCount);
+		for (i=0; i<p->OutputChannelCount; i++) {
+			fprintf(trace, "%s%d", i ? " " : "", p->ChannelMapping[i]);
+		}
+		fprintf(trace, "\"");
+	}
+	fprintf(trace, ">\n");
+	gf_isom_box_dump_done("OpusSpecificBox", a, trace);
+
+	return GF_OK;
+}
+
 GF_Err dac3_dump(GF_Box *a, FILE * trace)
 {
 	GF_AC3ConfigBox *p = (GF_AC3ConfigBox *)a;
@@ -3863,6 +4060,17 @@
 	return GF_OK;
 }
 
+GF_Err dvcC_dump(GF_Box *a, FILE * trace)
+{
+	GF_DOVIConfigurationBox *p = (GF_DOVIConfigurationBox *)a;
+	gf_isom_box_dump_start(a, "DOVIConfigurationBox", trace);
+	fprintf(trace, "dv_version_major=\"%u\" dv_version_minor=\"%u\" dv_profile=\"%u\" dv_level=\"%u\" rpu_present_flag=\"%u\" el_present_flag=\"%u\" bl_present_flag=\"%u\">\n",
+		p->DOVIConfig.dv_version_major, p->DOVIConfig.dv_version_minor, p->DOVIConfig.dv_profile, p->DOVIConfig.dv_level,
+		p->DOVIConfig.rpu_present_flag, p->DOVIConfig.el_present_flag, p->DOVIConfig.bl_present_flag);
+	gf_isom_box_dump_done("DOVIConfigurationBox", a, trace);
+	return GF_OK;
+}
+
 GF_Err lsrc_dump(GF_Box *a, FILE * trace)
 {
 	GF_LASERConfigurationBox *p = (GF_LASERConfigurationBox *)a;
@@ -3913,7 +4121,7 @@
 	for (i = 0; i < p->subsegment_count; i++) {
 		fprintf(trace, "<Subsegment range_count=\"%d\">\n", p->subsegments[i].range_count);
 		for (j = 0; j < p->subsegments[i].range_count; j++) {
-			fprintf(trace, "<Range level=\"%d\" range_size=\"%d\"/>\n", p->subsegments[i].levels[j], p->subsegments[i].range_sizes[j]);
+			fprintf(trace, "<Range level=\"%d\" range_size=\"%d\"/>\n", p->subsegments[i].ranges[j].level, p->subsegments[i].ranges[j].range_size);
 		}
 		fprintf(trace, "</Subsegment>\n");
 	}
@@ -4157,9 +4365,9 @@
 		fprintf(trace, " maxPicWidth=\"%u\" maxPicHeight=\"%u\"", op->maxPicWidth, op->maxPicHeight);
 		fprintf(trace, " maxChromaFormat=\"%u\" maxBitDepth=\"%u\"", op->maxChromaFormat, op->maxBitDepth);
 		fprintf(trace, " frame_rate_info_flag=\"%u\" bit_rate_info_flag=\"%u\"", op->frame_rate_info_flag, op->bit_rate_info_flag);
-		if (op->frame_rate_info_flag) 
+		if (op->frame_rate_info_flag)
 			fprintf(trace, " avgFrameRate=\"%u\" constantFrameRate=\"%u\"", op->avgFrameRate, op->constantFrameRate);
-		if (op->bit_rate_info_flag) 
+		if (op->bit_rate_info_flag)
 			fprintf(trace, " maxBitRate=\"%u\" avgBitRate=\"%u\"", op->maxBitRate, op->avgBitRate);
 		fprintf(trace, "/>\n");
 	}
@@ -4261,14 +4469,14 @@
 		fprintf(trace, "</NALUMap>\n");
 		return;
 	}
-	
+
 	bs = gf_bs_new(data, data_size, GF_BITSTREAM_READ);
 	gf_bs_read_int(bs, 6);
 	large_size = gf_bs_read_int(bs, 1);
 	rle = gf_bs_read_int(bs, 1);
 	entry_count = gf_bs_read_int(bs, large_size ? 16 : 8);
 	fprintf(trace, "<NALUMap rle=\"%d\" large_size=\"%d\">\n", rle, large_size);
-	
+
 	while (entry_count) {
 		u32 ID;
 		fprintf(trace, "<NALUMapEntry ");
@@ -4317,6 +4525,9 @@
 				fprintf(trace, " num_leading_samples=\"%d\"", ((GF_VisualRandomAccessEntry*)entry)->num_leading_samples);
 			fprintf(trace, "/>\n");
 			break;
+		case GF_ISOM_SAMPLE_GROUP_SYNC:
+			fprintf(trace, "<SyncSampleGroupEntry NAL_unit_type=\"%d\"/>\n", ((GF_SYNCEntry*)entry)->NALU_type);
+			break;
 		case GF_ISOM_SAMPLE_GROUP_SEIG:
 			fprintf(trace, "<CENCSampleEncryptionGroupEntry IsEncrypted=\"%d\" IV_size=\"%d\" KID=\"", ((GF_CENCSampleEncryptionGroupEntry*)entry)->IsProtected, ((GF_CENCSampleEncryptionGroupEntry*)entry)->Per_Sample_IV_size);
 			dump_data_hex(trace, (char *)((GF_CENCSampleEncryptionGroupEntry*)entry)->KID, 16);
@@ -4335,7 +4546,7 @@
 		case GF_ISOM_SAMPLE_GROUP_TRIF:
 			trif_dump(trace, (char *) ((GF_DefaultSampleGroupDescriptionEntry*)entry)->data, ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
 			break;
-			
+
 		case GF_ISOM_SAMPLE_GROUP_NALM:
 			nalm_dump(trace, (char *) ((GF_DefaultSampleGroupDescriptionEntry*)entry)->data, ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
 			break;
@@ -4362,6 +4573,9 @@
 		case GF_ISOM_SAMPLE_GROUP_RAP:
 			fprintf(trace, "<VisualRandomAccessEntry num_leading_samples_known=\"yes|no\" num_leading_samples=\"\" />\n");
 			break;
+		case GF_ISOM_SAMPLE_GROUP_SYNC:
+			fprintf(trace, "<SyncSampleGroupEntry NAL_unit_type=\"\" />\n");
+			break;
 		case GF_ISOM_SAMPLE_GROUP_SEIG:
 			fprintf(trace, "<CENCSampleEncryptionGroupEntry IsEncrypted=\"\" IV_size=\"\" KID=\"\" constant_IV_size=\"\" constant_IV=\"\"/>\n");
 			break;
@@ -4497,11 +4711,11 @@
 		fprintf(trace, " IV_size=\"%d\" KID=\"", ptr->Per_Sample_IV_Size);
 	else {
 		fprintf(trace, " constant_IV_size=\"%d\" constant_IV=\"", ptr->constant_IV_size);
-		dump_data_hex(trace, (char *) ptr->KID, 16);
+		dump_data_hex(trace, (char *) ptr->constant_IV, ptr->constant_IV_size);
 		fprintf(trace, "\" KID=\"");
 	}
 	dump_data_hex(trace, (char *) ptr->KID, 16);
-	if (ptr->version) 
+	if (ptr->version)
 		fprintf(trace, "\" crypt_byte_block=\"%d\" skip_byte_block=\"%d", ptr->crypt_byte_block, ptr->skip_byte_block);
 	fprintf(trace, "\">\n");
 	gf_isom_box_dump_done("TrackEncryptionBox", a, trace);
@@ -4559,16 +4773,21 @@
 			GF_CENCSampleAuxInfo *cenc_sample = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
 
 			if (cenc_sample) {
-				if (!strlen((char *)cenc_sample->IV)) continue;
-				fprintf(trace, "<PIFFSampleEncryptionEntry IV_size=\"%u\" IV=\"", cenc_sample->IV_size);
-				dump_data_hex(trace, (char *) cenc_sample->IV, cenc_sample->IV_size);
+				fprintf(trace, "<PIFFSampleEncryptionEntry sampleNumber=\"%d\" IV_size=\"%u\"", i+1, cenc_sample->IV_size);
+				if (cenc_sample->IV_size) {
+					fprintf(trace, " IV=\"");
+					dump_data_hex(trace, (char *) cenc_sample->IV, cenc_sample->IV_size);
+					fprintf(trace, "\"");
+				}
 				if (ptr->flags & 0x2) {
-					fprintf(trace, "\" SubsampleCount=\"%d\"", cenc_sample->subsample_count);
+					fprintf(trace, " SubsampleCount=\"%d\"", cenc_sample->subsample_count);
 					fprintf(trace, ">\n");
 
 					for (j=0; j<cenc_sample->subsample_count; j++) {
 						fprintf(trace, "<PIFFSubSampleEncryptionEntry NumClearBytes=\"%d\" NumEncryptedBytes=\"%d\"/>\n", cenc_sample->subsamples[j].bytes_clear_data, cenc_sample->subsamples[j].bytes_encrypted_data);
 					}
+				} else {
+					fprintf(trace, ">\n");
 				}
 				fprintf(trace, "</PIFFSampleEncryptionEntry>\n");
 			}
@@ -4598,9 +4817,12 @@
 		GF_CENCSampleAuxInfo *cenc_sample = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
 
 		if (cenc_sample) {
-			fprintf(trace, "<SampleEncryptionEntry sampleCount=\"%d\" IV_size=\"%u\" IV=\"", i+1, cenc_sample->IV_size);
-			dump_data_hex(trace, (char *) cenc_sample->IV, 16);
-			fprintf(trace, "\"");
+			fprintf(trace, "<SampleEncryptionEntry sampleNumber=\"%d\" IV_size=\"%u\"", i+1, cenc_sample->IV_size);
+			if (cenc_sample->IV_size) {
+				fprintf(trace, " IV=\"");
+				dump_data_hex(trace, (char *) cenc_sample->IV, cenc_sample->IV_size);
+				fprintf(trace, "\"");
+			}
 			if (ptr->flags & 0x2) {
 				fprintf(trace, " SubsampleCount=\"%d\"", cenc_sample->subsample_count);
 				fprintf(trace, ">\n");
@@ -4740,10 +4962,37 @@
 
 GF_Err colr_dump(GF_Box *a, FILE * trace)
 {
+	u8 *prof_data_64=NULL;
+	u32 size_64;
 	GF_ColourInformationBox *ptr = (GF_ColourInformationBox *)a;
 	if (!a) return GF_BAD_PARAM;
+
 	gf_isom_box_dump_start(a, "ColourInformationBox", trace);
-	fprintf(trace, "colour_type=\"%s\" colour_primaries=\"%d\" transfer_characteristics=\"%d\" matrix_coefficients=\"%d\" full_range_flag=\"%d\">\n", gf_4cc_to_str(ptr->colour_type), ptr->colour_primaries, ptr->transfer_characteristics, ptr->matrix_coefficients, ptr->full_range_flag);
+	switch (ptr->colour_type) {
+	case GF_ISOM_SUBTYPE_NCLC:
+		fprintf(trace, "colour_type=\"%s\" colour_primaries=\"%d\" transfer_characteristics=\"%d\" matrix_coefficients=\"%d\">\n", gf_4cc_to_str(ptr->colour_type), ptr->colour_primaries, ptr->transfer_characteristics, ptr->matrix_coefficients);
+		break;
+	case GF_ISOM_SUBTYPE_NCLX:
+		fprintf(trace, "colour_type=\"%s\" colour_primaries=\"%d\" transfer_characteristics=\"%d\" matrix_coefficients=\"%d\" full_range_flag=\"%d\">\n", gf_4cc_to_str(ptr->colour_type), ptr->colour_primaries, ptr->transfer_characteristics, ptr->matrix_coefficients, ptr->full_range_flag);
+		break;
+	case GF_ISOM_SUBTYPE_PROF:
+	case GF_ISOM_SUBTYPE_RICC:
+		fprintf(trace, "colour_type=\"%s\">\n", gf_4cc_to_str(ptr->colour_type));
+		if (ptr->opaque != NULL) {
+			fprintf(trace, "<profile><![CDATA[");
+			size_64 = 2*ptr->opaque_size;
+			prof_data_64 = gf_malloc(size_64);
+			size_64 = gf_base64_encode((const char *) ptr->opaque, ptr->opaque_size, (char *)prof_data_64, size_64);
+			prof_data_64[size_64] = 0;
+			fprintf(trace, "%s", prof_data_64);
+			fprintf(trace, "]]></profile>");
+		}
+		break;
+	default:
+		fprintf(trace, "colour_type=\"%s\">\n", gf_4cc_to_str(ptr->colour_type));
+		break;
+	}
+
 	gf_isom_box_dump_done("ColourInformationBox", a, trace);
 	return GF_OK;
 }
@@ -4785,6 +5034,30 @@
 	return GF_OK;
 }
 
+GF_Err clli_dump(GF_Box *a, FILE * trace)
+{
+	GF_ContentLightLevelBox *ptr = (GF_ContentLightLevelBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	gf_isom_box_dump_start(a, "ContentLightLevelBox", trace);
+	fprintf(trace, "max_content_light_level=\"%u\" max_pic_average_light_level=\"%u\">\n", ptr->max_content_light_level, ptr->max_pic_average_light_level);
+	gf_isom_box_dump_done("ContentLightLevelBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err mdcv_dump(GF_Box *a, FILE * trace)
+{
+	int c = 0;
+	GF_MasteringDisplayColourVolumeBox *ptr = (GF_MasteringDisplayColourVolumeBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	gf_isom_box_dump_start(a, "MasteringDisplayColourVolumeBox", trace);
+	for (c = 0; c < 3; c++) {
+		fprintf(trace, "display_primaries[%d].x=\"%u\" display_primaries[%d].y=\"%u\"", c, ptr->display_primaries[c].x, c, ptr->display_primaries[c].y);
+	}
+	fprintf(trace, "white_point_x=\"%u\" white_point_y=\"%u\" max_display_mastering_luminance=\"%u\" min_display_mastering_luminance=\"%u\">\n", ptr->white_point_x, ptr->white_point_y, ptr->max_display_mastering_luminance, ptr->min_display_mastering_luminance);
+	gf_isom_box_dump_done("MasteringDisplayColourVolumeBox", a, trace);
+	return GF_OK;
+}
+
 GF_Err ipco_dump(GF_Box *a, FILE * trace)
 {
 	gf_isom_box_dump_start(a, "ItemPropertyContainerBox", trace);
@@ -4799,6 +5072,7 @@
 	gf_isom_box_dump_start(a, "ItemPropertiesBox", trace);
 	fprintf(trace, ">\n");
 	if (ptr->property_container) gf_isom_box_dump(ptr->property_container, trace);
+	if (ptr->property_association) gf_isom_box_dump(ptr->property_association, trace);
 	gf_isom_box_dump_done("ItemPropertiesBox", a, trace);
 	return GF_OK;
 }
@@ -4843,6 +5117,17 @@
 	return GF_OK;
 }
 
+GF_Err auxi_dump(GF_Box *a, FILE * trace)
+{
+	GF_AuxiliaryTypeInfoBox *ptr = (GF_AuxiliaryTypeInfoBox *)a;
+
+	gf_isom_box_dump_start(a, "AuxiliaryTypeInfoBox", trace);
+	fprintf(trace, "aux_track_type=\"%s\" ", ptr->aux_track_type);
+	fprintf(trace, ">\n");
+	gf_isom_box_dump_done("AuxiliaryTypeInfoBox", a, trace);
+	return GF_OK;
+}
+
 GF_Err oinf_dump(GF_Box *a, FILE * trace)
 {
 	GF_OINFPropertyBox *ptr = (GF_OINFPropertyBox *)a;
@@ -4926,7 +5211,26 @@
 
 GF_Err def_cont_box_dump(GF_Box *a, FILE *trace)
 {
-	char *name = "SubTrackDefinitionBox"; //only one using generic box container for now
+	char *name = "GenericContainerBox";
+
+	switch (a->type) {
+	case GF_QT_BOX_TYPE_WAVE:
+		name = "DecompressionParamBox";
+		break;
+	case GF_QT_BOX_TYPE_TMCD:
+		name = "TimeCodeBox";
+		break;
+	case GF_ISOM_BOX_TYPE_GMHD:
+		name = "GenericMediaHeaderBox";
+		break;
+	case GF_QT_BOX_TYPE_TAPT:
+		name = "TrackApertureBox";
+		break;
+	case GF_ISOM_BOX_TYPE_STRD:
+		name = "SubTrackDefinitionBox";
+		break;
+	}
+
 	gf_isom_box_dump_start(a, name, trace);
 	fprintf(trace, ">\n");
 	gf_isom_box_dump_done(name, a, trace);
@@ -5078,6 +5382,8 @@
 	return GF_OK;
 }
 
+#ifndef GPAC_DISABLE_ISOM_HINTING
+
 GF_Err fdpa_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
@@ -5136,6 +5442,8 @@
 	return GF_OK;
 }
 
+#endif /*GPAC_DISABLE_ISOM_HINTING*/
+
 GF_Err trik_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
@@ -5176,5 +5484,95 @@
 	return GF_OK;
 }
 
+
+GF_Err mhac_dump(GF_Box *a, FILE * trace)
+{
+	GF_MHAConfigBox *p = (GF_MHAConfigBox *) a;
+
+	gf_isom_box_dump_start(a, "MHAConfigurationBox", trace);
+
+	fprintf(trace, "configurationVersion=\"%d\" mpegh3daProfileLevelIndication=\"%d\" referenceChannelLayout=\"%d\">\n", p->configuration_version, p->mha_pl_indication, p->reference_channel_layout);
+	gf_isom_box_dump_done("MHAConfigurationBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err tmcd_dump(GF_Box *a, FILE * trace)
+{
+	GF_TimeCodeSampleEntryBox *p = (GF_TimeCodeSampleEntryBox *) a;
+
+	gf_isom_box_dump_start(a, "TimeCodeSampleEntryBox", trace);
+
+	fprintf(trace, "DataReferenceIndex=\"%d\" Flags=\"%08X\" TimeScale=\"%d\" FrameDuration=\"%d\" FramesPerSec=\"%d\">\n", p->dataReferenceIndex, p->flags, p->timescale, p->frame_duration, p->frames_per_sec);
+
+	gf_isom_box_dump_done("TimeCodeSampleEntryBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err tcmi_dump(GF_Box *a, FILE * trace)
+{
+	GF_TimeCodeMediaInformationBox *p = (GF_TimeCodeMediaInformationBox *) a;
+
+	gf_isom_box_dump_start(a, "TimeCodeMediaInformationBox", trace);
+	fprintf(trace, "textFont=\"%d\" textFace=\"%d\" textSize=\"%d\" textColorRed=\"%d\" textColorGreen=\"%d\" textColorBlue=\"%d\" backColorRed=\"%d\" backColorGreen=\"%d\" backColorBlue=\"%d\"",
+			p->text_font, p->text_face, p->text_size, p->text_color_red, p->text_color_green, p->text_color_blue, p->back_color_red, p->back_color_green, p->back_color_blue);
+	if (p->font)
+		fprintf(trace, " font=\"%s\"", p->font);
+
+	fprintf(trace, ">\n");
+
+	gf_isom_box_dump_done("TimeCodeMediaInformationBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err fiel_dump(GF_Box *a, FILE * trace)
+{
+	GF_FieldInfoBox *p = (GF_FieldInfoBox *) a;
+
+	gf_isom_box_dump_start(a, "FieldInfoBox", trace);
+	fprintf(trace, "count=\"%d\" order=\"%d\">\n", p->field_count, p->field_order);
+	gf_isom_box_dump_done("FieldInfoBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err gama_dump(GF_Box *a, FILE * trace)
+{
+	GF_GamaInfoBox *p = (GF_GamaInfoBox *) a;
+
+	gf_isom_box_dump_start(a, "GamaInfoBox", trace);
+	fprintf(trace, "gama=\"%d\">\n", p->gama);
+	gf_isom_box_dump_done("GamaInfoBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err chrm_dump(GF_Box *a, FILE * trace)
+{
+	GF_ChromaInfoBox *p = (GF_ChromaInfoBox *) a;
+	if (a->type==GF_QT_BOX_TYPE_ENDA) {
+		gf_isom_box_dump_start(a, "AudioEndianBox", trace);
+		fprintf(trace, "littleEndian=\"%d\">\n", p->chroma);
+		gf_isom_box_dump_done("AudioEndianBox", a, trace);
+	} else {
+		gf_isom_box_dump_start(a, "ChromaInfoBox", trace);
+		fprintf(trace, "chroma=\"%d\">\n", p->chroma);
+		gf_isom_box_dump_done("ChromaInfoBox", a, trace);
+	}
+	return GF_OK;
+}
+
+GF_Err chan_dump(GF_Box *a, FILE * trace)
+{
+	u32 i;
+	GF_ChannelLayoutInfoBox *p = (GF_ChannelLayoutInfoBox *) a;
+
+	gf_isom_box_dump_start(a, "ChannelLayoutInfoBox", trace);
+	fprintf(trace, "layout=\"%d\" bitmap=\"%d\">\n", p->layout_tag, p->bitmap);
+	for (i=0; i<p->num_audio_description; i++) {
+		GF_AudioChannelDescription *adesc = &p->audio_descs[i];
+		fprintf(trace, "<AudioChannelDescription label=\"%d\" flags=\"%08X\" coordinates=\"%f %f %f\"/>\n", adesc->label, adesc->flags, adesc->coordinates[0], adesc->coordinates[1], adesc->coordinates[2]);
+	}
+	gf_isom_box_dump_done("ChannelLayoutInfoBox", a, trace);
+	return GF_OK;
+}
+
 
 #endif /*GPAC_DISABLE_ISOM_DUMP*/

gpac-0.7.1.tar.gz/src/isomedia/box_funcs.c -> gpac-0.8.0.tar.gz/src/isomedia/box_funcs.c Changed

@@ -42,13 +42,17 @@
 	ret = gf_isom_box_parse_ex(outBox, bs, 0, GF_TRUE);
 	if (ret == GF_ISOM_INCOMPLETE_FILE) {
 		if (!*outBox) {
-			// We could not even read the box size, we at least need 8 bytes 
+			// We could not even read the box size, we at least need 8 bytes
 			*bytesExpected = 8;
-			GF_LOG(progressive_mode ? GF_LOG_DEBUG : GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Incomplete box\n"));
+			GF_LOG(progressive_mode ? GF_LOG_DEBUG : GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Incomplete box - start "LLU"\n", start));
 		}
 		else {
+			u32 type = (*outBox)->type;
+			if (type==GF_ISOM_BOX_TYPE_UNKNOWN)
+				type = ((GF_UnknownBox *) (*outBox))->original_4cc;
+
 			*bytesExpected = (*outBox)->size;
-			GF_LOG(progressive_mode ? GF_LOG_DEBUG : GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Incomplete box %s\n", gf_4cc_to_str((*outBox)->type)));
+			GF_LOG(progressive_mode ? GF_LOG_DEBUG : GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Incomplete box %s - start "LLU" size "LLU"\n", gf_4cc_to_str(type), start, (*outBox)->size));
 			gf_isom_box_del(*outBox);
 			*outBox = NULL;
 		}
@@ -88,10 +92,11 @@
 GF_Err gf_isom_box_parse_ex(GF_Box **outBox, GF_BitStream *bs, u32 parent_type, Bool is_root_box)
 {
 	u32 type, uuid_type, hdr_size;
-	u64 size, start, end;
+	u64 size, start, payload_start, end;
 	char uuid[16];
 	GF_Err e;
 	GF_Box *newBox;
+	Bool skip_logs = gf_bs_get_cookie(bs) ? GF_TRUE : GF_FALSE;
 
 	if ((bs == NULL) || (outBox == NULL) ) return GF_BAD_PARAM;
 	*outBox = NULL;
@@ -116,10 +121,14 @@
 			size = 12;
 		if (!size) {
 			if (is_root_box) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Warning Read Box type %s (0x%08X) size 0 reading till the end of file\n", gf_4cc_to_str(type), type));
+				if (!skip_logs) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Warning Read Box type %s (0x%08X) size 0 reading till the end of file\n", gf_4cc_to_str(type), type));
+				}
 				size = gf_bs_available(bs) + 8;
 			} else {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Read Box type %s (0x%08X) has size 0 but is not at root/file level, skipping\n", gf_4cc_to_str(type), type));
+				if (!skip_logs) {
+					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, skipping\n", gf_4cc_to_str(type), type, start));
+				}
 				return GF_OK;
 //				return GF_ISOM_INVALID_FILE;
 			}
@@ -170,7 +179,7 @@
 		((GF_EntityToGroupTypeBox*)newBox)->grouping_type = type;
 	} else {
 		//OK, create the box based on the type
-		newBox = gf_isom_box_new_ex(uuid_type ? uuid_type : type, parent_type);
+		newBox = gf_isom_box_new_ex(uuid_type ? uuid_type : type, parent_type, skip_logs, is_root_box);
 		if (!newBox) return GF_OUT_OF_MEM;
 	}
 
@@ -181,6 +190,9 @@
 	}
 
 	if (!newBox->type) newBox->type = type;
+	payload_start = gf_bs_get_position(bs);
+
+retry_unknown_box:
 
 	end = gf_bs_available(bs);
 	if (size - hdr_size > end ) {
@@ -206,19 +218,34 @@
 	if (e && (e != GF_ISOM_INCOMPLETE_FILE)) {
 		gf_isom_box_del(newBox);
 		*outBox = NULL;
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Read Box \"%s\" failed (%s) - skipping\n", gf_4cc_to_str(type), gf_error_to_string(e)));
 
+		if (parent_type==GF_ISOM_BOX_TYPE_STSD) {
+			newBox = gf_isom_box_new(GF_ISOM_BOX_TYPE_UNKNOWN);
+			((GF_UnknownBox *)newBox)->original_4cc = type;
+			newBox->size = size;
+			gf_bs_seek(bs, payload_start);
+			goto retry_unknown_box;
+		}
+		if (!skip_logs) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Read Box \"%s\" (start "LLU") failed (%s) - skipping\n", gf_4cc_to_str(type), start, gf_error_to_string(e)));
+		}
 		//we don't try to reparse known boxes that have been failing (too dangerous)
 		return e;
 	}
 
 	if (end-start > size) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" size "LLU" invalid (read "LLU")\n", gf_4cc_to_str(type), LLU_CAST size, LLU_CAST (end-start) ));
+		if (!skip_logs) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" size "LLU" (start "LLU") invalid (read "LLU")\n", gf_4cc_to_str(type), LLU_CAST size, start, LLU_CAST (end-start) ));
+		}
 		/*let's still try to load the file since no error was notified*/
 		gf_bs_seek(bs, start+size);
 	} else if (end-start < size) {
 		u32 to_skip = (u32) (size-(end-start));
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" has %u extra bytes\n", gf_4cc_to_str(type), to_skip));
+		if (!skip_logs) {
+			if ((to_skip!=4) || gf_bs_peek_bits(bs, 32, 0)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" (start "LLU") has %u extra bytes\n", gf_4cc_to_str(type), start, to_skip));
+			}
+		}
 		gf_bs_skip_bytes(bs, to_skip);
 	}
 	*outBox = newBox;
@@ -248,7 +275,7 @@
 
 GF_Err gf_isom_box_array_read(GF_Box *parent, GF_BitStream *bs, GF_Err (*add_box)(GF_Box *par, GF_Box *b))
 {
-	return gf_isom_box_array_read_ex(parent, bs, add_box, 0);
+	return gf_isom_box_array_read_ex(parent, bs, add_box, parent->type);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -305,7 +332,7 @@
 	}
 	if (ptr->size > 0xFFFFFFFF)
 		gf_bs_write_u64(bs, ptr->size);
-	
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Written Box type %s size "LLD" start "LLD"\n", gf_4cc_to_str(ptr->type), LLD_CAST ptr->size, LLD_CAST start));
 
 	return GF_OK;
@@ -370,7 +397,7 @@
 
 
 
-GF_Box * unkn_New(u32 type);
+GF_Box * unkn_New();
 void unkn_del(GF_Box *);
 GF_Err unkn_Read(GF_Box *s, GF_BitStream *bs);
 GF_Err unkn_Write(GF_Box *s, GF_BitStream *bs);
@@ -391,6 +418,7 @@
 ISOM_BOX_IMPL_DECL(reftype)
 ISOM_BOX_IMPL_DECL(ireftype)
 ISOM_BOX_IMPL_DECL(free)
+ISOM_BOX_IMPL_DECL(wide)
 ISOM_BOX_IMPL_DECL(mdat)
 ISOM_BOX_IMPL_DECL(moov)
 ISOM_BOX_IMPL_DECL(mvhd)
@@ -411,6 +439,7 @@
 ISOM_BOX_IMPL_DECL(trak)
 ISOM_BOX_IMPL_DECL(mp4s)
 ISOM_BOX_IMPL_DECL(audio_sample_entry)
+ISOM_BOX_IMPL_DECL(gen_sample_entry)
 ISOM_BOX_IMPL_DECL(edts)
 ISOM_BOX_IMPL_DECL(udta)
 ISOM_BOX_IMPL_DECL(dref)
@@ -436,7 +465,6 @@
 ISOM_BOX_IMPL_DECL(mfro)
 ISOM_BOX_IMPL_DECL(uuid)
 ISOM_BOX_IMPL_DECL(void)
-ISOM_BOX_IMPL_DECL(stsf)
 ISOM_BOX_IMPL_DECL(gnrm)
 ISOM_BOX_IMPL_DECL(gnrv)
 ISOM_BOX_IMPL_DECL(gnra)
@@ -567,6 +595,9 @@
 ISOM_BOX_IMPL_DECL(ilst)
 ISOM_BOX_IMPL_DECL(ilst_item)
 ISOM_BOX_IMPL_DECL(databox)
+ISOM_BOX_IMPL_DECL(gmin)
+ISOM_BOX_IMPL_DECL(alis)
+ISOM_BOX_IMPL_DECL(clef)
 
 /*OMA extensions*/
 ISOM_BOX_IMPL_DECL(ohdr)
@@ -594,6 +625,13 @@
 
 ISOM_BOX_IMPL_DECL(subs)
 
+ISOM_BOX_IMPL_DECL(tmcd)
+ISOM_BOX_IMPL_DECL(tcmi)
+ISOM_BOX_IMPL_DECL(fiel)
+ISOM_BOX_IMPL_DECL(gama)
+ISOM_BOX_IMPL_DECL(chrm)
+ISOM_BOX_IMPL_DECL(chan)
+
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 ISOM_BOX_IMPL_DECL(sidx)
@@ -619,9 +657,17 @@
 ISOM_BOX_IMPL_DECL(senc)
 ISOM_BOX_IMPL_DECL(cslg)
 ISOM_BOX_IMPL_DECL(ccst)
+ISOM_BOX_IMPL_DECL(auxi)
 ISOM_BOX_IMPL_DECL(hvcc)
+ISOM_BOX_IMPL_DECL(av1c)
+ISOM_BOX_IMPL_DECL(dOps)
 ISOM_BOX_IMPL_DECL(prft)
 
+//VPx
+ISOM_BOX_IMPL_DECL(vpcc)
+ISOM_BOX_IMPL_DECL(SmDm)
+ISOM_BOX_IMPL_DECL(CoLL)
+
 ISOM_BOX_IMPL_DECL(trep)
 
 //FEC
@@ -659,6 +705,10 @@
 ISOM_BOX_IMPL_DECL(trgr)
 ISOM_BOX_IMPL_DECL(trgt)
 
+/* MIAF declarations */
+ISOM_BOX_IMPL_DECL(clli)
+ISOM_BOX_IMPL_DECL(mdcv)
+
 ISOM_BOX_IMPL_DECL(grpl)
 
 ISOM_BOX_IMPL_DECL(strk)
@@ -673,29 +723,37 @@
 ISOM_BOX_IMPL_DECL(trik)
 ISOM_BOX_IMPL_DECL(bloc)
 ISOM_BOX_IMPL_DECL(ainf)
+ISOM_BOX_IMPL_DECL(mhac)
 
 ISOM_BOX_IMPL_DECL(grptype)
 
 
-#define BOX_DEFINE(__type, b_rad, __par) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 0, 0, __par, "p12" }
+/* Dolby Vision */
+ISOM_BOX_IMPL_DECL(dvcC)
+ISOM_BOX_IMPL_DECL(dvhe)
+
+
+
 
-#define BOX_DEFINE_S(__type, b_rad, __par, __spec) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 0, 0, __par, __spec }
+#define BOX_DEFINE(__type, b_rad, __par) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 0, 0, __par, "p12", GF_FALSE}
 
-#define FBOX_DEFINE(__type, b_rad, __par, __max_v) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 1+__max_v, 0, __par, "p12" }
+#define BOX_DEFINE_S(__type, b_rad, __par, __spec) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 0, 0, __par, __spec, GF_FALSE }
 
-#define FBOX_DEFINE_FLAGS(__type, b_rad, __par, __max_v, flags) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 1+__max_v, flags, __par, "p12" }
+#define FBOX_DEFINE(__type, b_rad, __par, __max_v) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 1+__max_v, 0, __par, "p12", GF_FALSE }
 
-#define FBOX_DEFINE_FLAGS_S(__type, b_rad, __par, __max_v, flags, __spec) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 1+__max_v, flags, __par, __spec }
+#define FBOX_DEFINE_FLAGS(__type, b_rad, __par, __max_v, flags) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 1+__max_v, flags, __par, "p12", GF_FALSE }
 
-#define FBOX_DEFINE_S(__type, b_rad, __par, __max_v, __spec) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 1+__max_v, 0, __par, __spec }
+#define FBOX_DEFINE_FLAGS_S(__type, b_rad, __par, __max_v, flags, __spec) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 1+__max_v, flags, __par, __spec, GF_FALSE }
 
-#define TREF_DEFINE(__type, b_rad, __par, __4cc, __spec) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, __4cc, 0, 0, __par, __spec }
+#define FBOX_DEFINE_S(__type, b_rad, __par, __max_v, __spec) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 1+__max_v, 0, __par, __spec, GF_FALSE }
 
-#define TRGT_DEFINE(__type, b_rad, __par, __4cc, max_version, __spec) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, __4cc, 1+max_version, 0, __par, __spec }
+#define TREF_DEFINE(__type, b_rad, __par, __4cc, __spec) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, __4cc, 0, 0, __par, __spec, GF_FALSE }
 
-#define SGPD_DEFINE(__type, b_rad, __par, __4cc, __spec) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, __4cc, 1, 0, __par, __spec }
+#define TRGT_DEFINE(__type, b_rad, __par, __4cc, max_version, __spec) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, __4cc, 1+max_version, 0, __par, __spec, GF_FALSE }
 
-static const struct box_registry_entry {
+#define SGPD_DEFINE(__type, b_rad, __par, __4cc, __spec) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, __4cc, 1, 0, __par, __spec, GF_FALSE }
+
+static struct box_registry_entry {
 	u32 box_4cc;
 	GF_Box * (*new_fn)();
 	void (*del_fn)(GF_Box *a);
@@ -708,6 +766,7 @@
 	u32 flags;
 	const char *parents_4cc;
 	const char *spec;
+	Bool disabled;
 } box_registry [] =
 {
 	//DO NOT MOVE THE FIRST ENTRY
@@ -751,8 +810,8 @@
 
 	//all item reference types
 	TREF_DEFINE( GF_ISOM_BOX_TYPE_REFI, ireftype, "iref", GF_ISOM_REF_TBAS, "p12"),
-	TREF_DEFINE( GF_ISOM_BOX_TYPE_REFI, ireftype, "iref", GF_4CC('i','l','o','c'), "p12" ),
-	TREF_DEFINE(GF_ISOM_BOX_TYPE_REFI, ireftype, "iref", GF_4CC('f','d','e','l'), "p12"),
+	TREF_DEFINE( GF_ISOM_BOX_TYPE_REFI, ireftype, "iref", GF_ISOM_REF_ILOC, "p12"),
+	TREF_DEFINE( GF_ISOM_BOX_TYPE_REFI, ireftype, "iref", GF_ISOM_REF_FDEL, "p12"),
 
 	//all sample group descriptions
 	SGPD_DEFINE( GF_ISOM_BOX_TYPE_SGPD, sgpd, "stbl traf", GF_ISOM_SAMPLE_GROUP_ROLL, "p12"),
@@ -779,6 +838,7 @@
 	SGPD_DEFINE( GF_ISOM_BOX_TYPE_SGPD, sgpd, "stbl traf", GF_ISOM_SAMPLE_GROUP_SYNC, "p15"),
 	SGPD_DEFINE( GF_ISOM_BOX_TYPE_SGPD, sgpd, "stbl traf", GF_ISOM_SAMPLE_GROUP_TSCL, "p15"),
 	SGPD_DEFINE( GF_ISOM_BOX_TYPE_SGPD, sgpd, "stbl traf", GF_ISOM_SAMPLE_GROUP_VIPR, "p15"),
+	SGPD_DEFINE( GF_ISOM_BOX_TYPE_SGPD, sgpd, "stbl traf", GF_ISOM_SAMPLE_GROUP_LBLI, "p15"),
 
 	SGPD_DEFINE( GF_ISOM_BOX_TYPE_SGPD, sgpd, "stbl traf", GF_ISOM_SAMPLE_GROUP_3GAG, "3gpp"),
 	SGPD_DEFINE( GF_ISOM_BOX_TYPE_SGPD, sgpd, "stbl traf", GF_ISOM_SAMPLE_GROUP_AVCB, "3gpp"),
@@ -787,7 +847,6 @@
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_GNRM, gnrm, "stsd", "unknown"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_GNRV, gnrv, "stsd", "unknown"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_GNRA, gnra, "stsd", "unknown"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_STSF, stsf, "stbl traf", "gpac"),
 
 	//all track group types
 	TRGT_DEFINE( GF_ISOM_BOX_TYPE_TRGT, trgt, "trgr", GF_ISOM_BOX_TYPE_MSRC, 0, "p12" ),
@@ -795,8 +854,8 @@
 	TRGT_DEFINE( GF_ISOM_BOX_TYPE_TRGT, trgt, "trgr", GF_ISOM_BOX_TYPE_CSTG, 0, "p15" ),
 
 	//part12 boxes
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_FREE, free, ""),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_SKIP, free, ""),
+	BOX_DEFINE( GF_ISOM_BOX_TYPE_FREE, free, "*"),
+	BOX_DEFINE( GF_ISOM_BOX_TYPE_SKIP, free, "*"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_MDAT, mdat, "file"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_IDAT, mdat, "meta"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_MOOV, moov, "file"),
@@ -809,7 +868,7 @@
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_STHD, nmhd, "minf", 0),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_STBL, stbl, "minf"),
 	BOX_DEFINE( 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_URL, url, "dref", 0, 1),
 	FBOX_DEFINE_FLAGS( GF_ISOM_BOX_TYPE_URN, urn, "dref", 0, 1),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_CPRT, cprt, "udta", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_KIND, kind, "udta", 0),
@@ -830,7 +889,7 @@
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_STCO, stco, "stbl", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_STSS, stss, "stbl", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_STDP, stdp, "stbl", 0),
-	FBOX_DEFINE( GF_ISOM_BOX_TYPE_SDTP, sdtp, "stbl", 0),
+	FBOX_DEFINE( GF_ISOM_BOX_TYPE_SDTP, sdtp, "stbl traf", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_CO64, co64, "stbl", 0),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_MINF, minf, "mdia"),
 	FBOX_DEFINE_FLAGS(GF_ISOM_BOX_TYPE_TKHD, tkhd, "trak", 1, 0x000001 | 0x000002 | 0x000004 | 0x000008),
@@ -850,7 +909,7 @@
 	FBOX_DEFINE_FLAGS( GF_ISOM_BOX_TYPE_SUBS, subs, "stbl traf", 0, 7), //warning flags are not used as a bit mask but as an enum!!
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_TRGR, trgr, "trak"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_FTYP, ftyp, "file"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_PADB, padb, "stbl"),
+	FBOX_DEFINE( GF_ISOM_BOX_TYPE_PADB, padb, "stbl", 0),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_BTRT, btrt, "sample_entry"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_PASP, pasp, "video_sample_entry ipco"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_CLAP, clap, "video_sample_entry ipco"),
@@ -897,9 +956,11 @@
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_SEGR, segr, "fiin"),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_GITN, gitn, "fiin", 0),
 
+#ifndef GPAC_DISABLE_ISOM_HINTING
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_FDSA, fdsa, "fdp_sample"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_FDPA, fdpa, "fdsa"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_EXTR, extr, "fdsa"),
+#endif
 
 	//full boxes todo
 	//FBOX_DEFINE( GF_ISOM_BOX_TYPE_ASSP, assp, 1),
@@ -977,7 +1038,7 @@
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MP4V, video_sample_entry, "stsd", "p14"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MP4A, audio_sample_entry, "stsd", "p14"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_M4DS, m4ds, "stsd", "p14"),
-	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_ESDS, esds, "mp4a mp4s mp4v encv enca encs resv", 0, "p14"),
+	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_ESDS, esds, "mp4a mp4s mp4v encv enca encs resv wave", 0, "p14"),
 
 	//part 15 boxes
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_AVCC, avcc, "avc1 avc2 avc3 avc4 encv resv ipco", "p15"),
@@ -999,6 +1060,28 @@
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_LHE1, video_sample_entry, "stsd", "p15"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_HVT1, video_sample_entry, "stsd", "p15"),
 
+	//mpegh 3D audio boxes
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MHA1, audio_sample_entry, "stsd", "mpegh3Daudio"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MHA2, audio_sample_entry, "stsd", "mpegh3Daudio"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MHM1, audio_sample_entry, "stsd", "mpegh3Daudio"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MHM2, audio_sample_entry, "stsd", "mpegh3Daudio"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MHAC, mhac, "mha1 mha2 mhm1 mhm2", "mpegh3Daudio"),
+
+	//AV1 in ISOBMFF boxes
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_AV01, video_sample_entry, "stsd", "av1"),
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_AV1C, av1c, "av01 encv resv ipco", "av1"),
+
+	// VP8-9 boxes
+	FBOX_DEFINE_FLAGS_S( GF_ISOM_BOX_TYPE_VPCC, vpcc, "vp08 vp09 encv resv", 1, 0, "vp"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_VP08, video_sample_entry, "stsd", "vp"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_VP09, video_sample_entry, "stsd", "vp"),
+	FBOX_DEFINE_FLAGS_S(GF_ISOM_BOX_TYPE_SMDM, SmDm, "vp08 vp09 encv resv", 1, 0, "vp"),
+	FBOX_DEFINE_FLAGS_S(GF_ISOM_BOX_TYPE_COLL, CoLL, "vp08 vp09 encv resv", 1, 0, "vp"),
+
+	//Opus in ISOBMFF boxes
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_OPUS, audio_sample_entry, "stsd", "Opus"),
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_DOPS, dOps, "Opus", "Opus"),
+		
 	//part20 boxes
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_LSR1, lsr1, "stsd", "p20"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_LSRC, lsrc, "lsr1", "p20"),
@@ -1006,7 +1089,7 @@
 	//part30 boxes
 #ifndef GPAC_DISABLE_TTXT
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_STXT, metx, "stsd"),
-	FBOX_DEFINE( GF_ISOM_BOX_TYPE_TXTC, txtc, "stxt", 0),
+	FBOX_DEFINE( GF_ISOM_BOX_TYPE_TXTC, txtc, "stxt mett sbtt", 0),
 #ifndef GPAC_DISABLE_VTT
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_WVTT, wvtt, "stsd", "p30"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_VTCC_CUE, vtcu, "vtt_sample", "p30"),
@@ -1026,18 +1109,23 @@
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_IPRP, iprp, "meta", "iff"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_IPCO, ipco, "iprp", "iff"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_ISPE, ispe, "ipco", 0, "iff"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_COLR, colr, "ipco mp4v jpeg avc1 avc2 avc3 avc4 svc1 svc2 hvc1 hev1 hvc2 hev2 lhv1 lhe1 encv resv", "iff"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_COLR, colr, "video_sample_entry ipco encv resv", "iff"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_PIXI, pixi, "ipco", 0, "iff"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_RLOC, rloc, "ipco", 0, "iff"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_IROT, irot, "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"),
+	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_AUXI, auxi, "sample_entry", 0, "iff"),
 	TRGT_DEFINE(GF_ISOM_BOX_TYPE_GRPT, grptype, "grpl", GF_ISOM_BOX_TYPE_ALTR, 0, "iff"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_AUXC, auxc, "ipco", 0, "iff"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_OINF, oinf, "ipco", 0, "iff"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_TOLS, tols, "ipco", 0, "iff"),
 
+	//MIAF
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_CLLI, clli, "mp4v jpeg avc1 avc2 avc3 avc4 svc1 svc2 hvc1 hev1 hvc2 hev2 lhv1 lhe1 encv resv", "miaf"),
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_MDCV, mdcv, "mp4v jpeg avc1 avc2 avc3 avc4 svc1 svc2 hvc1 hev1 hvc2 hev2 lhv1 lhe1 encv resv", "miaf"),
+
 	//other MPEG boxes
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_RVCC, rvcc, "avc1 avc2 avc3 avc4 svc1 svc2 hvc1 hev1 hvc2 hev2 lhv1 lhe1 encv resv", "rvc"),
 
@@ -1095,8 +1183,9 @@
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MP3, audio_sample_entry, "stsd", "apple"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_CHPL, chpl, "udta", 0, "apple"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_VOID, void, "", "apple"),
+	BOX_DEFINE_S(GF_QT_BOX_TYPE_WIDE, wide, "*", "apple"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_ILST, ilst, "meta", "apple"),
-	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_DATA, databox, "ilst", 0, "apple"),
+	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_DATA, databox, "ilst *", 0, "apple"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9NAM, ilst_item, "ilst data", "apple"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9CMT, ilst_item, "ilst data", "apple"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9DAY, ilst_item, "ilst data", "apple"),
@@ -1110,6 +1199,9 @@
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9DES, ilst_item, "ilst data", "apple"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9GEN, ilst_item, "ilst data", "apple"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9GRP, ilst_item, "ilst data", "apple"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_0xA9ENC, ilst_item, "ilst data", "apple"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_aART, ilst_item, "ilst data", "apple"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_PGAP, ilst_item, "ilst data", "apple"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_GNRE, ilst_item, "ilst data", "apple"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DISK, ilst_item, "ilst data", "apple"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_TRKN, ilst_item, "ilst data", "apple"),
@@ -1117,12 +1209,60 @@
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_CPIL, ilst_item, "ilst data", "apple"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_COVR, ilst_item, "ilst data", "apple"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_iTunesSpecificInfo, ilst_item, "ilst data", "apple"),
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_GMHD, def_cont_box, "minf", "apple"),
+	BOX_DEFINE_S(GF_QT_BOX_TYPE_TAPT, def_cont_box, "trak", "apple"),
+	FBOX_DEFINE_S( GF_QT_BOX_TYPE_GMIN, gmin, "gmhd", 0, "apple"),
+	FBOX_DEFINE_FLAGS_S( GF_QT_BOX_TYPE_ALIS, alis, "dref", 0, 1, "apple"),
+	FBOX_DEFINE_S( GF_QT_BOX_TYPE_CLEF, clef, "tapt", 0, "apple"),
+	FBOX_DEFINE_S( GF_QT_BOX_TYPE_PROF, clef, "tapt", 0, "apple"),
+	FBOX_DEFINE_S( GF_QT_BOX_TYPE_ENOF, clef, "tapt", 0, "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_WAVE, def_cont_box, "audio_sample_entry", "apple"),
+	FBOX_DEFINE_S( GF_QT_BOX_TYPE_CHAN, chan, "audio_sample_entry", 0, "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_FRMA, frma, "wave", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_TERMINATOR, unkn, "wave", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_ENDA, chrm, "wave", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_TMCD, def_cont_box, "gmhd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_NAME, unkn, "tmcd", "apple"),
+	FBOX_DEFINE_S( GF_QT_BOX_TYPE_TCMI, tcmi, "tmcd", 0, "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_FIEL, fiel, "video_sample_entry", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_GAMA, gama, "video_sample_entry", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_CHRM, chrm, "video_sample_entry", "apple"),
+	BOX_DEFINE_S( GF_ISOM_SUBTYPE_TEXT, unkn, "gmhd", "apple"),
+
+	//QT and prores sample entry types
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_TMCD, tmcd, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_C608, gen_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_APCH, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_APCO, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_APCS, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_APCF, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_APCN, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AP4X, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AP4H, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_RAW, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_TWOS, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_SOWT, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_FL32, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_FL64, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_IN24, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_IN32, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_ULAW, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_ALAW, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_ADPCM, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_IMA_ADPCM, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_DVCA, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_QDMC, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_QDMC2, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_QCELP, audio_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_kMP3, audio_sample_entry, "stsd", "apple"),
 
 	//dolby boxes
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_AC3, audio_sample_entry, "stsd", "dolby"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_EC3, audio_sample_entry, "stsd", "dolby"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DAC3, dac3, "ac-3", "dolby"),
 	{GF_ISOM_BOX_TYPE_DEC3, dec3_New, dac3_del, dac3_Read, dac3_Write, dac3_Size, dac3_dump, 0, 0, 0, "ec-3", "dolby" },
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_DVCC, dvcC, "dvhe dvav dva1 dvh1 avc1 avc2 avc3 avc4 hev1 encv resv", "DolbyVision"),
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_DVHE, video_sample_entry, "stsd", "DolbyVision"),
 
 	//Adobe boxes
 #ifndef GPAC_DISABLE_ISOM_ADOBE
@@ -1152,15 +1292,38 @@
 	BOX_DEFINE_S(GF_ISOM_BOX_UUID_PSSH, piff_pssh, "moov moof", "smooth"),
 	BOX_DEFINE_S(GF_ISOM_BOX_UUID_TFXD, tfxd, "traf", "smooth"),
 	BOX_DEFINE_S(GF_ISOM_BOX_UUID_MSSM, uuid, "file", "smooth"),
-	BOX_DEFINE_S(GF_ISOM_BOX_UUID_TFRF, uuid, "traf", "smooth")
+	BOX_DEFINE_S(GF_ISOM_BOX_UUID_TFRF, uuid, "traf", "smooth"),
+
+	/* Image tracks */
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_JPEG, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_JP2K, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_PNG, video_sample_entry, "stsd", "apple")
 };
 
+Bool gf_box_valid_in_parent(GF_Box *a, const char *parent_4cc)
+{
+	if (!a || !a->registry || !a->registry->parents_4cc) return GF_FALSE;
+	if (strstr(a->registry->parents_4cc, parent_4cc) != NULL) return GF_TRUE;
+	return GF_FALSE;
+}
+
 GF_EXPORT
 u32 gf_isom_get_num_supported_boxes()
 {
 	return sizeof(box_registry) / sizeof(struct box_registry_entry);
 }
 
+void gf_isom_registry_disable(u32 boxCode, Bool disable)
+{
+	u32 i=0, count = gf_isom_get_num_supported_boxes();
+	for (i=1; i<count; i++) {
+		if (box_registry[i].box_4cc==boxCode) {
+			box_registry[i].disabled = disable;
+			return;
+		}
+	}
+}
+
 static u32 get_box_reg_idx(u32 boxCode, u32 parent_type)
 {
 	u32 i=0, count = gf_isom_get_num_supported_boxes();
@@ -1170,27 +1333,64 @@
 		if (box_registry[i].box_4cc==boxCode) {
 			if (!parent_type) return i;
 			if (strstr(box_registry[i].parents_4cc, parent_name) != NULL) return i;
+
+			if (strstr(box_registry[i].parents_4cc, "sample_entry") != NULL) {
+				u32 j = get_box_reg_idx(parent_type, 0);
+				if (box_registry[j].parents_4cc && (strstr(box_registry[j].parents_4cc, "stsd") != NULL))
+					return i;
+			}
 		}
 	}
 	return 0;
 }
 
-GF_Box *gf_isom_box_new_ex(u32 boxType, u32 parentType)
+GF_Box *gf_isom_box_new_ex(u32 boxType, u32 parentType, Bool skip_logs, Bool is_root_box)
 {
 	GF_Box *a;
 	s32 idx = get_box_reg_idx(boxType, parentType);
 	if (idx==0) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Unknown box type %s\n", gf_4cc_to_str(boxType) ));
-		a = unkn_New(boxType);
-		if (a) a->registry = &box_registry[idx];
+#ifndef GPAC_DISABLE_LOGS
+		if (!skip_logs && (boxType != GF_ISOM_BOX_TYPE_UNKNOWN)) {
+			switch (parentType) {
+			case GF_ISOM_BOX_TYPE_ILST:
+			case GF_ISOM_BOX_TYPE_META:
+			case GF_ISOM_BOX_TYPE_UDTA:
+			case GF_ISOM_BOX_TYPE_UNKNOWN:
+				break;
+			default:
+				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 szName[10];
+					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));
+				} else {
+					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[iso file] Unknown box type %s\n", gf_4cc_to_str(boxType)));
+				}
+				break;
+			}
+		}
+#endif
+ if (boxType==GF_ISOM_BOX_TYPE_UUID) {
+ a = uuid_New();
+ if (a) a->registry = &box_registry[1];
+ } else {
+ a = unkn_New();
+ ((GF_UnknownBox *)a)->original_4cc = boxType;
+ if (a) a->registry = &box_registry[0];
+ }
 		return a;
 	}
 	a = box_registry[idx].new_fn();
 
 	if (a) {
-		if (a->type!=GF_ISOM_BOX_TYPE_UUID)
-			a->type = boxType;
-
+		if (a->type!=GF_ISOM_BOX_TYPE_UUID) {
+			if (a->type==GF_ISOM_BOX_TYPE_UNKNOWN) {
+				((GF_UnknownBox *)a)->original_4cc = boxType;
+			} else {
+				a->type = boxType;
+			}
+		}
 		a->registry = &box_registry[idx];
 	}
 	return a;
@@ -1199,12 +1399,12 @@
 GF_EXPORT
 GF_Box *gf_isom_box_new(u32 boxType)
 {
-	return gf_isom_box_new_ex(boxType, 0);
+	return gf_isom_box_new_ex(boxType, 0, 0, GF_FALSE);
 }
 
 void gf_isom_box_add_for_dump_mode(GF_Box *parent, GF_Box *a)
 {
-	if (use_dump_mode && (!parent->other_boxes || (gf_list_find(parent->other_boxes, a)<0) ) )
+	if (use_dump_mode && a && (!parent->other_boxes || (gf_list_find(parent->other_boxes, a)<0) ) )
 		gf_isom_box_add_default(parent, a);
 }
 
@@ -1212,6 +1412,8 @@
 {
 	GF_Err e;
 	GF_Box *a = NULL;
+	Bool skip_logs = gf_bs_get_cookie(bs) ? GF_TRUE : GF_FALSE;
+
 	//we may have terminators in some QT files (4 bytes set to 0 ...)
 	while (parent->size>=8) {
 		e = gf_isom_box_parse_ex(&a, bs, parent_type, GF_FALSE);
@@ -1223,7 +1425,9 @@
 		if (!a) return GF_OK;
 
 		if (parent->size < a->size) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" is larger than container box\n", gf_4cc_to_str(a->type)));
+			if (!skip_logs) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" is larger than container box\n", gf_4cc_to_str(a->type)));
+			}
 			parent->size = 0;
 		} else {
 			parent->size -= a->size;
@@ -1237,6 +1441,8 @@
 				parent_code = gf_4cc_to_str( ((GF_UnknownBox*)parent)->original_4cc );
 			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, " *")) {
+				parent_OK = GF_TRUE;
 			} else {
 				//parent must be a sample entry
 				if (strstr(a->registry->parents_4cc, "sample_entry") !=	NULL) {
@@ -1255,7 +1461,7 @@
 				else if (a->type==GF_ISOM_BOX_TYPE_UNKNOWN) parent_OK = GF_TRUE;
 				else if (a->type==GF_ISOM_BOX_TYPE_UUID) parent_OK = GF_TRUE;
 			}
-			if (! parent_OK) {
+			if (! parent_OK && !skip_logs) {
 				char szName[5];
 				strcpy(szName, parent_code);
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" is invalid in container %s\n", gf_4cc_to_str(a->type), szName));
@@ -1281,7 +1487,6 @@
 		a->other_boxes = gf_list_new();
 		if (!a->other_boxes) return GF_OUT_OF_MEM;
 	}
-	assert(subbox->type);
 	return gf_list_add(a->other_boxes, subbox);
 }
 
@@ -1291,7 +1496,7 @@
 	GF_List *other_boxes;
 	if (!a) return;
 	if (skip_box_dump_del) return;
-assert(a->type);
+
 	other_boxes	= a->other_boxes;
 	a->other_boxes = NULL;
 
@@ -1338,12 +1543,24 @@
 GF_EXPORT
 GF_Err gf_isom_box_write(GF_Box *a, GF_BitStream *bs)
 {
-	GF_Err e = gf_isom_box_write_listing(a, bs);
+	GF_Err e;
+	u64 pos = gf_bs_get_position(bs);
+	if (!a) return GF_BAD_PARAM;
+	if (a->registry->disabled) return GF_OK;
+	e = gf_isom_box_write_listing(a, bs);
 	if (e) return e;
 	if (a->other_boxes) {
-		return gf_isom_box_array_write(a, a->other_boxes, bs);
+		e = gf_isom_box_array_write(a, a->other_boxes, bs);
 	}
-	return GF_OK;
+	pos = gf_bs_get_position(bs) - pos;
+	if (pos != a->size) {
+		if ((a->type==GF_ISOM_BOX_TYPE_MDAT) || (a->type==GF_ISOM_BOX_TYPE_IDAT)) {
+
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box %s wrote "LLU" bytes but size is "LLU"\n", gf_4cc_to_str(a->type), pos, a->size ));
+		}
+	}
+	return e;
 }
 
 static GF_Err gf_isom_box_size_listing(GF_Box *a)
@@ -1369,7 +1586,12 @@
 GF_EXPORT
 GF_Err gf_isom_box_size(GF_Box *a)
 {
-	GF_Err e = gf_isom_box_size_listing(a);
+	GF_Err e;
+	if (a->registry->disabled) {
+		a->size = 0;
+		return GF_OK;
+	}
+	e = gf_isom_box_size_listing(a);
 	if (e) return e;
 	if (a->other_boxes) {
 		e = gf_isom_box_array_size(a, a->other_boxes);
@@ -1466,7 +1688,12 @@
 	} else {
 		fprintf(trace, "Size=\"%u\" ", (u32) a->size);
 	}
-	fprintf(trace, "Type=\"%s\" ", gf_4cc_to_str(a->type));
+	if (a->type==GF_ISOM_BOX_TYPE_UNKNOWN) {
+		fprintf(trace, "Type=\"%s\" ", gf_4cc_to_str(((GF_UnknownBox*)a)->original_4cc));
+	} else {
+		fprintf(trace, "Type=\"%s\" ", gf_4cc_to_str(a->type));
+	}
+
 	if (a->type == GF_ISOM_BOX_TYPE_UUID) {
 		u32 i;
 		fprintf(trace, "UUID=\"{");
@@ -1480,7 +1707,7 @@
 	if (a->registry->max_version_plus_one) {
 		fprintf(trace, "Version=\"%d\" Flags=\"%d\" ", ((GF_FullBox*)a)->version,((GF_FullBox*)a)->flags);
 	}
-	
+
 	fprintf(trace, "Specification=\"%s\" ", a->registry->spec);
 	fprintf(trace, "Container=\"%s\" ", a->registry->parents_4cc);
 	//disable all box dumping until end of this box
@@ -1527,6 +1754,7 @@
 {
 	if (!s || !s->registry) return GF_FALSE;
 	if (strstr(s->registry->parents_4cc, "file")!= NULL) return GF_TRUE;
+	if (strstr(s->registry->parents_4cc, "*")!= NULL) return GF_TRUE;
 	return GF_FALSE;
 }
 #endif

gpac-0.7.1.tar.gz/src/isomedia/data_map.c -> gpac-0.8.0.tar.gz/src/isomedia/data_map.c Changed

@@ -55,13 +55,15 @@
 	switch (ptr->type) {
 	//file-based
 	case GF_ISOM_DATA_FILE:
+	case GF_ISOM_DATA_MEM:
 		gf_isom_fdm_del((GF_FileDataMap *)ptr);
 		break;
 	case GF_ISOM_DATA_FILE_MAPPING:
 		gf_isom_fmo_del((GF_FileMappingDataMap *)ptr);
 		break;
-	//not implemented
 	default:
+		if (ptr->bs) gf_bs_del(ptr->bs);
+		gf_free(ptr);
 		break;
 	}
 }
@@ -122,8 +124,11 @@
 
 	//if nothing specified, this is a MEMORY data map
 	if (!location) {
-		//not supported yet
-		return GF_NOT_SUPPORTED;
+		*outDataMap = gf_isom_fdm_new(location, GF_ISOM_DATA_MAP_WRITE);
+		if (!(*outDataMap)) {
+			return GF_IO_ERR;
+		}
+		return GF_OK;
 	}
 	//we need a temp file ...
 	if (!strcmp(location, "mp4_tmp_edit")) {
@@ -271,6 +276,7 @@
 
 	switch (map->type) {
 	case GF_ISOM_DATA_FILE:
+	case GF_ISOM_DATA_MEM:
 		return gf_isom_fdm_get_data((GF_FileDataMap *)map, buffer, bufferLength, Offset);
 
 	case GF_ISOM_DATA_FILE_MAPPING:
@@ -285,7 +291,7 @@
 {
 	if (!map) return;
 
-	if (map->type==GF_ISOM_DATA_FILE) {
+	if (map->type == GF_ISOM_DATA_FILE || map->type == GF_ISOM_DATA_MEM) {
 		GF_FileDataMap *fdm = (GF_FileDataMap *)map;
 		gf_bs_flush(fdm->bs);
 	}
@@ -303,7 +309,8 @@
 	switch (map->type) {
 	case GF_ISOM_DATA_FILE:
 		return FDM_GetTotalOffset((GF_FileDataMap *)map);
-
+	case GF_ISOM_DATA_MEM:
+		return gf_bs_get_position(map->bs);
 	default:
 		return 0;
 	}
@@ -316,6 +323,7 @@
 
 	switch (ptr->type) {
 	case GF_ISOM_DATA_FILE:
+	case GF_ISOM_DATA_MEM:
 		return FDM_AddData((GF_FileDataMap *)ptr, data, dataSize);
 	default:
 		return GF_NOT_SUPPORTED;
@@ -373,9 +381,19 @@
 	GF_SAFEALLOC(tmp, GF_FileDataMap);
 	if (!tmp) return NULL;
 
-	tmp->type = GF_ISOM_DATA_FILE;
 	tmp->mode = mode;
 
+	if (sPath == NULL) {
+		tmp->type = GF_ISOM_DATA_MEM;
+		tmp->bs = gf_bs_new (NULL, 0, GF_BITSTREAM_WRITE);
+		if (!tmp->bs) {
+			gf_free(tmp);
+			return NULL;
+		}
+		return (GF_DataMap *)tmp;
+	}
+
+	tmp->type = GF_ISOM_DATA_FILE;
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	//open a temp file
 	if (!strcmp(sPath, "mp4_tmp_edit")) {
@@ -446,7 +464,7 @@
 
 void gf_isom_fdm_del(GF_FileDataMap *ptr)
 {
-	if (!ptr || (ptr->type != GF_ISOM_DATA_FILE)) return;
+	if (!ptr || (ptr->type != GF_ISOM_DATA_FILE && ptr->type != GF_ISOM_DATA_MEM)) return;
 	if (ptr->bs) gf_bs_del(ptr->bs);
 	if (ptr->stream && !ptr->is_stdout)
 		gf_fclose(ptr->stream);
@@ -460,8 +478,6 @@
 	gf_free(ptr);
 }
 
-
-
 u32 gf_isom_fdm_get_data(GF_FileDataMap *ptr, char *buffer, u32 bufferLength, u64 fileOffset)
 {
 	u32 bytesRead;
@@ -497,7 +513,6 @@
 }
 
 
-
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
@@ -510,8 +525,6 @@
 	return gf_bs_get_size(ptr->bs);
 }
 
-
-
 GF_Err FDM_AddData(GF_FileDataMap *ptr, char *data, u32 dataSize)
 {
 	u32 ret;
@@ -645,12 +658,16 @@
 
 #else
 
-GF_DataMap *gf_isom_fmo_new(const char *sPath, u8 mode) {
+GF_DataMap *gf_isom_fmo_new(const char *sPath, u8 mode)
+{
 	return gf_isom_fdm_new(sPath, mode);
 }
-void gf_isom_fmo_del(GF_FileMappingDataMap *ptr) {
+
+void gf_isom_fmo_del(GF_FileMappingDataMap *ptr)
+{
 	gf_isom_fdm_del((GF_FileDataMap *)ptr);
 }
+
 u32 gf_isom_fmo_get_data(GF_FileMappingDataMap *ptr, char *buffer, u32 bufferLength, u64 fileOffset)
 {
 	return gf_isom_fdm_get_data((GF_FileDataMap *)ptr, buffer, bufferLength, fileOffset);

gpac-0.7.1.tar.gz/src/isomedia/drm_sample.c -> gpac-0.8.0.tar.gz/src/isomedia/drm_sample.c Changed

@@ -162,7 +162,7 @@
 		return gf_isom_ismacryp_sample_from_data(samp->data, samp->dataLength, sinf->info->isfm->selective_encryption, sinf->info->isfm->key_indicator_length, sinf->info->isfm->IV_length);
 	}
 	/*OMA*/
-	else if (sinf->scheme_type->scheme_type == GF_4CC('o','d','k','m') ) {
+	else if (sinf->scheme_type->scheme_type == GF_ISOM_OMADRM_SCHEME ) {
 		if (!sinf->info->odkm) return NULL;
 		fmt = sinf->info->odkm->fmt;
 
@@ -190,6 +190,7 @@
 
 	/*non-encrypted or non-ISMA*/
 	if (!sinf || !sinf->scheme_type) return 0;
+	if (sinf->scheme_type->scheme_type == GF_4CC('p','i','f','f')) return GF_4CC('c','e','n','c');
 	return sinf->scheme_type->scheme_type;
 }
 
@@ -316,6 +317,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
+GF_EXPORT
 GF_Err gf_isom_remove_track_protection(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex)
 {
 	GF_TrackBox *trak;
@@ -342,8 +344,10 @@
 	sea->type = sinf->original_format->data_format;
 	gf_isom_box_array_del(sea->protections);
 	sea->protections = gf_list_new();
-	if (sea->type == GF_4CC('2','6','4','b')) sea->type = GF_ISOM_BOX_TYPE_AVC1;
-	if (sea->type == GF_4CC('2','6','5','b')) sea->type = GF_ISOM_BOX_TYPE_HVC1;
+	if (sea->type == GF_ISOM_BOX_TYPE_264B) sea->type = GF_ISOM_BOX_TYPE_AVC1;
+	if (sea->type == GF_ISOM_BOX_TYPE_265B) sea->type = GF_ISOM_BOX_TYPE_HVC1;
+	if (sea->type == GF_ISOM_BOX_TYPE_AV1B) sea->type = GF_ISOM_BOX_TYPE_AV01;
+	if (sea->type == GF_ISOM_BOX_TYPE_VP9B) sea->type = GF_ISOM_BOX_TYPE_VP09;
 	return GF_OK;
 }
 
@@ -415,7 +419,7 @@
 	case GF_ISOM_BOX_TYPE_SVC1:
 	case GF_ISOM_BOX_TYPE_MVC1:
 		if (is_isma)
-			original_format = GF_4CC('2','6','4','b');
+			original_format = GF_ISOM_BOX_TYPE_264B;
 		sea->type = GF_ISOM_BOX_TYPE_ENCV;
 		break;
 	case GF_ISOM_BOX_TYPE_HVC1:
@@ -426,7 +430,17 @@
 	case GF_ISOM_BOX_TYPE_LHV1:
 	case GF_ISOM_BOX_TYPE_HVT1:
 		if (is_isma)
-			original_format = GF_4CC('2','6','5','b');
+			original_format = GF_ISOM_BOX_TYPE_265B;
+		sea->type = GF_ISOM_BOX_TYPE_ENCV;
+		break;
+	case GF_ISOM_BOX_TYPE_VP09:
+		if (is_isma)
+			original_format = GF_ISOM_BOX_TYPE_VP9B;
+		sea->type = GF_ISOM_BOX_TYPE_ENCV;
+		break;
+	case GF_ISOM_BOX_TYPE_AV01:
+		if (is_isma)
+			original_format = GF_ISOM_BOX_TYPE_AV1B;
 		sea->type = GF_ISOM_BOX_TYPE_ENCV;
 		break;
 	case GF_ISOM_BOX_TYPE_MP4S:
@@ -438,6 +452,14 @@
 	case GF_ISOM_BOX_TYPE_STPP:
 		sea->type = GF_ISOM_BOX_TYPE_ENCT;
 		break;
+	case GF_ISOM_BOX_TYPE_ENCA:
+	case GF_ISOM_BOX_TYPE_ENCV:
+	case GF_ISOM_BOX_TYPE_ENCT:
+	case GF_ISOM_BOX_TYPE_ENCM:
+	case GF_ISOM_BOX_TYPE_ENCF:
+	case GF_ISOM_BOX_TYPE_ENCS:
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] cannot set protection entry: file is already encrypted.\n"));
+		return GF_BAD_PARAM;
 	default:
 		return GF_BAD_PARAM;
 	}
@@ -465,6 +487,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_set_ismacryp_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u32 scheme_type,
 u32 scheme_version, char *scheme_uri, char *kms_URI,
 Bool selective_encryption, u32 KI_length, u32 IV_length)
@@ -537,7 +560,7 @@
 	if (!sea) return GF_BAD_PARAM;
 
 	sinf = (GF_ProtectionSchemeInfoBox*)gf_list_get(sea->protections, 0);
-	if (outOriginalFormat && sinf->original_format) {
+	if (outOriginalFormat && sinf && sinf->original_format) {
 		*outOriginalFormat = sinf->original_format->data_format;
 	}
 	return GF_OK;
@@ -554,7 +577,7 @@
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_FALSE;
 
-	if (trak->sample_encryption) return GF_TRUE;
+//	if (trak->sample_encryption) return GF_TRUE;
 
 	sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CENC_SCHEME, NULL);
 	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CBC_SCHEME, NULL);
@@ -564,7 +587,7 @@
 	if (!sinf) return GF_FALSE;
 
 	/*non-encrypted or non-CENC*/
-	if (!sinf->info || !sinf->info->tenc)
+	if (!sinf->info || !sinf->info->tenc || !sinf->scheme_type)
 		return GF_FALSE;
 
 	//TODO: validate the fields in tenc for each scheme type
@@ -608,7 +631,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_IV_size,	bin128 default_KID, 
+ u32 scheme_version, u32 default_IsEncrypted, u8 default_IV_size,	bin128 default_KID,
 								 u8 default_crypt_byte_block, u8 default_skip_byte_block,
 								 u8 default_constant_IV_size, bin128 default_constant_IV)
 {
@@ -649,7 +672,7 @@
 		return GF_BAD_PARAM;
 
 	saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SAIO);
-	saio->aux_info_type = GF_4CC('c', 'e', 'n', 'c');
+	saio->aux_info_type = GF_ISOM_CENC_SCHEME;
 	saio->aux_info_type_parameter = 0;
 
 	if (!stbl->sai_offsets) stbl->sai_offsets = gf_list_new();
@@ -672,8 +695,16 @@
 
 	for (i = 0; i < gf_list_count(stbl->sai_sizes); i++) {
 		GF_SampleAuxiliaryInfoSizeBox *saiz = (GF_SampleAuxiliaryInfoSizeBox *)gf_list_get(stbl->sai_sizes, i);
-		if (saiz->aux_info_type != GF_4CC('c', 'e', 'n', 'c'))
+		switch (saiz->aux_info_type) {
+		case GF_ISOM_CENC_SCHEME:
+		case GF_ISOM_CENS_SCHEME:
+		case GF_ISOM_CBC_SCHEME:
+		case GF_ISOM_CBCS_SCHEME:
+		case 0:
+			break;
+		default:
 			continue;
+		}
 		gf_isom_box_del((GF_Box *)saiz);
 		gf_list_rem(stbl->sai_sizes, i);
 		i--;
@@ -700,8 +731,16 @@
 
 	for (i = 0; i < gf_list_count(stbl->sai_offsets); i++) {
 		GF_SampleAuxiliaryInfoOffsetBox *saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_list_get(stbl->sai_offsets, i);
-		if (saio->aux_info_type != GF_4CC('c', 'e', 'n', 'c'))
+		switch (saio->aux_info_type) {
+		case GF_ISOM_CENC_SCHEME:
+		case GF_ISOM_CENS_SCHEME:
+		case GF_ISOM_CBC_SCHEME:
+		case GF_ISOM_CBCS_SCHEME:
+		case 0:
+			break;
+		default:
 			continue;
+		}
 		gf_isom_box_del((GF_Box *)saio);
 		gf_list_rem(stbl->sai_offsets, i);
 		i--;
@@ -771,7 +810,19 @@
 		gf_list_del(stbl->other_boxes);
 		stbl->other_boxes = NULL;
 	}
-
+	for (i = 0; i < gf_list_count(trak->other_boxes); i++) {
+		GF_Box *a = (GF_Box *)gf_list_get(trak->other_boxes, i);
+		if ((a->type ==GF_ISOM_BOX_TYPE_UUID) && (((GF_UUIDBox *)a)->internal_4cc == GF_ISOM_BOX_UUID_PSEC)) {
+			gf_isom_box_del(a);
+			gf_list_rem(trak->other_boxes, i);
+			i--;
+		}
+		else if (a->type == GF_ISOM_BOX_TYPE_SENC) {
+			gf_isom_box_del(a);
+			gf_list_rem(trak->other_boxes, i);
+			i--;
+		}
+	}
 	return GF_OK;
 }
 
@@ -787,7 +838,7 @@
 
 	for (i = 0; i < gf_list_count(stbl->sampleGroupsDescription); i++) {
 		GF_SampleGroupDescriptionBox *a = (GF_SampleGroupDescriptionBox *)gf_list_get(stbl->sampleGroupsDescription, i);
-		if (a->grouping_type == GF_4CC( 's', 'e', 'i', 'g' )) {
+		if (a->grouping_type == GF_ISOM_SAMPLE_GROUP_SEIG) {
 			gf_list_rem(stbl->sampleGroupsDescription, i);
 			gf_isom_box_del((GF_Box *) a);
 			i--;
@@ -800,7 +851,7 @@
 
 	for (i = 0; i < gf_list_count(stbl->sampleGroups); i++) {
 		GF_SampleGroupBox *a = (GF_SampleGroupBox *)gf_list_get(stbl->sampleGroups, i);
-		if (a->grouping_type == GF_4CC( 's', 'e', 'i', 'g' )) {
+		if (a->grouping_type == GF_ISOM_SAMPLE_GROUP_SEIG) {
 			gf_list_rem(stbl->sampleGroups, i);
 			gf_isom_box_del((GF_Box *) a);
 			i--;
@@ -819,7 +870,7 @@
 	u32 i;
 	for (i = 0; i < gf_list_count(the_file->moov->other_boxes); i++) {
 		GF_Box *a = (GF_Box *)gf_list_get(the_file->moov->other_boxes, i);
-		if (a->type == GF_4CC('p', 's', 's', 'h')) {
+		if ((a->type == GF_ISOM_BOX_UUID_PSSH) || (a->type == GF_ISOM_BOX_TYPE_PSSH)) {
 			gf_list_rem(the_file->moov->other_boxes, i);
 			gf_isom_box_del(a);
 			i--;
@@ -896,7 +947,8 @@
 	u32 i;
 	if (!senc->cenc_saiz) {
 		senc->cenc_saiz = (GF_SampleAuxiliaryInfoSizeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SAIZ);
-		senc->cenc_saiz->aux_info_type = GF_4CC('c', 'e', 'n', 'c');
+		//as per 3rd edition of cenc "so content SHOULD be created omitting these optional fields" ...
+		senc->cenc_saiz->aux_info_type = 0;
 		senc->cenc_saiz->aux_info_type_parameter = 0;
 		if (stbl)
 			stbl_AddBox((GF_Box*)stbl, (GF_Box *)senc->cenc_saiz);
@@ -907,7 +959,8 @@
 		senc->cenc_saio = (GF_SampleAuxiliaryInfoOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SAIO);
 		//force using version 1 for saio box, it could be redundant when we use 64 bits for offset
 		senc->cenc_saio->version = 1;
-		senc->cenc_saio->aux_info_type = GF_4CC('c', 'e', 'n', 'c');
+		//as per 3rd edition of cenc "so content SHOULD be created omitting these optional fields" ...
+		senc->cenc_saio->aux_info_type = 0;
 		senc->cenc_saio->aux_info_type_parameter = 0;
 		senc->cenc_saio->entry_count = 1;
 		if (stbl)
@@ -937,7 +990,7 @@
 	u32 i;
 	if (!senc->cenc_saiz) {
 		senc->cenc_saiz = (GF_SampleAuxiliaryInfoSizeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SAIZ);
-		senc->cenc_saiz->aux_info_type = GF_4CC('c', 'e', 'n', 'c');
+		senc->cenc_saiz->aux_info_type = GF_ISOM_CENC_SCHEME;
 		senc->cenc_saiz->aux_info_type_parameter = 0;
 		if (stbl)
 			stbl_AddBox((GF_Box*)stbl, (GF_Box *)senc->cenc_saiz);
@@ -946,7 +999,7 @@
 		senc->cenc_saio = (GF_SampleAuxiliaryInfoOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SAIO);
 		//force using version 1 for saio box, it could be redundant when we use 64 bits for offset
 		senc->cenc_saio->version = 1;
-		senc->cenc_saio->aux_info_type = GF_4CC('c', 'e', 'n', 'c');
+		senc->cenc_saio->aux_info_type = GF_ISOM_CENC_SCHEME;
 		senc->cenc_saio->aux_info_type_parameter = 0;
 		if (stbl)
 			stbl_AddBox((GF_Box*)stbl, (GF_Box *)senc->cenc_saio);
@@ -979,7 +1032,7 @@
 }
 #endif /* GPAC_DISABLE_ISOM_FRAGMENTS */
 
-GF_Err gf_isom_track_cenc_add_sample_info(GF_ISOFile *the_file, u32 trackNumber, u32 container_type, u8 IV_size, char *buf, u32 len)
+GF_Err gf_isom_track_cenc_add_sample_info(GF_ISOFile *the_file, u32 trackNumber, u32 container_type, u8 IV_size, char *buf, u32 len, Bool use_subsamples, char *clear_IV)
 {
 	u32 i;
 	GF_SampleEncryptionBox *senc;
@@ -999,22 +1052,48 @@
 		return GF_NOT_SUPPORTED;
 	}
 
-
 	sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
 	if (!sai) return GF_OUT_OF_MEM;
+
 	memset(sai, 0, sizeof(GF_CENCSampleAuxInfo));
-	if (len) {
+	if (len && buf) {
 		GF_BitStream *bs = gf_bs_new(buf, len, GF_BITSTREAM_READ);
 		sai->IV_size = IV_size;
 		gf_bs_read_data(bs, (char *)sai->IV, IV_size);
-		sai->subsample_count = gf_bs_read_u16(bs);
-		if (sai->subsample_count) senc->flags = 0x00000002;
-		sai->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sai->subsample_count*sizeof(GF_CENCSubSampleEntry));
-		for (i = 0; i < sai->subsample_count; i++) {
-			sai->subsamples[i].bytes_clear_data = gf_bs_read_u16(bs);
-			sai->subsamples[i].bytes_encrypted_data = gf_bs_read_u32(bs);
+		if (use_subsamples) {
+			sai->subsample_count = gf_bs_read_u16(bs);
+			if (sai->subsample_count) senc->flags = 0x00000002;
+			sai->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sai->subsample_count*sizeof(GF_CENCSubSampleEntry));
+			for (i = 0; i < sai->subsample_count; i++) {
+				sai->subsamples[i].bytes_clear_data = gf_bs_read_u16(bs);
+				sai->subsamples[i].bytes_encrypted_data = gf_bs_read_u32(bs);
+			}
 		}
 		gf_bs_del(bs);
+	} else if (len) {
+		u32 olen = len;
+		sai->IV_size = IV_size;
+		if (clear_IV) memcpy(sai->IV, clear_IV, sizeof(bin128));
+		if (use_subsamples) {
+			sai->subsample_count = 1;
+			if (sai->subsample_count) senc->flags = 0x00000002;
+			while (olen>0xFFFF) {
+				olen -= 0xFFFF;
+				sai->subsample_count ++;
+			}
+			sai->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sai->subsample_count*sizeof(GF_CENCSubSampleEntry));
+			olen = len;
+			for (i = 0; i < sai->subsample_count; i++) {
+				if (olen<0xFFFF) {
+					sai->subsamples[i].bytes_clear_data = olen;
+				} else {
+					sai->subsamples[i].bytes_clear_data = 0xFFFF;
+					olen -= 0xFFFF;
+				}
+				sai->subsamples[i].bytes_encrypted_data = 0;
+			}
+		}
+		len = IV_size + 2 + 6*sai->subsample_count;
 	}
 
 	gf_list_add(senc->samp_aux_info, sai);
@@ -1034,9 +1113,9 @@
 	gf_free(samp);
 }
 
-Bool gf_isom_cenc_has_saiz_saio_full(GF_SampleTableBox *stbl, void *_traf)
+Bool gf_isom_cenc_has_saiz_saio_full(GF_SampleTableBox *stbl, void *_traf, u32 scheme_type)
 {
-	u32 i;
+	u32 i, c1, c2;
 	GF_List *sai_sizes, *sai_offsets;
 	Bool has_saiz, has_saio;
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
@@ -1057,39 +1136,63 @@
 	else
 		return GF_FALSE;
 
-	for (i = 0; i < gf_list_count(sai_sizes); i++) {
+	c1 = gf_list_count(sai_sizes);
+	c2 = gf_list_count(sai_offsets);
+	for (i = 0; i < c1; i++) {
 		GF_SampleAuxiliaryInfoSizeBox *saiz = (GF_SampleAuxiliaryInfoSizeBox *)gf_list_get(sai_sizes, i);
-		if (saiz->aux_info_type == GF_4CC('c', 'e', 'n', 'c')) {
+		u32 saiz_aux_info_type = saiz->aux_info_type;
+		if (!saiz_aux_info_type) saiz_aux_info_type = scheme_type;
+
+		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"));
+			continue;
+		}
+
+		switch (saiz_aux_info_type) {
+		case GF_ISOM_CENC_SCHEME:
+		case GF_ISOM_CBC_SCHEME:
+		case GF_ISOM_CENS_SCHEME:
+		case GF_ISOM_CBCS_SCHEME:
 			has_saiz = GF_TRUE;
 			break;
 		}
 	}
 
-	for (i = 0; i < gf_list_count(sai_offsets); i++) {
+	for (i = 0; i < c2; i++) {
 		GF_SampleAuxiliaryInfoOffsetBox *saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_list_get(sai_offsets, i);
-		if (saio->aux_info_type == GF_4CC('c', 'e', 'n', 'c')) {
+		u32 saio_aux_info_type = saio->aux_info_type;
+		if (!saio_aux_info_type) saio_aux_info_type = scheme_type;
+
+		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"));
+			continue;
+		}
+		switch (saio_aux_info_type) {
+		case GF_ISOM_CENC_SCHEME:
+		case GF_ISOM_CBC_SCHEME:
+		case GF_ISOM_CENS_SCHEME:
+		case GF_ISOM_CBCS_SCHEME:
 			has_saio = GF_TRUE;
 			break;
 		}
 	}
-
 	return (has_saiz && has_saio);
 }
 
-Bool gf_isom_cenc_has_saiz_saio_track(GF_SampleTableBox *stbl)
+Bool gf_isom_cenc_has_saiz_saio_track(GF_SampleTableBox *stbl, u32 scheme_type)
 {
-	return gf_isom_cenc_has_saiz_saio_full(stbl, NULL);
+	return gf_isom_cenc_has_saiz_saio_full(stbl, NULL, scheme_type);
 }
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-Bool gf_isom_cenc_has_saiz_saio_traf(GF_TrackFragmentBox *traf)
+Bool gf_isom_cenc_has_saiz_saio_traf(GF_TrackFragmentBox *traf, u32 scheme_type)
 {
-	return gf_isom_cenc_has_saiz_saio_full(NULL, traf);
+	return gf_isom_cenc_has_saiz_saio_full(NULL, traf, scheme_type);
 }
 #endif
 
 
-static GF_Err isom_cenc_get_sai_by_saiz_saio(GF_MediaBox *mdia, u32 sampleNumber, u8 IV_size, GF_CENCSampleAuxInfo **sai)
+static GF_Err isom_cenc_get_sai_by_saiz_saio(GF_MediaBox *mdia, u32 sampleNumber, u32 scheme_type, u8 IV_size, GF_CENCSampleAuxInfo **sai)
 {
 	GF_BitStream *bs;
 	u32 prev_sai_size, size, i, j, nb_saio;
@@ -1102,24 +1205,48 @@
 
 	for (i = 0; i < gf_list_count(mdia->information->sampleTable->sai_offsets); i++) {
 		GF_SampleAuxiliaryInfoOffsetBox *saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_list_get(mdia->information->sampleTable->sai_offsets, i);
-		if (saio->aux_info_type == GF_4CC('c', 'e', 'n', 'c')) {
-			if (saio->entry_count == 1)
-				offset = saio->version ? saio->offsets_large[0] : saio->offsets[0];
-			else
-				offset = saio->version ? saio->offsets_large[sampleNumber-1]: saio->offsets[sampleNumber-1];
-			nb_saio = saio->entry_count;
+		u32 aux_info_type = saio->aux_info_type;
+		if (!aux_info_type) aux_info_type = scheme_type;
+
+		switch (aux_info_type) {
+		case GF_ISOM_CENC_SCHEME:
+		case GF_ISOM_CBC_SCHEME:
+		case GF_ISOM_CENS_SCHEME:
+		case GF_ISOM_CBCS_SCHEME:
 			break;
+		default:
+			continue;
 		}
+
+		if (saio->entry_count == 1)
+			offset = saio->version ? saio->offsets_large[0] : saio->offsets[0];
+		else
+			offset = saio->version ? saio->offsets_large[sampleNumber-1]: saio->offsets[sampleNumber-1];
+		nb_saio = saio->entry_count;
+		break;
 	}
 
 	for (i = 0; i < gf_list_count(mdia->information->sampleTable->sai_sizes); i++) {
 		GF_SampleAuxiliaryInfoSizeBox *saiz = (GF_SampleAuxiliaryInfoSizeBox *)gf_list_get(mdia->information->sampleTable->sai_sizes, i);
-		if (saiz->aux_info_type == GF_4CC('c', 'e', 'n', 'c')) {
-			for (j = 0; j < sampleNumber-1; j++)
-				prev_sai_size += saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[j];
-			size = saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[sampleNumber-1];
+		u32 aux_info_type = saiz->aux_info_type;
+		if (!aux_info_type) aux_info_type = scheme_type;
+
+		switch (aux_info_type) {
+		case GF_ISOM_CENC_SCHEME:
+		case GF_ISOM_CBC_SCHEME:
+		case GF_ISOM_CENS_SCHEME:
+		case GF_ISOM_CBCS_SCHEME:
 			break;
+		default:
+			continue;
+		}
+		if (sampleNumber>saiz->sample_count) {
+			return GF_NON_COMPLIANT_BITSTREAM;
 		}
+		for (j = 0; j < sampleNumber-1; j++)
+			prev_sai_size += saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[j];
+		size = saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[sampleNumber-1];
+		break;
 	}
 
 	offset += (nb_saio == 1) ? prev_sai_size : 0;
@@ -1131,17 +1258,19 @@
 
 	*sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
 	memset(*sai, 0, sizeof(GF_CENCSampleAuxInfo));
-	bs = gf_bs_new(buffer, size, GF_BITSTREAM_READ);
-	gf_bs_read_data(bs, (char *)(*sai)->IV, IV_size);
-	if (size > IV_size) {
-		(*sai)->subsample_count = gf_bs_read_u16(bs);
-		(*sai)->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry)*(*sai)->subsample_count);
-		for (i = 0; i < (*sai)->subsample_count; i++) {
-			(*sai)->subsamples[i].bytes_clear_data = gf_bs_read_u16(bs);
-			(*sai)->subsamples[i].bytes_encrypted_data = gf_bs_read_u32(bs);
+	if (size) {
+		bs = gf_bs_new(buffer, size, GF_BITSTREAM_READ);
+		gf_bs_read_data(bs, (char *)(*sai)->IV, IV_size);
+		if (size > IV_size) {
+			(*sai)->subsample_count = gf_bs_read_u16(bs);
+			(*sai)->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry)*(*sai)->subsample_count);
+			for (i = 0; i < (*sai)->subsample_count; i++) {
+				(*sai)->subsamples[i].bytes_clear_data = gf_bs_read_u16(bs);
+				(*sai)->subsamples[i].bytes_encrypted_data = gf_bs_read_u32(bs);
+			}
 		}
+		gf_bs_del(bs);
 	}
-	gf_bs_del(bs);
 	gf_free(buffer);
 
 	return e;
@@ -1156,8 +1285,9 @@
 	GF_SampleEncryptionBox *senc = NULL;
 	u32 type;
 	GF_CENCSampleAuxInfo *a_sai;
-	u8 IV_size;
-	u32 is_Protected;
+	u8 IV_size, constant_IV_size;
+	bin128 constant_IV;
+	u32 is_Protected, scheme_type=-1;
 
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
@@ -1165,20 +1295,19 @@
 	if (!stbl)
 		return GF_BAD_PARAM;
 
+	type = 0;
 	senc = trak->sample_encryption;
-	if (!senc)
-		return GF_BAD_PARAM;
+	//no senc is OK
+	if (senc) {
+		if ((senc->type == GF_ISOM_BOX_TYPE_UUID) && (((GF_UUIDBox *)senc)->internal_4cc == GF_ISOM_BOX_UUID_PSEC)) {
+			type = GF_ISOM_BOX_UUID_PSEC;
+		} else if (senc->type == GF_ISOM_BOX_TYPE_SENC) {
+			type = GF_ISOM_BOX_TYPE_SENC;
+		}
 
-	if ((senc->type == GF_ISOM_BOX_TYPE_UUID) && (((GF_UUIDBox *)senc)->internal_4cc == GF_ISOM_BOX_UUID_PSEC)) {
-		type = GF_ISOM_BOX_UUID_PSEC;
-	} else if (senc->type == GF_ISOM_BOX_TYPE_SENC) {
-		type = GF_ISOM_BOX_TYPE_SENC;
-	} else {
-		type = 0;
+		if (container_type) *container_type = type;
 	}
 
-	if (container_type) *container_type = type;
-
 	if (!sai) return GF_OK; /*we need only container_type*/
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
@@ -1189,31 +1318,37 @@
 		gf_isom_cenc_samp_aux_info_del(*sai);
 		*sai = NULL;
 	}
+	gf_isom_get_cenc_info(the_file, trackNumber, 1, NULL, &scheme_type, NULL, NULL);
+	gf_isom_get_sample_cenc_info_ex(trak, NULL, senc, sampleNumber, &is_Protected, &IV_size, NULL, NULL, NULL, &constant_IV_size, &constant_IV);
 
-	gf_isom_get_sample_cenc_info_ex(trak, NULL, senc, sampleNumber, &is_Protected, &IV_size, NULL, NULL, NULL, NULL, NULL);
-	if (!is_Protected) {
-		GF_SAFEALLOC( (*sai), GF_CENCSampleAuxInfo);
-		return GF_OK;
+	/*get sample auxiliary information by saiz/saio rather than by parsing senc box*/
+	if (gf_isom_cenc_has_saiz_saio_track(stbl, scheme_type)) {
+		return isom_cenc_get_sai_by_saiz_saio(trak->Media, sampleNumber, scheme_type, IV_size, sai);
 	}
+	if (!senc)
+		return GF_OK;
 
-	/*get sample auxiliary information by saiz/saio rather than by parsing senc box*/
-	if (IV_size && gf_isom_cenc_has_saiz_saio_track(stbl)) {
-		return isom_cenc_get_sai_by_saiz_saio(trak->Media, sampleNumber, IV_size, sai);
+	//senc is not loaded by default, do it now
+	if (!gf_list_count(senc->samp_aux_info)) {
+		GF_Err e = senc_Parse(the_file->movieFileMap->bs, trak, NULL, senc);
+		if (e) return e;
 	}
 
 	a_sai = NULL;
 	switch (type) {
 	case GF_ISOM_BOX_UUID_PSEC:
 		if (senc)
-			a_sai = (GF_CENCSampleAuxInfo *)gf_list_get(((GF_SampleEncryptionBox *)senc)->samp_aux_info, sampleNumber-1);
+			a_sai = (GF_CENCSampleAuxInfo *)gf_list_get(senc->samp_aux_info, sampleNumber-1);
 		break;
 	case GF_ISOM_BOX_TYPE_SENC:
 		if (senc)
-			a_sai = (GF_CENCSampleAuxInfo *)gf_list_get(((GF_SampleEncryptionBox *)senc)->samp_aux_info, sampleNumber-1);
+			a_sai = (GF_CENCSampleAuxInfo *)gf_list_get(senc->samp_aux_info, sampleNumber-1);
 		break;
 	}
-	if (!a_sai)
+	if (!a_sai) {
+		if (!IV_size && constant_IV_size) return GF_OK;
 		return GF_NOT_SUPPORTED;
+	}
 
 	GF_SAFEALLOC((*sai), GF_CENCSampleAuxInfo);
 	if (!(*sai) ) return GF_OUT_OF_MEM;
@@ -1230,13 +1365,17 @@
 	return GF_OK;
 }
 
-void gf_isom_cenc_get_default_info_ex(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID)
+void gf_isom_cenc_get_default_info_ex(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID, u8 *constant_IV_size, bin128 *constant_IV, u8 *crypt_byte_block, u8 *skip_byte_block)
 {
 	GF_ProtectionSchemeInfoBox *sinf;
 
 	if (default_IsEncrypted) *default_IsEncrypted = 0;
 	if (default_IV_size) *default_IV_size = 0;
 	if (default_KID) memset(*default_KID, 0, 16);
+	if (constant_IV_size) *constant_IV_size = 0;
+	if (constant_IV) memset(*constant_IV, 0, 16);
+	if (crypt_byte_block) *crypt_byte_block = 0;
+	if (skip_byte_block) *skip_byte_block = 0;
 
 	sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CENC_SCHEME, NULL);
 	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CBC_SCHEME, NULL);
@@ -1247,6 +1386,11 @@
 		if (default_IsEncrypted) *default_IsEncrypted = sinf->info->tenc->isProtected;
 		if (default_IV_size) *default_IV_size = sinf->info->tenc->Per_Sample_IV_Size;
 		if (default_KID) memmove(*default_KID, sinf->info->tenc->KID, 16);
+		if (constant_IV_size) *constant_IV_size = sinf->info->tenc->constant_IV_size;
+		if (constant_IV) memmove(*constant_IV, sinf->info->tenc->constant_IV, 16);
+		if (crypt_byte_block) *crypt_byte_block = sinf->info->tenc->crypt_byte_block;
+		if (skip_byte_block) *skip_byte_block = sinf->info->tenc->skip_byte_block;
+
 	} else {
 		if (! trak->moov->mov->is_smooth) {
 			trak->moov->mov->is_smooth = GF_TRUE;
@@ -1259,37 +1403,11 @@
 }
 
 GF_EXPORT
-void gf_isom_cenc_get_default_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID)
-{
-	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return;
-	gf_isom_cenc_get_default_info_ex(trak, sampleDescriptionIndex, default_IsEncrypted, default_IV_size, default_KID);
-}
-
-void gf_isom_cenc_get_default_pattern_info_ex(GF_TrackBox *trak, u32 sampleDescriptionIndex, u8 *default_crypt_byte_block, u8 *default_skip_byte_block)
-{
-	GF_ProtectionSchemeInfoBox *sinf;
-
-	if (default_crypt_byte_block) *default_crypt_byte_block = 0;
-	if (default_skip_byte_block) *default_skip_byte_block = 0;
-
-
-	sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CENC_SCHEME, NULL);
-	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CBC_SCHEME, NULL);
-	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CENS_SCHEME, NULL);
-	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CBCS_SCHEME, NULL);
-
-	if (sinf && sinf->info && sinf->info->tenc) {
-	}
-
-}
-
-GF_EXPORT
-void gf_isom_cenc_get_default_pattern_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u8 *default_crypt_byte_block, u8 *default_skip_byte_block)
+void gf_isom_cenc_get_default_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID, u8 *constant_IV_size, bin128 *constant_IV, u8 *crypt_byte_block, u8 *skip_byte_block)
 {
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return;
-	gf_isom_cenc_get_default_pattern_info_ex(trak, sampleDescriptionIndex, default_crypt_byte_block, default_skip_byte_block);
+	gf_isom_cenc_get_default_info_ex(trak, sampleDescriptionIndex, default_IsEncrypted, default_IV_size, default_KID, constant_IV_size, constant_IV, crypt_byte_block, skip_byte_block);
 }
 
 /*

gpac-0.7.1.tar.gz/src/isomedia/hint_track.c -> gpac-0.8.0.tar.gz/src/isomedia/hint_track.c Changed

@@ -83,7 +83,7 @@
 	return GF_OK;
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_setup_hint_track(GF_ISOFile *movie, u32 trackNumber, u32 HintType)
 {
 	GF_Err e;
@@ -167,6 +167,7 @@
 }
 
 //to use with internally supported protocols
+GF_EXPORT
 GF_Err gf_isom_new_hint_description(GF_ISOFile *the_file, u32 trackNumber, s32 HintTrackVersion, s32 LastCompatibleVersion, u8 Rely, u32 *HintDescriptionIndex)
 {
 	GF_Err e;
@@ -189,7 +190,7 @@
 	if (LastCompatibleVersion > 0) hdesc->LastCompatibleVersion = LastCompatibleVersion;
 
 	//create a data reference - WE ONLY DEAL WITH SELF-CONTAINED HINT TRACKS
-	e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, NULL, NULL, &drefIndex);
+	e = Media_CreateDataRef(the_file, trak->Media->information->dataInformation->dref, NULL, NULL, &drefIndex);
 	if (e) return e;
 	hdesc->dataReferenceIndex = drefIndex;
 
@@ -221,6 +222,7 @@
 *******************************************************************/
 
 //sets the RTP TimeScale
+GF_EXPORT
 GF_Err gf_isom_rtp_set_timescale(GF_ISOFile *the_file, u32 trackNumber, u32 HintDescriptionIndex, u32 TimeScale)
 {
 	GF_TrackBox *trak;
@@ -250,6 +252,7 @@
 
 //sets the RTP TimeOffset that the server will add to the packets
 //if not set, the server adds a random offset
+GF_EXPORT
 GF_Err gf_isom_rtp_set_time_offset(GF_ISOFile *the_file, u32 trackNumber, u32 HintDescriptionIndex, u32 TimeOffset)
 {
 	GF_TrackBox *trak;
@@ -280,6 +283,7 @@
 
 //sets the RTP SequenceNumber Offset that the server will add to the packets
 //if not set, the server adds a random offset
+GF_EXPORT
 GF_Err gf_isom_rtp_set_time_sequence_offset(GF_ISOFile *the_file, u32 trackNumber, u32 HintDescriptionIndex, u32 SequenceNumberOffset)
 {
 	GF_TrackBox *trak;
@@ -309,6 +313,7 @@
 
 //Starts a new sample for the hint track. A sample is just a collection of packets
 //the transmissionTime is indicated in the media timeScale of the hint track
+GF_EXPORT
 GF_Err gf_isom_begin_hint_sample(GF_ISOFile *the_file, u32 trackNumber, u32 HintDescriptionIndex, u32 TransmissionTime)
 {
 	GF_TrackBox *trak;
@@ -349,6 +354,7 @@
 //stores the hint sample in the file
 //set IsRandomAccessPoint if you want to indicate that this is a random access point
 //in the stream
+GF_EXPORT
 GF_Err gf_isom_end_hint_sample(GF_ISOFile *the_file, u32 trackNumber, u8 IsRandomAccessPoint)
 {
 	GF_TrackBox *trak;
@@ -397,6 +403,7 @@
 
 
 //adds a blank chunk of data in the sample that is skipped while streaming
+GF_EXPORT
 GF_Err gf_isom_hint_blank_data(GF_ISOFile *the_file, u32 trackNumber, u8 AtBegin)
 {
 	GF_TrackBox *trak;
@@ -423,6 +430,7 @@
 
 //adds a chunk of data (max 14 bytes) in the packet that is directly copied
 //while streaming
+GF_EXPORT
 GF_Err gf_isom_hint_direct_data(GF_ISOFile *the_file, u32 trackNumber, char *data, u32 dataLength, u8 AtBegin)
 {
 	GF_TrackBox *trak;
@@ -450,6 +458,7 @@
 	return gf_isom_hint_pck_add_dte(pck, (GF_GenericDTE *)dte, AtBegin);
 }
 
+GF_EXPORT
 GF_Err gf_isom_hint_sample_data(GF_ISOFile *the_file, u32 trackNumber, u32 SourceTrackID, u32 SampleNumber, u16 DataLength, u32 offsetInSample, char *extra_data, u8 AtBegin)
 {
 	GF_TrackBox *trak;
@@ -519,6 +528,7 @@
 	return gf_isom_hint_pck_add_dte(pck, (GF_GenericDTE *)dte, AtBegin);
 }
 
+GF_EXPORT
 GF_Err gf_isom_hint_sample_description_data(GF_ISOFile *the_file, u32 trackNumber, u32 SourceTrackID, u32 StreamDescriptionIndex, u16 DataLength, u32 offsetInDescription, u8 AtBegin)
 {
 	GF_TrackBox *trak;
@@ -558,7 +568,7 @@
 	return gf_isom_hint_pck_add_dte(pck, (GF_GenericDTE *)dte, AtBegin);
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_rtp_packet_set_flags(GF_ISOFile *the_file, u32 trackNumber,
                                     u8 PackingBit,
                                     u8 eXtensionBit,
@@ -591,6 +601,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_rtp_packet_begin(GF_ISOFile *the_file, u32 trackNumber,
                                 s32 relativeTime,
                                 u8 PackingBit,
@@ -631,6 +642,7 @@
 //set the time offset of this packet. This enables packets to be placed in the hint track
 //in decoding order, but have their presentation time-stamp in the transmitted
 //packet be in a different order. Typically used for MPEG video with B-frames
+GF_EXPORT
 GF_Err gf_isom_rtp_packet_set_offset(GF_ISOFile *the_file, u32 trackNumber, s32 timeOffset)
 {
 	GF_RTPOBox *rtpo;
@@ -761,6 +773,7 @@
 }
 
 //remove all SDP info at the track level
+GF_EXPORT
 GF_Err gf_isom_sdp_clean_track(GF_ISOFile *the_file, u32 trackNumber)
 {
 	GF_TrackBox *trak;
@@ -824,7 +837,7 @@
 	hnti = (GF_HintTrackInfoBox *)gf_list_get(map->other_boxes, 0);
 
 	if (!hnti->SDP) {
-		GF_Box *a = gf_isom_box_new_ex(GF_ISOM_BOX_TYPE_RTP, GF_ISOM_BOX_TYPE_HNTI);
+		GF_Box *a = gf_isom_box_new_ex(GF_ISOM_BOX_TYPE_RTP, GF_ISOM_BOX_TYPE_HNTI, 0, GF_FALSE);
 		hnti_AddBox((GF_Box*)hnti, a);
 	}
 	rtp = (GF_RTPBox *) hnti->SDP;
@@ -943,7 +956,7 @@
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return 0;
 
-	if (!CheckHintFormat(trak, GF_4CC('r', 't', 'p', ' '))) return 0;
+	if (!CheckHintFormat(trak, GF_ISOM_HINT_RTP)) return 0;
 	map = udta_getEntry(trak->udta, GF_ISOM_BOX_TYPE_HINF, NULL);
 	if (!map) return 0;
 	if (gf_list_count(map->other_boxes) != 1) return 0;
@@ -969,7 +982,7 @@
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !index) return NULL;
 
-	if (!CheckHintFormat(trak, GF_4CC('r', 't', 'p', ' '))) return NULL;
+	if (!CheckHintFormat(trak, GF_ISOM_HINT_RTP)) return NULL;
 	map = udta_getEntry(trak->udta, GF_ISOM_BOX_TYPE_HINF, NULL);
 	if (!map) return NULL;
 	if (gf_list_count(map->other_boxes) != 1) return NULL;

gpac-0.7.1.tar.gz/src/isomedia/iff.c -> gpac-0.8.0.tar.gz/src/isomedia/iff.c Changed

@@ -104,16 +104,23 @@
 
 	p->colour_type = gf_bs_read_u32(bs);
 	p->size -= 4;
-	if (p->colour_type == GF_4CC('n','c','l','x')) {
+	switch (p->colour_type) {
+	case GF_ISOM_SUBTYPE_NCLX:
 		p->colour_primaries = gf_bs_read_u16(bs);
 		p->transfer_characteristics = gf_bs_read_u16(bs);
 		p->matrix_coefficients = gf_bs_read_u16(bs);
 		p->full_range_flag = (gf_bs_read_u8(bs) & 0x80 ? GF_TRUE : GF_FALSE);
-	} else {
+		break;
+	case GF_ISOM_SUBTYPE_NCLC:
+		p->colour_primaries = gf_bs_read_u16(bs);
+		p->transfer_characteristics = gf_bs_read_u16(bs);
+		p->matrix_coefficients = gf_bs_read_u16(bs);
+		break;
+	default:
 		p->opaque = gf_malloc(sizeof(u8)*(size_t)p->size);
 		p->opaque_size = (u32) p->size;
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("ICC colour profile not supported \n" ));
 		gf_bs_read_data(bs, (char *) p->opaque, p->opaque_size);
+		break;
 	}
 	return GF_OK;
 }
@@ -126,15 +133,24 @@
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 
-	if (p->colour_type != GF_4CC('n','c','l','x')) {
-		gf_bs_write_u32(bs, p->colour_type);
-		gf_bs_write_data(bs, (char *)p->opaque, p->opaque_size);
-	} else {
+	switch (p->colour_type) {
+	case GF_ISOM_SUBTYPE_NCLX:
 		gf_bs_write_u32(bs, p->colour_type);
 		gf_bs_write_u16(bs, p->colour_primaries);
 		gf_bs_write_u16(bs, p->transfer_characteristics);
 		gf_bs_write_u16(bs, p->matrix_coefficients);
 		gf_bs_write_u8(bs, (p->full_range_flag == GF_TRUE ? 0x80 : 0));
+		break;
+	case GF_ISOM_SUBTYPE_NCLC:
+		gf_bs_write_u32(bs, p->colour_type);
+		gf_bs_write_u16(bs, p->colour_primaries);
+		gf_bs_write_u16(bs, p->transfer_characteristics);
+		gf_bs_write_u16(bs, p->matrix_coefficients);
+		break;
+	default:
+		gf_bs_write_u32(bs, p->colour_type);
+		gf_bs_write_data(bs, (char *)p->opaque, p->opaque_size);
+		break;
 	}
 	return GF_OK;
 }
@@ -143,10 +159,16 @@
 {
 	GF_ColourInformationBox *p = (GF_ColourInformationBox*)s;
 
-	if (p->colour_type != GF_4CC('n','c','l','x')) {
-		p->size += 4 + p->opaque_size;
-	} else {
+	switch (p->colour_type) {
+	case GF_ISOM_SUBTYPE_NCLX:
 		p->size += 11;
+		break;
+	case GF_ISOM_SUBTYPE_NCLC:
+		p->size += 10;
+		break;
+	default:
+		p->size += 4 + p->opaque_size;
+		break;
 	}
 	return GF_OK;
 }
@@ -355,6 +377,7 @@
 {
 	GF_ItemPropertiesBox *p = (GF_ItemPropertiesBox *)s;
 	if (p->property_container) gf_isom_box_del((GF_Box *)p->property_container);
+	if (p->property_association) gf_isom_box_del((GF_Box *)p->property_association);
 	gf_free(p);
 }
 
@@ -368,6 +391,12 @@
 		}
 		p->property_container = (GF_ItemPropertyContainerBox*)a;
 		break;
+	case GF_ISOM_BOX_TYPE_IPMA:
+		if (p->property_association) {
+			return GF_ISOM_INVALID_FILE;
+		}
+		p->property_association = (GF_ItemPropertyAssociationBox*)a;
+		break;
 	default:
 		return gf_isom_box_add_default(s, a);
 	}
@@ -392,6 +421,10 @@
 		e = gf_isom_box_write((GF_Box *) p->property_container, bs);
 		if (e) return e;
 	}
+	if (p->property_association) {
+		e = gf_isom_box_write((GF_Box *) p->property_association, bs);
+		if (e) return e;
+	}
 	return GF_OK;
 }
 
@@ -405,6 +438,11 @@
 		if (e) return e;
 		p->size += p->property_container->size;
 	}
+	if (p->property_association) {
+		e = gf_isom_box_size((GF_Box *) p->property_association);
+		if (e) return e;
+		p->size += p->property_association->size;
+	}
 	return GF_OK;
 }
 
@@ -642,7 +680,7 @@
 GF_Err grptype_Size(GF_Box *s)
 {
 	GF_EntityToGroupTypeBox *ptr = (GF_EntityToGroupTypeBox *)s;
-	ptr->size += 8 * (ptr->entity_id_count * sizeof(u32));
+	ptr->size += 8 + 4*ptr->entity_id_count;
 	return GF_OK;
 }
 
@@ -694,13 +732,54 @@
 GF_Err auxc_Size(GF_Box *s)
 {
 	GF_AuxiliaryTypePropertyBox *p = (GF_AuxiliaryTypePropertyBox*)s;
-	p->size += 1;
+	p->size += strlen(p->aux_urn) + 1 + p->data_size;
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+void auxi_del(GF_Box *s)
+{
+	GF_AuxiliaryTypeInfoBox *ptr = (GF_AuxiliaryTypeInfoBox *)s;
+	if (ptr->aux_track_type) gf_free(ptr->aux_track_type);
+	if (ptr) gf_free(ptr);
+	return;
+}
+
+GF_Err auxi_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_AuxiliaryTypeInfoBox *ptr = (GF_AuxiliaryTypeInfoBox *)s;
+	return gf_isom_read_null_terminated_string(s, bs, s->size, &ptr->aux_track_type);
+}
+
+GF_Box *auxi_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AuxiliaryTypeInfoBox, GF_ISOM_BOX_TYPE_AUXI);
+	return (GF_Box *) tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err auxi_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_AuxiliaryTypeInfoBox *ptr = (GF_AuxiliaryTypeInfoBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	//with terminating 0
+	gf_bs_write_data(bs, ptr->aux_track_type, (u32) strlen(ptr->aux_track_type) + 1 );
+	return GF_OK;
+}
+
+GF_Err auxi_Size(GF_Box *s)
+{
+	GF_AuxiliaryTypeInfoBox *ptr = (GF_AuxiliaryTypeInfoBox *)s;
+	ptr->size += strlen(ptr->aux_track_type) + 1;
+	return GF_OK;
+}
 
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
 GF_Box *oinf_New()
 {
 	ISOM_DECL_BOX_ALLOC(GF_OINFPropertyBox, GF_ISOM_BOX_TYPE_OINF);
@@ -784,28 +863,142 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
+GF_Box *clli_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ContentLightLevelBox, GF_ISOM_BOX_TYPE_CLLI);
+	return (GF_Box *)tmp;
+}
+
+void clli_del(GF_Box *a)
+{
+	GF_ContentLightLevelBox *p = (GF_ContentLightLevelBox *)a;
+	gf_free(p);
+}
+
+GF_Err clli_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_ContentLightLevelBox *p = (GF_ContentLightLevelBox *)s;
+	p->max_content_light_level = gf_bs_read_u16(bs);
+	p->max_pic_average_light_level = gf_bs_read_u16(bs);
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err clli_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_ContentLightLevelBox *p = (GF_ContentLightLevelBox*)s;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	gf_bs_write_u16(bs, p->max_content_light_level);
+	gf_bs_write_u16(bs, p->max_pic_average_light_level);
+	return GF_OK;
+}
+
+GF_Err clli_Size(GF_Box *s)
+{
+	GF_ContentLightLevelBox *p = (GF_ContentLightLevelBox*)s;
+	p->size += 4;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+GF_Box *mdcv_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_MasteringDisplayColourVolumeBox, GF_ISOM_BOX_TYPE_MDCV);
+	return (GF_Box *)tmp;
+}
+
+void mdcv_del(GF_Box *a)
+{
+	GF_MasteringDisplayColourVolumeBox *p = (GF_MasteringDisplayColourVolumeBox *)a;
+	gf_free(p);
+}
+
+GF_Err mdcv_Read(GF_Box *s, GF_BitStream *bs)
+{
+	int c = 0;
+	GF_MasteringDisplayColourVolumeBox *p = (GF_MasteringDisplayColourVolumeBox *)s;
+	for (c = 0; c<3; c++) {
+		p->display_primaries[c].x = gf_bs_read_u16(bs);
+		p->display_primaries[c].y = gf_bs_read_u16(bs);
+	}
+	p->white_point_x = gf_bs_read_u16(bs);
+	p->white_point_y = gf_bs_read_u16(bs);
+	p->max_display_mastering_luminance = gf_bs_read_u32(bs);
+	p->min_display_mastering_luminance = gf_bs_read_u32(bs);
+
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err mdcv_Write(GF_Box *s, GF_BitStream *bs)
+{
+	int c = 0;
+	GF_Err e;
+	GF_MasteringDisplayColourVolumeBox *p = (GF_MasteringDisplayColourVolumeBox*)s;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
+	for (c = 0; c<3; c++) {
+		gf_bs_write_u16(bs, p->display_primaries[c].x);
+		gf_bs_write_u16(bs, p->display_primaries[c].y);
+	}
+	gf_bs_write_u16(bs, p->white_point_x);
+	gf_bs_write_u16(bs, p->white_point_y);
+	gf_bs_write_u32(bs, p->max_display_mastering_luminance);
+	gf_bs_write_u32(bs, p->min_display_mastering_luminance);
+	
+	return GF_OK;
+}
+
+GF_Err mdcv_Size(GF_Box *s)
+{
+	GF_MasteringDisplayColourVolumeBox *p = (GF_MasteringDisplayColourVolumeBox*)s;
+	p->size += 24;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
 
 GF_EXPORT
 GF_Err gf_isom_iff_create_image_item_from_track(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) {
 	GF_Err e;
 	u32 imported_sample_desc_index = 1;
-	u32 sample_index = 1;
+//	u32 sample_index = 1;
 	u32 w, h, hSpacing, vSpacing;
+	u8 num_channels;
+	u8 bits_per_channel[3];
 	u32 subtype;
-	GF_ISOSample *sample;
+	GF_ISOSample *sample = NULL;
+	u32 timescale;
 	u32 item_type = 0;
 	GF_ImageItemProperties local_image_props;
 	Bool config_needed = 0;
 	GF_Box *config_box = NULL;
 	//u32 media_brand = 0;
+	u32 sample_desc_index = 0;
 
 	if (image_props && image_props->tile_mode != TILE_ITEM_NONE) {
+		/* Processing the input file in Tiled mode:
+		 The single track is split into multiple tracks
+		 and each track is processed to create an item */
 		u32 i, count;
 		u32 tile_track;
 		GF_List *tile_item_ids;
 		char sz_item_name[256];
 		GF_TileItemMode orig_tile_mode;
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
 		e = gf_media_split_hevc_tiles(movie, 0);
+#else
+		e = GF_NOT_SUPPORTED;
+#endif
 		if (e) return e;
 		tile_item_ids = gf_list_new();
 		orig_tile_mode = image_props->tile_mode;
@@ -824,7 +1017,7 @@
 			if (e) return e;
 			gf_isom_remove_track(movie, tile_track);
 			if (orig_tile_mode == TILE_ITEM_ALL_BASE) {
-				e = gf_isom_meta_add_item_ref(movie, root_meta, meta_track_number, *tile_item_id, item_id, GF_4CC('t', 'b', 'a', 's'), NULL);
+				e = gf_isom_meta_add_item_ref(movie, root_meta, meta_track_number, *tile_item_id, item_id, GF_ISOM_REF_TBAS, NULL);
 			}
 			if (e) return e;
 		}
@@ -854,20 +1047,32 @@
 			//FIXME: in avc1 with multiple descriptor, we should take the right description index
 			config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_AVCC);
 			((GF_AVCConfigurationBox *)config_box)->config = gf_isom_avc_config_get(movie, imported_track, imported_sample_desc_index);
-			item_type = GF_4CC('a', 'v', 'c', '1');
+			item_type = GF_ISOM_SUBTYPE_AVC_H264;
 			config_needed = 1;
+			num_channels = 3;
+			bits_per_channel[0] = ((GF_AVCConfigurationBox *)config_box)->config->luma_bit_depth;
+			bits_per_channel[1] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
+			bits_per_channel[2] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
 			break;
 		case GF_ISOM_SUBTYPE_SVC_H264:
 			config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_SVCC);
 			((GF_AVCConfigurationBox *)config_box)->config = gf_isom_svc_config_get(movie, imported_track, imported_sample_desc_index);
-			item_type = GF_4CC('s', 'v', 'c', '1');
+			item_type = GF_ISOM_SUBTYPE_SVC_H264;
 			config_needed = 1;
+			num_channels = 3;
+			bits_per_channel[0] = ((GF_AVCConfigurationBox *)config_box)->config->luma_bit_depth;
+			bits_per_channel[1] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
+			bits_per_channel[2] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
 			break;
 		case GF_ISOM_SUBTYPE_MVC_H264:
 			config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_MVCC);
 			((GF_AVCConfigurationBox *)config_box)->config = gf_isom_mvc_config_get(movie, imported_track, imported_sample_desc_index);
-			item_type = GF_4CC('m', 'v', 'c', '1');
+			item_type = GF_ISOM_SUBTYPE_MVC_H264;
 			config_needed = 1;
+			num_channels = 3;
+			bits_per_channel[0] = ((GF_AVCConfigurationBox *)config_box)->config->luma_bit_depth;
+			bits_per_channel[1] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
+			bits_per_channel[2] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
 			break;
 		case GF_ISOM_SUBTYPE_HVC1:
 		case GF_ISOM_SUBTYPE_HEV1:
@@ -879,28 +1084,61 @@
 			config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_HVCC);
 			((GF_HEVCConfigurationBox *)config_box)->config = gf_isom_hevc_config_get(movie, imported_track, imported_sample_desc_index);
 			if (subtype == GF_ISOM_SUBTYPE_HVT1) {
-				item_type = GF_4CC('h', 'v', 't', '1');
+				item_type = GF_ISOM_SUBTYPE_HVT1;
 			}
 			else {
-				item_type = GF_4CC('h', 'v', 'c', '1');
+				item_type = GF_ISOM_SUBTYPE_HVC1;
 			}
 			config_needed = 1;
 			if (!((GF_HEVCConfigurationBox *)config_box)->config) {
 				((GF_HEVCConfigurationBox *)config_box)->config = gf_isom_lhvc_config_get(movie, imported_track, imported_sample_desc_index);
-				item_type = GF_4CC('l', 'h', 'v', '1');
+				item_type = GF_ISOM_SUBTYPE_LHV1;
 			}
+			num_channels = 3;
+			bits_per_channel[0] = ((GF_HEVCConfigurationBox *)config_box)->config->luma_bit_depth;
+			bits_per_channel[1] = ((GF_HEVCConfigurationBox *)config_box)->config->chroma_bit_depth;
+			bits_per_channel[2] = ((GF_HEVCConfigurationBox *)config_box)->config->chroma_bit_depth;
 			//media_brand = GF_ISOM_BRAND_HEIC;
+			break;
+		case GF_ISOM_SUBTYPE_AV01:
+			{
+				config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_AV1C);
+				((GF_AV1ConfigurationBox *)config_box)->config = gf_isom_av1_config_get(movie, imported_track, imported_sample_desc_index);
+				item_type = GF_ISOM_SUBTYPE_AV01;
+				config_needed = 1;
+				u8 depth = ((GF_AV1ConfigurationBox *)config_box)->config->high_bitdepth ? (((GF_AV1ConfigurationBox *)config_box)->config->twelve_bit ? 12 : 10 ) : 8;
+				if (((GF_AV1ConfigurationBox *)config_box)->config->monochrome) {
+					num_channels = 1;
+					bits_per_channel[0] = depth;
+					bits_per_channel[1] = 0;
+					bits_per_channel[2] = 0;
+				} else {
+					num_channels = 3;
+					bits_per_channel[0] = depth;
+					bits_per_channel[1] = depth;
+					bits_per_channel[2] = depth;
+				}
+				//media_brand = GF_ISOM_BRAND_AVIF;
+			}
+			break;
+		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: Codec not supported to create HEIF image items\n"));
+			return GF_NOT_SUPPORTED;
+		}
+		if (config_needed && !config_box && !((GF_AVCConfigurationBox *)config_box)->config) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: Image type %s requires a missing configuration box\n", gf_4cc_to_str(item_type)));
+			return GF_BAD_PARAM;
 		}
-		if (config_needed && !config_box && !((GF_AVCConfigurationBox *)config_box)->config) return GF_BAD_PARAM;
-
 		/* Get some images properties from the track data */
 		e = gf_isom_get_visual_info(movie, imported_track, imported_sample_desc_index, &w, &h);
 		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error determining image size\n"));
 			if (config_box) gf_isom_box_del(config_box);
 			return e;
 		}
 		e = gf_isom_get_pixel_aspect_ratio(movie, imported_track, imported_sample_desc_index, &hSpacing, &vSpacing);
 		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error determining image aspect ratio\n"));
 			if (config_box) gf_isom_box_del(config_box);
 			return e;
 		}
@@ -917,16 +1155,30 @@
 			image_props->vSpacing = vSpacing;
 		}
 		image_props->config = config_box;
+		if (!image_props->num_channels) {
+			image_props->num_channels = num_channels;
+			image_props->bits_per_channel[0] = bits_per_channel[0];
+			image_props->bits_per_channel[1] = bits_per_channel[1];
+			image_props->bits_per_channel[2] = bits_per_channel[2];
+		}
 
-		sample = gf_isom_get_sample(movie, imported_track, sample_index, NULL);
-		if (!sample) {
+		timescale = gf_isom_get_media_timescale(movie, imported_track);
+		e = gf_isom_get_sample_for_media_time(movie, imported_track, (u64)(image_props->time*timescale), &sample_desc_index, GF_ISOM_SEARCH_SYNC_FORWARD, &sample, NULL);
+		if (sample_desc_index != imported_sample_desc_index) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Warning sample description index for sync sample differ from config\n"));
+		}
+		if (e || !sample || !sample->IsRAP) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error no sync sample found after time %g\n", image_props->time));
+			if (sample) gf_isom_sample_del(&sample);
 			if (config_box) gf_isom_box_del(config_box);
 			return GF_BAD_PARAM;
 		}
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Adding sample from time %.3f as item %d\n", sample->DTS*1.0/timescale, item_id));
 		e = gf_isom_add_meta_item_memory(movie, root_meta, meta_track_number, (!item_name || !strlen(item_name) ? "Image" : item_name), item_id, item_type, NULL, NULL, image_props, sample->data, sample->dataLength, item_extent_refs);
 
 		gf_isom_set_brand_info(movie, GF_ISOM_BRAND_MIF1, 0);
 		gf_isom_reset_alt_brands(movie);
+		// TODO Analyze configuration to determine the brand */
 		//if (media_brand) {
 		//	gf_isom_modify_alternate_brand(movie, media_brand, 1);
 		//}

gpac-0.7.1.tar.gz/src/isomedia/isom_intern.c -> gpac-0.8.0.tar.gz/src/isomedia/isom_intern.c Changed

@@ -34,7 +34,7 @@
 GF_Err gf_isom_parse_root_box(GF_Box **outBox, GF_BitStream *bs, u64 *bytesExpected, Bool progressive_mode);
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-GF_Err MergeTrack(GF_TrackBox *trak, GF_TrackFragmentBox *traf, u64 moof_offset, Bool is_first_merge);
+GF_Err MergeTrack(GF_TrackBox *trak, GF_TrackFragmentBox *traf, u64 moof_offset, u64 *cumulated_offset, Bool is_first_merge);
 
 GF_Err MergeFragment(GF_MovieFragmentBox *moof, GF_ISOFile *mov)
 {
@@ -43,6 +43,7 @@
 	u64 MaxDur;
 	GF_TrackFragmentBox *traf;
 	GF_TrackBox *trak;
+	u64 base_data_offset;
 
 	MaxDur = 0;
 
@@ -53,11 +54,12 @@
 	}
 	//and all fragments must be continous - we do not throw an error as we may still want to be able to concatenate dependent representations in DASH and
 	//we will likely a-have R1(moofSN 1, 3, 5, 7) plus R2(moofSN 2, 4, 6, 8)
-	if (mov->NextMoofNumber && (mov->NextMoofNumber >= moof->mfhd->sequence_number)) {
+	if (mov->NextMoofNumber && moof->mfhd && (mov->NextMoofNumber >= moof->mfhd->sequence_number)) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Warning: wrong sequence number: got %d but last one was %d\n", moof->mfhd->sequence_number, mov->NextMoofNumber));
 //		return GF_ISOM_INVALID_FILE;
 	}
 
+	base_data_offset = mov->current_top_box_start;
 	i=0;
 	while ((traf = (GF_TrackFragmentBox*)gf_list_enum(moof->TrackList, &i))) {
 		if (!traf->tfhd) {
@@ -82,7 +84,7 @@
 			return GF_ISOM_INVALID_FILE;
 		}
 
-		e = MergeTrack(trak, traf, mov->current_top_box_start, !trak->first_traf_merged);
+		e = MergeTrack(trak, traf, mov->current_top_box_start, &base_data_offset, !trak->first_traf_merged);
 		if (e) return e;
 
 		trak->present_in_scalable_segment = 1;
@@ -211,7 +213,7 @@
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Incomplete MDAT while file is not read-only\n"));
 				return GF_ISOM_INVALID_FILE;
 			}
-			if (mov->openMode == GF_ISOM_OPEN_READ) {
+			if ((mov->openMode == GF_ISOM_OPEN_READ) && !progressive_mode) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Incomplete file while reading for dump - aborting parsing\n"));
 				break;
 			}
@@ -235,7 +237,7 @@
 #endif
 			e = gf_list_add(mov->TopBoxes, a);
 			if (e) return e;
-			
+
 			totSize += a->size;
 
 			//dump senc info in dump mode
@@ -328,9 +330,9 @@
 		{
 			u32 brand = ((GF_SegmentTypeBox *)a)->majorBrand;
 			switch (brand) {
-			case GF_4CC('s', 'i', 's', 'x'):
-			case GF_4CC('r', 'i', 's', 'x'):
-			case GF_4CC('s', 's', 's', 's'):
+			case GF_ISOM_BRAND_SISX:
+			case GF_ISOM_BRAND_RISX:
+			case GF_ISOM_BRAND_SSSS:
 				mov->is_index_segment = GF_TRUE;
 				break;
 			default:
@@ -380,7 +382,7 @@
 				if (mov->moov) {
 					for (k=0; k<gf_list_count(mov->moof->TrackList); k++) {
 						GF_TrackFragmentBox *traf = gf_list_get(mov->moof->TrackList, k);
-						if (traf->tfhd) {
+						if (traf->tfhd && mov->moov->mvex && mov->moov->mvex->TrackExList) {
 							GF_TrackBox *trak = gf_isom_get_track_from_id(mov->moov, traf->tfhd->trackID);
 							u32 j=0;
 							while ((traf->trex = (GF_TrackExtendsBox*)gf_list_enum(mov->moov->mvex->TrackExList, &j))) {
@@ -398,6 +400,15 @@
 							if (e) return e;
 						}
 					}
+				} else {
+					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);
+							if (e) return e;
+						}
+					}
+
 				}
 			} else if (mov->openMode==GF_ISOM_OPEN_CAT_FRAGMENTS) {
 				mov->NextMoofNumber = mov->moof->mfhd->sequence_number+1;
@@ -414,7 +425,7 @@
 		case GF_ISOM_BOX_TYPE_UNKNOWN:
 		{
 			GF_UnknownBox *box = (GF_UnknownBox*)a;
-			if (box->original_4cc == GF_4CC('j','P',' ',' ')) {
+			if (box->original_4cc == GF_ISOM_BOX_TYPE_JP) {
 				u8 *c = (u8 *) box->data;
 				if ((box->dataSize==4) && (GF_4CC(c[0],c[1],c[2],c[3])==(u32)0x0D0A870A))
 					mov->is_jp2 = 1;
@@ -529,7 +540,7 @@
 	GF_Err e;
 	u64 bytes;
 	GF_ISOFile *mov = gf_isom_new_movie();
-	if (! mov) return NULL;
+	if (!mov || !fileName) return NULL;
 
 	mov->fileName = gf_strdup(fileName);
 	mov->openMode = OpenMode;
@@ -646,6 +657,8 @@
 	gf_isom_box_array_del(mov->TopBoxes);
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	gf_isom_box_array_del(mov->moof_list);
+	if (mov->mfra)
+		gf_isom_box_del((GF_Box*)mov->mfra);
 #endif
 	if (mov->last_producer_ref_time)
 		gf_isom_box_del((GF_Box *) mov->last_producer_ref_time);
@@ -955,17 +968,16 @@
 	if (OpenMode == GF_ISOM_OPEN_WRITE) {
 		//THIS IS NOT A TEMP FILE, WRITE mode is used for "live capture"
 		//this file will be the final file...
-		mov->fileName = gf_strdup(fileName);
-		e = gf_isom_datamap_new(fileName, NULL, GF_ISOM_DATA_MAP_WRITE, & mov->editFileMap);
+		mov->fileName = fileName ? gf_strdup(fileName) : NULL;
+		e = gf_isom_datamap_new(fileName, NULL, GF_ISOM_DATA_MAP_WRITE, &mov->editFileMap);
 		if (e) goto err_exit;
 
 		/*brand is set to ISOM by default - it may be touched until sample data is added to track*/
 		gf_isom_set_brand_info( (GF_ISOFile *) mov, GF_ISOM_BRAND_ISOM, 1);
 	} else {
 		//we are in EDIT mode but we are creating the file -> temp file
-		mov->finalName = (char*)gf_malloc(strlen(fileName) + 1);
-		strcpy(mov->finalName, fileName);
-		e = gf_isom_datamap_new("mp4_tmp_edit", tmp_dir, GF_ISOM_DATA_MAP_WRITE, & mov->editFileMap);
+		mov->finalName = fileName ? gf_strdup(fileName) : NULL;
+		e = gf_isom_datamap_new("mp4_tmp_edit", tmp_dir, GF_ISOM_DATA_MAP_WRITE, &mov->editFileMap);
 		if (e) {
 			gf_isom_set_last_error(NULL, e);
 			gf_isom_delete_movie(mov);
@@ -1108,7 +1120,7 @@
 		sub_samples = NULL;
 	}
 	if (!sub_samples) return 0;
-	
+
 	last_sample = 0;
 	count = gf_list_count(sub_samples->Samples);
 	for (i=0; i<count; i++) {

gpac-0.7.1.tar.gz/src/isomedia/isom_read.c -> gpac-0.8.0.tar.gz/src/isomedia/isom_read.c Changed

@@ -110,7 +110,7 @@
 		type = 0;
 		if (fread(data, 1, 4, f) == 4) {
 			if (fread(data, 1, 4, f) == 4) {
-				type = GF_4CC(data[0], data[1], data[2], data[3]);
+				type = GF_4CC((u32)data[0], (u8)data[1], (u8)data[2], (u8)data[3]);
 			}
 		}
 		gf_fclose(f);
@@ -122,6 +122,7 @@
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	case GF_ISOM_BOX_TYPE_MOOF:
 	case GF_ISOM_BOX_TYPE_STYP:
+	case GF_ISOM_BOX_TYPE_SIDX:
 		return 3;
 #ifndef GPAC_DISABLE_ISOM_ADOBE
 	/*Adobe specific*/
@@ -135,8 +136,8 @@
 	case GF_ISOM_BOX_TYPE_UDTA:
 	case GF_ISOM_BOX_TYPE_META:
 	case GF_ISOM_BOX_TYPE_VOID:
-	case GF_4CC('j','P',' ',' '):
-	case GF_4CC('w','i','d','e'):
+	case GF_ISOM_BOX_TYPE_JP:
+	case GF_QT_BOX_TYPE_WIDE:
 		return 1;
 	default:
 		return 0;
@@ -152,7 +153,7 @@
 	u32 sample_rate=0;
 	u32 nb_channels=0;
 	u32 bps=0;
-	u32 atag=0;
+	//u32 atag=0;
 	u32 nal_len=4;
 	u32 width = 0;
 	u32 height = 0;
@@ -189,7 +190,7 @@
 		}
 		else if (!strncmp(val, "nal=", 4)) nal_len = atoi(val+4);
 		else if (!strncmp(val, "bps=", 4)) bps = atoi(val+4);
-		else if (!strncmp(val, "atag=", 5)) atag = atoi(val+5);
+		//else if (!strncmp(val, "atag=", 5)) atag = atoi(val+5);
 		else if (!strncmp(val, "ch=", 3)) nb_channels = atoi(val+3);
 		else if (!strncmp(val, "srate=", 6)) sample_rate = atoi(val+6);
 		else if (!strncmp(val, "w=", 2)) width = atoi(val+2);
@@ -237,6 +238,7 @@
 	trak->Media->mediaHeader->timeScale = timescale;
 
 	trak->Media->handler = (GF_HandlerBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_HDLR);
+ //we assume by default vide for handler type (only used for smooth streaming)
 	trak->Media->handler->handlerType = width ? GF_ISOM_MEDIA_VISUAL : GF_ISOM_MEDIA_AUDIO;
 
 	trak->Media->information = (GF_MediaInformationBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MINF);
@@ -434,8 +436,24 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_close(GF_ISOFile *movie)
+GF_Err gf_isom_get_bs(GF_ISOFile *movie, GF_BitStream **out_bs)
 {
+	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;
+}
+
+GF_EXPORT
+GF_Err gf_isom_write(GF_ISOFile *movie) {
 	GF_Err e;
 	if (movie == NULL) return GF_ISOM_INVALID_FILE;
 	e = GF_OK;
@@ -449,6 +467,17 @@
 		if ( (movie->openMode == GF_ISOM_OPEN_WRITE) && (movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) ) {
 			e = gf_isom_close_fragments(movie);
 			if (e) return e;
+			//in case of mfra box usage -> create mfro, calculate box sizes and write it out
+			if (movie->mfra) {
+				if (!movie->mfra->mfro)
+					movie->mfra->mfro = (GF_MovieFragmentRandomAccessOffsetBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_MFRO);
+
+				e = gf_isom_box_size((GF_Box *)movie->mfra);
+				if (e) return e;
+				movie->mfra->mfro->container_size = (u32) movie->mfra->size;
+				//write mfra
+				e = gf_isom_box_write((GF_Box *)movie->mfra, movie->editFileMap->bs);
+			}
 		} else
 #endif
 			e = WriteToFile(movie);
@@ -458,7 +487,6 @@
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (movie->moov) {
 		u32 i;
-
 		for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
 			GF_TrackBox *trak = (GF_TrackBox*)gf_list_get(movie->moov->trackList, i);
 			/*delete any pending dataHandler of scalable enhancements*/
@@ -468,9 +496,20 @@
 	}
 #endif
 
+	return e;
+}
+
+GF_EXPORT
+GF_Err gf_isom_close(GF_ISOFile *movie)
+{
+	GF_Err e;
+	if (movie == NULL) return GF_ISOM_INVALID_FILE;
+	e = gf_isom_write(movie);
+	if (e) return e;
+
 	//free and return;
 	gf_isom_delete_movie(movie);
-	return e;
+	return GF_OK;
 }
 
 
@@ -812,7 +851,7 @@
 
 
 //gets the enable flag of a track
-//0: NO, 1: yes, 2: error
+//0: NO, 1: YES, 2: ERROR
 GF_EXPORT
 u8 gf_isom_is_track_enabled(GF_ISOFile *the_file, u32 trackNumber)
 {
@@ -1041,7 +1080,7 @@
 	u8 useEdit;
 	s64 SegmentStartTime, mediaOffset;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak || !MediaTime) return GF_BAD_PARAM;;
+	if (!trak || !MediaTime) return GF_BAD_PARAM;
 
 	SegmentStartTime = 0;
 	return GetMediaTime(trak, GF_FALSE, movieTime, MediaTime, &SegmentStartTime, &mediaOffset, &useEdit, NULL);
@@ -1446,6 +1485,7 @@
 	 ;
 }
 
+GF_EXPORT
 u32 gf_isom_get_constant_sample_size(GF_ISOFile *the_file, u32 trackNumber)
 {
 	GF_TrackBox *trak;
@@ -1455,6 +1495,35 @@
 }
 
 GF_EXPORT
+u32 gf_isom_get_constant_sample_duration(GF_ISOFile *the_file, u32 trackNumber)
+{
+	GF_TrackBox *trak;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return 0;
+	if (trak->Media->information->sampleTable->TimeToSample->nb_entries != 1) return 0;
+	return trak->Media->information->sampleTable->TimeToSample->entries[0].sampleDelta;
+}
+
+GF_EXPORT
+Bool gf_isom_enable_raw_pack(GF_ISOFile *the_file, u32 trackNumber, u32 pack_num_samples)
+{
+	GF_TrackBox *trak;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_FALSE;
+	trak->pack_num_samples = 0;
+	//we only activate sample packing for raw audio
+	if (!trak->Media->handler) return GF_FALSE;
+	if (trak->Media->handler->handlerType != GF_ISOM_MEDIA_AUDIO) return GF_FALSE;
+	//and sample duration of 1
+	if (trak->Media->information->sampleTable->TimeToSample->nb_entries != 1) return GF_FALSE;
+	if (trak->Media->information->sampleTable->TimeToSample->entries[0].sampleDelta != 1) return GF_FALSE;
+	//and sample with constant size
+	if (!trak->Media->information->sampleTable->SampleSize->sampleSize) return GF_FALSE;
+	trak->pack_num_samples = pack_num_samples;
+	return pack_num_samples ? GF_TRUE : GF_FALSE;
+}
+
+GF_EXPORT
 u32 gf_isom_has_time_offset(GF_ISOFile *the_file, u32 trackNumber)
 {
 	u32 i;
@@ -2001,7 +2070,6 @@
 			Double time = (Double) ent->segmentDuration;
 			time /= trak->moov->mvhd->timeScale;
 			time *= trak->Media->mediaHeader->timeScale;
-
 			*mediaOffset = (s64) time;
 			return GF_FALSE;
 		}
@@ -2396,29 +2464,6 @@
 }
 
 GF_EXPORT
-u32 gf_isom_get_sample_fragment_count(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber)
-{
-	GF_TrackBox *trak;
-	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return 0;
-
-	//Padding info
-	return stbl_GetSampleFragmentCount(trak->Media->information->sampleTable->Fragments, sampleNumber);
-}
-
-GF_EXPORT
-u16 gf_isom_get_sample_fragment_size(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 FragmentIndex)
-{
-	GF_TrackBox *trak;
-	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak || !FragmentIndex) return 0;
-
-	//Padding info
-	return stbl_GetSampleFragmentSize(trak->Media->information->sampleTable->Fragments, sampleNumber, FragmentIndex);
-}
-
-
-GF_EXPORT
 GF_Err gf_isom_get_fragment_defaults(GF_ISOFile *the_file, u32 trackNumber,
 u32 *defaultDuration, u32 *defaultSize, u32 *defaultDescriptionIndex,
 u32 *defaultRandomAccess, u8 *defaultPadding, u16 *defaultDegradationPriority)
@@ -2486,7 +2531,7 @@
 		//no sync table is ALL RAP
 		*defaultRandomAccess = stbl->SyncSample ? 0 : 1;
 		if (stbl->SyncSample
-		 && (stbl->SyncSample->nb_entries >= stbl->SampleSize->sampleCount/2)) {
+		 && (stbl->SyncSample->nb_entries == stbl->SampleSize->sampleCount)) {
 			*defaultRandomAccess = 1;
 		}
 	}
@@ -2762,6 +2807,15 @@
 			gf_isom_box_array_del(stbl->sampleGroups);
 			stbl->sampleGroups = NULL;
 
+			if (trak->sample_encryption) {
+				gf_list_del_item(trak->other_boxes, trak->sample_encryption);
+				if (trak->Media->information->sampleTable->other_boxes) {
+					gf_list_del_item(trak->Media->information->sampleTable->other_boxes, trak->sample_encryption);
+				}
+				gf_isom_box_del((GF_Box*)trak->sample_encryption);
+				trak->sample_encryption = NULL;
+			}
+
 			j = stbl->nb_sgpd_in_stbl;
 			while ((a = (GF_Box *)gf_list_enum(stbl->sampleGroupsDescription, &j))) {
 				gf_isom_box_del(a);
@@ -2889,16 +2943,30 @@
 	track_id = 0;
 	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
 		s32 ref;
+		u32 ref_type = GF_ISOM_REF_SCAL;
 		GF_TrackBox *trak = (GF_TrackBox*)gf_list_get(movie->moov->trackList, i);
 		if (! trak->present_in_scalable_segment) continue;
 
-		ref = gf_isom_get_reference_count(movie, i+1, GF_ISOM_REF_SCAL);
-		if (ref<=0) continue;
+		ref = gf_isom_get_reference_count(movie, i+1, ref_type);
+		if (ref<=0) {
+			//handle implicit reconstruction for LHE1/LHV1, check sbas track ref
+			u32 subtype = gf_isom_get_media_subtype(movie, i+1, 1);
+			switch (subtype) {
+			case GF_ISOM_SUBTYPE_LHE1:
+			case GF_ISOM_SUBTYPE_LHV1:
+				ref = gf_isom_get_reference_count(movie, i+1, GF_ISOM_REF_BASE);
+				if (ref<=0) continue;
+				ref_type = GF_ISOM_REF_BASE;
+				break;
+			default:
+				continue;
+			}
+		}
 		if (ref<=max_ref) continue;
 
 		for (j=0; j< (u32) ref; j++) {
 			u32 on_track=0;
-			gf_isom_get_reference(movie, i+1, GF_ISOM_REF_SCAL, j+1, &on_track);
+			gf_isom_get_reference(movie, i+1, GF_ISOM_REF_BASE, j+1, &on_track);
 			if (on_track==for_base_track) {
 				max_ref = ref;
 				track_id = trak->Header->trackID;
@@ -3111,6 +3179,44 @@
 }
 
 GF_EXPORT
+GF_Err gf_isom_get_color_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 *colour_type, u16 *colour_primaries, u16 *transfer_characteristics, u16 *matrix_coefficients, Bool *full_range_flag)
+{
+	GF_TrackBox *trak;
+	GF_VisualSampleEntryBox *entry;
+	GF_SampleDescriptionBox *stsd;
+	u32 i, count;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	stsd = trak->Media->information->sampleTable->SampleDescription;
+	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) return movie->LastError = GF_BAD_PARAM;
+
+	entry = (GF_VisualSampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	//no support for generic sample entries (eg, no MPEG4 descriptor)
+	if (entry == NULL) return GF_OK;
+
+	//valid for MPEG visual, JPG and 3GPP H263
+	if (entry->internal_type!=GF_ISOM_SAMPLE_ENTRY_VIDEO) {
+		return GF_BAD_PARAM;
+	}
+	count = gf_list_count(entry->other_boxes);
+	for (i=0; i<count; i++) {
+		GF_ColourInformationBox *clr = gf_list_get(entry->other_boxes, i);
+		if (clr->type != GF_ISOM_BOX_TYPE_COLR) continue;
+
+		if (colour_type) *colour_type = clr->colour_type;
+		if (colour_primaries) *colour_primaries = clr->colour_primaries;
+		if (transfer_characteristics) *transfer_characteristics = clr->transfer_characteristics;
+		if (matrix_coefficients) *matrix_coefficients = clr->matrix_coefficients;
+		if (full_range_flag) *full_range_flag = clr->full_range_flag;
+		return GF_OK;
+	}
+	return GF_NOT_FOUND;
+}
+
+GF_EXPORT
 const char *gf_isom_get_filename(GF_ISOFile *movie)
 {
 	if (!movie) return NULL;
@@ -3176,7 +3282,8 @@
 GF_EXPORT
 u64 gf_isom_get_media_data_size(GF_ISOFile *movie, u32 trackNumber)
 {
-	u32 i, size;
+	u32 i;
+	u64 size;
 	GF_SampleSizeBox *stsz;
 	GF_TrackBox *tk = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!tk) return 0;
@@ -3200,8 +3307,8 @@
 GF_EXPORT
 Bool gf_isom_is_single_av(GF_ISOFile *file)
 {
-	u32 count, i, nb_any, nb_a, nb_v, nb_scene, nb_od, nb_text;
-	nb_a = nb_v = nb_any = nb_scene = nb_od = nb_text = 0;
+	u32 count, i, nb_any, nb_a, nb_v, nb_auxv, nb_pict, nb_scene, nb_od, nb_text;
+	nb_auxv = nb_pict = nb_a = nb_v = nb_any = nb_scene = nb_od = nb_text = 0;
 
 	if (!file->moov) return GF_FALSE;
 	count = gf_isom_get_track_count(file);
@@ -3223,6 +3330,16 @@
 		case GF_ISOM_MEDIA_AUDIO:
 			nb_a++;
 			break;
+ case GF_ISOM_MEDIA_AUXV:
+ /*discard file with images*/
+ if (gf_isom_get_sample_count(file, i+1)==1) nb_any++;
+ else nb_auxv++;
+ break;
+ case GF_ISOM_MEDIA_PICT:
+ /*discard file with images*/
+ if (gf_isom_get_sample_count(file, i+1)==1) nb_any++;
+ else nb_pict++;
+ break;
 		case GF_ISOM_MEDIA_VISUAL:
 			/*discard file with images*/
 			if (gf_isom_get_sample_count(file, i+1)==1) nb_any++;
@@ -3234,7 +3351,7 @@
 		}
 	}
 	if (nb_any) return GF_FALSE;
-	if ((nb_scene<=1) && (nb_od<=1) && (nb_a<=1) && (nb_v<=1) && (nb_text<=1) ) return GF_TRUE;
+	if ((nb_scene<=1) && (nb_od<=1) && (nb_a<=1) && (nb_v+nb_pict+nb_auxv<=1) && (nb_text<=1) ) return GF_TRUE;
 	return GF_FALSE;
 }
 
@@ -3247,13 +3364,13 @@
 GF_EXPORT
 u32 gf_isom_guess_specification(GF_ISOFile *file)
 {
-	u32 count, i, nb_any, nb_m4s, nb_a, nb_v, nb_scene, nb_od, nb_mp3, nb_aac, nb_m4v, nb_avc, nb_amr, nb_h263, nb_qcelp, nb_evrc, nb_smv, nb_text;
+	u32 count, i, nb_any, nb_m4s, nb_a, nb_v, nb_auxv,nb_scene, nb_od, nb_mp3, nb_aac, nb_m4v, nb_avc, nb_amr, nb_h263, nb_qcelp, nb_evrc, nb_smv, nb_text, nb_pict;
 
-	nb_m4s = nb_a = nb_v = nb_any = nb_scene = nb_od = nb_mp3 = nb_aac = nb_m4v = nb_avc = nb_amr = nb_h263 = nb_qcelp = nb_evrc = nb_smv = nb_text = 0;
+	nb_m4s = nb_a = nb_v = nb_auxv = nb_any = nb_scene = nb_od = nb_mp3 = nb_aac = nb_m4v = nb_avc = nb_amr = nb_h263 = nb_qcelp = nb_evrc = nb_smv = nb_text = nb_pict = 0;
 
 	if (file->is_jp2) {
-		if (file->moov) return GF_4CC('m','j','p','2');
-		return GF_4CC('j','p','2',' ');
+		if (file->moov) return GF_ISOM_BRAND_MJP2;
+		return GF_ISOM_BRAND_JP2;
 	}
 	if (!file->moov) {
 		if (!file->meta || !file->meta->handler) return 0;
@@ -3275,7 +3392,7 @@
 			if (gf_isom_get_sample_count(file, i+1)>1) nb_m4s++;
 		}
 		else if ((mtype==GF_ISOM_MEDIA_TEXT) || (mtype==GF_ISOM_MEDIA_SUBT)) nb_text++;
-		else if ((mtype==GF_ISOM_MEDIA_AUDIO) || (mtype==GF_ISOM_MEDIA_VISUAL)) {
+		else if ((mtype==GF_ISOM_MEDIA_AUDIO) || gf_isom_is_video_subtype(mtype) ) {
 			switch (mstype) {
 			case GF_ISOM_SUBTYPE_3GP_AMR:
 			case GF_ISOM_SUBTYPE_3GP_AMR_WB:
@@ -3346,9 +3463,11 @@
 				}
 				gf_odf_desc_del((GF_Descriptor *)dcd);
 			}
-			break;
+				break;
 			default:
 				if (mtype==GF_ISOM_MEDIA_VISUAL) nb_v++;
+				else if (mtype==GF_ISOM_MEDIA_AUXV) nb_auxv++;
+				else if (mtype==GF_ISOM_MEDIA_PICT) nb_pict++;
 				else nb_a++;
 				break;
 			}
@@ -3375,7 +3494,7 @@
 	/*MP3: ISMA and MPEG4*/
 	if (nb_mp3) {
 		if (!nb_text && (nb_v<=1) && (nb_a<=1) && (nb_scene==1) && (nb_od==1))
-			return GF_4CC('I', 'S', 'M', 'A');
+			return GF_ISOM_BRAND_ISMA;
 		return GF_ISOM_BRAND_MP42;
 	}
 	/*MP4*/
@@ -3386,7 +3505,7 @@
 	}
 	/*use ISMA (3GP fine too)*/
 	if (!nb_amr && !nb_h263 && !nb_text) {
-		if ((nb_v<=1) && (nb_a<=1)) return GF_4CC('I', 'S', 'M', 'A');
+		if ((nb_v<=1) && (nb_a<=1)) return GF_ISOM_BRAND_ISMA;
 		return GF_ISOM_BRAND_MP42;
 	}
 
@@ -3556,7 +3675,7 @@
 	*rvc_predefined = entry->rvcc->predefined_rvc_config;
 	if (entry->rvcc->rvc_meta_idx) {
 		if (!data || !size) return GF_OK;
-		return gf_isom_extract_meta_item_mem(movie, GF_FALSE, track, entry->rvcc->rvc_meta_idx, data, size, mime);
+		return gf_isom_extract_meta_item_mem(movie, GF_FALSE, track, entry->rvcc->rvc_meta_idx, data, size, mime, GF_FALSE);
 	}
 	return GF_OK;
 }
@@ -3593,6 +3712,49 @@
 }
 
 GF_EXPORT
+void gf_isom_reset_seq_num(GF_ISOFile *movie)
+{
+#ifdef GPAC_DISABLE_ISOM_FRAGMENTS
+	movie->NextMoofNumber = 0;
+#endif
+}
+
+GF_EXPORT
+void gf_isom_reset_sample_count(GF_ISOFile *movie)
+{
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	u32 i;
+	if (!movie) return;
+	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
+		GF_TrackBox *trak = (GF_TrackBox*)gf_list_get(movie->moov->trackList, i);
+		trak->Media->information->sampleTable->SampleSize->sampleCount = 0;
+		trak->sample_count_at_seg_start = 0;
+	}
+	movie->NextMoofNumber = 0;
+#endif
+}
+
+GF_EXPORT
+Bool gf_isom_has_cenc_sample_group(GF_ISOFile *the_file, u32 trackNumber)
+{
+	GF_TrackBox *trak;
+	u32 i, count;
+
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_FALSE;
+	if (!trak->Media->information->sampleTable->sampleGroups) return GF_FALSE;
+
+	count = gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription);
+	for (i=0; i<count; i++) {
+		GF_SampleGroupDescriptionBox *sgdesc = (GF_SampleGroupDescriptionBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, i);
+		if (sgdesc->grouping_type==GF_ISOM_SAMPLE_GROUP_SEIG) {
+			return GF_TRUE;
+		}
+	}
+	return GF_FALSE;
+}
+
+GF_EXPORT
 GF_Err gf_isom_get_sample_rap_roll_info(GF_ISOFile *the_file, u32 trackNumber, u32 sample_number, Bool *is_rap, Bool *has_roll, s32 *roll_distance)
 {
 	GF_TrackBox *trak;
@@ -3611,10 +3773,11 @@
 		for (i=0; i<count; i++) {
 			GF_SampleGroupDescriptionBox *sgdesc = (GF_SampleGroupDescriptionBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, i);
 			switch (sgdesc->grouping_type) {
-			case GF_4CC('r','a','p',' '):
+			case GF_ISOM_SAMPLE_GROUP_RAP:
+			case GF_ISOM_SAMPLE_GROUP_SYNC:
 				if (is_rap) *is_rap = GF_TRUE;
 				break;
-			case GF_4CC('r','o','l','l'):
+			case GF_ISOM_SAMPLE_GROUP_ROLL:
 				if (has_roll) *has_roll = GF_TRUE;
 				if (roll_distance) {
 					s32 max_roll = 0;
@@ -3652,7 +3815,7 @@
 			break;
 		}
 		/*no sampleGroup info associated*/
-		if (!group_desc_index) continue;
+		if (group_desc_index <= 1) continue;
 
 		sgdesc = NULL;
 		for (j=0; j<gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription); j++) {
@@ -3664,10 +3827,11 @@
 		if (!sgdesc) continue;
 
 		switch (sgdesc->grouping_type) {
-		case GF_4CC('r','a','p',' '):
+		case GF_ISOM_SAMPLE_GROUP_RAP:
+		case GF_ISOM_SAMPLE_GROUP_SYNC:
 			if (is_rap) *is_rap = GF_TRUE;
 			break;
-		case GF_4CC('r','o','l','l'):
+		case GF_ISOM_SAMPLE_GROUP_ROLL:
 			if (has_roll) *has_roll = GF_TRUE;
 			if (roll_distance) {
 				GF_RollRecoveryEntry *roll_entry = (GF_RollRecoveryEntry *) gf_list_get(sgdesc->group_descriptions, group_desc_index - 1);
@@ -3716,11 +3880,12 @@
 	if (!sg_entry) return GF_FALSE;
 
 	switch (grouping_type) {
-	case GF_4CC('r','a','p',' '):
-	case GF_4CC('r','o','l','l'):
-	case GF_4CC( 's', 'e', 'i', 'g' ):
-	case GF_4CC( 'o', 'i', 'n', 'f' ):
-	case GF_4CC( 'l', 'i', 'n', 'f' ):
+	case GF_ISOM_SAMPLE_GROUP_RAP:
+	case GF_ISOM_SAMPLE_GROUP_SYNC:
+	case GF_ISOM_SAMPLE_GROUP_ROLL:
+	case GF_ISOM_SAMPLE_GROUP_SEIG:
+	case GF_ISOM_SAMPLE_GROUP_OINF:
+	case GF_ISOM_SAMPLE_GROUP_LINF:
 		return GF_TRUE;
 	default:
 		if (sg_entry && data) *data = (char *) sg_entry->data;
@@ -3852,6 +4017,8 @@
 		switch (gf_isom_get_media_subtype(file, i+1, 1)) {
 		case GF_ISOM_SUBTYPE_LHV1:
 		case GF_ISOM_SUBTYPE_LHE1:
+		case GF_ISOM_SUBTYPE_HVC2:
+		case GF_ISOM_SUBTYPE_HEV2:
 			if (gf_isom_get_reference_count(file, i+1, GF_ISOM_REF_BASE) > 0) {
 				return GF_TRUE;
 			}
@@ -3889,6 +4056,29 @@
 }
 
 GF_EXPORT
+GF_Err gf_isom_get_pssh(GF_ISOFile *file, u32 pssh_index, u8 **pssh_data, u32 *pssh_size)
+{
+	GF_Err e;
+	u32 i=0;
+	GF_BitStream *bs;
+	u32 count=1;
+	GF_Box *pssh;
+	while ((pssh = (GF_Box *)gf_list_enum(file->moov->other_boxes, &i))) {
+		if (pssh->type != GF_ISOM_BOX_TYPE_PSSH) continue;
+		if (count == pssh_index) break;
+		count++;
+	}
+	if (!pssh) return GF_BAD_PARAM;
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	e = gf_isom_box_write(pssh, bs);
+	if (!e) {
+		gf_bs_get_content(bs, (char **)pssh_data, pssh_size);
+	}
+	gf_bs_del(bs);
+	return e;
+}
+
+GF_EXPORT
 GF_Err gf_isom_get_pssh_info(GF_ISOFile *file, u32 pssh_index, bin128 SystemID, u32 *KID_count, const bin128 **KIDs, const u8 **private_data, u32 *private_data_size)
 {
 	u32 count=1;
@@ -3901,11 +4091,11 @@
 	}
 	if (!pssh) return GF_BAD_PARAM;
 
-	memcpy(SystemID, pssh->SystemID, 16);
-	*KID_count = pssh->KID_count;
-	*KIDs = (const bin128 *) pssh->KIDs;
-	*private_data_size = pssh->private_data_size;
-	*private_data = pssh->private_data;
+	if (SystemID) memcpy(SystemID, pssh->SystemID, 16);
+	if (KID_count) *KID_count = pssh->KID_count;
+	if (KIDs) *KIDs = (const bin128 *) pssh->KIDs;
+	if (private_data_size) *private_data_size = pssh->private_data_size;
+	if (private_data) *private_data = pssh->private_data;
 	return GF_OK;
 }
 
@@ -3922,7 +4112,6 @@
 	u32 i, count;
 	u32 descIndex, chunkNum;
 	u64 offset;
-	u8 edit;
 	u32 first_sample_in_entry, last_sample_in_entry;
 	GF_CENCSampleEncryptionGroupEntry *entry;
 
@@ -3934,21 +4123,18 @@
 	if (constant_IV_size) *constant_IV_size = 0;
 	if (constant_IV) memset(*constant_IV, 0, 16);
 
-	if (!senc) return GF_BAD_PARAM;
-
 #ifdef	GPAC_DISABLE_ISOM_FRAGMENTS
 	if (traf)
 		return GF_BAD_PARAM;
 #endif
 
-	if (trak->Media->information->sampleTable->SampleSize && trak->Media->information->sampleTable->SampleSize->sampleCount>=sample_number) {
-		stbl_GetSampleInfos(trak->Media->information->sampleTable, sample_number, &offset, &chunkNum, &descIndex, &edit);
+	if (trak && 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);
 	} else {
 		//this is dump mode of fragments, we haven't merged tables yet :(
 		descIndex = 1;
 	}
-	gf_isom_cenc_get_default_info_ex(trak, descIndex, IsEncrypted, IV_size, KID);
-
+	gf_isom_cenc_get_default_info_ex(trak, descIndex, IsEncrypted, IV_size, KID, constant_IV_size, constant_IV, crypt_byte_block, skip_byte_block);
 
 	sample_group = NULL;
 	group_desc_index = 0;
@@ -3956,7 +4142,7 @@
 		count = gf_list_count(trak->Media->information->sampleTable->sampleGroups);
 		for (i=0; i<count; i++) {
 			sample_group = (GF_SampleGroupBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroups, i);
-			if (sample_group->grouping_type == GF_4CC( 's', 'e', 'i', 'g' ))
+			if (sample_group->grouping_type == GF_ISOM_SAMPLE_GROUP_SEIG)
 				break;
 			sample_group = NULL;
 		}
@@ -3980,7 +4166,7 @@
 		for (i=0; i<count; i++) {
 			group_desc_index = 0;
 			sample_group = (GF_SampleGroupBox*)gf_list_get(traf->sampleGroups, i);
-			if (sample_group->grouping_type == GF_4CC( 's', 'e', 'i', 'g' ))
+			if (sample_group->grouping_type == GF_ISOM_SAMPLE_GROUP_SEIG)
 				break;
 			sample_group = NULL;
 		}
@@ -4037,7 +4223,7 @@
 exit:
 
 	//in PIFF we may have default values if no TENC is present: 8 bytes for IV size
-	if ((senc->is_piff || (trak->moov && trak->moov->mov->is_smooth) ) && !(*IV_size) ) {
+	if (( (senc && senc->is_piff) || (trak->moov && trak->moov->mov->is_smooth) ) && !(*IV_size) ) {
 		if (!senc->is_piff) {
 			senc->is_piff = GF_TRUE;
 			senc->IV_size=8;
@@ -4094,6 +4280,13 @@
 #endif
 }
 
+GF_EXPORT
+Bool gf_isom_is_smooth_streaming_moov(GF_ISOFile *the_file)
+{
+	return the_file ? the_file->is_smooth : GF_FALSE;
+}
+
+
 void gf_isom_parse_trif_info(const char *data, u32 size, u32 *id, u32 *independent, Bool *full_picture, u32 *x, u32 *y, u32 *w, u32 *h)
 {
 	GF_BitStream *bs;
@@ -4123,7 +4316,7 @@
 	const char *data;
 	u32 size;
 
-	if (!gf_isom_get_sample_group_info(file, trackNumber, sample_description_index, GF_4CC('t','r','i','f'), default_sample_group_index, &data, &size))
+	if (!gf_isom_get_sample_group_info(file, trackNumber, sample_description_index, GF_ISOM_SAMPLE_GROUP_TRIF, default_sample_group_index, &data, &size))
 		return GF_FALSE;
 	gf_isom_parse_trif_info(data, size, id, independent, full_picture, x, y, w, h);
 	return GF_TRUE;
@@ -4150,9 +4343,102 @@
 		if (!trak) return GF_FALSE;
 	}
 
-	*ptr = (GF_OperatingPointsInformation *) gf_isom_get_sample_group_info_entry(file, trak, GF_4CC('o','i','n','f'), 1, &def_index, NULL);
+	*ptr = (GF_OperatingPointsInformation *) gf_isom_get_sample_group_info_entry(file, trak, GF_ISOM_SAMPLE_GROUP_OINF, 1, &def_index, NULL);
 
 	return *ptr ? GF_TRUE : GF_FALSE;
 }
 
+GF_EXPORT
+Bool gf_isom_is_video_subtype(u32 mtype)
+{
+	switch (mtype) {
+	case GF_ISOM_MEDIA_VISUAL:
+	case GF_ISOM_MEDIA_AUXV:
+	case GF_ISOM_MEDIA_PICT:
+		return GF_TRUE;
+	default:
+		return GF_FALSE;
+	}
+}
+
+GF_EXPORT
+GF_Err gf_isom_get_bitrate(GF_ISOFile *movie, u32 trackNumber, u32 sampleDescIndex, u32 *average_bitrate, u32 *max_bitrate, u32 *decode_buffer_size)
+{
+	GF_BitRateBox *a;
+	u32 i, count, mrate, arate, dbsize, type;
+	GF_SampleEntryBox *ent;
+	GF_ProtectionSchemeInfoBox *sinf;
+	GF_TrackBox *trak;
+	GF_ESDBox *esd;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media) return GF_BAD_PARAM;
+
+	mrate = arate = dbsize = 0;
+	count = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+	for (i=0; i<count; i++) {
+		if ((sampleDescIndex>0) && (i+1 != sampleDescIndex)) continue;
+
+		ent = (GF_SampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, i);
+		if (!ent) return GF_BAD_PARAM;
+		a = gf_isom_sample_entry_get_bitrate(ent, GF_FALSE);
+		if (a) {
+			if (mrate<a->maxBitrate) mrate = a->maxBitrate;
+			if (arate<a->avgBitrate) arate = a->avgBitrate;
+			if (dbsize<a->bufferSizeDB) dbsize = a->bufferSizeDB;
+			continue;
+		}
+		type = ent->type;
+		switch (type) {
+		case GF_ISOM_BOX_TYPE_ENCV:
+		case GF_ISOM_BOX_TYPE_ENCA:
+		case GF_ISOM_BOX_TYPE_ENCS:
+			sinf = gf_list_get(ent->protections, 0);
+			if (sinf && sinf->original_format) type = sinf->original_format->data_format;
+			break;
+		}
+		esd = NULL;
+		switch (type) {
+		case GF_ISOM_BOX_TYPE_MP4V:
+			esd = ((GF_MPEGVisualSampleEntryBox *)ent)->esd;
+			break;
+		case GF_ISOM_BOX_TYPE_MP4A:
+			esd = ((GF_MPEGAudioSampleEntryBox *)ent)->esd;
+			break;
+		case GF_ISOM_BOX_TYPE_MP4S:
+			esd = ((GF_MPEGSampleEntryBox *)ent)->esd;
+			break;
+		}
+		if (esd && esd->desc && esd->desc->decoderConfig) {
+			if (mrate<esd->desc->decoderConfig->maxBitrate) mrate = esd->desc->decoderConfig->maxBitrate;
+			if (arate<esd->desc->decoderConfig->avgBitrate) arate = esd->desc->decoderConfig->avgBitrate;
+			if (dbsize<esd->desc->decoderConfig->bufferSizeDB) dbsize = esd->desc->decoderConfig->bufferSizeDB;
+		}
+	}
+	if (average_bitrate) *average_bitrate = arate;
+	if (max_bitrate) *max_bitrate = mrate;
+	if (decode_buffer_size) *decode_buffer_size = dbsize;
+	return GF_OK;
+}
+
+GF_EXPORT
+Bool gf_isom_sample_was_traf_start(GF_ISOFile *movie, u32 trackNumber, u32 sampleNum)
+{
+	u32 i;
+	GF_TrackBox *trak;
+	GF_TrafToSampleMap *tmap;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media) return GF_FALSE;
+	if (!trak->Media->information->sampleTable->traf_map) return GF_FALSE;
+
+	tmap = trak->Media->information->sampleTable->traf_map;
+	if (!tmap) return GF_FALSE;
+	for (i=0; i<tmap->nb_entries; i++) {
+		if (tmap->sample_num[i] == sampleNum) return GF_TRUE;
+		if (tmap->sample_num[i] > sampleNum) return GF_FALSE;
+	}
+	return GF_FALSE;
+}
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.7.1.tar.gz/src/isomedia/isom_store.c -> gpac-0.8.0.tar.gz/src/isomedia/isom_store.c Changed

@@ -3,7 +3,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2019
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -68,10 +68,17 @@
 	u32 timeScale;
 	/*this is for generic, time-based interleaving. Expressed in Media TimeScale*/
 	u32 chunkDur;
+	u32 chunkSize;
+	u32 constant_size, constant_dur;
+
 	u64 DTSprev;
 	u8 isDone;
 	u64 prev_offset;
 	GF_MediaBox *mdia;
+	GF_SampleTableBox *stbl;
+
+	u32 all_dref_mode;
+
 	/*each writer has a sampleToChunck and ChunkOffset tables
 	these tables are filled during emulation mode and then will	replace the table in the GF_SampleTableBox*/
 	GF_SampleToChunkBox *stsc;
@@ -107,6 +114,7 @@
 	while ((writer = (TrackWriter *)gf_list_enum(writers, &i))) {
 		writer->isDone = 0;
 		writer->chunkDur = 0;
+		writer->chunkSize = 0;
 		writer->DTSprev = 0;
 		writer->sampleNumber = 1;
 		gf_isom_box_del((GF_Box *)writer->stsc);
@@ -143,20 +151,35 @@
 		if (!writer) goto exit;
 		writer->sampleNumber = 1;
 		writer->mdia = trak->Media;
+		writer->stbl = trak->Media->information->sampleTable;
 		writer->timeScale = trak->Media->mediaHeader->timeScale;
+		writer->all_dref_mode = Media_SelfContainedType(writer->mdia);
+
 		writer->isDone = 0;
 		writer->DTSprev = 0;
 		writer->chunkDur = 0;
+		writer->chunkSize = 0;
+		writer->constant_size = writer->constant_dur = 0;
+		if (writer->stbl->SampleSize->sampleSize)
+			writer->constant_size = writer->stbl->SampleSize->sampleSize;
+		if (writer->stbl->TimeToSample->nb_entries==1) {
+			writer->constant_dur = writer->stbl->TimeToSample->entries[0].sampleDelta;
+			if (writer->constant_dur>1) writer->constant_dur = 0;
+		}
+		if (!writer->constant_dur || !writer->constant_size || (writer->constant_size>=10))
+			writer->constant_size = writer->constant_dur = 0;
+
 		writer->stsc = (GF_SampleToChunkBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSC);
-		if (trak->Media->information->sampleTable->ChunkOffset->type == GF_ISOM_BOX_TYPE_STCO) {
+		if (writer->stbl->ChunkOffset->type == GF_ISOM_BOX_TYPE_STCO) {
 			writer->stco = gf_isom_box_new(GF_ISOM_BOX_TYPE_STCO);
 		} else {
 			writer->stco = gf_isom_box_new(GF_ISOM_BOX_TYPE_CO64);
 		}
 		/*stops from chunk escape*/
-		if (interleaving) writer->mdia->information->sampleTable->MaxSamplePerChunk = 0;
+		if (interleaving) writer->stbl->MaxSamplePerChunk = 0;
 		/*for progress, assume only one descIndex*/
-		if (Media_IsSelfContained(writer->mdia, 1)) mw->total_samples += trak->Media->information->sampleTable->SampleSize->sampleCount;
+		if (Media_IsSelfContained(writer->mdia, 1))
+			mw->total_samples += writer->stbl->SampleSize->sampleCount;
 		/*optimization for interleaving: put audio last (this can be overriden by priorities)*/
 		if (movie->storageMode != GF_ISOM_STORE_INTERLEAVED) {
 			gf_list_add(writers, writer);
@@ -212,7 +235,8 @@
 		//we have to proceed entry by entry in case a part of the media is not self-contained...
 		for (j=0; j<writer->stsc->nb_entries; j++) {
 			ent = &writer->stsc->entries[j];
-			if (!Media_IsSelfContained(writer->mdia, ent->sampleDescriptionIndex)) continue;
+			if ((writer->all_dref_mode==ISOM_DREF_EXT) || !Media_IsSelfContained(writer->mdia, ent->sampleDescriptionIndex))
+				continue;
 
 			//OK, get the chunk(s) number(s) and "shift" its (their) offset(s).
 			if (writer->stco->type == GF_ISOM_BOX_TYPE_STCO) {
@@ -288,10 +312,10 @@
 		i=0;
 		while ((writer = (TrackWriter*)gf_list_enum(writers, &i))) {
 			//don't delete them !!!
-			stsc = writer->mdia->information->sampleTable->SampleToChunk;
-			stco = writer->mdia->information->sampleTable->ChunkOffset;
-			writer->mdia->information->sampleTable->SampleToChunk = writer->stsc;
-			writer->mdia->information->sampleTable->ChunkOffset = writer->stco;
+			stsc = writer->stbl->SampleToChunk;
+			stco = writer->stbl->ChunkOffset;
+			writer->stbl->SampleToChunk = writer->stsc;
+			writer->stbl->ChunkOffset = writer->stco;
 			writer->stco = stco;
 			writer->stsc = stsc;
 		}
@@ -306,10 +330,10 @@
 			//don't delete them !!!
 			stsc = writer->stsc;
 			stco = writer->stco;
-			writer->stsc = writer->mdia->information->sampleTable->SampleToChunk;
-			writer->stco = writer->mdia->information->sampleTable->ChunkOffset;
-			writer->mdia->information->sampleTable->SampleToChunk = stsc;
-			writer->mdia->information->sampleTable->ChunkOffset = stco;
+			writer->stsc = writer->stbl->SampleToChunk;
+			writer->stco = writer->stbl->ChunkOffset;
+			writer->stbl->SampleToChunk = stsc;
+			writer->stbl->ChunkOffset = stco;
 		}
 		if (e) return e;
 	}
@@ -331,8 +355,8 @@
 
 		i=0;
 		while ((writer = (TrackWriter*)gf_list_enum(writers, &i))) {
-			size -= writer->mdia->information->sampleTable->ChunkOffset->size;
-			size -= writer->mdia->information->sampleTable->SampleToChunk->size;
+			size -= writer->stbl->ChunkOffset->size;
+			size -= writer->stbl->SampleToChunk->size;
 			gf_isom_box_size((GF_Box *)writer->stsc);
 			gf_isom_box_size(writer->stco);
 			size += writer->stsc->size;
@@ -350,7 +374,7 @@
 }
 
 //Write a sample to the file - this is only called for self-contained media
-GF_Err WriteSample(MovieWriter *mw, u32 size, u64 offset, u8 isEdited, GF_BitStream *bs)
+GF_Err WriteSample(MovieWriter *mw, u32 size, u64 offset, u8 isEdited, GF_BitStream *bs, u32 nb_samp)
 {
 	GF_DataMap *map;
 	u32 bytes;
@@ -378,11 +402,57 @@
 	if (bytes != size)
 		return GF_IO_ERR;
 
-	mw->nb_done++;
+	mw->nb_done+=nb_samp;
 	gf_set_progress("ISO File Writing", mw->nb_done, mw->total_samples);
 	return GF_OK;
 }
 
+//flush as much as possible from current chunk for constand size and duration (typically raw audio)
+// We don't want to write samples outside of the current source chunk
+//since the next chunk might be edited (different bitstream object), which would complexify WriteSample code
+//not flushing the chunk will work, but result in very slow writing of raw audio
+void update_writer_constant_dur(GF_ISOFile *movie, TrackWriter *tkw, GF_StscEntry *stsc_ent, u32 *nb_samp, u32 *samp_size, Bool is_flat)
+{
+	u64 chunk_dur;
+	u32 nb_in_run;
+	u32 samp_idx_in_chunk, nb_samp_left_in_src_chunk;
+	if (!tkw->constant_dur) return;
+
+	samp_idx_in_chunk = tkw->sampleNumber - tkw->stbl->SampleToChunk->firstSampleInCurrentChunk;
+	nb_samp_left_in_src_chunk = stsc_ent->samplesPerChunk - samp_idx_in_chunk;
+
+	if (nb_samp_left_in_src_chunk<=1) return;
+
+	if (is_flat) {
+		nb_in_run = nb_samp_left_in_src_chunk;
+	} else {
+
+		chunk_dur = movie->interleavingTime * tkw->timeScale;
+		chunk_dur /= movie->moov->mvhd->timeScale;
+		chunk_dur -= tkw->chunkDur;
+
+		if (chunk_dur <= tkw->chunkDur) return;
+
+		chunk_dur -= tkw->constant_dur;
+
+		nb_in_run = (u32) (chunk_dur / tkw->constant_dur);
+
+		if (nb_in_run > nb_samp_left_in_src_chunk) {
+			nb_in_run = nb_samp_left_in_src_chunk;
+		}
+	}
+	if (tkw->sampleNumber + nb_in_run >= tkw->stbl->SampleSize->sampleCount) {
+		nb_in_run = tkw->stbl->SampleSize->sampleCount - tkw->sampleNumber;
+	}
+
+	chunk_dur = nb_in_run * tkw->constant_dur;
+
+	tkw->chunkDur += (u32) chunk_dur;
+	tkw->DTSprev += chunk_dur - tkw->constant_dur; //because nb_samp += nb_in_run-1
+
+	*nb_samp = nb_in_run;
+	*samp_size = nb_in_run * tkw->constant_size;
+}
 
 GF_Err DoWriteMeta(GF_ISOFile *file, GF_MetaBox *meta, GF_BitStream *bs, Bool Emulation, u64 baseOffset, u64 *mdatSize)
 {
@@ -524,7 +594,8 @@
 	TrackWriter *writer;
 	u64 offset, sampOffset, predOffset;
 	u32 chunkNumber, descIndex, sampSize;
-	u8 isEdited, force;
+	Bool force;
+	GF_StscEntry *stsc_ent;
 	u64 size, mdatSize = 0;
 	GF_ISOFile *movie = mw->movie;
 
@@ -558,16 +629,20 @@
 	i=0;
 	while ((writer = (TrackWriter*)gf_list_enum(writers, &i))) {
 		while (!writer->isDone) {
+			Bool self_contained;
+			u32 nb_samp=1;
 			//To Check: are empty sample tables allowed ???
-			if (writer->sampleNumber > writer->mdia->information->sampleTable->SampleSize->sampleCount) {
+			if (writer->sampleNumber > writer->stbl->SampleSize->sampleCount) {
 				writer->isDone = 1;
 				continue;
 			}
-			e = stbl_GetSampleInfos(writer->mdia->information->sampleTable, writer->sampleNumber, &sampOffset, &chunkNumber, &descIndex, &isEdited);
+			e = stbl_GetSampleInfos(writer->stbl, writer->sampleNumber, &sampOffset, &chunkNumber, &descIndex, &stsc_ent);
 			if (e) return e;
-			e = stbl_GetSampleSize(writer->mdia->information->sampleTable->SampleSize, writer->sampleNumber, &sampSize);
+			e = stbl_GetSampleSize(writer->stbl->SampleSize, writer->sampleNumber, &sampSize);
 			if (e) return e;
 
+			update_writer_constant_dur(movie, writer, stsc_ent, &nb_samp, &sampSize, GF_TRUE);
+
 			//update our chunks.
 			force = 0;
 			if (movie->openMode == GF_ISOM_OPEN_WRITE) {
@@ -575,9 +650,18 @@
 				if (predOffset != offset)
 					force = 1;
 			}
+
+			if (writer->stbl->MaxChunkSize && (writer->chunkSize + sampSize > writer->stbl->MaxChunkSize)) {
+				writer->chunkSize = 0;
+				force = 1;
+			}
+			writer->chunkSize += sampSize;
+
+			self_contained = ((writer->all_dref_mode==ISOM_DREF_SELF) || Media_IsSelfContained(writer->mdia, descIndex) ) ? GF_TRUE : GF_FALSE;
+
 			//update our global offset...
-			if (Media_IsSelfContained(writer->mdia, descIndex) ) {
-				e = stbl_SetChunkAndOffset(writer->mdia->information->sampleTable, writer->sampleNumber, descIndex, writer->stsc, &writer->stco, offset, force);
+			if (self_contained) {
+				e = stbl_SetChunkAndOffset(writer->stbl, writer->sampleNumber, descIndex, writer->stsc, &writer->stco, offset, force, nb_samp);
 				if (e) return e;
 				if (movie->openMode == GF_ISOM_OPEN_WRITE) {
 					predOffset = sampOffset + sampSize;
@@ -589,21 +673,21 @@
 				if (predOffset != offset) force = 1;
 				predOffset = sampOffset + sampSize;
 				//we have a DataRef, so use the offset idicated in sampleToChunk and ChunkOffset tables...
-				e = stbl_SetChunkAndOffset(writer->mdia->information->sampleTable, writer->sampleNumber, descIndex, writer->stsc, &writer->stco, sampOffset, force);
+				e = stbl_SetChunkAndOffset(writer->stbl, writer->sampleNumber, descIndex, writer->stsc, &writer->stco, sampOffset, force, nb_samp);
 				if (e) return e;
 			}
 			//we write the sample if not emulation
 			if (!Emulation) {
-				if (Media_IsSelfContained(writer->mdia, descIndex) ) {
-					e = WriteSample(mw, sampSize, sampOffset, isEdited, bs);
+				if (self_contained) {
+					e = WriteSample(mw, sampSize, sampOffset, stsc_ent->isEdited, bs, 1);
 					if (e) return e;
 				}
 			}
 			//ok, the track is done
-			if (writer->sampleNumber == writer->mdia->information->sampleTable->SampleSize->sampleCount) {
+			if (writer->sampleNumber >= writer->stbl->SampleSize->sampleCount) {
 				writer->isDone = 1;
 			} else {
-				writer->sampleNumber ++;
+				writer->sampleNumber += nb_samp;
 			}
 		}
 	}
@@ -637,7 +721,7 @@
 			if (!totSize) {
 				if (movie->is_jp2) {
 					gf_bs_write_u32(movie->editFileMap->bs, 12);
-					gf_bs_write_u32(movie->editFileMap->bs, GF_4CC('j','P',' ',' '));
+					gf_bs_write_u32(movie->editFileMap->bs, GF_ISOM_BOX_TYPE_JP);
 					gf_bs_write_u32(movie->editFileMap->bs, 0x0D0A870A);
 					totSize += 12;
 					begin += 12;
@@ -667,7 +751,7 @@
 		} else {
 			if (movie->is_jp2) {
 				gf_bs_write_u32(bs, 12);
-				gf_bs_write_u32(bs, GF_4CC('j','P',' ',' '));
+				gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_JP);
 				gf_bs_write_u32(bs, 0x0D0A870A);
 			}
 			if (movie->brand) {
@@ -768,7 +852,7 @@
 
 	if (movie->is_jp2) {
 		gf_bs_write_u32(bs, 12);
-		gf_bs_write_u32(bs, GF_4CC('j','P',' ',' '));
+		gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_JP);
 		gf_bs_write_u32(bs, 0x0D0A870A);
 	}
 	if (movie->brand) {
@@ -850,7 +934,8 @@
 	s64 res;
 	u32 descIndex, sampSize, chunkNumber;
 	u16 curGroupID, curTrackPriority;
-	u8 forceNewChunk, writeGroup, isEdited;
+	Bool forceNewChunk, writeGroup;
+	GF_StscEntry *stsc_ent;
 	//this is used to emulate the write ...
 	u64 offset, totSize, sampOffset;
 	GF_ISOFile *movie = mw->movie;
@@ -869,6 +954,8 @@
 
 		//proceed a group
 		while (writeGroup) {
+			u32 nb_samp = 1;
+			Bool self_contained, chunked_forced=GF_FALSE;
 			//first get the appropriated sample for the min time in this group
 			curWriter = NULL;
 			DTStmp = (u64) -1;
@@ -880,15 +967,15 @@
 
 				//is it done writing ?
 				//is it in our group ??
-				if (tmp->isDone || tmp->mdia->information->sampleTable->groupID != curGroupID) continue;
+				if (tmp->isDone || tmp->stbl->groupID != curGroupID) continue;
 
 				//OK, get the current sample in this track
-				stbl_GetSampleDTS(tmp->mdia->information->sampleTable->TimeToSample, tmp->sampleNumber, &DTS);
+				stbl_GetSampleDTS(tmp->stbl->TimeToSample, tmp->sampleNumber, &DTS);
 				res = TStmp ? DTStmp * tmp->timeScale - DTS * TStmp : 0;
 				if (res < 0) continue;
-				if ((!res) && curTrackPriority <= tmp->mdia->information->sampleTable->trackPriority) continue;
+				if ((!res) && curTrackPriority <= tmp->stbl->trackPriority) continue;
 				curWriter = tmp;
-				curTrackPriority = tmp->mdia->information->sampleTable->trackPriority;
+				curTrackPriority = tmp->stbl->trackPriority;
 				DTStmp = DTS;
 				TStmp = tmp->timeScale;
 			}
@@ -899,28 +986,40 @@
 				continue;
 			}
 			//To Check: are empty sample tables allowed ???
-			if (curWriter->sampleNumber > curWriter->mdia->information->sampleTable->SampleSize->sampleCount) {
+			if (curWriter->sampleNumber > curWriter->stbl->SampleSize->sampleCount) {
 				curWriter->isDone = 1;
 				tracksDone ++;
 				continue;
 			}
 
-			e = stbl_GetSampleInfos(curWriter->mdia->information->sampleTable, curWriter->sampleNumber, &sampOffset, &chunkNumber, &descIndex, &isEdited);
+			e = stbl_GetSampleInfos(curWriter->stbl, curWriter->sampleNumber, &sampOffset, &chunkNumber, &descIndex, &stsc_ent);
 			if (e) return e;
-			e = stbl_GetSampleSize(curWriter->mdia->information->sampleTable->SampleSize, curWriter->sampleNumber, &sampSize);
+			e = stbl_GetSampleSize(curWriter->stbl->SampleSize, curWriter->sampleNumber, &sampSize);
 			if (e) return e;
 
+			update_writer_constant_dur(movie, curWriter, stsc_ent, &nb_samp, &sampSize, GF_FALSE);
+
+			if (curWriter->stbl->MaxChunkSize && (curWriter->chunkSize + sampSize > curWriter->stbl->MaxChunkSize)) {
+				curWriter->chunkSize = 0;
+				chunked_forced = forceNewChunk = 1;
+			}
+			curWriter->chunkSize += sampSize;
+
+			self_contained = ((curWriter->all_dref_mode==ISOM_DREF_SELF) || Media_IsSelfContained(curWriter->mdia, descIndex) ) ? GF_TRUE : GF_FALSE;
+
 			//do we actually write, or do we emulate ?
 			if (Emulation) {
 				//are we in the same track ??? If not, force a new chunk when adding this sample
-				if (curWriter != prevWriter) {
-					forceNewChunk = 1;
-				} else {
-					forceNewChunk = 0;
+				if (!chunked_forced) {
+					if (curWriter != prevWriter) {
+						forceNewChunk = 1;
+					} else {
+						forceNewChunk = 0;
+					}
 				}
 				//update our offsets...
-				if (Media_IsSelfContained(curWriter->mdia, descIndex) ) {
-					e = stbl_SetChunkAndOffset(curWriter->mdia->information->sampleTable, curWriter->sampleNumber, descIndex, curWriter->stsc, &curWriter->stco, offset, forceNewChunk);
+				if (self_contained) {
+					e = stbl_SetChunkAndOffset(curWriter->stbl, curWriter->sampleNumber, descIndex, curWriter->stsc, &curWriter->stco, offset, forceNewChunk, nb_samp);
 					if (e) return e;
 					offset += sampSize;
 					totSize += sampSize;
@@ -930,23 +1029,23 @@
 
 					//we have a DataRef, so use the offset idicated in sampleToChunk
 					//and ChunkOffset tables...
-					e = stbl_SetChunkAndOffset(curWriter->mdia->information->sampleTable, curWriter->sampleNumber, descIndex, curWriter->stsc, &curWriter->stco, sampOffset, 0);
+					e = stbl_SetChunkAndOffset(curWriter->stbl, curWriter->sampleNumber, descIndex, curWriter->stsc, &curWriter->stco, sampOffset, chunked_forced, nb_samp);
 					if (e) return e;
 				}
 			} else {
 				//this is no game, we're writing ....
-				if (Media_IsSelfContained(curWriter->mdia, descIndex) ) {
-					e = WriteSample(mw, sampSize, sampOffset, isEdited, bs);
+				if (self_contained) {
+					e = WriteSample(mw, sampSize, sampOffset, stsc_ent->isEdited, bs, 1);
 					if (e) return e;
 				}
 			}
 			//ok, the sample is done
-			if (curWriter->sampleNumber == curWriter->mdia->information->sampleTable->SampleSize->sampleCount) {
+			if (curWriter->sampleNumber == curWriter->stbl->SampleSize->sampleCount) {
 				curWriter->isDone = 1;
 				//one more track done...
 				tracksDone ++;
 			} else {
-				curWriter->sampleNumber ++;
+				curWriter->sampleNumber += nb_samp;
 			}
 			prevWriter = curWriter;
 		}
@@ -959,6 +1058,8 @@
 	return GF_OK;
 }
 
+
+
 /*uncomment the following to easily test large file generation. This will prepend 4096*1MByte of 0 before the media data*/
 //#define TEST_LARGE_FILES
 
@@ -970,12 +1071,12 @@
 	u32 descIndex, sampSize, chunkNumber;
 	u64 DTS;
 	u16 curGroupID;
-	u8 forceNewChunk, writeGroup, isEdited;
+	Bool forceNewChunk, writeGroup;
+	GF_StscEntry *stsc_ent;
 	//this is used to emulate the write ...
 	u64 offset, sampOffset, size, mdatSize;
 	u32 count;
 	GF_ISOFile *movie = mw->movie;
-	if (!movie->moov || !movie->moov->mvhd) return GF_NON_COMPLIANT_BITSTREAM;
 
 	mdatSize = 0;
 
@@ -1007,24 +1108,25 @@
 		mdatSize += size;
 		StartOffset += (u32) size;
 	}
-	if (movie->moov && movie->moov->meta) {
-		e = DoWriteMeta(movie, movie->moov->meta, bs, Emulation, StartOffset, &size);
-		if (e) return e;
-		mdatSize += size;
-		StartOffset += (u32) size;
-	}
-	i=0;
-	while ((tmp = (TrackWriter*)gf_list_enum(writers, &i))) {
-		if (tmp->mdia->mediaTrack->meta) {
-			e = DoWriteMeta(movie, tmp->mdia->mediaTrack->meta, bs, Emulation, StartOffset, &size);
+	if (movie->moov) {
+		if (movie->moov->meta) {
+			e = DoWriteMeta(movie, movie->moov->meta, bs, Emulation, StartOffset, &size);
 			if (e) return e;
 			mdatSize += size;
 			StartOffset += (u32) size;
 		}
+		i=0;
+		while ((tmp = (TrackWriter*)gf_list_enum(writers, &i))) {
+			if (tmp->mdia->mediaTrack->meta) {
+				e = DoWriteMeta(movie, tmp->mdia->mediaTrack->meta, bs, Emulation, StartOffset, &size);
+				if (e) return e;
+				mdatSize += size;
+				StartOffset += (u32) size;
+			}
+		}
 	}
 
 
-
 	if (movie->storageMode == GF_ISOM_STORE_TIGHT)
 		return DoFullInterleave(mw, writers, bs, Emulation, StartOffset);
 
@@ -1057,23 +1159,25 @@
 				if (tmp->isDone) continue;
 
 				//is it in our group ??
-				if (tmp->mdia->information->sampleTable->groupID != curGroupID) continue;
+				if (tmp->stbl->groupID != curGroupID) continue;
 
 				//write till this chunk is full on this track...
 				while (1) {
+					Bool self_contained;
+					u32 nb_samp = 1;
 					//To Check: are empty sample tables allowed ???
-					if (tmp->sampleNumber > tmp->mdia->information->sampleTable->SampleSize->sampleCount) {
+					if (tmp->sampleNumber > tmp->stbl->SampleSize->sampleCount) {
 						tmp->isDone = 1;
 						tracksDone ++;
 						break;
 					}
 
 					//OK, get the current sample in this track
-					stbl_GetSampleDTS(tmp->mdia->information->sampleTable->TimeToSample, tmp->sampleNumber, &DTS);
+					stbl_GetSampleDTS(tmp->stbl->TimeToSample, tmp->sampleNumber, &DTS);
 
 					//can this sample fit in our chunk ?
 					if ( ( (DTS - tmp->DTSprev) + tmp->chunkDur) * movie->moov->mvhd->timeScale > movie->interleavingTime * tmp->timeScale
-					 /*drfit check: reject sample if outside our check window*/
+					 /*drift check: reject sample if outside our check window*/
 					 || (drift_inter && chunkLastDTS && ( ((u64)tmp->DTSprev*chunkLastScale) > ((u64)chunkLastDTS*tmp->timeScale)) )
 					 ) {
 						//in case the sample is longer than InterleaveTime
@@ -1096,17 +1200,30 @@
 					tmp->chunkDur += (u32) (DTS - tmp->DTSprev);
 					tmp->DTSprev = DTS;
 
-					e = stbl_GetSampleInfos(curWriter->mdia->information->sampleTable, curWriter->sampleNumber, &sampOffset, &chunkNumber, &descIndex, &isEdited);
-					if (e) return e;
-					e = stbl_GetSampleSize(curWriter->mdia->information->sampleTable->SampleSize, curWriter->sampleNumber, &sampSize);
-					if (e) return e;
+					e = stbl_GetSampleInfos(curWriter->stbl, curWriter->sampleNumber, &sampOffset, &chunkNumber, &descIndex, &stsc_ent);
+					if (e)
+						return e;
+					e = stbl_GetSampleSize(curWriter->stbl->SampleSize, curWriter->sampleNumber, &sampSize);
+					if (e)
+						return e;
+
+					self_contained = ((curWriter->all_dref_mode==ISOM_DREF_SELF) || Media_IsSelfContained(curWriter->mdia, descIndex)) ? GF_TRUE : GF_FALSE;
+
+					update_writer_constant_dur(movie, curWriter, stsc_ent, &nb_samp, &sampSize, GF_FALSE);
+
+					if (curWriter->stbl->MaxChunkSize && (curWriter->chunkSize + sampSize > curWriter->stbl->MaxChunkSize)) {
+						curWriter->chunkSize = 0;
+						forceNewChunk = 1;
+					}
+					curWriter->chunkSize += sampSize;
 
 					//do we actually write, or do we emulate ?
 					if (Emulation) {
 						//update our offsets...
-						if (Media_IsSelfContained(curWriter->mdia, descIndex) ) {
-							e = stbl_SetChunkAndOffset(curWriter->mdia->information->sampleTable, curWriter->sampleNumber, descIndex, curWriter->stsc, &curWriter->stco, offset, forceNewChunk);
-							if (e) return e;
+						if (self_contained) {
+							e = stbl_SetChunkAndOffset(curWriter->stbl, curWriter->sampleNumber, descIndex, curWriter->stsc, &curWriter->stco, offset, forceNewChunk, nb_samp);
+							if (e)
+								return e;
 							offset += sampSize;
 							mdatSize += sampSize;
 						} else {
@@ -1115,24 +1232,25 @@
 
 							//we have a DataRef, so use the offset idicated in sampleToChunk
 							//and ChunkOffset tables...
-							e = stbl_SetChunkAndOffset(curWriter->mdia->information->sampleTable, curWriter->sampleNumber, descIndex, curWriter->stsc, &curWriter->stco, sampOffset, forceNewChunk);
+							e = stbl_SetChunkAndOffset(curWriter->stbl, curWriter->sampleNumber, descIndex, curWriter->stsc, &curWriter->stco, sampOffset, forceNewChunk, nb_samp);
 							if (e) return e;
 						}
 					} else {
-						//this is no game, we're writing ....
-						if (Media_IsSelfContained(curWriter->mdia, descIndex) ) {
-							e = WriteSample(mw, sampSize, sampOffset, isEdited, bs);
-							if (e) return e;
+						//we're writing ....
+						if (self_contained) {
+							e = WriteSample(mw, sampSize, sampOffset, stsc_ent->isEdited, bs, nb_samp);
+							if (e)
+								return e;
 						}
 					}
 					//ok, the sample is done
-					if (curWriter->sampleNumber == curWriter->mdia->information->sampleTable->SampleSize->sampleCount) {
+					if (curWriter->sampleNumber >= curWriter->stbl->SampleSize->sampleCount) {
 						curWriter->isDone = 1;
 						//one more track done...
 						tracksDone ++;
 						break;
 					} else {
-						curWriter->sampleNumber ++;
+						curWriter->sampleNumber += nb_samp;
 					}
 				}
 				/*record chunk end-time & track timescale for drift-controled interleaving*/
@@ -1182,7 +1300,7 @@
 
 	if (movie->is_jp2) {
 		gf_bs_write_u32(bs, 12);
-		gf_bs_write_u32(bs, GF_4CC('j','P',' ',' '));
+		gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_JP);
 		gf_bs_write_u32(bs, 0x0D0A870A);
 	}
 	if (movie->brand) {
@@ -1320,11 +1438,6 @@
 			gf_bs_set_output_buffering(bs, buffer_size);
 		}
 
-		if (!movie->moov) {
-			/* in case of file with only a meta box, we force a flat storage */
-			movie->storageMode = GF_ISOM_STORE_FLAT;
-		}
-
 		switch (movie->storageMode) {
 		case GF_ISOM_STORE_TIGHT:
 		case GF_ISOM_STORE_INTERLEAVED:

gpac-0.7.1.tar.gz/src/isomedia/isom_write.c -> gpac-0.8.0.tar.gz/src/isomedia/isom_write.c Changed

@@ -24,7 +24,7 @@
 */
 
 #include <gpac/internal/isomedia_dev.h>
-
+#include <gpac/constants.h>
 #include <gpac/iso639.h>
 
 
@@ -173,7 +173,7 @@
 
 	if (!movie->moov->iods) AddMovieIOD(movie->moov, 0);
 	if (!movie->moov->iods) return GF_OUT_OF_MEM;
-	
+
 	switch (movie->moov->iods->descriptor->tag) {
 	case GF_ODF_ISOM_IOD_TAG:
 		esds = ((GF_IsomInitialObjectDescriptor *)movie->moov->iods->descriptor)->ES_ID_IncDescriptors;
@@ -285,7 +285,7 @@
 				break;
 			}
 		}
-		if (!elng && (strlen(code) != 3)) {
+		if (!elng && (strlen(code) > 3)) {
 			elng = (GF_ExtendedLanguageBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_ELNG);
 			if (!count) {
 				trak->Media->other_boxes = gf_list_new();
@@ -339,6 +339,7 @@
 	movie->moov->iods->descriptor = (GF_Descriptor *)iod;
 }
 
+GF_EXPORT
 GF_Err gf_isom_add_desc_to_root_od(GF_ISOFile *movie, GF_Descriptor *theDesc)
 {
 	GF_Err e;
@@ -376,7 +377,6 @@
 GF_EXPORT
 GF_Err gf_isom_set_timescale(GF_ISOFile *movie, u32 timeScale)
 {
-	Double ts_scale;
 	GF_TrackBox *trak;
 	u32 i;
 	GF_Err e;
@@ -387,25 +387,30 @@
 	if (movie->moov->mvhd->timeScale == timeScale) return GF_OK;
 
 	/*rewrite all durations and edit lists*/
-	ts_scale = timeScale;
-	ts_scale /= movie->moov->mvhd->timeScale;
-
-	movie->moov->mvhd->timeScale = timeScale;
-	movie->interleavingTime = timeScale;
-
-	movie->moov->mvhd->duration = (u64) (s64) ((s64) movie->moov->mvhd->duration * ts_scale);
-
+	movie->moov->mvhd->duration *= timeScale;
+	movie->moov->mvhd->duration /= movie->moov->mvhd->timeScale;
+	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;
+	}
+	
 	i=0;
 	while ((trak = (GF_TrackBox*)gf_list_enum(movie->moov->trackList, &i))) {
-		trak->Header->duration = (u64) (s64) ((s64) trak->Header->duration * ts_scale);
+		trak->Header->duration *= timeScale;
+		trak->Header->duration /= movie->moov->mvhd->timeScale;
+
 		if (trak->editBox && trak->editBox->editList) {
 			u32 j, count = gf_list_count(trak->editBox->editList->entryList);
 			for (j=0; j<count; j++) {
 				GF_EdtsEntry *ent = (GF_EdtsEntry *)gf_list_get(trak->editBox->editList->entryList, j);
-				ent->segmentDuration = (u64) (s64) ((s64) ent->segmentDuration * ts_scale);
+				ent->segmentDuration *= timeScale;
+				ent->segmentDuration /= movie->moov->mvhd->timeScale;
 			}
 		}
 	}
+
+	movie->moov->mvhd->timeScale = timeScale;
+	movie->interleavingTime = timeScale;
 	return GF_OK;
 }
 
@@ -445,7 +450,7 @@
 	return GF_OK;
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_set_root_od_id(GF_ISOFile *movie, u32 OD_ID)
 {
 	GF_Err e;
@@ -469,6 +474,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_set_root_od_url(GF_ISOFile *movie, char *url_string)
 {
 	GF_Err e;
@@ -478,7 +484,7 @@
 
 	if (!movie->moov->iods) AddMovieIOD(movie->moov, 0);
 	if (!movie->moov->iods) return GF_OUT_OF_MEM;
-	
+
 	switch (movie->moov->iods->descriptor->tag) {
 	case GF_ODF_ISOM_OD_TAG:
 		if (((GF_IsomObjectDescriptor *)movie->moov->iods->descriptor)->URLString) gf_free(((GF_IsomObjectDescriptor *)movie->moov->iods->descriptor)->URLString);
@@ -592,6 +598,8 @@
 	//some default properties for Audio, Visual or private tracks
 	switch (MediaType) {
 	case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
 	case GF_ISOM_MEDIA_SCENE:
 	case GF_ISOM_MEDIA_TEXT:
 	case GF_ISOM_MEDIA_SUBT:
@@ -651,7 +659,7 @@
 	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 	if (e) return e;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(movie, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
 	//duplicate our desc
@@ -743,6 +751,7 @@
 	return SetTrackDuration(trak);
 }
 
+GF_EXPORT
 GF_Err gf_isom_add_sample_shadow(GF_ISOFile *movie, u32 trackNumber, GF_ISOSample *sample)
 {
 	GF_Err e;
@@ -833,6 +842,7 @@
 
 }
 
+GF_EXPORT
 GF_Err gf_isom_append_sample_data(GF_ISOFile *movie, u32 trackNumber, char *data, u32 data_size)
 {
 	GF_Err e;
@@ -1137,6 +1147,7 @@
 }
 
 //Add a system descriptor to the ESD of a stream(EDIT or WRITE mode only)
+GF_EXPORT
 GF_Err gf_isom_add_desc_to_description(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, GF_Descriptor *theDesc)
 {
 	GF_IPIPtr *ipiD;
@@ -1297,7 +1308,43 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing)
+GF_Err gf_isom_set_visual_bit_depth(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u16 bitDepth)
+{
+	GF_Err e;
+	GF_TrackBox *trak;
+	GF_MPEGVisualSampleEntryBox *entry;
+	GF_SampleDescriptionBox *stsd;
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	switch (trak->Media->handler->handlerType) {
+	case GF_ISOM_MEDIA_VISUAL:
+	case GF_ISOM_MEDIA_PICT:
+	case GF_ISOM_MEDIA_AUXV:
+		break;
+	default:
+		return GF_OK;
+	}
+
+	stsd = trak->Media->information->sampleTable->SampleDescription;
+	if (!stsd) {
+		return movie->LastError = GF_ISOM_INVALID_FILE;
+	}
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) {
+		return movie->LastError = GF_BAD_PARAM;
+	}
+	entry = (GF_MPEGVisualSampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	//no support for generic sample entries (eg, no MPEG4 descriptor)
+	if (entry == NULL) return GF_BAD_PARAM;
+	entry->bit_depth = bitDepth;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing, Bool force_par)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
@@ -1324,20 +1371,127 @@
 	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_BAD_PARAM;
 
 	vent = (GF_VisualSampleEntryBox*)entry;
-	if (!hSpacing || !vSpacing) {
+	if (!hSpacing || !vSpacing || (((s32)hSpacing > 0) && (hSpacing == vSpacing) && !force_par)) {
 		if (vent->pasp) gf_isom_box_del((GF_Box*)vent->pasp);
 		vent->pasp = NULL;
 		return GF_OK;
 	}
 	if (!vent->pasp) vent->pasp = (GF_PixelAspectRatioBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_PASP);
-	vent->pasp->hSpacing = hSpacing;
-	vent->pasp->vSpacing = vSpacing;
+	if ((s32) hSpacing<0) {
+		vent->pasp->hSpacing = 1;
+		vent->pasp->vSpacing = 1;
+	} else {
+		vent->pasp->hSpacing = hSpacing;
+		vent->pasp->vSpacing = vSpacing;
+	}
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_isom_set_visual_color_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 colour_type, u16 colour_primaries, u16 transfer_characteristics, u16 matrix_coefficients, Bool full_range_flag, char *icc_data, u32 icc_size)
+{
+	GF_Err e;
+	GF_TrackBox *trak;
+	GF_SampleEntryBox *entry;
+	GF_SampleDescriptionBox *stsd;
+	GF_ColourInformationBox *clr=NULL;
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	stsd = trak->Media->information->sampleTable->SampleDescription;
+	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) {
+		return movie->LastError = GF_BAD_PARAM;
+	}
+	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	//no support for generic sample entries (eg, no MPEG4 descriptor)
+	if (entry == NULL) return GF_BAD_PARAM;
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_OK;
+
+	clr = ((GF_MPEGVisualSampleEntryBox *)entry)->colr;
+	if (!colour_type) {
+		if (clr) gf_isom_box_del((GF_Box *)clr);
+		((GF_MPEGVisualSampleEntryBox *)entry)->colr = NULL;
+		return GF_OK;
+	}
+	if (!clr) {
+		clr = (GF_ColourInformationBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_COLR);
+		((GF_MPEGVisualSampleEntryBox *)entry)->colr = clr;
+	}
+	clr->colour_type = colour_type;
+	clr->colour_primaries = colour_primaries;
+	clr->transfer_characteristics = transfer_characteristics;
+	clr->matrix_coefficients = matrix_coefficients;
+	clr->full_range_flag = full_range_flag;
+	if (clr->opaque) gf_free(clr->opaque);
+	clr->opaque = NULL;
+	clr->opaque_size = 0;
+	if ((colour_type=GF_ISOM_SUBTYPE_RICC) || (colour_type=GF_ISOM_SUBTYPE_PROF)) {
+		clr->opaque_size = icc_data ? icc_size : 0;
+		if (clr->opaque_size) {
+			clr->opaque = gf_malloc(sizeof(char)*clr->opaque_size);
+			memcpy(clr->opaque, icc_data, sizeof(char)*clr->opaque_size);
+		}
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_set_hdr(GF_ISOFile* movie, u32 trackNumber, u32 StreamDescriptionIndex, GF_MasteringDisplayColourVolumeInfo *mdcv, GF_ContentLightLevelInfo *clli)
+{
+	GF_Err e;
+	GF_TrackBox* trak;
+	GF_SampleEntryBox* entry;
+	GF_VisualSampleEntryBox* vent;
+	GF_SampleDescriptionBox* stsd;
+	u32 i;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	stsd = trak->Media->information->sampleTable->SampleDescription;
+	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) {
+		return movie->LastError = GF_BAD_PARAM;
+	}
+	entry = (GF_SampleEntryBox*)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	//no support for generic sample entries (eg, no MPEG4 descriptor)
+	if (entry == NULL) return GF_BAD_PARAM;
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_BAD_PARAM;
+
+	vent = (GF_VisualSampleEntryBox*)entry;
+
+	/*mdcv*/
+	if (!vent->mdcv) vent->mdcv = (GF_MasteringDisplayColourVolumeBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_MDCV);
+	for (i = 0; i < 3; ++i) {
+		vent->mdcv->display_primaries[i].x = mdcv->display_primaries[i].x;
+		vent->mdcv->display_primaries[i].y = mdcv->display_primaries[i].y;
+	}
+	vent->mdcv->min_display_mastering_luminance = mdcv->min_display_mastering_luminance;
+	vent->mdcv->max_display_mastering_luminance = mdcv->max_display_mastering_luminance;
+
+	/*clli*/
+	if (!vent->clli) vent->clli = (GF_ContentLightLevelBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_CLLI);
+	vent->clli->max_content_light_level = clli->max_content_light_level;
+	vent->clli->max_pic_average_light_level = clli->max_pic_average_light_level;
+
+	return e;
+}
 
 GF_EXPORT
-GF_Err gf_isom_set_clean_apperture(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 cleanApertureWidthN, u32 cleanApertureWidthD, u32 cleanApertureHeightN, u32 cleanApertureHeightD, u32 horizOffN, u32 horizOffD, u32 vertOffN, u32 vertOffD)
+GF_Err gf_isom_set_clean_aperture(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 cleanApertureWidthN, u32 cleanApertureWidthD, u32 cleanApertureHeightN, u32 cleanApertureHeightD, u32 horizOffN, u32 horizOffD, u32 vertOffN, u32 vertOffD)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
@@ -1369,7 +1523,7 @@
 		vent->clap = NULL;
 		return GF_OK;
 	}
-	if (!vent->clap) vent->clap = (GF_CleanAppertureBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_CLAP);
+	if (!vent->clap) vent->clap = (GF_CleanApertureBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_CLAP);
 	vent->clap->cleanApertureWidthN = cleanApertureWidthN;
 	vent->clap->cleanApertureWidthD = cleanApertureWidthD;
 	vent->clap->cleanApertureHeightN = cleanApertureHeightN;
@@ -1382,11 +1536,90 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_audio_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 sampleRate, u32 nbChannels, u8 bitsPerSample)
+GF_Err gf_isom_set_image_sequence_coding_constraints(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, Bool remove, Bool all_ref_pics_intra, Bool intra_pred_used, u32 max_ref_per_pic)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
 	GF_SampleEntryBox *entry;
+	GF_VisualSampleEntryBox*vent;
+	GF_SampleDescriptionBox *stsd;
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	stsd = trak->Media->information->sampleTable->SampleDescription;
+	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) {
+		return movie->LastError = GF_BAD_PARAM;
+	}
+	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	//no support for generic sample entries (eg, no MPEG4 descriptor)
+	if (entry == NULL) return GF_BAD_PARAM;
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_BAD_PARAM;
+
+	vent = (GF_VisualSampleEntryBox*)entry;
+	if (remove) {
+		if (vent->ccst) gf_isom_box_del((GF_Box*)vent->ccst);
+		vent->ccst = NULL;
+		return GF_OK;
+	}
+	if (!vent->ccst) vent->ccst = (GF_CodingConstraintsBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_CCST);
+	vent->ccst->all_ref_pics_intra = all_ref_pics_intra;
+	vent->ccst->intra_pred_used = intra_pred_used;
+	vent->ccst->max_ref_per_pic = max_ref_per_pic;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_set_image_sequence_alpha(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, Bool remove)
+{
+	GF_Err e;
+	GF_TrackBox *trak;
+	GF_SampleEntryBox *entry;
+	GF_VisualSampleEntryBox*vent;
+	GF_SampleDescriptionBox *stsd;
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	stsd = trak->Media->information->sampleTable->SampleDescription;
+	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) {
+		return movie->LastError = GF_BAD_PARAM;
+	}
+	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	//no support for generic sample entries (eg, no MPEG4 descriptor)
+	if (entry == NULL) return GF_BAD_PARAM;
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_BAD_PARAM;
+
+	vent = (GF_VisualSampleEntryBox*)entry;
+	if (remove) {
+		if (vent->auxi) gf_isom_box_del((GF_Box*)vent->auxi);
+		vent->ccst = NULL;
+		return GF_OK;
+	}
+	if (!vent->auxi) vent->auxi = (GF_AuxiliaryTypeInfoBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_AUXI);
+	vent->auxi->aux_track_type = gf_strdup("urn:mpeg:mpegB:cicp:systems:auxiliary:alpha");
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_set_audio_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 sampleRate, u32 nbChannels, u8 bitsPerSample, GF_AudioSampleEntryImportMode asemode)
+{
+	GF_Err e;
+	GF_TrackBox *trak;
+	GF_SampleEntryBox *entry;
+	GF_AudioSampleEntryBox*aud_entry;
 	GF_SampleDescriptionBox *stsd;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
@@ -1408,11 +1641,61 @@
 		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
 	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_AUDIO) return GF_BAD_PARAM;
+	aud_entry = (GF_AudioSampleEntryBox*) entry;
+	aud_entry->samplerate_hi = sampleRate;
+	aud_entry->samplerate_lo = 0;
+	aud_entry->bitspersample = bitsPerSample;
+
+	switch (asemode) {
+	case GF_IMPORT_AUDIO_SAMPLE_ENTRY_v0_2:
+		stsd->version = 0;
+		aud_entry->version = 0;
+		aud_entry->is_qtff = 0;
+		aud_entry->channel_count = 2;
+		break;
+	case GF_IMPORT_AUDIO_SAMPLE_ENTRY_NOT_SET:
+	case GF_IMPORT_AUDIO_SAMPLE_ENTRY_v0_BS:
+		stsd->version = 0;
+		aud_entry->version = 0;
+		aud_entry->is_qtff = 0;
+		aud_entry->channel_count = nbChannels;
+		break;
+	case GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_MPEG:
+		stsd->version = 1;
+		aud_entry->version = 1;
+		aud_entry->is_qtff = 0;
+		aud_entry->channel_count = nbChannels;
+		break;
+	case GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF:
+		stsd->version = 0;
+		aud_entry->version = 1;
+		aud_entry->is_qtff = 1;
+		aud_entry->channel_count = nbChannels;
+		break;
+	}
+	if (aud_entry->is_qtff) {
+		GF_UnknownBox *wave=NULL;
+		u32 i, count = gf_list_count(aud_entry->other_boxes);
+		for (i=0; i<count; i++) {
+			wave = gf_list_get(aud_entry->other_boxes, i);
+			if (wave->type==GF_QT_BOX_TYPE_WAVE)
+				break;
+			if (wave->type != GF_ISOM_BOX_TYPE_UNKNOWN) {
+				wave = NULL;
+			} else if (wave->original_4cc!=GF_QT_BOX_TYPE_WAVE) {
+				wave = NULL;
+			} else {
+				break;
+			}
+		}
+		if (wave)
+			aud_entry->is_qtff=2;
 
-	((GF_AudioSampleEntryBox*)entry)->samplerate_hi = sampleRate;
-	((GF_AudioSampleEntryBox*)entry)->samplerate_lo = 0;
-	((GF_AudioSampleEntryBox*)entry)->channel_count = nbChannels;
-	((GF_AudioSampleEntryBox*)entry)->bitspersample = bitsPerSample;
+		if (aud_entry->type==GF_ISOM_BOX_TYPE_MP4A)
+			aud_entry->compression_id = -2;
+		else
+			aud_entry->compression_id = 0;
+	}
 	return GF_OK;
 }
 
@@ -1566,6 +1849,7 @@
 
 
 //remove the edit segments for the whole track
+GF_EXPORT
 GF_Err gf_isom_remove_edit_segment(GF_ISOFile *movie, u32 trackNumber, u32 seg_index)
 {
 	GF_Err e;
@@ -1740,7 +2024,7 @@
 
 		j=0;
 		while ((tref = (GF_TrackReferenceTypeBox *)gf_list_enum(trak->References->other_boxes, &j))) {
-			if (tref->reference_type==GF_4CC('s','c','a','l'))
+			if (tref->reference_type==GF_ISOM_REF_SCAL)
 				continue;
 
 			found = 0;
@@ -1972,7 +2256,7 @@
 		ptr = (GF_ChapterListBox*)gf_list_get(map->other_boxes, 0);
 	}
 	if (!map) return GF_OUT_OF_MEM;
-	
+
 	/*this may happen if original MP4 is not properly formatted*/
 	if (!ptr) {
 		ptr = (GF_ChapterListBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_CHPL);
@@ -1982,7 +2266,7 @@
 
 	GF_SAFEALLOC(ce, GF_ChapterEntry);
 	if (!ce) return GF_OUT_OF_MEM;
-	
+
 	ce->start_time = timestamp * 10000L;
 	ce->name = name ? gf_strdup(name) : NULL;
 
@@ -2002,7 +2286,7 @@
 	return gf_list_add(ptr->list, ce);
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_remove_chapter(GF_ISOFile *movie, u32 trackNumber, u32 index)
 {
 	GF_Err e;
@@ -2058,6 +2342,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_remove_copyright(GF_ISOFile *movie, u32 index)
 {
 	GF_Err e;
@@ -2094,7 +2379,7 @@
 }
 
 
-
+GF_EXPORT
 GF_Err gf_isom_set_watermark(GF_ISOFile *movie, bin128 UUID, u8* data, u32 length)
 {
 	GF_Err e;
@@ -2132,6 +2417,7 @@
 
 //set the interleaving time of media data (INTERLEAVED mode only)
 //InterleaveTime is in MovieTimeScale
+GF_EXPORT
 GF_Err gf_isom_set_interleave_time(GF_ISOFile *movie, u32 InterleaveTime)
 {
 	GF_Err e;
@@ -2143,12 +2429,14 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 u32 gf_isom_get_interleave_time(GF_ISOFile *movie)
 {
 	return movie ? movie->interleavingTime : 0;
 }
 
 //set the storage mode of a file (FLAT, STREAMABLE, INTERLEAVED)
+GF_EXPORT
 u8 gf_isom_get_storage_mode(GF_ISOFile *movie)
 {
 	return movie ? movie->storageMode : 0;
@@ -2160,6 +2448,7 @@
 //use a compact track version for sample size. This is not usually recommended
 //except for speech codecs where the track has a lot of small samples
 //compaction is done automatically while writing based on the track's sample sizes
+GF_EXPORT
 GF_Err gf_isom_use_compact_size(GF_ISOFile *movie, u32 trackNumber, u8 CompactionOn)
 {
 	GF_TrackBox *trak;
@@ -2292,7 +2581,7 @@
 		gf_list_add(movie->TopBoxes, movie->brand);
 	}
 	if (!AddIt && !movie->brand) return GF_OK;
-	
+
 	//do not mofify major one
 	if (!AddIt && movie->brand->majorBrand == Brand) return GF_OK;
 
@@ -2564,55 +2853,6 @@
 	return e;
 }
 
-
-GF_Err gf_isom_add_sample_fragment(GF_ISOFile *movie, u32 trackNumber, u32 sampleNumber, u16 FragmentSize)
-{
-	GF_Err e;
-	GF_TrackBox *trak;
-
-	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
-	if (e) return e;
-
-	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak || !sampleNumber || !FragmentSize) return GF_BAD_PARAM;
-
-	//set Padding info
-	return stbl_AddSampleFragment(trak->Media->information->sampleTable, sampleNumber, FragmentSize);
-}
-
-
-GF_EXPORT
-GF_Err gf_isom_remove_sample_fragment(GF_ISOFile *movie, u32 trackNumber, u32 sampleNumber)
-{
-	GF_TrackBox *trak;
-	GF_Err e;
-
-	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
-	if (e) return e;
-
-	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak) return GF_BAD_PARAM;
-	return stbl_RemoveSampleFragments(trak->Media->information->sampleTable, sampleNumber);
-}
-
-GF_Err gf_isom_remove_sample_fragments(GF_ISOFile *movie, u32 trackNumber)
-{
-	GF_TrackBox *trak;
-	GF_Err e;
-
-	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
-	if (e) return e;
-
-	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak) return GF_BAD_PARAM;
-
-	if (trak->Media->information->sampleTable->Fragments) {
-		gf_isom_box_del((GF_Box *)trak->Media->information->sampleTable->Fragments);
-		trak->Media->information->sampleTable->Fragments = NULL;
-	}
-	return GF_OK;
-}
-
 GF_EXPORT
 GF_Err gf_isom_clone_pl_indications(GF_ISOFile *orig, GF_ISOFile *dest)
 {
@@ -2664,7 +2904,7 @@
 	return e;
 }
 
-GF_Err gf_isom_clone_movie(GF_ISOFile *orig_file, GF_ISOFile *dest_file, Bool clone_tracks, Bool keep_hint_tracks, Bool keep_pssh)
+GF_Err gf_isom_clone_movie(GF_ISOFile *orig_file, GF_ISOFile *dest_file, Bool clone_tracks, Bool keep_hint_tracks, Bool keep_pssh, Bool mvex_after_traks)
 {
 	GF_Err e;
 	u32 i;
@@ -2714,13 +2954,14 @@
 			dest_file->moov->mvex = NULL;
 		}
 #endif
+		dest_file->moov->mvex_after_traks = mvex_after_traks;
 
 		if (clone_tracks) {
 			for (i=0; i<gf_list_count(orig_file->moov->trackList); i++) {
 				GF_TrackBox *trak = (GF_TrackBox*)gf_list_get( orig_file->moov->trackList, i);
 				if (!trak) continue;
 				if (keep_hint_tracks || (trak->Media->handler->handlerType != GF_ISOM_MEDIA_HINT)) {
-					e = gf_isom_clone_track(orig_file, i+1, dest_file, GF_FALSE, &dstTrack);
+					e = gf_isom_clone_track(orig_file, i+1, dest_file, 0, &dstTrack);
 					if (e) return e;
 				}
 			}
@@ -2759,7 +3000,7 @@
 		case GF_ISOM_BOX_TYPE_SSIX:
 		case GF_ISOM_BOX_TYPE_MOOF:
 #endif
-		case GF_4CC('j','P',' ',' '):
+		case GF_ISOM_BOX_TYPE_JP:
 			break;
 
 		case GF_ISOM_BOX_TYPE_PSSH:
@@ -2779,9 +3020,8 @@
 	return GF_OK;
 }
 
-
 GF_EXPORT
-GF_Err gf_isom_clone_track(GF_ISOFile *orig_file, u32 orig_track, GF_ISOFile *dest_file, Bool keep_data_ref, u32 *dest_track)
+GF_Err gf_isom_clone_track(GF_ISOFile *orig_file, u32 orig_track, GF_ISOFile *dest_file, u32 flags, u32 *dest_track)
 {
 	GF_TrackBox *trak, *new_tk;
 	GF_BitStream *bs;
@@ -2792,6 +3032,7 @@
 	GF_Err e;
 	GF_SampleEntryBox *entry;
 	GF_SampleTableBox *stbl, *stbl_temp;
+	GF_SampleEncryptionBox *senc;
 
 	e = CanAccessMovie(dest_file, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
@@ -2811,6 +3052,13 @@
 	/*clone CompositionToDecode table, we may remove it later*/
 	stbl_temp->CompositionToDecode = stbl->CompositionToDecode;
 
+	senc = trak->sample_encryption;
+	if (senc) {
+		assert(trak->other_boxes);
+		gf_list_del_item(trak->other_boxes, senc);
+		trak->sample_encryption = NULL;
+	}
+
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
 	gf_isom_box_size( (GF_Box *) trak);
@@ -2818,17 +3066,24 @@
 	gf_bs_get_content(bs, &data, &data_size);
 	gf_bs_del(bs);
 	bs = gf_bs_new(data, data_size, GF_BITSTREAM_READ);
+	if (flags & GF_ISOM_CLONE_TRACK_NO_QT)
+		gf_bs_set_cookie(bs, 1);
 	e = gf_isom_box_parse((GF_Box **) &new_tk, bs);
 	gf_bs_del(bs);
 	gf_free(data);
 	trak->Media->information->sampleTable = stbl;
-
+	if (senc) {
+		trak->sample_encryption = senc;
+		gf_list_add(trak->other_boxes, senc);
+	}
 	stbl_temp->SampleDescription = NULL;
 	stbl_temp->sampleGroupsDescription = NULL;
 	stbl_temp->CompositionToDecode = NULL;
 	gf_isom_box_del((GF_Box *)stbl_temp);
+
 	if (e) return e;
 
+
 	/*create default boxes*/
 	stbl = new_tk->Media->information->sampleTable;
 	stbl->ChunkOffset = gf_isom_box_new(GF_ISOM_BOX_TYPE_STCO);
@@ -2868,14 +3123,14 @@
 	}
 
 	/*reset data ref*/
-	if (!keep_data_ref) {
+	if (! (flags & GF_ISOM_CLONE_TRACK_KEEP_DREF) ) {
 		gf_isom_box_array_del(new_tk->Media->information->dataInformation->dref->other_boxes);
 		new_tk->Media->information->dataInformation->dref->other_boxes = gf_list_new();
 		/*update data ref*/
 		entry = (GF_SampleEntryBox*)gf_list_get(new_tk->Media->information->sampleTable->SampleDescription->other_boxes, 0);
 		if (entry) {
 			u32 dref;
-			Media_CreateDataRef(new_tk->Media->information->dataInformation->dref, NULL, NULL, &dref);
+			Media_CreateDataRef(dest_file, new_tk->Media->information->dataInformation->dref, NULL, NULL, &dref);
 			entry->dataReferenceIndex = dref;
 		}
 	} else {
@@ -2884,7 +3139,8 @@
 			GF_DataEntryBox *dref_entry = (GF_DataEntryBox *)gf_list_get(new_tk->Media->information->dataInformation->dref->other_boxes, i);
 			if (dref_entry->flags & 1) {
 				dref_entry->flags &= ~1;
-				dref_entry->location = gf_strdup(orig_file->fileName);
+				e = Media_SetDrefURL((GF_DataEntryURLBox *)dref_entry, orig_file->fileName, dest_file->finalName);
+				if (e) return e;
 			}
 		}
 	}
@@ -2933,6 +3189,7 @@
 	GF_Box *entry;
 	GF_Err e;
 	u32 dataRefIndex;
+ u32 mtype;
 
 	e = CanAccessMovie(the_file, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
@@ -2964,7 +3221,7 @@
 	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 	if (e) goto exit;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(the_file, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) goto exit;
 	}
 	if (!the_file->keep_utc)
@@ -2975,7 +3232,8 @@
 	*outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
 
 	/*also clone track w/h info*/
-	if (gf_isom_get_media_type(the_file, trackNumber) == GF_ISOM_MEDIA_VISUAL) {
+ mtype = gf_isom_get_media_type(the_file, trackNumber);
+	if (gf_isom_is_video_subtype(mtype) ) {
 		gf_isom_set_visual_info(the_file, trackNumber, (*outDescriptionIndex), ((GF_VisualSampleEntryBox*)entry)->Width, ((GF_VisualSampleEntryBox*)entry)->Height);
 	}
 	return e;
@@ -2985,7 +3243,7 @@
 	return e;
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_new_generic_sample_description(GF_ISOFile *movie, u32 trackNumber, char *URLname, char *URNname, GF_GenericSampleDescription *udesc, u32 *outDescriptionIndex)
 {
 	GF_TrackBox *trak;
@@ -3002,13 +3260,13 @@
 	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 	if (e) return e;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(movie, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
 	if (!movie->keep_utc)
 		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
-	if (trak->Media->handler->handlerType==GF_ISOM_MEDIA_VISUAL) {
+	if (gf_isom_is_video_subtype(trak->Media->handler->handlerType)) {
 		GF_GenericVisualSampleEntryBox *entry;
 		//create a new entry
 		entry = (GF_GenericVisualSampleEntryBox*) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRV);
@@ -3020,6 +3278,11 @@
 		} else {
 			entry->EntryType = udesc->codec_tag;
 		}
+		if (entry->EntryType == 0) {
+			gf_isom_box_del((GF_Box *)entry);
+			return GF_NOT_SUPPORTED;
+		}
+
 		entry->dataReferenceIndex = dataRefIndex;
 		entry->vendor = udesc->vendor_code;
 		entry->version = udesc->version;
@@ -3057,6 +3320,11 @@
 		} else {
 			gena->EntryType = udesc->codec_tag;
 		}
+		if (gena->EntryType == 0) {
+			gf_isom_box_del((GF_Box *)gena);
+			return GF_NOT_SUPPORTED;
+		}
+
 		gena->dataReferenceIndex = dataRefIndex;
 		gena->vendor = udesc->vendor_code;
 		gena->version = udesc->version;
@@ -3089,6 +3357,11 @@
 		} else {
 			genm->EntryType = udesc->codec_tag;
 		}
+		if (genm->EntryType == 0) {
+			gf_isom_box_del((GF_Box *)genm);
+			return GF_NOT_SUPPORTED;
+		}
+
 		genm->dataReferenceIndex = dataRefIndex;
 		if (udesc->extension_buf && udesc->extension_buf_size) {
 			genm->data = (char*)gf_malloc(sizeof(char) * udesc->extension_buf_size);
@@ -3107,6 +3380,7 @@
 
 //use carefully. Very useful when you made a lot of changes (IPMP, IPI, OCI, ...)
 //THIS WILL REPLACE THE WHOLE DESCRIPTOR ...
+GF_EXPORT
 GF_Err gf_isom_change_generic_sample_description(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, GF_GenericSampleDescription *udesc)
 {
 	GF_TrackBox *trak;
@@ -3192,6 +3466,7 @@
 }
 
 /*removes given stream description*/
+GF_EXPORT
 GF_Err gf_isom_remove_sample_description(GF_ISOFile *movie, u32 trackNumber, u32 streamDescIndex)
 {
 	GF_TrackBox *trak;
@@ -3209,7 +3484,6 @@
 	return GF_OK;
 }
 
-
 //sets a track reference
 GF_EXPORT
 GF_Err gf_isom_set_track_reference(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType, u32 ReferencedTrackID)
@@ -3232,7 +3506,7 @@
 	//find a ref of the given type
 	e = Track_FindRef(trak, referenceType, &dpnd);
 	if (e) return e;
-	
+
 	if (!dpnd) {
 		dpnd = (GF_TrackReferenceTypeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_REFT);
 		dpnd->reference_type = referenceType;
@@ -3289,6 +3563,24 @@
 }
 
 
+//sets a track reference
+GF_EXPORT
+GF_Err gf_isom_remove_track_references(GF_ISOFile *the_file, u32 trackNumber)
+{
+	GF_TrackBox *trak;
+
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	if (trak->References) {
+		gf_isom_box_del((GF_Box *)trak->References);
+		trak->References = NULL;
+	}
+	return GF_OK;
+}
+
+
+
 //changes track ID
 GF_EXPORT
 GF_Err gf_isom_set_track_id(GF_ISOFile *movie, u32 trackNumber, u32 trackID)
@@ -3376,6 +3668,23 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_isom_shift_cts_offset(GF_ISOFile *the_file, u32 trackNumber, s32 offset_shift)
+{
+	u32 i;
+	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+	if (!trak->Media->information->sampleTable->CompositionOffset) return GF_BAD_PARAM;
+	if (!trak->Media->information->sampleTable->CompositionOffset->unpack_mode) return GF_BAD_PARAM;
+
+	for (i=0; i<trak->Media->information->sampleTable->CompositionOffset->nb_entries; i++) {
+		/*we're in unpack mode: one entry per sample*/
+		trak->Media->information->sampleTable->CompositionOffset->entries[i].decodingOffset -= offset_shift;
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
 GF_Err gf_isom_remove_cts_info(GF_ISOFile *the_file, u32 trackNumber)
 {
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
@@ -3429,6 +3738,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_set_track_name(GF_ISOFile *the_file, u32 trackNumber, char *name)
 {
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
@@ -3438,6 +3748,8 @@
 	if (name) trak->name = gf_strdup(name);
 	return GF_OK;
 }
+
+GF_EXPORT
 const char *gf_isom_get_track_name(GF_ISOFile *the_file, u32 trackNumber)
 {
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
@@ -3445,7 +3757,7 @@
 	return trak->name;
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_store_movie_config(GF_ISOFile *movie, Bool remove_all)
 {
 	u32 i, count, len;
@@ -3454,9 +3766,9 @@
 	bin128 binID;
 	if (movie == NULL) return GF_BAD_PARAM;
 
-	gf_isom_remove_user_data(movie, 0, GF_4CC('G','P','A','C'), binID);
+	gf_isom_remove_user_data(movie, 0, GF_VENDOR_GPAC, binID);
 	count = gf_isom_get_track_count(movie);
-	for (i=0; i<count; i++) gf_isom_remove_user_data(movie, i+1, GF_4CC('G','P','A','C'), binID);
+	for (i=0; i<count; i++) gf_isom_remove_user_data(movie, i+1, GF_VENDOR_GPAC, binID);
 
 	if (remove_all) return GF_OK;
 
@@ -3467,7 +3779,7 @@
 	gf_bs_write_u32(bs, movie->interleavingTime);
 	gf_bs_get_content(bs, &data, &len);
 	gf_bs_del(bs);
-	gf_isom_add_user_data(movie, 0, GF_4CC('G','P','A','C'), binID, data, len);
+	gf_isom_add_user_data(movie, 0, GF_VENDOR_GPAC, binID, data, len);
 	gf_free(data);
 	/*update tracks: interleaving group/priority and track edit name*/
 	for (i=0; i<count; i++) {
@@ -3482,13 +3794,13 @@
 		for (j=0; j<len; j++) gf_bs_write_u8(bs, trak->name[j]);
 		gf_bs_get_content(bs, &data, &len);
 		gf_bs_del(bs);
-		gf_isom_add_user_data(movie, i+1, GF_4CC('G','P','A','C'), binID, data, len);
+		gf_isom_add_user_data(movie, i+1, GF_VENDOR_GPAC, binID, data, len);
 		gf_free(data);
 	}
 	return GF_OK;
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_load_movie_config(GF_ISOFile *movie)
 {
 	u32 i, count, len;
@@ -3500,10 +3812,10 @@
 
 	found_cfg = GF_FALSE;
 	/*restore movie*/
-	count = gf_isom_get_user_data_count(movie, 0, GF_4CC('G','P','A','C'), binID);
+	count = gf_isom_get_user_data_count(movie, 0, GF_VENDOR_GPAC, binID);
 	for (i=0; i<count; i++) {
 		data = NULL;
-		gf_isom_get_user_data(movie, 0, GF_4CC('G','P','A','C'), binID, i+1, &data, &len);
+		gf_isom_get_user_data(movie, 0, GF_VENDOR_GPAC, binID, i+1, &data, &len);
 		if (!data) continue;
 		/*check marker*/
 		if ((unsigned char) data[0] != 0xFE) {
@@ -3523,10 +3835,10 @@
 	for (i=0; i<gf_isom_get_track_count(movie); i++) {
 		u32 j;
 		GF_TrackBox *trak = gf_isom_get_track_from_file(movie, i+1);
-		count = gf_isom_get_user_data_count(movie, i+1, GF_4CC('G','P','A','C'), binID);
+		count = gf_isom_get_user_data_count(movie, i+1, GF_VENDOR_GPAC, binID);
 		for (j=0; j<count; j++) {
 			data = NULL;
-			gf_isom_get_user_data(movie, i+1, GF_4CC('G','P','A','C'), binID, j+1, &data, &len);
+			gf_isom_get_user_data(movie, i+1, GF_VENDOR_GPAC, binID, j+1, &data, &len);
 			if (!data) continue;
 			/*check marker*/
 			if ((unsigned char) data[0] != 0xFE) {
@@ -3566,7 +3878,7 @@
 	scale /= trak->Media->mediaHeader->timeScale;
 	trak->Media->mediaHeader->timeScale = newTS;
 	if (!force_rescale) {
-		u32 i, k, idx;
+		u32 i, k, idx, last_delta;
 		GF_SampleTableBox *stbl = trak->Media->information->sampleTable;
 		u64 cur_dts;
 		u64*DTSs = NULL;
@@ -3579,7 +3891,7 @@
 				ent->mediaTime = (u32) (scale*ent->mediaTime);
 			}
 		}
-		if (! stbl || !stbl->TimeToSample) {
+		if (! stbl || !stbl->TimeToSample || !stbl->TimeToSample->nb_entries) {
 			return SetTrackDuration(trak);
 		}
 
@@ -3607,6 +3919,8 @@
 				idx++;
 			}
 		}
+		last_delta = (u32) (stbl->TimeToSample->entries[stbl->TimeToSample->nb_entries-1].sampleDelta * scale);
+
 		//repack DTS
 		if (stbl->SampleSize->sampleCount) {
 			stbl->TimeToSample->entries = gf_realloc(stbl->TimeToSample->entries, sizeof(GF_SttsEntry)*stbl->SampleSize->sampleCount);
@@ -3624,6 +3938,15 @@
 					stbl->TimeToSample->entries[idx].sampleCount=1;
 				}
 			}
+			//add the sample delta for the last sample
+			if (stbl->TimeToSample->entries[idx].sampleDelta == last_delta) {
+				stbl->TimeToSample->entries[idx].sampleCount++;
+			} else {
+				idx++;
+				stbl->TimeToSample->entries[idx].sampleDelta = last_delta;
+				stbl->TimeToSample->entries[idx].sampleCount=1;
+			}
+
 			stbl->TimeToSample->nb_entries = idx+1;
 			stbl->TimeToSample->entries = gf_realloc(stbl->TimeToSample->entries, sizeof(GF_SttsEntry)*stbl->TimeToSample->nb_entries);
 		}
@@ -3704,7 +4027,7 @@
 	u32 i, count;
 	GF_TrackBox *trak1, *trak2;
 	GF_ESD *esd1, *esd2;
-	Bool need_memcmp;
+	Bool need_memcmp, ret;
 	GF_Box *a, *b;
 
 	/*get orig sample desc and clone it*/
@@ -3764,6 +4087,7 @@
 		case GF_ISOM_BOX_TYPE_HEV2:
 		case GF_ISOM_BOX_TYPE_LHE1:
 		case GF_ISOM_BOX_TYPE_LHV1:
+		case GF_ISOM_BOX_TYPE_AV01:
 		{
 			GF_MPEGVisualSampleEntryBox *avc1 = (GF_MPEGVisualSampleEntryBox *)ent1;
 			GF_MPEGVisualSampleEntryBox *avc2 = (GF_MPEGVisualSampleEntryBox *)ent2;
@@ -3776,6 +4100,8 @@
 				a = (GF_Box *) avc1->svc_config;
 			else if (avc1->mvc_config)
 				a = (GF_Box *) avc1->mvc_config;
+			else if (avc1->av1_config)
+				a = (GF_Box *)avc1->av1_config;
 			else
 				a = (GF_Box *) avc1->avc_config;
 
@@ -3787,6 +4113,8 @@
 				b = (GF_Box *) avc2->svc_config;
 			else if (avc2->mvc_config)
 				b = (GF_Box *) avc2->mvc_config;
+			else if (avc2->av1_config)
+				b = (GF_Box *)avc2->av1_config;
 			else
 				b = (GF_Box *) avc2->avc_config;
 
@@ -3847,7 +4175,24 @@
 			}
 			return GF_FALSE;
 		}
-		break;
+		case GF_ISOM_BOX_TYPE_MP3:
+		case GF_QT_BOX_TYPE_AUDIO_RAW:
+		case GF_QT_BOX_TYPE_AUDIO_TWOS:
+		case GF_QT_BOX_TYPE_AUDIO_SOWT:
+		case GF_QT_BOX_TYPE_AUDIO_FL32:
+		case GF_QT_BOX_TYPE_AUDIO_FL64:
+		case GF_QT_BOX_TYPE_AUDIO_IN24:
+		case GF_QT_BOX_TYPE_AUDIO_IN32:
+		case GF_QT_BOX_TYPE_AUDIO_ULAW:
+		case GF_QT_BOX_TYPE_AUDIO_ALAW:
+		case GF_QT_BOX_TYPE_AUDIO_ADPCM:
+		case GF_QT_BOX_TYPE_AUDIO_IMA_ADPCM:
+		case GF_QT_BOX_TYPE_AUDIO_DVCA:
+		case GF_QT_BOX_TYPE_AUDIO_QDMC:
+		case GF_QT_BOX_TYPE_AUDIO_QDMC2:
+		case GF_QT_BOX_TYPE_AUDIO_QCELP:
+		case GF_QT_BOX_TYPE_AUDIO_kMP3:
+			return GF_TRUE;
 		}
 
 		if (sdesc_index1 && sdesc_index2) break;
@@ -3855,7 +4200,13 @@
 	if (!need_memcmp) return GF_TRUE;
 	a = (GF_Box *)trak1->Media->information->sampleTable->SampleDescription;
 	b = (GF_Box *)trak2->Media->information->sampleTable->SampleDescription;
-	return gf_isom_box_equal(a,b);
+	//we ignore all bitrate boxes when comparing the box, disable their writing
+	gf_isom_registry_disable(GF_ISOM_BOX_TYPE_BTRT, GF_TRUE);
+	ret = gf_isom_box_equal(a,b);
+	//re-enable btrt writing
+	gf_isom_registry_disable(GF_ISOM_BOX_TYPE_BTRT, GF_FALSE);
+
+	return ret;
 }
 
 GF_EXPORT
@@ -3888,6 +4239,7 @@
 
 
 //set shadowing on/off
+GF_EXPORT
 GF_Err gf_isom_remove_sync_shadows(GF_ISOFile *movie, u32 trackNumber)
 {
 	GF_TrackBox *trak;
@@ -3906,6 +4258,7 @@
 }
 
 //fill the sync shadow table
+GF_EXPORT
 GF_Err gf_isom_set_sync_shadow(GF_ISOFile *movie, u32 trackNumber, u32 sampleNumber, u32 syncSample)
 {
 	GF_TrackBox *trak;
@@ -3936,6 +4289,7 @@
 }
 
 //set the GroupID of a track (only used for interleaving)
+GF_EXPORT
 GF_Err gf_isom_set_track_interleaving_group(GF_ISOFile *movie, u32 trackNumber, u32 GroupID)
 {
 	GF_TrackBox *trak;
@@ -3951,6 +4305,7 @@
 
 //set the Priority of a track within a Group (only used for tight interleaving)
 //Priority ranges from 1 to 9
+GF_EXPORT
 GF_Err gf_isom_set_track_priority_in_group(GF_ISOFile *movie, u32 trackNumber, u32 Priority)
 {
 	GF_TrackBox *trak;
@@ -3964,15 +4319,16 @@
 }
 
 //set the max SamplesPerChunk (for file optimization)
-GF_Err gf_isom_set_max_samples_per_chunk(GF_ISOFile *movie, u32 trackNumber, u32 maxSamplesPerChunk)
+GF_EXPORT
+GF_Err gf_isom_hint_max_chunk_size(GF_ISOFile *movie, u32 trackNumber, u32 maxChunkSize)
 {
 	GF_TrackBox *trak;
 
 	if (movie->openMode == GF_ISOM_OPEN_READ) return GF_ISOM_INVALID_MODE;
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak || !maxSamplesPerChunk) return GF_BAD_PARAM;
+	if (!trak || !maxChunkSize) return GF_BAD_PARAM;
 
-	trak->Media->information->sampleTable->MaxSamplePerChunk = maxSamplesPerChunk;
+	trak->Media->information->sampleTable->MaxChunkSize = maxChunkSize;
 	return GF_OK;
 }
 
@@ -4018,7 +4374,7 @@
 	return gf_odf_desc_copy((GF_Descriptor *) slConfig, (GF_Descriptor **) slc);
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_get_extraction_slc(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_SLConfig **slConfig)
 {
 	GF_TrackBox *trak;
@@ -4057,7 +4413,7 @@
 	return gf_odf_desc_copy((GF_Descriptor *) slc, (GF_Descriptor **) slConfig);
 }
 
-
+GF_EXPORT
 u32 gf_isom_get_track_group(GF_ISOFile *the_file, u32 trackNumber)
 {
 	GF_TrackBox *trak;
@@ -4066,7 +4422,7 @@
 	return trak->Media->information->sampleTable->groupID;
 }
 
-
+GF_EXPORT
 u32 gf_isom_get_track_priority_in_group(GF_ISOFile *the_file, u32 trackNumber)
 {
 	GF_TrackBox *trak;
@@ -4172,6 +4528,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_clone_root_od(GF_ISOFile *input, GF_ISOFile *output)
 {
 	GF_List *esds;
@@ -4274,8 +4631,9 @@
 GF_Err gf_isom_add_uuid(GF_ISOFile *movie, u32 trackNumber, bin128 UUID, const char *data, u32 data_size)
 {
 	GF_List *list;
+ u32 btype;
 	GF_Box *box;
-	GF_UnknownUUIDBox *uuid;
+	GF_UnknownUUIDBox *uuidb;
 
 	if (!data_size || !data) return GF_OK;
 
@@ -4292,15 +4650,16 @@
 		if (!movie->moov->other_boxes) movie->moov->other_boxes = gf_list_new();
 		list = movie->moov->other_boxes;
 	}
-
-	box = gf_isom_box_new(gf_isom_solve_uuid_box((char *) UUID));
-	uuid = (GF_UnknownUUIDBox*)box;
-	uuid->internal_4cc = gf_isom_solve_uuid_box((char *) UUID);
-	memcpy(uuid->uuid, UUID, sizeof(bin128));
-	uuid->dataSize = data_size;
-	uuid->data = (char*)gf_malloc(sizeof(char)*data_size);
-	memcpy(uuid->data, data, sizeof(char)*data_size);
-	gf_list_add(list, uuid);
+ btype = gf_isom_solve_uuid_box((char *) UUID);
+ if (!btype) btype = GF_ISOM_BOX_TYPE_UUID;
+ box = gf_isom_box_new(btype);
+	uuidb = (GF_UnknownUUIDBox*)box;
+	uuidb->internal_4cc = gf_isom_solve_uuid_box((char *) UUID);
+	memcpy(uuidb->uuid, UUID, sizeof(bin128));
+	uuidb->dataSize = data_size;
+	uuidb->data = (char*)gf_malloc(sizeof(char)*data_size);
+	memcpy(uuidb->data, data, sizeof(char)*data_size);
+	gf_list_add(list, uuidb);
 	return GF_OK;
 }
 
@@ -4639,10 +4998,10 @@
 	}
 	entry->rvcc->predefined_rvc_config = rvc_predefined;
 	if (!rvc_predefined) {
-		e = gf_isom_set_meta_type(movie, GF_FALSE, track, GF_4CC('r','v','c','i'));
+		e = gf_isom_set_meta_type(movie, GF_FALSE, track, GF_META_TYPE_RVCI);
 		if (e) return e;
 		gf_isom_modify_alternate_brand(movie, GF_ISOM_BRAND_ISO2, 1);
-		e = gf_isom_add_meta_item_memory(movie, GF_FALSE, track, "rvcconfig.xml", 0, GF_4CC('m', 'i', 'm', 'e'), mime, NULL, NULL, data, size, NULL);
+		e = gf_isom_add_meta_item_memory(movie, GF_FALSE, track, "rvcconfig.xml", 0, GF_META_ITEM_TYPE_MIME, mime, NULL, NULL, data, size, NULL);
 		if (e) return e;
 		entry->rvcc->rvc_meta_idx = gf_isom_get_meta_item_count(movie, GF_FALSE, track);
 	}
@@ -4656,6 +5015,7 @@
 	GF_SampleGroupBox *sgroup = NULL;
 	u32 i, count, last_sample_in_entry;
 
+	assert(sampleGroups);
 	count = gf_list_count(sampleGroups);
 	for (i=0; i<count; i++) {
 		sgroup = (GF_SampleGroupBox*)gf_list_get(sampleGroups, i);
@@ -4792,18 +5152,20 @@
 	if (!sgdesc) return GF_OUT_OF_MEM;
 
 	entry = NULL;
-	for (i=0; i<gf_list_count(sgdesc->group_descriptions); i++) {
-		entry = gf_list_get(sgdesc->group_descriptions, i);
-		if (sg_compare_entry(udta, entry)) break;
-		entry = NULL;
+	if (sg_compare_entry) {
+		for (i=0; i<gf_list_count(sgdesc->group_descriptions); i++) {
+			entry = gf_list_get(sgdesc->group_descriptions, i);
+			if (sg_compare_entry(udta, entry)) break;
+			entry = NULL;
+		}
 	}
-	if (!entry) {
+	if (!entry && sg_create_entry) {
 		entry = sg_create_entry(udta);
 		if (!entry) return GF_IO_ERR;
 		gf_list_add(sgdesc->group_descriptions, entry);
 	}
-
-	entry_idx = 1 + gf_list_find(sgdesc->group_descriptions, entry);
+	if (!entry) entry_idx = 0;
+	else entry_idx = 1 + gf_list_find(sgdesc->group_descriptions, entry);
 
 	/*look in stbl or traf for sample sampleGroups*/
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
@@ -4811,7 +5173,7 @@
 		if (!traf->sampleGroups)
 			traf->sampleGroups = gf_list_new();
 		groupList = traf->sampleGroups;
-		entry_idx |= 0x10000;
+		if (entry) entry_idx |= 0x10000;
 	} else
 #endif
 	{
@@ -4857,8 +5219,8 @@
 
 	sgdesc = get_sgdp(trak->Media->information->sampleTable, NULL, grouping_type);
 	if (!sgdesc) return GF_OUT_OF_MEM;
-	
-	if (grouping_type==GF_4CC('o','i','n','f')) {
+
+	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);
 		e = gf_isom_oinf_read_entry(ptr, bs);
@@ -4870,7 +5232,7 @@
 		e = gf_list_add(sgdesc->group_descriptions, ptr);
 		if (e) return e;
 		entry = (GF_DefaultSampleGroupDescriptionEntry *) ptr;
-	} else if (grouping_type==GF_4CC('l','i','n','f')) {
+	} else if (grouping_type==GF_ISOM_SAMPLE_GROUP_LINF) {
 		GF_LHVCLayerInformation *ptr = gf_isom_linf_new_entry();
 		GF_BitStream *bs=gf_bs_new(data, data_size, GF_BITSTREAM_READ);
 		e = gf_isom_linf_read_entry(ptr, bs);
@@ -4910,7 +5272,7 @@
 			}
 		}
 	}
-	
+
 
 	if (is_default) {
 		sgdesc->default_description_index = 1 + gf_list_find(sgdesc->group_descriptions, entry);
@@ -4953,6 +5315,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_add_sample_info(GF_ISOFile *movie, u32 track, u32 sample_number, u32 grouping_type, u32 sampleGroupDescriptionIndex, u32 grouping_type_parameter)
 {
 	GF_Err e;
@@ -4990,9 +5353,10 @@
 	return GF_FALSE;
 }
 
+GF_EXPORT
 GF_Err gf_isom_set_sample_rap_group(GF_ISOFile *movie, u32 track, u32 sample_number, u32 num_leading_samples)
 {
-	return gf_isom_set_sample_group_info(movie, track, sample_number, GF_4CC( 'r', 'a', 'p', ' ' ), 0, &num_leading_samples, sg_rap_create_entry, sg_rap_compare_entry);
+	return gf_isom_set_sample_group_info(movie, track, sample_number, GF_ISOM_SAMPLE_GROUP_RAP, 0, &num_leading_samples, sg_rap_create_entry, sg_rap_compare_entry);
 }
 
 
@@ -5014,9 +5378,10 @@
 	return GF_FALSE;
 }
 
+GF_EXPORT
 GF_Err gf_isom_set_sample_roll_group(GF_ISOFile *movie, u32 track, u32 sample_number, s16 roll_distance)
 {
-	return gf_isom_set_sample_group_info(movie, track, sample_number, GF_4CC( 'r', 'o', 'l', 'l' ), 0, &roll_distance, sg_roll_create_entry, sg_roll_compare_entry);
+	return gf_isom_set_sample_group_info(movie, track, sample_number, GF_ISOM_SAMPLE_GROUP_ROLL, 0, &roll_distance, sg_roll_create_entry, sg_roll_compare_entry);
 }
 
 void *sg_encryption_create_entry(void *udta)
@@ -5066,12 +5431,12 @@
 	gf_bs_del(bs);
 
 	is_identical = GF_TRUE;
-	if ((isEncrypted != seig->IsProtected) || (IV_size != seig->Per_Sample_IV_size) || (strncmp((const char *)KID, (const char *)seig->KID, 16))) 
+	if ((isEncrypted != seig->IsProtected) || (IV_size != seig->Per_Sample_IV_size) || (strncmp((const char *)KID, (const char *)seig->KID, 16)))
 		is_identical = GF_FALSE;
 	if ((crypt_byte_block != seig->crypt_byte_block) || (skip_byte_block != seig->skip_byte_block))
 		is_identical = GF_FALSE;
 	if ((isEncrypted == 1) && !IV_size) {
-		if ((constant_IV_size != seig->constant_IV_size) || (strncmp((const char *)constant_IV, (const char *)seig->constant_IV, constant_IV_size))) 
+		if ((constant_IV_size != seig->constant_IV_size) || (strncmp((const char *)constant_IV, (const char *)seig->constant_IV, constant_IV_size)))
 			is_identical = GF_FALSE;
 	}
 	return is_identical;
@@ -5101,7 +5466,7 @@
 			return GF_BAD_PARAM;
 
 		switch (grouping_type) {
-		case GF_4CC( 'r', 'a', 'p', ' ' ):
+		case GF_ISOM_SAMPLE_GROUP_RAP:
 		{
 			char udta[2];
 			bs = gf_bs_new(udta, 2*sizeof(char), GF_BITSTREAM_WRITE);
@@ -5110,14 +5475,24 @@
 			gf_bs_del(bs);
 			return gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, 0, udta, sg_rap_create_entry, sg_rap_compare_entry);
 		}
-		case GF_4CC( 'r', 'o', 'l', 'l' ):
+		case GF_ISOM_SAMPLE_GROUP_SYNC:
+		{
+			char udta[1];
+			bs = gf_bs_new(udta, 1*sizeof(char), GF_BITSTREAM_WRITE);
+			gf_bs_write_int(bs, 0, 2);
+			gf_bs_write_int(bs, ((GF_SYNCEntry *)entry)->NALU_type, 6);
+			gf_bs_del(bs);
+			return gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, 0, udta, sg_rap_create_entry, sg_rap_compare_entry);
+		}
+		case GF_ISOM_SAMPLE_GROUP_ROLL:
 		{
 			char udta[2];
 			bs = gf_bs_new(udta, 2*sizeof(char), GF_BITSTREAM_WRITE);
 			gf_bs_write_u16(bs, ((GF_RollRecoveryEntry *)entry)->roll_distance);
+			gf_bs_del(bs);
 			return gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, 0, udta, sg_roll_create_entry, sg_roll_compare_entry);
 		}
-		case GF_4CC( 's', 'e', 'i', 'g' ):
+		case GF_ISOM_SAMPLE_GROUP_SEIG:
 		{
 			char *udta;
 			u32 size;
@@ -5172,11 +5547,18 @@
 	gf_bs_get_content(bs, &udta, &size);
 	gf_bs_del(bs);
 
-	e = gf_isom_set_sample_group_info(movie, track, sample_number, GF_4CC( 's', 'e', 'i', 'g' ), 0, udta, sg_encryption_create_entry, sg_encryption_compare_entry);
+	e = gf_isom_set_sample_group_info(movie, track, sample_number, GF_ISOM_SAMPLE_GROUP_SEIG, 0, udta, sg_encryption_create_entry, sg_encryption_compare_entry);
 	gf_free(udta);
 	return e;
 }
 
+/*sample encryption information group can be in stbl or traf*/
+GF_EXPORT
+GF_Err gf_isom_set_sample_cenc_default(GF_ISOFile *movie, u32 track, u32 sample_number)
+{
+	return gf_isom_set_sample_group_info(movie, track, sample_number, GF_ISOM_SAMPLE_GROUP_SEIG, 0, NULL, NULL, NULL);
+}
+
 static GF_Err gf_isom_set_ctts_v1(GF_ISOFile *file, u32 track, GF_TrackBox *trak)
 {
 	u32 i, shift;
@@ -5341,6 +5723,17 @@
 }
 
 GF_EXPORT
+GF_Err gf_isom_sample_set_dep_info(GF_ISOFile *file, u32 track, u32 sampleNumber, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant)
+{
+	GF_TrackBox *trak;
+
+	trak = gf_isom_get_track_from_file(file, track);
+	if (!trak) return GF_BAD_PARAM;
+
+	return stbl_AddDependencyType(trak->Media->information->sampleTable, sampleNumber, isLeading, dependsOn, dependedOn, redundant);
+}
+
+GF_EXPORT
 GF_Err gf_isom_copy_sample_info(GF_ISOFile *dst, u32 dst_track, GF_ISOFile *src, u32 src_track, u32 sampleNumber)
 {
 	u32 i, count, idx, dst_sample_num, subs_flags;
@@ -5576,6 +5969,19 @@
 		while ((ent = (GF_EdtsEntry*)gf_list_enum(elst->entryList, &i))) {
 			if (ent->segmentDuration > trackDuration)
 				ent->segmentDuration = trackDuration;
+			if (!ent->segmentDuration) {
+				u64 diff;
+				ent->segmentDuration = trackDuration;
+				if (ent->mediaTime>0) {
+					diff = ent->mediaTime;
+					diff *= trak->moov->mvhd->timeScale;
+					diff /= trak->Media->mediaHeader->timeScale;
+					if (diff < ent->segmentDuration)
+						ent->segmentDuration -= diff;
+					else
+						diff = 0;
+				}
+			}
 			if ((ent->mediaTime>=0) && ((u64) ent->mediaTime>=trak->Media->mediaHeader->duration)) {
 				ent->mediaTime = trak->Media->mediaHeader->duration;
 			}
@@ -5664,6 +6070,46 @@
 	return gf_list_add(trak->groups->groups, trgt);
 }
 
+GF_EXPORT
+GF_Err gf_isom_update_video_sample_entry_fields(GF_ISOFile *file, u32 track, u32 stsd_idx, u16 revision, u32 vendor, u32 temporalQ, u32 spatialQ, u32 horiz_res, u32 vert_res, u16 frames_per_sample, char *compressor_name, s16 color_table_index)
+{
+
+	GF_TrackBox *trak;
+	GF_MPEGVisualSampleEntryBox *vid_ent;
+
+	/*get orig sample desc and clone it*/
+	trak = gf_isom_get_track_from_file(file, track);
+	if (!trak || !stsd_idx) return GF_BAD_PARAM;
+
+	if (!trak->Media || !trak->Media->handler || !trak->Media->information || !trak->Media->information->sampleTable || !trak->Media->information->sampleTable->SampleDescription)
+		return GF_ISOM_INVALID_FILE;
+
+	switch (trak->Media->handler->handlerType) {
+	case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
+ 	break;
+	default:
+		return GF_BAD_PARAM;
+	}
+	vid_ent = gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, stsd_idx-1);
+	if (!vid_ent)
+		return GF_BAD_PARAM;
+
+	vid_ent->revision = revision;
+	vid_ent->vendor = vendor;
+	vid_ent->temporal_quality = temporalQ;
+	vid_ent->spatial_quality = spatialQ;
+	vid_ent->horiz_res = horiz_res;
+	vid_ent->vert_res = vert_res;
+	vid_ent->frames_per_sample = frames_per_sample;
+	if (compressor_name)
+		strncpy(vid_ent->compressor_name, compressor_name, 32);
+
+	vid_ent->color_table_index = color_table_index;
+	return GF_OK;
+}
+
 #endif	/*!defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_WRITE)*/

gpac-0.7.1.tar.gz/src/isomedia/media.c -> gpac-0.8.0.tar.gz/src/isomedia/media.c Changed

@@ -25,6 +25,7 @@
 
 #include <gpac/internal/isomedia_dev.h>
 #include <gpac/constants.h>
+#include <gpac/avparse.h>
 
 #ifndef GPAC_DISABLE_ISOM
 
@@ -52,7 +53,6 @@
 	GF_Err e;
 	u32 sampleNumber, prevSampleNumber, num;
 	u64 offset;
-	u8 isEdited;
 	if (sampleDescIndex == NULL) return GF_BAD_PARAM;
 
 	//find the sample for this time
@@ -67,7 +67,7 @@
 		}
 		return GF_BAD_PARAM;
 	}
-	return stbl_GetSampleInfos(mdia->information->sampleTable, ( sampleNumber ? sampleNumber : prevSampleNumber), &offset, &num, sampleDescIndex, &isEdited);
+	return stbl_GetSampleInfos(mdia->information->sampleTable, ( sampleNumber ? sampleNumber : prevSampleNumber), &offset, &num, sampleDescIndex, NULL);
 }
 
 static GF_Err gf_isom_get_3gpp_audio_esd(GF_SampleTableBox *stbl, GF_GenericAudioSampleEntryBox *entry, GF_ESD **out_esd)
@@ -199,10 +199,33 @@
 			HEVC_RewriteESDescriptorEx((GF_MPEGVisualSampleEntryBox*) entry, NULL);
 		esd = ((GF_MPEGVisualSampleEntryBox*) entry)->emul_esd;
 		break;
+	case GF_ISOM_BOX_TYPE_AV01:
+		AV1_RewriteESDescriptorEx((GF_MPEGVisualSampleEntryBox*)entry, mdia);
+		esd = ((GF_MPEGVisualSampleEntryBox*)entry)->emul_esd;
+		break;
+	case GF_ISOM_BOX_TYPE_VP09:
+		VP9_RewriteESDescriptorEx((GF_MPEGVisualSampleEntryBox*)entry, mdia);
+		esd = ((GF_MPEGVisualSampleEntryBox*)entry)->emul_esd;
+		break;
 	case GF_ISOM_BOX_TYPE_MP4A:
 	case GF_ISOM_BOX_TYPE_ENCA:
-		ESDa = ((GF_MPEGAudioSampleEntryBox*)entry)->esd;
-		if (ESDa) esd = (GF_ESD *) ESDa->desc;
+ {
+ GF_MPEGAudioSampleEntryBox *ase = (GF_MPEGAudioSampleEntryBox*)entry;
+ ESDa = ase->esd;
+ if (ESDa) esd = (GF_ESD *) ESDa->desc;
+ else {
+ // Assuming that if no ESD is provided the stream is Basic MPEG-4 AAC LC
+ GF_M4ADecSpecInfo aacinfo;
+ memset(&aacinfo, 0, sizeof(GF_M4ADecSpecInfo));
+ aacinfo.nb_chan = ase->channel_count;
+ aacinfo.base_object_type = GF_M4A_AAC_LC;
+ aacinfo.base_sr = ase->samplerate_hi;
+ *out_esd = gf_odf_desc_esd_new(0);
+ (*out_esd)->decoderConfig->streamType = GF_STREAM_AUDIO;
+ (*out_esd)->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4;
+ gf_m4a_write_config(&aacinfo, &(*out_esd)->decoderConfig->decoderSpecificInfo->data, &(*out_esd)->decoderConfig->decoderSpecificInfo->dataLength);
+ }
+ }
 		break;
 	case GF_ISOM_BOX_TYPE_MP4S:
 	case GF_ISOM_BOX_TYPE_ENCS:
@@ -234,31 +257,11 @@
 		gf_bs_get_content(bs, & esd->decoderConfig->decoderSpecificInfo->data, & esd->decoderConfig->decoderSpecificInfo->dataLength);
 		gf_bs_del(bs);
 	}
-	break;
+		break;
 	case GF_ISOM_BOX_TYPE_STPP:
-	{
-		/* TODO */
-	}
-	break;
 	case GF_ISOM_BOX_TYPE_SBTT:
-	{
-		/* TODO */
-	}
-	break;
 	case GF_ISOM_BOX_TYPE_STXT:
-	{
-		GF_BitStream *bs;
-		esd = gf_odf_desc_esd_new(2);
-		*out_esd = esd;
-		esd->decoderConfig->streamType = GF_STREAM_TEXT;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_SIMPLE_TEXT_MP4;
-		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		gf_bs_write_u32(bs, entry->type);
-		gf_isom_box_write((GF_Box *)((GF_MetaDataSampleEntryBox*)entry)->config, bs);
-		gf_bs_get_content(bs, & esd->decoderConfig->decoderSpecificInfo->data, & esd->decoderConfig->decoderSpecificInfo->dataLength);
-		gf_bs_del(bs);
-	}
-	break;
+		break;
 #endif
 
 	case GF_ISOM_SUBTYPE_3GP_AMR:
@@ -272,6 +275,26 @@
 			break;
 		} else return GF_ISOM_INVALID_MEDIA;
 
+	case GF_ISOM_SUBTYPE_OPUS: {
+		GF_OpusSpecificBox *e = ((GF_MPEGAudioSampleEntryBox*)entry)->cfg_opus;
+		GF_BitStream *bs_out;
+		if (!e) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("ESD not found for Opus\n)"));
+			break;
+		}
+
+		*out_esd = gf_odf_desc_esd_new(2);
+		(*out_esd)->decoderConfig->streamType = GF_STREAM_AUDIO;
+		(*out_esd)->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_OPUS;
+
+		//serialize box with header - compatibility with ffmpeg
+		bs_out = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		gf_isom_box_size((GF_Box *) e);
+		gf_isom_box_write((GF_Box *) e, bs_out);
+		gf_bs_get_content(bs_out, & (*out_esd)->decoderConfig->decoderSpecificInfo->data, & (*out_esd)->decoderConfig->decoderSpecificInfo->dataLength);
+		gf_bs_del(bs_out);
+		break;
+	}
 	case GF_ISOM_SUBTYPE_3GP_H263:
 		if (true_desc_only) {
 			return GF_ISOM_INVALID_MEDIA;
@@ -315,6 +338,11 @@
 			memcpy(esd->decoderConfig->decoderSpecificInfo->data, ptr->lsr_config->hdr, sizeof(char)*ptr->lsr_config->hdr_size);
 			break;
 		}
+	case GF_ISOM_SUBTYPE_MH3D_MHA1:
+	case GF_ISOM_SUBTYPE_MH3D_MHA2:
+	case GF_ISOM_SUBTYPE_MH3D_MHM1:
+	case GF_ISOM_SUBTYPE_MH3D_MHM2:
+		break;
 
 	default:
 		return GF_ISOM_INVALID_MEDIA;
@@ -350,8 +378,8 @@
 	u32 bytesRead;
 	u32 dataRefIndex, chunkNumber;
 	u64 offset, new_size;
-	u8 isEdited;
 	GF_SampleEntryBox *entry;
+	GF_StscEntry *stsc_entry;
 
 	if (!mdia || !mdia->information->sampleTable) return GF_BAD_PARAM;
 	if (!mdia->information->sampleTable->SampleSize)
@@ -385,18 +413,22 @@
 		//if no SyncSample, all samples are sync (cf spec)
 		(*samp)->IsRAP = RAP;
 	}
-	/*overwrite sync sample with sample dep if any*/
+
 	if (mdia->information->sampleTable->SampleDep) {
 		u32 isLeading, dependsOn, dependedOn, redundant;
 		e = stbl_GetSampleDepType(mdia->information->sampleTable->SampleDep, sampleNumber, &isLeading, &dependsOn, &dependedOn, &redundant);
 		if (!e) {
 			if (dependsOn==1) (*samp)->IsRAP = RAP_NO;
-			else if (dependsOn==2) (*samp)->IsRAP = RAP;
+			//commenting following code since it is wrong - an I frame is not always a SAP1, it can be a SAP2 or SAP3.
+			//Keeping this code breaks AVC / HEVC openGOP import when writing sample dependencies
+			//else if (dependsOn==2) (*samp)->IsRAP = RAP;
+
 			/*if not depended upon and redundant, mark as carousel sample*/
 			if ((dependedOn==2) && (redundant==1)) (*samp)->IsRAP = RAP_REDUNDANT;
 			/*TODO FIXME - we must enhance the IsRAP semantics to carry disposable info ... */
 		}
 	}
+
 	/*get sync shadow*/
 	if (Media_IsSampleSyncShadow(mdia->information->sampleTable->ShadowSync, sampleNumber)) (*samp)->IsRAP = RAP_REDUNDANT;
 
@@ -406,7 +438,7 @@
 	if (!sIDX) return GF_OK;
 
 	(*sIDX) = 0;
-	e = stbl_GetSampleInfos(mdia->information->sampleTable, sampleNumber, &offset, &chunkNumber, sIDX, &isEdited);
+	e = stbl_GetSampleInfos(mdia->information->sampleTable, sampleNumber, &offset, &chunkNumber, sIDX, &stsc_entry);
 	if (e) return e;
 
 	//then get the DataRef
@@ -419,13 +451,13 @@
 	if (mdia->mediaTrack->moov->mov->openMode == GF_ISOM_OPEN_READ) {
 		//same as last call in read mode
 		if (!mdia->information->dataHandler) {
-			e = gf_isom_datamap_open(mdia, dataRefIndex, isEdited);
+			e = gf_isom_datamap_open(mdia, dataRefIndex, stsc_entry->isEdited);
 			if (e) return e;
 		}
 		if (mdia->information->dataEntryIndex != dataRefIndex)
 			mdia->information->dataEntryIndex = dataRefIndex;
 	} else {
-		e = gf_isom_datamap_open(mdia, dataRefIndex, isEdited);
+		e = gf_isom_datamap_open(mdia, dataRefIndex, stsc_entry->isEdited);
 		if (e) return e;
 	}
 
@@ -433,6 +465,15 @@
 	if (no_data) return GF_OK;
 	if ((*samp)->dataLength != 0) {
 
+		if (mdia->mediaTrack->pack_num_samples) {
+			u32 idx_in_chunk = sampleNumber - mdia->information->sampleTable->SampleToChunk->firstSampleInCurrentChunk;
+			u32 left_in_chunk = stsc_entry->samplesPerChunk - idx_in_chunk;
+			if (left_in_chunk > mdia->mediaTrack->pack_num_samples)
+				left_in_chunk = mdia->mediaTrack->pack_num_samples;
+			(*samp)->dataLength *= left_in_chunk;
+			(*samp)->nb_pack = left_in_chunk;
+		}
+
 		/*and finally get the data, include padding if needed*/
 		(*samp)->data = (char *) gf_malloc(sizeof(char) * ( (*samp)->dataLength + mdia->mediaTrack->padding_bytes) );
 		if (mdia->mediaTrack->padding_bytes)
@@ -463,12 +504,10 @@
 		e = Media_RewriteODFrame(mdia, *samp);
 		if (e) return e;
 	}
-	/*FIXME: we do NOT rewrite sample if we have a encrypted track*/
+	/*we do NOT rewrite sample if we have a encrypted track*/
 	else if (gf_isom_is_nalu_based_entry(mdia, entry)
-	//we rewrite sample even if track is encrypted since CENC keeps nal unit in clear, which is all we need to rewrite the sample and insert SPS/PPS/VPS
-//	&& !gf_isom_is_track_encrypted(mdia->mediaTrack->moov->mov, gf_isom_get_tracknum_from_id(mdia->mediaTrack->moov, mdia->mediaTrack->Header->trackID))
-
-	 ) {
+		&& !gf_isom_is_track_encrypted(mdia->mediaTrack->moov->mov, gf_isom_get_tracknum_from_id(mdia->mediaTrack->moov, mdia->mediaTrack->Header->trackID))
+	) {
 		e = gf_isom_nalu_sample_rewrite(mdia, *samp, sampleNumber, (GF_MPEGVisualSampleEntryBox *)entry);
 		if (e) return e;
 	}
@@ -532,10 +571,26 @@
 	}
 	if (a->flags & 1) return 1;
 	/*QT specific*/
-	if (a->type == GF_4CC('a', 'l', 'i', 's')) return 1;
+	if (a->type == GF_QT_BOX_TYPE_ALIS) return 1;
 	return 0;
 }
 
+GF_ISOMDataRefAllType Media_SelfContainedType(GF_MediaBox *mdia)
+{
+	u32 nb_ext, nb_self;
+	u32 i, count;
+
+	nb_ext = nb_self = 0;
+	count = gf_list_count(mdia->information->sampleTable->SampleDescription->other_boxes);
+	for (i=0; i<count; i++) {
+		if (Media_IsSelfContained(mdia, i+1)) nb_self++;
+		else nb_ext++;
+	}
+	if (nb_ext==count) return ISOM_DREF_EXT;
+	if (nb_self==count) return ISOM_DREF_SELF;
+	return ISOM_DREF_MIXED;
+}
+
 
 
 //look for a sync sample from a given point in media time
@@ -572,7 +627,7 @@
 
 	if (prev_in_sap > prev)
 		prev = prev_in_sap;
-	if (next_in_sap < next)
+	if (next_in_sap && next_in_sap < next)
 		next = next_in_sap;
 
 	//nothing yet, go for next time...
@@ -721,8 +776,35 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
+GF_Err Media_SetDrefURL(GF_DataEntryURLBox *dref_entry, const char *origName, const char *finalName)
+{
+	//for now we only support dref created in same folder for relative URLs
+	if (strstr(origName, "://") || ((origName[1]==':') && (origName[2]=='\\'))
+		|| (origName[0]=='/') || (origName[0]=='\\')
+	) {
+		dref_entry->location = gf_strdup(origName);
+	} else {
+		char *fname = strrchr(origName, '/');
+		if (!fname) fname = strrchr(origName, '\\');
+		if (fname) fname++;
+
+		if (!fname) {
+			dref_entry->location = gf_strdup(origName);
+		} else {
+			u32 len = (u32)(fname - origName);
+			if (!finalName || strncmp(origName, finalName, len)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Concatenation of relative path %s with relative path %s not supported, use absolute URLs\n", origName, finalName));
+				return GF_NOT_SUPPORTED;
+			} else {
+				dref_entry->location = gf_strdup(fname);
+			}
+		}
+	}
+	return GF_OK;
+}
+
 
-GF_Err Media_CreateDataRef(GF_DataReferenceBox *dref, char *URLname, char *URNname, u32 *dataRefIndex)
+GF_Err Media_CreateDataRef(GF_ISOFile *movie, GF_DataReferenceBox *dref, char *URLname, char *URNname, u32 *dataRefIndex)
 {
 	GF_Err e;
 	GF_DataEntryURLBox *entry;
@@ -743,12 +825,12 @@
 		//THIS IS URL
 		entry = (GF_DataEntryURLBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_URL);
 		entry->flags = 0;
-		entry->location = (char*)gf_malloc(strlen(URLname)+1);
+
+		e = Media_SetDrefURL(entry, URLname, movie->fileName ? movie->fileName : movie->finalName);
 		if (! entry->location) {
 			gf_isom_box_del((GF_Box *)entry);
-			return GF_OUT_OF_MEM;
+			return e ? e : GF_OUT_OF_MEM;
 		}
-		strcpy(entry->location, URLname);
 		e = dref_AddDataEntry(dref, (GF_Box *)entry);
 		if (e) return e;
 		*dataRefIndex = gf_list_count(dref->other_boxes);
@@ -791,11 +873,11 @@
 	stbl = mdia->information->sampleTable;
 
 	//get a valid sampleNumber for this new guy
-	e = stbl_AddDTS(stbl, sample->DTS, &sampleNumber, mdia->mediaHeader->timeScale);
+	e = stbl_AddDTS(stbl, sample->DTS, &sampleNumber, mdia->mediaHeader->timeScale, sample->nb_pack);
 	if (e) return e;
 
 	//add size
-	e = stbl_AddSize(stbl->SampleSize, sampleNumber, sample->dataLength);
+	e = stbl_AddSize(stbl->SampleSize, sampleNumber, sample->dataLength, sample->nb_pack);
 	if (e) return e;
 
 	//adds CTS offset
@@ -836,9 +918,9 @@
 	}
 
 	//and update the chunks
-	e = stbl_AddChunkOffset(mdia, sampleNumber, StreamDescIndex, data_offset);
+	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(GF_ISOM_BOX_TYPE_STSH);
 	return stbl_AddShadow(mdia->information->sampleTable->ShadowSync, sampleNumber, syncShadowNumber);
@@ -888,7 +970,6 @@
 	GF_Err e;
 	u32 drefIndex, chunkNum, descIndex;
 	u64 newOffset, DTS;
-	u8 isEdited;
 	GF_DataEntryURLBox *Dentry;
 	GF_SampleTableBox *stbl;
 
@@ -905,7 +986,7 @@
 	}
 
 	//get our infos
-	stbl_GetSampleInfos(stbl, sampleNumber, &newOffset, &chunkNum, &descIndex, &isEdited);
+	stbl_GetSampleInfos(stbl, sampleNumber, &newOffset, &chunkNum, &descIndex, NULL);
 
 	//then check the data ref
 	e = Media_GetSampleDesc(mdia, descIndex, NULL, &drefIndex);
@@ -934,7 +1015,6 @@
 	GF_Err e;
 	u32 drefIndex, chunkNum, descIndex;
 	u64 off, DTS;
-	u8 isEdited;
 	GF_DataEntryURLBox *Dentry;
 	GF_SampleTableBox *stbl;
 
@@ -947,7 +1027,7 @@
 	if (DTS != sample->DTS) return GF_BAD_PARAM;
 
 	//get our infos
-	stbl_GetSampleInfos(stbl, sampleNumber, &off, &chunkNum, &descIndex, &isEdited);
+	stbl_GetSampleInfos(stbl, sampleNumber, &off, &chunkNum, &descIndex, NULL);
 
 	//then check the data ref
 	e = Media_GetSampleDesc(mdia, descIndex, NULL, &drefIndex);

gpac-0.7.1.tar.gz/src/isomedia/meta.c -> gpac-0.8.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-2012
+ *			Copyright (c) Telecom ParisTech 2005-2019
 *					All rights reserved
 *
 * This file is part of GPAC / ISO Media File Format sub-project
@@ -126,7 +126,7 @@
 
 GF_EXPORT
 GF_Err gf_isom_get_meta_item_info(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_num,
- u32 *itemID, u32 *protection_idx, Bool *is_self_reference,
+ u32 *itemID, u32 *type, u32 *protection_idx, Bool *is_self_reference,
 const char **item_name, const char **item_mime_type, const char **item_encoding,
 const char **item_url, const char **item_urn)
 {
@@ -144,6 +144,7 @@
 	if (item_mime_type) (*item_mime_type) = iinf->content_type;
 	if (item_encoding) (*item_encoding) = iinf->content_encoding;
 	if (is_self_reference) *is_self_reference = 0;
+	if (type) *type = iinf->item_type;
 
 	if (item_url) (*item_url) = NULL;
 	if (item_urn) (*item_urn) = NULL;
@@ -191,7 +192,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_extract_meta_item_extended(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, const char *dump_file_name, char **out_data, u32 *out_size, const char **out_mime )
+GF_Err gf_isom_extract_meta_item_extended(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, const char *dump_file_name, char **out_data, u32 *out_size, const char **out_mime, Bool use_annex_b)
 {
 	GF_BitStream *item_bs;
 	char szPath[1024];
@@ -200,6 +201,9 @@
 	u32 i, count;
 	GF_ItemLocationEntry *location_entry;
 	u32 item_num;
+	u32 item_type = 0;
+	u32 nalu_size_length = 0;
+	u64 idat_offset = 0;
 	char *item_name = NULL;
 
 	GF_MetaBox *meta = gf_isom_get_meta(file, root_meta, track_num);
@@ -212,6 +216,8 @@
 		GF_ItemInfoEntryBox *item_entry = (GF_ItemInfoEntryBox *)gf_list_get(meta->item_infos->item_infos, item_num-1);
 		item_name = item_entry->item_name;
 		if (out_mime) *out_mime = item_entry->content_type;
+
+		item_type = item_entry->item_type;
 	}
 
 	location_entry = NULL;
@@ -222,9 +228,43 @@
 		location_entry = NULL;
 	}
 
+	// switch (item_type) {
+	// case GF_ISOM_SUBTYPE_HVC1:
+	// case GF_ISOM_SUBTYPE_AVC_H264:
+	// case GF_ISOM_SUBTYPE_JPEG:
+	// 	break;
+	// default:
+	// 	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[IsoMedia] Extracting item type %s not supported\n", gf_4cc_to_str(item_type) ));
+	// 	return GF_NOT_SUPPORTED;
+	// }
+
 	if (!location_entry) return GF_BAD_PARAM;
+
+	/* offsets are expressed from the start of the idat box instead of the start of the file */
+	if (location_entry->construction_method == 1) {
+		int found = 0;
+
+		count = gf_list_count(meta->other_boxes);
+		for (i = 0; i <count; i++) {
+			GF_Box *a = (GF_Box *)gf_list_get(meta->other_boxes, i);
+
+			if (a->type == GF_ISOM_BOX_TYPE_IDAT) {
+
+				GF_MediaDataBox *p = (GF_MediaDataBox *)a;
+				idat_offset = p->bsOffset;
+				found = 1;
+				break;
+
+			}
+			if (!found) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] Item %d references an inexistant idat box\n", item_num));
+				return GF_BAD_PARAM;
+			}
+		}
+	}
+	/* when construction_method==1, data_reference_index is ignored */
 	/*FIXME*/
-	if (location_entry->data_reference_index) {
+	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->other_boxes, location_entry->data_reference_index-1);
 		if (a->type==GF_ISOM_BOX_TYPE_URL) {
@@ -250,6 +290,7 @@
 
 	item_bs = NULL;
 
+
 	if (out_data) {
 		item_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	} else if (dump_file_name) {
@@ -257,24 +298,95 @@
 		resource = gf_fopen(szPath, "wb");
 		item_bs = gf_bs_from_file(resource, GF_BITSTREAM_WRITE);
 	} else {
-		if (item_name) strcpy(szPath, item_name);
+		if (item_name && strlen(item_name) > 0) strcpy(szPath, item_name);
 		else sprintf(szPath, "item_id%02d", item_id);
 		resource = gf_fopen(szPath, "wb");
 		item_bs = gf_bs_from_file(resource, GF_BITSTREAM_WRITE);
 	}
 
+	if ((item_type == GF_ISOM_SUBTYPE_HVC1) || (item_type == GF_ISOM_SUBTYPE_AVC_H264) ) {
+		u32 i, count, j, c2;
+		GF_HEVCConfigurationBox *hvcc = NULL;
+		GF_AVCConfigurationBox *avcc = NULL;
+		if (! meta->item_props) return GF_NON_COMPLIANT_BITSTREAM;
+		if (! meta->item_props->property_container) return GF_NON_COMPLIANT_BITSTREAM;
+		if (! meta->item_props->property_association) return GF_NON_COMPLIANT_BITSTREAM;
+
+		count = gf_list_count(meta->item_props->property_association->entries);
+		for (i=0; i<count; i++) {
+			GF_ItemPropertyAssociationEntry *e = gf_list_get(meta->item_props->property_association->entries, i);
+			if (e->item_id!=item_id) continue;
+			c2 = gf_list_count(e->property_index);
+			for (j=0; j<c2; j++) {
+				u32 *idx = gf_list_get(e->property_index, j);
+				if (! (*idx) ) continue;
+				hvcc = gf_list_get(meta->item_props->property_container->other_boxes, (*idx) - 1);
+				if (!hvcc) return GF_NON_COMPLIANT_BITSTREAM;
+				if (hvcc->type == GF_ISOM_BOX_TYPE_HVCC) break;
+				if (hvcc->type == GF_ISOM_BOX_TYPE_AVCC) {
+					avcc = (GF_AVCConfigurationBox *) hvcc;
+					hvcc = NULL;
+					break;
+				}
+			}
+			if (avcc || hvcc) break;
+		}
+		if (hvcc) {
+			if (! hvcc->config) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Missing HEVC config in hvcC\n"));
+			} else {
+				if (use_annex_b) {
+					hvcc->config->write_annex_b = GF_TRUE;
+					gf_odf_hevc_cfg_write_bs(hvcc->config, item_bs);
+					hvcc->config->write_annex_b = GF_FALSE;
+				}
+				nalu_size_length = hvcc->config->nal_unit_size;
+			}
+		} else if (avcc) {
+			if (! avcc->config) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Missing AVC config in avcC\n"));
+			} else {
+				if (use_annex_b) {
+					avcc->config->write_annex_b = GF_TRUE;
+					gf_odf_avc_cfg_write_bs(avcc->config, item_bs);
+					avcc->config->write_annex_b = GF_FALSE;
+				}
+				nalu_size_length = avcc->config->nal_unit_size;
+			}
+		}
+	}
+
 	for (i=0; i<count; i++) {
 		char buf_cache[4096];
 		u64 remain;
 		GF_ItemExtentEntry *extent_entry = (GF_ItemExtentEntry *)gf_list_get(location_entry->extent_entries, i);
-		gf_bs_seek(file->movieFileMap->bs, location_entry->base_offset + extent_entry->extent_offset);
+		gf_bs_seek(file->movieFileMap->bs, idat_offset + location_entry->base_offset + extent_entry->extent_offset);
 
 		remain = extent_entry->extent_length;
 		while (remain) {
-			u32 cache_size = (remain>4096) ? 4096 : (u32) remain;
-			gf_bs_read_data(file->movieFileMap->bs, buf_cache, cache_size);
-			gf_bs_write_data(item_bs, buf_cache, cache_size);
-			remain -= cache_size;
+			if (nalu_size_length) {
+				u32 nal_size = gf_bs_read_int(file->movieFileMap->bs, 8*nalu_size_length);
+				assert(remain>nalu_size_length);
+
+				if (use_annex_b)
+					gf_bs_write_u32(item_bs, 1);
+				else
+					gf_bs_write_int(item_bs, nal_size, 8*nalu_size_length);
+
+				remain -= nalu_size_length + nal_size;
+				while (nal_size) {
+					u32 cache_size = (nal_size>4096) ? 4096 : (u32) nal_size;
+
+					gf_bs_read_data(file->movieFileMap->bs, buf_cache, cache_size);
+					gf_bs_write_data(item_bs, buf_cache, cache_size);
+					nal_size -= cache_size;
+				}
+			} else {
+				u32 cache_size = (remain>4096) ? 4096 : (u32) remain;
+				gf_bs_read_data(file->movieFileMap->bs, buf_cache, cache_size);
+				gf_bs_write_data(item_bs, buf_cache, cache_size);
+				remain -= cache_size;
+			}
 		}
 	}
 	if (out_data) {
@@ -290,12 +402,13 @@
 GF_EXPORT
 GF_Err gf_isom_extract_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, const char *dump_file_name)
 {
-	return gf_isom_extract_meta_item_extended(file, root_meta, track_num, item_id, dump_file_name, NULL, NULL, NULL);
+	return gf_isom_extract_meta_item_extended(file, root_meta, track_num, item_id, dump_file_name, NULL, NULL, NULL, GF_TRUE);
 }
 
-GF_Err gf_isom_extract_meta_item_mem(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, char **out_data, u32 *out_size, const char **out_mime)
+GF_EXPORT
+GF_Err gf_isom_extract_meta_item_mem(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, char **out_data, u32 *out_size, const char **out_mime, Bool use_annex_b)
 {
-	return gf_isom_extract_meta_item_extended(file, root_meta, track_num, item_id, NULL, out_data, out_size, out_mime);
+	return gf_isom_extract_meta_item_extended(file, root_meta, track_num, item_id, NULL, out_data, out_size, out_mime, use_annex_b);
 }
 
 GF_EXPORT
@@ -313,7 +426,7 @@
 GF_EXPORT
 GF_Err gf_isom_set_meta_type(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 metaType)
 {
-	char szName[20];
+	char szName[40];
 	GF_MetaBox *meta;
 
 	GF_Err e = CanAccessMovie(file, GF_ISOM_OPEN_WRITE);
@@ -419,17 +532,21 @@
 	assert(gf_ftell(xmlfile) < 1<<31);
 	length = (u32) gf_ftell(xmlfile);
 	gf_fseek(xmlfile, 0, SEEK_SET);
-	xml->xml = (char*)gf_malloc(sizeof(unsigned char)*length);
+	xml->xml = (char*)gf_malloc(sizeof(unsigned char)*(length+1));
 	bread = (u32) fread(xml->xml, 1, sizeof(unsigned char)*length, xmlfile);
 	if (ferror(xmlfile) || (bread != length)) {
 		gf_free(xml->xml);
 		xml->xml = NULL;
 		return GF_BAD_PARAM;
 	}
+	else {
+		xml->xml[length] = '\0';
+	}
 	gf_fclose(xmlfile);
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_set_meta_xml_memory(GF_ISOFile *file, Bool root_meta, u32 track_num, unsigned char *data, u32 data_size, Bool IsBinaryXML)
 {
 	GF_Err e;
@@ -457,6 +574,80 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_isom_get_meta_image_props(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, GF_ImageItemProperties *prop) {
+	u32 count, i;
+	u32 count2, j;
+	GF_ItemPropertyAssociationBox *ipma = NULL;
+	GF_ItemPropertyContainerBox *ipco = NULL;
+	GF_MetaBox *meta = gf_isom_get_meta(file, root_meta, track_num);
+	if (!meta) return GF_BAD_PARAM;
+
+	memset(prop, 0, sizeof(GF_ImageItemProperties));
+	if (!meta->item_props) return GF_OK;
+
+	ipma = meta->item_props->property_association;
+	ipco = meta->item_props->property_container;
+
+	count = gf_list_count(ipma->entries);
+	for (i = 0; i < count; i++) {
+		GF_ItemPropertyAssociationEntry *entry = (GF_ItemPropertyAssociationEntry *)gf_list_get(ipma->entries, i);
+		if (entry->item_id == item_id) {
+			count2 = gf_list_count(entry->property_index);
+			for (j = 0; j < count2; j++) {
+				u32 *index = (u32 *)gf_list_get(entry->property_index, j);
+				GF_Box *b = (GF_Box *)gf_list_get(ipco->other_boxes, *index - 1);
+				if (!b) continue;
+				switch (b->type) {
+				case GF_ISOM_BOX_TYPE_ISPE:
+				{
+					GF_ImageSpatialExtentsPropertyBox *ispe = (GF_ImageSpatialExtentsPropertyBox *)b;
+					prop->width = ispe->image_width;
+					prop->height = ispe->image_height;
+				}
+				break;
+				case GF_ISOM_BOX_TYPE_RLOC:
+				{
+					GF_RelativeLocationPropertyBox *rloc = (GF_RelativeLocationPropertyBox *)b;
+					prop->hOffset = rloc->horizontal_offset;
+					prop->vOffset = rloc->vertical_offset;
+				}
+				break;
+				case GF_ISOM_BOX_TYPE_PASP:
+				{
+					GF_PixelAspectRatioBox *pasp = (GF_PixelAspectRatioBox *)b;
+					prop->hSpacing = pasp->hSpacing;
+					prop->vSpacing = pasp->vSpacing;
+				}
+				break;
+				case GF_ISOM_BOX_TYPE_PIXI:
+				{
+					GF_PixelInformationPropertyBox *pixi = (GF_PixelInformationPropertyBox *)b;
+					if (pixi->num_channels > 3) {
+						return GF_BAD_PARAM;
+					}
+					prop->num_channels = pixi->num_channels;
+					memset(prop->bits_per_channel, 0, 3);
+					memcpy(prop->bits_per_channel, pixi->bits_per_channel, pixi->num_channels);
+				}
+				break;
+				case GF_ISOM_BOX_TYPE_IROT:
+				{
+					GF_ImageRotationBox *irot = (GF_ImageRotationBox *)b;
+					prop->angle = irot->angle * 90;
+				}
+				break;
+				case GF_ISOM_BOX_TYPE_HVCC:
+				case GF_ISOM_BOX_TYPE_AVCC:
+					prop->config = b;
+					break;
+				}
+			}
+		}
+	}
+	return GF_OK;
+}
+
 static s32 meta_find_prop(GF_ItemPropertyContainerBox *boxes, GF_ImageItemProperties *prop) {
 	u32 i;
 	u32 count;
@@ -496,6 +687,20 @@
 			}
 		}
 		break;
+		case GF_ISOM_BOX_TYPE_PIXI:
+		{
+			GF_PixelInformationPropertyBox *pixi = (GF_PixelInformationPropertyBox *)b;
+			if (prop->num_channels && pixi->num_channels == prop->num_channels) {
+				int j;
+				for (j = 0; j < pixi->num_channels; j++) {
+					if (pixi->bits_per_channel[j] != prop->bits_per_channel[j]) {
+						break;
+					}
+				}
+				return i;
+			}
+		}
+		break;
 		default:
 			if (gf_isom_box_equal(prop->config, b)) {
 				return i;
@@ -524,7 +729,7 @@
 	if (!found_entry) {
 		GF_SAFEALLOC(found_entry, GF_ItemPropertyAssociationEntry);
 		if (!found_entry) return;
-		
+
 		gf_list_add(ipma->entries, found_entry);
 		found_entry->item_id = item_ID;
 		found_entry->essential = gf_list_new();
@@ -533,7 +738,7 @@
 	gf_list_add(found_entry->essential, ess);
 	gf_list_add(found_entry->property_index, index);
 }
-
+	
 static void meta_process_image_properties(GF_MetaBox *meta, u32 item_ID, GF_ImageItemProperties *image_props) {
 	GF_ImageItemProperties searchprop;
 	GF_ItemPropertyAssociationBox *ipma;
@@ -546,11 +751,37 @@
 		meta->item_props->property_container = (GF_ItemPropertyContainerBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_IPCO);
 		ipco = meta->item_props->property_container;
 		ipma = (GF_ItemPropertyAssociationBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_IPMA);
-		gf_list_add(meta->item_props->other_boxes, ipma);
+		meta->item_props->property_association = ipma;
 	} else {
-		ipma = (GF_ItemPropertyAssociationBox *)gf_list_get(meta->item_props->other_boxes, 0);
 		ipco = meta->item_props->property_container;
+		ipma = meta->item_props->property_association;
+	}
+
+	if (strlen(image_props->iccPath) > 0) {
+		FILE *fp = gf_fopen(image_props->iccPath, "rb");
+		if (fp) {
+			size_t read;
+			GF_ColourInformationBox *colr = (GF_ColourInformationBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_COLR);
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[iso file] reading ICC colour profile from file %s\n", &image_props->iccPath));
+			colr->colour_type = GF_ISOM_SUBTYPE_PROF;
+			fseek(fp,0,SEEK_END);
+			colr->opaque_size = (u32)ftell(fp);
+			fseek(fp,0,SEEK_SET);
+			colr->opaque = malloc(colr->opaque_size);
+			read = gf_fread(colr->opaque, 1, colr->opaque_size, fp);
+			gf_fclose(fp);
+			if (ferror(fp) || read != colr->opaque_size) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Error reading ICC colour profile from file %s\n", &image_props->iccPath));
+			} else {
+				gf_list_add(ipco->other_boxes, colr);
+				prop_index = gf_list_count(ipco->other_boxes) - 1;
+				meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_FALSE);
+			}
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Error opening ICC colour profile file at %s\n", &image_props->iccPath));
+		}
 	}
+
 	if (image_props->width || image_props->height) {
 		searchprop.width = image_props->width;
 		searchprop.height = image_props->height;
@@ -616,6 +847,34 @@
 			prop_index = gf_list_count(ipco->other_boxes) - 1;
 		}
 		meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		searchprop.config = NULL;
+	}
+	if (image_props->alpha) {
+		searchprop.alpha = image_props->alpha;
+		prop_index = meta_find_prop(ipco, &searchprop);
+		if (prop_index < 0) {
+			GF_AuxiliaryTypePropertyBox *auxC = (GF_AuxiliaryTypePropertyBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_AUXC);
+			auxC->aux_urn = gf_strdup("urn:mpeg:mpegB:cicp:systems:auxiliary:alpha");
+			gf_list_add(ipco->other_boxes, auxC);
+			prop_index = gf_list_count(ipco->other_boxes) - 1;
+		}
+		meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		searchprop.alpha = GF_FALSE;
+	}
+	if (image_props->num_channels) {
+		searchprop.num_channels = image_props->num_channels;
+		memcpy(searchprop.bits_per_channel, image_props->bits_per_channel, 3);
+		prop_index = meta_find_prop(ipco, &searchprop);
+		if (prop_index < 0) {
+			GF_PixelInformationPropertyBox *pixi = (GF_PixelInformationPropertyBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_PIXI);
+			pixi->num_channels = image_props->num_channels;
+			pixi->bits_per_channel = gf_malloc(pixi->num_channels);
+			memcpy(pixi->bits_per_channel, image_props->bits_per_channel, image_props->num_channels);
+			gf_list_add(ipco->other_boxes, pixi);
+			prop_index = gf_list_count(ipco->other_boxes) - 1;
+		}
+		meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		searchprop.num_channels = 0;
 	}
 }
 
@@ -660,7 +919,7 @@
 	GF_MetaBox *meta;
 	u32 lastItemID = 0;
 
-	if (!self_reference && !resource_path && !data) return GF_BAD_PARAM;
+	if (!self_reference && !resource_path && !data && !item_extent_refs) return GF_BAD_PARAM;
 	e = CanAccessMovie(file, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 	meta = gf_isom_get_meta(file, root_meta, track_num);
@@ -673,7 +932,7 @@
 	if (e) return e;
 
 	/*check file exists */
-	if (!URN && !URL && !self_reference && !data) {
+	if (resource_path) {
 		FILE *src = gf_fopen(resource_path, "rb");
 		if (!src) return GF_URL_ERROR;
 		gf_fclose(src);
@@ -702,13 +961,9 @@
 	if (item_name) {
 		infe->item_name = gf_strdup(item_name);
 	} else if (resource_path) {
-		if (strrchr(resource_path, GF_PATH_SEPARATOR)) {
-			infe->item_name = gf_strdup(strrchr(resource_path, GF_PATH_SEPARATOR) + 1);
-		} else {
-			infe->item_name = gf_strdup(resource_path);
-		}
+		infe->item_name = gf_strdup(gf_file_basename( resource_path ));
 	}
-	
+
 	infe->item_type = item_type;
 
 	if (mime_type) {
@@ -739,7 +994,7 @@
 	location_entry->item_ID = infe->item_ID;
 
 	if (!meta->item_infos) meta->item_infos = (GF_ItemInfoBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_IINF);
-	e = gf_list_add(meta->item_infos->item_infos, infe);	
+	e = gf_list_add(meta->item_infos->item_infos, infe);
 	if (e) return e;
 
 	if (image_props) {
@@ -767,7 +1022,7 @@
 		e = Media_FindDataRef(meta->file_locations->dref, (char *) URL, (char *) URN, &dataRefIndex);
 		if (e) return e;
 		if (!dataRefIndex) {
-			e = Media_CreateDataRef(meta->file_locations->dref, (char *) URL, (char *) URN, &dataRefIndex);
+			e = Media_CreateDataRef(file, meta->file_locations->dref, (char *) URL, (char *) URN, &dataRefIndex);
 			if (e) return e;
 		}
 		location_entry->data_reference_index = dataRefIndex;
@@ -784,7 +1039,7 @@
 			GF_SAFEALLOC(entry, GF_ItemExtentEntry);
 			gf_list_add(location_entry->extent_entries, entry);
 			item_index = (u32 *)gf_list_get(item_extent_refs, i);
-			gf_isom_meta_add_item_ref(file, root_meta, track_num, infe->item_ID, *item_index, GF_4CC('i','l','o','c'), &(entry->extent_index));	
+			gf_isom_meta_add_item_ref(file, root_meta, track_num, infe->item_ID, *item_index, GF_ISOM_REF_ILOC, &(entry->extent_index));
 		}
 	}
 	else {
@@ -859,6 +1114,7 @@
 	return gf_isom_add_meta_item_extended(file, root_meta, track_num, self_reference, resource_path, item_name, item_id, item_type, mime_type, content_encoding, image_props, URL, URN, NULL, 0, NULL);
 }
 
+GF_EXPORT
 GF_Err gf_isom_add_meta_item_memory(GF_ISOFile *file, Bool root_meta, u32 track_num, const char *item_name, u32 item_id, u32 item_type, const char *mime_type, const char *content_encoding, GF_ImageItemProperties *image_props, char *data, u32 data_len, GF_List *item_extent_refs)
 {
 	return gf_isom_add_meta_item_extended(file, root_meta, track_num, GF_FALSE, NULL, item_name, item_id, item_type, mime_type, content_encoding, image_props, NULL, NULL, data, data_len, item_extent_refs);

gpac-0.7.1.tar.gz/src/isomedia/movie_fragments.c -> gpac-0.8.0.tar.gz/src/isomedia/movie_fragments.c Changed

@@ -105,7 +105,8 @@
 
 	if (store_file) {
 		/*"dash" brand: this is a DASH Initialization Segment*/
-		gf_isom_modify_alternate_brand(movie, GF_4CC('d','a','s','h'), 1);
+		if (media_segment_type)
+			gf_isom_modify_alternate_brand(movie, GF_ISOM_BRAND_DASH, 1);
 
 		if (!movie->moov->mvex->mehd || !movie->moov->mvex->mehd->fragment_duration) {
 			//update durations
@@ -114,17 +115,16 @@
 
 		i=0;
 		while ((trex = (GF_TrackExtendsBox *)gf_list_enum(movie->moov->mvex->TrackExList, &i))) {
-			GF_TrackExtensionPropertiesBox *trep;
 			if (trex->type != GF_ISOM_BOX_TYPE_TREX) continue;
-			trep = GetTrep(movie->moov, trex->trackID);
-
-			if (!trep) {
-				trep = (GF_TrackExtensionPropertiesBox*) gf_isom_box_new(GF_ISOM_BOX_TYPE_TREP);
-				trep->trackID = trex->trackID;
-				gf_list_add(movie->moov->mvex->TrackExPropList, trep);
-			}
-
 			if (trex->track->Media->information->sampleTable->CompositionToDecode) {
+				GF_TrackExtensionPropertiesBox *trep;
+				trep = GetTrep(movie->moov, trex->trackID);
+
+				if (!trep) {
+					trep = (GF_TrackExtensionPropertiesBox*) gf_isom_box_new(GF_ISOM_BOX_TYPE_TREP);
+					trep->trackID = trex->trackID;
+					gf_list_add(movie->moov->mvex->TrackExPropList, trep);
+				}
 
 				if (!trex->track->Media->information->sampleTable->SampleSize || ! trex->track->Media->information->sampleTable->SampleSize->sampleCount) {
 					gf_list_add(trep->other_boxes, trex->track->Media->information->sampleTable->CompositionToDecode);
@@ -144,6 +144,10 @@
 			if (movie->moov->mvex->mehd && movie->moov->mvex->mehd->fragment_duration) {
 				trex->track->Header->duration = 0;
 				Media_SetDuration(trex->track);
+				if (trex->track->editBox && trex->track->editBox->editList) {
+					GF_EdtsEntry *edts = gf_list_last(trex->track->editBox->editList->entryList);
+					edts->segmentDuration = 0;
+				}
 			}
 		}
 
@@ -178,7 +182,7 @@
 	/*set brands for segment*/
 
 	/*"msdh": it's a media segment */
-	gf_isom_set_brand_info(movie, GF_4CC('m','s','d','h'), 0);
+	gf_isom_set_brand_info(movie, GF_ISOM_BRAND_MSDH, 0);
 	/*remove all brands	*/
 	gf_isom_reset_alt_brands(movie);
 	/*
@@ -197,7 +201,8 @@
 u32 DefaultSampleSize,
 u8 DefaultSampleIsSync,
 u8 DefaultSamplePadding,
- u16 DefaultDegradationPriority)
+ u16 DefaultDegradationPriority,
+ u8 force_traf_flags)
 {
 	GF_MovieExtendsBox *mvex;
 	GF_TrackExtendsBox *trex;
@@ -224,7 +229,14 @@
 	if (DefaultSampleIsSync) {
 		trex->def_sample_flags |= (2<<24);
 	}
+	trex->cannot_use_default = GF_FALSE;
 
+	if (force_traf_flags) {
+		trex->cannot_use_default = GF_TRUE;
+	} else if (DefaultSampleDescriptionIndex == 0 && DefaultSampleDuration == 0 && DefaultSampleSize == 0
+		&& DefaultSampleIsSync == 0 && DefaultSamplePadding == 0 && DefaultDegradationPriority == 0) {
+		trex->cannot_use_default = GF_TRUE;
+	}
 	return GF_OK;
 }
 
@@ -235,7 +247,8 @@
 u32 DefaultSampleSize,
 u8 DefaultSampleIsSync,
 u8 DefaultSamplePadding,
- u16 DefaultDegradationPriority)
+ u16 DefaultDegradationPriority,
+ u8 force_traf_flags)
 {
 	GF_MovieExtendsBox *mvex;
 	GF_TrackExtendsBox *trex;
@@ -269,7 +282,7 @@
 		mvex_AddBox((GF_Box*)mvex, (GF_Box *) trex);
 	}
 	trex->track = trak;
-	return gf_isom_change_track_fragment_defaults(movie, TrackID, DefaultSampleDescriptionIndex, DefaultSampleDuration, DefaultSampleSize, DefaultSampleIsSync, DefaultSamplePadding, DefaultDegradationPriority);
+	return gf_isom_change_track_fragment_defaults(movie, TrackID, DefaultSampleDescriptionIndex, DefaultSampleDuration, DefaultSampleSize, DefaultSampleIsSync, DefaultSamplePadding, DefaultDegradationPriority, force_traf_flags);
 }
 
 
@@ -326,7 +339,7 @@
 	}
 escape_duration:
 	//store if #
-	if (DefValue && (DefValue != traf->trex->def_sample_duration)) {
+	if (DefValue && ((DefValue != traf->trex->def_sample_duration) || traf->trex->cannot_use_default ) ) {
 		traf->tfhd->def_sample_duration = DefValue;
 	}
 
@@ -369,12 +382,12 @@
 		}
 	}
 	//store if #
-	if (DefValue && (DefValue != traf->trex->def_sample_flags)) {
+	if (traf->trex->cannot_use_default || (DefValue && (DefValue != traf->trex->def_sample_flags))) {
 		traf->tfhd->def_sample_flags = DefValue;
 	}
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_set_fragment_option(GF_ISOFile *movie, u32 TrackID, u32 Code, u32 Param)
 {
 	GF_TrackFragmentBox *traf;
@@ -395,6 +408,9 @@
 		//don't cache only one sample ...
 		traf->DataCache = Param > 1 ? Param : 0;
 		break;
+	case GF_ISOM_TFHD_FORCE_MOOF_BASE_OFFSET:
+		movie->force_moof_base_offset = Param;
+		break;
 	}
 	return GF_OK;
 }
@@ -423,6 +439,7 @@
 #endif
 }
 
+static
 u32 UpdateRuns(GF_ISOFile *movie, GF_TrackFragmentBox *traf)
 {
 	u32 sampleCount, i, j, RunSize, RunDur, RunFlags, NeedFlags, UseCTS, count;
@@ -442,7 +459,11 @@
 	} else
 #endif
 	{
-		traf->tfhd->flags = GF_ISOM_TRAF_BASE_OFFSET;
+		if (movie->force_moof_base_offset) {
+			traf->tfhd->flags = GF_ISOM_MOOF_BASE_OFFSET;
+		} else {
+			traf->tfhd->flags = GF_ISOM_TRAF_BASE_OFFSET;
+		}
 	}
 
 	//empty runs
@@ -452,7 +473,7 @@
 			gf_list_rem(traf->TrackRuns, 0);
 			gf_isom_box_del((GF_Box *)trun);
 		}
-		traf->tfhd->flags = GF_ISOM_TRAF_DUR_EMPTY;
+		traf->tfhd->flags |= GF_ISOM_TRAF_DUR_EMPTY;
 		if (traf->tfhd->EmptyDuration != traf->trex->def_sample_duration) {
 			traf->tfhd->def_sample_duration = traf->tfhd->EmptyDuration;
 			traf->tfhd->flags |= GF_ISOM_TRAF_SAMPLE_DUR;
@@ -481,14 +502,18 @@
 			if (!j) {
 				first_ent = ent;
 				RunSize = ent->size;
+				if (ent->nb_pack) RunSize /= ent->nb_pack;
 				RunDur = ent->Duration;
 			}
 			//we may have one entry only ...
 			if (j || (count==1)) {
+				u32 ssize = ent->size;
+				if (ent->nb_pack) ssize /= ent->nb_pack;
+
 				//flags are only after first entry
 				if (j==1 || (count==1) ) RunFlags = ent->flags;
 
-				if (ent->size != RunSize) RunSize = 0;
+				if (ssize != RunSize) RunSize = 0;
 				if (ent->Duration != RunDur) RunDur = 0;
 				if (j && (RunFlags != ent->flags)) NeedFlags = 1;
 			}
@@ -500,12 +525,12 @@
 			gf_list_rem(traf->TrackRuns, i);
 			continue;
 		}
-		trun->sample_count = gf_list_count(trun->entries);
+//		trun->sample_count = gf_list_count(trun->entries);
 		trun->flags = 0;
 
 		//size checking
 		//constant size, check if this is from current fragment default or global default
-		if (RunSize && (traf->trex->def_sample_size == RunSize)) {
+		if (RunSize && (traf->trex->def_sample_size == RunSize) && !traf->trex->cannot_use_default) {
 			if (!UseDefaultSize) UseDefaultSize = 2;
 			else if (UseDefaultSize==1) RunSize = 0;
 		} else if (RunSize && (traf->tfhd->def_sample_size == RunSize)) {
@@ -521,7 +546,7 @@
 		if (!RunSize) trun->flags |= GF_ISOM_TRUN_SIZE;
 
 		//duration checking
-		if (RunDur && (traf->trex->def_sample_duration == RunDur)) {
+		if (RunDur && (traf->trex->def_sample_duration == RunDur) && !traf->trex->cannot_use_default) {
 			if (!UseDefaultDur) UseDefaultDur = 2;
 			else if (UseDefaultDur==1) RunDur = 0;
 		} else if (RunDur && (traf->tfhd->def_sample_duration == RunDur)) {
@@ -533,7 +558,7 @@
 		//flag checking
 		if (!NeedFlags) {
 			// all samples flags are the same after the 2nd entry
-			if (RunFlags == traf->trex->def_sample_flags) {
+			if (RunFlags == traf->trex->def_sample_flags && !traf->trex->cannot_use_default) {
 				/* this run can use trex flags */
 				if (!UseDefaultFlag) {
 					/* if all previous runs used explicit flags per sample, we can still use trex flags for this run */
@@ -581,10 +606,14 @@
 	}
 
 	//after all runs in the traf are processed, update TRAF flags
-	if (UseDefaultSize==1) traf->tfhd->flags |= GF_ISOM_TRAF_SAMPLE_SIZE;
-	if (UseDefaultDur==1) traf->tfhd->flags |= GF_ISOM_TRAF_SAMPLE_DUR;
-	if (UseDefaultFlag==1) traf->tfhd->flags |= GF_ISOM_TRAF_SAMPLE_FLAGS;
-	if (traf->tfhd->sample_desc_index && traf->tfhd->sample_desc_index != traf->trex->def_sample_desc_index) traf->tfhd->flags |= GF_ISOM_TRAF_SAMPLE_DESC;
+	if (UseDefaultSize==1)
+		traf->tfhd->flags |= GF_ISOM_TRAF_SAMPLE_SIZE;
+	if (UseDefaultDur==1)
+		traf->tfhd->flags |= GF_ISOM_TRAF_SAMPLE_DUR;
+	if (UseDefaultFlag==1)
+		traf->tfhd->flags |= GF_ISOM_TRAF_SAMPLE_FLAGS;
+	if (traf->trex->cannot_use_default || (traf->tfhd->sample_desc_index != traf->trex->def_sample_desc_index))
+		traf->tfhd->flags |= GF_ISOM_TRAF_SAMPLE_DESC;
 
 
 	return sampleCount;
@@ -620,10 +649,11 @@
 		sg = (GF_SampleGroupBox*)gf_list_get(traf->sampleGroups, i);
 
 		switch (sg->grouping_type) {
-		case GF_4CC('r','a','p',' '):
+		case GF_ISOM_SAMPLE_GROUP_RAP:
+		case GF_ISOM_SAMPLE_GROUP_SYNC:
 			rap_type = GF_TRUE;
 			break;
-		case GF_4CC('r','o','l','l'):
+		case GF_ISOM_SAMPLE_GROUP_ROLL:
 			break;
 		default:
 			continue;
@@ -778,32 +808,40 @@
 
 	if (load_mdat_only) {
 		u64 pos = 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 (movie->segment_bs) {
-			gf_bs_seek(bs, 0);
+			e = gf_bs_seek(bs, 0);
+			if (e) return e;
 			/*write mdat size*/
 			gf_bs_write_u32(bs, (u32) movie->moof->mdat_size);
 			/*and get internal buffer*/
-			gf_bs_seek(bs, movie->moof->mdat_size);
+			e = gf_bs_seek(bs, movie->moof->mdat_size);
+			if (e) return e;
 			gf_bs_get_content(bs, &movie->moof->mdat, &movie->moof->mdat_size);
 
 			gf_bs_del(bs);
 			movie->editFileMap->bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		} else {
 			u64 offset = movie->segment_start;
-			gf_bs_seek(bs, offset);
+			e = gf_bs_seek(bs, offset);
+			if (e) return e;
 			/*write mdat size*/
 			gf_bs_write_u32(bs, (u32) movie->moof->mdat_size);
 
 			movie->moof->mdat = (char*)gf_malloc(sizeof(char) * movie->moof->mdat_size);
 			if (!movie->moof->mdat) return GF_OUT_OF_MEM;
 
-			gf_bs_seek(bs, offset);
+			e = gf_bs_seek(bs, offset);
+			if (e) return e;
 			gf_bs_read_data(bs, movie->moof->mdat, movie->moof->mdat_size);
 
-			gf_bs_seek(bs, offset);
+			e = gf_bs_seek(bs, offset);
+			if (e) return e;
 			gf_bs_truncate(bs);
 		}
 
@@ -818,18 +856,20 @@
 
 	//2- update MOOF MDAT header
 	if (!movie->moof->mdat) {
-		gf_bs_seek(bs, movie->moof->fragment_offset);
+		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
 		mdat_size = (u32) (moof_start - movie->moof->fragment_offset);
 		gf_bs_write_u32(bs, (u32) mdat_size);
 		gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_MDAT);
-		gf_bs_seek(bs, moof_start);
+		e = gf_bs_seek(bs, moof_start);
+		if (e) return e;
 	}
 
 	/*estimate moof size and shift trun offsets*/
 #ifndef USE_BASE_DATA_OFFSET
 	offset = 0;
-	if (movie->use_segments) {
+	if (movie->use_segments || movie->force_moof_base_offset) {
 		e = gf_isom_box_size((GF_Box *) movie->moof);
 		if (e) return e;
 		offset = (s32) movie->moof->size;
@@ -859,10 +899,12 @@
 	/*rewind bitstream and load mdat in memory */
 	if (movie->moof_first && !movie->moof->mdat) {
 		buffer = (char*)gf_malloc(sizeof(char)*mdat_size);
-		gf_bs_seek(bs, movie->moof->fragment_offset);
+		e = gf_bs_seek(bs, movie->moof->fragment_offset);
+		if (e) return e;
 		gf_bs_read_data(bs, buffer, mdat_size);
 		/*back to mdat start and erase with moov*/
-		gf_bs_seek(bs, movie->moof->fragment_offset);
+		e = gf_bs_seek(bs, movie->moof->fragment_offset);
+		if (e) return e;
 		gf_bs_truncate(bs);
 	}
 
@@ -873,7 +915,7 @@
 	DECIDE NOT TO USE THE DATA-OFFSET FLAG*/
 	if (movie->moof_first
 #ifndef USE_BASE_DATA_OFFSET
-	 && !movie->use_segments
+	 && !(movie->use_segments || movie->force_moof_base_offset)
 #endif
 	 ) {
 		i=0;
@@ -884,7 +926,7 @@
 		}
 	}
 #ifndef USE_BASE_DATA_OFFSET
-	else if (movie->use_segments) {
+	else if (movie->use_segments || movie->force_moof_base_offset) {
 		if (offset != (movie->moof->size+8)) {
 			offset = (s32) (movie->moof->size + 8 - offset);
 			update_trun_offsets(movie, offset);
@@ -897,7 +939,7 @@
 
 	if (movie->moof->ntp) {
 		gf_bs_write_u32(bs, 8*4);
-		gf_bs_write_u32(bs, GF_4CC('p','r','f','t') );
+		gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_PRFT );
 		gf_bs_write_u8(bs, 1);
 		gf_bs_write_u24(bs, 0);
 		gf_bs_write_u32(bs, movie->moof->reference_track_ID);
@@ -933,26 +975,35 @@
 	return GF_OK;
 }
 
-static GF_Err sidx_rewrite(GF_SegmentIndexBox *sidx, GF_BitStream *bs, u64 start_pos)
+static GF_Err sidx_rewrite(GF_SegmentIndexBox *sidx, GF_BitStream *bs, u64 start_pos, GF_SubsegmentIndexBox *ssix)
 {
-	GF_Err e;
+	GF_Err e = GF_OK;
 	u64 pos = gf_bs_get_position(bs);
+	if (ssix) {
+		e = gf_isom_box_size((GF_Box *)ssix);
+		sidx->first_offset = ssix->size;
+	}
 	/*write sidx*/
 	gf_bs_seek(bs, start_pos);
-	e = gf_isom_box_write((GF_Box *) sidx, bs);
+	if (!e) e = gf_isom_box_write((GF_Box *) sidx, bs);
+	if (!e && ssix) {
+		e = gf_isom_box_write((GF_Box *) ssix, bs);
+	}
 	gf_bs_seek(bs, pos);
 	return e;
 }
 
-GF_Err gf_isom_allocate_sidx(GF_ISOFile *movie, s32 subsegs_per_sidx, Bool daisy_chain_sidx, u32 nb_segs, u32 *frags_per_segment, u32 *start_range, u32 *end_range)
+GF_Err gf_isom_allocate_sidx(GF_ISOFile *movie, s32 subsegs_per_sidx, Bool daisy_chain_sidx, u32 nb_segs, u32 *frags_per_segment, u32 *start_range, u32 *end_range, Bool use_ssix)
 {
 	GF_BitStream *bs;
 	GF_Err e;
+	u32 i;
 
 	//and only at setup
 	if (!movie || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) ) return GF_BAD_PARAM;
 	if (movie->openMode != GF_ISOM_OPEN_WRITE) return GF_ISOM_INVALID_MODE;
 	if (movie->root_sidx) return GF_BAD_PARAM;
+	if (movie->root_ssix) return GF_BAD_PARAM;
 	if (movie->moof) return GF_BAD_PARAM;
 	if (gf_list_count(movie->moof_list)) return GF_BAD_PARAM;
 
@@ -968,6 +1019,20 @@
 
 	movie->root_sidx_index = 0;
 
+	if (use_ssix) {
+		movie->root_ssix = (GF_SubsegmentIndexBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SSIX);
+		movie->root_ssix->subsegments = gf_malloc(sizeof(GF_SubsegmentInfo) * nb_segs);
+		movie->root_ssix->subsegment_count = nb_segs;
+		for (i=0; i<nb_segs; i++) {
+			movie->root_ssix->subsegments[i].range_count = 2;
+			movie->root_ssix->subsegments[i].ranges = gf_malloc(sizeof(GF_SubsegmentRangeInfo)*2);
+			movie->root_ssix->subsegments[i].ranges[0].level = 0;
+			movie->root_ssix->subsegments[i].ranges[0].range_size = 0;
+			movie->root_ssix->subsegments[i].ranges[1].level = 0xFF;
+			movie->root_ssix->subsegments[i].ranges[1].range_size = 0;
+		}
+	}
+	
 	/*remember start of sidx*/
 	movie->root_sidx_offset = gf_bs_get_position(movie->editFileMap->bs);
 
@@ -978,6 +1043,13 @@
 	e = gf_isom_box_write((GF_Box *) movie->root_sidx, bs);
 	if (e) return e;
 
+	if (movie->root_ssix) {
+		e = gf_isom_box_size((GF_Box *) movie->root_ssix);
+		if (e) return e;
+		e = gf_isom_box_write((GF_Box *) movie->root_ssix, bs);
+		if (e) return e;
+	}
+	//include ssix in index range - spec is not clear whether this is forbidden
 	if (start_range) *start_range = (u32) movie->root_sidx_offset;
 	if (end_range) *end_range = (u32) gf_bs_get_position(bs)-1;
 
@@ -994,10 +1066,10 @@
 		/*modify brands STYP*/
 
 		/*"msix" brand: this is a DASH Initialization Segment*/
-		gf_isom_modify_alternate_brand(movie, GF_4CC('m','s','i','x'), 1);
+		gf_isom_modify_alternate_brand(movie, GF_ISOM_BRAND_MSIX, 1);
 		if (last_segment) {
 			/*"lmsg" brand: this is the last DASH Segment*/
-			gf_isom_modify_alternate_brand(movie, GF_4CC('l','m','s','g'), 1);
+			gf_isom_modify_alternate_brand(movie, GF_ISOM_BRAND_LMSG, 1);
 		}
 
 		movie->brand->type = GF_ISOM_BOX_TYPE_STYP;
@@ -1099,10 +1171,60 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_close_segment(GF_ISOFile *movie, s32 subsegments_per_sidx, u32 referenceTrackID, u64 ref_track_decode_time, s32 ts_shift, u64 ref_track_next_cts, Bool daisy_chain_sidx, Bool last_segment, u32 segment_marker_4cc, u64 *index_start_range, u64 *index_end_range)
+const char *gf_isom_get_segment_name(GF_ISOFile *movie)
+{
+	if (!movie) return NULL;
+	if (movie->append_segment) return movie->movieFileMap->szName;
+	return movie->editFileMap->szName;
+}
+
+static void compute_seg_size(GF_ISOFile *movie, u64 *out_seg_size)
+{
+	u64 final_size;
+	if (out_seg_size) {
+		if (movie->append_segment) {
+			final_size = gf_bs_get_position(movie->movieFileMap->bs);
+			final_size -= movie->segment_start;
+		} else {
+			final_size = gf_bs_get_position(movie->editFileMap->bs);
+		}
+		*out_seg_size = final_size;
+	}
+}
+
+static u32 moof_get_first_sap_end(GF_MovieFragmentBox *moof)
+{
+	u32 i, count = gf_list_count(moof->TrackList);
+	u32 base_offset = 0;
+	for (i=0; i<count; i++) {
+		u32 j, nb_trun;
+		GF_TrackFragmentBox *traf = gf_list_get(moof->TrackList, i);
+		base_offset = (u32) traf->tfhd->base_data_offset;
+
+		nb_trun = gf_list_count(traf->TrackRuns);
+		for (j=0; j<nb_trun; j++) {
+			u32 k, nb_ent;
+			GF_TrackFragmentRunBox *trun = gf_list_get(traf->TrackRuns, j);
+			u32 offset = base_offset + trun->data_offset;
+			nb_ent = gf_list_count(trun->entries);
+			for (k=0; k<nb_ent; k++) {
+				GF_TrunEntry *ent = gf_list_get(trun->entries, k);
+				if (ent->SAP_type) return offset + ent->size;
+
+				offset += ent->size;
+			}
+		}
+	}
+	return 0;
+}
+
+
+GF_EXPORT
+GF_Err gf_isom_close_segment(GF_ISOFile *movie, s32 subsegments_per_sidx, u32 referenceTrackID, u64 ref_track_decode_time, s32 ts_shift, u64 ref_track_next_cts, Bool daisy_chain_sidx, Bool use_ssix, Bool last_segment, Bool close_segment_handle, u32 segment_marker_4cc, u64 *index_start_range, u64 *index_end_range, u64 *out_seg_size)
 {
 	GF_SegmentIndexBox *sidx=NULL;
 	GF_SegmentIndexBox *root_sidx=NULL;
+	GF_SubsegmentIndexBox *ssix=NULL;
 	GF_List *daisy_sidx = NULL;
 	u64 sidx_start, sidx_end;
 	Bool first_frag_in_subseg;
@@ -1156,6 +1278,14 @@
 				gf_bs_write_u32(movie->editFileMap->bs, segment_marker_4cc); //write box type field
 			}
 		}
+
+		compute_seg_size(movie, out_seg_size);
+
+		if (close_segment_handle) {
+			gf_isom_datamap_del(movie->editFileMap);
+			movie->editFileMap = NULL;
+		}
+
 		return GF_OK;
 	}
 
@@ -1280,6 +1410,26 @@
 			e = gf_isom_box_write((GF_Box *) sidx, movie->editFileMap->bs);
 			if (e) return e;
 
+			if (use_ssix && !ssix && !movie->root_ssix) {
+				u32 k;
+				ssix = (GF_SubsegmentIndexBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SSIX);
+				ssix->subsegments = gf_malloc(sizeof(GF_SubsegmentInfo) * sidx->nb_refs);
+				ssix->subsegment_count = sidx->nb_refs;
+				for (k=0; k<sidx->nb_refs; k++) {
+					GF_SubsegmentInfo *subs = &ssix->subsegments[k];
+					subs->range_count = 2;
+					subs->ranges = gf_malloc(sizeof(GF_SubsegmentRangeInfo)*2);
+					subs->ranges[0].level = 1;
+					subs->ranges[1].level = 0xFF;
+					subs->ranges[0].range_size = subs->ranges[1].range_size = 0;
+				}
+
+				e = gf_isom_box_size((GF_Box *) ssix);
+				if (e) return e;
+				e = gf_isom_box_write((GF_Box *) ssix, movie->editFileMap->bs);
+				if (e) return e;
+			}
+
 			sidx_end = gf_bs_get_position(movie->editFileMap->bs);
 
 			if (daisy_sidx) {
@@ -1373,6 +1523,10 @@
 		movie->moof->fragment_offset = gf_bs_get_position(movie->editFileMap->bs);
 
 		if (!e) {
+			Bool generate_ssix = GF_FALSE;
+			if (movie->root_ssix) generate_ssix = GF_TRUE;
+			else if (use_ssix) generate_ssix = GF_TRUE;
+
 			e = StoreFragment(movie, GF_FALSE, offset_diff, &moof_size);
 
 
@@ -1412,6 +1566,21 @@
 
 				count++;
 
+				if (generate_ssix) {
+					if (movie->root_ssix)
+						ssix = movie->root_ssix;
+
+					//get
+					ssix->subsegments[cur_index].ranges[0].level = 1;
+					ssix->subsegments[cur_index].ranges[0].range_size = moof_get_first_sap_end(movie->moof);
+
+					ssix->subsegments[cur_index].ranges[1].level = 0xFF;
+					ssix->subsegments[cur_index].ranges[1].range_size = sidx->refs[cur_index].reference_size - ssix->subsegments[count-1].ranges[0].range_size;
+
+					if (movie->root_ssix)
+						ssix = NULL;
+				}
+
 				/*we are switching subsegment*/
 				frag_count--;
 
@@ -1448,7 +1617,7 @@
 						if (!sidx_idx) {
 							root_sidx->earliest_presentation_time = sidx->earliest_presentation_time;
 						}
-						sidx_rewrite(sidx, movie->editFileMap->bs, local_sidx_start);
+						sidx_rewrite(sidx, movie->editFileMap->bs, local_sidx_start, ssix);
 						gf_isom_box_del((GF_Box*)sidx);
 						sidx = NULL;
 					} else if (daisy_chain_sidx) {
@@ -1481,18 +1650,32 @@
 		if (last_segment) {
 			assert(movie->root_sidx_index == movie->root_sidx->nb_refs);
 
-			sidx_rewrite(movie->root_sidx, movie->editFileMap->bs, movie->root_sidx_offset);
+			sidx_rewrite(movie->root_sidx, movie->editFileMap->bs, movie->root_sidx_offset, movie->root_ssix);
 			gf_isom_box_del((GF_Box*) movie->root_sidx);
 			movie->root_sidx = NULL;
+
+			if (movie->root_ssix) {
+				gf_isom_box_del((GF_Box*)movie->root_ssix);
+				movie->root_ssix = NULL;
+			}
 		}
+		if (ssix)
+			gf_isom_box_del((GF_Box*)ssix);
+
+		compute_seg_size(movie, out_seg_size);
 		return GF_OK;
 	}
 
 	if (sidx) {
 		assert(!root_sidx);
-		sidx_rewrite(sidx, movie->editFileMap->bs, sidx_start);
+		sidx_rewrite(sidx, movie->editFileMap->bs, sidx_start, ssix);
 		gf_isom_box_del((GF_Box*)sidx);
 	}
+	if (ssix) {
+		gf_isom_box_del((GF_Box*)ssix);
+		ssix = NULL;
+	}
+
 	if (daisy_sidx) {
 		u32 i, j;
 		u64 last_entry_end_offset = 0;
@@ -1504,7 +1687,7 @@
 			if (!last_entry_end_offset) {
 				last_entry_end_offset = next_entry->end_offset;
 				/*rewrite last sidx*/
-				sidx_rewrite(next_entry->sidx, movie->editFileMap->bs, next_entry->start_offset);
+				sidx_rewrite(next_entry->sidx, movie->editFileMap->bs, next_entry->start_offset, NULL);
 			}
 			/*copy over SAP info for last item (which points to next item !)*/
 			entry->sidx->refs[entry->sidx->nb_refs-1] = next_entry->sidx->refs[0];
@@ -1515,7 +1698,7 @@
 			for (j=0; j<next_entry->sidx->nb_refs; j++) {
 				entry->sidx->refs[entry->sidx->nb_refs-1].subsegment_duration += next_entry->sidx->refs[j].subsegment_duration;
 			}
-			sidx_rewrite(entry->sidx, movie->editFileMap->bs, entry->start_offset);
+			sidx_rewrite(entry->sidx, movie->editFileMap->bs, entry->start_offset, NULL);
 		}
 		while (gf_list_count(daisy_sidx)) {
 			SIDXEntry *entry = (SIDXEntry*)gf_list_last(daisy_sidx);
@@ -1526,7 +1709,7 @@
 		gf_list_del(daisy_sidx);
 	}
 	if (root_sidx) {
-		sidx_rewrite(root_sidx, movie->editFileMap->bs, sidx_start);
+		sidx_rewrite(root_sidx, movie->editFileMap->bs, sidx_start, NULL);
 		gf_isom_box_del((GF_Box*)root_sidx);
 	}
 
@@ -1546,7 +1729,11 @@
 		}
 		gf_isom_datamap_del(movie->editFileMap);
 		movie->editFileMap = gf_isom_fdm_new_temp(NULL);
+	} else if (close_segment_handle == GF_TRUE) {
+		gf_isom_datamap_del(movie->editFileMap);
+		movie->editFileMap = NULL;
 	}
+	compute_seg_size(movie, out_seg_size);
 
 	return e;
 }
@@ -1555,7 +1742,7 @@
 GF_Err gf_isom_close_fragments(GF_ISOFile *movie)
 {
 	if (movie->use_segments) {
-		return gf_isom_close_segment(movie, 0, 0, 0, 0, 0, GF_FALSE, 1, 0, NULL, NULL);
+		return gf_isom_close_segment(movie, 0, 0, 0, 0, 0, 0, GF_FALSE, GF_FALSE, 1, 0, NULL, NULL, NULL);
 	} else {
 		return StoreFragment(movie, GF_FALSE, 0, NULL);
 	}
@@ -1575,9 +1762,9 @@
 	movie->segment_bs = NULL;
 	movie->append_segment = GF_FALSE;
 	/*update segment file*/
-	if (SegName) {
-		gf_isom_datamap_del(movie->editFileMap);
-		e = gf_isom_datamap_new(SegName, NULL, GF_ISOM_DATA_MAP_WRITE, & movie->editFileMap);
+	if (SegName || !gf_isom_get_filename(movie)) {
+		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;
 		if (e) return e;
@@ -1677,11 +1864,35 @@
 		//add 8 bytes (MDAT size+type) to avoid the data_offset in the first trun
 		traf->tfhd->base_data_offset = movie->moof->fragment_offset + 8;
 		gf_list_add(movie->moof->TrackList, traf);
-	}
 
+		if (movie->mfra) {
+			GF_TrackFragmentRandomAccessBox *tfra;
+			GF_RandomAccessEntry *raf;
+			if (!traf->trex->tfra) {
+				tfra = (GF_TrackFragmentRandomAccessBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_TFRA);
+				tfra->track_id = traf->trex->trackID;
+				tfra->traf_bits = 8;
+				tfra->trun_bits = 8;
+				tfra->sample_bits = 8;
+				gf_list_add(movie->mfra->tfra_list, tfra);
+				traf->trex->tfra = tfra;
+			}
+			tfra = traf->trex->tfra;
+			tfra->entries = (GF_RandomAccessEntry *)gf_realloc(tfra->entries, (tfra->nb_entries+1)*sizeof(GF_RandomAccessEntry));
+			tfra->nb_entries++;
+			raf = &tfra->entries[tfra->nb_entries-1];
+			raf->sample_number = 1;
+			raf->time = 0;
+			raf->traf_number = i+1;
+			//trun number is set once we fond a sync
+			raf->trun_number = 0;
+			raf->moof_offset = movie->moof->fragment_offset;
+		}
+	}
 	return GF_OK;
 }
 
+static
 u32 GetRunSize(GF_TrackFragmentRunBox *trun)
 {
 	u32 i, size;
@@ -1793,6 +2004,7 @@
 	ent->CTS_Offset = sample->CTS_Offset;
 	ent->Duration = Duration;
 	ent->size = sample->dataLength;
+	ent->nb_pack = sample->nb_pack;
 	ent->flags = GF_ISOM_FORMAT_FRAG_FLAGS(PaddingBits, sample->IsRAP, DegradationPriority);
 	if (sample->IsRAP) {
 		ent->flags |= GF_ISOM_GET_FRAG_DEPEND_FLAGS(0, 2, 0, (redundant_coding ? 1 : 0) );
@@ -1803,11 +2015,11 @@
 	if (sample->CTS_Offset<0) {
 		trun->version = 1;
 	}
-	trun->sample_count += 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 depandancies are not well done ...
+		//this may fail if dependencies are not well done ...
 		Media_ParseODFrame(traf->trex->track->Media, sample, &od_sample);
 		sample = od_sample;
 	}
@@ -1829,6 +2041,17 @@
 		}
 	}
 	if (od_sample) gf_isom_sample_del(&od_sample);
+
+	if (traf->trex->tfra) {
+		GF_RandomAccessEntry *raf;
+		raf = &traf->trex->tfra->entries[traf->trex->tfra->nb_entries-1];
+		//if sample is sync, store its time and trun number
+		if (!raf->trun_number && sample->IsRAP) {
+			raf->time = sample->DTS + sample->CTS_Offset;
+			raf->trun_number = gf_list_count(traf->TrackRuns);
+			raf->sample_number = trun->sample_count;
+		}
+	}
 	return GF_OK;
 }
 
@@ -1854,6 +2077,9 @@
 		gf_isom_get_sample_cenc_info(input, trackNum, SampleNum, &IsEncrypted, &IV_size, NULL, NULL, NULL, NULL, NULL);
 		e = gf_isom_cenc_get_sample_aux_info(input, trackNum, SampleNum, &sai, &boxType);
 		if (e) return e;
+		//no associated SAI (constant IV and no subsample)
+		if (!sai) return GF_OK;
+		
 		sai->IV_size = IV_size;
 
 		switch (boxType) {
@@ -1882,19 +2108,27 @@
 			senc = (GF_SampleEncryptionBox *) traf->sample_encryption;
 			break;
 		default:
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[isofile] Unsupported encryption storage box %s\n", gf_4cc_to_str(boxType) ));
 			return GF_NOT_SUPPORTED;
 		}
 
 		gf_list_add(senc->samp_aux_info, sai);
 		if (sai->subsample_count) senc->flags = 0x00000002;
-		//this assumes that we don't have a cenc sample info with subsamples indicated and subsample_count=0
-		gf_isom_cenc_set_saiz_saio(senc, NULL, traf, IsEncrypted ? IV_size + (2+6)*sai->subsample_count : 0);
+
+		//no subsample (not NAL-based data), saiz is IV size only
+		if (! sai->subsample_count) {
+			gf_isom_cenc_set_saiz_saio(senc, NULL, traf, IV_size);
+		}
+		// subsamples ( NAL-based data), saiz is IV size + nb subsamples (2 bytes) + 6 bytes per subsample
+		else {
+			gf_isom_cenc_set_saiz_saio(senc, NULL, traf, IV_size + 2+6*sai->subsample_count);
+		}
 	}
 
 	return GF_OK;
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_fragment_append_data(GF_ISOFile *movie, u32 TrackID, char *data, u32 data_size, u8 PaddingBits)
 {
 	u32 count;
@@ -2051,6 +2285,7 @@
 		count = gf_list_count(trak->Media->information->sampleTable->sampleGroups);
 		for (i=0; i<count; i++) {
 			GF_SampleGroupBox *sg;
+			Bool found = GF_FALSE;
 			u32 j;
 			u32 first_sample_in_entry, last_sample_in_entry;
 			first_sample_in_entry = 1;
@@ -2069,9 +2304,18 @@
 				/*found our sample, add it to trak->sampleGroups*/
 				e = gf_isom_copy_sample_group_entry_to_traf(traf, trak->Media->information->sampleTable, sg->grouping_type, sg->grouping_type_parameter, sg->sample_entries[j].group_description_index, sgpd_in_traf);
 				if (e) return e;
-				
+
+				found = GF_TRUE;
 				break;
 			}
+			//unmapped sample
+			if (!found) {
+				if (!traf->sampleGroups)
+					traf->sampleGroups = gf_list_new();
+
+				e = gf_isom_copy_sample_group_entry_to_traf(traf, trak->Media->information->sampleTable, sg->grouping_type, sg->grouping_type_parameter, 0, sgpd_in_traf);
+				if (e) return e;
+			}
 		}
 	}
 	return GF_OK;
@@ -2116,6 +2360,14 @@
 	return GF_OK;
 }
 
+GF_Err gf_isom_enable_mfra(GF_ISOFile *file)
+{
+	if (!file) return GF_BAD_PARAM;
+	file->mfra = (GF_MovieFragmentRandomAccessBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_MFRA);
+	if (!file->mfra) return GF_OUT_OF_MEM;
+	return GF_OK;
+}
+
 #else
 
 GF_Err gf_isom_finalize_for_fragment(GF_ISOFile *the_file, u32 media_segment_type)
@@ -2129,7 +2381,8 @@
 u32 DefaultSampleSize,
 u8 DefaultSampleIsSync,
 u8 DefaultSamplePadding,
- u16 DefaultDegradationPriority)
+ u16 DefaultDegradationPriority,
+ u8 u8 force_traf_flags)
 {
 	return GF_NOT_SUPPORTED;
 }
@@ -2183,6 +2436,12 @@
 	return GF_NOT_SUPPORTED;
 }
 
+GF_Err gf_isom_enable_mfra(GF_ISOFile *file)
+{
+	return GF_NOT_SUPPORTED;
+}
+
+
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS)*/

gpac-0.7.1.tar.gz/src/isomedia/sample_descs.c -> gpac-0.8.0.tar.gz/src/isomedia/sample_descs.c Changed

@@ -144,6 +144,8 @@
 	ptr->samplerate_lo = gf_bs_read_u16(bs);
 
 	ptr->size -= 28;
+	if (!ptr->is_qtff) return GF_OK;
+	
 	if (ptr->version==1) {
 		if (ptr->size<16) return GF_ISOM_INVALID_FILE;
 		gf_bs_read_data(bs, (char *) ptr->extensions, 16);
@@ -172,20 +174,69 @@
 	gf_bs_write_u16(bs, ptr->packet_size);
 	gf_bs_write_u16(bs, ptr->samplerate_hi);
 	gf_bs_write_u16(bs, ptr->samplerate_lo);
-	if (ptr->version==1) {
-		gf_bs_write_data(bs, (char *) ptr->extensions, 16);
-	} else if (ptr->version==2) {
-		gf_bs_write_data(bs, (char *) ptr->extensions, 36);
+
+	if (ptr->is_qtff) {
+		GF_Box *esds = NULL;
+		if (ptr->is_qtff==1) {
+			if ((ptr->type==GF_ISOM_BOX_TYPE_MP4A) && ((GF_MPEGAudioSampleEntryBox*)ptr)->esd) {
+				esds = (GF_Box *) ((GF_MPEGAudioSampleEntryBox*)ptr)->esd;
+			}
+		}
+
+		if (ptr->version==1) {
+			if (ptr->is_qtff==2) {
+				gf_bs_write_data(bs, (char *) ptr->extensions, 16);
+			} else {
+				gf_bs_write_u32(bs, esds ? 1024 : 1);
+				gf_bs_write_u32(bs, esds ? 0 : ptr->bitspersample);
+				gf_bs_write_u32(bs, esds ? 0 : ptr->bitspersample*ptr->channel_count);
+				gf_bs_write_u32(bs, esds ? 0 : ptr->bitspersample/8);
+			}
+		} else if (ptr->version==2) {
+			gf_bs_write_data(bs, (char *) ptr->extensions, 36);
+		}
+
+		if (ptr->is_qtff==1) {
+			u64 wave_size = 8 + 12 + 10 + 8;
+			if ((ptr->type==GF_ISOM_BOX_TYPE_MP4A) && ((GF_MPEGAudioSampleEntryBox*)ptr)->esd) {
+				wave_size += esds->size;
+			}
+			gf_bs_write_u32(bs, (u32) wave_size);
+			gf_bs_write_u32(bs, GF_QT_BOX_TYPE_WAVE);
+			gf_bs_write_u32(bs, 12);
+			gf_bs_write_u32(bs, GF_QT_BOX_TYPE_FRMA);
+			gf_bs_write_u32(bs, ptr->type);
+			if (esds) gf_isom_box_write(esds, bs);
+
+			gf_bs_write_u32(bs, 10);
+			gf_bs_write_u32(bs, GF_QT_BOX_TYPE_ENDA);
+			gf_bs_write_u16(bs, 1);
+			gf_bs_write_u32(bs, 8);
+			gf_bs_write_u32(bs, GF_QT_BOX_TYPE_TERMINATOR);
+		}
 	}
 }
 
 void gf_isom_audio_sample_entry_size(GF_AudioSampleEntryBox *ptr)
 {
 	ptr->size += 28;
-	if (ptr->version==1) {
-		ptr->size+=16;
-	} else if (ptr->version==2) {
-		ptr->size += 36;
+	if (ptr->is_qtff) {
+		if (ptr->version==1) {
+			ptr->size+=16;
+		} else if (ptr->version==2) {
+			ptr->size += 36;
+		}
+
+		if (ptr->is_qtff==1) {
+			//add wave: 12 (frma) +10(enda)+8(term null)+ 8 header for wave
+			ptr->size += 8 + 12 + 10 + 8;
+			if ((ptr->type==GF_ISOM_BOX_TYPE_MP4A) && ((GF_MPEGAudioSampleEntryBox*)ptr)->esd) {
+				GF_Box *esds = (GF_Box *) ((GF_MPEGAudioSampleEntryBox*)ptr)->esd;
+				gf_isom_box_size(esds);
+				ptr->size += esds->size;
+				ptr->compression_id=-2;
+			}
+		}
 	}
 }
 
@@ -283,7 +334,7 @@
 		cfg_type = GF_ISOM_BOX_TYPE_DSMV;
 		break;
 	case GF_ISOM_SUBTYPE_3GP_H263:
-		if (trak->Media->handler->handlerType!=GF_ISOM_MEDIA_VISUAL) return GF_BAD_PARAM;
+		if (!gf_isom_is_video_subtype(trak->Media->handler->handlerType)) return GF_BAD_PARAM;
 		cfg_type = GF_ISOM_BOX_TYPE_D263;
 		break;
 	case 0:
@@ -296,7 +347,7 @@
 	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 	if (e) return e;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(the_file, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
 	if (!the_file->keep_utc)
@@ -342,6 +393,7 @@
 	return e;
 }
 
+GF_EXPORT
 GF_Err gf_isom_3gp_config_update(GF_ISOFile *the_file, u32 trackNumber, GF_3GPConfig *param, u32 DescriptionIndex)
 {
 	GF_TrackBox *trak;
@@ -398,7 +450,7 @@
 	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 	if (e) return e;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(the_file, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
 	if (!the_file->keep_utc)
@@ -458,6 +510,8 @@
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_EXPORT
 GF_Err gf_isom_new_dims_description(GF_ISOFile *movie, u32 trackNumber, GF_DIMSDescription *desc, char *URLname, char *URNname, u32 *outDescriptionIndex)
 {
 	GF_TrackBox *trak;
@@ -477,7 +531,7 @@
 	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 	if (e) return e;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(movie, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
 	if (!movie->keep_utc)
@@ -506,7 +560,7 @@
 	return e;
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_update_dims_description(GF_ISOFile *movie, u32 trackNumber, GF_DIMSDescription *desc, char *URLname, char *URNname, u32 DescriptionIndex)
 {
 	GF_TrackBox *trak;
@@ -670,7 +724,7 @@
 	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 	if (e) return e;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(movie, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
 	if (!movie->keep_utc)
@@ -768,7 +822,7 @@
 	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 	if (e) return e;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(movie, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
 	if (!movie->keep_utc)
@@ -894,7 +948,7 @@
 	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 	if (e) return e;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(movie, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
 	if (!movie->keep_utc)
@@ -1060,7 +1114,7 @@
 	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 	if (e) return e;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(movie, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
 	if (!movie->keep_utc)
@@ -1095,34 +1149,77 @@
 	GF_BitRateBox *a;
 	GF_Err e;
 	GF_SampleEntryBox *ent;
+	u32 i, count;
 	GF_TrackBox *trak;
-
+	GF_ProtectionSchemeInfoBox *sinf;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return GF_BAD_PARAM;
 
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak || !sampleDescriptionIndex || !trak->Media) return GF_BAD_PARAM;
-
-	ent = (GF_SampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, sampleDescriptionIndex - 1);
-	if (!ent) return GF_BAD_PARAM;
-
-	a = gf_isom_sample_entry_get_bitrate(ent, max_bitrate ? GF_TRUE : GF_FALSE);
-	if (!max_bitrate) {
-		if (a) {
-			gf_list_del_item(ent->other_boxes, a);
-			gf_isom_box_del((GF_Box *) a);
+	if (!trak || !trak->Media) return GF_BAD_PARAM;
 
-			if (!gf_list_count(ent->other_boxes)) {
-				gf_list_del(ent->other_boxes);
-				ent->other_boxes = NULL;
+	count = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+	for (i=0; i<count; i++) {
+		u32 ent_type;
+		GF_ESDBox *esds=NULL;
+		if (sampleDescriptionIndex && (sampleDescriptionIndex!=i+1)) continue;
+
+		ent = (GF_SampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, i);
+		if (!ent) return GF_BAD_PARAM;
+
+		ent_type = ent->type;
+		switch (ent_type) {
+		case GF_ISOM_BOX_TYPE_ENCV:
+		case GF_ISOM_BOX_TYPE_ENCA:
+		case GF_ISOM_BOX_TYPE_ENCS:
+			sinf = gf_list_get(ent->protections, 0);
+			if (sinf && sinf->original_format)
+				ent_type = sinf->original_format->type;
+			break;
+		}
+		switch (ent_type) {
+		case GF_ISOM_BOX_TYPE_MP4V:
+			esds = ((GF_MPEGVisualSampleEntryBox *)ent)->esd;
+			break;
+		case GF_ISOM_BOX_TYPE_MP4A:
+			esds = ((GF_MPEGAudioSampleEntryBox *)ent)->esd;
+			break;
+		case GF_ISOM_BOX_TYPE_MP4S:
+			esds = ((GF_MPEGSampleEntryBox *) ent)->esd;
+			break;
+		}
+		//using mpeg4 esd
+		if (esds) {
+			if (esds->desc && esds->desc->decoderConfig) {
+				esds->desc->decoderConfig->avgBitrate = average_bitrate;
+				esds->desc->decoderConfig->maxBitrate = max_bitrate;
+				if (decode_buffer_size)
+					esds->desc->decoderConfig->bufferSizeDB = decode_buffer_size;
 			}
+			continue;
+		}
+		
+		//using BTRT
+		if (!max_bitrate && average_bitrate) max_bitrate = average_bitrate;
+		a = gf_isom_sample_entry_get_bitrate(ent, max_bitrate ? GF_TRUE : GF_FALSE);
+
+		if (!max_bitrate) {
+			if (a) {
+				gf_list_del_item(ent->other_boxes, a);
+				gf_isom_box_del((GF_Box *) a);
+
+				if (!gf_list_count(ent->other_boxes)) {
+					gf_list_del(ent->other_boxes);
+					ent->other_boxes = NULL;
+				}
+			}
+		} else {
+			a->avgBitrate = average_bitrate;
+			a->maxBitrate = max_bitrate;
+			if (decode_buffer_size)
+				a->bufferSizeDB = decode_buffer_size;
 		}
-		return GF_OK;
 	}
-
-	a->avgBitrate = average_bitrate;
-	a->maxBitrate = max_bitrate;
-	a->bufferSizeDB = decode_buffer_size;
 	return GF_OK;
 }

gpac-0.7.1.tar.gz/src/isomedia/stbl_read.c -> gpac-0.8.0.tar.gz/src/isomedia/stbl_read.c Changed

@@ -66,7 +66,7 @@
 			if ( i && (curDTS + CTSOffset > DTS) ) {
 				ent = &stbl->TimeToSample->entries[i];
 				curSampNum -= ent->sampleCount;
-				curDTS -= ent->sampleDelta * ent->sampleCount;
+				curDTS -= (u64)ent->sampleDelta * ent->sampleCount;
 				i --;
 			} else if (!i) {
 				//beginning of the table, no choice
@@ -96,7 +96,7 @@
 			curDTS += ent->sampleDelta;
 		}
 		//we're switching to the next entry, update the cache!
-		stbl->TimeToSample->r_CurrentDTS += ent->sampleCount * ent->sampleDelta;
+		stbl->TimeToSample->r_CurrentDTS += (u64)ent->sampleCount * ent->sampleDelta;
 		stbl->TimeToSample->r_currentEntryIndex += 1;
 		stbl->TimeToSample->r_FirstSampleInEntry += ent->sampleCount;
 	}
@@ -206,7 +206,7 @@
 		}
 
 		//update our cache
-		stts->r_CurrentDTS += ent->sampleCount * ent->sampleDelta;
+		stts->r_CurrentDTS += (u64)ent->sampleCount * ent->sampleDelta;
 		stts->r_currentEntryIndex += 1;
 		stts->r_FirstSampleInEntry += ent->sampleCount;
 	}
@@ -281,10 +281,11 @@
 		u32 first_sample_in_entry, last_sample_in_entry;
 		GF_SampleGroupBox *sg = gf_list_get(stbl->sampleGroups, i);
 		switch (sg->grouping_type) {
-		case GF_4CC('r','a','p',' '):
+		case GF_ISOM_SAMPLE_GROUP_RAP:
+		case GF_ISOM_SAMPLE_GROUP_SYNC:
 			is_rap_group = 1;
 			break;
-		case GF_4CC('r','o','l','l'):
+		case GF_ISOM_SAMPLE_GROUP_ROLL:
 			break;
 		default:
 			continue;
@@ -387,17 +388,17 @@
 }
 
 //Get the offset, descIndex and chunkNumber of a sample...
-GF_Err stbl_GetSampleInfos(GF_SampleTableBox *stbl, u32 sampleNumber, u64 *offset, u32 *chunkNumber, u32 *descIndex, u8 *isEdited)
+GF_Err stbl_GetSampleInfos(GF_SampleTableBox *stbl, u32 sampleNumber, u64 *offset, u32 *chunkNumber, u32 *descIndex, GF_StscEntry **out_ent)
 {
 	GF_Err e;
-	u32 i, j, k, offsetInChunk, size;
+	u32 i, k, offsetInChunk, size;
 	GF_ChunkOffsetBox *stco;
 	GF_ChunkLargeOffsetBox *co64;
 	GF_StscEntry *ent;
 
 	(*offset) = 0;
 	(*chunkNumber) = (*descIndex) = 0;
-	(*isEdited) = 0;
+	if (out_ent) (*out_ent) = NULL;
 	if (!stbl || !sampleNumber) return GF_BAD_PARAM;
 	if (!stbl->ChunkOffset || !stbl->SampleToChunk) return GF_ISOM_INVALID_FILE;
 
@@ -406,7 +407,7 @@
 		if (!ent) return GF_BAD_PARAM;
 		(*descIndex) = ent->sampleDescriptionIndex;
 		(*chunkNumber) = sampleNumber;
-		(*isEdited) = ent->isEdited;
+		if (out_ent) *out_ent = ent;
 		if ( stbl->ChunkOffset->type == GF_ISOM_BOX_TYPE_STCO) {
 			stco = (GF_ChunkOffsetBox *)stbl->ChunkOffset;
 			(*offset) = (u64) stco->offsets[sampleNumber - 1];
@@ -440,12 +441,12 @@
 	for (; i < stbl->SampleToChunk->nb_entries; i++) {
 		//browse from the current chunk we're browsing from index 1
 		for (; k <= stbl->SampleToChunk->ghostNumber; k++) {
-			//browse all the samples in this chunk
-			for (j = 0; j < ent->samplesPerChunk; j++) {
-				//ok, this is our sample
-				if (stbl->SampleToChunk->firstSampleInCurrentChunk + j == sampleNumber )
-					goto sample_found;
+			if ((stbl->SampleToChunk->firstSampleInCurrentChunk <= sampleNumber)
+				&& (stbl->SampleToChunk->firstSampleInCurrentChunk + ent->samplesPerChunk > sampleNumber)
+			) {
+				goto sample_found;
 			}
+
 			//nope, get to next chunk
 			stbl->SampleToChunk->firstSampleInCurrentChunk += ent->samplesPerChunk;
 			stbl->SampleToChunk->currentChunk ++;
@@ -468,15 +469,22 @@
 
 	(*descIndex) = ent->sampleDescriptionIndex;
 	(*chunkNumber) = ent->firstChunk + stbl->SampleToChunk->currentChunk - 1;
-	(*isEdited) = ent->isEdited;
-
-	//ok, get the size of all the previous sample
+	if (out_ent) *out_ent = ent;
+	assert((*chunkNumber));
+	
+	//ok, get the size of all the previous samples in the chunk
 	offsetInChunk = 0;
-	//warning, firstSampleInChunk is at least 1 - not 0
-	for (i = stbl->SampleToChunk->firstSampleInCurrentChunk; i < sampleNumber; i++) {
-		e = stbl_GetSampleSize(stbl->SampleSize, i, &size);
-		if (e) return e;
-		offsetInChunk += size;
+	//constant size
+	if (stbl->SampleSize->sampleSize) {
+		u32 diff = sampleNumber - stbl->SampleToChunk->firstSampleInCurrentChunk;
+		offsetInChunk += diff * stbl->SampleSize->sampleSize;
+	} else {
+		//warning, firstSampleInChunk is at least 1 - not 0
+		for (i = stbl->SampleToChunk->firstSampleInCurrentChunk; i < sampleNumber; i++) {
+			e = stbl_GetSampleSize(stbl->SampleSize, i, &size);
+			if (e) return e;
+			offsetInChunk += size;
+		}
 	}
 	//OK, that's the size of our offset in the chunk
 	//now get the chunk
@@ -557,7 +565,9 @@
 	assert(dependsOn && dependedOn && redundant);
 	*dependsOn = *dependedOn = *redundant = 0;
 
-	if (SampleNumber > sdep->sampleCount) return GF_BAD_PARAM;
+	if (SampleNumber > sdep->sampleCount) {
+		return GF_OK;
+	}
 	flag = sdep->sample_info[SampleNumber-1];
 	*isLeading = (flag >> 6) & 3;
 	*dependsOn = (flag >> 4) & 3;
@@ -566,56 +576,5 @@
 	return GF_OK;
 }
 
-u32 stbl_GetSampleFragmentCount(GF_SampleFragmentBox *stsf, u32 sampleNumber)
-{
-	GF_StsfEntry *ent;
-	u32 i, count;
-	if (!stsf) return 0;
-
-	//check cache
-	if (!stsf->r_currentEntry || (stsf->r_currentEntry->SampleNumber < sampleNumber)) {
-		stsf->r_currentEntry = NULL;
-		stsf->r_currentEntryIndex = 0;
-	}
-	i = stsf->r_currentEntryIndex;
-
-	count = gf_list_count(stsf->entryList);
-	for (; i<count; i++) {
-		ent = (GF_StsfEntry *)gf_list_get(stsf->entryList, i);
-		if (ent->SampleNumber == sampleNumber) {
-			stsf->r_currentEntry = ent;
-			stsf->r_currentEntryIndex = i;
-			return ent->fragmentCount;
-		}
-	}
-	//not found
-	return 0;
-}
-
-u32 stbl_GetSampleFragmentSize(GF_SampleFragmentBox *stsf, u32 sampleNumber, u32 FragmentIndex)
-{
-	GF_StsfEntry *ent;
-	u32 i, count;
-	if (!stsf || !FragmentIndex) return 0;
-
-	//check cache
-	if (!stsf->r_currentEntry || (stsf->r_currentEntry->SampleNumber < sampleNumber)) {
-		stsf->r_currentEntry = NULL;
-		stsf->r_currentEntryIndex = 0;
-	}
-	i = stsf->r_currentEntryIndex;
-	count = gf_list_count(stsf->entryList);
-	for (; i<count; i++) {
-		ent = (GF_StsfEntry *)gf_list_get(stsf->entryList, i);
-		if (ent->SampleNumber == sampleNumber) {
-			stsf->r_currentEntry = ent;
-			stsf->r_currentEntryIndex = i;
-			if (FragmentIndex > ent->fragmentCount) return 0;
-			return ent->fragmentSizes[FragmentIndex - 1];
-		}
-	}
-	//not found
-	return 0;
-}
 
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.7.1.tar.gz/src/isomedia/stbl_write.c -> gpac-0.8.0.tar.gz/src/isomedia/stbl_write.c Changed

@@ -37,7 +37,7 @@
 //we could return an error if a sample with the same DTS already exists
 //but this is not true for QT or MJ2K, only for MP4...
 //we assume the authoring tool tries to create a compliant MP4 file.
-GF_Err stbl_AddDTS(GF_SampleTableBox *stbl, u64 DTS, u32 *sampleNumber, u32 LastAUDefDuration)
+GF_Err stbl_AddDTS(GF_SampleTableBox *stbl, u64 DTS, u32 *sampleNumber, u32 LastAUDefDuration, u32 nb_packed_samples)
 {
 	u32 i, j, sampNum;
 	u64 *DTSs, curDTS;
@@ -50,6 +50,9 @@
 	stts->r_FirstSampleInEntry = 0;
 
 	*sampleNumber = 0;
+	if (!nb_packed_samples)
+		nb_packed_samples=1;
+
 	//if we don't have an entry, that's the first one...
 	if (!stts->nb_entries) {
 		//assert the first DTS is 0. If not, that will break the whole file
@@ -58,21 +61,25 @@
 		stts->nb_entries = 1;
 		stts->entries = gf_malloc(sizeof(GF_SttsEntry));
 		if (!stts->entries) return GF_OUT_OF_MEM;
-		stts->entries[0].sampleCount = 1;
-		stts->entries[0].sampleDelta = LastAUDefDuration;
-		stts->w_currentSampleNum = (*sampleNumber) = 1;
+		stts->entries[0].sampleCount = nb_packed_samples;
+		stts->entries[0].sampleDelta = (nb_packed_samples>1) ? 0 : LastAUDefDuration;
+		(*sampleNumber) = 1;
+		stts->w_currentSampleNum = nb_packed_samples;
 		return GF_OK;
 	}
-
-	//check the last DTS...
-	if (DTS > stts->w_LastDTS) {
+	//check the last DTS - we allow 0-duration samples (same DTS)
+	if (DTS >= stts->w_LastDTS) {
 		ent = &stts->entries[stts->nb_entries-1];
+		if (!ent->sampleDelta && (ent->sampleCount>1)) {
+			ent->sampleDelta = (u32) ( DTS / ent->sampleCount);
+			stts->w_LastDTS = DTS - ent->sampleDelta;
+		}
 		//OK, we're adding at the end
 		if (DTS == stts->w_LastDTS + ent->sampleDelta) {
-			ent->sampleCount ++;
-			stts->w_currentSampleNum ++;
-			(*sampleNumber) = stts->w_currentSampleNum;
-			stts->w_LastDTS = DTS;
+			(*sampleNumber) = stts->w_currentSampleNum + 1;
+			ent->sampleCount += nb_packed_samples;
+			stts->w_currentSampleNum += nb_packed_samples;
+			stts->w_LastDTS = DTS + ent->sampleDelta * (nb_packed_samples-1);
 			return GF_OK;
 		}
 		//we need to split the entry
@@ -345,7 +352,7 @@
 }
 
 //add size
-GF_Err stbl_AddSize(GF_SampleSizeBox *stsz, u32 sampleNumber, u32 size)
+GF_Err stbl_AddSize(GF_SampleSizeBox *stsz, u32 sampleNumber, u32 size, u32 nb_pack_samples)
 {
 	u32 i, k;
 	u32 *newSizes;
@@ -353,19 +360,27 @@
 
 	if (sampleNumber > stsz->sampleCount + 1) return GF_BAD_PARAM;
 
+	if (!nb_pack_samples) nb_pack_samples = 1;
+	else if (nb_pack_samples>1)
+		size /= nb_pack_samples;
+
 	//all samples have the same size
 	if (stsz->sizes == NULL) {
 		//1 first sample added in NON COMPACT MODE
 		if (! stsz->sampleCount && (stsz->type != GF_ISOM_BOX_TYPE_STZ2) ) {
-			stsz->sampleCount = 1;
+			stsz->sampleCount = nb_pack_samples;
 			stsz->sampleSize = size;
 			return GF_OK;
 		}
 		//2- sample has the same size
 		if (stsz->sampleSize == size) {
-			stsz->sampleCount++;
+			stsz->sampleCount += nb_pack_samples;
 			return GF_OK;
 		}
+		if (nb_pack_samples>1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Inserting packed samples with different sizes is not yet supported\n" ));
+			return GF_NOT_SUPPORTED;
+		}
 		//3- no, need to alloc a size table
 		stsz->sizes = (u32*)gf_malloc(sizeof(u32) * (stsz->sampleCount + 1));
 		if (!stsz->sizes) return GF_OUT_OF_MEM;
@@ -503,6 +518,54 @@
 	return GF_OK;
 }
 
+GF_Err stbl_AddDependencyType(GF_SampleTableBox *stbl, u32 sampleNumber, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant)
+{
+	u32 flags;
+	GF_SampleDependencyTypeBox *sdtp;
+
+	if (stbl->SampleDep == NULL) {
+		stbl->SampleDep = (GF_SampleDependencyTypeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SDTP);
+		if (!stbl->SampleDep) return GF_OUT_OF_MEM;
+	}
+	sdtp = stbl->SampleDep;
+	if (sdtp->sampleCount + 1 < sampleNumber) {
+		u32 missed = sampleNumber-1 - sdtp->sampleCount;
+		sdtp->sample_info = (u8*) gf_realloc(sdtp->sample_info, sizeof(u8) * (sdtp->sampleCount+missed) );
+		memset(&sdtp->sample_info[sdtp->sampleCount], 0, sizeof(u8) * missed );
+		while (missed) {
+			SAPType isRAP;
+			if (stbl->SyncSample) stbl_GetSampleRAP(stbl->SyncSample, sdtp->sampleCount+1, &isRAP, NULL, NULL);
+			else isRAP = 1;
+			sdtp->sample_info[sdtp->sampleCount] = isRAP ? (2<<4) : 0;
+			if (isRAP) {
+				sdtp->sample_info[sdtp->sampleCount] = 0;
+
+			}
+			sdtp->sampleCount++;
+			missed--;
+		}
+	}
+
+	flags = 0;
+	flags |= isLeading << 6;
+	flags |= dependsOn << 4;
+	flags |= dependedOn << 2;
+	flags |= redundant;
+
+	sdtp->sample_info = (u8*) gf_realloc(sdtp->sample_info, sizeof(u8) * (sdtp->sampleCount + 1));
+	if (!sdtp->sample_info) return GF_OUT_OF_MEM;
+	if (sdtp->sampleCount < sampleNumber) {
+		sdtp->sample_info[sdtp->sampleCount] = flags;
+	} else {
+		u32 snum = sampleNumber-1;
+		memmove(sdtp->sample_info+snum+1, sdtp->sample_info+snum, sizeof(u8) * (sdtp->sampleCount - snum) );
+		sdtp->sample_info[snum] = flags;
+	}
+	//update our list
+	sdtp->sampleCount ++;
+	return GF_OK;
+}
+
 GF_Err stbl_AppendDependencyType(GF_SampleTableBox *stbl, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant)
 {
 	GF_SampleDependencyTypeBox *sdtp;
@@ -552,20 +615,101 @@
 }
 
 //used in edit/write, where sampleNumber == chunkNumber
-GF_Err stbl_AddChunkOffset(GF_MediaBox *mdia, u32 sampleNumber, u32 StreamDescIndex, u64 offset)
+GF_Err stbl_AddChunkOffset(GF_MediaBox *mdia, u32 sampleNumber, u32 StreamDescIndex, u64 offset, u32 nb_pack_samples)
 {
 	GF_SampleTableBox *stbl;
 	GF_ChunkOffsetBox *stco;
 	GF_SampleToChunkBox *stsc;
 	GF_ChunkLargeOffsetBox *co64;
 	GF_StscEntry *ent;
-	u32 i, k, *newOff;
+	Bool needs_split = GF_TRUE;
+	u32 i, k, *newOff, new_chunk_idx=0;
 	u64 *newLarge;
+	s32 insert_idx = -1;
 
 	stbl = mdia->information->sampleTable;
 	stsc = stbl->SampleToChunk;
 
-	if (stsc->nb_entries + 1 < sampleNumber ) return GF_BAD_PARAM;
+	if (stsc->w_lastSampleNumber + 1 < sampleNumber ) return GF_BAD_PARAM;
+	if (!nb_pack_samples)
+		nb_pack_samples = 1;
+
+	if (stsc->w_lastSampleNumber + 1 == sampleNumber ) needs_split = GF_TRUE;
+
+	if (!stsc->nb_entries || (stsc->nb_entries + (needs_split ? 2 : 0) >= stsc->alloc_size)) {
+		if (!stsc->alloc_size) stsc->alloc_size = 1;
+		ALLOC_INC(stsc->alloc_size);
+		stsc->entries = gf_realloc(stsc->entries, sizeof(GF_StscEntry)*stsc->alloc_size);
+		if (!stsc->entries) return GF_OUT_OF_MEM;
+		memset(&stsc->entries[stsc->nb_entries], 0, sizeof(GF_StscEntry)*(stsc->alloc_size-stsc->nb_entries) );
+	}
+	if (sampleNumber == stsc->w_lastSampleNumber + 1) {
+		ent = &stsc->entries[stsc->nb_entries];
+		stsc->w_lastChunkNumber ++;
+		ent->firstChunk = stsc->w_lastChunkNumber;
+		if (stsc->nb_entries) stsc->entries[stsc->nb_entries-1].nextChunk = stsc->w_lastChunkNumber;
+
+		new_chunk_idx = stsc->w_lastChunkNumber;
+		stsc->w_lastSampleNumber = sampleNumber + nb_pack_samples-1;
+		stsc->nb_entries += 1;
+	} else {
+		u32 cur_samp = 1;
+		u32 samples_in_next_entry = 0;
+		u32 next_entry_first_chunk = 1;
+		for (i=0; i<stsc->nb_entries; i++) {
+			u32 k, nb_chunks = 1;
+			ent = &stsc->entries[i];
+			if (i+1<stsc->nb_entries) nb_chunks = stsc->entries[i+1].firstChunk - ent->firstChunk;
+			for (k=0; k<nb_chunks; k++) {
+				if ((cur_samp <= sampleNumber) && (ent->samplesPerChunk + cur_samp > sampleNumber)) {
+					insert_idx = i;
+					samples_in_next_entry = ent->samplesPerChunk - (sampleNumber-cur_samp);
+					ent->samplesPerChunk = sampleNumber-cur_samp;
+					break;
+				}
+				if (insert_idx>=0) break;
+				cur_samp += ent->samplesPerChunk;
+				next_entry_first_chunk++;
+			}
+		}
+		if (samples_in_next_entry) {
+			memmove(&stsc->entries[insert_idx+3], &stsc->entries[insert_idx+2], sizeof(GF_StscEntry)*(stsc->nb_entries+1-insert_idx));
+			ent = &stsc->entries[insert_idx+1];
+			stsc->entries[insert_idx+2] = *ent;
+			stsc->entries[insert_idx+2].samplesPerChunk = samples_in_next_entry;
+			stsc->entries[insert_idx+2].firstChunk = next_entry_first_chunk + 2;
+			stsc->nb_entries += 2;
+		} else {
+			memmove(&stsc->entries[insert_idx+1], &stsc->entries[insert_idx], sizeof(GF_StscEntry)*(stsc->nb_entries+1-insert_idx));
+			ent = &stsc->entries[insert_idx+1];
+			ent->firstChunk = next_entry_first_chunk +1;
+			stsc->nb_entries += 1;
+		}
+		new_chunk_idx = next_entry_first_chunk;
+	}
+	ent->isEdited = (Media_IsSelfContained(mdia, StreamDescIndex)) ? 1 : 0;
+	ent->sampleDescriptionIndex = StreamDescIndex;
+	ent->samplesPerChunk = nb_pack_samples;
+	ent->nextChunk = ent->firstChunk+1;
+
+	//OK, now if we've inserted a chunk, update the sample to chunk info...
+	if (sampleNumber + nb_pack_samples - 1 == stsc->w_lastSampleNumber) {
+		if (stsc->nb_entries)
+			stsc->entries[stsc->nb_entries-1].nextChunk = ent->firstChunk;
+
+		stbl->SampleToChunk->currentIndex = stsc->nb_entries-1;
+		stbl->SampleToChunk->firstSampleInCurrentChunk = sampleNumber;
+		//write - edit mode: sample number = chunk number
+		stbl->SampleToChunk->currentChunk = stsc->w_lastChunkNumber;
+		stbl->SampleToChunk->ghostNumber = 1;
+	} else {
+		/*offset remaining entries*/
+		for (i = insert_idx+1; i<stsc->nb_entries+1; i++) {
+			stsc->entries[i].firstChunk++;
+			if (i+1<stsc->nb_entries)
+				stsc->entries[i-1].nextChunk = stsc->entries[i].firstChunk;
+		}
+	}
 
 	//add the offset to the chunk...
 	//and we change our offset
@@ -580,7 +724,7 @@
 			if (!co64->offsets) return GF_OUT_OF_MEM;
 			k = 0;
 			for (i=0; i<stco->nb_entries; i++) {
-				if (i + 1 == sampleNumber) {
+				if (i + 1 == new_chunk_idx) {
 					co64->offsets[i] = offset;
 					k = 1;
 				}
@@ -591,7 +735,7 @@
 			stbl->ChunkOffset = (GF_Box *) co64;
 		} else {
 			//no, we can use this one.
-			if (sampleNumber > stco->nb_entries) {
+			if (new_chunk_idx > stco->nb_entries) {
 				if (!stco->alloc_size) stco->alloc_size = stco->nb_entries;
 				if (stco->nb_entries == stco->alloc_size) {
 					ALLOC_INC(stco->alloc_size);
@@ -607,7 +751,7 @@
 				if (!newOff) return GF_OUT_OF_MEM;
 				k=0;
 				for (i=0; i<stco->nb_entries; i++) {
-					if (i+1 == sampleNumber) {
+					if (i+1 == new_chunk_idx) {
 						newOff[i] = (u32) offset;
 						k=1;
 					}
@@ -638,7 +782,7 @@
 			if (!newLarge) return GF_OUT_OF_MEM;
 			k=0;
 			for (i=0; i<co64->nb_entries; i++) {
-				if (i+1 == sampleNumber) {
+				if (i+1 == new_chunk_idx) {
 					newLarge[i] = offset;
 					k=1;
 				}
@@ -651,43 +795,7 @@
 		}
 	}
 
-	if (stsc->nb_entries==stsc->alloc_size) {
-		ALLOC_INC(stsc->alloc_size);
-		stsc->entries = gf_realloc(stsc->entries, sizeof(GF_StscEntry)*stsc->alloc_size);
-		if (!stsc->entries) return GF_OUT_OF_MEM;
-		memset(&stsc->entries[stsc->nb_entries], 0, sizeof(GF_StscEntry)*(stsc->alloc_size-stsc->nb_entries) );
-	}
-	if (sampleNumber == stsc->nb_entries + 1) {
-		ent = &stsc->entries[stsc->nb_entries];
-	} else {
-		memmove(&stsc->entries[sampleNumber], &stsc->entries[sampleNumber-1], sizeof(GF_StscEntry)*(stsc->nb_entries+1-sampleNumber));
-		ent = &stsc->entries[sampleNumber-1];
-	}
-	ent->isEdited = 0;
-	ent->isEdited = (Media_IsSelfContained(mdia, StreamDescIndex)) ? 1 : 0;
-	ent->sampleDescriptionIndex = StreamDescIndex;
-	ent->samplesPerChunk = 1;
-	ent->firstChunk = sampleNumber;
-	ent->nextChunk = sampleNumber + 1;
-
-	//OK, now if we've inserted a chunk, update the sample to chunk info...
-	if (sampleNumber == stsc->nb_entries + 1) {
-		ent->nextChunk = stsc->nb_entries + 1;
-		if (stsc->nb_entries)
-			stsc->entries[stsc->nb_entries-1].nextChunk = ent->firstChunk;
 
-		stbl->SampleToChunk->currentIndex = stsc->nb_entries;
-		stbl->SampleToChunk->firstSampleInCurrentChunk = sampleNumber;
-		//write - edit mode: sample number = chunk number
-		stbl->SampleToChunk->currentChunk = sampleNumber;
-		stbl->SampleToChunk->ghostNumber = 1;
-	} else {
-		/*offset remaining entries*/
-		for (i = sampleNumber; i<stsc->nb_entries+1; i++) {
-			stsc->entries[i].firstChunk++;
-		}
-	}
-	stsc->nb_entries++;
 	return GF_OK;
 }
 
@@ -789,7 +897,7 @@
 		if (isRAP) return GF_OK;
 		/*remove it...*/
 		if (i+1 < stss->nb_entries)
-			memcpy(stss->sampleNumbers + i, stss->sampleNumbers + i + 1, sizeof(u32) * (stss->nb_entries - i - 1));
+			memmove(stss->sampleNumbers + i, stss->sampleNumbers + i + 1, sizeof(u32) * (stss->nb_entries - i - 1));
 		stss->nb_entries--;
 		return GF_OK;
 	}
@@ -803,7 +911,7 @@
 	}
 
 	if (i+1 < stss->nb_entries)
-		memcpy(stss->sampleNumbers + i + 1, stss->sampleNumbers + i, sizeof(u32) * (stss->nb_entries - i - 1));
+		memmove(stss->sampleNumbers + i + 1, stss->sampleNumbers + i, sizeof(u32) * (stss->nb_entries - i - 1));
 	stss->sampleNumbers[i] = SampleNumber;
 	stss->nb_entries ++;
 	return GF_OK;
@@ -980,7 +1088,7 @@
 		return GF_OK;
 	}
 	if (sampleNumber < stsz->sampleCount) {
-		memcpy(stsz->sizes + sampleNumber - 1, stsz->sizes + sampleNumber, sizeof(u32) * (stsz->sampleCount - sampleNumber));
+		memmove(stsz->sizes + sampleNumber - 1, stsz->sizes + sampleNumber, sizeof(u32) * (stsz->sampleCount - sampleNumber));
 	}
 	stsz->sampleCount--;
 	return GF_OK;
@@ -1241,7 +1349,7 @@
 			if ((SampleNumber>prev_sample) && (SampleNumber <= prev_sample + e->sample_entries[k].sample_count) ) {
 				e->sample_entries[k].sample_count--;
 				if (!e->sample_entries[k].sample_count) {
-					memcpy(&e->sample_entries[k], &e->sample_entries[k+1], sizeof(GF_SampleGroupEntry) * (e->entry_count-k-1));
+					memmove(&e->sample_entries[k], &e->sample_entries[k+1], sizeof(GF_SampleGroupEntry) * (e->entry_count-k-1));
 					e->entry_count--;
 				}
 				break;
@@ -1257,102 +1365,10 @@
 	return GF_OK;
 }
 
-
-
-
-GF_Err stbl_AddSampleFragment(GF_SampleTableBox *stbl, u32 sampleNumber, u16 size)
-{
-	GF_Err e;
-	u32 i, count;
-	GF_StsfEntry *ent;
-	GF_SampleFragmentBox *stsf;
-	stsf = stbl->Fragments;
-
-	if (!stsf) {
-		//create table if any
-		stsf = (GF_SampleFragmentBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSF);
-		if (!stsf) return GF_OUT_OF_MEM;
-		e = stbl_AddBox((GF_Box*)stbl, (GF_Box *) stsf);
-		if (e) return e;
-	}
-
-	//check cache
-	if (!stsf->w_currentEntry || (stsf->w_currentEntry->SampleNumber < sampleNumber)) {
-		stsf->w_currentEntry = NULL;
-		stsf->w_currentEntryIndex = 0;
-	}
-	i = stsf->w_currentEntryIndex;
-
-	count = gf_list_count(stsf->entryList);
-	for (; i<count; i++) {
-		ent = (GF_StsfEntry *)gf_list_get(stsf->entryList, i);
-		if (ent->SampleNumber > sampleNumber) {
-			ent = (GF_StsfEntry *)gf_malloc(sizeof(GF_StsfEntry));
-			if (!ent) return GF_OUT_OF_MEM;
-			memset(ent, 0, sizeof(GF_StsfEntry));
-			ent->SampleNumber = sampleNumber;
-			gf_list_insert(stsf->entryList, ent, i);
-			stsf->w_currentEntry = ent;
-			stsf->w_currentEntryIndex = i;
-			goto ent_found;
-		}
-		else if (ent->SampleNumber == sampleNumber) {
-			stsf->w_currentEntry = ent;
-			stsf->w_currentEntryIndex = i;
-			goto ent_found;
-		}
-	}
-	//if we get here add a new entry
-	GF_SAFEALLOC(ent, GF_StsfEntry);
-	if (!ent) return GF_OUT_OF_MEM;
-	ent->SampleNumber = sampleNumber;
-	gf_list_add(stsf->entryList, ent);
-	stsf->w_currentEntry = ent;
-	stsf->w_currentEntryIndex = gf_list_count(stsf->entryList)-1;
-
-ent_found:
-	if (!ent->fragmentCount) {
-		ent->fragmentCount = 1;
-		ent->fragmentSizes = (u16*)gf_malloc(sizeof(u16));
-		if (!ent->fragmentSizes) return GF_OUT_OF_MEM;
-		ent->fragmentSizes[0] = size;
-		return GF_OK;
-	}
-	ent->fragmentSizes = (u16*)gf_realloc(ent->fragmentSizes, sizeof(u16) * (ent->fragmentCount+1));
-	if (!ent->fragmentSizes) return GF_OUT_OF_MEM;
-	ent->fragmentSizes[ent->fragmentCount] = size;
-	ent->fragmentCount += 1;
-
-	return GF_OK;
-}
-
-GF_Err stbl_RemoveSampleFragments(GF_SampleTableBox *stbl, u32 sampleNumber)
-{
-	u32 i;
-	GF_StsfEntry *ent;
-	GF_SampleFragmentBox *stsf = stbl->Fragments;
-
-	i=0;
-	while ((ent = (GF_StsfEntry *)gf_list_enum(stsf->entryList, &i))) {
-		if (ent->SampleNumber == sampleNumber) {
-			gf_list_rem(stsf->entryList, i-1);
-			if (ent->fragmentSizes) gf_free(ent->fragmentSizes);
-			gf_free(ent);
-			goto exit;
-		}
-	}
-exit:
-	//empty table, remove it
-	if (!gf_list_count(stsf->entryList)) {
-		stbl->Fragments = NULL;
-		gf_isom_box_del((GF_Box *)stsf);
-	}
-	return GF_OK;
-}
-
 GF_Err stbl_SampleSizeAppend(GF_SampleSizeBox *stsz, u32 data_size)
 {
 	u32 i;
+	u32 single_size = 0;
 	if (!stsz || !stsz->sampleCount) return GF_BAD_PARAM;
 
 	//we must realloc our table
@@ -1366,6 +1382,19 @@
 		stsz->sampleSize = data_size;
 	} else {
 		stsz->sizes[stsz->sampleCount-1] += data_size;
+
+		single_size = stsz->sizes[0];
+		for (i=1; i<stsz->sampleCount; i++) {
+			if (stsz->sizes[i] != single_size) {
+				single_size = 0;
+				break;
+			}
+		}
+		if (single_size) {
+			stsz->sampleSize = single_size;
+			gf_free(stsz->sizes);
+			stsz->sizes = NULL;
+		}
 	}
 	return GF_OK;
 }
@@ -1374,13 +1403,14 @@
 
 
 
-void stbl_AppendTime(GF_SampleTableBox *stbl, u32 duration)
+void stbl_AppendTime(GF_SampleTableBox *stbl, u32 duration, u32 nb_pack)
 {
 	GF_TimeToSampleBox *stts = stbl->TimeToSample;
 
+	if (!nb_pack) nb_pack = 1;
 	if (stts->nb_entries) {
 		if (stts->entries[stts->nb_entries-1].sampleDelta == duration) {
-			stts->entries[stts->nb_entries-1].sampleCount += 1;
+			stts->entries[stts->nb_entries-1].sampleCount += nb_pack;
 			return;
 		}
 	}
@@ -1390,22 +1420,23 @@
 		if (!stts->entries) return;
 		memset(&stts->entries[stts->nb_entries], 0, sizeof(GF_SttsEntry)*(stts->alloc_size-stts->nb_entries) );
 	}
-	stts->entries[stts->nb_entries].sampleCount = 1;
+	stts->entries[stts->nb_entries].sampleCount = nb_pack;
 	stts->entries[stts->nb_entries].sampleDelta = duration;
 	stts->nb_entries++;
 }
 
-void stbl_AppendSize(GF_SampleTableBox *stbl, u32 size)
+void stbl_AppendSize(GF_SampleTableBox *stbl, u32 size, u32 nb_pack)
 {
 	u32 i;
+	if (!nb_pack) nb_pack = 1;
 
 	if (!stbl->SampleSize->sampleCount) {
 		stbl->SampleSize->sampleSize = size;
-		stbl->SampleSize->sampleCount = 1;
+		stbl->SampleSize->sampleCount += nb_pack;
 		return;
 	}
 	if (stbl->SampleSize->sampleSize && (stbl->SampleSize->sampleSize==size)) {
-		stbl->SampleSize->sampleCount += 1;
+		stbl->SampleSize->sampleCount += nb_pack;
 		return;
 	}
 	if (!stbl->SampleSize->sizes || (stbl->SampleSize->sampleCount==stbl->SampleSize->alloc_size)) {
@@ -1425,9 +1456,11 @@
 	}
 	stbl->SampleSize->sampleSize = 0;
 	stbl->SampleSize->sizes[stbl->SampleSize->sampleCount] = size;
-	stbl->SampleSize->sampleCount += 1;
+	stbl->SampleSize->sampleCount += nb_pack;
 }
 
+
+
 void stbl_AppendChunk(GF_SampleTableBox *stbl, u64 offset)
 {
 	GF_ChunkOffsetBox *stco;
@@ -1542,6 +1575,27 @@
 	stbl->SyncSample->nb_entries += 1;
 }
 
+void stbl_AppendTrafMap(GF_SampleTableBox *stbl)
+{
+	GF_TrafToSampleMap *tmap;
+
+	if (!stbl->traf_map) {
+		//nope, create one
+		GF_SAFEALLOC(stbl->traf_map, GF_TrafToSampleMap);
+		if (!stbl->traf_map) return;
+	}
+	tmap = stbl->traf_map;
+	if (tmap->nb_entries >= stbl->SampleSize->sampleCount)
+		tmap->nb_entries = 0;
+
+	if (tmap->nb_entries + 1 > tmap->nb_alloc) {
+		tmap->nb_alloc++;
+		tmap->sample_num = gf_realloc(tmap->sample_num, sizeof(u32) * tmap->nb_alloc);
+	}
+	tmap->sample_num[tmap->nb_entries] = stbl->SampleSize->sampleCount;
+	tmap->nb_entries += 1;
+}
+
 void stbl_AppendPadding(GF_SampleTableBox *stbl, u8 padding)
 {
 	u32 i;
@@ -1606,7 +1660,6 @@
 GF_Err stbl_UnpackOffsets(GF_SampleTableBox *stbl)
 {
 	GF_Err e;
-	u8 isEdited;
 	u32 i, chunkNumber, sampleDescIndex;
 	u64 dataOffset;
 	GF_StscEntry *ent;
@@ -1662,12 +1715,15 @@
 	stsc_tmp->nb_entries = stsc_tmp->alloc_size = stbl->SampleSize->sampleCount;
 	stsc_tmp->entries = gf_malloc(sizeof(GF_StscEntry)*stsc_tmp->nb_entries);
 	if (!stsc_tmp->entries) return GF_OUT_OF_MEM;
+	//set write cache to last sample before unpack
+	stsc_tmp->w_lastSampleNumber = stbl->SampleSize->sampleCount;
+	stsc_tmp->w_lastChunkNumber = stbl->SampleSize->sampleCount;
 
 	//OK write our two tables...
 	ent = NULL;
 	for (i = 0; i < stbl->SampleSize->sampleCount; i++) {
 		//get the data info for the sample
-		e = stbl_GetSampleInfos(stbl, i+1, &dataOffset, &chunkNumber, &sampleDescIndex, &isEdited);
+		e = stbl_GetSampleInfos(stbl, i+1, &dataOffset, &chunkNumber, &sampleDescIndex, NULL);
 		if (e) goto err_exit;
 		ent = &stsc_tmp->entries[i];
 		ent->isEdited = 0;
@@ -1767,7 +1823,7 @@
 //are re-arranged in chunks according to the chunkOffsets
 //NOTE: this has to be called once interleaving or whatever is done and
 //the final MDAT is written!!!
-GF_Err stbl_SetChunkAndOffset(GF_SampleTableBox *stbl, u32 sampleNumber, u32 StreamDescIndex, GF_SampleToChunkBox *the_stsc, GF_Box **the_stco, u64 data_offset, u8 forceNewChunk)
+GF_Err stbl_SetChunkAndOffset(GF_SampleTableBox *stbl, u32 sampleNumber, u32 StreamDescIndex, GF_SampleToChunkBox *the_stsc, GF_Box **the_stco, u64 data_offset, Bool forceNewChunk, u32 nb_samp)
 {
 	GF_Err e;
 	u8 newChunk;
@@ -1799,7 +1855,7 @@
 
 	//no need for a new chunk
 	if (!newChunk) {
-		cur_ent->samplesPerChunk += 1;
+		cur_ent->samplesPerChunk += nb_samp;
 		return GF_OK;
 	}
 
@@ -1838,7 +1894,7 @@
 		newEnt->firstChunk = ((GF_ChunkLargeOffsetBox *) (*the_stco) )->nb_entries;
 	}
 	newEnt->sampleDescriptionIndex = StreamDescIndex;
-	newEnt->samplesPerChunk = 1;
+	newEnt->samplesPerChunk = nb_samp;
 	newEnt->nextChunk = 0;
 	//if we already have an entry, adjust its next chunk to point to our new chunk
 	if (the_stsc->nb_entries)
@@ -1847,7 +1903,7 @@
 	return GF_OK;
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_refresh_size_info(GF_ISOFile *file, u32 trackNumber)
 {
 	u32 i, size;

gpac-0.7.1.tar.gz/src/isomedia/track.c -> gpac-0.8.0.tar.gz/src/isomedia/track.c Changed

@@ -95,14 +95,14 @@
 	//find stream dependencies: dpnd, sbas and scal
 	for (k=0; k<3; k++) {
 		u32 ref = GF_ISOM_BOX_TYPE_DPND;
-		if (k==1) ref = GF_4CC('s', 'b', 'a', 's');
-		else if (k==2) ref = GF_4CC('s', 'c', 'a', 'l');
+		if (k==1) ref = GF_ISOM_REF_BASE;
+		else if (k==2) ref = GF_ISOM_REF_SCAL;
 
 		e = Track_FindRef(trak, ref , &dpnd);
 		if (e) return e;
 		if (dpnd) {
 			//ONLY ONE STREAM DEPENDENCY IS ALLOWED
-			if (dpnd->trackIDCount != 1) return GF_ISOM_INVALID_MEDIA;
+			if (!k && (dpnd->trackIDCount != 1)) return GF_ISOM_INVALID_MEDIA;
 			//fix the spec: where is the index located ??
 			esd->dependsOnESID = dpnd->trackIDs[0];
 			break;
@@ -115,7 +115,7 @@
 		GF_UserDataMap *map;
 		u32 i = 0;
 		while ((map = (GF_UserDataMap*)gf_list_enum(trak->udta->recordList, &i))) {
-			if (map->boxType == GF_4CC('A','U','X','V')) {
+			if (map->boxType == GF_ISOM_BOX_TYPE_AUXV) {
 				GF_Descriptor *d = gf_odf_desc_new(GF_ODF_AUX_VIDEO_DATA);
 				gf_list_add(esd->extensionDescriptors, d);
 				break;
@@ -354,6 +354,8 @@
 {
 	switch (HandlerType) {
 	case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
 	case GF_ISOM_MEDIA_AUDIO:
 	case GF_ISOM_MEDIA_SUBPIC:
 	case GF_ISOM_MEDIA_OD:
@@ -413,19 +415,20 @@
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 
-GF_Err MergeTrack(GF_TrackBox *trak, GF_TrackFragmentBox *traf, u64 moof_offset, Bool is_first_merge)
+GF_Err MergeTrack(GF_TrackBox *trak, GF_TrackFragmentBox *traf, u64 moof_offset, u64 *cumulated_offset, Bool is_first_merge)
 {
-	u32 i, j, chunk_size;
-	u64 base_offset, data_offset;
+	u32 i, j, chunk_size, track_num;
+	u64 base_offset, data_offset, traf_duration;
 	u32 def_duration, DescIndex, def_size, def_flags;
 	u32 duration, size, flags, cts_offset, prev_trun_data_offset;
 	u8 pad, sync;
 	u16 degr;
+	Bool first_samp_in_traf=GF_TRUE;
 	GF_TrackFragmentRunBox *trun;
 	GF_TrunEntry *ent;
 
-	void stbl_AppendTime(GF_SampleTableBox *stbl, u32 duration);
-	void stbl_AppendSize(GF_SampleTableBox *stbl, u32 size);
+	void stbl_AppendTime(GF_SampleTableBox *stbl, u32 duration, u32 nb_pack);
+	void stbl_AppendSize(GF_SampleTableBox *stbl, u32 size, u32 nb_pack);
 	void stbl_AppendChunk(GF_SampleTableBox *stbl, u64 offset);
 	void stbl_AppendSampleToChunk(GF_SampleTableBox *stbl, u32 DescIndex, u32 samplesInChunk);
 	void stbl_AppendCTSOffset(GF_SampleTableBox *stbl, s32 CTSOffset);
@@ -437,15 +440,29 @@
 
 	//setup all our defaults
 	DescIndex = (traf->tfhd->flags & GF_ISOM_TRAF_SAMPLE_DESC) ? traf->tfhd->sample_desc_index : traf->trex->def_sample_desc_index;
+	if (!DescIndex) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] default sample description set to 0, likely broken ! Fixing to 1\n" ));
+		DescIndex = 1;
+	}
+
 	def_duration = (traf->tfhd->flags & GF_ISOM_TRAF_SAMPLE_DUR) ? traf->tfhd->def_sample_duration : traf->trex->def_sample_duration;
 	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;
 
-	//locate base offset
-	base_offset = (traf->tfhd->flags & GF_ISOM_TRAF_BASE_OFFSET) ? traf->tfhd->base_data_offset : moof_offset;
+	//locate base offset, by default use moof (dash-like)
+	base_offset = moof_offset;
+	//explicit base offset, use it
+	if (traf->tfhd->flags & GF_ISOM_TRAF_BASE_OFFSET)
+		base_offset = traf->tfhd->base_data_offset;
+	//no moof offset and no explicit offset, the offset is the end of the last written chunk of
+	//the previous traf. For the first traf, *cumulated_offset is actually moof offset
+	else if (!(traf->tfhd->flags & GF_ISOM_MOOF_BASE_OFFSET))
+		base_offset = *cumulated_offset;
 
 	chunk_size = 0;
 	prev_trun_data_offset = 0;
+	data_offset = 0;
+	traf_duration = 0;
 
 	/*in playback mode*/
 	if (traf->tfdt && is_first_merge) {
@@ -467,6 +484,11 @@
 		//merge the run
 		for (j=0; j<trun->sample_count; j++) {
 			ent = (GF_TrunEntry*)gf_list_get(trun->entries, j);
+
+			if (!ent) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Track %d doesn't have enough trun entries (%d) compared to sample count (%d) in run\n", traf->trex->trackID, gf_list_count(trun->entries), trun->sample_count ));
+				break;
+			}
 			size = def_size;
 			duration = def_duration;
 			flags = def_flags;
@@ -481,25 +503,29 @@
 				}
 			}
 			//add size first
-			stbl_AppendSize(trak->Media->information->sampleTable, size);
+			stbl_AppendSize(trak->Media->information->sampleTable, size, ent->nb_pack);
 			//then TS
-			stbl_AppendTime(trak->Media->information->sampleTable, duration);
+			stbl_AppendTime(trak->Media->information->sampleTable, duration, ent->nb_pack);
+
 			//add chunk on first sample
 			if (!j) {
 				data_offset = base_offset;
-				//aggregated offset if base-data-offset-present is not set AND if default-base-is-moof is not set
-				if (!(traf->tfhd->flags & GF_ISOM_TRAF_BASE_OFFSET) && !(traf->tfhd->flags & GF_ISOM_MOOF_BASE_OFFSET) )
-					data_offset += chunk_size;
-
+				//we have an explicit data offset for this trun
 				if (trun->flags & GF_ISOM_TRUN_DATA_OFFSET) {
 					data_offset += trun->data_offset;
 					/*reset chunk size since data is now relative to this trun*/
 					chunk_size = 0;
 					/*remember this data offset for following trun*/
 					prev_trun_data_offset = trun->data_offset;
-				} else {
+				}
+				//we had an explicit data offset for the previous trun, use it + chunk size
+				else if (prev_trun_data_offset) {
 					/*data offset is previous chunk size plus previous offset of the trun*/
-					data_offset += prev_trun_data_offset;
+					data_offset += prev_trun_data_offset + chunk_size;
+				}
+				//no explicit data offset, continuous data after last data in previous chunk
+				else {
+					data_offset += chunk_size;
 				}
 				stbl_AppendChunk(trak->Media->information->sampleTable, data_offset);
 				//then sampleToChunk
@@ -508,6 +534,17 @@
 			}
 			chunk_size += size;
 
+			if (first_samp_in_traf) {
+				first_samp_in_traf = GF_FALSE;
+				stbl_AppendTrafMap(trak->Media->information->sampleTable);
+			}
+			if (ent->nb_pack) {
+				j+= ent->nb_pack-1;
+				traf_duration += ent->nb_pack*duration;
+				continue;
+			}
+
+			traf_duration += duration;
 
 			//CTS
 			cts_offset = (trun->flags & GF_ISOM_TRUN_CTS_OFFSET) ? ent->CTS_Offset : 0;
@@ -527,6 +564,34 @@
 			stbl_AppendDependencyType(trak->Media->information->sampleTable, GF_ISOM_GET_FRAG_LEAD(flags), GF_ISOM_GET_FRAG_DEPENDS(flags), GF_ISOM_GET_FRAG_DEPENDED(flags), GF_ISOM_GET_FRAG_REDUNDANT(flags));
 		}
 	}
+	if (traf_duration && trak->editBox && trak->editBox->editList) {
+		for (i=0; i<gf_list_count(trak->editBox->editList->entryList); i++) {
+			GF_EdtsEntry *ent = gf_list_get(trak->editBox->editList->entryList, i);
+			if (ent->was_empty_dur) {
+				u64 extend_dur = traf_duration;
+				extend_dur *= trak->moov->mvhd->timeScale;
+				extend_dur /= trak->Media->mediaHeader->timeScale;
+				ent->segmentDuration += extend_dur;
+			}
+			else if (!ent->segmentDuration) {
+				ent->was_empty_dur = GF_TRUE;
+				if ((s64) traf_duration > ent->mediaTime)
+					traf_duration -= ent->mediaTime;
+				else
+					traf_duration = 0;
+
+				ent->segmentDuration = traf_duration;
+				ent->segmentDuration *= trak->moov->mvhd->timeScale;
+				ent->segmentDuration /= trak->Media->mediaHeader->timeScale;
+			}
+
+		}
+	}
+
+	//in any case, update the cumulated offset
+	//this will handle hypothetical files mixing MOOF offset and implicit non-moof offset
+	*cumulated_offset = data_offset + chunk_size;
+
 	/*merge sample groups*/
 	if (traf->sampleGroups) {
 		GF_List *groups;
@@ -643,11 +708,14 @@
 	}
 
 	/*content is encrypted*/
-	if (gf_isom_is_cenc_media(trak->moov->mov, gf_isom_get_tracknum_from_id(trak->moov, trak->Header->trackID), 1)
+	track_num = gf_isom_get_tracknum_from_id(trak->moov, trak->Header->trackID);
+	if (gf_isom_is_cenc_media(trak->moov->mov, track_num, 1)
 		|| traf->sample_encryption) {
 		/*Merge sample auxiliary encryption information*/
 		GF_SampleEncryptionBox *senc = NULL;
 		GF_List *sais = NULL;
+		u32 scheme_type;
+		gf_isom_get_cenc_info(trak->moov->mov, track_num, 1, NULL, &scheme_type, NULL, NULL);
 
 		if (traf->sample_encryption) {
 			for (i = 0; i < gf_list_count(trak->Media->information->sampleTable->other_boxes); i++) {
@@ -663,6 +731,9 @@
 					break;
 				}
 			}
+			if (!senc && trak->sample_encryption)
+				senc = trak->sample_encryption;
+
 			if (!senc) {
 				if (traf->sample_encryption->is_piff) {
 					senc = (GF_SampleEncryptionBox *)gf_isom_create_piff_psec_box(1, 0x2, 0, 0, NULL);
@@ -672,8 +743,6 @@
 
 				if (!trak->Media->information->sampleTable->other_boxes) trak->Media->information->sampleTable->other_boxes = gf_list_new();
 
-				assert(trak->sample_encryption == NULL);
-
 				trak->sample_encryption = senc;
 				gf_isom_box_add_default((GF_Box *)trak, (GF_Box *)senc);
 			}
@@ -682,8 +751,9 @@
 		}
 
 		/*get sample auxiliary information by saiz/saio rather than by parsing senc box*/
-		if (gf_isom_cenc_has_saiz_saio_traf(traf)) {
+		if (gf_isom_cenc_has_saiz_saio_traf(traf, scheme_type)) {
 			u32 size, nb_saio;
+			u32 aux_info_type;
 			u64 offset;
 			GF_Err e;
 			Bool is_encrypted;
@@ -694,8 +764,13 @@
 
 			for (i = 0; i < gf_list_count(traf->sai_offsets); i++) {
 				saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_list_get(traf->sai_offsets, i);
+				aux_info_type = saio->aux_info_type;
+				if (!aux_info_type) aux_info_type = scheme_type;
+
 				/*if we have only 1 sai_offsets, assume that its type is cenc*/
-				if ((saio->aux_info_type == GF_4CC('c', 'e', 'n', 'c')) || (gf_list_count(traf->sai_offsets) == 1)) {
+				if ((aux_info_type == GF_ISOM_CENC_SCHEME) || (aux_info_type == GF_ISOM_CBC_SCHEME) ||
+					(aux_info_type == GF_ISOM_CENS_SCHEME) || (aux_info_type == GF_ISOM_CBCS_SCHEME) ||
+					(gf_list_count(traf->sai_offsets) == 1)) {
 					offset = (saio->version ? saio->offsets_large[0] : saio->offsets[0]) + moof_offset;
 					nb_saio = saio->entry_count;
 					break;
@@ -703,8 +778,12 @@
 			}
 			for (i = 0; i < gf_list_count(traf->sai_sizes); i++) {
 				saiz = (GF_SampleAuxiliaryInfoSizeBox *)gf_list_get(traf->sai_sizes, i);
+				aux_info_type = saiz->aux_info_type;
+				if (!aux_info_type) aux_info_type = scheme_type;
 				/*if we have only 1 sai_sizes, assume that its type is cenc*/
-				if ((saiz->aux_info_type == GF_4CC('c', 'e', 'n', 'c')) || (gf_list_count(traf->sai_sizes) == 1)) {
+				if ((aux_info_type == GF_ISOM_CENC_SCHEME) || (aux_info_type == GF_ISOM_CBC_SCHEME) ||
+					(aux_info_type == GF_ISOM_CENS_SCHEME) || (aux_info_type == GF_ISOM_CBCS_SCHEME) ||
+					(gf_list_count(traf->sai_sizes) == 1)) {
 					break;
 				}
 			}
@@ -769,6 +848,13 @@
 				gf_list_add(senc->samp_aux_info, new_sai);
 				if (sai->subsample_count) senc->flags = 0x00000002;
 			}
+		} else if (traf->sample_encryption) {
+			senc_Parse(trak->moov->mov->movieFileMap->bs, trak, traf, traf->sample_encryption);
+			trak->sample_encryption->AlgorithmID = traf->sample_encryption->AlgorithmID;
+			if (!trak->sample_encryption->IV_size)
+				trak->sample_encryption->IV_size = traf->sample_encryption->IV_size;
+			if (!trak->sample_encryption->samp_aux_info) trak->sample_encryption->samp_aux_info = gf_list_new();
+			gf_list_transfer(trak->sample_encryption->samp_aux_info, traf->sample_encryption->samp_aux_info);
 		}
 	}
 	return GF_OK;
@@ -827,7 +913,7 @@
 
 	GF_Err e;
 
-	if (*mdia || !mdia) return GF_BAD_PARAM;
+	if (!mdia || *mdia) return GF_BAD_PARAM;
 
 	minf = NULL;
 	mdhd = NULL;
@@ -847,6 +933,14 @@
 		mediaInfo = gf_isom_box_new(GF_ISOM_BOX_TYPE_VMHD);
 		str = "GPAC ISO Video Handler";
 		break;
+ case GF_ISOM_MEDIA_AUXV:
+ mediaInfo = gf_isom_box_new(GF_ISOM_BOX_TYPE_VMHD);
+ str = "GPAC ISO Auxiliary Video Handler";
+ break;
+ case GF_ISOM_MEDIA_PICT:
+ mediaInfo = gf_isom_box_new(GF_ISOM_BOX_TYPE_VMHD);
+ str = "GPAC ISO Picture Sequence Handler";
+ break;
 	case GF_ISOM_MEDIA_AUDIO:
 		mediaInfo = gf_isom_box_new(GF_ISOM_BOX_TYPE_SMHD);
 		str = "GPAC ISO Audio Handler";
@@ -1062,10 +1156,17 @@
 
 	//we have a streamDescritpionIndex, use it
 	if (StreamDescriptionIndex) {
+		u32 entry_type;
 		entry = (GF_MPEGSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, StreamDescriptionIndex - 1);
 		if (!entry) return GF_ISOM_INVALID_FILE;
 
-		switch (entry->type) {
+		entry_type = entry->type;
+		if (gf_list_count(entry->protections)) {
+			GF_ProtectionSchemeInfoBox *sinf = (GF_ProtectionSchemeInfoBox *) gf_list_get(entry->protections, 0);
+			if (sinf && sinf->original_format) entry_type = sinf->original_format->data_format;
+		}
+
+		switch (entry_type) {
 		case GF_ISOM_BOX_TYPE_MP4S:
 			//OK, delete the previous ESD
 			gf_odf_desc_del((GF_Descriptor *) entry->esd->desc);
@@ -1079,9 +1180,11 @@
 			break;
 		case GF_ISOM_BOX_TYPE_MP4A:
 			entry_a = (GF_MPEGAudioSampleEntryBox*) entry;
-			//OK, delete the previous ESD
-			gf_odf_desc_del((GF_Descriptor *) entry_a->esd->desc);
-			entry_a->esd->desc = esd;
+ if (entry_a->esd) { // some non-conformant files may not have an ESD ...
+ //OK, delete the previous ESD
+ gf_odf_desc_del((GF_Descriptor *) entry_a->esd->desc);
+ entry_a->esd->desc = esd;
+ }
 			break;
 		case GF_ISOM_BOX_TYPE_AVC1:
 		case GF_ISOM_BOX_TYPE_AVC2:
@@ -1103,11 +1206,15 @@
 			e = LSR_UpdateESD((GF_LASeRSampleEntryBox*)entry, esd);
 			if (e) return e;
 			break;
+		case GF_ISOM_BOX_TYPE_AV01:
+		case GF_ISOM_BOX_TYPE_AV1C:
+		case GF_ISOM_BOX_TYPE_OPUS:
+		case GF_ISOM_BOX_TYPE_DOPS:
 		case GF_ISOM_BOX_TYPE_STXT:
 		case GF_ISOM_BOX_TYPE_WVTT:
 		case GF_ISOM_BOX_TYPE_STPP:
-			/* TODO */
-			assert(0);
+			if (esd) gf_odf_desc_del((GF_Descriptor *) esd);
+			e = GF_OK;
 			break;
 
 		default:
@@ -1125,6 +1232,8 @@
 
 		//OK, check the handler and create the entry
 		switch (trak->Media->handler->handlerType) {
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
 		case GF_ISOM_MEDIA_VISUAL:
 			if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MVC)) {
 				entry_v = (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_AVC1);
@@ -1147,7 +1256,12 @@
 			entry = (GF_MPEGSampleEntryBox*) entry_v;
 			break;
 		case GF_ISOM_MEDIA_AUDIO:
-			if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_AUDIO_AC3) {
+			if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_MEDIA_OPUS) {
+				GF_MPEGAudioSampleEntryBox *opus = (GF_MPEGAudioSampleEntryBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_OPUS);
+				if (!opus) return GF_OUT_OF_MEM;
+				opus->cfg_opus = (GF_OpusSpecificBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_DOPS);
+				entry = (GF_MPEGSampleEntryBox*)opus;
+			} else if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_AUDIO_AC3) {
 				GF_MPEGAudioSampleEntryBox *ac3 = (GF_MPEGAudioSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_AC3);
 				if (!ac3) return GF_OUT_OF_MEM;
 				ac3->cfg_ac3 = (GF_AC3ConfigBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_DAC3);

gpac-0.7.1.tar.gz/src/isomedia/tx3g.c -> gpac-0.8.0.tar.gz/src/isomedia/tx3g.c Changed

@@ -83,6 +83,7 @@
 	return e;
 }
 
+GF_EXPORT
 GF_Err gf_isom_new_text_description(GF_ISOFile *movie, u32 trackNumber, GF_TextSampleDescriptor *desc, char *URLname, char *URNname, u32 *outDescriptionIndex)
 {
 	GF_TrackBox *trak;
@@ -108,7 +109,7 @@
 	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 	if (e) return e;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(movie, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
 	if (!movie->keep_utc)
@@ -139,6 +140,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*/
+GF_EXPORT
 GF_Err gf_isom_text_add_text(GF_TextSample *samp, char *text_data, u32 text_len)
 {
 	if (!samp) return GF_BAD_PARAM;
@@ -160,6 +162,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_text_add_style(GF_TextSample *samp, GF_StyleRecord *rec)
 {
 	if (!samp || !rec) return GF_BAD_PARAM;
@@ -175,6 +178,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_text_add_highlight(GF_TextSample *samp, u16 start_char, u16 end_char)
 {
 	GF_TextHighlightBox *a;
@@ -188,6 +192,7 @@
 	return gf_list_add(samp->others, a);
 }
 
+GF_EXPORT
 GF_Err gf_isom_text_set_highlight_color(GF_TextSample *samp, u8 r, u8 g, u8 b, u8 a)
 {
 	if (!samp) return GF_BAD_PARAM;
@@ -219,6 +224,7 @@
 }
 
 /*3GPP spec is quite obscur here*/
+GF_EXPORT
 GF_Err gf_isom_text_add_karaoke(GF_TextSample *samp, u32 start_time)
 {
 	if (!samp) return GF_BAD_PARAM;
@@ -228,6 +234,7 @@
 	return gf_list_add(samp->others, samp->cur_karaoke);
 }
 
+GF_EXPORT
 GF_Err gf_isom_text_set_karaoke_segment(GF_TextSample *samp, u32 end_time, u16 start_char, u16 end_char)
 {
 	if (!samp || !samp->cur_karaoke) return GF_BAD_PARAM;
@@ -240,7 +247,7 @@
 	return GF_OK;
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_text_set_scroll_delay(GF_TextSample *samp, u32 scroll_delay)
 {
 	if (!samp) return GF_BAD_PARAM;
@@ -252,6 +259,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_text_add_hyperlink(GF_TextSample *samp, char *URL, char *altString, u16 start_char, u16 end_char)
 {
 	GF_TextHyperTextBox*a;
@@ -265,6 +273,7 @@
 	return gf_list_add(samp->others, a);
 }
 
+GF_EXPORT
 GF_Err gf_isom_text_set_box(GF_TextSample *samp, s16 top, s16 left, s16 bottom, s16 right)
 {
 	if (!samp) return GF_BAD_PARAM;
@@ -279,6 +288,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_text_add_blink(GF_TextSample *samp, u16 start_char, u16 end_char)
 {
 	GF_TextBlinkBox *a;
@@ -290,6 +300,7 @@
 	return gf_list_add(samp->others, a);
 }
 
+GF_EXPORT
 GF_Err gf_isom_text_set_wrap(GF_TextSample *samp, u8 wrap_flags)
 {
 	if (!samp) return GF_BAD_PARAM;
@@ -310,6 +321,7 @@
 	return e;
 }
 
+GF_EXPORT
 GF_ISOSample *gf_isom_text_to_sample(GF_TextSample *samp)
 {
 	GF_Err e;
@@ -405,6 +417,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+GF_EXPORT
 GF_TextSample *gf_isom_new_text_sample()
 {
 	GF_TextSample *res;
@@ -414,6 +427,7 @@
 	return res;
 }
 
+GF_EXPORT
 GF_Err gf_isom_text_reset_styles(GF_TextSample *samp)
 {
 	if (!samp) return GF_BAD_PARAM;
@@ -436,6 +450,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_text_reset(GF_TextSample *samp)
 {
 	if (!samp) return GF_BAD_PARAM;

gpac-0.7.1.tar.gz/src/laser/lsr_dec.c -> gpac-0.8.0.tar.gz/src/laser/lsr_dec.c Changed

@@ -35,7 +35,7 @@
 	(_val) = gf_bs_read_int(_codec->bs, _nbBits);	\
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[LASeR] %s\t\t%d\t\t%d\n", _str, _nbBits, _val)); \
 	}\
- 
+
 
 static void lsr_read_group_content(GF_LASeRCodec *lsr, GF_Node *elt, Bool skip_object_content);
 static void lsr_read_group_content_post_init(GF_LASeRCodec *lsr, SVG_Element *elt, Bool skip_init);
@@ -192,6 +192,7 @@
 	return e;
 }
 
+GF_EXPORT
 GF_Err gf_laser_decode_command_list(GF_LASeRCodec *codec, u16 ESID, char *data, u32 data_len, GF_List *com_list)
 {
 	GF_Err e;
@@ -2529,10 +2530,20 @@
 		}
 	}
 	count = lsr_read_vluimsbf5(lsr, "count");
-	for (i=0; i<count; i++) {
-		Fixed *v = (Fixed *)gf_malloc(sizeof(Fixed));
-		*v = lsr_read_fixed_16_8(lsr, "val");
-		gf_list_add(*coords, v);
+	if (tag == TAG_SVG_ATT_text_rotate) {
+		for (i=0; i<count; i++) {
+			SVG_Number *n = (SVG_Number *)gf_malloc(sizeof(SVG_Number));
+			n->type = SVG_NUMBER_VALUE;
+			n->value = lsr_read_fixed_16_8(lsr, "val");
+			gf_list_add(*coords, n);
+		}
+	}
+	else {
+		for (i=0; i<count; i++) {
+			Fixed *n = (Fixed *)gf_malloc(sizeof(Fixed));
+			*n = lsr_read_fixed_16_8(lsr, "val");
+			gf_list_add(*coords, n);
+		}
 	}
 }
 
@@ -5299,7 +5310,7 @@
 
 	GF_LSR_READ_INT(lsr, flag, 1, "has_pointvalue");
 	if (flag) {
-		lsr_read_byte_align_string(lsr, NULL, "string");;
+		lsr_read_byte_align_string(lsr, NULL, "string");
 	}
 	lsr_read_any_attribute(lsr, NULL, 1);

gpac-0.7.1.tar.gz/src/laser/lsr_enc.c -> gpac-0.8.0.tar.gz/src/laser/lsr_enc.c Changed

@@ -44,6 +44,7 @@
 static void lsr_write_point_sequence(GF_LASeRCodec *lsr, GF_List **pts, const char *name);
 static void lsr_write_path_type(GF_LASeRCodec *lsr, SVG_PathData *path, const char *name);
 
+GF_EXPORT
 GF_LASeRCodec *gf_laser_encoder_new(GF_SceneGraph *graph)
 {
 	GF_LASeRCodec *tmp;
@@ -55,6 +56,7 @@
 	return tmp;
 }
 
+GF_EXPORT
 void gf_laser_encoder_del(GF_LASeRCodec *codec)
 {
 	/*destroy all config*/
@@ -85,7 +87,7 @@
 	return NULL;
 }
 
-
+GF_EXPORT
 GF_Err gf_laser_encoder_new_stream(GF_LASeRCodec *codec, u16 ESID, GF_LASERConfig *cfg)
 {
 	LASeRStreamInfo *pInfo;
@@ -104,6 +106,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_laser_encoder_get_config(GF_LASeRCodec *codec, u16 ESID, char **out_data, u32 *out_data_length)
 {
 	GF_BitStream *bs;
@@ -145,7 +148,7 @@
 	return GF_OK;
 }
 
-
+GF_EXPORT
 GF_Err gf_laser_encode_au(GF_LASeRCodec *codec, u16 ESID, GF_List *command_list, Bool reset_context, char **out_data, u32 *out_data_length)
 {
 	GF_Err e;
@@ -173,6 +176,7 @@
 	return e;
 }
 
+GF_EXPORT
 GF_Err gf_laser_encoder_get_rap(GF_LASeRCodec *codec, char **out_data, u32 *out_data_length)
 {
 	GF_Err e;

gpac-0.7.1.tar.gz/src/media_tools/ait.c -> gpac-0.8.0.tar.gz/src/media_tools/ait.c Changed

gpac-0.8.0.tar.gz/src/media_tools/atsc_dmx.c Added

@@ -0,0 +1,1876 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ * This file is part of GPAC / Media Tools ATSC demux sub-project
+ *
+ * GPAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GPAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/atsc.h>
+
+#ifndef GPAC_DISABLE_ATSC
+
+#include <gpac/network.h>
+#include <gpac/bitstream.h>
+#include <gpac/xml.h>
+
+#define GF_ATSC_MCAST_ADDR	"224.0.23.60"
+#define GF_ATSC_MCAST_PORT	4937
+#define GF_ATSC_SOCK_SIZE	0x80000
+
+typedef struct
+{
+	u8 codepoint;
+	u8 format_id;
+	u8 frag;
+	u8 order;
+	u32 src_fec_payload_id;
+} GF_ATSCLCTReg;
+
+typedef struct
+{
+	u32 tsi;
+	char *init_filename;
+	u32 init_toi;
+	char *toi_template;
+	GF_ATSCLCTReg CPs[8];
+	u32 nb_cps;
+	u32 last_dispatched_tsi, last_dispatched_toi;
+
+} GF_ATSCLCTChannel;
+
+
+typedef struct
+{
+	u32 offset;
+	u32 size;
+} GF_LCTFragInfo;
+
+typedef enum
+{
+	GF_LCT_OBJ_INIT=0,
+	GF_LCT_OBJ_RECEPTION,
+	GF_LCT_OBJ_DONE_ERR,
+	GF_LCT_OBJ_DONE,
+	GF_LCT_OBJ_DISPATCHED,
+} GF_LCTObjectStatus;
+
+typedef struct
+{
+	u32 toi, tsi;
+	u32 total_length;
+	//fragment reaggregation
+	char *payload;
+	u32 nb_bytes, nb_recv_bytes, alloc_size;
+	u32 nb_frags, nb_alloc_frags, nb_recv_frags;
+	GF_LCTFragInfo *frags;
+	GF_LCTObjectStatus status;
+	Bool closed_flag;
+	u32 download_time_ms;
+
+	GF_ATSCLCTChannel *rlct;
+
+	u32 prev_start_offset;
+} GF_LCTObject;
+
+
+
+typedef struct
+{
+	GF_Socket *sock;
+
+	GF_List *channels;
+} GF_ATSCRouteSession;
+
+typedef enum
+{
+	GF_ATSC_TUNE_OFF=0,
+	GF_ATSC_TUNE_ON,
+	GF_ATSC_TUNE_SLS_ONLY,
+} GF_ATSCTuneMode;
+
+typedef struct
+{
+	u32 service_id;
+	u32 protocol;
+	u32 mpd_version, stsid_version;
+	GF_Socket *sock;
+	u32 secondary_sockets;
+	GF_List *objects;
+	GF_LCTObject *last_active_obj;
+	char *output_dir;
+	u32 port;
+	char *dst_ip;
+	u32 last_dispatched_toi_on_tsi_zero;
+	u32 stsid_crc;
+
+	GF_List *route_sessions;
+	GF_ATSCTuneMode tune_mode;
+	void *udta;
+} GF_ATSCService;
+
+struct __gf_atscdmx {
+	const char *ip_ifce;
+	const char *base_dir;
+	GF_Socket *sock;
+	char *buffer;
+	u32 buffer_size;
+	char *unz_buffer;
+	u32 unz_buffer_size;
+
+	u32 max_seg_store;
+
+	u32 slt_version, rrt_version, systime_version, aeat_version;
+	GF_List *services;
+
+	GF_List *object_reservoir;
+	GF_BitStream *bs;
+
+	GF_DOMParser *dom;
+	u32 service_autotune;
+	Bool tune_all_sls;
+
+	GF_SockGroup *active_sockets;
+
+
+	void (*on_event)(void *udta, GF_ATSCEventType evt, u32 evt_param, GF_ATSCEventFileInfo *info);
+	void *udta;
+
+	u32 debug_tsi;
+
+	u64 nb_packets;
+	u64 total_bytes_recv;
+	u64 first_pck_time, last_pck_time;
+};
+
+static void gf_atsc3_route_session_del(GF_ATSCRouteSession *rs)
+{
+	if (rs->sock) gf_sk_del(rs->sock);
+	while (gf_list_count(rs->channels)) {
+		GF_ATSCLCTChannel *lc = gf_list_pop_back(rs->channels);
+		if (lc->init_filename) gf_free(lc->init_filename);
+		gf_free(lc->toi_template);
+		gf_free(lc);
+	}
+	gf_list_del(rs->channels);
+	gf_free(rs);
+}
+
+static void gf_atsc3_lct_obj_del(GF_LCTObject *o)
+{
+	if (o->frags) gf_free(o->frags);
+	if (o->payload) gf_free(o->payload);
+	gf_free(o);
+}
+
+static void gf_atsc3_service_del(GF_ATSCDmx *atscd, GF_ATSCService *s)
+{
+	if (s->sock) {
+		gf_sk_group_unregister(atscd->active_sockets, s->sock);
+		gf_sk_del(s->sock);
+	}
+	if (s->output_dir) gf_free(s->output_dir);
+	while (gf_list_count(s->route_sessions)) {
+		GF_ATSCRouteSession *rsess = gf_list_pop_back(s->route_sessions);
+		gf_atsc3_route_session_del(rsess);
+	}
+	gf_list_del(s->route_sessions);
+
+	while (gf_list_count(s->objects)) {
+		GF_LCTObject *o = gf_list_pop_back(s->objects);
+		gf_atsc3_lct_obj_del(o);
+	}
+	gf_list_del(s->objects);
+	if (s->dst_ip) gf_free(s->dst_ip);
+	gf_free(s);
+}
+
+GF_EXPORT
+void gf_atsc3_dmx_del(GF_ATSCDmx *atscd)
+{
+	if (atscd->buffer) gf_free(atscd->buffer);
+	if (atscd->unz_buffer) gf_free(atscd->unz_buffer);
+	if (atscd->sock) gf_sk_del(atscd->sock);
+	if (atscd->dom) gf_xml_dom_del(atscd->dom);
+	if (atscd->services) {
+		while (gf_list_count(atscd->services)) {
+			GF_ATSCService *s = gf_list_pop_back(atscd->services);
+			gf_atsc3_service_del(atscd, s);
+		}
+		gf_list_del(atscd->services);
+	}
+	if (atscd->active_sockets) gf_sk_group_del(atscd->active_sockets);
+	if (atscd->object_reservoir) {
+		while (gf_list_count(atscd->object_reservoir)) {
+			GF_LCTObject *obj = gf_list_pop_back(atscd->object_reservoir);
+			gf_atsc3_lct_obj_del(obj);
+		}
+		gf_list_del(atscd->object_reservoir);
+	}
+	if (atscd->bs) gf_bs_del(atscd->bs);
+	gf_free(atscd);
+}
+
+GF_EXPORT
+GF_ATSCDmx *gf_atsc3_dmx_new(const char *ifce, const char *dir, u32 sock_buffer_size)
+{
+	GF_ATSCDmx *atscd;
+	GF_Err e;
+	GF_SAFEALLOC(atscd, GF_ATSCDmx);
+	if (!atscd) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ATSC] Failed to allocate ATSC demuxer\n"));
+		return NULL;
+	}
+	atscd->ip_ifce = ifce;
+	atscd->base_dir = dir;
+	if (dir && !gf_dir_exists(dir)) {
+		e = gf_mkdir(dir);
+		if (e == GF_IO_ERR) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Failed to create output dir %s - using memory mode\n", dir));
+			atscd->base_dir = NULL;
+		}
+	}
+	atscd->dom = gf_xml_dom_new();
+	if (!atscd->dom) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Failed to allocate DOM parser\n" ));
+		gf_atsc3_dmx_del(atscd);
+		return NULL;
+	}
+	atscd->services = gf_list_new();
+	if (!atscd->services) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Failed to allocate ATSC service list\n" ));
+		gf_atsc3_dmx_del(atscd);
+		return NULL;
+	}
+	atscd->object_reservoir = gf_list_new();
+	if (!atscd->object_reservoir) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Failed to allocate ATSC object reservoir\n" ));
+		gf_atsc3_dmx_del(atscd);
+		return NULL;
+	}
+
+	if (!sock_buffer_size) sock_buffer_size = GF_ATSC_SOCK_SIZE;
+	atscd->unz_buffer_size = sock_buffer_size;
+	//we store one UDP packet, or realloc to store LLS signaling so starting with 10k should be enough in most cases
+	atscd->buffer_size = 10000;
+	atscd->buffer = gf_malloc(atscd->buffer_size);
+	if (!atscd->buffer) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ATSC] Failed to allocate socket buffer\n"));
+		gf_atsc3_dmx_del(atscd);
+		return NULL;
+	}
+	atscd->unz_buffer = gf_malloc(atscd->unz_buffer_size);
+	if (!atscd->unz_buffer) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ATSC] Failed to allocate socket buffer\n"));
+		gf_atsc3_dmx_del(atscd);
+		return NULL;
+	}
+
+	atscd->active_sockets = gf_sk_group_new();
+	if (!atscd->active_sockets) {
+		gf_atsc3_dmx_del(atscd);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[ATSC] Failed to create socket group\n"));
+		return NULL;
+	}
+
+	atscd->sock = gf_sk_new(GF_SOCK_TYPE_UDP);
+	if (!atscd->sock) {
+		gf_atsc3_dmx_del(atscd);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[ATSC] Failed to create UDP socket\n"));
+		return NULL;
+	}
+	gf_sk_group_register(atscd->active_sockets, atscd->sock);
+
+	gf_sk_set_usec_wait(atscd->sock, 1);
+	e = gf_sk_setup_multicast(atscd->sock, GF_ATSC_MCAST_ADDR, GF_ATSC_MCAST_PORT, 1, GF_FALSE, (char *) ifce);
+	if (e) {
+		gf_atsc3_dmx_del(atscd);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[ATSC] Failed to bind to multicast address on interface %s\n", ifce ? ifce : "default"));
+		return NULL;
+	}
+	gf_sk_set_buffer_size(atscd->sock, GF_FALSE, sock_buffer_size);
+	//gf_sk_set_block_mode(atscd->sock, GF_TRUE);
+	//create static bs
+	atscd->bs = gf_bs_new((char*)&e, 1, GF_BITSTREAM_READ);
+
+	return atscd;
+}
+
+static void gf_atsc3_register_service_sockets(GF_ATSCDmx *atscd, GF_ATSCService *s, Bool do_register)
+{
+	u32 i;
+	GF_ATSCRouteSession *rsess;
+	if (do_register) gf_sk_group_register(atscd->active_sockets, s->sock);
+	else gf_sk_group_unregister(atscd->active_sockets, s->sock);
+
+	if (!s->secondary_sockets) return;
+
+	i=0;
+	while ((rsess = gf_list_enum(s->route_sessions, &i))) {
+		if (! rsess->sock) continue;
+		if (do_register) gf_sk_group_register(atscd->active_sockets, rsess->sock);
+		else gf_sk_group_unregister(atscd->active_sockets, rsess->sock);
+	}
+}
+
+GF_EXPORT
+GF_Err gf_atsc3_tune_in(GF_ATSCDmx *atscd, u32 serviceID, Bool tune_all_sls)
+{
+	u32 i;
+	GF_ATSCService *s;
+	if (!atscd) return GF_BAD_PARAM;
+	atscd->service_autotune = serviceID;
+	atscd->tune_all_sls = tune_all_sls;
+	i=0;
+	while ((s = gf_list_enum(atscd->services, &i))) {
+		GF_ATSCTuneMode prev_mode = s->tune_mode;
+		if (s->service_id==serviceID) s->tune_mode = GF_ATSC_TUNE_ON;
+		else if (serviceID==0xFFFFFFFF) s->tune_mode = GF_ATSC_TUNE_ON;
+		else if ((s->tune_mode!=GF_ATSC_TUNE_ON) && (serviceID==0xFFFFFFFE)) {
+			s->tune_mode = GF_ATSC_TUNE_ON;
+			serviceID = s->service_id;
+		} else {
+			s->tune_mode = tune_all_sls ? GF_ATSC_TUNE_SLS_ONLY : GF_ATSC_TUNE_OFF;
+		}
+		//we were previously not tuned
+		if (prev_mode == GF_ATSC_TUNE_OFF) {
+			//we are now tuned, register sockets
+			if (s->tune_mode != GF_ATSC_TUNE_OFF) {
+				gf_atsc3_register_service_sockets(atscd, s, GF_TRUE);
+			}
+		}
+		//we were previously tuned
+		else {
+			//we are now not tuned, unregister sockets
+			if (s->tune_mode == GF_ATSC_TUNE_OFF) {
+				gf_atsc3_register_service_sockets(atscd, s, GF_FALSE);
+			}
+		}
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_atsc3_set_max_objects_store(GF_ATSCDmx *atscd, u32 max_segs)
+{
+	if (!atscd) return GF_BAD_PARAM;
+	atscd->max_seg_store = max_segs;
+	return GF_OK;
+}
+
+static GF_Err gf_atsc3_dmx_process_slt(GF_ATSCDmx *atscd, GF_XMLNode *root)
+{
+	GF_XMLNode *n;
+	u32 i=0;
+
+	while ( ( n = gf_list_enum(root->content, &i)) ) {
+		if (n->type != GF_XML_NODE_TYPE) continue;
+		//setup service
+		if (!strcmp(n->name, "Service")) {
+			GF_XMLAttribute *att;
+			GF_XMLNode *m;
+			u32 j=0;
+			GF_Err e;
+			GF_ATSCService *service;
+			const char *dst_ip=NULL;
+			u32 dst_port = 0;
+			u32 protocol = 0;
+			u32 service_id=0;
+			while ( ( att = gf_list_enum(n->attributes, &j)) ) {
+				if (!strcmp(att->name, "serviceId")) sscanf(att->value, "%u", &service_id);
+			}
+
+			j=0;
+			while ( ( m = gf_list_enum(n->content, &j)) ) {
+				if (m->type != GF_XML_NODE_TYPE) continue;
+				if (!strcmp(m->name, "BroadcastSvcSignaling")) {
+					u32 k=0;
+					while ( ( att = gf_list_enum(m->attributes, &k)) ) {
+						if (!strcmp(att->name, "slsProtocol")) protocol = atoi(att->value);
+						if (!strcmp(att->name, "slsDestinationIpAddress")) dst_ip = att->value;
+						else if (!strcmp(att->name, "slsDestinationUdpPort")) dst_port = atoi(att->value);
+						//don't care about the rest
+					}
+				}
+			}
+
+			if (!dst_ip || !dst_port) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] No service destination IP or port found for service %d - ignoring service\n", service_id));
+				continue;
+			}
+			if ((protocol!=1) && (protocol!=2)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Unknown ATSC service signaling protocol %d for service %d - ignoring service\n", service_id, protocol));
+				continue;
+			}
+
+			//todo - remove existing service ?
+
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[ATSC] Found service %d destination IP %s port %d\n", service_id, dst_ip, dst_port));
+
+			GF_SAFEALLOC(service, GF_ATSCService);
+			if (!service) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Failed to allocate service %d\n", service_id));
+				continue;
+			}
+			service->service_id = service_id;
+			service->protocol = protocol;
+
+			service->sock = gf_sk_new(GF_SOCK_TYPE_UDP);
+			gf_sk_set_usec_wait(service->sock, 1);
+			e = gf_sk_setup_multicast(service->sock, dst_ip, dst_port, 0, GF_FALSE, (char*) atscd->ip_ifce);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Failed to setup multicast on %s:%d for service %d\n", dst_ip, dst_port, service_id));
+				gf_atsc3_service_del(atscd, service);
+				continue;
+			}
+			gf_sk_set_buffer_size(service->sock, GF_FALSE, atscd->unz_buffer_size);
+			//gf_sk_set_block_mode(service->sock, GF_TRUE);
+
+			service->dst_ip = gf_strdup(dst_ip);
+			service->port = dst_port;
+			service->objects = gf_list_new();
+			service->route_sessions = gf_list_new();
+
+			if (atscd->base_dir) {
+				u32 len = (u32) strlen(atscd->base_dir);
+				service->output_dir = gf_malloc(sizeof(char) * (len + 20) );
+				if ((atscd->base_dir[len-1]=='/') || (atscd->base_dir[len-1]=='\\')) {
+					sprintf(service->output_dir, "%sservice%d", atscd->base_dir, service_id);
+				} else {
+					sprintf(service->output_dir, "%s/service%d", atscd->base_dir, service_id);
+				}
+				if (! gf_dir_exists(service->output_dir)) {
+					e = gf_mkdir(service->output_dir);
+					if (e==GF_IO_ERR) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Failed to create output service dir %s, working in memory mode\n", service->output_dir));
+						gf_free(service->output_dir);
+						service->output_dir = NULL;
+					}
+				}
+			}
+			if (atscd->service_autotune==0xFFFFFFFF) service->tune_mode = GF_ATSC_TUNE_ON;
+			else if (atscd->service_autotune==service_id) service->tune_mode = GF_ATSC_TUNE_ON;
+			else if (atscd->tune_all_sls) service->tune_mode = GF_ATSC_TUNE_SLS_ONLY;
+
+			//we are tuning, register socket
+			if (service->tune_mode != GF_ATSC_TUNE_OFF)
+				gf_sk_group_register(atscd->active_sockets, service->sock);
+
+			gf_list_add(atscd->services, service);
+			if (atscd->on_event) atscd->on_event(atscd->udta, GF_ATSC_EVT_SERVICE_FOUND, service_id, NULL);
+		}
+	}
+	if (atscd->on_event) atscd->on_event(atscd->udta, GF_ATSC_EVT_SERVICE_SCAN, 0, NULL);
+	return GF_OK;
+}
+
+
+static void gf_atsc3_obj_to_reservoir(GF_ATSCDmx *atscd, GF_ATSCService *s, GF_LCTObject *obj)
+{
+	//remove other objects
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d : moving object tsi %u toi %u to reservoir\n", s->service_id, obj->tsi, obj->toi));
+
+#ifndef GPAC_DISABLE_LOG
+	if (gf_log_tool_level_on(GF_LOG_CONTAINER, GF_LOG_DEBUG)){
+		u32 i, count = gf_list_count(s->objects);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d : active objects TOIs for tsi %u: ", s->service_id, obj->tsi));
+		for (i=0;i<count;i++) {
+			GF_LCTObject *o = gf_list_get(s->objects, i);
+			if (o==obj) continue;
+			if (o->tsi != obj->tsi) continue;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (" %u", o->toi));
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("\n"));
+	}
+#endif
+
+	if (s->last_active_obj==obj) s->last_active_obj = NULL;
+	obj->closed_flag = GF_FALSE;
+	obj->nb_bytes = 0;
+	obj->nb_frags = GF_FALSE;
+	obj->nb_recv_frags = 0;
+	obj->rlct = NULL;
+	obj->toi = 0;
+	obj->tsi = 0;
+	obj->total_length = 0;
+	obj->prev_start_offset = 0;
+	obj->download_time_ms = 0;
+	obj->status = GF_LCT_OBJ_INIT;
+	gf_list_del_item(s->objects, obj);
+	gf_list_add(atscd->object_reservoir, obj);
+
+}
+
+//#define CHECK_ISOM
+
+#ifdef CHECK_ISOM
+#include <gpac/isomedia.h>
+#endif
+
+static GF_Err gf_atsc3_dmx_process_object(GF_ATSCDmx *atscd, GF_ATSCService *s, GF_LCTObject *obj)
+{
+	char szPath[GF_MAX_PATH], *sep;
+	u32 i, count, nb_objs;
+	Bool partial = GF_FALSE;
+	FILE *out;
+
+	if (!obj->rlct) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] 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_DONE_ERR) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d : object TSI %u TOI %u partial received only\n", s->service_id, obj->tsi, obj->toi));
+		partial = GF_TRUE;
+	}
+	if (obj->status == GF_LCT_OBJ_DISPATCHED) return GF_OK;
+	obj->status = GF_LCT_OBJ_DISPATCHED;
+
+	if (!atscd->base_dir) {
+		Bool is_init = GF_FALSE;
+
+		if (obj->rlct->init_toi == obj->toi) {
+			sprintf(szPath, "%s", obj->rlct->init_filename ? obj->rlct->init_filename : "ghost-init.mp4");
+			is_init = GF_TRUE;
+		} else {
+			sprintf(szPath, obj->rlct->toi_template, obj->toi);
+		}
+#ifndef GPAC_DISABLE_LOG
+		if (partial || gf_log_tool_level_on(GF_LOG_CONTAINER, GF_LOG_DEBUG)) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[ATSC] Service %d got file %s (TSI %u TOI %u) size %d in %d ms (%d bytes in %d fragments)\n", s->service_id, szPath, obj->tsi, obj->toi, obj->total_length, obj->download_time_ms, obj->nb_bytes, obj->nb_recv_frags));
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[ATSC] Service %d got file %s (TSI %u TOI %u) size %d in %d ms\n", s->service_id, szPath, obj->tsi, obj->toi, obj->total_length, obj->download_time_ms));
+		}
+#endif
+
+#ifdef CHECK_ISOM
+		{
+			char szBlob[1024];
+			GF_ISOFile *file;
+			sprintf(szBlob, "gmem://%d@%p", obj->total_length, obj->payload);
+			file = gf_isom_open(szBlob, GF_ISOM_OPEN_READ_DUMP, NULL);
+			if (file) {
+				fprintf(stderr, "ISOBMF %s file OK\n", szPath);
+				gf_isom_delete(file);
+			} else {
+				fprintf(stderr, "ISOBMF %s file invalid\n", szPath);
+			}
+		}
+#endif
+
+		if (atscd->on_event) {
+			GF_ATSCEventFileInfo finfo;
+			memset(&finfo, 0, sizeof(GF_ATSCEventFileInfo));
+			finfo.filename = szPath;
+			finfo.data = obj->payload;
+			finfo.size = obj->total_length;
+			finfo.tsi = obj->tsi;
+			finfo.toi = obj->toi;
+			finfo.corrupted = partial;
+			finfo.download_ms = obj->download_time_ms;
+			atscd->on_event(atscd->udta, is_init ? GF_ATSC_EVT_INIT_SEG : GF_ATSC_EVT_SEG, s->service_id, &finfo);
+		}
+		return GF_OK;
+	}
+
+	if (obj->rlct->init_toi == obj->toi) {
+		sprintf(szPath, "%s/%s", s->output_dir, obj->rlct->init_filename ? obj->rlct->init_filename : "ghost-init.mp4");
+	} else {
+		char szFileName[1024];
+		sprintf(szFileName, obj->rlct->toi_template, obj->toi);
+		sprintf(szPath, "%s/%s", s->output_dir, szFileName);
+	}
+
+
+	sep = strrchr(szPath, '/');
+	sep[0]=0;
+	if (gf_dir_exists(szPath)==GF_FALSE) {
+		GF_Err e = gf_mkdir(szPath);
+		if (e==GF_IO_ERR) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d failed to create output dir %s\n", s->service_id, szPath ));
+			return GF_IO_ERR;
+		}
+	}
+	sep[0]='/';
+
+	out = gf_fopen(szPath, "wb");
+	if (!out) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d failed to create file %s\n", s->service_id, szPath ));
+		return GF_IO_ERR;
+	} else {
+		u32 bytes;
+		bytes = (u32) fwrite(obj->payload, 1, (size_t) obj->total_length, out);
+		gf_fclose(out);
+		if (bytes != obj->total_length) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d failed to write DASH resource file %d written for %d total\n", s->service_id, bytes, obj->total_length));
+			return GF_IO_ERR;
+		}
+
+#ifdef CHECK_ISOM
+		{
+			GF_ISOFile *file = gf_isom_open(szPath, GF_ISOM_OPEN_READ_DUMP, NULL);
+			if (file) {
+				fprintf(stderr, "ISOBMF %s file OK\n", szPath);
+				gf_isom_delete(file);
+			} else {
+				fprintf(stderr, "ISOBMF %s file invalid\n", szPath);
+			}
+		}
+#endif
+
+	}
+#ifndef GPAC_DISABLE_LOG
+	if (partial || gf_log_tool_level_on(GF_LOG_CONTAINER, GF_LOG_DEBUG)) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[ATSC] Service %d got file %s (TSI %u TOI %u) size %d in %d ms (%d bytes in %d fragments)\n", s->service_id, szPath, obj->tsi, obj->toi, obj->total_length, obj->download_time_ms, obj->nb_bytes, obj->nb_recv_frags));
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[ATSC] Service %d got file %s (TSI %u TOI %u) size %d in %d ms\n", s->service_id, szPath, obj->tsi, obj->toi, obj->total_length, obj->download_time_ms));
+	}
+#endif
+	//keep init segment active
+	if (obj->toi==obj->rlct->init_toi) return GF_OK;
+	//no limit on objects, move to reservoir
+	if (!atscd->max_seg_store) {
+		gf_atsc3_obj_to_reservoir(atscd, s, obj);
+		return GF_OK;
+	}
+
+	//remove all pending objects except init segment
+	count = gf_list_count(s->objects);
+	nb_objs = 0;
+	for (i=0; i<count; i++) {
+		GF_LCTObject *o = gf_list_get(s->objects, i);
+		if (o->tsi != obj->tsi) continue;
+		if (obj->rlct && (o->toi==obj->rlct->init_toi)) continue;
+		nb_objs++;
+		if (o==obj) break;
+	}
+	if (atscd->max_seg_store >= nb_objs) return GF_OK;
+	nb_objs -= atscd->max_seg_store;
+
+	for (i=0; i<count; i++) {
+		GF_LCTObject *o;
+		if (!nb_objs) break;
+		o = gf_list_get(s->objects, i);
+		if (o->tsi != obj->tsi) continue;
+		if (o==obj) break;
+		if (o->toi==obj->rlct->init_toi) continue;
+		if (nb_objs) {
+			char szFileName[1024];
+			sprintf(szFileName, o->rlct->toi_template, o->toi);
+			sprintf(szPath, "%s/%s", s->output_dir, szFileName);
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[ATSC] Service %d deleting file %s (TSI %u TOI %u)\n", s->service_id, szPath, o->tsi, o->toi));
+			gf_delete_file(szPath);
+			i--;
+			count--;
+			gf_atsc3_obj_to_reservoir(atscd, s, o);
+			nb_objs--;
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err gf_atsc3_service_flush_object(GF_ATSCService *s, GF_LCTObject *obj)
+{
+	u32 i;
+	u64 start_offset = 0;
+	obj->status = GF_LCT_OBJ_DONE;
+	for (i=0; i<obj->nb_frags; i++) {
+		if (start_offset != obj->frags[0].offset) {
+			obj->status = GF_LCT_OBJ_DONE_ERR;
+			break;
+		}
+		start_offset += obj->frags[i].size;
+	}
+	if (start_offset != obj->total_length) {
+		obj->status = GF_LCT_OBJ_DONE_ERR;
+	}
+	obj->download_time_ms = gf_sys_clock() - obj->download_time_ms;
+	return GF_EOS;
+}
+
+static GF_Err gf_atsc3_service_gather_object(GF_ATSCDmx *atscd, GF_ATSCService *s, u32 tsi, u32 toi, u32 start_offset, char *data, u32 size, u32 total_len, Bool close_flag, Bool in_order, GF_ATSCLCTChannel *rlct, GF_LCTObject **gather_obj)
+{
+	Bool inserted, done;
+	u32 i, count;
+	GF_LCTObject *obj = s->last_active_obj;
+
+	//in case last packet(s) are duplicated after we sent the object, skip them
+	if (rlct) {
+		if ((tsi==rlct->last_dispatched_tsi) && (toi==rlct->last_dispatched_toi)) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d TSI %u TOI %u LCT fragment on already dispatched object, skipping\n", s->service_id, tsi, toi));
+			return GF_OK;
+		}
+	} else {
+		if (!tsi && (toi==s->last_dispatched_toi_on_tsi_zero)) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d TSI %u TOI %u LCT fragment on already dispatched object, skipping\n", s->service_id, tsi, toi));
+			return GF_OK;
+		}
+	}
+
+	if (!obj || (obj->tsi!=tsi) || (obj->toi!=toi)) {
+		count = gf_list_count(s->objects);
+		for (i=0; i<count; i++) {
+			obj = gf_list_get(s->objects, i);
+			if ((obj->toi == toi) && (obj->tsi==tsi)) break;
+
+			if (!tsi && !obj->tsi && ((obj->toi&0xFFFFFF00) == (toi&0xFFFFFF00)) ) {
+				//change in version of bundle but same other flags: reuse this one
+				obj->nb_frags = obj->nb_recv_frags = 0;
+				obj->nb_bytes = obj->nb_recv_bytes = 0;
+				obj->total_length = total_len;
+				obj->toi = toi;
+				obj->status = GF_LCT_OBJ_INIT;
+				break;
+			}
+			obj = NULL;
+		}
+	}
+	if (!obj) {
+		obj = gf_list_pop_back(atscd->object_reservoir);
+		if (!obj) {
+			GF_SAFEALLOC(obj, GF_LCTObject);
+			if (!obj) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d failed to allocate LCT object TSI %u TOI %u\n", s->service_id, toi, tsi ));
+				return GF_OUT_OF_MEM;
+			}
+			obj->nb_alloc_frags = 10;
+			obj->frags = gf_malloc(sizeof(GF_LCTFragInfo)*obj->nb_alloc_frags);
+		}
+		obj->toi = toi;
+		obj->tsi = tsi;
+		obj->status = GF_LCT_OBJ_INIT;
+		obj->total_length = total_len;
+		if (tsi && rlct) obj->rlct = rlct;
+
+		if (!total_len) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d object TSI %u TOI %u started without total-length assigned !\n", s->service_id, tsi, toi ));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d starting object TSI %u TOI %u total-length %d\n", s->service_id, tsi, toi, total_len));
+
+		}
+		obj->download_time_ms = gf_sys_clock();
+		gf_list_add(s->objects, obj);
+	} else if (!obj->total_length && total_len) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d object TSI %u TOI %u was started without total-length assigned, assigning to %u\n", s->service_id, tsi, toi, total_len));
+		obj->total_length = total_len;
+	} else if (total_len && (obj->total_length != total_len)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] 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));
+	}
+	if (s->last_active_obj != obj) {
+		//last object had EOS and not completed
+		if (s->last_active_obj && s->last_active_obj->closed_flag && (s->last_active_obj->status<GF_LCT_OBJ_DONE_ERR)) {
+			GF_LCTObject *o = s->last_active_obj;
+		 	if (o->tsi) {
+		 		gf_atsc3_service_flush_object(s, o);
+				gf_atsc3_dmx_process_object(atscd, s, o);
+			} else {
+				gf_atsc3_obj_to_reservoir(atscd, s, o);
+			}
+ 			s->last_active_obj = obj;
+		} else if (in_order) {
+			u32 count = gf_list_count(s->objects);
+ 			s->last_active_obj = obj;
+			for (i=0; i<count; i++) {
+				u32 new_count;
+				GF_LCTObject *o = gf_list_get(s->objects, i);
+				if (o==obj) break;
+				//we can only detect losses if a new TOI on the same TSI is found
+				if (o->tsi != obj->tsi) continue;
+				if (o->status>=GF_LCT_OBJ_DONE_ERR) continue;
+
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d object TSI %u TOI %u not completely received but in-order delivery signaled and new TOI %u - forcing dispatch\n", s->service_id, o->tsi, o->toi, toi ));
+				if (o->tsi) {
+		 			gf_atsc3_service_flush_object(s, o);
+					gf_atsc3_dmx_process_object(atscd, s, o);
+				} else {
+					gf_atsc3_obj_to_reservoir(atscd, s, o);
+				}
+				new_count = gf_list_count(s->objects);
+				//objects purged
+				if (new_count<count) {
+					i=-1;
+					count = new_count;
+				}
+			}
+		}
+	}
+	*gather_obj = obj;
+	assert(obj->toi == toi);
+	assert(obj->tsi == tsi);
+
+	//keep receiving if we are done with errors
+	if (obj->status >= GF_LCT_OBJ_DONE) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d object TSI %u TOI %u already received - skipping\n", s->service_id, tsi, toi ));
+		return GF_EOS;
+	}
+	obj->nb_recv_bytes += size;
+	inserted = GF_FALSE;
+	for (i=0; i<obj->nb_frags; i++) {
+		if ((obj->frags[i].offset <= start_offset) && (obj->frags[i].offset + obj->frags[i].size >= start_offset + size) ) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d LCT fragment already received\n", s->service_id));
+			return GF_OK;
+		}
+
+		//insert fragment
+		if (obj->frags[i].offset > start_offset) {
+			//check overlap (not sure if this is legal)
+			if (start_offset + size > obj->frags[i].offset) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] 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->frags[i+1], &obj->frags[i], sizeof(GF_LCTFragInfo) * (obj->nb_frags - i) );
+			obj->frags[i].offset = start_offset;
+			obj->frags[i].size = size;
+			obj->nb_bytes += size;
+			obj->nb_frags++;
+			inserted = GF_TRUE;
+			break;
+		}
+		//expand fragment
+		if (obj->frags[i].offset + obj->frags[i].size == start_offset) {
+			obj->frags[i].size += size;
+			obj->nb_bytes += size;
+			inserted = GF_TRUE;
+			break;
+		}
+	}
+
+	if (!inserted) {
+		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->frags[obj->nb_frags].offset = start_offset;
+		obj->frags[obj->nb_frags].size = size;
+		obj->nb_frags++;
+		obj->nb_bytes += size;
+	}
+	obj->nb_recv_frags++;
+
+	assert(obj->toi == toi);
+	assert(obj->tsi == tsi);
+	if (start_offset + size > obj->alloc_size) {
+		obj->alloc_size = start_offset + size;
+		//use total size if available
+		if (obj->alloc_size < obj->total_length)
+			obj->alloc_size = obj->total_length;
+		//for signaling objects, we set byte after last to 0 to use string functions
+		if (!tsi)
+			obj->alloc_size++;
+		obj->payload = gf_realloc(obj->payload, obj->alloc_size+1);
+		obj->payload[obj->alloc_size] = 0;
+	}
+	assert(obj->alloc_size >= start_offset + size);
+
+	memcpy(obj->payload + start_offset, data, size);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] 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));
+
+	obj->prev_start_offset = start_offset;
+	assert(obj->toi == toi);
+	assert(obj->tsi == tsi);
+
+	//check if we are done
+	done = GF_FALSE;
+	if (obj->total_length) {
+		if (obj->nb_bytes >= obj->total_length) {
+			done = GF_TRUE;
+		}
+		else if (close_flag) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[ATSC] Service %d object TSI %u TOI %u closed flag found but not yet completed\n", s->service_id, tsi, toi ));
+		}
+	} else {
+		if (close_flag) obj->closed_flag = GF_TRUE;
+	}
+	if (!done) return GF_OK;
+
+	s->last_active_obj = NULL;
+	if (obj->rlct) {
+		obj->rlct->last_dispatched_tsi = obj->tsi;
+		obj->rlct->last_dispatched_toi = obj->toi;
+	} else {
+		s->last_dispatched_toi_on_tsi_zero = obj->toi;
+	}
+	return gf_atsc3_service_flush_object(s, obj);
+}
+
+static GF_Err gf_atsc3_service_setup_dash(GF_ATSCDmx *atscd, GF_ATSCService *s, char *content, char *content_location)
+{
+	u32 len = (u32) strlen(content);
+
+	if (s->tune_mode==GF_ATSC_TUNE_SLS_ONLY) {
+		s->tune_mode = GF_ATSC_TUNE_OFF;
+		//unregister sockets
+		gf_atsc3_register_service_sockets(atscd, s, GF_FALSE);
+	}
+
+	if (s->output_dir) {
+		FILE *out;
+		char szPath[GF_MAX_PATH];
+		sprintf(szPath, "%s/%s", s->output_dir, content_location);
+		out = gf_fopen(szPath, "w");
+		if (!out) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d failed to create MPD file %s\n", s->service_id, szPath ));
+			return GF_IO_ERR;
+		} else {
+			u32 bytes = (u32) fwrite(content, 1, (size_t) len, out);
+			gf_fclose(out);
+			if (bytes != len) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d failed to write MPD file %d written for %d total\n", s->service_id, bytes, len));
+				return GF_IO_ERR;
+			}
+		}
+		return GF_OK;
+	}
+
+	if (atscd->on_event) {
+		GF_ATSCEventFileInfo finfo;
+		memset(&finfo, 0, sizeof(GF_ATSCEventFileInfo));
+		finfo.data = content;
+		finfo.size = len;
+		finfo.filename = content_location;
+		atscd->on_event(atscd->udta, GF_ATSC_EVT_MPD, s->service_id, &finfo);
+	}
+	else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[ATSC] Service %d received MPD file %s content:\n%s\n", s->service_id, content_location, content ));
+	}
+	return GF_NOT_SUPPORTED;
+}
+
+static GF_Err gf_atsc3_service_parse_mbms_enveloppe(GF_ATSCDmx *atscd, GF_ATSCService *s, char *content, char *content_location, u32 *stsid_version, u32 *mpd_version)
+{
+	u32 i, j;
+	GF_Err e;
+	GF_XMLAttribute *att;
+	GF_XMLNode *it, *root;
+
+	e = gf_xml_dom_parse_string(atscd->dom, content);
+	root = gf_xml_dom_get_root(atscd->dom);
+	if (e || !root) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d failed to parse S-TSID: %s\n", s->service_id, gf_error_to_string(e) ));
+		return e;
+	}
+
+	i=0;
+	while ((it = gf_list_enum(root->content, &i))) {
+		const char *content_type = NULL;
+		/*const char *uri = NULL;*/
+		u32 version = 0;
+
+		if (strcmp(it->name, "item")) continue;
+
+		j=0;
+		while ((att = gf_list_enum(it->attributes, &j))) {
+			if (!stricmp(att->name, "contentType")) content_type = att->value;
+			/*else if (!stricmp(att->name, "metadataURI")) uri = att->value;*/
+			else if (!stricmp(att->name, "version")) version = atoi(att->value);
+		}
+		if (!content_type) continue;
+		if (!strcmp(content_type, "application/s-tsid")) *stsid_version = version;
+		else if (!strcmp(content_type, "application/dash+xml")) *mpd_version = version;
+	}
+	return GF_OK;
+}
+
+static GF_Err gf_atsc3_service_setup_stsid(GF_ATSCDmx *atscd, GF_ATSCService *s, char *content, char *content_location)
+{
+	GF_Err e;
+	GF_XMLAttribute *att;
+	GF_XMLNode *rs, *ls, *srcf, *efdt, *node, *root;
+	u32 i, j, k, crc, nb_lct_channels=0;
+
+	crc = gf_crc_32(content, (u32) strlen(content) );
+	if (!s->stsid_crc) {
+		s->stsid_crc = crc;
+	} else if (s->stsid_crc != crc) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d update of S-TSID not yet supported, skipping\n", s->service_id));
+		return GF_NOT_SUPPORTED;
+	} else {
+		return GF_OK;
+	}
+
+	e = gf_xml_dom_parse_string(atscd->dom, content);
+	root = gf_xml_dom_get_root(atscd->dom);
+	if (e || !root) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d failed to parse S-TSID: %s\n", s->service_id, gf_error_to_string(e) ));
+		return e;
+	}
+	i=0;
+	while ((rs = gf_list_enum(root->content, &i))) {
+		char *dst_ip = s->dst_ip;
+		u32 dst_port = s->port;
+		char *file_template = NULL;
+		char *init_file_name = NULL;
+		GF_ATSCRouteSession *rsess;
+		GF_ATSCLCTChannel *rlct;
+		u32 init_file_toi=0;
+		u32 tsi = 0;
+		if (rs->type != GF_XML_NODE_TYPE) continue;
+		if (strcmp(rs->name, "RS")) continue;
+
+		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);
+		}
+
+		GF_SAFEALLOC(rsess, GF_ATSCRouteSession);
+		rsess->channels = gf_list_new();
+
+		//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);
+			gf_sk_set_usec_wait(rsess->sock, 1);
+			e = gf_sk_setup_multicast(rsess->sock, dst_ip, dst_port, 0, GF_FALSE, (char *) atscd->ip_ifce);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d failed to setup mcast for route session on %s:%d\n", s->service_id, dst_ip, dst_port));
+				return e;
+			}
+			gf_sk_set_buffer_size(rsess->sock, GF_FALSE, atscd->unz_buffer_size);
+			//gf_sk_set_block_mode(rsess->sock, GF_TRUE);
+			s->secondary_sockets++;
+			if (s->tune_mode == GF_ATSC_TUNE_ON) gf_sk_group_register(atscd->active_sockets, rsess->sock);
+		}
+		gf_list_add(s->route_sessions, rsess);
+
+		j=0;
+		while ((ls = gf_list_enum(rs->content, &j))) {
+			char *sep;
+			if (ls->type != GF_XML_NODE_TYPE) continue;
+			if (strcmp(ls->name, "LS")) continue;
+
+			//extract TSI
+			k=0;
+			while ((att = gf_list_enum(ls->attributes, &k))) {
+				if (!strcmp(att->name, "tsi")) sscanf(att->value, "%u", &tsi);
+			}
+			if (!tsi) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d missing TSI in LS/ROUTE session\n", s->service_id));
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+			k=0;
+			srcf = NULL;
+			while ((srcf = gf_list_enum(ls->content, &k))) {
+				if ((srcf->type == GF_XML_NODE_TYPE) && !strcmp(srcf->name, "SrcFlow")) break;
+				srcf = NULL;
+			}
+			if (!srcf) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d missing srcFlow in LS/ROUTE session\n", s->service_id));
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+			//enum srcf for efdt
+			k=0;
+			efdt = NULL;
+			while ((node = gf_list_enum(srcf->content, &k))) {
+				if (node->type != GF_XML_NODE_TYPE) continue;
+				if (!strcmp(node->name, "EFDT")) efdt = node;
+			}
+			if (!efdt) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d missing EFDT element in LS/ROUTE session, not supported\n", s->service_id));
+				return GF_NOT_SUPPORTED;
+			}
+
+			k=0;
+			while ((node = gf_list_enum(efdt->content, &k))) {
+				if (node->type != GF_XML_NODE_TYPE) continue;
+				//Korean version
+				if (!strcmp(node->name, "FileTemplate")) {
+					GF_XMLNode *content = gf_list_get(node->content, 0);
+					if (content->type==GF_XML_TEXT_TYPE) file_template = content->name;
+				}
+				else if (!strcmp(node->name, "FDTParameters")) {
+					u32 l=0;
+					GF_XMLNode *fdt = NULL;
+					while ((fdt = gf_list_enum(node->content, &l))) {
+						if ((fdt->type == GF_XML_NODE_TYPE) && (strstr(fdt->name, "File")!=NULL)) break;
+						fdt = NULL;
+					}
+					if (fdt) {
+						l=0;
+						while ((att = gf_list_enum(fdt->attributes, &l))) {
+							if (!strcmp(att->name, "Content-Location")) init_file_name = att->value;
+							else if (!strcmp(att->name, "TOI")) sscanf(att->value, "%u", &init_file_toi);
+						}
+					}
+				}
+				//US version
+				else if (!strcmp(node->name, "FDT-Instance")) {
+					u32 l=0;
+					GF_XMLNode *fdt = NULL;
+					while ((att = gf_list_enum(node->attributes, &l))) {
+						if (strstr(att->name, "fileTemplate")) file_template = att->value;
+					}
+					l=0;
+					while ((fdt = gf_list_enum(node->content, &l))) {
+						if ((fdt->type == GF_XML_NODE_TYPE) && (strstr(fdt->name, "File")!=NULL)) break;
+						fdt = NULL;
+					}
+					if (fdt) {
+						l=0;
+						while ((att = gf_list_enum(fdt->attributes, &l))) {
+							if (!strcmp(att->name, "Content-Location")) init_file_name = att->value;
+							else if (!strcmp(att->name, "TOI")) sscanf(att->value, "%u", &init_file_toi);
+						}
+					}
+				}
+			}
+
+			if (!init_file_name) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d missing init file name in LS/ROUTE session, could be problematic - will consider any TOI %u (-1) present as a ghost init segment\n", s->service_id, (u32)-1));
+				//force an init at -1, some streams still have the init not declared but send on TOI -1
+				// interpreting it as a regular segment would break clock setup
+				init_file_toi = (u32) -1;
+			}
+			if (!file_template) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d missing file TOI template in LS/ROUTE session, not supported - skipping stream\n", s->service_id));
+				continue;
+			}
+			sep = strstr(file_template, "$TOI$");
+			if (!sep) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d wrong TOI template %s in LS/ROUTE session\n", s->service_id, file_template));
+				return GF_NOT_SUPPORTED;
+			}
+			nb_lct_channels++;
+
+			//OK setup LCT channel for route
+			GF_SAFEALLOC(rlct, GF_ATSCLCTChannel);
+			rlct->init_toi = init_file_toi;
+			rlct->tsi = tsi;
+			rlct->init_filename = init_file_name ? gf_strdup(init_file_name) : NULL;
+			rlct->toi_template = gf_strdup(file_template);
+			sep = strstr(rlct->toi_template, "$TOI$");
+			sep[0] = 0;
+			strcat(rlct->toi_template, "%d");
+			sep = strstr(file_template, "$TOI$");
+			strcat(rlct->toi_template, sep+5);
+
+			//fill in payloads
+			k=0;
+			efdt = NULL;
+			while ((node = gf_list_enum(srcf->content, &k))) {
+				if (node->type != GF_XML_NODE_TYPE) continue;
+				if (!strcmp(node->name, "Payload")) {
+					u32 l=0;
+					GF_ATSCLCTReg *lreg;
+					lreg = &rlct->CPs[rlct->nb_cps];
+					lreg->order = 1; //default
+					while ((att = gf_list_enum(node->attributes, &l))) {
+						if (!strcmp(att->name, "codePoint")) lreg->codepoint = (u8) atoi(att->value);
+						else if (!strcmp(att->name, "formatID")) lreg->format_id = (u8) atoi(att->value);
+						else if (!strcmp(att->name, "frag")) lreg->frag = (u8) atoi(att->value);
+						else if (!strcmp(att->name, "order")) lreg->order = (u8) atoi(att->value);
+						else if (!strcmp(att->name, "srcFecPayloadID")) lreg->src_fec_payload_id = (u8) atoi(att->value);
+					}
+					if (lreg->src_fec_payload_id) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d payload format indicates srcFecPayloadId %d (reserved), assuming 0\n", s->service_id, lreg->src_fec_payload_id));
+
+					}
+					if (lreg->format_id != 1) {
+						if (lreg->format_id && (lreg->format_id<5)) {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d payload formatID %d not supported\n", s->service_id, lreg->format_id));
+						} else {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d payload formatID %d reserved, assuming 1\n", s->service_id, lreg->format_id));
+						}
+					}
+					rlct->nb_cps++;
+					if (rlct->nb_cps==8) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d more payload formats than supported (8 max)\n", s->service_id));
+						break;
+					}
+				}
+			}
+
+			gf_list_add(rsess->channels, rlct);
+		}
+	}
+
+	if (!nb_lct_channels) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d does not have any supported LCT channels\n", s->service_id));
+		return GF_NOT_SUPPORTED;
+	}
+	return GF_OK;
+}
+
+static GF_Err gf_atsc3_dmx_process_service_signaling(GF_ATSCDmx *atscd, GF_ATSCService *s, GF_LCTObject *object, u8 cc, u32 stsid_version, u32 mpd_version)
+{
+	char *payload, *boundary=NULL, *sep;
+	char szContentType[100], szContentLocation[1024];
+	u32 payload_size;
+	GF_Err e;
+
+	//uncompress bundle
+	if (object->toi & (1<<31) ) {
+		u32 raw_size;
+		if (object->total_length > atscd->buffer_size) {
+			atscd->buffer_size = object->total_length;
+			atscd->buffer = gf_realloc(atscd->buffer, object->total_length);
+			if (!atscd->buffer) return GF_OUT_OF_MEM;
+		}
+		memcpy(atscd->buffer, object->payload, object->total_length);
+		e = gf_gz_decompress_payload(atscd->buffer, object->total_length, &atscd->unz_buffer, &raw_size);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d failed to decompress signaling bundle: %s\n", s->service_id, gf_error_to_string(e) ));
+			return e;
+		}
+		if (raw_size > atscd->unz_buffer_size) atscd->unz_buffer_size = raw_size;
+		payload = atscd->unz_buffer;
+		payload_size = raw_size;
+	} else {
+		payload = object->payload;
+		payload_size = object->total_length;
+	}
+	payload[payload_size] = 0;
+
+	//check for multipart
+	if (!strncmp(payload, "Content-Type: multipart/", 24)) {
+		sep = strstr(payload, "boundary=\"");
+		if (!sep) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d cannot find multipart boundary in package:\n%s\n", s->service_id, payload ));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		if (sep) payload = sep + 10;
+		sep = strstr(payload, "\"");
+		if (!sep) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d multipart boundary not properly formatted in package:\n%s\n", s->service_id, payload ));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		sep[0] = 0;
+		boundary = gf_strdup(payload);
+		sep[0] = '\"';
+		payload = sep+1;
+	}
+
+	//extract all content
+	while (1) {
+		char *content;
+		//multipart, check for start and end
+		if (boundary) {
+			sep = strstr(payload, boundary);
+			if (!sep) break;
+			payload = sep + strlen(boundary) + 2;
+			sep = strstr(payload, boundary);
+			if (!sep) break;
+			sep[0] = 0;
+		} else {
+			sep = NULL;
+		}
+
+		//extract headers
+		while (strncmp(payload, "\r\n\r\n", 4)) {
+			u32 i=0;
+			while (strchr("\n\r", payload[0]) != NULL) payload++;
+			while (strchr("\r\n", payload[i]) == NULL) i++;
+
+			if (!strnicmp(payload, "Content-Type: ", 14)) {
+				strncpy(szContentType, payload+14, i-14);
+				szContentType[i-14]=0;
+				payload += i;
+			}
+			else if (!strnicmp(payload, "Content-Location: ", 18)) {
+				strncpy(szContentLocation, payload+18, i-18);
+				szContentLocation[i-18]=0;
+				payload += i;
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d unrecognized header entity in package:\n%s\n", s->service_id, payload ));
+			}
+		}
+		payload += 4;
+		content = boundary ? strstr(payload, "\r\n--") : strstr(payload, "\r\n\r\n");
+		if (content) {
+			content[0] = 0;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d package type %s location %s content:\n%s\n", s->service_id, szContentType, szContentLocation, payload ));
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d %s not properly formatted in package:\n%s\n", s->service_id, boundary ? "multipart boundary" : "entity", payload ));
+			if (sep) sep[0] = boundary[0];
+			gf_free(boundary);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
+		if (!strcmp(szContentType, "application/mbms-envelope+xml")) {
+			e = gf_atsc3_service_parse_mbms_enveloppe(atscd, s, payload, szContentLocation, &stsid_version, &mpd_version);
+
+			if (e || !stsid_version || !mpd_version) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d MBMS envelope error %s, S-TSID version %d MPD version %d\n",s->service_id, gf_error_to_string(e), stsid_version, mpd_version ));
+				gf_free(boundary);
+				return e ? e : GF_SERVICE_ERROR;
+			}
+		} else if (!strcmp(szContentType, "application/mbms-user-service-description+xml")) {
+		} else if (!strcmp(szContentType, "application/dash+xml")) {
+			if (mpd_version && (mpd_version+1 != s->mpd_version)) {
+				s->mpd_version = mpd_version+1;
+				gf_atsc3_service_setup_dash(atscd, s, payload, szContentLocation);
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d same MPD version, ignoring\n",s->service_id));
+			}
+		}
+		//Korean and US version have different mime types
+		else if (!strcmp(szContentType, "application/s-tsid") || !strcmp(szContentType, "application/route-s-tsid+xml")) {
+			if (stsid_version && (stsid_version+1 != s->stsid_version)) {
+				s->stsid_version = stsid_version+1;
+				gf_atsc3_service_setup_stsid(atscd, s, payload, szContentLocation);
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d same S-TSID version, ignoring\n",s->service_id));
+			}
+		}
+		if (!sep) break;
+		sep[0] = boundary[0];
+		payload = sep;
+	}
+
+	gf_free(boundary);
+	return GF_OK;
+}
+
+enum
+{
+	/*No-operation extension header*/
+	GF_LCT_EXT_NOP = 0,
+	/*Authentication extension header*/
+	GF_LCT_EXT_AUTH = 1,
+	/*Time extension header*/
+	GF_LCT_EXT_TIME = 2,
+	/*FEC object transmission information extension header*/
+	GF_LCT_EXT_FTI = 64,
+	/*Extension header for FDT - FLUTE*/
+	GF_LCT_EXT_FDT = 192,
+	/*Extension header for FDT content encoding - FLUTE*/
+	GF_LCT_EXT_CENC = 193,
+	/*TOL extension header - ATSC - 24 bit payload*/
+	GF_LCT_EXT_TOL24 = 194,
+	/*TOL extension header - ATSC - HEL + 28 bit payload*/
+	GF_LCT_EXT_TOL48 = 67,
+};
+
+static GF_Err gf_atsc3_dmx_process_service(GF_ATSCDmx *atscd, GF_ATSCService *s, GF_ATSCRouteSession *route_sess)
+{
+	GF_Err e;
+	u32 nb_read, v, C, psi, S, O, H, /*Res, A,*/ B, hdr_len, cp, cc, tsi, toi, pos;
+	u32 /*a_G=0, a_U=0,*/ a_S=0, a_M=0/*, a_A=0, a_H=0, a_D=0*/;
+	u64 tol_size=0;
+	Bool in_order = GF_TRUE;
+	u32 start_offset;
+	GF_ATSCLCTChannel *rlct=NULL;
+	GF_LCTObject *gather_object=NULL;
+
+	if (route_sess) {
+		e = gf_sk_receive_no_select(route_sess->sock, atscd->buffer, atscd->buffer_size, 0, &nb_read);
+	} else {
+		e = gf_sk_receive_no_select(s->sock, atscd->buffer, atscd->buffer_size, 0, &nb_read);
+	}
+
+	if (e != GF_OK) return e;
+	assert(nb_read);
+
+	atscd->nb_packets++;
+	atscd->total_bytes_recv += nb_read;
+	atscd->last_pck_time = gf_sys_clock_high_res();
+	if (!atscd->first_pck_time) atscd->first_pck_time = atscd->last_pck_time;
+
+	e = gf_bs_reassign_buffer(atscd->bs, atscd->buffer, nb_read);
+	if (e != GF_OK) return e;
+
+	//parse LCT header
+	v = gf_bs_read_int(atscd->bs, 4);
+	C = gf_bs_read_int(atscd->bs, 2);
+	psi = gf_bs_read_int(atscd->bs, 2);
+	S = gf_bs_read_int(atscd->bs, 1);
+	O = gf_bs_read_int(atscd->bs, 2);
+	H = gf_bs_read_int(atscd->bs, 1);
+	/*Res = */gf_bs_read_int(atscd->bs, 2);
+	/*A = */gf_bs_read_int(atscd->bs, 1);
+	B = gf_bs_read_int(atscd->bs, 1);
+	hdr_len = gf_bs_read_int(atscd->bs, 8);
+	cp = gf_bs_read_int(atscd->bs, 8);
+
+	if (v!=1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d : wrong LCT header version %d\n", s->service_id, v));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	else if (C!=0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d : wrong ROUTE LCT header C %d, expecting 0\n", s->service_id, C));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	else if ((psi!=0) && (psi!=2) ) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d : wrong ROUTE LCT header PSI %d, expecting b00 or b10\n", s->service_id, psi));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	else if (S!=1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d : wrong ROUTE LCT header S, shall be 1\n", s->service_id));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	else if (O!=1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d : wrong ROUTE LCT header S, shall be b01\n", s->service_id));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	else if (H!=0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d : wrong ROUTE LCT header H, shall be 0\n", s->service_id));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	if (hdr_len<4) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d : wrong ROUTE LCT header len %d, shall be at least 4 0\n", s->service_id, hdr_len));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	if (psi==0) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d : FEC ROUTE not implemented\n", s->service_id));
+		return GF_NOT_SUPPORTED;
+	}
+
+	cc = gf_bs_read_u32(atscd->bs);
+	tsi = gf_bs_read_u32(atscd->bs);
+	toi = gf_bs_read_u32(atscd->bs);
+	hdr_len-=4;
+
+	//filter TSI if not 0 (service TSI) and debug mode set
+	if (atscd->debug_tsi && tsi && (tsi!=atscd->debug_tsi)) return GF_OK;
+
+	//look for TSI 0 first
+	if (tsi!=0) {
+		u32 i=0;
+		Bool in_session = GF_FALSE;
+		if (s->tune_mode==GF_ATSC_TUNE_SLS_ONLY) return GF_OK;
+
+		if (s->last_active_obj && (s->last_active_obj->tsi==tsi)) {
+			in_session = GF_TRUE;
+			rlct = s->last_active_obj->rlct;
+		} else {
+			u32 i=0;
+			GF_ATSCRouteSession *rsess;
+			while ((rsess = gf_list_enum(s->route_sessions, &i))) {
+				u32 j=0;
+				while ((rlct = gf_list_enum(rsess->channels, &j))) {
+					if (rlct->tsi == tsi) {
+						in_session = GF_TRUE;
+						break;
+					}
+					rlct = NULL;
+				}
+				if (in_session) break;
+			}
+		}
+		if (!in_session) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d : no session with TSI %u defined, skipping packet\n", s->service_id, tsi));
+			return GF_OK;
+		}
+		for (i=0; rlct && i<rlct->nb_cps; i++) {
+			if (rlct->CPs[i].codepoint==cp) {
+				in_order = rlct->CPs[i].order;
+				break;
+			}
+		}
+	} else {
+		//check TOI for TSI 0
+		/*a_G = toi & (1<<31) ? 1 : 0;
+		a_U = toi & (1<<16) ? 1 : 0;*/
+		a_S = toi & (1<<17) ? 1 : 0;
+		a_M = toi & (1<<18) ? 1 : 0;
+		/*a_A = toi & (1<<19) ? 1 : 0;
+		a_H = toi & (1<<22) ? 1 : 0;
+		a_D = toi & (1<<23) ? 1 : 0;*/
+		v = toi & 0xFF;
+		//skip known version
+		if (a_M && (s->mpd_version == v+1)) a_M = 0;
+		if (a_S && (s->stsid_version == v+1)) a_S = 0;
+
+
+		//for now we only care about S and M
+		if (!a_S && ! a_M) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d : SLT bundle without MPD or S-TSID, skipping packet\n", s->service_id));
+			return GF_OK;
+		}
+	}
+
+	//parse extensions
+	while (hdr_len) {
+		u8 hel=0, het = gf_bs_read_u8(atscd->bs);
+		if (het<128) hel = gf_bs_read_u8(atscd->bs);
+
+		switch (het) {
+		case GF_LCT_EXT_FDT:
+			/*flute_version = */gf_bs_read_int(atscd->bs, 4);
+			/*fdt_instance_id = */gf_bs_read_int(atscd->bs, 20);
+			break;
+
+		case GF_LCT_EXT_CENC:
+			/*content_encodind = */gf_bs_read_int(atscd->bs, 8);
+			/*reserved = */gf_bs_read_int(atscd->bs, 16);
+			break;
+
+		case GF_LCT_EXT_TOL24:
+			tol_size = gf_bs_read_int(atscd->bs, 24);
+			break;
+
+		case GF_LCT_EXT_TOL48:
+			if (hel!=2) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d : wrong HEL %d for TOL48 LCT extension, expecing 2\n", s->service_id, hel));
+				continue;
+			}
+			tol_size = gf_bs_read_long_int(atscd->bs, 48);
+			break;
+
+		default:
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d : unsupported header extension HEL %d HET %d\n", s->service_id, hel, het));
+			break;
+		}
+		if (hdr_len<hel) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d : wrong HEL %d for LCT extension %d, remainign header size %d\n", s->service_id, hel, het, hdr_len));
+			continue;
+		}
+		if (hel) hdr_len -= hel;
+		else hdr_len -= 1;
+	}
+
+	start_offset = gf_bs_read_u32(atscd->bs);
+	pos = (u32) gf_bs_get_position(atscd->bs);
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] 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));
+
+	e = gf_atsc3_service_gather_object(atscd, s, tsi, toi, start_offset, atscd->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) {
+				gf_atsc3_obj_to_reservoir(atscd, 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_atsc3_dmx_process_service_signaling(atscd, 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
+		} else {
+			gf_atsc3_dmx_process_object(atscd, s, gather_object);
+		}
+	}
+
+	return GF_OK;
+}
+
+static GF_Err gf_atsc3_dmx_process_lls(GF_ATSCDmx *atscd)
+{
+	u32 read;
+	GF_Err e;
+	const char *name=NULL;
+	u32 lls_table_id, lls_group_id, lls_group_count, lls_table_version;
+	u32 raw_size = atscd->unz_buffer_size;
+	GF_XMLNode *root;
+
+	e = gf_sk_receive_no_select(atscd->sock, atscd->buffer, atscd->buffer_size, 0, &read);
+	if (e)
+		return e;
+
+	atscd->nb_packets++;
+	atscd->total_bytes_recv += read;
+	atscd->last_pck_time = gf_sys_clock_high_res();
+	if (!atscd->first_pck_time) atscd->first_pck_time = atscd->last_pck_time;
+
+	lls_table_id = atscd->buffer[0];
+	lls_group_id = atscd->buffer[1];
+	lls_group_count = 1 + atscd->buffer[2];
+	lls_table_version = atscd->buffer[3];
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSCDmx] LLSTable size %d version %d: ID %d (%s) - group ID %d - group count %d\n", read, lls_table_id, lls_table_version, (lls_table_id==1) ? "SLT" : (lls_table_id==2) ? "RRT" : (lls_table_id==3) ? "SystemTime" : (lls_table_id==4) ? "AEAT" : "Reserved", lls_group_id, lls_group_count));
+	switch (lls_table_id) {
+	case 1:
+		if (atscd->slt_version== 1+lls_table_version) return GF_OK;
+		atscd->slt_version = 1+lls_table_version;
+		name="SLT";
+		break;
+	case 2:
+		if (atscd->rrt_version== 1+lls_table_version) return GF_OK;
+		atscd->rrt_version = 1+lls_table_version;
+		name="RRT";
+ 	break;
+	case 3:
+		if (atscd->systime_version== 1+lls_table_version) return GF_OK;
+		atscd->systime_version = 1+lls_table_version;
+		name="SysTime";
+ 	break;
+	case 4:
+		if (atscd->aeat_version== 1+lls_table_version) return GF_OK;
+		atscd->aeat_version = 1+lls_table_version;
+		name="AEAT";
+ 	break;
+	default:
+		return GF_OK;
+	}
+
+	e = gf_gz_decompress_payload(&atscd->buffer[4], read-4, &atscd->unz_buffer, &raw_size);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Failed to decompress %s table: %s\n", name, gf_error_to_string(e) ));
+		return e;
+	}
+	//realloc happened
+	if (atscd->unz_buffer_size<raw_size) atscd->unz_buffer_size = raw_size;
+	atscd->unz_buffer[raw_size]=0;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSCDmx] SLT table - payload:\n%s\n", atscd->unz_buffer));
+
+
+	e = gf_xml_dom_parse_string(atscd->dom, atscd->unz_buffer);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Failed to parse SLT XML: %s\n", gf_error_to_string(e) ));
+		return e;
+	}
+
+	root = gf_xml_dom_get_root(atscd->dom);
+	if (!root) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Failed to get XML root for %s table\n", name ));
+		return e;
+	}
+
+	switch (lls_table_id) {
+	case 1:
+		return gf_atsc3_dmx_process_slt(atscd, root);
+	case 2:
+	case 3:
+	case 4:
+	default:
+		break;
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_atsc3_dmx_process(GF_ATSCDmx *atscd)
+{
+	u32 i, count;
+	GF_Err e;
+
+	//check all active sockets
+	e = gf_sk_group_select(atscd->active_sockets, 10);
+	if (e) return e;
+
+	if (gf_sk_group_sock_is_set(atscd->active_sockets, atscd->sock)) {
+		e = gf_atsc3_dmx_process_lls(atscd);
+		if (e) return e;
+	}
+
+	count = gf_list_count(atscd->services);
+	for (i=0; i<count; i++) {
+		u32 j;
+		GF_Err e;
+		GF_ATSCRouteSession *rsess;
+		GF_ATSCService *s = (GF_ATSCService *)gf_list_get(atscd->services, i);
+		if (s->tune_mode==GF_ATSC_TUNE_OFF) continue;
+
+		if (gf_sk_group_sock_is_set(atscd->active_sockets, s->sock)) {
+			e = gf_atsc3_dmx_process_service(atscd, s, NULL);
+			if (e) return e;
+		}
+		if (s->tune_mode!=GF_ATSC_TUNE_ON) continue;
+		if (!s->secondary_sockets) continue;
+
+		j=0;
+		while ((rsess = (GF_ATSCRouteSession *)gf_list_enum(s->route_sessions, &j) )) {
+			if (gf_sk_group_sock_is_set(atscd->active_sockets, rsess->sock)) {
+				e = gf_atsc3_dmx_process_service(atscd, s, rsess);
+				if (e) return e;
+			}
+		}
+
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_atsc3_set_callback(GF_ATSCDmx *atscd, void (*on_event)(void *udta, GF_ATSCEventType evt, u32 evt_param, GF_ATSCEventFileInfo *info), void *udta)
+{
+	if (!atscd) return GF_BAD_PARAM;
+	atscd->udta = udta;
+	atscd->on_event = on_event;
+	return GF_OK;
+}
+
+GF_EXPORT
+Bool gf_atsc3_dmx_find_service(GF_ATSCDmx *atscd, u32 service_id)
+{
+	u32 i=0;
+	GF_ATSCService *s;
+	while ((s = gf_list_enum(atscd->services, &i))) {
+		if (s->service_id != service_id) continue;
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+
+GF_EXPORT
+u32 gf_atsc3_dmx_get_object_count(GF_ATSCDmx *atscd, u32 service_id)
+{
+	u32 i=0;
+	GF_ATSCService *s;
+	while ((s = gf_list_enum(atscd->services, &i))) {
+		if (s->service_id != service_id) continue;
+		return gf_list_count(s->objects);
+	}
+	return 0;
+}
+
+GF_EXPORT
+void gf_atsc3_dmx_remove_object_by_name(GF_ATSCDmx *atscd, u32 service_id, char *fileName, Bool purge_previous)
+{
+	u32 i=0;
+	GF_ATSCService *s=NULL;
+	GF_LCTObject *obj = NULL;
+	while ((s = gf_list_enum(atscd->services, &i))) {
+		if (s->service_id == service_id) break;
+		s = NULL;
+	}
+	if (!s) return;
+	i=0;
+	while ((obj = gf_list_enum(s->objects, &i))) {
+		u32 toi;
+		if (obj->rlct && (sscanf(fileName, obj->rlct->toi_template, &toi) == 1)) {
+			if (toi == obj->toi) {
+				GF_ATSCLCTChannel *rlct = obj->rlct;
+				//we likely have a loop here
+				if (obj == s->last_active_obj) break;
+
+				gf_atsc3_obj_to_reservoir(atscd, s, obj);
+				if (purge_previous) {
+					i=0;
+					while ((obj = gf_list_enum(s->objects, &i))) {
+						if (obj->rlct != rlct) continue;
+						if (obj->toi==rlct->init_toi) continue;
+						if (obj->toi<toi) {
+							i--;
+							//we likely have a loop here
+							if (obj == s->last_active_obj) return;
+							gf_atsc3_obj_to_reservoir(atscd, s, obj);
+						}
+					}
+				}
+				return;
+			}
+		}
+		else if (obj->rlct && obj->rlct->init_filename && !strcmp(fileName, obj->rlct->init_filename)) {
+			gf_atsc3_obj_to_reservoir(atscd, s, obj);
+			return;
+		}
+	}
+	GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Failed to remove object %s from service, object not found\n", fileName));
+}
+
+
+GF_EXPORT
+void gf_atsc3_dmx_remove_first_object(GF_ATSCDmx *atscd, u32 service_id)
+{
+	u32 i=0;
+	GF_ATSCService *s=NULL;
+	GF_LCTObject *obj = NULL;
+	while ((s = gf_list_enum(atscd->services, &i))) {
+		if (s->service_id == service_id) break;
+		s = NULL;
+	}
+	if (!s) return;
+
+	obj = gf_list_get(s->objects, 0);
+	if (obj) {
+		assert(obj != s->last_active_obj);
+		gf_atsc3_obj_to_reservoir(atscd, s, obj);
+	}
+}
+
+GF_EXPORT
+void gf_atsc3_dmx_purge_objects(GF_ATSCDmx *atscd, u32 service_id)
+{
+	u32 i=0;
+	GF_ATSCService *s=NULL;
+	GF_LCTObject *obj = NULL;
+	while ((s = gf_list_enum(atscd->services, &i))) {
+		if (s->service_id == service_id) break;
+		s = NULL;
+	}
+	if (!s) return;
+
+	i=0;
+	while ((obj = gf_list_enum(s->objects, &i))) {
+		//only purge non signaling objects
+		if (!obj->tsi) continue;
+		//if object is being received keep it
+		if (s->last_active_obj == obj) continue;
+		//if object is init segment keep it - this may need refinement in case we had init segment updates
+		if (obj->rlct && (obj->rlct->init_toi==obj->toi)) continue;
+		//trash
+		gf_atsc3_obj_to_reservoir(atscd, s, obj);
+	}
+}
+
+GF_EXPORT
+void gf_atsc3_dmx_set_service_udta(GF_ATSCDmx *atscd, u32 service_id, void *udta)
+{
+	u32 i=0;
+	GF_ATSCService *s=NULL;
+	while ((s = gf_list_enum(atscd->services, &i))) {
+		if (s->service_id == service_id) {
+			s->udta = udta;
+			return;
+		}
+	}
+}
+
+GF_EXPORT
+void *gf_atsc3_dmx_get_service_udta(GF_ATSCDmx *atscd, u32 service_id)
+{
+	u32 i=0;
+	GF_ATSCService *s=NULL;
+	while ((s = gf_list_enum(atscd->services, &i))) {
+		if (s->service_id == service_id) {
+			return s->udta;
+		}
+	}
+	return NULL;
+}
+
+GF_EXPORT
+u64 gf_atsc3_dmx_get_first_packet_time(GF_ATSCDmx *atscd)
+{
+	return atscd ? atscd->first_pck_time : 0;
+}
+
+GF_EXPORT
+u64 gf_atsc3_dmx_get_last_packet_time(GF_ATSCDmx *atscd)
+{
+	return atscd ? atscd->last_pck_time : 0;
+}
+
+GF_EXPORT
+u64 gf_atsc3_dmx_get_nb_packets(GF_ATSCDmx *atscd)
+{
+	return atscd ? atscd->nb_packets : 0;
+}
+
+GF_EXPORT
+u64 gf_atsc3_dmx_get_recv_bytes(GF_ATSCDmx *atscd)
+{
+	return atscd ? atscd->total_bytes_recv : 0;
+}
+
+GF_EXPORT
+void gf_atsc3_dmx_debug_tsi(GF_ATSCDmx *atscd, u32 tsi)
+{
+	if (atscd) atscd->debug_tsi = tsi;
+}
+
+#endif /* GPAC_DISABLE_ATSC */

gpac-0.7.1.tar.gz/src/media_tools/av_parsers.c -> gpac-0.8.0.tar.gz/src/media_tools/av_parsers.c Changed

@@ -26,10 +26,10 @@
 #include <gpac/internal/media_dev.h>
 #include <gpac/constants.h>
 #include <gpac/mpeg4_odf.h>
+#include <gpac/maths.h>
 
 #ifndef GPAC_DISABLE_OGG
 #include <gpac/internal/ogg.h>
-#include <gpac/maths.h>
 #endif
 
 static const struct {
@@ -1545,6 +1545,2442 @@
 	return GF_OK;
 }
 
+
+/*AV1 parsing*/
+
+static u32 av1_read_ns(GF_BitStream *bs, u32 n)
+{
+	u32 v;
+	Bool extra_bit;
+	int w = (u32)(log(n)/log(2)) + 1;
+	u32 m = (1 << w) - n;
+	assert(w < 32);
+	v = gf_bs_read_int(bs, w - 1);
+	if (v < m)
+		return v;
+	extra_bit = gf_bs_read_int(bs, 1);
+	return (v << 1) - m + extra_bit;
+}
+
+static void av1_color_config(GF_BitStream *bs, AV1State *state)
+{
+	state->config->high_bitdepth = gf_bs_read_int(bs, 1);
+	state->bit_depth = 8;
+	if (state->config->seq_profile == 2 && state->config->high_bitdepth) {
+		state->config->twelve_bit = gf_bs_read_int(bs, 1);
+		state->bit_depth = state->config->twelve_bit ? 12 : 10;
+	} else if (state->config->seq_profile <= 2) {
+		state->bit_depth = state->config->high_bitdepth ? 10 : 8;
+	}
+
+	state->config->monochrome = GF_FALSE;
+	if (state->config->seq_profile == 1) {
+		state->config->monochrome = GF_FALSE;
+	} else {
+		state->config->monochrome = gf_bs_read_int(bs, 1);
+	}
+	/*NumPlanes = mono_chrome ? 1 : 3;*/
+	state->color_description_present_flag = gf_bs_read_int(bs, 1);
+	if (state->color_description_present_flag) {
+		state->color_primaries = gf_bs_read_int(bs, 8);
+		state->transfer_characteristics = gf_bs_read_int(bs, 8);
+		state->matrix_coefficients = gf_bs_read_int(bs, 8);
+	} else {
+		state->color_primaries = 2/*CP_UNSPECIFIED*/;
+		state->transfer_characteristics = 2/*TC_UNSPECIFIED*/;
+		state->matrix_coefficients = 2/*MC_UNSPECIFIED*/;
+	}
+	if (state->config->monochrome) {
+		state->color_range = gf_bs_read_int(bs, 1);
+		state->config->chroma_subsampling_x = GF_TRUE;
+		state->config->chroma_subsampling_y = GF_TRUE;
+		state->config->chroma_sample_position = 0/*CSP_UNKNOWN*/;
+		state->separate_uv_delta_q = 0;
+		return;
+	} else if (state->color_primaries == 0/*CP_BT_709*/ &&
+		state->transfer_characteristics == 13/*TC_SRGB*/ &&
+		state->matrix_coefficients == 0/*MC_IDENTITY*/) {
+		state->color_range = GF_TRUE;
+		state->config->chroma_subsampling_x = GF_FALSE;
+		state->config->chroma_subsampling_y = GF_FALSE;
+	} else {
+		state->config->chroma_subsampling_x = GF_FALSE;
+		state->config->chroma_subsampling_y = GF_FALSE;
+
+		state->color_range = gf_bs_read_int(bs, 1);
+		if (state->config->seq_profile == 0) {
+			state->config->chroma_subsampling_x = GF_TRUE;
+			state->config->chroma_subsampling_y = GF_TRUE;
+		} else if (state->config->seq_profile == 1) {
+			state->config->chroma_subsampling_x = GF_FALSE;
+			state->config->chroma_subsampling_y = GF_FALSE;
+		} else {
+			if (state->bit_depth == 12) {
+				state->config->chroma_subsampling_x = gf_bs_read_int(bs, 1);
+				if (state->config->chroma_subsampling_x)
+					state->config->chroma_subsampling_y = gf_bs_read_int(bs, 1);
+				else
+					state->config->chroma_subsampling_y = GF_FALSE;
+			} else {
+				state->config->chroma_subsampling_x = GF_TRUE;
+				state->config->chroma_subsampling_y = GF_FALSE;
+			}
+		}
+		if (state->config->chroma_subsampling_x && state->config->chroma_subsampling_y) {
+			state->config->chroma_sample_position = gf_bs_read_int(bs, 2);
+		}
+	}
+	state->separate_uv_delta_q = gf_bs_read_int(bs, 1);
+}
+
+
+static u32 uvlc(GF_BitStream *bs) {
+	u8 leadingZeros = 0;
+	while (1) {
+		Bool done = gf_bs_read_int(bs, 1);
+		if (done)
+			break;
+		leadingZeros++;
+	}
+	if (leadingZeros >= 32) {
+		return 0xFFFFFFFF;
+	}
+	return gf_bs_read_int(bs, leadingZeros) + (1 << leadingZeros) - 1;
+}
+
+static void timing_info(GF_BitStream *bs, AV1State *state) {
+	u32 num_ticks_per_picture_minus_1 = 0, time_scale = 0;
+	/*num_units_in_display_tick*/ gf_bs_read_int(bs, 32);
+	time_scale = gf_bs_read_int(bs, 32);
+	state->equal_picture_interval = gf_bs_read_int(bs, 1);
+	if (state->equal_picture_interval) {
+		num_ticks_per_picture_minus_1 = uvlc(bs);
+		state->FPS = (num_ticks_per_picture_minus_1 + 1) / (double)time_scale;
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1] VFR not supported.\n"));
+		//TODO: upload num_units_in_display_tick (eq. to the POC in H264), compute delta between frames, set it as dts_inc in gf_import_aom_av1()
+	}
+}
+
+static void decoder_model_info(AV1State *state, GF_BitStream *bs) {
+	state->buffer_delay_length = 1 + gf_bs_read_int(bs, 5);
+	/*num_units_in_decoding_tick =*/ gf_bs_read_int(bs, 32);
+	state->buffer_removal_time_length = gf_bs_read_int(bs, 5);
+	state->frame_presentation_time_length = 1 + gf_bs_read_int(bs, 5);
+}
+
+static void operating_parameters_info(GF_BitStream *bs, const u8 idx, const u8 buffer_delay_length_minus_1) {
+	const u8 n = buffer_delay_length_minus_1 + 1;
+	/*decoder_buffer_delay[op] =*/ gf_bs_read_int(bs, n);
+	/*encoder_buffer_delay[op] =*/ gf_bs_read_int(bs, n);
+	/*low_delay_mode_flag[op] =*/ gf_bs_read_int(bs, 1);
+}
+
+static void av1_parse_sequence_header_obu(GF_BitStream *bs, AV1State *state)
+{
+	u8 buffer_delay_length_minus_1 = 0;
+	Bool timing_info_present_flag, initial_display_delay_present_flag;
+	state->frame_state.seen_seq_header = GF_TRUE;
+	state->config->seq_profile = gf_bs_read_int(bs, 3);
+	state->still_picture = gf_bs_read_int(bs, 1);
+	state->reduced_still_picture_header = gf_bs_read_int(bs, 1);
+	if (state->reduced_still_picture_header) {
+		timing_info_present_flag = GF_FALSE;
+		initial_display_delay_present_flag = GF_FALSE;
+		state->operating_points_count = 1;
+		state->config->seq_level_idx_0 = gf_bs_read_int(bs, 5);
+	} else {
+		u8 i = 0;
+		timing_info_present_flag = gf_bs_read_int(bs, 1);
+		if (timing_info_present_flag) {
+			timing_info(bs, state);
+			state->decoder_model_info_present_flag = gf_bs_read_int(bs, 1);
+			if (state->decoder_model_info_present_flag) {
+				decoder_model_info(state, bs);
+			}
+		} else {
+			state->decoder_model_info_present_flag = GF_FALSE;
+		}
+		initial_display_delay_present_flag = gf_bs_read_int(bs, 1);
+		state->operating_points_count = 1 + gf_bs_read_int(bs, 5);
+		for (i = 0; i < state->operating_points_count; i++) {
+			u8 seq_level_idx_i, seq_tier = 0;
+
+			state->operating_point_idc[i] = gf_bs_read_int(bs, 12);
+
+			seq_level_idx_i = gf_bs_read_int(bs, 5);
+			if (i == 0) state->config->seq_level_idx_0 = seq_level_idx_i;
+
+			if (seq_level_idx_i > 7) {
+				seq_tier = gf_bs_read_int(bs, 1);
+			}
+			if (i == 0) state->config->seq_tier_0 = seq_tier;
+
+			if (state->decoder_model_info_present_flag) {
+				state->decoder_model_present_for_this_op[i] = gf_bs_read_int(bs, 1);
+				if (state->decoder_model_present_for_this_op[i]) {
+					operating_parameters_info(bs, i, buffer_delay_length_minus_1);
+				}
+			} else {
+				state->decoder_model_present_for_this_op[i] = 0;
+			}
+			if (initial_display_delay_present_flag) {
+				if (gf_bs_read_int(bs, 1) /*initial_display_delay_present_for_this_op[i]*/) {
+					/*initial_display_delay_minus_1[i] =*/ gf_bs_read_int(bs, 4);
+				}
+			}
+		}
+	}
+
+	//operatingPoint = av1_choose_operating_point(bs);
+	state->OperatingPointIdc = 0;//TODO: operating_point_idc[operatingPoint];
+
+	state->frame_width_bits_minus_1 = gf_bs_read_int(bs, 4);
+	state->frame_height_bits_minus_1 = gf_bs_read_int(bs, 4);
+	state->width = gf_bs_read_int(bs, state->frame_width_bits_minus_1 + 1) + 1;
+	state->height = gf_bs_read_int(bs, state->frame_height_bits_minus_1 + 1) + 1;
+	state->frame_id_numbers_present_flag = GF_FALSE;
+	if (!state->reduced_still_picture_header) {
+		state->frame_id_numbers_present_flag = gf_bs_read_int(bs, 1);
+	}
+	if (state->frame_id_numbers_present_flag) {
+		state->delta_frame_id_length_minus_2 = gf_bs_read_int(bs, 4);
+		state->additional_frame_id_length_minus_1 = gf_bs_read_int(bs, 3);
+	}
+	state->use_128x128_superblock = gf_bs_read_int(bs, 1);
+	/*enable_filter_intra =*/ gf_bs_read_int(bs, 1);
+	/*enable_intra_edge_filter =*/ gf_bs_read_int(bs, 1);
+	if (state->reduced_still_picture_header) {
+		/*enable_interintra_compound = 0;
+		enable_masked_compound = 0;
+		enable_dual_filter = 0;
+		enable_jnt_comp = 0;
+		enable_ref_frame_mvs = 0;*/
+		state->enable_warped_motion = 0;
+		state->enable_order_hint = GF_FALSE;
+		state->OrderHintBits = 0;
+		state->seq_force_integer_mv = 2/*SELECT_INTEGER_MV*/;
+		state->seq_force_screen_content_tools = 2/*SELECT_SCREEN_CONTENT_TOOLS*/;
+	} else {
+		Bool seq_choose_screen_content_tools;
+		/*enable_interintra_compound =*/ gf_bs_read_int(bs, 1);
+		/*enable_masked_compound =*/ gf_bs_read_int(bs, 1);
+		state->enable_warped_motion = gf_bs_read_int(bs, 1);
+		/*enable_dual_filter =*/ gf_bs_read_int(bs, 1);
+		state->enable_order_hint = gf_bs_read_int(bs, 1);
+		if (state->enable_order_hint) {
+			/*enable_jnt_comp =*/ gf_bs_read_int(bs, 1);
+			state->enable_ref_frame_mvs = gf_bs_read_int(bs, 1);
+		} else {
+			/*enable_jnt_comp = 0*/;
+			/*enable_ref_frame_mvs = 0*/;
+		}
+		seq_choose_screen_content_tools = gf_bs_read_int(bs, 1);
+		state->seq_force_screen_content_tools = 0;
+		if (seq_choose_screen_content_tools) {
+			state->seq_force_screen_content_tools = 2/*SELECT_SCREEN_CONTENT_TOOLS*/;
+		} else {
+			state->seq_force_screen_content_tools = gf_bs_read_int(bs, 1);
+		}
+
+		state->seq_force_integer_mv = 0;
+		if (state->seq_force_screen_content_tools > 0) {
+			const Bool seq_choose_integer_mv = gf_bs_read_int(bs, 1);
+			if (seq_choose_integer_mv) {
+				state->seq_force_integer_mv = 2/*SELECT_INTEGER_MV*/;
+			} else {
+				state->seq_force_integer_mv = gf_bs_read_int(bs, 1);
+			}
+		} else {
+			state->seq_force_integer_mv = 2/*SELECT_INTEGER_MV*/;
+		}
+		if (state->enable_order_hint) {
+			u8 order_hint_bits_minus_1 = gf_bs_read_int(bs, 3);
+			state->OrderHintBits = order_hint_bits_minus_1 + 1;
+		} else {
+			state->OrderHintBits = 0;
+		}
+	}
+
+	state->enable_superres = gf_bs_read_int(bs, 1);
+	state->enable_cdef = gf_bs_read_int(bs, 1);
+	state->enable_restoration = gf_bs_read_int(bs, 1);
+	av1_color_config(bs, state);
+	state->film_grain_params_present = gf_bs_read_int(bs, 1);
+}
+
+
+
+#define IVF_FILE_HEADER_SIZE 32
+
+Bool gf_media_probe_ivf(GF_BitStream *bs)
+{
+	u32 dw = 0;
+	if (gf_bs_available(bs) < IVF_FILE_HEADER_SIZE) return GF_FALSE;
+
+	dw = gf_bs_peek_bits(bs, 32, 0);
+	if (dw != GF_4CC('D', 'K', 'I', 'F')) {
+		return GF_FALSE;
+	}
+	return GF_TRUE;
+}
+
+GF_Err gf_media_parse_ivf_file_header(GF_BitStream *bs, int *width, int *height, u32 *codec_fourcc, u32 *frame_rate, u32 *time_scale, u32 *num_frames)
+{
+	u32 dw = 0;
+
+	if (!width || !height || !codec_fourcc || !frame_rate || !time_scale || !num_frames) {
+		assert(0);
+		return GF_BAD_PARAM;
+	}
+
+	if (gf_bs_available(bs) < IVF_FILE_HEADER_SIZE) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[IVF] Not enough bytes available ("LLU").\n", gf_bs_available(bs)));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	dw = gf_bs_read_u32(bs);
+	if (dw != GF_4CC('D', 'K', 'I', 'F')) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[IVF] Invalid signature\n"));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	dw = gf_bs_read_u16_le(bs);
+	if (dw != 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[IVF] Wrong IVF version. 0 expected, got %u\n", dw));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	dw = gf_bs_read_u16_le(bs); //length of header in bytes
+	if (dw != IVF_FILE_HEADER_SIZE) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[IVF] Wrong IVF header length. Expected 32 bytes, got %u\n", dw));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	*codec_fourcc = gf_bs_read_u32(bs);
+
+	*width = gf_bs_read_u16_le(bs);
+	*height = gf_bs_read_u16_le(bs);
+
+	*frame_rate = gf_bs_read_u32_le(bs);
+	*time_scale = gf_bs_read_u32_le(bs);
+
+	*num_frames = gf_bs_read_u32_le(bs);
+	gf_bs_read_u32_le(bs); //skip unused
+
+	return GF_OK;
+}
+
+GF_Err gf_media_aom_parse_ivf_file_header(GF_BitStream *bs, AV1State *state)
+{
+	int width = 0, height = 0;
+	u32 codec_fourcc = 0, frame_rate = 0, time_scale = 0, num_frames = 0;
+	GF_Err e = gf_media_parse_ivf_file_header(bs, &width, &height, &codec_fourcc, &frame_rate, &time_scale, &num_frames);
+	if (e)
+		return e;
+
+	if (codec_fourcc != GF_4CC('A', 'V', '0', '1')) {
+		char *FourCC = (char*)&codec_fourcc;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[IVF] Unsupported codec FourCC '%c%c%c%c'\n", FourCC[3], FourCC[2], FourCC[1], FourCC[0]));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	state->width = state->width < width ? width : state->width;
+	state->height = state->height < height ? height : state->height;
+	state->FPS = frame_rate / (double)time_scale;
+
+	return GF_OK;
+}
+
+GF_Err gf_media_parse_ivf_frame_header(GF_BitStream *bs, u64 *frame_size, u64 *pts)
+{
+	if (!frame_size) return GF_BAD_PARAM;
+
+	*frame_size = gf_bs_read_u32_le(bs);
+	if (*frame_size > 256 * 1024 * 1024) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[IVF] Wrong frame size %u\n", *frame_size));
+		*frame_size = 0;
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	*pts = gf_bs_read_u64_le(bs);
+
+	return GF_OK;
+}
+
+GF_Err vp9_parse_superframe(GF_BitStream *bs, u64 ivf_frame_size, int *num_frames_in_superframe, u32 frame_sizes[VP9_MAX_FRAMES_IN_SUPERFRAME], int *superframe_index_size)
+{
+	u8 byte, bytes_per_framesize;
+	u64 pos = gf_bs_get_position(bs), i = 0;
+	GF_Err e = GF_OK;
+
+	assert(bs && num_frames_in_superframe);
+
+	/*initialize like there is no superframe*/
+	memset(frame_sizes, 0, VP9_MAX_FRAMES_IN_SUPERFRAME * sizeof(frame_sizes[0]));
+	*num_frames_in_superframe = 1;
+	frame_sizes[0] = (u32)ivf_frame_size;
+	*superframe_index_size = 0;
+
+	e = gf_bs_seek(bs, pos + ivf_frame_size - 1);
+	if (e) return e;
+
+	byte = gf_bs_read_u8(bs);
+	if ((byte & 0xe0) != 0xc0)
+		goto exit; /*no superframe*/
+
+	bytes_per_framesize = 1 + ((byte & 0x18) >> 3);
+	*num_frames_in_superframe = 1 + (byte & 0x7);
+
+	/*superframe_index()*/
+	*superframe_index_size = 2 + bytes_per_framesize * *num_frames_in_superframe;
+	gf_bs_seek(bs, pos + ivf_frame_size - *superframe_index_size);
+	byte = gf_bs_read_u8(bs);
+	if ((byte & 0xe0) != 0xc0)
+		goto exit; /*no superframe*/
+
+	frame_sizes[0] = 0;
+	for (i = 0; i < *num_frames_in_superframe; ++i) {
+		gf_bs_read_data(bs, (char*)(frame_sizes+i), bytes_per_framesize);
+	}
+
+exit:
+	gf_bs_seek(bs, pos);
+	return e;
+}
+
+static Bool vp9_frame_sync_code(GF_BitStream *bs)
+{
+	u8 val = gf_bs_read_int(bs, 8);
+	if (val != 0x49)
+		return GF_FALSE;
+
+	val = gf_bs_read_int(bs, 8);
+	if (val != 0x83)
+		return GF_FALSE;
+
+	val = gf_bs_read_int(bs, 8);
+	if (val != 0x42)
+		return GF_FALSE;
+
+	return GF_TRUE;
+}
+
+typedef enum {
+	CS_UNKNOWN = 0,
+	CS_BT_601 = 1,
+	CS_BT_709 = 2,
+	CS_SMPTE_170 = 3,
+	CS_SMPTE_240 = 4,
+	CS_BT_2020 = 5,
+	CS_RESERVED = 6,
+	CS_RGB = 7,
+} VP9_color_space;
+
+static const int VP9_CS_to_23001_8_colour_primaries[] = { -1/*undefined*/, 5, 1, 6, 7, 9, -1/*reserved*/, 1 };
+static const int VP9_CS_to_23001_8_transfer_characteristics[] = { -1/*undefined*/, 5, 1, 6, 7, 9, -1/*reserved*/, 13 };
+
+static GF_Err vp9_color_config(GF_BitStream *bs, GF_VPConfig *vp9_cfg)
+{
+	VP9_color_space color_space;
+
+	if (vp9_cfg->profile >= 2) {
+		Bool ten_or_twelve_bit = gf_bs_read_int(bs, 1);
+		vp9_cfg->bit_depth = ten_or_twelve_bit ? 12 : 10;
+	} else {
+		vp9_cfg->bit_depth = 8;
+	}
+
+	color_space = gf_bs_read_int(bs, 3);
+	vp9_cfg->colour_primaries = VP9_CS_to_23001_8_colour_primaries[color_space];
+	vp9_cfg->transfer_characteristics = VP9_CS_to_23001_8_transfer_characteristics[color_space];
+	if (color_space != CS_RGB) {
+		vp9_cfg->video_fullRange_flag = gf_bs_read_int(bs, 1);
+		if (vp9_cfg->profile == 1 || vp9_cfg->profile == 3) {
+			u8 subsampling_x, subsampling_y, subsampling_xy_to_chroma_subsampling[2][2] = { {3, 0}, {2, 0} };
+			subsampling_x = gf_bs_read_int(bs, 1);
+			subsampling_y = gf_bs_read_int(bs, 1);
+			vp9_cfg->chroma_subsampling = subsampling_xy_to_chroma_subsampling[subsampling_x][subsampling_y];
+			Bool reserved_zero = gf_bs_read_int(bs, 1);
+			if (reserved_zero) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VP9] color config reserved zero (1) is not zero.\n"));
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+		} else {
+			vp9_cfg->chroma_subsampling = 0;
+		}
+	 } else {
+		vp9_cfg->video_fullRange_flag = GF_TRUE;
+		if (vp9_cfg->profile == 1 || vp9_cfg->profile == 3) {
+			vp9_cfg->chroma_subsampling = 3;
+			Bool reserved_zero = gf_bs_read_int(bs, 1);
+			if (reserved_zero) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VP9] color config reserved zero (2) is not zero.\n"));
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+		}
+	}
+
+	return GF_OK;
+}
+
+static void vp9_compute_image_size(int FrameWidth, int FrameHeight, int *Sb64Cols, int *Sb64Rows)
+{
+	int MiCols = (FrameWidth + 7) >> 3;
+	int MiRows = (FrameHeight + 7) >> 3;
+	*Sb64Cols = (MiCols + 7) >> 3;
+	*Sb64Rows = (MiRows + 7) >> 3;
+}
+
+static void vp9_frame_size(GF_BitStream *bs, int *FrameWidth, int *FrameHeight, int *Sb64Cols, int *Sb64Rows)
+{
+	int frame_width_minus_1 = gf_bs_read_int(bs, 16);
+	int frame_height_minus_1 = gf_bs_read_int(bs, 16);
+	if (frame_width_minus_1+1 != *FrameWidth || frame_height_minus_1+1 != *FrameHeight) {
+		if (*FrameWidth || *FrameHeight)
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[VP9] inconsistent frame dimensions: previous was %dx%d, new one is %dx%d.\n", *FrameWidth, *FrameHeight, frame_width_minus_1 + 1, frame_height_minus_1 + 1));
+	}
+	*FrameWidth = frame_width_minus_1 + 1;
+	*FrameHeight = frame_height_minus_1 + 1;
+	vp9_compute_image_size(*FrameWidth, *FrameHeight, Sb64Cols, Sb64Rows);
+}
+
+static void vp9_render_size(GF_BitStream *bs, int FrameWidth, int FrameHeight, int *renderWidth, int *renderHeight)
+{
+	Bool render_and_frame_size_different = gf_bs_read_int(bs, 1);
+	if (render_and_frame_size_different == 1) {
+		int render_width_minus_1 = gf_bs_read_int(bs, 16);
+		int render_height_minus_1 = gf_bs_read_int(bs, 16);
+		*renderWidth = render_width_minus_1 + 1;
+		*renderHeight = render_height_minus_1 + 1;
+	} else {
+		*renderWidth = FrameWidth;
+		*renderHeight = FrameHeight;
+	}
+}
+
+static s64 vp9_s(GF_BitStream *bs, int n) {
+	s64 value = gf_bs_read_int(bs, n);
+	Bool sign = gf_bs_read_int(bs, 1);
+	return sign ? -value : value;
+}
+
+static void vp9_loop_filter_params(GF_BitStream *bs)
+{
+	/*loop_filter_level = */gf_bs_read_int(bs, 6);
+	/*loop_filter_sharpness = */gf_bs_read_int(bs, 3);
+	Bool loop_filter_delta_enabled = gf_bs_read_int(bs, 1);
+	if (loop_filter_delta_enabled == 1) {
+		Bool loop_filter_delta_update = gf_bs_read_int(bs, 1);
+		if (loop_filter_delta_update == GF_TRUE) {
+			int i;
+			for (i = 0; i < 4; i++) {
+				Bool update_ref_delta = gf_bs_read_int(bs, 1);
+				if (update_ref_delta == GF_TRUE)
+					/*loop_filter_ref_deltas[i] =*/ vp9_s(bs, 6);
+			}
+			for (i = 0; i < 2; i++) {
+				Bool update_mode_delta = gf_bs_read_int(bs, 1);
+				if (update_mode_delta == GF_TRUE)
+					/*loop_filter_mode_deltas[i] =*/ vp9_s(bs, 6);
+			}
+		}
+	}
+}
+
+static void vp9_quantization_params(GF_BitStream *bs)
+{
+	/*base_q_idx = */gf_bs_read_int(bs, 8);
+}
+
+#define VP9_MAX_SEGMENTS 8
+#define VP9_SEG_LVL_MAX 4
+static const int segmentation_feature_bits[VP9_SEG_LVL_MAX] = { 8, 6, 2, 0 };
+static const int segmentation_feature_signed[VP9_SEG_LVL_MAX] = { 1, 1, 0, 0 };
+
+#define VP9_MIN_TILE_WIDTH_B64 4
+#define VP9_MAX_TILE_WIDTH_B64 64
+
+static void vp9_segmentation_params(GF_BitStream *bs)
+{
+	int i, j;
+	Bool segmentation_enabled = gf_bs_read_int(bs, 1);
+	if (segmentation_enabled == 1) {
+		Bool segmentation_update_map = gf_bs_read_int(bs, 1);
+		if (segmentation_update_map) {
+			for (i = 0; i < 7; i++)
+				/*segmentation_tree_probs[i] = read_prob()*/
+				/*segmentation_temporal_update = */gf_bs_read_int(bs, 1);
+			/*for (i = 0; i < 3; i++)
+				segmentation_pred_prob[i] = segmentation_temporal_update ? read_prob() : 255*/
+		}
+		Bool segmentation_update_data = gf_bs_read_int(bs, 1);
+		if (segmentation_update_data == 1) {
+			/*segmentation_abs_or_delta_update =*/ gf_bs_read_int(bs, 1);
+			for (i = 0; i < VP9_MAX_SEGMENTS; i++) {
+				for (j = 0; j < VP9_SEG_LVL_MAX; j++) {
+					/*feature_value = 0*/
+					Bool feature_enabled = gf_bs_read_int(bs, 1);
+					/*FeatureEnabled[i][j] = feature_enabled*/
+					if (feature_enabled) {
+						int bits_to_read = segmentation_feature_bits[j];
+						/*feature_value =*/ gf_bs_read_int(bs, bits_to_read);
+						if (segmentation_feature_signed[j] == 1) {
+							/*Bool feature_sign = */gf_bs_read_int(bs, 1);
+							/*if (feature_sign == 1)
+								feature_value *= -1*/
+						}
+					}
+					/*FeatureData[i][j] = feature_value*/
+				}
+			}
+		}
+	}
+}
+
+static int calc_min_log2_tile_cols(int Sb64Cols) {
+	int minLog2 = 0;
+	while ((VP9_MAX_TILE_WIDTH_B64 << minLog2) < Sb64Cols)
+		minLog2++;
+
+	return minLog2;
+}
+
+static int calc_max_log2_tile_cols(int Sb64Cols) {
+	int maxLog2 = 1;
+	while ((Sb64Cols >> maxLog2) >= VP9_MIN_TILE_WIDTH_B64)
+		maxLog2++;
+
+	return maxLog2 - 1;
+}
+
+static void vp9_tile_info(GF_BitStream *bs, int Sb64Cols)
+{
+	Bool tile_rows_log2;
+	int minLog2TileCols = calc_min_log2_tile_cols(Sb64Cols);
+	int maxLog2TileCols = calc_max_log2_tile_cols(Sb64Cols);
+	int tile_cols_log2 = minLog2TileCols;
+	while (tile_cols_log2 < maxLog2TileCols) {
+		Bool increment_tile_cols_log2 = gf_bs_read_int(bs, 1);
+		if (increment_tile_cols_log2)
+			tile_cols_log2++;
+		else
+			break;
+	}
+	tile_rows_log2 = gf_bs_read_int(bs, 1);
+	if (tile_rows_log2) {
+		Bool increment_tile_rows_log2 = gf_bs_read_int(bs, 1);
+		tile_rows_log2 += increment_tile_rows_log2;
+	}
+}
+
+static void vp9_frame_size_with_refs(GF_BitStream *bs, int *FrameWidth, int *FrameHeight, int *RenderWidth, int *RenderHeight, int *Sb64Cols, int *Sb64Rows)
+{
+	Bool found_ref;
+	int i;
+	for (i = 0; i < 3; i++) {
+		found_ref = gf_bs_read_int(bs, 1);
+		if (found_ref) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[VP9] frame_size_with_refs() with ref is not supported (keep old value %dx%d).\n", *FrameWidth, *FrameHeight));
+			return;
+			/*FrameWidth = RefFrameWidth[ref_frame_idx[i]];
+			FrameHeight = RefFrameHeight[ref_frame_idx[i]];
+			break;*/
+		}
+	}
+	if (found_ref == 0) {
+		vp9_frame_size(bs, FrameWidth, FrameHeight, Sb64Cols, Sb64Rows);
+	} else {
+		vp9_compute_image_size(*FrameWidth, *FrameHeight, Sb64Cols, Sb64Rows);
+	}
+
+	vp9_render_size(bs, *FrameWidth, *FrameHeight, RenderWidth, RenderHeight);
+}
+
+static void vp9_read_interpolation_filter(GF_BitStream *bs)
+{
+	Bool is_filter_switchable = gf_bs_read_int(bs, 1);
+	if (!is_filter_switchable) {
+		/*raw_interpolation_filter = */gf_bs_read_int(bs, 2);
+	}
+}
+
+
+#define VP9_KEY_FRAME 0
+
+GF_Err vp9_parse_sample(GF_BitStream *bs, GF_VPConfig *vp9_cfg, Bool *key_frame, int *FrameWidth, int *FrameHeight, int *renderWidth, int *renderHeight)
+{
+	Bool FrameIsIntra = GF_FALSE, profile_low_bit = GF_FALSE, profile_high_bit = GF_FALSE, show_existing_frame = GF_FALSE, frame_type = GF_FALSE, show_frame = GF_FALSE, error_resilient_mode = GF_FALSE;
+	/*u8 frame_context_idx = 0, reset_frame_context = 0, frame_marker = 0*/;
+	int Sb64Cols = 0, Sb64Rows = 0;
+
+	assert(bs && key_frame);
+
+	/*uncompressed header*/
+	/*frame_marker =*/ gf_bs_read_int(bs, 2);
+	profile_low_bit = gf_bs_read_int(bs, 1);
+	profile_high_bit = gf_bs_read_int(bs, 1);
+	vp9_cfg->profile = (profile_high_bit << 1) + profile_low_bit;
+	if (vp9_cfg->profile == 3) {
+		Bool reserved_zero = gf_bs_read_int(bs, 1);
+		if (reserved_zero) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[VP9] uncompressed header reserved zero is not zero.\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+	}
+
+	show_existing_frame = gf_bs_read_int(bs, 1);
+	if (show_existing_frame == GF_TRUE) {
+		/*frame_to_show_map_idx = */gf_bs_read_int(bs, 3);
+		return GF_OK;
+	}
+
+	frame_type = gf_bs_read_int(bs, 1);
+	show_frame = gf_bs_read_int(bs, 1);
+	error_resilient_mode = gf_bs_read_int(bs, 1);
+	if (frame_type == VP9_KEY_FRAME) {
+		if (!vp9_frame_sync_code(bs))
+			return GF_NON_COMPLIANT_BITSTREAM;
+		if (vp9_color_config(bs, vp9_cfg) != GF_OK)
+			return GF_NON_COMPLIANT_BITSTREAM;
+		vp9_frame_size(bs, FrameWidth, FrameHeight, &Sb64Cols, &Sb64Rows);
+		vp9_render_size(bs, *FrameWidth, *FrameHeight, renderWidth, renderHeight);
+		/*refresh_frame_flags = 0xFF;*/
+		*key_frame = GF_TRUE;
+		FrameIsIntra = GF_TRUE;
+	} else {
+		Bool intra_only = GF_FALSE;
+		*key_frame = GF_FALSE;
+
+		if (show_frame == GF_FALSE) {
+			intra_only = gf_bs_read_int(bs, 1);
+		}
+		FrameIsIntra = intra_only;
+
+		if (error_resilient_mode == GF_FALSE) {
+			/*reset_frame_context =*/ gf_bs_read_int(bs, 2);
+		}
+
+		if (intra_only == GF_TRUE) {
+			if (!vp9_frame_sync_code(bs))
+				return GF_NON_COMPLIANT_BITSTREAM;
+
+			if (vp9_cfg->profile > 0) {
+				if (vp9_color_config(bs, vp9_cfg) != GF_OK)
+					return GF_NON_COMPLIANT_BITSTREAM;
+			} else {
+				u8 color_space = CS_BT_601;
+				vp9_cfg->colour_primaries = VP9_CS_to_23001_8_colour_primaries[color_space];
+				vp9_cfg->transfer_characteristics = VP9_CS_to_23001_8_transfer_characteristics[color_space];
+				vp9_cfg->chroma_subsampling = 0;
+				vp9_cfg->bit_depth = 8;
+			}
+			/*refresh_frame_flags = */gf_bs_read_int(bs, 8);
+			vp9_frame_size(bs, FrameWidth, FrameHeight, &Sb64Cols, &Sb64Rows);
+			vp9_render_size(bs, *FrameWidth, *FrameHeight, renderWidth, renderHeight);
+		} else {
+			int i;
+			/*refresh_frame_flags = */gf_bs_read_int(bs, 8);
+			for (i = 0; i < 3; i++) {
+				/*ref_frame_idx[i] = */gf_bs_read_int(bs, 3);
+				/*ref_frame_sign_bias[LAST_FRAME + i] = */gf_bs_read_int(bs, 1);
+			}
+			vp9_frame_size_with_refs(bs, FrameWidth, FrameHeight, renderWidth, renderHeight, &Sb64Cols, &Sb64Rows);
+			/*allow_high_precision_mv = */gf_bs_read_int(bs, 1);
+			vp9_read_interpolation_filter(bs);
+		}
+	}
+
+	if (error_resilient_mode == 0) {
+		/*refresh_frame_context = */gf_bs_read_int(bs, 1);
+		/*frame_parallel_decoding_mode = */gf_bs_read_int(bs, 1);
+	}
+
+	/*frame_context_idx = */gf_bs_read_int(bs, 2);
+	if (FrameIsIntra || error_resilient_mode) {
+		/*setup_past_independence + save_probs ...*/
+		//frame_context_idx = 0;
+	}
+
+	vp9_loop_filter_params(bs);
+	vp9_quantization_params(bs);
+	vp9_segmentation_params(bs);
+	vp9_tile_info(bs, Sb64Cols);
+
+	/*header_size_in_bytes = */gf_bs_read_int(bs, 16);
+
+	return GF_OK;
+}
+
+static GF_Err 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);
+	if (forbidden) {
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	*obu_type = gf_bs_read_int(bs, 4);
+	*obu_extension_flag = gf_bs_read_int(bs, 1);
+	*obu_has_size_field = gf_bs_read_int(bs, 1);
+	if (gf_bs_read_int(bs, 1) /*obu_reserved_1bit*/) {
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	if (*obu_extension_flag) {
+		*temporal_id = gf_bs_read_int(bs, 3);
+		*spatial_id = gf_bs_read_int(bs, 2);
+		/*extension_header_reserved_3bits = */gf_bs_read_int(bs, 3);
+	}
+
+	return GF_OK;
+}
+
+GF_EXPORT
+const char *av1_get_obu_name(ObuType obu_type)
+{
+	switch (obu_type) {
+	case OBU_SEQUENCE_HEADER: return "seq_header";
+	case OBU_TEMPORAL_DELIMITER: return "delimiter";
+	case OBU_FRAME_HEADER: return "frame_header";
+	case OBU_TILE_GROUP: return "tile_group";
+	case OBU_METADATA: return "metadata";
+	case OBU_FRAME: return "frame";
+	case OBU_REDUNDANT_FRAME_HEADER: return "redundant_frame_header";
+	case OBU_TILE_LIST: return "tile_list";
+	case OBU_PADDING: return "padding";
+	case OBU_RESERVED_0:
+	case OBU_RESERVED_9:
+	case OBU_RESERVED_10:
+	case OBU_RESERVED_11:
+	case OBU_RESERVED_12:
+	case OBU_RESERVED_13:
+	case OBU_RESERVED_14:
+		return "reserved";
+	default: return "unknown";
+	}
+}
+
+Bool av1_is_obu_header(ObuType obu_type) {
+	switch (obu_type) {
+	case OBU_SEQUENCE_HEADER:
+	case OBU_METADATA:
+		// TODO add check based on the metadata type
+		return GF_TRUE;
+	default:
+		return GF_FALSE;
+	}
+}
+
+static Bool av1_is_obu_frame(AV1State *state, ObuType obu_type)
+{
+	switch (obu_type) {
+	case OBU_PADDING:
+	case OBU_REDUNDANT_FRAME_HEADER:
+		return GF_FALSE;
+	case OBU_TEMPORAL_DELIMITER:
+		return state->keep_temporal_delim ? GF_TRUE : GF_FALSE;
+	default:
+		return GF_TRUE;
+	}
+}
+
+u64 read_leb128(GF_BitStream *bs, u8 *opt_Leb128Bytes) {
+	u64 value = 0;
+	u8 Leb128Bytes = 0, i = 0;
+	for (i = 0; i < 8; i++) {
+		u8 leb128_byte = gf_bs_read_u8(bs);
+		value |= ((leb128_byte & 0x7f) << (i * 7));
+		Leb128Bytes += 1;
+		if (!(leb128_byte & 0x80)) {
+			break;
+		}
+	}
+
+	if (opt_Leb128Bytes) {
+		*opt_Leb128Bytes = Leb128Bytes;
+	}
+	return value;
+}
+
+static size_t leb128_size(u64 value)
+{
+	size_t leb128_size = 0;
+	do {
+		++leb128_size;
+	} while ((value >>= 7) != 0);
+
+	return leb128_size;
+}
+
+static u64 write_leb128(GF_BitStream *bs, u64 value)
+{
+	size_t i, leb_size = leb128_size(value);
+	for (i = 0; i < leb_size; ++i) {
+		u8 byte = value & 0x7f;
+		value >>= 7;
+		if (value != 0) byte |= 0x80; //more bytes follow
+		gf_bs_write_u8(bs, byte);
+	}
+
+	return 0;
+}
+
+static void av1_add_obu_internal(GF_BitStream *bs, u64 pos, u64 obu_length, ObuType obu_type, GF_List **obu_list) {
+	Bool isSection5=GF_FALSE, obu_extension_flag=GF_FALSE;
+	u8 temporal_id, spatial_id;
+	GF_AV1_OBUArrayEntry *a;
+	GF_SAFEALLOC(a, GF_AV1_OBUArrayEntry);
+
+	gf_bs_seek(bs, pos);
+	av1_parse_obu_header(bs, &obu_type, &obu_extension_flag, &isSection5, &temporal_id, &spatial_id);
+	gf_bs_seek(bs, pos);
+
+	if (isSection5) {
+		a->obu = gf_malloc((size_t)obu_length);
+		gf_bs_read_data(bs, (char *) a->obu, (u32)obu_length);
+		a->obu_length = obu_length;
+	} else {
+		u8 i, hdr_size = obu_extension_flag ? 2 : 1;
+		const u32 leb_size = (u32)leb128_size(obu_length);
+		const u64 obu_size = obu_length - hdr_size;
+		a->obu = gf_malloc((size_t)obu_length + leb_size);
+		a->obu_length = obu_length + leb_size;
+		for (i = 0; i < hdr_size; ++i) {
+			a->obu[i] = gf_bs_read_u8(bs);
+			if (i == 0) a->obu[0] |= 0x02; /*add size field*/
+		}
+		{
+			u32 out_size = 0;
+			char *output = NULL;
+			GF_BitStream *bsLeb128 = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			write_leb128(bsLeb128, obu_size);
+			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, (char *) a->obu + hdr_size + leb_size, (u32)(obu_size));
+		assert(gf_bs_get_position(bs) == pos + obu_length);
+	}
+	a->obu_type = obu_type;
+	if (!*obu_list) *obu_list = gf_list_new();
+	gf_list_add(*obu_list, a);
+}
+
+static void av1_populate_state_from_obu(GF_BitStream *bs, u64 pos, u64 obu_length, ObuType obu_type, AV1State *state)
+{
+	if (av1_is_obu_header(obu_type)) {
+		av1_add_obu_internal(bs, pos, obu_length, obu_type, &state->frame_state.header_obus);
+	}
+	if (av1_is_obu_frame(state, obu_type)) {
+		av1_add_obu_internal(bs, pos, obu_length, obu_type, &state->frame_state.frame_obus);
+	}
+}
+
+GF_Err aom_av1_parse_temporal_unit_from_section5(GF_BitStream *bs, AV1State *state)
+{
+	Bool obu_td_found = GF_FALSE;
+	ObuType obu_type = -1;
+	while (gf_bs_available(bs)) {
+		u64 pos = gf_bs_get_position(bs), obu_length = 0;
+		GF_Err e;
+
+		e = gf_media_aom_av1_parse_obu(bs, &obu_type, &obu_length, NULL, state);
+		if (e)
+			return e;
+		if (obu_length != gf_bs_get_position(bs) - pos) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[AV1] OBU (Section 5) frame size "LLU" different from consumed bytes "LLU".\n", obu_length, gf_bs_get_position(bs) - pos));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
+		if (obu_type == OBU_TEMPORAL_DELIMITER) {
+			if (!obu_td_found) {
+				obu_td_found = GF_TRUE;
+			} else {
+				gf_bs_seek(bs, pos);
+				break;
+			}
+		}
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[AV1] Section5 OBU detected (size "LLU")\n", obu_length));
+		av1_populate_state_from_obu(bs, pos, obu_length, obu_type, state);
+	}
+
+	return GF_OK;
+}
+
+Bool gf_media_aom_probe_annexb(GF_BitStream *bs)
+{
+	Bool res = GF_TRUE;
+	u64 pos = gf_bs_get_position(bs);
+	u64 sz = read_leb128(bs, NULL);
+
+	while (sz>0) {
+		u8 Leb128Bytes = 0;
+		u64 frame_unit_size = read_leb128(bs, &Leb128Bytes);
+
+		if (sz < Leb128Bytes + frame_unit_size) {
+			res = GF_FALSE;
+			break;
+		}
+		sz -= Leb128Bytes + frame_unit_size;
+
+		while (frame_unit_size > 0) {
+			ObuType obu_type;
+			u64 pos, obu_length = read_leb128(bs, &Leb128Bytes);
+			if (frame_unit_size < Leb128Bytes + obu_length) {
+				res = GF_FALSE;
+				break;
+			}
+			pos = gf_bs_get_position(bs);
+			frame_unit_size -= Leb128Bytes;
+
+			u8 tid, sid;
+			Bool extflag, has_size;
+			GF_Err e = av1_parse_obu_header(bs, &obu_type, &extflag, &has_size, &tid, &sid);
+			if (e) {
+				res = GF_FALSE;
+				break;
+			}
+
+			if (has_size) {
+				obu_length = (u32)read_leb128(bs, NULL);
+			} else {
+				if (obu_length >= 1 + extflag) {
+					obu_length = obu_length - 1 - extflag;
+				} else {
+					res = GF_FALSE;
+					break;
+				}
+			}
+			u32 hdr_size = (u32) (gf_bs_get_position(bs) - pos);
+			obu_length += hdr_size;
+
+			if (frame_unit_size < obu_length) {
+				res = GF_FALSE;
+				break;
+			}
+			frame_unit_size -= obu_length;
+			gf_bs_skip_bytes(bs, obu_length - hdr_size);
+		}
+		if (!res) break;
+	}
+	gf_bs_seek(bs, pos);
+	return res;
+}
+
+GF_Err aom_av1_parse_temporal_unit_from_annexb(GF_BitStream *bs, AV1State *state)
+{
+	GF_Err e = GF_OK;
+	u64 sz = read_leb128(bs, NULL);
+	if (!bs || !state) return GF_BAD_PARAM;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[AV1] Annex B temporal unit detected (size "LLU") ***** \n", sz));
+	while (sz > 0) {
+		u8 Leb128Bytes = 0;
+		u64 frame_unit_size = read_leb128(bs, &Leb128Bytes);
+		if (sz < Leb128Bytes + frame_unit_size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1] Annex B sz("LLU") < Leb128Bytes("LLU") + frame_unit_size("LLU")\n", sz, Leb128Bytes, frame_unit_size));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[AV1] Annex B frame unit detected (size "LLU")\n", frame_unit_size));
+		sz -= Leb128Bytes + frame_unit_size;
+
+		while (frame_unit_size > 0) {
+			ObuType obu_type;
+			u64 pos, obu_length = read_leb128(bs, &Leb128Bytes);
+			if (frame_unit_size < Leb128Bytes + obu_length) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1] Annex B frame_unit_size("LLU") < Leb128Bytes("LLU") + obu_length("LLU")\n", frame_unit_size, Leb128Bytes, obu_length));
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[AV1] Annex B OBU detected (size "LLU")\n", obu_length));
+			pos = gf_bs_get_position(bs);
+			frame_unit_size -= Leb128Bytes;
+
+			e = gf_media_aom_av1_parse_obu(bs, &obu_type, &obu_length, NULL, state);
+			if (e) return e;
+
+			if (obu_length != gf_bs_get_position(bs) - pos) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[AV1] Annex B frame size "LLU" different from consumed bytes "LLU".\n", obu_length, gf_bs_get_position(bs) - pos));
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+
+			av1_populate_state_from_obu(bs, pos, obu_length, obu_type, state);
+			if (frame_unit_size < obu_length) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1] Annex B frame_unit_size("LLU") < OBU size ("LLU")\n", frame_unit_size, obu_length));
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+			frame_unit_size -= obu_length;
+		}
+	}
+	assert(sz == 0);
+	return GF_OK;
+}
+
+GF_Err aom_av1_parse_temporal_unit_from_ivf(GF_BitStream *bs, AV1State *state)
+{
+	u64 frame_size, pts_ignored;
+	GF_Err e = gf_media_parse_ivf_frame_header(bs, &frame_size, &pts_ignored);
+	if (e) return e;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[AV1] IVF frame detected (size "LLU")\n", frame_size));
+
+	while (frame_size > 0) {
+		u64 obu_size = 0, pos = gf_bs_get_position(bs);
+		ObuType obu_type;
+
+		if (gf_media_aom_av1_parse_obu(bs, &obu_type, &obu_size, NULL, state) != GF_OK)
+			return e;
+
+		if (obu_size != gf_bs_get_position(bs) - pos) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[AV1] IVF frame size "LLU" different from consumed bytes "LLU".\n", obu_size, gf_bs_get_position(bs) - pos));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
+		av1_populate_state_from_obu(bs, pos, obu_size, obu_type, state);
+
+		frame_size -= obu_size;
+	}
+
+	return e;
+}
+
+#define AV1_NUM_REF_FRAMES 8
+#define AV1_ALL_FRAMES ((1 << AV1_NUM_REF_FRAMES) - 1)
+
+#define AV1_SUPERRES_DENOM_MIN 9
+#define AV1_SUPERRES_DENOM_BITS 3
+#define AV1_SUPERRES_NUM 8
+
+#define AV1_REFS_PER_FRAME 7
+#define AV1_PRIMARY_REF_NONE 7
+
+#define MAX_TILE_WIDTH 4096
+#define MAX_TILE_AREA (4096 * 2304)
+
+static u32 aom_av1_tile_log2(u32 blkSize, u32 target)
+{
+	u32 k;
+	for (k = 0; (blkSize << k) < target; k++) {
+	}
+	return k;
+}
+
+static u64 aom_av1_le(GF_BitStream *bs, u32 n) {
+	u32 i = 0;
+	u64 t = 0;
+	for (i = 0; i < n; i++) {
+		u8 byte = gf_bs_read_int(bs, 8);
+		t += (byte << (i * 8));
+	}
+	return t;
+}
+
+
+static void av1_parse_tile_info(GF_BitStream *bs, AV1State *state)
+{
+	u32 i;
+	u32 MiCols = 2 * ((state->width + 7) >> 3);
+	u32 MiRows = 2 * ((state->height + 7) >> 3);
+	u32 sbCols = state->use_128x128_superblock ? ((MiCols + 31) >> 5) : ((MiCols + 15) >> 4);
+	u32 sbRows = state->use_128x128_superblock ? ((MiRows + 31) >> 5) : ((MiRows + 15) >> 4);
+	u32 sbShift = state->use_128x128_superblock ? 5 : 4;
+	u32 sbSize = sbShift + 2;
+	u32 maxTileWidthSb = MAX_TILE_WIDTH >> sbSize;
+	u32 maxTileAreaSb = MAX_TILE_AREA >> (2 * sbSize);
+	u32 minLog2tileCols = aom_av1_tile_log2(maxTileWidthSb, sbCols);
+	u32 maxLog2tileCols = aom_av1_tile_log2(1, MIN(sbCols, AV1_MAX_TILE_COLS));
+	u32 maxLog2tileRows = aom_av1_tile_log2(1, MIN(sbRows, AV1_MAX_TILE_ROWS));
+	u32 minLog2Tiles = MAX(minLog2tileCols, aom_av1_tile_log2(maxTileAreaSb, sbRows * sbCols));
+	Bool uniform_tile_spacing_flag = gf_bs_read_int(bs, 1);
+	if (uniform_tile_spacing_flag) {
+		u32 startSb, tileWidthSb, tileHeightSb, minLog2tileRows;
+		state->tileColsLog2 = minLog2tileCols;
+		while (state->tileColsLog2 < maxLog2tileCols) {
+			Bool increment_tile_cols_log2 = gf_bs_read_int(bs, 1);
+			if (increment_tile_cols_log2 == 1)
+				state->tileColsLog2++;
+			else
+				break;
+		}
+
+		tileWidthSb = (sbCols + (1 << state->tileColsLog2) - 1) >> state->tileColsLog2;
+		i = 0;
+		for (startSb = 0; startSb < sbCols; startSb += tileWidthSb) {
+			i += 1;
+		}
+		state->tileCols = i;
+		minLog2tileRows = MAX((int)(minLog2Tiles - state->tileColsLog2), 0);
+		state->tileRowsLog2 = minLog2tileRows;
+		while (state->tileRowsLog2 < maxLog2tileRows) {
+			Bool increment_tile_rows_log2 = gf_bs_read_int(bs, 1);
+			if (increment_tile_rows_log2 == 1)
+				state->tileRowsLog2++;
+			else
+				break;
+		}
+
+		tileHeightSb = (sbRows + (1 << state->tileRowsLog2) - 1) >> state->tileRowsLog2;
+		i = 0;
+		for (startSb = 0; startSb < sbRows; startSb += tileHeightSb) {
+			i += 1;
+		}
+		state->tileRows = i;
+	} else {
+		u32 startSb, maxTileHeightSb, widestTileSb;
+		widestTileSb = 0;
+		startSb = 0;
+		for (i = 0; startSb < sbCols; i++) {
+			u32 maxWidth = MIN((int)(sbCols - startSb), maxTileWidthSb);
+			u32 width_in_sbs_minus_1 = av1_read_ns(bs, maxWidth);
+			u32 sizeSb = width_in_sbs_minus_1 + 1;
+			widestTileSb = MAX(sizeSb, widestTileSb);
+			startSb += sizeSb;
+		}
+
+		state->tileCols = i;
+		state->tileColsLog2 = aom_av1_tile_log2(1, state->tileCols);
+
+		if (minLog2Tiles > 0)
+			maxTileAreaSb = (sbRows * sbCols) >> (minLog2Tiles + 1);
+		else
+			maxTileAreaSb = sbRows * sbCols;
+		maxTileHeightSb = MAX(maxTileAreaSb / widestTileSb, 1);
+
+		startSb = 0;
+		for (i = 0; startSb < sbRows; i++) {
+			u32 maxHeight = MIN((int)(sbRows - startSb), maxTileHeightSb);
+			u32 height_in_sbs_minus_1 = av1_read_ns(bs, maxHeight);
+			u32 sizeSb = height_in_sbs_minus_1 + 1;
+			startSb += sizeSb;
+		}
+
+		state->tileRows = i;
+		state->tileRowsLog2 = aom_av1_tile_log2(1, state->tileRows);
+	}
+	if (state->tileColsLog2 > 0 || state->tileRowsLog2 > 0) {
+		/*context_update_tile_id = */gf_bs_read_int(bs, state->tileRowsLog2 + state->tileColsLog2);
+		state->tile_size_bytes = gf_bs_read_int(bs, 2) + 1;
+	}
+}
+
+static void superres_params(GF_BitStream *bs, AV1State *state)
+{
+	u32 SuperresDenom;
+	Bool use_superres;
+
+	if (state->enable_superres) {
+		use_superres = gf_bs_read_int(bs, 1);
+	} else {
+		use_superres = GF_FALSE;
+	}
+	if (use_superres) {
+		u8 coded_denom = gf_bs_read_int(bs, AV1_SUPERRES_DENOM_BITS);
+		SuperresDenom = coded_denom + AV1_SUPERRES_DENOM_MIN;
+	} else {
+		SuperresDenom = AV1_SUPERRES_NUM;
+	}
+	state->UpscaledWidth = state->width;
+	state->width = (state->UpscaledWidth * AV1_SUPERRES_NUM + (SuperresDenom / 2)) / SuperresDenom;
+}
+
+static void frame_size(GF_BitStream *bs, AV1State *state, Bool frame_size_override_flag)
+{
+	if (frame_size_override_flag) {
+		u32 frame_width_minus_1, frame_height_minus_1;
+		u8 n = state->frame_width_bits_minus_1 + 1;
+		frame_width_minus_1 = gf_bs_read_int(bs, n);
+		n = state->frame_height_bits_minus_1 + 1;
+		frame_height_minus_1 = gf_bs_read_int(bs, n);
+		state->width = frame_width_minus_1 + 1;
+		state->height = frame_height_minus_1 + 1;
+	}
+	superres_params(bs, state);
+	//compute_image_size(); //no bits
+}
+
+static void render_size(GF_BitStream *bs)
+{
+	Bool render_and_frame_size_different = gf_bs_read_int(bs, 1);
+	if (render_and_frame_size_different == GF_TRUE) {
+		/*render_width_minus_1 =*/ gf_bs_read_int(bs, 16);
+		/*render_height_minus_1 =*/ gf_bs_read_int(bs, 16);
+		//RenderWidth = render_width_minus_1 + 1;
+		//RenderHeight = render_height_minus_1 + 1;
+	} else {
+		//RenderWidth = UpscaledWidth;
+		//RenderHeight = FrameHeight;
+	}
+}
+
+static void read_interpolation_filter(GF_BitStream *bs)
+{
+	Bool is_filter_switchable = gf_bs_read_int(bs, 1);
+	if (!is_filter_switchable) {
+		/*interpolation_filter =*/ gf_bs_read_int(bs, 2);
+	}
+}
+
+static void frame_size_with_refs(GF_BitStream *bs, AV1State *state, Bool frame_size_override_flag)
+{
+	Bool found_ref = GF_FALSE;
+	u32 i = 0;
+	for (i = 0; i < AV1_REFS_PER_FRAME; i++) {
+		found_ref = gf_bs_read_int(bs, 1);
+		if (found_ref == 1) {
+#if 0
+			UpscaledWidth = RefUpscaledWidth[ref_frame_idx[i]];
+			FrameWidth = UpscaledWidth;
+			FrameHeight = RefFrameHeight[ref_frame_idx[i]];
+			RenderWidth = RefRenderWidth[ref_frame_idx[i]];
+			RenderHeight = RefRenderHeight[ref_frame_idx[i]];
+#endif
+			break;
+		}
+	}
+	if (found_ref == 0) {
+		frame_size(bs, state, frame_size_override_flag);
+		render_size(bs);
+	} else {
+		superres_params(bs, state);
+		//compute_image_size();
+	}
+}
+
+static s32 av1_delta_q(GF_BitStream *bs)
+{
+	Bool delta_coded = gf_bs_read_int(bs, 1);
+	s32 delta_q = 0;
+	if ( delta_coded ) {
+		u32 signMask = 1 << (7 - 1);
+		delta_q = gf_bs_read_int(bs, 7);
+		if (delta_q & signMask )
+			delta_q = delta_q - 2 * signMask;
+	}
+	return delta_q;
+}
+
+static u8 Segmentation_Feature_Bits[] = {8,6,6,6,6,3,0,0};
+static u8 Segmentation_Feature_Signed[] = { 1, 1, 1, 1, 1, 0, 0, 0 };
+
+static u8 av1_get_qindex(Bool ignoreDeltaQ, u32 segmentId, u32 base_q_idx, u32 delta_q_present, u32 CurrentQIndex, Bool segmentation_enabled, u8 *features_SEG_LVL_ALT_Q_enabled, s32 *features_SEG_LVL_ALT_Q)
+{
+	//If seg_feature_active_idx( segmentId, SEG_LVL_ALT_Q ) is equal to 1 the following ordered steps apply:
+	if (segmentation_enabled && features_SEG_LVL_ALT_Q_enabled[segmentId] ) {
+		//Set the variable data equal to FeatureData[ segmentId ][ SEG_LVL_ALT_Q ].
+		s32 data = features_SEG_LVL_ALT_Q[segmentId];
+		s32 qindex = base_q_idx + data;
+		//If ignoreDeltaQ is equal to 0 and delta_q_present is equal to 1, set qindex equal to CurrentQIndex + data.
+		if ((ignoreDeltaQ==0) && (delta_q_present==1)) qindex = CurrentQIndex+data;
+		//Return Clip3( 0, 255, qindex ).
+		if (qindex<0) return 0;
+		else if (qindex>255) return 255;
+		else return (u8) qindex;
+	}
+	//Otherwise, if ignoreDeltaQ is equal to 0 and delta_q_present is equal to 1, return CurrentQIndex.
+	if ((ignoreDeltaQ==0) && (delta_q_present==1)) return CurrentQIndex;
+	//otherwise
+	return base_q_idx;
+}
+
+enum {
+AV1_RESTORE_NONE=0,
+AV1_RESTORE_SWITCHABLE,
+AV1_RESTORE_WIENER,
+AV1_RESTORE_SGRPROJ
+};
+
+#define AV1_GMC_IDENTITY 0
+#define AV1_GMC_TRANSLATION 1
+#define AV1_GMC_ROTZOOM 2
+#define AV1_GMC_AFFINE 3
+
+#define AV1_LAST_FRAME 1
+#define AV1_LAST2_FRAME 2
+#define AV1_LAST3_FRAME 3
+#define AV1_GOLDEN_FRAME 4
+#define AV1_BWDREF_FRAME 5
+#define AV1_ALTREF2_FRAME 6
+#define AV1_ALTREF_FRAME 7
+
+#define GM_ABS_ALPHA_BITS 12
+#define GM_ALPHA_PREC_BITS 15
+#define GM_ABS_TRANS_ONLY_BITS 9
+#define GM_TRANS_ONLY_PREC_BITS 3
+#define GM_ABS_TRANS_BITS 12
+#define GM_TRANS_PREC_BITS 6
+#define WARPEDMODEL_PREC_BITS 16
+
+
+static u32 av1_decode_subexp(GF_BitStream *bs, s32 numSyms)
+{
+	s32 i=0;
+	s32 mk=0;
+	s32 k=3;
+	while (1) {
+		s32 b2 = i ? k + i - 1 : k;
+		s32 a = 1 << b2;
+		if ( numSyms <= mk + 3 * a ) {
+			s32 subexp_final_bits = av1_read_ns(bs, numSyms - mk);
+			return subexp_final_bits + mk;
+		} else {
+			s32 subexp_more_bits = gf_bs_read_int(bs, 1);
+			if ( subexp_more_bits ) {
+				i++;
+				mk += a;
+			} else {
+				s32 subexp_bits = gf_bs_read_int(bs, b2);
+				return subexp_bits + mk;
+			}
+		}
+	}
+}
+
+static GFINLINE s32 inverse_recenter(s32 r, u32 v)
+{
+	if ( (s64)v > (s64)(2 * r) )
+		return v;
+	else if ( v & 1 )
+		return r - ((v + 1) >> 1);
+	else
+		return r + (v >> 1);
+}
+
+static s32 av1_decode_unsigned_subexp_with_ref(GF_BitStream *bs, s32 mx, s32 r)
+{
+	u32 v = av1_decode_subexp(bs, mx );
+	if ((r<0) && (- (-r << 1) <= mx ) ) {
+		return inverse_recenter(r, v);
+	} else if ( (r << 1) <= mx ) {
+		return inverse_recenter(r, v);
+	} else {
+		return mx - 1 - inverse_recenter(mx - 1 - r, v);
+	}
+}
+static s16 av1_decode_signed_subexp_with_ref(GF_BitStream *bs, s32 low, s32 high, s32 r)
+{
+	s16 x = av1_decode_unsigned_subexp_with_ref(bs, high - low, r - low);
+	return x + low;
+}
+
+static void av1_read_global_param(AV1State *state, GF_BitStream *bs, u8 type, u8 ref, u8 idx)
+{
+	u8 absBits = GM_ABS_ALPHA_BITS;
+	u8 precBits = GM_ALPHA_PREC_BITS;
+	if ( idx < 2 ) {
+		if ( type == AV1_GMC_TRANSLATION ) {
+			absBits = GM_ABS_TRANS_ONLY_BITS - (!state->frame_state.allow_high_precision_mv ? 1 : 0);
+			precBits = GM_TRANS_ONLY_PREC_BITS - (!state->frame_state.allow_high_precision_mv ? 1 : 0);
+		} else {
+			absBits = GM_ABS_TRANS_BITS;
+			precBits = GM_TRANS_PREC_BITS;
+		}
+	}
+	s32 precDiff = WARPEDMODEL_PREC_BITS - precBits;
+	s32 round = (idx % 3) == 2 ? (1 << WARPEDMODEL_PREC_BITS) : 0;
+	s32 sub = (idx % 3) == 2 ? (1 << precBits) : 0;
+	s32 mx = (1 << absBits);
+	s32 r = (state->PrevGmParams.coefs[ref][idx] >> precDiff) - sub;
+	s32 val = av1_decode_signed_subexp_with_ref(bs, -mx, mx + 1, r );
+
+	if (val<0) {
+		val = -val;
+		state->GmParams.coefs[ref][idx] = ( -(val << precDiff) + round);
+	} else {
+		state->GmParams.coefs[ref][idx] = (val << precDiff) + round;
+	}
+}
+
+static s32 av1_get_relative_dist(s32 a, s32 b, AV1State *state)
+{
+	if ( !state->enable_order_hint )
+		return 0;
+	s32 diff = a - b;
+	s32 m = 1 << (state->OrderHintBits - 1);
+	diff = (diff & (m - 1)) - (diff & m);
+	return diff;
+}
+
+static void av1_setup_past_independence(AV1State *state)
+{
+	u32 ref, i;
+	for (ref = AV1_LAST_FRAME; ref<=AV1_ALTREF_FRAME; ref++) {
+		for (i=0; i<=5; i++) {
+			state->PrevGmParams.coefs[ref][i] = ( ( i % 3 == 2 ) ? 1 << WARPEDMODEL_PREC_BITS : 0 );
+		}
+	}
+}
+
+static void av1_load_previous(AV1State *state, u8 primary_ref_frame, s8 *ref_frame_idx)
+{
+	s8 prevFrame = ref_frame_idx[ primary_ref_frame ];
+	if (prevFrame<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1] load_previous: prevFrame reference index %d is invalid\n", prevFrame));
+	} else {
+		state->PrevGmParams = state->SavedGmParams[prevFrame];
+		// load_loop_filter_params( prevFrame )
+		// load_segmentation_params( prevFrame )
+	}
+}
+
+static void av1_decode_frame_wrapup(AV1State *state)
+{
+	u32 i;
+	for (i=0; i<AV1_NUM_REF_FRAMES; i++) {
+		if ( (state->frame_state.refresh_frame_flags >> i) & 1) {
+			state->RefOrderHint[i] = state->frame_state.order_hint;
+			state->SavedGmParams[i] = state->GmParams;
+			state->RefFrameType[i] = state->frame_state.frame_type;
+		}
+	}
+	state->frame_state.seen_frame_header = GF_FALSE;
+	//Otherwise (show_existing_frame is equal to 1), if frame_type is equal to KEY_FRAME, the reference frame loading process as specified in section 7.21 is invoked
+	if ( (state->frame_state.show_existing_frame) && (state->frame_state.frame_type==AV1_KEY_FRAME) ) {
+		state->frame_state.order_hint = state->RefOrderHint[state->frame_state.frame_to_show_map_idx];
+		//OrderHints[ j + LAST_FRAME ] is set equal to SavedOrderHints[state->frame_to_show_map_idx ][ j + LAST_FRAME ] for j = 0..REFS_PER_FRAME-1.
+
+		//gm_params[ ref ][ j ] is set equal to SavedGmParams[ frame_to_show_map_idx ][ ref ][ j ] for ref = LAST_FRAME..ALTREF_FRAME, for j = 0..5.
+		state->GmParams = state->SavedGmParams[state->frame_state.frame_to_show_map_idx];
+
+	}
+}
+
+static s32 find_latest_forward(u32 curFrameHint, u8 *shiftedOrderHints, u8 *usedFrame)
+{
+	u32 i;
+	s32 ref = -1;
+	s32 latestOrderHint = 0;
+	for (i=0; i<AV1_NUM_REF_FRAMES; i++) {
+		s32 hint = shiftedOrderHints[ i ];
+		if ( !usedFrame[ i ] && ((u32)hint < curFrameHint) && ( ref < 0 || hint >= latestOrderHint ) ) {
+			ref=i;
+			latestOrderHint = hint;
+		}
+	}
+	return ref;
+}
+
+//see 7.8 of AV1 spec
+static void av1_set_frame_refs(AV1State *state, u8 last_frame_idx, u8 gold_frame_idx, s8 *ref_frame_idx)
+{
+	u32 i;
+	u8 usedFrame[AV1_NUM_REF_FRAMES];
+	u8 shiftedOrderHints[AV1_NUM_REF_FRAMES];
+
+	for (i=0; i<AV1_REFS_PER_FRAME; i++)
+		ref_frame_idx[i] = -1;
+
+	ref_frame_idx[AV1_LAST_FRAME - AV1_LAST_FRAME] = last_frame_idx;
+	ref_frame_idx[AV1_GOLDEN_FRAME - AV1_LAST_FRAME ] = gold_frame_idx;
+
+	for (i=0; i<AV1_NUM_REF_FRAMES; i++) {
+		usedFrame[i] = 0;
+	}
+
+	usedFrame[last_frame_idx] = 1;
+	usedFrame[gold_frame_idx] = 1;
+	u32 curFrameHint = 1 << (state->OrderHintBits - 1);
+
+	for (i=0; i<AV1_NUM_REF_FRAMES; i++) {
+		shiftedOrderHints[ i ] = curFrameHint + av1_get_relative_dist(state->RefOrderHint[i], state->frame_state.order_hint, state);
+	}
+
+	u8 lastOrderHint = shiftedOrderHints[ last_frame_idx ];
+	u8 goldOrderHint = shiftedOrderHints[ gold_frame_idx ];
+
+	//It is a requirement of bitstream conformance that lastOrderHint is strictly less than curFrameHint.
+	if (lastOrderHint >= curFrameHint) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] non conformant bitstream detected while setting up frame refs: lastOrderHint(%d) shall be stricly less than curFrameHint(%d)\n", lastOrderHint, curFrameHint));
+	}
+	//It is a requirement of bitstream conformance that goldOrderHint is strictly less than curFrameHint.
+	if (goldOrderHint >= curFrameHint) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] non conformant bitstream detected while setting up frame refs: goldOrderHint(%d) shall be stricly less than curFrameHint(%d)\n", lastOrderHint, curFrameHint));
+	}
+
+	//find_latest_backward() {
+	s32 ref = -1;
+	s32 latestOrderHint = 0;
+	for (i=0; i < AV1_NUM_REF_FRAMES; i++) {
+		s32 hint = shiftedOrderHints[ i ];
+		if ( !usedFrame[ i ] && ((u32)hint >= curFrameHint) && ( ref < 0 || hint >= latestOrderHint ) ) {
+			ref = i;
+			latestOrderHint = hint;
+		}
+	}
+	if (ref >= 0) {
+		ref_frame_idx[ AV1_ALTREF_FRAME - AV1_LAST_FRAME ] = ref;
+		usedFrame[ ref ] = 1;
+	}
+	//find_earliest_backward() for BWDREF_FRAME
+	ref = -1;
+	s32 earliestOrderHint = 0;
+	for (i=0; i < AV1_NUM_REF_FRAMES; i++) {
+		s32 hint = shiftedOrderHints[ i ];
+		if ( !usedFrame[ i ] && ((u32)hint >= curFrameHint) && ( ref < 0 || hint < earliestOrderHint ) ) {
+			ref = i;
+			earliestOrderHint = hint;
+		}
+	}
+	if (ref >= 0) {
+		ref_frame_idx[ AV1_BWDREF_FRAME - AV1_LAST_FRAME ] = ref;
+		usedFrame[ ref ] = 1;
+	}
+
+	//find_earliest_backward() for ALTREF2_FRAME
+	ref = -1;
+	earliestOrderHint = 0;
+	for (i=0; i < AV1_NUM_REF_FRAMES; i++) {
+		s32 hint = shiftedOrderHints[ i ];
+		if ( !usedFrame[ i ] && ((u32)hint >= curFrameHint) && ( ref < 0 || hint < earliestOrderHint ) ) {
+			ref = i;
+			earliestOrderHint = hint;
+		}
+	}
+	if (ref >= 0) {
+		ref_frame_idx[ AV1_ALTREF2_FRAME - AV1_LAST_FRAME ] = ref;
+		usedFrame[ ref ] = 1;
+	}
+
+	//The remaining references are set to be forward references in anti-chronological order as follows:
+
+	const u8 Ref_Frame_List[AV1_REFS_PER_FRAME - 2 ] = {
+		AV1_LAST2_FRAME, AV1_LAST3_FRAME, AV1_BWDREF_FRAME, AV1_ALTREF2_FRAME, AV1_ALTREF_FRAME
+	};
+
+	for (i=0; i<AV1_REFS_PER_FRAME - 2; i++) {
+		u8 refFrame = Ref_Frame_List[ i ];
+		if ( ref_frame_idx[ refFrame - AV1_LAST_FRAME ] < 0 ) {
+			s32 ref = find_latest_forward(curFrameHint, shiftedOrderHints, usedFrame);
+			if (ref >= 0) {
+				ref_frame_idx[ refFrame - AV1_LAST_FRAME ] = ref;
+				usedFrame[ ref ] = 1;
+			}
+		}
+	}
+	//Finally, any remaining references are set to the reference frame with smallest output order as follows:
+	ref = -1;
+	for (i=0; i < AV1_NUM_REF_FRAMES; i++) {
+		s32 hint = shiftedOrderHints[ i ];
+		if ( ref < 0 || hint < earliestOrderHint ) {
+			ref=i;
+			earliestOrderHint = hint;
+		}
+	}
+	for (i=0; i < AV1_REFS_PER_FRAME; i++) {
+		if (ref_frame_idx[ i ] < 0 ) {
+			ref_frame_idx[ i ] = ref;
+		}
+	}
+}
+
+
+static void av1_parse_uncompressed_header(GF_BitStream *bs, AV1State *state)
+{
+	Bool error_resilient_mode = GF_FALSE, allow_screen_content_tools = GF_FALSE, force_integer_mv = GF_FALSE;
+	Bool /*use_ref_frame_mvs = GF_FALSE,*/ FrameIsIntra = GF_FALSE, frame_size_override_flag = GF_FALSE;
+	Bool disable_cdf_update = GF_FALSE;
+	u8 showable_frame;
+	u8 primary_ref_frame;
+	u16 idLen = 0;
+	u32 idx;
+	s8 ref_frame_idx[AV1_REFS_PER_FRAME];
+	AV1StateFrame *frame_state = &state->frame_state;
+
+	if (state->frame_id_numbers_present_flag) {
+		idLen = (state->additional_frame_id_length_minus_1 + state->delta_frame_id_length_minus_2 + 3);
+	}
+	frame_state->refresh_frame_flags = 0;
+
+	showable_frame = 0;
+	if (state->reduced_still_picture_header) {
+		frame_state->key_frame = GF_TRUE;
+		FrameIsIntra = GF_TRUE;
+		frame_state->frame_type = AV1_KEY_FRAME;
+		frame_state->show_frame = GF_TRUE;
+		frame_state->show_existing_frame = 0;
+	} else {
+		frame_state->show_existing_frame = gf_bs_read_int(bs, 1);
+		if (frame_state->show_existing_frame == GF_TRUE) {
+			frame_state->frame_to_show_map_idx = gf_bs_read_int(bs, 3);
+			frame_state->frame_type = state->RefFrameType[frame_state->frame_to_show_map_idx];
+
+			if (state->decoder_model_info_present_flag && !state->equal_picture_interval) {
+				/*frame_presentation_time = */gf_bs_read_int(bs, state->frame_presentation_time_length);
+			}
+
+			frame_state->refresh_frame_flags = 0;
+			if (state->frame_id_numbers_present_flag) {
+				/*display_frame_id = */gf_bs_read_int(bs, idLen);
+			}
+			if (frame_state->frame_type == AV1_KEY_FRAME) {
+				frame_state->refresh_frame_flags = AV1_ALL_FRAMES;
+			}
+			/*
+			if (film_grain_params_present) {
+				load_grain_params(frame_to_show_map_idx)
+			}*/
+			return;
+		}
+		frame_state->frame_type = gf_bs_read_int(bs, 2);
+		FrameIsIntra = (frame_state->frame_type == AV1_INTRA_ONLY_FRAME || frame_state->frame_type == AV1_KEY_FRAME);
+		frame_state->show_frame = gf_bs_read_int(bs, 1);
+		if (frame_state->is_first_frame) {
+			frame_state->key_frame = frame_state->seen_seq_header && frame_state->show_frame && frame_state->frame_type == AV1_KEY_FRAME && frame_state->seen_frame_header;
+		}
+		if (frame_state->show_frame && state->decoder_model_info_present_flag && !state->equal_picture_interval) {
+			/*frame_presentation_time = */gf_bs_read_int(bs, state->frame_presentation_time_length);
+		}
+		if (frame_state->show_frame) {
+			showable_frame = frame_state->frame_type != AV1_KEY_FRAME;
+
+		} else {
+			showable_frame = gf_bs_read_int(bs, 1);
+		}
+		if (frame_state->frame_type == AV1_SWITCH_FRAME || (frame_state->frame_type == AV1_KEY_FRAME && frame_state->show_frame))
+			error_resilient_mode = GF_TRUE;
+		else
+			error_resilient_mode = gf_bs_read_int(bs, 1);
+	}
+
+	if ( (frame_state->frame_type == AV1_KEY_FRAME) && frame_state->show_frame) {
+		u32 i;
+		for ( i = 0; i < AV1_NUM_REF_FRAMES; i++ ) {
+			state->RefValid[i] = 0;
+			state->RefOrderHint[i] = 0;
+		}
+		for ( i = 0; i < AV1_REFS_PER_FRAME; i++ ) {
+			state->OrderHints[ AV1_LAST_FRAME + i ] = 0;
+		}
+	}
+
+	disable_cdf_update = gf_bs_read_int(bs, 1);
+	if (state->seq_force_screen_content_tools == 2/*SELECT_SCREEN_CONTENT_TOOLS*/) {
+		allow_screen_content_tools = gf_bs_read_int(bs, 1);
+	} else {
+		allow_screen_content_tools = state->seq_force_screen_content_tools;
+	}
+	if (allow_screen_content_tools) {
+		if (state->seq_force_integer_mv == 2/*SELECT_INTEGER_MV*/) {
+			force_integer_mv = gf_bs_read_int(bs, 1);
+		} else {
+			force_integer_mv = state->seq_force_integer_mv;
+		}
+	} else {
+		force_integer_mv = 0;
+	}
+	if (FrameIsIntra) {
+		force_integer_mv = 1;
+	}
+	if (state->frame_id_numbers_present_flag) {
+		/*current_frame_id = */gf_bs_read_int(bs, idLen);
+	}
+	if (frame_state->frame_type == AV1_SWITCH_FRAME)
+		frame_size_override_flag = GF_TRUE;
+	else if (state->reduced_still_picture_header)
+		frame_size_override_flag = GF_FALSE;
+	else
+		frame_size_override_flag = gf_bs_read_int(bs, 1);
+
+	frame_state->order_hint = gf_bs_read_int(bs, state->OrderHintBits);
+	if (FrameIsIntra || error_resilient_mode) {
+		primary_ref_frame = AV1_PRIMARY_REF_NONE;
+	} else {
+		primary_ref_frame = gf_bs_read_int(bs, 3);
+	}
+
+	if (state->decoder_model_info_present_flag) {
+		u8 buffer_removal_time_present_flag = gf_bs_read_int(bs, 1);
+		if (buffer_removal_time_present_flag) {
+			u32 opNum;
+			for (opNum = 0; opNum < state->operating_points_count; opNum++) {
+				if (state->decoder_model_present_for_this_op[opNum]) {
+					u8 opPtIdc = state->operating_point_idc[opNum];
+					u8 inTemporalLayer = (opPtIdc >> state->temporal_id) & 1;
+					u8 inSpatialLayer = (opPtIdc >> (state->spatial_id + 8)) & 1;
+					if (opPtIdc == 0 || (inTemporalLayer && inSpatialLayer)) {
+						/*buffer_removal_time[opNum] = */gf_bs_read_int(bs, state->buffer_removal_time_length);
+					}
+				}
+			}
+		}
+	}
+
+	if (frame_state->frame_type == AV1_SWITCH_FRAME || (frame_state->frame_type == AV1_KEY_FRAME && frame_state->show_frame)) {
+		frame_state->refresh_frame_flags = AV1_ALL_FRAMES;
+	} else {
+		frame_state->refresh_frame_flags = gf_bs_read_int(bs, 8);
+	}
+	if (!FrameIsIntra || frame_state->refresh_frame_flags != AV1_ALL_FRAMES) {
+		if (error_resilient_mode && state->enable_order_hint) {
+			u32 i = 0;
+			for (i = 0; i < AV1_NUM_REF_FRAMES; i++) {
+				u8 ref_order_hint = gf_bs_read_int(bs, state->OrderHintBits);
+				if ( ref_order_hint != state->RefOrderHint[i] ) {
+					state->RefValid[i] = 0;
+				}
+				state->RefOrderHint[i] = ref_order_hint;
+			}
+		}
+	}
+
+	u8 allow_intrabc = 0;
+	if (frame_state->frame_type == AV1_KEY_FRAME) {
+		frame_size(bs, state, frame_size_override_flag);
+		render_size(bs);
+		if (allow_screen_content_tools && state->UpscaledWidth == state->width) {
+			allow_intrabc = gf_bs_read_int(bs, 1);
+		}
+	} else {
+		if (frame_state->frame_type == AV1_INTRA_ONLY_FRAME) {
+			frame_size(bs, state, frame_size_override_flag);
+			render_size(bs);
+			if (allow_screen_content_tools && state->UpscaledWidth == state->width) {
+				allow_intrabc = gf_bs_read_int(bs, 1);
+			}
+		} else {
+			u32 i = 0;
+			Bool frame_refs_short_signaling = GF_FALSE;
+			if (state->enable_order_hint) {
+				frame_refs_short_signaling = gf_bs_read_int(bs, 1);
+				if (frame_refs_short_signaling) {
+					u8 last_frame_idx = gf_bs_read_int(bs, 3);
+					u8 gold_frame_idx = gf_bs_read_int(bs, 3);
+					av1_set_frame_refs(state, last_frame_idx, gold_frame_idx, ref_frame_idx);
+				}
+			}
+			for (i = 0; i < AV1_REFS_PER_FRAME; i++) {
+				if (!frame_refs_short_signaling)
+					ref_frame_idx[i] = gf_bs_read_int(bs, 3);
+					if (state->frame_id_numbers_present_flag) {
+						u32 n = state->delta_frame_id_length_minus_2 + 2;
+						/*delta_frame_id_minus_1 =*/ gf_bs_read_int(bs, n);
+						//DeltaFrameId = delta_frame_id_minus_1 + 1;
+						//expectedFrameId[i] = ((current_frame_id + (1 << idLen) - DeltaFrameId) % (1 << idLen));
+					}
+			}
+			if (frame_size_override_flag && !error_resilient_mode) {
+				frame_size_with_refs(bs, state, frame_size_override_flag);
+			} else {
+				frame_size(bs, state, frame_size_override_flag);
+				render_size(bs);
+			}
+			frame_state->allow_high_precision_mv = 0;
+			if (!force_integer_mv) {
+				frame_state->allow_high_precision_mv = gf_bs_read_int(bs, 1);
+			}
+
+			read_interpolation_filter(bs);
+
+			/*is_motion_mode_switchable =*/ gf_bs_read_int(bs, 1);
+			if (! (error_resilient_mode || !state->enable_ref_frame_mvs) ) {
+				/*use_ref_frame_mvs = */gf_bs_read_int(bs, 1);
+			}
+		}
+	}
+
+	if ( !FrameIsIntra ) {
+		u32 i;
+		for (i=0; i< AV1_REFS_PER_FRAME; i++) {
+			u8 refFrame = AV1_LAST_FRAME + i;
+			u8 ridx = ref_frame_idx[ i ];
+			if (ridx>=0) {
+				u8 hint = state->RefOrderHint[ ridx ];
+				state->OrderHints[ refFrame ] = hint;
+	/*			if ( !enable_order_hint ) {
+					RefFrameSignBias[ refFrame ] = 0;
+				} else {
+					RefFrameSignBias[ refFrame ] = get_relative_dist( hint, OrderHint) > 0;
+				}
+	*/
+			}
+
+		}
+	}
+
+	if ( !(state->reduced_still_picture_header || disable_cdf_update) )
+		/*disable_frame_end_update_cdf = */gf_bs_read_int(bs, 1);
+
+	if (primary_ref_frame == AV1_PRIMARY_REF_NONE) {
+		//init_non_coeff_cdfs();
+		av1_setup_past_independence(state);
+	} else {
+		//load_cdfs(ref_frame_idx[primary_ref_frame]);
+		av1_load_previous(state, primary_ref_frame, ref_frame_idx);
+	}
+
+	av1_parse_tile_info(bs, state);
+	//quantization_params( ):
+	u8 base_q_idx = gf_bs_read_int(bs, 8);
+	s32 DeltaQUDc=0;
+	s32 DeltaQUAc=0;
+	s32 DeltaQVDc=0;
+	s32 DeltaQVAc=0;
+	s32 DeltaQYDc = av1_delta_q(bs);
+	if (! state->config->monochrome) {
+		u8 diff_uv_delta = 0;
+		if (state->separate_uv_delta_q)
+			diff_uv_delta = gf_bs_read_int(bs, 1);
+
+		DeltaQUDc = av1_delta_q(bs);
+		DeltaQUAc = av1_delta_q(bs);
+		if ( diff_uv_delta ) {
+			DeltaQVDc = av1_delta_q(bs);
+			DeltaQVAc = av1_delta_q(bs);
+		}
+	}
+	if (/*using_qmatrix*/gf_bs_read_int(bs, 1)) {
+		/*qm_y = */gf_bs_read_int(bs, 4);
+		/*qm_y = */gf_bs_read_int(bs, 4);
+		if ( !state->separate_uv_delta_q ) {
+			/*qm_v = */gf_bs_read_int(bs, 4);
+		}
+	}
+
+	u8 seg_features_SEG_LVL_ALT_Q_enabled[8] = {0,0,0,0,0,0,0,0};
+	s32 seg_features_SEG_LVL_ALT_Q[8] = {0,0,0,0,0,0,0,0};
+
+	//segmentation_params( ):
+	u8 segmentation_enabled = gf_bs_read_int(bs, 1);
+	if (segmentation_enabled) {
+		u8 segmentation_update_map = 1;
+		/*u8 segmentation_temporal_update = 0;*/
+		u8 segmentation_update_data = 1;
+		if ( primary_ref_frame != AV1_PRIMARY_REF_NONE ) {
+			segmentation_update_map = gf_bs_read_int(bs, 1);
+			if ( segmentation_update_map == 1 )
+				/*segmentation_temporal_update = */gf_bs_read_int(bs, 1);
+			segmentation_update_data = gf_bs_read_int(bs, 1);
+		}
+		if ( segmentation_update_data == 1 ) {
+			u32 i, j;
+			for (i=0; i < 8/*=MAX_SEGMENTS*/; i++) {
+				for (j=0; j < 8 /*=SEG_LVL_MAX*/; j++) {
+					if (/*feature_enabled = */gf_bs_read_int(bs, 1) == 1 ) {
+						s32 val;
+						u32 bitsToRead = Segmentation_Feature_Bits[ j ];
+						//this is SEG_LVL_ALT_Q
+						if (!j) seg_features_SEG_LVL_ALT_Q_enabled[i] = 1;
+
+						if ( Segmentation_Feature_Signed[ j ] == 1 ) {
+							val = gf_bs_read_int(bs, 1+bitsToRead);
+						} else {
+							val = gf_bs_read_int(bs, bitsToRead);
+						}
+						if (!j) seg_features_SEG_LVL_ALT_Q[i] = val;
+					}
+				}
+			}
+			//ignore all init steps
+		}
+
+	}
+
+	//delta_q_params():
+	/*u8 delta_q_res = 0;*/
+	u8 delta_q_present = 0;
+	if ( base_q_idx > 0 ) {
+		delta_q_present = gf_bs_read_int(bs, 1);
+	}
+	if ( delta_q_present ) {
+		/*delta_q_res = */gf_bs_read_int(bs, 2);
+	}
+
+	//delta_lf_params():
+	u8 delta_lf_present = 0;
+	/*u8 delta_lf_res = 0;
+	u8 delta_lf_multi = 0;*/
+	if ( delta_q_present ) {
+		if ( !allow_intrabc) {
+			delta_lf_present = gf_bs_read_int(bs, 1);
+		}
+		if ( delta_lf_present ) {
+			/*delta_lf_res = */gf_bs_read_int(bs, 2);
+			/*delta_lf_multi = */gf_bs_read_int(bs, 1);
+		}
+	}
+
+	//init lossless stuff!
+	u8 CodedLossless = 1;
+	for (idx = 0; idx < 8; idx++ ) {
+		u8 qindex = av1_get_qindex(GF_TRUE, idx, base_q_idx, delta_q_present, 0/*CurrentQIndex always ignored at this level of parsin*/, segmentation_enabled, seg_features_SEG_LVL_ALT_Q_enabled, seg_features_SEG_LVL_ALT_Q);
+		Bool LosslessArray = (qindex == 0) && (DeltaQYDc == 0) && (DeltaQUAc == 0) && (DeltaQUDc == 0) && (DeltaQVAc == 0) && (DeltaQVDc == 0);
+		if (!LosslessArray)
+			CodedLossless = 0;
+	}
+	Bool AllLossless = CodedLossless && (state->width == state->UpscaledWidth );
+
+	//loop_filter_params():
+	if (!CodedLossless && !allow_intrabc) {
+		u8 loop_filter_level_0 = gf_bs_read_int(bs, 6);
+		u8 loop_filter_level_1 = gf_bs_read_int(bs, 6);
+		if (!state->config->monochrome) {
+			if ( loop_filter_level_0 || loop_filter_level_1 ) {
+				/*u8 loop_filter_level_2 = */gf_bs_read_int(bs, 6);
+				/*u8 loop_filter_level_3 = */gf_bs_read_int(bs, 6);
+			}
+		}
+		/*u8 loop_filter_sharpness = */gf_bs_read_int(bs, 3);
+		u8 loop_filter_delta_enabled = gf_bs_read_int(bs, 1);
+		if ( loop_filter_delta_enabled == 1 ) {
+			u8 loop_filter_delta_update = gf_bs_read_int(bs, 1);
+			if (loop_filter_delta_update) {
+				u32 i;
+				for ( i = 0; i < 8/*TOTAL_REFS_PER_FRAME*/; i++ ) {
+					u8 update_ref_delta = gf_bs_read_int(bs, 1);
+					if ( update_ref_delta == 1 ) {
+						/*u8 loop_filter_ref_deltas_i = */gf_bs_read_int(bs, 1+6);
+					}
+				}
+				for ( i = 0; i < 2; i++ ) {
+					u8 update_mode_delta = gf_bs_read_int(bs, 1);
+					if (update_mode_delta) {
+						/*u8 loop_filter_mode_deltas_i = */gf_bs_read_int(bs, 1+6);
+					}
+				}
+			}
+		}
+	}
+	//cdef_params( ):
+	if (!CodedLossless && !allow_intrabc && state->enable_cdef) {
+		/*u8 cdef_damping_minus_3 = */gf_bs_read_int(bs, 2);
+		u8 cdef_bits = gf_bs_read_int(bs, 2);
+		u32 i, num_cd = 1<<cdef_bits;
+		for (i=0; i<num_cd; i++) {
+			/*u8 cdef_y_pri_strength_i = */gf_bs_read_int(bs, 4);
+			/*u8 cdef_y_sec_strength_i = */gf_bs_read_int(bs, 2);
+			if ( ! state->config->monochrome ) {
+				/*u8 cdef_uv_pri_strength_i = */gf_bs_read_int(bs, 4);
+				/*u8 cdef_uv_sec_strength_i = */gf_bs_read_int(bs, 2);
+			}
+		}
+	}
+
+	//lr_params( ) :
+	if (!AllLossless && !allow_intrabc && state->enable_restoration ) {
+		u32 i, nb_planes = state->config->monochrome ? 1 : 3;
+		u8 UsesLr = 0;
+		u8 usesChromaLr = 0;
+		for (i=0; i<nb_planes; i++) {
+			u8 lr_type = gf_bs_read_int(bs, 2);
+			//FrameRestorationType[i] = Remap_Lr_Type[lr_type]
+			if (lr_type != AV1_RESTORE_NONE) {
+				UsesLr = 1;
+				if ( i > 0 ) {
+					usesChromaLr = 1;
+				}
+			}
+		}
+		if ( UsesLr ) {
+			if (state->use_128x128_superblock) {
+				/*u8 lr_unit_shift_minus_1 = */gf_bs_read_int(bs, 1) ;
+			} else {
+				u8 lr_unit_shift = gf_bs_read_int(bs, 1);
+				if (lr_unit_shift) {
+					u8 lr_unit_extra_shift = gf_bs_read_int(bs, 1);
+					lr_unit_shift += lr_unit_extra_shift;
+				}
+			}
+			if (state->config->chroma_subsampling_x && state->config->chroma_subsampling_y && usesChromaLr ) {
+				/*u8 lr_uv_shift = */gf_bs_read_int(bs, 1);
+			}
+		}
+	}
+	//read_tx_mode():
+	if ( CodedLossless == 1 ) {
+	} else {
+		/*tx_mode_select = */gf_bs_read_int(bs, 1);
+	}
+
+	//frame_reference_mode( ):
+	u8 reference_select=0;
+	if ( FrameIsIntra ) {
+	} else {
+		reference_select = gf_bs_read_int(bs, 1);
+	}
+
+	//skip_mode_params( ):
+	u8 skipModeAllowed = 0;
+	if ( FrameIsIntra || !reference_select || !state->enable_order_hint ) {
+	} else {
+		u32 i;
+		s32 forwardIdx = -1;
+		s32 backwardIdx = -1;
+		s32 forwardHint=0;
+		s32 backwardHint=0;
+		for (i=0; i<AV1_REFS_PER_FRAME; i++ ) {
+			u8 refHint = state->RefOrderHint[ ref_frame_idx[ i ] ];
+			if ( av1_get_relative_dist( refHint, frame_state->order_hint, state ) < 0 ) {
+				if ( forwardIdx < 0 || av1_get_relative_dist( refHint, forwardHint, state) > 0 ) {
+					forwardIdx = i;
+					forwardHint = refHint;
+				}
+			} else if ( av1_get_relative_dist( refHint, frame_state->order_hint, state) > 0 ) {
+				if ( backwardIdx < 0 || av1_get_relative_dist( refHint, backwardHint, state) < 0 ) {
+					backwardIdx = i;
+					backwardHint = refHint;
+				}
+			}
+		}
+		if ( forwardIdx < 0 ) {
+			skipModeAllowed = 0;
+		} else if ( backwardIdx >= 0 ) {
+			skipModeAllowed = 1;
+			//SkipModeFrame[0] = AV1_LAST_FRAME + MIN(forwardIdx, backwardIdx);
+			//SkipModeFrame[1] = AV1_LAST_FRAME + MAX(forwardIdx, backwardIdx);
+		} else {
+			s32 secondForwardIdx = -1;
+			s32 secondForwardHint=0;
+			for ( i = 0; i < AV1_REFS_PER_FRAME; i++ ) {
+				u8 refHint = state->RefOrderHint[ ref_frame_idx[ i ] ];
+				if ( av1_get_relative_dist( refHint, forwardHint, state) < 0 ) {
+					if ( secondForwardIdx < 0 || av1_get_relative_dist( refHint, secondForwardHint, state ) > 0 ) {
+						secondForwardIdx = i;
+						secondForwardHint = refHint;
+					}
+				}
+			}
+			if ( secondForwardIdx < 0 ) {
+				skipModeAllowed = 0;
+			} else {
+				skipModeAllowed = 1;
+				//SkipModeFrame[ 0 ] = LAST_FRAME + Min(forwardIdx, secondForwardIdx)
+				//SkipModeFrame[ 1 ] = LAST_FRAME + Max(forwardIdx, secondForwardIdx)
+			}
+		}
+	}
+	if (skipModeAllowed) {
+		/*skip_mode_present = */gf_bs_read_int(bs, 1);
+	}
+
+
+	if ( FrameIsIntra || error_resilient_mode || !state->enable_warped_motion ) {
+
+	} else {
+		/*allow_warped_motion = */gf_bs_read_int(bs, 1);
+	}
+
+	/*reduced_tx = */gf_bs_read_int(bs, 1);
+
+	//global_motion_params( )
+	u32 ref;
+	for (ref=AV1_LAST_FRAME; ref <= AV1_ALTREF_FRAME; ref++ ) {
+		u32 i;
+		for (i=0; i<6; i++) {
+			state->GmParams.coefs[ref][i] = ( ( i % 3 == 2 ) ? 1 << WARPEDMODEL_PREC_BITS : 0 );
+		}
+	}
+	if (! FrameIsIntra ) {
+		u32 ref;
+		for (ref=AV1_LAST_FRAME; ref<=AV1_ALTREF_FRAME; ref++ ) {
+			u8 type = AV1_GMC_IDENTITY;
+			Bool is_global = gf_bs_read_int(bs, 1);
+			if (is_global) {
+				Bool is_rot_zoom = gf_bs_read_int(bs, 1);
+				if (is_rot_zoom) {
+					type = AV1_GMC_ROTZOOM;
+				} else {
+					Bool is_trans = gf_bs_read_int(bs, 1);
+					type = is_trans ? AV1_GMC_TRANSLATION : AV1_GMC_AFFINE;
+
+				}
+			}
+
+			if (type>=AV1_GMC_ROTZOOM) {
+				av1_read_global_param(state, bs, type,ref,2);
+				av1_read_global_param(state, bs, type,ref,3);
+				if ( type == AV1_GMC_AFFINE ) {
+					av1_read_global_param(state, bs, type,ref,4);
+					av1_read_global_param(state, bs, type,ref,5);
+				} else {
+					state->GmParams.coefs[ref][4] = -state->GmParams.coefs[ref][3];
+					state->GmParams.coefs[ref][5] = state->GmParams.coefs[ref][2];
+
+				}
+			}
+			if ( type >= AV1_GMC_TRANSLATION ) {
+				av1_read_global_param(state, bs, type,ref,0);
+				av1_read_global_param(state, bs, type,ref,1);
+			}
+		}
+	}
+
+	//film_grain_params()
+	if (!state->film_grain_params_present || (!state->frame_state.show_frame && !showable_frame) ) {
+	} else {
+		u8 apply_grain = gf_bs_read_int(bs, 1);
+		if (apply_grain ) {
+			/*u8 grain_seed = */gf_bs_read_int(bs, 16);
+			u8 update_grain = 1;
+			if (state->frame_state.frame_type == AV1_INTER_FRAME ) {
+				update_grain = gf_bs_read_int(bs, 1);
+			}
+			if (!update_grain) {
+				/*u8 film_grain_params_ref_idx = */gf_bs_read_int(bs, 3);
+			} else {
+				u32 i, num_y_points = gf_bs_read_int(bs, 4);
+				for ( i = 0; i < num_y_points; i++ ) {
+					/*u8 point_y_value = */gf_bs_read_int(bs, 8);
+					/*u8 point_y_scaling = */gf_bs_read_int(bs, 8);
+				}
+				u8 chroma_scaling_from_luma = 0;
+				if (!state->config->monochrome) chroma_scaling_from_luma = gf_bs_read_int(bs, 1);
+
+				u8 num_cb_points = 0;
+				u8 num_cr_points = 0;
+				if ( state->config->monochrome || chroma_scaling_from_luma ||
+				 	( (state->config->chroma_subsampling_x == 1) && (state->config->chroma_subsampling_y == 1) && (num_y_points == 0) )
+				) {
+				} else {
+					num_cb_points = gf_bs_read_int(bs, 4);
+					for (i=0; i<num_cb_points; i++) {
+						/*point_cb_value[ i ] = */gf_bs_read_int(bs, 8);
+						/*point_cb_scaling[ i ] = */gf_bs_read_int(bs, 8);
+					}
+					num_cr_points = gf_bs_read_int(bs, 4);
+					for (i=0; i<num_cr_points; i++) {
+						/*point_cb_value[ i ] = */gf_bs_read_int(bs, 8);
+						/*point_cb_scaling[ i ] = */gf_bs_read_int(bs, 8);
+					}
+				}
+				/*u8 grain_scaling_minus_8 = */gf_bs_read_int(bs, 2);
+				u8 ar_coeff_lag = gf_bs_read_int(bs, 2);
+				u16 numPosLuma = 2 * ar_coeff_lag * ( ar_coeff_lag + 1 );
+				u16 numPosChroma = numPosLuma;
+				if ( num_y_points ) {
+					numPosChroma = numPosLuma + 1;
+					for ( i = 0; i < numPosLuma; i++ ) {
+						/*ar_coeffs_y_plus_128[ i ] = */gf_bs_read_int(bs, 8);
+					}
+				}
+				if ( chroma_scaling_from_luma || num_cb_points ) {
+					for ( i = 0; i < numPosChroma; i++ ) {
+						/*ar_coeffs_cb_plus_128[ i ] =*/gf_bs_read_int(bs, 8);
+					}
+				}
+				if ( chroma_scaling_from_luma || num_cr_points ) {
+					for ( i = 0; i < numPosChroma; i++ ) {
+						/*ar_coeffs_cr_plus_128[ i ] =*/gf_bs_read_int(bs, 8);
+					}
+				}
+				/*u8 ar_coeff_shift_minus_6 = */gf_bs_read_int(bs, 2);
+				/*u8 grain_scale_shift = */gf_bs_read_int(bs, 2);
+				if ( num_cb_points ) {
+					/*u8 cb_mult = */gf_bs_read_int(bs, 8);
+					/*u8 cb_luma_mult = */gf_bs_read_int(bs, 8);
+					/*u8 cb_offset = */gf_bs_read_int(bs, 9);
+				}
+				if ( num_cr_points ) {
+					/*u8 cr_mult = */gf_bs_read_int(bs, 8);
+					/*u8 cr_luma_mult = */gf_bs_read_int(bs, 8);
+					/*u8 cr_offset = */gf_bs_read_int(bs, 9);
+				}
+				/*u8 overlap_flag = */gf_bs_read_int(bs, 1);
+				/*u8 clip_to_restricted_range = */gf_bs_read_int(bs, 1);
+			}
+		}
+	}
+
+	//end of uncompressed header !!
+}
+
+
+static GF_Err av1_parse_tile_group(GF_BitStream *bs, AV1State *state, u64 obu_start, u64 obu_size)
+{
+	u32 TileNum, tg_start=0, tg_end=0;
+	Bool numTiles = state->tileCols * state->tileRows;
+	Bool tile_start_and_end_present_flag = GF_FALSE;
+	GF_Err e = GF_OK;
+	if (numTiles > 1)
+		tile_start_and_end_present_flag = gf_bs_read_int(bs, 1);
+
+	if (numTiles == 1 || !tile_start_and_end_present_flag) {
+		tg_start = 0;
+		tg_end = numTiles - 1;
+		/*state->frame_state.tg[0].start_idx = 0;
+		state->frame_state.tg[0].end_idx = numTiles - 1;*/
+	} else {
+		u32 tileBits = state->tileColsLog2 + state->tileRowsLog2;
+		/*state->frame_state.tg[state->frame_state.tg_idx].start_idx*/ tg_start = gf_bs_read_int(bs, tileBits);
+		/*state->frame_state.tg[state->frame_state.tg_idx].end_idx*/ tg_end = gf_bs_read_int(bs, tileBits);
+	}
+	/*state->frame_state.tg_idx++;*/
+
+	gf_bs_align(bs);
+
+	state->frame_state.nb_tiles_in_obu = 0;
+	for (TileNum = tg_start; TileNum <= tg_end; TileNum++) {
+		u32 tile_start_offset, tile_size;
+		/*u32 tileRow = TileNum / state->tileCols;
+		u32 tileCol = TileNum % state->tileCols;*/
+		Bool lastTile = TileNum == tg_end;
+		u64 pos = gf_bs_get_position(bs);
+		if (lastTile) {
+			tile_start_offset = (u32) (pos - obu_start);
+			tile_size = (u32)(obu_size - (pos - obu_start) );
+		} else {
+			u64 tile_size_minus_1 = aom_av1_le(bs, state->tile_size_bytes);
+			pos = gf_bs_get_position(bs);
+			tile_start_offset = (u32) (pos - obu_start);
+			tile_size = (u32)(tile_size_minus_1 + 1/* + state->tile_size_bytes*/);
+		}
+
+
+		if (tile_start_offset + tile_size > obu_size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AV1]Error parsing tile group, tile %d start %d + size %d exceeds OBU length %d\n", TileNum, tile_start_offset, tile_size, obu_size));
+			e = GF_NON_COMPLIANT_BITSTREAM;
+			break;
+		}
+
+		state->frame_state.tiles[state->frame_state.nb_tiles_in_obu].obu_start_offset = tile_start_offset;
+		state->frame_state.tiles[state->frame_state.nb_tiles_in_obu].size = tile_size;
+		gf_bs_skip_bytes(bs, tile_size);
+		state->frame_state.nb_tiles_in_obu++;
+	}
+	if (tg_end == numTiles-1) {
+		av1_decode_frame_wrapup(state);
+	}
+	return e;
+}
+
+static void av1_parse_frame_header(GF_BitStream *bs, AV1State *state)
+{
+	AV1StateFrame *frame_state = &state->frame_state;
+	if (frame_state->seen_frame_header == GF_FALSE) {
+		u64 pos = gf_bs_get_position(bs);
+		state->frame_state.show_existing_frame = GF_FALSE;
+		frame_state->seen_frame_header = GF_TRUE;
+		av1_parse_uncompressed_header(bs, state);
+		state->frame_state.is_first_frame = GF_FALSE;
+		state->frame_state.uncompressed_header_bytes = (u32) (gf_bs_get_position(bs)-pos);
+
+		if (state->frame_state.show_existing_frame) {
+			av1_decode_frame_wrapup(state);
+			frame_state->seen_frame_header = GF_FALSE;
+		} else {
+			//TileNum = 0;
+			frame_state->seen_frame_header = GF_TRUE;
+		}
+	}
+}
+
+static GF_Err av1_parse_frame(GF_BitStream *bs, AV1State *state, u64 obu_start, u64 obu_size)
+{
+	av1_parse_frame_header(bs, state);
+	//byte alignment
+	gf_bs_align(bs);
+	return av1_parse_tile_group(bs, state, obu_start, obu_size);
+}
+
+GF_EXPORT
+GF_Err gf_media_aom_av1_parse_obu(GF_BitStream *bs, ObuType *obu_type, u64 *obu_size, u32 *obu_hdr_size, AV1State *state)
+{
+	GF_Err e = GF_OK;
+	u32 hdr_size;
+	u64 pos = gf_bs_get_position(bs);
+
+	if (!bs || !obu_type || !state)
+		return GF_BAD_PARAM;
+
+	state->obu_extension_flag = state->obu_has_size_field = 0;
+	state->temporal_id = state->spatial_id = 0;
+	state->frame_state.uncompressed_header_bytes = 0;
+	e = av1_parse_obu_header(bs, obu_type, &state->obu_extension_flag, &state->obu_has_size_field, &state->temporal_id, &state->spatial_id);
+	if (e)
+		return e;
+
+	if (state->obu_has_size_field) {
+		*obu_size = (u32)read_leb128(bs, NULL);
+	} else {
+		if (*obu_size >= 1 + state->obu_extension_flag) {
+			*obu_size = *obu_size - 1 - state->obu_extension_flag;
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] computed OBU size "LLD" (input value = "LLU"). Skipping.\n", *obu_size - 1 - state->obu_extension_flag, *obu_size));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+	}
+	hdr_size = (u32) (gf_bs_get_position(bs) - pos);
+	*obu_size += hdr_size;
+	if (obu_hdr_size) *obu_hdr_size = hdr_size;
+
+	if (*obu_type != OBU_SEQUENCE_HEADER && *obu_type != OBU_TEMPORAL_DELIMITER &&
+		state->OperatingPointIdc != 0 && state->obu_extension_flag == 1)
+	{
+		u32 inTemporalLayer = (state->OperatingPointIdc >> state->temporal_id) & 1;
+		u32 inSpatialLayer = (state->OperatingPointIdc >> (state->spatial_id + 8)) & 1;
+		if (!inTemporalLayer || !inSpatialLayer) {
+			*obu_type = -1;
+			gf_bs_seek(bs, pos + *obu_size);
+			return GF_OK;
+		}
+	}
+
+	e = GF_OK;
+	switch (*obu_type) {
+	case OBU_SEQUENCE_HEADER:
+		av1_parse_sequence_header_obu(bs, state);
+		if (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;
+
+	case OBU_METADATA:
+#if 0
+ 		//TODO + sample groups
+		const ObuMetadataType metadata_type = (u32)read_leb128(bs, NULL); we should check for 16 bits limit (AV1MetadataSampleGroupEntry) for ISOBMFF bindings, see https ://github.com/AOMediaCodec/av1-isobmff/pull/86#issuecomment-416659538
+		if (metadata_type == OBU_METADATA_TYPE_ITUT_T35) {
+		} else if (metadata_type == OBU_METADATA_TYPE_HDR_CLL) {
+		} else if (metadata_type == OBU_METADATA_TYPE_HDR_MDCV) {
+		} else if (metadata_type == OBU_METADATA_TYPE_SCALABILITY) {
+		} else if (metadata_type == METADATA_TYPE_TIMECODE) {
+		}
+#endif
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] parsing for metadata is not implemented. Forwarding.\n"));
+
+		if (gf_bs_get_position(bs) > pos + *obu_size) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] Metadata parsing consumed too many bytes !\n"));
+			e = GF_NON_COMPLIANT_BITSTREAM;
+		}
+		gf_bs_seek(bs, pos + *obu_size);
+		break;
+
+	case OBU_FRAME_HEADER:
+	case OBU_REDUNDANT_FRAME_HEADER:
+		av1_parse_frame_header(bs, state);
+		if (gf_bs_get_position(bs) > pos + *obu_size) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] Frame header parsing consumed too many bytes !\n"));
+			e = GF_NON_COMPLIANT_BITSTREAM;
+		}
+		gf_bs_seek(bs, pos + *obu_size);
+		break;
+	case OBU_FRAME:
+		e = av1_parse_frame(bs, state, pos, *obu_size);
+		if (gf_bs_get_position(bs) != pos + *obu_size) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] Frame parsing did not consume the right number of bytes !\n"));
+			e = GF_NON_COMPLIANT_BITSTREAM;
+		}
+		gf_bs_seek(bs, pos + *obu_size);
+		break;
+	case OBU_TILE_GROUP:
+		e = av1_parse_tile_group(bs, state, pos, *obu_size);
+		if (gf_bs_get_position(bs) != pos + *obu_size) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] Tile group parsing did not consume the right number of bytes !\n"));
+			e = GF_NON_COMPLIANT_BITSTREAM;
+		}
+		gf_bs_seek(bs, pos + *obu_size);
+		break;
+	case OBU_TEMPORAL_DELIMITER:
+		state->frame_state.seen_frame_header = GF_FALSE;
+	case OBU_PADDING:
+		gf_bs_seek(bs, pos + *obu_size);
+		break;
+	default:
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AV1] unknown OBU type %u (size "LLU"). Skipping.\n", *obu_type, *obu_size));
+		gf_bs_seek(bs, pos + *obu_size);
+		break;
+	}
+	return e;
+}
+
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
 GF_EXPORT
@@ -1573,7 +4009,6 @@
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 
-
 GF_EXPORT
 u8 gf_mp3_layer(u32 hdr)
 {
@@ -2095,14 +4530,16 @@
 	return gf_media_avc_slice_is_intra(avc);
 }
 
-static const struct {
+struct sar_ {
 	u32 w, h;
-} avc_sar[14] =
-{
+};
+
+static const struct sar_ avc_sar[] = {
 	{ 0, 0 }, { 1, 1 }, { 12, 11 }, { 10, 11 },
 	{ 16, 11 }, { 40, 33 }, { 24, 11 }, { 20, 11 },
 	{ 32, 11 }, { 80, 33 }, { 18, 11 }, { 15, 11 },
-	{ 64, 33 }, { 160,99 },
+	{ 64, 33 }, { 160,99 }, { 4, 3 }, { 3, 2 },
+	{ 2, 1 }
 };
 
 
@@ -2132,7 +4569,7 @@
 }
 
 /*returns the nal_size without emulation prevention bytes*/
-static u32 avc_emulation_bytes_add_count(char *buffer, u32 nal_size)
+static u32 gf_media_nalu_emulation_bytes_add_count(char *buffer, u32 nal_size)
 {
 	u32 i = 0, emulation_bytes_count = 0;
 	u8 num_zero = 0;
@@ -2145,7 +4582,7 @@
 		\96 0x00000302
 		\96 0x00000303"
 		*/
-		if (num_zero == 2 && buffer[i] < 0x04) {
+		if (num_zero == 2 && (u8) buffer[i] < 0x04) {
 			/*emulation code found*/
 			num_zero = 0;
 			emulation_bytes_count++;
@@ -2162,9 +4599,8 @@
 	return emulation_bytes_count;
 }
 
-static u32 avc_add_emulation_bytes(const char *buffer_src, char *buffer_dst, u32 nal_size)
+static u32 gf_media_nalu_add_emulation_bytes(const char *buffer_src, char *buffer_dst, u32 nal_size)
 {
-
 	u32 i = 0, emulation_bytes_count = 0;
 	u8 num_zero = 0;
 
@@ -2176,7 +4612,7 @@
 		0x00000302
 		0x00000303"
 		*/
-		if (num_zero == 2 && buffer_src[i] < 0x04) {
+		if (num_zero == 2 && (u8)buffer_src[i] < 0x04) {
 			/*add emulation code*/
 			num_zero = 0;
 			buffer_dst[i+emulation_bytes_count] = 0x03;
@@ -2196,7 +4632,7 @@
 }
 
 /*returns the nal_size without emulation prevention bytes*/
-static u32 avc_emulation_bytes_remove_count(const char *buffer, u32 nal_size)
+u32 gf_media_nalu_emulation_bytes_remove_count(const char *buffer, u32 nal_size)
 {
 	u32 i = 0, emulation_bytes_count = 0;
 	u8 num_zero = 0;
@@ -2213,7 +4649,7 @@
 		if (num_zero == 2
 		 && buffer[i] == 0x03
 		 && i+1 < nal_size /*next byte is readable*/
-		 && buffer[i+1] < 0x04)
+		 && (u8) buffer[i+1] < 0x04)
 		{
 			/*emulation code found*/
 			num_zero = 0;
@@ -2233,7 +4669,8 @@
 }
 
 /*nal_size is updated to allow better error detection*/
-static u32 avc_remove_emulation_bytes(const char *buffer_src, char *buffer_dst, u32 nal_size)
+GF_EXPORT
+u32 gf_media_nalu_remove_emulation_bytes(const char *buffer_src, char *buffer_dst, u32 nal_size)
 {
 	u32 i = 0, emulation_bytes_count = 0;
 	u8 num_zero = 0;
@@ -2250,7 +4687,7 @@
 		if (num_zero == 2
 		 && buffer_src[i] == 0x03
 		 && i+1 < nal_size /*next byte is readable*/
-		 && buffer_src[i+1] < 0x04)
+		 && (u8) buffer_src[i+1] < 0x04)
 		{
 			/*emulation code found*/
 			num_zero = 0;
@@ -2275,7 +4712,6 @@
 s32 gf_media_avc_read_sps(const char *sps_data, u32 sps_size, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos)
 {
 	AVC_SPS *sps;
-	u32 ChromaArrayType = 0;
 	s32 mb_width, mb_height, sps_id = -1;
 	u32 profile_idc, level_idc, pcomp, i, chroma_format_idc, cl=0, cr=0, ct=0, cb=0, luma_bd, chroma_bd;
 	u8 separate_colour_plane_flag = 0;
@@ -2285,7 +4721,7 @@
 
 	/*SPS still contains emulation bytes*/
 	sps_data_without_emulation_bytes = gf_malloc(sps_size*sizeof(char));
-	sps_data_without_emulation_bytes_size = avc_remove_emulation_bytes(sps_data, sps_data_without_emulation_bytes, sps_size);
+	sps_data_without_emulation_bytes_size = gf_media_nalu_remove_emulation_bytes(sps_data, sps_data_without_emulation_bytes, sps_size);
 	bs = gf_bs_new(sps_data_without_emulation_bytes, sps_data_without_emulation_bytes_size, GF_BITSTREAM_READ);
 	if (!bs) {
 		sps_id = -1;
@@ -2318,8 +4754,8 @@
 	}
 
 	luma_bd = chroma_bd = 0;
-	chroma_format_idc = ChromaArrayType = 1;
 	sps = &avc->sps[sps_id];
+	chroma_format_idc = sps->ChromaArrayType = 1;
 	sps->state |= subseq_sps ? AVC_SUBSPS_PARSED : AVC_SPS_PARSED;
 
 	/*High Profile and SVC*/
@@ -2337,7 +4773,7 @@
 	case 118:
 	case 128:
 		chroma_format_idc = bs_get_ue(bs);
-		ChromaArrayType = chroma_format_idc;
+		sps->ChromaArrayType = chroma_format_idc;
 		if (chroma_format_idc == 3) {
 			separate_colour_plane_flag = gf_bs_read_int(bs, 1);
 			/*
@@ -2345,7 +4781,7 @@
 			\96	If separate_colour_plane_flag is equal to 0, ChromaArrayType is set equal to chroma_format_idc.
 			\96	Otherwise (separate_colour_plane_flag is equal to 1), ChromaArrayType is set equal to 0.
 			*/
-			if (separate_colour_plane_flag) ChromaArrayType = 0;
+			if (separate_colour_plane_flag) sps->ChromaArrayType = 0;
 		}
 		luma_bd = bs_get_ue(bs);
 		chroma_bd = bs_get_ue(bs);
@@ -2386,14 +4822,18 @@
 		sps->offset_for_non_ref_pic = bs_get_se(bs);
 		sps->offset_for_top_to_bottom_field = bs_get_se(bs);
 		sps->poc_cycle_length = bs_get_ue(bs);
+		if (sps->poc_cycle_length > ARRAY_LENGTH(sps->offset_for_ref_frame)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[avc-h264] offset_for_ref_frame overflow from poc_cycle_length\n"));
+			goto exit;
+		}
 		for(i=0; i<sps->poc_cycle_length; i++) sps->offset_for_ref_frame[i] = bs_get_se(bs);
 	}
 	if (sps->poc_type > 2) {
 		sps_id = -1;
 		goto exit;
 	}
-	sps->max_num_ref_frames = bs_get_ue(bs); 
-	sps->gaps_in_frame_num_value_allowed_flag = gf_bs_read_int(bs, 1); 
+	sps->max_num_ref_frames = bs_get_ue(bs);
+	sps->gaps_in_frame_num_value_allowed_flag = gf_bs_read_int(bs, 1);
 	mb_width = bs_get_ue(bs) + 1;
 	mb_height= bs_get_ue(bs) + 1;
 
@@ -2401,10 +4841,10 @@
 
 	sps->width = mb_width * 16;
 	sps->height = (2-sps->frame_mbs_only_flag) * mb_height * 16;
-	
+
 	if (!sps->frame_mbs_only_flag) sps->mb_adaptive_frame_field_flag = gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 1); /*direct_8x8_inference_flag*/
-	
+
 	if (gf_bs_read_int(bs, 1)) { /*crop*/
 		int CropUnitX, CropUnitY, SubWidthC = -1, SubHeightC = -1;
 
@@ -2416,7 +4856,7 @@
 			SubWidthC = 1, SubHeightC = 1;
 		}
 
-		if (ChromaArrayType == 0) {
+		if (sps->ChromaArrayType == 0) {
 			assert(SubWidthC==-1);
 			CropUnitX = 1;
 			CropUnitY = 2-sps->frame_mbs_only_flag;
@@ -2436,7 +4876,7 @@
 		cr *= CropUnitX;
 		ct *= CropUnitY;
 		cb *= CropUnitY;
-	} 
+	}
 	sps->crop.left = cl;
 	sps->crop.right = cr;
 	sps->crop.top = ct;
@@ -2454,13 +4894,15 @@
 			if (aspect_ratio_idc == 255) {
 				sps->vui.par_num = gf_bs_read_int(bs, 16); /*AR num*/
 				sps->vui.par_den = gf_bs_read_int(bs, 16); /*AR den*/
-			} else if (aspect_ratio_idc<14) {
+			} else if (aspect_ratio_idc < sizeof(avc_sar)/sizeof(struct sar_)) {
 				sps->vui.par_num = avc_sar[aspect_ratio_idc].w;
 				sps->vui.par_den = avc_sar[aspect_ratio_idc].h;
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[avc-h264] Unknown aspect_ratio_idc: your video may have a wrong aspect ratio. Contact the GPAC team!\n"));
 			}
 		}
 		sps->vui.overscan_info_present_flag = gf_bs_read_int(bs, 1);
-		if(sps->vui.overscan_info_present_flag)		
+		if(sps->vui.overscan_info_present_flag)
 			gf_bs_read_int(bs, 1);		/* overscan_appropriate_flag */
 
 		/* default values */
@@ -2474,10 +4916,10 @@
 			sps->vui.video_format = gf_bs_read_int(bs, 3);
 			sps->vui.video_full_range_flag = gf_bs_read_int(bs, 1);
 			sps->vui.colour_description_present_flag = gf_bs_read_int(bs, 1);
-			if (sps->vui.colour_description_present_flag) { 
-				sps->vui.colour_primaries = gf_bs_read_int(bs, 8); 
-				sps->vui.transfer_characteristics = gf_bs_read_int(bs, 8); 
-				sps->vui.matrix_coefficients = gf_bs_read_int(bs, 8); 
+			if (sps->vui.colour_description_present_flag) {
+				sps->vui.colour_primaries = gf_bs_read_int(bs, 8);
+				sps->vui.transfer_characteristics = gf_bs_read_int(bs, 8);
+				sps->vui.matrix_coefficients = gf_bs_read_int(bs, 8);
 			}
 		}
 
@@ -2502,7 +4944,7 @@
 			avc_parse_hrd_parameters(bs, &sps->vui.hrd);
 
 		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(bs, 1); 
+			sps->vui.low_delay_hrd_flag = gf_bs_read_int(bs, 1);
 
 		sps->vui.pic_struct_present_flag = gf_bs_read_int(bs, 1);
 	}
@@ -2515,14 +4957,14 @@
 
 			/*inter_layer_deblocking_filter_control_present_flag=*/	gf_bs_read_int(bs, 1);
 			extended_spatial_scalability_idc = gf_bs_read_int(bs, 2);
-			if (ChromaArrayType == 1 || ChromaArrayType == 2) {
+			if (sps->ChromaArrayType == 1 || sps->ChromaArrayType == 2) {
 				/*chroma_phase_x_plus1_flag*/ gf_bs_read_int(bs, 1);
 			}
-			if( ChromaArrayType == 1 ) {
+			if (sps->ChromaArrayType == 1) {
 				/*chroma_phase_y_plus1*/ gf_bs_read_int(bs, 2);
 			}
 			if (extended_spatial_scalability_idc == 1) {
-				if( ChromaArrayType > 0 ) {
+				if (sps->ChromaArrayType > 0) {
 					/*seq_ref_layer_chroma_phase_x_plus1_flag*/gf_bs_read_int(bs, 1);
 					/*seq_ref_layer_chroma_phase_y_plus1*/gf_bs_read_int(bs, 2);
 				}
@@ -2595,7 +5037,7 @@
 
 	/*PPS still contains emulation bytes*/
 	pps_data_without_emulation_bytes = gf_malloc(pps_size*sizeof(char));
-	pps_data_without_emulation_bytes_size = avc_remove_emulation_bytes(pps_data, pps_data_without_emulation_bytes, pps_size);
+	pps_data_without_emulation_bytes_size = gf_media_nalu_remove_emulation_bytes(pps_data, pps_data_without_emulation_bytes, pps_size);
 	bs = gf_bs_new(pps_data_without_emulation_bytes, pps_data_without_emulation_bytes_size, GF_BITSTREAM_READ);
 	if (!bs) {
 		pps_id = -1;
@@ -2628,19 +5070,41 @@
 	pps->entropy_coding_mode_flag = gf_bs_read_int(bs, 1);
 	pps->pic_order_present= gf_bs_read_int(bs, 1);
 	pps->slice_group_count= bs_get_ue(bs) + 1;
-	if (pps->slice_group_count > 1 ) /*pps->mb_slice_group_map_type = */bs_get_ue(bs);
-	/*pps->ref_count[0]= */bs_get_ue(bs) /*+ 1*/;
-	/*pps->ref_count[1]= */bs_get_ue(bs) /*+ 1*/;
+	if (pps->slice_group_count > 1) {
+		u32 iGroup;
+		pps->mb_slice_group_map_type = bs_get_ue(bs);
+		if (pps->mb_slice_group_map_type == 0) {
+			for (iGroup = 0; iGroup <= pps->slice_group_count - 1; iGroup++)
+				/*run_length_minus1[iGroup] = */ bs_get_ue(bs);
+		} else if (pps->mb_slice_group_map_type == 2) {
+				for (iGroup = 0; iGroup < pps->slice_group_count-1; iGroup++) {
+					/*top_left[iGroup] = */ bs_get_ue(bs);
+					/*bottom_right[iGroup] = */ bs_get_ue(bs);
+				}
+		} else if (pps->mb_slice_group_map_type == 3 || pps->mb_slice_group_map_type == 4 || pps->mb_slice_group_map_type == 5) {
+			/*slice_group_change_direction_flag =*/ gf_bs_read_int(bs, 1);
+			/*slice_group_change_rate_minus1 = */ bs_get_ue(bs);
+		} else if (pps->mb_slice_group_map_type == 6) {
+			u32 i;
+			pps->pic_size_in_map_units_minus1 = bs_get_ue(bs);
+			for (i = 0; i <= pps->pic_size_in_map_units_minus1; i++) {
+				/*slice_group_id[i] = */ gf_bs_read_int(bs, (u32)ceil(log(pps->slice_group_count)/log(2)));
+			}
+		}
+	}
+	pps->num_ref_idx_l0_default_active_minus1 = bs_get_ue(bs);
+	pps->num_ref_idx_l1_default_active_minus1 = bs_get_ue(bs);
+
 	/*
 	if ((pps->ref_count[0] > 32) || (pps->ref_count[1] > 32)) goto exit;
 	*/
 
-	/*pps->weighted_pred = */gf_bs_read_int(bs, 1);
+	pps->weighted_pred_flag = gf_bs_read_int(bs, 1);
 	/*pps->weighted_bipred_idc = */gf_bs_read_int(bs, 2);
 	/*pps->init_qp = */bs_get_se(bs) /*+ 26*/;
 	/*pps->init_qs= */bs_get_se(bs) /*+ 26*/;
 	/*pps->chroma_qp_index_offset = */bs_get_se(bs);
-	/*pps->deblocking_filter_parameters_present = */gf_bs_read_int(bs, 1);
+	pps->deblocking_filter_control_present_flag = gf_bs_read_int(bs, 1);
 	/*pps->constrained_intra_pred = */gf_bs_read_int(bs, 1);
 	pps->redundant_pic_cnt_present = gf_bs_read_int(bs, 1);
 
@@ -2659,7 +5123,7 @@
 
 	/*PPS still contains emulation bytes*/
 	spse_data_without_emulation_bytes = gf_malloc(spse_size*sizeof(char));
-	spse_data_without_emulation_bytes_size = avc_remove_emulation_bytes(spse_data, spse_data_without_emulation_bytes, spse_size);
+	spse_data_without_emulation_bytes_size = gf_media_nalu_remove_emulation_bytes(spse_data, spse_data_without_emulation_bytes, spse_size);
 	bs = gf_bs_new(spse_data_without_emulation_bytes, spse_data_without_emulation_bytes_size, GF_BITSTREAM_READ);
 
 	/*nal header*/gf_bs_read_u8(bs);
@@ -2687,9 +5151,97 @@
 	return 1;
 }
 
+static void ref_pic_list_modification(GF_BitStream *bs, u32 slice_type) {
+	if (slice_type % 5 != 2 && slice_type % 5 != 4) {
+		if (/*ref_pic_list_modification_flag_l0*/ gf_bs_read_int(bs, 1)) {
+			u32 modification_of_pic_nums_idc;
+			do {
+				modification_of_pic_nums_idc = bs_get_ue(bs);
+				if (modification_of_pic_nums_idc == 0 || modification_of_pic_nums_idc == 1) {
+					/*abs_diff_pic_num_minus1 =*/ bs_get_ue(bs);
+				} else if (modification_of_pic_nums_idc == 2) {
+					/*long_term_pic_num =*/ bs_get_ue(bs);
+				}
+			} while (modification_of_pic_nums_idc != 3);
+		}
+	}
+	if (slice_type % 5 == 1) {
+		if (/*ref_pic_list_modification_flag_l1*/ gf_bs_read_int(bs, 1)) {
+			u32 modification_of_pic_nums_idc;
+			do {
+				modification_of_pic_nums_idc = bs_get_ue(bs);
+				if (modification_of_pic_nums_idc == 0 || modification_of_pic_nums_idc == 1) {
+					/*abs_diff_pic_num_minus1 =*/ bs_get_ue(bs);
+				} else if (modification_of_pic_nums_idc == 2) {
+					/*long_term_pic_num =*/ bs_get_ue(bs);
+				}
+			} while (modification_of_pic_nums_idc != 3);
+		}
+	}
+}
+
+static void pred_weight_table(GF_BitStream *bs, u32 slice_type, u32 ChromaArrayType, u32 num_ref_idx_l0_active_minus1, u32 num_ref_idx_l1_active_minus1) {
+	u32 i, j;
+	/*luma_log2_weight_denom =*/ bs_get_ue(bs);
+	if (ChromaArrayType != 0) {
+		/*chroma_log2_weight_denom =*/ bs_get_ue(bs);
+	}
+	for (i = 0; i <= num_ref_idx_l0_active_minus1; i++) {
+		if (/*luma_weight_l0_flag*/ gf_bs_read_int(bs, 1)) {
+			/*luma_weight_l0[i] =*/ bs_get_se(bs);
+			/*luma_offset_l0[i] =*/ bs_get_se(bs);
+		}
+		if (ChromaArrayType != 0) {
+			if (/*chroma_weight_l0_flag*/ gf_bs_read_int(bs, 1))
+				for (j = 0; j < 2; j++) {
+					/*chroma_weight_l0[i][j] =*/ bs_get_se(bs);
+					/*chroma_offset_l0[i][j] =*/ bs_get_se(bs);
+				}
+		}
+	}
+	if (slice_type % 5 == 1) {
+		for (i = 0; i <= num_ref_idx_l1_active_minus1; i++) {
+			if (/*luma_weight_l1_flag*/ gf_bs_read_int(bs, 1)) {
+				/*luma_weight_l1[i] =*/ bs_get_se(bs);
+				/*luma_offset_l1[i] =*/ bs_get_se(bs);
+			}
+			if (ChromaArrayType != 0) {
+				if (/*chroma_weight_l1_flag*/ gf_bs_read_int(bs, 1)) {
+					for (j = 0; j < 2; j++) {
+						/*chroma_weight_l1[i][j] =*/ bs_get_se(bs);
+						/*chroma_offset_l1[i][j] =*/ bs_get_se(bs);
+					}
+				}
+			}
+		}
+	}
+}
+
+static void dec_ref_pic_marking(GF_BitStream *bs, Bool IdrPicFlag) {
+	if (IdrPicFlag) {
+		/*no_output_of_prior_pics_flag =*/ gf_bs_read_int(bs, 1);
+		/*long_term_reference_flag =*/ gf_bs_read_int(bs, 1);
+	} else {
+		if (/*adaptive_ref_pic_marking_mode_flag*/ gf_bs_read_int(bs, 1)) {
+			u32 memory_management_control_operation;
+			do {
+				memory_management_control_operation = bs_get_ue(bs);
+				if (memory_management_control_operation == 1 || memory_management_control_operation == 3)
+					/*difference_of_pic_nums_minus1 =*/ bs_get_ue(bs);
+				if (memory_management_control_operation == 2)
+					/*long_term_pic_num =*/ bs_get_ue(bs);
+				if (memory_management_control_operation == 3 || memory_management_control_operation == 6)
+					/*long_term_frame_idx =*/ bs_get_ue(bs);
+				if (memory_management_control_operation == 4)
+					/*max_long_term_frame_idx_plus1 =*/ bs_get_ue(bs);
+			} while (memory_management_control_operation != 0);
+		}
+	}
+}
+
 static s32 avc_parse_slice(GF_BitStream *bs, AVCState *avc, Bool svc_idr_flag, AVCSliceInfo *si)
 {
-	s32 pps_id;
+	s32 pps_id, num_ref_idx_l0_active_minus1 = 0, num_ref_idx_l1_active_minus1 = 0;
 
 	/*s->current_picture.reference= h->nal_ref_idc != 0;*/
 	/*first_mb_in_slice = */bs_get_ue(bs);
@@ -2703,7 +5255,7 @@
 	si->sps = &avc->sps[si->pps->sps_id];
 	if (!si->sps->log2_max_frame_num) return -2;
 	avc->sps_active_idx = si->pps->sps_id;
-	
+
 	si->frame_num = gf_bs_read_int(bs, si->sps->log2_max_frame_num);
 
 	si->field_pic_flag = 0;
@@ -2713,6 +5265,7 @@
 		if (si->field_pic_flag)
 			si->bottom_field_flag = gf_bs_read_int(bs, 1);
 	}
+
 	if ((si->nal_unit_type==GF_AVC_NALU_IDR_SLICE) || svc_idr_flag)
 		si->idr_pic_id = bs_get_ue(bs);
 
@@ -2726,9 +5279,69 @@
 		if ((si->pps->pic_order_present==1) && !si->field_pic_flag)
 			si->delta_poc[1] = bs_get_se(bs);
 	}
+
 	if (si->pps->redundant_pic_cnt_present) {
 		si->redundant_pic_cnt = bs_get_ue(bs);
 	}
+
+	if (si->slice_type % 5 == GF_AVC_TYPE_B) {
+		/*direct_spatial_mv_pred_flag = */gf_bs_read_int(bs, 1);
+	}
+
+	num_ref_idx_l0_active_minus1 = si->pps->num_ref_idx_l0_default_active_minus1;
+	num_ref_idx_l1_active_minus1 = si->pps->num_ref_idx_l1_default_active_minus1;
+
+	if (si->slice_type % 5 == GF_AVC_TYPE_P || si->slice_type % 5 == GF_AVC_TYPE_SP || si->slice_type % 5 == GF_AVC_TYPE_B) {
+		Bool num_ref_idx_active_override_flag = gf_bs_read_int(bs, 1);
+		if (num_ref_idx_active_override_flag) {
+			num_ref_idx_l0_active_minus1 = bs_get_ue(bs);
+			if (si->slice_type % 5 == GF_AVC_TYPE_B) {
+				num_ref_idx_l1_active_minus1 = bs_get_ue(bs);
+			}
+		}
+	}
+
+	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);
+		return -1;
+	} else {
+		ref_pic_list_modification(bs, si->slice_type);
+	}
+
+	if ((si->pps->weighted_pred_flag && (si->slice_type % 5 == GF_AVC_TYPE_P || si->slice_type % 5 == GF_AVC_TYPE_SP))
+		|| (si->pps->weighted_bipred_idc == 1 && si->slice_type % 5 == GF_AVC_TYPE_B)) {
+		pred_weight_table(bs, si->slice_type, si->sps->ChromaArrayType, num_ref_idx_l0_active_minus1, num_ref_idx_l1_active_minus1);
+	}
+
+	if (si->nal_ref_idc != 0) {
+		dec_ref_pic_marking(bs, (si->nal_unit_type == GF_AVC_NALU_IDR_SLICE) );
+	}
+
+	if (si->pps->entropy_coding_mode_flag && si->slice_type % 5 != GF_AVC_TYPE_I && si->slice_type % 5 != GF_AVC_TYPE_SI) {
+		/*cabac_init_idc = */bs_get_ue(bs);
+	}
+
+	/*slice_qp_delta = */bs_get_se(bs);
+	if (si->slice_type % 5 == GF_AVC_TYPE_SP || si->slice_type % 5 == GF_AVC_TYPE_SI) {
+		if (si->slice_type % 5 == GF_AVC_TYPE_SP) {
+			/*sp_for_switch_flag = */gf_bs_read_int(bs, 1);
+		}
+		/*slice_qs_delta = */bs_get_se(bs);
+	}
+
+	if (si->pps->deblocking_filter_control_present_flag) {
+		if (/*disable_deblocking_filter_idc*/ bs_get_ue(bs) != 1) {
+			/*slice_alpha_c0_offset_div2 =*/ bs_get_se(bs);
+			/*slice_beta_offset_div2 =*/ bs_get_se(bs);
+		}
+	}
+
+	if (si->pps->slice_group_count > 1 && si->pps->mb_slice_group_map_type >= 3 && si->pps->mb_slice_group_map_type <= 5) {
+		/*slice_group_change_cycle = */gf_bs_read_int(bs, (u32)ceil(log((si->pps->pic_size_in_map_units_minus1+1) / (si->pps->slice_group_change_rate_minus1 + 1) + 1)/log(2)));
+	}
+
 	return 0;
 }
 
@@ -3012,11 +5625,11 @@
 		SVC_ReadNal_header_extension(bs, &n_state.NalHeader);
 		return 0;
 
+	case GF_AVC_NALU_IDR_SLICE:
 	case GF_AVC_NALU_NON_IDR_SLICE:
 	case GF_AVC_NALU_DP_A_SLICE:
 	case GF_AVC_NALU_DP_B_SLICE:
 	case GF_AVC_NALU_DP_C_SLICE:
-	case GF_AVC_NALU_IDR_SLICE:
 		slice = 1;
 		/* slice buffer - read the info and compare.*/
 		ret = avc_parse_slice(bs, avc, idr_flag, &n_state);
@@ -3123,7 +5736,7 @@
 
 	/*PPS still contains emulation bytes*/
 	sei_without_emulation_bytes = gf_malloc(nal_size + 1/*for SEI null string termination*/);
-	sei_without_emulation_bytes_size = avc_remove_emulation_bytes(buffer, sei_without_emulation_bytes, nal_size);
+	sei_without_emulation_bytes_size = gf_media_nalu_remove_emulation_bytes(buffer, sei_without_emulation_bytes, nal_size);
 
 	bs = gf_bs_new(sei_without_emulation_bytes, sei_without_emulation_bytes_size, GF_BITSTREAM_READ);
 	gf_bs_read_int(bs, 8);
@@ -3131,7 +5744,6 @@
 	new_buffer = (char*)gf_malloc(sizeof(char)*nal_size);
 	new_buffer[0] = (char) hdr;
 	written = 1;
-
 	/*parse SEI*/
 	while (gf_bs_available(bs)) {
 		Bool do_copy;
@@ -3157,7 +5769,6 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[avc-h264] SEI user message type %d size error (%d but %d remain), skiping %sSEI message\n", ptype, psize, nal_size-start, written ? "end of " : ""));
 			break;
 		}
-
 		switch (ptype) {
 		/*remove SEI messages forbidden in MP4*/
 		case 3: /*filler data*/
@@ -3204,9 +5815,7 @@
 		case 16: /*progressive refinement segment start*/
 		case 17: /*progressive refinement segment end*/
 		case 18: /*motion constrained slice group*/
-			break;
-		default: /*reserved*/
-			do_copy = 0;
+		default: /*add all unknown SEIs*/
 			break;
 		}
 
@@ -3243,12 +5852,12 @@
 	}
 	gf_bs_del(bs);
 	gf_free(sei_without_emulation_bytes);
-
-	if (written) {
-		var = avc_emulation_bytes_add_count(new_buffer, written);
+	//if we removed things, rewrite
+	if (written != sei_without_emulation_bytes_size) {
+		var = gf_media_nalu_emulation_bytes_add_count(new_buffer, written);
 		if (var) {
 			if (written+var<=nal_size) {
-				written = avc_add_emulation_bytes(new_buffer, buffer, written);
+				written = gf_media_nalu_add_emulation_bytes(new_buffer, buffer, written);
 			} else {
 				written = 0;
 			}
@@ -3259,6 +5868,9 @@
 				written = 0;
 			}
 		}
+	} else {
+		//nothing modified, return original nal size
+		written = nal_size;
 	}
 	gf_free(new_buffer);
 
@@ -3302,7 +5914,7 @@
 
 		/*SPS still contains emulation bytes*/
 		no_emulation_buf = gf_malloc((slc->size-1)*sizeof(char));
-		no_emulation_buf_size = avc_remove_emulation_bytes(slc->data+1, no_emulation_buf, slc->size-1);
+		no_emulation_buf_size = gf_media_nalu_remove_emulation_bytes(slc->data+1, no_emulation_buf, slc->size-1);
 
 		orig = gf_bs_new(no_emulation_buf, no_emulation_buf_size, GF_BITSTREAM_READ);
 		gf_bs_read_data(orig, no_emulation_buf, no_emulation_buf_size);
@@ -3365,10 +5977,10 @@
 
 		/*set anti-emulation*/
 		gf_bs_get_content(mod, (char **) &no_emulation_buf, &flag);
-		emulation_bytes = avc_emulation_bytes_add_count(no_emulation_buf, flag);
+		emulation_bytes = gf_media_nalu_emulation_bytes_add_count(no_emulation_buf, flag);
 		if (flag+emulation_bytes+1>slc->size)
 			slc->data = (char*)gf_realloc(slc->data, flag+emulation_bytes+1);
-		slc->size = avc_add_emulation_bytes(no_emulation_buf, slc->data+1, flag)+1;
+		slc->size = gf_media_nalu_add_emulation_bytes(no_emulation_buf, slc->data+1, flag)+1;
 
 		gf_bs_del(mod);
 		gf_free(no_emulation_buf);
@@ -3409,7 +6021,7 @@
 
 	/*PPS still contains emulation bytes*/
 	pps_data_without_emulation_bytes = gf_malloc(pps_size*sizeof(char));
-	pps_data_without_emulation_bytes_size = avc_remove_emulation_bytes(pps_data, pps_data_without_emulation_bytes, pps_size);
+	pps_data_without_emulation_bytes_size = gf_media_nalu_remove_emulation_bytes(pps_data, pps_data_without_emulation_bytes, pps_size);
 	bs = gf_bs_new(pps_data_without_emulation_bytes, pps_data_without_emulation_bytes_size, GF_BITSTREAM_READ);
 	if (!bs) {
 		e = GF_NON_COMPLIANT_BITSTREAM;
@@ -3579,7 +6191,7 @@
 		}
 	}
 
-	if (si->slice_type==GF_HEVC_SLICE_TYPE_B) {
+	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;
@@ -3588,6 +6200,30 @@
 }
 
 static
+Bool ref_pic_lists_modification(GF_BitStream *bs, u32 slice_type, u32 num_ref_idx_l0_active, u32 num_ref_idx_l1_active)
+{
+	//u32 i;
+	Bool ref_pic_list_modification_flag_l0 = gf_bs_read_int(bs, 1);
+	if (ref_pic_list_modification_flag_l0) {
+		/*for (i=0; i<num_ref_idx_l0_active; i++) {
+			list_entry_l0[i] = *//*gf_bs_read_int(bs, (u32)ceil(log(getNumPicTotalCurr())/log(2)));
+		}*/
+		return GF_FALSE;
+	}
+	if (slice_type == GF_HEVC_SLICE_TYPE_B) {
+		Bool ref_pic_list_modification_flag_l1 = gf_bs_read_int(bs, 1);
+		if (ref_pic_list_modification_flag_l1) {
+			/*for (i=0; i<num_ref_idx_l1_active; i++) {
+				list_entry_l1[i] = *//*gf_bs_read_int(bs, (u32)ceil(log(getNumPicTotalCurr()) / log(2)));
+			}*/
+			return GF_FALSE;
+		}
+	}
+
+	return GF_TRUE;
+}
+
+static
 s32 hevc_parse_slice_segment(GF_BitStream *bs, HEVCState *hevc, HEVCSliceInfo *si)
 {
 	u32 i, j;
@@ -3661,24 +6297,29 @@
 
 		if (IDRPicFlag) {
 			si->poc_lsb = 0;
+
+			//if not asked to parse full header, abort since we know the poc
+			if (!hevc->full_slice_header_parse) return 0;
+
 		} else {
 			si->poc_lsb = gf_bs_read_int(bs, sps->log2_max_pic_order_cnt_lsb);
 
-//			if (!full_header_parse) return 0;
+			//if not asked to parse full header, abort once we have the poc
+			if (!hevc->full_slice_header_parse) return 0;
 
 			if (/*short_term_ref_pic_set_sps_flag =*/gf_bs_read_int(bs, 1) == 0) {
 				Bool ret = parse_short_term_ref_pic_set(bs, sps, sps->num_short_term_ref_pic_sets );
 				if (!ret)
-					return 0;
+					return -1;
 			} else if( sps->num_short_term_ref_pic_sets > 1 ) {
 				u32 numbits = 0;
-				s32 short_term_ref_pic_set_idx;
+
 				while ( (u32) (1 << numbits) < sps->num_short_term_ref_pic_sets)
 					numbits++;
 				if (numbits > 0)
-					short_term_ref_pic_set_idx = gf_bs_read_int(bs, numbits);
-				else
-					short_term_ref_pic_set_idx = 0;
+					/*s32 short_term_ref_pic_set_idx = */gf_bs_read_int(bs, numbits);
+				/*else
+					short_term_ref_pic_set_idx = 0;*/
 			}
 			if (sps->long_term_ref_pics_present_flag ) {
 				u8 DeltaPocMsbCycleLt[32];
@@ -3691,9 +6332,8 @@
 
 				for (i = 0; i < num_long_term_sps + num_long_term_pics; i++ ) {
 					if( i < num_long_term_sps ) {
-						u8 lt_idx_sps = 0;
 						if (sps->num_long_term_ref_pic_sps > 1)
-							lt_idx_sps = gf_bs_read_int(bs, gf_get_bit_size(sps->num_long_term_ref_pic_sps) );
+							/*u8 lt_idx_sps = */gf_bs_read_int(bs, gf_get_bit_size(sps->num_long_term_ref_pic_sps) );
 					} else {
 						/*PocLsbLt[ i ] = */ gf_bs_read_int(bs, sps->log2_max_pic_order_cnt_lsb);
 						/*UsedByCurrPicLt[ i ] = */ gf_bs_read_int(bs, 1);
@@ -3718,7 +6358,6 @@
 
 		if (si->slice_type == GF_HEVC_SLICE_TYPE_P || si->slice_type == GF_HEVC_SLICE_TYPE_B) {
 			//u32 NumPocTotalCurr;
-
 			num_ref_idx_l0_active = pps->num_ref_idx_l0_default_active;
 			num_ref_idx_l1_active = 0;
 			if (si->slice_type == GF_HEVC_SLICE_TYPE_B)
@@ -3730,9 +6369,11 @@
 					num_ref_idx_l1_active = 1 + bs_get_ue(bs);
 			}
 
-			if (pps->lists_modification_present_flag ) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[hevc] ref_pic_lists_modification( ) not implemented\n"));
-				return 0;
+			if (pps->lists_modification_present_flag /*TODO: && NumPicTotalCurr > 1*/) {
+				if (!ref_pic_lists_modification(bs, si->slice_type, num_ref_idx_l0_active, num_ref_idx_l1_active)) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[hevc] ref_pic_lists_modification( ) not implemented\n"));
+					return -1;
+				}
 			}
 
 			if (si->slice_type == GF_HEVC_SLICE_TYPE_B)
@@ -3782,7 +6423,11 @@
 			/*slice_loop_filter_across_slices_enabled_flag = */gf_bs_read_int(bs, 1);
 		}
 	}
-//	if (!full_header_parse) return 0;
+	//dependent slice segment
+	else {
+		//if not asked to parse full header, abort
+		if (!hevc->full_slice_header_parse) return 0;
+	}
 
 	si->entry_point_start_bits = ((u32)gf_bs_get_position(bs)-1)*8 + gf_bs_get_bit_position(bs);
 
@@ -3988,6 +6633,9 @@
 	u8 dimension_id_len[16], dim_bit_offset[16];
 	u8 /*avc_base_layer_flag, */NumLayerSets, /*default_one_target_output_layer_flag, */rep_format_idx_present_flag, ols_ids_to_ls_idx;
 	u8 layer_set_idx_for_ols_minus1[MAX_LHVC_LAYERS];
+	u8 nb_output_layers_in_output_layer_set[MAX_LHVC_LAYERS+1];
+	u8 ols_highest_output_layer_id[MAX_LHVC_LAYERS+1];
+
 	u32 k,d, r, p, iNuhLId, jNuhLId;
 	u8 num_direct_ref_layers[64], num_pred_layers[64], num_layers_in_tree_partition[MAX_LHVC_LAYERS];
 	u8 dependency_flag[MAX_LHVC_LAYERS][MAX_LHVC_LAYERS], id_pred_layers[64][MAX_LHVC_LAYERS];
@@ -4015,7 +6663,7 @@
 	for (i=0; i<(num_scalability_types - splitting_flag); i++) {
 		dimension_id_len[i] = 1 + gf_bs_read_int(bs, 3);
 	}
-	
+
 	if (splitting_flag) {
 		for (i = 0; i < num_scalability_types; i++) {
 			dim_bit_offset[i] = 0;
@@ -4043,7 +6691,7 @@
 			}
 		}
 	}
-	
+
 	if (splitting_flag) {
 		for (i = 0; i<vps->max_layers; i++)
 			for (j=0; j<num_scalability_types; j++)
@@ -4090,7 +6738,7 @@
 //				id_ref_layers[iNuhLId][r] = jNuhLId;
 				r++;
 			}
-				
+
 			if (dependency_flag[j][i])
 				id_pred_layers[iNuhLId][p++] = jNuhLId;
 		}
@@ -4105,7 +6753,7 @@
 		iNuhLId = vps->layer_id_in_nuh[i];
 		if (!num_direct_ref_layers[iNuhLId]) {
 			u32 h = 1;
-			//tree_partition_layer_id[k][0] = iNuhLId;		
+			//tree_partition_layer_id[k][0] = iNuhLId;
 			for (j = 0; j < num_pred_layers[iNuhLId]; j++) {
 				u32 predLId = id_pred_layers[iNuhLId][j];
 				if (!layer_id_in_list_flag[predLId]) {
@@ -4117,7 +6765,7 @@
 		}
 	}
 	num_indepentdent_layers = k;
-	
+
 	num_add_layer_set = 0;
 	if (num_indepentdent_layers > 1)
 		num_add_layer_set = bs_get_ue(bs);
@@ -4153,15 +6801,15 @@
 		vps->num_profile_tier_level=1;
 		return GF_FALSE;
 	}
-	
+
 	for (i=vps->base_layer_internal_flag ? 2 : 1; i < vps->num_profile_tier_level; i++) {
 		Bool vps_profile_present_flag = gf_bs_read_int(bs, 1);
 		profile_tier_level(bs, vps_profile_present_flag, vps->max_sub_layers-1, &vps->ext_ptl[i-1] );
 	}
-	
+
 	NumLayerSets = vps->num_layer_sets + num_add_layer_set;
 	num_add_olss = 0;
-	
+
 	if (NumLayerSets > 1) {
 		num_add_olss = bs_get_ue(bs);
 		default_output_layer_idc = gf_bs_read_int(bs,2);
@@ -4233,8 +6881,17 @@
 				vps->profile_tier_level_idx[i][j] = gf_bs_read_int(bs, nb_bits);
 			else
 				vps->profile_tier_level_idx[i][j] = 0;
-		//if (NumOutputLayersInOutputLayerSet[i] == 1 && num_direct_ref_layers[OlsHighestOutputLayerId[i] > 0)
-		vps->alt_output_layer_flag[i] = gf_bs_read_int(bs, 1);
+
+
+		nb_output_layers_in_output_layer_set[i] = 0;
+		for (j = 0; j < vps->num_layers_in_id_list[ols_ids_to_ls_idx]; j++) {
+			nb_output_layers_in_output_layer_set[i] += OutputLayerFlag[i][j];
+			if (OutputLayerFlag[i][j]) {
+				ols_highest_output_layer_id[i] = vps->LayerSetLayerIdList[ols_ids_to_ls_idx][j];
+			}
+		}
+		if (nb_output_layers_in_output_layer_set[i] == 1 && ols_highest_output_layer_id[i] > 0)
+			 vps->alt_output_layer_flag[i] = gf_bs_read_int(bs, 1);
 	}
 
 	vps->num_rep_formats = 1 + bs_get_ue(bs);
@@ -4445,12 +7102,12 @@
 	s32 vps_id = -1;
 
 	/*still contains emulation bytes*/
-	data_without_emulation_bytes_size = avc_emulation_bytes_remove_count(data, (*size));
+	data_without_emulation_bytes_size = gf_media_nalu_emulation_bytes_remove_count(data, (*size));
 	if (!data_without_emulation_bytes_size) {
 		bs = gf_bs_new(data, (*size), GF_BITSTREAM_READ);
 	} else {
 		data_without_emulation_bytes = gf_malloc((*size) * sizeof(char));
-		data_without_emulation_bytes_size = avc_remove_emulation_bytes(data, data_without_emulation_bytes, (*size) );
+		data_without_emulation_bytes_size = gf_media_nalu_remove_emulation_bytes(data, data_without_emulation_bytes, (*size) );
 		bs = gf_bs_new(data_without_emulation_bytes, data_without_emulation_bytes_size, GF_BITSTREAM_READ);
 	}
 	if (!bs) goto exit;
@@ -4483,12 +7140,12 @@
 		new_vps=NULL;
 		gf_bs_get_content(w_bs, &new_vps, &new_vps_size);
 		gf_bs_del(w_bs);
-		
-		emulation_bytes = avc_emulation_bytes_add_count(new_vps, new_vps_size);
+
+		emulation_bytes = gf_media_nalu_emulation_bytes_add_count(new_vps, new_vps_size);
 		if (emulation_bytes+new_vps_size > *size) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("Buffer too small to rewrite VPS - skipping rewrite\n"));
 		} else {
-			*size = avc_add_emulation_bytes(new_vps, data, new_vps_size);
+			*size = gf_media_nalu_add_emulation_bytes(new_vps, data, new_vps_size);
 		}
 	}
 
@@ -4559,7 +7216,6 @@
 	if (vps_id>=16) {
 		return -1;
 	}
-
 	memset(&ptl, 0, sizeof(ptl));
 	max_sub_layers_minus1 = 0;
 	sps_ext_or_max_sub_layers_minus1 = 0;
@@ -4568,7 +7224,7 @@
 	else
 		sps_ext_or_max_sub_layers_minus1 = gf_bs_read_int(bs, 3);
 	multiLayerExtSpsFlag = (layer_id != 0) && (sps_ext_or_max_sub_layers_minus1 == 7);
-	if (!multiLayerExtSpsFlag) {		
+	if (!multiLayerExtSpsFlag) {
 		/*temporal_id_nesting_flag = */gf_bs_read_int(bs, 1);
 		profile_tier_level(bs, 1, max_sub_layers_minus1, &ptl);
 	}
@@ -4587,6 +7243,11 @@
 	sps->ptl = ptl;
 	vps = &hevc->vps[vps_id];
 
+	/* default values */
+	sps->colour_primaries = 2;
+	sps->transfer_characteristic = 2;
+	sps->matrix_coeffs = 2;
+
 	//sps_rep_format_idx = 0;
 	if (multiLayerExtSpsFlag) {
 		u8 update_rep_format_flag = gf_bs_read_int(bs, 1);
@@ -4699,7 +7360,7 @@
 		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;
 	}
-	
+
 	for (i=0; i<sps->num_short_term_ref_pic_sets; i++) {
 		Bool ret = parse_short_term_ref_pic_set(bs, sps, i);
 		/*cannot parse short_term_ref_pic_set, skip VUI parsing*/
@@ -4742,11 +7403,11 @@
 		/*video_signal_type_present_flag = */flag = gf_bs_read_int(bs, 1);
 		if (flag) {
 			/*video_format = */gf_bs_read_int(bs, 3);
-			/*video_full_range_flag = */gf_bs_read_int(bs, 1);
-			if (/*colour_description_present_flag = */gf_bs_read_int(bs, 1)) {
-				/*colour_primaries = */ gf_bs_read_int(bs, 8);
-				/* transfer_characteristic = */ gf_bs_read_int(bs, 8);
-				/* matrix_coeffs = */ gf_bs_read_int(bs, 8);
+			sps->video_full_range_flag = gf_bs_read_int(bs, 1);
+			if ((sps->colour_description_present_flag = gf_bs_read_int(bs, 1))) {
+				sps->colour_primaries = gf_bs_read_int(bs, 8);
+				sps->transfer_characteristic = gf_bs_read_int(bs, 8);
+				sps->matrix_coeffs = gf_bs_read_int(bs, 8);
 			}
 		}
 
@@ -4811,13 +7472,13 @@
 
 	if (vui_flag_pos) *vui_flag_pos = 0;
 
-	data_without_emulation_bytes_size = avc_emulation_bytes_remove_count(data, size);
+	data_without_emulation_bytes_size = gf_media_nalu_emulation_bytes_remove_count(data, size);
 	if (!data_without_emulation_bytes_size) {
 		bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
 	} else {
 		/*still contains emulation bytes*/
 		data_without_emulation_bytes = gf_malloc(size*sizeof(char));
-		data_without_emulation_bytes_size = avc_remove_emulation_bytes(data, data_without_emulation_bytes, size);
+		data_without_emulation_bytes_size = gf_media_nalu_remove_emulation_bytes(data, data_without_emulation_bytes, size);
 		bs = gf_bs_new(data_without_emulation_bytes, data_without_emulation_bytes_size, GF_BITSTREAM_READ);
 	}
 	if (!bs) goto exit;
@@ -4899,7 +7560,7 @@
 		pps->loop_filter_across_tiles_enabled_flag = gf_bs_read_int(bs, 1);
 	}
 	pps->loop_filter_across_slices_enabled_flag = gf_bs_read_int(bs, 1);
-	if( /*deblocking_filter_control_present_flag = */gf_bs_read_int(bs, 1) ) {
+	if (/*pps->deblocking_filter_control_present_flag*/ gf_bs_read_int(bs, 1)) {
 		pps->deblocking_filter_override_enabled_flag = gf_bs_read_int(bs, 1);
 		if (! /*pic_disable_deblocking_filter_flag= */gf_bs_read_int(bs, 1) ) {
 			/*beta_offset_div2 = */bs_get_se(bs);
@@ -4930,12 +7591,12 @@
 	s32 pps_id = -1;
 
 	/*still contains emulation bytes*/
-	data_without_emulation_bytes_size = avc_emulation_bytes_remove_count(data, size);
+	data_without_emulation_bytes_size = gf_media_nalu_emulation_bytes_remove_count(data, size);
 	if (!data_without_emulation_bytes_size) {
 		bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
 	} else {
 		data_without_emulation_bytes = gf_malloc(size*sizeof(char));
-		data_without_emulation_bytes_size = avc_remove_emulation_bytes(data, data_without_emulation_bytes, size);
+		data_without_emulation_bytes_size = gf_media_nalu_remove_emulation_bytes(data, data_without_emulation_bytes, size);
 		bs = gf_bs_new(data_without_emulation_bytes, data_without_emulation_bytes_size, GF_BITSTREAM_READ);
 	}
 	if (!bs) goto exit;
@@ -4966,13 +7627,13 @@
 	hevc->s_info.entry_point_start_bits = -1;
 	hevc->s_info.payload_start_offset = -1;
 
-	data_without_emulation_bytes_size = avc_emulation_bytes_remove_count(data, size);
+	data_without_emulation_bytes_size = gf_media_nalu_emulation_bytes_remove_count(data, size);
 	if (!data_without_emulation_bytes_size) {
 		bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
 	} else {
 		/*still contains emulation bytes*/
 		data_without_emulation_bytes = gf_malloc(size*sizeof(char));
-		data_without_emulation_bytes_size = avc_remove_emulation_bytes(data, data_without_emulation_bytes, size);
+		data_without_emulation_bytes_size = gf_media_nalu_remove_emulation_bytes(data, data_without_emulation_bytes, size);
 		bs = gf_bs_new(data_without_emulation_bytes, data_without_emulation_bytes_size, GF_BITSTREAM_READ);
 	}
 	if (!bs) goto exit;
@@ -5072,7 +7733,7 @@
 {
 	GF_BitStream *orig, *mod;
 	HEVCState hevc;
-	u32 i, bit_offset, flag, nal_hdr_size;
+	u32 i, bit_offset, flag;
 	s32 idx;
 	GF_HEVCParamArray *spss;
 	GF_AVCConfigSlot *slc;
@@ -5081,8 +7742,6 @@
 	memset(&hevc, 0, sizeof(HEVCState));
 	hevc.sps_active_idx = -1;
 
-	nal_hdr_size=2;
-
 	i=0;
 	spss = NULL;
 	while ((spss = (GF_HEVCParamArray *)gf_list_enum(hvcc->param_array, &i))) {
@@ -5096,11 +7755,10 @@
 	while ((slc = (GF_AVCConfigSlot *)gf_list_enum(spss->nalus, &i))) {
 		char *no_emulation_buf = NULL;
 		u32 no_emulation_buf_size = 0, emulation_bytes = 0;
-		u32 off;
 
 		/*SPS may still contains emulation bytes*/
-		no_emulation_buf = gf_malloc((slc->size - nal_hdr_size)*sizeof(char));
-		no_emulation_buf_size = avc_remove_emulation_bytes(slc->data, no_emulation_buf, slc->size);
+		no_emulation_buf = gf_malloc((slc->size)*sizeof(char));
+		no_emulation_buf_size = gf_media_nalu_remove_emulation_bytes(slc->data, no_emulation_buf, slc->size);
 
 		idx = gf_media_hevc_read_sps_ex(no_emulation_buf, no_emulation_buf_size, &hevc, &bit_offset);
 		if (idx<0) {
@@ -5115,13 +7773,11 @@
 
 		/*copy over till vui flag*/
 		assert(bit_offset >= 0);
-		off = bit_offset;
 		while (bit_offset) {
 			flag = gf_bs_read_int(orig, 1);
 			gf_bs_write_int(mod, flag, 1);
 			bit_offset--;
 		}
-		assert(off == gf_bs_get_bit_offset(orig));
 
 		/*check VUI*/
 		flag = gf_bs_read_int(orig, 1);
@@ -5175,11 +7831,11 @@
 
 		/*set anti-emulation*/
 		gf_bs_get_content(mod, (char **) &no_emulation_buf, &no_emulation_buf_size);
-		emulation_bytes = avc_emulation_bytes_add_count(no_emulation_buf, no_emulation_buf_size);
-		if (no_emulation_buf_size + emulation_bytes + nal_hdr_size > slc->size)
-			slc->data = (char*)gf_realloc(slc->data, no_emulation_buf_size + emulation_bytes + nal_hdr_size);
+		emulation_bytes = gf_media_nalu_emulation_bytes_add_count(no_emulation_buf, no_emulation_buf_size);
+		if (no_emulation_buf_size + emulation_bytes > slc->size)
+			slc->data = (char*)gf_realloc(slc->data, no_emulation_buf_size + emulation_bytes);
 
-		slc->size = avc_add_emulation_bytes(no_emulation_buf, slc->data, no_emulation_buf_size) + nal_hdr_size;
+		slc->size = gf_media_nalu_add_emulation_bytes(no_emulation_buf, slc->data, no_emulation_buf_size);
 
 		gf_bs_del(mod);
 		gf_free(no_emulation_buf);
@@ -5543,11 +8199,14 @@
 
 
 GF_EXPORT
-Bool gf_vorbis_parse_header(GF_VorbisParser *vp, char *data, u32 data_len)
+Bool gf_vorbis_parse_header(ogg_audio_codec_desc *codec, char *data, u32 data_len)
 {
 	u32 pack_type, i, j, k, times, nb_part, nb_books, nb_modes;
+	int l;
 	char szNAME[8];
 	oggpack_buffer opb;
+	Bool res = GF_TRUE;
+	GF_VorbisParser *vp = codec->parserPrivateState;
 
 	oggpack_readinit(&opb, (u8*)data, data_len);
 	pack_type = oggpack_read(&opb, 8);
@@ -5557,38 +8216,53 @@
 		i++;
 	}
 	szNAME[i] = 0;
-	if (strcmp(szNAME, "vorbis")) return vp->is_init = 0;
+	if (strcmp(szNAME, "vorbis")) {
+		res = GF_FALSE;
+		goto exit;
+	}
+
+	if (!vp) {
+		GF_SAFEALLOC(vp, GF_VorbisParser);
+		codec->parserPrivateState = vp;
+		vp->vbs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	}
 
 	switch (pack_type) {
 	case 0x01:
 		vp->version = oggpack_read(&opb, 32);
-		if (vp->version!=0) return 0;
-		vp->channels = oggpack_read(&opb, 8);
-		vp->sample_rate = oggpack_read(&opb, 32);
+		if (vp->version != 0) {
+			res = GF_FALSE;
+			goto exit;
+		}
+		codec->channels = oggpack_read(&opb, 8);
+		codec->sample_rate = oggpack_read(&opb, 32);
 		vp->max_r = oggpack_read(&opb, 32);
 		vp->avg_r = oggpack_read(&opb, 32);
 		vp->low_r = oggpack_read(&opb, 32);
 
 		vp->min_block = 1<<oggpack_read(&opb, 4);
 		vp->max_block = 1<<oggpack_read(&opb, 4);
-		if (vp->sample_rate < 1) return vp->is_init = 0;
-		if (vp->channels < 1) return vp->is_init = 0;
-		if (vp->min_block<8) return vp->is_init = 0;
-		if (vp->max_block < vp->min_block) return vp->is_init = 0;
-		if (oggpack_read(&opb, 1) != 1) return vp->is_init = 0;
-		vp->is_init = 1;
-		return 1;
+		if (codec->sample_rate < 1 || codec->channels < 1 || vp->min_block < 8 || vp->max_block < vp->min_block
+		 || oggpack_read(&opb, 1) != 1) {
+			res = GF_FALSE;
+		}
+		vp->nb_init=1;
+		goto exit;
 	case 0x03:
 		/*trash comments*/
-		vp->is_init ++;
-		return 1;
+		vp->nb_init++;
+		res = GF_TRUE;
+		goto exit;
 	case 0x05:
 		/*need at least bitstream header to make sure we're parsing the right thing*/
-		if (!vp->is_init) return 0;
+		if (!vp->nb_init) {
+			res = GF_FALSE;
+			goto exit;
+		}
 		break;
 	default:
-		vp->is_init = 0;
-		return 0;
+		res = GF_FALSE;
+		goto exit;
 	}
 	/*OK parse codebook*/
 	nb_books = oggpack_read(&opb, 8) + 1;
@@ -5697,13 +8371,14 @@
 		if (oggpack_read(&opb, 1)) {
 			u32 nb_steps = oggpack_read(&opb, 8)+1;
 			for (j=0; j<nb_steps; j++) {
-				oggpack_read(&opb, ilog(vp->channels));
-				oggpack_read(&opb, ilog(vp->channels));
+				oggpack_read(&opb, ilog(codec->channels));
+				oggpack_read(&opb, ilog(codec->channels));
 			}
 		}
 		oggpack_read(&opb, 2);
 		if (sub_maps>1) {
-			for(j=0; j<vp->channels; j++) oggpack_read(&opb, 4);
+			for(l=0; l<codec->channels; l++)
+				oggpack_read(&opb, 4);
 		}
 		for (j=0; j<sub_maps; j++) {
 			oggpack_read(&opb, 8);
@@ -5725,7 +8400,13 @@
 		vp->modebits++;
 		j>>=1;
 	}
-	return 1;
+
+exit:
+	if (!res) {
+		gf_free(vp);
+		codec->parserPrivateState = NULL;
+	}
+	return res;
 }
 
 GF_EXPORT
@@ -5733,7 +8414,7 @@
 {
 	s32 block_size;
 	oggpack_buffer opb;
-	if (!vp->is_init) return 0;
+	if (!vp) return 0;
 	oggpack_readinit(&opb, (unsigned char*)data, data_length);
 	/*not audio*/
 	if (oggpack_read(&opb, 1) !=0) return 0;

gpac-0.7.1.tar.gz/src/media_tools/avilib.c -> gpac-0.8.0.tar.gz/src/media_tools/avilib.c Changed

gpac-0.7.1.tar.gz/src/media_tools/dash_client.c -> gpac-0.8.0.tar.gz/src/media_tools/dash_client.c Changed

@@ -39,6 +39,9 @@
 #include <time.h>
 #endif
 
+#include <math.h>
+
+
 #ifndef GPAC_DISABLE_DASH_CLIENT
 
 /*ISO 639 languages*/
@@ -60,8 +63,8 @@
 //shifts AST in the past(>0) or future (<0) so that client starts request in the future or in the past
 //#define FORCE_DESYNC	4000
 
-/* WARNING: GF_DASH_Group does not represent a Group in DASH 
- It corresponds to an AdaptationSet with additional live information not present in the MPD 
+/* WARNING: GF_DASH_Group does not represent a Group in DASH
+ It corresponds to an AdaptationSet with additional live information not present in the MPD
 (e.g. current active representation)
 */
 typedef struct __dash_group GF_DASH_Group;
@@ -98,8 +101,9 @@
 	/*mime type of media segments (m3u8)*/
 	char *mimeTypeForM3U8Segments;
 
-	/* active period in MPD (only one currently supported) */
+	/* active period in MPD */
 	u32 active_period_index;
+	u32 reinit_period_index;
 	u32 request_period_switch;
 
 	Bool next_period_checked;
@@ -109,6 +113,8 @@
 	Bool ignore_mpd_duration;
 	u32 initial_time_shift_value;
 
+	const char *query_string;
+
 	/*list of groups in the active period*/
 	GF_List *groups;
 
@@ -125,7 +131,7 @@
 	u32 nb_buffering;
 	u32 idle_interval;
 
-	s32 utc_drift_estimate;
+	s64 utc_drift_estimate;
 	s32 utc_shift;
 
 	Double start_range_period;
@@ -142,7 +148,15 @@
 	u32 min_timeout_between_404, segment_lost_after_ms;
 
 	Bool use_threaded_download;
-	
+	Bool ignore_xlink;
+
+	//0: not atsc - 1: atsc but clock not init 2- atsc clock init
+	u32 atsc_clock_state;
+	//atsc AST shift in ms
+	u32 atsc_ast_shift;
+
+	Bool initial_period_tunein;
+
 	//in ms
 	u32 time_in_tsb, prev_time_in_tsb;
 	u32 tsb_exceeded;
@@ -156,7 +170,7 @@
 
 	GF_DASHAdaptationAlgorithm adaptation_algorithm;
 
-	u32 (*rate_adaptation_algo)(GF_DashClient *dash, GF_DASH_Group *group, GF_DASH_Group *base_group,
+	s32 (*rate_adaptation_algo)(GF_DashClient *dash, GF_DASH_Group *group, GF_DASH_Group *base_group,
 												 u32 dl_rate, Double speed, Double max_available_speed, Bool force_lower_complexity,
 												 GF_MPD_Representation *rep, Bool go_up_bitrate);
 
@@ -221,6 +235,9 @@
 	u32 min_representation_bitrate;
 
 	u32 nb_segments_in_rep;
+
+	/* Segment duration as advertised in the MPD
+	 for the real duration of the segment being downloaded see current_downloaded_segment_duration */
 	Double segment_duration;
 
 	Double start_playback_range;
@@ -283,8 +300,8 @@
 	u32 base_rep_index_plus_one;
 
 	/* maximum representation index we want to download*/
-	u32 force_max_rep_index;
-	//start time of currently downloaded segment - for now only used for merging SegmentTimeline, but we should use this to resync across representations ...
+	u32 max_complementary_rep_index;
+	//start time and timescales of currently downloaded segment
 	u64 current_start_time;
 	u32 current_timescale;
 
@@ -323,12 +340,17 @@
 
 	/*current index of the base URL used*/
 	u32 current_base_url_idx;
-	
+
 	u32 quality_degradation_hint;
 
 	Bool rate_adaptation_postponed;
+
+	/* current segment index in BBA and BOLA algorithm */
+	u32 current_index;
 };
 
+static void gf_dash_solve_period_xlink(GF_DashClient *dash, GF_List *period_list, u32 period_idx);
+
 struct _dash_srd_desc
 {
 	u32 srd_nb_rows, srd_nb_cols;
@@ -392,16 +414,16 @@
 	GF_MPD_Representation *rep;
 	count = gf_list_count(group->adaptation_set->representations);
 	nb_rep_need = 1;
-	if (!group->base_rep_index_plus_one || (group->base_rep_index_plus_one == group->force_max_rep_index+1))
+	if (!group->base_rep_index_plus_one || (group->base_rep_index_plus_one == group->max_complementary_rep_index+1))
 		return nb_rep_need; // we need to download only one representation
 	rep = gf_list_get(group->adaptation_set->representations, group->base_rep_index_plus_one-1);
-	next_rep_index_plus_one = rep->enhancement_rep_index_plus_one;
-	while ((nb_rep_need < count) && rep->enhancement_rep_index_plus_one) {
+	next_rep_index_plus_one = rep->playback.enhancement_rep_index_plus_one;
+	while ((nb_rep_need < count) && rep->playback.enhancement_rep_index_plus_one) {
 		nb_rep_need++;
-		if (next_rep_index_plus_one == group->force_max_rep_index+1)
+		if (next_rep_index_plus_one == group->max_complementary_rep_index+1)
 			break;
 		rep = gf_list_get(group->adaptation_set->representations, next_rep_index_plus_one-1);
-		next_rep_index_plus_one = rep->enhancement_rep_index_plus_one;
+		next_rep_index_plus_one = rep->playback.enhancement_rep_index_plus_one;
 	}
 
 	assert(nb_rep_need <= count);
@@ -472,6 +494,7 @@
 {
 	GF_MPD_SegmentTimeline *timeline = NULL;
 	GF_MPD_Representation *rep = NULL;
+	const char *val;
 	u32 shift, timescale;
 	u64 current_time, current_time_no_timeshift, availabilityStartTime;
 	u32 ast_diff, start_number;
@@ -480,6 +503,12 @@
 	if (mpd->type==GF_MPD_TYPE_STATIC)
 		return;
 
+	//always init clock even if active period is a remote one
+#if 0
+	if (group->period->origin_base_url && (group->period->type != GF_MPD_TYPE_DYNAMIC))
+		return;
+#endif
+
 	/*M3U8 does not use NTP sync */
 	if (group->dash->is_m3u8)
 		return;
@@ -499,22 +528,134 @@
 		//when trying to locate the live edge
 		fetch_time = gf_net_get_utc();
 	}
+	//if ATSC and clock not setup, do it
+	val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "x-dash-atsc");
+	if (val && !group->dash->utc_drift_estimate) {
+		u32 i;
+		GF_MPD_Period *dyn_period=NULL;
+		Bool found = GF_FALSE;
+		u64 timeline_offset_ms=0;
+		if (!group->dash->atsc_clock_state) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Detected ATSC DASH service ID %s\n", val));
+			group->dash->atsc_clock_state = 1;
+		}
 
+		for (i=0; i<gf_list_count(group->dash->mpd->periods); i++) {
+			dyn_period = gf_list_get(group->dash->mpd->periods, i);
+			if (!dyn_period->xlink_href && !dyn_period->origin_base_url) break;
+			if (dyn_period->xlink_href && !dyn_period->origin_base_url && gf_list_count(dyn_period->adaptation_sets) ) break;
+			dyn_period = NULL;
+		}
+		if (!dyn_period) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] ATSC with no dynamic period, cannot init clock yet\n"));
+			return;
+		}
 
-	if (!group->dash->ntp_forced && group->dash->estimate_utc_drift && !group->dash->utc_drift_estimate && group->dash->mpd_dnload && group->dash->dash_io->get_header_value) {
-		const char *val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "Server-UTC");
+		for (i=0; i<gf_list_count(dyn_period->adaptation_sets); i++) {
+			u64 sr, seg_dur;
+			u32 j, len, nb_space=0;
+			GF_MPD_AdaptationSet *set;
+			char *sep, *start, *end, *seg_url = NULL;
+			val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "x-dash-first-seg");
+			if (!val) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Waiting for ATSC clock ...\n"));
+				return;
+			}
+
+			set = gf_list_get(dyn_period->adaptation_sets, i);
+			for (j=0; j<gf_list_count(set->representations); j++) {
+				u64 dur = dyn_period->duration;
+				rep = gf_list_get(set->representations, j);
+
+				dyn_period->duration = 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, NULL, NULL, NULL);
+
+				dyn_period->duration = dur;
+
+				sep = seg_url ? strstr(seg_url, "987") : NULL;
+				if (!sep) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Failed to resolve template for segment #9876 on rep #%d\n", j+1));
+					if (seg_url) gf_free(seg_url);
+					continue;
+				}
+				start = sep;
+				end = sep+4;
+				while (start && start>seg_url && (*(start-1)=='0')) { start--; nb_space++;}
+				start[0]=0;
+				len = (u32) strlen(seg_url)-2;
+				if (!strncmp(val, seg_url+2, len)) {
+					u32 number=0;
+					char szTemplate[100];
+
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Resolve ATSC clock on bootstrap segment URL %s template %s\n", val, seg_url+2));
+
+					strcpy(szTemplate, seg_url+2);
+					strcat(szTemplate, "%");
+					if (nb_space) {
+						char szFmt[20];
+						sprintf(szFmt, "0%d", nb_space+4);
+						strcat(szTemplate, szFmt);
+					}
+					strcat(szTemplate, "d");
+					strcat(szTemplate, end);
+					if (sscanf(val, szTemplate, &number) == 1) {
+						u32 startNum = 1;
+						//safety check for now, in case one of the segment is send too early compared to the rest
+						if (number) number--;
+						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+1>=startNum) {
+							timeline_offset_ms = seg_dur*(number+1-startNum);
+						}
+						found = GF_TRUE;
+					}
+				} else {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] ATSC bootstrap segment URL %s does not match template %s for rep #%d\n", val, seg_url+2, j+1));
+				}
+				gf_free(seg_url);
+				if (found) break;
+			}
+			if (found) break;
+		}
+		if (found) {
+			//adjust so that nb_seg = current_time/segdur = (fetch-ast)/seg_dur;
+			// = (fetch- ( mpd->availabilityStartTime + group->dash->utc_shift + group->dash->utc_drift_estimate) / segdur;
+			//hence nb_seg*seg_dur = fetch - mpd->availabilityStartTime - group->dash->utc_shift - group->dash->utc_drift_estimate
+			//so group->dash->utc_drift_estimate = fetch - (mpd->availabilityStartTime + nb_seg*seg_dur)
+
+
+			u64 utc = mpd->availabilityStartTime + dyn_period->start + timeline_offset_ms;
+			group->dash->utc_drift_estimate = ((s64) fetch_time - (s64) utc);
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Estimated UTC diff of ATSC broadcast "LLD" ms (UTC fetch "LLU" - server UTC "LLU" - MPD AST "LLU" - MPD PublishTime "LLU" - bootstraping on segment %s\n", group->dash->utc_drift_estimate, fetch_time, utc, group->dash->mpd->availabilityStartTime, group->dash->mpd->publishTime, val));
+
+			group->dash->atsc_clock_state = 2;
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Failed to setup ATSC clock from segment template with bootstrap URL %s, using NTP\n", val));
+			group->dash->atsc_clock_state = 3;
+		}
+	}
+	else if (val) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] ATSC clock already setup - UTC diff of ATSC broadcast "LLD" ms\n", group->dash->utc_drift_estimate));
+	} else if (val) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] No ATSC entity on HTPP request\n"));
+	}
+
+	if ((!group->dash->atsc_clock_state || (group->dash->atsc_clock_state>2)) && !group->dash->ntp_forced && group->dash->estimate_utc_drift && !group->dash->utc_drift_estimate && group->dash->mpd_dnload && group->dash->dash_io->get_header_value) {
+		val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "Server-UTC");
 		if (val) {
 			u64 utc;
 			sscanf(val, LLU, &utc);
-			group->dash->utc_drift_estimate = (s32) ((s64) fetch_time - (s64) utc);
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Estimated UTC diff between client and server %d ms (UTC fetch "LLU" - server UTC "LLU" - MPD AST "LLU" - MPD PublishTime "LLU"\n", group->dash->utc_drift_estimate, fetch_time, utc, group->dash->mpd->availabilityStartTime, group->dash->mpd->publishTime));
+			group->dash->utc_drift_estimate = ((s64) fetch_time - (s64) utc);
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Estimated UTC diff between client and server "LLD" ms (UTC fetch "LLU" - server UTC "LLU" - MPD AST "LLU" - MPD PublishTime "LLU"\n", group->dash->utc_drift_estimate, fetch_time, utc, group->dash->mpd->availabilityStartTime, group->dash->mpd->publishTime));
 		} else {
 			val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "Date");
 			if (val) {
 				u64 utc = gf_net_parse_date(val);
 				if (utc) {
-					group->dash->utc_drift_estimate = (s32) ((s64) fetch_time - (s64) utc);
-					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Estimated UTC diff between client and server %d ms (UTC fetch "LLU" - server UTC "LLU" - MPD AST "LLU" - MPD PublishTime "LLU"\n", group->dash->utc_drift_estimate, fetch_time, utc, group->dash->mpd->availabilityStartTime, group->dash->mpd->publishTime));
+					group->dash->utc_drift_estimate = ((s64) fetch_time - (s64) utc);
+					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Estimated UTC diff between client and server "LLD" ms (UTC fetch "LLU" - server UTC "LLU" - MPD AST "LLU" - MPD PublishTime "LLU"\n", group->dash->utc_drift_estimate, fetch_time, utc, group->dash->mpd->availabilityStartTime, group->dash->mpd->publishTime));
 				}
 			}
 		}
@@ -576,19 +717,46 @@
 	}
 	else current_time -= availabilityStartTime;
 
-	if (current_time < group->period->start) current_time = 0;
-	else current_time -= group->period->start;
+	if (gf_list_count(group->dash->mpd->periods)) {
+		u64 seg_start_ms = current_time;
+		u64 seg_end_ms = (u64) (seg_start_ms + group->segment_duration*1000);
+		u32 i;
+		u64 start = 0;
+		for (i=0; i<gf_list_count(group->dash->mpd->periods); i++) {
+			GF_MPD_Period *ap = gf_list_get(group->dash->mpd->periods, i);
+			if (ap->start) start = ap->start;
+
+			if (group->dash->initial_period_tunein
+				&& (seg_start_ms>=ap->start)
+				&& (!ap->duration || (seg_end_ms<=start + ap->duration))
+			) {
+				if (i != group->dash->active_period_index) {
+					group->dash->initial_period_tunein = GF_FALSE;
+					group->dash->reinit_period_index = 1+i;
+					group->dash->start_range_period = (Double) seg_start_ms;
+					group->dash->start_range_period -= ap->start;
+					group->dash->start_range_period /= 1000;
+					return;
+				}
+			}
 
-#if 0
-	{
-		s64 diff = (s64) current_time - (s64) (mpd->media_presentation_duration);
-		if (ABS(diff)>10) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Broken UTC timing in client or server - got Media URL is not set in segment list\n"));
+			if (!ap->duration) break;
+			start += ap->duration;
+		}
+	}
 
+	//compute current time in period
+	if (current_time < group->period->start)
+		current_time = 0;
+	else {
+		if (group->dash->initial_period_tunein) {
+			current_time -= group->period->start;
+		} else {
+			//initial period was setup, consider we are moving to a new period, so time in this period is 0
+			current_time = 0;
+			if (group->start_playback_range) current_time = (u64) (group->start_playback_range*1000);
 		}
-		current_time = mpd->media_presentation_duration;
 	}
-#endif
 
 	current_time_no_timeshift = current_time;
 	if ( ((s32) mpd->time_shift_buffer_depth>=0)) {
@@ -606,15 +774,6 @@
 			if (current_time < shift) current_time = 0;
 			else current_time -= shift;
 		}
-		//commented for now, this increase the delay to the live ...
-#if 0
-		else if (group->dash->user_buffer_ms) {
-			shift = MIN(group->dash->user_buffer_ms, mpd->time_shift_buffer_depth);
-
-			if (current_time < shift) current_time = 0;
-			else current_time -= shift;
-		}
-#endif
 	}
 	group->dash->time_in_tsb = group->dash->prev_time_in_tsb = 0;
 
@@ -670,8 +829,8 @@
 		u32 i, seg_idx = 0;
 
 		current_time_rescale = current_time;
-		current_time_rescale /= 1000;
 		current_time_rescale *= timescale;
+		current_time_rescale /= 1000;
 
 		count = gf_list_count(timeline->entries);
 		for (i=0; i<count; i++) {
@@ -748,6 +907,42 @@
 		nb_seg /= group->segment_duration;
 		shift = (u32) nb_seg;
 
+		if ((group->dash->atsc_clock_state == 2) && shift) {
+			//shift currently points to the next segment after the one used for clock bootstrap, use the right one
+			shift--;
+			//avoid querying too early the cache since segments do not usually arrive exactly on time ...
+			availabilityStartTime += group->dash->atsc_ast_shift;
+		}
+
+		if (group->dash->initial_period_tunein) {
+			u64 seg_start_ms, seg_end_ms;
+
+			seg_start_ms = (u64) (group->segment_duration * (shift+start_number) * 1000);
+			seg_end_ms = (u64) (seg_start_ms + group->segment_duration*1000);
+			//we are in the right period
+			if (seg_start_ms>=group->period->start && (!group->period->duration || (seg_end_ms<=group->period->start+group->period->duration)) ) {
+			} else {
+				u32 i;
+				u64 start = 0;
+				for (i=0; i<gf_list_count(group->dash->mpd->periods); i++) {
+					GF_MPD_Period *ap = gf_list_get(group->dash->mpd->periods, i);
+					if (ap->start) start = ap->start;
+
+					if ((seg_start_ms>=ap->start) && (!ap->duration || (seg_end_ms<=start + ap->duration))) {
+						group->dash->initial_period_tunein = GF_FALSE;
+						group->dash->reinit_period_index = 1+i;
+						group->dash->start_range_period = (Double) seg_start_ms;
+						group->dash->start_range_period -= ap->start;
+						group->dash->start_range_period /= 1000;
+						return;
+					}
+
+					if (!ap->duration) break;
+					start += ap->duration;
+				}
+			}
+		}
+
 		//not time shifting, we are at the live edge, we must stick to start of segment otherwise we won't have enough data to play until next segment is ready
 
 		if (!group->dash->initial_time_shift_value) {
@@ -857,7 +1052,7 @@
 	return GF_FALSE;
 }
 
-static Bool gf_dash_is_smooth_mime(const char *url, const char * mime) 
+static Bool gf_dash_is_smooth_mime(const char *url, const char * mime)
 {
 	u32 i;
 	if (!url || !mime)
@@ -909,7 +1104,9 @@
 	if (! *sess) {
 		*sess = dash_io->create(dash_io, persistent_mode ? 1 : 0, url, group_idx);
 		if (!(*sess)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot try to download %s... OUT of memory ?\n", url));
+			if (dash->atsc_clock_state)
+				return GF_IP_NETWORK_EMPTY;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot try to download %s... out of memory ?\n", url));
 			return GF_OUT_OF_MEM;
 		}
 	} else {
@@ -917,7 +1114,8 @@
 		if (persistent_mode!=2) {
 			e = dash_io->setup_from_url(dash_io, *sess, url, group_idx);
 			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot resetup session for url %s: %s\n", url, gf_error_to_string(e) ));
+				//with ATSC we may have 404 right away if nothing in cache yet, not an error
+				GF_LOG(dash->atsc_clock_state ? GF_LOG_DEBUG : GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot resetup downloader for url %s: %s\n", url, gf_error_to_string(e) ));
 				return e;
 			}
 		}
@@ -1002,7 +1200,7 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] failed to download, retrying once with %s...\n", url));
 			*sess = dash_io->create(dash_io, 0, url, group_idx);
 			if (! (*sess)) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot retry to download %s... OUT of memory ?\n", url));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot retry to download %s... out of memory ?\n", url));
 				if (group)
 					group->is_downloading = GF_FALSE;
 				return GF_OUT_OF_MEM;
@@ -1022,7 +1220,7 @@
 		break;
 	default:
 		//log as warning, maybe the dash client can recover from this error
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] FAILED to download %s = %s...\n", url, gf_error_to_string(e)));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Failed to download %s = %s...\n", url, gf_error_to_string(e)));
 		break;
 	}
 	if (group)
@@ -1170,7 +1368,7 @@
 			*max_seg_duration /= timescale;
 		}
 		mediaDuration = (Double)period->duration;
-		if (!mediaDuration) {
+		if (!mediaDuration && mpd->media_presentation_duration) {
 			u32 i, count = gf_list_count(mpd->periods);
 			Double start = 0;
 			for (i=0; i<count; i++) {
@@ -1498,6 +1696,18 @@
 	return GF_OK;
 }
 
+static void dash_purge_xlink(GF_MPD *new_mpd)
+{
+	u32 i, count = gf_list_count(new_mpd->periods);
+	for (i=0; i<count; i++) {
+		GF_MPD_Period *period = gf_list_get(new_mpd->periods, i);
+		if (!gf_list_count(period->adaptation_sets)) continue;
+		if (!period->xlink_href) continue;
+		gf_free(period->xlink_href);
+		period->xlink_href = NULL;
+	}
+}
+
 
 static GF_Err gf_dash_update_manifest(GF_DashClient *dash)
 {
@@ -1588,7 +1798,7 @@
 		/* Some servers, for instance http://tv.freebox.fr, serve m3u8 as text/plain */
 		if (gf_dash_is_m3u8_mime(purl, mime) || strstr(purl, ".m3u8")) {
 			new_mpd = gf_mpd_new();
-			e = gf_m3u8_to_mpd(local_url, purl, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter, new_mpd, GF_FALSE);
+			e = gf_m3u8_to_mpd(local_url, purl, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter, new_mpd, GF_FALSE, dash->keep_files, 0);
 			if (e) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: error in MPD creation %s\n", gf_error_to_string(e)));
 				gf_mpd_del(new_mpd);
@@ -1665,6 +1875,8 @@
 			gf_mpd_del(new_mpd);
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
+		if (dash->ignore_xlink)
+			dash_purge_xlink(new_mpd);
 	}
 
 	assert(new_mpd);
@@ -1672,6 +1884,58 @@
 	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
 	if (fetch_only && !period) goto exit;
 
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Updated manifest:\n"));
+	for (i=0; i<gf_list_count(new_mpd->periods); i++) {
+		GF_MPD_Period *ap = gf_list_get(new_mpd->periods, i);
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tP#%d: start "LLU" - duration " LLU" - xlink %s\n", i+1, ap->start, ap->duration, ap->xlink_href ? ap->xlink_href : "none"));
+	}
+
+	//if current period was a remote period, do a pass on the new manifest periods, check for xlink
+	if (period->origin_base_url) {
+restart_period_check:
+		for (i=0; i<gf_list_count(new_mpd->periods); i++) {
+			new_period = gf_list_get(new_mpd->periods, i);
+			if (!new_period->xlink_href) continue;
+
+			if ((new_period->start<=period->start) &&
+				( (new_period->start+new_period->duration >= period->start + period->duration) || (!new_period->duration))
+			) {
+				const char *base_url;
+				u32 j, insert_idx;
+				if (period->type == GF_MPD_TYPE_DYNAMIC) {
+					gf_dash_solve_period_xlink(dash, new_mpd->periods, i);
+					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
+
+				base_url = period->origin_base_url;
+				if (!base_url) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - found new Xlink period overlapping a non-xlink period in original manifest\n"));
+					gf_mpd_del(new_mpd);
+					return GF_NON_COMPLIANT_BITSTREAM;
+				}
+				insert_idx = i;
+				gf_list_rem(new_mpd->periods, i);
+				for (j=0; j<gf_list_count(dash->mpd->periods); j++) {
+					GF_MPD_Period *ap = gf_list_get(dash->mpd->periods, j);
+					if (!ap->origin_base_url) continue;
+					if (strcmp(ap->origin_base_url, base_url)) continue;
+					gf_list_rem(dash->mpd->periods, j);
+					j--;
+					gf_list_insert(new_mpd->periods, ap, insert_idx);
+					insert_idx++;
+				}
+				//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);
+				//this will do the garbage collection
+				gf_list_add(dash->mpd->periods, new_period);
+				goto exit;
+			}
+			new_period=NULL;
+		}
+	}
+
 	new_period = NULL;
 	for (i=0; i<gf_list_count(new_mpd->periods); i++) {
 		new_period = gf_list_get(new_mpd->periods, i);
@@ -1680,11 +1944,26 @@
 	}
 
 	if (!new_period) {
+		if (dash->mpd->type == GF_MPD_TYPE_DYNAMIC) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] current active period not found in MPD update - assuming end of active period and switching to first period in new MPD\n"));
+			new_period = gf_list_get(new_mpd->periods, 0);
+			//assume the old period is no longer valid
+			dash->active_period_index = 0;
+			dash->request_period_switch = GF_TRUE;
+			for (i=0; i<gf_list_count(dash->groups); i++) {
+				GF_DASH_Group *group = gf_list_get(dash->groups, i);
+				group->done = GF_TRUE;
+				group->adaptation_set = NULL;
+			}
+			goto exit;
+		}
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: missing period\n"));
 		gf_mpd_del(new_mpd);
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
+
 	dash->active_period_index = gf_list_find(new_mpd->periods, new_period);
+	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"));
@@ -1721,8 +2000,6 @@
 	}
 
 	for (group_idx=0; group_idx<gf_list_count(dash->groups); group_idx++) {
-		Double seg_dur;
-		Bool reset_segment_count;
 		GF_MPD_AdaptationSet *set, *new_set;
 		u32 rep_i;
 		GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
@@ -1827,7 +2104,7 @@
 						if (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) 
+						if (group->dash->dash_state != GF_DASH_STATE_RUNNING)
 							break;
 
 						gf_sleep(100);
@@ -1885,7 +2162,6 @@
 						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Representation #%d: Adding new segment %s\n", rep_idx+1, new_seg->media));
 					}
 				}
-
 				/*what else should we check ?*/
 
 				/*swap segment list content*/
@@ -1941,6 +2217,23 @@
 				return e;
 			}
 
+			//move redirections in representations base URLs (we could do that on AS as well )
+			if (rep->base_URLs && new_rep->base_URLs) {
+				u32 k;
+				for (i=0; i<gf_list_count(new_rep->base_URLs); i++) {
+					GF_MPD_BaseURL *n_url = gf_list_get(new_rep->base_URLs, i);
+					if (!n_url->URL) continue;
+
+					for (k=0; k<gf_list_count(rep->base_URLs); k++) {
+						GF_MPD_BaseURL *o_url = gf_list_get(rep->base_URLs, k);
+						if (o_url->URL && !strcmp(o_url->URL, n_url->URL)) {
+							n_url->redirection = o_url->redirection;
+							o_url->redirection = NULL;
+						}
+					}
+				}
+			}
+
 			/*what else should we check ??*/
 
 
@@ -1960,11 +2253,17 @@
 			gf_mpd_del(new_mpd);
 			return e;
 		}
-
+	}
+	//good to go, switch pointers
+	for (group_idx=0; group_idx<gf_list_count(dash->groups); group_idx++) {
+		Double seg_dur;
+		Bool reset_segment_count;
+		GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
 		/*update group/period to new period*/
 		j = gf_list_find(group->period->adaptation_sets, group->adaptation_set);
 		group->adaptation_set = gf_list_get(new_period->adaptation_sets, j);
 		group->period = new_period;
+		assert(group->adaptation_set);
 
 		j = gf_list_count(group->adaptation_set->representations);
 		assert(j);
@@ -2028,6 +2327,12 @@
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updated AdaptationSet %d - %d segments\n", group_idx+1, group->nb_segments_in_rep));
 
+		if (!period->duration && new_period->duration) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("End of period upcoming, current segment index for group #%d: %d\n", group_idx+1, group->download_segment_index));
+			if (group->download_segment_index > (s32) group->nb_segments_in_rep)
+				group->done = GF_TRUE;
+		}
+
 	}
 
 exit:
@@ -2037,6 +2342,13 @@
 	dash->mpd = new_mpd;
 	dash->last_update_time = gf_sys_clock();
 	dash->mpd_fetch_time = fetch_time;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Manifest after update:\n"));
+	for (i=0; i<gf_list_count(new_mpd->periods); i++) {
+		GF_MPD_Period *ap = gf_list_get(new_mpd->periods, i);
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tP#%d: start "LLU" - duration " LLU" - xlink %s\n", i+1, ap->start, ap->duration, ap->xlink_href ? ap->xlink_href : ap->origin_base_url ? ap->origin_base_url : "none"));
+	}
+
 	return GF_OK;
 }
 
@@ -2057,9 +2369,9 @@
 	u32 nb_cached_seg_per_rep = group->max_cached_segments / gf_dash_group_count_rep_needed(group);
 	assert((s32) i >= 0);
 
-	/* in case of dependent representations: we set force_max_rep_index than active_rep_index*/
+	/* in case of dependent representations: we set max_complementary_rep_index than active_rep_index*/
 	if (group->base_rep_index_plus_one)
-		group->force_max_rep_index = i;
+		group->max_complementary_rep_index = i;
 	else
 		group->active_rep_index = i;
 	group->active_bitrate = rep->bandwidth;
@@ -2080,11 +2392,11 @@
 		u64 dur = 0;
 		u32 retry=10;
 		GF_Err e=GF_OK;
-		
+
 		if (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", rep->segment_list->consecutive_xlink_count));
 		}
-		
+
 		while (retry) {
 			if (group->dash->is_m3u8) {
 				e = gf_m3u8_solve_representation_xlink(rep, &group->dash->getter, &is_static, &dur);
@@ -2093,7 +2405,7 @@
 			}
 			if (e==GF_OK) break;
 			if (e==GF_NON_COMPLIANT_BITSTREAM) break;
-			if (group->dash->dash_state != GF_DASH_STATE_RUNNING) 
+			if (group->dash->dash_state != GF_DASH_STATE_RUNNING)
 				break;
 
 			retry--;
@@ -2103,7 +2415,7 @@
 		//after resolving xlink: if this represenstation is marked as disabled, we have nothing to do
 		if (rep->playback.disabled)
 			return;
-		
+
 		if (e) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Could not reslove XLINK %s in time - using old representation\n", rep->segment_list->xlink_href));
 			group->active_rep_index = prev_active_rep_index;
@@ -2145,7 +2457,6 @@
 				for (k=0; k<gf_list_count(rep->segment_list->segment_URLs); k++) {
 					s64 start_diff;
 					seg_url = (GF_MPD_SegmentURL *) gf_list_get(rep->segment_list->segment_URLs, k);
-					assert(seg_url->hls_utc_start_time);
 
 					start_diff = (s64) current_start_time;
 					start_diff -= (s64) seg_url->hls_utc_start_time;
@@ -2157,7 +2468,7 @@
 						break;
 					}
 					if (current_start_time < seg_url->hls_utc_start_time) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Switching to HLS start time "LLU" but found earlier segment with start time "LLU" - probabluy lost one segment\n", current_start_time, seg_url->hls_utc_start_time));
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Switching to HLS start time "LLU" but found earlier segment with start time "LLU" - probably lost one segment\n", current_start_time, seg_url->hls_utc_start_time));
 						group->download_segment_index = k;
 						next_media_seq = rep->m3u8_media_seq_min + group->download_segment_index;
 						next_found = GF_TRUE;
@@ -2298,6 +2609,12 @@
 
 	if (!group->timeline_setup) {
 		gf_dash_group_timeline_setup(mpd, group, 0);
+		//we must wait for ATSC 3.0 clock to initialize, even if first period is static remote (we need to know when to tune)
+		if (group->dash->atsc_clock_state==1)
+			return GF_IP_NETWORK_EMPTY;
+
+		if (group->dash->reinit_period_index)
+			return GF_IP_NETWORK_EMPTY;
 		group->timeline_setup = 1;
 		item_index = group->download_segment_index;
 	}
@@ -2306,6 +2623,7 @@
 	*segment_duration = (resolve_type==GF_MPD_RESOLVE_URL_MEDIA) ? (u32) ((Double) ((*segment_duration) * 1000.0) / timescale) : 0;
 	e = gf_mpd_resolve_url(mpd, rep, set, period, mpd_url, group->current_base_url_idx, resolve_type, item_index, group->nb_segments_purged, out_url, out_range_start, out_range_end, segment_duration, is_in_base_url, out_key_url, out_key_iv);
 
+
 	if (e == GF_NON_COMPLIANT_BITSTREAM) {
 //		group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
 	}
@@ -2340,7 +2658,7 @@
 	Double max_dl_speed, max_decoding_speed;
 	u32 framerate;
 	u32 bytes_per_sec;
-	
+
 	if (!group->irap_max_dec_time && !group->avg_dec_time) {
 		return 0;
 	}
@@ -2359,7 +2677,7 @@
 	return max_available_speed/2; // for testing and debug
 }
 
-static void dash_store_stats(GF_DashClient *dash, GF_DASH_Group *group, u32 bytes_per_sec, u32 file_size)
+static void dash_store_stats(GF_DashClient *dash, GF_DASH_Group *group, u32 bytes_per_sec, u32 file_size, Bool is_broadcast)
 {
 	const char *url;
 	u32 buffer_ms = 0;
@@ -2374,7 +2692,11 @@
 	else url = group->cached[group->nb_cached_segments-1].url;
 
 	group->total_size = file_size;
-	group->bytes_per_sec = bytes_per_sec;
+	//in broadcast mode, just store the rate
+	if (is_broadcast) group->bytes_per_sec = bytes_per_sec;
+	//otherwise store the min rate we got (to deal with complementary representations)
+	else if (!group->bytes_per_sec || group->bytes_per_sec > bytes_per_sec) group->bytes_per_sec = bytes_per_sec;
+
 	group->last_segment_time = gf_sys_clock();
 	group->nb_segments_since_switch ++;
 
@@ -2396,17 +2718,15 @@
 		bitrate = 8*group->total_size;
 		bitrate /= group->current_downloaded_segment_duration;
 	}
-	if (group->bytes_per_sec) {
+	if (bytes_per_sec) {
 		time = group->total_size;
-		time /= group->bytes_per_sec;
+		time /= bytes_per_sec;
 	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d got %s stats: %d bytes in %g sec (%d kbps) - duration %g sec - Media Rate: indicated %d - computed %d kbps - buffer %d ms\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set), url, group->total_size, time, 8*group->bytes_per_sec/1000, group->current_downloaded_segment_duration/1000.0, rep->bandwidth/1000, (u32) bitrate, buffer_ms));
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AS#%d got %s stats: %d bytes in %g sec (%d kbps) - duration %g sec - Media Rate: indicated %d - computed %d kbps - buffer %d ms\n", 1+gf_list_find(group->period->adaptation_sets, group->adaptation_set), url, group->total_size, time, 8*bytes_per_sec/1000, group->current_downloaded_segment_duration/1000.0, rep->bandwidth/1000, (u32) bitrate, buffer_ms));
 
 #endif
 }
 
-
-
 static GF_Err dash_do_rate_monitor_default(GF_DashClient *dash, GF_DASH_Group *group)
 {
 	Bool default_switch_mode = GF_FALSE;
@@ -2440,14 +2760,16 @@
 	time_since_start = gf_sys_clock() - group->download_start_time;
 
 	if (group->min_bandwidth_selected) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%d at rate %d kbps but media bitrate is %d kbps - no lower bitrate available ...\n", set_idx, download_rate/1024, group->active_bitrate/1024 ));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%d at rate %d kbps but media bitrate is"
+				" %d kbps - no lower bitrate available ...\n", set_idx, download_rate/1024, group->active_bitrate/1024 ));
 		return GF_OK;
 	}
 
 
 	//TODO - when do we start checking ?
 	if (time_since_start < 200) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%ds at rate %d kbps but media bitrate is %d kbps\n", set_idx, download_rate/1024, group->active_bitrate/1024 ));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%ds at rate %d kbps but "
+				"media bitrate is %d kbps\n", set_idx, download_rate/1024, group->active_bitrate/1024 ));
 		return GF_OK;
 	}
 
@@ -2458,12 +2780,16 @@
 		}
 		//we have enough cache data to go until end of this download, perform rate switching at next segment
 		if (time_until_end<cache_dur) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%ds at rate %d kbps but media bitrate is %d kbps - %d till end of download and %d in cache - going on with download\n", set_idx, download_rate/1024, group->active_bitrate/1024,time_until_end, cache_dur ));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%ds at rate %d kbps but "
+					"media bitrate is %d kbps - %d till end of download and %d in cache - "
+					"going on with download\n", set_idx, download_rate/1024, group->active_bitrate/1024,time_until_end, cache_dur ));
 			return GF_OK;
 		}
 	}
 
-	GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Downloading from set #%d at rate %d kbps but media bitrate is %d kbps - %d/%d in cache - killing connection and switching\n", set_idx, download_rate/1024, group->active_bitrate/1024, group->nb_cached_segments, group->max_cached_segments ));
+	GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Downloading from set #%d at rate %d kbps but "
+			"media bitrate is %d kbps - %d/%d in cache - killing connection and "
+			"switching\n", set_idx, download_rate/1024, group->active_bitrate/1024, group->nb_cached_segments, group->max_cached_segments ));
 
 	group->download_abort_type = 2;
 	group->dash->dash_io->abort(group->dash->dash_io, group->segment_download);
@@ -2476,7 +2802,8 @@
 		//don't force bandwidth switch (it's too late anyway, consider we lost the segment), let the rate adaptation decide
 		group->force_switch_bandwidth = default_switch_mode;
 
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Download time longer than segment duration - trying to resync on next segment\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Download time longer than segment duration - trying to resync on next "
+				"segment\n"));
 	} else {
 		u32 target_rate;
 		//compute min bitrate needed to fetch the segement in another rep, with the time remaining
@@ -2500,14 +2827,14 @@
 	return GF_OK;
 }
 
-static u32 dash_do_rate_adaptation_legacy_rate(GF_DashClient *dash, GF_DASH_Group *group, GF_DASH_Group *base_group,
+static s32 dash_do_rate_adaptation_legacy_rate(GF_DashClient *dash, GF_DASH_Group *group, GF_DASH_Group *base_group,
 												u32 dl_rate, Double speed, Double max_available_speed, Bool force_lower_complexity,
 												GF_MPD_Representation *rep, Bool go_up_bitrate)
 {
 	u32 k;
 	Bool do_switch;
 	GF_MPD_Representation *new_rep;
-	u32 new_index = group->active_rep_index;
+	s32 new_index = group->active_rep_index;
 
 	/* records the number of representations between the current one and the next chosen one */
 	u32 nb_inter_rep = 0;
@@ -2535,18 +2862,18 @@
 
 			/* First check if we are adapting to CPU */
 			if (!dash->disable_speed_adaptation && force_lower_complexity) {
-				
+
 				/*try to switch to highest quality below the current one*/
 				if ((arep->quality_ranking < rep->quality_ranking) ||
 					(arep->width < rep->width) || (arep->height < rep->height)) {
-					
+
 					/* If we hadn't found a new representation, use it
 					 otherwise use it only if current representation is better*/
 					if (!new_rep) {
 						new_rep = arep;
 						new_index = k;
 					}
-					else if ((arep->quality_ranking > new_rep->quality_ranking) || 
+					else if ((arep->quality_ranking > new_rep->quality_ranking) ||
 						(arep->width > new_rep->width) || (arep->height > new_rep->height)) {
 						new_rep = arep;
 						new_index = k;
@@ -2624,14 +2951,14 @@
 	return new_index;
 }
 
-static u32 dash_do_rate_adaptation_legacy_buffer(GF_DashClient *dash, GF_DASH_Group *group, GF_DASH_Group *base_group,
+static s32 dash_do_rate_adaptation_legacy_buffer(GF_DashClient *dash, GF_DASH_Group *group, GF_DASH_Group *base_group,
 												 u32 dl_rate, Double speed, Double max_available_speed, Bool force_lower_complexity,
 												 GF_MPD_Representation *rep, Bool go_up_bitrate)
 {
 	Bool do_switch;
-	u32 new_index = group->active_rep_index;
+	s32 new_index = group->active_rep_index;
 
-	/* We assume that there will be a change in quality 
+	/* We assume that there will be a change in quality
 	 and then set it to no change or increase if this is not the case */
 	do_switch = GF_TRUE;
 
@@ -2655,7 +2982,7 @@
 
 		if (group->current_downloaded_segment_duration && (group->buffer_max_ms > group->current_downloaded_segment_duration)) {
 			buf_high_threshold = group->buffer_max_ms - (u32)group->current_downloaded_segment_duration;
-		} 
+		}
 		else {
 			buf_high_threshold = 2 * group->buffer_max_ms / 3;
 		}
@@ -2672,7 +2999,7 @@
 		if ((s32)group->buffer_occupancy_ms < (s32)buf_low_threshold) {
 			if (!group->buffer_occupancy_ms) {
 				dl_rate = group->min_representation_bitrate;
-			} 
+			}
 			else {
 				dl_rate = (rep->bandwidth > 10) ? rep->bandwidth - 10 : 1;
 			}
@@ -2700,25 +3027,282 @@
 	return new_index;
 }
 
-static u32 dash_do_rate_adaptation_test(GF_DashClient *dash, GF_DASH_Group *group, GF_DASH_Group *base_group,
+// returns the bitrate and index of the representation having the minimum bitrate above the given rate
+static u32 get_min_rate_above(GF_List *representations, double rate, s32 *index) {
+	u32 k;
+	u32 min_rate = GF_INT_MAX;
+	GF_MPD_Representation *rep;
+
+	u32 nb_reps = gf_list_count(representations);
+	for (k = 0; k < nb_reps; k++) {
+		rep = gf_list_get(representations, k);
+		if ((rep->bandwidth < min_rate) && (rep->bandwidth > rate)) {
+			min_rate = rep->bandwidth;
+			if (index) {
+				*index = k;
+			}
+			return min_rate; // representations are sorted by bandwidth
+		}
+	}
+	return min_rate;
+}
+
+// returns the bitrate and index of the representation having the maximum bitrate below the given rate
+static u32 get_max_rate_below(GF_List *representations, double rate, s32 *index) {
+	s32 k;
+	u32 max_rate = 0;
+	GF_MPD_Representation *rep;
+
+	u32 nb_reps = gf_list_count(representations);
+	for (k = (s32) nb_reps-1; k >=0 ; k--) {
+		rep = gf_list_get(representations, k);
+		if ((rep->bandwidth > max_rate) && (rep->bandwidth < rate)) {
+			max_rate = rep->bandwidth;
+			if (index) {
+				*index = k;
+			}
+			return max_rate; // representations are sorted by bandwidth
+		}
+	}
+	return max_rate;
+}
+
+/**
+Adaptation Algorithm as described in
+	T.-Y. Huang et al. 2014. A buffer-based approach to rate adaptation: evidence from a large video streaming service.
+	In Proceedings of the 2014 ACM conference on SIGCOMM (SIGCOMM '14).
+*/
+static s32 dash_do_rate_adaptation_bba0(GF_DashClient *dash, GF_DASH_Group *group, GF_DASH_Group *base_group,
 												 u32 dl_rate, Double speed, Double max_available_speed, Bool force_lower_complexity,
 												 GF_MPD_Representation *rep, Bool go_up_bitrate)
 {
-	if (group->buffer_occupancy_ms + group->segment_duration*1000 > group->buffer_max_ms) {
-		if (!group->rate_adaptation_postponed) {
-			//fprintf(stderr, "new buffer occupancy would be %u ms, greater than max buffer %u ms - postponing download\n", group->buffer_occupancy_ms+(u32)(group->segment_duration*1000), group->buffer_max_ms);
+	u32 rate_plus;
+	u32 rate_minus;
+	u32 rate_prev = group->active_bitrate;
+	u32 rate_max;
+	u32 rate_min;
+	s32 new_index;
+	u32 r; // reservoir
+	u32 cu; // cushion
+	u32 buf_now = group->buffer_occupancy_ms;
+	double f_buf_now;
+
+	/* We don't use the segment duration as advertised in the MPD because it may not be there due to segment timeline*/
+	u32 segment_duration_ms = (u32)group->current_downloaded_segment_duration;
+
+	rate_min = ((GF_MPD_Representation *)gf_list_get(group->adaptation_set->representations, 0))->bandwidth;
+	rate_max = ((GF_MPD_Representation *)gf_list_get(group->adaptation_set->representations, gf_list_count(group->adaptation_set->representations) - 1))->bandwidth;
+	/* if the current buffer cannot hold an entire new segment, we indicate that we don't want to download it
+	 NOTE: This is not described in the paper
+	*/
+	if (group->buffer_occupancy_ms + segment_duration_ms > group->buffer_max_ms) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] BBA-0: not enough space to download new segment: %d\n", group->buffer_occupancy_ms));
+		return -1;
+	}
+
+ if (rate_prev == rate_max) {
+ 	rate_plus = rate_max;
+ } else {
+		rate_plus = get_min_rate_above(group->adaptation_set->representations, rate_prev, NULL);
+ }
+
+ if (rate_prev == rate_min) {
+ 	rate_minus = rate_min;
+ } else {
+		rate_minus = get_max_rate_below(group->adaptation_set->representations, rate_prev, NULL);
+ }
+
+ /*
+ * the size of the reservoir is 37.5% of the buffer size, but at least = 1 chunk duration)
+	 * the size of the upper reservoir is 10% of the buffer size
+ * the size of cushion is between 37.5% and 90% of the buffer size
+	 * the rate map is piece-wise
+ */
+	if (group->buffer_max_ms <= segment_duration_ms) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] BBA-0: cannot initialize BBA-0 given the buffer size (%d) and segment duration (%d)\n", group->buffer_max_ms, group->segment_duration*1000));
+		return -1;
+	}
+	r = (u32)(37.5*group->buffer_max_ms / 100);
+	if (r < segment_duration_ms) {
+		r = segment_duration_ms;
+	}
+	cu = (u32)((90-37.5)*group->buffer_max_ms / 100);
+
+	if (buf_now <= r) {
+		f_buf_now = rate_min;
+	}
+	else if (buf_now >= (cu + r)) {
+		f_buf_now = rate_max;
+	}
+	else {
+		f_buf_now = rate_min + (rate_max - rate_min)*((buf_now - r) * 1.0 / cu);
+	}
+
+	if (f_buf_now == rate_max) {
+		// rate_next = rate_max;
+		new_index = gf_list_count(group->adaptation_set->representations) - 1;
+	}
+	else if (f_buf_now == rate_min) {
+		// rate_next = rate_min;
+		new_index = 0;
+	}
+	else if (f_buf_now >= rate_plus) {
+		// rate_next = max of Ri st. Ri < f_buf_now
+		new_index = 0;
+		get_max_rate_below(group->adaptation_set->representations, f_buf_now, &new_index);
+	}
+	else if (f_buf_now <= rate_minus) {
+		// rate_next = min of Ri st. Ri > f_buf_now
+		new_index = gf_list_count(group->adaptation_set->representations) - 1;
+		get_min_rate_above(group->adaptation_set->representations, f_buf_now, &new_index);
+	}
+	else {
+		// no change
+		new_index = group->active_rep_index;
+	}
+
+	if (new_index != -1) {
+		GF_MPD_Representation *result = gf_list_get(group->adaptation_set->representations, (u32)new_index);
+		// increment the segment number for debug purposes
+		group->current_index++;
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] BBA-0: buffer %d ms, segment number %d, new quality %d with rate %d\n", group->buffer_occupancy_ms, group->current_index, new_index, result->bandwidth));
+	}
+	return new_index;
+}
+
+/* returns the index of the representation which maximises BOLA utility function
+ based on the relative log-based utility of each representation compared to the one with the lowest bitrate
+ NOTE: V can represent V (in BOLA BASIC) or V_D (in other modes of BOLA) */
+static s32 bola_find_max_utility_index(GF_List *representations, Double V, Double gamma, Double p, Double Q) {
+	u32 k;
+	Double max_utility = GF_MIN_DOUBLE;
+	u32 nb_reps = gf_list_count(representations);
+	s32 new_index = -1;
+
+	for (k = 0; k < nb_reps; k++) {
+		GF_MPD_Representation *rep = gf_list_get(representations, k);
+		Double utility = (V * rep->playback.bola_v + V*gamma*p - Q) / (rep->bandwidth*p);
+		if (utility >= max_utility) {
+			max_utility = utility;
+			new_index = k;
 		}
-		return 0xFFFFFFFF;
 	}
-	else if (group->rate_adaptation_postponed) {
-		if (group->buffer_occupancy_ms + group->segment_duration*1000 > group->buffer_max_ms/2) {
-			//fprintf(stderr, "new buffer occupancy %u ms, greater than half max buffer %u ms - still postponing download\n", group->buffer_occupancy_ms+(u32)(group->segment_duration*1000), group->buffer_max_ms);
-			return 0xFFFFFFFF;
+	return new_index;
+}
+
+/**
+Adaptation Algorithm as described in
+K. Spiteri et al. 2016. BOLA: Near-Optimal Bitrate Adaptation for Online Videos
+Arxiv.org
+*/
+static s32 dash_do_rate_adaptation_bola(GF_DashClient *dash, GF_DASH_Group *group, GF_DASH_Group *base_group,
+		 	 	 	 	 	 	 	 	 u32 dl_rate, Double speed, Double max_available_speed, Bool force_lower_complexity,
+										 	 GF_MPD_Representation *rep, Bool go_up_bitrate)
+{
+	s32 new_index = -1;
+	u32 k;
+	Double p = group->current_downloaded_segment_duration / 1000.0;	// segment duration
+	Double gamma = (double)5/(double)p;
+	Double Qmax = group->buffer_max_ms / 1000.0 / p;		// max nb of segments in the buffer
+	Double Q = group->buffer_occupancy_ms / 1000.0 / p;		// current buffer occupancy in number of segments
+
+	GF_MPD_Representation *min_rep;
+	GF_MPD_Representation *max_rep;
+	u32 nb_reps;
+
+	if (dash->mpd->type != GF_MPD_TYPE_STATIC) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] BOLA: Cannot be used for live MPD\n"));
+		return -1;
+	}
+
+	nb_reps = gf_list_count(group->adaptation_set->representations);
+	min_rep = gf_list_get(group->adaptation_set->representations, 0);
+	max_rep = gf_list_get(group->adaptation_set->representations, nb_reps - 1);
+
+	// Computing the log-based utility of each segment (recomputing each time for period changes)
+	for (k = 0; k < nb_reps; k++) {
+		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, k);
+		rep->playback.bola_v = log(((Double)rep->bandwidth) / min_rep->bandwidth);
+	}
+
+	if (dash->adaptation_algorithm == GF_DASH_ALGO_BOLA_BASIC) {
+		/* BOLA Basic is the variant of BOLA that assumes infinite duration streams (no wind-up/down, no rate use, no oscillation control)
+		 It simply consists in finding the maximum utility */
+		// NOTE in BOLA, representation indices decrease when the quality increases [1 = best quality]
+		Double V = (Qmax - 1) / (gamma * p + max_rep->playback.bola_v);
+		new_index = bola_find_max_utility_index(group->adaptation_set->representations, V, gamma, p, Q);
+	}
+	else if (dash->adaptation_algorithm == GF_DASH_ALGO_BOLA_FINITE ||
+		dash->adaptation_algorithm == GF_DASH_ALGO_BOLA_O ||
+		dash->adaptation_algorithm == GF_DASH_ALGO_BOLA_U) {
+		/* BOLA FINITE is the same as BOLA Basic with the wind-up and down phases */
+		/* BOLA O and U add extra steps to BOLA FINITE */
+		Double t_bgn; //play time from begin
+		Double t_end; //play time to the end
+		Double t;
+		Double t_prime;
+		Double Q_Dmax;
+		Double V_D;
+		Double N = dash->mpd->media_presentation_duration / p;
+
+		t_bgn = p*group->current_index;
+		t_end = (N - group->current_index)*p;
+		t = MIN(t_bgn, t_end);
+		t_prime = MAX(t / 2, 3 * p);
+		Q_Dmax = MIN(Qmax, t_prime / p);
+		V_D = (Q_Dmax - 1) / (gamma * p + max_rep->playback.bola_v);
+
+		new_index = bola_find_max_utility_index(group->adaptation_set->representations, V_D, gamma, p, Q);
+
+		if (dash->adaptation_algorithm == GF_DASH_ALGO_BOLA_U || dash->adaptation_algorithm == GF_DASH_ALGO_BOLA_O) {
+			//Bola U algorithm
+			if ((new_index != -1) && ((u32)new_index > group->active_rep_index)) {
+				u32 r = group->bytes_per_sec*8;
+
+				// index_prime the min m such that (Sm[m]/p)<= max(bandwidth_previous,S_M/p))
+				// NOTE in BOLA, representation indices decrease when the quality increases [1 = best quality]
+				u32 m_prime = 0;
+				get_max_rate_below(group->adaptation_set->representations, MAX(r, min_rep->bandwidth), &m_prime);
+				if (m_prime >= (u32)new_index) {
+					m_prime = new_index;
+				}
+				else if (m_prime < group->active_rep_index) {
+					m_prime = group->active_rep_index;
+				}
+				else {
+					if (dash->adaptation_algorithm == GF_DASH_ALGO_BOLA_U) {
+						m_prime++;
+					}
+					else { //GF_DASH_ALGO_BOLA_O
+#if 0
+						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);
+						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;
+						Sm_prime_plus_one = rep_m_prime_plus_one->bandwidth*p;
+						f_m_prime = V_D*(rep_m_prime->playback.bola_v + gamma*p) / Sm_prime;
+						f_m_prime_1 = V_D*(rep_m_prime_plus_one->playback.bola_v + gamma*p) / Sm_prime_plus_one;
+						// TODO wait for bola_o_pause before making the download
+						bola_o_pause = Q - (f_m_prime - f_m_prime_1) / (1 / Sm_prime - 1 / Sm_prime_plus_one);
+#endif
+					}
+				}
+				new_index = m_prime;
+			}
 		}
+		// TODO trigger pause for max(p*(Q-Q_Dmax+1), 0)
 	}
-//	fprintf(stderr, "new buffer occupancy ms, max buffer %u ms - doing rate adaptation\n", group->buffer_occupancy_ms+(u32)(group->segment_duration*1000), group->buffer_max_ms);
 
-	return dash_do_rate_adaptation_legacy_rate(dash, group, base_group, dl_rate, speed, max_available_speed, force_lower_complexity, rep, go_up_bitrate);
+	if (new_index != -1) {
+		GF_MPD_Representation *result = gf_list_get(group->adaptation_set->representations, (u32)new_index);
+		// increment the segment number for debug purposes
+		group->current_index++;
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] BOLA: buffer %d ms, segment number %d, new quality %d with rate %d\n", group->buffer_occupancy_ms, group->current_index, new_index, result->bandwidth));
+	}
+	return new_index;
 }
 
 /* This function is called each time a new segment has been downloaded */
@@ -2728,7 +3312,7 @@
 	Double max_available_speed;
 	u32 dl_rate;
 	u32 k;
-	u32 new_index;
+	s32 new_index, old_index;
 	GF_DASH_Group *base_group;
 	GF_MPD_Representation *rep;
 	GF_MPD_Representation *new_rep;
@@ -2744,10 +3328,10 @@
 	}
 
 	/* 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 accomodate 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 
+	 if set to 0, this means that no segment was downloaded since the last call
+	 because this AdaptationSet is not selected
 	 So no rate adaptation should be done*/
 	if (!group->bytes_per_sec) {
 		return;
@@ -2805,52 +3389,67 @@
 		rep->playback.waiting_codec_reset = GF_FALSE;
 	}
 
+	old_index = group->active_rep_index;
+	//scalable case, force the rate algo to consider the active rep is the max rep
+	if (group->base_rep_index_plus_one) {
+		group->active_rep_index = group->max_complementary_rep_index;
+	}
+	if (group->dash->atsc_clock_state) {
+		rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+		if (rep->playback.broadcast_flag && (dl_rate < rep->bandwidth)) {
+			dl_rate = rep->bandwidth+1;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AS#%d representation %d segment sent over broadcast, forcing bandwidth to %d\n", 1 + gf_list_find(group->period->adaptation_sets, group->adaptation_set), group->active_rep_index, dl_rate));
+		}
+	}
+
 	/* Call a specific adaptation algorithm (see GPAC configuration)
 	Each algorithm should:
 	- return the new_index value to the desired quality
-	
+
 	It can use:
 	- the information about each available representation (group->adaptation_set->representations, e.g. bandwidth required for that representation)
 	- the information of the current representation (rep)
 	- the download_rate dl_rate (computed on the previously downloaded segment, and adjusted to the playback speed),
 	- the buffer levels:
-	 - current: group->buffer_occupancy_ms, 
+	 - current: group->buffer_occupancy_ms,
 		- previous: group->buffer_occupancy_at_last_seg
 		- max: group->buffer_max_ms,
 	- the playback speed,
 	- the maximum achievable speed at the current resolution,
 	- the indicator that the current representation is too demanding CPU-wise (force_lower_complexity)
-	
+
 	Private algorithm information should be stored in the dash object if global to all AdaptationSets,
 	or in the group if local to an AdaptationSet.
 
 	TODO: document how to access other possible parameters (e.g. segment sizes if available, ...)
-	*/	
+	*/
 	new_index = group->active_rep_index;
 	if (dash->rate_adaptation_algo) {
 		new_index = dash->rate_adaptation_algo(dash, group, base_group,
-														 dl_rate, speed, max_available_speed, force_lower_complexity, 
+														 dl_rate, speed, max_available_speed, force_lower_complexity,
 														 rep, GF_FALSE);
 	}
 
-	if (new_index==0xFFFFFFFF) {
+	if (new_index==-1) {
+		group->active_rep_index = old_index;
 		group->rate_adaptation_postponed = GF_TRUE;
 		return;
 	}
 	group->rate_adaptation_postponed = GF_FALSE;
 
 	if (new_index != group->active_rep_index) {
-		new_rep = gf_list_get(group->adaptation_set->representations, new_index);
+		new_rep = gf_list_get(group->adaptation_set->representations, (u32)new_index);
 		if (!new_rep) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error: Cannot find new representation index: %d\n", new_index));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error: Cannot find new representation index %d\n", new_index));
 			return;
 		}
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AS#%d switching after playing %d segments, from rep %d to rep %d\n", 1 + gf_list_find(group->period->adaptation_sets, group->adaptation_set), group->nb_segments_since_switch, group->active_rep_index, new_index));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AS#%d switching after playing %d segments, from rep %d to rep %d\n", 1 + gf_list_find(group->period->adaptation_sets, group->adaptation_set),
+				group->nb_segments_since_switch, group->active_rep_index, new_index));
 		group->nb_segments_since_switch = 0;
 
 		if (force_lower_complexity) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Requesting codec reset"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Requesting codec reset\n"));
 			new_rep->playback.waiting_codec_reset = GF_TRUE;
 		}
 		/* request downloads for the new representation */
@@ -2865,9 +3464,12 @@
 			arep->playback.probe_switch_count = 0;
 		}
 
-	} else if (force_lower_complexity) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Speed %f is too fast to play - speed down \n", dash->speed));
-		/*FIXME: should do something here*/
+	} else {
+		group->active_rep_index = old_index;
+		if (force_lower_complexity) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Speed %f is too fast to play - speed down\n", dash->speed));
+			/*FIXME: should do something here*/
+		}
 	}
 
 	/* Remembering the buffer level for the processing of the next segment */
@@ -2887,6 +3489,7 @@
 	/* This variable is 0 if there is a initURL, the index of first segment downloaded otherwise */
 	u32 nb_segment_read = 0;
 	u32 file_size=0, Bps= 0;
+	char *base_url=NULL;
 	char *key_url=NULL;
 	bin128 key_iv;
 
@@ -2900,10 +3503,14 @@
 		return GF_IO_ERR;
 	}
 	start_range = end_range = 0;
+	base_url = dash->base_url;
+	if (group->period->origin_base_url) base_url = group->period->origin_base_url;
 
-	e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_INIT, 0, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL, &key_url, &key_iv, &data_url_processed);
+	e = gf_dash_resolve_url(dash->mpd, rep, group, base_url, GF_MPD_RESOLVE_URL_INIT, 0, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL, &key_url, &key_iv, &data_url_processed);
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve initialization URL: %s\n", gf_error_to_string(e) ));
+		if (e != GF_IP_NETWORK_EMPTY) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve initialization URL: %s\n", gf_error_to_string(e) ));
+		}
 		return e;
 	}
 
@@ -2924,7 +3531,8 @@
 		group->dont_delete_first_segment = 1;
 	}
 
-	if (!strstr(base_init_url, "://") || !strnicmp(base_init_url, "file://", 7) || !strnicmp(base_init_url, "gmem://", 7) || !strnicmp(base_init_url, "views://", 8) || !strnicmp(base_init_url, "isobmff://", 10)) {
+	if (!strstr(base_init_url, "://") || !strnicmp(base_init_url, "file://", 7) || !strnicmp(base_init_url, "gmem://", 7)
+		|| !strnicmp(base_init_url, "views://", 8) || !strnicmp(base_init_url, "mosaic://", 9) || !strnicmp(base_init_url, "isobmff://", 10)) {
 		//if file-based, check if file exists, if not switch base URL
 		if ( strnicmp(base_init_url, "gmem://", 7)) {
 			FILE *ftest = gf_fopen(base_init_url, "rb");
@@ -3000,7 +3608,7 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] First segment is %s \n", init_segment_local_url));
 		gf_free(base_init_url);
 		group->current_base_url_idx=0;
-		dash_store_stats(dash, group, 0, file_size);
+		dash_store_stats(dash, group, 0, file_size, GF_FALSE);
 		return GF_OK;
 	}
 
@@ -3015,7 +3623,7 @@
 		gf_dash_switch_group_representation(dash, group);
 		return gf_dash_download_init_segment(dash, group);
 	}
-	
+
 	if ((e==GF_URL_ERROR) && base_init_url) {
 		if (group->current_base_url_idx + 1 < gf_mpd_get_base_url_count(dash->mpd, group->period, group->adaptation_set, rep) ){
 			group->current_base_url_idx++;
@@ -3051,19 +3659,18 @@
 	}
 
 	if (e!= GF_OK && !group->segment_must_be_streamed) {
-		dash->mpd_stop_request = 1;
 		gf_free(base_init_url);
 		if (key_url) gf_free(key_url);
+		if (!group->dash->atsc_clock_state || (group->dash->atsc_clock_state==3)) {
+			dash->mpd_stop_request = 1;
+		}
 		return e;
 	}
 
 
 	if (!group->nb_segments_in_rep) {
 		if (dash->mpd->type==GF_MPD_TYPE_STATIC) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] 0 segments in static representation, aborting\n"));
-			gf_free(base_init_url);
-			if (key_url) gf_free(key_url);
-			return GF_BAD_PARAM;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] 0 segments in static representation (MPD duration "LLU", will probably have 404\n", group->dash->mpd->media_presentation_duration));
 		}
 	} else if (!group->groups_depending_on && (group->nb_segments_in_rep < group->max_cached_segments)) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Resizing to %u max_cached_segments elements instead of %u.\n", group->nb_segments_in_rep, group->max_cached_segments));
@@ -3195,10 +3802,34 @@
 	group->current_base_url_idx = 0;
 	/*if this was not an init segment, perform rate adaptation*/
 	if (nb_segment_read) {
-		dash_store_stats(dash, group, Bps, file_size);
+		dash_store_stats(dash, group, Bps, file_size, GF_FALSE);
 		dash_do_rate_adaptation(dash, group);
 	}
 
+	if (dash->atsc_clock_state) {
+		u32 i, j;
+		for (i=0; i<gf_list_count(group->adaptation_set->representations); i++) {
+			GF_MPD_Representation *a_rep = gf_list_get(group->adaptation_set->representations, i);
+			for (j=0; j<gf_list_count(a_rep->base_URLs); j++) {
+				GF_MPD_BaseURL *b_url = gf_list_get(a_rep->base_URLs, j);
+				char *nURL = gf_url_concatenate(dash->base_url, b_url->URL);
+				if (nURL) {
+					u32 len = (u32) strlen(nURL);
+					if (nURL[len] != '/') {
+						GF_Err e = gf_dash_download_resource(dash, &(group->segment_download), nURL, 0, 0, 1, group);
+						if (!e) {
+							const char *redirected_url = dash->dash_io->get_url(dash->dash_io, group->segment_download);
+							if (redirected_url && strcmp(redirected_url, nURL)) {
+								b_url->redirection = gf_strdup(redirected_url);
+							}
+						}
+					}
+					gf_free(nURL);
+				}
+			}
+		}
+	}
+
 	return GF_OK;
 }
 
@@ -3260,7 +3891,7 @@
 
 		gf_dash_group_reset_cache_entry(&group->cached[group->nb_cached_segments]);
 	}
-	
+
 	group->timeline_setup = 0;
 }
 
@@ -3279,7 +3910,7 @@
 		gf_free(group->cached);
 		if (group->service_mime)
 			gf_free(group->service_mime);
-		
+
 		if (group->download_th)
 			gf_th_del(group->download_th);
 
@@ -3287,7 +3918,7 @@
 			gf_mx_del(group->cache_mutex);
 		if (group->bs_switching_init_segment_url)
 			gf_free(group->bs_switching_init_segment_url);
-		
+
 		gf_free(group);
 	}
 	gf_list_del(dash->groups);
@@ -3539,7 +4170,7 @@
 				has_dependent_representations = GF_TRUE;
 			else
 				group->base_rep_index_plus_one = j+1;
-			rep->enhancement_rep_index_plus_one = 0;
+			rep->playback.enhancement_rep_index_plus_one = 0;
 			for (k = 0; k < gf_list_count(set->representations); k++) {
 				GF_MPD_Representation *a_rep = gf_list_get(set->representations, k);
 				if (a_rep->dependency_id) {
@@ -3549,11 +4180,11 @@
 					else
 						tmp = a_rep->dependency_id;
 					if (!strcmp(tmp, rep->id))
-						rep->enhancement_rep_index_plus_one = k + 1;
+						rep->playback.enhancement_rep_index_plus_one = k + 1;
 				}
 			}
-			if (!rep->enhancement_rep_index_plus_one)
-				group->force_max_rep_index = j;
+			if (!rep->playback.enhancement_rep_index_plus_one)
+				group->max_complementary_rep_index = j;
 			if (!rep->playback.disabled && rep->dependency_id)
 				nb_dependant_rep++;
 		}
@@ -3589,6 +4220,10 @@
 		if (!has_dependent_representations)
 			group->base_rep_index_plus_one = 0; // all representations in this group are independent
 
+		if (group->max_cached_segments>50) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Too many cached segments (%d), segment duration %g - using 50 max\n", group->max_cached_segments, seg_dur));
+			group->max_cached_segments = 50;
+		}
 		group->cached = gf_malloc(sizeof(segment_cache_entry)*group->max_cached_segments);
 		memset(group->cached, 0, sizeof(segment_cache_entry)*group->max_cached_segments);
 		if (!group->cached) {
@@ -3631,9 +4266,13 @@
 
 			for (j=0; j<nb_dep_groups; j++) {
 				GF_DASH_Group *dep_group = gf_list_get(group->groups_depending_on, j);
-				gf_free(dep_group->cached);
-				dep_group->cached = NULL;
+
 				dep_group->max_cached_segments = 0;
+
+				/* the rest of the code assumes that at least group->cached[0] is allocated */
+				dep_group->cached = gf_realloc(dep_group->cached, sizeof(segment_cache_entry));
+				memset(dep_group->cached, 0, sizeof(segment_cache_entry));
+
 			}
 		}
 	}
@@ -3656,7 +4295,7 @@
 	gf_bs_seek(bs, sidx_offset);
 	size = gf_bs_read_u32(bs);
 	type = gf_bs_read_u32(bs);
-	if (type != GF_4CC('s','i','d','x')) {
+	if (type != GF_ISOM_BOX_TYPE_SIDX) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error parsing SIDX: type is %s (box start offset "LLD")\n", gf_4cc_to_str(type), gf_bs_get_position(bs)-8 ));
 		return GF_ISOM_INVALID_FILE;
 	}
@@ -3723,10 +4362,10 @@
 	while (gf_bs_available(bs)) {
 		u32 size = gf_bs_read_u32(bs);
 		u32 type = gf_bs_read_u32(bs);
-		if (type != GF_4CC('s','i','d','x')) {
+		if (type != GF_ISOM_BOX_TYPE_SIDX) {
 			gf_bs_skip_bytes(bs, size-8);
 
-			if (needs_mov_range && (type==GF_4CC('m','o','o','v') )) {
+			if (needs_mov_range && (type==GF_ISOM_BOX_TYPE_MOOV )) {
 				GF_SAFEALLOC(rep->segment_list->initialization_segment->byte_range, GF_MPD_ByteRange);
 				rep->segment_list->initialization_segment->byte_range->end_range = gf_bs_get_position(bs);
 			}
@@ -3790,7 +4429,7 @@
 		char *profile = rep->profiles;
 		if (!profile) profile = group->adaptation_set->profiles;
 		if (!profile) profile = group->dash->mpd->profiles;
-		
+
 		//if on-demand cleanup all segment templates and segment list if we have base URLs
 		if (profile && strstr(profile, "on-demand")) {
 			u32 nb_rem=0;
@@ -3804,7 +4443,7 @@
 				gf_mpd_segment_template_free(group->adaptation_set->segment_template);
 				group->adaptation_set->segment_template = NULL;
 			}
-			
+
 			if (group->period->segment_template) {
 				nb_rem++;
 				gf_mpd_segment_template_free(group->period->segment_template);
@@ -3834,7 +4473,7 @@
 			}
 		}
 	}
-	
+
 	/*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;
@@ -3854,7 +4493,7 @@
 
 
 		if (is_isom && (init_in_base || index_in_base)) {
-			if (!strstr(init_url, "://") || (!strnicmp(init_url, "file://", 7) || !strnicmp(init_url, "views://", 7)) ) {
+			if (!strstr(init_url, "://") || (!strnicmp(init_url, "file://", 7) ) ) {
 				GF_SAFEALLOC(rep->segment_list, GF_MPD_SegmentList);
 				if (!rep->segment_list) {
 					e = GF_OUT_OF_MEM;
@@ -3894,7 +4533,7 @@
 				offset = 8;
 				while (box_type) {
 					/*we got the moov, stop here */
-					if (!index_in_base && (box_type==GF_4CC('m','o','o','v'))) {
+					if (!index_in_base && (box_type==GF_ISOM_BOX_TYPE_MOOV)) {
 						e = gf_dash_download_resource(group->dash, &(group->segment_download), init_url, offset, offset+box_size-9, 2, group);
 						break;
 					} else {
@@ -3908,7 +4547,7 @@
 						if (e == GF_IO_ERR) {
 							/*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_4CC('s','i','d','x')) {
+							if (box_type == GF_ISOM_BOX_TYPE_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));
@@ -3917,7 +4556,7 @@
 							}
 						}
 
-						if (box_type == GF_4CC('s','i','d','x'))
+						if (box_type == GF_ISOM_BOX_TYPE_SIDX)
 							has_seen_sidx = 1;
 						else if (has_seen_sidx)
 							break;
@@ -4026,47 +4665,84 @@
 	return e;
 }
 
-static void gf_dash_solve_period_xlink(GF_DashClient *dash, u32 period_idx)
+static void gf_dash_solve_period_xlink(GF_DashClient *dash, GF_List *period_list, u32 period_idx)
 {
 	u32 count, i;
 	GF_Err e;
+	u64 start = 0;
+	u64 src_duration = 0;
 	Bool is_local=GF_FALSE;
 	const char *local_url;
-	char *url;
+	char *url, *period_xlink;
 	GF_DOMParser *parser;
 	GF_MPD *new_mpd;
 	GF_MPD_Period *period;
+	GF_DASHFileIOSession xlink_sess=NULL;
 
 	gf_mx_p(dash->dash_mutex);
 
-	period = gf_list_get(dash->mpd->periods, period_idx);
-	if (!period->xlink_href) {
+	period = gf_list_get(period_list, period_idx);
+	if (!period->xlink_href || (dash->atsc_clock_state==1)) {
 		gf_mx_v(dash->dash_mutex);
 		return;
 	}
-
+	start = period->start;
 	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Resolving period XLINK %s\n", period->xlink_href));
 
 	if (!strcmp(period->xlink_href, "urn:mpeg:dash:resolve-to-zero:2013")) {
 		//spec is not very clear here, I suppose it means "remove the element"
-		gf_list_rem(dash->mpd->periods, period_idx);
+		gf_list_rem(period_list, period_idx);
 		gf_mpd_period_free(period);
 		gf_mx_v(dash->dash_mutex);
 		return;
 	}
 
+	//ATSC puts a tag in front of the url ("tag:atsc.org,2016:xlink") - in case others decide to follow this crazy example, whe search for http:// or https://
+	period_xlink = strstr(period->xlink_href, "http://");
+	if (!period_xlink) period_xlink = strstr(period->xlink_href, "HTTP://");
+	if (!period_xlink) period_xlink = strstr(period->xlink_href, "https://");
+	if (!period_xlink) period_xlink = strstr(period->xlink_href, "HTTPS://");
+	if (!period_xlink) period_xlink = period->xlink_href;
+
 	//xlink relative to our MPD base URL
-	url = gf_url_concatenate(dash->base_url, period->xlink_href);
+	url = gf_url_concatenate(dash->base_url, period_xlink);
 
 	if (!strstr(url, "://") || !strnicmp(url, "file://", 7) ) {
 		local_url = url;
 		is_local=GF_TRUE;
 		e = GF_OK;
 	} else {
-		/*use non-persistent connection for MPD*/
-		e = gf_dash_download_resource(dash, &(dash->mpd_dnload), url ? url : period->xlink_href, 0, 0, 0, NULL);
+		if (dash->query_string) {
+			char *full_url;
+			char *purl, *sep;
+			u32 len;
+			purl = url ? url : period_xlink;
+			len = (u32) (2 + strlen(purl) + strlen(dash->query_string) + (period->ID ? strlen(period->ID) : 0 ) );
+			full_url = gf_malloc(sizeof(char)*len);
+
+			strcpy(full_url, purl);
+			if (strchr(purl, '?')) strcat(full_url, "&");
+			else strcat(full_url, "?");
+
+			strcat(full_url, dash->query_string);
+			sep = strstr(dash->query_string, "=PID");
+			if (sep && period->ID) {
+				char *sep2 = strstr(full_url, "=PID");
+				if (sep2) sep2[1] = 0;
+				strcat(full_url, period->ID);
+				strcat(full_url, sep+4);
+			} else {
+				strcat(full_url, dash->query_string);
+			}
 
-		gf_free(url);
+			/*use non-persistent connection for MPD*/
+			e = gf_dash_download_resource(dash, &xlink_sess, full_url, 0, 0, 0, NULL);
+			gf_free(full_url);
+
+		} else {
+			/*use non-persistent connection for MPD*/
+			e = gf_dash_download_resource(dash, &xlink_sess, url ? url : period_xlink, 0, 0, 0, NULL);
+		}
 	}
 
 	if (e) {
@@ -4074,25 +4750,35 @@
 		gf_free(period->xlink_href);
 		period->xlink_href = NULL;
 		gf_mx_v(dash->dash_mutex);
+		if (xlink_sess) dash->dash_io->del(dash->dash_io, xlink_sess);
+		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, dash->mpd_dnload);
+		local_url = dash->dash_io->get_cache_name(dash->dash_io, xlink_sess);
 	}
 
 	/* parse the MPD */
 	parser = gf_xml_dom_new();
 	e = gf_xml_dom_parse(parser, local_url, NULL, NULL);
-	if (is_local) gf_free(url);
+	if (url) gf_free(url);
+	url = NULL;
 
+	if (xlink_sess) {
+		//get redirected URL
+		url = (char *) dash->dash_io->get_url(dash->dash_io, xlink_sess);
+		if (url) url = gf_strdup(url);
+		dash->dash_io->del(dash->dash_io, xlink_sess);
+	}
 	if (e != GF_OK) {
 		gf_xml_dom_del(parser);
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot parse xlink periods: error in XML parsing %s\n", gf_error_to_string(e)));
 		gf_free(period->xlink_href);
 		period->xlink_href = NULL;
 		gf_mx_v(dash->dash_mutex);
+		if (url) gf_free(url);
 		return;
 	}
 	new_mpd = gf_mpd_new();
@@ -4113,22 +4799,47 @@
 		period->xlink_href = NULL;
 		gf_mpd_del(new_mpd);
 		gf_mx_v(dash->dash_mutex);
+		if (url) gf_free(url);
 		return;
 	}
 
-	gf_list_rem(dash->mpd->periods, period_idx);
+	gf_list_rem(period_list, period_idx);
+
+	if (!period->duration) {
+		GF_MPD_Period *next_period = gf_list_get(period_list, period_idx);
+		if (next_period && next_period->start)
+			period->duration = next_period->start - period->start;
+	}
+	src_duration = period->duration;
 	//insert all periods
 	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
 		if (inserted_period->xlink_href && inserted_period->xlink_actuate_on_load) {
-			gf_mpd_period_free(period);
+			gf_mpd_period_free(inserted_period);
 			continue;
 		}
-		gf_list_insert(dash->mpd->periods, inserted_period, period_idx);
+		inserted_period->origin_base_url = url ? gf_strdup(url) : NULL;
+		inserted_period->start = start;
+		inserted_period->type = GF_MPD_TYPE_STATIC;
+
+		gf_list_insert(period_list, inserted_period, period_idx);
 		period_idx++;
+
+		if (period->duration) {
+			//truncate duration
+			if (inserted_period->duration > src_duration) {
+				inserted_period->duration = src_duration;
+				break;
+			} else {
+				src_duration -= inserted_period->duration;
+			}
+		}
+		start += inserted_period->duration;
 	}
+	if (url) gf_free(url);
+
 	//this will do the garbage collection
 	gf_list_add(new_mpd->periods, period);
 
@@ -4141,18 +4852,18 @@
 {
 	s32 res, res2;
 	struct _dash_srd_desc *srd = tile_group->srd_desc;
-	
+
 	//no SRD is max quality for now
 	if (!srd) return 0;
 	if (!tile_group->srd_w || !tile_group->srd_h) return 0;
-	
+
 	if (tile_group->quality_degradation_hint) {
 		u32 v = tile_group->quality_degradation_hint * MAX(srd->srd_nb_rows, srd->srd_nb_cols);
 		v/=100;
 		return v;
 	}
-	
-	
+
+
 	switch (dash->tile_adapt_mode) {
 	case GF_DASH_ADAPT_TILE_NONE:
 		return 0;
@@ -4238,16 +4949,23 @@
 	//solve xlink - if
 	while (retry) {
 		period = gf_list_get(dash->mpd->periods, dash->active_period_index);
+		if (!period) return GF_EOS;
 		if (!period->xlink_href) break;
-		gf_dash_solve_period_xlink(dash, dash->active_period_index);
+		gf_dash_solve_period_xlink(dash, dash->mpd->periods, dash->active_period_index);
 		retry --;
 	}
 	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
-	if (period->xlink_href) {
+	if (period->xlink_href && (dash->atsc_clock_state!=1) ) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Too many xlink indirections on the same period - not supported\n"));
 		return GF_NOT_SUPPORTED;
 	}
 
+	if (!period->duration) {
+		GF_MPD_Period *next_period = gf_list_get(dash->mpd->periods, dash->active_period_index+1);
+		if (next_period && next_period->start)
+			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++) {
@@ -4261,6 +4979,8 @@
 		}
 	}
 
+	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"));
+
 	/*setup all groups*/
 	gf_dash_setup_groups(dash);
 
@@ -4281,7 +5001,7 @@
 		Bool active_rep_found;
 
 		active_rep = 0;
-		
+
 		if ((dash->debug_group_index>=0) && (group_i != (u32) dash->debug_group_index)) {
 			group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
 			continue;
@@ -4289,9 +5009,21 @@
 
 		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
+			&& !group->adaptation_set->max_height
+			&& (gf_list_count(dash->groups)>1)
+		) {
+			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, 0);
+			if ((!rep->segment_template || !rep->segment_template->initialization) && (!rep->segment_list || !rep->segment_list->initialization_segment)) {
+				group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
+				continue;
+			}
+		}
+
 		if ((nb_rep>1) && !group->adaptation_set->segment_alignment && !group->adaptation_set->subsegment_alignment) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] AdaptationSet without segmentAlignment flag set - ignoring because not supported\n"));
-			continue;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] AdaptationSet without segmentAlignment flag set - may result in broken adaptation\n"));
 		}
 		if (group->adaptation_set->xlink_href) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] AdaptationSet with xlink:href to %s - ignoring because not supported\n", group->adaptation_set->xlink_href));
@@ -4369,7 +5101,7 @@
 			if (rep->width && rep->height) group_has_video = GF_TRUE;
 		}
 
-		//sort by bandwidth and quality
+		//sort by ascending bandwidth and quality
 		for (rep_i = 1; rep_i < nb_rep; rep_i++) {
 			Bool swap=GF_FALSE;
 			GF_MPD_Representation *r2 = gf_list_get(group->adaptation_set->representations, rep_i);
@@ -4390,6 +5122,7 @@
 		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);
 			if (rep->playback.disabled)
 				continue;
@@ -4422,16 +5155,36 @@
 					sep = strchr(rep_sel->codecs, '.');
 					if (sep) sep[0] = 0;
 					ok = !strnicmp(rep->codecs, rep_sel->codecs, strlen(rep_sel->codecs) );
+					//check for scalable coding
+					if (!ok && rep->dependency_id) {
+						if (!strncmp(rep_sel->codecs, "avc", 3)) {
+							//we accept LHVC with different configs as enhancement for AVC
+							if (!strncmp(rep->codecs, "lhv", 3) || !strncmp(rep->codecs, "lhe", 3) ) ok = 1;
+							//we accept SVC and MVC as enhancement for AVC
+							else if (!strncmp(rep->codecs, "svc", 3) || !strncmp(rep->codecs, "mvc", 3) ) ok = 1;
+						}
+						else if (!strncmp(rep_sel->codecs, "hvc", 3) || !strncmp(rep_sel->codecs, "hev", 3)) {
+							//we accept HEVC and HEVC+LHVC with different configs
+							if (!strncmp(rep->codecs, "hvc", 3) || !strncmp(rep->codecs, "hev", 3) ) ok = 1;
+							//we accept LHVC with different configs
+							else if (!strncmp(rep->codecs, "lhv", 3) || !strncmp(rep->codecs, "lhe", 3) ) ok = 1;
+						}
+					}
+
 					if (sep) sep[0] = '.';
 					if (!ok) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Different codec types (%s vs %s) in same AdaptationSet\n", rep_sel->codecs, rep->codecs));
-						//rep->playback.disabled = 1;
-						//continue;
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Different codec types (%s vs %s) in same AdaptationSet - disabling rep %s\n", rep_sel->codecs, rep->codecs, rep->codecs));
+						//we don(t support mixes
+						rep->playback.disabled = 1;
+						continue;
 					}
 				}
 			}
+			//move to highest rate if ATSC session and rep is not a remote one (baseURL set)
+			if (dash->atsc_clock_state && (first_select_mode==GF_DASH_SELECT_BANDWIDTH_LOWEST) && !gf_list_count(rep->base_URLs))
+				first_select_mode = GF_DASH_SELECT_BANDWIDTH_HIGHEST;
 
-			switch (dash->first_select_mode) {
+			switch (first_select_mode) {
 			case GF_DASH_SELECT_QUALITY_LOWEST:
 				if (rep->quality_ranking && (rep->quality_ranking < rep_sel->quality_ranking)) {
 					active_rep = rep_i;
@@ -4445,11 +5198,11 @@
 				}
 				break;
 			case GF_DASH_SELECT_QUALITY_HIGHEST:
-				/*fallthrough if quality is not indicated*/
 				if (rep->quality_ranking > rep_sel->quality_ranking) {
 					active_rep = rep_i;
 					break;
 				}
+				/*fallthrough if quality is not indicated*/
 			case GF_DASH_SELECT_BANDWIDTH_HIGHEST:
 				if (rep->bandwidth > rep_sel->bandwidth) {
 					active_rep = rep_i;
@@ -4475,7 +5228,7 @@
 
 		gf_dash_set_group_representation(group, rep_sel);
 		// active representation is marked as disabled, we need to redo the selection
-		if (rep_sel->playback.disabled) 
+		if (rep_sel->playback.disabled)
 			goto select_active_rep;
 
 		//adjust seek
@@ -4535,7 +5288,7 @@
 			Bool found = GF_FALSE;
 			GF_DASH_Group *group = gf_list_get(dash->groups, group_i);
 			if (group->srd_desc != srd) continue;
-			
+
 			if (!group->srd_w || !group->srd_h) continue;
 
 			for (k=0; k<srd->srd_nb_cols; k++) {
@@ -4659,13 +5412,17 @@
 static DownloadGroupStatus on_group_download_error(GF_DashClient *dash, GF_DASH_Group *group, GF_DASH_Group *base_group, GF_Err e, GF_MPD_Representation *rep, char *new_base_seg_url, char *key_url, Bool has_dep_following)
 {
 	u32 clock_time = gf_sys_clock();
+	Bool will_retry = GF_FALSE;
 
 	if (!dash->min_wait_ms_before_next_request || (dash->min_timeout_between_404 < dash->min_wait_ms_before_next_request))
 		dash->min_wait_ms_before_next_request = dash->min_timeout_between_404;
 
 	group->retry_after_utc = dash->min_timeout_between_404 + gf_net_get_utc();
 
-	if (group->maybe_end_of_stream) {
+	if (e==GF_REMOTE_SERVICE_ERROR) {
+		group->done = 1;
+	}
+	else if (group->maybe_end_of_stream) {
 		if (group->maybe_end_of_stream==2) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Couldn't get segment %s (error %s) and end of period was guessed during last update - stopping playback\n", new_base_seg_url, gf_error_to_string(e)));
 			group->maybe_end_of_stream = 0;
@@ -4686,7 +5443,9 @@
 	} else if (group->prev_segment_ok && !group->time_at_first_failure) {
 		if (!group->loop_detected) {
 			group->time_at_first_failure = clock_time;
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s - starting countdown for %d ms\n", new_base_seg_url, gf_error_to_string(e), group->current_downloaded_segment_duration));
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s - starting countdown for %d ms\n", new_base_seg_url, gf_error_to_string(e), group->current_downloaded_segment_duration));
+
+			will_retry = GF_TRUE;
 		}
 	}
 	//if multiple baseURL, try switching the base
@@ -4698,13 +5457,35 @@
 	}
 	//if previous segment download was OK, we are likely asking too early - retry for the complete duration in case one segment was lost - we add 100ms safety
 	else if (group->prev_segment_ok && (clock_time - group->time_at_first_failure <= group->current_downloaded_segment_duration + dash->segment_lost_after_ms )) {
+		will_retry = GF_TRUE;
 	} else {
+		if ((group->dash->atsc_clock_state==2) && (e==GF_URL_ERROR)) {
+			const char *val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "x-atsc-loop");
+			//if explicit loop or more than 5 consecutive seg lost restart synchro
+			if ((group->nb_consecutive_segments_lost >= 5) || (val && !strcmp(val, "yes"))) {
+				u32 i=0;
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] ATSC loop detected, reseting timeline\n"));
+				dash->utc_drift_estimate = 0;
+				dash->atsc_clock_state = 1;
+				while ((group = gf_list_enum(dash->groups, &i))) {
+					group->start_number_at_last_ast = 0;
+					gf_dash_group_timeline_setup(dash->mpd, group, 0);
+					group->loop_detected = GF_TRUE;
+					group->time_at_first_failure = 0;
+					group->prev_segment_ok = GF_TRUE;
+				}
+				if (new_base_seg_url) gf_free(new_base_seg_url);
+				if (key_url) gf_free(key_url);
+				return GF_DASH_DownloadCancel;
+			}
+		}
 		if (group->prev_segment_ok) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s - waited %d ms but segment still not available, checking next one ...\n", new_base_seg_url, gf_error_to_string(e), clock_time - group->time_at_first_failure));
 			group->time_at_first_failure = 0;
 			group->prev_segment_ok = GF_FALSE;
 		}
 		group->nb_consecutive_segments_lost ++;
+
 		//we are lost ....
 		if (group->nb_consecutive_segments_lost == 20) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Too many consecutive segments not found, sync or signal has been lost - entering end of stream detection mode\n"));
@@ -4723,16 +5504,19 @@
 			}
 		}
 	}
-	if (rep->dependency_id) {
-		segment_cache_entry *cache_entry = &base_group->cached[base_group->nb_cached_segments];
-		cache_entry->has_dep_following = 0;
-	}
-	
-	if (group->base_rep_index_plus_one) {
-		group->active_rep_index = group->base_rep_index_plus_one - 1;
-		group->has_pending_enhancement = GF_FALSE;
+	//if retry, do not reset dependency status
+	if (!will_retry) {
+		if (rep->dependency_id) {
+			segment_cache_entry *cache_entry = &base_group->cached[base_group->nb_cached_segments];
+			cache_entry->has_dep_following = 0;
+		}
+
+		if (group->base_rep_index_plus_one) {
+			group->active_rep_index = group->base_rep_index_plus_one - 1;
+			group->has_pending_enhancement = GF_FALSE;
+		}
 	}
-	
+
 	if (new_base_seg_url) gf_free(new_base_seg_url);
 	if (key_url) gf_free(key_url);
 	return GF_DASH_DownloadCancel;
@@ -4751,8 +5535,13 @@
 	u32 representation_index;
 	u32 clock_time, file_size=0, Bps=0;
 	Bool empty_file = GF_FALSE;
+	const char *base_url = NULL;
 	const char *local_file_name = NULL;
 	const char *resource_name = NULL;
+	GF_MPD_Type dyn_type = dash->mpd->type;
+	if (group->period->origin_base_url)
+		dyn_type = group->period->type;
+
 
 	if (group->done) return GF_DASH_DownloadSuccess;
 
@@ -4765,6 +5554,7 @@
 	/*remember the active rep index, since group->active_rep_index may change because of bandwidth control algorithm*/
 	representation_index = group->active_rep_index;
 	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+	rep->playback.broadcast_flag = GF_FALSE;
 
 	/* if the index of the segment to be downloaded is greater or equal to the last segment (as seen in the playlist),
 	 we need to check if a new playlist is ready */
@@ -4773,14 +5563,14 @@
 		Bool update_playlist = 0;
 
 		/* this period is done*/
-		if ((dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && group->period->duration) {
+		if ((dyn_type==GF_MPD_TYPE_DYNAMIC) && group->period->duration) {
 		}
 		/* update of the playlist, only if indicated */
 		else if (dash->mpd->minimum_update_period && (timer > dash->mpd->minimum_update_period)) {
 			update_playlist = 1;
 		}
 		/* if media_presentation_duration is 0 and we are in live, force a refresh (not in the spec but safety check*/
-		else if ((dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && !dash->mpd->media_presentation_duration) {
+		else if ((dyn_type==GF_MPD_TYPE_DYNAMIC) && !dash->mpd->media_presentation_duration) {
 			if (group->segment_duration && (timer > group->segment_duration*1000))
 				update_playlist = 1;
 		}
@@ -4792,9 +5582,14 @@
 		/* Now that the playlist is up to date, we can check again */
 		if (group->download_segment_index >= (s32) group->nb_segments_in_rep) {
 			/* if there is a specified update period, we redo the whole process */
-			if (dash->mpd->minimum_update_period || dash->mpd->type==GF_MPD_TYPE_DYNAMIC) {
+			if (dash->mpd->minimum_update_period || dyn_type==GF_MPD_TYPE_DYNAMIC) {
 
-				if ((dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && group->period->duration) {
+				if (dyn_type==GF_MPD_TYPE_STATIC) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Last segment in static period (dynamic MPD) - group is done\n"));
+					group->done = 1;
+					return GF_DASH_DownloadCancel;
+				}
+				else if ((dyn_type==GF_MPD_TYPE_DYNAMIC) && group->period->duration) {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Last segment in period (dynamic mode) - group is done\n"));
 					group->done = 1;
 					return GF_DASH_DownloadCancel;
@@ -4819,8 +5614,8 @@
 					if (dash->mpd->minimum_update_period) {
 						if (now - group->time_at_first_reload_required < dash->mpd->minimum_update_period)
 							return GF_DASH_DownloadCancel;
-					} else if (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) {
-						if (timer < group->nb_segments_in_rep * group->segment_duration * 1000) 
+					} else if (dyn_type==GF_MPD_TYPE_DYNAMIC) {
+						if (timer < group->nb_segments_in_rep * group->segment_duration * 1000)
 							return GF_DASH_DownloadCancel;
 					}
 
@@ -4832,6 +5627,8 @@
 				/* if not, we are really at the end of the playlist, we can quit */
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] End of period reached for group\n"));
 				group->done = 1;
+				if (!dash->request_period_switch && !group->has_pending_enhancement && !has_dep_following)
+					dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, gf_list_find(dash->groups, base_group), GF_OK);
 				return GF_DASH_DownloadCancel;
 			}
 		}
@@ -4846,7 +5643,7 @@
 	}
 
 	/*check availablity start time of segment in Live !!*/
-	if (!group->broken_timing && (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && !dash->is_m3u8) {
+	if (!group->broken_timing && (dyn_type==GF_MPD_TYPE_DYNAMIC) && !dash->is_m3u8) {
 		s32 to_wait = 0;
 		u32 seg_dur_ms=0;
 #ifndef GPAC_DISABLE_LOG
@@ -4892,8 +5689,10 @@
 		}
 	}
 
+	base_url = dash->base_url;
+	if (group->period->origin_base_url) base_url = group->period->origin_base_url;
 	/* At this stage, there are some segments left to be downloaded */
-	e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index, &new_base_seg_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL, &key_url, &key_iv, NULL);
+	e = gf_dash_resolve_url(dash->mpd, rep, group, base_url, GF_MPD_RESOLVE_URL_MEDIA, group->download_segment_index, &new_base_seg_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL, &key_url, &key_iv, NULL);
 
 	if (e || !new_base_seg_url) {
 		if (e==GF_EOS) {
@@ -4942,6 +5741,7 @@
 		}
 		group->current_base_url_idx = 0;
 	} else {
+		const char *hdr;
 		base_group->max_bitrate = 0;
 		base_group->min_bitrate = (u32)-1;
 
@@ -4967,9 +5767,9 @@
 		group->prev_segment_ok = GF_TRUE;
 		if (group->time_at_first_failure) {
 			if (group->current_base_url_idx) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Recovered segment %s after 404 by switching baseURL\n", new_base_seg_url));
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Recovered segment %s after 404 by switching baseURL\n", new_base_seg_url));
 			} else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Recovered segment %s after 404 - was our download schedule too early ?\n", new_base_seg_url));
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Recovered segment %s after 404 - was our download schedule too early ?\n", new_base_seg_url));
 			}
 			group->time_at_first_failure = 0;
 		}
@@ -5006,6 +5806,10 @@
 		resource_name = dash->dash_io->get_url(dash->dash_io, base_group->segment_download);
 
 		Bps = dash->dash_io->get_bytes_per_sec(dash->dash_io, base_group->segment_download);
+
+		hdr = dash->dash_io->get_header_value(dash->dash_io, base_group->segment_download, "x-atsc");
+		if (hdr && !strcmp(hdr, "yes"))
+			rep->playback.broadcast_flag = GF_TRUE;
 	}
 
 	if (local_file_name && (e == GF_OK || group->segment_must_be_streamed )) {
@@ -5042,11 +5846,11 @@
 			base_group->nb_cached_segments++;
 			gf_dash_update_buffering(group, dash);
 		}
-		dash_store_stats(dash, group, Bps, file_size);
+		dash_store_stats(dash, group, Bps, file_size, rep->playback.broadcast_flag);
 
 		/* download enhancement representation of this segment*/
-		if ((representation_index != group->force_max_rep_index) && rep->enhancement_rep_index_plus_one) {
-			group->active_rep_index = rep->enhancement_rep_index_plus_one - 1;
+		if ((representation_index != group->max_complementary_rep_index) && rep->playback.enhancement_rep_index_plus_one) {
+			group->active_rep_index = rep->playback.enhancement_rep_index_plus_one - 1;
 			group->has_pending_enhancement = GF_TRUE;
 		}
 		/* if we have downloaded all enhancement representations of this segment, restart from base representation and increase dowloaded segment index by 1*/
@@ -5071,12 +5875,12 @@
 		}
 
 		gf_mx_v(group->cache_mutex);
-		
+
 		//do not notify segments if there is a pending period switch - since these are decided by the user, we don't
 		//want to notify old segments
 		if (!dash->request_period_switch && !group->has_pending_enhancement && !has_dep_following)
 			dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, gf_list_find(dash->groups, base_group), GF_OK);
-		
+
 	}
 	if (new_base_seg_url) gf_free(new_base_seg_url);
 	if (key_url) gf_free(key_url);
@@ -5125,7 +5929,8 @@
 	u32 quality_rank;
 	u32 min_bandwidth = 0;
 	Bool force_rep_idx = GF_FALSE;
-	GF_MPD_Representation *rep;
+	Bool local_file_mode = GF_FALSE;
+	GF_MPD_Representation *rep, *rep_new;
 	u32 total_rate, bandwidths[20], groups_per_quality[20], max_level;
 	u32 q_idx, nb_qualities = 0;
 	u32 i, count = gf_list_count(dash->groups), local_files = 0;
@@ -5150,27 +5955,43 @@
 		if (group->selection != GF_DASH_GROUP_SELECTED) continue;
 		if (group->local_files) local_files ++;
 		if (!group->bytes_per_sec) continue;
+		if (group->done) continue;
 
-		//keep min rate to perform rate adaptation
-		if (total_rate > group->bytes_per_sec)
-			total_rate = group->bytes_per_sec;
+		//only count broadband ones
+		if (dash->atsc_clock_state && !gf_list_count(group->period->base_URLs) && !gf_list_count(group->adaptation_set->base_URLs) && !group->period->origin_base_url) {
+			u32 j;
+			//get all active rep, count bandwidth for broadband ones
+			for (j=0; j<=group->max_complementary_rep_index; j++) {
+				rep = gf_list_get(group->adaptation_set->representations, j);
+				//this rep is not in broadcast, add bandwidth
+				if (gf_list_count(rep->base_URLs)) {
+					total_rate = group->bytes_per_sec;
+				}
+			}
+		} else {
+			//keep min rate to perform rate adaptation
+			if (total_rate > group->bytes_per_sec)
+				total_rate = group->bytes_per_sec;
+		}
 	}
 	if (total_rate == (u32) -1) {
 		total_rate = 0;
 	}
 	if (local_files==count) {
 		total_rate = dash->dash_io->get_bytes_per_sec(dash->dash_io, NULL);
+		if (!total_rate) local_file_mode = GF_TRUE;
+	} else if (!total_rate) {
+		return;
 	}
-	if (!total_rate) return;
-	
 
-	for (q_idx=0; q_idx<nb_qualities; q_idx++) {
+ for (q_idx=0; q_idx<nb_qualities; q_idx++) {
 		bandwidths[q_idx] = 0;
 		groups_per_quality[q_idx] = 0;
 
 		for (i=0; i<count; i++) {
 			GF_DASH_Group *group = gf_list_get(dash->groups, i);
 			if (group->selection != GF_DASH_GROUP_SELECTED) continue;
+			if (group->done) continue;
 
 			quality_rank = gf_dash_get_tiles_quality_rank(dash, group);
 			if (quality_rank >= nb_qualities) quality_rank = nb_qualities-1;
@@ -5181,9 +6002,29 @@
 			bandwidths[q_idx] += rep->bandwidth;
 			groups_per_quality[q_idx] ++;
 			if (max_level < 1 + quality_rank) max_level = 1+quality_rank;
+
+			//quick trick here: if no download cap in local playback, compute the total rate based on
+			//quality rank
+			if (local_file_mode) {
+				u32 nb_reps = gf_list_count(group->adaptation_set->representations);
+				//get rep matching the given quality rank - quality 0 is the highest and our
+				//reps are sorted from lowest !
+				u32 rep_target;
+				if (!quality_rank)
+					rep_target = nb_reps-1;
+				else
+					rep_target = (nb_qualities - quality_rank) * nb_reps / nb_qualities;
+
+				rep = gf_list_get(group->adaptation_set->representations, rep_target);
+				total_rate += rep->bandwidth;
+			}
 		}
 		min_bandwidth += bandwidths[q_idx];
 	}
+	if (local_file_mode) {
+		//total rate is in bytes per second, and add a safety of 10 bytes to ensure selection
+		total_rate = 10 + total_rate / 8;
+	}
 
 	/*no per-quality adaptation, we may have oscillations*/
 	if (!dash->tile_rate_decrease) {
@@ -5202,6 +6043,7 @@
 					u32 diff;
 					GF_DASH_Group *group = gf_list_get(dash->groups, i);
 					if (group->selection != GF_DASH_GROUP_SELECTED) continue;
+					if (group->done) continue;
 
 					quality_rank = gf_dash_get_tiles_quality_rank(dash, group);
 					if (quality_rank >= nb_qualities) quality_rank = nb_qualities-1;
@@ -5211,12 +6053,26 @@
 						continue;
 
 					nb_rep_in_qidx++;
-					
+
 					rep = gf_list_get(group->adaptation_set->representations, group->target_new_rep);
 					diff = rep->bandwidth;
-					rep = gf_list_get(group->adaptation_set->representations, group->target_new_rep+1);
-					diff = rep->bandwidth - diff;
-					
+					rep_new = gf_list_get(group->adaptation_set->representations, group->target_new_rep+1);
+					diff = rep_new->bandwidth - diff;
+
+					if (dash->atsc_clock_state) {
+						//if baseURL in period or adaptation set, we assume we are in broadband mode, otherwise we re in broadcast, don't count bitrate
+						if (!gf_list_count(group->period->base_URLs) && !gf_list_count(group->adaptation_set->base_URLs)) {
+							//new rep is in broadcast, force diff to 0 to select the rep
+							if (!gf_list_count(rep_new->base_URLs)) {
+								diff = 0;
+							}
+							//new rep is in broadband, prev rep is in broadcast, diff is the new rep bandwidth
+							else if (!gf_list_count(rep->base_URLs)) {
+								diff = rep_new->bandwidth;
+							}
+						}
+					}
+
 					if (test_pass) {
 						cumulated_bw_in_pass+= diff;
 						nb_rep_increased ++;
@@ -5236,7 +6092,7 @@
 				//no more adjustement possible for this quality level
 				if (! nb_rep_increased)
 					break;
-				
+
 				test_pass = !test_pass;
 			}
 		}
@@ -5272,10 +6128,12 @@
 		}
 	}
 
+	//GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DEBUG. 2. dowload at %d \n", 8*bandwidths[q_idx]/1000));
 	//bandwitdh sharing done, perform rate adaptation with theses new numbers
 	for (i=0; i<count; i++) {
 		GF_DASH_Group *group = gf_list_get(dash->groups, i);
 		if (group->selection != GF_DASH_GROUP_SELECTED) continue;
+		if (group->done) continue;
 
 		if (force_rep_idx) {
 			rep = gf_list_get(group->adaptation_set->representations, group->target_new_rep);
@@ -5306,9 +6164,9 @@
 static u32 dash_download_threaded(void *par)
 {
 	GF_DASH_Group *group = (GF_DASH_Group *) par;
-	
+
 	group->download_th_done = GF_FALSE;
-	
+
 	while (1) {
 		DownloadGroupStatus res = dash_download_group(group->dash, group, group, group->groups_depending_on ? GF_TRUE : GF_FALSE);
 		if (res==GF_DASH_DownloadRestart) {
@@ -5367,6 +6225,22 @@
 		gf_mx_p(group->cache_mutex);
 		e = gf_dash_download_init_segment(dash, group);
 		gf_mx_v(group->cache_mutex);
+		if (e == GF_IP_NETWORK_EMPTY) {
+			gf_dash_buffer_off(group);
+			if (dash->mpd_stop_request)
+				goto exit;
+
+			if (dash->reinit_period_index) {
+				gf_dash_reset_groups(dash);
+				dash->active_period_index = dash->reinit_period_index-1;
+				dash->reinit_period_index = 0;
+				goto restart_period;
+			}
+
+			gf_sleep(30);
+			i--;
+			continue;
+		}
 		if (e) break;
 	}
 	first_period_in_mpd = 0;
@@ -5410,6 +6284,7 @@
 
 		/*wait until next segment is needed*/
 		while (!dash->mpd_stop_request) {
+			Bool all_groups_done_notified = GF_FALSE;
 			u32 timer = gf_sys_clock() - dash->last_update_time;
 
 			/*refresh MPD*/
@@ -5419,11 +6294,11 @@
 					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] At %d Time to update the playlist (%u ms elapsed since last refresh and min reload rate is %u)\n", gf_sys_clock() , timer, dash->mpd->minimum_update_period));
 				}
 				dash->force_mpd_update = 0;
-				
+
 				gf_mx_p(dash->dash_mutex);
 				e = gf_dash_update_manifest(dash);
 				gf_mx_v(dash->dash_mutex);
-				
+
 				group_count = gf_list_count(dash->groups);
 				diff = gf_sys_clock() - diff;
 				if (e) {
@@ -5450,18 +6325,36 @@
 				dash->tsb_exceeded = 0;
 				dash->time_in_tsb = 0;
 				for (i=0; i<group_count; i++) {
+					GF_MPD_Type dyn_type = dash->mpd->type;
 					GF_DASH_Group *group = gf_list_get(dash->groups, i);
-					
+
+					if (group->period->origin_base_url) dyn_type = group->period->type;
+
 					gf_mx_p(group->cache_mutex);
 
-					if ((group->selection != GF_DASH_GROUP_SELECTED) || group->done || group->depend_on_group) {
+					if ((group->selection != GF_DASH_GROUP_SELECTED)
+						|| group->depend_on_group
+						|| (group->done && !group->nb_cached_segments)
+					) {
 						gf_mx_v(group->cache_mutex);
 						continue;
 					}
 					all_groups_done = 0;
-					if (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) {
+					if (!group->done && (dyn_type==GF_MPD_TYPE_DYNAMIC) ) {
 						gf_dash_group_check_time(group);
 					}
+					//cache is full, notify client some segments are pending
+					if ((group->nb_cached_segments == group->max_cached_segments)
+						&& !dash->request_period_switch
+						&& !group->has_pending_enhancement
+					) {
+						dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, i, GF_OK);
+					}
+					if (group->done && group->nb_cached_segments)
+					{
+						dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, i, GF_OK);
+					}
+
 					if (group->nb_cached_segments<group->max_cached_segments) {
 						cache_full = 0;
 					}
@@ -5510,7 +6403,12 @@
 					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Switching to period #%d\n", dash->active_period_index+1));
 					goto restart_period;
 				}
-
+				if (!all_groups_done)
+					dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_CACHE_FULL, 0, GF_OK);
+				else if (!all_groups_done_notified) {
+					all_groups_done_notified = GF_TRUE;
+					dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_END_OF_PERIOD, 0, GF_OK);
+				}
 				gf_sleep(30);
 			}
 		}
@@ -5526,6 +6424,7 @@
 			dash_global_rate_adaptation(dash, GF_TRUE);
 		}
 
+		dash->initial_period_tunein = GF_FALSE;
 
 		/*for each selected groups*/
 		for (i=0; i<group_count; i++) {
@@ -5534,12 +6433,16 @@
 				if (group->nb_cached_segments && !group->dont_delete_first_segment) {
 					gf_dash_group_reset(dash, group);
 				}
+				group->download_th_done = GF_TRUE;
 				continue;
 			}
 
 			if (group->depend_on_group) continue;
 			//not yet scheduled for download
-			if (group->rate_adaptation_postponed) continue;
+			if (group->rate_adaptation_postponed) {
+				group->download_th_done = GF_TRUE;
+				continue;
+			}
 
 			if (dash->use_threaded_download) {
 				group->download_th_done = GF_FALSE;
@@ -5559,7 +6462,7 @@
 				group->download_th_done = GF_TRUE;
 			}
 		}
-		
+
 		while (dash->use_threaded_download) {
 			Bool all_done = GF_TRUE;
 			for (i=0; i<group_count; i++) {
@@ -5578,8 +6481,9 @@
 			}
 			if (all_done)
 				break;
+			gf_sleep(1);
 		}
-		
+
 		dash_global_rate_adaptation(dash, GF_FALSE);
 	}
 
@@ -5600,6 +6504,7 @@
 {
 	u32 i, count;
 	u64 cumul_start = 0;
+	Bool is_dyn = GF_FALSE;
 	GF_MPD_Period *period;
 
 	if (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) {
@@ -5613,6 +6518,7 @@
 		} else {
 			now -= dash->initial_time_shift_value;
 		}
+		if (!time) is_dyn = GF_TRUE;
 		time += now;
 	}
 
@@ -5623,20 +6529,27 @@
 	for (i = 0; i<count; i++) {
 		period = gf_list_get(dash->mpd->periods, i);
 
-		if (period->xlink_href) {
-			gf_dash_solve_period_xlink(dash, i);
+		if (period->xlink_href && !period->duration) {
+			gf_dash_solve_period_xlink(dash, dash->mpd->periods, i);
 			goto restart;
 		}
 
 		if ((period->start > time) || (cumul_start > time)) {
 			break;
 		}
+
 		cumul_start += period->duration;
 
 		if (time < cumul_start) {
 			break;
 		}
 	}
+	if (is_dyn) {
+		for (i = 0; i<count; i++) {
+			period = gf_list_get(dash->mpd->periods, i);
+			if (!period->xlink_href && !period->origin_base_url) return i;
+		}
+	}
 	return (i>=1 ? (i-1) : 0);
 }
 
@@ -5700,7 +6613,7 @@
 		Double dur;
 
 		if (period->xlink_href) {
-			gf_dash_solve_period_xlink(dash, i);
+			gf_dash_solve_period_xlink(dash, dash->mpd->periods, i);
 			if (nb_retry) {
 				nb_retry --;
 				i--;
@@ -5746,7 +6659,7 @@
 	u32 first_downloaded, last_downloaded, segment_idx, orig_idx;
 
 	gf_mx_p(group->cache_mutex);
-	
+
 	group->force_segment_switch = 0;
 	if (!is_dynamic) {
 		/*figure out where to seek*/
@@ -5754,7 +6667,7 @@
 		e = gf_mpd_seek_in_period(seek_to, MPD_SEEK_PREV, group->period, group->adaptation_set, gf_list_get(group->adaptation_set->representations, group->active_rep_index), &segment_idx, NULL);
 		if (e<0)
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] An error occured while seeking to time %lf: %s\n", seek_to, gf_error_to_string(e)));
-			
+
 		group->download_segment_index = orig_idx;
 
 		/*remember to seek to given duration*/
@@ -5804,10 +6717,20 @@
 		gf_dash_group_reset_cache_entry(&group->cached[group->nb_cached_segments]);
 	}
 	group->done = 0;
-	
+
 	gf_mx_v(group->cache_mutex);
 }
 
+GF_EXPORT
+void gf_dash_group_seek(GF_DashClient *dash, u32 group_idx, Double seek_to)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
+	if (!group) return;
+	gf_mx_p(dash->dash_mutex);
+	gf_dash_seek_group(dash, group, seek_to, (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) ? GF_TRUE : GF_FALSE);
+	gf_mx_v(dash->dash_mutex);
+}
+
 static void gf_dash_seek_groups(GF_DashClient *dash, Double seek_time, Bool is_dynamic)
 {
 	u32 i;
@@ -5852,7 +6775,8 @@
 		}
 		e = dash->dash_io->setup_from_url(dash->dash_io, getter->session, url, group_idx);
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot resetup session for url %s: %s\n", url, gf_error_to_string(e) ));
+			//with ATSC we may have 404 right away if nothing in cache yet, not an error
+			GF_LOG(dash->atsc_clock_state ? GF_LOG_DEBUG : GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot resetup downloader for url %s: %s\n", url, gf_error_to_string(e) ));
 			return e;
 		}
 		sess = (GF_DASHFileIOSession *)getter->session;
@@ -6007,12 +6931,12 @@
 			if (sep) sep[0]=0;
 			strcat(local_path, ".mpd");
 
-			e = gf_m3u8_to_mpd(local_url, manifest_url, local_path, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter, dash->mpd, GF_FALSE);
+			e = gf_m3u8_to_mpd(local_url, manifest_url, local_path, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter, dash->mpd, GF_FALSE, dash->keep_files, 0);
 		} else {
 			const char *redirected_url = dash->dash_io->get_url(dash->dash_io, dash->mpd_dnload);
 			if (!redirected_url) redirected_url=manifest_url;
 
-			e = gf_m3u8_to_mpd(local_url, redirected_url, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter, dash->mpd, GF_FALSE);
+			e = gf_m3u8_to_mpd(local_url, redirected_url, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter, dash->mpd, GF_FALSE, dash->keep_files, 0);
 		}
 	} else {
 		if (!dash->is_smooth && !gf_dash_check_mpd_root_type(local_url)) {
@@ -6038,20 +6962,27 @@
 			dash->mpd_dnload = NULL;
 			return GF_URL_ERROR;
 		}
-	}
 
-	if (dash->mpd)
-		gf_mpd_del(dash->mpd);
+		if (dash->is_smooth) {
+			e = gf_mpd_init_smooth_from_dom(gf_xml_dom_get_root(mpd_parser), dash->mpd, manifest_url);
+		} else {
+			e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), dash->mpd, manifest_url);
+		}
+		gf_xml_dom_del(mpd_parser);
 
-	dash->mpd = gf_mpd_new();
-	if (!dash->mpd) {
-		e = GF_OUT_OF_MEM;
-	} else if (dash->is_smooth) {
-		e = gf_mpd_init_smooth_from_dom(gf_xml_dom_get_root(mpd_parser), dash->mpd, manifest_url);
-	} else {
-		e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), dash->mpd, manifest_url);
+		if (dash->ignore_xlink)
+			dash_purge_xlink(dash->mpd);
+
+		if (!is_local) {
+			const char *hdr = dash->dash_io->get_header_value(dash->dash_io, dash->mpd_dnload, "x-dash-atsc");
+			if (hdr) {
+				if (!dash->atsc_clock_state) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Detected ATSC DASH service ID %s\n", hdr));
+					dash->atsc_clock_state = 1;
+				}
+			}
+		}
 	}
-	gf_xml_dom_del(mpd_parser);
 
 	if (e != GF_OK) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: MPD creation problem %s\n", gf_error_to_string(e)));
@@ -6069,6 +7000,10 @@
 	/* 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;
@@ -6124,8 +7059,15 @@
 		dash->rate_adaptation_algo = dash_do_rate_adaptation_legacy_rate;
 		dash->rate_adaptation_download_monitor = dash_do_rate_monitor_default;
 		break;
-	case GF_DASH_ALGO_GPAC_TEST:
-		dash->rate_adaptation_algo = dash_do_rate_adaptation_test;
+	case GF_DASH_ALGO_BBA0:
+		dash->rate_adaptation_algo = dash_do_rate_adaptation_bba0;
+		dash->rate_adaptation_download_monitor = dash_do_rate_monitor_default;
+		break;
+	case GF_DASH_ALGO_BOLA_FINITE:
+	case GF_DASH_ALGO_BOLA_BASIC:
+	case GF_DASH_ALGO_BOLA_U:
+	case GF_DASH_ALGO_BOLA_O:
+		dash->rate_adaptation_algo = dash_do_rate_adaptation_bola;
 		dash->rate_adaptation_download_monitor = dash_do_rate_monitor_default;
 		break;
 	case GF_DASH_ALGO_NONE:
@@ -6133,8 +7075,6 @@
 		dash->rate_adaptation_algo = NULL;
 		break;
 	}
-
-
 }
 
 GF_EXPORT
@@ -6166,6 +7106,8 @@
 	dash->segment_lost_after_ms = 100;
 	dash->debug_group_index = -1;
 	dash->tile_rate_decrease = 100;
+	dash->atsc_ast_shift = 1000;
+	dash->initial_period_tunein = GF_TRUE;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Client created\n"));
 	return dash;
 }
@@ -6272,7 +7214,7 @@
 		u32 current_idx = group->active_rep_index;
 		if (group->selection != GF_DASH_GROUP_SELECTED) continue;
 
-		if (group->base_rep_index_plus_one) current_idx = group->force_max_rep_index;
+		if (group->base_rep_index_plus_one) current_idx = group->max_complementary_rep_index;
 		if (group->force_representation_idx_plus_one) current_idx = group->force_representation_idx_plus_one - 1;
 
 		active_rep = gf_list_get(group->adaptation_set->representations, current_idx);
@@ -6302,27 +7244,27 @@
 		}
 		if (switch_to_rep_idx && (switch_to_rep_idx-1 != current_idx) ) {
 			u32 nb_cached_seg_per_rep = group->max_cached_segments / gf_dash_group_count_rep_needed(group);
-			
+
 			gf_mx_p(group->cache_mutex);
-			
+
 			group->force_switch_bandwidth = 1;
 			if (!group->base_rep_index_plus_one)
 				group->force_representation_idx_plus_one = switch_to_rep_idx;
 			else
-				group->force_max_rep_index = switch_to_rep_idx-1;
+				group->max_complementary_rep_index = switch_to_rep_idx-1;
 
 
 			if (group->local_files || immediate_switch) {
 				u32 keep_seg_index = 0;
 				//keep all scalable enhancements of the first segment
 				rep = gf_list_get(group->adaptation_set->representations, group->cached[0].representation_index);
-				if (rep->enhancement_rep_index_plus_one) {
-					u32 rep_idx = rep->enhancement_rep_index_plus_one;
+				if (rep->playback.enhancement_rep_index_plus_one) {
+					u32 rep_idx = rep->playback.enhancement_rep_index_plus_one;
 					while (keep_seg_index + 1 < group->nb_cached_segments) {
 						rep = gf_list_get(group->adaptation_set->representations, group->cached[keep_seg_index+1].representation_index);
 						if (rep_idx == group->cached[keep_seg_index+1].representation_index+1) {
 							keep_seg_index ++;
-							rep_idx = rep->enhancement_rep_index_plus_one;
+							rep_idx = rep->playback.enhancement_rep_index_plus_one;
 						}
 						else
 							break;
@@ -6351,13 +7293,13 @@
 						//first, we keep the second segment and remove all segments from the third one
 						keep_seg_index++;
 						rep = gf_list_get(group->adaptation_set->representations, group->cached[keep_seg_index].representation_index);
-						if (rep->enhancement_rep_index_plus_one) {
-							u32 rep_idx = rep->enhancement_rep_index_plus_one;
+						if (rep->playback.enhancement_rep_index_plus_one) {
+							u32 rep_idx = rep->playback.enhancement_rep_index_plus_one;
 							while (keep_seg_index + 1 < group->nb_cached_segments) {
 								rep = gf_list_get(group->adaptation_set->representations, group->cached[keep_seg_index+1].representation_index);
 								if (rep_idx == group->cached[keep_seg_index+1].representation_index+1) {
 									keep_seg_index ++;
-									rep_idx = rep->enhancement_rep_index_plus_one;
+									rep_idx = rep->playback.enhancement_rep_index_plus_one;
 								}
 								else
 									break;
@@ -6457,15 +7399,13 @@
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
 	if (!group) return NULL;
 
-	/*solve dependencies if any*/
-	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
-
-	while (rep && rep->dependency_id) {
-		char *sep = strchr(rep->dependency_id, ' ');
-		if (sep) sep[0] = 0;
-		rep = gf_dash_find_rep(dash, rep->dependency_id, &group);
-		if (sep) sep[0] = ' ';
-	}
+	/*solve dependencies if any - we first test highest: if this is a complementary rep, keep the highest for init
+	otherwise use the selected one
+	this is need for scalable because we only init once the demuxer*/
+
+	rep = gf_list_last(group->adaptation_set->representations);
+	if (!rep->dependency_id)
+		rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
 
 	if (group->bs_switching_init_segment_url) {
 		if (start_range) *start_range = group->bs_switching_init_segment_url_start_range;
@@ -6632,11 +7572,14 @@
 Bool gf_dash_in_last_period(GF_DashClient *dash, Bool check_eos)
 {
 	Bool res = (dash->active_period_index+1 < gf_list_count(dash->mpd->periods)) ? 0 : 1;
+	//this code seems buggy, commented for now
+#if 0
 	if (res && dash->mpd->type==GF_MPD_TYPE_DYNAMIC) {
 		GF_MPD_Period*period = gf_list_last(dash->mpd->periods);
 		//consider we are
 		if (!period->duration || dash->mpd->media_presentation_duration) res = GF_FALSE;
 	}
+#endif
 	return res;
 }
 GF_EXPORT
@@ -6836,9 +7779,9 @@
 		gf_mx_v(dash->dash_mutex);
 		return GF_BAD_PARAM;
 	}
-	
+
 	gf_mx_p(group->cache_mutex);
-	
+
 	if (!group->nb_cached_segments) {
 		gf_mx_v(group->cache_mutex);
 		gf_mx_v(dash->dash_mutex);
@@ -6860,8 +7803,8 @@
 			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->cached[index].representation_index);
 
 			if (index+1 >= group->nb_cached_segments) err = GF_BUFFER_TOO_SMALL;
-			else if (!rep->enhancement_rep_index_plus_one) err = GF_BAD_PARAM;
-			else if (rep->enhancement_rep_index_plus_one != group->cached[index+1].representation_index + 1) err = GF_BAD_PARAM;
+			else if (!rep->playback.enhancement_rep_index_plus_one) err = GF_BAD_PARAM;
+			else if (rep->playback.enhancement_rep_index_plus_one != group->cached[index+1].representation_index + 1) err = GF_BAD_PARAM;
 		}
 
 		if (err) {
@@ -6897,11 +7840,11 @@
 
 	if (group->cached[index].has_dep_following) {
 		if (has_next_segment) *has_next_segment = GF_TRUE;
-	} else if (group->cached[index+1].cache) {
+	} else if (group->cached[index+1].cache && group->adaptation_set) {
 		GF_MPD_Representation *rep;
 
 		rep = gf_list_get(group->adaptation_set->representations, group->cached[index].representation_index);
-		if (rep && (rep->enhancement_rep_index_plus_one == group->cached[index+1].representation_index+1) ) {
+		if (rep && (rep->playback.enhancement_rep_index_plus_one == group->cached[index+1].representation_index+1) ) {
 			if (has_next_segment)
 				*has_next_segment = GF_TRUE;
 		}
@@ -6985,6 +7928,7 @@
 		start_range /= 1000;
 
 		is_dynamic = 1;
+		dash->initial_period_tunein = GF_TRUE;
 	}
 
 	/*first check if we seek to another period*/
@@ -7383,6 +8327,15 @@
 }
 
 GF_EXPORT
+u32 gf_dash_group_get_num_components(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return 0;
+	return gf_list_count(group->adaptation_set->content_component);
+}
+
+
+GF_EXPORT
 GF_Err gf_dash_group_get_quality_info(GF_DashClient *dash, u32 idx, u32 quality_idx, GF_DASHQualityInfo *quality)
 {
 	GF_MPD_Fractional *sar;
@@ -7413,8 +8366,13 @@
 	quality->bandwidth = rep->bandwidth;
 	quality->ID = rep->id;
 	quality->interlaced = (rep->scan_type == GF_MPD_SCANTYPE_INTERLACED) ? 1 : ( (group->adaptation_set->scan_type == GF_MPD_SCANTYPE_INTERLACED) ? 1 : 0);
-	quality->is_selected = (quality_idx==group->active_rep_index) ? 1 : 0;
 
+	//scalable rep, selected quality is max_complementary_rep_index
+	if (group->base_rep_index_plus_one) {
+		quality->is_selected = (quality_idx==group->max_complementary_rep_index) ? 1 : 0;
+	} else {
+		quality->is_selected = (quality_idx==group->active_rep_index) ? 1 : 0;
+	}
 	return GF_OK;
 }
 
@@ -7578,7 +8536,7 @@
 
 GF_EXPORT
 s32 gf_dash_get_utc_drift_estimate(GF_DashClient *dash) {
-	return dash->utc_drift_estimate;
+	return (s32) dash->utc_drift_estimate;
 }
 
 GF_EXPORT
@@ -7604,13 +8562,13 @@
 {
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
 	if (!group || !group->srd_desc) return GF_FALSE;
-	
+
 	if (group->srd_desc) {
 		if (srd_id) (*srd_id) = group->srd_desc->id;
 		if (srd_width) (*srd_width) = group->srd_desc->srd_fw;
 		if (srd_height) (*srd_height) = group->srd_desc->srd_fh;
 	}
-	
+
 	if (srd_x) (*srd_x) = group->srd_x;
 	if (srd_y) (*srd_y) = group->srd_y;
 	if (srd_w) (*srd_w) = group->srd_w;
@@ -7627,6 +8585,18 @@
 }
 
 GF_EXPORT
+void gf_dash_ignore_xlink(GF_DashClient *dash, Bool ignore_xlink)
+{
+	dash->ignore_xlink = ignore_xlink;
+}
+
+GF_EXPORT
+void gf_dash_set_atsc_ast_shift(GF_DashClient *dash, u32 ast_shift)
+{
+	dash->atsc_ast_shift = ast_shift;
+}
+
+GF_EXPORT
 GF_Err gf_dash_group_set_max_buffer_playout(GF_DashClient *dash, u32 idx, u32 max_buffer_playout_ms)
 {
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
@@ -7657,7 +8627,7 @@
 	if (!min_x && !max_x && !min_y && !max_y) {
 		group->quality_degradation_hint = 0;
 	}
-	
+
 
 	//TODO - single video, we may want to switch down quality if not a lot of the video is visible
 	//we will need the zoom factor as well
@@ -7677,17 +8647,37 @@
 		} 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;
-		
+
 		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"));
 	}
 	return GF_OK;
 }
 
 
+GF_EXPORT
+Bool gf_dash_all_groups_done(GF_DashClient *dash)
+{
+	u32 i, count = gf_list_count(dash->groups);
+	for (i=0; i<count; i++) {
+		GF_DASH_Group *group = gf_list_get(dash->groups, i);
+		if (group->selection != GF_DASH_GROUP_SELECTED) continue;
+		if (!group->done) return GF_FALSE;
+		if (group->nb_cached_segments) return GF_FALSE;
+	}
+	return GF_TRUE;
+}
+
+GF_EXPORT
+void gf_dash_set_period_xlink_query_string(GF_DashClient *dash, const char *query_string)
+{
+	if (dash) dash->query_string = query_string;
+}
+
 
 #endif //GPAC_DISABLE_DASH_CLIENT
+

gpac-0.7.1.tar.gz/src/media_tools/dash_segmenter.c -> gpac-0.8.0.tar.gz/src/media_tools/dash_segmenter.c Changed

@@ -28,12 +28,14 @@
 #include <gpac/mpegts.h>
 #include <gpac/config_file.h>
 #include <gpac/network.h>
+#include <gpac/base_coding.h>
 #ifdef _WIN32_WCE
 #include <winbase.h>
 #else
 #include <time.h>
 #endif
 #include <gpac/internal/isomedia_dev.h>
+#include <gpac/internal/mpd.h>
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 #ifdef GPAC_DISABLE_ISOM
@@ -49,16 +51,18 @@
 {
 	u32 ID;/*audio/video/text/ ...*/
 	u32 media_type;/*audio/video/text/ ...*/
-	char szCodec[50];
+	char szCodec[RFC6381_CODEC_NAME_SIZE_MAX];
 	/*for video */
-	u32 width, height, fps_num, fps_denum, sar_num, sar_denum, max_sap;
+	u32 width, height, fps_num, fps_denum, sar_num, sar_denum, max_sap, hevc_tile_type;
 
 	/*for audio*/
 	u32 sample_rate, channels;
 	/*apply to any media. We use 5 bytes because we may use copy data converted from gf_4cc_to_str which is 5 bytes*/
 	char *lang;
+	Double duration;
 };
 
+
 struct __gf_dash_segmenter
 {
 	char *mpd_name;
@@ -82,15 +86,15 @@
 	Bool segments_start_with_rap;
 
 	Double segment_duration;
-	Bool segment_duration_strict;
 	Double fragment_duration;
 	//has to be freed
 	char *seg_rad_name;
 	const char *seg_ext;
+	const char *init_seg_ext;
 	u32 segment_marker_4cc;
 	Bool enable_sidx;
 	u32 subsegs_per_sidx;
-	Bool daisy_chain_sidx;
+	Bool daisy_chain_sidx, use_ssix;
 
 	Bool fragments_start_with_rap;
 	char *tmpdir;
@@ -104,9 +108,11 @@
 	u32 initial_moof_sn;
 	u64 initial_tfdt;
 	Bool no_fragments_defaults;
-	Bool pssh_moof;
+
+	GF_DASHPSSHMode pssh_mode;
 	Bool samplegroups_in_traf;
-	Bool single_traf_per_moof;
+ Bool single_traf_per_moof;
+	Bool tfdt_per_traf;
 	Double mpd_live_duration;
 	Bool insert_utc;
 	Bool real_time;
@@ -125,14 +131,29 @@
 	const char *bs_switch_segment_file;
 	Bool inband_param_set;
 	Bool force_period_end;
+	Bool force_session_end;
 
 	/*set if seg_rad_name depends on input file name (had %s in it). In this case, SegmentTemplate cannot be used at adaptation set level*/
 	Bool variable_seg_rad_name;
 
+	/*If true, disable generation date printing in mpd headers*/
+	Bool force_test_mode;
+
 	GF_DASH_ContentLocationMode cp_location_mode;
 
 	Double max_segment_duration;
+	Bool no_cache;
+	Bool disable_loop;
+
+	/* indicates if a segment must contain its theorical boundary */
+	Bool split_on_bound;
 
+	/* used to segment video as close to the boundary as possible */
+	Bool split_on_closest;
+	const char *cues_file;
+	Bool strict_cues;
+
+	Bool mvex_after_traks;
 };
 
 struct _dash_segment_input
@@ -157,6 +178,7 @@
 	u32 bandwidth;
 	u32 dependency_bandwidth;
 	char *dependencyID;
+	Bool sscale;
 
 	/*if 0, input is disabled*/
 	u32 adaptation_set;
@@ -199,17 +221,20 @@
 	u32 x, y, w, h;
 
 	Bool disable_inband_param_set;
-
-	Bool period_id_not_specified;
+	//0: PID specified, 1 or more: specified, indicates the number of time the period was instantiated
+	u32 period_id_not_specified;
 
 	Bool init_segment_generated;
 	char *init_seg_url;
-	Bool use_bs_switching;
+	u32 use_bs_switching; //0: no, 1: yes, 2: kaked for hevc tiles
 
 
 	Bool get_component_info_done;
 	//cached isobmf input
 	GF_ISOFile *isobmf_input;
+	Bool no_cache;
+
+	Double clamp_duration;
 };
 
 
@@ -227,7 +252,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 *output_file_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)
 {
@@ -237,11 +262,19 @@
 	Bool is_init = (seg_type==GF_DASH_TEMPLATE_INITIALIZATION) ? GF_TRUE : GF_FALSE;
 	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 needs_init=((is_init || is_init_template) && !is_bs_switching) ? GF_TRUE : GF_FALSE;
+	Bool needs_init;
 	u32 char_template = 0;
+	Bool skip_output = GF_FALSE;
 	char tmp[100];
 	strcpy(segment_name, "");
 
+	if (seg_type==GF_DASH_TEMPLATE_SEGMENT_NO_OUTPUT) {
+		seg_type = GF_DASH_TEMPLATE_SEGMENT;
+		skip_output = GF_TRUE;
+	}
+
+	needs_init=((is_init || is_init_template) && !is_bs_switching) ? GF_TRUE : GF_FALSE;
+
 	if (seg_rad_name && (strstr(seg_rad_name, "$RepresentationID$") || strstr(seg_rad_name, "$Bandwidth$")))
 		needs_init = GF_FALSE;
 
@@ -303,6 +336,24 @@
 				char_template += (u32) strlen(seg_rad_name + char_template)+1;
 				if (sep) sep[0] = '$';
 			}
+			else if (!strnicmp(& seg_rad_name[char_template], "$Path=", 6)) {
+				char *sep = strchr(seg_rad_name + char_template+6, '$');
+				if (sep) sep[0] = 0;
+				if (!is_template && !is_init_template) {
+					strcat(segment_name, seg_rad_name + char_template+6);
+				}
+				char_template += (u32) strlen(seg_rad_name + char_template)+1;
+				if (sep) sep[0] = '$';
+			}
+			else if (!strnicmp(& seg_rad_name[char_template], "$Segment=", 9)) {
+				char *sep = strchr(seg_rad_name + char_template+9, '$');
+				if (sep) sep[0] = 0;
+				if (!is_init && !is_init_template) {
+					strcat(segment_name, seg_rad_name + char_template+9);
+				}
+				char_template += (u32) strlen(seg_rad_name + char_template)+1;
+				if (sep) sep[0] = '$';
+			}
 
 			else {
 				char_template+=1;
@@ -312,32 +363,12 @@
 				strcat(segment_name, tmp);
 			}
 		}
-
-		//take care of base_url, if any
-		if (gf_url_is_local(base_url)) {
-			const char *name;
-			char tmp_segment_name[GF_MAX_PATH], tmp_path[GF_MAX_PATH], tmp_path2[GF_MAX_PATH];
-			name = gf_url_get_resource_name(segment_name);
-			gf_url_get_resource_path(segment_name, tmp_path);
-			strcpy(tmp_segment_name, name);
-			gf_url_get_resource_path(base_url, tmp_path2);
-			if (tmp_path2[strlen(tmp_path2)] != GF_PATH_SEPARATOR) {
-				char ext[2];
-				ext[0] = GF_PATH_SEPARATOR;
-				ext[1] = 0;
-				strcat(tmp_path2, ext);
-			}
-			segment_name[0] = '\0';
-			strcat(segment_name, tmp_path);
-			strcat(segment_name, tmp_path2);
-			strcat(segment_name, tmp_segment_name);
-		}
 	}
 
-	if (is_template) {
-		if (use_segment_timeline && !strstr(seg_rad_name, "$Time")) {
+	if (is_template && !strstr(seg_rad_name, "$Number") && !strstr(seg_rad_name, "$Time")) {
+		if (use_segment_timeline) {
 			strcat(segment_name, "$Time$");
-		} else if (!use_segment_timeline && !strstr(seg_rad_name, "$Number")) {
+		} else {
 			strcat(segment_name, "$Number$");
 		}
 	}
@@ -346,15 +377,21 @@
 		strcat(segment_name, "init");
 
 	if (!is_init && !is_template && !is_init_template && !is_index && !has_number) {
-		sprintf(tmp, "%d", segment_number);
-		strcat(segment_name, tmp);
+		if (use_segment_timeline) {
+			sprintf(tmp, LLU, start_time);
+			strcat(segment_name, tmp);
+		}
+		else {
+			sprintf(tmp, "%d", segment_number);
+			strcat(segment_name, tmp);
+		}
 	}
 	if (seg_ext) {
 		strcat(segment_name, ".");
 		strcat(segment_name, seg_ext);
 	}
 
-	if ((seg_type != GF_DASH_TEMPLATE_TEMPLATE) && (seg_type != GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE)) {
+	if ((seg_type != GF_DASH_TEMPLATE_TEMPLATE) && (seg_type != GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE) && !skip_output) {
 		char *sep = strrchr(segment_name, '/');
 		if (sep) {
 			char c = sep[0];
@@ -392,13 +429,13 @@
 	return res;
 }
 
-GF_Err gf_dasher_store_segment_info(GF_DASHSegmenter *dash_cfg, const char *representationID, const char *SegmentName, u64 segStartTime, u64 segEndTime)
+GF_Err gf_dasher_store_segment_info(GF_DASHSegmenter *dasher, const char *representationID, const char *SegmentName, u64 segStartTime, u64 segEndTime, u64 scale)
 {
 	char szKey[512];
-	if (!dash_cfg->dash_ctx) return GF_OK;
+	if (!dasher->dash_ctx) return GF_OK;
 
-	sprintf(szKey, ""LLU"-"LLU"@%s", segStartTime, segEndTime-segStartTime, representationID);
-	return gf_cfg_set_key(dash_cfg->dash_ctx, "SegmentsStartTimes", SegmentName, szKey);
+	sprintf(szKey, ""LLU"-"LLU"-"LLU"@%s", segStartTime, segEndTime-segStartTime, scale, representationID);
+	return gf_cfg_set_key(dasher->dash_ctx, "SegmentsStartTimes", SegmentName, szKey);
 }
 
 
@@ -415,7 +452,7 @@
 
 	u32 subtype = gf_isom_get_media_subtype(movie, track, 1);
 
-	if (subtype==GF_ISOM_SUBTYPE_MPEG4_CRYP) {
+	if (subtype == GF_ISOM_SUBTYPE_MPEG4_CRYP) {
 		GF_Err e;
 		u32 originalFormat=0;
 		if (gf_isom_is_ismacryp_media(movie, track, 1)) {
@@ -425,11 +462,11 @@
 		} else if(gf_isom_is_cenc_media(movie, track, 1)) {
 			e = gf_isom_get_cenc_info(movie, track, 1, &originalFormat, NULL, NULL, NULL);
 		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISOM Tools] Unkown protection scheme type %s\n", gf_4cc_to_str( gf_isom_is_media_encrypted(movie, track, 1)) ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISOM Tools] Unknown protection scheme type %s\n", gf_4cc_to_str( gf_isom_is_media_encrypted(movie, track, 1)) ));
 			e = gf_isom_get_original_format_type(movie, track, 1, &originalFormat);
 		}
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISOM Tools] Error fecthing protection information\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISOM Tools] Error fetching protection information\n"));
 			return e;
 		}
 
@@ -439,48 +476,61 @@
 	switch (subtype) {
 	case GF_ISOM_SUBTYPE_MPEG4:
 		esd = gf_isom_get_esd(movie, track, 1);
-		switch (esd->decoderConfig->streamType) {
-		case GF_STREAM_AUDIO:
-			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-				/*5 first bits of AAC config*/
-				u8 audio_object_type = (esd->decoderConfig->decoderSpecificInfo->data[0] & 0xF8) >> 3;
-#ifndef GPAC_DISABLE_AV_PARSERS
-				if (force_sbr && (audio_object_type==2) ) {
-					GF_M4ADecSpecInfo a_cfg;
-					GF_Err e = gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg);
-					if (e==GF_OK) {
-						if (a_cfg.sbr_sr)
-							audio_object_type = a_cfg.sbr_object_type;
-						if (a_cfg.has_ps)
-							audio_object_type = 29;
+		if (esd && esd->decoderConfig) {
+			switch (esd->decoderConfig->streamType) {
+			case GF_STREAM_AUDIO:
+				if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
+					u8 audio_object_type;
+					if (esd->decoderConfig->decoderSpecificInfo->dataLength < 2) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[RFC6381-AAC] invalid DSI size %u < 2\n", esd->decoderConfig->decoderSpecificInfo->dataLength));
+						return GF_NON_COMPLIANT_BITSTREAM;
+					}
+					/*5 first bits of AAC config*/
+					audio_object_type = (esd->decoderConfig->decoderSpecificInfo->data[0] & 0xF8) >> 3;
+					if (audio_object_type == 31) { /*escape code*/
+						const u8 audio_object_type_ext = ((esd->decoderConfig->decoderSpecificInfo->data[0] & 0x07) << 3) + ((esd->decoderConfig->decoderSpecificInfo->data[1] & 0xE0) >> 5);
+						audio_object_type = 32 + audio_object_type_ext;
+					}
+	#ifndef GPAC_DISABLE_AV_PARSERS
+					if (force_sbr && (audio_object_type==2) ) {
+						GF_M4ADecSpecInfo a_cfg;
+						GF_Err e = gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg);
+						if (e==GF_OK) {
+							if (a_cfg.sbr_sr)
+								audio_object_type = a_cfg.sbr_object_type;
+							if (a_cfg.has_ps)
+								audio_object_type = 29;
+						}
 					}
+	#endif
+					snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4a.%02X.%01d", esd->decoderConfig->objectTypeIndication, audio_object_type);
+				} else {
+					snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4a.%02X", esd->decoderConfig->objectTypeIndication);
 				}
-#endif
-
-				sprintf(szCodec, "mp4a.%02X.%01d", esd->decoderConfig->objectTypeIndication, audio_object_type);
-			} else {
-				sprintf(szCodec, "mp4a.%02X", esd->decoderConfig->objectTypeIndication);
-			}
-			break;
-		case GF_STREAM_VISUAL:
-#ifndef GPAC_DISABLE_AV_PARSERS
-			if (esd->decoderConfig->decoderSpecificInfo) {
-				GF_M4VDecSpecInfo dsi;
-				gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-				sprintf(szCodec, "mp4v.%02X.%01x", esd->decoderConfig->objectTypeIndication, dsi.VideoPL);
-			} else
-#endif
-			{
-				sprintf(szCodec, "mp4v.%02X", esd->decoderConfig->objectTypeIndication);
+				break;
+			case GF_STREAM_VISUAL:
+	#ifndef GPAC_DISABLE_AV_PARSERS
+				if (esd->decoderConfig->decoderSpecificInfo) {
+					GF_M4VDecSpecInfo dsi;
+					gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
+					snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4v.%02X.%01x", esd->decoderConfig->objectTypeIndication, dsi.VideoPL);
+				} else
+	#endif
+				{
+					snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4v.%02X", esd->decoderConfig->objectTypeIndication);
+				}
+				break;
+			default:
+				snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4s.%02X", esd->decoderConfig->objectTypeIndication);
+				break;
 			}
-			break;
-		default:
-			sprintf(szCodec, "mp4s.%02X", esd->decoderConfig->objectTypeIndication);
-			break;
+			gf_odf_desc_del((GF_Descriptor *)esd);
+			return GF_OK;
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[RFC6381] Cannot find ESD. Aborting.\n"));
+			if (esd) gf_odf_desc_del((GF_Descriptor *)esd);
+			return GF_ISOM_INVALID_FILE;
 		}
-		gf_odf_desc_del((GF_Descriptor *)esd);
-		return GF_OK;
-
 	case GF_ISOM_SUBTYPE_AVC_H264:
 	case GF_ISOM_SUBTYPE_AVC2_H264:
 	case GF_ISOM_SUBTYPE_AVC3_H264:
@@ -494,11 +544,10 @@
 				subtype = GF_ISOM_SUBTYPE_AVC4_H264;
 		}
 		if (avcc) {
-			sprintf(szCodec, "%s.%02X%02X%02X", gf_4cc_to_str(subtype), avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%02X%02X%02X", gf_4cc_to_str(subtype), avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
 			gf_odf_avc_cfg_del(avcc);
 			return GF_OK;
-		}
-		else {
+		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Cannot find AVC configuration box"));
 			return GF_ISOM_INVALID_FILE;
 		}
@@ -507,7 +556,7 @@
 		avcc = gf_isom_mvc_config_get(movie, track, 1);
 		if (!avcc) avcc = gf_isom_svc_config_get(movie, track, 1);
 		if (avcc) {
-			sprintf(szCodec, "%s.%02X%02X%02X", gf_4cc_to_str(subtype), avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%02X%02X%02X", gf_4cc_to_str(subtype), avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
 			gf_odf_avc_cfg_del(avcc);
 			return GF_OK;
 		}
@@ -523,7 +572,6 @@
 	case GF_ISOM_SUBTYPE_HVT1:
 	case GF_ISOM_SUBTYPE_LHV1:
 	case GF_ISOM_SUBTYPE_LHE1:
-
 		if (force_inband) {
 			if (subtype==GF_ISOM_SUBTYPE_HVC1) subtype = GF_ISOM_SUBTYPE_HEV1;
 			else if (subtype==GF_ISOM_SUBTYPE_HVC2) subtype = GF_ISOM_SUBTYPE_HEV2;
@@ -535,12 +583,13 @@
 		if (subtype==GF_ISOM_SUBTYPE_HVT1) {
 			u32 refTrack;
 			gf_isom_get_reference(movie, track, GF_ISOM_REF_TBAS, 1, &refTrack);
+			if (hvcc) gf_odf_hevc_cfg_del(hvcc);
 			hvcc = gf_isom_hevc_config_get(movie, refTrack, 1);
 		}
 		if (hvcc) {
 			u8 c;
-			char szTemp[40];
-			sprintf(szCodec, "%s.", gf_4cc_to_str(subtype));
+			char szTemp[RFC6381_CODEC_NAME_SIZE_MAX];
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.", gf_4cc_to_str(subtype));
 			if (hvcc->profile_space==1) strcat(szCodec, "A");
 			else if (hvcc->profile_space==2) strcat(szCodec, "B");
 			else if (hvcc->profile_space==3) strcat(szCodec, "C");
@@ -599,14 +648,93 @@
 
 			gf_odf_hevc_cfg_del(hvcc);
 		} else {
-			sprintf(szCodec, "%s", gf_4cc_to_str(subtype));
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
 		}
 		return GF_OK;
-#endif
+#endif /*GPAC_DISABLE_HEVC*/
+
+#ifndef GPAC_DISABLE_AV1
+	case GF_ISOM_SUBTYPE_AV01: {
+		GF_AV1Config *av1c = NULL;
+		AV1State av1_state;
+		GF_BitStream *bs = NULL;
+		GF_Err e = GF_OK;
+		u32 i = 0;
+
+		memset(&av1_state, 0, sizeof(AV1State));
+		av1c = gf_isom_av1_config_get(movie, track, 1);
+		if (!av1c) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[ISOM Tools] No config found for AV1 file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
+			return GF_BAD_PARAM;
+		}
+		av1_state.config = av1c;
+
+		for (i = 0; i < gf_list_count(av1c->obu_array); ++i) {
+			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_AUTHOR, ("[ISOM Tools] AV1: unexpected obu_type %d when computing RFC6381. 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); bs = NULL;
+			if (e) {
+				gf_odf_av1_cfg_del(av1c);
+				return e;
+			}
+		}
+
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%01u.%02u%c.%02u", gf_4cc_to_str(subtype),
+			av1_state.config->seq_profile, av1_state.config->seq_level_idx_0, av1_state.config->seq_tier_0 ? 'H' : 'M',
+			av1_state.bit_depth);
+
+		/* "All the other fields [...] are optional, mutually inclusive (all or none) fields." https://aomediacodec.github.io/av1-isobmff/ */
+		if (av1_state.color_description_present_flag) {
+			char tmp[RFC6381_CODEC_NAME_SIZE_MAX];
+			snprintf(tmp, RFC6381_CODEC_NAME_SIZE_MAX, "%01u.%01u.%01u.%01u.%01u.%01u%01u%01u",
+				av1_state.config->monochrome,
+				av1_state.config->chroma_subsampling_x, av1_state.config->chroma_subsampling_y,
+				av1_state.config->chroma_subsampling_x && av1_state.config->chroma_subsampling_y ? av1_state.config->chroma_sample_position : 0,
+				av1_state.color_primaries, av1_state.transfer_characteristics, av1_state.matrix_coefficients, av1_state.color_range);
+			strcat(szCodec, tmp);
+		}
+
+		gf_odf_av1_cfg_del(av1c);
+		av1_reset_frame_state(&av1_state.frame_state);
+		return GF_OK;
+	}
+#endif /*GPAC_DISABLE_AV1*/
+
+
+	case GF_ISOM_SUBTYPE_VP08:
+	case GF_ISOM_SUBTYPE_VP09:
+	{
+		GF_VPConfig *vpcc = NULL;
+
+		vpcc = gf_isom_vp_config_get(movie, track, 1);
+		if (!vpcc) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[ISOM Tools] No config found for VP file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
+			return GF_BAD_PARAM;
+		}
+
+		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,
+			vpcc->bit_depth,
+			vpcc->chroma_subsampling,
+			vpcc->colour_primaries,
+			vpcc->transfer_characteristics,
+			vpcc->matrix_coefficients,
+			vpcc->video_fullRange_flag);
+
+
+		gf_odf_vp_cfg_del(vpcc);
+
+		return GF_OK;
+	}
 
 	default:
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[ISOM Tools] codec parameters not known - setting codecs string to default value \"%s\"\n", gf_4cc_to_str(subtype) ));
-		sprintf(szCodec, "%s", gf_4cc_to_str(subtype));
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
 		return GF_OK;
 	}
 	return GF_OK;
@@ -619,23 +747,31 @@
 
 typedef struct
 {
+	/* indicates if the track under fragmentation is the reference for sidx or prft boxes*/
 	Bool is_ref_track;
+
 	Bool done;
 	u32 TrackID;
 	u32 SampleNum, SampleCount;
 	u64 FragmentLength;
 	u32 OriginalTrack;
 	u32 finalSampleDescriptionIndex;
-	u32 TimeScale, MediaType, DefaultDuration;
-	u64 last_sample_cts, next_sample_dts, InitialTSOffset;
+	u32 TimeScale, MediaType, sample_duration;
+	u64 last_sample_cts, next_sample_dts, InitialTSOffset, loop_ts_offset;
 	Bool all_sample_raps, splitable;
+	/* carry of the amount of time of the current sample already used in the previous segment */
 	u32 split_sample_dts_shift;
 	s32 media_time_to_pres_time_shift;
 	u64 min_cts_in_segment;
 	u64 start_tfdt;
+
+	u32 cues_timescale;
+	u32 nb_cues;
+	GF_DASHCueInfo *cues;
+	Bool cues_use_edits;
 } GF_ISOMTrackFragmenter;
 
-static u64 isom_get_next_sap_time(GF_ISOFile *input, u32 track, u32 sample_count, u32 sample_num)
+static u64 isom_get_next_sap_time(GF_ISOFile *input, u32 track, u32 sample_count, u32 sample_num, Bool *is_eos)
 {
 	GF_ISOSample *samp;
 	u64 time;
@@ -653,35 +789,113 @@
 		}
 	}
 	//TRICK: if we don't found next RAP, return time of the last sample in track
-	if (!found_sample)
+	if (!found_sample) {
 		found_sample = sample_count;
+		*is_eos = GF_TRUE;
+	}
 	samp = gf_isom_get_sample_info(input, track, found_sample, NULL, NULL);
 	time = samp->DTS;
 	gf_isom_sample_del(&samp);
 	return time;
 }
 
-static GF_Err gf_isom_write_content_protection(GF_ISOFile *input, FILE *mpd, u32 protected_track, u8 indent)
+static void get_canon_urn(bin128 URN, char *res)
+{
+	char sres[4];
+	u32 i;
+	/* Output canonical UIID form */
+	strcpy(res, "");
+	for (i=0; i<4; i++) { sprintf(sres, "%02x", URN[i]); strcat(res, sres); }
+	strcat(res, "-");
+	for (i=4; i<6; i++) { sprintf(sres, "%02x", URN[i]); strcat(res, sres); }
+	strcat(res, "-");
+	for (i=6; i<8; i++) { sprintf(sres, "%02x", URN[i]); strcat(res, sres); }
+	strcat(res, "-");
+	for (i=8; i<10; i++) { sprintf(sres, "%02x", URN[i]); strcat(res, sres); }
+	strcat(res, "-");
+	for (i=10; i<16; i++) { sprintf(sres, "%02x", URN[i]); strcat(res, sres); }
+}
+
+static const char *get_drm_kms_name(const char *canURN)
+{
+	if (!stricmp(canURN, "67706163-6365-6E63-6472-6D746F6F6C31")) return "GPAC1.0";
+	else if (!stricmp(canURN, "5E629AF5-38DA-4063-8977-97FFBD9902D4")) return "Marlin1.0";
+	else if (!strcmp(canURN, "adb41c24-2dbf-4a6d-958b-4457c0d27b95")) return "MediaAccess3.0";
+	else if (!strcmp(canURN, "A68129D3-575B-4F1A-9CBA-3223846CF7C3")) return "VideoGuard";
+	else if (!strcmp(canURN, "9a04f079-9840-4286-ab92-e65be0885f95")) return "PlayReady";
+	else if (!strcmp(canURN, "9a27dd82-fde2-4725-8cbc-4234aa06ec09")) return "VCAS";
+	else if (!strcmp(canURN, "F239E769-EFA3-4850-9C16-A903C6932EFB")) return "Adobe";
+	else if (!strcmp(canURN, "1f83e1e8-6ee9-4f0d-ba2f-5ec4e3ed1a66")) return "SecureMedia";
+	else if (!strcmp(canURN, "644FE7B5-260F-4FAD-949A-0762FFB054B4")) return "CMLA (OMA DRM)";
+	else if (!strcmp(canURN, "6a99532d-869f-5922-9a91-113ab7b1e2f3")) return "MobiTVDRM";
+	else if (!strcmp(canURN, "35BF197B-530E-42D7-8B65-1B4BF415070F")) return "DivX DRM";
+	else if (!strcmp(canURN, "B4413586-C58C-FFB0-94A5-D4896C1AF6C3")) return "VODRM";
+	else if (!strcmp(canURN, "edef8ba9-79d6-4ace-a3c8-27dcd51d21ed")) return "Widevine";
+	else if (!strcmp(canURN, "80a6be7e-1448-4c37-9e70-d5aebe04c8d2")) return "Irdeto";
+	else if (!strcmp(canURN, "dcf4e3e3-62f1-5818-7ba6-0a6fe33ff3dd")) return "CA 1.0, DRM+ 2.0";
+	else if (!strcmp(canURN, "45d481cb-8fe0-49c0-ada9-ab2d2455b2f2")) return "CoreCrypt";
+	else if (!strcmp(canURN, "616C7469-6361-7374-2D50-726F74656374")) return "altiProtect";
+	else if (!strcmp(canURN, "992c46e6-c437-4899-b6a0-50fa91ad0e39")) return "Arris SecureMedia SteelKnot version 1";
+	else if (!strcmp(canURN, "1077efec-c0b2-4d02-ace3-3c1e52e2fb4b")) return "cenc initData";
+	else if (!strcmp(canURN, "e2719d58-a985-b3c9-781a-b030af78d30e")) return "ClearKey1.0";
+	else if (!strcmp(canURN, "94CE86FB-07FF-4F43-ADB8-93D2FA968CA2")) return "FairPlay";
+	else if (!strcmp(canURN, "279fe473-512c-48fe-ade8-d176fee6b40f")) return "Arris Titanium";
+	else if (!strcmp(canURN, "aa11967f-cc01-4a4a-8e99-c5d3dddfea2d")) return "UDRM";
+	return "unknown";
+}
+
+static GF_Err gf_isom_write_content_protection(GF_ISOFile *input, FILE *mpd, u32 protected_track, GF_DASHSegmenter *dasher, u8 indent)
 {
+	char sCan[40];
 	u32 prot_scheme	= gf_isom_is_media_encrypted(input, protected_track, 1);
 	if (gf_isom_is_cenc_media(input, protected_track, 1)) {
 		bin128 default_KID;
-		u8 i;
-		gf_isom_cenc_get_default_info(input, protected_track, 1, NULL, NULL, &default_KID);
+		u32 i, count;
+		gf_isom_cenc_get_default_info(input, protected_track, 1, NULL, NULL, &default_KID, NULL, NULL, NULL, NULL);
 		for (i=0; i<indent; i++)
 			fprintf(mpd, " ");
-		fprintf(mpd, "<ContentProtection schemeIdUri=\"urn:mpeg:dash:mp4protection:2011\" value=\"%s\" cenc:default_KID=\"", gf_4cc_to_str(prot_scheme) );
-		/* Output canonical UIID form */
-		for (i=0; i<4; i++) fprintf(mpd, "%02x", default_KID[i]);
-		fprintf(mpd, "-");
-		for (i=4; i<6; i++) fprintf(mpd, "%02x", default_KID[i]);
-		fprintf(mpd, "-");
-		for (i=6; i<8; i++) fprintf(mpd, "%02x", default_KID[i]);
-		fprintf(mpd, "-");
-		for (i=8; i<10; i++) fprintf(mpd, "%02x", default_KID[i]);
-		fprintf(mpd, "-");
-		for (i=10; i<16; i++) fprintf(mpd, "%02x", default_KID[i]);
-		fprintf(mpd, "\"/>\n");
+
+		get_canon_urn(default_KID, sCan);
+		fprintf(mpd, "<ContentProtection schemeIdUri=\"urn:mpeg:dash:mp4protection:2011\" value=\"%s\" cenc:default_KID=\"%s\"/>\n", gf_4cc_to_str(prot_scheme), sCan );
+
+		if (dasher->pssh_mode <= GF_DASH_PSSH_MOOF) {
+			return GF_OK;
+		}
+
+		//add pssh
+		count = gf_isom_get_pssh_count(input);
+		for (i=0; i<count; i++) {
+			GF_Err e;
+			u32 j;
+			bin128 sysID;
+			u8 *pssh_data=NULL;
+			u8 *pssh_data_64=NULL;
+			u32 pssh_len, size_64;
+
+			gf_isom_get_pssh_info(input, i+1, sysID, NULL, NULL, NULL, NULL);
+
+			e = gf_isom_get_pssh(input, i+1, &pssh_data, &pssh_len);
+			if (e) continue;
+
+			for (j=0; j<indent; j++)
+				fprintf(mpd, " ");
+			get_canon_urn(sysID, sCan);
+			fprintf(mpd, "<ContentProtection schemeIdUri=\"urn:uuid:%s\" value=\"%s\">\n", sCan, get_drm_kms_name(sCan) );
+
+			size_64 = 2*pssh_len;
+			pssh_data_64 = gf_malloc(size_64);
+			size_64 = gf_base64_encode((const char *)pssh_data, pssh_len, (char *)pssh_data_64, size_64);
+			pssh_data_64[size_64] = 0;
+
+			for (j=0; j<=indent; j++)
+				fprintf(mpd, " ");
+			fprintf(mpd, "<cenc:pssh>%s</cenc:pssh>\n", pssh_data_64);
+			gf_free(pssh_data_64);
+			gf_free(pssh_data);
+			for (j=0; j<indent; j++)
+				fprintf(mpd, " ");
+			fprintf(mpd, "</ContentProtection>\n");
+		}
 	}
 	//todo for ISMA or OMA DRM
 
@@ -692,6 +906,7 @@
 {
 	char szMPDTempLine[2048];
 	u64 segment_dur = segment_end - segment_start;
+
 	if (*previous_segment_duration == segment_dur) {
 		*segment_timeline_repeat_count = *segment_timeline_repeat_count + 1;
 		return;
@@ -716,24 +931,25 @@
 	*segment_timeline_repeat_count = 0;
 }
 
-static void gf_dash_load_segment_timeline(GF_DASHSegmenter *dash_cfg, GF_BitStream *mpd_timeline_bs, const char *representationID, u64 *previous_segment_duration , Bool *first_segment_in_timeline,u32 *segment_timeline_repeat_count)
+static void gf_dash_load_segment_timeline(GF_DASHSegmenter *dasher, GF_BitStream *mpd_timeline_bs, const char *representationID, u64 *previous_segment_duration , Bool *first_segment_in_timeline,u32 *segment_timeline_repeat_count)
 {
 	u32 i, count;
+	u64 scale;
 	char szRepID[100];
 
 	*first_segment_in_timeline = GF_TRUE;
 	*segment_timeline_repeat_count = 0;
 	*previous_segment_duration = 0;
 
-	count = gf_cfg_get_key_count(dash_cfg->dash_ctx, "SegmentsStartTimes");
+	count = gf_cfg_get_key_count(dasher->dash_ctx, "SegmentsStartTimes");
 	for (i=0; i<count; i++) {
 		u64 start, dur;
-		const char *fileName = gf_cfg_get_key_name(dash_cfg->dash_ctx, "SegmentsStartTimes", i);
-		const char *MPDTime = gf_cfg_get_key(dash_cfg->dash_ctx, "SegmentsStartTimes", fileName);
+		const char *fileName = gf_cfg_get_key_name(dasher->dash_ctx, "SegmentsStartTimes", i);
+		const char *MPDTime = gf_cfg_get_key(dasher->dash_ctx, "SegmentsStartTimes", fileName);
 		if (!fileName)
 			break;
 
-		sscanf(MPDTime, ""LLU"-"LLU"@%s", &start, &dur, szRepID);
+		sscanf(MPDTime, ""LLU"-"LLU"-"LLU"@%s", &start, &dur, &scale, szRepID);
 		if (strcmp(representationID, szRepID)) continue;
 
 		gf_dash_append_segment_timeline(mpd_timeline_bs, start, start+dur, previous_segment_duration, first_segment_in_timeline, segment_timeline_repeat_count);
@@ -779,6 +995,16 @@
 		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("DASH input: broken MPEG-4 Track, no ESD found\n"));
 		return GF_OK;
 	}
+	switch (esd->decoderConfig->objectTypeIndication) {
+	case GPAC_OTI_AUDIO_AAC_MPEG4:
+	case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
+	case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
+	case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
+		break;
+	default:
+		gf_odf_desc_del((GF_Descriptor*)esd);
+		return GF_OK;
+	}
 	e = gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg);
 	if (e) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("DASH input: corrupted AAC Config, %s\n", gf_error_to_string(e)));
@@ -825,23 +1051,23 @@
 
 
 
-static GF_Err gf_media_isom_segment_file(GF_ISOFile *input, const char *output_file, GF_DASHSegmenter *dash_cfg, GF_DashSegInput *dash_input, Bool first_in_set)
+static GF_Err isom_segment_file(GF_ISOFile *input, const char *output_file, GF_DASHSegmenter *dasher, GF_DashSegInput *dash_input, Bool first_in_set)
 {
 	u8 NbBits;
-	u32 i, TrackNum, descIndex, j, count, nb_sync, ref_track_id, nb_tracks_done;
-	u32 defaultDuration, defaultSize, defaultDescriptionIndex, defaultRandomAccess, nb_samp, nb_done;
-	u32 nb_video, nb_audio, nb_text, nb_scene, mpd_timescale;
+	u32 i, TrackNum, descIndex, j, count, nb_sync, ref_track_id, nb_tracks_done=0;
+	u32 sample_duration, defaultSize, defaultDescriptionIndex, defaultRandomAccess, nb_samp, nb_done;
+	u32 nb_video, nb_auxv, nb_pict, nb_audio, nb_text, nb_scene, mpd_timescale;
 	u8 defaultPadding;
 	u16 defaultDegradationPriority;
 	GF_Err e;
 	char sOpt[100], sKey[100];
-	char szCodecs[200], szCodec[100];
+	char szCodecs[200], szCodec[RFC6381_CODEC_NAME_SIZE_MAX];
 	u32 cur_seg, fragment_index, max_sap_type;
 	GF_ISOFile *output, *bs_switch_segment;
 	GF_ISOSample *sample, *next;
 	GF_List *fragmenters;
 	u64 MaxFragmentDuration, MaxSegmentDuration, period_duration;
-	Double segment_start_time, SegmentDuration, maxFragDurationOverSegment;
+	Double segment_start_time=0, SegmentDuration, maxFragDurationOverSegment;
 	u64 presentationTimeOffset = 0;
 	Double file_duration, max_segment_duration;
 	u32 nb_segments, width, height, sample_rate, nb_channels, nb_surround, nb_lfe, sar_w, sar_h, fps_num, fps_denum, startNumber;
@@ -850,7 +1076,7 @@
 	u32 index_start_range, index_end_range;
 	Bool force_switch_segment = GF_FALSE;
 	Bool switch_segment = GF_FALSE;
-	Bool split_seg_at_rap = dash_cfg->segments_start_with_rap;
+	Bool split_seg_at_rap = dasher->segments_start_with_rap;
 	Bool split_at_rap = GF_FALSE;
 	Bool has_rap = GF_FALSE;
 	Bool next_sample_rap = GF_FALSE;
@@ -873,7 +1099,7 @@
 	char RepSecName[200];
 	char RepURLsSecName[200];
 	const char *opt;
-	Double max_track_duration = 0;
+	GF_Fraction max_track_duration = {0, 1};
 	Bool bs_switching_is_output = GF_FALSE;
 	Bool store_dash_params = GF_FALSE;
 	Bool dash_moov_setup = GF_FALSE;
@@ -884,23 +1110,29 @@
 	u32 protected_track = 0;
 	Double min_seg_dur, max_seg_dur, total_seg_dur, last_seg_dur;
 	Bool is_bs_switching = GF_FALSE;
-	Bool use_url_template = dash_cfg->use_url_template;
-	const char *seg_rad_name = dash_cfg->seg_rad_name;
-	const char *seg_ext = dash_cfg->seg_ext;
+	Bool use_url_template = dasher->use_url_template;
+	const char *seg_rad_name = dasher->seg_rad_name;
+	const char *seg_ext = dasher->seg_ext;
+	const char *init_seg_ext = dasher->init_seg_ext;
 	const char *bs_switching_segment_name = NULL;
 	u64 generation_start_utc = 0;
 	u64 ntpts = 0;
+	Bool seg_dur_adjusted = GF_FALSE;
+	u32 nb_enc = 0;
+	u32 cue_start = 0;
+	u32 force_timescale = 0;
 	SegmentName[0] = 0;
 	SegmentDuration = 0;
 	nb_samp = 0;
 	fragmenters = NULL;
-	
+
 	if (!dash_input) return GF_BAD_PARAM;
+	if (!init_seg_ext) init_seg_ext = "mp4";
 	if (!seg_ext) seg_ext = "m4s";
 
-	if (dash_cfg->real_time && dash_cfg->dash_ctx) {
+	if (dasher->real_time && dasher->dash_ctx) {
 		u32 sec, frac;
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, "DASH", "GenerationNTP");
+		opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "GenerationNTP");
 		sscanf(opt, "%u:%u", &sec, &frac);
 
 		generation_start_utc = sec - GF_NTP_SEC_1900_TO_1970;
@@ -908,16 +1140,16 @@
 		generation_start_utc += ((u64) frac) * 1000 / 0xFFFFFFFFUL;
 	}
 
-	if (dash_cfg->insert_utc) {
+	if (dasher->insert_utc) {
 		ntpts = gf_net_get_ntp_ts();
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Sampling NTP TS "LLU" at "LLU" us, at UTC "LLU"\n", ntpts, gf_sys_clock_high_res(), gf_net_get_utc()));
 	}
 
 	bs_switch_segment = NULL;
-	if (dash_cfg->bs_switch_segment_file) {
-		bs_switch_segment = gf_isom_open(dash_cfg->bs_switch_segment_file, GF_ISOM_OPEN_READ, NULL);
+	if (dasher->bs_switch_segment_file) {
+		bs_switch_segment = gf_isom_open(dasher->bs_switch_segment_file, GF_ISOM_OPEN_READ, NULL);
 		if (bs_switch_segment) {
-			bs_switching_segment_name = gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->bs_switch_segment_file);
+			bs_switching_segment_name = gf_dasher_strip_output_dir(dasher->mpd_name, dasher->bs_switch_segment_file);
 			is_bs_switching = GF_TRUE;
 		}
 	}
@@ -947,59 +1179,62 @@
 		bandwidth = (u32) (gf_isom_get_file_size(input) / file_duration * 8);
 	}
 
-	if (dash_cfg->dash_ctx) {
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "Setup");
+	if (dasher->dash_ctx) {
+		opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "Setup");
 		if (!opt || stricmp(opt, "yes") ) {
 			store_dash_params=GF_TRUE;
-			gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "ID", dash_input->representationID);
+			gf_cfg_set_key(dasher->dash_ctx, RepSecName, "ID", dash_input->representationID);
 		}
 	}
 
-	opt = dash_cfg->dash_ctx ? gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "InitializationSegment") : NULL;
+	opt = dasher->dash_ctx ? gf_cfg_get_key(dasher->dash_ctx, RepSecName, "InitializationSegment") : NULL;
 	if (opt) {
-		output = gf_isom_open(opt, GF_ISOM_OPEN_CAT_FRAGMENTS, dash_cfg->tmpdir);
+		output = gf_isom_open(opt, GF_ISOM_OPEN_CAT_FRAGMENTS, dasher->tmpdir);
 		dash_moov_setup = GF_TRUE;
 	} else {
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, dash_input->representationID, dash_input->nb_baseURL ? dash_input->baseURL[0] : NULL, seg_rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, bandwidth, 0, dash_cfg->use_segment_timeline);
-		output = gf_isom_open(SegmentName, GF_ISOM_OPEN_WRITE, dash_cfg->tmpdir);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, dash_input->representationID, dash_input->nb_baseURL ? dash_input->baseURL[0] : NULL, seg_rad_name, !stricmp(init_seg_ext, "null") ? NULL : init_seg_ext, 0, bandwidth, 0, dasher->use_segment_timeline);
+		output = gf_isom_open(SegmentName, GF_ISOM_OPEN_WRITE, dasher->tmpdir);
 	}
 	if (!output) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISOBMF DASH] Cannot open %s for writing\n", opt ? opt : SegmentName));
 		e = gf_isom_last_error(NULL);
 		goto err_exit;
 	}
+	else if (dasher->force_test_mode) {
+		gf_isom_no_version_date_info(output, 1);
+	}
 
 	if (store_dash_params) {
 		const char *name;
 
-		if (!gf_cfg_get_key(dash_cfg->dash_ctx, "DASH", "SegmentTemplate"))
-			gf_cfg_set_key(dash_cfg->dash_ctx, "DASH", "SegmentTemplate", seg_rad_name);
-		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "Source", gf_isom_get_filename(input) );
+		if (!gf_cfg_get_key(dasher->dash_ctx, "DASH", "SegmentTemplate"))
+			gf_cfg_set_key(dasher->dash_ctx, "DASH", "SegmentTemplate", seg_rad_name);
+		gf_cfg_set_key(dasher->dash_ctx, RepSecName, "Source", gf_isom_get_filename(input) );
 
-		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "Setup", "yes");
+		gf_cfg_set_key(dasher->dash_ctx, RepSecName, "Setup", "yes");
 		name = SegmentName;
 		if (bs_switch_segment) name = gf_isom_get_filename(bs_switch_segment);
-		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "InitializationSegment", name);
+		gf_cfg_set_key(dasher->dash_ctx, RepSecName, "InitializationSegment", name);
 
 		/*store BS flag per rep - it should be stored per adaptation set but we dson't have a key for adaptation sets right now*/
 		if (/*first_in_set && */ is_bs_switching)
-			gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "BitstreamSwitching", "yes");
-	} else if (dash_cfg->dash_ctx) {
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "BitstreamSwitching");
+			gf_cfg_set_key(dasher->dash_ctx, RepSecName, "BitstreamSwitching", "yes");
+	} else if (dasher->dash_ctx) {
+		opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "BitstreamSwitching");
 		if (opt && !strcmp(opt, "yes")) {
 			is_bs_switching = GF_TRUE;
 			if (bs_switch_segment)
 				gf_isom_delete(bs_switch_segment);
 			bs_switch_segment = output;
 			bs_switching_is_output = GF_TRUE;
-			bs_switching_segment_name = gf_dasher_strip_output_dir(dash_cfg->mpd_name, gf_isom_get_filename(bs_switch_segment));
+			bs_switching_segment_name = gf_dasher_strip_output_dir(dasher->mpd_name, gf_isom_get_filename(bs_switch_segment));
 		}
 
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "Bandwidth");
+		opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "Bandwidth");
 		if (opt) sscanf(opt, "%u", &bandwidth);
 
-		if (dash_cfg->use_segment_timeline) {
-			opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "NbSegmentsRemoved");
+		if (dasher->use_segment_timeline) {
+			opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "NbSegmentsRemoved");
 			if (opt) {
 				u32 nb_removed = atoi(opt);
 				startNumber = 1 + nb_removed;
@@ -1009,13 +1244,13 @@
 
 	mpd_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	//if segment alignment not set or if first in AS, create SegmentTimeline
-	if (dash_cfg->use_segment_timeline && (first_in_set || dash_cfg->segment_alignment_disabled) ) {
+	if (dasher->use_segment_timeline && (first_in_set || dasher->segment_alignment_disabled) ) {
 		mpd_timeline_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		sprintf(szMPDTempLine, " <SegmentTimeline>\n");
 		gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
 
-		if (dash_cfg->dash_ctx) {
-			gf_dash_load_segment_timeline(dash_cfg, mpd_timeline_bs, dash_input->representationID, &previous_segment_duration, &first_segment_in_timeline, &segment_timeline_repeat_count);
+		if (dasher->dash_ctx) {
+			gf_dash_load_segment_timeline(dasher, mpd_timeline_bs, dash_input->representationID, &previous_segment_duration, &first_segment_in_timeline, &segment_timeline_repeat_count);
 		}
 	}
 
@@ -1030,7 +1265,7 @@
 		char *virtual_url;
 		FILE *vseg;
 		GF_BitStream *bs;
-		gf_media_get_rfc_6381_codec_name(input, dash_input->trackNum , szCodec, dash_cfg->inband_param_set, GF_TRUE);
+		gf_media_get_rfc_6381_codec_name(input, dash_input->trackNum, szCodec, dasher->inband_param_set, GF_TRUE);
 		if (strlen(szCodecs)) strcat(szCodecs, ",");
 		strcpy(szCodecs, szCodec);
 
@@ -1039,10 +1274,10 @@
 		vseg = gf_fopen(virtual_url, "w");
 		bs = gf_bs_from_file(vseg, GF_BITSTREAM_WRITE);
 		gf_bs_write_u32(bs, 20);
-		gf_bs_write_u32(bs, GF_4CC('s','t','y','p'));
-		gf_bs_write_u32(bs, GF_4CC('m','s','d','h'));
+		gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_STYP);
+		gf_bs_write_u32(bs, GF_ISOM_BRAND_MSDH);
 		gf_bs_write_u32(bs, 0);
-		gf_bs_write_u32(bs, GF_4CC('m','s','d','h'));
+		gf_bs_write_u32(bs, GF_ISOM_BRAND_MSDH);
 		gf_bs_del(bs);
 		gf_fclose(vseg);
 
@@ -1054,32 +1289,40 @@
 #endif
 
 	if (! dash_moov_setup) {
-		e = gf_isom_clone_movie(input, output, GF_FALSE, GF_FALSE, !dash_cfg->pssh_moof );
+		Bool keep_pssh = GF_FALSE;
+		if ((dasher->pssh_mode==GF_DASH_PSSH_MOOV) || (dasher->pssh_mode==GF_DASH_PSSH_MOOV_MPD))
+			keep_pssh = GF_TRUE;
+		e = gf_isom_clone_movie(input, output, GF_FALSE, GF_FALSE, keep_pssh, dasher->mvex_after_traks);
 		if (e) goto err_exit;
 
-		/*because of movie fragments MOOF based offset, ISOM <4 is forbidden*/
-		gf_isom_set_brand_info(output, GF_4CC('i','s','o','5'), 1);
-		gf_isom_modify_alternate_brand(output, GF_4CC('i','s','o','m'), 0);
-		gf_isom_modify_alternate_brand(output, GF_4CC('i','s','o','1'), 0);
-		gf_isom_modify_alternate_brand(output, GF_4CC('i','s','o','2'), 0);
-		gf_isom_modify_alternate_brand(output, GF_4CC('i','s','o','3'), 0);
+		/*because of movie fragments MOOF based offset, brand <= ISO4 is forbidden*/
+		/*because of tfdt in traf, brand <= ISO5 is forbidden*/
+		gf_isom_set_brand_info(output, GF_ISOM_BRAND_ISO6, 1);
+		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_ISOM, 0);
+		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_ISO1, 0);
+		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_ISO2, 0);
+		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_ISO3, 0);
+		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_ISO4, 0);
+		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_ISO5, 0);
+		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_AVC1, 0);
 		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_MP41, 0);
 		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_MP42, 0);
 
+		gf_isom_remove_root_od(output);
 	}
 
-	MaxFragmentDuration = (u32) (dash_cfg->dash_scale * dash_cfg->fragment_duration);
-	MaxSegmentDuration = (u32) (dash_cfg->dash_scale * dash_cfg->segment_duration);
+	MaxFragmentDuration = (u32) (dasher->dash_scale * dasher->fragment_duration);
+	MaxSegmentDuration = (u32) (dasher->dash_scale * dasher->segment_duration);
 
 	/*in single segment mode, only one big SIDX is written between the end of the moov and the first fragment.
 	To speed-up writing, we do a first fragmentation pass without writing any sample to compute the number of segments and fragments per segment
 	in order to allocate / write to file the sidx before the fragmentation. The sidx will then be rewritten when closing the last segment*/
-	if (dash_cfg->single_file_mode==1) {
+	if (dasher->single_file_mode==1) {
 		simulation_pass = GF_TRUE;
 		seg_rad_name = NULL;
 	}
 	/*if single file is requested, store all segments in the same file*/
-	else if (dash_cfg->single_file_mode==2) {
+	else if (dasher->single_file_mode==2) {
 		seg_rad_name = NULL;
 	}
 
@@ -1091,11 +1334,11 @@
 	langCode = NULL;
 
 
-	mpd_timescale = nb_video = nb_audio = nb_text = nb_scene = 0;
+	mpd_timescale = nb_video = nb_auxv = nb_pict = nb_audio = nb_text = nb_scene = 0;
 	//duplicates all tracks
 	for (i=0; i<gf_isom_get_track_count(input); i++) {
-		u32 _w, _h, _sr, _nb_ch, vidtype;
-
+		u32 _w, _h, _nb_ch, vidtype;
+		u32 _sr = 0;
 		u32 mtype = gf_isom_get_media_type(input, i+1);
 		if (mtype == GF_ISOM_MEDIA_HINT) continue;
 
@@ -1106,13 +1349,18 @@
 			continue;
 
 		if (!dash_moov_setup) {
-			e = gf_isom_clone_track(input, i+1, output, GF_FALSE, &TrackNum);
+
+			if (!force_timescale && dash_input->sscale) {
+				force_timescale = gf_isom_get_media_timescale(input, i+1);
+			}
+
+			e = gf_isom_clone_track(input, i+1, output, 0, &TrackNum);
 			if (e) goto err_exit;
 
 			if (gf_isom_is_track_in_root_od(input, i+1)) gf_isom_add_track_to_root_od(output, TrackNum);
 
 			/*remove sgpd in stbl; it would be in traf*/
-			if (dash_cfg->samplegroups_in_traf) {
+			if (dasher->samplegroups_in_traf) {
 				GF_TrackBox *trak = (GF_TrackBox *)gf_isom_get_track_from_file(output, TrackNum);
 				if (!trak) continue;
 				while (gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription)) {
@@ -1121,6 +1369,9 @@
 					gf_list_rem(trak->Media->information->sampleTable->sampleGroupsDescription, 0);
 				}
 			}
+			if (dash_input->bandwidth) {
+				gf_isom_update_bitrate(output, TrackNum, 0, dash_input->bandwidth, dash_input->bandwidth, 0);
+			}
 
 // Commenting it the code for Timed Text tracks, it may happen that we have only one long sample, fragmentation is useful
 #if 0
@@ -1138,34 +1389,41 @@
 			TrackNum = gf_isom_get_track_by_id(output, gf_isom_get_track_id(input, i+1));
 		}
 
-		/*set extraction mode whether setup or not*/
-		vidtype = gf_isom_get_avc_svc_type(input, i+1, 1);
-		if (vidtype==GF_ISOM_AVCTYPE_AVC_ONLY) {
-			/*for AVC we concatenate SPS/PPS unless SVC base*/
-			if (!dash_input->trackNum && dash_cfg->inband_param_set && !dash_input->disable_inband_param_set)
-				gf_isom_set_nalu_extract_mode(input, i+1, GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
-		}
-		else if (vidtype > GF_ISOM_AVCTYPE_AVC_ONLY) {
-			/*for SVC we don't want any rewrite of extractors, and we don't concatenate SPS/PPS*/
-			gf_isom_set_nalu_extract_mode(input, i+1, GF_ISOM_NALU_EXTRACT_INSPECT);
-		}
+		//if encrypted, do not touch the media
+		if (!gf_isom_is_media_encrypted(input, i+1, 1)) {
+			/*set extraction mode whether setup or not*/
+			vidtype = gf_isom_get_avc_svc_type(input, i+1, 1);
+			if (vidtype==GF_ISOM_AVCTYPE_AVC_ONLY) {
+				/*for AVC we concatenate SPS/PPS unless SVC base*/
+				if (!dash_input->trackNum && dasher->inband_param_set && !dash_input->disable_inband_param_set)
+					gf_isom_set_nalu_extract_mode(input, i+1, GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
+			}
+			else if (vidtype > GF_ISOM_AVCTYPE_AVC_ONLY) {
+				/*for SVC we don't want any rewrite of extractors, and we don't concatenate SPS/PPS*/
+				gf_isom_set_nalu_extract_mode(input, i+1, GF_ISOM_NALU_EXTRACT_INSPECT);
+			}
 
-		vidtype = gf_isom_get_hevc_lhvc_type(input, i+1, 1);
-		if (vidtype == GF_ISOM_HEVCTYPE_HEVC_ONLY) {
+			vidtype = gf_isom_get_hevc_lhvc_type(input, i+1, 1);
+			if (vidtype == GF_ISOM_HEVCTYPE_HEVC_ONLY) {
 
-			u32 mode = GF_ISOM_NALU_EXTRACT_INSPECT;	//because of tile tracks
+				u32 mode = GF_ISOM_NALU_EXTRACT_INSPECT;	//because of tile tracks
 
-			/*concatenate SPS/PPS unless LHVC base*/
-			if (!dash_input->trackNum && dash_cfg->inband_param_set && !dash_input->disable_inband_param_set)
-				mode |= GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG;
+				/*concatenate SPS/PPS unless LHVC base*/
+				if (!dash_input->trackNum && dasher->inband_param_set && !dash_input->disable_inband_param_set)
+					mode |= GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG;
 
-			gf_isom_set_nalu_extract_mode(input, i+1, mode);
-		}
-		else if (vidtype > GF_ISOM_HEVCTYPE_HEVC_ONLY) {
-			gf_isom_set_nalu_extract_mode(input, i+1, GF_ISOM_NALU_EXTRACT_INSPECT);
+				gf_isom_set_nalu_extract_mode(input, i+1, mode);
+			}
+			else if (vidtype > GF_ISOM_HEVCTYPE_HEVC_ONLY) {
+				gf_isom_set_nalu_extract_mode(input, i+1, GF_ISOM_NALU_EXTRACT_INSPECT);
+			}
+		} else {
+			nb_enc ++;
 		}
 
 		if (mtype == GF_ISOM_MEDIA_VISUAL) nb_video++;
+ else if (mtype == GF_ISOM_MEDIA_AUXV) nb_auxv++;
+ else if (mtype == GF_ISOM_MEDIA_PICT) nb_pict++;
 		else if (mtype == GF_ISOM_MEDIA_AUDIO) nb_audio++;
 		else if (mtype == GF_ISOM_MEDIA_TEXT || mtype == GF_ISOM_MEDIA_MPEG_SUBT || mtype == GF_ISOM_MEDIA_SUBT) nb_text++;
 		else if (mtype == GF_ISOM_MEDIA_SCENE) nb_scene++;
@@ -1175,24 +1433,22 @@
 		if (! dash_moov_setup) {
 			//new initialization segment, setup fragmentation
 			gf_isom_get_fragment_defaults(input, i+1,
-			 &defaultDuration, &defaultSize, &defaultDescriptionIndex,
+			 &sample_duration, &defaultSize, &defaultDescriptionIndex,
 			 &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
-			if (! dash_cfg->no_fragments_defaults) {
-				e = gf_isom_setup_track_fragment(output, gf_isom_get_track_id(output, TrackNum),
-				 defaultDescriptionIndex, defaultDuration,
-				 defaultSize, (u8) defaultRandomAccess,
-				 defaultPadding, defaultDegradationPriority);
 
-			} else {
-				e = gf_isom_setup_track_fragment(output, gf_isom_get_track_id(output, TrackNum), defaultDescriptionIndex, 0, 0, 0, 0, 0);
-			}
+			e = gf_isom_setup_track_fragment(output, gf_isom_get_track_id(output, TrackNum),
+											 defaultDescriptionIndex, sample_duration,
+											 defaultSize, (u8) defaultRandomAccess,
+											 defaultPadding, defaultDegradationPriority,
+											 dasher->no_fragments_defaults ? 1 : 0);
+
 			if (e) goto err_exit;
 		} else {
 			gf_isom_get_fragment_defaults(output, TrackNum,
-			 &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
+			 &sample_duration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
 		}
 
-		gf_media_get_rfc_6381_codec_name(input, i+1, szCodec, dash_cfg->inband_param_set, GF_TRUE);
+		gf_media_get_rfc_6381_codec_name(input, i+1, szCodec, dasher->inband_param_set, GF_TRUE);
 		if (strlen(szCodecs)) strcat(szCodecs, ",");
 		strcat(szCodecs, szCodec);
 
@@ -1202,13 +1458,19 @@
 		tf->OriginalTrack = i+1;
 		tf->TimeScale = gf_isom_get_media_timescale(input, i+1);
 		tf->MediaType = gf_isom_get_media_type(input, i+1);
-		tf->DefaultDuration = defaultDuration;
+		tf->sample_duration = sample_duration;
 		mpd_timescale = tf->TimeScale;
+		gf_isom_enable_raw_pack(input, i+1, 2048);
 
-		if (max_track_duration < gf_isom_get_track_duration(input, i+1)) {
-			max_track_duration = (Double) gf_isom_get_track_duration(input, i+1);
+		if ( (max_track_duration.num / max_track_duration.den) < gf_isom_get_track_duration(input, i+1)) {
+			max_track_duration.num = gf_isom_get_track_duration(input, i+1);
+			max_track_duration.den = 1;
 		}
 
+		/* We set the reference track (for use in the sidx or prft) to be the track that has the greatest number of sync samples,
+		 but not all of them. E.g. in audio+video we want the video to be used
+		 if for all tracks all samples are sync, we will pick anyone (see below)
+		 NOTE: This might be problematic if the file has multiple video tracks that are not sync sample aligned */
 		if (gf_isom_get_sync_point_count(input, i+1)>nb_sync) {
 			tfref = tf;
 			nb_sync = gf_isom_get_sync_point_count(input, i+1);
@@ -1218,6 +1480,12 @@
 
 		tf->finalSampleDescriptionIndex = 1;
 
+		if (dasher->cues_file) {
+			e = gf_mpd_load_cues(dasher->cues_file, tf->TrackID, &tf->cues_timescale, &tf->cues_use_edits, &tf->cues, &tf->nb_cues);
+			if (e) goto err_exit;
+		}
+
+
 		/*figure out if we have an initial TS*/
 		if (!dash_moov_setup) {
 			u32 j, edit_count = gf_isom_get_edit_segment_count(input, i+1);
@@ -1247,13 +1515,13 @@
 				tf->media_time_to_pres_time_shift += (u32) (scale*SegDuration);
 			}
 
-			gf_isom_set_brand_info(output, GF_4CC('i','s','o','5'), 1);
+			gf_isom_set_brand_info(output, GF_ISOM_BRAND_ISO6, 1);
 
 			/*DASH self-init media segment*/
-			if (dash_cfg->single_file_mode==1) {
-				gf_isom_modify_alternate_brand(output, GF_4CC('d','s','m','s'), 1);
+			if (dasher->single_file_mode==1) {
+				gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_DSMS, 1);
 			} else {
-				gf_isom_modify_alternate_brand(output, GF_4CC('d','a','s','h'), 1);
+				gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_DASH, 1);
 			}
 
 			/*locate sample description in list if given*/
@@ -1274,11 +1542,11 @@
 				/*otherwise override the fragment defauls so that we are consistent with the shared init segment*/
 				else {
 					e = gf_isom_get_fragment_defaults(bs_switch_segment, sample_descs_track,
-					 &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
+					 &sample_duration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
 					if (e) goto err_exit;
 
 					e = gf_isom_change_track_fragment_defaults(output, tf->TrackID,
-					 defaultDescriptionIndex, defaultDuration, defaultSize, defaultRandomAccess, defaultPadding, defaultDegradationPriority);
+					 defaultDescriptionIndex, sample_duration, defaultSize, defaultRandomAccess, defaultPadding, defaultDegradationPriority, dasher->no_fragments_defaults);
 					if (e) goto err_exit;
 				}
 
@@ -1309,7 +1577,7 @@
 		else {
 			char *opt, sKey[100];
 			sprintf(sKey, "TKID_%d_NextDecodingTime", tf->TrackID);
-			opt = (char *)gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, sKey);
+			opt = (char *)gf_cfg_get_key(dasher->dash_ctx, RepSecName, sKey);
 			if (opt) sscanf(opt, LLU, & tf->InitialTSOffset);
 
 			/*store presentationTimeOffset on the first rep*/
@@ -1326,6 +1594,8 @@
 		case GF_ISOM_MEDIA_MPEG_SUBT:
 			gf_isom_get_media_language(input, i+1, &langCode);
 		case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
 		case GF_ISOM_MEDIA_SCENE:
 		case GF_ISOM_MEDIA_DIMS:
 			e = gf_isom_get_visual_info(input, i+1, 1, &_w, &_h);
@@ -1339,11 +1609,12 @@
 			break;
 		case GF_ISOM_MEDIA_AUDIO:
 			//DASH-IF and MPEG disagree here:
-			if (dash_cfg->profile == GF_DASH_PROFILE_AVC264_LIVE || dash_cfg->profile == GF_DASH_PROFILE_AVC264_ONDEMAND)
+			if (dasher->profile == GF_DASH_PROFILE_AVC264_LIVE || dasher->profile == GF_DASH_PROFILE_AVC264_ONDEMAND)
 			{
 				isom_get_audio_info_with_m4a_sbr_ps(input, i+1, 1, &_sr, &_nb_ch, NULL);
 			}
 			else {
+				gf_isom_get_audio_info(input, i+1, 1, &_sr, &_nb_ch, NULL);
 				isom_get_audio_info_with_m4a_sbr_ps(input, i+1, 1, NULL, &_nb_ch, NULL);
 			}
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -1367,7 +1638,7 @@
 			break;
 		}
 
-		if (mtype==GF_ISOM_MEDIA_VISUAL) {
+		if (gf_isom_is_video_subtype(mtype) ) {
 			/*get duration of 2nd sample*/
 			u32 sample_dur = gf_isom_get_sample_duration(input, i+1, 2);
 			gf_isom_get_pixel_aspect_ratio(input, i+1, 1, &sar_w, &sar_h);
@@ -1394,10 +1665,16 @@
 		nb_samp += tf->SampleCount;
 	}
 
+	if (!nb_enc) {
+		gf_isom_remove_pssh_box(output);
+	}
+
 	if (gf_list_count(fragmenters)>1)
 		mpd_timescale = 1000;
 
+	/* Finalize the selection of the reference track for sidx computations */
 	if (!tfref) {
+		/* if we did not find a track in which all samples are not sync samples, we pick the first track to be the reference */
 		tfref = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, 0);
 		assert(tfref);
 	} else {
@@ -1405,22 +1682,23 @@
 		gf_list_del_item(fragmenters, tfref);
 		gf_list_insert(fragmenters, tfref, 0);
 	}
-
 	tfref->is_ref_track = GF_TRUE;
 	tfref_timescale = tfref->TimeScale;
 	ref_track_id = tfref->TrackID;
 	if (tfref->all_sample_raps)
 		split_seg_at_rap = GF_TRUE;
 
-
 	if (!dash_moov_setup) {
-		max_track_duration /= gf_isom_get_timescale(input);
-		max_track_duration *= gf_isom_get_timescale(output);
-		gf_isom_set_movie_duration(output, (u64) max_track_duration);
+		max_track_duration.den *= gf_isom_get_timescale(input);
+		max_track_duration.num *= gf_isom_get_timescale(output);
+		gf_isom_set_movie_duration(output, max_track_duration.num / max_track_duration.den );
 	}
 
 	//if single segment, add msix brand if we use indexes
-	gf_isom_modify_alternate_brand(output, GF_4CC('m','s','i','x'), ((dash_cfg->single_file_mode==1) && dash_cfg->enable_sidx) ? 1 : 0);
+	gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_MSIX, ((dasher->single_file_mode==1) && dasher->enable_sidx) ? 1 : 0);
+
+	if (force_timescale)
+		gf_isom_set_timescale(output, force_timescale);
 
 	//flush movie
 	e = gf_isom_finalize_for_fragment(output, 1);
@@ -1430,7 +1708,7 @@
 	for (i=0; i<gf_list_count(fragmenters); i++) {
 		tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
 		if (tf->SampleCount)
-			nb_done += tf->SampleCount - tf->SampleNum - 1;
+			nb_done += tf->SampleCount - tf->SampleNum;
 	}
 	if (!nb_done) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] No samples in movie, rewriting moof and exit\n"));
@@ -1441,17 +1719,32 @@
 	file_size = gf_isom_get_file_size(bs_switch_segment ? bs_switch_segment : output);
 	init_seg_size = file_size;
 
-	if (dash_cfg->dash_ctx) {
+	if (dasher->dash_ctx) {
 		if (store_dash_params) {
 			char szVal[1024];
 			sprintf(szVal, LLU, init_seg_size);
-			gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "InitializationSegmentSize", szVal);
+			gf_cfg_set_key(dasher->dash_ctx, RepSecName, "InitializationSegmentSize", szVal);
 		} else {
-			const char *opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "InitializationSegmentSize");
+			const char *opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "InitializationSegmentSize");
 			if (opt) init_seg_size = atoi(opt);
 		}
 	}
 
+	max_sap_type = 0;
+	if (dasher->force_session_end) {
+		if (dasher->dash_ctx) {
+			opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "MaxSAPType");
+			if (opt) max_sap_type = atoi(opt);
+			else {
+				opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "PrevPeriodMaxSAPType");
+				if (opt) max_sap_type = atoi(opt);
+			}
+		}
+
+		goto write_rep_only;
+	}
+
+
 restart_fragmentation_pass:
 
 	for (i=0; i<gf_list_count(fragmenters); i++) {
@@ -1472,7 +1765,7 @@
 	cur_seg = 1;
 	fragment_index = 1;
 	if (dash_input->moof_seqnum_increase) {
-		fragment_index = dash_input->moof_seqnum_increase * dash_input->idx_representations + 1;
+		fragment_index = dash_input->idx_representations + 1;
 	}
 	period_duration = 0;
 	split_at_rap = GF_FALSE;
@@ -1484,55 +1777,59 @@
 	ref_track_next_cts = 0;
 
 	/*setup previous URL list*/
-	if (dash_cfg->dash_ctx) {
+	if (dasher->dash_ctx) {
 		const char *opt;
 		char sKey[100];
-		count = gf_cfg_get_key_count(dash_cfg->dash_ctx, RepURLsSecName);
+		count = gf_cfg_get_key_count(dasher->dash_ctx, RepURLsSecName);
 		for (i=0; i<count; i++) {
-			const char *key_name = gf_cfg_get_key_name(dash_cfg->dash_ctx, RepURLsSecName, i);
-			opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepURLsSecName, key_name);
-			sprintf(szMPDTempLine, " %s\n", opt);
+			const char *key_name = gf_cfg_get_key_name(dasher->dash_ctx, RepURLsSecName, i);
+			opt = gf_cfg_get_key(dasher->dash_ctx, RepURLsSecName, key_name);
+			sprintf(szMPDTempLine, " %s\n", opt);
 			gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
 		}
 
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "NextSegmentIndex");
+		opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "NextSegmentIndex");
 		if (opt) {
 			cur_seg = atoi(opt);
 		}
 
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "NextFragmentIndex");
+		opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "NextFragmentIndex");
 		if (opt) fragment_index = atoi(opt);
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "CumulatedDuration");
+		opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "CumulatedDuration");
 		if (opt) sscanf(opt, LLU, &period_duration);
 
 		for (i=0; i<gf_list_count(fragmenters); i++) {
 			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
 			sprintf(sKey, "TKID_%d_NextSampleNum", tf->TrackID);
-			opt = (char *)gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, sKey);
+			opt = (char *)gf_cfg_get_key(dasher->dash_ctx, RepSecName, sKey);
 			if (opt) tf->SampleNum = atoi(opt);
 
 			sprintf(sKey, "TKID_%d_LastSampleCTS", tf->TrackID);
-			opt = (char *)gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, sKey);
+			opt = (char *)gf_cfg_get_key(dasher->dash_ctx, RepSecName, sKey);
 			if (opt) sscanf(opt, LLU, &tf->last_sample_cts);
 
 			sprintf(sKey, "TKID_%d_NextSampleDTS", tf->TrackID);
-			opt = (char *)gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, sKey);
+			opt = (char *)gf_cfg_get_key(dasher->dash_ctx, RepSecName, sKey);
 			if (opt) {
 				sscanf(opt, LLU, &tf->next_sample_dts);
 			}
 
 			sprintf(sKey, "TKID_%d_MediaTimeToPresTime", tf->TrackID);
-			opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, sKey);
+			opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, sKey);
 			if (opt) tf->media_time_to_pres_time_shift = atoi(opt);
 
-			if (dash_cfg->nb_secs_to_discard) {
+			sprintf(sKey, "TKID_%d_LoopTSOffset", tf->TrackID);
+			opt = (char *)gf_cfg_get_key(dasher->dash_ctx, RepSecName, sKey);
+			if (opt) sscanf(opt, LLU, &tf->loop_ts_offset);
+
+			if (dasher->nb_secs_to_discard) {
 				GF_ISOSample *sample = gf_isom_get_sample_info(input, tf->OriginalTrack, tf->SampleCount, &descIndex, NULL);
 				u32 last_sample_dur = gf_isom_get_sample_duration(input, tf->OriginalTrack, tf->SampleCount);
 				u64 track_dur = (u64) ((s64) last_sample_dur + sample->DTS + sample->CTS_Offset + tf->media_time_to_pres_time_shift);
-				u64 pos = dash_cfg->nb_secs_to_discard;
-				u64 period_dur = track_dur * dash_cfg->dash_scale / tf->TimeScale;
-				u32 nb_seg_in_track = (u32) ( period_dur / (dash_cfg->segment_duration * dash_cfg->dash_scale) );
-				if (nb_seg_in_track * dash_cfg->segment_duration * dash_cfg->dash_scale < period_dur)
+				u64 pos = dasher->nb_secs_to_discard;
+				u64 period_dur = track_dur * dasher->dash_scale / tf->TimeScale;
+				u32 nb_seg_in_track = (u32) ( period_dur / (dasher->segment_duration * dasher->dash_scale) );
+				if (nb_seg_in_track * dasher->segment_duration * dasher->dash_scale < period_dur)
 					nb_seg_in_track++;
 				pos *= tf->TimeScale;
 				while (1) {
@@ -1546,12 +1843,12 @@
 
 				sprintf(sKey, "TKID_%d_NextDecodingTime", tf->TrackID);
 				sprintf(sOpt, LLU, tf->InitialTSOffset);
-				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, sKey, sOpt);
+				gf_cfg_set_key(dasher->dash_ctx, RepSecName, sKey, sOpt);
 			}
 		}
 	}
 
-	gf_isom_set_next_moof_number(output, dash_cfg->initial_moof_sn + fragment_index);
+	gf_isom_set_next_moof_number(output, dasher->initial_moof_sn + fragment_index);
 
 
 	max_segment_duration = 0;
@@ -1559,13 +1856,15 @@
 
 	while ( (count = gf_list_count(fragmenters)) ) {
 		Bool store_pssh = GF_FALSE;
+		u32 ref_SAP_type = 0;
+		u32 ref_start_SAP_type = 0;
 #ifdef GENERATE_VIRTUAL_REP_SRD
 		if (dash_input->virtual_representation)
 			break;
 #endif
 
 		if (switch_segment) {
-			if (dash_cfg->subduration && (segment_start_time + MaxSegmentDuration/2 >= dash_cfg->dash_scale * dash_cfg->subduration)) {
+			if (dasher->subduration && (segment_start_time + MaxSegmentDuration/2 >= dasher->dash_scale * dasher->subduration)) {
 				/*done with file (next segment will exceed of more than half the requested subduration : store all fragmenters state and abord*/
 				break;
 			}
@@ -1582,35 +1881,44 @@
 			} else {
 				start_range = gf_isom_get_file_size(output);
 				if (seg_rad_name) {
-					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, is_bs_switching, SegmentName, output_file, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, seg_rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, period_duration + (u64)segment_start_time, bandwidth, cur_seg, dash_cfg->use_segment_timeline);
-					e = gf_isom_start_segment(output, SegmentName, dash_cfg->fragments_in_memory);
+					u64 s_start = (u64)( (period_duration + (u64)segment_start_time) * mpd_timescale );
+					s_start /= dasher->dash_scale;
+
+					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, is_bs_switching, SegmentName, output_file, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, seg_rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, s_start, bandwidth, cur_seg, dasher->use_segment_timeline);
+					e = gf_isom_start_segment(output, SegmentName, dasher->fragments_in_memory);
 
 					/*we are in bitstream switching mode, delete init segment*/
 					if (is_bs_switching && !init_segment_deleted) {
 						init_segment_deleted = GF_TRUE;
-						if (dash_cfg->bs_switch_segment_file && strcmp(dash_cfg->bs_switch_segment_file, gf_isom_get_filename(output))) {
+						if (dasher->bs_switch_segment_file && strcmp(dasher->bs_switch_segment_file, gf_isom_get_filename(output))) {
 							gf_delete_file(gf_isom_get_filename(output));
 						}
 					}
 
 					if (!use_url_template) {
-						const char *name = gf_dasher_strip_output_dir(dash_cfg->mpd_name, SegmentName);
+						const char *name = gf_dasher_strip_output_dir(dasher->mpd_name, SegmentName);
 						sprintf(szMPDTempLine, " <SegmentURL media=\"%s\"/>\n", name );
 						gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-						if (dash_cfg->dash_ctx) {
+						if (dasher->dash_ctx) {
 							char szKey[100], szVal[4046];
 							sprintf(szKey, "UrlInfo%d", cur_seg );
 							sprintf(szVal, "<SegmentURL media=\"%s\"/>", name);
-							gf_cfg_set_key(dash_cfg->dash_ctx, RepURLsSecName, szKey, szVal);
+							gf_cfg_set_key(dasher->dash_ctx, RepURLsSecName, szKey, szVal);
 						}
 					}
 				} else {
-					e = gf_isom_start_segment(output, NULL, dash_cfg->fragments_in_memory);
+					e = gf_isom_start_segment(output, NULL, dasher->fragments_in_memory);
 				}
-				if (dash_cfg->pssh_moof)
+				switch (dasher->pssh_mode) {
+				case GF_DASH_PSSH_MOOF:
+				case GF_DASH_PSSH_MOOF_MPD:
 					store_pssh = GF_TRUE;
+					break;
+				default:
+					break;
+				}
 
-				if (tfref && dash_cfg->insert_utc) {
+				if (tfref /* tfref set to NULL after its last sample is processed */ && dasher->insert_utc) {
 					store_utc = GF_TRUE;
 				}
 			}
@@ -1623,12 +1931,12 @@
 
 		sample = NULL;
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, starting fragment %d\n", SegmentName, nbFragmentInSegment));
 		if (simulation_pass) {
 			segments_info[nb_segments_info-1] ++;
 			e = GF_OK;
 		} else {
 
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, starting fragment %d\n", SegmentName, nbFragmentInSegment));
 			e = gf_isom_start_fragment(output, GF_TRUE);
 			if (e) goto err_exit;
 
@@ -1636,22 +1944,33 @@
 				tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
 				if (tf->done) continue;
 
-				if (dash_cfg->initial_tfdt && (tf->TimeScale != dash_cfg->dash_scale)) {
+				if (dasher->initial_tfdt && (tf->TimeScale != dasher->dash_scale)) {
 					Double scale = tf->TimeScale;
-					scale /= dash_cfg->dash_scale;
-					tf->start_tfdt = (u64) (dash_cfg->initial_tfdt*scale) + tf->InitialTSOffset + tf->next_sample_dts;
+					scale /= dasher->dash_scale;
+					tf->start_tfdt = (u64) (dasher->initial_tfdt*scale) + tf->InitialTSOffset + tf->next_sample_dts;
 				} else {
 					tf->start_tfdt = tf->InitialTSOffset + tf->next_sample_dts;
 				}
+
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, fragment %d, tfdt "LLD" on TrackID %d\n", SegmentName, nbFragmentInSegment, tf->start_tfdt, tf->TrackID));
+
 				gf_isom_set_traf_base_media_decode_time(output, tf->TrackID, tf->start_tfdt);
 				if (!SegmentDuration) tf->min_cts_in_segment = (u64)-1;
 
+				if (!mpd_timeline_bs && use_url_template) {
+					Double sdur = ((Double)MaxSegmentDuration) / dasher->dash_scale;
+					Double diff = (cur_seg-2) * sdur;
+					diff -= ((Double)tf->start_tfdt) / tf->TimeScale;
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Drift control for segment %d: segment_boundary=%.2f\t media_time=%.2f\tdrift=%.2f\n", cur_seg, (cur_seg - 2) * sdur, ((Double)tf->start_tfdt) / tf->TimeScale, diff));
+					if (ABS(diff) > sdur/2) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Segment %s (Number #%d): drift between MPD timeline and tfdt exceeds 50%% of segment duration (MPD time minus TFDT %lf secs) - bitstream will not be compliant, try increasing segment duration or reencoding for better keyframe alignment\n", SegmentName, cur_seg-1, diff));
+					}
+				}
 			}
 			if (store_pssh) {
 				e = gf_isom_clone_pssh(output, input, GF_TRUE);
 			}
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, starting fragment %d track processing\n", SegmentName, nbFragmentInSegment));
 
 		//process track by track
 		for (i=0; i<count; i++) {
@@ -1665,26 +1984,39 @@
 
 			if (tf->done) continue;
 			//if not the first TRAF in our moof and single traf per moof is requested, start a new moof
-			if (!simulation_pass && dash_cfg->single_traf_per_moof && (i>0) ) {
+			if (!simulation_pass && dasher->single_traf_per_moof && (i>0) ) {
 				e = gf_isom_start_fragment(output, GF_TRUE);
 				if (e) goto err_exit;
+ if (dasher->tfdt_per_traf) {
+ tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
+ if (tf->done) continue;
+ gf_isom_set_traf_base_media_decode_time(output, tf->TrackID, tf->start_tfdt);
+ }
 			}
 
 			//ok write samples
 			while (1) {
+				u64 last_sample_dts;
+				Bool loop_track = GF_FALSE;
+				Bool force_eos = GF_FALSE;
 				Bool stop_frag = GF_FALSE;
 				Bool is_redundant_sample = GF_FALSE;
 				u32 split_sample_duration = 0;
+				u32 next_sample_num_offset = 1;
+				Double clamp_duration = dash_input->clamp_duration;
+				if (!clamp_duration) clamp_duration = dash_input->media_duration;
 
-				/*first sample*/
+				/*first sample in the fragment */
 				if (!sample) {
 					sample = gf_isom_get_sample(input, tf->OriginalTrack, tf->SampleNum + 1, &descIndex);
 					if (!sample) {
 						e = gf_isom_last_error(input);
 						goto err_exit;
 					}
+					sample->DTS += tf->loop_ts_offset;
 
 					/*FIXME - use negative ctts to indicate "past" DTS for splitted sample*/
+					/* take into account the possible split of the last sample in the previous fragment */
 					if (tf->split_sample_dts_shift) {
 						sample->DTS += tf->split_sample_dts_shift;
 						is_redundant_sample = GF_TRUE;
@@ -1703,34 +2035,85 @@
 					}
 				}
 
+				if (!tf->FragmentLength && tf->is_ref_track) {
+					ref_start_SAP_type = SAP_type;
+				}
+
 				gf_isom_get_sample_padding_bits(input, tf->OriginalTrack, tf->SampleNum+1, &NbBits);
+				if (sample->nb_pack) {
+					next_sample_num_offset = sample->nb_pack;
+				}
+
+				next = gf_isom_get_sample(input, tf->OriginalTrack, tf->SampleNum + 1 + next_sample_num_offset, &j);
+
+				if (next) sample_duration = gf_isom_get_sample_duration(input, tf->OriginalTrack, tf->SampleNum+1 + next_sample_num_offset);
+				if (clamp_duration && next && clamp_duration*tf->TimeScale < next->DTS + sample_duration) {
+					gf_isom_sample_del(&next);
+					next = NULL;
+				}
 
-				next = gf_isom_get_sample(input, tf->OriginalTrack, tf->SampleNum + 2, &j);
 				if (next) {
-					defaultDuration = (u32) (next->DTS - sample->DTS);
+					next->DTS += tf->loop_ts_offset;
+					sample_duration = (u32) (next->DTS - sample->DTS);
+				}
+				//in dynamic mode we will loop, pay attention to the timing
+				else if (!dasher->disable_loop) {
+					if (clamp_duration) {
+						/* simple round with (int)+.5 to avoid trucating .99999 to 0 */
+						sample_duration = (u32)(clamp_duration*tf->TimeScale - (sample->DTS - tf->loop_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 (sample_duration==0)
+							sample_duration=1;
+					} else {
+						sample_duration = (u32) (gf_isom_get_media_duration(input, tf->OriginalTrack) - (sample->DTS - tf->loop_ts_offset) );
+
+						assert(tf->SampleNum+1 == tf->SampleCount);
+					}
+
+					tf->loop_ts_offset = tf->next_sample_dts + sample_duration;
+					loop_track = GF_TRUE;
+					next = gf_isom_get_sample(input, tf->OriginalTrack, 1, &j);
+					next->DTS += tf->loop_ts_offset;
+				} else if (clamp_duration) {
+					if (tf->MediaType!=GF_ISOM_MEDIA_AUDIO) {
+						sample_duration = (u32)(clamp_duration*tf->TimeScale - (sample->DTS - tf->loop_ts_offset) + 0.5);
+					} else {
+						sample_duration = gf_isom_get_sample_duration(input, tf->OriginalTrack, tf->SampleNum+1);
+					}
+					force_eos = GF_TRUE;
 				} else {
-					defaultDuration = (u32) (gf_isom_get_media_duration(input, tf->OriginalTrack) - sample->DTS);
+					sample_duration = (u32) (gf_isom_get_media_duration(input, tf->OriginalTrack) - (sample->DTS - tf->loop_ts_offset));
+				}
+
+				if (sample->nb_pack) {
+					sample_duration /= sample->nb_pack;
 				}
 
 				if (tf->splitable) {
+					/* Evaluate if we need to split the current sample
+					(if it goes beyond the segment boundary,
+					we do not split a sample if it exceeds the fragment boundary) */
 					if (tf->is_ref_track) {
-						u64 frag_dur = (tf->FragmentLength + defaultDuration) * dash_cfg->dash_scale / tf->TimeScale;
+						u64 frag_dur = (tf->FragmentLength + sample_duration) * dasher->dash_scale / tf->TimeScale;
 						/*if media segment about to be produced is longer than max segment length, force segment split*/
 						if (SegmentDuration + frag_dur > MaxSegmentDuration) {
-							split_sample_duration = defaultDuration;
-							defaultDuration = (u32) (tf->TimeScale * (MaxSegmentDuration - SegmentDuration) / dash_cfg->dash_scale - tf->FragmentLength);
-							assert(defaultDuration);
-							split_sample_duration -= defaultDuration;
+							split_sample_duration = sample_duration;
+							sample_duration = (u32) (tf->TimeScale * (MaxSegmentDuration - SegmentDuration) / dasher->dash_scale - tf->FragmentLength);
+							assert(sample_duration);
+							split_sample_duration -= sample_duration;
+
+							/*since we split this sample we have to stop fragmenting afterwards*/
+							stop_frag = GF_TRUE;
 							nb_samp++;
 						}
-					} else if (tfref /* tfref set to NULL after the last sample of tfref is processed */
-					 /*&& next do not split if no next sample */
-
-					 /*next sample DTS */
-					 && ((tf->next_sample_dts + defaultDuration) * tfref_timescale > tfref->next_sample_dts * tf->TimeScale)) {
-						split_sample_duration = defaultDuration;
-						defaultDuration = (u32) ( (tfref->next_sample_dts * tf->TimeScale)/tfref_timescale - tf->next_sample_dts );
-						split_sample_duration -= defaultDuration;
+					} else if (tfref
+					 /* we split the sample not at the "perfect" segment boundary
+							 but at the "real" segment boundary given by the end of the last sample of the reference track (if any)
+							 there may not be a reference track anymore if all samples have been used */
+					 && ((tf->next_sample_dts + sample_duration) * tfref_timescale > tfref->next_sample_dts * tf->TimeScale)) {
+						split_sample_duration = sample_duration;
+						sample_duration = (u32) ( (tfref->next_sample_dts * tf->TimeScale)/tfref_timescale - tf->next_sample_dts );
+						split_sample_duration -= sample_duration;
 
 						/*since we split this sample we have to stop fragmenting afterwards*/
 						stop_frag = GF_TRUE;
@@ -1738,6 +2121,8 @@
 					}
 				}
 
+				assert(!next || ((s32) sample_duration > 0));
+
 				if (tf->is_ref_track) {
 					if (segments_start_with_sap && first_sample_in_segment) {
 						first_sample_in_segment = GF_FALSE;
@@ -1755,14 +2140,20 @@
 							ref_track_next_cts = next_cts;
 						}
 					} else {
-						u64 cts = gf_isom_get_media_duration(input, tf->OriginalTrack);
-						if (cts>ref_track_next_cts) ref_track_next_cts = cts;
-						else ref_track_next_cts += defaultDuration;
+						if (tf->MediaType==GF_ISOM_MEDIA_AUDIO) {
+							ref_track_next_cts += sample_duration;
+						} else {
+							u64 last_cts = gf_isom_get_media_duration(input, tf->OriginalTrack);
+							u64 dur = (u64) ((dash_input->clamp_duration ? dash_input->clamp_duration : dash_input->media_duration) * tf->TimeScale);
+							if (dur < last_cts)
+								last_cts = dur;
+
+							if (last_cts > ref_track_next_cts) ref_track_next_cts = last_cts;
+							else ref_track_next_cts += sample_duration;
+						}
 					}
 				}
 
-				if (SAP_type > max_sap_type) max_sap_type = SAP_type;
-
 				if (simulation_pass) {
 					e = GF_OK;
 				} else {
@@ -1779,18 +2170,21 @@
 					/*override descIndex with final index used in file*/
 					descIndex = tf->finalSampleDescriptionIndex;
 					e = gf_isom_fragment_add_sample(output, tf->TrackID, sample, descIndex,
-					 defaultDuration, NbBits, 0, is_redundant_sample);
+					 sample_duration, NbBits, 0, is_redundant_sample);
 					if (e)
 						goto err_exit;
 
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, fragment %d, current fragment length %d, adding sample with DTS %d from TrackID %d\n", SegmentName, nbFragmentInSegment, tf->FragmentLength, sample->DTS, tf->TrackID));
+
 					if (sample->DTS + sample->CTS_Offset < tf->min_cts_in_segment)
 						tf->min_cts_in_segment = sample->DTS + sample->CTS_Offset;
 
 					e = gf_isom_fragment_add_sai(output, input, tf->TrackID, tf->SampleNum + 1);
-					if (e) goto err_exit;
+					if (e)
+						goto err_exit;
 
 					/*copy subsample information*/
-					e = gf_isom_fragment_copy_subsample(output, tf->TrackID, input, tf->OriginalTrack, tf->SampleNum + 1, dash_cfg->samplegroups_in_traf);
+					e = gf_isom_fragment_copy_subsample(output, tf->TrackID, input, tf->OriginalTrack, tf->SampleNum + 1, dasher->samplegroups_in_traf);
 					if (e)
 						goto err_exit;
 
@@ -1799,18 +2193,27 @@
 				}
 
 				tf->last_sample_cts = sample->DTS + sample->CTS_Offset;
-				tf->next_sample_dts = sample->DTS + defaultDuration;
+				tf->next_sample_dts = sample->DTS + sample_duration;
+				last_sample_dts = sample->DTS;
 
 				if (split_sample_duration) {
 					gf_isom_sample_del(&next);
-					sample->DTS += defaultDuration;
+					sample->DTS += sample_duration;
 				} else {
 					gf_isom_sample_del(&sample);
 					sample = next;
-					tf->SampleNum += 1;
+					tf->SampleNum += next_sample_num_offset;
 					tf->split_sample_dts_shift = 0;
 				}
-				tf->FragmentLength += defaultDuration;
+				tf->FragmentLength += sample_duration;
+
+				//done with current sample
+
+				if (loop_track)
+					tf->SampleNum = 0;
+
+				if (force_eos)
+					tf->SampleNum = tf->SampleCount;
 
 				/*compute SAP type*/
 				if (sample) {
@@ -1830,53 +2233,106 @@
 
 				if (next && SAP_type) {
 					if (tf->is_ref_track) {
-						if (split_sample_duration) {
-							stop_frag = GF_TRUE;
-						}
-						else if (split_seg_at_rap) {
+						if (split_seg_at_rap) {
+							Bool next_sap_is_eos=GF_FALSE;
 							u64 next_sap_time;
-							u64 frag_dur, next_dur;
+							u64 frag_dur, next_dur, cur_frag_dur;
 							next_dur = gf_isom_get_sample_duration(input, tf->OriginalTrack, tf->SampleNum + 1);
-							if (!next_dur) next_dur = defaultDuration;
+							if (!next_dur) next_dur = sample_duration;
 							/*duration of fragment if we add this rap*/
-							frag_dur = (tf->FragmentLength+next_dur)*dash_cfg->dash_scale / tf->TimeScale;
+							frag_dur = (tf->FragmentLength+next_dur)*dasher->dash_scale / tf->TimeScale;
+							cur_frag_dur = (tf->FragmentLength)*dasher->dash_scale / tf->TimeScale;
 							next_sample_rap = GF_TRUE;
-							next_sap_time = isom_get_next_sap_time(input, tf->OriginalTrack, tf->SampleCount, tf->SampleNum + 2);
+							next_sap_time = isom_get_next_sap_time(input, tf->OriginalTrack, tf->SampleCount, tf->SampleNum + 2, &next_sap_is_eos);
+
 							/*if no more SAP after this one, do not switch segment*/
 							if (next_sap_time) {
-								u32 scaler;
-								Double SegmentStart;
 								u64 next_sap_dur;
-								if (dash_cfg->segment_duration_strict) {
-									SegmentStart = 0;
-								} else {
-									SegmentStart = segment_start_time;
+								Bool do_split = GF_FALSE;
+
+								next_sap_time += tf->loop_ts_offset;
+
+								/*this is the fragment duration if we add up to the next SAP */
+								next_sap_dur = frag_dur + (s64) (next_sap_time - tf->next_sample_dts - next_dur) * dasher->dash_scale / tf->TimeScale;
+
+								if (!tf->splitable) {
+
+									/**
+									*** we are at a RAP now, if we keep it in the current segment, we'll have to advance at least to the next RAP
+									*** so we check if the next RAP fit into the limit
+									*** there are two behaviors for segment limits:
+									*** 1. we go as close the segment boundary in media time without going over
+									*** i.e. segment_start = max{ RAP <= segment_number*dash_duration }
+									*** 2. we allow segment to grow up to 150% of the dash duration without drifting more than 50% of dash duration
+									*** audio uses 1., video uses 2. by default and 1. if -bound is specified
+									**/
+
+									// method 1.
+									if (tf->all_sample_raps || dasher->split_on_bound) {
+
+										if (next_sap_time * dasher->dash_scale / (double)tf->TimeScale <= (cur_seg - 1)*MaxSegmentDuration) {
+												if (SegmentDuration + next_sap_dur > MaxSegmentDuration)
+													GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Adjusting for drift for segment %d trackID %d: \tnext_sap_time: %.2f\tsegment_boundary: %d\t segment_duration: %d\n", cur_seg, tf->TrackID, next_sap_time * dasher->dash_scale / (double)tf->TimeScale, (cur_seg - 1)*MaxSegmentDuration, next_sap_dur));
+										}
+										else {
+											do_split = GF_TRUE;
+										}
+
+									}
+									// method 2.
+									else {
+
+										if (SegmentDuration + next_sap_dur >= 3 * MaxSegmentDuration / 2) {
+											do_split = GF_TRUE;
+										}
+
+										else if (!tf->all_sample_raps && !mpd_timeline_bs && use_url_template) {
+
+											Double diff_next, diff_current;
+											Double sdur = ((Double)MaxSegmentDuration) / dasher->dash_scale;
+
+											/* tfdt of first sample in next segment
+											** minus segment start time of next segment
+											** should be less than 50% of duration.
+											** If not we need to break into smaller segments
+											*/
+
+											diff_next = ((Double)next_sap_time) / tf->TimeScale - (cur_seg-1) * sdur;
+											diff_current = ((Double)tf->next_sample_dts) / tf->TimeScale - (cur_seg - 1) * sdur;
+
+											if (diff_next > sdur/2) {
+												do_split = GF_TRUE;
+												seg_dur_adjusted = GF_TRUE;
+												GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Stopping because of drift between next_sap_time=%2.f and boundary=%.2f (drift: %.2f)\n", next_sap_time / (double)tf->TimeScale, (cur_seg-1) * sdur, diff_next));
+											}
+
+											if (dasher->split_on_closest && ABS(diff_next) > ABS(diff_current)) {
+												do_split = GF_TRUE;
+												GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Stopping because of drift between next_sap_time=%.2f and boundary=%.2f (drift: %.2f) is bigger than current drift at %.2f (%.2f).\n", next_sap_time / (double)tf->TimeScale, (cur_seg - 1) * sdur, diff_next, ((Double)tf->next_sample_dts) / tf->TimeScale, diff_current));
+											}
+											//handle the case where we are exactly aligned and not at the end of stream
+											if (!dasher->split_on_closest && !dasher->split_on_bound && !diff_current && (SegmentDuration + cur_frag_dur == MaxSegmentDuration) && !next_sap_is_eos) {
+												do_split = GF_TRUE;
+											}
+										}
+
+									}
+
+
 								}
-								/*this is the fragment duration from last sample added to next SAP*/
-								next_sap_dur = frag_dur + (s64) (next_sap_time - tf->next_sample_dts - next_dur) * dash_cfg->dash_scale / tf->TimeScale;
-								/*if media segment about to be produced is longer than max segment length, force segment split*/
-								if (!tf->splitable && (SegmentStart + SegmentDuration + next_sap_dur > SegmentStart + MaxSegmentDuration)) {
-									//if (!tf->splitable && (SegmentStart + SegmentDuration + frag_dur > MaxSegmentDuration * SegmentNum)) {
+
+
+								if (do_split) {
 									split_at_rap = GF_TRUE;
 									/*force new segment*/
 									force_switch_segment = GF_TRUE;
 									stop_frag = GF_TRUE;
-									if (frag_dur < MaxSegmentDuration) {
-										GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Require segment starts with RAP but segment duration is not aligned with GOP duration (%d vs %d) - using GOP duration for this segment\n", MaxSegmentDuration, frag_dur));
-									}
-								}
+									GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %d trackID %d: Splitting at time %.2f\tnext_sap_time: %.2f\tsegment_boundary: %d\t segment_duration: %d\n", cur_seg, tf->TrackID, tf->next_sample_dts * dasher->dash_scale / (double)tf->TimeScale, next_sap_time * dasher->dash_scale / (double)tf->TimeScale, (cur_seg - 1)*MaxSegmentDuration, next_sap_dur));
 
-								if (! tf->all_sample_raps) {
-									/*if adding this SAP will result in stopping the fragment "soon" after it, stop now and start with SAP
-									if all samples are RAPs, just stop fragment if we exceed the requested duration by adding the next sample
-									otherwise, take 3 samples (should be refined of course)*/
-									scaler = 3;
-									if ( (tf->FragmentLength + scaler * next_dur) * dash_cfg->dash_scale >= MaxFragmentDuration * tf->TimeScale)
-										stop_frag = GF_TRUE;
 								}
 							}
 						} else if (!has_rap) {
-							if (tf->FragmentLength == defaultDuration) has_rap = 2;
+							if (tf->FragmentLength == sample_duration) has_rap = 2;
 							else has_rap = 1;
 						}
 					}
@@ -1884,19 +2340,122 @@
 					next_sample_rap = GF_FALSE;
 				}
 
-				if (tf->SampleNum==tf->SampleCount) {
+				if (tf->cues && sample) {
+					u32 cidx;
+					GF_DASHCueInfo *cue=NULL;
+					Bool is_split = GF_FALSE;
+					s32 has_mismatch = -1;
+					s32 strip_from = -1;
+
+					stop_frag = GF_FALSE;
+					force_switch_segment = GF_FALSE;
+
+					for (cidx=cue_start;cidx<tf->nb_cues; cidx++) {
+						cue = &tf->cues[cidx];
+						if (cue->sample_num) {
+							//ignore first sample
+							if (cue->sample_num==1) continue;
+
+							if (cue->sample_num == tf->SampleNum+1) {
+								is_split = GF_TRUE;
+								break;
+							} else if (cue->sample_num < tf->SampleNum+1) {
+								if (cue->sample_num == tf->SampleNum) {
+									strip_from = cidx;
+								} else {
+									has_mismatch = cidx;
+								}
+							} else {
+								break;
+							}
+						}
+						else if (cue->dts) {
+							u64 ts = cue->dts * tf->TimeScale;
+							u64 ts2 = sample->DTS * tf->cues_timescale;
+							if (ts == ts2) {
+								is_split = GF_TRUE;
+								break;
+							} else if (ts < ts2) {
+								if (last_sample_dts * tf->cues_timescale == ts) {
+									strip_from = cidx;
+								} else {
+									has_mismatch = cidx;
+								}
+							} else {
+								break;
+							}
+						}
+						else if (cue->cts) {
+							s64 ts = cue->cts * tf->TimeScale;
+							s64 ts2 = (sample->DTS + sample->CTS_Offset) * tf->cues_timescale;
+
+							//cues are given in track timeline (presentation time), substract the media time to pres time offset
+							if (tf->cues_use_edits) {
+								ts -= (s64) (tf->media_time_to_pres_time_shift) * tf->TimeScale;
+							}
+							if (ts == ts2) {
+								is_split = GF_TRUE;
+								break;
+							} else if (ts < ts2) {
+								if (tf->last_sample_cts * tf->cues_timescale == ts) {
+									strip_from = cidx;
+								} else {
+									has_mismatch = cidx;
+								}
+							} else {
+								break;
+							}
+						}
+					}
+					if (is_split) {
+						if (!next_sample_rap) {
+							GF_LOG(dasher->strict_cues ? GF_LOG_ERROR : GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] cue found (sn %d - dts "LLD" - cts "LLD") for track ID %d but sample %d is not RAP !\n", cue->sample_num, cue->dts, cue->cts, tf->TrackID, tf->SampleNum+1));
+							if (dasher->strict_cues) {
+								e = GF_BAD_PARAM;
+								goto err_exit;
+							}
+						}
+						stop_frag = GF_TRUE;
+						force_switch_segment = GF_TRUE;
+						if (!simulation_pass) {
+							tf->cues[cidx].is_processed = GF_TRUE;
+						}
+						cue_start = cidx+1;
+					} else if (strip_from>=0) {
+						cue_start = strip_from+1;
+					}
+
+					if (has_mismatch>=0) {
+						cue = &tf->cues[has_mismatch];
+						GF_LOG(dasher->strict_cues ? GF_LOG_ERROR : GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] found cue (sn %d - dts "LLD" - cts "LLD") in track ID %d before current sample (sn %d - dts "LLD" - cts "LLD") , buggy source cues ?\n", cue->sample_num, cue->dts, cue->cts, tf->TrackID, tf->SampleNum+1, sample->DTS, sample->DTS + sample->CTS_Offset));
+							if (dasher->strict_cues) {
+								e = GF_BAD_PARAM;
+								goto err_exit;
+							}
+					}
+				} else if (tf->SampleNum==tf->SampleCount) {
 					stop_frag = GF_TRUE;
 				} else if (tf->is_ref_track) {
+					/* NOTE: we don't need to check for split_sample_duration because if it is used, stop_frag should already be TRUE */
 					/*fragmenting on "clock" track: no drift control*/
-					if (!dash_cfg->fragments_start_with_rap || ( tf->splitable && split_sample_duration ) || ( (next && next->IsRAP) || split_at_rap) ) {
-						if ((tf->FragmentLength * dash_cfg->dash_scale >= MaxFragmentDuration * tf->TimeScale)
+					if (!dasher->fragments_start_with_rap || ( (next && next->IsRAP) || split_at_rap) ) {
+						Bool segment_dur_exceeded = GF_FALSE;
+						Bool last_frag_in_seg = GF_FALSE;
+						u64 seg_dur = (u64) (SegmentDuration + (tf->FragmentLength * dasher->dash_scale / tf->TimeScale));
+
+						if (seg_dur >= MaxSegmentDuration) {
+							last_frag_in_seg = GF_TRUE;
+							segment_dur_exceeded = GF_TRUE;
+						}
+
+						if ((!last_frag_in_seg && (tf->FragmentLength * dasher->dash_scale >= MaxFragmentDuration * tf->TimeScale))
 						 /* if we don't split segment at rap and if the current fragment makes the segment longer than required, stop the current fragment */
-						 || (!split_seg_at_rap && (SegmentDuration + (tf->FragmentLength * dash_cfg->dash_scale / tf->TimeScale) >= MaxSegmentDuration))
+						 || (!split_seg_at_rap && segment_dur_exceeded)
+								/* this can only happen if seg==MaxSegmentDuration, stop to avoid split with sample_duration==0 on next loop */
+								|| (tf->splitable && segment_dur_exceeded)
 						 ) {
+
 							stop_frag = GF_TRUE;
-							if (split_seg_at_rap && (next && !next->IsRAP)) {
-								GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Require segment starts with RAP but next segment will not be compatible\n"));
-							}
 						}
 					}
 				}
@@ -1907,7 +2466,7 @@
 					/*get next sample dts: if greater than tref EPT, abort. This ensures that we have at most
 					one au wihth EPT less than ref EPT*/
 					u64 next_dur = gf_isom_get_sample_duration(input, tf->OriginalTrack, tf->SampleNum + 1);
-					if (!next_dur) next_dur = defaultDuration;
+					if (!next_dur) next_dur = sample_duration;
 					ept_next = get_presentation_time(tf->next_sample_dts + next_dur, tf->media_time_to_pres_time_shift);
 					/*fragmenting on "non-clock" track: drift control*/
 					if (ept_next * tfref_timescale > tref_ept_next * tf->TimeScale)
@@ -1915,19 +2474,25 @@
 				}
 
 				if (stop_frag) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, done with fragment %d, fragment length %d\n", SegmentName, nbFragmentInSegment, tf->FragmentLength));
 					gf_isom_sample_del(&sample);
 					sample = next = NULL;
 
+					if (!ref_SAP_type)
+						ref_SAP_type = SAP_type ? SAP_type : ref_start_SAP_type;
+
 					//only compute max dur over segment for the track used for indexing / deriving MPD start time
 					if (!tfref || (tf->is_ref_track)) {
-						Double f_dur = (Double)( tf->FragmentLength ) * dash_cfg->dash_scale / tf->TimeScale;
+						Double f_dur = (Double)( tf->FragmentLength ) * dasher->dash_scale / tf->TimeScale;
 						if (maxFragDurationOverSegment <= f_dur) {
 							maxFragDurationOverSegment = f_dur;
 						}
 					}
 					tf->FragmentLength = 0;
+					/* propagate the portion of the current 'split' sample that has already been used in this fragment
+					 to the next fragment */
 					if (split_sample_duration)
-						tf->split_sample_dts_shift += defaultDuration;
+						tf->split_sample_dts_shift += sample_duration;
 
 					//if (tf==tfref)
 					//last_ref_cts = tf->last_sample_cts;
@@ -1945,19 +2510,19 @@
 				}
 			}
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, done fragment %d track processing\n", SegmentName, nbFragmentInSegment));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, done with fragment %d, fragment length %d\n", SegmentName, nbFragmentInSegment, tf->FragmentLength));
 
 		SegmentDuration += maxFragDurationOverSegment;
 
 		/*if no simulation and no SIDX or realtime is used, flush fragments as we write them*/
-		if (!simulation_pass && (!dash_cfg->enable_sidx || dash_cfg->real_time) ) {
+		if (!simulation_pass && (!dasher->enable_sidx || dasher->real_time) ) {
 
-			if (tfref && dash_cfg->real_time) {
-				u64 utc, end_time = tfref->InitialTSOffset + tfref->next_sample_dts - tfref->DefaultDuration;
+			if (tfref && dasher->real_time) {
+				u64 utc, end_time = tfref->InitialTSOffset + tfref->next_sample_dts - tfref->sample_duration;
 				end_time *= 1000;
 				end_time /= tfref->TimeScale;
 
-				assert(tfref->InitialTSOffset + tfref->next_sample_dts >= tfref->DefaultDuration);
+				assert(tfref->InitialTSOffset + tfref->next_sample_dts >= tfref->sample_duration);
 
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, going to sleep before flushing fragment %d at "LLU" us, at UTC "LLU" (flush target UTC "LLU")\n", SegmentName, nbFragmentInSegment, gf_sys_clock_high_res(), gf_net_get_utc(), generation_start_utc + end_time));
 				while (1) {
@@ -1977,20 +2542,30 @@
 		}
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, fragment %d flushed\n", SegmentName, nbFragmentInSegment));
 
-		if (force_switch_segment || flush_all_samples || ((SegmentDuration >= MaxSegmentDuration) && (!split_seg_at_rap || !next || next_sample_rap || tf->splitable))) {
-			if (!min_seg_dur || (min_seg_dur>SegmentDuration))
+		if (force_switch_segment || flush_all_samples || ((SegmentDuration >= MaxSegmentDuration) && (!split_seg_at_rap || next_sample_rap || tf->splitable))) {
+			//don't update min_seg_dur if this is the last segment
+			if (!min_seg_dur || (!flush_all_samples && (min_seg_dur>SegmentDuration)))
 				min_seg_dur = SegmentDuration;
+
+			//remember max sap type at start of segment
+			if (!max_sap_type && ref_SAP_type)
+				max_sap_type = ref_SAP_type;
+			else if (ref_SAP_type > max_sap_type)
+				max_sap_type = ref_SAP_type;
+
 			if (max_seg_dur < SegmentDuration)
 				max_seg_dur = SegmentDuration;
+
 			total_seg_dur += SegmentDuration;
 			last_seg_dur = SegmentDuration;
 
 			if (mpd_timeline_bs) {
-				u32 tick_adjust = 0;
+				u64 s_start, s_end;
 
+				u32 tick_adjust = 0;
 				//since dash scale and ref track used for segmentation may not have the same timescale we will have drift in segment timelines. Adjust it
 				if (tfref) {
-					s64 seg_start_time_min_cts = (s64) (tfref->min_cts_in_segment + tfref->media_time_to_pres_time_shift) * dash_cfg->dash_scale;
+					s64 seg_start_time_min_cts = (s64) (tfref->min_cts_in_segment + tfref->media_time_to_pres_time_shift) * dasher->dash_scale;
 					u64 seg_start_time_mpd = (period_duration + (u64)segment_start_time) * tfref->TimeScale;
 
 					//if first CTS in segment is less than 0, this means that we have AUs that are not presented due to edit list.
@@ -2016,27 +2591,37 @@
 						if (diff >= 1) {
 							tick_adjust = (u32) diff;
 							if (tick_adjust > 1) {
-								GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Drift between minCTS of segment and MPD start time is %g s\n", diff/dash_cfg->dash_scale));
+								GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Drift between minCTS of segment and MPD start time is %g s\n", diff/dasher->dash_scale));
 							}
 						}
 					}
 				}
+
+				s_start = (u64)( (period_duration + (u64)segment_start_time) * mpd_timescale );
+				s_end = (u64)( (period_duration + (u64)(segment_start_time + SegmentDuration) + tick_adjust)*mpd_timescale );
+				s_start /= dasher->dash_scale;
+				s_end /= dasher->dash_scale;
+
 				//adjust
-				gf_dash_append_segment_timeline(mpd_timeline_bs, period_duration + (u64)segment_start_time, (u64)(period_duration + segment_start_time + SegmentDuration + tick_adjust), &previous_segment_duration, &first_segment_in_timeline, &segment_timeline_repeat_count);
 				period_duration += tick_adjust;
+
+				gf_dash_append_segment_timeline(mpd_timeline_bs, s_start, s_end, &previous_segment_duration, &first_segment_in_timeline, &segment_timeline_repeat_count);
+				gf_dasher_store_segment_info(dasher, dash_input->representationID, SegmentName, s_start, s_end, mpd_timescale);
+			}
+			else {
+				gf_dasher_store_segment_info(dasher, dash_input->representationID, SegmentName, period_duration + (u64)segment_start_time, (u64)(period_duration + segment_start_time + SegmentDuration), dasher->dash_scale);
 			}
-			if (dash_cfg->max_segment_duration * dash_cfg->dash_scale < SegmentDuration) {
-				dash_cfg->max_segment_duration = (Double) SegmentDuration;
-				dash_cfg->max_segment_duration /= dash_cfg->dash_scale;
+			if (dasher->max_segment_duration * dasher->dash_scale < SegmentDuration) {
+				dasher->max_segment_duration = (Double) SegmentDuration;
+				dasher->max_segment_duration /= dasher->dash_scale;
 			}
 
-			gf_dasher_store_segment_info(dash_cfg, dash_input->representationID, SegmentName, period_duration + (u64)segment_start_time, (u64)(period_duration + segment_start_time + SegmentDuration));
 
 			segment_start_time += SegmentDuration;
 			nb_segments++;
-			/*if (max_segment_duration * dash_cfg->dash_scale <= SegmentDuration) {
+			/*if (max_segment_duration * dasher->dash_scale <= SegmentDuration) {
 				max_segment_duration = (Double) (s64) SegmentDuration;
-				max_segment_duration /= dash_cfg->dash_scale;
+				max_segment_duration /= dasher->dash_scale;
 			}*/
 			force_switch_segment = GF_FALSE;
 			switch_segment = GF_TRUE;
@@ -2044,27 +2629,27 @@
 			split_at_rap = GF_FALSE;
 			has_rap = GF_FALSE;
 			/*restore fragment duration*/
-			MaxFragmentDuration = (u32) (dash_cfg->fragment_duration * dash_cfg->dash_scale);
+			MaxFragmentDuration = (u32) (dasher->fragment_duration * dasher->dash_scale);
 
 			if (!simulation_pass) {
 				u64 idx_start_range, idx_end_range;
 				Bool last_segment = flush_all_samples ? GF_TRUE : GF_FALSE;
 
-				if (dash_cfg->subduration && (segment_start_time + MaxSegmentDuration/2 >= dash_cfg->dash_scale * dash_cfg->subduration)) {
+				if (dasher->subduration && (segment_start_time + MaxSegmentDuration/2 >= dasher->dash_scale * dasher->subduration)) {
 					//onDemand with subdur: if we are done dashing the content set last segment to TRUE to flush sidx
 					//live and end of period forced, force last segment
-					if (dash_cfg->force_period_end || (dash_cfg->single_file_mode==1) )
+					if (dasher->force_period_end || (dasher->single_file_mode==1) )
 						last_segment = GF_TRUE;
 				}
 
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Closing segment %s at "LLU" us, at UTC "LLU" - segment AST "LLU" (MPD AST "LLU")\n", SegmentName, gf_sys_clock_high_res(), gf_net_get_utc(), generation_start_utc + period_duration + (u64)segment_start_time, generation_start_utc ));
-				gf_isom_close_segment(output, dash_cfg->enable_sidx ? dash_cfg->subsegs_per_sidx : 0, dash_cfg->enable_sidx ? ref_track_id : 0, ref_track_first_dts, tfref ? tfref->media_time_to_pres_time_shift : tf->media_time_to_pres_time_shift, ref_track_next_cts, dash_cfg->daisy_chain_sidx, last_segment, dash_cfg->segment_marker_4cc, &idx_start_range, &idx_end_range);
+				gf_isom_close_segment(output, dasher->enable_sidx ? dasher->subsegs_per_sidx : 0, dasher->enable_sidx ? ref_track_id : 0, ref_track_first_dts, tfref ? tfref->media_time_to_pres_time_shift : tf->media_time_to_pres_time_shift, ref_track_next_cts, dasher->daisy_chain_sidx, dasher->use_ssix, last_segment, GF_FALSE, dasher->segment_marker_4cc, &idx_start_range, &idx_end_range, NULL);
 				nbFragmentInSegment = 0;
 
 				//take care of scalable reps
 				if (dash_input->moof_seqnum_increase) {
-					u32 frag_index = gf_isom_get_next_moof_number(output) + dash_input->nb_representations * dash_input->moof_seqnum_increase;
-					gf_isom_set_next_moof_number(output, dash_cfg->initial_moof_sn + frag_index);
+					u32 frag_index = gf_isom_get_next_moof_number(output) - 1 + dash_input->moof_seqnum_increase;
+					gf_isom_set_next_moof_number(output, frag_index);
 				}
 
 				ref_track_first_dts = (u64) -1;
@@ -2072,8 +2657,8 @@
 				if (!seg_rad_name) {
 					file_size = gf_isom_get_file_size(output);
 					end_range = file_size - 1;
-					if (dash_cfg->single_file_mode!=1) {
-						sprintf(szMPDTempLine, " <SegmentURL mediaRange=\""LLD"-"LLD"\"", start_range, end_range);
+					if (dasher->single_file_mode!=1) {
+						sprintf(szMPDTempLine, " <SegmentURL mediaRange=\""LLD"-"LLD"\"", start_range, end_range);
 						gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
 						if (idx_start_range || idx_end_range) {
 							sprintf(szMPDTempLine, " indexRange=\""LLD"-"LLD"\"", idx_start_range, idx_end_range);
@@ -2081,11 +2666,11 @@
 						}
 						gf_bs_write_data(mpd_bs, "/>\n", 3);
 
-						if (dash_cfg->dash_ctx) {
+						if (dasher->dash_ctx) {
 							char szKey[100], szVal[4046];
 							sprintf(szKey, "UrlInfo%d", cur_seg );
 							sprintf(szVal, "<SegmentURL mediaRange=\""LLD"-"LLD"\" indexRange=\""LLD"-"LLD"\"/>", start_range, end_range, idx_start_range, idx_end_range);
-							gf_cfg_set_key(dash_cfg->dash_ctx, RepURLsSecName, szKey, szVal);
+							gf_cfg_set_key(dasher->dash_ctx, RepURLsSecName, szKey, szVal);
 						}
 					}
 				} else {
@@ -2100,12 +2685,13 @@
 				}
 			}
 		}
-		if (nb_tracks_done==count) break;
+		if (nb_tracks_done==count)
+			break;
 	}
 
 	if (simulation_pass) {
 		/*OK, we have all segments and frags per segments*/
-		gf_isom_allocate_sidx(output, dash_cfg->subsegs_per_sidx, dash_cfg->daisy_chain_sidx, nb_segments_info, segments_info, &index_start_range, &index_end_range );
+		gf_isom_allocate_sidx(output, dasher->subsegs_per_sidx, dasher->daisy_chain_sidx, nb_segments_info, segments_info, &index_start_range, &index_end_range, dasher->use_ssix );
 		gf_free(segments_info);
 		segments_info = NULL;
 		simulation_pass = GF_FALSE;
@@ -2120,6 +2706,7 @@
 			if (tf->is_ref_track)
 				tfref = tf;
 		}
+		cue_start = 0;
 		goto restart_fragmentation_pass;
 	}
 
@@ -2132,13 +2719,13 @@
 		last_seg_dur = SegmentDuration;
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Closing segment %s at "LLU" us, at UTC "LLU"\n", SegmentName, gf_sys_clock_high_res(), gf_net_get_utc()));
-		gf_isom_close_segment(output, dash_cfg->enable_sidx ? dash_cfg->subsegs_per_sidx : 0, dash_cfg->enable_sidx ? ref_track_id : 0, ref_track_first_dts, tfref ? tfref->media_time_to_pres_time_shift : tf->media_time_to_pres_time_shift, ref_track_next_cts, dash_cfg->daisy_chain_sidx, GF_TRUE, dash_cfg->segment_marker_4cc, &idx_start_range, &idx_end_range);
+		gf_isom_close_segment(output, dasher->enable_sidx ? dasher->subsegs_per_sidx : 0, dasher->enable_sidx ? ref_track_id : 0, ref_track_first_dts, tfref ? tfref->media_time_to_pres_time_shift : tf->media_time_to_pres_time_shift, ref_track_next_cts, dasher->daisy_chain_sidx, dasher->use_ssix, GF_TRUE, GF_FALSE, dasher->segment_marker_4cc, &idx_start_range, &idx_end_range, NULL);
 		nb_segments++;
 
 		if (!seg_rad_name) {
 			file_size = gf_isom_get_file_size(output);
 			end_range = file_size - 1;
-			if (dash_cfg->single_file_mode!=1) {
+			if (dasher->single_file_mode!=1) {
 				sprintf(szMPDTempLine, " <SegmentURL mediaRange=\""LLD"-"LLD"\"", start_range, end_range);
 				gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
 				if (idx_start_range || idx_end_range) {
@@ -2147,11 +2734,11 @@
 				}
 				gf_bs_write_data(mpd_bs, "/>\n", 3);
 
-				if (dash_cfg->dash_ctx) {
+				if (dasher->dash_ctx) {
 					char szKey[100], szVal[4046];
 					sprintf(szKey, "UrlInfo%d", cur_seg );
 					sprintf(szVal, "<SegmentURL mediaRange=\""LLD"-"LLD"\" indexRange=\""LLD"-"LLD"\"/>", start_range, end_range, idx_start_range, idx_end_range);
-					gf_cfg_set_key(dash_cfg->dash_ctx, RepURLsSecName, szKey, szVal);
+					gf_cfg_set_key(dasher->dash_ctx, RepURLsSecName, szKey, szVal);
 				}
 			}
 		} else {
@@ -2160,7 +2747,7 @@
 	}
 	//close timeline
 	if (mpd_timeline_bs) {
-		if (previous_segment_duration == SegmentDuration) {
+		if (previous_segment_duration * dasher->dash_scale == SegmentDuration * mpd_timescale) {
 			segment_timeline_repeat_count ++;
 			sprintf(szMPDTempLine, " r=\"%d\"/>\n", segment_timeline_repeat_count);
 			gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
@@ -2187,108 +2774,124 @@
 		sprintf(szMPDTempLine, " </SegmentTimeline>\n");
 		gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
 	}
-	else if (!dash_cfg->use_segment_timeline) {
+	else if (!dasher->use_segment_timeline) {
 		if (3*min_seg_dur < max_seg_dur) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Segment duration variation is higher than the +/- 50%% allowed by DASH-IF (min %g, max %g) - please reconsider encoding\n", (Double) min_seg_dur / dash_cfg->dash_scale, (Double) max_seg_dur / dash_cfg->dash_scale));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Segment duration variation is higher than the +/- 50%% allowed by DASH-IF (min %g, max %g) - please reconsider encoding\n", (Double) min_seg_dur / dasher->dash_scale, (Double) max_seg_dur / dasher->dash_scale));
 		}
-		if (dash_cfg->dash_ctx) {
-			max_segment_duration = dash_cfg->segment_duration;
-			if ((Double) max_seg_dur / dash_cfg->dash_scale < dash_cfg->segment_duration) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Segment duration is smaller than required (require %g s but DASH-ing only %g s)\n", dash_cfg->segment_duration, (Double) max_seg_dur / dash_cfg->dash_scale));
+		if (dasher->dash_ctx) {
+			if (!seg_dur_adjusted && ((Double) max_seg_dur / dasher->dash_scale < dasher->segment_duration/2)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Segment duration is smaller than required (require %g s but DASH-ing only %g s)\n", dasher->segment_duration, (Double) max_seg_dur / dasher->dash_scale));
 			}
+			max_segment_duration = max_seg_dur;
+			max_segment_duration /= 1000;
 		} else {
 			if (nb_segments == 1) {
 				max_segment_duration = (Double) total_seg_dur;
-				max_segment_duration /= nb_segments * dash_cfg->dash_scale;
+				max_segment_duration /= nb_segments * dasher->dash_scale;
 			} else {
 				max_segment_duration = (Double) (total_seg_dur - last_seg_dur);
-				max_segment_duration /= (nb_segments - 1) * dash_cfg->dash_scale;
+				max_segment_duration /= (nb_segments - 1) * dasher->dash_scale;
 			}
 		}
 	}
 
 
-	if (!bandwidth)
-		bandwidth = (u32) (file_size * 8 / file_duration);
+write_rep_only:
+
+ if (!bandwidth) {
+ 	for (i=0; i<gf_list_count(fragmenters); i++) {
+ 		u32 bw=0;
+			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
+			gf_isom_get_bitrate(input, tf->OriginalTrack, 0, &bw, NULL, NULL);
+			if (!bw) {
+				u64 msize = gf_isom_get_media_data_size(input, tf->OriginalTrack);
+				msize *= 8;
+				bw = (u32) (msize / file_duration);
+			}
+			bandwidth += (u32) bw;
+		}
+	}
 
-	bandwidth += dash_input->dependency_bandwidth;
-	dash_input->bandwidth = bandwidth;
+ bandwidth += dash_input->dependency_bandwidth;
+ dash_input->bandwidth = bandwidth;
 
 
 	/* max segment duration */
-	if (dash_cfg->dash_ctx) {
+	if (dasher->dash_ctx) {
 		Double seg_dur;
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration");
+		opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "MaxSegmentDuration");
 		if (opt) {
 			seg_dur = atof(opt);
 			if (seg_dur < max_segment_duration) {
 				sprintf(sOpt, "%f", max_segment_duration);
-				gf_cfg_set_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
+				gf_cfg_set_key(dasher->dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
 			} else {
 				max_segment_duration = seg_dur;
 			}
 		} else {
 			sprintf(sOpt, "%f", max_segment_duration);
-			gf_cfg_set_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
+			gf_cfg_set_key(dasher->dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
 		}
 	}
 
-	if (!max_segment_duration || !dash_cfg->segment_duration_strict) {
-		max_segment_duration = dash_cfg->segment_duration;
-	}
+	max_segment_duration = dasher->segment_duration;
 
 	/* Write adaptation set content protection element */
-	if (protected_track && first_in_set && (dash_cfg->cp_location_mode != GF_DASH_CPMODE_REPRESENTATION)) {
-		gf_isom_write_content_protection(input, dash_cfg->mpd, protected_track, 3);
+	if (protected_track && first_in_set && (dasher->cp_location_mode != GF_DASH_CPMODE_REPRESENTATION)) {
+		gf_isom_write_content_protection(input, dasher->mpd, protected_track, dasher, 3);
 	}
 
 	if (use_url_template) {
 		/*segment template does not depend on file name, write the template at the adaptationSet level*/
-		if (!dash_cfg->variable_seg_rad_name && first_in_set) {
-			const char *rad_name = gf_dasher_strip_output_dir(dash_cfg->mpd_name, seg_rad_name);
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, 0, 0, 0, dash_cfg->use_segment_timeline);
-			fprintf(dash_cfg->mpd, " <SegmentTemplate timescale=\"%d\" media=\"%s\" startNumber=\"%d\"", mpd_timeline_bs ? dash_cfg->dash_scale : mpd_timescale, SegmentName, startNumber);
-			if (dash_cfg->ast_offset_ms<0) {
-				fprintf(dash_cfg->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dash_cfg->ast_offset_ms / 1000.0);
-			}
-			if (!dash_cfg->use_segment_timeline) {
-				if (!max_segment_duration)
-					max_segment_duration = dash_cfg->segment_duration;
-				fprintf(dash_cfg->mpd, " duration=\"%d\"", (u32) (max_segment_duration * mpd_timescale + 0.5));
-			}
+		if (!dasher->variable_seg_rad_name && first_in_set) {
+			const char *rad_name = gf_dasher_strip_output_dir(dasher->mpd_name, seg_rad_name);
+			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, 0, 0, 0, dasher->use_segment_timeline);
+			fprintf(dasher->mpd, " <SegmentTemplate media=\"%s\"", SegmentName);
+
 			/*in BS switching we share the same IS for all reps*/
 			if (is_bs_switching) {
 				strcpy(SegmentName, bs_switching_segment_name);
 			} else {
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, 0, 0, dash_cfg->use_segment_timeline);
+				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, rad_name, !stricmp(init_seg_ext, "null") ? NULL : init_seg_ext, 0, 0, 0, dasher->use_segment_timeline);
 			}
-			fprintf(dash_cfg->mpd, " initialization=\"%s\"", SegmentName);
+			fprintf(dasher->mpd, " initialization=\"%s\"", SegmentName);
+
+			fprintf(dasher->mpd, " timescale=\"%d\"", mpd_timescale);
+			fprintf(dasher->mpd, " startNumber=\"%d\"", startNumber);
+			if (!dasher->use_segment_timeline) {
+				fprintf(dasher->mpd, " duration=\"%d\"", (u32) (max_segment_duration * mpd_timescale + 0.5));
+			}
+
 			if (presentationTimeOffset)
-				fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
+				fprintf(dasher->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
+
+			if (dasher->ast_offset_ms<0) {
+				fprintf(dasher->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dasher->ast_offset_ms / 1000.0);
+			}
 
 			if (mpd_timeline_bs) {
 				char *mpd_seg_info = NULL;
 				u32 size;
-				fprintf(dash_cfg->mpd, ">\n");
+				fprintf(dasher->mpd, ">\n");
 
 				gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
-				gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
+				gf_fwrite(mpd_seg_info, 1, size, dasher->mpd);
 				gf_free(mpd_seg_info);
-				fprintf(dash_cfg->mpd, " </SegmentTemplate>\n");
+				fprintf(dasher->mpd, " </SegmentTemplate>\n");
 			} else {
-				fprintf(dash_cfg->mpd, "/>\n");
+				fprintf(dasher->mpd, "/>\n");
 			}
 		}
 		/*in BS switching we share the same IS for all reps, write the SegmentTemplate for the init segment*/
-		else if ((is_bs_switching || mpd_timeline_bs) && first_in_set && !dash_cfg->segment_alignment_disabled) {
-			fprintf(dash_cfg->mpd, " <SegmentTemplate");
+		else if ((is_bs_switching || mpd_timeline_bs) && first_in_set && !dasher->segment_alignment_disabled) {
+			fprintf(dasher->mpd, " <SegmentTemplate");
 			if (is_bs_switching) {
-				fprintf(dash_cfg->mpd, " initialization=\"%s\"", bs_switching_segment_name);
+				fprintf(dasher->mpd, " initialization=\"%s\"", bs_switching_segment_name);
 				if (presentationTimeOffset)
-					fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
+					fprintf(dasher->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
 			}
-			if (dash_cfg->ast_offset_ms<0) {
-				fprintf(dash_cfg->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dash_cfg->ast_offset_ms / 1000.0);
+			if (dasher->ast_offset_ms<0) {
+				fprintf(dasher->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dasher->ast_offset_ms / 1000.0);
 			}
 
 			if (mpd_timeline_bs) {
@@ -2296,262 +2899,280 @@
 				u32 size;
 
 
-				fprintf(dash_cfg->mpd, " timescale=\"%d\">\n", dash_cfg->dash_scale);
+				fprintf(dasher->mpd, " timescale=\"%d\">\n", mpd_timescale);
 
 				gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
-				gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
+				gf_fwrite(mpd_seg_info, 1, size, dasher->mpd);
 				gf_free(mpd_seg_info);
-				fprintf(dash_cfg->mpd, " </SegmentTemplate>\n");
+				fprintf(dasher->mpd, " </SegmentTemplate>\n");
 			} else {
-				fprintf(dash_cfg->mpd, "/>\n");
+				fprintf(dasher->mpd, "/>\n");
 			}
 		}
 	}
-	else if ((dash_cfg->single_file_mode!=1) && mpd_timeline_bs) {
+	else if ((dasher->single_file_mode!=1) && mpd_timeline_bs) {
 		char *mpd_seg_info = NULL;
 		u32 size;
 
-		fprintf(dash_cfg->mpd, " <SegmentList timescale=\"%d\"", dash_cfg->dash_scale);
-		if (dash_cfg->ast_offset_ms<0) {
-			fprintf(dash_cfg->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dash_cfg->ast_offset_ms / 1000.0);
+		fprintf(dasher->mpd, " <SegmentList timescale=\"%d\"", dasher->dash_scale);
+		if (dasher->ast_offset_ms<0) {
+			fprintf(dasher->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dasher->ast_offset_ms / 1000.0);
 		}
-		fprintf(dash_cfg->mpd, "\n");
+		fprintf(dasher->mpd, "\n");
 
 		gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
-		gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
+		gf_fwrite(mpd_seg_info, 1, size, dasher->mpd);
 		gf_free(mpd_seg_info);
-		fprintf(dash_cfg->mpd, " </SegmentList>\n");
+		fprintf(dasher->mpd, " </SegmentList>\n");
 	}
 
-	fprintf(dash_cfg->mpd, " <Representation ");
-	if ( strlen(dash_input->representationID) ) fprintf(dash_cfg->mpd, "id=\"%s\"", dash_input->representationID);
-	else fprintf(dash_cfg->mpd, "id=\"%p\"", output);
+	fprintf(dasher->mpd, " <Representation ");
+	if ( strlen(dash_input->representationID) ) fprintf(dasher->mpd, "id=\"%s\"", dash_input->representationID);
+	else fprintf(dasher->mpd, "id=\"%p\"", output);
 
-	fprintf(dash_cfg->mpd, " mimeType=\"%s/mp4\" codecs=\"%s\"", (!nb_audio && !nb_video) ? "application" : (!nb_video ? "audio" : "video"), szCodecs);
+	fprintf(dasher->mpd, " mimeType=\"%s/mp4\" codecs=\"%s\"", (!nb_audio && !nb_video && !nb_auxv) ? "application" : (!nb_video && !nb_auxv ? "audio" : "video"), szCodecs);
 	if (width && height) {
-		fprintf(dash_cfg->mpd, " width=\"%u\" height=\"%u\"", width, height);
+		fprintf(dasher->mpd, " width=\"%u\" height=\"%u\"", width, height);
 
 		/*this is a video track*/
 		if (fps_num || fps_denum) {
 			gf_media_get_reduced_frame_rate(&fps_num, &fps_denum);
 			if (fps_denum>1)
-				fprintf(dash_cfg->mpd, " frameRate=\"%d/%d\"", fps_num, fps_denum);
+				fprintf(dasher->mpd, " frameRate=\"%d/%d\"", fps_num, fps_denum);
 			else
-				fprintf(dash_cfg->mpd, " frameRate=\"%d\"", fps_num);
+				fprintf(dasher->mpd, " frameRate=\"%d\"", fps_num);
 
 			if (!sar_w) sar_w = 1;
 			if (!sar_h) sar_h = 1;
-			fprintf(dash_cfg->mpd, " sar=\"%d:%d\"", sar_w, sar_h);
+			fprintf(dasher->mpd, " sar=\"%d:%d\"", sar_w, sar_h);
 		}
 	}
-	if (sample_rate) fprintf(dash_cfg->mpd, " audioSamplingRate=\"%d\"", sample_rate);
+	if (sample_rate) fprintf(dasher->mpd, " audioSamplingRate=\"%d\"", sample_rate);
 
-	//single segment (onDemand profiles, assumes we always start with an IDR)
-	if (dash_cfg->single_file_mode==1) {
-		fprintf(dash_cfg->mpd, " startWithSAP=\"1\"");
-	}
-	//regular segmenting
-	else {
+	//single segment (onDemand profiles, assumes we always start with an IDR), don't write
+	if (dasher->single_file_mode != 1) {
 		if (segments_start_with_sap || split_seg_at_rap) {
-			fprintf(dash_cfg->mpd, " startWithSAP=\"%d\"", max_sap_type);
+			//don't write startWithSAP on final dynamic->static conversion, we don't have the info
+			if (max_sap_type != 1) {
+				fprintf(dasher->mpd, " startWithSAP=\"%d\"", max_sap_type);
+			}
 		} else {
-			fprintf(dash_cfg->mpd, " startWithSAP=\"0\"");
+			fprintf(dasher->mpd, " startWithSAP=\"0\"");
 		}
 	}
 
 
 	//only appears at AdaptationSet level - need to rewrite the DASH segementer to allow writing this at the proper place
-//		if ((single_file_mode==1) && segments_start_with_sap) fprintf(dash_cfg->mpd, " subsegmentStartsWithSAP=\"%d\"", max_sap_type);
+//		if ((single_file_mode==1) && segments_start_with_sap) fprintf(dasher->mpd, " subsegmentStartsWithSAP=\"%d\"", max_sap_type);
 
-	fprintf(dash_cfg->mpd, " bandwidth=\"%d\"", bandwidth);
+	fprintf(dasher->mpd, " bandwidth=\"%d\"", bandwidth);
 	if (dash_input->dependencyID)
-		fprintf(dash_cfg->mpd, " dependencyId=\"%s\"", dash_input->dependencyID);
-	fprintf(dash_cfg->mpd, ">\n");
+		fprintf(dasher->mpd, " dependencyId=\"%s\"", dash_input->dependencyID);
+	fprintf(dasher->mpd, ">\n");
 
 	/* baseURLs */
 	if (dash_input->nb_baseURL) {
 		for (i=0; i<dash_input->nb_baseURL; i++) {
-			fprintf(dash_cfg->mpd, " <BaseURL>%s</BaseURL>\n", dash_input->baseURL[i]);
+			fprintf(dasher->mpd, " <BaseURL>%s</BaseURL>\n", dash_input->baseURL[i]);
 		}
 	}
 
 	/* writing Representation level descriptors */
 	if (dash_input->nb_rep_descs) {
 		for (i=0; i<dash_input->nb_rep_descs; i++) {
-			fprintf(dash_cfg->mpd, " %s\n", dash_input->rep_descs[i]);
+			if (strchr(dash_input->rep_descs[i], '<') != NULL) {
+				fprintf(dasher->mpd, " %s\n", dash_input->rep_descs[i]);
+			}
 		}
 	}
 
 	if (nb_channels && !is_bs_switching) {
 		if (!nb_surround && !nb_lfe) {
-			fprintf(dash_cfg->mpd, " <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\"/>\n", nb_channels );
+			fprintf(dasher->mpd, " <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\"/>\n", nb_channels );
 		} else {
-			fprintf(dash_cfg->mpd, " <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:mpegB:cicp:ChannelConfiguration\" value=\"%d\"/>\n", cicp_get_channel_config(nb_channels, nb_surround, nb_lfe) );
+			fprintf(dasher->mpd, " <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:mpegB:cicp:ChannelConfiguration\" value=\"%d\"/>\n", cicp_get_channel_config(nb_channels, nb_surround, nb_lfe) );
 		}
 	}
 
 	/* Write content protection element in representation */
-	if (protected_track && (dash_cfg->cp_location_mode != GF_DASH_CPMODE_ADAPTATION_SET)) {
-		gf_isom_write_content_protection(input, dash_cfg->mpd, protected_track, 4);
+	if (protected_track && (dasher->cp_location_mode != GF_DASH_CPMODE_ADAPTATION_SET)) {
+		gf_isom_write_content_protection(input, dasher->mpd, protected_track, dasher, 4);
 	}
 
 	if (use_url_template) {
 		/*segment template depends on file name, but the template at the representation level*/
-		if (dash_cfg->variable_seg_rad_name) {
-			const char *rad_name = gf_dasher_strip_output_dir(dash_cfg->mpd_name, seg_rad_name);
+		if (dasher->variable_seg_rad_name) {
+			const char *rad_name = gf_dasher_strip_output_dir(dasher->mpd_name, seg_rad_name);
 #ifdef GENERATE_VIRTUAL_REP_SRD
 			//if virtual rep, SegmentName already contains the name of the empty media segment used
 			if (!dash_input->virtual_representation)
 #endif
 			{
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, 0, bandwidth, 0, dash_cfg->use_segment_timeline);
+				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, 0, bandwidth, 0, dasher->use_segment_timeline);
 			}
 
-			fprintf(dash_cfg->mpd, " <SegmentTemplate timescale=\"%d\" media=\"%s\" startNumber=\"%d\"", dash_cfg->use_segment_timeline ? dash_cfg->dash_scale : mpd_timescale, SegmentName, startNumber);
-			if (!dash_cfg->use_segment_timeline) {
-				fprintf(dash_cfg->mpd, " duration=\"%d\"", (u32) (max_segment_duration * mpd_timescale + 0.5));
-			}
+			fprintf(dasher->mpd, " <SegmentTemplate media=\"%s\"", SegmentName);
+
 			//don't write init if scalable rep
 			if (!is_bs_switching && !dash_input->idx_representations) {
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, 0, 0, dash_cfg->use_segment_timeline);
-				fprintf(dash_cfg->mpd, " initialization=\"%s\"", SegmentName);
+				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, rad_name, !stricmp(init_seg_ext, "null") ? NULL : init_seg_ext, 0, 0, 0, dasher->use_segment_timeline);
+				fprintf(dasher->mpd, " initialization=\"%s\"", SegmentName);
+			}
+			fprintf(dasher->mpd, " timescale=\"%d\"", mpd_timescale);
+			fprintf(dasher->mpd, " startNumber=\"%d\"", startNumber);
+			if (!dasher->use_segment_timeline) {
+				fprintf(dasher->mpd, " duration=\"%d\"", (u32) (max_segment_duration * mpd_timescale + 0.5));
 			}
 			if (presentationTimeOffset)
-				fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
+				fprintf(dasher->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
 
-			if (dash_cfg->ast_offset_ms<0) {
-				fprintf(dash_cfg->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dash_cfg->ast_offset_ms / 1000.0);
+			if (dasher->ast_offset_ms<0) {
+				fprintf(dasher->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dasher->ast_offset_ms / 1000.0);
 			}
 
-			if (mpd_timeline_bs && (!first_in_set || dash_cfg->segment_alignment_disabled) ) {
+			if (mpd_timeline_bs && (!first_in_set || dasher->segment_alignment_disabled) ) {
 				char *mpd_seg_info = NULL;
 				u32 size;
-				fprintf(dash_cfg->mpd, ">\n");
+				fprintf(dasher->mpd, ">\n");
 
 				gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
-				gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
+				gf_fwrite(mpd_seg_info, 1, size, dasher->mpd);
 				gf_free(mpd_seg_info);
-				fprintf(dash_cfg->mpd, " </SegmentTemplate>\n");
+				fprintf(dasher->mpd, " </SegmentTemplate>\n");
 			} else {
-				fprintf(dash_cfg->mpd, "/>\n");
+				fprintf(dasher->mpd, "/>\n");
 			}
 		}
-	} else if (dash_cfg->single_file_mode==1) {
+	} else if (dasher->single_file_mode==1) {
 #ifdef GENERATE_VIRTUAL_REP_SRD
 		if (dash_input->virtual_representation) {
-			fprintf(dash_cfg->mpd, " <BaseURL>%s</BaseURL>\n", SegmentName);
-			fprintf(dash_cfg->mpd, " <SegmentBase />\n");
+			fprintf(dasher->mpd, " <BaseURL>%s</BaseURL>\n", SegmentName);
+			fprintf(dasher->mpd, " <SegmentBase />\n");
 		} else
 #endif
 		{
-			fprintf(dash_cfg->mpd, " <BaseURL>%s</BaseURL>\n", gf_dasher_strip_output_dir(dash_cfg->mpd_name, gf_isom_get_filename(output) ) );
-			fprintf(dash_cfg->mpd, " <SegmentBase indexRangeExact=\"true\" indexRange=\"%d-%d\"", index_start_range, index_end_range);
+			fprintf(dasher->mpd, " <BaseURL>%s</BaseURL>\n", gf_dasher_strip_output_dir(dasher->mpd_name, gf_isom_get_filename(output) ) );
+			fprintf(dasher->mpd, " <SegmentBase indexRangeExact=\"true\" indexRange=\"%d-%d\"", index_start_range, index_end_range);
 
 			if (presentationTimeOffset)
-				fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
+				fprintf(dasher->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
 			if (!is_bs_switching) {
-				fprintf(dash_cfg->mpd, ">\n");
-				fprintf(dash_cfg->mpd, " <Initialization range=\"%d-%d\"/>\n", 0, index_start_range-1);
-				fprintf(dash_cfg->mpd, " </SegmentBase>\n");
+				fprintf(dasher->mpd, ">\n");
+				fprintf(dasher->mpd, " <Initialization range=\"%d-%d\"/>\n", 0, index_start_range-1);
+				fprintf(dasher->mpd, " </SegmentBase>\n");
 			} else {
-				fprintf(dash_cfg->mpd, "/>\n");
+				fprintf(dasher->mpd, "/>\n");
 			}
 		}
 	} else {
 		if (!seg_rad_name) {
-			fprintf(dash_cfg->mpd, " <BaseURL>%s</BaseURL>\n", gf_dasher_strip_output_dir(dash_cfg->mpd_name, gf_isom_get_filename(output) ) );
+			fprintf(dasher->mpd, " <BaseURL>%s</BaseURL>\n", gf_dasher_strip_output_dir(dasher->mpd_name, gf_isom_get_filename(output) ) );
 		}
-		fprintf(dash_cfg->mpd, " <SegmentList");
+		fprintf(dasher->mpd, " <SegmentList");
 		if (!mpd_timeline_bs) {
-			fprintf(dash_cfg->mpd, " timescale=\"%d\" duration=\"%d\"", mpd_timescale, (u32) (max_segment_duration * mpd_timescale + 0.5));
+			fprintf(dasher->mpd, " timescale=\"%d\" duration=\"%d\"", mpd_timescale, (u32) (max_segment_duration * mpd_timescale + 0.5));
 		}
 		if (presentationTimeOffset) {
-			fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
+			fprintf(dasher->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
 		}
-		if (dash_cfg->ast_offset_ms<0) {
-			fprintf(dash_cfg->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dash_cfg->ast_offset_ms / 1000.0);
+		if (dasher->ast_offset_ms<0) {
+			fprintf(dasher->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dasher->ast_offset_ms / 1000.0);
 		}
-		fprintf(dash_cfg->mpd, ">\n");
+		fprintf(dasher->mpd, ">\n");
 		/*we are not in bitstreamSwitching mode*/
 		if (!is_bs_switching) {
-			fprintf(dash_cfg->mpd, " <Initialization");
+			fprintf(dasher->mpd, " <Initialization");
 			if (!seg_rad_name) {
-				fprintf(dash_cfg->mpd, " range=\"0-"LLD"\"", init_seg_size-1);
+				fprintf(dasher->mpd, " range=\"0-"LLD"\"", init_seg_size-1);
 			} else {
 #ifdef GENERATE_VIRTUAL_REP_SRD
 				//if virtual rep, SegmentName already contains the name of the empty media segment used
 				if (!dash_input->virtual_representation)
 #endif
 				{
-					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dash_cfg->mpd_name, seg_rad_name) , !stricmp(seg_ext, "null") ? NULL : "mp4", 0, bandwidth, 0, dash_cfg->use_segment_timeline);
+					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dasher->mpd_name, seg_rad_name) , !stricmp(init_seg_ext, "null") ? NULL : init_seg_ext, 0, bandwidth, 0, dasher->use_segment_timeline);
 				}
-				fprintf(dash_cfg->mpd, " sourceURL=\"%s\"", SegmentName);
+				fprintf(dasher->mpd, " sourceURL=\"%s\"", SegmentName);
 			}
-			fprintf(dash_cfg->mpd, "/>\n");
+			fprintf(dasher->mpd, "/>\n");
 		}
 	}
 	if (mpd_bs) {
 		char *mpd_seg_info = NULL;
 		u32 size;
 		gf_bs_get_content(mpd_bs, &mpd_seg_info, &size);
-		gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
+		gf_fwrite(mpd_seg_info, 1, size, dasher->mpd);
 		gf_free(mpd_seg_info);
 	}
 
-	if (!use_url_template && (dash_cfg->single_file_mode!=1)) {
-		fprintf(dash_cfg->mpd, " </SegmentList>\n");
+	if (!use_url_template && (dasher->single_file_mode!=1)) {
+		fprintf(dasher->mpd, " </SegmentList>\n");
 	}
 
-	fprintf(dash_cfg->mpd, " </Representation>\n");
+	fprintf(dasher->mpd, " </Representation>\n");
 
 
 	/*store context*/
-	if (dash_cfg->dash_ctx) {
+	if (dasher->dash_ctx) {
 		period_duration += (u64)segment_start_time; //change to get a Double period duration
-
-		for (i=0; i<gf_list_count(fragmenters); i++) {
+		count = gf_list_count(fragmenters);
+		for (i=0; i<count; i++) {
 			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
 
 			/*InitialTSOffset is used when joining different files - if we are still in the same file , do not update it*/
 			if (tf->done) {
 				sprintf(sKey, "TKID_%d_NextDecodingTime", tf->TrackID);
 				sprintf(sOpt, LLU, tf->InitialTSOffset + tf->next_sample_dts);
-				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, sKey, sOpt);
+				gf_cfg_set_key(dasher->dash_ctx, RepSecName, sKey, sOpt);
 			}
 
-			if (dash_cfg->subduration) {
+			if (dasher->subduration) {
 				sprintf(sKey, "TKID_%d_NextSampleNum", tf->TrackID);
 				sprintf(sOpt, "%d", tf->SampleNum);
-				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, sKey, tf->done ? NULL : sOpt);
+				gf_cfg_set_key(dasher->dash_ctx, RepSecName, sKey, tf->done ? NULL : sOpt);
 
 				sprintf(sKey, "TKID_%d_LastSampleCTS", tf->TrackID);
 				sprintf(sOpt, LLU, tf->last_sample_cts);
-				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, sKey, tf->done ? NULL : sOpt);
+				gf_cfg_set_key(dasher->dash_ctx, RepSecName, sKey, tf->done ? NULL : sOpt);
 
 				sprintf(sKey, "TKID_%d_NextSampleDTS", tf->TrackID);
 				sprintf(sOpt, LLU, tf->next_sample_dts);
-				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, sKey, tf->done ? NULL : sOpt);
+				gf_cfg_set_key(dasher->dash_ctx, RepSecName, sKey, tf->done ? NULL : sOpt);
 
 				sprintf(sKey, "TKID_%d_MediaTimeToPresTime", tf->TrackID);
 				sprintf(sOpt, "%d", tf->media_time_to_pres_time_shift);
-				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, sKey, sOpt);
+				gf_cfg_set_key(dasher->dash_ctx, RepSecName, sKey, sOpt);
+
+				sprintf(sKey, "TKID_%d_LoopTSOffset", tf->TrackID);
+				sprintf(sOpt, LLU, tf->loop_ts_offset);
+				gf_cfg_set_key(dasher->dash_ctx, RepSecName, sKey, (tf->done && dasher->disable_loop) ? NULL : sOpt);
+
 			}
 		}
 		sprintf(sOpt, "%d", cur_seg);
-		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "NextSegmentIndex", sOpt);
+		gf_cfg_set_key(dasher->dash_ctx, RepSecName, "NextSegmentIndex", sOpt);
 
 		fragment_index = gf_isom_get_next_moof_number(output);
 		sprintf(sOpt, "%d", fragment_index);
-		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "NextFragmentIndex", sOpt);
-
-
-		sprintf(sOpt, LLU, period_duration);
-		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "CumulatedDuration", sOpt);
+		gf_cfg_set_key(dasher->dash_ctx, RepSecName, "NextFragmentIndex", sOpt);
 
+		sprintf(sKey, "MaxSAPType");
+		sprintf(sOpt, "%d", max_sap_type);
+		gf_cfg_set_key(dasher->dash_ctx, RepSecName, sKey, sOpt);
+
+		if (!dasher->force_session_end) {
+			sprintf(sOpt, LLU, period_duration);
+			gf_cfg_set_key(dasher->dash_ctx, RepSecName, "CumulatedDuration", sOpt);
+		}
 		if (store_dash_params) {
 			sprintf(sOpt, "%u", bandwidth);
-			gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "Bandwidth", sOpt);
+			gf_cfg_set_key(dasher->dash_ctx, RepSecName, "Bandwidth", sOpt);
+		}
+		//done with this file
+		if ((nb_tracks_done==count) && dasher->disable_loop) {
+			dasher->force_period_end = GF_TRUE;
 		}
+
 	}
 
 err_exit:
@@ -2561,6 +3182,15 @@
 	if (fragmenters) {
 		while (gf_list_count(fragmenters)) {
 			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, 0);
+			if (!e && tf->nb_cues) {
+				for (i = 0; i < tf->nb_cues; i++) {
+					if (!tf->cues[i].is_processed) {
+						GF_LOG(dasher->strict_cues ? GF_LOG_ERROR : GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Track ID %d has cue #%d not processed after segmentation\n", tf->TrackID, i));
+						if (dasher->strict_cues) e = GF_BAD_PARAM;
+					}
+				}
+			}
+			if (tf->cues) gf_free(tf->cues);
 			gf_free(tf);
 			gf_list_rem(fragmenters, 0);
 		}
@@ -2579,7 +3209,7 @@
 }
 
 
-static GF_Err dasher_isom_get_input_components_info(GF_DashSegInput *input, GF_DASHSegmenter *opts)
+static GF_Err dasher_isom_get_components_info(GF_DashSegInput *input, GF_DASHSegmenter *opts)
 {
 	u32 i;
 	GF_ISOFile *in;
@@ -2600,32 +3230,49 @@
 		if (mtype == GF_ISOM_MEDIA_HINT)
 			continue;
 
-		if (gf_isom_get_sample_count(in, i+1)<2)
-			continue;
+		//we allow single sample tracks to be dashed, might want to disable BIFS and OD ...
 
-		dur = (Double) gf_isom_get_track_duration(in, i+1);
-		dur /= gf_isom_get_timescale(in);
+		dur = 0;
+		if (gf_isom_get_edit_segment_count(in, i+1)) {
+			dur = (Double) gf_isom_get_track_duration(in, i+1);
+			dur /= gf_isom_get_timescale(in);
+		}
 		if (!dur) {
 			dur = (Double) gf_isom_get_media_duration(in, i+1);
 			dur /= gf_isom_get_media_timescale(in, i+1);
 		}
 		if (dur > input->duration) input->duration = dur;
 
+		input->components[input->nb_components].duration = dur;
+
 		input->components[input->nb_components].ID = gf_isom_get_track_id(in, i+1);
 		input->components[input->nb_components].media_type = mtype;
 		gf_isom_get_media_language(in, i+1, &input->components[input->nb_components].lang);
 
-		if (mtype == GF_ISOM_MEDIA_VISUAL) {
+ if (gf_isom_is_video_subtype(mtype)) {
 			gf_isom_get_visual_info(in, i+1, 1, &input->components[input->nb_components].width, &input->components[input->nb_components].height);
 
 			input->components[input->nb_components].fps_num = gf_isom_get_media_timescale(in, i+1);
 			/*get duration of track or of 2nd sample otherwise*/
 			if (gf_isom_get_track_duration(in, i + 1)) {
-				input->components[input->nb_components].fps_denum = (u32)(gf_isom_get_track_duration(in, i+1) * gf_isom_get_media_timescale(in, i+1) / ((gf_isom_get_sample_count(in, i+1) - 1) * gf_isom_get_timescale(in)));
+				input->components[input->nb_components].fps_denum = (u32)(gf_isom_get_media_duration(in, i+1) / gf_isom_get_sample_count(in, i+1) );
 			} else {
 				input->components[input->nb_components].fps_denum = gf_isom_get_sample_duration(in, i+1, 2);
 			}
 			gf_isom_get_pixel_aspect_ratio(in, i+1, 1, &input->components[input->nb_components].sar_num, &input->components[input->nb_components].sar_denum);
+
+			switch (gf_isom_get_media_subtype(in, i+1, 1) ) {
+			case GF_ISOM_SUBTYPE_HVT1:
+				input->components[input->nb_components].hevc_tile_type = 2;
+				break;
+			case GF_ISOM_SUBTYPE_HVC2:
+			case GF_ISOM_SUBTYPE_HEV2:
+				if (gf_isom_get_reference_count(in, i+1, GF_ISOM_REF_SABT)>0)
+					input->components[input->nb_components].hevc_tile_type = 1;
+				break;
+			default:
+				break;
+			}
 		}
 		/*non-video tracks, get lang*/
 		else if (mtype == GF_ISOM_MEDIA_AUDIO) {
@@ -2700,7 +3347,7 @@
 		if (! dasher_inputs_have_same_roles(&dash_inputs[input_idx], &dash_inputs[i]) ) {
 			continue;
 		}
-		
+
 		/* if two inputs don't have the same (number and value) as_desc they don't belong to the same AdaptationSet
 		 (use c_as_desc for AdaptationSet descriptors common to all inputs in an AS) */
 		if (dash_inputs[input_idx].nb_as_descs != dash_inputs[i].nb_as_descs)
@@ -2782,7 +3429,7 @@
 				break;
 			}
 
-			if ((mtype!=GF_ISOM_MEDIA_VISUAL) && (mtype!=GF_ISOM_MEDIA_HINT)) {
+			if (!gf_isom_is_video_subtype(mtype) && (mtype!=GF_ISOM_MEDIA_HINT)) {
 				char *lang1, *lang2;
 				lang1 = lang2 = NULL;
 				gf_isom_get_media_language(set_file, j+1, &lang1);
@@ -2796,7 +3443,7 @@
 				if (lang1) gf_free(lang1);
 				if (lang2) gf_free(lang2);
 			}
-			if (mtype==GF_ISOM_MEDIA_VISUAL) {
+			if (gf_isom_is_video_subtype(mtype) ) {
 				u32 w1, h1, w2, h2, sap_type;
 				Bool rap, roll;
 				s32 roll_dist;
@@ -2856,6 +3503,7 @@
 
 static GF_Err dasher_isom_create_init_segment(GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 adaptation_set, char *szInitName, const char *tmpdir, GF_DASHSegmenter *dash_opts, GF_DashSwitchingMode bs_switch_mode, Bool *disable_bs_switching)
 {
+	u64 max_track_duration = 0;
 	GF_Err e = GF_OK;
 	u32 i;
 	u32 single_track_id = 0;
@@ -2867,6 +3515,8 @@
 	u32 first_track = 0;
 	Bool single_segment = (dash_opts->single_file_mode==1) ? GF_TRUE : GF_FALSE;
 	GF_ISOFile *init_seg;
+	u32 force_timescale = 0;
+	GF_DashSegInput *first_dash_input = NULL;
 
 
 	probe_inband_param_set = dash_opts->inband_param_set ? 1 : 0;
@@ -2874,6 +3524,11 @@
 restart_init:
 
 	init_seg = gf_isom_open(szInitName, GF_ISOM_OPEN_WRITE, tmpdir);
+	if (dash_opts->force_test_mode) {
+		gf_isom_no_version_date_info(init_seg, 1);
+	}
+	max_track_duration = 0;
+
 	for (i=0; i<nb_dash_inputs; i++) {
 		u32 j;
 		GF_ISOFile *in;
@@ -3025,7 +3680,6 @@
 						case GF_ISOM_SUBTYPE_HVC2:
 							gf_isom_hevc_set_inband_config(init_seg, track, 1);
 							use_hevc = GF_TRUE;
-							gf_isom_set_brand_info(init_seg, GF_4CC('i','s','o','6'), 1);
 							sps_merge_failed = GF_FALSE;
 							break;
 						case GF_ISOM_SUBTYPE_AVC_H264:
@@ -3034,7 +3688,6 @@
 						case GF_ISOM_SUBTYPE_MVC_H264:
 							gf_isom_avc_set_inband_config(init_seg, track, 1);
 							use_avc3 = GF_TRUE;
-							gf_isom_set_brand_info(init_seg, GF_4CC('i','s','o','6'), 1);
 							sps_merge_failed = GF_FALSE;
 							break;
 						}
@@ -3054,11 +3707,11 @@
 					}
 				}
 			} else {
-				u32 defaultDuration, defaultSize, defaultDescriptionIndex, defaultRandomAccess;
+				u32 sample_duration, defaultSize, defaultDescriptionIndex, defaultRandomAccess;
 				u8 defaultPadding;
 				u16 defaultDegradationPriority;
 
-				gf_isom_clone_track(in, j+1, init_seg, GF_FALSE, &track);
+				gf_isom_clone_track(in, j+1, init_seg, 0, &track);
 
 				switch (gf_isom_get_media_subtype(in, j+1, 1)) {
 				case GF_ISOM_SUBTYPE_AVC_H264:
@@ -3092,18 +3745,15 @@
 					probe_inband_param_set = 0;
 					break;
 				}
-				if (gf_isom_has_sync_points(in, j+1))
-					gf_isom_set_sync_table(init_seg, track);
 
-
-				gf_isom_get_fragment_defaults(in, j+1, &defaultDuration, &defaultSize,
+				gf_isom_get_fragment_defaults(in, j+1, &sample_duration, &defaultSize,
 				 &defaultDescriptionIndex, &defaultRandomAccess,
 				 &defaultPadding, &defaultDegradationPriority);
 				//setup for fragmentation
 				e = gf_isom_setup_track_fragment(init_seg, gf_isom_get_track_id(init_seg, track),
-				 defaultDescriptionIndex, defaultDuration,
+				 defaultDescriptionIndex, sample_duration,
 				 defaultSize, (u8) defaultRandomAccess,
-				 defaultPadding, defaultDegradationPriority);
+				 defaultPadding, defaultDegradationPriority, 0);
 				if (e) break;
 			}
 			if (!e) {
@@ -3126,24 +3776,36 @@
 
 					gf_isom_set_edit_segment(init_seg, track, EditTime, SegDuration, MediaTime, EditMode);
 				}
+
+				if (max_track_duration < gf_isom_get_track_duration(in, j+1)) {
+					max_track_duration = gf_isom_get_track_duration(in, j+1);
+				}
+
+				if (!first_dash_input && !force_timescale && dash_inputs[i].sscale) {
+					force_timescale = gf_isom_get_media_timescale(in, j+1);
+				}
 			}
 		}
-		if (!i) {
-			if (use_hevc || use_avc3) {
-				gf_isom_set_brand_info(init_seg, GF_4CC('i','s','o','6'), 1);
-			} else {
-				gf_isom_set_brand_info(init_seg, GF_4CC('i','s','o','5'), 1);
-			}
+
+		if (!first_dash_input) {
+			first_dash_input = &dash_inputs[i];
+
+			//force ISO6 since we use tfdt all over the place
+			gf_isom_set_brand_info(init_seg, GF_ISOM_BRAND_ISO6, 1);
+			gf_isom_modify_alternate_brand(init_seg, GF_ISOM_BRAND_ISOM, 0);
+
 			/*DASH self-init media segment*/
 			if (single_segment) {
-				gf_isom_modify_alternate_brand(init_seg, GF_4CC('d','s','m','s'), 1);
+				gf_isom_modify_alternate_brand(init_seg, GF_ISOM_BRAND_DSMS, 1);
 			} else {
-				gf_isom_modify_alternate_brand(init_seg, GF_4CC('d','a','s','h'), 1);
+				gf_isom_modify_alternate_brand(init_seg, GF_ISOM_BRAND_DASH, 1);
 			}
 
-			if (!dash_opts->pssh_moof) {
+			if ((dash_opts->pssh_mode==GF_DASH_PSSH_MOOV) || (dash_opts->pssh_mode==GF_DASH_PSSH_MOOV_MPD) ) {
 				e = gf_isom_clone_pssh(init_seg, in, GF_FALSE);
 			}
+
+			gf_isom_set_movie_duration(init_seg, max_track_duration);
 		}
 		gf_isom_close(in);
 	}
@@ -3160,6 +3822,8 @@
 		gf_delete_file(szInitName);
 		return GF_OK;
 	} else {
+		if (force_timescale) gf_isom_set_timescale(init_seg, force_timescale);
+
 		e = gf_isom_close(init_seg);
 
 		if (probe_inband_param_set) {
@@ -3174,114 +3838,12 @@
 	return e;
 }
 
-static GF_Err dasher_isom_adjust_last_sample(GF_ISOFile *in, const u32 trackNumber, const u32 track_duration, const u32 target_duration_in_timescale, const Double fragment_duration_in_sec) {
-	const u32 fragment_duration_in_media_timescale = (u32)(fragment_duration_in_sec * gf_isom_get_media_timescale(in, trackNumber));
-	const u32 last_sample_duration = gf_isom_get_sample_duration(in, trackNumber, gf_isom_get_sample_count(in, trackNumber));
-	const u32 new_last_sample_duration_in_media_timescale = (u32) ( last_sample_duration + (target_duration_in_timescale - MIN(track_duration, target_duration_in_timescale)) * (u64)gf_isom_get_media_timescale(in, trackNumber) / gf_isom_get_timescale(in) );
-
-	if (new_last_sample_duration_in_media_timescale != last_sample_duration) {
-		if (!is_splitable(gf_isom_get_media_type(in, trackNumber)) && (new_last_sample_duration_in_media_timescale > fragment_duration_in_media_timescale)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Wrong user parameter would lead to set the last sample duration to %u while fragment duration is %u. Aborting.\n", new_last_sample_duration_in_media_timescale, fragment_duration_in_media_timescale));
-			return GF_BAD_PARAM;
-		} else {
-			return gf_isom_set_last_sample_duration(in, trackNumber, new_last_sample_duration_in_media_timescale);
-		}
-	} else {
-		return GF_OK;
-	}
-}
-
-static u32 isom_get_track_duration_from_samples_in_timescale(GF_ISOFile *in, u32 trackNumber) {
-	u64 track_duration = 0;
-	u32 sampleNumber;
-	for (sampleNumber=1; sampleNumber<=gf_isom_get_sample_count(in, trackNumber); ++sampleNumber) {
-		track_duration += gf_isom_get_sample_duration(in, trackNumber, sampleNumber);
-	}
-	track_duration = track_duration * gf_isom_get_timescale(in) / gf_isom_get_media_timescale(in, trackNumber);
-	return (u32)track_duration;
-}
-
-static GF_Err dasher_isom_force_duration(GF_ISOFile *in, const Double duration_in_sec, const Double fragment_duration_in_sec) {
-	GF_Err e = GF_OK;
-
-	u32 trackNumber, trackCount=gf_isom_get_track_count(in);
-	for (trackNumber=1; trackNumber<=trackCount; ++trackNumber) {
-		const u32 target_duration_in_timescale = (u32)(duration_in_sec * gf_isom_get_timescale(in));
-		const u32 track_duration = isom_get_track_duration_from_samples_in_timescale(in, trackNumber);
-		gf_set_progress("ISO File Force Duration", trackNumber-1, trackCount);
-
-		if (target_duration_in_timescale < track_duration) {
-			u32 i, j, track_duration2, sample_count = gf_isom_get_sample_count(in, trackNumber);
-			track_duration2 = 0;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Target track %u duration shorter than %lfs: removing samples and adjusting last sample duration.\n", trackNumber, duration_in_sec));
-			for (i=1; i <= sample_count; ++i) {
-				u32 di;
-				GF_ISOSample *s = gf_isom_get_sample(in, trackNumber, i, &di);
-				gf_set_progress("ISO File Force Duration", (trackNumber-1)*sample_count+i, trackCount*sample_count);
-				if (s->DTS >= duration_in_sec * gf_isom_get_media_timescale(in, trackNumber)) {
-					track_duration2 = (u32)(s->DTS * gf_isom_get_timescale(in) / gf_isom_get_media_timescale(in, trackNumber));
-					break;
-				}
-			}
-			for (j=i; j <= sample_count; ++j) {
-				u32 di;
-				GF_ISOSample *s = gf_isom_get_sample(in, trackNumber, i, &di);
-				gf_set_progress("ISO File Force Duration", (trackNumber-1)*sample_count+j, trackCount*sample_count);
-				e = gf_isom_remove_sample(in, trackNumber, i);
-				gf_isom_sample_del(&s);
-				assert(e == GF_OK);
-			}
-			e = dasher_isom_adjust_last_sample(in, trackNumber, track_duration2, target_duration_in_timescale, fragment_duration_in_sec);
-		} else if (target_duration_in_timescale > track_duration) {
-			u32 i, edit_count;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Target track %u duration longer than %lfs: increase the last sample duration.\n", trackNumber, duration_in_sec));
-			e = dasher_isom_adjust_last_sample(in, trackNumber, track_duration, target_duration_in_timescale, fragment_duration_in_sec);
-			if (e) break;
-			edit_count = gf_isom_get_edit_segment_count(in, trackNumber);
-			for (i=1; i<=edit_count; ++i) {
-				u64 EditTime, SegmentDuration, MediaTime;
-				u8 EditMode;
-				gf_set_progress("ISO File Force Duration", (trackNumber-1)*edit_count+i, trackCount*edit_count);
-				e = gf_isom_get_edit_segment(in, trackNumber, i, &EditTime, &SegmentDuration, &MediaTime, &EditMode);
-				if (e) {
-					e = GF_OK;
-					continue;
-				}
-				if ((EditTime + MediaTime) * gf_isom_get_media_timescale(in, trackNumber) > (track_duration - SegmentDuration) * gf_isom_get_timescale(in)) {
-					u64 EditDuration = target_duration_in_timescale - (track_duration - SegmentDuration);
-					e = gf_isom_set_edit_segment(in, trackNumber, EditTime, EditDuration, MediaTime, EditMode);
-					if (e)
-						break;
-				}
-				if (EditMode == GF_ISOM_EDIT_NORMAL) {
-					if (i < edit_count) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Track %u, %u edit lists in track (max 1 allowed). Consider re-importing the content in MP4Box.\n", trackNumber, edit_count));
-						return GF_BAD_PARAM;
-					}
-
-					break;
-				}
-			}
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Target track %u duration already equal to %lfs. Nothing to do.\n", trackNumber, duration_in_sec));
-		}
-
-		if (e)
-			break;
-	}
-
-	gf_set_progress("ISO File Force Duration", 1, 1);
-	gf_isom_update_duration(in);
-
-	return e;
-}
-
-static GF_Err dasher_isom_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenter *dash_cfg, Bool first_in_set)
+static GF_Err dasher_isom_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenter *dasher, Bool first_in_set)
 {
 	GF_Err e = GF_OK;
 
 	if (!dash_input->isobmf_input) {
-		GF_ISOFile *in = gf_isom_open(dash_input->file_name, dash_input->media_duration ? GF_ISOM_OPEN_EDIT : GF_ISOM_OPEN_READ, dash_cfg->tmpdir);
+		GF_ISOFile *in = gf_isom_open(dash_input->file_name, GF_ISOM_OPEN_READ, dasher->tmpdir);
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] ISOBMFF opened\n"));
 
@@ -3290,20 +3852,28 @@
 			return GF_BAD_PARAM;
 		}
 
+#if 0
 		if (dash_input->media_duration) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Forcing media duration to %lfs.\n", dash_input->media_duration));
-			e = dasher_isom_force_duration(in, dash_input->media_duration, dash_cfg->fragment_duration);
+			e = dasher_isom_force_duration(in, dash_input->media_duration, dasher->fragment_duration);
 			if (e) {
 				gf_isom_delete(in);
 				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Media duration couldn't be forced. Aborting.\n"));
 				return e;
 			}
 		}
+#endif
+
 		dash_input->isobmf_input = in;
 	}
 
 
-	return gf_media_isom_segment_file(dash_input->isobmf_input, szOutName, dash_cfg, dash_input, first_in_set);
+	e = isom_segment_file(dash_input->isobmf_input, szOutName, dasher, dash_input, first_in_set);
+	if(dash_input->no_cache){
+		gf_isom_delete(dash_input->isobmf_input);
+		dash_input->isobmf_input=NULL;
+	}
+	return e;
 }
 
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
@@ -3377,7 +3947,7 @@
 				break;
 			}
 			/*make sure we use the same aspect ratio*/
-			if (src_tk->type==GF_ISOM_MEDIA_VISUAL) {
+			if (gf_isom_is_video_subtype(src_tk->type) ) {
 				if (src_tk->video_info.width * probe_tk->video_info.height != src_tk->video_info.height * probe_tk->video_info.width) {
 					valid_in_adaptation_set = GF_FALSE;
 					break;
@@ -4086,7 +4656,7 @@
 
 #define NB_TSPCK_IO_BYTES 18800
 
-static GF_Err dasher_mp2t_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenter *dash_cfg, Bool first_in_set)
+static GF_Err dasher_mp2t_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenter *dasher, Bool first_in_set)
 {
 	GF_TSSegmenter ts_seg;
 	Bool rewrite_input = GF_FALSE;
@@ -4103,7 +4673,7 @@
 	u32 bandwidth = 0;
 	u32 segment_index;
 	/*compute name for indexed segments*/
-	const char *basename = gf_dasher_strip_output_dir(dash_cfg->mpd_name, szOutName);
+	const char *basename = gf_dasher_strip_output_dir(dasher->mpd_name, szOutName);
 
 	if (dash_input->media_duration) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] media duration cannot be forced with MPEG2-TS segmenter. Ignoring.\n"));
@@ -4113,8 +4683,8 @@
 	e = dasher_get_ts_demux(&ts_seg, dash_input->file_name, 0);
 	if (e) return e;
 
-	ts_seg.segment_duration = dash_cfg->segment_duration;
-	ts_seg.segment_at_rap = dash_cfg->segments_start_with_rap;
+	ts_seg.segment_duration = dasher->segment_duration;
+	ts_seg.segment_at_rap = dasher->segments_start_with_rap;
 
 	ts_seg.bandwidth = (u32) (ts_seg.file_size * 8 / dash_input->duration);
 
@@ -4124,11 +4694,11 @@
 	ts_seg.index_file = NULL;
 	ts_seg.index_bs = NULL;
 	presentationTimeOffset=0;
-	if (!dash_cfg->dash_ctx && (dash_cfg->use_url_template != 2)) {
+	if (!dasher->dash_ctx && (dasher->use_url_template != 2)) {
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		GF_SegmentTypeBox *styp;
 
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, GF_TRUE, IdxName, szOutName, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dash_cfg->seg_rad_name, "six", 0, 0, 0, dash_cfg->use_segment_timeline);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, GF_TRUE, IdxName, szOutName, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dasher->seg_rad_name, "six", 0, 0, 0, dasher->use_segment_timeline);
 
 		ts_seg.index_file = gf_fopen(IdxName, "wb");
 		if (!ts_seg.index_file) {
@@ -4139,7 +4709,7 @@
 		ts_seg.index_bs = gf_bs_from_file(ts_seg.index_file, GF_BITSTREAM_WRITE);
 
 		styp = (GF_SegmentTypeBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_STYP);
-		styp->majorBrand = GF_4CC('r','i','s','x');
+		styp->majorBrand = GF_ISOM_BRAND_RISX;
 		styp->minorVersion = 0;
 		styp->altBrand = (u32*)gf_malloc(sizeof(u32));
 		styp->altBrand[0] = styp->majorBrand;
@@ -4150,18 +4720,18 @@
 #endif
 	}
 
-	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, GF_TRUE, IdxName, basename, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dash_cfg->seg_rad_name, "six", 0, 0, 0, dash_cfg->use_segment_timeline);
+	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, GF_TRUE, IdxName, basename, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dasher->seg_rad_name, "six", 0, 0, 0, dasher->use_segment_timeline);
 
 	ts_seg.PCR_DTS_initial_diff = (u64) -1;
-	ts_seg.subduration = (u32) (dash_cfg->subduration * 90000);
+	ts_seg.subduration = (u32) (dasher->subduration * 90000);
 
 	szSectionName[0] = 0;
-	if (dash_cfg->dash_ctx) {
+	if (dasher->dash_ctx) {
 		sprintf(szSectionName, "Representation_%s", dash_input->representationID);
 		sprintf(szRepURLsSecName, "URLs_%s", dash_input->representationID);
 
 		/*restart where we left last time*/
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "ByteOffset");
+		opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "ByteOffset");
 		if (opt) {
 			u64 offset;
 			sscanf(opt, LLU, &offset);
@@ -4184,16 +4754,16 @@
 			ts_seg.ts->pck_number = (u32) (offset/188);
 		}
 
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "InitialDTSOffset");
+		opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "InitialDTSOffset");
 		if (opt) sscanf(opt, LLU, &ts_seg.PCR_DTS_initial_diff);
 
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "PresentationTimeOffset");
+		opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "PresentationTimeOffset");
 		if (opt) {
 			sscanf(opt, LLU, &presentationTimeOffset);
 			presentationTimeOffset++;
 		}
 
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "DurationAtLastPass");
+		opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "DurationAtLastPass");
 		if (opt) sscanf(opt, LLD, &ts_seg.duration_at_last_pass);
 	}
 
@@ -4212,9 +4782,9 @@
 
 	if (!presentationTimeOffset) {
 		presentationTimeOffset = 1 + ts_seg.first_PTS;
-		if (dash_cfg->dash_ctx) {
+		if (dasher->dash_ctx) {
 			sprintf(szOpt, LLU, ts_seg.first_PTS);
-			gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "PresentationTimeOffset", szOpt);
+			gf_cfg_set_key(dasher->dash_ctx, szSectionName, "PresentationTimeOffset", szOpt);
 		}
 	}
 
@@ -4228,7 +4798,7 @@
 	m2ts_sidx_finalize_size(&ts_seg, ts_seg.file_size);
 	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Indexing done (1 sidx, %d entries).\n", ts_seg.sidx->nb_refs));
 
-	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, GF_TRUE, IdxName, basename, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->seg_rad_name ? dash_cfg->seg_rad_name : szOutName ), "six", 0, 0, 0, dash_cfg->use_segment_timeline);
+	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, GF_TRUE, IdxName, basename, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dasher->seg_rad_name ? dasher->seg_rad_name : szOutName, "six", 0, 0, 0, dasher->use_segment_timeline);
 
 
 	memset(is_pes, 0, sizeof(u8)*GF_M2TS_MAX_STREAMS);
@@ -4240,53 +4810,53 @@
 	bandwidth = dash_input->bandwidth;
 	if (!bandwidth) bandwidth = ts_seg.bandwidth;
 
-	if (dash_cfg->dash_ctx) {
+	if (dasher->dash_ctx) {
 
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "Setup");
+		opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "Setup");
 		if (!opt || strcmp(opt, "yes")) {
-			gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "Setup", "yes");
-			gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "ID", dash_input->representationID);
+			gf_cfg_set_key(dasher->dash_ctx, szSectionName, "Setup", "yes");
+			gf_cfg_set_key(dasher->dash_ctx, szSectionName, "ID", dash_input->representationID);
 		} else {
 			if (!bandwidth) {
-				opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "Bandwidth");
+				opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "Bandwidth");
 				if (opt) sscanf(opt, "%u", &bandwidth);
 			}
 
-			opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "StartIndex");
+			opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "StartIndex");
 			if (opt) sscanf(opt, "%u", &segment_index);
 
-			opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "PCR90kOffset");
+			opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "PCR90kOffset");
 			if (opt) sscanf(opt, LLU, &pcr_shift);
 
-			opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "CumulatedDuration");
+			opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "CumulatedDuration");
 			if (opt) {
 				u64 val;
 				sscanf(opt, LLU, &val);
-				cumulated_duration = ((Double) val) / dash_cfg->dash_scale;
+				cumulated_duration = ((Double) val) / dasher->dash_scale;
 			}
 		}
 	}
 
 	/*write segment template for all representations*/
-	if (first_in_set && dash_cfg->seg_rad_name && dash_cfg->use_url_template && !dash_cfg->variable_seg_rad_name) {
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, GF_TRUE, SegName, basename, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
-		fprintf(dash_cfg->mpd, " <SegmentTemplate timescale=\"90000\" duration=\"%d\" startNumber=\"%d\" media=\"%s\"", (u32) (90000*dash_cfg->segment_duration), segment_index, SegName);
+	if (first_in_set && dasher->seg_rad_name && dasher->use_url_template && !dasher->variable_seg_rad_name) {
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, GF_TRUE, SegName, basename, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dasher->mpd_name, dasher->seg_rad_name), "ts", 0, bandwidth, segment_index, dasher->use_segment_timeline);
+		fprintf(dasher->mpd, " <SegmentTemplate timescale=\"90000\" duration=\"%d\" startNumber=\"%d\" media=\"%s\"", (u32) (90000*dasher->segment_duration), segment_index, SegName);
 		//the SIDX we have is not compatible with the spec - until fixed, disable this
 #if 0
-		if (!dash_cfg->dash_ctx) {
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, 1, IdxName, basename, dash_input->representationID, gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->seg_rad_name), "six", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
-			fprintf(dash_cfg->mpd, " index=\"%s\"", IdxName);
+		if (!dasher->dash_ctx) {
+			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, 1, IdxName, basename, dash_input->representationID, gf_dasher_strip_output_dir(dasher->mpd_name, dasher->seg_rad_name), "six", 0, bandwidth, segment_index, dasher->use_segment_timeline);
+			fprintf(dasher->mpd, " index=\"%s\"", IdxName);
 		}
 #endif
 
-		if (dash_cfg->ast_offset_ms<0) {
-			fprintf(dash_cfg->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dash_cfg->ast_offset_ms / 1000.0);
+		if (dasher->ast_offset_ms<0) {
+			fprintf(dasher->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dasher->ast_offset_ms / 1000.0);
 		}
-		fprintf(dash_cfg->mpd, "/>\n");
+		fprintf(dasher->mpd, "/>\n");
 	}
 
 
-	fprintf(dash_cfg->mpd, " <Representation id=\"%s\" mimeType=\"video/mp2t\"", dash_input->representationID);
+	fprintf(dasher->mpd, " <Representation id=\"%s\" mimeType=\"video/mp2t\"", dash_input->representationID);
 	szCodecs[0] = 0;
 	for (i=0; i<dash_input->nb_components; i++) {
 		if (strlen(dash_input->components[i].szCodec))
@@ -4295,108 +4865,110 @@
 		strcat(szCodecs, dash_input->components[i].szCodec);
 
 		if (dash_input->components[i].width && dash_input->components[i].height)
-			fprintf(dash_cfg->mpd, " width=\"%u\" height=\"%u\"", dash_input->components[i].width, dash_input->components[i].height);
+			fprintf(dasher->mpd, " width=\"%u\" height=\"%u\"", dash_input->components[i].width, dash_input->components[i].height);
 
 		if (dash_input->components[i].sample_rate)
-			fprintf(dash_cfg->mpd, " audioSamplingRate=\"%d\"", dash_input->components[i].sample_rate);
+			fprintf(dasher->mpd, " audioSamplingRate=\"%d\"", dash_input->components[i].sample_rate);
 	}
 	if (strlen(szCodecs))
-		fprintf(dash_cfg->mpd, " codecs=\"%s\"", szCodecs);
+		fprintf(dasher->mpd, " codecs=\"%s\"", szCodecs);
 
-	fprintf(dash_cfg->mpd, " startWithSAP=\"%d\"", dash_cfg->segments_start_with_rap ? 1 : 0);
-	fprintf(dash_cfg->mpd, " bandwidth=\"%d\"", bandwidth);
-	fprintf(dash_cfg->mpd, ">\n");
+	fprintf(dasher->mpd, " startWithSAP=\"%d\"", dasher->segments_start_with_rap ? 1 : 0);
+	fprintf(dasher->mpd, " bandwidth=\"%d\"", bandwidth);
+	fprintf(dasher->mpd, ">\n");
 
 	/* writing Representation level descriptors */
 	if (dash_input->nb_rep_descs) {
 		for (i=0; i<dash_input->nb_rep_descs; i++) {
-			fprintf(dash_cfg->mpd, " %s\n", dash_input->rep_descs[i]);
+			if (strchr(dash_input->rep_descs[i], '<') != NULL) {
+				fprintf(dasher->mpd, " %s\n", dash_input->rep_descs[i]);
+			}
 		}
 	}
 
 
 	for (i=0; i<ts_seg.sidx->nb_refs; i++) {
 		GF_SIDXReference *ref = &ts_seg.sidx->refs[i];
-		if (dash_cfg->max_segment_duration * ts_seg.sidx->timescale < ref->subsegment_duration) {
-			dash_cfg->max_segment_duration = (Double) ref->subsegment_duration;
-			dash_cfg->max_segment_duration /= ts_seg.sidx->timescale;
+		if (dasher->max_segment_duration * ts_seg.sidx->timescale < ref->subsegment_duration) {
+			dasher->max_segment_duration = (Double) ref->subsegment_duration;
+			dasher->max_segment_duration /= ts_seg.sidx->timescale;
 		}
 	}
 
 
-	if (dash_cfg->single_file_mode==1) {
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, basename, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
-		fprintf(dash_cfg->mpd, " <BaseURL>%s</BaseURL>\n", SegName);
+	if (dasher->single_file_mode==1) {
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, basename, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dasher->mpd_name, dasher->seg_rad_name), "ts", 0, bandwidth, segment_index, dasher->use_segment_timeline);
+		fprintf(dasher->mpd, " <BaseURL>%s</BaseURL>\n", SegName);
 
-		fprintf(dash_cfg->mpd, " <SegmentBase>\n");
-		fprintf(dash_cfg->mpd, " <RepresentationIndex sourceURL=\"%s\"/>\n", IdxName);
-		fprintf(dash_cfg->mpd, " </SegmentBase>\n");
+		fprintf(dasher->mpd, " <SegmentBase>\n");
+		fprintf(dasher->mpd, " <RepresentationIndex sourceURL=\"%s\"/>\n", IdxName);
+		fprintf(dasher->mpd, " </SegmentBase>\n");
 
 		/*we rewrite the file*/
 		rewrite_input = GF_TRUE;
 	} else {
-		if (dash_cfg->seg_rad_name && dash_cfg->use_url_template) {
-			if (dash_cfg->variable_seg_rad_name) {
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, GF_TRUE, SegName, basename, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
-				fprintf(dash_cfg->mpd, " <SegmentTemplate timescale=\"90000\" duration=\"%d\" startNumber=\"%d\" media=\"%s\"", (u32) (90000*dash_cfg->segment_duration), segment_index, SegName);
+		if (dasher->seg_rad_name && dasher->use_url_template) {
+			if (dasher->variable_seg_rad_name) {
+				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, GF_TRUE, SegName, basename, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dasher->mpd_name, dasher->seg_rad_name), "ts", 0, bandwidth, segment_index, dasher->use_segment_timeline);
+				fprintf(dasher->mpd, " <SegmentTemplate timescale=\"90000\" duration=\"%d\" startNumber=\"%d\" media=\"%s\"", (u32) (90000*dasher->segment_duration), segment_index, SegName);
 
 				//the SIDX we have is not compatible with the spec - until fixed, disable this
 #if 0
-				if (!dash_cfg->dash_ctx) {
-					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, 1, IdxName, basename, dash_input->representationID, gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->seg_rad_name), "six", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
-					fprintf(dash_cfg->mpd, " index=\"%s\"", IdxName);
+				if (!dasher->dash_ctx) {
+					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, 1, IdxName, basename, dash_input->representationID, gf_dasher_strip_output_dir(dasher->mpd_name, dasher->seg_rad_name), "six", 0, bandwidth, segment_index, dasher->use_segment_timeline);
+					fprintf(dasher->mpd, " index=\"%s\"", IdxName);
 				}
 #endif
 
 				if (presentationTimeOffset > 1)
-					fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset - 1);
+					fprintf(dasher->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset - 1);
 
-				if (dash_cfg->ast_offset_ms<0) {
-					fprintf(dash_cfg->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dash_cfg->ast_offset_ms / 1000.0);
+				if (dasher->ast_offset_ms<0) {
+					fprintf(dasher->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dasher->ast_offset_ms / 1000.0);
 				}
-				fprintf(dash_cfg->mpd, "/>\n");
+				fprintf(dasher->mpd, "/>\n");
 			} else if (presentationTimeOffset > 1) {
-				fprintf(dash_cfg->mpd, " <SegmentTemplate presentationTimeOffset=\""LLD"\"/>\n", presentationTimeOffset - 1);
+				fprintf(dasher->mpd, " <SegmentTemplate presentationTimeOffset=\""LLD"\"/>\n", presentationTimeOffset - 1);
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] PTSOffset "LLD" - startNumber %d - time %g\n", presentationTimeOffset - 1, segment_index, (Double) (s64) (ts_seg.sidx->earliest_presentation_time + pcr_shift) / 90000.0));
 			}
 		} else {
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, basename, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dash_cfg->mpd_name, dash_cfg->seg_rad_name ? dash_cfg->seg_rad_name : szOutName), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
-			if (dash_cfg->single_file_mode)
-				fprintf(dash_cfg->mpd, " <BaseURL>%s</BaseURL>\n",SegName);
-			fprintf(dash_cfg->mpd, " <SegmentList timescale=\"90000\" duration=\"%d\"", (u32) (90000*dash_cfg->segment_duration));
+			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT_NO_OUTPUT, GF_TRUE, SegName, basename, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dasher->mpd_name, dasher->seg_rad_name ? dasher->seg_rad_name : szOutName), "ts", 0, bandwidth, segment_index, dasher->use_segment_timeline);
+			if (dasher->single_file_mode)
+				fprintf(dasher->mpd, " <BaseURL>%s</BaseURL>\n",SegName);
+			fprintf(dasher->mpd, " <SegmentList timescale=\"90000\" duration=\"%d\"", (u32) (90000*dasher->segment_duration));
 
 			if (presentationTimeOffset > 1)
-				fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset - 1);
+				fprintf(dasher->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset - 1);
 
-			if (dash_cfg->ast_offset_ms<0) {
-				fprintf(dash_cfg->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dash_cfg->ast_offset_ms / 1000.0);
+			if (dasher->ast_offset_ms<0) {
+				fprintf(dasher->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dasher->ast_offset_ms / 1000.0);
 			}
-			fprintf(dash_cfg->mpd, ">\n");
+			fprintf(dasher->mpd, ">\n");
 
-			if (!dash_cfg->dash_ctx) {
-				fprintf(dash_cfg->mpd, " <RepresentationIndex sourceURL=\"%s\"/>\n", IdxName);
+			if (!dasher->dash_ctx) {
+				fprintf(dasher->mpd, " <RepresentationIndex sourceURL=\"%s\"/>\n", IdxName);
 			}
 		}
 
 		/*rewrite previous SegmentList entries*/
-		if ( dash_cfg->dash_ctx && ((dash_cfg->single_file_mode==2) || (!dash_cfg->single_file_mode && !dash_cfg->use_url_template))) {
+		if ( dasher->dash_ctx && ((dasher->single_file_mode==2) || (!dasher->single_file_mode && !dasher->use_url_template))) {
 			/*rewrite previous URLs*/
 			const char *opt;
 			u32 count, i;
-			count = gf_cfg_get_key_count(dash_cfg->dash_ctx, szRepURLsSecName);
+			count = gf_cfg_get_key_count(dasher->dash_ctx, szRepURLsSecName);
 			for (i=0; i<count; i++) {
-				const char *key_name = gf_cfg_get_key_name(dash_cfg->dash_ctx, szRepURLsSecName, i);
-				opt = gf_cfg_get_key(dash_cfg->dash_ctx, szRepURLsSecName, key_name);
-				fprintf(dash_cfg->mpd, " %s\n", opt);
+				const char *key_name = gf_cfg_get_key_name(dasher->dash_ctx, szRepURLsSecName, i);
+				opt = gf_cfg_get_key(dasher->dash_ctx, szRepURLsSecName, key_name);
+				fprintf(dasher->mpd, " %s\n", opt);
 			}
 		}
 
-		if (dash_cfg->single_file_mode==2) {
+		if (dasher->single_file_mode==2) {
 
 			start = ts_seg.sidx->first_offset;
 			for (i=0; i<ts_seg.sidx->nb_refs; i++) {
 				GF_SIDXReference *ref = &ts_seg.sidx->refs[i];
-				fprintf(dash_cfg->mpd, " <SegmentURL mediaRange=\""LLD"-"LLD"\"/>\n", start, start+ref->reference_size-1);
+				fprintf(dasher->mpd, " <SegmentURL mediaRange=\""LLD"-"LLD"\"/>\n", start, start+ref->reference_size-1);
 				start += ref->reference_size;
 			}
 			rewrite_input = GF_TRUE;
@@ -4411,11 +4983,11 @@
 				char buf[NB_TSPCK_IO_BYTES];
 				GF_SIDXReference *ref = &ts_seg.sidx->refs[i];
 
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, szOutName, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dash_cfg->seg_rad_name, "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
+				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, szOutName, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dasher->seg_rad_name, "ts", 0, bandwidth, segment_index, dasher->use_segment_timeline);
 
 				/*warning - we may introduce repeated sequence number when concatenating files. We should use switching
 				segments to force reset of the continuity counter for all our pids - we don't because most players don't car ...*/
-				if (dash_cfg->use_url_template != 2) {
+				if (dasher->use_url_template != 2) {
 					dst = gf_fopen(SegName, "wb");
 					if (!dst) {
 						gf_fclose(src);
@@ -4427,7 +4999,7 @@
 					dur = ref->subsegment_duration;
 					dur /= 90000;
 
-					gf_dasher_store_segment_info(dash_cfg, dash_input->representationID, SegName, (u64) (current_time*dash_cfg->dash_scale), (u64) ((current_time+dur)*dash_cfg->dash_scale));
+					gf_dasher_store_segment_info(dasher, dash_input->representationID, SegName, (u64) (current_time*dasher->dash_scale), (u64) ((current_time+dur)*dasher->dash_scale), dasher->dash_scale);
 
 					current_time += dur;
 
@@ -4455,15 +5027,15 @@
 				}
 				start += ref->reference_size;
 
-				if (!dash_cfg->use_url_template) {
-					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, basename, dash_input->representationID, NULL, dash_cfg->seg_rad_name, "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
-					fprintf(dash_cfg->mpd, " <SegmentURL media=\"%s\"/>\n", SegName);
+				if (!dasher->use_url_template) {
+					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, basename, dash_input->representationID, NULL, dasher->seg_rad_name, "ts", 0, bandwidth, segment_index, dasher->use_segment_timeline);
+					fprintf(dasher->mpd, " <SegmentURL media=\"%s\"/>\n", SegName);
 
-					if (dash_cfg->dash_ctx) {
+					if (dasher->dash_ctx) {
 						char szKey[100], szVal[4046];
 						sprintf(szKey, "UrlInfo%d", segment_index);
 						sprintf(szVal, "<SegmentURL media=\"%s\"/>", SegName);
-						gf_cfg_set_key(dash_cfg->dash_ctx, szRepURLsSecName, szKey, szVal);
+						gf_cfg_set_key(dasher->dash_ctx, szRepURLsSecName, szKey, szVal);
 					}
 				}
 
@@ -4472,8 +5044,8 @@
 			}
 			gf_fclose(src);
 		}
-		if (!dash_cfg->seg_rad_name || !dash_cfg->use_url_template) {
-			fprintf(dash_cfg->mpd, " </SegmentList>\n");
+		if (!dasher->seg_rad_name || !dasher->use_url_template) {
+			fprintf(dasher->mpd, " </SegmentList>\n");
 		}
 	}
 
@@ -4481,7 +5053,7 @@
 		FILE *in, *out;
 		u64 fsize, done;
 		char buf[NB_TSPCK_IO_BYTES];
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, szOutName, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dash_cfg->seg_rad_name, "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, szOutName, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dasher->seg_rad_name, "ts", 0, bandwidth, segment_index, dasher->use_segment_timeline);
 		out = gf_fopen(SegName, "wb");
 		if (!out) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot create segment file %s\n", SegName));
@@ -4509,29 +5081,29 @@
 		gf_fclose(out);
 	}
 
-	fprintf(dash_cfg->mpd, " </Representation>\n");
+	fprintf(dasher->mpd, " </Representation>\n");
 
-	if (dash_cfg->dash_ctx) {
+	if (dasher->dash_ctx) {
 		sprintf(szOpt, "%u", bandwidth);
-		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "Bandwidth", szOpt);
+		gf_cfg_set_key(dasher->dash_ctx, szSectionName, "Bandwidth", szOpt);
 
 		sprintf(szOpt, "%u", segment_index);
-		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "StartIndex", szOpt);
+		gf_cfg_set_key(dasher->dash_ctx, szSectionName, "StartIndex", szOpt);
 
-		sprintf(szOpt, LLU, (u64) (dash_cfg->dash_scale*ts_seg.segment_duration) );
-		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "CumulatedDuration", szOpt);
+		sprintf(szOpt, LLU, (u64) (dasher->dash_scale*ts_seg.segment_duration) );
+		gf_cfg_set_key(dasher->dash_ctx, szSectionName, "CumulatedDuration", szOpt);
 
 		sprintf(szOpt, LLU, next_pcr_shift + pcr_shift);
-		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "PCR90kOffset", szOpt);
+		gf_cfg_set_key(dasher->dash_ctx, szSectionName, "PCR90kOffset", szOpt);
 
 		sprintf(szOpt, LLU, ts_seg.suspend_indexing);
-		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "ByteOffset", ts_seg.suspend_indexing ? szOpt : NULL);
+		gf_cfg_set_key(dasher->dash_ctx, szSectionName, "ByteOffset", ts_seg.suspend_indexing ? szOpt : NULL);
 
 		sprintf(szOpt, LLD, ts_seg.duration_at_last_pass);
-		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "DurationAtLastPass", ts_seg.suspend_indexing ? szOpt : NULL);
+		gf_cfg_set_key(dasher->dash_ctx, szSectionName, "DurationAtLastPass", ts_seg.suspend_indexing ? szOpt : NULL);
 
 		sprintf(szOpt, LLU, ts_seg.PCR_DTS_initial_diff);
-		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "InitialDTSOffset", ts_seg.suspend_indexing ? szOpt : NULL);
+		gf_cfg_set_key(dasher->dash_ctx, szSectionName, "InitialDTSOffset", ts_seg.suspend_indexing ? szOpt : NULL);
 	}
 
 	if (ts_seg.sidx && ts_seg.index_bs) {
@@ -4549,7 +5121,7 @@
 	if (ts_seg.index_bs) gf_bs_del(ts_seg.index_bs);
 	if (ts_seg.index_file) {
 		gf_fclose(ts_seg.index_file);
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, GF_TRUE, IdxName, szOutName, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dash_cfg->seg_rad_name, "six", 0, 0, 0, dash_cfg->use_segment_timeline);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, GF_TRUE, IdxName, szOutName, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dasher->seg_rad_name, "six", 0, 0, 0, dasher->use_segment_timeline);
 		gf_delete_file(IdxName);
 	}
 	dasher_del_ts_demux(&ts_seg);
@@ -4595,7 +5167,7 @@
 		strcpy(dash_input->szMime, "video/mp4");
 		dash_input->dasher_create_init_segment = dasher_isom_create_init_segment;
 		dash_input->dasher_input_classify = dasher_isom_classify_input;
-		dash_input->dasher_get_components_info = dasher_isom_get_input_components_info;
+		dash_input->dasher_get_components_info = dasher_isom_get_components_info;
 		dash_input->dasher_segment_file = dasher_isom_segment_file;
 
 		file = gf_isom_open(dash_input->file_name, GF_ISOM_OPEN_READ, NULL);
@@ -4605,7 +5177,7 @@
 
 		/*if this dash input file has only one track, or this has not the scalable track: handle as one representation*/
 		if ((nb_track == 1) || !gf_isom_needs_layer_reconstruction(file)) {
-
+			u32 track_num = nb_track;
 			if (uri_frag) {
 				u32 id = 0;
 				if (!strnicmp(uri_frag+1, "trackID=", 8))
@@ -4614,9 +5186,17 @@
 					id = atoi(uri_frag+4);
 				else if (!stricmp(uri_frag+1, "audio") || !stricmp(uri_frag+1, "video")) {
 					Bool check_video = !stricmp(uri_frag+1, "video") ? GF_TRUE : GF_FALSE;
+ Bool check_auxv = !stricmp(uri_frag+1, "auxv") ? GF_TRUE : GF_FALSE;
+ Bool check_pict = !stricmp(uri_frag+1, "pict") ? GF_TRUE : GF_FALSE;
 					u32 i;
 					for (i=0; i<nb_track; i++) {
 						switch (gf_isom_get_media_type(file, i+1)) {
+ case GF_ISOM_MEDIA_AUXV:
+ if (check_auxv) id = gf_isom_get_track_id(file, i+1);
+ break;
+ case GF_ISOM_MEDIA_PICT:
+ if (check_pict) id = gf_isom_get_track_id(file, i+1);
+ break;
 						case GF_ISOM_MEDIA_VISUAL:
 							if (check_video) id = gf_isom_get_track_id(file, i+1);
 							break;
@@ -4628,9 +5208,10 @@
 					}
 				}
 				dash_input->single_track_num = gf_isom_get_track_by_id(file, id);
-				nb_track = dash_input->single_track_num;
+				track_num = dash_input->single_track_num;
+				if (nb_track==1) dash_input->single_track_num = 0;
 			}
-			dash_input->protection_scheme_type = gf_isom_is_media_encrypted(file, nb_track, 1);
+			dash_input->protection_scheme_type = gf_isom_is_media_encrypted(file, track_num, 1);
 
 			dash_input->moof_seqnum_increase = 0;
 
@@ -4641,7 +5222,8 @@
 		max_nb_deps = 0;
 		for (j = 0; j < nb_track; j++) {
 			//check scalability
-			if (gf_isom_get_media_type(file, j+1)==GF_ISOM_MEDIA_VISUAL) {
+ u32 mtype = gf_isom_get_media_type(file, j+1);
+			if (gf_isom_is_video_subtype(mtype) ) {
 				u32 c1 = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_BASE);
 				u32 c2 = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_TBAS);
 				if (c2) has_tiling = GF_TRUE;
@@ -4657,7 +5239,7 @@
 		j = *nb_dash_inputs + max_nb_deps;
 		dash_inputs = (GF_DashSegInput*)gf_realloc(dash_inputs, sizeof(GF_DashSegInput) * j);
 		memset(&dash_inputs[*nb_dash_inputs], 0, sizeof(GF_DashSegInput) * max_nb_deps);
-		*io_dash_inputs = dash_inputs;
+		(*io_dash_inputs) = dash_inputs;
 
 		dash_input = & dash_inputs[idx];
 		dash_input->nb_representations = 1 + max_nb_deps;
@@ -4684,6 +5266,8 @@
 					switch (gf_isom_get_media_subtype(file, j+1, 1)) {
 					case GF_ISOM_SUBTYPE_LHE1:
 					case GF_ISOM_SUBTYPE_LHV1:
+					case GF_ISOM_SUBTYPE_HEV2:
+					case GF_ISOM_SUBTYPE_HVC2:
 						count = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_BASE);
 						break;
 					}
@@ -4732,7 +5316,7 @@
 			memcpy(di, dash_input, sizeof(GF_DashSegInput));
 
 			/*representationID*/
-			sprintf(di->representationID, "%s_%d", dep_representation_id, cur_idx);
+			snprintf(di->representationID, sizeof(di->representationID), "%s_%d", dep_representation_id, cur_idx);
 			di->trackNum = j+1;
 
 			di->protection_scheme_type = gf_isom_is_media_encrypted(file, di->trackNum, 1);
@@ -4761,7 +5345,8 @@
 			di->trackNum = 0;
 			for (k = 0; k < nb_track; k++) {
 				//check scalability
-				if (gf_isom_get_media_type(file, k+1)==GF_ISOM_MEDIA_VISUAL) {
+ u32 mtype = gf_isom_get_media_type(file, k+1);
+				if (gf_isom_is_video_subtype(mtype) ) {
 					if (gf_isom_get_reference_count(file, k+1, GF_ISOM_REF_SABT)) {
 						di->trackNum = k+1;
 						break;
@@ -4778,7 +5363,7 @@
 		}
 #endif
 
-		/*dependencyID - FIXME - the delaration of dependency and new dash_input entries should be in DEDENDENCY ORDER*/
+		/*dependencyID - FIXME - the declaration of dependency and new dash_input entries should be in DEDENDENCY ORDER*/
 		for (k=0; k<2; k++) {
 			for (j = idx; j < *nb_dash_inputs; j++) {
 				GF_DashSegInput *di;
@@ -4787,20 +5372,23 @@
 				u32 dep_type;
 
 				di = &dash_inputs[j];
+				if (di->dependencyID) continue;
 
 #ifdef GENERATE_VIRTUAL_REP_SRD
-				if (k==0) dep_type = (di->virtual_representation) ? GF_ISOM_REF_SABT : GF_ISOM_REF_TBAS;
+				if (k==1) dep_type = (di->virtual_representation) ? GF_ISOM_REF_SABT : GF_ISOM_REF_TBAS;
 #else
-				if (k==0) dep_type = GF_ISOM_REF_TBAS;
+				if (k==1) dep_type = GF_ISOM_REF_TBAS;
 #endif
 				else dep_type = GF_ISOM_REF_SCAL;
 
 				count = gf_isom_get_reference_count(file, di->trackNum, dep_type);
 				if (!count) {
-					if (k==0) {
+					if (k==1) {
 						switch (gf_isom_get_media_subtype(file, j+1, 1)) {
 						case GF_ISOM_SUBTYPE_LHE1:
 						case GF_ISOM_SUBTYPE_LHV1:
+						case GF_ISOM_SUBTYPE_HEV2:
+						case GF_ISOM_SUBTYPE_HVC2:
 							dep_type = GF_ISOM_REF_BASE;
 							count = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_BASE);
 							break;
@@ -4831,6 +5419,7 @@
 
 					di->lower_layer_track = ref_track;
 				}
+				if (di->dependencyID) gf_free(di->dependencyID);
 				di->dependencyID = depID;
 			}
 		}
@@ -4910,19 +5499,23 @@
 	assert(time_ms<1000);
 
 	fprintf(mpd, "<?xml version=\"1.0\"?>\n");
-	fprintf(mpd, "\n");
+	if(!dasher->force_test_mode)
+ fprintf(mpd, "-->\n");
 
 	/*TODO what should we put for minBufferTime */
 	fprintf(mpd, "<MPD xmlns=\"urn:mpeg:dash:schema:mpd:2011\" minBufferTime=\"PT%.3fS\" type=\"%s\"", dasher->min_buffer, dasher->dash_mode ? "dynamic" : "static");
@@ -4973,7 +5566,11 @@
 	}
 
 	if (dasher->max_segment_duration) {
-		format_duration(mpd, dasher->max_segment_duration, "maxSegmentDuration");
+		if (dasher->single_segment) {
+			format_duration(mpd, dasher->max_segment_duration, "maxSubsegmentDuration");
+		} else {
+			format_duration(mpd, dasher->max_segment_duration, "maxSegmentDuration");
+		}
 	}
 
 	if (dasher->profile==GF_DASH_PROFILE_LIVE) {
@@ -5017,8 +5614,13 @@
 	fprintf(mpd, " <ProgramInformation moreInformationURL=\"%s\">\n", dasher->moreInfoURL ? dasher->moreInfoURL : "http://gpac.io");
 	if (dasher->title)
 		fprintf(mpd, " <Title>%s</Title>\n", dasher->title);
-	else
-		fprintf(mpd, " <Title>%s generated by GPAC</Title>\n", dasher->mpd_name);
+	else {
+		const char *title = strrchr(dasher->mpd_name, '/');
+		if (!title) title = strrchr(dasher->mpd_name, '/');
+		if (!title) title = dasher->mpd_name;
+		else title += 1;
+		fprintf(mpd, " <Title>%s generated by GPAC</Title>\n", title);
+	}
 
 	if (dasher->source)
 		fprintf(mpd, " <Source>%s</Source>\n", dasher->source);
@@ -5063,7 +5665,9 @@
 	for (i=0; i< dasher->nb_inputs; i++) {
 		if (dasher->inputs[i].adaptation_set && (dasher->inputs[i].period==period_num)) {
 			for (j = 0; j < dasher->inputs[i].nb_p_descs; j++) {
-				fprintf(mpd, " %s\n", dasher->inputs[i].p_descs[j]);
+				if (strchr(dasher->inputs[i].p_descs[j], '<') != NULL) {
+					fprintf(mpd, " %s\n", dasher->inputs[i].p_descs[j]);
+				}
 			}
 		}
 	}
@@ -5077,7 +5681,7 @@
 
 static GF_Err write_adaptation_header(FILE *mpd, GF_DashProfile profile, Bool use_url_template, u32 single_file_mode,
 GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 period_num, u32 adaptation_set_num, u32 first_rep_in_set,
- Bool bitstream_switching_mode, u32 max_width, u32 max_height, u32 dar_num, u32 dar_den, char *szMaxFPS, char *szLang, const char *szInitSegment, Bool segment_alignment_disabled, const char *mpd_name)
+ u32 bitstream_switching_mode, u32 max_width, u32 max_height, u32 dar_num, u32 dar_den, char *szMaxFPS, char *szLang, const char *szInitSegment, Bool segment_alignment_disabled, const char *mpd_name, Bool start_with_sap)
 {
 	u32 i, j;
 	Bool is_on_demand = ((profile==GF_DASH_PROFILE_ONDEMAND) || (profile==GF_DASH_PROFILE_AVC264_ONDEMAND));
@@ -5085,7 +5689,7 @@
 
 	//force segmentAlignment in onDemand
 	fprintf(mpd, " <AdaptationSet segmentAlignment=\"%s\"", (!is_on_demand && segment_alignment_disabled) ? "false" : "true");
-	if (bitstream_switching_mode) {
+	if (bitstream_switching_mode==1) {
 		fprintf(mpd, " bitstreamSwitching=\"true\"");
 	}
 	if (first_rep->group_id) {
@@ -5105,6 +5709,16 @@
 	if (szLang) {
 		fprintf(mpd, " lang=\"%s\"", szLang);
 	}
+
+	if (single_file_mode == 1) {
+		fprintf(mpd, " startWithSAP=\"1\"");
+	}
+	//regular segmenting
+	else if (start_with_sap) {
+		fprintf(mpd, " startWithSAP=\"1\"");
+
+	}
+
 	if ((profile==GF_DASH_PROFILE_ONDEMAND) || (profile==GF_DASH_PROFILE_AVC264_ONDEMAND)) {
 		fprintf(mpd, " subsegmentAlignment=\"%s\"", segment_alignment_disabled ? "false" : "true");
 		//FIXME - we need inspection of the segments to figure out the SAP type !
@@ -5116,7 +5730,9 @@
 	for (i=0; i< nb_dash_inputs; i++) {
 		if ((dash_inputs[i].adaptation_set == adaptation_set_num) && (dash_inputs[i].period == period_num)) {
 			for (j = 0; j < dash_inputs[i].nb_as_c_descs; j++) {
-				fprintf(mpd, " %s\n", dash_inputs[i].as_c_descs[j]);
+				if (strchr(dash_inputs[i].as_c_descs[j], '<') != NULL) {
+					fprintf(mpd, " %s\n", dash_inputs[i].as_c_descs[j]);
+				}
 			}
 		}
 	}
@@ -5147,7 +5763,9 @@
 
 		/* writing AdaptationSet level descriptors specified only all inputs for that AdaptationSet*/
 		for (i=0; i<first_rep->nb_as_descs; i++) {
-			fprintf(mpd, " %s\n", first_rep->as_descs[i]);
+			if (strchr(first_rep->as_descs[i], '<') != NULL) {
+				fprintf(mpd, " %s\n", first_rep->as_descs[i]);
+			}
 		}
 
 		if (bitstream_switching_mode) {
@@ -5187,6 +5805,8 @@
 					fprintf(mpd, "contentType=\"text\" ");
 					break;
 				case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
 					fprintf(mpd, "contentType=\"video\" ");
 					break;
 				case GF_ISOM_MEDIA_AUDIO:
@@ -5246,8 +5866,6 @@
 		gf_cfg_set_key(dash_ctx, "DASH", "StoreParams", "no");
 	}
 
-	gf_cfg_set_key(dash_ctx, "DASH", "PeriodSwitch", "no");
-
 	if (first_run) {
 		u32 sec, frac;
 #ifndef _WIN32_WCE
@@ -5281,7 +5899,6 @@
 			opt = gf_cfg_get_key(dash_ctx, "DASH", "PeriodID");
 			if (!opt || strcmp(opt, periodID)) {
 				gf_cfg_set_key(dash_ctx, "DASH", "PeriodID", periodID);
-				gf_cfg_set_key(dash_ctx, "DASH", "PeriodSwitch", "yes");
 			}
 		}
 	}
@@ -5294,36 +5911,26 @@
 GF_EXPORT
 u32 gf_dasher_next_update_time(GF_DASHSegmenter *dasher, u64 *ms_in_session)
 {
-	Double max_dur = 0;
-//	Double safety_dur;
+	Double past_period_dur = 0, max_dur = 0;
 	Double ms_elapsed;
-	u32 i, ntp_sec, frac, prev_sec, prev_frac, dash_scale;
+	u32 i, ntp_sec, frac, prev_sec, prev_frac, dash_scale, nb_reps=0;
 	const char *opt, *section;
 
 	if (!dasher || !dasher->dash_ctx) return -1;
 
-	opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "MaxSegmentDuration");
-	if (!opt) return 0;
-
-/*
-	safety_dur = atof(opt) / 2;
-	if (safety_dur > dasher->mpd_update_time)
-		safety_dur = dasher->mpd_update_time;
-
-	safety_dur = 0;
-*/
-
 	opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "GenerationNTP");
 	sscanf(opt, "%u:%u", &prev_sec, &prev_frac);
 
 	opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "TimeScale");
 	sscanf(opt, "%u", &dash_scale);
 
+
 	/*compute cumulated duration*/
 	for (i=0; i<gf_cfg_get_section_count(dasher->dash_ctx); i++) {
 		Double dur = 0;
 		section = gf_cfg_get_section_name(dasher->dash_ctx, i);
 		if (section && !strncmp(section, "Representation_", 15)) {
+			nb_reps ++;
 			opt = gf_cfg_get_key(dasher->dash_ctx, section, "CumulatedDuration");
 			if (opt) {
 				u64 val;
@@ -5333,6 +5940,20 @@
 			if (dur>max_dur) max_dur = dur;
 		}
 	}
+	//last period has been flushed but its duration not yet included in cumulated dur
+	if (!nb_reps) {
+		opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "CumulatedPastPeriodsDuration");
+		if (opt) {
+			sscanf(opt, "%lf", &past_period_dur);
+			max_dur = past_period_dur;
+		}
+	}
+
+	opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "CumulatedPastPeriodsDuration");
+	if (opt) {
+		sscanf(opt, "%lf", &past_period_dur);
+		max_dur += past_period_dur;
+	}
 
 	if (!max_dur) return 0;
 	gf_net_get_ntp(&ntp_sec, &frac);
@@ -5344,7 +5965,7 @@
 	ms_elapsed += ((u64)(ntp_sec - prev_sec))*1000;
 
 	if (ms_in_session) *ms_in_session = (u64) ( 1000*max_dur );
-	
+
 	/*check if we need to generate */
 	if (ms_elapsed < (max_dur /* - safety_dur*/)*1000 ) {
 		return (u32) (1000*max_dur - ms_elapsed);
@@ -5413,7 +6034,7 @@
 	if (dasher->time_shift_depth >= 0) {
 		for (i=0; i<gf_cfg_get_key_count(dasher->dash_ctx, "SegmentsStartTimes"); i++) {
 			Double seg_time;
-			u64 start, dur;
+			u64 start, dur, scale;
 			char szRepID[100];
 			char szSecName[200];
 			u32 j;
@@ -5422,9 +6043,10 @@
 			if (!fileName)
 				break;
 
-			sscanf(opt, ""LLU"-"LLU"@%s", &start, &dur, szRepID);
+			sscanf(opt, ""LLU"-"LLU"-"LLU"@%s", &start, &dur, &scale, szRepID);
 			seg_time = (Double) start;
-			seg_time /= dasher->dash_scale;
+			seg_time /= scale;
+
 			if (dasher->ast_offset_ms > 0)
 				seg_time += ((Double) dasher->ast_offset_ms) / 1000;
 
@@ -5524,7 +6146,11 @@
 	for (i=0; i<count; i++) {
 		const char *opt = gf_cfg_get_section_name(dash_ctx, i);
 		if (!opt) continue;
-		if( !strnicmp(opt, "Representation_", 15) || !strcmp(opt, "SegmentsStartTimes")) {
+		if ( !strnicmp(opt, "Representation_", 15) || !strcmp(opt, "SegmentsStartTimes")) {
+			const char *max_sap = gf_cfg_get_key(dash_ctx, opt, "MaxSAPType");
+			if (max_sap) {
+				gf_cfg_set_key(dash_ctx, "DASH", "PrevPeriodMaxSAPType", max_sap);
+			}
 			gf_cfg_del_section(dash_ctx, opt);
 			count--;
 			i--;
@@ -5590,6 +6216,7 @@
 		}
 		if (dasher->inputs[i].dependencyID) gf_free(dasher->inputs[i].dependencyID);
 		if (dasher->inputs[i].init_seg_url) gf_free(dasher->inputs[i].init_seg_url);
+		if (dasher->inputs[i].period_id_not_specified && dasher->inputs[i].periodID) gf_free(dasher->inputs[i].periodID);
 
 		if (dasher->inputs[i].isobmf_input) {
 			//we don't want to save any modif due to duration adjustments
@@ -5629,6 +6256,12 @@
 }
 
 GF_EXPORT
+GF_Err gf_dasher_set_test_mode(GF_DASHSegmenter *dasher, Bool forceTestMode){
+	dasher->force_test_mode=forceTestMode;
+	return GF_OK;
+}
+
+GF_EXPORT
 GF_Err gf_dasher_set_location(GF_DASHSegmenter *dasher, const char *location)
 {
 	if (!dasher) return GF_BAD_PARAM;
@@ -5661,11 +6294,12 @@
 }
 
 GF_EXPORT
-GF_Err gf_dasher_enable_url_template(GF_DASHSegmenter *dasher, Bool enable, const char *default_template, const char *default_extension)
+GF_Err gf_dasher_enable_url_template(GF_DASHSegmenter *dasher, Bool enable, const char *default_template, const char *default_extension, const char *default_init_extension)
 {
 	if (!dasher) return GF_BAD_PARAM;
 	dasher->use_url_template = enable;
 	dasher->seg_ext = default_extension;
+	dasher->init_seg_ext = default_init_extension;
 	dasher_format_seg_name(dasher, default_template);
 	return GF_OK;
 }
@@ -5702,11 +6336,10 @@
 }
 
 GF_EXPORT
-GF_Err gf_dasher_set_durations(GF_DASHSegmenter *dasher, Double default_segment_duration, Bool segment_duration_strict, Double default_fragment_duration)
+GF_Err gf_dasher_set_durations(GF_DASHSegmenter *dasher, Double default_segment_duration, Double default_fragment_duration)
 {
 	if (!dasher) return GF_BAD_PARAM;
 	dasher->segment_duration = default_segment_duration * 1000 / dasher->dash_scale;
-	dasher->segment_duration_strict = segment_duration_strict;
 	if (default_fragment_duration)
 		dasher->fragment_duration = default_fragment_duration * 1000 / dasher->dash_scale;
 	else
@@ -5732,12 +6365,13 @@
 }
 
 GF_EXPORT
-GF_Err gf_dasher_enable_sidx(GF_DASHSegmenter *dasher, Bool enable_sidx, u32 subsegs_per_sidx, Bool daisy_chain_sidx)
+GF_Err gf_dasher_enable_sidx(GF_DASHSegmenter *dasher, Bool enable_sidx, u32 subsegs_per_sidx, Bool daisy_chain_sidx, Bool use_ssix)
 {
 	if (!dasher) return GF_BAD_PARAM;
 	dasher->enable_sidx = enable_sidx;
 	dasher->subsegs_per_sidx = subsegs_per_sidx;
 	dasher->daisy_chain_sidx = daisy_chain_sidx;
+	dasher->use_ssix = use_ssix;
 	return GF_OK;
 }
 
@@ -5786,13 +6420,14 @@
 }
 
 GF_EXPORT
-GF_Err gf_dasher_configure_isobmf_default(GF_DASHSegmenter *dasher, Bool no_fragments_defaults, Bool pssh_moof, Bool samplegroups_in_traf, Bool single_traf_per_moof)
+GF_Err gf_dasher_configure_isobmf_default(GF_DASHSegmenter *dasher, Bool no_fragments_defaults, GF_DASHPSSHMode pssh_mode, Bool samplegroups_in_traf, Bool single_traf_per_moof, Bool tfdt_per_traf)
 {
 	if (!dasher) return GF_BAD_PARAM;
 	dasher->no_fragments_defaults = no_fragments_defaults;
-	dasher->pssh_moof = pssh_moof;
+	dasher->pssh_mode = pssh_mode;
 	dasher->samplegroups_in_traf = samplegroups_in_traf;
 	dasher->single_traf_per_moof = single_traf_per_moof;
+ dasher->tfdt_per_traf = tfdt_per_traf;
 	return GF_OK;
 }
 
@@ -5829,6 +6464,87 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_dasher_enable_cached_inputs(GF_DASHSegmenter *dasher, Bool no_cache)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->no_cache = no_cache;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_enable_loop_inputs(GF_DASHSegmenter *dasher, Bool do_loop)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->disable_loop = do_loop ? GF_FALSE : GF_TRUE;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_set_split_on_bound(GF_DASHSegmenter *dasher, Bool split_on_bound)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->split_on_bound = split_on_bound;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_set_split_on_closest(GF_DASHSegmenter *dasher, Bool split_on_closest)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->split_on_closest = split_on_closest;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_set_cues(GF_DASHSegmenter *dasher, const char *cues_file, Bool strict_cues)
+{
+	dasher->cues_file = cues_file;
+	dasher->strict_cues = strict_cues;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dasher_set_isobmff_options(GF_DASHSegmenter *dasher, Bool mvex_after_traks)
+{
+	dasher->mvex_after_traks = mvex_after_traks;
+	return GF_OK;
+}
+
+static void dash_input_check_period_id(GF_DASHSegmenter *dasher, GF_DashSegInput *dash_input)
+{
+	if (dash_input->period_id_not_specified) {
+		if (dash_input->periodID) gf_free(dash_input->periodID);
+		dash_input->periodID = NULL;
+		dash_input->period_id_not_specified = 0;
+	}
+
+	if (! dash_input->periodID) {
+		dash_input->period_id_not_specified = 1;
+		//assign ID if dynamic - if dash_ctx also assign ID since we could have moved from dynamic to static
+		if ((dasher->dash_mode!=GF_DASH_STATIC) || dasher->dash_ctx) {
+			char szPName[50];
+			sprintf(szPName, "DID1");
+			if (dasher->dash_ctx) {
+				if (dasher->force_session_end) {
+					const char *p = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastActivePeriod");
+					if (p) {
+						strcpy(szPName, p);
+						sscanf(p, "DID%d", &dash_input->period_id_not_specified);
+					}
+				} else {
+					while (1) {
+						const char *p = gf_cfg_get_key(dasher->dash_ctx, "PastPeriods", szPName);
+						if (!p) break;
+						dash_input->period_id_not_specified++;
+						sprintf(szPName, "DID%d", dash_input->period_id_not_specified);
+					}
+				}
+			}
+			dash_input->periodID = gf_strdup(szPName);
+		}
+	}
+}
 
 GF_EXPORT
 GF_Err gf_dasher_add_input(GF_DASHSegmenter *dasher, GF_DashSegmenterInput *input)
@@ -5862,16 +6578,11 @@
 	dash_input->as_c_descs = input->as_c_descs;
 	dash_input->nb_p_descs = input->nb_p_descs;
 	dash_input->p_descs = input->p_descs;
+	dash_input->no_cache = dasher->no_cache;
+	dash_input->sscale = input->sscale;
 
 	dash_input->bandwidth = input->bandwidth;
 
-	if (! dash_input->periodID) {
-		dash_input->period_id_not_specified = GF_TRUE;
-		//assign ID if dynamic - if dash_ctx also assign ID since we could have moved from dynamic to static
-		if (dasher->dash_mode || dasher->dash_ctx) {
-			dash_input->periodID = "GENID_DEF";
-		}
-	}
 	if (!strcmp(dash_input->file_name, "NULL") || !strcmp(dash_input->file_name, "") || !dash_input->file_name) {
 		if (!strcmp(dash_input->xlink, "")) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] No input file specified and no xlink set - cannot dash\n"));
@@ -5919,6 +6630,7 @@
 	Double presentation_duration = 0;
 	Double active_period_start = 0;
 	u32 last_period_rep_idx_plus_one = 0;
+	u32 nb_vids=0;
 	FILE *mpd = NULL;
 	PeriodEntry *p;
 	if (!dasher) return GF_BAD_PARAM;
@@ -5926,11 +6638,13 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Dashing starting\n"));
 
 	dasher->force_period_end = GF_FALSE;
+	dasher->force_session_end = GF_FALSE;
 
 	if (dasher->dash_mode && !dasher->mpd_update_time && !dasher->mpd_live_duration) {
 		if (dasher->dash_mode == GF_DASH_DYNAMIC_LAST) {
-			dasher->force_period_end = GF_TRUE;
-			dasher->dash_mode = GF_DASH_DYNAMIC;
+			//dasher->force_period_end = GF_TRUE;
+			dasher->force_session_end = GF_TRUE;
+			dasher->dash_mode = GF_DASH_STATIC;
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Either MPD refresh (update) period or MPD duration shall be set in dynamic mode.\n"));
 			return GF_BAD_PARAM;
@@ -5951,9 +6665,6 @@
 		if (opt) {
 			Double seg_dur = atof(opt);
 			dasher->max_segment_duration = seg_dur;
-		} else {
-			sprintf(szOpt, "%f", dasher->segment_duration);
-			gf_cfg_set_key(dasher->dash_ctx, "DASH", "MaxSegmentDuration", szOpt);
 		}
 		sprintf(szOpt, "%u", dasher->dash_scale);
 		gf_cfg_set_key(dasher->dash_ctx, "DASH", "TimeScale", szOpt);
@@ -5972,6 +6683,7 @@
 		u32 r;
 		GF_DashSegInput *dash_input = &dasher->inputs[i];
 		dash_input->period = 0;
+		dash_input_check_period_id(dasher, dash_input);
 
 		dash_input->moof_seqnum_increase = dash_input->nb_representations;
 		if (!dash_input->moof_seqnum_increase) dash_input->moof_seqnum_increase=1;
@@ -6014,7 +6726,6 @@
 		//reset adaptation classifier
 		dash_input->adaptation_set = 0;
 
-
 		if (dash_input->period)
 			continue;
 
@@ -6175,12 +6886,6 @@
 	default:
 		break;
 	}
-	if (dasher->bitstream_switching_mode == GF_DASH_BSMODE_DEFAULT) {
-		dasher->bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
-	}
-
-	//we allow using inband param set when not time aligned. set the option now before overriding flags for non time aligned
-	dasher->inband_param_set = ((dasher->bitstream_switching_mode == GF_DASH_BSMODE_INBAND) || (dasher->bitstream_switching_mode == GF_DASH_BSMODE_SINGLE) ) ? GF_TRUE : GF_FALSE;
 
 	if (!segment_alignment) {
 		if (dasher->profile) {
@@ -6195,7 +6900,7 @@
 
 	//check we have a segment template
 	if (dasher->use_url_template && !dasher->seg_rad_name) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] WARNING! DASH Live profile requested but no -segment-name\n\tusing \"%%s_dash\" by default\n\n"));
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] DASH Live profile requested but no -segment-name - using \"%%s_dash\" by default\n"));
 		dasher_format_seg_name(dasher, "%s_dash");
 	}
 
@@ -6229,7 +6934,12 @@
 	max_comp_per_input = 0;
 	for (cur_period=0; cur_period<max_period; cur_period++) {
 		u32 first_in_period = 0;
+		u32 k;
 		Double period_duration=0;
+		Double min_media_duration = -1;
+		Double max_media_duration = -1;
+		Double max_audio_duration = -1;
+		Double min_audio_duration = -1;
 
 		for (i=0; i<dasher->nb_inputs; i++) {
 			Double dur = 0;
@@ -6256,18 +6966,46 @@
 
 			/*force media duration if requested by the author*/
 			if (dash_input->media_duration) {
-				dash_input->period_duration = dash_input->media_duration;
 				dash_input->duration = dash_input->media_duration;
 			}
 
 			dur = dash_input->duration;
-			if (sub_duration && (sub_duration < dur * dasher->dash_scale) ) {
+
+			for (k=0; k<dash_input->nb_components;k++) {
+				Double cdur = dash_input->components[k].duration;
+				if (dash_input->media_duration)
+					cdur = dash_input->media_duration;
+				if (!cdur)
+					cdur = dur;
+
+				if (dash_input->components[k].media_type == GF_ISOM_MEDIA_AUDIO) {
+					if (min_audio_duration == -1 || min_audio_duration > cdur) {
+						min_audio_duration = cdur;
+					}
+					if (max_audio_duration == -1 || max_audio_duration < cdur) {
+						max_audio_duration = cdur;
+					}
+				}
+				else if (dash_input->components[k].media_type == GF_ISOM_MEDIA_VISUAL) {
+					if (dash_input->components[k].hevc_tile_type<2)
+						nb_vids++;
+				}
+			}
+
+			if (sub_duration && (!dasher->disable_loop || (sub_duration < dur)) ) {
 				dur = dasher->subduration;
 			}
 
 			if (dur > period_duration)
 				period_duration = dur;
 
+			if (min_media_duration == -1 || min_media_duration > dur) {
+				min_media_duration = dur;
+			}
+			if (max_media_duration == -1 || max_media_duration < dur) {
+				max_media_duration = dur;
+			}
+
 			switch (dash_input->protection_scheme_type) {
 			case GF_ISOM_CENC_SCHEME:
 			case GF_ISOM_CBC_SCHEME:
@@ -6282,8 +7020,42 @@
 		if (first_in_period) {
 			dasher->inputs[first_in_period-1].period_duration = period_duration;
 		}
-		presentation_duration += period_duration;
+		if (!dasher->force_session_end)
+			presentation_duration += period_duration;
+
+		if (max_media_duration - min_media_duration > dasher->segment_duration) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] The difference between the durations of the longest and shortest representations (%f) is higher than the segment duration (%f)\n", max_media_duration - min_media_duration, dasher->segment_duration));
+		}
+
+		if (! dasher->subduration)
+			dasher->disable_loop = GF_TRUE;
+
+		if (!dasher->disable_loop && dasher->subduration && (max_audio_duration>0)) {
+			if (max_audio_duration != min_audio_duration) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Audio streams in the period have different durations (min %lf, max %lf), may result in bad synchronization\n", min_audio_duration, max_audio_duration));
+			}
+			for (i=0; i<dasher->nb_inputs; i++) {
+				GF_DashSegInput *dash_input = &dasher->inputs[i];
+				if (dash_input->period != cur_period+1) continue;
+				if (!dash_input->adaptation_set) continue;
+				dash_input->clamp_duration = max_audio_duration;
+
+				if (dash_input->duration > max_audio_duration) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Input %s: max audio duration (%lf) in the period is less than duration (%lf), clamping will happen\n", dash_input->file_name, max_audio_duration, dash_input->media_duration ? dash_input->media_duration : dash_input->duration));
+				}
+			}
+		}
+	}
+
+	if (dasher->bitstream_switching_mode == GF_DASH_BSMODE_DEFAULT) {
+		if (nb_vids > 1) {
+			dasher->bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
+		} else {
+			dasher->bitstream_switching_mode = GF_DASH_BSMODE_NONE;
+		}
 	}
+	//we allow using inband param set when not time aligned. set the option now before overriding flags for non time aligned
+	dasher->inband_param_set = ((dasher->bitstream_switching_mode == GF_DASH_BSMODE_INBAND) || (dasher->bitstream_switching_mode == GF_DASH_BSMODE_SINGLE) ) ? GF_TRUE : GF_FALSE;
 
 	if (max_comp_per_input > 1) {
 		if (dasher->profile == GF_DASH_PROFILE_AVC264_LIVE) {
@@ -6333,7 +7105,7 @@
 
 		opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastActivePeriod");
 		//period has changed
-		if (opt && strcmp(opt, id)) {
+		if (opt && strcmp(opt, id) && !dasher->force_session_end) {
 			Bool prev_period_not_done = GF_FALSE;
 			const char *prev_id = opt;
 			Double last_period_dur = 0;
@@ -6355,7 +7127,7 @@
 				if (!p_id) p_id = "";
 				if (!strcmp(p_id, prev_id)) {
 					last_period_dur += dasher->inputs[last_period_rep_idx_plus_one-1].period_duration;
-					presentation_duration -= dasher->inputs[last_period_rep_idx_plus_one-1].period_duration;;
+					presentation_duration -= dasher->inputs[last_period_rep_idx_plus_one-1].period_duration;
 					prev_period_not_done = GF_TRUE;
 					break;
 				}
@@ -6376,7 +7148,7 @@
 			//and add period to past periods, storing their duration and xlink
 			if (! prev_period_not_done) {
 				opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastPeriodXLINK");
-				sprintf(szOpt, "%g,%s", last_period_dur, opt ? opt : "INLINE");
+				sprintf(szOpt, "%g-%g,%s", last_period_dur, active_period_start-last_period_dur, opt ? opt : "INLINE");
 				gf_cfg_set_key(dasher->dash_ctx, "PastPeriods", prev_id, szOpt);
 				if (opt) {
 					gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastPeriodXLINK", NULL);
@@ -6395,18 +7167,56 @@
 			sprintf(szOpt, "%g", dasher->inputs[last_period_rep_idx_plus_one-1].period_duration);
 			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastPeriodDuration", szOpt);
 		} else {
-			opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastPeriodDuration");
-			if (opt) {
-				duration = atof(opt);
-				dasher->inputs[last_period_rep_idx_plus_one-1].period_duration += duration;
-				presentation_duration += duration;
+			GF_DashSegInput *dash_input = &dasher->inputs[last_period_rep_idx_plus_one-1];
+			if (dasher->force_session_end || dasher->force_period_end) {
+				//get largest duration
+				u32 k, scount = gf_cfg_get_section_count(dasher->dash_ctx);
+				Double mdur=0;
+				for (k=0; k<scount; k++) {
+					const char *sec = gf_cfg_get_section_name(dasher->dash_ctx, k);
+					if (!sec) continue;
+					if( !strnicmp(sec, "Representation_", 15) ) {
+						const char *key = gf_cfg_get_key(dasher->dash_ctx, sec, "CumulatedDuration");
+						if (key) {
+							Double v = ((Double) atoi(key)) / dasher->dash_scale;
+							if (v > mdur) mdur = v;
+						}
+					}
+				}
+				if (!mdur) {
+					opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastPeriodDuration");
+					if (opt) mdur = atof(opt);
+				}
+				dash_input->period_duration = mdur;
+				presentation_duration += mdur;
+			} else {
+				opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastPeriodDuration");
+				if (opt) {
+					Double d = dash_input->duration;
+					if (dash_input->clamp_duration) d = dash_input->clamp_duration;
+					else if (dash_input->media_duration) d = dash_input->media_duration;
+
+					duration = atof(opt);
+					if (dasher->force_session_end) {
+						dash_input->period_duration = duration;
+					} else {
+						if (dasher->disable_loop && dash_input->period_duration + duration > d) {
+							dash_input->period_duration = d - duration;
+						}
+						dash_input->period_duration += duration;
+					}
+					presentation_duration += duration;
+				}
 			}
-			sprintf(szOpt, "%g", dasher->inputs[last_period_rep_idx_plus_one-1].period_duration);
+			sprintf(szOpt, "%g", dash_input->period_duration);
 			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastPeriodDuration", szOpt);
 			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastActivePeriod", id);
 
 			opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "CumulatedPastPeriodsDuration");
 			presentation_duration += opt ? atof(opt) : 0.0;
+
+			opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastActivePeriodStart");
+			if (opt) active_period_start = atof(opt);
 		}
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] DASH context restored\n"));
@@ -6510,7 +7320,7 @@
 
 			dasher->mpd = period_mpd;
 
-			e = write_period_header(dasher, period_mpd, id, 0.0, period_duration, NULL, cur_period+1, (xlink!=NULL) ? GF_TRUE : GF_FALSE);
+			e = write_period_header(dasher, period_mpd, id, active_period_start, period_duration, NULL, cur_period+1, (xlink!=NULL) ? GF_TRUE : GF_FALSE);
 			if (e) goto exit;
 		}
 		//keep track of the last period xlink
@@ -6521,6 +7331,7 @@
 		for (cur_adaptation_set=0; cur_adaptation_set < max_adaptation_set; cur_adaptation_set++) {
 			char szInit[GF_MAX_PATH], tmp[GF_MAX_PATH];
 			u32 first_rep_in_set=0;
+			u32 nb_rep_in_set=0;
 			u32 max_width = 0;
 			u32 max_height = 0;
 			u32 dar_num = 1;
@@ -6529,7 +7340,7 @@
 			u32 fps_denum = 0;
 			Double seg_duration_in_as = 0;
 			Bool has_scalability = GF_FALSE;
-			Bool use_bs_switching = (dasher->bitstream_switching_mode==GF_DASH_BSMODE_NONE) ? GF_FALSE : GF_TRUE;
+			u32 use_bs_switching = (dasher->bitstream_switching_mode==GF_DASH_BSMODE_NONE) ? 0 : 1;
 			char *lang;
 			char szFPS[100];
 			Bool is_first_rep = GF_FALSE;
@@ -6565,9 +7376,12 @@
 				 /*unless the representation is a scalable one split across several adaptation sets ...*/
 				 && (dasher->inputs[first_rep_in_set].nb_representations<=1)
 				 ) {
-					use_bs_switching = GF_FALSE;
+					use_bs_switching = 0;
 				}
 
+				if (dasher->inputs[first_rep_in_set].components[0].hevc_tile_type)
+					use_bs_switching = 2;
+
 				if (! use_bs_switching) {
 					skip_init_segment_creation = GF_TRUE;
 				}
@@ -6590,7 +7404,7 @@
 					e = dasher->inputs[first_rep_in_set].dasher_create_init_segment(dasher->inputs, dasher->nb_inputs, cur_adaptation_set+1, szInit, dasher->tmpdir, dasher, dasher->bitstream_switching_mode, &disable_bs_switching);
 					if (e) goto exit;
 					if (disable_bs_switching)
-						use_bs_switching = GF_FALSE;
+						use_bs_switching = 0;
 				}
 
 				dasher->inputs[first_rep_in_set].init_seg_url = use_bs_switching ? gf_strdup(szInit) : NULL;
@@ -6665,11 +7479,18 @@
 			}
 
 			e = write_adaptation_header(period_mpd, dasher->profile, dasher->use_url_template, dasher->single_file_mode, dasher->inputs, dasher->nb_inputs, cur_period+1, cur_adaptation_set+1, first_rep_in_set,
-			 use_bs_switching, max_width, max_height, dar_num, dar_den, szFPS, lang, szInit, dasher->segment_alignment_disabled, dasher->mpd_name);
+			 use_bs_switching, max_width, max_height, dar_num, dar_den, szFPS, lang, szInit, dasher->segment_alignment_disabled, dasher->mpd_name, dasher->segments_start_with_rap);
 			gf_free(lang);
 
 			if (e) goto exit;
 
+			nb_rep_in_set = 0;
+			for (i=0; i<dasher->nb_inputs && !e; i++) {
+				GF_DashSegInput *dash_input = &dasher->inputs[i];
+				if (dash_input->adaptation_set==cur_adaptation_set+1)
+					nb_rep_in_set++;
+			}
+
 			is_first_rep = GF_TRUE;
 			for (i=0; i<dasher->nb_inputs && !e; i++) {
 				char szOutName[GF_MAX_PATH], *segment_name, *orig_seg_name;
@@ -6686,6 +7507,7 @@
 
 				/*in scalable case: seg_name is variable*/
 				dasher->variable_seg_rad_name = has_scalability ? GF_TRUE : GF_FALSE;
+
 				if (segment_name) {
 					if (strstr(segment_name, "%s")) {
 						sprintf(szSolvedSegName, segment_name, szOutName);
@@ -6702,6 +7524,9 @@
 					segment_name = szSolvedSegName;
 				}
 
+				if (nb_rep_in_set==1)
+					dasher->variable_seg_rad_name = GF_FALSE;
+
 				/* user added a relative-path baseURL */
 				if (dash_input->nb_baseURL) {
 					if (gf_url_is_local(dash_input->baseURL[0])) {
@@ -6724,22 +7549,29 @@
 					}
 				}
 
+				strcat(szOutName, "_dash");
 				if ((dash_input->trackNum || dash_input->single_track_num) && (!dasher->seg_rad_name || !strstr(dasher->seg_rad_name, "$RepresentationID$") ) ) {
-					char tmp[10];
-					sprintf(tmp, "_track%d", dash_input->trackNum ? dash_input->trackNum : dash_input->single_track_num);
+					char tmp[20];
+					sprintf(tmp, "_track%d_", dash_input->trackNum ? dash_input->trackNum : dash_input->single_track_num);
 					strcat(szOutName, tmp);
 				}
-				strcat(szOutName, "_dash");
 
 				if (gf_url_get_resource_path(dasher->mpd_name, tmp)) {
 					strcat(tmp, szOutName);
 					strcpy(szOutName, tmp);
 				}
 				if (segment_name && dash_input->trackNum && !strstr(dasher->seg_rad_name, "$RepresentationID$") ) {
-					char tmp[10];
+					char tmp[20];
 					sprintf(tmp, "_track%d_", dash_input->trackNum);
 					strcat(segment_name, tmp);
 				}
+				//dynamic loop of input creates same segment ID in new periods, force pid identification
+				//to have different names in periods
+				if (dash_input->period_id_not_specified>1) {
+					char tmp[20];
+					sprintf(tmp, "p%d_", dash_input->period_id_not_specified);
+					strcat(segment_name, tmp);
+				}
 				dasher->seg_rad_name = segment_name;
 
 				/*in scalable case, we need also the bandwidth of dependent representation*/
@@ -6757,7 +7589,6 @@
 					dasher->fragment_duration = dasher->segment_duration;
 				}
 
-
 				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASHing file %s\n", dash_input->file_name));
 				e = dash_input->dasher_segment_file(dash_input, szOutName, dasher, is_first_rep);
 
@@ -6787,26 +7618,37 @@
 		if (last_period_rep_idx_plus_one && dasher->inputs[last_period_rep_idx_plus_one-1].periodID && strcmp(id, dasher->inputs[last_period_rep_idx_plus_one-1].periodID) ) {
 			flush_period = GF_TRUE;
 		}
-		else if (dasher->force_period_end) {
+		else if (dasher->force_period_end || dasher->force_session_end) {
 			flush_period = GF_TRUE;
 		}
-		if (flush_period) {
-			sprintf(szOpt, "%g", active_period_start);
+		if (flush_period && dasher->dash_ctx) {
+			//get largest duration
+			u32 k, scount = gf_cfg_get_section_count(dasher->dash_ctx);
+			for (k=0; k<scount; k++) {
+				const char *sec = gf_cfg_get_section_name(dasher->dash_ctx, k);
+				if (!sec) continue;
+				if( !strnicmp(sec, "Representation_", 15) ) {
+					const char *key = gf_cfg_get_key(dasher->dash_ctx, sec, "CumulatedDuration");
+					if (key) {
+						Double v = atof(key) / dasher->dash_scale;
+						if (v>period_duration) period_duration = v;
+					}
+				}
+			}
+
+			sprintf(szOpt, "%g-%g", active_period_start, period_duration);
 			gf_cfg_set_key(dasher->dash_ctx, "PastPeriods", id, szOpt);
-			active_period_start += period_duration;
 
 			sprintf(szOpt, "%g", active_period_start);
 			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastActivePeriodStart", szOpt);
+			//also update last period duration with computed val
+			sprintf(szOpt, "%g", period_duration);
+			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastPeriodDuration", szOpt);
 
 			if (dasher->dash_ctx) purge_dash_context(dasher->dash_ctx);
 		}
 	}
 
-	if (dasher->dash_ctx) {
-		sprintf(szOpt, "%g", dasher->max_segment_duration);
-		gf_cfg_set_key(dasher->dash_ctx, "DASH", "MaxSegmentDuration", szOpt);
-	}
-
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] DASH Segment generation done\n"));
 
 
@@ -6817,7 +7659,7 @@
 		presentation_duration = dasher->mpd_live_duration;
 	}
 
-	if (dasher->force_period_end && !dasher->mpd_update_time && !presentation_duration) {
+	if ((dasher->force_period_end || dasher->force_session_end) && !dasher->mpd_update_time && !presentation_duration) {
 		presentation_duration = 0;
 		i=0;
 		while ((p = (PeriodEntry *) gf_list_enum(period_links, &i))) {

gpac-0.7.1.tar.gz/src/media_tools/dsmcc.c -> gpac-0.8.0.tar.gz/src/media_tools/dsmcc.c Changed

gpac-0.7.1.tar.gz/src/media_tools/dvb_mpe.c -> gpac-0.8.0.tar.gz/src/media_tools/dvb_mpe.c Changed

gpac-0.7.1.tar.gz/src/media_tools/filestreamer.c -> gpac-0.8.0.tar.gz/src/media_tools/filestreamer.c Changed

@@ -159,6 +159,8 @@
 		u32 w, h;
 		u32 dsi_len = 0;
 		GF_DecoderConfig *dcd;
+        u32 mtype;
+        
 		//use inspect mode so that we don't aggregate xPS from the base in the enhancement ESD
 		gf_isom_set_nalu_extract_mode(streamer->isom, track->track_num, GF_ISOM_NALU_EXTRACT_INSPECT);
 		dcd = gf_isom_get_decoder_config(streamer->isom, track->track_num, 1);
@@ -168,7 +170,8 @@
 			dsi_len = dcd->decoderSpecificInfo->dataLength;
 		}
 		w = h = 0;
-		if (gf_isom_get_media_type(streamer->isom, track->track_num) == GF_ISOM_MEDIA_VISUAL) {
+        mtype = gf_isom_get_media_type(streamer->isom, track->track_num);
+		if (gf_isom_is_video_subtype(mtype)) {
 			gf_isom_get_visual_info(streamer->isom, track->track_num, 1, &w, &h);
 		}
 
@@ -214,12 +217,13 @@
 	return gf_isom_streamer_setup_sdp(streamer, sdpfilename, NULL);
 }
 
+GF_EXPORT
 GF_Err gf_isom_streamer_get_sdp(GF_ISOMRTPStreamer *streamer, char **out_sdp_buffer)
 {
 	return gf_isom_streamer_setup_sdp(streamer, NULL, out_sdp_buffer);
 }
 
-
+GF_EXPORT
 void gf_isom_streamer_reset(GF_ISOMRTPStreamer *streamer, Bool is_loop)
 {
 	GF_RTPTrack *track;
@@ -475,6 +479,8 @@
 		case GF_ISOM_MEDIA_TEXT:
 			break;
 		case GF_ISOM_MEDIA_VISUAL:
+        case GF_ISOM_MEDIA_AUXV:
+        case GF_ISOM_MEDIA_PICT:
 		case GF_ISOM_MEDIA_AUDIO:
 		case GF_ISOM_MEDIA_SUBT:
 		case GF_ISOM_MEDIA_OD:
@@ -636,6 +642,8 @@
 		gf_isom_get_reference(streamer->isom, track->track_num, GF_ISOM_REF_BASE, 1, &base_track);
 		if (base_track)
 			streamer->base_track = base_track;
+
+		if (dsi) gf_free(dsi);
 	}
 
 	/*if scalable coding is found, disable auto RTCP reports and send them ourselves*/

gpac-0.7.1.tar.gz/src/media_tools/gpac_ogg.c -> gpac-0.8.0.tar.gz/src/media_tools/gpac_ogg.c Changed

@@ -960,7 +960,8 @@
 }
 
 s32 ogg_sync_wrote(ogg_sync_state *oy, s32 bytes) {
-	if(oy->fill+bytes>oy->storage)return(-1);
+	if(oy->fill+bytes>oy->storage)
+		return(-1);
 	oy->fill+=bytes;
 	return(0);
 }
@@ -1328,3 +1329,118 @@
 }
 
 #endif /*GPAC_DISABLE_OGG*/
+
+
+#include <gpac/internal/isomedia_dev.h>
+
+#ifndef GPAC_DISABLE_ISOM
+
+GF_Box *dOps_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_OpusSpecificBox, GF_ISOM_BOX_TYPE_DOPS);
+	return (GF_Box *)tmp;
+}
+
+void dOps_del(GF_Box *s)
+{
+	GF_OpusSpecificBox *ptr = (GF_OpusSpecificBox *)s;
+	if (ptr) gf_free(ptr);
+}
+
+GF_Err dOps_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_OpusSpecificBox *ptr = (GF_OpusSpecificBox *)s;
+	ptr->version = gf_bs_read_u8(bs);
+	ptr->OutputChannelCount = gf_bs_read_u8(bs);
+	ptr->PreSkip = gf_bs_read_u16(bs);
+	ptr->InputSampleRate = gf_bs_read_u32(bs);
+	ptr->OutputGain = gf_bs_read_u16(bs);
+	ptr->ChannelMappingFamily = gf_bs_read_u8(bs);
+	ISOM_DECREASE_SIZE(ptr, 11)
+	if (ptr->size) {
+		ISOM_DECREASE_SIZE(ptr, 2+ptr->OutputChannelCount);
+		ptr->StreamCount = gf_bs_read_u8(bs);
+		ptr->CoupledCount = gf_bs_read_u8(bs);
+		gf_bs_read_data(bs, (char *) ptr->ChannelMapping, ptr->OutputChannelCount);
+	}
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err dOps_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_OpusSpecificBox *ptr = (GF_OpusSpecificBox *)s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	gf_bs_write_u8(bs, ptr->version);
+	gf_bs_write_u8(bs, ptr->OutputChannelCount);
+	gf_bs_write_u16(bs, ptr->PreSkip);
+	gf_bs_write_u32(bs, ptr->InputSampleRate);
+	gf_bs_write_u16(bs, ptr->OutputGain);
+	gf_bs_write_u8(bs, ptr->ChannelMappingFamily);
+	if (ptr->ChannelMappingFamily) {
+		gf_bs_write_u8(bs, ptr->StreamCount);
+		gf_bs_write_u8(bs, ptr->CoupledCount);
+		gf_bs_write_data(bs, (char *) ptr->ChannelMapping, ptr->OutputChannelCount);
+	}
+	return GF_OK;
+}
+
+GF_Err dOps_Size(GF_Box *s)
+{
+	GF_OpusSpecificBox *ptr = (GF_OpusSpecificBox *)s;
+	ptr->size += 11;
+	if (ptr->ChannelMappingFamily)
+		ptr->size += 2 + ptr->OutputChannelCount;
+
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+
+GF_EXPORT
+GF_Err gf_isom_opus_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_OpusSpecificBox *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex)
+{
+	GF_TrackBox *trak;
+	GF_Err e;
+	u32 dataRefIndex;
+	GF_MPEGAudioSampleEntryBox *entry;
+	ptrdiff_t offset;
+
+	e = CanAccessMovie(the_file, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !trak->Media || !cfg) return GF_BAD_PARAM;
+
+	//get or create the data ref
+	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+	if (e) return e;
+	if (!dataRefIndex) {
+		e = Media_CreateDataRef(the_file, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		if (e) return e;
+	}
+	if (!the_file->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	//create a new entry
+	entry = (GF_MPEGAudioSampleEntryBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_OPUS);
+	if (!entry) return GF_OUT_OF_MEM;
+	entry->cfg_opus = (GF_OpusSpecificBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_DOPS);
+	if (!entry->cfg_opus) return GF_OUT_OF_MEM;
+	//skip box header
+	offset = (ptrdiff_t)&cfg->version - (ptrdiff_t)cfg;
+	memcpy((char*)entry->cfg_opus + offset, (char*)cfg + offset, sizeof(GF_OpusSpecificBox) - (size_t)offset);
+	
+	entry->dataReferenceIndex = dataRefIndex;
+	e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, entry);
+	*outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+	return e;
+}
+
+#endif /*GPAC_DISABLE_ISOM*/

gpac-0.7.1.tar.gz/src/media_tools/img.c -> gpac-0.8.0.tar.gz/src/media_tools/img.c Changed

@@ -24,6 +24,7 @@
 */
 
 #include <gpac/internal/media_dev.h>
+#include <gpac/internal/isomedia_dev.h>
 #include <gpac/constants.h>
 
 #ifdef GPAC_HAS_PNG
@@ -112,7 +113,7 @@
 			}
 		}
 		*OTI = GPAC_OTI_IMAGE_JPEG;
-		*mtype = GF_4CC('j','p','e','g');
+		*mtype = GF_ISOM_MEDIA_JPEG;
 		if (dsi) {
 			GF_BitStream *bs_dsi = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 			gf_bs_write_u16(bs_dsi, offset);
@@ -136,18 +137,18 @@
 		*width = gf_bs_read_u32(bs);
 		*height = gf_bs_read_u32(bs);
 		*OTI = GPAC_OTI_IMAGE_PNG;
-		*mtype = GF_4CC('p','n','g',' ');
+		*mtype = GF_ISOM_MEDIA_PNG;
 	}
 	/*try j2k*/
 	else {
 		size = gf_bs_read_u8(bs);
 		type = gf_bs_read_u32(bs);
-		if ( ((size==12) && (type==GF_4CC('j','P',' ',' ') ))
-	 || (type==GF_4CC('j','p','2','h') ) ) {
+		if ( ((size==12) && (type==GF_ISOM_BOX_TYPE_JP ))
+	 || (type==GF_ISOM_BOX_TYPE_JP2H ) ) {
 
-			if (type==GF_4CC('j','p','2','h')) {
+			if (type==GF_ISOM_BOX_TYPE_JP2H) {
 				*OTI = GPAC_OTI_IMAGE_JPEG_2000;
-				*mtype = GF_4CC('j','p','2',' ');
+				*mtype = GF_ISOM_MEDIA_JP2;
 				goto j2k_restart;
 			}
 
@@ -155,16 +156,16 @@
 			if (type!=0x0D0A870A) goto exit;
 
 			*OTI = GPAC_OTI_IMAGE_JPEG_2000;
-			*mtype = GF_4CC('j','p','2',' ');
+			*mtype = GF_ISOM_MEDIA_JP2;
 
 			while (gf_bs_available(bs)) {
 j2k_restart:
 				size = gf_bs_read_u32(bs);
 				type = gf_bs_read_u32(bs);
 				switch (type) {
-				case GF_4CC('j','p','2','h'):
+				case GF_ISOM_BOX_TYPE_JP2H:
 					goto j2k_restart;
-				case GF_4CC('i','h','d','r'):
+				case GF_ISOM_BOX_TYPE_IHDR:
 				{
 					u16 nb_comp;
 					u8 BPC, C, UnkC, IPR;
@@ -439,7 +440,7 @@
 	udta.size = png_size;
 	udta.pos = 0;
 	udta.rows=NULL;
-	
+
 	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, (png_voidp) &udta, NULL, NULL);
 	if (!png_ptr) return GF_IO_ERR;
 	info_ptr = png_create_info_struct(png_ptr);

gpac-0.7.1.tar.gz/src/media_tools/ismacryp.c -> gpac-0.8.0.tar.gz/src/media_tools/ismacryp.c Changed

@@ -29,6 +29,7 @@
 #include <gpac/xml.h>
 #include <gpac/base_coding.h>
 #include <gpac/constants.h>
+#include <gpac/internal/isomedia_dev.h>
 #include <gpac/crypt.h>
 #include <math.h>
 
@@ -40,10 +41,31 @@
 	GF_List *tcis;
 	Bool has_common_key;
 	Bool in_text_header;
-	//for convenience, it is set as the same as encryption scheme type
-	u32 crypt_type;
+	//global for all tracks unless overriden
+	u32 def_crypt_type;
+
+	GF_Err parse_error;
 } GF_CryptInfo;
 
+static u32 get_crypt_type(char *cr_type)
+{
+	if (!stricmp(cr_type, "ISMA") || !stricmp(cr_type, "iAEC"))
+		return GF_CRYPT_TYPE_ISMA;
+	else if (!stricmp(cr_type, "CENC AES-CTR") || !stricmp(cr_type, "cenc"))
+		return GF_CRYPT_TYPE_CENC;
+	else if (!stricmp(cr_type, "CENC AES-CBC") || !stricmp(cr_type, "cbc1"))
+		return GF_CRYPT_TYPE_CBC1;
+	else if (!stricmp(cr_type, "ADOBE") || !stricmp(cr_type, "adkm"))
+		return GF_CRYPT_TYPE_ADOBE;
+	else if (!stricmp(cr_type, "CENC AES-CTR Pattern") || !stricmp(cr_type, "cens"))
+		return GF_CRYPT_TYPE_CENS;
+	else if (!stricmp(cr_type, "CENC AES-CBC Pattern") || !stricmp(cr_type, "cbcs"))
+		return GF_CRYPT_TYPE_CBCS;
+
+	GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Unrecognized crypto type %s\n", cr_type));
+	return 0;
+}
+
 void isma_ea_node_start(void *sax_cbck, const char *node_name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes)
 {
 	GF_XMLAttribute *att;
@@ -59,23 +81,13 @@
 		for (i=0; i<nb_attributes; i++) {
 			att = (GF_XMLAttribute *) &attributes[i];
 			if (!stricmp(att->name, "type")) {
-				if (!stricmp(att->value, "ISMA") || !stricmp(att->value, "iAEC"))
-					info->crypt_type = GF_CRYPT_ISMA_CRYPT_TYPE;
-				else if (!stricmp(att->value, "CENC AES-CTR") || !stricmp(att->value, "cenc"))
-					info->crypt_type = GF_CRYPT_CENC_CRYPT_TYPE;
-				else if (!stricmp(att->value, "CENC AES-CBC") || !stricmp(att->value, "cbc1"))
-					info->crypt_type = GF_CRYPT_CBC1_CRYPT_TYPE;
-				else if (!stricmp(att->value, "ADOBE") || !stricmp(att->value, "adkm"))
-					info->crypt_type = GF_CRYPT_ADOBE_CRYPT_TYPE;
-				else if (!stricmp(att->value, "CENC AES-CTR Pattern") || !stricmp(att->value, "cens"))
-					info->crypt_type = GF_CRYPT_CENS_CRYPT_TYPE;
-				else if (!stricmp(att->value, "CENC AES-CBC Pattern") || !stricmp(att->value, "cbcs"))
-					info->crypt_type = GF_CRYPT_CBCS_CRYPT_TYPE;
+				info->def_crypt_type = get_crypt_type(att->value);
 			}
 		}
 		return;
 	}
 	if (!strcmp(node_name, "CrypTrack")) {
+		Bool has_common_key = GF_TRUE;
 		GF_SAFEALLOC(tkc, GF_TrackCryptInfo);
 		if (!tkc) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Cannnot allocate crypt track, skipping\n"));
@@ -83,6 +95,8 @@
 		}
 		//by default track is encrypted
 		tkc->IsEncrypted = 1;
+		tkc->sai_saved_box_type = GF_ISOM_BOX_TYPE_SENC;
+		tkc->scheme_type = info->def_crypt_type;
 		gf_list_add(info->tcis, tkc);
 
 		if (!strcmp(node_name, "OMATrack")) {
@@ -95,10 +109,21 @@
 			att = (GF_XMLAttribute *) &attributes[i];
 			if (!stricmp(att->name, "trackID") || !stricmp(att->name, "ID")) {
 				if (!strcmp(att->value, "*")) info->has_common_key = 1;
-				else tkc->trackID = atoi(att->value);
+				else {
+					tkc->trackID = atoi(att->value);
+					has_common_key = GF_FALSE;
+				}
+			}
+			else if (!stricmp(att->name, "type")) {
+				tkc->scheme_type = get_crypt_type(att->value);
 			}
 			else if (!stricmp(att->name, "key")) {
-				gf_bin128_parse(att->value, tkc->key);
+				GF_Err e = gf_bin128_parse(att->value, tkc->key);
+ if (e != GF_OK) {
+ GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannnot parse key value in CrypTrack\n"));
+ info->parse_error = e;
+ return;
+ }
 			}
 			else if (!stricmp(att->name, "salt")) {
 				u32 len, j;
@@ -134,6 +159,14 @@
 				else if (!strnicmp(att->value, "Clear", 5)) {
 					tkc->sel_enc_type = GF_CRYPT_SELENC_CLEAR;
 				}
+				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;
+				}
+			}
+			else if (!stricmp(att->name, "forceType")) {
+				tkc->force_type = GF_TRUE;
 			}
 			else if (!stricmp(att->name, "Preview")) {
 				tkc->sel_enc_type = GF_CRYPT_SELENC_PREVIEW;
@@ -179,6 +212,7 @@
 						sscanf(szV, "%x", &v);
 						tkc->first_IV[j/2] = v;
 					}
+					if (!tkc->IV_size) tkc->IV_size = (u8) strlen(sKey) / 2;
 				}
 			}
 			else if (!stricmp(att->name, "saiSavedBox")) {
@@ -201,13 +235,26 @@
 			else if (!stricmp(att->name, "skip_byte_block")) {
 				tkc->skip_byte_block = atoi(att->value);
 			}
+			else if (!stricmp(att->name, "clear_bytes")) {
+				tkc->clear_bytes = atoi(att->value);
+			}
 			else if (!stricmp(att->name, "constant_IV_size")) {
 				tkc->constant_IV_size = atoi(att->value);
-				assert((tkc->constant_IV_size == 8) || (tkc->constant_IV_size == 16));
+				if (tkc->constant_IV_size != 8 && tkc->constant_IV_size != 16) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] wrong given constant IV size %d, should be 8 or 16\n", tkc->constant_IV_size));
+				}
 			}
 			else if (!stricmp(att->name, "constant_IV")) {
 				char *sKey = att->value;
 				if (!strnicmp(sKey, "0x", 2)) sKey += 2;
+				if (!tkc->constant_IV_size) {
+					tkc->constant_IV_size = (u8) strlen(sKey) / 2;
+				} else {
+					u8 expected_size = (u8) strlen(sKey) / 2;
+					if (tkc->constant_IV_size != expected_size) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Mismatch between given constant_IV_size %d and constant_IV length %d\n", tkc->constant_IV_size, expected_size));
+					}
+				}
 				if ((strlen(sKey) == 16) || (strlen(sKey) == 32)) {
 					u32 j;
 					for (j=0; j<strlen(sKey); j+=2) {
@@ -217,38 +264,45 @@
 						sscanf(szV, "%x", &v);
 						tkc->constant_IV[j/2] = v;
 					}
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] wrong constant IV value size %d, should be 16 or 32\n", strlen(sKey)));
 				}
 			}
+			else if (!stricmp(att->name, "encryptSliceHeader")) {
+				tkc->allow_encrypted_slice_header = !strcmp(att->value, "yes") ? GF_TRUE : GF_FALSE;
+			}
+			else if (!stricmp(att->name, "blockAlign")) {
+				if (!strcmp(att->value, "disable")) tkc->block_align = 1;
+				else if (!strcmp(att->value, "always")) tkc->block_align = 2;
+				else tkc->block_align = 0;
+			}
 		}
 
-		if ((info->crypt_type == GF_CRYPT_CBC1_CRYPT_TYPE) && (tkc->IV_size == 8)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Using AES-128 CBC: IV_size should be 16\n"));
+		if (has_common_key) info->has_common_key = 1;
+
+		if ((tkc->IV_size != 0) && (tkc->IV_size != 8) && (tkc->IV_size != 16)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] wrong IV size %d for AES-128, using 16\n", (u32) tkc->IV_size));
 			tkc->IV_size = 16;
 		}
 
-		if ((info->crypt_type == GF_CRYPT_CENC_CRYPT_TYPE) || (info->crypt_type == GF_CRYPT_CBC1_CRYPT_TYPE)) {
+		if ((tkc->scheme_type == GF_CRYPT_TYPE_CENC) || (tkc->scheme_type == GF_CRYPT_TYPE_CBC1)) {
 			if (tkc->crypt_byte_block || tkc->skip_byte_block) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Using scheme type %s, crypt_byte_block and skip_byte_block shall be 0\n", gf_4cc_to_str(info->crypt_type) ));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Using scheme type %s, crypt_byte_block and skip_byte_block shall be 0\n", gf_4cc_to_str(tkc->scheme_type) ));
 				tkc->crypt_byte_block = tkc->skip_byte_block = 0;
 			}
 		}
 
-		if ((info->crypt_type == GF_CRYPT_CENS_CRYPT_TYPE) || (info->crypt_type == GF_CRYPT_CBCS_CRYPT_TYPE)) {
-			if (!tkc->crypt_byte_block || !tkc->skip_byte_block) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Using pattern mode, crypt_byte_block and skip_byte_block shall be 0 only for track other than video\n"));
-			}
-		}
-
-		if ((info->crypt_type == GF_CRYPT_CENC_CRYPT_TYPE) || (info->crypt_type == GF_CRYPT_CBC1_CRYPT_TYPE) || (info->crypt_type == GF_CRYPT_CENS_CRYPT_TYPE)) {
+		if ((tkc->scheme_type == GF_CRYPT_TYPE_CENC) || (tkc->scheme_type == GF_CRYPT_TYPE_CBC1) || (tkc->scheme_type == GF_CRYPT_TYPE_CENS)) {
 			if (tkc->constant_IV_size) {
 				if (!tkc->IV_size) {
 					tkc->IV_size = tkc->constant_IV_size;
 					memcpy(tkc->first_IV, tkc->constant_IV, 16);
-					GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Using scheme type %s, constant IV shall not be used, using constant IV as first IV\n", gf_4cc_to_str(info->crypt_type)));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Using scheme type %s, constant IV shall not be used, using constant IV as first IV\n", gf_4cc_to_str(tkc->scheme_type)));
+					tkc->constant_IV_size = 0;
 				} else {
 					tkc->constant_IV_size = 0;
 					memset(tkc->constant_IV, 0, 16);
-					GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Using scheme type %s, constant IV shall not be used, ignoring\n", gf_4cc_to_str(info->crypt_type)));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Using scheme type %s, constant IV shall not be used, ignoring\n", gf_4cc_to_str(tkc->scheme_type)));
 				}
 			}
 		}
@@ -263,10 +317,20 @@
 			att = (GF_XMLAttribute *) &attributes[i];
 
 			if (!stricmp(att->name, "KID")) {
-				gf_bin128_parse(att->value, tkc->KIDs[tkc->KID_count]);
+				GF_Err e = gf_bin128_parse(att->value, tkc->KIDs[tkc->KID_count]);
+ if (e != GF_OK) {
+ GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannnot parse KID\n"));
+ info->parse_error = e;
+ return;
+ }
 			}
 			else if (!stricmp(att->name, "value")) {
-				gf_bin128_parse(att->value, tkc->keys[tkc->KID_count]);
+				GF_Err e = gf_bin128_parse(att->value, tkc->keys[tkc->KID_count]);
+ if (e != GF_OK) {
+ GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannnot parse key value\n"));
+ info->parse_error = e;
+ return;
+ }
 			}
 		}
 		tkc->KID_count++;
@@ -328,6 +392,7 @@
 	sax = gf_xml_sax_new(isma_ea_node_start, isma_ea_node_end, isma_ea_text, info);
 	e = gf_xml_sax_parse_file(sax, file, NULL);
 	gf_xml_sax_del(sax);
+	if (e>=0) e = info->parse_error;
 	if (e<0) {
 		del_crypt_info(info);
 		return NULL;
@@ -412,7 +477,7 @@
 	gf_bs_write_data(bs, salt, 8);
 	gf_bs_write_u64(bs, (s64) count);
 	gf_bs_del(bs);
-	gf_crypt_set_state(mc, IV, 17);
+	gf_crypt_set_IV(mc, IV, GF_AES_128_KEYSIZE+1);
 
 	/*decrypt remain bytes*/
 	if (remain) {
@@ -426,7 +491,7 @@
 {
 	GF_Err e;
 	Bool use_sel_enc;
-	u32 track, count, i, j, si, is_avc;
+	u32 track, count, i, j, si, otype, is_nalu;
 	GF_ISOSample *samp;
 	GF_ISMASample *ismasamp;
 	GF_Crypt *mc;
@@ -436,12 +501,12 @@
 	GF_ESD *esd;
 
 	track = gf_isom_get_track_by_id(mp4, tci->trackID);
-	e = gf_isom_get_ismacryp_info(mp4, track, 1, &is_avc, NULL, NULL, NULL, NULL, &use_sel_enc, &IV_size, NULL);
+	e = gf_isom_get_ismacryp_info(mp4, track, 1, &otype, NULL, NULL, NULL, NULL, &use_sel_enc, &IV_size, NULL);
 	if (e) return e;
-	is_avc = (is_avc==GF_4CC('2','6','4','b')) ? 1 : 0;
+	is_nalu = ((otype==GF_ISOM_BOX_TYPE_264B) || (otype==GF_ISOM_BOX_TYPE_265B)) ? 1 : 0;
 
 
-	mc = gf_crypt_open("AES-128", "CTR");
+	mc = gf_crypt_open(GF_AES_128, GF_CTR);
 	if (!mc) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open AES-128 CTR cryptography\n", tci->trackID));
 		return GF_IO_ERR;
@@ -449,7 +514,7 @@
 
 	memset(IV, 0, sizeof(char)*16);
 	memcpy(IV, tci->salt, sizeof(char)*8);
-	e = gf_crypt_init(mc, tci->key, 16, IV);
+	e = gf_crypt_init(mc, tci->key, IV);
 	if (e) {
 		gf_crypt_close(mc);
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] cannot initialize AES-128 CTR (%s)\n", gf_error_to_string(e)));
@@ -458,6 +523,8 @@
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[CENC/ISMA] Decrypting track ID %d - KMS: %s%s\n", tci->trackID, tci->KMS_URI, use_sel_enc ? " - Selective Decryption" : ""));
 
+	if (gf_isom_has_time_offset(mp4, track)) gf_isom_set_cts_packing(mp4, track, GF_TRUE);
+
 	/*start as initialized*/
 	prev_sample_encrypted = 1;
 	/* decrypt each sample */
@@ -482,7 +549,7 @@
 		gf_isom_ismacryp_delete_sample(ismasamp);
 
 		/*replace AVC start codes (0x00000001) by nalu size*/
-		if (is_avc) {
+		if (is_nalu) {
 			u32 nalu_size;
 			u32 remain = samp->dataLength;
 			char *start, *end;
@@ -521,6 +588,7 @@
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Error ISMACryp signature from trackID %d: %s\n", tci->trackID, gf_error_to_string(e)));
 	}
+	gf_isom_set_cts_packing(mp4, track, GF_FALSE);
 
 	/*remove all IPMP ptrs*/
 	esd = gf_isom_get_esd(mp4, track, 1);
@@ -534,6 +602,8 @@
 		gf_odf_desc_del((GF_Descriptor *)esd);
 	}
 
+	gf_media_update_bitrate(mp4, track);
+
 	/*update OD track if any*/
 	for (i=0; i<gf_isom_get_track_count(mp4); i++) {
 		GF_ODCodec *cod;
@@ -574,7 +644,7 @@
 	GF_ISOSample *samp;
 	GF_ISMASample *isamp;
 	GF_Crypt *mc;
-	u32 i, count, di, track, IV_size, rand, avc_size_length;
+	u32 i, count, di, track, IV_size, rand, avc_size_length, hevc_size_length;
 	u64 BSO, range_end;
 	GF_ESD *esd;
 	GF_IPMPPtr *ipmpdp;
@@ -586,7 +656,7 @@
 	GF_Err e;
 	Bool prev_sample_encryped, has_crypted_samp;
 
-	avc_size_length = 0;
+	avc_size_length = hevc_size_length = 0;
 	track = gf_isom_get_track_by_id(mp4, tci->trackID);
 	if (!track) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot find TrackID %d in input file - skipping\n", tci->trackID));
@@ -600,6 +670,7 @@
 	}
 	if (esd) {
 		if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)) avc_size_length = 1;
+		else if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_LHVC)) hevc_size_length = 1;
 		gf_odf_desc_del((GF_Descriptor*) esd);
 	}
 	if (avc_size_length) {
@@ -607,7 +678,16 @@
 		avc_size_length = avccfg->nal_unit_size;
 		gf_odf_avc_cfg_del(avccfg);
 		if (avc_size_length != 4) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot encrypt AVC/H264 track with %d size_length field - onmy 4 supported\n", avc_size_length));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot encrypt AVC/H264 track with %d size_length field - only 4 supported\n", avc_size_length));
+			return GF_NOT_SUPPORTED;
+		}
+	}
+	if (hevc_size_length) {
+		GF_HEVCConfig *hvccfg = gf_isom_hevc_config_get(mp4, track, 1);
+		avc_size_length = hvccfg->nal_unit_size;
+		gf_odf_hevc_cfg_del(hvccfg);
+		if (avc_size_length != 4) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot encrypt HEVC/H265 track with %d size_length field - only 4 supported\n", avc_size_length));
 			return GF_NOT_SUPPORTED;
 		}
 	}
@@ -638,12 +718,12 @@
 	/*init crypto*/
 	memset(IV, 0, sizeof(char)*16);
 	memcpy(IV, tci->salt, sizeof(char)*8);
-	mc = gf_crypt_open("AES-128", "CTR");
+	mc = gf_crypt_open(GF_AES_128, GF_CTR);
 	if (!mc) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open AES-128 CTR\n"));
 		return GF_IO_ERR;
 	}
-	e = gf_crypt_init(mc, tci->key, 16, IV);
+	e = gf_crypt_init(mc, tci->key, IV);
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot initialize AES-128 CTR (%s)\n", gf_error_to_string(e)) );
 		gf_crypt_close(mc);
@@ -701,6 +781,8 @@
 
 		switch (tci->sel_enc_type) {
 		case GF_CRYPT_SELENC_RAP:
+			if (!samp->IsRAP)
+				gf_isom_get_sample_rap_roll_info(mp4, track, i+1, (Bool *) &samp->IsRAP, NULL, NULL);
 			if (samp->IsRAP) isamp->flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
 			break;
 		case GF_CRYPT_SELENC_NON_RAP:
@@ -776,9 +858,11 @@
 		gf_isom_sample_del(&samp);
 		gf_set_progress("ISMA Encrypt", i+1, count);
 	}
-	gf_isom_set_cts_packing(mp4, track, GF_FALSE);
 	gf_crypt_close(mc);
 
+	gf_isom_set_cts_packing(mp4, track, GF_FALSE);
+	gf_media_update_bitrate(mp4, track);
+
 
 	/*format as IPMP(X) - note that the ISMACryp spec is broken since it always uses IPMPPointers to a
 	single desc which would assume the same protection (eg key & salt) for all streams using it...*/
@@ -871,16 +955,17 @@
 	return;
 }
 
-static void cenc_resync_IV(GF_Crypt *mc, char IV[16], u8 IV_size) {
+static void cenc_resync_IV(GF_Crypt *mc, char IV[16], u8 IV_size)
+{
 	char next_IV[17];
-	int size = 17;
+	u32 size = 17;
 
-	gf_crypt_get_state(mc, &next_IV, &size);
+	gf_crypt_get_IV(mc, (u8 *) next_IV, &size);
 	/*
 		NOTE 1: the next_IV returned by get_state has 17 bytes, the first byte being the current counter position in the following 16 bytes.
-		If this index is 0, this means that we are at the begining of a new block and we can use it as IV for next sample,
+		If this index is 0, this means that we are at the beginning of a new block and we can use it as IV for next sample,
 		otherwise we must discard unsued bytes in the counter (next sample shall begin with counter at 0)
-		if less than 16 blocks were cyphered, we must force inscreasing the next IV for next sample, not doing so would produce the same IV for the next bytes cyphered,
+		if less than 16 blocks were cyphered, we must force increasing the next IV for next sample, not doing so would produce the same IV for the next bytes cyphered,
 		which is forbidden by CENC (unique IV per sample). In GPAC, we ALWAYS force counter increase
 
 		NOTE 2: in case where IV_size is 8, because the cypher block is treated as 16 bytes while processing,
@@ -904,25 +989,135 @@
 		next_IV[0] = 0;
 	}
 
-	gf_crypt_set_state(mc, next_IV, size);
+	gf_crypt_set_IV(mc, next_IV, size);
 
 	memset(IV, 0, 16*sizeof(char));
 	memcpy(IV, next_IV+1, 16*sizeof(char));
 }
 
-static GF_Err gf_cenc_encrypt_sample_ctr(GF_Crypt *mc, GF_ISOSample *samp, Bool is_nalu_video, u32 nalu_size_length, char IV[16], u32 IV_size, char **sai, u32 *saiz, 
-										 u32 bytes_in_nalhr, u8 crypt_byte_block, u8 skip_byte_block) {
-	GF_BitStream *pleintext_bs, *cyphertext_bs, *sai_bs;
+//parses slice header and returns its size
+static u32 gf_cenc_get_clear_bytes(GF_TrackCryptInfo *tci, GF_BitStream *plaintext_bs, char *samp_data, u32 nal_size, u32 bytes_in_nalhr)
+{
+	u32 clear_bytes = 0;
+	if (tci->slice_header_clear) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+		u32 nal_start = (u32) gf_bs_get_position(plaintext_bs);
+		if (tci->is_avc) {
+			s32 ret;
+			u32 ntype, nhdr, nb_epb_count;
+			GF_BitStream *bs = NULL;
+			char *epb_rem_bytes;
+
+			//check if we have EP bytes in the payload (they could be in slice header)
+			nb_epb_count = gf_media_nalu_emulation_bytes_remove_count(samp_data + nal_start, nal_size);
+			if (nb_epb_count) {
+				epb_rem_bytes = gf_malloc(sizeof(char) * nal_size);
+				nb_epb_count = gf_media_nalu_remove_emulation_bytes(samp_data + nal_start, epb_rem_bytes, nal_size);
+				bs = gf_bs_new(epb_rem_bytes, nb_epb_count, GF_BITSTREAM_READ);
+			}
+			nhdr = gf_bs_read_u8(bs ? bs : plaintext_bs);
+
+			ntype = nhdr & 0x1F;
+			switch (ntype) {
+			case GF_AVC_NALU_NON_IDR_SLICE:
+			case GF_AVC_NALU_DP_A_SLICE:
+			case GF_AVC_NALU_DP_B_SLICE:
+			case GF_AVC_NALU_DP_C_SLICE:
+			case GF_AVC_NALU_IDR_SLICE:
+			case GF_AVC_NALU_SLICE_AUX:
+			case GF_AVC_NALU_SVC_SLICE:
+				ret = gf_media_avc_parse_nalu(bs ? bs : plaintext_bs, nhdr, &tci->avc);
+				if (ret<0) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Error parsing slice header, cannot get slice header size. Assuming 8 bytes is enough, but resulting file will not be compliant\n"));
+					clear_bytes = 8;
+				} else {
+					//skip bits till alignment
+					gf_bs_align(bs ? bs : plaintext_bs);
+					if (bs) {
+						clear_bytes = (u32) gf_bs_get_position(bs);
+					} else {
+						clear_bytes = (u32) gf_bs_get_position(plaintext_bs) - nal_start;
+					}
+				}
+				break;
+			case GF_AVC_NALU_SEQ_PARAM:
+				gf_media_avc_read_sps(samp_data + nal_start, nal_size, &tci->avc, 0, NULL);
+				clear_bytes = nal_size;
+				break;
+			case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
+				gf_media_avc_read_sps(samp_data + nal_start, nal_size, &tci->avc, 1, NULL);
+				clear_bytes = nal_size;
+				break;
+			case GF_AVC_NALU_PIC_PARAM:
+				gf_media_avc_read_pps(samp_data + nal_start, nal_size, &tci->avc);
+				clear_bytes = nal_size;
+				break;
+
+			default:
+				clear_bytes = nal_size;
+				break;
+			}
+			if (bs) {
+				gf_bs_del(bs);
+				gf_free(epb_rem_bytes);
+
+				//check if we have EP bytes in slice header
+				if (clear_bytes < nal_size) {
+					nb_epb_count = gf_media_nalu_emulation_bytes_remove_count(samp_data + nal_start, clear_bytes);
+					if (nb_epb_count)
+						clear_bytes += nb_epb_count;
+				}
+			}
+		} else {
+#if !defined(GPAC_DISABLE_HEVC)
+			u8 ntype, ntid, nlid;
+			u32 nal_start = (u32) gf_bs_get_position(plaintext_bs);
+			tci->hevc.full_slice_header_parse = GF_TRUE;
+			gf_media_hevc_parse_nalu (samp_data + nal_start, nal_size, &tci->hevc, &ntype, &ntid, &nlid);
+			if (ntype<=GF_HEVC_NALU_SLICE_CRA) {
+				clear_bytes = tci->hevc.s_info.payload_start_offset;
+			} else {
+				clear_bytes = nal_size;
+			}
+		}
+		gf_bs_seek(plaintext_bs, nal_start);
+#endif
+
+#else
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] AV parsers disabled, cannot get slice header size. Assuming 8 bytes is enough, but resulting file will not be compliant\n"));
+		clear_bytes = 8;
+#endif //GPAC_DISABLE_AV_PARSERS
+
+	} else {
+		clear_bytes = bytes_in_nalhr;
+	}
+	return clear_bytes;
+}
+
+typedef enum {
+	ENC_FULL_SAMPLE,
+
+	/*below types may have several ranges (clear/encrypted) per sample*/
+	ENC_NALU, /*NALU-based*/
+	ENC_OBU, /*OBU-based*/
+	ENC_VP9, /*custom, see https://www.webmproject.org/vp9/mp4/*/
+} GF_Enc_BsFmt;
+
+static GF_Err gf_cenc_encrypt_sample_ctr(GF_Crypt *mc, GF_TrackCryptInfo *tci, GF_ISOSample *samp, GF_Enc_BsFmt bs_type, u32 nalu_size_length_in_bytes, char IV[16], u32 IV_size, char **sai, u32 *saiz,
+										 u32 bytes_in_nalhr, u8 crypt_byte_block, u8 skip_byte_block)
+{
+	GF_BitStream *plaintext_bs = NULL, *cyphertext_bs, *sai_bs = NULL;
+	GF_CENCSubSampleEntry *prev_entry = NULL;
 	char *buffer;
-	u32 max_size, size;
+	u32 max_size_in_bytes, unit_size = 0;
 	GF_Err e = GF_OK;
-	GF_List *subsamples;
+	GF_List *subsamples = NULL;
 
-	pleintext_bs = cyphertext_bs = sai_bs = NULL;
-	max_size = 4096;
-	buffer = (char*)gf_malloc(sizeof(char) * max_size);
-	memset(buffer, 0, max_size);
-	pleintext_bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
+	plaintext_bs = cyphertext_bs = sai_bs = NULL;
+	max_size_in_bytes = 4096;
+	buffer = (char*)gf_malloc(sizeof(char) * max_size_in_bytes);
+	memset(buffer, 0, max_size_in_bytes);
+	plaintext_bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
 	cyphertext_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	sai_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	gf_bs_write_data(sai_bs, IV, IV_size);
@@ -931,52 +1126,266 @@
 		e = GF_IO_ERR;
 		goto exit;
 	}
-	while (gf_bs_available(pleintext_bs)) {
-		if (is_nalu_video) {
-			char nal_hdr[2];
-			GF_CENCSubSampleEntry *entry = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry));
-			size = gf_bs_read_int(pleintext_bs, 8*nalu_size_length);
-			if (size>max_size) {
-				buffer = (char*)gf_realloc(buffer, sizeof(char)*size);
-				max_size = size;
-			}
-			gf_bs_read_data(pleintext_bs, (char *)nal_hdr, bytes_in_nalhr);
+	if ((bs_type == ENC_OBU) || (bs_type == ENC_VP9))
+		nalu_size_length_in_bytes = 0;
+
+	while (gf_bs_available(plaintext_bs)) {
+		if (bs_type != ENC_FULL_SAMPLE) {
+			u32 clear_bytes = 0;
+			u32 range_idx = 0;
+			struct {
+				int clear, encrypted;
+			} ranges[AV1_MAX_TILE_ROWS * AV1_MAX_TILE_COLS];
+			u32 nb_ranges=1;
+
+			switch(bs_type) {
+			case ENC_NALU:
+				unit_size = gf_bs_read_int(plaintext_bs, 8*nalu_size_length_in_bytes);
+				if (unit_size == 0) {
+					continue;
+				}
+				if (unit_size > gf_bs_available(plaintext_bs) ) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] NAL size %u larger than bytes remaining in sample\n", unit_size ));
+					e = GF_NON_COMPLIANT_BITSTREAM;
+					goto exit;
+				}
 
-			gf_bs_read_data(pleintext_bs, buffer, size-bytes_in_nalhr);
-			//pattern encryption
-			if (crypt_byte_block && skip_byte_block) {
-				u32 pos = 0;
-				u32 res = size-bytes_in_nalhr;
-				while (res) {
-					gf_crypt_encrypt(mc, buffer+pos, res >= (u32) (16*crypt_byte_block) ? 16*crypt_byte_block : res);
-					if (res >= (u32) (16 * (crypt_byte_block + skip_byte_block))) {
-						pos += 16 * (crypt_byte_block + skip_byte_block);
-						res -= 16 * (crypt_byte_block + skip_byte_block);
+	 			clear_bytes = gf_cenc_get_clear_bytes(tci, plaintext_bs, samp->data, unit_size, bytes_in_nalhr);
+				break;
+			case ENC_OBU: {
+				ObuType obut;
+				u64 pos, obu_size;
+				u32 hdr_size, i;
+
+				pos = gf_bs_get_position(plaintext_bs);
+				e = gf_media_aom_av1_parse_obu(plaintext_bs, &obut, &obu_size, &hdr_size, &tci->av1);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC-CTR] Failed to parse OBU\n"));
+					goto exit;
+				}
+				gf_bs_seek(plaintext_bs, pos);
+
+				unit_size = (u32)obu_size;
+				switch (obut) { //we only encrypt frame and tile group
+				case OBU_FRAME:
+				case OBU_TILE_GROUP:
+					assert(tci->av1.frame_state.nb_tiles_in_obu > 0);
+					nb_ranges = tci->av1.frame_state.nb_tiles_in_obu;
+
+					ranges[0].clear = tci->av1.frame_state.tiles[0].obu_start_offset;
+					ranges[0].encrypted = tci->av1.frame_state.tiles[0].size;
+					for (i = 1; i < nb_ranges; ++i) {
+						ranges[i].clear = tci->av1.frame_state.tiles[i].obu_start_offset - (tci->av1.frame_state.tiles[i - 1].obu_start_offset + tci->av1.frame_state.tiles[i - 1].size);
+						ranges[i].encrypted = tci->av1.frame_state.tiles[i].size;
+					}
+					clear_bytes = ranges[0].clear;
+					unit_size = clear_bytes + ranges[0].encrypted;
+					if (ranges[0].encrypted >= 16) {
+						//A subsample SHALL be created for each tile >= 16 bytes. If previous range had encrypted bytes, create a new one, otherwise merge in prev
+						if (prev_entry && prev_entry->bytes_encrypted_data)
+							prev_entry = NULL;
 					} else {
-						res = 0;
+						clear_bytes = unit_size;
 					}
+					break;
+				default:
+					clear_bytes = (u32)obu_size;
+					break;
 				}
-			} else {
-				gf_crypt_encrypt(mc, buffer, size-bytes_in_nalhr);
 			}
+				break;
+			case ENC_VP9: {
+				u64 pos = 0;
+				int num_frames_in_superframe = 0, superframe_index_size = 0, i = 0;
+				u32 frame_sizes[VP9_MAX_FRAMES_IN_SUPERFRAME];
+
+				if (tci->block_align != 2) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] VP9 mandates that blockAlign=\"always\". Forcing value.\n"));
+					tci->block_align = 2;
+				}
 
-			//TODO: adjust bytes_encrypted_data to a multiple of 16 bytes to avoid partial Blocks at the end of Subsamples
+				pos = gf_bs_get_position(plaintext_bs);
+				e = vp9_parse_superframe(plaintext_bs, samp->dataLength, &num_frames_in_superframe, frame_sizes, &superframe_index_size);
+				if (e) goto exit;
+				gf_bs_seek(plaintext_bs, pos);
+
+				nb_ranges = num_frames_in_superframe;
+
+				for (i = 0; i < num_frames_in_superframe; ++i) {
+					Bool key_frame;
+					int width = 0, height = 0, renderWidth = 0, renderHeight = 0;
+					GF_VPConfig *vp9_cfg = gf_odf_vp_cfg_new();
+					u64 pos2 = gf_bs_get_position(plaintext_bs);
+					e = vp9_parse_sample(plaintext_bs, vp9_cfg, &key_frame, &width, &height, &renderWidth, &renderHeight);
+					gf_odf_vp_cfg_del(vp9_cfg);
+					if (e) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[CENC-CTR][VP9] Error parsing sample at DTS="LLU"\n", samp->DTS));
+						goto exit;
+					}
+
+					ranges[i].clear = (int)(gf_bs_get_position(plaintext_bs) - pos2);
+					ranges[i].encrypted = frame_sizes[i] - ranges[i].clear;
 
-			/*write clear data and encrypted data to bitstream*/
-			gf_bs_write_int(cyphertext_bs, size, 8*nalu_size_length);
-			gf_bs_write_data(cyphertext_bs, nal_hdr, bytes_in_nalhr);
-			gf_bs_write_data(cyphertext_bs, buffer, size-bytes_in_nalhr);
+					gf_bs_seek(plaintext_bs, pos2 + frame_sizes[i]);
+				}
+				if (gf_bs_get_position(plaintext_bs) + superframe_index_size != pos + samp->dataLength) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[CENC-CTR][VP9] Inconsistent sample size %u (parsed "LLU") at DTS="LLU". Re-import raw VP9/IVF for more details.\n",
+						samp->dataLength, gf_bs_get_position(plaintext_bs) + superframe_index_size - pos, samp->DTS));
+				}
+				gf_bs_seek(plaintext_bs, pos);
+
+				clear_bytes = ranges[0].clear;
+				assert(frame_sizes[0] == ranges[0].clear + ranges[0].encrypted);
+				unit_size = frame_sizes[0];
+
+				//final superframe index must be in clear
+				if (superframe_index_size > 0) {
+					ranges[nb_ranges].clear = superframe_index_size;
+					ranges[nb_ranges].encrypted = 0;
+					nb_ranges++;
+				}
+
+				//not clearly defined in the spec (so we do the same as in AV1 which is more clearly defined):
+				if (frame_sizes[0] - clear_bytes >= 16) {
+					//A subsample SHALL be created for each tile >= 16 bytes. If previous range had encrypted bytes, create a new one, otherwise merge in prev
+					if (prev_entry && prev_entry->bytes_encrypted_data)
+						prev_entry = NULL;
+				} else {
+					clear_bytes = unit_size;
+				}
+			}
+				break;
+			default:
+				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC-CTR] Unsupported bitstream format (%s).\n", bs_type));
+				e = GF_NOT_SUPPORTED;
+				goto exit;
+			}
 
-			entry->bytes_clear_data = nalu_size_length + bytes_in_nalhr;
-			entry->bytes_encrypted_data = size - bytes_in_nalhr;
-			gf_list_add(subsamples, entry);
+
+			while (nb_ranges) {
+				if (unit_size > max_size_in_bytes) {
+					buffer = (char*)gf_realloc(buffer, sizeof(char)*unit_size);
+					max_size_in_bytes = unit_size;
+				}
+
+				// adjust so that encrypted bytes are a multiple of 16 bytes: cenc SHOULD, cens SHALL, we always do it
+				if (unit_size > clear_bytes) {
+					u32 ret = (unit_size - clear_bytes) % 16;
+					//in OBU (AV1) always enforced
+					if (bs_type == ENC_OBU) {
+						clear_bytes += ret;
+					}
+					//for CENC (should),
+					else if (tci->scheme_type == GF_CRYPT_TYPE_CENC) {
+						//do it if not disabled by user
+						if (tci->block_align != 1) {
+							//always align even if sample is not encrypted in the end
+							if (tci->block_align == 2) {
+								clear_bytes += ret;
+							}
+							//or if we don't end up with sample in the clear
+							else if (unit_size > clear_bytes + ret) {
+								clear_bytes += ret;
+							}
+						}
+					} else {
+						clear_bytes += ret;
+					}
+				}
+
+				/*read clear data and transfer to output*/
+				gf_bs_read_data(plaintext_bs, buffer, clear_bytes);
+				if (bs_type == ENC_NALU)
+					gf_bs_write_int(cyphertext_bs, unit_size, 8*nalu_size_length_in_bytes);
+
+				gf_bs_write_data(cyphertext_bs, buffer, clear_bytes);
+
+				//read data to encrypt
+				if (unit_size > clear_bytes) {
+					gf_bs_read_data(plaintext_bs, buffer, unit_size - clear_bytes);
+
+					//pattern encryption
+					if (crypt_byte_block && skip_byte_block) {
+						u32 pos = 0;
+						u32 res = unit_size - clear_bytes;
+						while (res) {
+							gf_crypt_encrypt(mc, buffer+pos, res >= (u32) (16*crypt_byte_block) ? 16*crypt_byte_block : res);
+							if (res >= (u32) (16 * (crypt_byte_block + skip_byte_block))) {
+								pos += 16 * (crypt_byte_block + skip_byte_block);
+								res -= 16 * (crypt_byte_block + skip_byte_block);
+							} else {
+								res = 0;
+							}
+						}
+					} else {
+						gf_crypt_encrypt(mc, buffer, unit_size - clear_bytes);
+					}
+
+					/*write encrypted data to bitstream*/
+					gf_bs_write_data(cyphertext_bs, buffer, unit_size - clear_bytes);
+				}
+				//prev entry is not a VCL, append this NAL
+				if (prev_entry && !prev_entry->bytes_encrypted_data) {
+					prev_entry->bytes_clear_data += nalu_size_length_in_bytes + clear_bytes;
+					prev_entry->bytes_encrypted_data += unit_size - clear_bytes;
+				} else {
+					prev_entry = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry));
+					prev_entry->bytes_clear_data = nalu_size_length_in_bytes + clear_bytes;
+					prev_entry->bytes_encrypted_data = unit_size - clear_bytes;
+					gf_list_add(subsamples, prev_entry);
+				}
+				//check bytes of clear is not larger than 16bits
+				while (prev_entry->bytes_clear_data > 0xFFFF) {
+					GF_CENCSubSampleEntry *split_entry = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry));
+					split_entry->bytes_clear_data = prev_entry->bytes_clear_data - 0xFFFF;
+					split_entry->bytes_encrypted_data = prev_entry->bytes_encrypted_data;
+					prev_entry->bytes_clear_data = 0xFFFF;
+					prev_entry->bytes_encrypted_data = 0;
+					gf_list_add(subsamples, split_entry);
+					prev_entry = split_entry;
+				}
+
+
+				nb_ranges--;
+				if (!nb_ranges) break;
+
+				range_idx++;
+				switch (bs_type) {
+				case ENC_OBU:
+					clear_bytes = ranges[range_idx].clear;
+					unit_size = clear_bytes + ranges[range_idx].encrypted;
+					prev_entry = NULL; //a subsample SHALL be created for each tile.
+					break;
+				case ENC_VP9:
+					if (nb_ranges > 1) {
+						clear_bytes = ranges[range_idx].clear;
+						unit_size = clear_bytes + ranges[range_idx].encrypted;
+					} else { /*last*/
+						unit_size = clear_bytes = ranges[range_idx].clear;
+						assert(ranges[range_idx].encrypted == 0);
+					}
+					prev_entry = NULL; //a subsample SHALL be created for each tile.
+					break;
+				default:
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Detected unexpected subrange in bitstream format %d\n", bs_type));
+					assert(0);
+					break;
+				}
+			}
 		} else {
-			gf_bs_read_data(pleintext_bs, buffer, samp->dataLength);
+			assert(bs_type == ENC_FULL_SAMPLE);
+			if (samp->dataLength > max_size_in_bytes) {
+				buffer = (char*)gf_realloc(buffer, sizeof(char)*samp->dataLength);
+				max_size_in_bytes = samp->dataLength;
+			}
+
+			gf_bs_read_data(plaintext_bs, buffer, samp->dataLength);
 			gf_crypt_encrypt(mc, buffer, samp->dataLength);
 			gf_bs_write_data(cyphertext_bs, buffer, samp->dataLength);
 		}
 	}
 
+
 	if (samp->data) {
 		gf_free(samp->data);
 		samp->data = NULL;
@@ -999,25 +1408,27 @@
 
 exit:
 	if (buffer) gf_free(buffer);
-	if (pleintext_bs) gf_bs_del(pleintext_bs);
+	if (plaintext_bs) gf_bs_del(plaintext_bs);
 	if (cyphertext_bs) gf_bs_del(cyphertext_bs);
 	if (sai_bs) gf_bs_del(sai_bs);
 	return e;
 }
 
-static GF_Err gf_cenc_encrypt_sample_cbc(GF_Crypt *mc, GF_ISOSample *samp, Bool is_nalu_video, u32 nalu_size_length, char IV[16], u32 IV_size, char **sai, u32 *saiz, 
+
+static GF_Err gf_cenc_encrypt_sample_cbc(GF_Crypt *mc, GF_TrackCryptInfo *tci, GF_ISOSample *samp, GF_Enc_BsFmt bs_type, u32 nalu_size_length_in_bytes, char IV[16], u32 IV_size, char **sai, u32 *saiz,
 										u32 bytes_in_nalhr, u8 crypt_byte_block, u8 skip_byte_block) {
-	GF_BitStream *pleintext_bs, *cyphertext_bs, *sai_bs;
-	char *buffer;
-	u32 max_size, size;
+	GF_BitStream *plaintext_bs = NULL, *cyphertext_bs = NULL, *sai_bs = NULL;
+	GF_CENCSubSampleEntry *prev_entry = NULL;
+	char *buffer = NULL;
+	u32 max_size, unit_size;
 	GF_Err e = GF_OK;
 	GF_List *subsamples;
 
-	pleintext_bs = cyphertext_bs = sai_bs = NULL;
+	plaintext_bs = cyphertext_bs = sai_bs = NULL;
 	max_size = 4096;
 	buffer = (char*)gf_malloc(sizeof(char) * max_size);
 	memset(buffer, 0, max_size);
-	pleintext_bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
+	plaintext_bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
 	cyphertext_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	sai_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	gf_bs_write_data(sai_bs, IV, IV_size);
@@ -1026,66 +1437,196 @@
 		e = GF_IO_ERR;
 		goto exit;
 	}
-	while (gf_bs_available(pleintext_bs)) {
-		u32 ret;
+	if ((bs_type == ENC_OBU) || (bs_type == ENC_VP9))
+		nalu_size_length_in_bytes = 0;
+
+	while (gf_bs_available(plaintext_bs)) {
+		if (skip_byte_block || (bs_type == ENC_NALU) || (bs_type == ENC_OBU)) {
+			u32 clear_bytes = 0;
+			u32 clear_bytes_at_end = 0;
+			u32 av1_tile_idx = 0;
+			struct {
+				int clear, encrypted;
+			} ranges[AV1_MAX_TILE_ROWS * AV1_MAX_TILE_COLS];
+			u32 nb_ranges=1;
+
+			if (bs_type == ENC_NALU) {
+				unit_size = gf_bs_read_int(plaintext_bs, 8*nalu_size_length_in_bytes);
+
+				gf_bs_write_int(cyphertext_bs, unit_size, 8*nalu_size_length_in_bytes);
+
+				clear_bytes = gf_cenc_get_clear_bytes(tci, plaintext_bs, samp->data, unit_size, bytes_in_nalhr);
+			} else if (bs_type == ENC_OBU) {
+				ObuType obut;
+				u64 pos, obu_size;
+				u32 hdr_size, i;
+				pos = gf_bs_get_position(plaintext_bs);
+				e = gf_media_aom_av1_parse_obu(plaintext_bs, &obut, &obu_size, &hdr_size, &tci->av1);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC-CBC] Failed to parse OBU\n"));
+					goto exit;
+				}
+				gf_bs_seek(plaintext_bs, pos);
+
+				unit_size = (u32) obu_size;
+				switch (obut) {
+				//we only encrypt frame and tile group
+				case OBU_FRAME:
+				case OBU_TILE_GROUP:
+					assert(tci->av1.frame_state.nb_tiles_in_obu > 0);
+					nb_ranges = tci->av1.frame_state.nb_tiles_in_obu;
+					ranges[0].clear = tci->av1.frame_state.tiles[0].obu_start_offset;
+					ranges[0].encrypted = tci->av1.frame_state.tiles[0].size;
+					for (i = 1; i < nb_ranges; ++i) {
+						ranges[i].clear = tci->av1.frame_state.tiles[i].obu_start_offset - (tci->av1.frame_state.tiles[i - 1].obu_start_offset + tci->av1.frame_state.tiles[i - 1].size);
+						ranges[i].encrypted = tci->av1.frame_state.tiles[i].size;
+					}
 
-		if (is_nalu_video) {
-			char nal_hdr[2];
-			GF_CENCSubSampleEntry *entry = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry));
-			size = gf_bs_read_int(pleintext_bs, 8*nalu_size_length);
-			if (size+1 > max_size) {
-				buffer = (char*)gf_realloc(buffer, sizeof(char)*(size+1));
-				memset(buffer, 0, sizeof(char)*(size+1));
-				max_size = size + 1;
+					clear_bytes = ranges[0].clear;
+					unit_size = clear_bytes + ranges[0].encrypted;
+					if (ranges[0].encrypted >= 16) {
+						//A subsample SHALL be created for each tile >= 16 bytes. If previous range had encrypted bytes, create a new one, otherwise merge in prev
+						if (prev_entry && prev_entry->bytes_encrypted_data)
+							prev_entry = NULL;
+					} else {
+						clear_bytes = unit_size;
+					}
+					break;
+				default:
+					clear_bytes = (u32) obu_size;
+					break;
+				}
+			} else {
+				unit_size = (u32) gf_bs_available(plaintext_bs);
+				clear_bytes = bytes_in_nalhr;
+				if (unit_size<clear_bytes) {
+					if (tci->block_align==2) {
+						clear_bytes = unit_size;
+					} else {
+						clear_bytes = 0;
+					}
+				}
 			}
-			gf_bs_write_int(cyphertext_bs, size, 8*nalu_size_length);
 
-			gf_bs_read_data(pleintext_bs, (char *)nal_hdr, bytes_in_nalhr);
-			gf_bs_write_data(cyphertext_bs, nal_hdr, bytes_in_nalhr);
+			while (nb_ranges) {
+				if (unit_size+1 > max_size) {
+					buffer = (char*)gf_realloc(buffer, sizeof(char)*(unit_size+1));
+					memset(buffer, 0, sizeof(char)*(unit_size+1));
+					max_size = unit_size + 1;
+				}
 
-			gf_bs_read_data(pleintext_bs, buffer, size-bytes_in_nalhr);
+				//in cbcs, we don't adjust bytes_encrypted_data to be a multiple of 16 bytes and leave the last block unencrypted
+				//except in AV1, where BytesOfProtectedData SHALL end on the last byte of the decode_tile structure
+				if ( ( (bs_type != ENC_OBU) && (bs_type != ENC_VP9) ) && (tci->scheme_type == GF_CRYPT_TYPE_CBCS) ) {
+					u32 ret = (unit_size-clear_bytes) % 16;
+					clear_bytes_at_end = ret;
+				}
+				//in cbc1, we adjust bytes_encrypted_data to be a multiple of 16 bytes
+				else {
+					u32 ret = (unit_size-clear_bytes) % 16;
+					clear_bytes += ret;
+					clear_bytes_at_end = 0;
+				}
+				//copy over clear bytes
+				if (clear_bytes) {
+					assert(gf_bs_available(plaintext_bs) >= clear_bytes);
 
-			//FIXME: we adjust bytes_encrypted_data to a multiple of 16 bytes, is this correct in cbcs scheme ? 
-			ret = (size-bytes_in_nalhr) % 16;
-			if (ret) {
-				gf_bs_write_data(cyphertext_bs, buffer, ret);
-			}
+					gf_bs_read_data(plaintext_bs, buffer, clear_bytes);
+					gf_bs_write_data(cyphertext_bs, buffer, clear_bytes);
+				}
 
-			if (size-bytes_in_nalhr >= 16) {
-				//in cbcs scheme: start each Subsample with a Constant IV,
-				if (!IV_size)
-					gf_crypt_set_state(mc, IV, 16);
-				//pattern encryption
-				if (crypt_byte_block && skip_byte_block) {
-					u32 pos = 0;
-					u32 res = size - bytes_in_nalhr -ret;
-					while (res) {
-						gf_crypt_encrypt(mc, buffer+ret+pos, res >= (u32) (16*crypt_byte_block) ? 16*crypt_byte_block : res);
-						if (res >= (u32) (16 * (crypt_byte_block + skip_byte_block))) {
-							pos += 16 * (crypt_byte_block + skip_byte_block);
-							res -= 16 * (crypt_byte_block + skip_byte_block);
-						} else {
-							res = 0;
+				if (unit_size - clear_bytes) {
+					//read the bytes to be encrypted
+					assert(gf_bs_available(plaintext_bs) >= unit_size - clear_bytes);
+					gf_bs_read_data(plaintext_bs, buffer, unit_size - clear_bytes);
+
+					//cbcs scheme (constant IV), reinit at each sub sample,
+					if (!IV_size)
+						gf_crypt_set_IV(mc, IV, 16);
+					//pattern encryption
+					if (crypt_byte_block && skip_byte_block) {
+						u32 pos = 0;
+						u32 res = unit_size - clear_bytes - clear_bytes_at_end;
+						assert((res % 16) == 0);
+
+						while (res) {
+							gf_crypt_encrypt(mc, buffer + pos, res >= (u32) (16*crypt_byte_block) ? 16*crypt_byte_block : res);
+							if (res >= (u32) (16 * (crypt_byte_block + skip_byte_block))) {
+								pos += 16 * (crypt_byte_block + skip_byte_block);
+								res -= 16 * (crypt_byte_block + skip_byte_block);
+							} else {
+								res = 0;
+							}
 						}
+					} else {
+						gf_crypt_encrypt(mc, buffer, unit_size - clear_bytes - clear_bytes_at_end);
 					}
-				} else {
-					gf_crypt_encrypt(mc, buffer+ret, size - bytes_in_nalhr -ret);
+					//write the cyphered data, including the non encrypted bytes at the end of the block
+					gf_bs_write_data(cyphertext_bs, buffer, unit_size - clear_bytes);
 				}
-				gf_bs_write_data(cyphertext_bs, buffer+ret, size - bytes_in_nalhr - ret);
-			}
 
-			entry->bytes_clear_data = nalu_size_length + bytes_in_nalhr + ret;
-			entry->bytes_encrypted_data = (size-bytes_in_nalhr >= 16) ? size - bytes_in_nalhr - ret : 0 ;
-			gf_list_add(subsamples, entry);
+				//for NALU-based, subsamples. Otherwise, if bytes in clear at the beginning, subsample
+				//the spec is not clear here: can we ommit subsamples if we always cypher everything ?
+				//for now commented out for max compatibility
+				//if (is_nalu_video || bytes_in_nalhr)
+				{
+					//note that we write encrypted data to cover the complete byte range after the slice header
+					//but the last incomplete block might be unencrypted, but is still signaled in bytes_encrypted, as per the spec
+
+					//prev entry is not a VCL, append this NAL
+					if (prev_entry && !prev_entry->bytes_encrypted_data) {
+						prev_entry->bytes_clear_data += nalu_size_length_in_bytes + clear_bytes;
+						prev_entry->bytes_encrypted_data += unit_size - clear_bytes;
+					} else {
+						prev_entry = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry));
+						prev_entry->bytes_clear_data = nalu_size_length_in_bytes + clear_bytes;
+						prev_entry->bytes_encrypted_data = unit_size - clear_bytes;
+						gf_list_add(subsamples, prev_entry);
+					}
+
+					//check bytes of clear is not larger than 16bits
+					while (prev_entry->bytes_clear_data > 0xFFFF) {
+						GF_CENCSubSampleEntry *split_entry = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry));
+						split_entry->bytes_clear_data = prev_entry->bytes_clear_data - 0xFFFF;
+						split_entry->bytes_encrypted_data = prev_entry->bytes_encrypted_data;
+						prev_entry->bytes_clear_data = 0xFFFF;
+						prev_entry->bytes_encrypted_data = 0;
+						gf_list_add(subsamples, split_entry);
+						prev_entry = split_entry;
+					}
+					assert((s32)prev_entry->bytes_encrypted_data >= 0);
+					assert(prev_entry->bytes_encrypted_data <= samp->dataLength);
+				}
+				nb_ranges--;
+				if (!nb_ranges) break;
+
+				av1_tile_idx++;
+				clear_bytes = ranges[av1_tile_idx].clear;
+				unit_size = clear_bytes + ranges[av1_tile_idx].encrypted;
+				//A subsample SHALL be created for each tile.
+				prev_entry = NULL;
+			}
 		} else {
-			gf_bs_read_data(pleintext_bs, buffer, samp->dataLength);
-			ret = samp->dataLength % 16;
+			u32 clear_trailing;
+
+			if (samp->dataLength > max_size) {
+				buffer = (char*)gf_realloc(buffer, sizeof(char)*samp->dataLength);
+				max_size = samp->dataLength;
+			}
+
+			gf_bs_read_data(plaintext_bs, buffer, samp->dataLength);
+			clear_trailing = samp->dataLength % 16;
+
+			//cbcs scheme with constant IV, reinit at each sample,
+			if (!IV_size)
+				gf_crypt_set_IV(mc, IV, 16);
+
 			if (samp->dataLength >= 16) {
-				gf_crypt_encrypt(mc, buffer, samp->dataLength-ret);
-				gf_bs_write_data(cyphertext_bs, buffer, samp->dataLength-ret);
+				gf_crypt_encrypt(mc, buffer, samp->dataLength - clear_trailing);
+				gf_bs_write_data(cyphertext_bs, buffer, samp->dataLength - clear_trailing);
 			}
-			if (ret) {
-				gf_bs_write_data(cyphertext_bs, buffer+samp->dataLength-ret, ret);
+			if (clear_trailing) {
+				gf_bs_write_data(cyphertext_bs, buffer+samp->dataLength - clear_trailing, clear_trailing);
 			}
 		}
 	}
@@ -1111,31 +1652,49 @@
 
 exit:
 	if (buffer) gf_free(buffer);
-	if (pleintext_bs) gf_bs_del(pleintext_bs);
+	if (plaintext_bs) gf_bs_del(plaintext_bs);
 	if (cyphertext_bs) gf_bs_del(cyphertext_bs);
 	if (sai_bs) gf_bs_del(sai_bs);
 	return e;
 }
 
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
+static void hevc_parse_ps(GF_HEVCConfig *hevccfg, HEVCState *hevc, u32 nal_type)
+{
+	u32 i, j;
+	for (i=0; i<gf_list_count(hevccfg->param_array); i++) {
+		GF_HEVCParamArray *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_AVCConfigSlot *sl = gf_list_get(ar->nalus, j);
+			gf_media_hevc_parse_nalu(sl->data, sl->size, hevc, &ntype, &tid, &lid);
+		}
+	}
+}
+#endif
 
 /*encrypts track - logs, progress: info callbacks, NULL for default*/
 GF_Err gf_cenc_encrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk)
 {
 	GF_Err e;
 	char IV[16];
-	GF_ISOSample *samp;
+	GF_ISOSample *samp = NULL;
 	GF_Crypt *mc;
 	Bool all_rap = GF_FALSE;
-	u32 i, count, di, track, len, nb_samp_encrypted, nalu_size_length, idx, bytes_in_nalhr;
+	u32 i, count, di, track, saiz_len, nb_samp_encrypted, nalu_size_length, idx, bytes_in_nalhr;
 	GF_ESD *esd;
 	Bool has_crypted_samp;
-	Bool is_nalu_video = GF_FALSE;
-	char *buf;
+	GF_Enc_BsFmt bs_type = ENC_FULL_SAMPLE;
+	Bool use_subsamples = GF_FALSE;
+	char *saiz_buf;
+	Bool use_seig = GF_FALSE;
+	Bool has_seig = GF_FALSE;
 	GF_BitStream *bs;
 
 	nalu_size_length = 0;
 	mc = NULL;
-	buf = NULL;
+	saiz_buf = NULL;
 	bs = NULL;
 	bytes_in_nalhr = 0;
 
@@ -1145,6 +1704,8 @@
 		return GF_OK;
 	}
 
+	if (gf_isom_has_time_offset(mp4, track)) gf_isom_set_cts_packing(mp4, track, GF_TRUE);
+
 	esd = gf_isom_get_esd(mp4, track, 1);
 	if (esd && (esd->decoderConfig->streamType == GF_STREAM_OD)) {
 		gf_odf_desc_del((GF_Descriptor *) esd);
@@ -1155,33 +1716,125 @@
 		if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)) {
 			GF_AVCConfig *avccfg = gf_isom_avc_config_get(mp4, track, 1);
 			GF_AVCConfig *svccfg = gf_isom_svc_config_get(mp4, track, 1);
+
+			bytes_in_nalhr = 1;
+
 			if (avccfg)
 				nalu_size_length = avccfg->nal_unit_size;
 			else if (svccfg)
 				nalu_size_length = svccfg->nal_unit_size;
+
+			switch (gf_isom_get_media_subtype(mp4, track, 1)) {
+			case GF_ISOM_BOX_TYPE_AVC1:
+				if (!tci->allow_encrypted_slice_header) {
+					tci->slice_header_clear = GF_TRUE;
+				} else if (tci->scheme_type==GF_CRYPT_TYPE_CBCS) {
+					tci->slice_header_clear = GF_TRUE;
+				}
+				break;
+			default:
+				tci->slice_header_clear = GF_TRUE;
+				break;
+			}
+			tci->is_avc = GF_TRUE;
+			if (!tci->slice_header_clear && tci->clear_bytes)
+				bytes_in_nalhr = tci->clear_bytes;
+
+#if !defined(GPAC_DISABLE_AV_PARSERS)
+			for (i=0; i<gf_list_count(avccfg->sequenceParameterSets); i++) {
+				GF_AVCConfigSlot *slc = gf_list_get(avccfg->sequenceParameterSets, i);
+				gf_media_avc_read_sps(slc->data, slc->size, &tci->avc, 0, NULL);
+			}
+			for (i=0; i<gf_list_count(avccfg->pictureParameterSets); i++) {
+				GF_AVCConfigSlot *slc = gf_list_get(avccfg->pictureParameterSets, i);
+				gf_media_avc_read_pps(slc->data, slc->size, &tci->avc);
+			}
+#endif
 			if (avccfg) gf_odf_avc_cfg_del(avccfg);
 			if (svccfg) gf_odf_avc_cfg_del(svccfg);
-			is_nalu_video = GF_TRUE;
-			bytes_in_nalhr = 1;
-		}
-		else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) {
+			bs_type = ENC_NALU;
+		} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) {
 			GF_HEVCConfig *hevccfg = gf_isom_hevc_config_get(mp4, track, 1);
 			if (hevccfg)
 				nalu_size_length = hevccfg->nal_unit_size;
+
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
+			hevc_parse_ps(hevccfg, &tci->hevc, GF_HEVC_NALU_VID_PARAM);
+			hevc_parse_ps(hevccfg, &tci->hevc, GF_HEVC_NALU_SEQ_PARAM);
+			hevc_parse_ps(hevccfg, &tci->hevc, GF_HEVC_NALU_PIC_PARAM);
+#endif
+			//mandatory for HEVC
+			tci->slice_header_clear = GF_TRUE;
+			tci->is_avc = GF_FALSE;
+
 			if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
-			is_nalu_video = GF_TRUE;
+			bs_type = ENC_NALU;
+			bytes_in_nalhr = 2;
+		} else if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_AV1) {
+			tci->av1.config = gf_odf_av1_cfg_new();
+			bs_type = ENC_OBU;
+			bytes_in_nalhr = 2;
+		} else if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_VP9) {
+			bs_type = ENC_VP9;
 			bytes_in_nalhr = 2;
 		}
 		gf_odf_desc_del((GF_Descriptor*) esd);
 	}
 
+	if ( (tci->scheme_type == GF_CRYPT_TYPE_CENS) || (tci->scheme_type == GF_CRYPT_TYPE_CBCS) ) {
+		if ( (bs_type == ENC_NALU) || (bs_type == ENC_OBU) ) {
+			if (!tci->crypt_byte_block || !tci->skip_byte_block) {
+				if (tci->crypt_byte_block || tci->skip_byte_block) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[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"));
+				}
+				tci->crypt_byte_block = 1;
+				tci->skip_byte_block = 9;
+			}
+		} else if (bs_type == ENC_VP9) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Using pattern mode, CBCS or CENS, is not supported with VP9.\n"));
+			e = GF_NOT_SUPPORTED;
+			goto exit;
+		}
+	}
+
+
+	if (bs_type != ENC_FULL_SAMPLE) {
+		use_subsamples = GF_TRUE;
+	}
+	//CBCS mode with skip byte block may be used for any track, in which case we need subsamples
+	else if (tci->scheme_type == GF_CRYPT_TYPE_CBCS) {
+		if (tci->skip_byte_block) {
+			use_subsamples = GF_TRUE;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("\n[CENC] 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
+			bytes_in_nalhr = tci->clear_bytes;
+		}
+		//This is not clear in the spec, setting skip and crypt to 0 means no pattern, in which case tenc version shall be 0
+		//but cbcs asks for 1 - needs further clarification
+#if 0
+		//setup defaults
+		else if (!tci->crypt_byte_block) {
+			tci->crypt_byte_block = 1;
+		}
+#else
+		else {
+			tci->crypt_byte_block = 0;
+		}
+#endif
+	}
+	else if ((tci->scheme_type == GF_CRYPT_TYPE_CENS) && tci->skip_byte_block) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Using cens pattern mode on non NAL video track not allowed, forcing skip_byte_block to 0\n"));
+		tci->skip_byte_block = 0;
+		if (!tci->crypt_byte_block) {
+			tci->crypt_byte_block = 1;
+		}
+	}
 	samp = NULL;
 
 	if (tci->ctr_mode) {
-		mc = gf_crypt_open("AES-128", "CTR");
-	}
-	else {
-		mc = gf_crypt_open("AES-128", "CBC");
+		mc = gf_crypt_open(GF_AES_128, GF_CTR);
+	} else {
+		mc = gf_crypt_open(GF_AES_128, GF_CBC);
 	}
 	if (!mc) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot open AES-128 %s\n", tci->ctr_mode ? "CTR" : "CBC"));
@@ -1203,43 +1856,62 @@
 		memcpy(tci->key, tci->keys[0], 16);
 		memcpy(tci->default_KID, tci->KIDs[0], 16);
 		idx = 0;
+		tci->defaultKeyIdx = 0;
 	}
 
 	/*create CENC protection*/
-	e = gf_isom_set_cenc_protection(mp4, track, 1, tci->cenc_scheme_type, 0x00010000, tci->IsEncrypted, tci->IV_size, tci->default_KID, 
+	e = gf_isom_set_cenc_protection(mp4, track, 1, tci->scheme_type, 0x00010000, tci->IsEncrypted, tci->IV_size, tci->default_KID,
 		tci->crypt_byte_block, tci->skip_byte_block, tci->constant_IV_size, tci->constant_IV);
-	if (e) goto exit;
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot create CENC protection: %s\n", gf_error_to_string(e)));
+		goto exit;
+	}
 
 
 	count = gf_isom_get_sample_count(mp4, track);
 
 	has_crypted_samp = GF_FALSE;
 	nb_samp_encrypted = 0;
-	/*Sample Encryption Box*/
-	e = gf_isom_cenc_allocate_storage(mp4, track, tci->sai_saved_box_type, 0, 0, NULL);
-	if (e) goto exit;
+
+	//if constantIV and not using CENC subsample, no CENC auxiliary info
+	if (!tci->constant_IV_size || use_subsamples) {
+		/*Sample Encryption Box*/
+		e = gf_isom_cenc_allocate_storage(mp4, track, tci->sai_saved_box_type, 0, 0, NULL);
+		if (e) goto exit;
+	}
 
 	if (! gf_isom_has_sync_points(mp4, track))
 		all_rap = GF_TRUE;
 
+	if (tci->keyRoll) {
+		use_seig = GF_TRUE;
+	} else if (tci->sel_enc_type == GF_CRYPT_SELENC_RAP) {
+		if (gf_isom_has_sync_points(mp4, track))
+			use_seig = GF_TRUE;
+	} else if (tci->sel_enc_type > GF_CRYPT_SELENC_RAP) {
+		use_seig = GF_TRUE;
+	}
+
 	gf_isom_set_nalu_extract_mode(mp4, track, GF_ISOM_NALU_EXTRACT_INSPECT);
 	for (i = 0; i < count; i++) {
-		len=0;
+		Bool forced_clear = GF_FALSE;
+		saiz_len=0;
 		samp = gf_isom_get_sample(mp4, track, i+1, &di);
-		if (!samp)
-		{
+		if (!samp) {
 			e = GF_IO_ERR;
 			goto exit;
 		}
 
 		switch (tci->sel_enc_type) {
 		case GF_CRYPT_SELENC_RAP:
+			if (!samp->IsRAP)
+				gf_isom_get_sample_rap_roll_info(mp4, track, i+1, (Bool *) &samp->IsRAP, NULL, NULL);
 			if (!samp->IsRAP && !all_rap) {
 				bin128 NULL_IV;
-				e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, 0, NULL, 0);
+				e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, 0, NULL, samp->dataLength, use_subsamples, NULL);
 				if (e)
 					goto exit;
-				buf = NULL;
+				saiz_buf = NULL;
 
 				//already done: memset(tmp, 0, 16);
 				memset(NULL_IV, 0, 16);
@@ -1253,10 +1925,10 @@
 		case GF_CRYPT_SELENC_NON_RAP:
 			if (samp->IsRAP || all_rap) {
 				bin128 NULL_IV;
-				e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, 0, NULL, 0);
+				e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, 0, NULL, samp->dataLength, use_subsamples, NULL);
 				if (e)
 					goto exit;
-				buf = NULL;
+				saiz_buf = NULL;
 
 				memset(NULL_IV, 0, 16);
 				e = gf_isom_set_sample_cenc_group(mp4, track, i+1, 0, 0, NULL_IV, 0, 0, 0, NULL);
@@ -1266,19 +1938,30 @@
 				continue;
 			}
 			break;
+		case GF_CRYPT_SELENC_CLEAR_FORCED:
+			forced_clear = GF_TRUE;
 		case GF_CRYPT_SELENC_CLEAR:
 			{
 				bin128 NULL_IV;
-				e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, 0, NULL, 0);
+				memset(NULL_IV, 0, 16);
+				memcpy(NULL_IV, (char *) &i, 4);
+				e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, forced_clear ? tci->IV_size : 0, NULL, samp->dataLength, use_subsamples, forced_clear ? (char *)NULL_IV : NULL);
 				if (e)
 					goto exit;
-				buf = NULL;
+				saiz_buf = NULL;
 
-				memset(NULL_IV, 0, 16);
-				e = gf_isom_set_sample_cenc_group(mp4, track, i + 1, 0, 0, NULL_IV, 0, 0, 0, NULL);
-				if (e) goto exit;
+				if (!forced_clear) {
+					memset(NULL_IV, 0, 16);
+					e = gf_isom_set_sample_cenc_group(mp4, track, i + 1, 0, 0, NULL_IV, 0, 0, 0, NULL);
+					if (e) goto exit;
+				}
 
 				gf_isom_sample_del(&samp);
+
+				//we have a range, go back to regulare encryption once done
+				if (forced_clear && tci->sel_enc_range && (i+1>=tci->sel_enc_range)) {
+					tci->sel_enc_type = GF_CRYPT_SELENC_NONE;
+				}
 				continue;
 			}
 			break;
@@ -1295,7 +1978,7 @@
 			}
 			else if (tci->IV_size == 16) {
 				memcpy(IV, tci->first_IV, sizeof(char)*16);
-			} 
+			}
 			else if (!tci->IV_size) {
 				if (tci->constant_IV_size == 8) {
 					memcpy(IV, tci->constant_IV, sizeof(char)*8);
@@ -1303,13 +1986,16 @@
 				}
 				else if (tci->constant_IV_size == 16) {
 					memcpy(IV, tci->constant_IV, sizeof(char)*16);
-				} else
-					return GF_NOT_SUPPORTED;
-			}
-			else
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] No IV set and invalid constant IV size %d crypt info file\n", tci->constant_IV_size));
+					return GF_BAD_PARAM;
+				}
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Invalid IV size %d in crypt info file\n", tci->IV_size));
 				return GF_NOT_SUPPORTED;
+			}
 
-			e = gf_crypt_init(mc, tci->key, 16, IV);
+			e = gf_crypt_init(mc, tci->key, IV);
 			if (e) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot initialize AES-128 %s (%s)\n", tci->ctr_mode ? "CTR" : "CBC", gf_error_to_string(e)) );
 				gf_crypt_close(mc);
@@ -1323,7 +2009,7 @@
 			if (tci->keyRoll) {
 				idx = (nb_samp_encrypted / tci->keyRoll) % tci->KID_count;
 				memcpy(tci->key, tci->keys[idx], 16);
-				e = gf_crypt_set_key(mc, tci->key, 16, IV);
+				e = gf_crypt_set_key(mc, tci->key);
 				if (e) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot set key AES-128 %s (%s)\n", tci->ctr_mode ? "CTR" : "CBC", gf_error_to_string(e)) );
 					gf_crypt_close(mc);
@@ -1334,42 +2020,55 @@
 			}
 		}
 
-		/*add this sample to sample encryption group*/
-		e = gf_isom_set_sample_cenc_group(mp4, track, i+1, 1, tci->IV_size, tci->KIDs[idx], tci->crypt_byte_block, tci->skip_byte_block, tci->constant_IV_size, tci->constant_IV);
-		if (e) goto exit;
+		if (use_seig && (tci->defaultKeyIdx != idx) ) {
+			/*add this sample to sample encryption group*/
+			e = gf_isom_set_sample_cenc_group(mp4, track, i+1, 1, tci->IV_size, tci->KIDs[idx], tci->crypt_byte_block, tci->skip_byte_block, tci->constant_IV_size, tci->constant_IV);
+			if (e) goto exit;
+			has_seig = GF_TRUE;
+		} else if (has_seig) {
+			e = gf_isom_set_sample_cenc_default(mp4, track, i+1);
+			if (e) goto exit;
+		}
 
-		if (tci->ctr_mode)
-			gf_cenc_encrypt_sample_ctr(mc, samp, is_nalu_video, nalu_size_length, IV, tci->IV_size, &buf, &len, bytes_in_nalhr, tci->crypt_byte_block, tci->skip_byte_block);
-		else {
-			//in cbcs scheme, Per_Sample_IV_size is 0; use constant IV
+		if (tci->ctr_mode) {
+			e = gf_cenc_encrypt_sample_ctr(mc, tci, samp, bs_type, nalu_size_length, IV, tci->IV_size, &saiz_buf, &saiz_len, bytes_in_nalhr, tci->crypt_byte_block, tci->skip_byte_block);
+			if (e) goto exit;
+		} else {
+			//in cbcs scheme, if Per_Sample_IV_size is not 0 (no constant IV), fetch current IV
 			if (tci->IV_size) {
-				int IV_size = 16;
-				gf_crypt_get_state(mc, IV, &IV_size);
+				u32 IV_size = 16;
+				gf_crypt_get_IV(mc, IV, &IV_size);
 			}
-			gf_cenc_encrypt_sample_cbc(mc, samp, is_nalu_video, nalu_size_length, IV, tci->IV_size, &buf, &len, bytes_in_nalhr, tci->crypt_byte_block, tci->skip_byte_block);
+			e = gf_cenc_encrypt_sample_cbc(mc, tci, samp, bs_type, nalu_size_length, IV, tci->IV_size, &saiz_buf, &saiz_len, bytes_in_nalhr, tci->crypt_byte_block, tci->skip_byte_block);
+			if (e) goto exit;
 		}
 
 		gf_isom_update_sample(mp4, track, i+1, samp, 1);
 		gf_isom_sample_del(&samp);
 		samp = NULL;
 
-		e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, tci->IV_size, buf, len);
-		if (e)
-			goto exit;
-		gf_free(buf);
-		buf = NULL;
+		if (saiz_len) {
+			e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, tci->IV_size, saiz_buf, saiz_len, use_subsamples, NULL);
+			if (e)
+				goto exit;
+		}
+		gf_free(saiz_buf);
+		saiz_buf = NULL;
 
 		nb_samp_encrypted++;
 		gf_set_progress("CENC Encrypt", i+1, count);
 	}
 
 	gf_isom_set_cts_packing(mp4, track, GF_FALSE);
+	//not strictly needed but we call it in case bitrate info in source is wrong
+	gf_media_update_bitrate(mp4, track);
 
 exit:
 	if (samp) gf_isom_sample_del(&samp);
 	if (mc) gf_crypt_close(mc);
-	if (buf) gf_free(buf);
+	if (saiz_buf) gf_free(saiz_buf);
 	if (bs) gf_bs_del(bs);
+	if (tci->av1.config) gf_odf_av1_cfg_del(tci->av1.config);
 	return e;
 }
 
@@ -1382,11 +2081,13 @@
 	GF_Crypt *mc;
 	char IV[17];
 	Bool prev_sample_encrypted;
-	GF_BitStream *pleintext_bs, *cyphertext_bs;
+	GF_BitStream *plaintext_bs, *cyphertext_bs;
 	GF_CENCSampleAuxInfo *sai;
 	char *buffer;
+	u32 scheme_type;
+	Bool is_ctr_mode = GF_FALSE;
 
-	pleintext_bs = cyphertext_bs = NULL;
+	plaintext_bs = cyphertext_bs = NULL;
 	mc = NULL;
 	buffer = NULL;
 	max_size = 4096;
@@ -1399,17 +2100,22 @@
 		return GF_OK;
 	}
 
+	scheme_type = gf_isom_is_media_encrypted(mp4, track, 1);
+	if ((scheme_type==GF_CRYPT_TYPE_CENC) || (scheme_type==GF_CRYPT_TYPE_CENS))
+		is_ctr_mode = GF_TRUE;
 
-	if (tci->ctr_mode)
-		mc = gf_crypt_open("AES-128", "CTR");
+	if (is_ctr_mode)
+		mc = gf_crypt_open(GF_AES_128, GF_CTR);
 	else
-		mc = gf_crypt_open("AES-128", "CBC");
+		mc = gf_crypt_open(GF_AES_128, GF_CBC);
 	if (!mc) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot open AES-128 %s\n", tci->ctr_mode ? "CTR" : "CBC"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot open AES-128 %s\n", is_ctr_mode ? "CTR" : "CBC"));
 		e = GF_IO_ERR;
 		goto exit;
 	}
 
+	if (gf_isom_has_time_offset(mp4, track)) gf_isom_set_cts_packing(mp4, track, GF_TRUE);
+
 	/* decrypt each sample */
 	count = gf_isom_get_sample_count(mp4, track);
 	buffer = (char*)gf_malloc(sizeof(char) * max_size);
@@ -1417,10 +2123,13 @@
 	gf_isom_set_nalu_extract_mode(mp4, track, GF_ISOM_NALU_EXTRACT_INSPECT);
 	for (i = 0; i < count; i++) {
 		u32 Is_Encrypted;
-		u8 IV_size;
-		bin128 KID;
+		u8 IV_size, constant_IV_size, skip_byte_block, crypt_byte_block;
+		bin128 KID, constant_IV;
+
+		constant_IV_size = skip_byte_block = crypt_byte_block = 0;
+		e = gf_isom_get_sample_cenc_info(mp4, track, i+1, &Is_Encrypted, &IV_size, &KID, &crypt_byte_block, &skip_byte_block, &constant_IV_size, &constant_IV);
+		if (e) goto exit;
 
-		gf_isom_get_sample_cenc_info(mp4, track, i+1, &Is_Encrypted, &IV_size, &KID, NULL, NULL, NULL, NULL);
 		if (!Is_Encrypted)
 			continue;
 
@@ -1446,28 +2155,32 @@
 
 		e = gf_isom_cenc_get_sample_aux_info(mp4, track, i+1, &sai, NULL);
 		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot fetch senc data for sample %d\n", i+1) );
 			goto exit;
 		}
 
 		cyphertext_bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
-		pleintext_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		plaintext_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+		if (sai)
+			sai->IV_size = IV_size;
+
 
-		sai->IV_size = IV_size;
 		if (!prev_sample_encrypted) {
-			if (sai->IV_size) {
+			if (sai && sai->IV_size) {
 				memmove(IV, sai->IV, sai->IV_size);
 				if (sai->IV_size == 8)
 					memset(IV+8, 0, sizeof(char)*8);
 			} else {
 				//cbcs scheme mode, use constant IV
-				memmove(IV, tci->constant_IV, tci->constant_IV_size);
-				if (tci->constant_IV_size == 8)
+				memmove(IV, constant_IV, constant_IV_size);
+				if (constant_IV_size == 8)
 					memset(IV+8, 0, sizeof(char)*8);
 			}
 
-			e = gf_crypt_init(mc, tci->key, 16, IV);
+			e = gf_crypt_init(mc, tci->key, IV);
 			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot initialize AES-128 CTR (%s)\n", gf_error_to_string(e)) );
+				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot initialize AES-128 %s (%s)\n", is_ctr_mode ? "CTR" : "CBC", gf_error_to_string(e)) );
 				gf_crypt_close(mc);
 				mc = NULL;
 				e = GF_IO_ERR;
@@ -1476,8 +2189,16 @@
 			prev_sample_encrypted = GF_TRUE;
 		}
 		else {
-			if (sai->IV_size) {
-				if (tci->ctr_mode) {
+			e = gf_crypt_set_key(mc, tci->key);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot set key AES-128 %s (%s)\n", is_ctr_mode ? "CTR" : "CBC", gf_error_to_string(e)) );
+				gf_crypt_close(mc);
+				mc = NULL;
+				e = GF_IO_ERR;
+				goto exit;
+			}
+			if (sai && sai->IV_size) {
+				if (is_ctr_mode) {
 					GF_BitStream *bs;
 					bs = gf_bs_new(IV, 17, GF_BITSTREAM_WRITE);
 					gf_bs_write_u8(bs, 0);	/*begin of counter*/
@@ -1485,101 +2206,122 @@
 					if (sai->IV_size == 8)
 						gf_bs_write_u64(bs, 0);
 					gf_bs_del(bs);
-					gf_crypt_set_state(mc, IV, 17);
+					gf_crypt_set_IV(mc, IV, GF_AES_128_KEYSIZE+1);
 				}
 				else {
 					memmove(IV, sai->IV, 16);
-					gf_crypt_set_state(mc, IV, 16);
+					gf_crypt_set_IV(mc, IV, GF_AES_128_KEYSIZE);
 				}
 			} else {
 				//cbcs scheme mode, use constant IV
-				memmove(IV, tci->constant_IV, tci->constant_IV_size);
-				if (tci->constant_IV_size == 8)
+				memmove(IV, constant_IV, constant_IV_size);
+				if (constant_IV_size == 8)
 					memset(IV+8, 0, sizeof(char)*8);
-				gf_crypt_set_state(mc, IV, 16);
-			}
-			e = gf_crypt_set_key(mc, tci->key, 16, IV);
-			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot set key AES-128 %s (%s)\n", tci->ctr_mode ? "CTR" : "CBC", gf_error_to_string(e)) );
-				gf_crypt_close(mc);
-				mc = NULL;
-				e = GF_IO_ERR;
-				goto exit;
+				gf_crypt_set_IV(mc, IV, GF_AES_128_KEYSIZE);
 			}
 		}
 
 		//sub-sample encryption
-		if (sai->subsample_count) {
+		if (sai && sai->subsample_count) {
+			u32 nb_done = 0;
 			subsample_count = 0;
 			while (gf_bs_available(cyphertext_bs)) {
+				GF_CENCSubSampleEntry *sai_e;
 				assert(subsample_count < sai->subsample_count);
 				if (!sai->IV_size) {
 					//cbcs scheme mode, use constant IV
-					memmove(IV, tci->constant_IV, tci->constant_IV_size);
-					if (tci->constant_IV_size == 8)
+					memmove(IV, constant_IV, constant_IV_size);
+					if (constant_IV_size == 8)
 						memset(IV+8, 0, sizeof(char)*8);
-					gf_crypt_set_state(mc, IV, 16);
+					gf_crypt_set_IV(mc, IV, GF_AES_128_KEYSIZE);
+				}
+				sai_e = &sai->subsamples[subsample_count];
+				if (nb_done + sai_e->bytes_clear_data + sai_e->bytes_encrypted_data > samp->dataLength) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Error in sample %d subsample info: %d bytes in samples but more bytes signaled in subsample data (%d bytes at subsample %d)\n", i+1, samp->dataLength, nb_done + sai_e->bytes_clear_data + sai_e->bytes_encrypted_data, subsample_count+1));
+					e = GF_NON_COMPLIANT_BITSTREAM;
+					goto exit;
 				}
+				nb_done += sai_e->bytes_clear_data + sai_e->bytes_encrypted_data;
 
-				/*read clear data and write it to pleintext bitstream*/
-				if (max_size < sai->subsamples[subsample_count].bytes_clear_data) {
-					buffer = (char*)gf_realloc(buffer, sizeof(char)*sai->subsamples[subsample_count].bytes_clear_data);
-					max_size = sai->subsamples[subsample_count].bytes_clear_data;
+				/*read clear data and write it to plaintext bitstream*/
+				if (max_size < sai_e->bytes_clear_data) {
+					buffer = (char*)gf_realloc(buffer, sizeof(char)*sai_e->bytes_clear_data);
+					max_size = sai_e->bytes_clear_data;
 				}
-				gf_bs_read_data(cyphertext_bs, buffer, sai->subsamples[subsample_count].bytes_clear_data);
-				gf_bs_write_data(pleintext_bs, buffer, sai->subsamples[subsample_count].bytes_clear_data);
+				gf_bs_read_data(cyphertext_bs, buffer, sai_e->bytes_clear_data);
+				gf_bs_write_data(plaintext_bs, buffer, sai_e->bytes_clear_data);
 
 				/*now read encrypted data, decrypted it and write to pleintext bitstream*/
-				if (max_size < sai->subsamples[subsample_count].bytes_encrypted_data) {
-					buffer = (char*)gf_realloc(buffer, sizeof(char)*sai->subsamples[subsample_count].bytes_encrypted_data);
-					max_size = sai->subsamples[subsample_count].bytes_encrypted_data;
+				if (max_size < sai_e->bytes_encrypted_data) {
+					buffer = (char*)gf_realloc(buffer, sizeof(char)*sai_e->bytes_encrypted_data);
+					max_size = sai_e->bytes_encrypted_data;
 				}
-				gf_bs_read_data(cyphertext_bs, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
+				gf_bs_read_data(cyphertext_bs, buffer, sai_e->bytes_encrypted_data);
 				//pattern decryption
-				if (tci->crypt_byte_block && tci->skip_byte_block) {
+				if (crypt_byte_block && skip_byte_block) {
 					u32 pos = 0;
-					u32 res = sai->subsamples[subsample_count].bytes_encrypted_data;
+					u32 res = sai_e->bytes_encrypted_data;
+
+					if (!is_ctr_mode) {
+						u32 clear_trailing = res % 16;
+						res -= clear_trailing;
+					}
+
 					while (res) {
-						gf_crypt_decrypt(mc, buffer+pos, res >= (u32) (16*tci->crypt_byte_block) ? 16*tci->crypt_byte_block : res);
-						if (res >= (u32) (16 * (tci->crypt_byte_block + tci->skip_byte_block))) {
-							pos += 16 * (tci->crypt_byte_block + tci->skip_byte_block);
-							res -= 16 * (tci->crypt_byte_block + tci->skip_byte_block);
+						gf_crypt_decrypt(mc, buffer+pos, res >= (u32) (16*crypt_byte_block) ? 16*crypt_byte_block : res);
+						if (res >= (u32) (16 * (crypt_byte_block + skip_byte_block))) {
+							pos += 16 * (crypt_byte_block + skip_byte_block);
+							res -= 16 * (crypt_byte_block + skip_byte_block);
 						} else {
 							res = 0;
 						}
 					}
 				} else {
-					gf_crypt_decrypt(mc, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
+					gf_crypt_decrypt(mc, buffer, sai_e->bytes_encrypted_data);
 				}
-				gf_bs_write_data(pleintext_bs, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
+				gf_bs_write_data(plaintext_bs, buffer, sai_e->bytes_encrypted_data);
 
 				subsample_count++;
 			}
 		}
 		//full sample encryption
 		else {
+			u32 clear_trailing = 0;
 			if (max_size < samp->dataLength) {
 				buffer = (char*)gf_realloc(buffer, sizeof(char)*samp->dataLength);
 				max_size = samp->dataLength;
 			}
 			gf_bs_read_data(cyphertext_bs, buffer,samp->dataLength);
-			if (tci->ctr_mode) {
-				gf_crypt_decrypt(mc, buffer, samp->dataLength);
-				gf_bs_write_data(pleintext_bs, buffer, samp->dataLength);
-			} else {
-				u32 ret = samp->dataLength % 16;
-				if (samp->dataLength >= 16) {
-					gf_crypt_decrypt(mc, buffer, samp->dataLength-ret);
-					gf_bs_write_data(pleintext_bs, buffer, samp->dataLength-ret);
-				}
-				if (ret) {
-					gf_bs_write_data(pleintext_bs, buffer+samp->dataLength-ret, ret);
+
+			if (!is_ctr_mode) {
+				clear_trailing = samp->dataLength % 16;
+			}
+			if (skip_byte_block && crypt_byte_block) {
+				u32 pos = 0;
+				u32 res = samp->dataLength - clear_trailing;
+				while (res) {
+					gf_crypt_decrypt(mc, buffer+pos, res >= (u32) (16*crypt_byte_block) ? 16*crypt_byte_block : res);
+					if (res >= (u32) (16 * (crypt_byte_block + skip_byte_block))) {
+						pos += 16 * (crypt_byte_block + skip_byte_block);
+						res -= 16 * (crypt_byte_block + skip_byte_block);
+					} else {
+						res = 0;
+					}
 				}
+			} else {
+				gf_crypt_decrypt(mc, buffer, samp->dataLength - clear_trailing);
+			}
+			gf_bs_write_data(plaintext_bs, buffer, samp->dataLength - clear_trailing);
+
+			if (clear_trailing) {
+				gf_bs_write_data(plaintext_bs, buffer + samp->dataLength - clear_trailing, clear_trailing);
 			}
 		}
 
-		gf_isom_cenc_samp_aux_info_del(sai);
-		sai = NULL;
+		if (sai) {
+			gf_isom_cenc_samp_aux_info_del(sai);
+			sai = NULL;
+		}
 
 		gf_bs_del(cyphertext_bs);
 		cyphertext_bs = NULL;
@@ -1588,9 +2330,9 @@
 			samp->data = NULL;
 			samp->dataLength = 0;
 		}
-		gf_bs_get_content(pleintext_bs, &samp->data, &samp->dataLength);
-		gf_bs_del(pleintext_bs);
-		pleintext_bs = NULL;
+		gf_bs_get_content(plaintext_bs, &samp->data, &samp->dataLength);
+		gf_bs_del(plaintext_bs);
+		plaintext_bs = NULL;
 		gf_isom_update_sample(mp4, track, i+1, samp, 1);
 		gf_isom_sample_del(&samp);
 		samp = NULL;
@@ -1614,7 +2356,7 @@
 
 exit:
 	if (mc) gf_crypt_close(mc);
-	if (pleintext_bs) gf_bs_del(pleintext_bs);
+	if (plaintext_bs) gf_bs_del(plaintext_bs);
 	if (cyphertext_bs) gf_bs_del(cyphertext_bs);
 	if (samp) gf_isom_sample_del(&samp);
 	if (buffer) gf_free(buffer);
@@ -1633,7 +2375,7 @@
 	Bool has_crypted_samp;
 	char *buf;
 	GF_BitStream *bs;
-	int IV_size;
+	u32 IV_size;
 
 	samp = NULL;
 	mc = NULL;
@@ -1646,7 +2388,7 @@
 		return GF_OK;
 	}
 
-	mc = gf_crypt_open("AES-128", "CBC");
+	mc = gf_crypt_open(GF_AES_128, GF_CBC);
 	if (!mc) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Adobe] Cannot open AES-128 CBC \n"));
 		e = GF_IO_ERR;
@@ -1656,6 +2398,8 @@
 	/*Adobe's protection scheme does not support selective key*/
 	memcpy(tci->key, tci->keys[0], 16);
 
+	if (gf_isom_has_time_offset(mp4, track)) gf_isom_set_cts_packing(mp4, track, GF_TRUE);
+
 	e = gf_isom_set_adobe_protection(mp4, track, 1, GF_ISOM_ADOBE_SCHEME, 1, GF_TRUE, tci->metadata, tci->metadata_len);
 	if (e) goto exit;
 
@@ -1682,6 +2426,8 @@
 
 		switch (tci->sel_enc_type) {
 		case GF_CRYPT_SELENC_RAP:
+			if (!samp->IsRAP)
+				gf_isom_get_sample_rap_roll_info(mp4, track, i+1, (Bool *) &samp->IsRAP, NULL, NULL);
 			if (!samp->IsRAP && !all_rap) {
 				is_encrypted_au = GF_FALSE;
 			}
@@ -1700,7 +2446,7 @@
 			if (!has_crypted_samp) {
 				memset(IV, 0, sizeof(char)*16);
 				memcpy(IV, tci->first_IV, sizeof(char)*16);
-				e = gf_crypt_init(mc, tci->key, 16, IV);
+				e = gf_crypt_init(mc, tci->key, IV);
 				if (e) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Cannot initialize AES-128 CBC (%s)\n", gf_error_to_string(e)) );
 					gf_crypt_close(mc);
@@ -1712,7 +2458,7 @@
 			}
 			else {
 				IV_size = 16;
-				e = gf_crypt_get_state(mc, IV, &IV_size);
+				e = gf_crypt_get_IV(mc, IV, &IV_size);
 			}
 
 			padding_bytes = 16 - len % 16;
@@ -1744,6 +2490,8 @@
 
 		gf_set_progress("Adobe's protection scheme Encrypt", i+1, count);
 	}
+	gf_isom_set_cts_packing(mp4, track, GF_FALSE);
+	gf_media_update_bitrate(mp4, track);
 
 exit:
 	if (samp) gf_isom_sample_del(&samp);
@@ -1775,7 +2523,7 @@
 		return GF_OK;
 	}
 
-	mc = gf_crypt_open("AES-128", "CBC");
+	mc = gf_crypt_open(GF_AES_128, GF_CBC);
 	if (!mc) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Cannot open AES-128 CBC\n"));
 		e = GF_IO_ERR;
@@ -1784,6 +2532,8 @@
 
 	memcpy(tci->key, tci->keys[0], 16);
 
+	if (gf_isom_has_time_offset(mp4, track)) gf_isom_set_cts_packing(mp4, track, GF_TRUE);
+
 	count = gf_isom_get_sample_count(mp4, track);
 	gf_isom_set_nalu_extract_mode(mp4, track, GF_ISOM_NALU_EXTRACT_INSPECT);
 	for (i = 0; i < count; i++) {
@@ -1802,7 +2552,7 @@
 		if (encrypted_au) {
 			memmove(IV, ptr+1, 16);
 			if (!prev_sample_decrypted) {
-				e = gf_crypt_init(mc, tci->key, 16, IV);
+				e = gf_crypt_init(mc, tci->key, IV);
 				if (e) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Cannot initialize AES-128 CBC (%s)\n", gf_error_to_string(e)) );
 					gf_crypt_close(mc);
@@ -1813,7 +2563,7 @@
 				prev_sample_decrypted = GF_TRUE;
 			}
 			else {
-				e = gf_crypt_set_state(mc, IV, 16);
+				e = gf_crypt_set_IV(mc, IV, GF_AES_128_KEYSIZE);
 				if (e) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Cannot set state AES-128 CBC (%s)\n", gf_error_to_string(e)) );
 					gf_crypt_close(mc);
@@ -1853,6 +2603,8 @@
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Error Adobe's protection scheme signature from trackID %d: %s\n", tci->trackID, gf_error_to_string(e)));
 	}
+	gf_isom_set_cts_packing(mp4, track, GF_FALSE);
+	gf_media_update_bitrate(mp4, track);
 
 exit:
 	if (mc) gf_crypt_close(mc);
@@ -1908,7 +2660,10 @@
 		if (idx==count) {
 			if (!drm_file || info->has_common_key) idx = common_idx;
 			/*no available KMS info for this track*/
-			else continue;
+			else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] No crypt info found in %s for track %d, keeping track encrypted\n", drm_file, trackID));
+				continue;
+			}
 		}
 		if (count) {
 			a_tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, idx);
@@ -1916,27 +2671,33 @@
 		} else {
 			memset(&tci, 0, sizeof(GF_TrackCryptInfo));
 			tci.trackID = trackID;
+			a_tci = NULL;
 		}
 
+		if (a_tci && a_tci->force_type) {
+			scheme_type = tci.scheme_type = a_tci->scheme_type;
+		}
+		if (!tci.trackID)
+			tci.trackID = trackID;
 
-		switch (info->crypt_type) {
-		case GF_CRYPT_ISMA_CRYPT_TYPE:
+		switch (scheme_type) {
+		case GF_CRYPT_TYPE_ISMA:
 			gf_decrypt_track = gf_ismacryp_decrypt_track;
 			break;
-		case GF_CRYPT_CENC_CRYPT_TYPE:
-		case GF_CRYPT_CENS_CRYPT_TYPE:
+		case GF_CRYPT_TYPE_CENC:
+		case GF_CRYPT_TYPE_CENS:
 			tci.ctr_mode = GF_TRUE;
-		case GF_CRYPT_CBC1_CRYPT_TYPE:
-		case GF_CRYPT_CBCS_CRYPT_TYPE:
+		case GF_CRYPT_TYPE_CBC1:
+		case GF_CRYPT_TYPE_CBCS:
 			is_cenc = GF_TRUE;
 			gf_decrypt_track = gf_cenc_decrypt_track;
 			break;
-		case GF_CRYPT_ADOBE_CRYPT_TYPE:
+		case GF_CRYPT_TYPE_ADOBE:
 			gf_decrypt_track = gf_adobe_decrypt_track;
 			break;
 		default:
 			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Encryption type not supported\n"));
-			return GF_NOT_SUPPORTED;;
+			return GF_NOT_SUPPORTED;
 		}
 
 		if (gf_isom_is_ismacryp_media(mp4, i+1, 1)) {
@@ -1953,14 +2714,14 @@
 			continue;
 		}
 
-		if (info->crypt_type == GF_CRYPT_ISMA_CRYPT_TYPE) {
+		if (scheme_type == GF_CRYPT_TYPE_ISMA) {
 			/*get key and salt from KMS*/
 			/*GPAC*/
 			if (!strnicmp(KMS_URI, "(key)", 5)) {
 				char data[100];
 				gf_base64_decode((char*)KMS_URI+5, (u32) strlen(KMS_URI)-5, data, 100);
 				memcpy(tci.key, data, sizeof(char)*16);
-				if (info->crypt_type == GF_CRYPT_ISMA_CRYPT_TYPE) memcpy(tci.salt, data+16, sizeof(char)*8);
+				memcpy(tci.salt, data+16, sizeof(char)*8);
 			}
 			/*MPEG4IP*/
 			else if (!stricmp(KMS_URI, "AudioKey") || !stricmp(KMS_URI, "VideoKey")) {
@@ -1996,11 +2757,11 @@
 		if (e) break;
 	}
 	if (is_oma) {
-		e = gf_isom_set_brand_info(mp4, GF_4CC('i','s','o','2'), 0x00000001);
-		if (!e) e = gf_isom_modify_alternate_brand(mp4, GF_4CC('o','d','c','f'), 0);
+		e = gf_isom_set_brand_info(mp4, GF_ISOM_BRAND_ISO2, 0x00000001);
+		if (!e) e = gf_isom_modify_alternate_brand(mp4, GF_ISOM_BRAND_ODCF, 0);
 	}
 
-	if (is_cenc)
+	if (is_cenc && !e)
 		e = gf_isom_remove_pssh_box(mp4);
 	if (info) del_crypt_info(info);
 	return e;
@@ -2059,10 +2820,18 @@
 				else if (!strcmp(att->value, "clear"))
 					cypherMode = 2;
 			} else if (!strcmp(att->name, "cypherKey")) {
-				gf_bin128_parse(att->value, cypherKey);
+				GF_Err e = gf_bin128_parse(att->value, cypherKey);
+ if (e != GF_OK) {
+ GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannnot parse cypherKey\n"));
+ return e;
+ }
 				has_key = GF_TRUE;
 			} else if (!strcmp(att->name, "cypherIV")) {
-				gf_bin128_parse(att->value, cypherIV);
+				GF_Err e = gf_bin128_parse(att->value, cypherIV);
+ if (e != GF_OK) {
+ GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannnot parse cypherIV\n"));
+ return e;
+ }
 				has_IV = GF_TRUE;
 			} else if (!strcmp(att->name, "cypherOffset")) {
 				cypherOffset = atoi(att->value);
@@ -2098,6 +2867,9 @@
 		}
 		if (specInfoSize < 16 + (version ? 4 + 16*KID_count : 0)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] Invalid PSSH blob in version %d: size %d key count %d - ignoring PSSH\n", version, specInfoSize, KID_count));
+			if (specInfo) gf_free(specInfo);
+			if (KIDs) gf_free(KIDs);
+			if (bs) gf_bs_del(bs);
 			continue;
 		}
 		len = specInfoSize - 16 - (version ? 4 + 16*KID_count : 0);
@@ -2105,16 +2877,14 @@
 		gf_bs_read_data(bs, data, len);
 
 		if (has_key && has_IV && (cypherOffset >= 0) && (cypherMode != 2)) {
-			/*TODO*/
-			GF_Crypt *mc;
-			mc = gf_crypt_open("AES-128", "CTR");
-			if (!mc) {
+			GF_Crypt *gc = gf_crypt_open(GF_AES_128, GF_CTR);
+			if (!gc) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open AES-128 CTR\n"));
 				return GF_IO_ERR;
 			}
-			e = gf_crypt_init(mc, cypherKey, 16, cypherIV);
-			gf_crypt_encrypt(mc, data+cypherOffset, len-cypherOffset);
-			gf_crypt_close(mc);
+			e = gf_crypt_init(gc, cypherKey, cypherIV);
+			gf_crypt_encrypt(gc, data+cypherOffset, len-cypherOffset);
+			gf_crypt_close(gc);
 		}
 		if (!e) e = gf_cenc_set_pssh(mp4, systemID, version, KID_count, KIDs, data, len);
 		if (specInfo) gf_free(specInfo);
@@ -2140,24 +2910,29 @@
 	GF_CryptInfo *info;
 	Bool is_oma, is_encrypted=GF_FALSE;
 	GF_TrackCryptInfo *tci;
-
+	Bool check_pssh = GF_FALSE;
 	is_oma = 0;
 
 	info = load_crypt_file(drm_file);
 	if (!info) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open or validate xml file %s\n", drm_file));
-		return GF_NOT_SUPPORTED;
+		return GF_BAD_PARAM;
 	}
 
-	/*write pssh box in case of CENC*/
-	if ((info->crypt_type == GF_CRYPT_CENC_CRYPT_TYPE) || (info->crypt_type == GF_CRYPT_CBC1_CRYPT_TYPE) || (info->crypt_type == GF_CRYPT_CENS_CRYPT_TYPE) || (info->crypt_type == GF_CRYPT_CBCS_CRYPT_TYPE)) {
+	e = GF_OK;
+	count = gf_list_count(info->tcis);
+	for (i=0; i<count; i++) {
+		tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, i);
+		/*write pssh box in case of CENC*/
+		if ((tci->scheme_type == GF_CRYPT_TYPE_CENC) || (tci->scheme_type == GF_CRYPT_TYPE_CBC1) || (tci->scheme_type == GF_CRYPT_TYPE_CENS) || (tci->scheme_type == GF_CRYPT_TYPE_CBCS)) {
+			check_pssh = GF_TRUE;
+		}
+	}
+	if (check_pssh) {
 		e = gf_cenc_parse_drm_system_info(mp4, drm_file);
 		if (e) return e;
 	}
 
-	e = GF_OK;
-	count = gf_list_count(info->tcis);
-
 	common_idx=0;
 	if (info && info->has_common_key) {
 		for (common_idx=0; common_idx<count; common_idx++) {
@@ -2168,8 +2943,12 @@
 	nb_tracks = gf_isom_get_track_count(mp4);
 	for (i=0; i<nb_tracks; i++) {
 		GF_Err (*gf_encrypt_track)(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk);
-
 		u32 trackID = gf_isom_get_track_id(mp4, i+1);
+
+		if (gf_isom_is_track_encrypted(mp4, i+1)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] Track %d is already encrypted\n", trackID));
+			continue;
+		}
 		for (idx=0; idx<count; idx++) {
 			tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, idx);
 			if (tci->trackID==trackID) break;
@@ -2179,31 +2958,35 @@
 			idx = common_idx;
 		}
 		tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, idx);
-		switch (info->crypt_type) {
-		case GF_CRYPT_ISMA_CRYPT_TYPE:
+		switch (tci->scheme_type) {
+		case GF_CRYPT_TYPE_ISMA:
 			gf_encrypt_track = gf_ismacryp_encrypt_track;
 			break;
-		case GF_CRYPT_CENC_CRYPT_TYPE:
-		case GF_CRYPT_CENS_CRYPT_TYPE:
+		case GF_CRYPT_TYPE_CENC:
+		case GF_CRYPT_TYPE_CENS:
 			tci->ctr_mode = GF_TRUE;
-		case GF_CRYPT_CBC1_CRYPT_TYPE:
-		case GF_CRYPT_CBCS_CRYPT_TYPE:
+		case GF_CRYPT_TYPE_CBC1:
+		case GF_CRYPT_TYPE_CBCS:
 			gf_encrypt_track = gf_cenc_encrypt_track;
-			tci->cenc_scheme_type = info->crypt_type;
 			break;
-		case GF_CRYPT_ADOBE_CRYPT_TYPE:
+		case GF_CRYPT_TYPE_ADOBE:
 			gf_encrypt_track = gf_adobe_encrypt_track;
 			break;
 		default:
 			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Encryption type not supported\n"));
-			return GF_NOT_SUPPORTED;;
+			return GF_NOT_SUPPORTED;
 		}
 
 		/*default to FILE uri*/
 		if (!strlen(tci->KMS_URI)) strcpy(tci->KMS_URI, drm_file);
 
 		if (tci->IsEncrypted > 0) {
-			e = gf_encrypt_track(mp4, tci, NULL, NULL);
+			GF_TrackCryptInfo bck;
+			memcpy(&bck, tci, sizeof(GF_TrackCryptInfo));
+			if (!tci->trackID) tci->trackID = trackID;
+
+ 			e = gf_encrypt_track(mp4, tci, NULL, NULL);
+			memcpy(tci, &bck, sizeof(GF_TrackCryptInfo));
 			if (e) break;
 
 			is_encrypted = GF_TRUE;
@@ -2214,10 +2997,10 @@
 	if (is_oma) {
 #if 0
 		/*set as OMA V2*/
-		e = gf_isom_set_brand_info(mp4, GF_4CC('o','d','c','f'), 0x00000002);
+		e = gf_isom_set_brand_info(mp4, GF_ISOM_BRAND_ODCF, 0x00000002);
 		gf_isom_reset_alt_brands(mp4);
 #else
-		e = gf_isom_modify_alternate_brand(mp4, GF_4CC('o','p','f','2'), 1);
+		e = gf_isom_modify_alternate_brand(mp4, GF_ISOM_BRAND_OPF2, 1);
 #endif
 	}

gpac-0.7.1.tar.gz/src/media_tools/isom_hinter.c -> gpac-0.8.0.tar.gz/src/media_tools/isom_hinter.c Changed

@@ -587,7 +587,7 @@
 
 	my_sl.AUSeqNumLength = gf_get_bit_size(gf_isom_get_sample_count(file, TrackNum));
 	if (my_sl.AUSeqNumLength>16) my_sl.AUSeqNumLength=16;
-	
+
 	my_sl.CUDuration = const_dur;
 
 	if (gf_isom_has_sync_points(file, TrackNum)) {
@@ -694,14 +694,14 @@
 	u32 i, descIndex, duration;
 	u64 ts;
 	u8 PadBits;
-	Double ft;
+	GF_Fraction ft;
 	GF_ISOSample *samp;
 
 	tkHint->HintSample = tkHint->RTPTime = 0;
 
 	tkHint->TotalSample = gf_isom_get_sample_count(tkHint->file, tkHint->TrackNum);
-	ft = tkHint->rtp_p->sl_config.timestampResolution;
-	ft /= tkHint->OrigTimeScale;
+	ft.num = tkHint->rtp_p->sl_config.timestampResolution;
+	ft.den = tkHint->OrigTimeScale;
 
 	e = GF_OK;
 	for (i=0; i<tkHint->TotalSample; i++) {
@@ -718,10 +718,10 @@
 			samp->IsRAP = RAP;
 		}
 
-		ts = (u64) (ft * (s64) (samp->DTS+samp->CTS_Offset));
+		ts = ft.num * (samp->DTS+samp->CTS_Offset) / ft.den;
 		tkHint->rtp_p->sl_header.compositionTimeStamp = ts;
 
-		ts = (u64) (ft * (s64)(samp->DTS));
+		ts = ft.num * samp->DTS / ft.den;
 		tkHint->rtp_p->sl_header.decodingTimeStamp = ts;
 		tkHint->rtp_p->sl_header.randomAccessPointFlag = samp->IsRAP;
 
@@ -854,10 +854,12 @@
 	GF_ESD *esd;
 	char sdpLine[20000];
 	char mediaName[30], payloadName[30];
-
+ u32 mtype;
+ 
 	Width = Height = 0;
 	gf_isom_sdp_clean_track(tkHint->file, tkHint->TrackNum);
-	if (gf_isom_get_media_type(tkHint->file, tkHint->TrackNum) == GF_ISOM_MEDIA_VISUAL)
+ mtype = gf_isom_get_media_type(tkHint->file, tkHint->TrackNum);
+ if (gf_isom_is_video_subtype(mtype))
 		gf_isom_get_visual_info(tkHint->file, tkHint->TrackNum, 1, &Width, &Height);
 
 	gf_rtp_builder_get_payload_name(tkHint->rtp_p, payloadName, mediaName);
@@ -1083,7 +1085,7 @@
 	}
 //xtended attribute for copyright
 if (gf_isom_drop_date_version_info_enabled(file)) {
- sprintf(buf64, "a=x-copyright: %s", "MP4/3GP File hinted with GPAC - (C)2000-2016 - http://gpac.io");
+ sprintf(buf64, "a=x-copyright: %s", "MP4/3GP File hinted with GPAC - (c) Telecom ParisTech (http://gpac.io)");
 } else {
 sprintf(buf64, "a=x-copyright: %s", "MP4/3GP File hinted with GPAC " GPAC_FULL_VERSION " (C)2000-2016 - http://gpac.io");
 }

gpac-0.7.1.tar.gz/src/media_tools/isom_tools.c -> gpac-0.8.0.tar.gz/src/media_tools/isom_tools.c Changed

@@ -26,12 +26,13 @@
 
 
 #include <gpac/internal/media_dev.h>
+#include <gpac/internal/isomedia_dev.h>
 #include <gpac/constants.h>
 #include <gpac/config_file.h>
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 GF_EXPORT
-GF_Err gf_media_change_par(GF_ISOFile *file, u32 track, s32 ar_num, s32 ar_den)
+GF_Err gf_media_change_par(GF_ISOFile *file, u32 track, s32 ar_num, s32 ar_den, Bool force_par)
 {
 	u32 tk_w, tk_h, stype;
 	GF_Err e;
@@ -54,7 +55,7 @@
 #endif
 	}
 #if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
-	else if (stype==GF_4CC('h','v','c','1')) {
+	else if (stype==GF_ISOM_SUBTYPE_HVC1) {
 		GF_HEVCConfig *hvcc = gf_isom_hevc_config_get(file, track, 1);
 		gf_media_hevc_change_par(hvcc, ar_num, ar_den);
 		e = gf_isom_hevc_config_update(file, track, 1, hvcc);
@@ -62,10 +63,20 @@
 		if (e) return e;
 	}
 #endif
+#if !defined(GPAC_DISABLE_AV1) && !defined(GPAC_DISABLE_AV_PARSERS)
+	else if (stype == GF_ISOM_SUBTYPE_AV01) {
+		assert(0);
+		//GF_AV1Config *av1c = gf_isom_av1_config_get(file, track, 1);
+		//gf_media_hevc_change_par(av1c, ar_num, ar_den);
+		//TODO: e = gf_isom_av1_config_update(file, track, 1, av1c);
+		//gf_odf_av1_cfg_del(av1c);
+		if (e) return e;
+	}
+#endif
 	else if (stype==GF_ISOM_SUBTYPE_MPEG4) {
 		GF_ESD *esd = gf_isom_get_esd(file, track, 1);
 		if (!esd || !esd->decoderConfig || (esd->decoderConfig->streamType!=4) ) {
-			if (esd) gf_odf_desc_del((GF_Descriptor *) esd);
+			if (esd) gf_odf_desc_del((GF_Descriptor *) esd);
 			return GF_NOT_SUPPORTED;
 		}
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -77,13 +88,22 @@
 		}
 #endif
 	} else {
-		if (gf_isom_get_media_type(file, track)==GF_ISOM_MEDIA_VISUAL) {
+ u32 mtype = gf_isom_get_media_type(file, track);
+		if (gf_isom_is_video_subtype(mtype)) {
+			u32 stype = gf_isom_get_media_subtype(file, track, 1);
+			char *cstype = (char*)&stype;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER,
+				("[ISOBMF] Error: changing pixel ratio of media subtype \"%c%c%c%c\" is not unsupported\n",
+					cstype[3], cstype[2], cstype[1], cstype[0]));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, (" - note that inband doesn't allow PAR change.\n"));
 			return GF_NOT_SUPPORTED;
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMF] Error: changing pixel ratio on non-video track.\n"));
+			return GF_BAD_PARAM;
 		}
-		return GF_BAD_PARAM;
 	}
 
-	e = gf_isom_set_pixel_aspect_ratio(file, track, 1, ar_num, ar_den);
+	e = gf_isom_set_pixel_aspect_ratio(file, track, 1, ar_num, ar_den, force_par);
 	if (e) return e;
 
 	if ((ar_den>=0) && (ar_num>=0)) {
@@ -99,7 +119,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_media_remove_non_rap(GF_ISOFile *file, u32 track)
+GF_Err gf_media_remove_non_rap(GF_ISOFile *file, u32 track, Bool non_ref_only)
 {
 	GF_Err e;
 	u32 i, count, di;
@@ -114,10 +134,20 @@
 
 	count = gf_isom_get_sample_count(file, track);
 	for (i=0; i<count; i++) {
+		Bool remove = GF_TRUE;
 		GF_ISOSample *samp = gf_isom_get_sample_info(file, track, i+1, &di, &offset);
 		if (!samp) return gf_isom_last_error(file);
 
-		if (samp->IsRAP) {
+		if (samp->IsRAP) remove = GF_FALSE;
+		else if (non_ref_only) {
+			u32 isLeading, dependsOn, dependedOn, redundant;
+			gf_isom_get_sample_flags(file, track, i+1, &isLeading, &dependsOn, &dependedOn, &redundant);
+			if (dependedOn != 2) {
+				remove = GF_FALSE;
+			}
+		}
+
+		if (!remove) {
 			last_dts = samp->DTS;
 			gf_isom_sample_del(&samp);
 			continue;
@@ -176,7 +206,7 @@
 			else if (box_size==1) box_size = gf_bs_peek_bits(bs, 64, 8);
 
 			/*skip all MutableDRMInformation*/
-			if (box_type==GF_4CC('m','d','r','i')) {
+			if (box_type==GF_ISOM_BOX_TYPE_MDRI) {
 				gf_bs_skip_bytes(bs, box_size);
 				tot += box_size;
 			} else {
@@ -290,6 +320,8 @@
 		mType = gf_isom_get_media_type(mp4file, i+1);
 		switch (mType) {
 		case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
 			image_track = 0;
 			if (esd && ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_IMAGE_JPEG) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_IMAGE_PNG)) )
 				image_track = 1;
@@ -584,6 +616,8 @@
 		stype = gf_isom_get_media_subtype(mp4file, i+1, 1);
 		switch (mType) {
 		case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
 			/*remove image tracks if wanted*/
 			if (gf_isom_get_sample_count(mp4file, i+1)<=1) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[3GPP convert] Visual track ID %d: only one sample found\n", gf_isom_get_track_id(mp4file, i+1) ));
@@ -784,11 +818,156 @@
 			break;
 		}
 	}
-	gf_isom_set_brand_info(mp4, GF_4CC('M','S','N','V'), 0);
-	gf_isom_modify_alternate_brand(mp4, GF_4CC('M','S','N','V'), 1);
+	gf_isom_set_brand_info(mp4, GF_ISOM_BRAND_MSNV, 0);
+	gf_isom_modify_alternate_brand(mp4, GF_ISOM_BRAND_MSNV, 1);
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_media_check_qt_prores(GF_ISOFile *mp4)
+{
+	u32 i, count, timescale, def_dur=0, video_tk=0;
+	Bool is_prores=GF_FALSE;
+	GF_Err e;
+	u32 colour_type=0;
+	u16 colour_primaries=0, transfer_characteristics=0, matrix_coefficients=0;
+	Bool full_range_flag=GF_FALSE;
+	u32 hspacing=0, vspacing=0;
+	u32 nb_video_tracks;
+	u32 target_ts = 0, w=0, h=0, chunk_size=0;
+
+	timescale = 0;
+	nb_video_tracks = 0;
+
+	count = gf_isom_get_track_count(mp4);
+	for (i=0; i<count; i++) {
+		u32 mtype = gf_isom_get_media_type(mp4, i+1);
+		if (mtype!=GF_ISOM_MEDIA_VISUAL) continue;
+		nb_video_tracks++;
+		if (!video_tk)
+			video_tk = i+1;
+	}
+
+	if ((nb_video_tracks==1) && video_tk) {
+		u32 video_subtype = gf_isom_get_media_subtype(mp4, video_tk, 1);
+		switch (video_subtype) {
+		case GF_QT_BOX_TYPE_APCH:
+		case GF_QT_BOX_TYPE_APCO:
+		case GF_QT_BOX_TYPE_APCN:
+		case GF_QT_BOX_TYPE_APCS:
+		case GF_QT_BOX_TYPE_APCF:
+		case GF_QT_BOX_TYPE_AP4X:
+		case GF_QT_BOX_TYPE_AP4H:
+			is_prores=GF_TRUE;
+			break;
+		}
+	}
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[QTFF/ProRes] Adjusting %s compliancy\n", is_prores ? "ProRes" : "QTFF"));
+
+	//adjust audio tracks
+	for (i=0; i<count; i++) {
+		u32 mtype = gf_isom_get_media_type(mp4, i+1);
+
+		//remove bitrate info (isobmff)
+		gf_isom_update_bitrate(mp4, i+1, 1, 0, 0, 0);
+		
+		if (mtype==GF_ISOM_MEDIA_AUDIO) {
+			u32 sr, nb_ch;
+			u8 bps;
+			gf_isom_get_audio_info(mp4, i+1, 1, &sr, &nb_ch, &bps);
+			gf_isom_set_audio_info(mp4, i+1, 1, sr, nb_ch, bps, GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF);
+			continue;
+		}
+		if (mtype!=GF_ISOM_MEDIA_VISUAL) continue;
+	}
+	//make QT
+	gf_isom_remove_root_od(mp4);
+	gf_isom_set_brand_info(mp4, GF_ISOM_BRAND_QT, 512);
+	gf_isom_reset_alt_brands(mp4);
+
+
+	if (!video_tk) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[QTFF] No visual track\n"));
+		return GF_OK;
+	}
+
+	if (video_tk && (nb_video_tracks>1)) {
+		if (is_prores) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("QTFF] cannot adjust params to prores, %d video tracks present\n", nb_video_tracks));
+			return GF_BAD_PARAM;
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[ProRes] no prores codec found but %d video tracks, not adjusting file\n", nb_video_tracks));
+		return GF_OK;
+	}
+
+	if (is_prores) {
+		gf_isom_update_video_sample_entry_fields(mp4, video_tk, 1, 0, GF_4CC('a','p','p','l'), 0, 0x3FF, 72<<16, 72<<16, 1, NULL, -1);
+	}
+
+	timescale = gf_isom_get_media_timescale(mp4, video_tk);
+	def_dur = gf_isom_get_constant_sample_duration(mp4, video_tk);
+	if (!def_dur) {
+		gf_isom_get_sample_duration(mp4, video_tk, 2);
+		if (!def_dur) {
+			gf_isom_get_sample_duration(mp4, video_tk, 1);
+		}
+	}
+	if (!def_dur) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ProRes] cannot estimate default sample duration for video track\n"));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	gf_isom_get_pixel_aspect_ratio(mp4, video_tk, 1, &hspacing, &vspacing);
+	if ((hspacing<=1) || (vspacing<=1))
+		gf_isom_set_pixel_aspect_ratio(mp4, video_tk, 1, -1, -1, GF_FALSE);
+
+	//todo: patch colr
+	e = gf_isom_get_color_info(mp4, video_tk, 1, &colour_type, &colour_primaries, &transfer_characteristics, &matrix_coefficients, &full_range_flag);
+	if (e==GF_NOT_FOUND) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ProRes] No color info present in visual track, defaulting to BT709\n"));
+		gf_isom_set_visual_color_info(mp4, video_tk, 1, GF_4CC('n','c','l','c'), 1, 1, 1, GF_FALSE, NULL, 0);
+	} else if (e) {
+		return e;
+	}
+	gf_isom_get_visual_info(mp4, video_tk, 1, &w, &h);
+
+	u32 ifps;
+	Double FPS = timescale;
+	FPS /= def_dur;
+	FPS *= 100;
+	ifps = (u32) FPS;
+	if (ifps>= 2996 && ifps<=2998) target_ts = 30000;	//29.97
+	else if (ifps>= 2999 && ifps<=3001) target_ts = 3000; //30
+	else if (ifps>= 2495 && ifps<=2505) target_ts = 2500; //25
+	else if (ifps >= 2396 && ifps<=2398) target_ts = 24000; //23.97
+	else if ((ifps>=2399) && (ifps<=2401)) target_ts = 2400; //24
+	else if (ifps>= 4990 && ifps<=5010) target_ts = 5000; //50
+	else if (ifps>= 5993 && ifps<=5995) target_ts = 60000; //59.94
+	else if (ifps>= 5996 && ifps<=6004) target_ts = 6000; //60
+
+	if (!target_ts) {
+		if (is_prores) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ProRes] Unrecognized frame rate %g\n", ((Double)timescale)/def_dur ));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		} else {
+			target_ts = timescale;
+		}
+	}
+
+	if (target_ts != timescale) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[ProRes] Adjusting timescale to %d\n", target_ts));
+		gf_isom_set_media_timescale(mp4, video_tk, target_ts, GF_FALSE);
+	}
+	gf_isom_set_timescale(mp4, target_ts);
+	if ((w<=720) && (h<=576)) chunk_size = 2000000;
+	else chunk_size = 4000000;
+
+	gf_isom_set_interleave_time(mp4, 500);
+	gf_isom_hint_max_chunk_size(mp4, video_tk, chunk_size);
+
+	return GF_OK;
+}
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
@@ -820,6 +999,9 @@
 	case GF_ISOM_SUBTYPE_HEV2:
 	case GF_ISOM_SUBTYPE_LHV1:
 	case GF_ISOM_SUBTYPE_LHE1:
+	case GF_ISOM_SUBTYPE_AV01:
+	case GF_ISOM_SUBTYPE_VP08:
+	case GF_ISOM_SUBTYPE_VP09:
 		return gf_isom_get_esd(mp4, track, 1);
 	}
 
@@ -863,7 +1045,7 @@
 		esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_GENERIC;
 		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		/*format ext*/
-		gf_bs_write_u32(bs, GF_4CC('h', '2', '6', '3'));
+		gf_bs_write_u32(bs, GF_ISOM_SUBTYPE_H263);
 		gf_isom_get_visual_info(mp4, track, 1, &w, &h);
 		gf_bs_write_u16(bs, w);
 		gf_bs_write_u16(bs, h);
@@ -898,14 +1080,22 @@
 		return esd;
 	}
 
+	if (subtype == GF_ISOM_SUBTYPE_OPUS) {
+		esd = gf_isom_get_esd(mp4, track, 1);
+		if (!esd) return NULL;
+
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_OPUS;
+		return esd;
+	}
 
-	if ( (subtype == GF_4CC('j','p','e','g')) || (subtype == GF_4CC('p','n','g',' ')) ) {
+
+	if ( (subtype == GF_ISOM_SUBTYPE_JPEG) || (subtype == GF_ISOM_SUBTYPE_PNG) ) {
 		esd = gf_odf_desc_esd_new(0);
 		esd->slConfig->timestampResolution = gf_isom_get_media_timescale(mp4, track);
 		esd->ESID = gf_isom_get_track_id(mp4, track);
 		esd->OCRESID = esd->ESID;
 		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		esd->decoderConfig->objectTypeIndication = (subtype == GF_4CC('j','p','e','g')) ? GPAC_OTI_IMAGE_JPEG : GPAC_OTI_IMAGE_PNG;
+		esd->decoderConfig->objectTypeIndication = (subtype == GF_ISOM_SUBTYPE_JPEG) ? GPAC_OTI_IMAGE_JPEG : GPAC_OTI_IMAGE_PNG;
 		gf_odf_desc_del((GF_Descriptor*)esd->decoderConfig->decoderSpecificInfo);
 		esd->decoderConfig->decoderSpecificInfo = NULL;
 		return esd;
@@ -937,13 +1127,14 @@
 	}
 
 	type = gf_isom_get_media_type(mp4, track);
-	if ((type != GF_ISOM_MEDIA_AUDIO) && (type != GF_ISOM_MEDIA_VISUAL)) return NULL;
+	if ((type != GF_ISOM_MEDIA_AUDIO) && !gf_isom_is_video_subtype(type)) return NULL;
 
 	esd = gf_odf_desc_esd_new(0);
 	esd->OCRESID = esd->ESID = gf_isom_get_track_id(mp4, track);
 	esd->slConfig->useTimestampsFlag = 1;
 	esd->slConfig->timestampResolution = gf_isom_get_media_timescale(mp4, track);
 	esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_GENERIC;
+	esd->decoderConfig->streamType = (type == GF_ISOM_MEDIA_AUDIO) ? GF_STREAM_AUDIO : GF_STREAM_VISUAL;
 	/*format ext*/
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	gf_bs_write_u32(bs, subtype);
@@ -972,6 +1163,101 @@
 	return esd;
 }
 
+GF_EXPORT
+GF_ESD *gf_media_map_item_esd(GF_ISOFile *mp4, u32 item_id)
+{
+	u32 item_type;
+	u32 prot_idx;
+	Bool is_self_ref;
+	const char *name;
+	const char *mime;
+	const char *encoding;
+	const char *url;
+	const char *urn;
+	GF_ESD *esd;
+	GF_Err e;
+
+	u32 item_idx = gf_isom_get_meta_item_by_id(mp4, GF_TRUE, 0, item_id);
+	if (!item_idx) return NULL;
+
+	e = gf_isom_get_meta_item_info(mp4, GF_TRUE, 0, item_idx, &item_id, &item_type, &prot_idx, &is_self_ref, &name, &mime, &encoding, &url, &urn);
+	if (e != GF_OK) return NULL;
+
+	if (item_type == GF_ISOM_SUBTYPE_HVC1) {
+		GF_ImageItemProperties props;
+		esd = gf_odf_desc_esd_new(0);
+		if (item_id > (1 << 16)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Item ID greater than 16 bits, does not fit on ES ID\n"));
+		}
+		esd->ESID = (u16)item_id;
+		esd->OCRESID = esd->ESID;
+		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_HEVC;
+		e = gf_isom_get_meta_image_props(mp4, GF_TRUE, 0, item_id, &props);
+		if (e == GF_OK && props.config) {
+			gf_odf_hevc_cfg_write(((GF_HEVCConfigurationBox *)props.config)->config, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
+		}
+		esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
+		esd->slConfig->useTimestampsFlag = 1;
+		esd->slConfig->timestampResolution = 1000;
+		return esd;
+	} else if (item_type == GF_ISOM_SUBTYPE_AVC_H264) {
+		GF_ImageItemProperties props;
+		esd = gf_odf_desc_esd_new(0);
+		if (item_id > (1 << 16)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Item ID greater than 16 bits, does not fit on ES ID\n"));
+		}
+		esd->ESID = (u16)item_id;
+		esd->OCRESID = esd->ESID;
+		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_AVC;
+		e = gf_isom_get_meta_image_props(mp4, GF_TRUE, 0, item_id, &props);
+		if (e == GF_OK && props.config) {
+			gf_odf_avc_cfg_write(((GF_AVCConfigurationBox *)props.config)->config, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
+		}
+		esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
+		esd->slConfig->useTimestampsFlag = 1;
+		esd->slConfig->timestampResolution = 1000;
+		return esd;
+	} else if ((item_type == GF_ISOM_SUBTYPE_JPEG) || (mime && !strcmp(mime, "image/jpeg")) ){
+		GF_ImageItemProperties props;
+		esd = gf_odf_desc_esd_new(0);
+		if (item_id > (1 << 16)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Item ID greater than 16 bits, does not fit on ES ID\n"));
+		}
+		esd->ESID = (u16)item_id;
+		esd->OCRESID = esd->ESID;
+		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_IMAGE_JPEG;
+		e = gf_isom_get_meta_image_props(mp4, GF_TRUE, 0, item_id, &props);
+		if (e == GF_OK && props.config) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("JPEG image item decoder config not supported, patch welcome\n"));
+		}
+		esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
+		esd->slConfig->useTimestampsFlag = 1;
+		esd->slConfig->timestampResolution = 1000;
+		return esd;
+	} else if ((item_type == GF_ISOM_SUBTYPE_PNG) || (mime && !strcmp(mime, "image/png")) ){
+		GF_ImageItemProperties props;
+		esd = gf_odf_desc_esd_new(0);
+		if (item_id > (1 << 16)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Item ID greater than 16 bits, does not fit on ES ID\n"));
+		}
+		esd->ESID = (u16)item_id;
+		esd->OCRESID = esd->ESID;
+		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_IMAGE_PNG;
+		e = gf_isom_get_meta_image_props(mp4, GF_TRUE, 0, item_id, &props);
+		esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
+		esd->slConfig->useTimestampsFlag = 1;
+		esd->slConfig->timestampResolution = 1000;
+		return esd;
+	} else {
+
+		return NULL;
+	}
+}
+
 #endif /*GPAC_DISABLE_ISOM*/
 
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
@@ -1027,7 +1313,7 @@
 	if (buffer) gf_free(buffer);
 	if (bs) gf_bs_del(bs);
 	gf_isom_set_nalu_extract_mode(file, track, cur_extract_mode);
-	return DQId;;
+	return DQId;
 }
 
 static Bool gf_isom_has_svc_explicit(GF_ISOFile *file, u32 track)
@@ -1454,7 +1740,7 @@
 
 			switch (nal_type) {
 			case GF_AVC_NALU_PIC_PARAM:
-				pps_id = gf_media_avc_read_pps(buffer, size, &avc);;
+				pps_id = gf_media_avc_read_pps(buffer, size, &avc);
 				j = 0;
 				dst_track = 0;
 				while (j < num_pps)
@@ -2132,7 +2418,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_media_split_lhvc(GF_ISOFile *file, u32 track, Bool for_temporal_sublayers, Bool splitAll, Bool use_extractors)
+GF_Err gf_media_split_lhvc(GF_ISOFile *file, u32 track, Bool for_temporal_sublayers, Bool splitAll, GF_LHVCExtractoreMode extractor_mode)
 {
 	LHVCTrackInfo sti[64];
 	GF_HEVCConfig *hevccfg, *lhvccfg;
@@ -2177,21 +2463,45 @@
 	nal_unit_size = lhvccfg ? lhvccfg->nal_unit_size : hevccfg->nal_unit_size;
 
 	if (!for_temporal_sublayers) {
-		u32 i;
+		u32 i, pass, base_layer_pass = GF_TRUE;
+		GF_HEVCConfig *cur_cfg = hevccfg;
+
+reparse:
 		//split all SPS/PPS/VPS from lhvccfg
-		count = gf_list_count(lhvccfg->param_array);
+		for (pass=0; pass<3; pass++) {
+		count = gf_list_count(cur_cfg->param_array);
 		for (i=0; i<count; i++) {
 			u32 count2;
 			GF_HEVCParamArray *s_ar;
-			GF_HEVCParamArray *ar = gf_list_get(lhvccfg->param_array, i);
+			GF_HEVCParamArray *ar = gf_list_get(cur_cfg->param_array, i);
+			if ((pass==0) && (ar->type!=GF_HEVC_NALU_VID_PARAM)) continue;
+			else if ((pass==1) && (ar->type!=GF_HEVC_NALU_SEQ_PARAM)) continue;
+			else if ((pass==2) && (ar->type!=GF_HEVC_NALU_PIC_PARAM)) continue;
+
 			count2 = gf_list_count(ar->nalus);
 			for (j=0; j<count2; j++) {
 				GF_AVCConfigSlot *sl = gf_list_get(ar->nalus, j);
 //				u8 nal_type = (sl->data[0] & 0x7E) >> 1;
 				u8 layer_id = ((sl->data[0] & 0x1) << 5) | (sl->data[1] >> 3);
 
-				//this should not happen
-				if (!layer_id) continue;
+				if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
+					u32 lw, lh;
+					s32 idx = gf_hevc_get_sps_info_with_state(&hevc_state, sl->data, sl->size, NULL, &lw, &lh, NULL, NULL);
+					if (idx>=0) {
+						if (lw > sti[layer_id].width) sti[layer_id].width = lw;
+						if (lh > sti[layer_id].height) sti[layer_id].height = lh;
+					}
+				} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
+					gf_media_hevc_read_pps(sl->data, sl->size, &hevc_state);
+				} else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
+					gf_media_hevc_read_vps(sl->data, sl->size, &hevc_state);
+				}
+
+				//don't touch base layer
+				if (!layer_id) {
+					assert(base_layer_pass);
+					continue;
+				}
 
 				if (!splitAll) layer_id = 1;
 
@@ -2215,6 +2525,12 @@
 				j--;
 				count2--;
 			}
+			}
+		}
+		if (base_layer_pass) {
+			base_layer_pass = GF_FALSE;
+			cur_cfg = lhvccfg;
+			goto reparse;
 		}
 	} else {
 		gf_isom_set_cts_packing(file, track, GF_TRUE);
@@ -2223,7 +2539,7 @@
 	//CLARIFY wether this is correct: we duplicate all VPS in the enhancement layer ...
 	//we do this because if we split the tracks some info for setting up the enhancement layer
 	//is in the VPS
-	if (!use_extractors) {
+	if (extractor_mode != GF_LHVC_EXTRACTORS_ON) {
 		u32 i;
 		count = gf_list_count(hevccfg->param_array);
 		for (i=0; i<count; i++) {
@@ -2259,7 +2575,7 @@
 	if (for_temporal_sublayers) {
 		e = gf_isom_lhvc_config_update(file, track, 1, NULL, GF_ISOM_LEHVC_WITH_BASE_BACKWARD);
 	} else {
-		e = gf_isom_lhvc_config_update(file, track, 1, NULL, GF_ISOM_LEHVC_WITH_BASE);
+		e = gf_isom_lhvc_config_update(file, track, 1, NULL, GF_ISOM_LEHVC_WITH_BASE_BACKWARD);
 	}
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[HEVC] Failed to update HEVC/LHVC config\n"));
@@ -2267,8 +2583,8 @@
 	}
 
 	//purge all linf sample groups
-	gf_isom_remove_sample_group(file, track, GF_4CC('l','i','n','f'));
-	
+	gf_isom_remove_sample_group(file, track, GF_ISOM_SAMPLE_GROUP_LINF);
+
 	nal_alloc_size = 10000;
 	nal_data = gf_malloc(sizeof(char) * nal_alloc_size);
 	//parse all samples
@@ -2381,7 +2697,7 @@
 		//reset all samples on all layers found - we may have layers not present in this sample, we still need to process these layers when extractors are used
 		for (j=0; j<=max_layer_id; j++) {
 			if (!for_temporal_sublayers && ! sti[j].bs) {
-				if (!sti[j].track_num || !use_extractors) {
+				if (!sti[j].track_num || (extractor_mode != GF_LHVC_EXTRACTORS_ON) ) {
 					sti[j].data_offset = sti[j].data_size = 0;
 					continue;
 				}
@@ -2390,7 +2706,7 @@
 			//clone track
 			if (! sti[j].track_num) {
 				u32 track_id = gf_isom_get_track_id(file, track);
-				e = gf_isom_clone_track(file, track, file, GF_FALSE, &sti[j].track_num);
+				e = gf_isom_clone_track(file, track, file, 0, &sti[j].track_num);
 				if (e) goto exit;
 
 				if (! for_temporal_sublayers) {
@@ -2405,8 +2721,11 @@
 						sti[j].lhvccfg->is_lhvc = 1;
 						sti[j].lhvccfg->complete_representation = 1;
 					}
-					e = gf_isom_lhvc_config_update(file, sti[j].track_num, 1, sti[j].lhvccfg, use_extractors ? GF_ISOM_LEHVC_WITH_BASE : GF_ISOM_LEHVC_ONLY);
+					e = gf_isom_lhvc_config_update(file, sti[j].track_num, 1, sti[j].lhvccfg, (extractor_mode == GF_LHVC_EXTRACTORS_ON) ? GF_ISOM_LEHVC_WITH_BASE : GF_ISOM_LEHVC_ONLY);
 					if (e) goto exit;
+
+					if (extractor_mode == GF_LHVC_EXTRACTORS_OFF_FORCE_INBAND)
+						gf_isom_lhvc_force_inband_config(file, sti[j].track_num, 1);
 				} else {
 					e = gf_isom_lhvc_config_update(file, sti[j].track_num, 1, NULL, GF_ISOM_LEHVC_WITH_BASE);
 					if (e) goto exit;
@@ -2416,27 +2735,27 @@
 					goto exit;
 				}
 
-				gf_isom_set_track_reference(file, sti[j].track_num, GF_4CC('s','b','a','s'), track_id);
+				gf_isom_set_track_reference(file, sti[j].track_num, GF_ISOM_REF_BASE, track_id);
 
 				//for an L-HEVC bitstream: only base track carries the 'oinf' sample group, other track have a track reference of type 'oref' to base track
-				e = gf_isom_remove_sample_group(file, sti[j].track_num, GF_4CC('o','i','n','f'));
+				e = gf_isom_remove_sample_group(file, sti[j].track_num, GF_ISOM_SAMPLE_GROUP_OINF);
 				if (e) goto exit;
 				//purge all linf sample groups
-				gf_isom_remove_sample_group(file, sti[j].track_num, GF_4CC('l','i','n','f'));
-				gf_isom_set_track_reference(file, sti[j].track_num, GF_4CC('o','r','e','f'), track_id);
+				gf_isom_remove_sample_group(file, sti[j].track_num, GF_ISOM_SAMPLE_GROUP_LINF);
+				gf_isom_set_track_reference(file, sti[j].track_num, GF_ISOM_REF_OREF, track_id);
 
 				gf_isom_set_nalu_extract_mode(file, sti[j].track_num, GF_ISOM_NALU_EXTRACT_INSPECT);
 
 				//get lower layer
-				if (use_extractors) {
+				if (extractor_mode == GF_LHVC_EXTRACTORS_ON) {
 					for (k=j; k>0; k--) {
 						if (sti[k-1].track_num) {
 							u32 track_id = gf_isom_get_track_id(file, sti[k-1].track_num);
-							gf_isom_set_track_reference(file, sti[j].track_num, GF_4CC('s','c','a','l'), track_id);
+							gf_isom_set_track_reference(file, sti[j].track_num, GF_ISOM_REF_SCAL, track_id);
 						}
 					}
 				}
-				
+
 				if (!for_temporal_sublayers)
 					gf_isom_set_visual_info(file, sti[j].track_num, 1, sti[j].width, sti[j].height);
 			} else {
@@ -2444,7 +2763,7 @@
 					gf_isom_set_visual_info(file, sti[j].track_num, 1, sti[j].width, sti[j].height);
 			}
 
-			if (j && use_extractors) {
+			if (j && (extractor_mode == GF_LHVC_EXTRACTORS_ON)) {
 				GF_BitStream *xbs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 				//get all lower layers
 				for (k=0; k<j; k++) {
@@ -2466,7 +2785,7 @@
 					// data offset: we start from beginning of the sample data, not the extractor
 					gf_bs_write_int(xbs, sti[k].data_offset, 8*nal_unit_size);
 					gf_bs_write_int(xbs, sti[k].data_size, 8*nal_unit_size);
-					
+
 					tid = sti[k].temporal_id_sample;
 					sti[j].layers[k].layer_id_plus_one = sti[k].layer_id+1;
 					if (!sti[j].layers[k].min_temporal_id || (sti[j].layers[k].min_temporal_id > tid)) {
@@ -2573,7 +2892,7 @@
 			sti[j].non_tsa_vcl = GF_FALSE;
 		}
 	}
-	
+
 exit:
 	//reset all scalable info
 	for (j=0; j<=max_layer_id; j++) {
@@ -2610,19 +2929,19 @@
 		}
 		gf_bs_get_content(bs, &data, &data_size);
 		gf_bs_del(bs);
-		gf_isom_add_sample_group_info(file, sti[j].track_num, GF_4CC( 'l', 'i', 'n', 'f'), data, data_size, GF_TRUE, &count);
+		gf_isom_add_sample_group_info(file, sti[j].track_num, GF_ISOM_SAMPLE_GROUP_LINF, data, data_size, GF_TRUE, &count);
 		gf_free(data);
 	}
 	gf_isom_set_nalu_extract_mode(file, track, cur_extract_mode);
 
-	if (use_extractors) {
-		gf_isom_modify_alternate_brand(file, GF_4CC('h','v','c','e'), 1);
-		gf_isom_modify_alternate_brand(file, GF_4CC('h','v','c','i'), 0);
+	if (extractor_mode == GF_LHVC_EXTRACTORS_ON) {
+		gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_HVCE, 1);
+		gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_HVCI, 0);
 	}
 	//add hvci brand only if single layer per track
 	else if (single_layer_per_track) {
-		gf_isom_modify_alternate_brand(file, GF_4CC('h','v','c','i'), 1);
-		gf_isom_modify_alternate_brand(file, GF_4CC('h','v','c','e'), 0);
+		gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_HVCI, 1);
+		gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_HVCE, 0);
 	}
 	if (lhvccfg) gf_odf_hevc_cfg_del(lhvccfg);
 	if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
@@ -2665,7 +2984,6 @@
 }
 
 #ifndef GPAC_DISABLE_HEVC
-GF_EXPORT
 u32 hevc_get_tile_id(HEVCState *hevc, u32 *tile_x, u32 *tile_y, u32 *tile_width, u32 *tile_height)
 {
 	HEVCSliceInfo *si = &hevc->s_info;
@@ -2761,7 +3079,7 @@
 	gf_bs_write_u16(bs, th);
 	gf_bs_del(bs);
 
-	gf_isom_add_sample_group_info(file, track, GF_4CC('t','r','i','f'), data, data_size, is_default, &di);
+	gf_isom_add_sample_group_info(file, track, GF_ISOM_SAMPLE_GROUP_TRIF, data, data_size, is_default, &di);
 }
 
 GF_EXPORT
@@ -2799,6 +3117,8 @@
 	hvcc = gf_isom_hevc_config_get(file, track, 1);
 	nalu_size_length = hvcc->nal_unit_size;
 
+	memset(&hevc, 0, sizeof(HEVCState));
+
 	count = gf_list_count(hvcc->param_array);
 	for (i=0; i<count; i++) {
 		GF_HEVCParamArray *ar = gf_list_get(hvcc->param_array, i);
@@ -2857,16 +3177,16 @@
 
 	if (pps_idx==-1) return GF_BAD_PARAM;
 	if (sps_idx==-1) return GF_BAD_PARAM;
-	
+
 	if (hevc.pps[pps_idx].loop_filter_across_tiles_enabled_flag)
 		filter_disabled=GF_FALSE;
-	
+
 	if (! hevc.pps[pps_idx].tiles_enabled_flag) {
 		hevc_add_trif(file, track, gf_isom_get_track_id(file, track), GF_TRUE, 1, filter_disabled, 0, 0, hevc.sps[pps_idx].width, hevc.sps[pps_idx].height, GF_TRUE);
 		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[HEVC Tiles] Tiles not enabled, signal only single tile full picture\n"));
 		return GF_OK;
 	}
-	
+
 	nb_tiles = hevc.pps[pps_idx].num_tile_columns * hevc.pps[pps_idx].num_tile_rows;
 	tiles = gf_malloc(sizeof(HEVCTileImport) * nb_tiles);
 	if (!tiles) return GF_OUT_OF_MEM;
@@ -2875,7 +3195,7 @@
 	for (i=0; i<nb_tiles; i++) {
 		if (! signal_mode) {
 			//first clone tracks
-			e = gf_isom_clone_track(file, track, file, GF_FALSE, &tiles[i].track );
+			e = gf_isom_clone_track(file, track, file, 0, &tiles[i].track );
 			if (e) goto err_exit;
 			tiles[i].track_id = gf_isom_get_track_id(file, tiles[i].track);
 			gf_isom_hevc_set_tile_config(file, tiles[i].track, 1, NULL, GF_FALSE);
@@ -2887,7 +3207,7 @@
 		}
 		tiles[i].all_intra = GF_TRUE;
 	}
-	
+
 	count = gf_isom_get_sample_count(file, track);
 	for (i=0; i<count; i++) {
 		u8 *data;
@@ -2901,7 +3221,7 @@
 			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 			sample->data = NULL;
 			sample->dataLength = 0;
-			
+
 			for (j=0; j<nb_tiles; j++) {
 				tiles[j].data_offset = 0;
 				tiles[j].sample_data = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
@@ -2917,7 +3237,7 @@
 			gf_bs_write_int(bs, (signal_mode==2) ? 1 : 0, 1);//rle
 			gf_bs_write_u8(bs, 0);//entry_count - will be set at the end
 		}
-		
+
 
 		sample->data = (char *) data;
 
@@ -2958,7 +3278,7 @@
 				}
 				if (e)
 					goto err_exit;
-				
+
 				tiles[cur_tile].tx = tx;
 				tiles[cur_tile].ty = ty;
 				tiles[cur_tile].tw = tw;
@@ -2966,7 +3286,7 @@
 				if (hevc.s_info.slice_type != GF_HEVC_SLICE_TYPE_I) {
 					tiles[cur_tile].all_intra = 0;
 				}
-				
+
 				if (signal_mode) {
 					nb_nalus++;
 					tiles[cur_tile].nb_nalus_in_sample++;
@@ -3008,7 +3328,7 @@
 			data += nalu_size + nalu_size_length;
 			size -= nalu_size + nalu_size_length;
 		}
-	
+
 		if (! signal_mode) {
 			gf_free(sample->data);
 			gf_bs_get_content(bs, &sample->data, &sample->dataLength);
@@ -3019,7 +3339,7 @@
 
 			gf_free(sample->data);
 			sample->data = NULL;
-		
+
 			for (j=0; j<nb_tiles; j++) {
 				sample->dataLength = 0;
 				gf_bs_get_content(tiles[j].sample_data, &sample->data, &sample->dataLength);
@@ -3046,11 +3366,11 @@
 			gf_bs_del(bs);
 			data[1] = nb_nal_entries;
 
-			e = gf_isom_add_sample_group_info(file, track, GF_4CC('n','a','l','m'), data, size, 0, &sdesc);
+			e = gf_isom_add_sample_group_info(file, track, GF_ISOM_SAMPLE_GROUP_NALM, data, size, 0, &sdesc);
 			if (e) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMF] Error defining NALM group description entry\n" ));
 			} else {
-				e = gf_isom_add_sample_info(file, track, i+1, GF_4CC('n','a','l','m'), sdesc, GF_4CC('t','r','i','f'));
+				e = gf_isom_add_sample_info(file, track, i+1, GF_ISOM_SAMPLE_GROUP_NALM, sdesc, GF_ISOM_SAMPLE_GROUP_TRIF);
 				if (e) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMF] Error associating NALM group description to sample\n" ));
 				}
@@ -3112,7 +3432,7 @@
 } GF_TrackFragmenter;
 
 GF_EXPORT
-GF_Err gf_media_fragment_file(GF_ISOFile *input, const char *output_file, Double max_duration_sec)
+GF_Err gf_media_fragment_file(GF_ISOFile *input, const char *output_file, Double max_duration_sec, Bool use_mfra)
 {
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	u8 NbBits;
@@ -3122,29 +3442,30 @@
 	u16 defaultDegradationPriority;
 	GF_Err e;
 	const char *tag;
-	u32 tag_len;
+	u32 tag_len, mbrand, bcount, mversion;
 	GF_ISOFile *output;
-	GF_ISOSample *sample, *next;
+	GF_ISOSample *sample;
 	GF_List *fragmenters;
 	u32 MaxFragmentDuration;
 	GF_TrackFragmenter *tf;
- Bool drop_version = gf_isom_drop_date_version_info_enabled(input);
- 
+	Bool drop_version = gf_isom_drop_date_version_info_enabled(input);
+
 	//create output file
 	output = gf_isom_open(output_file, GF_ISOM_OPEN_WRITE, NULL);
 	if (!output) return gf_isom_last_error(NULL);
 
- gf_isom_no_version_date_info(output, drop_version);
+	gf_isom_no_version_date_info(output, drop_version);
 
 
 	nb_samp = 0;
 	fragmenters = gf_list_new();
 
-	/*FIXME - ALL THESE SHOULD GO DO A clone_movie item !!*/
-	e = gf_isom_set_brand_info(output, GF_ISOM_BRAND_MP42, 1);
-	if (e) goto err_exit;
-	e = gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_ISOM, 1);
-	if (e) goto err_exit;
+	gf_isom_get_brand_info(input, &mbrand, &mversion, &bcount);
+	gf_isom_set_brand_info(output, mbrand, mversion);
+	for (i=0; i<bcount; i++) {
+		gf_isom_get_alternate_brand(input, i+1, &mbrand);
+		gf_isom_modify_alternate_brand(output, mbrand, GF_TRUE);
+	}
 
 	//copy movie desc
 	gf_isom_clone_root_od(input, output);
@@ -3174,10 +3495,13 @@
 		}
 	}
 
+	if (use_mfra)
+		gf_isom_enable_mfra(output);
+
 	MaxFragmentDuration = (u32) (max_duration_sec * 1000);
 	//duplicates all tracks
 	for (i=0; i<gf_isom_get_track_count(input); i++) {
-		e = gf_isom_clone_track(input, i+1, output, GF_FALSE, &TrackNum);
+		e = gf_isom_clone_track(input, i+1, output, 0, &TrackNum);
 		if (e) goto err_exit;
 
 		for (j = 0; j < gf_isom_get_track_kind_count(input, i+1); j++) {
@@ -3188,47 +3512,35 @@
 
 		count = gf_isom_get_sample_count(input, i+1);
 		//we always fragment each track regardless of the sample count
-#if 0
-		//if few samples don't fragment track
-		if (count<=1) {
-			for (j=0; j<count; j++) {
-				sample = gf_isom_get_sample(input, i+1, j+1, &descIndex);
-				e = gf_isom_add_sample(output, TrackNum, 1, sample);
-				gf_isom_sample_del(&sample);
-				if (e) goto err_exit;
-			}
-		}
-		//otherwise setup fragmented
-		else
-#endif
-		{
-			gf_isom_get_fragment_defaults(input, i+1,
-			 &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
-			//otherwise setup fragmentation
-			e = gf_isom_setup_track_fragment(output, gf_isom_get_track_id(output, TrackNum),
-			 defaultDescriptionIndex, defaultDuration,
-			 defaultSize, (u8) defaultRandomAccess,
-			 defaultPadding, defaultDegradationPriority);
-			if (e) goto err_exit;
 
-			GF_SAFEALLOC(tf, GF_TrackFragmenter);
-			if (!tf) {
-				e = GF_OUT_OF_MEM;
-				goto err_exit;
-			}
-			tf->TrackID = gf_isom_get_track_id(output, TrackNum);
-			tf->SampleCount = count;
-			tf->OriginalTrack = i+1;
-			tf->TimeScale = gf_isom_get_media_timescale(input, i+1);
-			tf->MediaType = gf_isom_get_media_type(input, i+1);
-			tf->DefaultDuration = defaultDuration;
-			gf_list_add(fragmenters, tf);
-			nb_samp += count;
-		}
+		gf_isom_get_fragment_defaults(input, i+1,
+									 &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
+		//otherwise setup fragmentation
+		e = gf_isom_setup_track_fragment(output, gf_isom_get_track_id(output, TrackNum),
+										 defaultDescriptionIndex, defaultDuration,
+										 defaultSize, (u8) defaultRandomAccess,
+										 defaultPadding, defaultDegradationPriority, 0);
+		if (e) goto err_exit;
+
+		GF_SAFEALLOC(tf, GF_TrackFragmenter);
+		if (!tf) {
+			e = GF_OUT_OF_MEM;
+			goto err_exit;
+		}
+		tf->TrackID = gf_isom_get_track_id(output, TrackNum);
+		tf->SampleCount = count;
+		tf->OriginalTrack = i+1;
+		tf->TimeScale = gf_isom_get_media_timescale(input, i+1);
+		tf->MediaType = gf_isom_get_media_type(input, i+1);
+		tf->DefaultDuration = defaultDuration;
+		gf_list_add(fragmenters, tf);
+		nb_samp += count;
 
 		if (gf_isom_is_track_in_root_od(input, i+1)) gf_isom_add_track_to_root_od(output, TrackNum);
-		//copy user data ?
+
 	}
+	gf_isom_set_movie_duration(output, gf_isom_get_duration(input));
+
 
 
 	//flush movie
@@ -3249,7 +3561,7 @@
 		//setup some default
 		for (i=0; i<count; i++) {
 			tf = (GF_TrackFragmenter *)gf_list_get(fragmenters, i);
-			if (tf->MediaType == GF_ISOM_MEDIA_VISUAL) {
+			if (gf_isom_is_video_subtype(tf->MediaType) ) {
 				e = gf_isom_set_fragment_option(output, tf->TrackID, GF_ISOM_TRAF_RANDOM_ACCESS, 1);
 				if (e) goto err_exit;
 			}
@@ -3275,12 +3587,7 @@
 				}
 				gf_isom_get_sample_padding_bits(input, tf->OriginalTrack, tf->SampleNum+1, &NbBits);
 
-				next = gf_isom_get_sample(input, tf->OriginalTrack, tf->SampleNum + 2, &j);
-				if (next) {
-					defaultDuration = (u32) (next->DTS - sample->DTS);
-				} else {
-					defaultDuration = tf->DefaultDuration;
-				}
+				defaultDuration = gf_isom_get_sample_duration(input, tf->OriginalTrack, tf->SampleNum + 1);
 
 				e = gf_isom_fragment_add_sample(output, tf->TrackID, sample, descIndex, defaultDuration, NbBits, 0, 0);
 				if (e) goto err_exit;
@@ -3290,14 +3597,13 @@
 
 				/*copy subsample information*/
 				e = gf_isom_fragment_copy_subsample(output, tf->TrackID, input, tf->OriginalTrack, tf->SampleNum + 1, GF_FALSE);
-				if (e)
-					goto err_exit;
+				if (e) goto err_exit;
 
 				gf_set_progress("ISO File Fragmenting", nb_done, nb_samp);
 				nb_done++;
 
 				gf_isom_sample_del(&sample);
-				sample = next;
+				sample = NULL;
 				tf->FragmentLength += defaultDuration;
 				tf->SampleNum += 1;
 
@@ -3305,8 +3611,7 @@
 				if ((tf->SampleNum==tf->SampleCount) ||
 				 /* TODO: should probably test the time position (not only duration) to avoid drift */
 				 (tf->FragmentLength*1000 >= MaxFragmentDuration*tf->TimeScale)) {
-					gf_isom_sample_del(&next);
-					sample = next = NULL;
+					sample = NULL;
 					tf->FragmentLength = 0;
 					break;
 				}
@@ -3328,7 +3633,7 @@
 	}
 	gf_list_del(fragmenters);
 	if (e) gf_isom_delete(output);
-	else gf_isom_close(output);
+ else gf_isom_close(output);
 	gf_set_progress("ISO File Fragmenting", nb_samp, nb_samp);
 	return e;
 #else

gpac-0.7.1.tar.gz/src/media_tools/m2ts_mux.c -> gpac-0.8.0.tar.gz/src/media_tools/m2ts_mux.c Changed

@@ -29,7 +29,7 @@
 
 #if !defined(GPAC_DISABLE_MPEG2TS_MUX)
 
-/*90khz internal delay between two updates for bitrate compute per stream */
+/* 90khz internal delay between two updates for bitrate compute per stream */
 #define BITRATE_UPDATE_WINDOW	90000
 /* length of adaptation_field_length; */
 #define ADAPTATION_LENGTH_LENGTH 1
@@ -140,6 +140,7 @@
 		table->table_id = table_id;
 		if (prev_table) prev_table->next = table;
 		else stream->tables = table;
+		table->version_number = stream->initial_version_number;
 	}
 
 	if (!table_payload_length) return;
@@ -436,7 +437,7 @@
                                   Bool has_pcr, u64 pcr_time,
                                   Bool is_rap,
                                   u32 padding_length,
-                                  char *af_descriptors, u32 af_descriptors_size)
+                                  char *af_descriptors, u32 af_descriptors_size, Bool set_discontinuity)
 {
 	u32 adaptation_length;
 
@@ -448,7 +449,7 @@
 	}
 
 	gf_bs_write_int(bs,	adaptation_length, 8);
-	gf_bs_write_int(bs,	0, 1);			// discontinuity indicator
+	gf_bs_write_int(bs,	set_discontinuity ? 1 : 0, 1);			// discontinuity indicator
 	gf_bs_write_int(bs,	is_rap, 1);		// random access indicator
 	gf_bs_write_int(bs,	0, 1);			// es priority indicator
 	gf_bs_write_int(bs,	has_pcr, 1);	// PCR_flag
@@ -575,7 +576,7 @@
 
 #ifdef USE_AF_STUFFING
 	if (adaptation_field_control != GF_M2TS_ADAPTATION_NONE)
-		gf_m2ts_add_adaptation(stream->program, bs, stream->pid, 0, 0, 0, padding_length, NULL, 0);
+		gf_m2ts_add_adaptation(stream->program, bs, stream->pid, 0, 0, 0, padding_length, NULL, 0, GF_FALSE);
 #endif
 
 	/*pointer field*/
@@ -820,7 +821,7 @@
 				}
 			}
 
-			if (es->ifce && es->ifce->lang && (es->ifce->lang  != GF_4CC('u', 'n', 'd', ' ')) ) {
+			if (es->ifce && es->ifce->lang && (es->ifce->lang  != GF_MEDIA_LANG_UND) ) {
 				es_info_length += 2 + 3;
 				has_lang = GF_TRUE;
 			}
@@ -900,17 +901,15 @@
 	u64 pcr_offset;
 
 	if (*dts > *cts) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: DTS "LLD" is greater than CTS "LLD" (likel ISOBMF CTTSv1 input) - adjusting to CTS\n", stream->pid, *dts, *cts));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: DTS "LLD" is greater than CTS "LLD" (like ISOBMF CTTSv1 input) - adjusting to CTS\n", stream->pid, *dts, *cts));
 		*dts = *cts;
 	}
 
 	/*Rescale our timestamps and express them in PCR*/
 	if (stream->ts_scale.den) {
-		*cts = (u64)( *cts * stream->ts_scale.num / stream->ts_scale.den ) ;
-		*dts = (u64)( *dts * stream->ts_scale.num / stream->ts_scale.den ) ;
+		*cts = *cts * stream->ts_scale.num / stream->ts_scale.den ;
+		*dts = *dts * stream->ts_scale.num / stream->ts_scale.den ;
 		if (duration) *duration = (u32)( *duration * stream->ts_scale.num / stream->ts_scale.den ) ;
-
-
 	}
 	if (!stream->program->initial_ts_set) {
 		u32 nb_bits = (u32) (stream->program->mux->tot_pck_sent - stream->program->num_pck_at_pcr_init) * 1504;
@@ -957,7 +956,7 @@
 	gf_bs_write_int(bs, 0, 1);
 	gf_bs_write_int(bs, 0, 1);
 	gf_bs_write_int(bs, 0x1F, 5);
-	gf_bs_write_u32(bs, GF_4CC('T','X','X','X'));
+	gf_bs_write_u32(bs, ID3V2_FRAME_TXXX);
 	gf_bs_write_u32(bs, *len); /* size of the text */
 	gf_bs_write_u8(bs, 0);
 	gf_bs_write_u8(bs, 0);
@@ -1042,7 +1041,7 @@
 
 		/*EOS*/
 		if (stream->ifce->caps & GF_ESI_STREAM_IS_OVER) return ret;
-		assert( stream->ifce->input_ctrl);
+		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;
@@ -1281,7 +1280,7 @@
 
 	/*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_offset;
+	time_inc = stream->curr_pck.dts - stream->program->pcr_init_time/300;
 
 	gf_m2ts_time_inc(&stream->time, time_inc, 90000);
 
@@ -1322,7 +1321,7 @@
 {
 	u64 pcr;
 	/*compute PCR*/
-	if (stream->program->mux->fixed_rate ) {
+	if (stream->program->mux->fixed_rate) {
 		Double abs_pcr = (Double) (stream->program->mux->tot_pck_sent - stream->program->num_pck_at_pcr_init);
 		abs_pcr *= 27000000;
 		abs_pcr *= 1504;
@@ -1794,7 +1793,8 @@
 			stream->program->nb_pck_last_pcr = stream->program->mux->tot_pck_sent;
 		}
 		is_rap = (hdr_len && (stream->curr_pck.flags & GF_ESI_DATA_AU_RAP) ) ? GF_TRUE : GF_FALSE;
-		gf_m2ts_add_adaptation(stream->program, bs, stream->pid, needs_pcr, pcr, is_rap, padding_length, hdr_len ? stream->curr_pck.mpeg2_af_descriptors : NULL, hdr_len ? stream->curr_pck.mpeg2_af_descriptors_size : 0);
+		gf_m2ts_add_adaptation(stream->program, bs, stream->pid, needs_pcr, pcr, is_rap, padding_length, hdr_len ? stream->curr_pck.mpeg2_af_descriptors : NULL, hdr_len ? stream->curr_pck.mpeg2_af_descriptors_size : 0, stream->set_initial_disc);
+		stream->set_initial_disc = GF_FALSE;
 
 		if (stream->curr_pck.mpeg2_af_descriptors) {
 			gf_free(stream->curr_pck.mpeg2_af_descriptors);
@@ -2075,9 +2075,9 @@
 	u32 data_len;
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	gf_bs_write_u16(bs, 0xFFFF);
-	gf_bs_write_u32(bs, GF_4CC('I','D','3',' '));
+	gf_bs_write_u32(bs, GF_MEDIA_TYPE_ID3);
 	gf_bs_write_u8(bs, 0xFF);
-	gf_bs_write_u32(bs, GF_4CC('I','D','3',' '));
+	gf_bs_write_u32(bs, GF_MEDIA_TYPE_ID3);
 	gf_bs_write_u8(bs, 0); /* service id */
 	gf_bs_write_int(bs, 0, 1); /* locator */
 	gf_bs_write_int(bs, 0, 2); /* carriage flags */
@@ -2100,9 +2100,9 @@
 	u32 data_len;
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	gf_bs_write_u16(bs, 0xFFFF);
-	gf_bs_write_u32(bs, GF_4CC('I','D','3',' '));
+	gf_bs_write_u32(bs, GF_MEDIA_TYPE_ID3);
 	gf_bs_write_u8(bs, 0xFF);
-	gf_bs_write_u32(bs, GF_4CC('I','D','3',' '));
+	gf_bs_write_u32(bs, GF_MEDIA_TYPE_ID3);
 	gf_bs_write_u8(bs, 0); /* service id */
 	gf_bs_write_int(bs, 0, 3); /* decoder config flags */
 	gf_bs_write_int(bs, 0, 1); /* dsmcc flag */
@@ -2128,6 +2128,7 @@
 	stream->program = program;
 	if (is_pcr) program->pcr = stream;
 	stream->loop_descriptors = gf_list_new();
+	stream->set_initial_disc = program->initial_disc_set;
 
 	if (program->streams) {
 		/*if PCR keep stream at the beginning*/
@@ -2315,7 +2316,7 @@
 }
 
 GF_EXPORT
-GF_M2TS_Mux_Program *gf_m2ts_mux_program_add(GF_M2TS_Mux *muxer, u32 program_number, u32 pmt_pid, u32 pmt_refresh_rate, u32 pcr_offset, Bool mpeg4_signaling)
+GF_M2TS_Mux_Program *gf_m2ts_mux_program_add(GF_M2TS_Mux *muxer, u32 program_number, u32 pmt_pid, u32 pmt_refresh_rate, u32 pcr_offset, Bool mpeg4_signaling, u32 pmt_version, Bool initial_disc)
 {
 	GF_M2TS_Mux_Program *program;
 
@@ -2338,6 +2339,9 @@
 	program->pmt = gf_m2ts_stream_new(pmt_pid);
 	program->pmt->program = program;
 	program->pmt->table_needs_update = GF_TRUE;
+	program->pmt->initial_version_number = pmt_version;
+	program->initial_disc_set = initial_disc;
+	program->pmt->set_initial_disc = initial_disc;
 	muxer->pat->table_needs_update = GF_TRUE;
 	program->pmt->process = gf_m2ts_stream_process_pmt;
 	program->pmt->refresh_rate_ms = pmt_refresh_rate ? pmt_refresh_rate : (u32) -1;
@@ -2525,7 +2529,6 @@
 		mux->time.sec = mux->time.nanosec = 0;
 		mux->init_sys_time = 0;
 	}
-
 }
 
 GF_EXPORT

gpac-0.7.1.tar.gz/src/media_tools/m3u8.c -> gpac-0.8.0.tar.gz/src/media_tools/m3u8.c Changed

gpac-0.7.1.tar.gz/src/media_tools/media_export.c -> gpac-0.8.0.tar.gz/src/media_tools/media_export.c Changed

@@ -25,6 +25,7 @@
 
 
 #include <gpac/internal/media_dev.h>
+#include <gpac/internal/isomedia_dev.h>
 #include <gpac/mpegts.h>
 #include <gpac/constants.h>
 
@@ -57,7 +58,7 @@
 		va_list args;
 		char szMsg[1024];
 		va_start(args, format);
-		vsprintf(szMsg, format, args);
+		vsnprintf(szMsg, 1024, format, args);
 		va_end(args);
 		GF_LOG((u32) (e ? GF_LOG_ERROR : GF_LOG_WARNING), GF_LOG_AUTHOR, ("%s\n", szMsg) );
 	}
@@ -239,14 +240,14 @@
 static void write_jp2_file(GF_BitStream *bs, char *data, u32 data_size, char *dsi, u32 dsi_size)
 {
 	gf_bs_write_u32(bs, 12);
-	gf_bs_write_u32(bs, GF_4CC('j','P',' ',' '));
+	gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_JP);
 	gf_bs_write_u32(bs, 0x0D0A870A);
 
 	gf_bs_write_u32(bs, 20);
-	gf_bs_write_u32(bs, GF_4CC('f','t','y','p'));
-	gf_bs_write_u32(bs, GF_4CC('j','p','2',' '));
+	gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_FTYP);
+	gf_bs_write_u32(bs, GF_ISOM_BRAND_JP2);
 	gf_bs_write_u32(bs, 0);
-	gf_bs_write_u32(bs, GF_4CC('j','p','2',' '));
+	gf_bs_write_u32(bs, GF_ISOM_BRAND_JP2);
 
 	gf_bs_write_data(bs, dsi, dsi_size);
 	gf_bs_write_data(bs, data, data_size);
@@ -396,7 +397,7 @@
 	} else if (m_stype==GF_ISOM_SUBTYPE_MP3) {
 		gf_export_message(dumper, GF_OK, "Extracting MP3 sample%s", szNum);
 		strcpy(szEXT, ".mp3");
-	} else if (m_stype==GF_4CC('x','d','v','b') ) {
+	} else if (m_stype==GF_ISOM_SUBTYPE_XDVB ) {
 		gf_export_message(dumper, GF_OK, "Extracting MPEG-2 sample%s", szNum);
 		strcpy(szEXT, ".m2v");
 	} else if ((m_stype==GF_ISOM_SUBTYPE_AVC_H264)
@@ -442,7 +443,7 @@
 		strcpy(szEXT, ".xml");
 	} else if (m_type==GF_ISOM_MEDIA_HINT) {
 		return gf_export_hint(dumper);
-	} else if (m_stype==GF_4CC('m','j','p','2')) {
+	} else if (m_stype==GF_ISOM_BRAND_MJP2) {
 		strcpy(szEXT, ".jp2");
 		gf_export_message(dumper, GF_OK, "Dumping JPEG 2000 sample%s", szNum);
 		udesc = gf_isom_get_generic_sample_description(dumper->file, track, 1);
@@ -458,6 +459,12 @@
 		case GF_ISOM_MEDIA_VISUAL:
 			gf_export_message(dumper, GF_OK, "Extracting \'%s\' Video - Compressor %s", szEXT, udesc ? udesc->compressor_name: "Unknown");
 			break;
+ case GF_ISOM_MEDIA_AUXV:
+ gf_export_message(dumper, GF_OK, "Extracting \'%s\' Auxiliary Video - Compressor %s", szEXT, udesc ? udesc->compressor_name: "Unknown");
+ break;
+ case GF_ISOM_MEDIA_PICT:
+ gf_export_message(dumper, GF_OK, "Extracting \'%s\' Picture sequence - Compressor %s", szEXT, udesc ? udesc->compressor_name: "Unknown");
+ break;
 		case GF_ISOM_MEDIA_AUDIO:
 			gf_export_message(dumper, GF_OK, "Extracting \'%s\' Audio - Compressor %s", szEXT, udesc ? udesc->compressor_name : "Unknown");
 			break;
@@ -477,15 +484,13 @@
 
 
 
-	gf_isom_set_nalu_extract_mode(dumper->file, track, GF_ISOM_NALU_EXTRACT_TILE_ONLY | GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG);
+	gf_isom_set_nalu_extract_mode(dumper->file, track, GF_ISOM_NALU_EXTRACT_TILE_ONLY);
 
 	if (dumper->sample_num == (u32) -1) {
 		GF_ISOSample *samp = gf_isom_get_sample(dumper->file, track, dumper->sample_num, &di);
 		if (!samp) return GF_BAD_PARAM;
 		if (ext_start) {
-			ext_start[0]=0;
-			sprintf(szName, "%s_%d%s", dumper->out_name, dumper->sample_num, ext_start+1);
-			ext_start[0]='.';
+			sprintf(szName, "%s", dumper->out_name);
 		} else {
 			sprintf(szName, "%s_%d%s", dumper->out_name, dumper->sample_num, szEXT);
 		}
@@ -506,9 +511,7 @@
 		GF_ISOSample *samp = gf_isom_get_sample(dumper->file, track, dumper->sample_num, &di);
 		if (!samp) return GF_BAD_PARAM;
 		if (ext_start) {
-			ext_start[0]=0;
-			sprintf(szName, "%s_%d%s", dumper->out_name, dumper->sample_num, ext_start+1);
-			ext_start[0]='.';
+			sprintf(szName, "%s", dumper->out_name);
 		} else {
 			sprintf(szName, "%s_%d%s", dumper->out_name, dumper->sample_num, szEXT);
 		}
@@ -758,7 +761,7 @@
 	Bool add_ext;
 	GF_DecoderConfig *dcfg;
 	GF_GenericSampleDescription *udesc;
-	char szName[1000], szEXT[5], GUID[16];
+	char szName[1000], GUID[16];
 	FILE *out;
 	unsigned int *qcp_rates, rt_cnt;	/*contains constants*/
 	GF_AVCConfig *avccfg, *svccfg, *mvccfg;
@@ -773,7 +776,6 @@
 	QCPRateTable rtable[8];
 	Bool is_stdout = GF_FALSE;
 	Bool is_webvtt = GF_FALSE;
-
 	dsi_size = 0;
 	dsi = NULL;
 	hevccfg = NULL;
@@ -913,7 +915,7 @@
 				break;
 			case GPAC_OTI_AUDIO_AAC_MPEG4:
 				if (!dcfg->decoderSpecificInfo) {
-					gf_export_message(dumper, GF_OK, "Could not extracting MPEG-4 AAC: descriptor not found");
+					gf_export_message(dumper, GF_OK, "Could not extract MPEG-4 AAC: descriptor specific info not found");
 					gf_odf_desc_del((GF_Descriptor *) dcfg);
 					return GF_NON_COMPLIANT_BITSTREAM;
 				}
@@ -1018,7 +1020,7 @@
 			gf_export_message(dumper, GF_OK, "Extracting H263 Video");
 			if (add_ext)
 				strcat(szName, ".263");
-		} else if (m_stype==GF_4CC('x','d','v','b')) {
+		} else if (m_stype==GF_ISOM_SUBTYPE_XDVB) {
 			gf_export_message(dumper, GF_OK, "Extracting MPEG-2 Video (xdvb)");
 			if (add_ext)
 				strcat(szName, ".m2v");
@@ -1054,6 +1056,10 @@
 			gf_export_message(dumper, GF_OK, "Extracting Macromedia Flash Movie");
 			if (add_ext)
 				strcat(szName, ".swf");
+		} else if (m_stype==GF_ISOM_SUBTYPE_AV01) {
+			gf_export_message(dumper, GF_OK, "Extracting AOM AV1 Video");
+			if (add_ext)
+				strcat(szName, ".av1");
 		} else if (m_stype==GF_ISOM_SUBTYPE_MP3) {
 			gf_export_message(dumper, GF_OK, "Extracting MPEG-1/2 Audio");
 			if (add_ext)
@@ -1112,13 +1118,19 @@
 			}
 			switch (m_type) {
 			case GF_ISOM_MEDIA_VISUAL:
-				gf_export_message(dumper, GF_OK, "Extracting \'%s\' Video - Compressor %s", szEXT, udesc ? udesc->compressor_name : "Unknown");
+				gf_export_message(dumper, GF_OK, "Extracting Video - Compressor %s", udesc ? udesc->compressor_name : "Unknown");
 				break;
+ case GF_ISOM_MEDIA_AUXV:
+ gf_export_message(dumper, GF_OK, "Extracting Video - Compressor %s", udesc ? udesc->compressor_name : "Unknown");
+ break;
+ case GF_ISOM_MEDIA_PICT:
+ gf_export_message(dumper, GF_OK, "Extracting picture sequence - Compressor %s", udesc ? udesc->compressor_name : "Unknown");
+ break;
 			case GF_ISOM_MEDIA_AUDIO:
-				gf_export_message(dumper, GF_OK, "Extracting \'%s\' Audio - Compressor %s", szEXT, udesc ? udesc->compressor_name : "Unknown");
+				gf_export_message(dumper, GF_OK, "Extracting Audio - Compressor %s", udesc ? udesc->compressor_name : "Unknown");
 				break;
 			default:
-				gf_export_message(dumper, GF_OK, "Extracting \'%s\' Track (type '%s') - Compressor %s", szEXT, gf_4cc_to_str(m_type), udesc ? udesc->compressor_name : "Unknown");
+				gf_export_message(dumper, GF_OK, "Extracting Track (type '%s') - Compressor %s", gf_4cc_to_str(m_type), udesc ? udesc->compressor_name : "Unknown");
 				break;
 			}
 			if (udesc) gf_free(udesc);
@@ -1273,7 +1285,6 @@
 
 		/* Start writing the stream out */
 		bs = gf_bs_from_file(out, GF_BITSTREAM_WRITE);
-		gf_bs_write_data(bs, dsi, dsi_size);
 	} else {
 		/* Start writing the stream out */
 		gf_bs_del(bs);
@@ -1398,6 +1409,11 @@
 		qcp_type = needs_rate_octet ? 1 : 0;
 	}
 
+	if (qcp_type || (m_stype == GF_ISOM_SUBTYPE_AV01) || aac_mode || avccfg || svccfg || mvccfg || hevccfg || lhvccfg) {
+	} else {
+		gf_isom_enable_raw_pack(dumper->file, track, 2048);
+	}
+
 	/* Start exporting samples */
 	for (i=0; i<count; i++) {
 		GF_ISOSample *samp = gf_isom_get_sample(dumper->file, track, i+1, &di);
@@ -1408,6 +1424,9 @@
 		/*AVC sample to NALU*/
 		if (avccfg || svccfg || mvccfg || hevccfg || lhvccfg) {
 			u32 j, nal_size, remain, nal_unit_size;
+			Bool is_rap;
+			Bool has_aud = GF_FALSE;
+			Bool write_dsi = GF_FALSE;
 			char *ptr = samp->data;
 			nal_unit_size = 0;
 			if (avccfg) nal_unit_size= avccfg->nal_unit_size;
@@ -1416,12 +1435,25 @@
 			else if (hevccfg) nal_unit_size = hevccfg->nal_unit_size;
 			else if (lhvccfg) nal_unit_size = lhvccfg->nal_unit_size;
 
-			if (i && dsi && samp->IsRAP) {
-				gf_bs_write_data(bs, dsi, dsi_size);
+			is_rap = samp->IsRAP;
+			//patch for opengop
+			if (!is_rap) {
+				gf_isom_get_sample_rap_roll_info(dumper->file, track, i+1, &is_rap, NULL, NULL);
+
+				if (!is_rap) {
+					u32 is_leading, dependsOn, dependedOn, redundant;
+					gf_isom_get_sample_flags(dumper->file, track, i+1, &is_leading, &dependsOn, &dependedOn, &redundant);
+					if (dependsOn==2) is_rap = GF_TRUE;
+				}
+			}
+
+			if (dsi && (is_rap || !i) ) {
+				write_dsi = GF_TRUE;
 			}
 
 			remain = samp->dataLength;
 			while (remain) {
+				Bool is_aud = GF_FALSE;
 				nal_size = 0;
 				if (remain<nal_unit_size) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Sample %d (size %d): Corrupted NAL Unit: header size %d - bytes left %d\n", i+1, samp->dataLength, nal_unit_size, remain) );
@@ -1433,11 +1465,58 @@
 					remain--;
 					ptr++;
 				}
-				gf_bs_write_u32(bs, 1);
+
 				if (remain < nal_size) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Sample %d (size %d): Corrupted NAL Unit: size %d - bytes left %d\n", i+1, samp->dataLength, nal_size, remain) );
 					nal_size = remain;
 				}
+
+				if (avccfg || svccfg || mvccfg) {
+					u8 nal_type = ptr[0] & 0x1F;
+					if (nal_type==GF_AVC_NALU_ACCESS_UNIT) is_aud = GF_TRUE;
+				} else {
+					u8 nal_type = (ptr[0] & 0x7E) >> 1;
+					if (nal_type==GF_HEVC_NALU_ACCESS_UNIT) is_aud = GF_TRUE;
+				}
+
+				if (is_aud) {
+					if (!has_aud) {
+						gf_bs_write_u32(bs, 1);
+						gf_bs_write_data(bs, ptr, nal_size);
+						has_aud = GF_TRUE;
+					}
+					ptr += nal_size;
+					remain -= nal_size;
+					continue;
+				}
+
+				if (!has_aud) {
+					has_aud = GF_TRUE;
+					gf_bs_write_u32(bs, 1);
+					if (avccfg || svccfg || mvccfg) {
+						u32 hdr = ptr[0] & 0x60;
+						hdr |= GF_AVC_NALU_ACCESS_UNIT;
+						gf_bs_write_u8(bs, hdr);
+						gf_bs_write_u8(bs, 0xF0);
+					} else {
+						//just copy the current nal header, patching the nal type to AU delim
+						u32 hdr = ptr[0] & 0x81;
+						hdr |= GF_HEVC_NALU_ACCESS_UNIT << 1;
+						gf_bs_write_u8(bs, hdr);
+						gf_bs_write_u8(bs, ptr[1]);
+
+						/*pic-type - by default we signal all slice types possible*/
+						gf_bs_write_int(bs, 2, 3);
+						gf_bs_write_int(bs, 0, 5);
+					}
+				}
+
+				if (write_dsi) {
+					write_dsi = GF_FALSE;
+					gf_bs_write_data(bs, dsi, dsi_size);
+				}
+
+				gf_bs_write_u32(bs, 1);
 				gf_bs_write_data(bs, ptr, nal_size);
 				ptr += nal_size;
 				remain -= nal_size;
@@ -1468,9 +1547,17 @@
 				}
 			}
 		}
+		/*AV1: add Temporal Unit Delimiters*/
+		else if (m_stype == GF_ISOM_SUBTYPE_AV01) {
+			gf_bs_write_u8(bs, 0x12);
+			gf_bs_write_u8(bs, 0x00);
+		}
 		if (!avccfg && !svccfg && !mvccfg && !hevccfg && !lhvccfg &!is_webvtt) {
 			gf_bs_write_data(bs, samp->data, samp->dataLength);
 		}
+		if (samp->nb_pack)
+			i += samp->nb_pack-1;
+
 		gf_isom_sample_del(&samp);
 		gf_set_progress("Media Export", i+1, count);
 		if (dumper->flags & GF_EXPORT_DO_ABORT) break;
@@ -2145,6 +2232,17 @@
 
 #include <gpac/base_coding.h>
 
+
+static void nhml_write_spec_info(FILE *nhml, const char *url)
+{
+	const char *fname = strrchr(url, '/');
+	if (!fname) fname = strrchr(url, '\\');
+	if (fname) fname++;
+	else fname = url;
+
+	fprintf(nhml, "specificInfoFile=\"%s\" ", fname);
+}
+
 GF_EXPORT
 GF_Err gf_media_export_nhml(GF_MediaExporter *dumper, Bool dims_doc)
 {
@@ -2207,23 +2305,26 @@
 	gf_export_message(dumper, GF_OK, "Exporting NHML for track %s", gf_4cc_to_str(mstype) );
 
 	/*write header*/
-	fprintf(nhml, "<%s version=\"1.0\" timeScale=\"%d\" ", szRootName, gf_isom_get_media_timescale(dumper->file, track) );
+	fprintf(nhml, "<%s version=\"1.0\" trackID=\"%d\" timeScale=\"%d\" ", szRootName, dumper->trackID, gf_isom_get_media_timescale(dumper->file, track) );
 	if (esd) {
+ u32 mtype;
+
 		fprintf(nhml, "streamType=\"%d\" objectTypeIndication=\"%d\" ", esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication);
 		if (!dumper->nhml_only && esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
 			sprintf(szName, "%s.info", dumper->out_name);
 			inf = gf_fopen(szName, "wb");
 			if (inf) gf_fwrite(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, 1, inf);
 			gf_fclose(inf);
-			fprintf(nhml, "specificInfoFile=\"%s\" ", szName);
+			nhml_write_spec_info(nhml, szName);
 		}
 		gf_odf_desc_del((GF_Descriptor *) esd);
 
-		if (gf_isom_get_media_type(dumper->file, track)==GF_ISOM_MEDIA_VISUAL) {
+ mtype = gf_isom_get_media_type(dumper->file, track);
+		if (gf_isom_is_video_subtype(mtype)) {
 			gf_isom_get_visual_info(dumper->file, track, 1, &w, &h);
 			fprintf(nhml, "width=\"%d\" height=\"%d\" ", w, h);
 		}
-		else if (gf_isom_get_media_type(dumper->file, track)==GF_ISOM_MEDIA_AUDIO) {
+		else if (mtype==GF_ISOM_MEDIA_AUDIO) {
 			u32 sr, nb_ch;
 			u8 bps;
 			gf_isom_get_audio_info(dumper->file, track, 1, &sr, &nb_ch, &bps);
@@ -2235,7 +2336,7 @@
 		fprintf(nhml, "mediaType=\"%s\" ", gf_4cc_to_str(mtype));
 		fprintf(nhml, "mediaSubType=\"%s\" ", gf_4cc_to_str(mstype ));
 		if (sdesc) {
-			if (mtype==GF_ISOM_MEDIA_VISUAL) {
+			if (gf_isom_is_video_subtype(mtype) ) {
 				fprintf(nhml, "codecVendor=\"%s\" codecVersion=\"%d\" codecRevision=\"%d\" ", gf_4cc_to_str(sdesc->vendor_code), sdesc->version, sdesc->revision);
 				fprintf(nhml, "width=\"%d\" height=\"%d\" compressorName=\"%s\" temporalQuality=\"%d\" spatialQuality=\"%d\" horizontalResolution=\"%d\" verticalResolution=\"%d\" bitDepth=\"%d\" ",
 				 sdesc->width, sdesc->height, sdesc->compressor_name, sdesc->temporal_quality, sdesc->spatial_quality, sdesc->h_res, sdesc->v_res, sdesc->depth);
@@ -2248,7 +2349,7 @@
 				inf = gf_fopen(szName, "wb");
 				if (inf) gf_fwrite(sdesc->extension_buf, sdesc->extension_buf_size, 1, inf);
 				gf_fclose(inf);
-				fprintf(nhml, "specificInfoFile=\"%s\" ", szName);
+				nhml_write_spec_info(nhml, szName);
 				gf_free(sdesc->extension_buf);
 			}
 			gf_free(sdesc);
@@ -2256,6 +2357,8 @@
 			const char *mime, *encoding, *config, *namespace, *location;
 			switch (mstype) {
 			case GF_ISOM_SUBTYPE_METT:
+			case GF_ISOM_SUBTYPE_SBTT:
+			case GF_ISOM_BOX_TYPE_STXT:
 				if (gf_isom_stxt_get_description(dumper->file, track, 1, &mime, &encoding, &config) == GF_OK) {
 					if (mime)
 						fprintf(nhml, "mime_type=\"%s\" ", mime);
@@ -2264,7 +2367,7 @@
 						inf = gf_fopen(szName, "wb");
 						if (inf) gf_fwrite(config, strlen(config), 1, inf);
 						gf_fclose(inf);
-						fprintf(nhml, "specificInfoFile=\"%s\" ", szName);
+						nhml_write_spec_info(nhml, szName);
 					}
 					if (encoding)
 						fprintf(nhml, "encoding=\"%s\" ", encoding);
@@ -2286,7 +2389,6 @@
 	}
 
 	if (gf_isom_is_track_in_root_od(dumper->file, track)) fprintf(nhml, "inRootOD=\"yes\" ");
-	fprintf(nhml, "trackID=\"%d\" ", dumper->trackID);
 
 	uncompress = 0;
 
@@ -2396,10 +2498,11 @@
 			gf_bs_del(bs);
 
 		} else {
-			fprintf(nhml, "<NHNTSample DTS=\""LLU"\" dataLength=\"%d\" ", LLU_CAST samp->DTS, samp->dataLength);
+			fprintf(nhml, "<NHNTSample number=\"%d\" DTS=\""LLU"\" dataLength=\"%d\" ", i+1, LLU_CAST samp->DTS, samp->dataLength);
 			if (full_dump || samp->CTS_Offset) fprintf(nhml, "CTSOffset=\"%u\" ", samp->CTS_Offset);
 			if (samp->IsRAP==RAP) fprintf(nhml, "isRAP=\"yes\" ");
 			else if (samp->IsRAP==RAP_REDUNDANT) fprintf(nhml, "isSyncShadow=\"yes\" ");
+			else if (samp->IsRAP) fprintf(nhml, "SAPType=\"%d\" ", samp->IsRAP);
 			else if (full_dump) fprintf(nhml, "isRAP=\"no\" ");
 			if (full_dump) fprintf(nhml, "mediaOffset=\"%d\" ", pos);
 
@@ -2537,7 +2640,7 @@
 		fprintf(vtt, "MPEG-4-streamType: %d\n", esd->decoderConfig->streamType);
 		/* TODO: export the MPEG-4 Object Type Indication only if it is not a GPAC internal value */
 		fprintf(vtt, "MPEG-4-objectTypeIndication: %d\n", esd->decoderConfig->objectTypeIndication);
-		if (mtype==GF_ISOM_MEDIA_VISUAL) {
+		if (gf_isom_is_video_subtype(mtype) ) {
 			gf_isom_get_visual_info(dumper->file, track, 1, &w, &h);
 			fprintf(vtt, "width:%d\n", w);
 			fprintf(vtt, "height:%d\n", h);
@@ -2597,7 +2700,7 @@
 		fprintf(vtt, "mediaType: %s\n", gf_4cc_to_str(mtype));
 		fprintf(vtt, "mediaSubType: %s\n", gf_4cc_to_str(mstype ));
 		if (sdesc) {
-			if (mtype==GF_ISOM_MEDIA_VISUAL) {
+			if (gf_isom_is_video_subtype(mtype) ) {
 				fprintf(vtt, "codecVendor: %s\n", gf_4cc_to_str(sdesc->vendor_code));
 				fprintf(vtt, "codecVersion: %d\n", sdesc->version);
 				fprintf(vtt, "codecRevision: %d\n", sdesc->revision);

gpac-0.7.1.tar.gz/src/media_tools/media_import.c -> gpac-0.8.0.tar.gz/src/media_tools/media_import.c Changed

@@ -23,8 +23,6 @@
 *
 */
 
-
-
 #include <gpac/internal/media_dev.h>
 #ifndef GPAC_DISABLE_AVILIB
 #include <gpac/internal/avilib.h>
@@ -52,7 +50,7 @@
 		va_list args;
 		char szMsg[1024];
 		va_start(args, format);
-		vsprintf(szMsg, format, args);
+		vsnprintf(szMsg, 1024, format, args);
 		va_end(args);
 		GF_LOG((u32) (e ? GF_LOG_WARNING : GF_LOG_INFO), GF_LOG_AUTHOR, ("%s\n", szMsg) );
 	}
@@ -106,47 +104,69 @@
 }
 
 
-static void gf_media_update_bitrate(GF_ISOFile *file, u32 track)
+GF_EXPORT
+void gf_media_update_bitrate(GF_ISOFile *file, u32 track)
 {
 #ifndef GPAC_DISABLE_ISOM_WRITE
-	u32 i, count, timescale, db_size;
+	u32 i, count, timescale, db_size, ofmt, cdur, csize;
 	u64 time_wnd, rate, max_rate, avg_rate, bitrate;
 	Double br;
-	GF_ESD *esd;
+	GF_ESD *esd = NULL;
+
+	switch (gf_isom_get_media_subtype(file, track, 1)) {
+	case GF_ISOM_SUBTYPE_MPEG4:
+		esd = gf_isom_get_esd(file, track, 1);
+		break;
+	case GF_ISOM_SUBTYPE_MPEG4_CRYP:
+		gf_isom_get_original_format_type(file, track, 1, &ofmt);
+		switch (ofmt) {
+		case GF_ISOM_BOX_TYPE_MP4S:
+		case GF_ISOM_BOX_TYPE_MP4A:
+		case GF_ISOM_BOX_TYPE_MP4V:
+			esd = gf_isom_get_esd(file, track, 1);
+			break;
+		}
+	}
 
 	db_size = 0;
+	rate = max_rate = avg_rate = time_wnd = 0;
 
-	esd = gf_isom_get_esd(file, track, 1);
-	if (esd) {
-		db_size = esd->decoderConfig->bufferSizeDB;
-		esd->decoderConfig->avgBitrate = 0;
-		esd->decoderConfig->maxBitrate = 0;
+	csize = 0;
+	cdur = 0;
+	if (gf_isom_get_media_type(file, track)==GF_ISOM_MEDIA_AUDIO) {
+		csize = gf_isom_get_constant_sample_size(file, track);
+		cdur = gf_isom_get_constant_sample_duration(file, track);
+		if (cdur > 1) cdur = 0;
 	}
-	rate = max_rate = avg_rate = time_wnd = 0;
 
 	timescale = gf_isom_get_media_timescale(file, track);
 	count = gf_isom_get_sample_count(file, track);
-	for (i=0; i<count; i++) {
-		GF_ISOSample *samp = gf_isom_get_sample_info(file, track, i+1, NULL, NULL);
+	if (csize && cdur) {
+		db_size = 0;
+		avg_rate = 8 * csize * timescale / cdur;
+		bitrate = rate = avg_rate;
+	} else {
+		for (i=0; i<count; i++) {
+			GF_ISOSample *samp = gf_isom_get_sample_info(file, track, i+1, NULL, NULL);
 
-		if (samp->dataLength > db_size) db_size = samp->dataLength;
+			if (samp->dataLength > db_size) db_size = samp->dataLength;
 
-		avg_rate += samp->dataLength;
-		rate += samp->dataLength;
-		if (samp->DTS > time_wnd + timescale) {
-			if (rate > max_rate) max_rate = rate;
-			time_wnd = samp->DTS;
-			rate = 0;
+			avg_rate += samp->dataLength;
+			rate += samp->dataLength;
+			if (samp->DTS > time_wnd + timescale) {
+				if (rate > max_rate) max_rate = rate;
+				time_wnd = samp->DTS;
+				rate = 0;
+			}
+			gf_isom_sample_del(&samp);
 		}
-
-		gf_isom_sample_del(&samp);
+		br = (Double) (s64) gf_isom_get_media_duration(file, track);
+		br /= timescale;
+		bitrate = (u32) ((Double) (s64)avg_rate / br);
+		bitrate *= 8;
+		max_rate *= 8;
 	}
-
-	br = (Double) (s64) gf_isom_get_media_duration(file, track);
-	br /= timescale;
-	bitrate = (u32) ((Double) (s64)avg_rate / br);
-	bitrate *= 8;
-	max_rate *= 8;
+	if (!max_rate) max_rate = bitrate;
 
 	/*move to bps*/
 	if (esd) {
@@ -209,8 +229,10 @@
 	data = (char*)gf_malloc(sizeof(char)*size);
 	size = (u32) fread(data, sizeof(char), size, src);
 	gf_fclose(src);
-	if ((s32) size < 0) return GF_IO_ERR;
-
+	if ((s32) size <= 0) {
+		gf_free(data);
+		return gf_import_message(import, GF_URL_ERROR, "Reading file %s failed", import->in_name);
+	}
 	/*get image size*/
 	bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
 	dsi = NULL;
@@ -293,13 +315,23 @@
 		memset(&udesc, 0, sizeof(GF_GenericSampleDescription));
 		switch (OTI) {
 		case GPAC_OTI_IMAGE_JPEG:
-			udesc.codec_tag = GF_4CC('j', 'p', 'e', 'g');
+			udesc.codec_tag = GF_ISOM_BOX_TYPE_JPEG;
+			memcpy(udesc.compressor_name, " JPEG", 5);
+			udesc.compressor_name[0] = 4;
 			break;
 		case GPAC_OTI_IMAGE_PNG:
-			udesc.codec_tag = GF_4CC('p', 'n', 'g', ' ');
+			udesc.codec_tag = GF_ISOM_BOX_TYPE_PNG;
+			memcpy(udesc.compressor_name, " PNG", 4);
+			udesc.compressor_name[0] = 3;
 			break;
 		case GPAC_OTI_IMAGE_JPEG_2000:
-			udesc.codec_tag = GF_4CC('j', 'p', '2', 'k');
+			udesc.codec_tag = GF_ISOM_BOX_TYPE_JP2K;
+			memcpy(udesc.compressor_name, " JPEG2000", 9);
+			udesc.compressor_name[0] = 8;
+			break;
+		default:
+			memcpy(udesc.compressor_name, " UNKNOWN", 8);
+			udesc.compressor_name[0] = 7;
 			break;
 		}
 		udesc.width = w;
@@ -307,7 +339,6 @@
 		udesc.v_res = 72;
 		udesc.h_res = 72;
 		udesc.depth = 24;
-		memcpy(udesc.compressor_name, "\4JPEG", 5);
 
 		gf_isom_new_generic_sample_description(import->dest, track, NULL, NULL, &udesc, &di);
 		import->final_trackID = gf_isom_get_track_id(import->dest, track);
@@ -563,14 +594,14 @@
 	} else {
 		GF_GenericSampleDescription udesc;
 		memset(&udesc, 0, sizeof(GF_GenericSampleDescription));
-		udesc.codec_tag = GF_4CC('.', 'm', 'p', '3');
+		udesc.codec_tag = GF_ISOM_BOX_TYPE_MP3;
 		memcpy(udesc.compressor_name, "\3MP3", 4);
 		udesc.samplerate = sr;
 		udesc.nb_channels = nb_chan;
 		gf_isom_new_generic_sample_description(import->dest, track, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &udesc, &di);
 	}
 
-	gf_isom_set_audio_info(import->dest, track, di, sr, nb_chan, 16);
+	gf_isom_set_audio_info(import->dest, track, di, sr, nb_chan, 16, import->asemode);
 
 	gf_fseek(in, 0, SEEK_END);
 	tot_size = gf_ftell(in);
@@ -645,6 +676,18 @@
 	u32 profile, sr_idx, nb_ch, frame_size;
 } ADTSHeader;
 
+static SAPType xHEAAC_isRAP(u32 profile, char *data, u32 dataLength)
+{
+	if (profile == 42) { /*xHE-AAC*/
+		if (dataLength > 0 && (data[0] & 0x80))
+			return RAP;
+		else
+			return RAP_NO;
+	}
+
+	return RAP;
+}
+
 static Bool ADTS_SyncFrame(GF_BitStream *bs, ADTSHeader *hdr, u32 *frame_skipped)
 {
 	u32 val, hdr_size;
@@ -659,18 +702,21 @@
 			continue;
 		}
 		hdr->is_mp2 = (Bool)gf_bs_read_int(bs, 1);
-		gf_bs_read_int(bs, 2);
+		/*layer*/ gf_bs_read_int(bs, 2);
 		hdr->no_crc = (Bool)gf_bs_read_int(bs, 1);
 		pos = gf_bs_get_position(bs) - 2;
 
 		hdr->profile = 1 + gf_bs_read_int(bs, 2);
 		hdr->sr_idx = gf_bs_read_int(bs, 4);
-		gf_bs_read_int(bs, 1);
+		/*private_bit*/ gf_bs_read_int(bs, 1);
 		hdr->nb_ch = gf_bs_read_int(bs, 3);
-		gf_bs_read_int(bs, 4);
+		/*original_copy*/ gf_bs_read_int(bs, 1);
+		/*home*/ gf_bs_read_int(bs, 1);
+		/*copyright_identification_bit*/gf_bs_read_int(bs, 1);
+		/*copyright_identification_start*/gf_bs_read_int(bs, 1);
 		hdr->frame_size = gf_bs_read_int(bs, 13);
-		gf_bs_read_int(bs, 11);
-		gf_bs_read_int(bs, 2);
+		/*adts_buffer_fullness*/gf_bs_read_int(bs, 11);
+		/*number_of_raw_data_blocks_in_frame*/gf_bs_read_int(bs, 2);
 		hdr_size = hdr->no_crc ? 7 : 9;
 		if (!hdr->no_crc) gf_bs_read_int(bs, 16);
 		if (hdr->frame_size < hdr_size) {
@@ -801,6 +847,7 @@
 	u32 timescale;
 	GF_BitStream *bs, *dsi;
 	GF_M4ADecSpecInfo acfg;
+	u32 base_object_type = 0;
 	FILE *in;
 	u32 nbbytes=0;
 	u8 aac_buf[4096];
@@ -833,6 +880,7 @@
 
 	dsi = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	gf_m4a_write_config_bs(dsi, &acfg);
+	base_object_type = acfg.base_object_type;
 
 	if (import->flags & GF_IMPORT_PS_EXPLICIT) {
 		import->flags &= ~GF_IMPORT_PS_IMPLICIT;
@@ -870,13 +918,13 @@
 	if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
 	import->final_trackID = import->esd->ESID;
 	gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
-	gf_isom_set_audio_info(import->dest, track, di, timescale, (acfg.nb_chan>2) ? 2 : acfg.nb_chan, 16);
+	gf_isom_set_audio_info(import->dest, track, di, timescale, acfg.nb_chan, 16, import->asemode);
 
 	/*add first sample*/
 	samp = gf_isom_sample_new();
-	samp->IsRAP = RAP;
 	samp->dataLength = nbbytes;
 	samp->data = (char *) aac_buf;
+	samp->IsRAP = xHEAAC_isRAP(acfg.base_object_type, samp->data, samp->dataLength);
 
 	e = gf_isom_add_sample(import->dest, track, di, samp);
 	if (e) goto exit;
@@ -894,6 +942,7 @@
 
 		samp->data = (char*)aac_buf;
 		samp->dataLength = nbbytes;
+		samp->IsRAP = xHEAAC_isRAP(base_object_type, samp->data, samp->dataLength);
 
 		e = gf_isom_add_sample(import->dest, track, di, samp);
 		if (e) break;
@@ -938,6 +987,7 @@
 	u64 offset, tot_size, done, duration;
 	u32 max_size, track, di, i;
 	GF_ISOSample *samp;
+	u32 cur_samp = 0;
 
 	in = gf_fopen(import->in_name, "rb");
 	if (!in) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
@@ -1113,15 +1163,15 @@
 	if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
 	import->final_trackID = import->esd->ESID;
 	gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
-	gf_isom_set_audio_info(import->dest, track, di, timescale, (hdr.nb_ch>2) ? 2 : hdr.nb_ch, 16);
+	gf_isom_set_audio_info(import->dest, track, di, timescale, hdr.nb_ch, 16, import->asemode);
 
 	/*add first sample*/
 	samp = gf_isom_sample_new();
-	samp->IsRAP = RAP;
 	max_size = samp->dataLength = hdr.frame_size;
 	samp->data = (char*)gf_malloc(sizeof(char)*hdr.frame_size);
 	offset = gf_bs_get_position(bs);
 	gf_bs_read_data(bs, samp->data, hdr.frame_size);
+	samp->IsRAP = RAP;
 
 	if (import->flags & GF_IMPORT_USE_DATAREF) {
 		e = gf_isom_add_sample_reference(import->dest, track, di, samp, offset);
@@ -1131,6 +1181,11 @@
 	if (e) goto exit;
 	samp->DTS+=dts_inc;
 
+	cur_samp++;
+	if (import->audio_roll_change) {
+		e = gf_isom_set_sample_roll_group(import->dest, track, cur_samp, import->audio_roll);
+	}
+
 	duration = import->duration;
 	duration *= sr;
 	duration /= 1000;
@@ -1155,6 +1210,12 @@
 		}
 		if (e) break;
 
+		cur_samp++;
+		if (import->audio_roll_change) {
+			e = gf_isom_set_sample_roll_group(import->dest, track, cur_samp, import->audio_roll);
+		}
+		cur_samp++;
+
 		gf_set_progress("Importing AAC", done, tot_size);
 		samp->DTS += dts_inc;
 		done += samp->dataLength;
@@ -1254,7 +1315,7 @@
 	if (import->flags & GF_IMPORT_PROBE_ONLY) {
 		import->tk_info[0].track_num = 1;
 		import->tk_info[0].type = GF_ISOM_MEDIA_VISUAL;
-		import->tk_info[0].media_type = mpeg12 ? ((dsi.VideoPL==GPAC_OTI_VIDEO_MPEG1) ? GF_4CC('M','P','G','1') : GF_4CC('M','P','G','2') ) : GF_4CC('M','P','4','V') ;
+		import->tk_info[0].media_type = mpeg12 ? ((dsi.VideoPL==GPAC_OTI_VIDEO_MPEG1) ? GF_MEDIA_TYPE_MPG1 : GF_MEDIA_TYPE_MPG2 ) : GF_MEDIA_TYPE_MP4V ;
 		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF | GF_IMPORT_OVERRIDE_FPS;
 		if (!mpeg12) import->tk_info[0].flags |= GF_IMPORT_NO_FRAME_DROP | GF_IMPORT_FORCE_PACKED;
 		import->tk_info[0].video_info.width = dsi.width;
@@ -1477,7 +1538,7 @@
 	if (nbNotCoded) gf_import_message(import, GF_OK, "Removed %d N-VOPs%s", nbNotCoded,is_packed ? " (Packed Bitstream)" : "");
 	gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_VISUAL, (u8) PL);
 
-	if (dsi.par_den && dsi.par_num) gf_media_change_par(import->dest, track, dsi.par_num, dsi.par_den);
+	if (dsi.par_den && dsi.par_num) gf_media_change_par(import->dest, track, dsi.par_num, dsi.par_den, GF_FALSE);
 
 exit:
 	if (samp) gf_isom_sample_del(&samp);
@@ -2021,24 +2082,26 @@
 {
 	GF_Err e;
 	u64 offset, sampDTS, duration, dts_offset;
-	u32 track, di, trackID, track_in, i, num_samples, mtype, w, h, sr, sbr_sr, ch, mstype, cur_extract_mode;
+	Bool is_nalu_video = GF_FALSE;
+	u32 track, di, trackID, track_in, i, num_samples, mtype, w, h, sr, sbr_sr, ch, mstype, cur_extract_mode, cdur;
 	s32 trans_x, trans_y;
 	s16 layer;
 	u8 bps;
 	char *lang;
 	const char *orig_name = gf_url_get_resource_name(gf_isom_get_filename(import->orig));
-	Bool sbr, ps;
+	Bool sbr, ps, has_seig;
 	GF_ISOSample *samp;
 	GF_ESD *origin_esd;
 	GF_InitialObjectDescriptor *iod;
 	Bool is_cenc;
+	u32 clone_flags=0;
 	sampDTS = 0;
 	if (import->flags & GF_IMPORT_PROBE_ONLY) {
 		for (i=0; i<gf_isom_get_track_count(import->orig); i++) {
 			import->tk_info[i].track_num = gf_isom_get_track_id(import->orig, i+1);
 			import->tk_info[i].type = gf_isom_get_media_type(import->orig, i+1);
 			import->tk_info[i].flags = GF_IMPORT_USE_DATAREF;
-			if (import->tk_info[i].type == GF_ISOM_MEDIA_VISUAL) {
+			if (gf_isom_is_video_subtype(import->tk_info[i].type) ) {
 				gf_isom_get_visual_info(import->orig, i+1, 1, &import->tk_info[i].video_info.width, &import->tk_info[i].video_info.height);
 			} else if (import->tk_info[i].type == GF_ISOM_MEDIA_AUDIO) {
 				gf_isom_get_audio_info(import->orig, i+1, 1, &import->tk_info[i].audio_info.sample_rate, &import->tk_info[i].audio_info.nb_channels, NULL);
@@ -2081,18 +2144,24 @@
 		iod = NULL;
 	}
 	mtype = gf_isom_get_media_type(import->orig, track_in);
-	if (mtype==GF_ISOM_MEDIA_VISUAL) {
+	if (gf_isom_is_video_subtype(mtype)) {
 		u8 PL = iod ? iod->visual_profileAndLevel : 0xFE;
 		w = h = 0;
 		gf_isom_get_visual_info(import->orig, track_in, 1, &w, &h);
 #ifndef GPAC_DISABLE_AV_PARSERS
 		/*for MPEG-4 visual, always check size (don't trust input file)*/
-		if (origin_esd && (origin_esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2)) {
-			GF_M4VDecSpecInfo dsi;
-			gf_m4v_get_config(origin_esd->decoderConfig->decoderSpecificInfo->data, origin_esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-			w = dsi.width;
-			h = dsi.height;
-			PL = dsi.VideoPL;
+		if (origin_esd && (origin_esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) ) {
+			if (!origin_esd->decoderConfig->decoderSpecificInfo) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ISOM import] File %s has invalid track #%d: decoderSpecificInfo is missing.\n", orig_name, trackID));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ISOM import] extracting track (with -raw %d) and reimporting might fix it.\n", trackID));
+			}
+			else {
+				GF_M4VDecSpecInfo dsi;
+				gf_m4v_get_config(origin_esd->decoderConfig->decoderSpecificInfo->data, origin_esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
+				w = dsi.width;
+				h = dsi.height;
+				PL = dsi.VideoPL;
+			}
 		}
 #endif
 		gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_VISUAL, PL);
@@ -2105,15 +2174,19 @@
 		ps = GF_FALSE;
 		gf_isom_get_audio_info(import->orig, track_in, 1, &sr, &ch, &bps);
 #ifndef GPAC_DISABLE_AV_PARSERS
-		if (origin_esd && (origin_esd->decoderConfig->objectTypeIndication==GPAC_OTI_AUDIO_AAC_MPEG4)) {
-			GF_M4ADecSpecInfo dsi;
-			gf_m4a_get_config(origin_esd->decoderConfig->decoderSpecificInfo->data, origin_esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-			sr = dsi.base_sr;
-			if (dsi.has_sbr) sbr_sr = dsi.sbr_sr;
-			ch = dsi.nb_chan;
-			PL = dsi.audioPL;
-			sbr = dsi.has_sbr ? ((dsi.base_object_type==GF_M4A_AAC_SBR || dsi.base_object_type==GF_M4A_AAC_PS) ? 2 : 1) : GF_FALSE;
-			ps = dsi.has_ps;
+ if (origin_esd && (origin_esd->decoderConfig->objectTypeIndication==GPAC_OTI_AUDIO_AAC_MPEG4)) {
+ if (origin_esd->decoderConfig->decoderSpecificInfo) {
+ GF_M4ADecSpecInfo dsi;
+ gf_m4a_get_config(origin_esd->decoderConfig->decoderSpecificInfo->data, origin_esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
+ sr = dsi.base_sr;
+ if (dsi.has_sbr) sbr_sr = dsi.sbr_sr;
+ ch = dsi.nb_chan;
+ PL = dsi.audioPL;
+ sbr = dsi.has_sbr ? ((dsi.base_object_type==GF_M4A_AAC_SBR || dsi.base_object_type==GF_M4A_AAC_PS) ? 2 : 1) : GF_FALSE;
+ ps = dsi.has_ps;
+ } else {
+ GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("Missing DecoderSpecificInfo in MPEG-4 AAC stream\n"));
+ }
 		}
 #endif
 		gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_AUDIO, PL);
@@ -2133,7 +2206,13 @@
 		gf_isom_set_timescale(import->dest, timescale);
 	}
 
-	e = gf_isom_clone_track(import->orig, track_in, import->dest, (import->flags & GF_IMPORT_USE_DATAREF) ? GF_TRUE : GF_FALSE, &track);
+	clone_flags = GF_ISOM_CLONE_TRACK_NO_QT;
+	if (import->asemode == GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF) {
+		clone_flags = 0;
+	}
+
+	if (import->flags & GF_IMPORT_USE_DATAREF) clone_flags |= GF_ISOM_CLONE_TRACK_KEEP_DREF;
+	e = gf_isom_clone_track(import->orig, track_in, import->dest, clone_flags, &track);
 	if (e) goto exit;
 
 	di = 1;
@@ -2147,6 +2226,9 @@
 	if (import->esd && import->esd->dependsOnESID) {
 		gf_isom_set_track_reference(import->dest, track, GF_ISOM_REF_DECODE, import->esd->dependsOnESID);
 	}
+	if (import->trackID && !(import->flags & GF_IMPORT_KEEP_REFS)) {
+		gf_isom_remove_track_references(import->dest, track);
+	}
 
 	mstype = gf_isom_get_media_subtype(import->orig, track_in, di);
 
@@ -2154,6 +2236,12 @@
 	case GF_ISOM_MEDIA_VISUAL:
 		gf_import_message(import, GF_OK, "IsoMedia import %s - track ID %d - Video (size %d x %d)", orig_name, trackID, w, h);
 		break;
+ case GF_ISOM_MEDIA_AUXV:
+ gf_import_message(import, GF_OK, "IsoMedia import %s - track ID %d - Auxiliary Video (size %d x %d)", orig_name, trackID, w, h);
+ break;
+ case GF_ISOM_MEDIA_PICT:
+ gf_import_message(import, GF_OK, "IsoMedia import %s - track ID %d - Picture sequence (size %d x %d)", orig_name, trackID, w, h);
+ break;
 	case GF_ISOM_MEDIA_AUDIO:
 	{
 		if (ps) {
@@ -2163,6 +2251,10 @@
 		} else {
 			gf_import_message(import, GF_OK, "IsoMedia import %s - track ID %d - Audio (SR %d - %d channels)", orig_name, trackID, sr, ch);
 		}
+		if (import->asemode != GF_IMPORT_AUDIO_SAMPLE_ENTRY_NOT_SET) {
+			gf_isom_get_audio_info(import->orig, track_in, 1, &sr, &ch, &bps);
+			gf_isom_set_audio_info(import->dest, track, 1, sr, ch, bps, import->asemode);
+		}
 	}
 	break;
 	case GF_ISOM_MEDIA_SUBPIC:
@@ -2188,10 +2280,20 @@
 	}
 
 	is_cenc = gf_isom_is_cenc_media(import->orig, track_in, 1);
+	if (gf_isom_is_media_encrypted(import->orig, track_in, 1)) {
+		gf_isom_get_original_format_type(import->orig, track_in, 1, &mstype);
+	}
+	has_seig = GF_FALSE;
+	if (is_cenc && gf_isom_has_cenc_sample_group(import->dest, track) ) {
+		has_seig = GF_TRUE;
+	}
 
 	duration = (u64) (((Double)import->duration * gf_isom_get_media_timescale(import->orig, track_in)) / 1000);
 	gf_isom_set_nalu_extract_mode(import->orig, track_in, GF_ISOM_NALU_EXTRACT_INSPECT);
 
+	cdur = gf_isom_get_constant_sample_duration(import->orig, track_in);
+	gf_isom_enable_raw_pack(import->orig, track_in, 2048);
+
 	if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
 		if (is_cenc ) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ISOM import] CENC media detected - cannot switch parameter set storage mode\n"));
@@ -2199,17 +2301,32 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ISOM import] Cannot switch parameter set storage mode when using data reference\n"));
 		} else {
 			switch (mstype) {
-			case GF_4CC('a', 'v', 'c', '1'):
+			case GF_ISOM_SUBTYPE_AVC_H264:
 				gf_isom_set_nalu_extract_mode(import->orig, track_in, GF_ISOM_NALU_EXTRACT_INSPECT | GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
 				gf_isom_avc_set_inband_config(import->dest, track, 1);
 				break;
-			case GF_4CC('h', 'v', 'c', '1'):
+			case GF_ISOM_SUBTYPE_HVC1:
 				gf_isom_set_nalu_extract_mode(import->orig, track_in, GF_ISOM_NALU_EXTRACT_INSPECT | GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
 				gf_isom_hevc_set_inband_config(import->dest, track, 1);
 				break;
 			}
 		}
 	}
+	switch (mstype) {
+	case GF_ISOM_SUBTYPE_AVC_H264:
+	case GF_ISOM_SUBTYPE_SVC_H264:
+	case GF_ISOM_SUBTYPE_MVC_H264:
+	case GF_ISOM_SUBTYPE_AVC2_H264:
+	case GF_ISOM_SUBTYPE_AVC3_H264:
+	case GF_ISOM_SUBTYPE_AVC4_H264:
+	case GF_ISOM_SUBTYPE_HEV1:
+	case GF_ISOM_SUBTYPE_HVC1:
+	case GF_ISOM_SUBTYPE_LHE1:
+	case GF_ISOM_SUBTYPE_LHV1:
+	case GF_ISOM_SUBTYPE_HVT1:
+		is_nalu_video = GF_TRUE;
+		break;
+	}
 
 	num_samples = gf_isom_get_sample_count(import->orig, track_in);
 
@@ -2239,6 +2356,18 @@
 				goto exit;
 			}
 			samp->DTS -= dts_offset;
+
+			if (samp->nb_pack && duration && (samp->DTS + samp->nb_pack*cdur > duration) ) {
+				u32 nb_samp = (u32) ( (duration - samp->DTS) / cdur);
+				u32 csize = samp->dataLength / samp->nb_pack;
+				if (!nb_samp) {
+					gf_isom_sample_del(&samp);
+					break;
+				}
+				samp->dataLength = csize*nb_samp;
+				samp->nb_pack = nb_samp;
+				duration = samp->DTS-1;
+			}
 			/*if not first sample and same DTS as previous sample, force DTS++*/
 			if (i && (samp->DTS<=sampDTS)) {
 				if (i+1 < num_samples) {
@@ -2249,15 +2378,20 @@
 			e = gf_isom_add_sample(import->dest, track, di, samp);
 		}
 		sampDTS = samp->DTS;
+		if (samp->nb_pack)
+			i+= samp->nb_pack-1;
+
 		gf_isom_sample_del(&samp);
 
 		gf_isom_copy_sample_info(import->dest, track, import->orig, track_in, i+1);
 
+		if (import->audio_roll_change) {
+			gf_isom_set_sample_roll_group(import->dest, track, i+1, import->audio_roll);
+		}
+
 		gf_set_progress("Importing ISO File", i+1, num_samples);
 
 
-		if (duration && (sampDTS > duration) ) break;
-		if (import->flags & GF_IMPORT_DO_ABORT) break;
 		if (e)
 			goto exit;
 		if (is_cenc) {
@@ -2292,16 +2426,20 @@
 				gf_isom_cenc_samp_aux_info_del(sai);
 				gf_bs_get_content(bs, &buffer, &len);
 				gf_bs_del(bs);
-				e = gf_isom_track_cenc_add_sample_info(import->dest, track, container_type, IV_size, buffer, len);
+				e = gf_isom_track_cenc_add_sample_info(import->dest, track, container_type, IV_size, buffer, len, is_nalu_video, NULL);
 				gf_free(buffer);
 			} else {
-				e = gf_isom_track_cenc_add_sample_info(import->dest, track, container_type, IV_size, NULL, 0);
+				e = gf_isom_track_cenc_add_sample_info(import->dest, track, container_type, IV_size, NULL, samp->dataLength, is_nalu_video, NULL);
 			}
 			if (e) goto exit;
 
-			e = gf_isom_set_sample_cenc_group(import->dest, track, i+1, Is_Encrypted, IV_size, KID, crypt_byte_block, skip_byte_block, constant_IV_size, constant_IV);
-			if (e) goto exit;
+			if (has_seig) {
+				e = gf_isom_set_sample_cenc_group(import->dest, track, i+1, Is_Encrypted, IV_size, KID, crypt_byte_block, skip_byte_block, constant_IV_size, constant_IV);
+				if (e) goto exit;
+			}
 		}
+		if (duration && (sampDTS > duration) ) break;
+		if (import->flags & GF_IMPORT_DO_ABORT) break;
 	}
 
 	//adjust last sample duration
@@ -2336,6 +2474,16 @@
 	}
 
 	gf_media_update_bitrate(import->dest, track);
+	if (mtype == GF_ISOM_MEDIA_VISUAL) {
+		if (import->flags & GF_IMPORT_USE_CCST) {
+			e = gf_isom_set_image_sequence_coding_constraints(import->dest, track, di, GF_FALSE, GF_FALSE, GF_TRUE, 15);
+			if (e) goto exit;
+		}
+		if (import->is_alpha) {
+			e = gf_isom_set_image_sequence_alpha(import->dest, track, di, GF_FALSE);
+			if (e) goto exit;
+		}
+	}
 
 exit:
 	if (origin_esd) gf_odf_desc_del((GF_Descriptor *) origin_esd);
@@ -2382,7 +2530,7 @@
 			import->tk_info[import->nb_tracks].video_info.height = mpeg2ps_get_video_stream_height(ps, i);
 			import->tk_info[import->nb_tracks].video_info.par = mpeg2ps_get_video_stream_aspect_ratio(ps, i);
 
-			import->tk_info[import->nb_tracks].media_type = GF_4CC('M', 'P', 'G', '1');
+			import->tk_info[import->nb_tracks].media_type = GF_MEDIA_TYPE_MPG1;
 			if (mpeg2ps_get_video_stream_type(ps, i) == MPEG_VIDEO_MPEG2) import->tk_info[import->nb_tracks].media_type ++;
 
 			import->nb_tracks++;
@@ -2393,16 +2541,16 @@
 			import->tk_info[import->nb_tracks].type = GF_ISOM_MEDIA_AUDIO;
 			switch (mpeg2ps_get_audio_stream_type(ps, i)) {
 			case MPEG_AUDIO_MPEG:
-				import->tk_info[import->nb_tracks].media_type = GF_4CC('M','P','G','A');
+				import->tk_info[import->nb_tracks].media_type = GF_MEDIA_TYPE_MPGA;
 				break;
 			case MPEG_AUDIO_AC3:
-				import->tk_info[import->nb_tracks].media_type = GF_4CC('A','C','3',' ');
+				import->tk_info[import->nb_tracks].media_type = GF_MEDIA_TYPE_AC3;
 				break;
 			case MPEG_AUDIO_LPCM:
-				import->tk_info[import->nb_tracks].media_type = GF_4CC('L','P','C','M');
+				import->tk_info[import->nb_tracks].media_type = GF_MEDIA_TYPE_LPCM;
 				break;
 			default:
-				import->tk_info[import->nb_tracks].media_type = GF_4CC('U','N','K',' ');
+				import->tk_info[import->nb_tracks].media_type = GF_MEDIA_TYPE_UNK;
 				break;
 			}
 			import->tk_info[import->nb_tracks].audio_info.sample_rate = mpeg2ps_get_audio_stream_sample_freq(ps, i);
@@ -2512,7 +2660,7 @@
 	if (last_pos!=file_size) gf_set_progress("Importing MPEG-PS Video", frames, frames);
 
 	gf_media_update_bitrate(import->dest, track);
-	if (ar) gf_media_change_par(import->dest, track, ar>>16, ar&0xffff);
+	if (ar) gf_media_change_par(import->dest, track, ar>>16, ar&0xffff, GF_FALSE);
 
 exit:
 	if (import->esd && destroy_esd) {
@@ -2602,7 +2750,7 @@
 	e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, NULL, NULL, &di);
 	if (e) goto exit;
 
-	gf_isom_set_audio_info(import->dest, track, di, sr, nb_ch, 16);
+	gf_isom_set_audio_info(import->dest, track, di, sr, nb_ch, 16, import->asemode);
 	gf_import_message(import, GF_OK, "%s Audio import - sample rate %d - %d channel%s", (mtype==GPAC_OTI_AUDIO_MPEG1) ? "MPEG-1" : "MPEG-2", sr, nb_ch, (nb_ch>1) ? "s" : "");
 
 
@@ -2711,8 +2859,8 @@
 
 	bs = gf_bs_from_file(nhnt, GF_BITSTREAM_READ);
 	sig = GF_4CC(gf_bs_read_u8(bs), gf_bs_read_u8(bs), gf_bs_read_u8(bs), gf_bs_read_u8(bs));
-	if (sig == GF_4CC('N','H','n','t')) sig = 0;
-	else if (sig == GF_4CC('N','H','n','l')) sig = 1;
+	if (sig == GF_MEDIA_TYPE_NHNT) sig = 0;
+	else if (sig == GF_MEDIA_TYPE_NHNL) sig = 1;
 	else {
 		gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Invalid NHNT signature");
 		e = GF_NON_COMPLIANT_BITSTREAM;
@@ -3110,7 +3258,7 @@
 	else if (strstr(att->value, "0X")) { u32 __i; sscanf(att->value+2, "%X", &__i); _value = __i; }\
 	else sscanf(att->value, _fmt, &_value); \
 	}\
- 
+
 
 /*FIXME - need LARGE FILE support in NHNT - add a new version*/
 GF_Err gf_import_nhml_dims(GF_MediaImporter *import, Bool dims_doc)
@@ -3305,7 +3453,7 @@
 			} else if (!stricmp(att->value, "main+redundant")) {
 				dims.containsRedundant = 3;
 			}
-		} else if (!stricmp(att->name, "text_encoding")) {
+		} else if (!stricmp(att->name, "text_encoding") || !stricmp(att->name, "encoding")) {
 			dims.textEncoding = att->value;
 		} else if (!stricmp(att->name, "content_encoding")) {
 			if (!strcmp(att->value, "deflate")) {
@@ -3355,9 +3503,10 @@
 	if (info) {
 		gf_fseek(info, 0, SEEK_END);
 		specInfoSize = (u32) gf_ftell(info);
-		specInfo = (char*)gf_malloc(sizeof(char) * specInfoSize);
+		specInfo = (char*)gf_malloc(sizeof(char) * (specInfoSize+1));
 		gf_fseek(info, 0, SEEK_SET);
 		specInfoSize = (u32) fread(specInfo, sizeof(char), specInfoSize, info);
+		specInfo[specInfoSize] = 0;
 		gf_fclose(info);
 	} else if (header_end) {
 		/* for text based streams, the decoder specific info can be at the beginning of the file */
@@ -3501,11 +3650,11 @@
 			 &di);
 		} else if (sdesc.codec_tag == GF_ISOM_SUBTYPE_SBTT) {
 			e = gf_isom_new_stxt_description(import->dest, track, GF_ISOM_SUBTYPE_SBTT,
-			 dims.mime_type, dims.textEncoding, specInfo,
+			 dims.mime_type, dims.contentEncoding, specInfo,
 			 &di);
 		} else if (sdesc.codec_tag == GF_ISOM_SUBTYPE_STXT) {
 			e = gf_isom_new_stxt_description(import->dest, track, GF_ISOM_SUBTYPE_STXT,
-			 dims.mime_type, dims.textEncoding, specInfo,
+			 dims.mime_type, dims.contentEncoding, specInfo,
 			 &di);
 		} else {
 			e = GF_NOT_SUPPORTED;
@@ -3533,7 +3682,7 @@
 		char szT[5];
 		sdesc.extension_buf = specInfo;
 		sdesc.extension_buf_size = specInfoSize;
-		if (!sdesc.vendor_code) sdesc.vendor_code = GF_4CC('G', 'P', 'A', 'C');
+		if (!sdesc.vendor_code) sdesc.vendor_code = GF_VENDOR_GPAC;
 
 		track = gf_isom_new_track(import->dest, tkID, mtype, timescale);
 		if (!track) {
@@ -3553,15 +3702,19 @@
 	if (import->esd && !import->esd->ESID) import->esd->ESID = import->final_trackID;
 
 	if (sdesc.width && sdesc.height) {
+		u32 w = sdesc.width;
 		gf_isom_set_visual_info(import->dest, track, di, sdesc.width, sdesc.height);
 		if (par_den && par_num) {
-			gf_media_change_par(import->dest, track, par_num, par_den);
+			gf_media_change_par(import->dest, track, par_num, par_den, GF_FALSE);
+			w *= par_num;
+			w /= par_den;
 		} else {
 			gf_media_update_par(import->dest, track);
 		}
+		gf_isom_set_track_layout_info(import->dest, track, w << 16, sdesc.height << 16, 0, 0, 0);
 	}
 	else if (sdesc.samplerate && sdesc.nb_channels) {
-		gf_isom_set_audio_info(import->dest, track, di, sdesc.samplerate, sdesc.nb_channels, (u8) sdesc.bits_per_sample);
+		gf_isom_set_audio_info(import->dest, track, di, sdesc.samplerate, sdesc.nb_channels, (u8) sdesc.bits_per_sample, import->asemode);
 	}
 
 	duration = (u64) ( ((Double) import->duration)/ 1000 * timescale);
@@ -3583,7 +3736,7 @@
 	samp->IsRAP = RAP;
 	i=0;
 	while ((node = (GF_XMLNode *) gf_list_enum(root->content, &i))) {
-		u32 j, dims_flags;
+		u32 j, dims_flags, sap_type;
 		Bool append, compress, has_subbs;
 		char *base_data = NULL;
 		if (node->type) continue;
@@ -3600,6 +3753,7 @@
 		append = GF_FALSE;
 		compress = do_compress;
 		sample_duration = 0;
+		sap_type = 0;
 
 		j=0;
 		while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
@@ -3617,6 +3771,7 @@
 				samp->IsRAP = (!stricmp(att->value, "yes")) ? RAP : RAP_NO;
 			}
 			else if (!stricmp(att->name, "isSyncShadow")) samp->IsRAP = !stricmp(att->value, "yes") ? RAP_REDUNDANT : RAP_NO;
+			else if (!stricmp(att->name, "SAPType") && !samp->IsRAP) sap_type = atoi(att->value);
 			else if (!stricmp(att->name, "mediaOffset")) offset = (s64) atof(att->value) ;
 			else if (!stricmp(att->name, "dataLength")) samp->dataLength = atoi(att->value);
 			else if (!stricmp(att->name, "mediaFile")) {
@@ -3739,7 +3894,7 @@
 			if (strlen(szMediaTemp)) {
 				f = gf_fopen(szMediaTemp, "rb");
 				if (!f) {
-					e = gf_import_message(import, GF_BAD_PARAM, "%s import failure: file %s not found", szImpName, close ? szMediaTemp : szMedia);
+					e = gf_import_message(import, GF_BAD_PARAM, "%s import failure: file %s not found", szImpName, szMediaTemp);
 					goto exit;
 				}
 				close = GF_TRUE;
@@ -3872,7 +4027,9 @@
 				}
 			}
 		}
-
+		if (sap_type==SAP_TYPE_3) {
+			gf_isom_set_sample_rap_group(import->dest, track, gf_isom_get_sample_count(import->dest, track), 0);
+		}
 		samp->IsRAP = RAP_NO;
 		samp->CTS_Offset = 0;
 		if (sample_duration)
@@ -4029,6 +4186,7 @@
 
 	memset(&gpp_cfg, 0, sizeof(GF_3GPConfig));
 	gpp_cfg.type = mtype;
+	gpp_cfg.vendor = GF_VENDOR_GPAC;
 	gpp_cfg.frames_per_sample = import->frames_per_sample;
 	if (!gpp_cfg.frames_per_sample) gpp_cfg.frames_per_sample = 1;
 	else if (gpp_cfg.frames_per_sample >15) gpp_cfg.frames_per_sample = 15;
@@ -4048,11 +4206,10 @@
 		if (e) goto exit;
 	} else {
 		import->flags &= ~GF_IMPORT_FORCE_MPEG4;
-		gpp_cfg.vendor = GF_4CC('G', 'P', 'A', 'C');
 		e = gf_isom_3gp_config_new(import->dest, track, &gpp_cfg, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
 		if (e) goto exit;
 	}
-	gf_isom_set_audio_info(import->dest, track, di, sample_rate, 1, 16);
+	gf_isom_set_audio_info(import->dest, track, di, sample_rate, 1, 16, import->asemode);
 	duration = import->duration;
 	duration *= sample_rate;
 	duration /= 1000;
@@ -4077,14 +4234,16 @@
 		case GF_ISOM_SUBTYPE_3GP_AMR:
 		case GF_ISOM_SUBTYPE_3GP_AMR_WB:
 			ft = (toc >> 3) & 0x0F;
-			/*update mode set (same mechanism for both AMR and AMR-WB*/
-			gpp_cfg.AMR_mode_set |= (1<<ft);
 			if (gpp_cfg.type==GF_ISOM_SUBTYPE_3GP_AMR_WB) {
 				samp->dataLength = (u32)GF_AMR_WB_FRAME_SIZE[ft];
 			} else {
 				samp->dataLength = (u32)GF_AMR_FRAME_SIZE[ft];
 			}
 			samp->data[0] = toc;
+			if (samp->dataLength) {
+				/*update mode set (same mechanism for both AMR and AMR-WB*/
+				gpp_cfg.AMR_mode_set |= (1<<ft);
+			}
 			break;
 		case GF_ISOM_SUBTYPE_3GP_EVRC:
 		case GF_ISOM_SUBTYPE_3GP_SMV:
@@ -4181,6 +4340,7 @@
 	}
 
 	memset(&gpp_cfg, 0, sizeof(GF_3GPConfig));
+	gpp_cfg.vendor = GF_VENDOR_GPAC;
 	delete_esd = GF_FALSE;
 
 	mdia = gf_fopen(import->in_name, "rb");
@@ -4320,7 +4480,7 @@
 		e = gf_isom_3gp_config_new(import->dest, track, &gpp_cfg, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
 		if (e) goto exit;
 	}
-	gf_isom_set_audio_info(import->dest, track, di, samplerate, 1, (u8) bps);
+	gf_isom_set_audio_info(import->dest, track, di, samplerate, 1, (u8) bps, import->asemode);
 
 	duration = import->duration;
 	duration *= samplerate;
@@ -4563,7 +4723,7 @@
 
 	memset(&gpp_cfg, 0, sizeof(GF_3GPConfig));
 	gpp_cfg.type = GF_ISOM_SUBTYPE_3GP_H263;
-	gpp_cfg.vendor = GF_4CC('G','P','A','C');
+	gpp_cfg.vendor = GF_VENDOR_GPAC;
 	/*FIXME - we need more in-depth parsing of the bitstream to detect P3@L10 (streaming wireless)*/
 	gpp_cfg.H263_profile = 0;
 	gpp_cfg.H263_level = 10;
@@ -4613,8 +4773,8 @@
 	gf_free(samp_data);
 	gf_isom_sample_del(&samp);
 	gf_set_progress("Importing H263", nb_samp, nb_samp);
-	gf_isom_modify_alternate_brand(import->dest, GF_4CC('3','g','g','6'), 1);
-	gf_isom_modify_alternate_brand(import->dest, GF_4CC('3','g','g','5'), 1);
+	gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_3GG6, 1);
+	gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_3GG5, 1);
 
 exit:
 	gf_bs_del(bs);
@@ -4687,6 +4847,7 @@
 	u8 priority_prev_nalu_prefix;
 	Double FPS;
 	char *buffer;
+	Bool sample_is_ref, has_redundant;
 	u32 max_size = 4096;
 
 	if (import->flags & GF_IMPORT_PROBE_ONLY) {
@@ -4708,9 +4869,9 @@
 		FPS = GF_IMPORT_DEFAULT_FPS;
 	} else {
 		if (import->video_fps == GF_IMPORT_AUTO_FPS)
-			import->video_fps = GF_IMPORT_DEFAULT_FPS;	/*fps=auto is handled as auto-detection is h264*/
+			import->video_fps = GF_IMPORT_DEFAULT_FPS; /*fps=auto is handled as auto-detection in h264*/
 		else
-			detect_fps = GF_FALSE;								/*fps is forced by the caller*/
+			detect_fps = GF_FALSE; /*fps is forced by the caller*/
 	}
 	get_video_timing(FPS, &timescale, &dts_inc);
 
@@ -4730,6 +4891,8 @@
 	first_avc = GF_TRUE;
 	last_svc_sps = 0;
 	sei_recovery_frame_count = -1;
+	sample_is_ref = GF_FALSE;
+	has_redundant = GF_FALSE;
 
 	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
 	if (!gf_media_nalu_is_start_code(bs)) {
@@ -4791,7 +4954,7 @@
 	nb_nalus = 0;
 
 	while (gf_bs_available(bs)) {
-		u8 nal_hdr, skip_nal, is_subseq, add_sps;
+		u8 nal_hdr, skip_nal, is_subseq, add_sps, nal_ref_idc;
 		u32 nal_and_trailing_size;
 
 		nal_and_trailing_size = nal_size = gf_media_nalu_next_start_code_bs(bs);
@@ -4858,6 +5021,7 @@
 				if ((avc.sps[idx].state & AVC_SUBSPS_PARSED) && !(avc.sps[idx].state & AVC_SUBSPS_DECLARED)) {
 					avc.sps[idx].state |= AVC_SUBSPS_DECLARED;
 					add_sps = 1;
+					avc.sps[idx].sbusps_crc = gf_crc_32(buffer, nal_size);
 				}
 				dstcfg = svccfg;
 				if (import->flags & GF_IMPORT_SVC_NONE) {
@@ -4869,14 +5033,16 @@
 					add_sps = 1;
 				}
 			}
-			/*some streams are not really nice and reuse sps idx with differnet parameters (typically
-			when concatenated bitstreams). Since we cannot put two SPS with the same idx in the decoder config, we keep them in the
-			video bitstream*/
 			if (avc.sps[idx].state & AVC_SUBSPS_DECLARED) {
 				if (import->flags & GF_IMPORT_SVC_NONE) {
 					copy_size = 0;
 				} else {
-					copy_size = nal_size;
+					/*some streams are not really nice and reuse sps idx with differnet parameters (typically
+					when concatenated bitstreams). Since we cannot put two SPS with the same idx in the decoder config, we keep them in the
+					video bitstream*/
+					if (avc.sps[idx].sbusps_crc != gf_crc_32(buffer, nal_size) ) {
+						copy_size = nal_size;
+					}
 				}
 			}
 
@@ -4892,7 +5058,7 @@
 				dstcfg->profile_compatibility = avc.sps[idx].prof_compat;
 				dstcfg->AVCProfileIndication = avc.sps[idx].profile_idc;
 				dstcfg->AVCLevelIndication = avc.sps[idx].level_idc;
-				
+
 				dstcfg->chroma_format = avc.sps[idx].chroma_format;
 				dstcfg->luma_bit_depth = 8 + avc.sps[idx].luma_bit_depth_m8;
 				dstcfg->chroma_bit_depth = 8 + avc.sps[idx].chroma_bit_depth_m8;
@@ -4941,7 +5107,7 @@
 					FPS = (Double)timescale / dts_inc;
 					detect_fps = GF_FALSE;
 
-					if (avc.sps[idx].vui.fixed_frame_rate_flag)
+					if (!avc.sps[idx].vui.fixed_frame_rate_flag)
 						GF_LOG(GF_LOG_INFO, GF_LOG_CODING, ("[avc-h264] Possible Variable Frame Rate: VUI \"fixed_frame_rate_flag\" absent.\n"));
 
 					gf_isom_remove_track(import->dest, track);
@@ -4993,9 +5159,12 @@
 			}
 			/*some streams are not really nice and reuse sps idx with differnet parameters (typically
 			when concatenated bitstreams). Since we cannot put two SPS with the same idx in the decoder config, we keep them in the
-			video bitstream*/
-			if (avc.pps[idx].status == 2) {
-				copy_size = nal_size;
+			video bitstream - if same CRC for the PPS, this is the same PPS, don't copy over*/
+			if (avc.pps[idx].status > 1) {
+				u32 pps_crc = gf_crc_32(buffer, nal_size);
+				if (pps_crc != avc.pps[idx].status) {
+					copy_size = nal_size;
+				}
 			}
 
 			//always keep NAL
@@ -5004,7 +5173,7 @@
 				if (sample_has_slice) flush_sample = GF_TRUE;
 			} else {
 				if (avc.pps[idx].status==1) {
-					avc.pps[idx].status = 2;
+					avc.pps[idx].status = gf_crc_32(buffer, nal_size);
 					slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
 					slc->size = nal_size;
 					slc->id = idx;
@@ -5029,9 +5198,12 @@
 			} else {
 				if (avc.sps_active_idx != -1) {
 					copy_size = gf_media_avc_reformat_sei(buffer, nal_size, &avc);
-					if (copy_size)
-						nb_sei++;
+				} else {
+					//if no state yet, import SEI
+					copy_size = nal_size;
 				}
+				if (copy_size)
+					nb_sei++;
 			}
 			break;
 
@@ -5040,7 +5212,7 @@
 		case GF_AVC_NALU_DP_B_SLICE:
 		case GF_AVC_NALU_DP_C_SLICE:
 		case GF_AVC_NALU_IDR_SLICE:
-			if (! skip_nal) {
+			if (!skip_nal) {
 				copy_size = nal_size;
 				switch (avc.s_info.slice_type) {
 				case GF_AVC_TYPE_P:
@@ -5070,6 +5242,12 @@
 
 		/*remove*/
 		case GF_AVC_NALU_ACCESS_UNIT:
+			if (import->keep_audelim) {
+				copy_size = nal_size;
+			} else {
+				copy_size = 0;
+			}
+			break;
 		case GF_AVC_NALU_FILLER_DATA:
 		case GF_AVC_NALU_END_OF_SEQ:
 		case GF_AVC_NALU_END_OF_STREAM:
@@ -5120,7 +5298,7 @@
 
 		case GF_AVC_NALU_SEQ_PARAM_EXT:
 			idx = gf_media_avc_read_sps_ext(buffer, nal_size);
-			if (idx<0) {
+			if (idx<0 || idx>31) {
 				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing Sequence Param Extension");
 				goto exit;
 			}
@@ -5152,6 +5330,7 @@
 		if (!nal_size) break;
 
 		if (flush_sample && sample_data) {
+			Bool is_rap=GF_FALSE;;
 			GF_ISOSample *samp = gf_isom_sample_new();
 			samp->DTS = (u64)dts_inc*cur_samp;
 			samp->IsRAP = sample_is_rap ? RAP : RAP_NO;
@@ -5208,6 +5387,8 @@
 			sample_has_slice = GF_FALSE;
 			cur_samp++;
 
+			if (samp->IsRAP) is_rap = GF_TRUE;
+
 			/*write sampleGroups info*/
 			if (!samp->IsRAP && ( (sei_recovery_frame_count>=0) || sample_has_islice) ) {
 				/*generic GDR*/
@@ -5219,9 +5400,23 @@
 				else if ((sei_recovery_frame_count == 0) && sample_has_islice) {
 					if (!use_opengop_gdr) use_opengop_gdr = 2;
 					e = gf_isom_set_sample_rap_group(import->dest, track, cur_samp, 0);
+					is_rap = GF_TRUE;
 				}
 				if (e) goto exit;
 			}
+			//write sample deps
+			if (import->flags & GF_IMPORT_SAMPLE_DEPS) {
+				u32 isLeading, dependsOn, dependedOn, hasRedundant;
+				isLeading = 0; //for avc we would need to parse sub-seq info SEI
+				dependsOn = is_rap ? 2 : 1;
+				dependedOn = sample_is_ref ? 1 : 2;
+				hasRedundant = has_redundant ? 1 : 2;
+
+				e = gf_isom_sample_set_dep_info(import->dest, track, cur_samp, isLeading, dependsOn, dependedOn, hasRedundant);
+				if (e) goto exit;
+			}
+			sample_is_ref = GF_FALSE;
+			has_redundant = GF_FALSE;
 
 			gf_isom_sample_del(&samp);
 			gf_set_progress("Importing AVC-H264", (u32) (nal_start/1024), (u32) (total_size/1024) );
@@ -5234,7 +5429,14 @@
 			sei_recovery_frame_count = -1;
 		}
 
+
 		if (copy_size) {
+			//nal in current sample is a ref
+			nal_ref_idc = (nal_hdr & 0x60) >> 5;
+			if (nal_ref_idc) {
+				sample_is_ref = GF_TRUE;
+			}
+			
 			if (is_islice)
 				sample_has_islice = GF_TRUE;
 
@@ -5332,6 +5534,10 @@
 					nb_idr++;
 				slice_force_ref = GF_FALSE;
 
+				if (avc.s_info.redundant_pic_cnt>0) {
+					has_redundant = GF_TRUE;
+				}
+
 				/*we only indicate TRUE IDRs for sync samples (cf AVC file format spec).
 				SEI recovery should be used to build sampleToGroup & RollRecovery tables*/
 				if (first_nal) {
@@ -5468,13 +5674,26 @@
 		gf_isom_sample_del(&samp);
 		gf_set_progress("Importing AVC-H264", (u32) cur_samp, cur_samp+1);
 		cur_samp++;
+
+		//write sample deps
+		if (import->flags & GF_IMPORT_SAMPLE_DEPS) {
+			u32 isLeading, dependsOn, dependedOn;
+			isLeading = 0;
+			dependsOn = (sample_is_rap || sample_has_islice) ? 2 : 1;
+			dependedOn = sample_is_ref ? 1 : 2;
+
+			e = gf_isom_sample_set_dep_info(import->dest, track, cur_samp, isLeading, dependsOn, dependedOn, 2);
+			if (e) goto exit;
+		}
+		sample_is_ref = GF_FALSE;
+
 	}
 
 
 	/*recompute all CTS offsets*/
 	if (has_cts_offset) {
 		u32 i, last_cts_samp;
-		u64 last_dts, max_cts, min_cts;
+		u64 last_dts, max_cts, min_cts, min_cts_offset;
 		if (!poc_diff) poc_diff = 1;
 		/*no b-frame references, no need to cope with negative poc*/
 		if (!max_total_delay) {
@@ -5486,18 +5705,19 @@
 		last_dts = 0;
 		max_cts = 0;
 		min_cts = (u64) -1;
+		min_cts_offset = (u64) -1;
 		last_cts_samp = 0;
 
 		for (i=0; i<cur_samp; i++) {
 			u64 cts;
-			/*not using descIdx and data_offset will only fecth DTS, CTS and RAP which is all we need*/
+			/*not using descIdx and data_offset will only fetch DTS, CTS and RAP which is all we need*/
 			GF_ISOSample *samp = gf_isom_get_sample_info(import->dest, track, i+1, NULL, NULL);
 			/*poc re-init (RAP and POC to 0, otherwise that's SEI recovery), update base DTS*/
 			if (samp->IsRAP /*&& !samp->CTS_Offset*/)
 				last_dts = samp->DTS * (1+is_paff);
 
 			/*CTS offset is frame POC (refers to last IDR)*/
-			cts = (min_poc + (s32) samp->CTS_Offset) * dts_inc/poc_diff + (u32) last_dts;
+			cts = ( (min_poc + (s32) samp->CTS_Offset) * dts_inc ) / poc_diff + (u32) last_dts;
 
 			/*if PAFF, 2 pictures (eg poc) <=> 1 aggregated frame (eg sample), divide by 2*/
 			if (is_paff) {
@@ -5513,6 +5733,9 @@
 
 			samp->CTS_Offset = (u32) (cts - samp->DTS);
 
+			if (samp->CTS_Offset < min_cts_offset)
+				min_cts_offset = samp->CTS_Offset;
+
 			if (max_cts < samp->DTS + samp->CTS_Offset) {
 				max_cts = samp->DTS + samp->CTS_Offset;
 				last_cts_samp = i;
@@ -5546,6 +5769,12 @@
 			}
 			gf_isom_sample_del(&samp);
 		}
+
+		if (min_cts_offset > 0) {
+			gf_isom_shift_cts_offset(import->dest, track, (s32)min_cts_offset);
+			max_cts -= min_cts_offset;
+			min_cts -= min_cts_offset;
+		}
 		/*and repack table*/
 		gf_isom_set_cts_packing(import->dest, track, GF_FALSE);
 
@@ -5560,6 +5789,10 @@
 		gf_isom_remove_cts_info(import->dest, track);
 	}
 
+	if (gf_isom_get_sample_count(import->dest,track) == 1) {
+	 gf_isom_set_last_sample_duration(import->dest, track, dts_inc );
+	}
+
 	gf_set_progress("Importing AVC-H264", (u32) cur_samp, cur_samp);
 
 	gf_isom_set_visual_info(import->dest, track, di, max_w, max_h);
@@ -5579,8 +5812,22 @@
 		gf_isom_svc_config_update(import->dest, track, 1, svccfg, GF_FALSE);
 	}
 
+	if (import->flags & GF_IMPORT_USE_CCST) {
+		e = gf_isom_set_image_sequence_coding_constraints(import->dest, track, di, GF_FALSE, GF_FALSE, GF_TRUE, 15);
+		if (e) goto exit;
+	}
+	if (import->is_alpha) {
+		e = gf_isom_set_image_sequence_alpha(import->dest, track, di, GF_FALSE);
+		if (e) goto exit;
+	}
 
-	gf_media_update_par(import->dest, track);
+	e = gf_media_update_par(import->dest, track);
+	if (e) goto exit;
+	/*arbitrary: use the last active SPS*/
+	if (avc.sps[avc.sps_active_idx].vui_parameters_present_flag && avc.sps[avc.sps_active_idx].vui.colour_description_present_flag) {
+		e = gf_isom_set_visual_color_info(import->dest, track, di, GF_ISOM_SUBTYPE_NCLX, avc.sps[avc.sps_active_idx].vui.colour_primaries, avc.sps[avc.sps_active_idx].vui.transfer_characteristics, avc.sps[avc.sps_active_idx].vui.matrix_coefficients, avc.sps[avc.sps_active_idx].vui.video_full_range_flag, NULL, 0);
+		if (e) goto exit;
+	}
 	gf_media_update_bitrate(import->dest, track);
 
 	gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_VISUAL, 0x7F);
@@ -5614,7 +5861,7 @@
 
 	if (use_opengop_gdr==2) {
 		gf_import_message(import, GF_OK, "OpenGOP detected - adjusting file brand");
-		gf_isom_modify_alternate_brand(import->dest, GF_4CC('i', 's', 'o', '6'), 1);
+		gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_ISO6, 1);
 	}
 
 	/*rewrite ESD*/
@@ -5729,7 +5976,7 @@
 		lhevc_ptl->general_level_idc = ptl.level_idc;
 		gf_list_add(oinf->profile_tier_levels, lhevc_ptl);
 	}
-	
+
 	for (i = 0; i < vps->num_output_layer_sets; i++) {
 		LHEVC_OperatingPoint *op;
 		u32 j;
@@ -5805,10 +6052,10 @@
 	gf_bs_get_content(bs, &data, &data_size);
 	gf_bs_del(bs);
 	gf_isom_oinf_del_entry(oinf);
-	gf_isom_add_sample_group_info(file, hevc_track ? hevc_track : track, GF_4CC( 'o', 'i', 'n', 'f'), data, data_size, GF_TRUE, &di);
+	gf_isom_add_sample_group_info(file, hevc_track ? hevc_track : track, GF_ISOM_SAMPLE_GROUP_OINF, data, data_size, GF_TRUE, &di);
 
 	if (hevc_track) {
-		gf_isom_set_track_reference(file, track, GF_4CC('o','r','e','f'), gf_isom_get_track_id(file, hevc_track) );
+		gf_isom_set_track_reference(file, track, GF_ISOM_REF_OREF, gf_isom_get_track_id(file, hevc_track) );
 	}
 	gf_free(data);
 	return GF_OK;
@@ -5828,7 +6075,7 @@
 	u32 data_size;
 
 	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	
+
 	for (i=0; i<64; i++) {
 		if (linf[i].layer_id_plus_one) nb_layers++;
 	}
@@ -5846,7 +6093,7 @@
 	}
 	gf_bs_get_content(bs, &data, &data_size);
 	gf_bs_del(bs);
-	gf_isom_add_sample_group_info(file, track, GF_4CC( 'l', 'i', 'n', 'f'), data, data_size, GF_TRUE, &di);
+	gf_isom_add_sample_group_info(file, track, GF_ISOM_SAMPLE_GROUP_LINF, data, data_size, GF_TRUE, &di);
 	gf_free(data);
 }
 
@@ -5868,10 +6115,10 @@
 	GF_HEVCParamArray *spss, *ppss, *vpss;
 	GF_BitStream *bs;
 	GF_BitStream *sample_data;
-	Bool flush_sample, flush_next_sample, is_empty_sample, sample_has_islice, is_islice, first_nal, slice_is_ref, has_cts_offset, is_paff, set_subsamples, slice_force_ref;
+	Bool flush_sample, flush_next_sample, is_empty_sample, sample_has_islice, sample_has_vps, sample_has_sps, is_islice, first_nal, slice_is_ref, has_cts_offset, is_paff, set_subsamples, slice_force_ref;
 	u32 ref_frame, timescale, copy_size, size_length, dts_inc;
 	s32 last_poc, max_last_poc, max_last_b_poc, poc_diff, prev_last_poc, min_poc, poc_shift;
-	Bool first_hevc, has_hevc, has_lhvc;
+	Bool first_hevc, /*has_hevc, */ has_lhvc;
 	u32 use_opengop_gdr = 0;
 	u8 layer_ids[64];
 	SAPType sample_rap_type;
@@ -5879,6 +6126,7 @@
 	u8 max_temporal_id[64];
 	u32 min_layer_id = (u32) -1;
 	LHVCLayerInfo linf[64];
+	Bool sample_is_ref;
 
 
 	Double FPS;
@@ -5894,7 +6142,7 @@
 	}
 
 	memset(linf, 0, sizeof(linf));
-	
+
 	set_subsamples = (import->flags & GF_IMPORT_SET_SUBSAMPLES) ? GF_TRUE : GF_FALSE;
 
 	mdia = gf_fopen(import->in_name, "rb");
@@ -5906,7 +6154,7 @@
 		FPS = GF_IMPORT_DEFAULT_FPS;
 	} else {
 		if (import->video_fps == GF_IMPORT_AUTO_FPS) {
-			import->video_fps = GF_IMPORT_DEFAULT_FPS;	/*fps=auto is handled as auto-detection is h264*/
+			import->video_fps = GF_IMPORT_DEFAULT_FPS;	/*fps=auto is handled as auto-detection in h264*/
 		} else {
 			/*fps is forced by the caller*/
 			detect_fps = GF_FALSE;
@@ -5931,7 +6179,8 @@
 	spss = ppss = vpss = NULL;
 	nb_nalus = 0;
 	hevc_base_track = 0;
-	has_hevc = has_lhvc = GF_FALSE;
+	/*has_hevc = */has_lhvc = GF_FALSE;
+	sample_is_ref = 0;
 
 	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
 	if (!gf_media_nalu_is_start_code(bs)) {
@@ -5970,6 +6219,8 @@
 	sample_data = NULL;
 	sample_rap_type = RAP_NO;
 	sample_has_islice = GF_FALSE;
+	sample_has_sps = GF_FALSE;
+	sample_has_vps = GF_FALSE;
 	cur_samp = 0;
 	is_paff = GF_FALSE;
 	total_size = gf_bs_get_size(bs);
@@ -6035,7 +6286,7 @@
 			has_lhvc = GF_TRUE;
 		} else {
 			dst_cfg = hevc_cfg;
-			has_hevc = GF_TRUE;
+			//has_hevc = GF_TRUE;
 		}
 
 		if (prev_cfg != dst_cfg) {
@@ -6051,13 +6302,14 @@
 		switch (res) {
 		case 1:
 			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-				if (!is_empty_sample) flush_sample = GF_TRUE;
+				if (!is_empty_sample)
+					flush_sample = GF_TRUE;
 			} else {
 				flush_sample = GF_TRUE;
 			}
 			break;
 		case -1:
-			gf_import_message(import, GF_OK, "Waring: Error parsing NAL unit");
+			gf_import_message(import, GF_OK, "Warning: Error parsing NAL unit");
 			skip_nal = GF_TRUE;
 			break;
 		case -2:
@@ -6075,7 +6327,7 @@
 		switch (nal_unit_type) {
 		case GF_HEVC_NALU_VID_PARAM:
 			if (import->flags & GF_IMPORT_NO_VPS_EXTENSIONS) {
-				//this may modify nal_size, but we don't use it for bitstream reading 
+				//this may modify nal_size, but we don't use it for bitstream reading
 				idx = gf_media_hevc_read_vps_ex(buffer, &nal_size, &hevc, GF_TRUE);
 			} else {
 				idx = hevc.last_parsed_vps_id;
@@ -6088,7 +6340,6 @@
 			if (hevc.vps[idx].state == 2) {
 				if (hevc.vps[idx].crc != gf_crc_32(buffer, nal_size)) {
 					copy_size = nal_size;
-					has_vcl_nal = GF_TRUE;
 					assert(vpss);
 					vpss->array_completeness = 0;
 				}
@@ -6115,20 +6366,24 @@
 				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
 					vpss->array_completeness = 0;
 					copy_size = nal_size;
-				} else {
-					slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-					slc->size = nal_size;
-					slc->id = idx;
-					slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-					memcpy(slc->data, buffer, sizeof(char)*slc->size);
-
-					gf_list_add(vpss->nalus, slc);
+					sample_has_vps = GF_TRUE;
 				}
+
+				slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+				slc->size = nal_size;
+				slc->id = idx;
+				slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
+				memcpy(slc->data, buffer, sizeof(char)*slc->size);
+
+				gf_list_add(vpss->nalus, slc);
+
 			}
 
 			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
 				copy_size = nal_size;
-				if (!is_empty_sample) flush_sample = GF_TRUE;
+				sample_has_vps = GF_TRUE;
+				if (!is_empty_sample)
+					flush_sample = GF_TRUE;
 			}
 
 			cur_vps_id = idx;
@@ -6150,7 +6405,6 @@
 			else if (hevc.sps[idx].state & AVC_SPS_DECLARED) {
 				if (hevc.sps[idx].crc != gf_crc_32(buffer, nal_size)) {
 					copy_size = nal_size;
-					has_vcl_nal = GF_TRUE;
 					assert(spss);
 					spss->array_completeness = 0;
 				}
@@ -6208,15 +6462,15 @@
 				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
 					spss->array_completeness = 0;
 					copy_size = nal_size;
-				} else {
-					slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-					slc->size = nal_size;
-					slc->id = idx;
-					slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-					memcpy(slc->data, buffer, sizeof(char)*slc->size);
-					gf_list_add(spss->nalus, slc);
 				}
 
+				slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+				slc->size = nal_size;
+				slc->id = idx;
+				slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
+				memcpy(slc->data, buffer, sizeof(char)*slc->size);
+				gf_list_add(spss->nalus, slc);
+
 				if (first_hevc) {
 					first_hevc = GF_FALSE;
 					gf_import_message(import, GF_OK, "HEVC import - frame size %d x %d at %02.3f FPS", hevc.sps[idx].width, hevc.sps[idx].height, FPS);
@@ -6235,7 +6489,9 @@
 			}
 			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
 				copy_size = nal_size;
-				if (!is_empty_sample) flush_sample = GF_TRUE;
+				sample_has_sps = GF_TRUE;
+				if (!is_empty_sample)
+					flush_sample = GF_TRUE;
 			}
 			break;
 
@@ -6249,9 +6505,12 @@
 			if (hevc.pps[idx].state == 2) {
 				if (hevc.pps[idx].crc != gf_crc_32(buffer, nal_size)) {
 					copy_size = nal_size;
-					has_vcl_nal = GF_TRUE;
-					assert(ppss);
-					ppss->array_completeness = 0;
+					if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+					} else if (!ppss) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[HEVC Import] Redefinition of PPS with id %d on a different layer but using out-of-band parameter set storage, resulting file might be broken\n", idx));
+					} else {
+						ppss->array_completeness = 0;
+					}
 				}
 			}
 
@@ -6270,19 +6529,20 @@
 				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
 					ppss->array_completeness = 0;
 					copy_size = nal_size;
-				} else {
-					slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-					slc->size = nal_size;
-					slc->id = idx;
-					slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-					memcpy(slc->data, buffer, sizeof(char)*slc->size);
-
-					gf_list_add(ppss->nalus, slc);
 				}
+
+				slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+				slc->size = nal_size;
+				slc->id = idx;
+				slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
+				memcpy(slc->data, buffer, sizeof(char)*slc->size);
+
+				gf_list_add(ppss->nalus, slc);
 			}
 			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
 				copy_size = nal_size;
-				if (!is_empty_sample) flush_sample = GF_TRUE;
+				if (!is_empty_sample && !layer_id)
+					flush_sample = GF_TRUE;
 			}
 
 			break;
@@ -6306,15 +6566,20 @@
 				copy_size = 0;
 			} else {
 				if (hevc.sps_active_idx != -1) {
+					//todo: inspect SEI and decide what we import
+					copy_size = nal_size;
+				} else {
+					//if no state yet, import SEI
 					copy_size = nal_size;
-					if (copy_size) {
-						nb_sei++;
-					}
 				}
 			}
+			if (copy_size) {
+				nb_sei++;
+			}
 			if (nal_size) {
 				//FIXME should not be minus 1 in layer_ids[layer_id - 1] but the previous layer in the tree
-				if (!layer_id || !layer_ids[layer_id - 1]) flush_sample = GF_TRUE;
+				if (!layer_id || !layer_ids[layer_id - 1])
+					flush_sample = GF_TRUE;
 			}
 			break;
 
@@ -6361,8 +6626,14 @@
 			}
 			break;
 
-		/*remove*/
 		case GF_HEVC_NALU_ACCESS_UNIT:
+			if (import->keep_audelim) {
+				copy_size = nal_size;
+			} else {
+				copy_size = 0;
+			}
+			break;
+		/*remove*/
 		case GF_HEVC_NALU_FILLER_DATA:
 		case GF_HEVC_NALU_END_OF_SEQ:
 		case GF_HEVC_NALU_END_OF_STREAM:
@@ -6388,6 +6659,7 @@
 			flush_sample = GF_FALSE;
 
 		if (flush_sample && sample_data) {
+			Bool is_rap=GF_FALSE;
 			GF_ISOSample *samp = gf_isom_sample_new();
 			samp->DTS = (u64)dts_inc*cur_samp;
 			samp->IsRAP = ((sample_rap_type==SAP_TYPE_1) || (sample_rap_type==SAP_TYPE_2)) ? RAP : RAP_NO;
@@ -6404,6 +6676,38 @@
 			gf_bs_del(sample_data);
 			sample_data = NULL;
 
+			if (samp->IsRAP) is_rap = GF_TRUE;
+
+			//fixme, we should check sps and vps IDs when missing
+			if ((import->flags & GF_IMPORT_FORCE_XPS_INBAND) && sample_rap_type && (!sample_has_vps || !sample_has_sps) ) {
+				u32 k;
+				GF_BitStream *fbs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+				if (!sample_has_vps) {
+					if (!vpss)
+						vpss = get_hevc_param_array(hevc_cfg, GF_HEVC_NALU_VID_PARAM);
+					assert(vpss);
+					for (k=0;k<gf_list_count(vpss->nalus); k++) {
+						GF_AVCConfigSlot *slc = gf_list_get(vpss->nalus, k);
+						gf_bs_write_int(fbs, slc->size, size_length);
+						gf_bs_write_data(fbs, slc->data, slc->size);
+					}
+				}
+				if (!sample_has_sps) {
+					if (!spss)
+						spss = get_hevc_param_array(hevc_cfg, GF_HEVC_NALU_SEQ_PARAM);
+					assert(spss);
+					for (k=0;k<gf_list_count(spss->nalus); k++) {
+						GF_AVCConfigSlot *slc = gf_list_get(spss->nalus, k);
+						gf_bs_write_int(fbs, slc->size, size_length);
+						gf_bs_write_data(fbs, slc->data, slc->size);
+					}
+				}
+				gf_bs_write_data(fbs, samp->data, samp->dataLength);
+				gf_free(samp->data);
+				gf_bs_get_content(fbs, &samp->data, &samp->dataLength);
+				gf_bs_del(fbs);
+			}
+
 			/*CTS recomuting is much trickier than with MPEG-4 ASP due to b-slice used as references - we therefore
 			store the POC as the CTS offset and update the whole table at the end*/
 			samp->CTS_Offset = last_poc - poc_shift;
@@ -6424,10 +6728,25 @@
 				else if (sample_rap_type==SAP_TYPE_3) {
 					if (!min_layer_id && !use_opengop_gdr) use_opengop_gdr = 2;
 					e = gf_isom_set_sample_rap_group(import->dest, track, cur_samp, 0);
+
+					is_rap = GF_TRUE;
 				}
 				if (e) goto exit;
 			}
 
+			//write sample deps
+			if (import->flags & GF_IMPORT_SAMPLE_DEPS) {
+				u32 isLeading, dependsOn, dependedOn;
+				isLeading = 0;
+				dependsOn = is_rap ? 2 : 1;
+				dependedOn = sample_is_ref ? 1 : 2;
+
+				e = gf_isom_sample_set_dep_info(import->dest, track, cur_samp, isLeading, dependsOn, dependedOn, 2);
+				if (e) goto exit;
+			}
+			sample_is_ref = GF_FALSE;
+
+
 			gf_isom_sample_del(&samp);
 			gf_set_progress("Importing HEVC", (u32) (nal_start/1024), (u32) (total_size/1024) );
 			first_nal = GF_TRUE;
@@ -6436,11 +6755,35 @@
 				min_poc = last_poc;
 
 			sample_has_islice = GF_FALSE;
+			sample_has_vps = GF_FALSE;
+			sample_has_sps = GF_FALSE;
 			sei_recovery_frame_count = -1;
 			is_empty_sample = GF_TRUE;
 		}
 
 		if (copy_size) {
+			if (!sample_is_ref) {
+				HEVC_VPS *vps;
+				switch (nal_unit_type) {
+				case GF_HEVC_NALU_SLICE_TRAIL_N:
+				case GF_HEVC_NALU_SLICE_TSA_N:
+				case GF_HEVC_NALU_SLICE_STSA_N:
+				case GF_HEVC_NALU_SLICE_RADL_N:
+				case GF_HEVC_NALU_SLICE_RASL_N:
+				case GF_HEVC_NALU_SLICE_RSV_VCL_N10:
+				case GF_HEVC_NALU_SLICE_RSV_VCL_N12:
+				case GF_HEVC_NALU_SLICE_RSV_VCL_N14:
+					vps = &hevc.vps[hevc.s_info.sps->vps_id];
+					if ((u32) temporal_id + 1 < vps->max_sub_layers) {
+						sample_is_ref = GF_TRUE;
+					}
+					break;
+				default:
+					if (nal_unit_type<GF_HEVC_NALU_VID_PARAM)
+						sample_is_ref = GF_TRUE;
+				}
+			}
+
 			if (is_islice)
 				sample_has_islice = GF_TRUE;
 
@@ -6558,6 +6901,7 @@
 						poc_diff = abs(hevc.s_info.poc - last_poc);/*ideally we would need to start the parsing again as poc_diff helps computing max_total_delay*/
 					}
 					last_poc = hevc.s_info.poc;
+					assert(is_slice);
 				}
 
 				/*ref slice, reset poc*/
@@ -6645,18 +6989,30 @@
 		gf_bs_del(sample_data);
 		sample_data = NULL;
 		e = gf_isom_add_sample(import->dest, track, di, samp);
-		if (e) goto exit;	
-		
+		if (e) goto exit;
+
 		gf_isom_sample_del(&samp);
 		gf_set_progress("Importing HEVC", (u32) cur_samp, cur_samp+1);
 		cur_samp++;
+
+		//write sample deps
+		if (import->flags & GF_IMPORT_SAMPLE_DEPS) {
+			u32 isLeading, dependsOn, dependedOn;
+			isLeading = 0;
+			dependsOn = (sample_rap_type && (sample_rap_type <= SAP_TYPE_3)) ? 2 : 1;
+			dependedOn = sample_is_ref ? 1 : 2;
+
+			e = gf_isom_sample_set_dep_info(import->dest, track, cur_samp, isLeading, dependsOn, dependedOn, 2);
+			if (e) goto exit;
+		}
+		sample_is_ref = GF_FALSE;
 	}
 
 
 	/*recompute all CTS offsets*/
 	if (has_cts_offset) {
 		u32 last_cts_samp;
-		u64 last_dts, max_cts, min_cts;
+		u64 last_dts, max_cts, min_cts, min_cts_offset;
 		if (!poc_diff) poc_diff = 1;
 		/*no b-frame references, no need to cope with negative poc*/
 		if (!max_total_delay) {
@@ -6668,11 +7024,12 @@
 		last_dts = 0;
 		max_cts = 0;
 		min_cts = (u64) -1;
+		min_cts_offset = (u64) -1;
 		last_cts_samp = 0;
 
 		for (i=0; i<cur_samp; i++) {
 			u64 cts;
-			/*not using descIdx and data_offset will only fecth DTS, CTS and RAP which is all we need*/
+			/*not using descIdx and data_offset will only fetch DTS, CTS and RAP which is all we need*/
 			GF_ISOSample *samp = gf_isom_get_sample_info(import->dest, track, i+1, NULL, NULL);
 			/*poc re-init (RAP and POC to 0, otherwise that's SEI recovery), update base DTS*/
 			if (samp->IsRAP /*&& !samp->CTS_Offset*/)
@@ -6695,6 +7052,9 @@
 
 			samp->CTS_Offset = (u32) (cts - samp->DTS);
 
+			if (samp->CTS_Offset < min_cts_offset)
+				min_cts_offset = samp->CTS_Offset;
+
 			if (max_cts < samp->DTS + samp->CTS_Offset) {
 				max_cts = samp->DTS + samp->CTS_Offset;
 				last_cts_samp = i;
@@ -6728,6 +7088,11 @@
 			}
 			gf_isom_sample_del(&samp);
 		}
+		if (min_cts_offset > 0) {
+			gf_isom_shift_cts_offset(import->dest, track, (s32)min_cts_offset);
+			max_cts -= min_cts_offset;
+			min_cts -= min_cts_offset;
+		}
 		/*and repack table*/
 		gf_isom_set_cts_packing(import->dest, track, GF_FALSE);
 
@@ -6764,7 +7129,7 @@
 
 				for (k=0; k < gf_list_count(lhvc_cfg->param_array); k++) {
 					s_ar = gf_list_get(lhvc_cfg->param_array, k);
-					if (s_ar->type==GF_HEVC_NALU_VID_PARAM) 
+					if (s_ar->type==GF_HEVC_NALU_VID_PARAM)
 						break;
 					s_ar = NULL;
 				}
@@ -6788,7 +7153,7 @@
 		//must use LHV1/LHC1 since no base HEVC in the track
 		gf_isom_lhvc_config_update(import->dest, track, 1, lhvc_cfg, GF_ISOM_LEHVC_ONLY);
 	}
-	//HEVC with optionnal lhvc
+	//HEVC with optional lhvc
 	else {
 		gf_isom_set_visual_info(import->dest, track, di, max_w_b, max_h_b);
 		hevc_set_parall_type(hevc_cfg);
@@ -6804,7 +7169,7 @@
 
 			if (import->flags&GF_IMPORT_SVC_EXPLICIT) {
 				gf_isom_lhvc_config_update(import->dest, track, 1, lhvc_cfg, GF_ISOM_LEHVC_WITH_BASE);
-				gf_isom_modify_alternate_brand(import->dest, GF_4CC('h','v','c','e'), 1);
+				gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_HVCE, 1);
 			} else {
 				gf_isom_lhvc_config_update(import->dest, track, 1, lhvc_cfg, GF_ISOM_LEHVC_WITH_BASE_BACKWARD);
 			}
@@ -6815,13 +7180,28 @@
 		gf_isom_hevc_set_inband_config(import->dest, track, 1);
 	}
 
-	gf_media_update_par(import->dest, track);
+	if (import->flags & GF_IMPORT_USE_CCST) {
+		e = gf_isom_set_image_sequence_coding_constraints(import->dest, track, di, GF_FALSE, GF_FALSE, GF_TRUE, 15);
+		if (e) goto exit;
+	}
+	if (import->is_alpha) {
+		e = gf_isom_set_image_sequence_alpha(import->dest, track, di, GF_FALSE);
+		if (e) goto exit;
+	}
+
+	e = gf_media_update_par(import->dest, track);
+	if (e) goto exit;
+	{
+		/*arbitrary: use the last active SPS*/
+		if (hevc.sps[hevc.sps_active_idx].colour_description_present_flag) {
+			e = gf_isom_set_visual_color_info(import->dest, track, di, GF_ISOM_SUBTYPE_NCLX, hevc.sps[hevc.sps_active_idx].colour_primaries, hevc.sps[hevc.sps_active_idx].transfer_characteristic, hevc.sps[hevc.sps_active_idx].matrix_coeffs, hevc.sps[hevc.sps_active_idx].video_full_range_flag, NULL, 0);
+			if (e) goto exit;
+		}
+	}
 	gf_media_update_bitrate(import->dest, track);
 
 	gf_isom_set_brand_info(import->dest, GF_ISOM_BRAND_ISO4, 1);
 	gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_ISOM, 0);
-	if (has_hevc)
-		gf_isom_modify_alternate_brand(import->dest, GF_4CC('h','v','c','1'), 1);
 
 	if (!vpss && !ppss && !spss) {
 		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Import results: No SPS or PPS found in the bitstream ! Nothing imported\n");
@@ -6841,7 +7221,7 @@
 
 	if (use_opengop_gdr==2) {
 		gf_import_message(import, GF_OK, "OpenGOP detected - adjusting file brand");
-		gf_isom_modify_alternate_brand(import->dest, GF_4CC('i', 's', 'o', '6'), 1);
+		gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_ISO6, 1);
 	}
 
 	/*rewrite ESD*/
@@ -6856,7 +7236,7 @@
 
 	//base layer (i.e layer with layer_id = 0) not found in bitstream
 	//we are importing an LHVC bitstream with external base layer
-	//find this base layer with the imported tracks. 
+	//find this base layer with the imported tracks.
 	//if we find more than one HEVC/AVC track, return an warning
 	if (min_layer_id != 0) {
 		u32 avc_base_track, ref_track_id;
@@ -6890,18 +7270,16 @@
 			}
 		}
 		if (!hevc_base_track && !avc_base_track) {
-			gf_import_message(import, GF_BAD_PARAM, "Using LHVC external base layer, but no base layer not found - NOT SETTING SBAS TRACK REFERENCE!");;
+			gf_import_message(import, GF_BAD_PARAM, "Using LHVC external base layer, but no base layer not found - NOT SETTING SBAS TRACK REFERENCE!");
 		} else {
 			ref_track_id = gf_isom_get_track_id(import->dest, hevc_base_track ? hevc_base_track : avc_base_track);
-			gf_isom_set_track_reference(import->dest, track, GF_4CC('s','b','a','s'), ref_track_id);
+			gf_isom_set_track_reference(import->dest, track, GF_ISOM_REF_BASE, ref_track_id);
 		}
 	}
 
-	// This is a L-HEVC bitstream ... 
-	if ( (has_lhvc && (cur_vps_id >= 0) && (cur_vps_id < 16) && (hevc.vps[cur_vps_id].max_layers > 1))
-	// HEVC with several sublayers
-	|| (max_temporal_id[0] > 0)
-	) {
+	// This is a L-HEVC bitstream, add linf/cstg. If we have a base HEVC with several temporal sublayers, we don't set linf until we split
+	//the sublayers in different tracks
+	if (has_lhvc && (cur_vps_id >= 0) && (cur_vps_id < 16) && (hevc.vps[cur_vps_id].max_layers > 1) ) {
 		gf_lhevc_set_operating_points_information(import->dest, hevc_base_track, track, &hevc.vps[cur_vps_id], max_temporal_id);
 		gf_lhevc_set_layer_information(import->dest, track, &linf[0]);
 
@@ -6921,6 +7299,522 @@
 #endif //GPAC_DISABLE_HEVC
 }
 
+void av1_reset_frame_state(AV1StateFrame *frame_state) {
+	if (frame_state->header_obus) {
+		while (gf_list_count(frame_state->header_obus)) {
+			GF_AV1_OBUArrayEntry *a = (GF_AV1_OBUArrayEntry*)gf_list_get(frame_state->header_obus, 0);
+			if (a->obu) gf_free(a->obu);
+			gf_list_rem(frame_state->header_obus, 0);
+			gf_free(a);
+		}
+		gf_list_del(frame_state->header_obus);
+	}
+
+	if (frame_state->frame_obus) {
+		while (gf_list_count(frame_state->frame_obus)) {
+			GF_AV1_OBUArrayEntry *a = (GF_AV1_OBUArrayEntry*)gf_list_get(frame_state->frame_obus, 0);
+			if (a->obu) gf_free(a->obu);
+			gf_list_rem(frame_state->frame_obus, 0);
+			gf_free(a);
+		}
+		gf_list_del(frame_state->frame_obus);
+	}
+
+	memset(frame_state, 0, sizeof(AV1StateFrame));
+	frame_state->is_first_frame = GF_TRUE;
+}
+
+static Bool probe_webm_matrovska(GF_BitStream *bs)
+{
+	char probe[64], *found = NULL;
+	u64 pos = gf_bs_get_position(bs);
+	u32 read = gf_bs_read_data(bs, probe, sizeof(probe) - 1);
+	gf_bs_seek(bs, pos);
+	probe[read] = 0;
+	found = strstr(probe, "webm");
+	if (found) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("AV1: guessed unsupported WebM container. Aborting.\n"));
+		return GF_TRUE;
+	}
+	found = strstr(probe, "matroska");
+	if (found) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("AV1: guessed unsupported Matrovska container. Aborting.\n"));
+		return GF_TRUE;
+	}
+
+	return GF_FALSE;
+}
+
+static const char* av1_get_bs_syntax_name(GF_Err(*av1_bs_syntax)(GF_BitStream*, AV1State*))
+{
+	if (av1_bs_syntax == aom_av1_parse_temporal_unit_from_section5) {
+		return "OBU section 5";
+	} else if (av1_bs_syntax == aom_av1_parse_temporal_unit_from_annexb) {
+		return "AnnexB";
+	} else if (av1_bs_syntax == aom_av1_parse_temporal_unit_from_ivf) {
+		return "IVF";
+	} else {
+		assert(0);
+		return "Unknown";
+	}
+}
+
+static GF_Err gf_import_aom_av1(GF_MediaImporter *import)
+{
+#ifdef GPAC_DISABLE_AV1
+	return GF_NOT_SUPPORTED;
+#else
+	GF_Err e = GF_OK;
+	GF_AV1Config *av1_cfg = NULL;
+	AV1State state;
+	FILE *mdia = NULL;
+	GF_BitStream *bs = NULL;
+	u32 timescale = 0, dts_inc = 0, track_num = 0, track_id = 0, di = 0, cur_samp = 0;
+	Bool detect_fps;
+	Double FPS = 0.0;
+	u64 fsize, pos = 0;
+	GF_Err (*parse_temporal_unit)(GF_BitStream*, AV1State*) = NULL;
+
+	if (import->flags & GF_IMPORT_PROBE_ONLY) {
+		import->nb_tracks = 1;
+		import->tk_info[0].track_num = 1;
+		import->tk_info[0].type = GF_ISOM_MEDIA_VISUAL;
+		import->tk_info[0].flags = GF_IMPORT_OVERRIDE_FPS | GF_IMPORT_FORCE_PACKED;
+		return GF_OK;
+	}
+
+	memset(&state, 0, sizeof(AV1State));
+	av1_cfg = gf_odf_av1_cfg_new();
+	state.config = av1_cfg;
+	if (import->flags & GF_IMPORT_KEEP_AV1_TEMPORAL_OBU)
+		state.keep_temporal_delim = GF_TRUE;
+
+	mdia = gf_fopen(import->in_name, "rb");
+	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "AV1: cannot find file %s", import->in_name);
+
+	detect_fps = GF_TRUE;
+	FPS = (Double)import->video_fps;
+	if (!FPS) {
+		FPS = GF_IMPORT_DEFAULT_FPS;
+	} else {
+		if (import->video_fps == GF_IMPORT_AUTO_FPS) {
+			import->video_fps = GF_IMPORT_DEFAULT_FPS;	/*fps=auto is handled as auto-detection in h264*/
+		} else {
+			/*fps is forced by the caller*/
+			detect_fps = GF_FALSE;
+		}
+	}
+	get_video_timing(FPS, &timescale, &dts_inc);
+
+	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
+	fsize = gf_bs_get_size(bs);
+	if (!fsize) {
+		gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "[AV1] Error: bitstream size is 0 byte", import->in_name);
+		goto exit;
+	}
+
+	if (probe_webm_matrovska(bs))
+		goto exit;
+
+	if (import->streamFormat) {
+		gf_import_message(import, GF_OK, "AV1: forcing format \"%s\".", import->streamFormat);
+		if (!stricmp(import->streamFormat, "obu")) {
+			parse_temporal_unit = aom_av1_parse_temporal_unit_from_section5;
+		} else if (!stricmp(import->streamFormat, "annexB")) {
+			parse_temporal_unit = aom_av1_parse_temporal_unit_from_annexb;
+		} else if (!stricmp(import->streamFormat, "ivf")) {
+			parse_temporal_unit = aom_av1_parse_temporal_unit_from_ivf;
+		} else {
+			gf_import_message(import, GF_NOT_SUPPORTED, "AV1: unknown bitstream format \"%s\" found. Only \"obu\", \"annexB\" and \"ivf\" found.", import->streamFormat);
+			goto exit;
+		}
+	} else {
+		if (gf_media_probe_ivf(bs)) {
+			e = gf_media_aom_parse_ivf_file_header(bs, &state);
+			parse_temporal_unit = aom_av1_parse_temporal_unit_from_ivf;
+
+			if (detect_fps && (state.FPS != FPS)) {
+				import->video_fps = FPS = state.FPS;
+				get_video_timing(FPS, &timescale, &dts_inc);
+			}
+			pos = gf_bs_get_position(bs);
+		} else if (gf_media_aom_probe_annexb(bs)) {
+			parse_temporal_unit = aom_av1_parse_temporal_unit_from_annexb;
+		} else {
+			gf_bs_seek(bs, pos);
+			e = aom_av1_parse_temporal_unit_from_section5(bs, &state);
+			if (e) {
+				gf_import_message(import, GF_NOT_SUPPORTED, "AV1: couldn't guess bitstream format (IVF then Annex B then Section 5 tested).");
+				goto exit;
+			}
+			parse_temporal_unit = aom_av1_parse_temporal_unit_from_section5;
+		}
+	}
+	gf_bs_seek(bs, pos);
+
+	track_id = 0;
+	if (import->esd) track_id = import->esd->ESID;
+	track_num = gf_isom_new_track(import->dest, track_id, GF_ISOM_MEDIA_VISUAL, timescale);
+	if (!track_num) {
+		e = gf_isom_last_error(import->dest);
+		goto exit;
+	}
+	gf_isom_set_track_enabled(import->dest, track_num, 1);
+	if (import->esd && !import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track_num);
+	import->final_trackID = gf_isom_get_track_id(import->dest, track_num);
+	if (import->esd && import->esd->dependsOnESID) {
+		gf_isom_set_track_reference(import->dest, track_num, GF_ISOM_REF_DECODE, import->esd->dependsOnESID);
+	}
+
+	while (gf_bs_available(bs)) {
+		av1_reset_frame_state(&state.frame_state);
+		pos = gf_bs_get_position(bs);
+
+		/*we process each TU and extract only the necessary OBUs*/
+		if (parse_temporal_unit(bs, &state) != GF_OK) {
+			gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing %s", av1_get_bs_syntax_name(parse_temporal_unit));
+			goto exit;
+		}
+
+		/*add sample*/
+		{
+			u32 frame_obus_idx = 0;
+			GF_ISOSample *samp = gf_isom_sample_new();
+			samp->DTS = (u64)dts_inc*cur_samp;
+			samp->IsRAP = state.frame_state.key_frame ? SAP_TYPE_1 : 0;
+			samp->CTS_Offset = 0;
+
+			for (frame_obus_idx = 0; frame_obus_idx < gf_list_count(state.frame_state.frame_obus); ++frame_obus_idx)
+				samp->dataLength += (u32)((GF_AV1_OBUArrayEntry*)gf_list_get(state.frame_state.frame_obus, frame_obus_idx))->obu_length;
+			samp->data = gf_malloc(samp->dataLength);
+
+			samp->dataLength = 0;
+			while (gf_list_count(state.frame_state.frame_obus)) {
+				GF_AV1_OBUArrayEntry *a = (GF_AV1_OBUArrayEntry*)gf_list_get(state.frame_state.frame_obus, 0);
+				if (a->obu) {
+					memcpy(samp->data + samp->dataLength, a->obu, (size_t)a->obu_length);
+					samp->dataLength += (u32)a->obu_length;
+					gf_free(a->obu);
+				}
+				gf_list_rem(state.frame_state.frame_obus, 0);
+				gf_free(a);
+			}
+
+			if (cur_samp == 0) {
+				while (gf_list_count(state.frame_state.header_obus)) {
+					GF_AV1_OBUArrayEntry *a = (GF_AV1_OBUArrayEntry*)gf_list_get(state.frame_state.header_obus, 0);
+					gf_list_add(av1_cfg->obu_array, a);
+					gf_list_rem(state.frame_state.header_obus, 0);
+				}
+
+				e = gf_isom_av1_config_new(import->dest, track_num, av1_cfg, NULL, NULL, &di);
+				if (e) goto exit;
+
+				gf_import_message(import, GF_OK, "Importing AV1 from %s file - size %dx%d bit-depth %d FPS %d/%d", av1_get_bs_syntax_name(parse_temporal_unit), state.width, state.height, state.bit_depth, timescale, dts_inc);
+
+			} else {
+				/*safety check: we only support static metadata*/
+				if (gf_list_count(state.frame_state.header_obus) > gf_list_count(av1_cfg->obu_array)) {
+					gf_import_message(import, GF_NOT_SUPPORTED, "More header OBUs in frame state than in config");
+					goto exit;
+				}
+
+				while (gf_list_count(state.frame_state.header_obus)) {
+					u32 obu_array_index = 0;
+					GF_AV1_OBUArrayEntry *a_hdr = (GF_AV1_OBUArrayEntry*)gf_list_get(state.frame_state.header_obus, 0);
+					for (obu_array_index = 0; obu_array_index < gf_list_count(av1_cfg->obu_array); ++obu_array_index) {
+						GF_AV1_OBUArrayEntry *a_cfg = (GF_AV1_OBUArrayEntry*)gf_list_get(av1_cfg->obu_array, obu_array_index);
+						if (a_cfg->obu_type == a_hdr->obu_type) {
+							if (a_cfg->obu_length != a_hdr->obu_length || memcmp(a_cfg->obu, a_hdr->obu, (size_t)a_hdr->obu_length)) {
+								gf_import_message(import, GF_NOT_SUPPORTED, "Changing AV1 header OBUs detected for file %s", import->in_name);
+								goto exit;
+							}
+						}
+					}
+					gf_list_rem(state.frame_state.header_obus, 0);
+					if (a_hdr->obu) gf_free(a_hdr->obu);
+					gf_free(a_hdr);
+				}
+
+			}
+
+			e = gf_isom_add_sample(import->dest, track_num, di, samp);
+			if (e) goto exit;
+			cur_samp++;
+
+			//write sample deps
+			if (import->flags & GF_IMPORT_SAMPLE_DEPS) {
+				u32 isLeading, dependsOn, dependedOn, hasRedundant;
+				isLeading = 0;
+				dependsOn = samp->IsRAP ? 2 : 1;
+				dependedOn = state.frame_state.refresh_frame_flags ? 1 : 2;
+				hasRedundant = 0;
+
+				e = gf_isom_sample_set_dep_info(import->dest, track_num, cur_samp, isLeading, dependsOn, dependedOn, hasRedundant);
+				if (e) goto exit;
+			}
+
+			gf_isom_sample_del(&samp);
+
+			gf_set_progress("Importing AV1", gf_bs_get_position(bs), fsize);
+		}
+	}
+
+	gf_set_progress("Importing AV1", (u32)cur_samp, cur_samp);
+	e = gf_isom_set_visual_info(import->dest, track_num, di, state.width, state.height);
+	if (e) goto exit;
+	e = gf_media_update_par(import->dest, track_num);
+	if (e) goto exit;
+
+	e = gf_isom_set_visual_color_info(import->dest, track_num, di, GF_ISOM_SUBTYPE_NCLX, state.color_primaries, state.transfer_characteristics, state.matrix_coefficients, state.color_range, NULL, 0);
+	if (e) goto exit;
+
+	gf_media_update_bitrate(import->dest, track_num);
+	if (import->flags & GF_IMPORT_USE_CCST) {
+		e = gf_isom_set_image_sequence_coding_constraints(import->dest, track_num, di, GF_FALSE, GF_FALSE, GF_TRUE, 15);
+		if (e) goto exit;
+	}
+	if (import->is_alpha) {
+		e = gf_isom_set_image_sequence_alpha(import->dest, track_num, di, GF_FALSE);
+		if (e) goto exit;
+	}
+
+	/*rewrite ESD*/
+	if (import->esd) {
+		if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig*)gf_odf_desc_new(GF_ODF_SLC_TAG);
+		import->esd->slConfig->predefined = 2;
+		import->esd->slConfig->timestampResolution = timescale;
+		if (import->esd->decoderConfig) gf_odf_desc_del((GF_Descriptor *)import->esd->decoderConfig);
+		import->esd->decoderConfig = gf_isom_get_decoder_config(import->dest, track_num, 1);
+		gf_isom_change_mpeg4_description(import->dest, track_num, 1, import->esd);
+	}
+
+	gf_isom_set_brand_info(import->dest, GF_ISOM_BRAND_ISO4, 1);
+	gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_ISOM, 0);
+	gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_AV01, 1);
+
+exit:
+	av1_reset_frame_state(&state.frame_state);
+	gf_odf_av1_cfg_del(av1_cfg);
+	gf_bs_del(bs);
+	gf_fclose(mdia);
+	return e;
+#endif /*GPAC_DISABLE_AV1*/
+}
+
+
+static GF_Err gf_import_vp9(GF_MediaImporter *import)
+{
+#ifdef GPAC_DISABLE_VP9
+	return GF_NOT_SUPPORTED;
+#else
+	GF_Err e = GF_OK;
+	GF_VPConfig *vp9_cfg = NULL;
+	FILE *mdia = NULL;
+	GF_BitStream *bs = NULL;
+	u32 timescale = 0, dts_inc = 0, track_num = 0, track_id = 0, di = 0, cur_samp = 0, codec_fourcc = 0, num_frames = 0;
+	int width = 0, height = 0, renderWidth, renderHeight;
+	Double FPS = 0.0;
+	u64 pos = 0, fsize = 0;
+	Bool forced_fps = GF_FALSE;
+
+	if (import->flags & GF_IMPORT_PROBE_ONLY) {
+		import->nb_tracks = 1;
+		import->tk_info[0].track_num = 1;
+		import->tk_info[0].type = GF_ISOM_MEDIA_VISUAL;
+		import->tk_info[0].flags = GF_IMPORT_OVERRIDE_FPS | GF_IMPORT_FORCE_PACKED;
+		return GF_OK;
+	}
+
+	vp9_cfg = gf_odf_vp_cfg_new();
+
+	mdia = gf_fopen(import->in_name, "rb");
+	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "[VP9] cannot find file %s", import->in_name);
+	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
+	fsize = gf_bs_get_size(bs);
+	if (!fsize) {
+		gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "[VP9] Error: bitstream size is 0 byte", import->in_name);
+		goto exit;
+	}
+
+	if (probe_webm_matrovska(bs))
+		goto exit;
+
+	e = gf_media_parse_ivf_file_header(bs, &width, &height, &codec_fourcc, &timescale, &dts_inc, &num_frames);
+	if (e)
+		goto exit;
+
+	FPS = (Double)import->video_fps;
+	if (!FPS || import->video_fps == GF_IMPORT_AUTO_FPS) {
+		FPS = (double)timescale / dts_inc;
+	} else {
+		/*fps is forced by the caller*/
+		get_video_timing(FPS, &timescale, &dts_inc);
+		forced_fps = GF_TRUE;
+	}
+
+	track_id = 0;
+	if (import->esd) track_id = import->esd->ESID;
+	track_num = gf_isom_new_track(import->dest, track_id, GF_ISOM_MEDIA_VISUAL, timescale);
+	if (!track_num) {
+		e = gf_isom_last_error(import->dest);
+		goto exit;
+	}
+	gf_isom_set_track_enabled(import->dest, track_num, 1);
+	if (import->esd && !import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track_num);
+	import->final_trackID = gf_isom_get_track_id(import->dest, track_num);
+	if (import->esd && import->esd->dependsOnESID) {
+		gf_isom_set_track_reference(import->dest, track_num, GF_ISOM_REF_DECODE, import->esd->dependsOnESID);
+	}
+
+	while (gf_bs_available(bs)) {
+		Bool key_frame = GF_FALSE;
+		u64 frame_size = 0, pts = 0;
+		int num_frames_in_superframe = 0, superframe_index_size = 0, i = 0;
+		u32 frame_sizes[VP9_MAX_FRAMES_IN_SUPERFRAME];
+
+		GF_Err e = gf_media_parse_ivf_frame_header(bs, &frame_size, &pts);
+		if (e) goto exit;
+
+		pos = gf_bs_get_position(bs);
+		if (gf_bs_available(bs) < frame_size) {
+			gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "[VP9] IVF frame size is %u but there is only "LLU" bytes left.", frame_size, gf_bs_available(bs));
+			goto exit;
+		}
+
+		/*check if it is a superframe*/
+		if (vp9_parse_superframe(bs, frame_size, &num_frames_in_superframe, frame_sizes, &superframe_index_size) != GF_OK) {
+			gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "[VP9] Error parsing sample %u superframe structure", cur_samp);
+			goto exit;
+		}
+
+		for (i = 0; i < num_frames_in_superframe; ++i) {
+			u64 pos2 = gf_bs_get_position(bs);
+			if (vp9_parse_sample(bs, vp9_cfg, &key_frame, &width, &height, &renderWidth, &renderHeight) != GF_OK) {
+				gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "[VP9] Error parsing sample %u", cur_samp);
+				goto exit;
+			}
+			e = gf_bs_seek(bs, pos2 + frame_sizes[i]);
+			if (e) {
+				gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "[VP9] Seek bad param (offset "LLU") at sample %u (1)", pos2 + frame_sizes[i], cur_samp);
+				goto exit;
+			}
+		}
+		if (gf_bs_get_position(bs) + superframe_index_size != pos + frame_size) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[VP9] Inconsistent IVF frame size of "LLU" bytes at sample %u.\n", frame_size, cur_samp));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, (" Detected %d frames (+ %d bytes for the superframe index):\n", num_frames_in_superframe, superframe_index_size));
+			for (i = 0; i < num_frames_in_superframe; ++i) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, (" superframe %d, size is %u bytes\n", i, frame_sizes[i]));
+			}
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("\n"));
+		}
+		e = gf_bs_seek(bs, pos + frame_size);
+		if (e) {
+			gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "[VP9] Seek bad param (offset "LLU") at sample %u (2)", pos + frame_size, cur_samp);
+			goto exit;
+		}
+
+		/*add sample*/
+		{
+			GF_ISOSample *samp = gf_isom_sample_new();
+			samp->DTS = forced_fps ? (u64)dts_inc*cur_samp : pts;
+			samp->IsRAP = key_frame ? SAP_TYPE_1 : 0;
+			samp->CTS_Offset = 0;
+			samp->dataLength = (u32)(gf_bs_get_position(bs) - pos);
+			assert(samp->dataLength == frame_size);
+			samp->data = gf_malloc(samp->dataLength);
+			gf_bs_seek(bs, pos);
+			gf_bs_read_data(bs, samp->data, samp->dataLength);
+
+			if (cur_samp == 0) {
+				e = gf_isom_vp_config_new(import->dest, track_num, vp9_cfg, NULL, NULL, &di, GF_TRUE);
+				if (e) goto exit;
+			}
+
+			e = gf_isom_add_sample(import->dest, track_num, di, samp);
+			if (e) goto exit;
+
+			gf_isom_sample_del(&samp);
+
+			gf_set_progress("Importing VP9", gf_bs_get_position(bs), fsize);
+			cur_samp++;
+		}
+	}
+
+	gf_set_progress("Importing VP9", cur_samp, cur_samp);
+	e = gf_isom_set_visual_info(import->dest, track_num, di, width, height);
+#if 0 //TODO: find streams when this happens in render_size()
+	if (width != renderWidth) {
+		e = gf_isom_set_pixel_aspect_ratio(import->dest, track_num, di, , );
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[VP9] Error setting aspect ratio (%d:%d) with resolution %dx%d\n", xxx, yyy, width, height));
+		}
+	}
+#endif
+
+	e = gf_isom_set_track_layout_info(import->dest, track_num, renderWidth << 16, renderHeight << 16, 0, 0, 0);
+	if (e) goto exit;
+
+	gf_media_update_bitrate(import->dest, track_num);
+
+	if (import->flags & GF_IMPORT_USE_CCST) {
+		e = gf_isom_set_image_sequence_coding_constraints(import->dest, track_num, di, GF_FALSE, GF_FALSE, GF_TRUE, 15);
+		if (e) goto exit;
+	}
+	if (import->is_alpha) {
+		e = gf_isom_set_image_sequence_alpha(import->dest, track_num, di, GF_FALSE);
+		if (e) goto exit;
+	}
+
+	/*rewrite ESD*/
+	if (import->esd) {
+		if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig*)gf_odf_desc_new(GF_ODF_SLC_TAG);
+		import->esd->slConfig->predefined = 2;
+		import->esd->slConfig->timestampResolution = timescale;
+		if (import->esd->decoderConfig) gf_odf_desc_del((GF_Descriptor *)import->esd->decoderConfig);
+		import->esd->decoderConfig = gf_isom_get_decoder_config(import->dest, track_num, 1);
+		gf_isom_change_mpeg4_description(import->dest, track_num, 1, import->esd);
+	}
+
+exit:
+	gf_odf_vp_cfg_del(vp9_cfg);
+	gf_bs_del(bs);
+	gf_fclose(mdia);
+	return e;
+#endif /*GPAC_DISABLE_VP9*/
+}
+
+static GF_Err gf_import_ivf(GF_MediaImporter *import)
+{
+	GF_Err e = GF_OK;
+	int width = 0, height = 0;
+	u32 codec_fourcc = 0, frame_rate = 0, time_scale = 0, num_frames = 0;
+	FILE *mdia = NULL;
+	GF_BitStream *bs = NULL;
+
+	mdia = gf_fopen(import->in_name, "rb");
+	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "Cannot find file %s", import->in_name);
+	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
+
+	e = gf_media_parse_ivf_file_header(bs, &width, &height, &codec_fourcc, &frame_rate, &time_scale, &num_frames);
+	gf_fclose(mdia);
+	gf_bs_del(bs);
+	if (e)
+		return e;
+
+	switch (codec_fourcc) {
+	case GF_4CC('A', 'V', '0', '1'):
+		return gf_import_aom_av1(import);
+	case GF_4CC('V', 'P', '9', '0'):
+		return gf_import_vp9(import);
+	default: {
+		char *FourCC = (char*)&codec_fourcc;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[IVF] Wrong codec FourCC. Only 'AV01' supported, got '%c%c%c%c'\n", FourCC[3], FourCC[2], FourCC[1], FourCC[0]));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	}
+}
+
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
 #ifndef GPAC_DISABLE_OGG
@@ -6931,10 +7825,11 @@
 {
 	if (feof(f_in)) return GF_FALSE;
 	while (ogg_sync_pageout(oy, oggpage ) != 1 ) {
-		char *buffer = ogg_sync_buffer(oy, OGG_BUFFER_SIZE);
-		u32 bytes = (u32) fread(buffer, sizeof(char), OGG_BUFFER_SIZE, f_in);
-		ogg_sync_wrote(oy, bytes);
+		char *buffer;
 		if (feof(f_in)) return GF_TRUE;
+		buffer = ogg_sync_buffer(oy, OGG_BUFFER_SIZE);
+		u32 bytes = (u32) fread(buffer, sizeof(char), OGG_BUFFER_SIZE, f_in);
+		if (ogg_sync_wrote(oy, bytes)) return GF_FALSE;
 	}
 	return GF_TRUE;
 }
@@ -6976,6 +7871,10 @@
 			ogg_stream_clear(&os);
 			break;
 		}
+		if (!is_video && (oggpage.body_len >= 8) && !strncmp((char *)oggpage.body, "OpusHead", 6)) {
+			ogg_stream_clear(&os);
+			break;
+		}
 		ogg_stream_clear(&os);
 		serial_no = 0;
 	}
@@ -7039,8 +7938,10 @@
 				gf_bs_del(bs);
 				import->tk_info[import->nb_tracks].video_info.FPS = fps_num;
 				import->tk_info[import->nb_tracks].video_info.FPS /= fps_den;
-				import->tk_info[import->nb_tracks].media_type = GF_4CC('t','h','e','o');
-			} else if ((oggpacket.bytes >= 7) && !strncmp((char *)&oggpacket.packet[1], "vorbis", 6)) {
+				import->tk_info[import->nb_tracks].media_type = GF_MEDIA_TYPE_THEO;
+			} else if ((oggpacket.bytes >= 7)
+				&& (!strncmp((char *)&oggpacket.packet[1], "vorbis", 6) || !strncmp((char *)&oggpacket.packet[1], "Opus", 4))
+				) {
 				import->tk_info[import->nb_tracks].type = GF_ISOM_MEDIA_AUDIO;
 				import->tk_info[import->nb_tracks].flags = 0;
 			}
@@ -7169,7 +8070,7 @@
 					gf_bs_del(bs);
 					bs = NULL;
 					import->esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-					import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_OGG;
+					import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_THEORA;
 
 					e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, NULL, NULL, &di);
 					if (e) goto exit;
@@ -7232,6 +8133,213 @@
 	return e;
 }
 
+static void vorbis_release(ogg_audio_codec_desc *codec)
+{
+	if (codec->parserPrivateState) {
+		GF_VorbisParser *vp = (GF_VorbisParser*)codec->parserPrivateState;
+		if (vp->vbs) gf_bs_del(vp->vbs);
+		gf_free(vp);
+	}
+}
+
+static GF_Err vorbis_process(ogg_audio_codec_desc *codec, char *data, u32 data_length,
+	void *importer, Bool *destroy_esd, u32 *track, u32 *di, u64 *duration, int *block_size)
+{
+	GF_VorbisParser *vp = NULL;
+	GF_Err e = GF_OK;
+	GF_MediaImporter *import = (GF_MediaImporter*)importer;
+
+	if (!codec || !import || !track || !di || !destroy_esd || !duration || !block_size)
+		return GF_BAD_PARAM;
+
+	vp = (GF_VorbisParser*)codec->parserPrivateState;
+
+	if (!vp || vp->num_headers<3) {
+		if (!gf_vorbis_parse_header(codec, (char*)data, data_length)) {
+			e = GF_NON_COMPLIANT_BITSTREAM;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("Corrupted OGG Vorbis header"));
+			goto exit;
+		}
+		vp = (GF_VorbisParser*)codec->parserPrivateState;
+
+		/*copy headers*/
+		gf_bs_write_u16(vp->vbs, data_length);
+		gf_bs_write_data(vp->vbs, (char *)data, data_length);
+		vp->num_headers++;
+
+		/*let's go, create the track*/
+		if (vp->num_headers == 3) {
+			if (!codec->parserPrivateState) {
+				e = GF_NON_COMPLIANT_BITSTREAM;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("Corrupted OGG Vorbis headers found"));
+				goto exit;
+			}
+
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("OGG Vorbis import - sample rate %d - %d channel%s", codec->sample_rate, codec->channels, (codec->channels>1) ? "s" : ""));
+
+			if (!import->esd) {
+				*destroy_esd = GF_TRUE;
+				import->esd = gf_odf_desc_esd_new(0);
+			}
+			*track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_AUDIO, codec->sample_rate);
+			if (!*track) {
+				e = gf_isom_last_error(import->dest);
+				goto exit;
+			}
+			gf_isom_set_track_enabled(import->dest, *track, 1);
+			if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, *track);
+			import->final_trackID = import->esd->ESID;
+			if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *)gf_odf_desc_new(GF_ODF_DCD_TAG);
+			if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *)gf_odf_desc_new(GF_ODF_SLC_TAG);
+			import->esd->slConfig->timestampResolution = codec->sample_rate;
+			if (!import->esd->decoderConfig->decoderSpecificInfo) import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *)gf_odf_desc_new(GF_ODF_DSI_TAG);
+			gf_bs_get_content(vp->vbs, &import->esd->decoderConfig->decoderSpecificInfo->data, &import->esd->decoderConfig->decoderSpecificInfo->dataLength);
+			gf_bs_del(vp->vbs);
+			vp->vbs = NULL;
+			import->esd->decoderConfig->streamType = GF_STREAM_AUDIO;
+			import->esd->decoderConfig->avgBitrate = vp->avg_r;
+			import->esd->decoderConfig->maxBitrate = (vp->max_r>0) ? vp->max_r : vp->avg_r;
+			import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_OGG;
+
+			e = gf_isom_new_mpeg4_description(import->dest, *track, import->esd, NULL, NULL, di);
+			if (e) goto exit;
+			gf_isom_set_audio_info(import->dest, *track, *di, codec->sample_rate, (codec->channels>1) ? 2 : 1, 16, import->asemode);
+
+			{
+				Double d = import->duration;
+				d *= codec->sample_rate;
+				d /= 1000;
+				*duration = (u64)d;
+			}
+		}
+		
+		*block_size = 0;
+		return GF_OK;
+	}
+
+	*block_size = gf_vorbis_check_frame(vp, (char *)data, data_length);
+
+exit:
+	return e;
+}
+
+static void opus_release(ogg_audio_codec_desc *codec)
+{
+	if (codec->parserPrivateState) {
+		GF_OpusSpecificBox *opus = (GF_OpusSpecificBox*)codec->parserPrivateState;
+		gf_free(opus);
+	}
+}
+
+static GF_Err opus_process(ogg_audio_codec_desc *codec, char *data, u32 data_length,
+	void *importer, Bool *destroy_esd, u32 *track, u32 *di, u64 *duration, int *block_size)
+{
+	GF_OpusSpecificBox *opus = NULL;
+	GF_Err e = GF_OK;
+	GF_MediaImporter *import = (GF_MediaImporter*)importer;
+	GF_BitStream *bs = NULL;
+	char tag[8];
+
+	if (!codec || !import || !track || !di || !destroy_esd || !duration || !block_size)
+		return GF_BAD_PARAM;
+
+	*block_size = 0;
+	opus = (GF_OpusSpecificBox*)codec->parserPrivateState;
+	bs = gf_bs_new(data, data_length, GF_BITSTREAM_READ);
+	gf_bs_read_data(bs, tag, 8);
+
+	if (!opus) {
+		/*Identification Header*/
+		u8 val;
+		val = gf_bs_read_u8(bs); /*version*/
+		if (val != 1) {
+			e = GF_NON_COMPLIANT_BITSTREAM;
+			goto exit;
+		}
+
+		GF_SAFEALLOC(opus, GF_OpusSpecificBox);
+		codec->parserPrivateState = (void*)opus;
+		codec->channels = opus->OutputChannelCount = gf_bs_read_u8(bs);
+		opus->PreSkip = gf_bs_read_u16_le(bs);
+		opus->InputSampleRate = gf_bs_read_u32_le(bs);
+		codec->sample_rate = 48000; /*Opus always outputs 48000 but stores the original opus->InputSampleRate rate*/
+		opus->OutputGain = gf_bs_read_u16_le(bs);
+
+		//TODO: parse and link to MP4 channel layouts - for now we just copy it binary as it is the same from Ogg to MP4
+		opus->ChannelMappingFamily = gf_bs_read_u8(bs);
+		if (opus->ChannelMappingFamily != 0) {
+			opus->StreamCount = gf_bs_read_u8(bs);
+			opus->CoupledCount = gf_bs_read_u8(bs);
+			gf_bs_read_data(bs, (char *) opus->ChannelMapping, opus->OutputChannelCount);
+		}
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("OGG Opus import - sample rate %d - %d channel%s", codec->sample_rate, codec->channels, (codec->channels>1) ? "s" : ""));
+
+		if (!import->esd) {
+			*destroy_esd = GF_TRUE;
+			import->esd = gf_odf_desc_esd_new(0);
+		}
+		*track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_AUDIO, 48000/*block sizes are alway in always in 48kHz*/);
+		if (!*track) {
+			e = gf_isom_last_error(import->dest);
+			goto exit;
+		}
+		gf_isom_set_track_enabled(import->dest, *track, 1);
+		if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, *track);
+		import->final_trackID = import->esd->ESID;
+		if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *)gf_odf_desc_new(GF_ODF_DCD_TAG);
+		if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *)gf_odf_desc_new(GF_ODF_SLC_TAG);
+		import->esd->slConfig->timestampResolution = 48000; /*block sizes are alway in always in 48kHz*/
+
+		import->esd->decoderConfig->streamType = GF_STREAM_AUDIO;
+		import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_OPUS;
+
+		if (!import->esd->decoderConfig->decoderSpecificInfo) import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *)gf_odf_desc_new(GF_ODF_DSI_TAG);
+		e = gf_isom_opus_config_new(import->dest, *track, opus, NULL, NULL, di);
+		if (e) goto exit;
+
+		gf_isom_set_audio_info(import->dest, *track, *di, codec->sample_rate, codec->channels, 16, import->asemode);
+		gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_OPUS, 0);
+
+		{
+			Double d = import->duration;
+			d *= codec->sample_rate;
+			d /= 1000;
+			*duration = (u64)d;
+		}
+	} else if (!memcmp(tag, "OpusTags", sizeof(tag))) {
+		/*skip*/
+		goto exit;
+	} else {
+		/*consider the whole packet as Ogg packets and ISOBMFF samples for Opus are framed similarly*/
+		static const int OpusFrameDurIn48k[] = { 480, 960, 1920, 2880, 480, 960, 1920, 2880, 480, 960, 1920, 2880,
+			480, 960, 480, 960,
+			120, 240, 480, 960, 120, 240, 480, 960, 120, 240, 480, 960, 120, 240, 480, 960,
+		};
+		int TOC_config = (data[0] & 0xf8) >> 3;
+		//int s = (data[0] & 0x04) >> 2;
+		*block_size = OpusFrameDurIn48k[TOC_config];
+
+		int c = data[0] & 0x03;
+		if (c == 1 || c == 2) {
+			*block_size *= 2;
+		} else if (c == 3) {
+			/*unknown number of frames*/
+			int num_frames = data[1] & 0x3f;
+			*block_size *= num_frames;
+		}
+	}
+
+exit:
+	gf_bs_del(bs);
+	return GF_OK;
+}
+
+static ogg_audio_codec_desc ogg_audio_codec_descs[] = {
+	{ "\1vorbis", NULL/*GF_VorbisParser*/, 0, 0, vorbis_process, vorbis_release },
+	{ "OpusHead", NULL/*GF_OpusParser*/, 0, 0, opus_process, opus_release },
+};
+
 GF_Err gf_import_ogg_audio(GF_MediaImporter *import)
 {
 #if defined(GPAC_DISABLE_AV_PARSERS)
@@ -7245,12 +8353,11 @@
 	s32 block_size;
 	GF_ISOSample *samp;
 	Bool destroy_esd, go;
-	u32 serial_no, sno, num_headers;
+	u32 serial_no, sno;
 	ogg_packet oggpacket;
 	ogg_page oggpage;
 	ogg_stream_state os;
-	GF_VorbisParser vp;
-	GF_BitStream *vbs;
+	ogg_audio_codec_desc *codec = NULL;
 	FILE *f_in;
 
 	if (import->flags & GF_IMPORT_PROBE_ONLY) return GF_OK;
@@ -7271,15 +8378,14 @@
 	tot_size = gf_ftell(f_in);
 	gf_fseek(f_in, 0, SEEK_SET);
 
-	destroy_esd = GF_FALSE;
+	destroy_esd = import->esd ? GF_FALSE : GF_TRUE;
 	samp = gf_isom_sample_new();
 	/*avoids gcc warnings*/
-	track = num_headers = 0;
+	track = 0;
 	duration = 0;
 
 	ogg_sync_init(&oy);
 
-	vbs = NULL;
 	serial_no = 0;
 	go = GF_TRUE;
 	while (go) {
@@ -7297,14 +8403,29 @@
 				serial_no = 0;
 				continue;
 			}
-			if ((oggpacket.bytes < 7) || strncmp((char *)&oggpacket.packet[1], "vorbis", 6)) {
+			if (oggpacket.bytes < 7) {
 				ogg_stream_clear(&os);
 				serial_no = 0;
 				continue;
 			}
-			num_headers = 0;
-			memset(&vp, 0, sizeof(GF_VorbisParser));
-			vbs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+			/*find codec*/
+			{
+				size_t size = sizeof(ogg_audio_codec_descs) / sizeof(ogg_audio_codec_desc);
+				size_t i;
+				for (i = 0; i < size; ++i) {
+					if (!strncmp((char *)oggpacket.packet, ogg_audio_codec_descs[i].codec_name, strlen(ogg_audio_codec_descs[i].codec_name))) {
+						codec = &ogg_audio_codec_descs[i];
+						break;
+					}
+				}
+				if (i == size) {
+					ogg_stream_clear(&os);
+					serial_no = 0;
+					continue;
+				}
+			}
+
 			continue;
 		}
 		/*FIXME - check end of stream for concatenated files?*/
@@ -7312,65 +8433,14 @@
 		/*not our stream*/
 		if (ogg_stream_pagein(&os, &oggpage) != 0) continue;
 
-
-
 		while (ogg_stream_packetout(&os, &oggpacket ) > 0 ) {
-			if (num_headers<3) {
-				if (!gf_vorbis_parse_header(&vp, (char*)oggpacket.packet, oggpacket.bytes)) {
-					e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Corrupted OGG Vorbis header");
-					goto exit;
-				}
-
-				/*copy headers*/
-				gf_bs_write_u16(vbs, oggpacket.bytes);
-				gf_bs_write_data(vbs, (char *)oggpacket.packet, oggpacket.bytes);
-				num_headers++;
-
-				/*let's go, create the track*/
-				if (num_headers==3) {
-					if (!vp.is_init) {
-						e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Corrupted OGG Vorbis headers found");
-						goto exit;
-					}
-
-					gf_import_message(import, GF_OK, "OGG Vorbis import - sample rate %d - %d channel%s", vp.sample_rate, vp.channels, (vp.channels>1) ? "s" : "");
-
-					if (!import->esd) {
-						destroy_esd = GF_TRUE;
-						import->esd = gf_odf_desc_esd_new(0);
-					}
-					track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_AUDIO, vp.sample_rate);
-					if (!track) goto exit;
-					gf_isom_set_track_enabled(import->dest, track, 1);
-					if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-					import->final_trackID = import->esd->ESID;
-					if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-					if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-					import->esd->slConfig->timestampResolution = vp.sample_rate;
-					if (!import->esd->decoderConfig->decoderSpecificInfo) import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-					gf_bs_get_content(vbs, &import->esd->decoderConfig->decoderSpecificInfo->data, &import->esd->decoderConfig->decoderSpecificInfo->dataLength);
-					gf_bs_del(vbs);
-					vbs = NULL;
-					import->esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-					import->esd->decoderConfig->avgBitrate = vp.avg_r;
-					import->esd->decoderConfig->maxBitrate = (vp.max_r>0) ? vp.max_r : vp.avg_r;
-					import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_OGG;
-
-					e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, NULL, NULL, &di);
-					if (e) goto exit;
-					gf_isom_set_audio_info(import->dest, track, di, vp.sample_rate, (vp.channels>1) ? 2 : 1, 16);
-
-					{
-						Double d = import->duration;
-						d *= vp.sample_rate;
-						d /= 1000;
-						duration = (u64) d;
-					}
-				}
-				continue;
+			if (!codec) {
+				e = gf_import_message(import, GF_NOT_SUPPORTED, "OGG: unrecognized codec");
+				goto exit;
 			}
 
-			block_size = gf_vorbis_check_frame(&vp, (char *)oggpacket.packet, oggpacket.bytes);
+			e = codec->process(codec, oggpacket.packet, oggpacket.bytes, import, &destroy_esd, &track, &di, &duration, &block_size);
+			if (e) goto exit;
 			if (!block_size) continue;
 
 			/*add packet*/
@@ -7399,13 +8469,21 @@
 		gf_set_progress("Importing OGG Audio", (u32) tot_size, (u32) tot_size);
 
 		gf_media_update_bitrate(import->dest, track);
+
+		/*rewrite ESD*/
+		if (import->esd) {
+			if (import->esd->decoderConfig) gf_odf_desc_del((GF_Descriptor *)import->esd->decoderConfig);
+			import->esd->decoderConfig = gf_isom_get_decoder_config(import->dest, track, 1);
+			gf_isom_change_mpeg4_description(import->dest, track, 1, import->esd);
+		}
 	}
 
 exit:
 	gf_isom_sample_del(&samp);
-	if (vbs) gf_bs_del(vbs);
 	if (serial_no) ogg_stream_clear(&os);
 	ogg_sync_clear(&oy);
+	if (codec && codec->release) codec->release(codec);
+
 	if (import->esd && destroy_esd) {
 		gf_odf_desc_del((GF_Descriptor *) import->esd);
 		import->esd = NULL;
@@ -7417,7 +8495,6 @@
 
 #endif /*GPAC_DISABLE_OGG*/
 
-
 GF_Err gf_import_raw_unit(GF_MediaImporter *import)
 {
 	GF_Err e;
@@ -7570,7 +8647,7 @@
 			if (st==GF_STREAM_SCENE) {
 				mtype = GF_ISOM_MEDIA_SCENE;
 				name = (char *) ( (oti==GPAC_OTI_SCENE_LASER) ? "LASeR Scene" : "BIFS Scene" );
-				stype = (oti==GPAC_OTI_SCENE_LASER) ? GF_4CC('L','A','S','R') : GF_4CC('B','I','F','S');
+				stype = (oti==GPAC_OTI_SCENE_LASER) ? GF_MEDIA_TYPE_LASR : GF_MEDIA_TYPE_BIFS;
 				in_root_od = GF_TRUE;
 			}
 			else if (st==GF_STREAM_VISUAL) {
@@ -7580,20 +8657,20 @@
 				case GPAC_OTI_VIDEO_SVC:
 				case GPAC_OTI_VIDEO_MVC:
 					name = "AVC/H264 Video";
-					stype = GF_4CC('H','2','6','4');
+					stype = GF_MEDIA_TYPE_H264;
 					break;
 				case GPAC_OTI_VIDEO_HEVC:
 				case GPAC_OTI_VIDEO_LHVC:
 					name = "HEVC Video";
-					stype = GF_4CC('H','E','V','C');
+					stype = GF_MEDIA_TYPE_HEVC;
 					break;
 				case GPAC_OTI_VIDEO_MPEG4_PART2:
 					name = "MPEG-4 Video";
-					stype = GF_4CC('M','P','4','V');
+					stype = GF_MEDIA_TYPE_MP4V;
 					break;
 				case GPAC_OTI_VIDEO_MPEG1:
 					name = "MPEG-1 Video";
-					stype = GF_4CC('M','P','1','V');
+					stype = GF_MEDIA_TYPE_MP1V;
 					break;
 				case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
 				case GPAC_OTI_VIDEO_MPEG2_MAIN:
@@ -7602,15 +8679,15 @@
 				case GPAC_OTI_VIDEO_MPEG2_HIGH:
 				case GPAC_OTI_VIDEO_MPEG2_422:
 					name = "MPEG-2 Video";
-					stype = GF_4CC('M','P','2','V');
+					stype = GF_MEDIA_TYPE_MP2V;
 					break;
 				case GPAC_OTI_IMAGE_JPEG:
 					name = "JPEG Image";
-					stype = GF_4CC('J','P','E','G');
+					stype = GF_MEDIA_TYPE_JPEG;
 					break;
 				case GPAC_OTI_IMAGE_PNG:
 					name = "PNG Image";
-					stype = GF_4CC('P','N','G',' ');
+					stype = GF_MEDIA_TYPE_PNG;
 					break;
 				}
 			}
@@ -7619,15 +8696,15 @@
 				switch (oti) {
 				case GPAC_OTI_AUDIO_MPEG2_PART3:
 					name = "MPEG-2 Audio";
-					stype = GF_4CC('M','P','2','A');
+					stype = GF_MEDIA_TYPE_MP2A;
 					break;
 				case GPAC_OTI_AUDIO_MPEG1:
 					name = "MPEG-1 Audio";
-					stype = GF_4CC('M','P','1','A');
+					stype = GF_MEDIA_TYPE_MP1A;
 					break;
 				case GPAC_OTI_AUDIO_AAC_MPEG4:
 					name = "MPEG-4 Audio";
-					stype = GF_4CC('M','P','4','A');
+					stype = GF_MEDIA_TYPE_MP4A;
 					break;
 				}
 			}
@@ -7747,6 +8824,7 @@
 	u32 nb_video, nb_video_configured;
 	u32 nb_audio, nb_audio_configured;
 
+	Bool is_substream;
 } GF_TSImport;
 
 #ifndef GPAC_DISABLE_MPEG2TS
@@ -8016,7 +9094,7 @@
 	case GF_M2TS_EVT_PMT_REPEAT:
 		/*abort upon first PMT repeat if not using 4on2. Otherwise we must parse the entire
 		bitstream to locate ODs sent in OD updates in order to get their stream types...*/
-		/*		if (!ts->has_4on2 && (import->flags & GF_IMPORT_PROBE_ONLY) && !import->trackID)
+		/*		if (!ts->has_4on2 && (import->flags & GF_IMPORT_PROBE_ONLY) && !import->track_id)
 					import->flags |= GF_IMPORT_DO_ABORT;
 		*/
 		break;
@@ -8065,21 +9143,21 @@
 
 				switch (es->stream_type) {
 				case GF_M2TS_VIDEO_MPEG1:
-					import->tk_info[idx].media_type = GF_4CC('M','P','G','1');
+					import->tk_info[idx].media_type = GF_MEDIA_TYPE_MPG1;
 					import->tk_info[idx].type = GF_ISOM_MEDIA_VISUAL;
 					import->tk_info[idx].lang = pes->lang;
 					import->nb_tracks++;
 					tsimp->nb_video++;
 					break;
 				case GF_M2TS_VIDEO_MPEG2:
-					import->tk_info[idx].media_type = GF_4CC('M','P','G','2');
+					import->tk_info[idx].media_type = GF_MEDIA_TYPE_MPG2;
 					import->tk_info[idx].type = GF_ISOM_MEDIA_VISUAL;
 					import->tk_info[idx].lang = pes->lang;
 					import->nb_tracks++;
 					tsimp->nb_video++;
 					break;
 				case GF_M2TS_VIDEO_MPEG4:
-					import->tk_info[idx].media_type = GF_4CC('M','P','4','V');
+					import->tk_info[idx].media_type = GF_MEDIA_TYPE_MP4V;
 					import->tk_info[idx].type = GF_ISOM_MEDIA_VISUAL;
 					import->tk_info[idx].lang = pes->lang;
 					import->nb_tracks++;
@@ -8087,32 +9165,45 @@
 					break;
 				case GF_M2TS_VIDEO_H264:
 				case GF_M2TS_VIDEO_SVC:
-					import->tk_info[idx].media_type = (es->stream_type==GF_M2TS_VIDEO_SVC) ? GF_4CC('S','V','C',' ') : GF_4CC('H','2','6','4');
+					import->tk_info[idx].media_type = (es->stream_type==GF_M2TS_VIDEO_SVC) ? GF_MEDIA_TYPE_SVC : GF_MEDIA_TYPE_H264;
 					import->tk_info[idx].type = GF_ISOM_MEDIA_VISUAL;
 					import->tk_info[idx].lang = pes->lang;
 					import->nb_tracks++;
 					tsimp->nb_video++;
 					break;
 				case GF_M2TS_VIDEO_HEVC:
+				case GF_M2TS_VIDEO_HEVC_TEMPORAL:
+				case GF_M2TS_VIDEO_HEVC_MCTS:
 				case GF_M2TS_VIDEO_SHVC:
 				case GF_M2TS_VIDEO_SHVC_TEMPORAL:
 				case GF_M2TS_VIDEO_MHVC:
 				case GF_M2TS_VIDEO_MHVC_TEMPORAL:
-					import->tk_info[idx].media_type = (es->stream_type==GF_M2TS_VIDEO_HEVC) ? GF_4CC('H','E','V','C') : GF_4CC('L','H','V','C');
+					import->tk_info[idx].media_type = (es->stream_type==GF_M2TS_VIDEO_HEVC) ? GF_MEDIA_TYPE_HEVC : GF_MEDIA_TYPE_LHVC;
 					import->tk_info[idx].type = GF_ISOM_MEDIA_VISUAL;
 					import->tk_info[idx].lang = pes->lang;
 					import->nb_tracks++;
 					tsimp->nb_video++;
+
+					switch (es->stream_type) {
+					case GF_M2TS_VIDEO_HEVC_MCTS:
+						import->tk_info[idx].media_type = GF_MEDIA_TYPE_HEVC;
+						break;
+					case GF_M2TS_VIDEO_HEVC_TEMPORAL:
+						import->tk_info[idx].media_type = GF_MEDIA_TYPE_HEVC;
+					case GF_M2TS_VIDEO_SHVC_TEMPORAL:
+					case GF_M2TS_VIDEO_MHVC_TEMPORAL:
+						import->tk_info[idx].video_info.temporal_enhancement = GF_TRUE;
+					}
 					break;
 				case GF_M2TS_AUDIO_MPEG1:
-					import->tk_info[idx].media_type = GF_4CC('M','P','G','1');
+					import->tk_info[idx].media_type = GF_MEDIA_TYPE_MPG1;
 					import->tk_info[idx].type = GF_ISOM_MEDIA_AUDIO;
 					import->tk_info[idx].lang = pes->lang;
 					import->nb_tracks++;
 					tsimp->nb_audio++;
 					break;
 				case GF_M2TS_AUDIO_MPEG2:
-					import->tk_info[idx].media_type = GF_4CC('M','P','G','2');
+					import->tk_info[idx].media_type = GF_MEDIA_TYPE_MPG2;
 					import->tk_info[idx].type = GF_ISOM_MEDIA_AUDIO;
 					import->tk_info[idx].lang = pes->lang;
 					import->nb_tracks++;
@@ -8120,28 +9211,28 @@
 					break;
 				case GF_M2TS_AUDIO_AAC:
 				case GF_M2TS_AUDIO_LATM_AAC:
-					import->tk_info[idx].media_type = GF_4CC('M','P','4','A');
+					import->tk_info[idx].media_type = GF_MEDIA_TYPE_MP4A;
 					import->tk_info[idx].type = GF_ISOM_MEDIA_AUDIO;
 					import->tk_info[idx].lang = pes->lang;
 					import->nb_tracks++;
 					tsimp->nb_audio++;
 					break;
 				case GF_M2TS_AUDIO_AC3:
-					import->tk_info[idx].media_type = GF_4CC('D','A','C','3');
+					import->tk_info[idx].media_type = GF_MEDIA_TYPE_DAC3;
 					import->tk_info[idx].type = GF_ISOM_MEDIA_AUDIO;
 					import->tk_info[idx].lang = pes->lang;
 					import->nb_tracks++;
 					tsimp->nb_audio++;
 					break;
 				case GF_M2TS_AUDIO_EC3:
-					import->tk_info[idx].media_type = GF_4CC('D','E','C','3');
+					import->tk_info[idx].media_type = GF_MEDIA_TYPE_DEC3;
 					import->tk_info[idx].type = GF_ISOM_MEDIA_AUDIO;
 					import->tk_info[idx].lang = pes->lang;
 					import->nb_tracks++;
 					tsimp->nb_audio++;
 					break;
 				case GF_M2TS_AUDIO_DTS:
-					import->tk_info[idx].media_type = GF_4CC('D','T','S',' ');
+					import->tk_info[idx].media_type = GF_MEDIA_TYPE_DTS;
 					import->tk_info[idx].type = GF_ISOM_MEDIA_AUDIO;
 					import->tk_info[idx].lang = pes->lang;
 					import->nb_tracks++;
@@ -8150,9 +9241,9 @@
 				case GF_M2TS_SYSTEMS_MPEG4_PES:
 				case GF_M2TS_SYSTEMS_MPEG4_SECTIONS:
 					if (es->stream_type == GF_M2TS_SYSTEMS_MPEG4_PES) {
-						import->tk_info[idx].media_type = GF_4CC('M','4','S','P');
+						import->tk_info[idx].media_type = GF_MEDIA_TYPE_M4SP;
 					} else {
-						import->tk_info[idx].media_type = GF_4CC('M','4','S','S');
+						import->tk_info[idx].media_type = GF_MEDIA_TYPE_M4SS;
 					}
 					if (prog->pmt_iod) {
 						GF_ESD *esd = gf_m2ts_get_esd(es);
@@ -8166,7 +9257,7 @@
 					import->nb_tracks++;
 					break;
 				case GF_M2TS_METADATA_ID3_HLS:
-					import->tk_info[idx].media_type = GF_4CC('I','D','3',' ');
+					import->tk_info[idx].media_type = GF_MEDIA_TYPE_ID3;
 					import->tk_info[idx].type = GF_ISOM_MEDIA_META;
 					import->tk_info[idx].lang = pes->lang;
 					import->nb_tracks++;
@@ -8206,7 +9297,7 @@
 				}
 			}
 
-			es = ts->ess[import->trackID]; /* import->trackID == pid */
+			es = ts->ess[import->trackID]; /* import->track_id == pid */
 
 			if (es->flags & GF_M2TS_ES_IS_SECTION) {
 				//ses = (GF_M2TS_SECTION_ES *)es;
@@ -8241,6 +9332,8 @@
 				tsimp->avccfg = gf_odf_avc_cfg_new();
 				break;
 			case GF_M2TS_VIDEO_HEVC:
+			case GF_M2TS_VIDEO_HEVC_TEMPORAL:
+			case GF_M2TS_VIDEO_HEVC_MCTS:
 			case GF_M2TS_VIDEO_SHVC:
 			case GF_M2TS_VIDEO_SHVC_TEMPORAL:
 			case GF_M2TS_VIDEO_MHVC:
@@ -8250,6 +9343,7 @@
 				oti = GPAC_OTI_VIDEO_HEVC;
 #ifndef GPAC_DISABLE_HEVC
 				tsimp->hevccfg = gf_odf_hevc_cfg_new();
+				if (es->stream_type != GF_M2TS_VIDEO_HEVC) tsimp->is_substream = GF_TRUE;
 #endif //GPAC_DISABLE_HEVC
 				break;
 			case GF_M2TS_VIDEO_SVC:
@@ -8308,7 +9402,7 @@
 				esd->decoderConfig->decoderSpecificInfo->data = NULL;
 				gf_odf_desc_del((GF_Descriptor *)esd);
 				tsimp->stream_setup = GF_TRUE;
-				gf_isom_set_audio_info(import->dest, tsimp->track, 1, ((GF_M2TS_PES_PCK*)par)->stream->aud_sr, ((GF_M2TS_PES_PCK*)par)->stream->aud_nb_ch, 8);
+				gf_isom_set_audio_info(import->dest, tsimp->track, 1, ((GF_M2TS_PES_PCK*)par)->stream->aud_sr, ((GF_M2TS_PES_PCK*)par)->stream->aud_nb_ch, 8, import->asemode);
 			}
 		}
 		break;
@@ -8642,7 +9736,7 @@
 		}
 		if (!tsimp->stream_setup) {
 			if (pck->stream->aud_sr) {
-				gf_isom_set_audio_info(import->dest, tsimp->track, 1, pck->stream->aud_sr, pck->stream->aud_nb_ch, 16);
+				gf_isom_set_audio_info(import->dest, tsimp->track, 1, pck->stream->aud_sr, pck->stream->aud_nb_ch, 16, import->asemode);
 				tsimp->stream_setup = GF_TRUE;
 			}
 			else if (pck->stream->vid_w) {
@@ -8651,7 +9745,7 @@
 				gf_isom_set_visual_info(import->dest, tsimp->track, 1, pck->stream->vid_w, pck->stream->vid_h);
 				gf_isom_set_track_layout_info(import->dest, tsimp->track, w<<16, pck->stream->vid_h<<16, 0, 0, 0);
 				if (w != pck->stream->vid_w) {
-					e = gf_isom_set_pixel_aspect_ratio(import->dest, tsimp->track, 1, pck->stream->vid_par>>16, pck->stream->vid_par&0xff);
+					e = gf_isom_set_pixel_aspect_ratio(import->dest, tsimp->track, 1, pck->stream->vid_par>>16, pck->stream->vid_par&0xff, GF_FALSE);
 					if (e) {
 						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] Error setting aspect ratio\n"));
 					}
@@ -8957,11 +10051,36 @@
 		}
 
 		if (tsimp.hevccfg) {
-			u32 w = ((GF_M2TS_PES*)es)->vid_w;
-			u32 h = ((GF_M2TS_PES*)es)->vid_h;
+			GF_M2TS_PES *pes = (GF_M2TS_PES*) es;
+ 			u32 w = pes->vid_w;
+			u32 h = pes->vid_h;
 			hevc_set_parall_type(tsimp.hevccfg);
 			gf_isom_hevc_config_update(import->dest, tsimp.track, 1, tsimp.hevccfg);
 
+			if (tsimp.is_substream) {
+				u32 tk = gf_isom_get_track_by_id(import->dest, pes->depends_on_pid);
+				if (tk) {
+					GF_HEVCConfig *hcfg = gf_isom_hevc_config_get(import->dest, tk, 1);
+					gf_isom_set_track_reference(import->dest, tsimp.track, GF_ISOM_REF_BASE, pes->depends_on_pid);
+					gf_isom_get_visual_info(import->dest, tk, 1, &w, &h);
+					if (hcfg && tsimp.hevccfg) {
+						GF_List *ar = tsimp.hevccfg->param_array;
+						memcpy(tsimp.hevccfg, hcfg, sizeof(GF_HEVCConfig));
+						tsimp.hevccfg->param_array = ar;
+						gf_isom_hevc_config_update(import->dest, tsimp.track, 1, tsimp.hevccfg);
+					}
+					if (hcfg) gf_odf_hevc_cfg_del(hcfg);
+
+				} else {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("Importing HEVC substream but base track not found\n"));
+				}
+				if ((es->stream_type==GF_M2TS_VIDEO_HEVC_TEMPORAL) || (es->stream_type==GF_M2TS_VIDEO_HEVC_MCTS)) {
+					//NULL config: we keep hvcC but change to hvc2 the sample entry
+					gf_isom_lhvc_config_update(import->dest, tsimp.track, 1, NULL, GF_ISOM_LEHVC_WITH_BASE);
+				} else {
+					gf_isom_lhvc_config_update(import->dest, tsimp.track, 1, tsimp.hevccfg, GF_ISOM_LEHVC_ONLY);
+				}
+			}
 			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
 				gf_isom_hevc_set_inband_config(import->dest, tsimp.track, 1);
 			}
@@ -9177,7 +10296,7 @@
 		 (buf[0x17] & 0xf0) != 0x20			 ||
 		 (buf[buf[0x16] + 0x17] & 0xe0) != 0x20)
 		{
-			gf_import_message(import, GF_CORRUPTED_DATA, "Corrupted data found in file %s", filename);
+			gf_import_message(import, GF_CORRUPTED_DATA, "[VobSub] Corrupted data found in file %s (1)", filename);
 			continue;
 		}
 
@@ -9204,12 +10323,12 @@
 		}
 
 		if (i != psize || left > 0) {
-			gf_import_message(import, GF_CORRUPTED_DATA, "Corrupted data found in file %s", filename);
+			gf_import_message(import, GF_CORRUPTED_DATA, "[VobSub] Corrupted data found in file %s (2)", filename);
 			continue;
 		}
 
 		if (vobsub_get_subpic_duration(packet, psize, dsize, &duration) != GF_OK) {
-			gf_import_message(import, GF_CORRUPTED_DATA, "Corrupted data found in file %s", filename);
+			gf_import_message(import, GF_CORRUPTED_DATA, "[VobSub] Corrupted data found in file %s (3)", filename);
 			continue;
 		}
 
@@ -9311,7 +10430,7 @@
 		gf_fclose(in);
 		import->tk_info[0].track_num = 1;
 		import->tk_info[0].type = GF_ISOM_MEDIA_AUDIO;
-		import->tk_info[0].media_type = GF_4CC('A', 'C', '3', ' ');
+		import->tk_info[0].media_type = GF_MEDIA_TYPE_AC3;
 		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF;
 		import->tk_info[0].audio_info.sample_rate = sr;
 		import->tk_info[0].audio_info.nb_channels = hdr.channels;
@@ -9357,7 +10476,7 @@
 	cfg.streams[0].lfon = hdr.lfon;
 
 	gf_isom_ac3_config_new(import->dest, track, &cfg, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
-	gf_isom_set_audio_info(import->dest, track, di, sr, nb_chan, 16);
+	gf_isom_set_audio_info(import->dest, track, di, sr, nb_chan, 16, import->asemode);
 
 	gf_bs_seek(bs, 0);
 	tot_size = gf_bs_get_size(bs);
@@ -9483,8 +10602,8 @@
 		gf_fclose(f);
 		if (is_chap_or_sub) {
 			import->nb_tracks = 1;
-			import->tk_info[0].media_type = GF_4CC('C','H','A','P');
-			import->tk_info[0].type = GF_4CC('t','e','x','t');
+			import->tk_info[0].media_type = GF_MEDIA_TYPE_CHAP;
+			import->tk_info[0].type = GF_ISOM_MEDIA_TEXT;
 			return GF_OK;
 		}
 		return GF_NOT_SUPPORTED;
@@ -9498,7 +10617,8 @@
 		for (i=0; i<gf_isom_get_track_count(import->dest); i++) {
 			GF_ISOSample *samp;
 			u32 ts, inc;
-			if (gf_isom_get_media_type(import->dest, i+1) != GF_ISOM_MEDIA_VISUAL) continue;
+ u32 mtype = gf_isom_get_media_type(import->dest, i+1);
+			if (!gf_isom_is_video_subtype(mtype)) continue;
 			if (gf_isom_get_sample_count(import->dest, i+1) < 20) continue;
 			samp = gf_isom_get_sample_info(import->dest, 1, 2, NULL, NULL);
 			inc = (u32) samp->DTS;
@@ -9663,7 +10783,6 @@
 		if (e) goto err_exit;
 	}
 
-
 err_exit:
 	gf_fclose(f);
 	return e;
@@ -9731,6 +10850,12 @@
 		if (e) return e;
 		return gf_import_ogg_audio(importer);
 	}
+	/*Opus audio*/
+	if (!strnicmp(ext, ".opus", 5)) {
+		if (importer->flags & GF_IMPORT_PROBE_ONLY)
+			return gf_import_ogg_video(importer);
+		return gf_import_ogg_audio(importer);
+	}
 #endif
 
 #ifndef GPAC_DISABLE_MPEG2PS
@@ -9762,7 +10887,7 @@
 	if (!strnicmp(ext, ".mp2", 4) || !strnicmp(ext, ".mp3", 4) || !strnicmp(ext, ".m1a", 4) || !strnicmp(ext, ".m2a", 4) || !stricmp(fmt, "MP3") || !stricmp(fmt, "MPEG-AUDIO") )
 		return gf_import_mp3(importer);
 	/*MPEG-2/4 AAC*/
-	if (!strnicmp(ext, ".aac", 4) || !stricmp(fmt, "AAC") || !stricmp(fmt, "MPEG4-AUDIO") )
+	if (!strnicmp(ext, ".aac", 4) || !strnicmp(ext, ".xhe", 4) || !stricmp(fmt, "AAC") || !stricmp(fmt, "MPEG4-AUDIO") )
 		return gf_import_aac_adts(importer);
 	/*MPEG-4 video*/
 	if (!strnicmp(ext, ".cmp", 4) || !strnicmp(ext, ".m4v", 4) || !stricmp(fmt, "CMP") || !stricmp(fmt, "MPEG4-Video") )
@@ -9775,7 +10900,7 @@
 		return gf_import_h263(importer);
 	/*H264/AVC video*/
 	if (!strnicmp(ext, ".h264", 5) || !strnicmp(ext, ".264", 4) || !strnicmp(ext, ".x264", 5)
-	 || !strnicmp(ext, ".h26L", 5) || !strnicmp(ext, ".26l", 4)
+	 || !strnicmp(ext, ".h26L", 5) || !strnicmp(ext, ".26l", 4) || !strnicmp(ext, ".avc", 4)
 	 || !stricmp(fmt, "AVC") || !stricmp(fmt, "H264") )
 		return gf_import_avc_h264(importer);
 	/*HEVC video*/
@@ -9783,6 +10908,12 @@
 		|| !strnicmp(ext, ".shvc", 5) || !strnicmp(ext, ".lhvc", 5) || !strnicmp(ext, ".mhvc", 5)
 	 || !stricmp(fmt, "HEVC") || !stricmp(fmt, "SHVC") || !stricmp(fmt, "MHVC") || !stricmp(fmt, "LHVC") || !stricmp(fmt, "H265") )
 		return gf_import_hevc(importer);
+	/*IVF container (may contain VP9, AV1, ...)*/
+	if (!strnicmp(ext, ".ivf", 4))
+		return gf_import_ivf(importer);
+	/*AOM AV1 video*/
+	if (!strnicmp(ext, ".av1", 4) || !strnicmp(ext, ".obu", 4))
+		return gf_import_aom_av1(importer);
 	/*AC3 and E-AC3*/
 	if (!strnicmp(ext, ".ac3", 4) || !stricmp(fmt, "AC3") )
 		return gf_import_ac3(importer, GF_FALSE);
@@ -9870,8 +11001,6 @@
 	return gf_import_message(importer, e, "[Importer] Unknown input file type for \"%s\"", importer->in_name);
 }
 
-
-
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/

gpac-0.7.1.tar.gz/src/media_tools/mpd.c -> gpac-0.8.0.tar.gz/src/media_tools/mpd.c Changed

@@ -38,7 +38,7 @@
 
 #ifndef GPAC_DISABLE_CORE_TOOLS
 
-static Bool gf_mpd_parse_bool(char *attr)
+static Bool gf_mpd_parse_bool(const char * const attr)
 {
 	if (!strcmp(attr, "true")) return 1;
 	if (!strcmp(attr, "1")) return 1;
@@ -74,39 +74,50 @@
 	return NULL;
 }
 
-static u32 gf_mpd_parse_int(char *attr)
+static u32 gf_mpd_parse_int(const char * const attr)
 {
 	return atoi(attr);
 }
 
-static u64 gf_mpd_parse_long_int(char *attr)
+static u64 gf_mpd_parse_long_int(const char * const attr)
 {
 	u64 longint;
 	sscanf(attr, LLU, &longint);
 	return longint;
 }
 
-static Double gf_mpd_parse_double(char *attr)
+static Double gf_mpd_parse_double(const char * const attr)
 {
 	return atof(attr);
 }
 
-static GF_MPD_Fractional *gf_mpd_parse_frac(char *attr)
+static GF_MPD_Fractional *gf_mpd_parse_frac(const char * const attr, const char sep)
 {
+	char str[6];
 	GF_MPD_Fractional *res;
 	GF_SAFEALLOC(res, GF_MPD_Fractional);
-	sscanf(attr, "%d:%d", &res->num, &res->den);
+	snprintf(str, sizeof(str), "%%d%c%%d", sep);
+	res->den = 1;
+	sscanf(attr, str, &res->num, &res->den);
 	return res;
 }
 
-static u64 gf_mpd_parse_date(char *attr)
+static u64 gf_mpd_parse_date(const char * const attr)
 {
 	return gf_net_parse_date(attr);
 }
 
-static u64 gf_mpd_parse_duration(char *duration) {
+static u64 gf_mpd_parse_duration(const char * const duration)
+{
 	u32 i;
-	if (!duration) return 0;
+	char *sep1, *sep2;
+	u32 h, m;
+	double s;
+	const char *startT;
+	if (!duration) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Error parsing duration: no value indicated\n"));
+		return 0;
+	}
 	i = 0;
 	while (1) {
 		if (duration[i] == ' ') i++;
@@ -115,44 +126,48 @@
 			break;
 		}
 	}
-	if (duration[i] == 'P') {
-		if (duration[i+1] == 0) return 0;
-		else if (duration[i+1] != 'T') return 0;
-		else {
-			char *sep1, *sep2;
-			u32 h, m;
-			double s;
-			h = m = 0;
-			s = 0;
-			if (NULL != (sep1 = strchr(duration+i+2, 'H'))) {
-				*sep1 = 0;
-				h = atoi(duration+i+2);
-				*sep1 = 'H';
-				sep1++;
-			} else {
-				sep1 = duration+i+2;
-			}
-			if (NULL != (sep2 = strchr(sep1, 'M'))) {
-				*sep2 = 0;
-				m = atoi(sep1);
-				*sep2 = 'M';
-				sep2++;
-			} else {
-				sep2 = sep1;
-			}
-			if (NULL != (sep1 = strchr(sep2, 'S'))) {
-				*sep1 = 0;
-				s = atof(sep2);
-				*sep1 = 'S';
-			}
-			return (u64)((h*3600+m*60+s)*(u64)1000);
-		}
-	} else {
+	if (duration[i] != 'P') {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Error parsing duration: no value indicated\n"));
+		return 0;
+	}
+	startT = strchr(duration+1, 'T');
+
+	if (duration[i+1] == 0) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Error parsing duration: no value indicated\n"));
+		return 0;
+	}
+	if (! startT) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Error parsing duration: no Time section found\n"));
 		return 0;
 	}
+
+	h = m = 0;
+	s = 0;
+	if (NULL != (sep1 = strchr(startT+1, 'H'))) {
+		*sep1 = 0;
+		h = atoi(duration+i+2);
+		*sep1 = 'H';
+		sep1++;
+	} else {
+		sep1 = (char *) startT+1;
+	}
+	if (NULL != (sep2 = strchr(sep1, 'M'))) {
+		*sep2 = 0;
+		m = atoi(sep1);
+		*sep2 = 'M';
+		sep2++;
+	} else {
+		sep2 = sep1;
+	}
+	if (NULL != (sep1 = strchr(sep2, 'S'))) {
+		*sep1 = 0;
+		s = atof(sep2);
+		*sep1 = 'S';
+	}
+	return (u64)((h*3600+m*60+s)*(u64)1000);
 }
 
-static u32 gf_mpd_parse_duration_u32(char *duration)
+static u32 gf_mpd_parse_duration_u32(const char * const duration)
 {
 	u64 dur = gf_mpd_parse_duration(duration);
 	if (dur <= GF_UINT_MAX) {
@@ -163,7 +178,7 @@
 	}
 }
 
-static GF_MPD_ByteRange *gf_mpd_parse_byte_range(char *attr)
+static GF_MPD_ByteRange *gf_mpd_parse_byte_range(const char * const attr)
 {
 	GF_MPD_ByteRange *br;
 	GF_SAFEALLOC(br, GF_MPD_ByteRange);
@@ -387,8 +402,13 @@
 		else if (!strcmp(att->name, "indexRange")) seg->index_range = gf_mpd_parse_byte_range(att->value);
 		//else if (!strcmp(att->name, "hls:keyMethod")) seg->key_url = gf_mpd_parse_string(att->value);
 		else if (!strcmp(att->name, "hls:keyURL")) seg->key_url = gf_mpd_parse_string(att->value);
-		else if (!strcmp(att->name, "hls:keyIV")) gf_bin128_parse(att->value, seg->key_iv);
-
+ else if (!strcmp(att->name, "hls:keyIV")) {
+ GF_Err e = gf_bin128_parse(att->value, seg->key_iv);
+ if (e != GF_OK) {
+ GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Cannot parse hls:keyIV\n"));
+ return;
+ }
+ }
 	}
 }
 
@@ -456,13 +476,13 @@
 			i--;	\
 			gf_list_rem(root->attributes, i);	\
 			gf_list_add(_elem->attributes, att);	\
- 
+
 #define MPD_STORE_EXTENSION_NODE(_elem)	\
 		if (!_elem->children) _elem->children = gf_list_new();	\
 		i--;	\
 		gf_list_rem(root->content, i);	\
 		gf_list_add(_elem->children, child);	\
- 
+
 static GF_Err gf_mpd_parse_descriptor(GF_List *container, GF_XMLNode *root)
 {
 	GF_XMLAttribute *att;
@@ -472,7 +492,7 @@
 
 	GF_SAFEALLOC(mpd_desc, GF_MPD_Descriptor);
 	if (!mpd_desc) return GF_OUT_OF_MEM;
-	
+
 	while ( (att = gf_list_enum(root->attributes, &i)) ) {
 		if (!strcmp(att->name, "schemeIdUri")) mpd_desc->scheme_id_uri = gf_mpd_parse_string(att->value);
 		else if (!strcmp(att->name, "value")) mpd_desc->value = gf_mpd_parse_string(att->value);
@@ -507,8 +527,8 @@
 		if (!strcmp(att->name, "profiles")) com->profiles = gf_mpd_parse_string(att->value);
 		else if (!strcmp(att->name, "width")) com->width = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "height")) com->height = gf_mpd_parse_int(att->value);
-		else if (!strcmp(att->name, "sar")) com->sar = gf_mpd_parse_frac(att->value);
-		else if (!strcmp(att->name, "frameRate")) com->framerate = gf_mpd_parse_frac(att->value);
+		else if (!strcmp(att->name, "sar")) com->sar = gf_mpd_parse_frac(att->value, ':');
+		else if (!strcmp(att->name, "frameRate")) com->framerate = gf_mpd_parse_frac(att->value, '/');
 		else if (!strcmp(att->name, "audioSamplingRate")) com->samplerate = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "mimeType")) com->mime_type = gf_mpd_parse_string(att->value);
 		else if (!strcmp(att->name, "segmentProfiles")) com->segmentProfiles = gf_mpd_parse_string(att->value);
@@ -639,7 +659,7 @@
 		else if (!strcmp(att->name, "group")) set->group = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "lang")) set->lang = gf_mpd_parse_string(att->value);
 		else if (!strcmp(att->name, "contentType")) set->content_type = gf_mpd_parse_string(att->value);
-		else if (!strcmp(att->name, "par")) set->par = gf_mpd_parse_frac(att->value);
+		else if (!strcmp(att->name, "par")) set->par = gf_mpd_parse_frac(att->value, ':');
 		else if (!strcmp(att->name, "minBandwidth")) set->min_bandwidth = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "maxBandwidth")) set->max_bandwidth = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "minWidth")) set->min_width = gf_mpd_parse_int(att->value);
@@ -778,6 +798,7 @@
 	GF_MPD_BaseURL *base_url = (GF_MPD_BaseURL *)_item;
 	if (base_url->service_location) gf_free(base_url->service_location);
 	if (base_url->URL) gf_free(base_url->URL);
+	if (base_url->redirection) gf_free(base_url->redirection);
 	gf_free(base_url);
 }
 
@@ -967,6 +988,7 @@
 {
 	GF_MPD_Period *ptr = (GF_MPD_Period *)_item;
 	if (ptr->ID) gf_free(ptr->ID);
+	if (ptr->origin_base_url) gf_free(ptr->origin_base_url);
 	if (ptr->xlink_href) gf_free(ptr->xlink_href);
 	if (ptr->segment_base) gf_mpd_segment_base_free(ptr->segment_base);
 	if (ptr->segment_list) gf_mpd_segment_list_free(ptr->segment_list);
@@ -1089,6 +1111,7 @@
 			MPD_STORE_EXTENSION_NODE(mpd)
 		}
 	}
+
 	return GF_OK;
 }
 
@@ -1121,7 +1144,7 @@
 }
 
 static GF_Err gf_m3u8_fill_mpd_struct(MasterPlaylist *pl, const char *m3u8_file, const char *src_base_url, const char *mpd_file, char *title, Double update_interval,
- char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates, Bool is_end, u32 max_dur, GF_MPD *mpd, Bool parse_sub_playlist)
+ char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates, Bool is_end, u32 max_dur, GF_MPD *mpd, Bool parse_sub_playlist, Bool test_mode)
 {
 	char *sep, *template_base=NULL, *template_ext;
 	u32 nb_streams, i, j, k, template_width, template_idx_start;
@@ -1170,7 +1193,10 @@
 	info->title = gf_strdup(title);
 	sprintf(str, "Generated from URL %s", src_base_url);
 	info->source = gf_strdup(str);
-	sprintf(str, "Generated by GPAC %s", GPAC_FULL_VERSION);
+	if (!test_mode)
+		sprintf(str, "Generated by GPAC %s", GPAC_FULL_VERSION);
+	else
+		sprintf(str, "Generated by GPAC");
 	info->copyright = gf_strdup(str);
 	gf_list_add(mpd->program_infos, info);
 
@@ -1216,11 +1242,11 @@
 		set->segment_alignment = GF_TRUE;
 		e = gf_list_add(period->adaptation_sets, set);
 		if (e) return e;
-		
+
 		/*check if we use templates*/
 		stream = gf_list_get(pl->streams, i);
 		count_variants = gf_list_count(stream->variants);
-		
+
 		if (use_template) {
 			for (j=0; j<count_variants; j++) {
 				u32 count_elements;
@@ -1286,6 +1312,7 @@
 						if (!sub_url) sub_url = elt->url;
 						else sub_url ++;
 						if (strcmp(szURL, sub_url)) {
+							GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[MPD] Cannot remap M3U8 to segment template MPD, using segment list\n"));
 							use_template = GF_FALSE;
 							break;
 						}
@@ -1365,7 +1392,7 @@
 				break;
 
 			if (elt) {
-				base_url = gf_url_concatenate(pe->url, elt->url);
+				base_url = gf_url_get_absolute_path(elt->url, pe->url);
 			} else {
 				base_url = gf_strdup(pe->url);
 			}
@@ -1375,6 +1402,11 @@
 			/*keep final '/' */
 			if (sep)
 				sep[1] = 0;
+			/* if no path separator then base_url is just a filename */
+			else {
+				free(base_url);
+				base_url = gf_strdup("./");
+			}
 
 
 			width = pe->width;
@@ -1387,10 +1419,10 @@
 				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;
-				elt_url = gf_url_concatenate(pe->url, elt_url);
+				elt_url = gf_url_get_absolute_path(elt_url, pe->url);
 
 				memset(&import, 0, sizeof(GF_MediaImporter));
 				import.trackID = 0;
@@ -1411,8 +1443,7 @@
 					import.in_name = elt_url;
 				}
 				e = gf_media_import(&import);
-				gf_free(elt_url);
-				
+
 				if (e != GF_OK) {
 //					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] M3U8 missing Media Element %s< (Playlist %s) %s \n", import.in_name, base_url));
 					k++;
@@ -1455,6 +1486,8 @@
 				for (k=0; k<import.nb_tracks; k++) {
 					switch (import.tk_info[k].type) {
 					case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
 						width = import.tk_info[k].video_info.width;
 						height = import.tk_info[k].video_info.height;
 						break;
@@ -1464,6 +1497,7 @@
 						break;
 					}
 				}
+				if (elt_url) gf_free(elt_url);
 			}
 #endif
 			GF_SAFEALLOC(rep, GF_MPD_Representation);
@@ -1522,8 +1556,8 @@
 				e = gf_list_add(rep->base_URLs, url);
 				if (e) return GF_OUT_OF_MEM;
 				url->URL = gf_strdup(base_url);
-				
-				
+
+
 				if (elt->init_segment_url) {
 					u32 len = (u32) strlen(base_url);
 					GF_SAFEALLOC(rep->segment_template, GF_MPD_SegmentTemplate);
@@ -1535,7 +1569,7 @@
 						rep->segment_template->initialization = gf_strdup(elt->init_segment_url);
 					}
 				}
-				
+
 				continue;
 			}
 
@@ -1550,12 +1584,15 @@
 				byte_range_media_file = elt->url;
 				url->URL = gf_strdup(byte_range_media_file);
 			} else {
-				GF_MPD_BaseURL *url;
-				GF_SAFEALLOC(url, GF_MPD_BaseURL);
-				if (! url) return GF_OUT_OF_MEM;
-				e = gf_list_add(rep->base_URLs, url);
-				if (e) return GF_OUT_OF_MEM;
-				url->URL = gf_strdup(base_url);
+				u32 url_len = (u32) strlen(base_url);
+				if (strncmp(base_url, mpd_file, url_len)) {
+					GF_MPD_BaseURL *url;
+					GF_SAFEALLOC(url, GF_MPD_BaseURL);
+					if (! url) return GF_OUT_OF_MEM;
+					e = gf_list_add(rep->base_URLs, url);
+					if (e) return GF_OUT_OF_MEM;
+					url->URL = gf_strdup(base_url);
+				}
 			}
 
 			GF_SAFEALLOC(rep->segment_list, GF_MPD_SegmentList);
@@ -1578,7 +1615,7 @@
 			if (elt && elt->init_segment_url) {
 				u32 len = (u32) strlen(base_url);
 				GF_SAFEALLOC(rep->segment_list->initialization_segment, GF_MPD_URL);
-				
+
 				if (!strncmp(base_url, elt->init_segment_url, len)) {
 					rep->segment_list->initialization_segment->sourceURL = gf_strdup(elt->init_segment_url + len);
 				} else {
@@ -1590,7 +1627,7 @@
 					rep->segment_list->initialization_segment->byte_range->end_range = elt->init_byte_range_end;
 				}
 			}
-			
+
 //			update_interval = (count_elements - 1) * pe->duration_info * 1000;
 			for (k=0; k<count_elements; k++) {
 				GF_MPD_SegmentURL *segment_url;
@@ -1647,7 +1684,7 @@
 GF_Err gf_m3u8_to_mpd(const char *m3u8_file, const char *base_url,
 const char *mpd_file,
 u32 reload_count, char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates, GF_FileDownload *getter,
- GF_MPD *mpd, Bool parse_sub_playlist)
+ GF_MPD *mpd, Bool parse_sub_playlist, Bool keep_files, Bool test_mode)
 {
 	GF_Err e;
 	char *title;
@@ -1667,7 +1704,7 @@
 		return e;
 	}
 	if (mpd_file == NULL) {
-		gf_delete_file(m3u8_file);
+		if (!keep_files) gf_delete_file(m3u8_file);
 		mpd_file = m3u8_file;
 	}
 
@@ -1697,8 +1734,6 @@
 
 			the_pe = pe;
 			suburl = NULL;
-			if (!strstr(pe->url, ".m3u8"))
-				continue; /*not HLS*/
 
 			if (!parse_sub_playlist)
 				continue;
@@ -1731,7 +1766,7 @@
 					if (e == GF_OK) {
 						e = gf_m3u8_parse_sub_playlist("tmp.m3u8", &pl, suburl, stream, pe);
 					} else {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD Generator] Download faile for %s\n", suburl));
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD Generator] Download failed for %s\n", suburl));
 						e = GF_OK;
 					}
 					gf_delete_file("tmp.m3u8");
@@ -1741,7 +1776,7 @@
 				if (e) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8toMPD] Failed to parse subplaylist %s\n", suburl));
 				}
-				
+
 			}
 			gf_free(suburl);
 		}
@@ -1785,7 +1820,7 @@
 	assert(mpd_file);
 	assert(mpd);
 
-	e = gf_m3u8_fill_mpd_struct(pl, m3u8_file, base_url, mpd_file, title, update_interval, mimeTypeForM3U8Segments, do_import, use_mpd_templates, is_end, max_dur, mpd, parse_sub_playlist);
+	e = gf_m3u8_fill_mpd_struct(pl, m3u8_file, base_url, mpd_file, title, update_interval, mimeTypeForM3U8Segments, do_import, use_mpd_templates, is_end, max_dur, mpd, parse_sub_playlist, test_mode);
 
 	gf_m3u8_master_playlist_del(&pl);
 
@@ -1843,17 +1878,18 @@
 	if (duration) {
 		*duration = (u32) (stream->computed_duration * 1000);
 	}
-	
+
 	if (pe->init_segment_url) {
 		if (!rep->segment_list->initialization_segment) {
 			GF_SAFEALLOC(rep->segment_list->initialization_segment, GF_MPD_URL);
-			rep->segment_list->initialization_segment->sourceURL = pe->init_segment_url;
-			pe->init_segment_url=NULL;
 
 			if (strstr(pe->init_segment_url, "mp4") || strstr(pe->init_segment_url, "MP4")) {
 				if (rep->mime_type) gf_free(rep->mime_type);
 				rep->mime_type = gf_strdup("video/mp4");
 			}
+			rep->segment_list->initialization_segment->sourceURL = pe->init_segment_url;
+			pe->init_segment_url=NULL;
+
 			if (pe->init_byte_range_end) {
 				GF_SAFEALLOC(rep->segment_list->initialization_segment->byte_range, GF_MPD_ByteRange);
 				 rep->segment_list->initialization_segment->byte_range->start_range = pe->init_byte_range_start;
@@ -1862,7 +1898,7 @@
 		}
 	}
 	rep->starts_with_sap = pl->independent_segments ? 1: 3;
-	
+
 	rep->segment_list->duration = (u64) (pe->duration_info * 1000);
 	rep->segment_list->timescale = 1000;
 	rep->m3u8_media_seq_min = pe->element.playlist.media_seq_min;
@@ -2321,7 +2357,8 @@
 
 }
 
-static GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out)
+GF_EXPORT
+GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out)
 {
 	u32 i;
 	GF_MPD_ProgramInfo *info;
@@ -2335,7 +2372,7 @@
 	fprintf(out, "<?xml version=\"1.0\"?>\n<MPD xmlns=\"%s\" type=\"%s\"", (mpd->xml_namespace ? mpd->xml_namespace : "urn:mpeg:dash:schema:mpd:2011"), (mpd->type == GF_MPD_TYPE_STATIC) ? "static" : "dynamic");
 
 	if (mpd->ID)
-		fprintf(out, " ID=\"%s\"", mpd->ID);
+		fprintf(out, " id=\"%s\"", mpd->ID);
 
 	if (mpd->profiles)
 		fprintf(out, " profiles=\"%s\"", mpd->profiles);
@@ -2447,7 +2484,7 @@
 	return base_url_count;
 }
 
-static char *gf_mpd_get_base_url(GF_List *baseURLs, char *url, u32 *base_url_index)
+static char *gf_mpd_get_base_url(GF_List *baseURLs, char *parent_url, u32 *base_url_index)
 {
 	GF_MPD_BaseURL *url_child;
 	u32 idx = 0;
@@ -2467,14 +2504,14 @@
 	} else {
 		idx = 0;
 	}
-	
+
 	url_child = gf_list_get(baseURLs, idx);
 	if (url_child) {
-		char *t_url = gf_url_concatenate(url, url_child->URL);
-		gf_free(url);
-		url = t_url;
+		char *t_url = gf_url_concatenate(parent_url, url_child->redirection ? url_child->redirection : url_child->URL);
+		gf_free(parent_url);
+		parent_url = t_url;
 	}
-	return url;
+	return parent_url;
 }
 
 GF_EXPORT
@@ -2511,6 +2548,7 @@
 		switch (resolve_type) {
 		case GF_MPD_RESOLVE_URL_MEDIA:
 		case GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE:
+		case GF_MPD_RESOLVE_URL_MEDIA_NOSTART:
 			if (!url)
 				return GF_NON_COMPLIANT_BITSTREAM;
 			*out_url = url;
@@ -2609,6 +2647,7 @@
 			return GF_OK;
 		case GF_MPD_RESOLVE_URL_MEDIA:
 		case GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE:
+		case GF_MPD_RESOLVE_URL_MEDIA_NOSTART:
 			if (!url) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Media URL is not set in segment list\n"));
 				return GF_SERVICE_ERROR;
@@ -2714,6 +2753,7 @@
 		break;
 	case GF_MPD_RESOLVE_URL_MEDIA:
 	case GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE:
+	case GF_MPD_RESOLVE_URL_MEDIA_NOSTART:
 		url_to_solve = media_url;
 		break;
 	case GF_MPD_RESOLVE_URL_INDEX:
@@ -2730,7 +2770,7 @@
 	/*let's solve the template*/
 	solved_template = gf_malloc(sizeof(char)*(strlen(url_to_solve) + (rep->id ? strlen(rep->id) : 0)) * 2);
 	if (!solved_template) return GF_OUT_OF_MEM;
-	
+
 	solved_template[0] = 0;
 	strcpy(solved_template, url_to_solve);
 	first_sep = strchr(solved_template, '$');
@@ -2776,6 +2816,9 @@
 		else if (!strcmp(first_sep+1, "Number")) {
 			if (resolve_type==GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE) {
 				strcat(solved_template, "$Number$");
+			} else if (resolve_type==GF_MPD_RESOLVE_URL_MEDIA_NOSTART) {
+				sprintf(szFormat, szPrintFormat, item_index);
+				strcat(solved_template, szFormat);
 			} else {
 				sprintf(szFormat, szPrintFormat, start_number + item_index);
 				strcat(solved_template, szFormat);
@@ -3122,7 +3165,7 @@
 		if (e<0)
 			return e;
 		segment_duration = segment_duration_in_scale / (Double)timescale;
-		
+
 		if (seek_mode == MPD_SEEK_PREV) {
 			if ((seek_time >= seg_start) && (seek_time < seg_start + segment_duration)) {
 				if (out_opt_seek_time) *out_opt_seek_time = seg_start;
@@ -3178,12 +3221,12 @@
 
 /*
 	smooth streaming 2.1 support
- 
+
 	this is still very basic - we miss support for:
 	* live streams
 	* sparse stream
 	* Custom Attributes in Url pattern
- 
+
 	The smooth maifest is transformed into an MPD with
 StreamIndex <=> AdaptationSet
 Url Template <=> SegmentTemplate.media at adaptation set level
@@ -3197,7 +3240,7 @@
 u32 i;
 GF_MPD_SegmentTimelineEntry *chunk;
 GF_XMLAttribute *att;
- 
+
 GF_SAFEALLOC(chunk, GF_MPD_SegmentTimelineEntry);
 if (!chunk) return GF_OUT_OF_MEM;
 gf_list_add(container, chunk);
@@ -3220,7 +3263,7 @@
 *output = res;
 return GF_OK;
 }
- 
+
 c = sep[0];
 sep[0] = 0;
 len = (u32) ( strlen(src_str) + strlen(str_replace) + strlen(sep+strlen(str_match)) + 1 );
@@ -3229,7 +3272,7 @@
 strcat(res, str_replace);
 strcat(res, sep+strlen(str_match));
 sep[0] = c;
- 
+
 if (*output) gf_free(*output);
 *output = res;
 return GF_OK;
@@ -3243,7 +3286,7 @@
 GF_XMLAttribute *att;
 GF_Err e;
 char szISOBMFFInit[2048];
- 
+
 GF_SAFEALLOC(rep, GF_MPD_Representation);
 if (!rep) return GF_OUT_OF_MEM;
 gf_mpd_init_common_attributes((GF_MPD_CommonAttributes *)rep);
@@ -3251,10 +3294,10 @@
 rep->sub_representations = gf_list_new();
 e = gf_list_add(container, rep);
 if (e) return e;
- 
+
 strcpy(szISOBMFFInit, "isobmff://");
- 
- 
+
+
 #define ISBMFFI_ADD_KEYWORD(_name, _value) \
 if (_value) {\
 strcat(szISOBMFFInit, _name);\
@@ -3262,8 +3305,8 @@
 strcat(szISOBMFFInit, _value);\
 strcat(szISOBMFFInit, " ");\
 }
- 
- 
+
+
 i = 0;
 while ( (att = gf_list_enum(root->attributes, &i)) ) {
 if (!strcmp(att->name, "Index")) rep->id = gf_strdup(att->value);
@@ -3303,9 +3346,11 @@
 }
 }
 if (timescale != 10000000) {
- char szTS[20];
+ char szTS[20], *v;
 sprintf(szTS, "%d", timescale);
- ISBMFFI_ADD_KEYWORD("scale", szTS)
+	//prevent gcc warning
+	v = (char *)szTS;
+ ISBMFFI_ADD_KEYWORD("scale", v)
 }
 ISBMFFI_ADD_KEYWORD("tfdt", "0000000000000000000")
 //create a url for the IS to be reconstructed
@@ -3321,13 +3366,13 @@
 GF_MPD_AdaptationSet *set;
 GF_XMLAttribute *att;
 GF_XMLNode *child;
- 
+
 GF_SAFEALLOC(set, GF_MPD_AdaptationSet);
 if (!set) return GF_OUT_OF_MEM;
 gf_mpd_init_common_attributes((GF_MPD_CommonAttributes *)set);
- 
+
 gf_list_add(container, set);
- 
+
 set->accessibility = gf_list_new();
 set->role = gf_list_new();
 set->rating = gf_list_new();
@@ -3338,7 +3383,7 @@
 set->segment_alignment = GF_TRUE;
 /*assign default ID and group*/
 set->group = -1;
- 
+
 i=0;
 while ((att = gf_list_enum(root->attributes, &i))) {
 if (!strcmp(att->name, "Type")) {}
@@ -3353,7 +3398,7 @@
 smooth_replace_string(template_url, "{start time}", "$Time$", &template_url);
 smooth_replace_string(template_url, "{start_time}", "$Time$", &template_url);
 //TODO handle track substitution and custom attrib
- 
+
 GF_SAFEALLOC(set->segment_template, GF_MPD_SegmentTemplate);
 if (!set->segment_template) return GF_OUT_OF_MEM;
 set->segment_template->media = template_url;
@@ -3362,7 +3407,7 @@
 set->segment_template->segment_timeline->entries = gf_list_new();
 }
 }
- 
+
 i = 0;
 while ( ( child = gf_list_enum(root->content, &i )) ) {
 if (!strcmp(child->name, "QualityLevel")) {
@@ -3372,7 +3417,7 @@
 smooth_parse_chunk(mpd, set->segment_template->segment_timeline->entries, child);
 }
 }
- 
+
 return GF_OK;
 }
 
@@ -3384,22 +3429,22 @@
 GF_XMLAttribute *att;
 GF_XMLNode *child;
 GF_MPD_Period *period;
- 
+
 if (!root || !mpd) return GF_BAD_PARAM;
- 
+
 assert(!mpd->periods);
 mpd->periods = gf_list_new();
 mpd->program_infos = gf_list_new();
 mpd->base_URLs = gf_list_new();
 mpd->locations = gf_list_new();
 mpd->metrics = gf_list_new();
- 
+
 /*setup some defaults*/
 mpd->type = GF_MPD_TYPE_STATIC;
 mpd->time_shift_buffer_depth = (u32) -1; /*infinite by default*/
 mpd->xml_namespace = NULL;
- 
- 
+
+
 timescale = 10000000;
 i=0;
 while ((att = gf_list_enum(root->attributes, &i))) {
@@ -3416,14 +3461,14 @@
 }
 mpd->media_presentation_duration = mpd->media_presentation_duration * 1000 / timescale;
 mpd->time_shift_buffer_depth = mpd->time_shift_buffer_depth * 1000 / timescale;
- 
- 
+
+
 GF_SAFEALLOC(period, GF_MPD_Period);
 if (!period) return GF_OUT_OF_MEM;
 gf_list_add(mpd->periods, period);
 period->adaptation_sets = gf_list_new();
 if (!period->adaptation_sets) return GF_OUT_OF_MEM;
- 
+
 i = 0;
 while ( ( child = gf_list_enum(root->content, &i )) ) {
 if (!strcmp(child->name, "StreamIndex")) {
@@ -3431,9 +3476,104 @@
 if (e) return e;
 }
 }
- 
+
 return GF_OK;
 }
 
 
+GF_Err gf_mpd_load_cues(const char *cues_file, u32 stream_id, u32 *cues_timescale, Bool *use_edit_list, GF_DASHCueInfo **out_cues, u32 *nb_cues)
+{
+	GF_XMLNode *root, *stream, *cue;
+	GF_XMLAttribute *att;
+	u32 i, j, k;
+	GF_DOMParser *parser = gf_xml_dom_new();
+	GF_Err e = gf_xml_dom_parse(parser, cues_file, NULL, NULL);
+	if (e != GF_OK) {
+		gf_xml_dom_del(parser);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error loading cue file %s\n", gf_error_to_string(e)));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	root = gf_xml_dom_get_root(parser);
+	if (e != GF_OK) {
+		gf_xml_dom_del(parser);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error loading cue file, no root element found\n"));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	if (strcmp(root->name, "DASHCues")) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Wrong cue file, expecting DASHCues got %s\n", root->name));
+		gf_xml_dom_del(parser);
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	i=0;
+	while ((stream = gf_list_enum(root->content, &i))) {
+		u32 id=0;
+		u32 cur_cue;
+		GF_DASHCueInfo *cues;
+		u32 timescale=1000;
+		if (stream->type != GF_XML_NODE_TYPE) continue;
+		if (strcmp(stream->name, "Stream")) continue;
+
+		*use_edit_list = GF_FALSE;
+		j=0;
+		while ((att = gf_list_enum(stream->attributes, &j))) {
+			if (!strcmp(att->name, "id")) id = atoi(att->value);
+			else if (!strcmp(att->name, "timescale")) timescale = atoi(att->value);
+			else if (!strcmp(att->name, "mode") && !strcmp(att->value, "edit") ) *use_edit_list = GF_TRUE;
+		}
+		if (id != stream_id) continue;
+
+		*cues_timescale = timescale;
+		*nb_cues = 0;
+
+		j=0;
+		while ((cue = gf_list_enum(stream->content, &j))) {
+			if (cue->type != GF_XML_NODE_TYPE) continue;
+			if (strcmp(cue->name, "Cue")) continue;
+			(*nb_cues)++;
+		}
+		cues = gf_malloc(sizeof(GF_DASHCueInfo)* (*nb_cues) );
+		if (!cues) {
+			gf_xml_dom_del(parser);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to allocate %d cues\n", (*nb_cues) ));
+			return GF_OUT_OF_MEM;
+		}
+		memset(cues, 0, sizeof(GF_DASHCueInfo)* (*nb_cues) );
+		*out_cues = cues;
+
+		j=0;
+		cur_cue = 0;
+		while ((cue = gf_list_enum(stream->content, &j))) {
+			if (cue->type != GF_XML_NODE_TYPE) continue;
+			if (strcmp(cue->name, "Cue")) continue;
+
+			k=0;
+			while ((att = gf_list_enum(cue->attributes, &k))) {
+				if (!strcmp(att->name, "sample")) cues[cur_cue].sample_num = atoi(att->value);
+				else if (!strcmp(att->name, "dts")) sscanf(att->value, LLD, &cues[cur_cue].dts);
+				else if (!strcmp(att->name, "cts")) sscanf(att->value, LLD, &cues[cur_cue].cts);
+			}
+			//first cue
+			if (!cues[cur_cue].cts && !cues[cur_cue].dts && (cues[cur_cue].sample_num<=1) ) {
+				(*nb_cues)--;
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] cue for first sample found in stream %d, ignoring\n", stream_id));
+			} else {
+				cur_cue++;
+			}
+		}
+
+
+		break;
+	}
+	gf_xml_dom_del(parser);
+
+	if (!stream) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] No cues found for requested stream %d\n", stream_id));
+		return GF_BAD_PARAM;
+	}
+	return GF_OK;
+}
+
+
+
 #endif /*GPAC_DISABLE_CORE_TOOLS*/

gpac-0.7.1.tar.gz/src/media_tools/mpegts.c -> gpac-0.8.0.tar.gz/src/media_tools/mpegts.c Changed

@@ -1141,88 +1141,10 @@
 
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
-
-typedef enum {
-	ID3V2_FRAME_AENC = GF_4CC('A','E','N','C'),
-	ID3V2_FRAME_APIC = GF_4CC('A','P','I','C'),
-	ID3V2_FRAME_COMM = GF_4CC('C','O','M','M'),
-	ID3V2_FRAME_COMR = GF_4CC('C','O','M','R'),
-	ID3V2_FRAME_ENCR = GF_4CC('E','N','C','R'),
-	ID3V2_FRAME_EQUA = GF_4CC('E','Q','U','A'),
-	ID3V2_FRAME_ETCO = GF_4CC('E','T','C','O'),
-	ID3V2_FRAME_GEOB = GF_4CC('G','E','O','B'),
-	ID3V2_FRAME_GRID = GF_4CC('G','R','I','D'),
-	ID3V2_FRAME_IPLS = GF_4CC('I','P','L','S'),
-	ID3V2_FRAME_LINK = GF_4CC('L','I','N','K'),
-	ID3V2_FRAME_MCDI = GF_4CC('M','C','D','I'),
-	ID3V2_FRAME_MLLT = GF_4CC('M','L','L','T'),
-	ID3V2_FRAME_OWNE = GF_4CC('O','W','N','E'),
-	ID3V2_FRAME_PRIV = GF_4CC('P','R','I','V'),
-	ID3V2_FRAME_PCNT = GF_4CC('P','C','N','T'),
-	ID3V2_FRAME_POPM = GF_4CC('P','O','P','M'),
-	ID3V2_FRAME_POSS = GF_4CC('P','O','S','S'),
-	ID3V2_FRAME_RBUF = GF_4CC('R','B','U','F'),
-	ID3V2_FRAME_RVAD = GF_4CC('R','V','A','D'),
-	ID3V2_FRAME_RVRB = GF_4CC('R','V','R','B'),
-	ID3V2_FRAME_SYLT = GF_4CC('S','Y','L','T'),
-	ID3V2_FRAME_SYTC = GF_4CC('S','Y','T','C'),
-	ID3V2_FRAME_TALB = GF_4CC('T','E','N','C'),
-	ID3V2_FRAME_TBPM = GF_4CC('T','B','P','M'),
-	ID3V2_FRAME_TCOM = GF_4CC('T','C','O','M'),
-	ID3V2_FRAME_TCON = GF_4CC('T','C','O','N'),
-	ID3V2_FRAME_TCOP = GF_4CC('T','C','O','P'),
-	ID3V2_FRAME_TDAT = GF_4CC('T','D','A','T'),
-	ID3V2_FRAME_TDLY = GF_4CC('T','D','L','Y'),
-	ID3V2_FRAME_TENC = GF_4CC('T','E','N','C'),
-	ID3V2_FRAME_TEXT = GF_4CC('T','E','X','T'),
-	ID3V2_FRAME_TFLT = GF_4CC('T','F','L','T'),
-	ID3V2_FRAME_TIME = GF_4CC('T','I','M','E'),
-	ID3V2_FRAME_TIT1 = GF_4CC('T','I','T','1'),
-	ID3V2_FRAME_TIT2 = GF_4CC('T','I','T','2'),
-	ID3V2_FRAME_TIT3 = GF_4CC('T','I','T','3'),
-	ID3V2_FRAME_TKEY = GF_4CC('T','K','E','Y'),
-	ID3V2_FRAME_TLAN = GF_4CC('T','L','A','N'),
-	ID3V2_FRAME_TLEN = GF_4CC('T','L','E','N'),
-	ID3V2_FRAME_TMED = GF_4CC('T','M','E','D'),
-	ID3V2_FRAME_TOAL = GF_4CC('T','O','A','L'),
-	ID3V2_FRAME_TOFN = GF_4CC('T','O','F','N'),
-	ID3V2_FRAME_TOLY = GF_4CC('T','O','L','Y'),
-	ID3V2_FRAME_TOPE = GF_4CC('T','O','P','E'),
-	ID3V2_FRAME_TORY = GF_4CC('T','O','R','Y'),
-	ID3V2_FRAME_TOWN = GF_4CC('T','O','W','N'),
-	ID3V2_FRAME_TPE1 = GF_4CC('T','P','E','1'),
-	ID3V2_FRAME_TPE2 = GF_4CC('T','P','E','2'),
-	ID3V2_FRAME_TPE3 = GF_4CC('T','P','E','3'),
-	ID3V2_FRAME_TPE4 = GF_4CC('T','P','E','4'),
-	ID3V2_FRAME_TPOS = GF_4CC('T','P','E','5'),
-	ID3V2_FRAME_TPUB = GF_4CC('T','P','U','B'),
-	ID3V2_FRAME_TRCK = GF_4CC('T','R','C','K'),
-	ID3V2_FRAME_TRDA = GF_4CC('T','R','D','A'),
-	ID3V2_FRAME_TRSN = GF_4CC('T','R','S','N'),
-	ID3V2_FRAME_TRSO = GF_4CC('T','R','S','O'),
-	ID3V2_FRAME_TSIZ = GF_4CC('T','S','I','Z'),
-	ID3V2_FRAME_TSRC = GF_4CC('T','S','R','C'),
-	ID3V2_FRAME_TSSE = GF_4CC('T','S','S','E'),
-	ID3V2_FRAME_TYER = GF_4CC('T','Y','E','R'),
-	ID3V2_FRAME_TXXX = GF_4CC('T','X','X','X'),
-	ID3V2_FRAME_UFID = GF_4CC('U','F','I','D'),
-	ID3V2_FRAME_USER = GF_4CC('U','S','E','R'),
-	ID3V2_FRAME_USLT = GF_4CC('U','S','L','T'),
-	ID3V2_FRAME_WCOM = GF_4CC('W','C','O','M'),
-	ID3V2_FRAME_WCOP = GF_4CC('W','C','O','P'),
-	ID3V2_FRAME_WOAF = GF_4CC('W','O','A','F'),
-	ID3V2_FRAME_WOAR = GF_4CC('W','O','A','R'),
-	ID3V2_FRAME_WOAS = GF_4CC('W','O','A','S'),
-	ID3V2_FRAME_WORS = GF_4CC('W','O','R','S'),
-	ID3V2_FRAME_WPAY = GF_4CC('W','P','A','Y'),
-	ID3V2_FRAME_WPUB = GF_4CC('W','P','U','B'),
-	ID3V2_FRAME_WXXX = GF_4CC('W','X','X','X')
-} GF_ID3v2FrameType;
-
 static void add_text(char **buffer, u32 *size, u32 *pos, char *msg, u32 msg_len)
 {
 	if (!msg || !buffer || ! *buffer) return;
-	
+
 	if (*pos+msg_len>*size) {
 		*size = *pos+msg_len-*size+256;
 		*buffer = (char *)gf_realloc(*buffer, *size);
@@ -1330,9 +1252,10 @@
 	if (simple_check && (ts->buffer[i]==0x47)) return 0;
 
 	while (i<ts->buffer_size) {
-		if (i+188>ts->buffer_size) return ts->buffer_size;
+		if (i+188>=ts->buffer_size) return ts->buffer_size;
 		if ((ts->buffer[i]==0x47) && (ts->buffer[i+188]==0x47))
 			break;
+		if (i+192>=ts->buffer_size) return ts->buffer_size;
 		if ((ts->buffer[i]==0x47) && (ts->buffer[i+192]==0x47)) {
 			ts->prefix_present = 1;
 			break;
@@ -1345,6 +1268,7 @@
 	return i;
 }
 
+GF_EXPORT
 Bool gf_m2ts_crc32_check(char *data, u32 len)
 {
 	u32 crc = gf_crc_32(data, len);
@@ -2205,6 +2129,7 @@
 	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;
 	unsigned char *data;
 	GF_M2TS_Section *section;
 	GF_Err e = GF_OK;
@@ -2268,8 +2193,8 @@
 				metadatapd_bs = gf_bs_new((char *)data+6, len, GF_BITSTREAM_READ);
 				metapd = gf_m2ts_read_metadata_pointer_descriptor(metadatapd_bs, len);
 				gf_bs_del(metadatapd_bs);
-				if (metapd->application_format_identifier == GF_4CC('I', 'D', '3', ' ') &&
-				 metapd->format_identifier == GF_4CC('I', 'D', '3', ' ') &&
+				if (metapd->application_format_identifier == GF_MEDIA_TYPE_ID3 &&
+				 metapd->format_identifier == GF_MEDIA_TYPE_ID3 &&
 				 metapd->carriage_flag == METADATA_CARRIAGE_SAME_TS) {
 					/*HLS ID3 Metadata */
 					pmt->program->metadata_pointer_descriptor = metapd;
@@ -2299,7 +2224,7 @@
 		}
 	}
 
-
+	nb_hevc = 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;
@@ -2322,7 +2247,10 @@
 		case GF_M2TS_SYSTEMS_MPEG4_PES:
 		case GF_M2TS_VIDEO_H264:
 		case GF_M2TS_VIDEO_SVC:
+		case GF_M2TS_VIDEO_MVCD:
 		case GF_M2TS_VIDEO_HEVC:
+		case GF_M2TS_VIDEO_HEVC_MCTS:
+		case GF_M2TS_VIDEO_HEVC_TEMPORAL:
 		case GF_M2TS_VIDEO_SHVC:
 		case GF_M2TS_VIDEO_SHVC_TEMPORAL:
 		case GF_M2TS_VIDEO_MHVC:
@@ -2334,6 +2262,8 @@
 		case GF_M2TS_AUDIO_LATM_AAC:
 		case GF_M2TS_AUDIO_AC3:
 		case GF_M2TS_AUDIO_DTS:
+		case GF_M2TS_MHAS_MAIN:
+		case GF_M2TS_MHAS_AUX:
 		case GF_M2TS_SUBTITLE_DVB:
 		case GF_M2TS_METADATA_PES:
 			GF_SAFEALLOC(pes, GF_M2TS_PES);
@@ -2384,6 +2314,8 @@
 		case GF_M2TS_13818_6_ANNEX_C:
 		case GF_M2TS_13818_6_ANNEX_D:
 		case GF_M2TS_PRIVATE_SECTION:
+		case GF_M2TS_QUALITY_SEC:
+		case GF_M2TS_MORE_SEC:
 			GF_SAFEALLOC(ses, GF_M2TS_SECTION_ES);
 			if (!ses) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG2TS] Failed to allocate ES for pid %d\n", pid));
@@ -2393,10 +2325,14 @@
 			es->flags |= GF_M2TS_ES_IS_SECTION;
 			es->pid = pid;
 			es->service_id = pmt->program->number;
-			if(stream_type == GF_M2TS_PRIVATE_SECTION) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("AIT section found on pid %d\n", pid));
+			if (stream_type == GF_M2TS_PRIVATE_SECTION) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("AIT sections on pid %d\n", pid));
+			} else if (stream_type == GF_M2TS_QUALITY_SEC) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Quality metadata sections on pid %d\n", pid));
+			} else if (stream_type == GF_M2TS_MORE_SEC) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("MORE sections on pid %d\n", pid));
 			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("stream type DSM CC user private section: pid = %d \n", pid));
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("stream type DSM CC user private sections on pid %d \n", pid));
 			}
 			/* NULL means: trigger the call to on_event with DVB_GENERAL type and the raw section as payload */
 			ses->sec = gf_m2ts_section_filter_new(NULL, 1);
@@ -2452,10 +2388,10 @@
 					reg_desc_format = GF_4CC(data[2], data[3], data[4], data[5]);
 					/*cf http://www.smpte-ra.org/mpegreg/mpegreg.html*/
 					switch (reg_desc_format) {
-					case GF_4CC('A', 'C', '-', '3'):
+					case GF_MEDIA_STREAM_AC3:
 						es->stream_type = GF_M2TS_AUDIO_AC3;
 						break;
-					case GF_4CC('V', 'C', '-', '1'):
+					case GF_MEDIA_STREAM_VC1:
 						es->stream_type = GF_M2TS_VIDEO_VC1;
 						break;
 					default:
@@ -2525,8 +2461,8 @@
 					metadatad_bs = gf_bs_new((char *)data+2, len, GF_BITSTREAM_READ);
 					metad = gf_m2ts_read_metadata_descriptor(metadatad_bs, len);
 					gf_bs_del(metadatad_bs);
-					if (metad->application_format_identifier == GF_4CC('I', 'D', '3', ' ') &&
-					 metad->format_identifier == GF_4CC('I', 'D', '3', ' ')) {
+					if (metad->application_format_identifier == GF_MEDIA_TYPE_ID3 &&
+					 metad->format_identifier == GF_MEDIA_TYPE_ID3) {
 						/*HLS ID3 Metadata */
 						if (pes) {
 							pes->metadata_descriptor = metad;
@@ -2601,11 +2537,48 @@
 
 			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++;
+		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++;
+		else if (es->stream_type == GF_M2TS_VIDEO_MHVC_TEMPORAL) nb_mhvc_temp++;
 	}
 
+	//Table 2-139, implied hierarchy indexes
+	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;
+			if (es->depends_on_pid) continue;
+
+			switch (es->stream_type) {
+			case GF_M2TS_VIDEO_HEVC_TEMPORAL:
+				es->depends_on_pid = 1;
+				break;
+			case GF_M2TS_VIDEO_SHVC:
+				if (!nb_hevc_temp) es->depends_on_pid = 1;
+				else es->depends_on_pid = 2;
+				break;
+			case GF_M2TS_VIDEO_SHVC_TEMPORAL:
+				es->depends_on_pid = 3;
+				break;
+			case GF_M2TS_VIDEO_MHVC:
+				if (!nb_hevc_temp) es->depends_on_pid = 1;
+				else es->depends_on_pid = 2;
+				break;
+			case GF_M2TS_VIDEO_MHVC_TEMPORAL:
+				if (!nb_hevc_temp) es->depends_on_pid = 2;
+				else es->depends_on_pid = 3;
+				break;
+			}
+		}
+	}
 
 	if (nb_es) {
 		u32 i;
+
 		//translate hierarchy descriptors indexes into PIDs - check whether the PMT-index rules are the same for HEVC
 		for (i=0; i<gf_list_count(pmt->program->streams); i++) {
 			GF_M2TS_PES *an_es = NULL;
@@ -2870,7 +2843,7 @@
 {
 	GF_M2TS_PESHeader pesh;
 	if (!ts) return;
-	
+
 	/*we need at least a full, valid start code !!*/
 	if ((pes->pck_data_len >= 4) && !pes->pck_data[0] && !pes->pck_data[1] && (pes->pck_data[2] == 0x1)) {
 		u32 len;
@@ -3302,8 +3275,8 @@
 		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<=182);
-		if (af_size>182)
+		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;
@@ -3419,7 +3392,7 @@
 
 				//ignore PCR discontinuity indicator if PCR found is larger than previously received PCR and diffence between PCR before and after discontinuity indicator is smaller than 50ms
 				else if ((diff_in_us > 0) && (diff < 200000)) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PCR discontinuity signaled but diff is small (diff %d us - PCR diff %d vs prev PCR diff %d) - ignore it\n", hdr.pid, diff, diff_in_us, prev_diff_in_us));
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PCR discontinuity signaled but diff is small (diff %d us - PCR diff %d vs prev PCR diff %d) - ignore it\n", hdr.pid, diff, diff_in_us, prev_diff_in_us));
 				} else {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PCR discontinuity signaled (diff %d us - PCR diff %d vs prev PCR diff %d)\n", hdr.pid, diff, diff_in_us, prev_diff_in_us));
 					pck.flags = GF_M2TS_PES_PCK_DISCONTINUITY;
@@ -3543,6 +3516,7 @@
 	return e;
 }
 
+GF_EXPORT
 GF_ESD *gf_m2ts_get_esd(GF_M2TS_ES *es)
 {
 	GF_ESD *esd;
@@ -3672,7 +3646,7 @@
 GF_Err gf_m2ts_set_pes_framing(GF_M2TS_PES *pes, u32 mode)
 {
 	if (!pes) return GF_BAD_PARAM;
-	
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] Setting pes framing mode of PID %d to %d\n", pes->pid, mode) );
 	/*ignore request for section PIDs*/
 	if (pes->flags & GF_M2TS_ES_IS_SECTION) {
@@ -3722,6 +3696,8 @@
 			pes->single_nal_mode = (mode==GF_M2TS_PES_FRAMING_DEFAULT_NAL) ? 1 : 0;
 			break;
 		case GF_M2TS_VIDEO_HEVC:
+		case GF_M2TS_VIDEO_HEVC_TEMPORAL:
+		case GF_M2TS_VIDEO_HEVC_MCTS:
 		case GF_M2TS_VIDEO_SHVC:
 		case GF_M2TS_VIDEO_SHVC_TEMPORAL:
 		case GF_M2TS_VIDEO_MHVC:
@@ -3789,6 +3765,7 @@
 	ts->demux_and_play = 0;
 	ts->nb_prog_pmt_received = 0;
 	ts->ChannelAppList = gf_list_new();
+	ts->udp_buffer_size = GF_M2TS_UDP_BUFFER_SIZE;
 
 	return ts;
 }
@@ -4050,16 +4027,16 @@
 {
 	u32 i;
 	GF_Err e;
-	char data[GF_M2TS_UDP_BUFFER_SIZE];
 	u32 size;
 	GF_M2TS_Demuxer *ts = _p;
+	char *data = gf_malloc(ts->udp_buffer_size);
 
 	gf_m2ts_reset_parsers(ts);
 	ts->abort_parsing = GF_FALSE;
 
 	//recreate the socket if needed
 	if (ts->socket_url && !ts->sock) {
-		gf_m2ts_get_socket(ts->socket_url, ts->network_type, GF_M2TS_UDP_BUFFER_SIZE, &ts->sock);
+		gf_m2ts_get_socket(ts->socket_url, ts->network_type, ts->udp_buffer_size, &ts->sock);
 	}
 
 #ifdef GPAC_HAS_LINUX_DVB
@@ -4072,7 +4049,7 @@
 				continue;
 			}
 
-			ts_size = read(ts->tuner->ts_fd, data, GF_M2TS_UDP_BUFFER_SIZE);
+			ts_size = read(ts->tuner->ts_fd, data, ts->udp_buffer_size);
 			if (ts_size>0) gf_m2ts_process_data(ts, data, (u32) ts_size);
 		}
 	} else
@@ -4097,7 +4074,7 @@
 				}
 				size = 0;
 				/*m2ts chunks by chunks*/
-				e = gf_sk_receive(ts->sock, data, GF_M2TS_UDP_BUFFER_SIZE, 0, &size);
+				e = gf_sk_receive(ts->sock, data, ts->udp_buffer_size, 0, &size);
 				if (!size || e) {
 					nb_empty++;
 					if (nb_empty==1000) {
@@ -4231,6 +4208,7 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TSDemux] EOS reached\n"));
 
 	ts->run_state = 2;
+	gf_free(data);
 	return 0;
 }
 
@@ -4298,7 +4276,7 @@
 		ts->sock_is_delegate = GF_TRUE;
 	} else {
 		GF_Err e;
-		e = gf_m2ts_get_socket(url, ts->network_type, GF_M2TS_UDP_BUFFER_SIZE, &ts->sock);
+		e = gf_m2ts_get_socket(url, ts->network_type, ts->udp_buffer_size, &ts->sock);
 		if (e) return e;
 	}
 
@@ -4685,8 +4663,8 @@
 	if (_TS < (u64) -ts_shift) _TS = pcr_mod + _TS + ts_shift; \
 	else _TS = _TS + ts_shift; \
 	while (_TS > pcr_mod) _TS -= pcr_mod; \
- 
 
+GF_EXPORT
 GF_Err gf_m2ts_restamp(char *buffer, u32 size, s64 ts_shift, u8 *is_pes)
 {
 	u32 done = 0;

gpac-0.7.1.tar.gz/src/media_tools/text_import.c -> gpac-0.8.0.tar.gz/src/media_tools/text_import.c Changed

@@ -161,6 +161,8 @@
 		switch (gf_isom_get_media_type(dest, i+1)) {
 		case GF_ISOM_MEDIA_SCENE:
 		case GF_ISOM_MEDIA_VISUAL:
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
 			gf_isom_get_visual_info(dest, i+1, 1, &w, &h);
 			if (w > f_w) f_w = w;
 			if (h > f_h) f_h = h;
@@ -201,49 +203,76 @@
 	if (unicode_type<=1) {
 		j=0;
 		len = (u32) strlen(szLine);
-		for (i=0; i<len; i++) {
+		for (i=0; i<len && j < sizeof(szLineConv) - 1; i++, j++) {
+
 			if (!unicode_type && (szLine[i] & 0x80)) {
 				/*non UTF8 (likely some win-CP)*/
 				if ((szLine[i+1] & 0xc0) != 0x80) {
-					szLineConv[j] = 0xc0 | ( (szLine[i] >> 6) & 0x3 );
-					j++;
-					szLine[i] &= 0xbf;
+					if (j + 1 < sizeof(szLineConv) - 1) {
+						szLineConv[j] = 0xc0 | ((szLine[i] >> 6) & 0x3);
+						j++;
+						szLine[i] &= 0xbf;
+					}
+					else
+						break;
 				}
 				/*UTF8 2 bytes char*/
 				else if ( (szLine[i] & 0xe0) == 0xc0) {
-					szLineConv[j] = szLine[i];
-					i++;
-					j++;
+
+					// don't cut multibyte in the middle in there is no more room in dest
+					if (j + 1 < sizeof(szLineConv) - 1 && i + 1 < len) {
+						szLineConv[j] = szLine[i];
+						i++;
+						j++;
+					}
+					else {
+						break;
+					}
 				}
 				/*UTF8 3 bytes char*/
 				else if ( (szLine[i] & 0xf0) == 0xe0) {
-					szLineConv[j] = szLine[i];
-					i++;
-					j++;
-					szLineConv[j] = szLine[i];
-					i++;
-					j++;
+					if (j + 2 < sizeof(szLineConv) - 1 && i + 2 < len) {
+						szLineConv[j] = szLine[i];
+						i++;
+						j++;
+						szLineConv[j] = szLine[i];
+						i++;
+						j++;
+					}
+					else {
+						break;
+					}
 				}
 				/*UTF8 4 bytes char*/
 				else if ( (szLine[i] & 0xf8) == 0xf0) {
-					szLineConv[j] = szLine[i];
-					i++;
-					j++;
-					szLineConv[j] = szLine[i];
-					i++;
-					j++;
-					szLineConv[j] = szLine[i];
-					i++;
-					j++;
+					if (j + 3 < sizeof(szLineConv) - 1 && i + 3 < len) {
+						szLineConv[j] = szLine[i];
+						i++;
+						j++;
+						szLineConv[j] = szLine[i];
+						i++;
+						j++;
+						szLineConv[j] = szLine[i];
+						i++;
+						j++;
+					}
+					else {
+						break;
+					}
 				} else {
 					i+=1;
 					continue;
 				}
 			}
-			szLineConv[j] = szLine[i];
-			j++;
+			if (j < sizeof(szLineConv)-1 && i<len)
+				szLineConv[j] = szLine[i];
+
 		}
-		szLineConv[j] = 0;
+		if (j >= sizeof(szLineConv))
+			szLineConv[sizeof(szLineConv) - 1] = 0;
+		else
+			szLineConv[j] = 0;
+
 		strcpy(szLine, szLineConv);
 		return sOK;
 	}
@@ -265,6 +294,8 @@
 	}
 	sptr = (u16 *)szLine;
 	i = (u32) gf_utf8_wcstombs(szLineConv, 1024, (const unsigned short **) &sptr);
+	if (i >= (u32)ARRAY_LENGTH(szLineConv))
+		return NULL;
 	szLineConv[i] = 0;
 	strcpy(szLine, szLineConv);
 	/*this is ugly indeed: since input is UTF16-LE, there are many chances the fgets never reads the \0 after a \n*/
@@ -701,7 +732,10 @@
 			txt_line ++;
 			break;
 		}
-		if (duration && (start >= duration)) break;
+		if (duration && (start >= duration)) {
+			end = 0;
+			break;
+		}
 	}
 
 	/*final flush*/	
@@ -713,9 +747,15 @@
 		gf_isom_add_sample(import->dest, track, 1, s);
 		gf_isom_sample_del(&s);
 		nb_samp++;
+		gf_isom_set_last_sample_duration(import->dest, track, 0);
+	} else {
+		if (duration && (start >= duration)) {
+			gf_isom_set_last_sample_duration(import->dest, track, (timescale*duration)/1000);
+		} else {
+			gf_isom_set_last_sample_duration(import->dest, track, 0);
+		}
 	}
 	gf_isom_delete_text_sample(samp);
-	gf_isom_set_last_sample_duration(import->dest, track, 0);
 	gf_set_progress("Importing SRT", nb_samp, nb_samp);
 
 exit:
@@ -995,6 +1035,8 @@
 				lang = gf_strdup(att->value);
 				import->esd->langDesc = (GF_Language *) gf_odf_desc_new(GF_ODF_LANG_TAG);
 				gf_isom_set_media_language(import->dest, track, lang);
+			} else {
+				gf_isom_set_media_language(import->dest, track, att->value);
 			}
 		}
 	}
@@ -1132,7 +1174,7 @@
 						} else if (e_opt == GF_OK) {
 							GF_XMLNode *p_node;
 							GF_XMLAttribute *p_att;
-							u32 p_idx = 0, h, m, s, ms;
+							u32 p_idx = 0, h, m, s, f, ms;
 							s64 ts_begin = -1, ts_end = -1;
 
 							//sample is either in the ...
@@ -1146,6 +1188,8 @@
 									}
 									if (sscanf(p_att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
 										ts_begin = (h*3600 + m*60+s)*1000+ms;
+									} else if (sscanf(p_att->value, "%u:%u:%u:%u", &h, &m, &s, &f) == 4) {
+										ts_begin = (h*3600 + m*60+s)*1000+f*40;
 									} else if (sscanf(p_att->value, "%u:%u:%u", &h, &m, &s) == 3) {
 										ts_begin = (h*3600 + m*60+s)*1000;
 									}
@@ -1156,6 +1200,8 @@
 									}
 									if (sscanf(p_att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
 										ts_end = (h*3600 + m*60+s)*1000+ms;
+									} else if (sscanf(p_att->value, "%u:%u:%u:%u", &h, &m, &s, &f) == 4) {
+										ts_end = (h*3600 + m*60+s)*1000+f*40;
 									} else if (sscanf(p_att->value, "%u:%u:%u", &h, &m, &s) == 3) {
 										ts_end = (h*3600 + m*60+s)*1000;
 									}
@@ -1189,6 +1235,8 @@
 											}
 											if (sscanf(span_att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
 												ts_begin = (h*3600 + m*60+s)*1000+ms;
+											} else if (sscanf(p_att->value, "%u:%u:%u:%u", &h, &m, &s, &f) == 4) {
+												ts_begin = (h*3600 + m*60+s)*1000+f*40;
 											} else if (sscanf(span_att->value, "%u:%u:%u", &h, &m, &s) == 3) {
 												ts_begin = (h*3600 + m*60+s)*1000;
 											}
@@ -1199,6 +1247,8 @@
 											}
 											if (sscanf(span_att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
 												ts_end = (h*3600 + m*60+s)*1000+ms;
+											} else if (sscanf(p_att->value, "%u:%u:%u:%u", &h, &m, &s, &f) == 4) {
+												ts_end = (h*3600 + m*60+s)*1000+f*40;
 											} else if (sscanf(span_att->value, "%u:%u:%u", &h, &m, &s) == 3) {
 												ts_end = (h*3600 + m*60+s)*1000;
 											}
@@ -1242,7 +1292,10 @@
 								samp = gf_isom_new_xml_subtitle_sample();
 								/*each sample consists of a full valid XML file*/
 								e = gf_isom_xml_subtitle_sample_add_text(samp, str, len);
-								if (e) goto exit;
+								if (e) {
+									GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML] ISOM - sample add text: %s", gf_error_to_string(e)));
+									goto exit;
+								}
 								gf_free(samp_text);
 								samp_text = NULL;
 
@@ -1259,7 +1312,10 @@
 								GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("ts_begin="LLD", ts_end="LLD", last_sample_duration="LLU" (real duration: "LLU"), last_sample_end="LLU"\n", ts_begin, ts_end, ts_end - last_sample_end, last_sample_duration, last_sample_end));
 
 								e = gf_isom_add_sample(import->dest, track, desc_idx, s);
-								if (e) goto exit;
+								if (e) {
+									GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML] ISOM - Add Sample: %s", gf_error_to_string(e)));
+									goto exit;
+								}
 								gf_isom_sample_del(&s);
 								nb_samples++;
 
@@ -1287,6 +1343,7 @@
 	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("last_sample_duration="LLU", last_sample_end="LLU"\n", last_sample_duration, last_sample_end));
 	gf_isom_set_last_sample_duration(import->dest, track, (u32) last_sample_duration);
+	gf_media_update_bitrate(import->dest, track);
 	gf_set_progress("Importing TTML EBU-TTD", nb_samples, nb_samples);
 
 exit:
@@ -1327,6 +1384,7 @@
 		if (e == GF_OK) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("Note: TTML import - EBU-TTD detected\n"));
 		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("Parsing TTML file with error: %s\n", gf_error_to_string(e)));
 			GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("Unsupported TTML file - only EBU-TTD is supported (root shall be \"tt\", got \"%s\")\n", root->name));
 			GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("Importing as generic TTML\n"));
 			e = GF_OK;
@@ -1444,6 +1502,10 @@
 	} else {
 		mime = "application/octet-stream";
 	}
+
+	read = gf_swf_reader_new(NULL, import->in_name);
+	gf_swf_read_header(read);
+
 	/*setup	track*/
 	if (cfg) {
 		u32	i;
@@ -1459,10 +1521,12 @@
 		gf_import_message(import, GF_OK, "SWF import - text track %d	x %d", cfg->text_width,	cfg->text_height);
 		gf_odf_desc_del((GF_Descriptor *)cfg);
 	} else {
-		u32	w;
-		u32	h;
+		u32	w = (u32)read->width;
+		u32	h = (u32)read->height;
+
+		if (!w || !h)
+			gf_text_get_video_size(import, &w, &h);
 
-		gf_text_get_video_size(import, &w, &h);
 		gf_isom_set_track_layout_info(import->dest,	track, w<<16, h<<16, 0,	0, 0);
 
 		gf_isom_new_stxt_description(import->dest, track, GF_ISOM_SUBTYPE_STXT, mime, NULL,	NULL, &descIndex);
@@ -1472,8 +1536,6 @@
 	gf_text_import_set_language(import, track);
 	//duration = (u32) (((Double) import->duration)*timescale/1000.0);
 
-	read = gf_swf_reader_new(NULL, import->in_name);
-	gf_swf_read_header(read);
 	flusher.import = import;
 	flusher.track = track;
 	flusher.timescale = timescale;
@@ -1499,6 +1561,7 @@
 	if (e==GF_EOS) e = GF_OK;
 exit:
 	gf_swf_reader_del(read);
+	gf_media_update_bitrate(import->dest, track);
 	return e;
 }
 /* end of SWF Importer */

gpac-0.7.1.tar.gz/src/media_tools/vobsub.c -> gpac-0.8.0.tar.gz/src/media_tools/vobsub.c Changed

gpac-0.7.1.tar.gz/src/media_tools/webvtt.c -> gpac-0.8.0.tar.gz/src/media_tools/webvtt.c Changed

@@ -67,8 +67,21 @@
 	case GF_ISOM_BOX_TYPE_STTG:
 	case GF_ISOM_BOX_TYPE_PAYL:
 	case GF_ISOM_BOX_TYPE_VTTA:
-		a = gf_isom_box_new(type);
-		if (a && string) ((GF_StringBox *)a)->string = gf_strdup(string);
+		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;
+
+			if (len && (a = gf_isom_box_new(type)))
+			{
+				// strndup
+				char* str = ((GF_StringBox *)a)->string = gf_malloc(len + 1);
+				memcpy(str, string, len);
+				str[len] = '\0';
+			}
+		}
 		break;
 	default:
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Box type %s is not a boxstring, cannot initialize with data\n", gf_4cc_to_str(type) ));
@@ -427,10 +440,8 @@
 
 GF_Err wvtt_dump(GF_Box *a, FILE * trace)
 {
-	GF_WebVTTSampleEntryBox *cuebox = (GF_WebVTTSampleEntryBox *)a;
 	gf_isom_box_dump_start(a, "WebVTTSampleEntryBox", trace);
 	fprintf(trace, ">\n");
-	if (cuebox->config) boxstring_dump((GF_Box *)cuebox->config, trace);
 	gf_isom_box_dump_done("WebVTTSampleEntryBox", a, trace);
 	return GF_OK;
 }
@@ -467,6 +478,17 @@
 
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 
+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;
+}
+static Bool gf_webvtt_timestamp_greater(GF_WebVTTTimestamp *ts1, GF_WebVTTTimestamp *ts2)
+{
+	u64 t_ts1 = (60 * 60 * ts1->hour + 60 * ts1->min + ts1->sec) * 1000 + ts1->ms;
+	u64 t_ts2 = (60 * 60 * ts2->hour + 60 * ts2->min + ts2->sec) * 1000 + ts2->ms;
+	return (t_ts1 >= t_ts2) ? GF_TRUE : GF_FALSE;
+}
+
 
 /* mark the overlapped cue in the previous sample as split */
 /* duplicate the cue, mark it as split and adjust its timing */
@@ -924,6 +946,14 @@
 			char *settings = line + pos;
 			e = gf_webvtt_cue_add_property(cue, WEBVTT_SETTINGS, settings, (u32) strlen(settings));
 		}
+
+		if (!gf_webvtt_timestamp_greater(&cue->end, &cue->start)) {
+			parser->report_message(parser->user, e, "Bad VTT timestamps, end smaller than start", timestamp_string);
+			cue->end = cue->start;
+			cue->end.ms += 1;
+			return GF_NON_COMPLIANT_BITSTREAM;
+
+		}
 	}
 	return e;
 }
@@ -1101,7 +1131,7 @@
 	}
 	while (gf_list_count(parser->samples) > 0) {
 		GF_WebVTTSample *sample = (GF_WebVTTSample *)gf_list_get(parser->samples, 0);
-		parser->last_duration = sample->end - sample->start;
+		parser->last_duration = (sample->end > sample->start) ? sample->end - sample->start : 0;
 		gf_list_rem(parser->samples, 0);
 		parser->on_sample_parsed(parser->user, sample);
 	}
@@ -1171,11 +1201,6 @@
 	return cues;
 }
 
-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;
-}
-
 GF_Err gf_webvtt_merge_cues(GF_WebVTTParser *parser, u64 start, GF_List *cues)
 {
 	GF_WebVTTSample *wsample;
@@ -1470,6 +1495,8 @@
 	return gf_webvtt_dump_cues(dump, samp->cues);
 }
 
+#ifndef GPAC_DISABLE_MEDIA_EXPORT
+
 GF_EXPORT
 GF_Err gf_webvtt_dump_iso_track(GF_MediaExporter *dumper, char *szName, u32 track, Bool merge, Bool box_dump)
 {
@@ -1492,7 +1519,8 @@
 	parser->user = out;
 	parser->on_cue_read = gf_webvtt_dump_cue;
 
-	fprintf(out, "<WebVTTTrack trackID=\"%d\">\n", gf_isom_get_track_id(dumper->file, track) );
+	if (box_dump)
+		fprintf(out, "<WebVTTTrack trackID=\"%d\">\n", gf_isom_get_track_id(dumper->file, track) );
 
 	e = gf_webvtt_dump_header(out, dumper->file, track, box_dump, 1);
 	if (e) goto exit;
@@ -1515,8 +1543,9 @@
 	duration = gf_isom_get_media_duration(dumper->file, track);
 	gf_webvtt_parser_dump_finalize(parser, duration);
 
-	fprintf(out, "</WebVTTTrack>\n");
-	
+	if (box_dump)
+		fprintf(out, "</WebVTTTrack>\n");
+
 exit:
 	gf_webvtt_parser_del(parser);
 	if (szName) gf_fclose(out);
@@ -1524,6 +1553,8 @@
 #endif
 }
 
-#endif //GPAC_DISABLE_ISOM_DUMP
+#endif /*GPAC_DISABLE_MEDIA_EXPORT*/
+
+#endif /*GPAC_DISABLE_ISOM_DUMP*/
 
-#endif /* GPAC_DISABLE_VTT */
+#endif /*GPAC_DISABLE_VTT*/

gpac-0.7.1.tar.gz/src/odf/desc_private.c -> gpac-0.8.0.tar.gz/src/odf/desc_private.c Changed

gpac-0.7.1.tar.gz/src/odf/descriptors.c -> gpac-0.8.0.tar.gz/src/odf/descriptors.c Changed

@@ -26,9 +26,7 @@
 #include <gpac/internal/odf_dev.h>
 #include <gpac/constants.h>
 
-#ifndef GPAC_DISABLE_AV_PARSERS
 #include <gpac/avparse.h>
-#endif
 
 GF_EXPORT
 const char *gf_odf_stream_type_name(u32 streamType)
@@ -413,10 +411,10 @@
 {
 	u32 to_skip;
 	GF_BitStream *bs;
-	
+
 	if (!cfg) return GF_BAD_PARAM;
 	memset(cfg, 0, sizeof(GF_LASERConfig));
-	
+
 	if (!dsi || !dsi->data || !dsi->dataLength || !cfg) return GF_BAD_PARAM;
 	bs = gf_bs_new(dsi->data, dsi->dataLength, GF_BITSTREAM_READ);
 	memset(cfg, 0, sizeof(GF_LASERConfig));
@@ -537,6 +535,8 @@
 		gf_free(sl);
 	}
 	gf_list_del(cfg->sequenceParameterSets);
+	cfg->sequenceParameterSets = NULL;
+
 	while (gf_list_count(cfg->pictureParameterSets)) {
 		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(cfg->pictureParameterSets, 0);
 		gf_list_rem(cfg->pictureParameterSets, 0);
@@ -544,6 +544,7 @@
 		gf_free(sl);
 	}
 	gf_list_del(cfg->pictureParameterSets);
+	cfg->pictureParameterSets = NULL;
 
 	if (cfg->sequenceParameterSetExtensions) {
 		while (gf_list_count(cfg->sequenceParameterSetExtensions)) {
@@ -553,52 +554,81 @@
 			gf_free(sl);
 		}
 		gf_list_del(cfg->sequenceParameterSetExtensions);
+		cfg->sequenceParameterSetExtensions = NULL;
 	}
 	gf_free(cfg);
 }
 
 GF_EXPORT
-GF_Err gf_odf_avc_cfg_write(GF_AVCConfig *cfg, char **outData, u32 *outSize)
+GF_Err gf_odf_avc_cfg_write_bs(GF_AVCConfig *cfg, GF_BitStream *bs)
 {
 	u32 i, count;
-	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	gf_bs_write_int(bs, cfg->configurationVersion, 8);
-	gf_bs_write_int(bs, cfg->AVCProfileIndication , 8);
-	gf_bs_write_int(bs, cfg->profile_compatibility, 8);
-	gf_bs_write_int(bs, cfg->AVCLevelIndication, 8);
-	gf_bs_write_int(bs, 0x3F, 6);
-	gf_bs_write_int(bs, cfg->nal_unit_size - 1, 2);
-	gf_bs_write_int(bs, 0x7, 3);
+
 	count = gf_list_count(cfg->sequenceParameterSets);
-	gf_bs_write_int(bs, count, 5);
+
+	if (!cfg->write_annex_b) {
+		gf_bs_write_int(bs, cfg->configurationVersion, 8);
+		gf_bs_write_int(bs, cfg->AVCProfileIndication , 8);
+		gf_bs_write_int(bs, cfg->profile_compatibility, 8);
+		gf_bs_write_int(bs, cfg->AVCLevelIndication, 8);
+		gf_bs_write_int(bs, 0x3F, 6);
+		gf_bs_write_int(bs, cfg->nal_unit_size - 1, 2);
+		gf_bs_write_int(bs, 0x7, 3);
+		gf_bs_write_int(bs, count, 5);
+	}
 	for (i=0; i<count; i++) {
 		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(cfg->sequenceParameterSets, i);
-		gf_bs_write_int(bs, sl->size, 16);
+		if (!cfg->write_annex_b) {
+			gf_bs_write_u16(bs, sl->size);
+		} else {
+			gf_bs_write_u32(bs, 1);
+		}
 		gf_bs_write_data(bs, sl->data, sl->size);
 	}
 	count = gf_list_count(cfg->pictureParameterSets);
-	gf_bs_write_int(bs, count, 8);
+	if (!cfg->write_annex_b) {
+		gf_bs_write_int(bs, count, 8);
+	}
 	for (i=0; i<count; i++) {
 		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(cfg->pictureParameterSets, i);
-		gf_bs_write_int(bs, sl->size, 16);
+		if (!cfg->write_annex_b) {
+			gf_bs_write_u16(bs, sl->size);
+		} else {
+			gf_bs_write_u32(bs, 1);
+		}
 		gf_bs_write_data(bs, sl->data, sl->size);
 	}
 	if (gf_avc_is_rext_profile(cfg->AVCProfileIndication)) {
-		gf_bs_write_int(bs, 0xFF, 6);
-		gf_bs_write_int(bs, cfg->chroma_format, 2);
-		gf_bs_write_int(bs, 0xFF, 5);
-		gf_bs_write_int(bs, cfg->luma_bit_depth - 8, 3);
-		gf_bs_write_int(bs, 0xFF, 5);
-		gf_bs_write_int(bs, cfg->chroma_bit_depth - 8, 3);
-
+		if (!cfg->write_annex_b) {
+			gf_bs_write_int(bs, 0xFF, 6);
+			gf_bs_write_int(bs, cfg->chroma_format, 2);
+			gf_bs_write_int(bs, 0xFF, 5);
+			gf_bs_write_int(bs, cfg->luma_bit_depth - 8, 3);
+			gf_bs_write_int(bs, 0xFF, 5);
+			gf_bs_write_int(bs, cfg->chroma_bit_depth - 8, 3);
+		}
 		count = cfg->sequenceParameterSetExtensions ? gf_list_count(cfg->sequenceParameterSetExtensions) : 0;
-		gf_bs_write_u8(bs, count);
+		if (!cfg->write_annex_b) {
+			gf_bs_write_u8(bs, count);
+		}
 		for (i=0; i<count; i++) {
 			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *) gf_list_get(cfg->sequenceParameterSetExtensions, i);
-			gf_bs_write_u16(bs, sl->size);
+			if (!cfg->write_annex_b) {
+				gf_bs_write_u16(bs, sl->size);
+			} else {
+				gf_bs_write_u32(bs, 1);
+			}
 			gf_bs_write_data(bs, sl->data, sl->size);
 		}
 	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_odf_avc_cfg_write(GF_AVCConfig *cfg, char **outData, u32 *outSize)
+{
+	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	gf_odf_avc_cfg_write_bs(cfg, bs);
 	*outSize = 0;
 	*outData = NULL;
 	gf_bs_get_content(bs, outData, outSize);
@@ -855,60 +885,72 @@
 {
 	u32 i, count;
 
-	gf_bs_write_int(bs, cfg->configurationVersion, 8);
-
-	if (!cfg->is_lhvc) {
-		gf_bs_write_int(bs, cfg->profile_space, 2);
-		gf_bs_write_int(bs, cfg->tier_flag, 1);
-		gf_bs_write_int(bs, cfg->profile_idc, 5);
-		gf_bs_write_int(bs, cfg->general_profile_compatibility_flags, 32);
-		gf_bs_write_int(bs, cfg->progressive_source_flag, 1);
-		gf_bs_write_int(bs, cfg->interlaced_source_flag, 1);
-		gf_bs_write_int(bs, cfg->non_packed_constraint_flag, 1);
-		gf_bs_write_int(bs, cfg->frame_only_constraint_flag, 1);
-		/*only lowest 44 bits used*/
-		gf_bs_write_long_int(bs, cfg->constraint_indicator_flags, 44);
-		gf_bs_write_int(bs, cfg->level_idc, 8);
-	}
+	count = gf_list_count(cfg->param_array);
 
-	gf_bs_write_int(bs, 0xFF, 4);
-	gf_bs_write_int(bs, cfg->min_spatial_segmentation_idc, 12);
+	if (!cfg->write_annex_b) {
+		gf_bs_write_int(bs, cfg->configurationVersion, 8);
+
+		if (!cfg->is_lhvc) {
+			gf_bs_write_int(bs, cfg->profile_space, 2);
+			gf_bs_write_int(bs, cfg->tier_flag, 1);
+			gf_bs_write_int(bs, cfg->profile_idc, 5);
+			gf_bs_write_int(bs, cfg->general_profile_compatibility_flags, 32);
+			gf_bs_write_int(bs, cfg->progressive_source_flag, 1);
+			gf_bs_write_int(bs, cfg->interlaced_source_flag, 1);
+			gf_bs_write_int(bs, cfg->non_packed_constraint_flag, 1);
+			gf_bs_write_int(bs, cfg->frame_only_constraint_flag, 1);
+			/*only lowest 44 bits used*/
+			gf_bs_write_long_int(bs, cfg->constraint_indicator_flags, 44);
+			gf_bs_write_int(bs, cfg->level_idc, 8);
+		}
 
-	gf_bs_write_int(bs, 0xFF, 6);
-	gf_bs_write_int(bs, cfg->parallelismType, 2);
+		gf_bs_write_int(bs, 0xFF, 4);
+		gf_bs_write_int(bs, cfg->min_spatial_segmentation_idc, 12);
 
-	if (!cfg->is_lhvc) {
 		gf_bs_write_int(bs, 0xFF, 6);
-		gf_bs_write_int(bs, cfg->chromaFormat, 2);
-		gf_bs_write_int(bs, 0xFF, 5);
-		gf_bs_write_int(bs, cfg->luma_bit_depth-8, 3);
-		gf_bs_write_int(bs, 0xFF, 5);
-		gf_bs_write_int(bs, cfg->chroma_bit_depth-8, 3);
-		gf_bs_write_int(bs, cfg->avgFrameRate, 16);
-	}
+		gf_bs_write_int(bs, cfg->parallelismType, 2);
+
+		if (!cfg->is_lhvc) {
+			gf_bs_write_int(bs, 0xFF, 6);
+			gf_bs_write_int(bs, cfg->chromaFormat, 2);
+			gf_bs_write_int(bs, 0xFF, 5);
+			gf_bs_write_int(bs, cfg->luma_bit_depth-8, 3);
+			gf_bs_write_int(bs, 0xFF, 5);
+			gf_bs_write_int(bs, cfg->chroma_bit_depth-8, 3);
+			gf_bs_write_int(bs, cfg->avgFrameRate, 16);
+		}
 
-	if (!cfg->is_lhvc)
-		gf_bs_write_int(bs, cfg->constantFrameRate, 2);
-	else
-		gf_bs_write_int(bs, 0xFF, 2);
+		if (!cfg->is_lhvc)
+			gf_bs_write_int(bs, cfg->constantFrameRate, 2);
+		else
+			gf_bs_write_int(bs, 0xFF, 2);
 
-	gf_bs_write_int(bs, cfg->numTemporalLayers, 3);
-	gf_bs_write_int(bs, cfg->temporalIdNested, 1);
-	gf_bs_write_int(bs, cfg->nal_unit_size - 1, 2);
+		gf_bs_write_int(bs, cfg->numTemporalLayers, 3);
+		gf_bs_write_int(bs, cfg->temporalIdNested, 1);
+		gf_bs_write_int(bs, cfg->nal_unit_size - 1, 2);
+
+		gf_bs_write_int(bs, count, 8);
+	}
 
-	count = gf_list_count(cfg->param_array);
-	gf_bs_write_int(bs, count, 8);
 	for (i=0; i<count; i++) {
 		u32 nalucount, j;
 		GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(cfg->param_array, i);
-		gf_bs_write_int(bs, ar->array_completeness, 1);
-		gf_bs_write_int(bs, 0, 1);
-		gf_bs_write_int(bs, ar->type, 6);
+
 		nalucount = gf_list_count(ar->nalus);
-		gf_bs_write_int(bs, nalucount, 16);
+		if (!cfg->write_annex_b) {
+			gf_bs_write_int(bs, ar->array_completeness, 1);
+			gf_bs_write_int(bs, 0, 1);
+			gf_bs_write_int(bs, ar->type, 6);
+			gf_bs_write_int(bs, nalucount, 16);
+		}
+
 		for (j=0; j<nalucount; j++) {
 			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j);
-			gf_bs_write_int(bs, sl->size, 16);
+			if (!cfg->write_annex_b) {
+				gf_bs_write_int(bs, sl->size, 16);
+			} else {
+				gf_bs_write_u32(bs, 1);
+			}
 			gf_bs_write_data(bs, sl->data, sl->size);
 		}
 	}
@@ -1029,6 +1071,180 @@
 	return cfg;
 }
 
+
+GF_EXPORT
+GF_AV1Config *gf_odf_av1_cfg_new()
+{
+	GF_AV1Config *cfg;
+	GF_SAFEALLOC(cfg, GF_AV1Config);
+	if (!cfg) return NULL;
+	cfg->marker = 1;
+	cfg->version = 1;
+	cfg->initial_presentation_delay_minus_one = 0;
+	cfg->obu_array = gf_list_new();
+	return cfg;
+}
+
+GF_EXPORT
+void gf_odf_av1_cfg_del(GF_AV1Config *cfg)
+{
+	if (!cfg) return;
+	while (gf_list_count(cfg->obu_array)) {
+		GF_AV1_OBUArrayEntry *a = (GF_AV1_OBUArrayEntry*)gf_list_get(cfg->obu_array, 0);
+		if (a->obu) gf_free(a->obu);
+		gf_list_rem(cfg->obu_array, 0);
+		gf_free(a);
+	}
+	gf_list_del(cfg->obu_array);
+	gf_free(cfg);
+}
+
+GF_EXPORT
+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->seq_profile, 3);
+	gf_bs_write_int(bs, cfg->seq_level_idx_0, 5);
+	gf_bs_write_int(bs, cfg->seq_tier_0, 1);
+	gf_bs_write_int(bs, cfg->high_bitdepth, 1);
+	gf_bs_write_int(bs, cfg->twelve_bit, 1);
+	gf_bs_write_int(bs, cfg->monochrome, 1);
+	gf_bs_write_int(bs, cfg->chroma_subsampling_x, 1);
+	gf_bs_write_int(bs, cfg->chroma_subsampling_y, 1);
+	gf_bs_write_int(bs, cfg->chroma_sample_position, 2);
+	gf_bs_write_int(bs, 0, 3); /*reserved*/
+	gf_bs_write_int(bs, cfg->initial_presentation_delay_present, 1);
+	gf_bs_write_int(bs, cfg->initial_presentation_delay_minus_one, 4); /*TODO: compute initial_presentation_delay_minus_one*/
+	for (i = 0; i < gf_list_count(cfg->obu_array); ++i) {
+		GF_AV1_OBUArrayEntry *a = gf_list_get(cfg->obu_array, i);
+		gf_bs_write_data(bs, a->obu, (u32)a->obu_length); //TODO: we are supposed to omit the size on the last OBU...
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_odf_av1_cfg_write(GF_AV1Config *cfg, char **outData, u32 *outSize) {
+	GF_Err e;
+	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	*outSize = 0;
+	*outData = NULL;
+	e = gf_odf_av1_cfg_write_bs(cfg, bs);
+	if (e == GF_OK)
+		gf_bs_get_content(bs, outData, outSize);
+
+	gf_bs_del(bs);
+	return e;
+}
+
+
+
+GF_EXPORT
+GF_VPConfig *gf_odf_vp_cfg_new()
+{
+	GF_VPConfig *cfg;
+	GF_SAFEALLOC(cfg, GF_VPConfig);
+	if (!cfg) return NULL;
+	cfg->codec_initdata_size = 0;
+	cfg->codec_initdata = NULL;
+	return cfg;
+}
+
+GF_EXPORT
+void gf_odf_vp_cfg_del(GF_VPConfig *cfg)
+{
+	if (!cfg) return;
+
+	if (cfg->codec_initdata) {
+		gf_free(cfg->codec_initdata);
+		cfg->codec_initdata = NULL;
+	}
+
+	gf_free(cfg);
+}
+
+GF_EXPORT
+GF_Err gf_odf_vp_cfg_write_bs(GF_VPConfig *cfg, GF_BitStream *bs, Bool is_v0)
+{
+	gf_bs_write_int(bs, cfg->profile, 8);
+	gf_bs_write_int(bs, cfg->level, 8);
+	gf_bs_write_int(bs, cfg->bit_depth, 4);
+	gf_bs_write_int(bs, cfg->chroma_subsampling, 3);
+	gf_bs_write_int(bs, cfg->video_fullRange_flag, 1);
+	gf_bs_write_int(bs, cfg->colour_primaries, 8);
+	gf_bs_write_int(bs, cfg->transfer_characteristics, 8);
+	gf_bs_write_int(bs, cfg->matrix_coefficients, 8);
+
+	if (!is_v0) {
+		if (cfg->codec_initdata_size) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] VP Configuration Box: invalid data, codec_initdata_size must be 0, was %d - ignoring\n", cfg->codec_initdata_size));
+		}
+
+		gf_bs_write_int(bs, (u16)0, 16);
+	}
+
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_odf_vp_cfg_write(GF_VPConfig *cfg, char **outData, u32 *outSize, Bool is_v0)
+{
+	GF_Err e;
+	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	*outSize = 0;
+	*outData = NULL;
+	e = gf_odf_vp_cfg_write_bs(cfg, bs, is_v0);
+	if (e==GF_OK)
+		gf_bs_get_content(bs, outData, outSize);
+
+	gf_bs_del(bs);
+	return e;
+}
+
+GF_EXPORT
+GF_VPConfig *gf_odf_vp_cfg_read_bs(GF_BitStream *bs, Bool is_v0)
+{
+	GF_VPConfig *cfg = gf_odf_vp_cfg_new();
+
+	cfg->profile = gf_bs_read_int(bs, 8);
+	cfg->level = gf_bs_read_int(bs, 8);
+
+	cfg->bit_depth = gf_bs_read_int(bs, 4);
+	cfg->chroma_subsampling = gf_bs_read_int(bs, 3);
+	cfg->video_fullRange_flag = gf_bs_read_int(bs, 1);
+
+	cfg->colour_primaries = gf_bs_read_int(bs, 8);
+	cfg->transfer_characteristics = gf_bs_read_int(bs, 8);
+	cfg->matrix_coefficients = gf_bs_read_int(bs, 8);
+
+	if (is_v0)
+		return cfg;
+
+	cfg->codec_initdata_size = gf_bs_read_int(bs, 16);
+
+	// must be 0 according to spec
+	if (cfg->codec_initdata_size) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] VP Configuration Box: invalid data, codec_initdata_size must be 0, was %d\n", cfg->codec_initdata_size));
+		gf_odf_vp_cfg_del(cfg);
+		return NULL;
+	}
+
+	return cfg;
+}
+
+GF_EXPORT
+GF_VPConfig *gf_odf_vp_cfg_read(char *dsi, u32 dsi_size)
+{
+	GF_BitStream *bs = gf_bs_new(dsi, dsi_size, GF_BITSTREAM_READ);
+	GF_VPConfig *cfg = gf_odf_vp_cfg_read_bs(bs, GF_FALSE);
+	gf_bs_del(bs);
+	return cfg;
+}
+
+
+
+
 GF_EXPORT
 const char *gf_afx_get_type_description(u8 afx_code)
 {
@@ -1147,6 +1363,10 @@
 			return "SMPTE VC-1 Video";
 		case GPAC_OTI_VIDEO_DIRAC:
 			return "Dirac Video";
+		case GPAC_OTI_VIDEO_AV1:
+			return "AOM AV1 Video";
+		case GPAC_OTI_VIDEO_VP9:
+			return "VP9 Video";
 		default:
 			return "Unknown Video type";
 		}

gpac-0.7.1.tar.gz/src/odf/ipmpx_code.c -> gpac-0.8.0.tar.gz/src/odf/ipmpx_code.c Changed

@@ -34,7 +34,7 @@
 	memset(__ptr, 0, sizeof(__stname));	\
 	((GF_IPMPX_Data *)__ptr)->tag = __tag;	\
 	((GF_IPMPX_Data *)__ptr)->Version = 0x01;	\
- 
+
 
 #define GF_IPMPX_DELETE_ARRAY(__ar) if (__ar) { if (__ar->data) gf_free(__ar->data); gf_free(__ar); }
 
@@ -751,7 +751,6 @@
 {
 	u32 NbBytes = 0;
 	GF_IPMPX_GetToolsResponse *p = (GF_IPMPX_GetToolsResponse *)_p;
-
 	while (size>NbBytes) {
 		u32 desc_size, start_o;
 		GF_Descriptor *desc;
@@ -776,7 +775,6 @@
 {
 	u32 i;
 	GF_IPMPX_GetToolsResponse *p = (GF_IPMPX_GetToolsResponse *)_p;
-
 	for (i=0; i<gf_list_count(p->ipmp_tools); i++) {
 		GF_Descriptor *desc = (GF_Descriptor *)gf_list_get(p->ipmp_tools, i);
 		gf_odf_write_descriptor(bs, desc);
@@ -1098,8 +1096,14 @@
 static GF_Err ReadGF_IPMPX_RemoveToolNotificationListener(GF_BitStream *bs, GF_IPMPX_Data *_p, u32 size)
 {
 	u32 i;
+	u8 count;
 	GF_IPMPX_RemoveToolNotificationListener*p = (GF_IPMPX_RemoveToolNotificationListener*)_p;
-	p->eventTypeCount = gf_bs_read_int(bs, 8);
+	p->eventTypeCount = 0;
+	count = gf_bs_read_int(bs, 8);
+	if (count > ARRAY_LENGTH(p->eventType))
+		return GF_CORRUPTED_DATA;
+
+	p->eventTypeCount = count;
 	for (i=0; i<p->eventTypeCount; i++) p->eventType[i] = gf_bs_read_int(bs, 8);
 	return GF_OK;
 }
@@ -1322,7 +1326,7 @@
 		GF_IPMPX_SelEncBuffer *sb;
 		GF_SAFEALLOC(sb, GF_IPMPX_SelEncBuffer);
 		if (!sb) return GF_OUT_OF_MEM;
-		
+
 		gf_list_add(p->SelEncBuffer, sb);
 		count--;
 		gf_bs_read_data(bs, (char*)sb->cipher_Id, 16);
@@ -1346,7 +1350,7 @@
 			GF_IPMPX_SelEncField *sf;
 			GF_SAFEALLOC(sf, GF_IPMPX_SelEncField);
 			if (!sf) return GF_OUT_OF_MEM;
-			
+
 			gf_list_add(p->SelEncFields, sf);
 			count--;
 			sf->field_Id = gf_bs_read_int(bs, 8);

gpac-0.7.1.tar.gz/src/odf/odf_code.c -> gpac-0.8.0.tar.gz/src/odf/odf_code.c Changed

@@ -1104,7 +1104,6 @@
 {
 	GF_Err e;
 	if (!dcd) return GF_BAD_PARAM;
-
 	if (dcd->decoderSpecificInfo) {
 		e = gf_odf_delete_descriptor((GF_Descriptor *) dcd->decoderSpecificInfo);
 		if (e) return e;
@@ -1255,6 +1254,12 @@
 		if (! dd->data) return GF_OUT_OF_MEM;
 		gf_bs_read_data(bs, dd->data, dd->dataLength);
 		nbBytes += dd->dataLength;
+		/* internal tags are read as default but deleted as their own types
+		 so dd->data would leak here */
+		if ((dd->tag>=GF_ODF_MUXINFO_TAG) && (dd->tag<=GF_ODF_LASER_CFG_TAG)) {
+			gf_free(dd->data);
+			dd->data = NULL;
+		}
 	}
 	if (nbBytes != DescSize) return GF_ODF_INVALID_DESCRIPTOR;
 	return GF_OK;
@@ -2585,6 +2590,8 @@
 		GF_KeyWordItem *tmp = (GF_KeyWordItem*)gf_list_get(kwd->keyWordsList, 0);
 		if (tmp) {
 			if (tmp->keyWord) gf_free(tmp->keyWord);
+			tmp->keyWord = NULL;
+			gf_list_rem(kwd->keyWordsList, 0);
 			gf_free(tmp);
 		}
 	}
@@ -2612,6 +2619,7 @@
 		if (e) return e;
 		nbBytes += len;
 		if (nbBytes > DescSize) {
+			gf_free(tmp->keyWord);
 			gf_free(tmp);
 			return GF_ODF_INVALID_DESCRIPTOR;
 		}
@@ -3298,7 +3306,7 @@
 		u32 s;
 		nbBytes += gf_ipmpx_array_size(bs, &s);
 		if (s>0xFFFFFF) return GF_ODF_INVALID_DESCRIPTOR;
-		
+
 		if (s) {
 			ipmpt->tool_url = (char*)gf_malloc(sizeof(char)*(s+1));
 			gf_bs_read_data(bs, ipmpt->tool_url, s);

gpac-0.7.1.tar.gz/src/odf/qos.c -> gpac-0.8.0.tar.gz/src/odf/qos.c Changed

gpac-0.7.1.tar.gz/src/scene_manager/encode_isom.c -> gpac-0.8.0.tar.gz/src/scene_manager/encode_isom.c Changed

gpac-0.7.1.tar.gz/src/scene_manager/loader_bt.c -> gpac-0.8.0.tar.gz/src/scene_manager/loader_bt.c Changed

gpac-0.7.1.tar.gz/src/scene_manager/loader_isom.c -> gpac-0.8.0.tar.gz/src/scene_manager/loader_isom.c Changed

gpac-0.7.1.tar.gz/src/scene_manager/loader_qt.c -> gpac-0.8.0.tar.gz/src/scene_manager/loader_qt.c Changed

@@ -25,6 +25,7 @@
 
 #include <gpac/scene_manager.h>
 #include <gpac/internal/media_dev.h>
+#include <gpac/internal/isomedia_dev.h>
 #include <gpac/constants.h>
 
 #if !defined(GPAC_DISABLE_QTVR)
@@ -40,7 +41,7 @@
 		char szMsg[1024];
 		va_list args;
 		va_start(args, format);
-		vsprintf(szMsg, format, args);
+		vsnprintf(szMsg, 1024, format, args);
 		va_end(args);
 		GF_LOG((u32) (e ? GF_LOG_ERROR : GF_LOG_WARNING), GF_LOG_PARSER, ("[QT Parsing] %s\n", szMsg) );
 	}
@@ -79,7 +80,9 @@
 	for (i=0; i<gf_isom_get_track_count(src); i++) {
 		switch (gf_isom_get_media_type(src, i+1)) {
 		case GF_ISOM_MEDIA_VISUAL:
-			if (gf_isom_get_media_subtype(src, i+1, 1) == GF_4CC('j', 'p', 'e', 'g')) {
+ case GF_ISOM_MEDIA_AUXV:
+ case GF_ISOM_MEDIA_PICT:
+			if (gf_isom_get_media_subtype(src, i+1, 1) == GF_ISOM_BOX_TYPE_JPEG) {
 				GF_GenericSampleDescription *udesc = gf_isom_get_generic_sample_description(src, i+1, 1);
 				if ((udesc->width>w) || (udesc->height>h)) {
 					w = udesc->width;
@@ -91,7 +94,7 @@
 				gf_free(udesc);
 			}
 			break;
-		case GF_4CC('q','t','v','r'):
+		case GF_ISOM_MEDIA_QTVR:
 			has_qtvr = 1;
 			break;
 		}

gpac-0.7.1.tar.gz/src/scene_manager/loader_svg.c -> gpac-0.8.0.tar.gz/src/scene_manager/loader_svg.c Changed

gpac-0.7.1.tar.gz/src/scene_manager/loader_xmt.c -> gpac-0.8.0.tar.gz/src/scene_manager/loader_xmt.c Changed

@@ -144,7 +144,7 @@
 		char szMsg[2048];
 		va_list args;
 		va_start(args, format);
-		vsprintf(szMsg, format, args);
+		vsnprintf(szMsg, 2048, format, args);
 		va_end(args);
 		GF_LOG((u32) (e ? GF_LOG_ERROR : GF_LOG_WARNING), GF_LOG_PARSER, ("[XMT Parsing] %s (line %d)\n", szMsg, gf_xml_sax_get_line(parser->sax_parser)) );
 	}
@@ -229,7 +229,7 @@
 	}
 	GF_SAFEALLOC(odl, XMT_ODLink);
 	if (!odl) return;
-	
+
 	odl->mf_urls = gf_list_new();
 	odl->od = od;
 	if (ID) od->objectDescriptorID = ID;
@@ -276,7 +276,7 @@
 	}
 	GF_SAFEALLOC(odl, XMT_ODLink);
 	if (!odl) return;
-	
+
 	odl->mf_urls = gf_list_new();
 	if (url) gf_list_add(odl->mf_urls, url);
 	if (ID) odl->ID = ID;
@@ -317,7 +317,7 @@
 	}
 	GF_SAFEALLOC(esdl, XMT_ESDLink);
 	if (!esdl) return;
-	
+
 	esdl->esd = esd;
 	esd->ESID = esdl->ESID = binID;
 	if (desc_name) {
@@ -1656,7 +1656,7 @@
 			e = GF_OK;
 			if (!node)
 				e = xmt_report(parser, GF_BAD_PARAM, "Warning: Cannot find node %s referenced in USE - skipping", proto_use);
-			
+
 			if (e) return NULL;
 			ID = 0;
 			register_def = 0;
@@ -2602,7 +2602,7 @@
 	if (!elt) return;
 	GF_SAFEALLOC(new_top, XMTNodeStack);
 	if (!new_top) return;
-	
+
 	new_top->node = elt;
 	gf_list_add(parser->nodes, new_top);
 
@@ -2995,7 +2995,7 @@
 	if ((load->type==GF_SM_LOAD_XSR) && !load->ctx) return NULL;
 	GF_SAFEALLOC(parser, GF_XMTParser);
 	if (!parser) return NULL;
-	
+
 	parser->nodes = gf_list_new();
 	parser->descriptors = gf_list_new();
 	parser->od_links = gf_list_new();

gpac-0.7.1.tar.gz/src/scene_manager/scene_manager.c -> gpac-0.8.0.tar.gz/src/scene_manager/scene_manager.c Changed

gpac-0.7.1.tar.gz/src/scene_manager/swf_bifs.c -> gpac-0.8.0.tar.gz/src/scene_manager/swf_bifs.c Changed

gpac-0.7.1.tar.gz/src/scene_manager/swf_parse.c -> gpac-0.8.0.tar.gz/src/scene_manager/swf_parse.c Changed

gpac-0.7.1.tar.gz/src/scene_manager/swf_svg.c -> gpac-0.8.0.tar.gz/src/scene_manager/swf_svg.c Changed

gpac-0.7.1.tar.gz/src/scenegraph/base_scenegraph.c -> gpac-0.8.0.tar.gz/src/scenegraph/base_scenegraph.c Changed

@@ -527,6 +527,7 @@
 	return NULL;
 }
 
+GF_EXPORT
 void gf_sg_set_private(GF_SceneGraph *sg, void *ptr)
 {
 	if (sg) sg->userpriv = ptr;
@@ -874,6 +875,7 @@
 #endif
 
 /*get all parents of the node and replace, the instance of the node and finally destroy the node*/
+GF_EXPORT
 GF_Err gf_node_replace(GF_Node *node, GF_Node *new_node, Bool updateOrderedGroup)
 {
 #ifndef GPAC_DISABLE_SVG
@@ -1065,14 +1067,14 @@
 				return;
 			}
 		}
-		/*if no rendering node, check if the proto is fully instanciated (externProto)*/
+		/*if no rendering node, check if the proto is fully instantiated (externProto)*/
 		else {
 			GF_ProtoInstance *proto_inst = (GF_ProtoInstance *) node;
 			gf_node_dirty_clear(node, 0);
 			/*proto has been deleted or dummy proto (without node code)*/
 			if (!proto_inst->proto_interface || (proto_inst->flags & GF_SG_PROTO_LOADED) ) return;
 			/*try to load the code*/
-			gf_sg_proto_instanciate(proto_inst);
+			gf_sg_proto_instantiate(proto_inst);
 
 			/*if user callback is set, this is an hardcoded proto. If not, locate the first traversable node*/
 			if (!node->sgprivate->UserCallback) {
@@ -1190,6 +1192,7 @@
 	return ID+1;
 }
 
+GF_EXPORT
 u32 gf_sg_get_max_node_id(GF_SceneGraph *sg)
 {
 	NodeIDedItem *reg_node;
@@ -2324,6 +2327,7 @@
 
 
 /*this is not a NodeReplace, thus only the given container is updated - pos is 0-based*/
+GF_EXPORT
 GF_Err gf_node_replace_child(GF_Node *node, GF_ChildNodeItem **container, s32 pos, GF_Node *newNode)
 {
 	GF_ChildNodeItem *child, *prev;
@@ -2390,3 +2394,9 @@
 	}
 	return 0;
 }
+
+GF_SceneGraph *gf_sg_get_parent(GF_SceneGraph *scene)
+{
+	return scene ? scene->parent_scene : NULL;
+}
+

gpac-0.7.1.tar.gz/src/scenegraph/dom_events.c -> gpac-0.8.0.tar.gz/src/scenegraph/dom_events.c Changed

gpac-0.7.1.tar.gz/src/scenegraph/dom_smjs.c -> gpac-0.8.0.tar.gz/src/scenegraph/dom_smjs.c Changed

gpac-0.7.1.tar.gz/src/scenegraph/html5_media_smjs.c -> gpac-0.8.0.tar.gz/src/scenegraph/html5_media_smjs.c Changed

gpac-0.7.1.tar.gz/src/scenegraph/svg_attributes.c -> gpac-0.8.0.tar.gz/src/scenegraph/svg_attributes.c Changed

@@ -211,6 +211,52 @@
 
 };
 
+/** In order to have the same representation of laser/svg media on unix and windows
+ * we have to force windows to use the same rounding method as the glibc.
+ * See: http://pubs.opengroup.org/onlinepubs/009695399/functions/fprintf.html
+ * "The low-order digit shall be rounded in an implementation-defined manner."
+ * glibc uses the IEEE-754 recommended half-to-even method while windows rounds half up.
+ * When windows finally implements HTE rounding we'll be able to remove the convoluted functions below
+ **/
+int is_even(double d) {
+	double int_part;
+	modf(d / 2.0, &int_part);
+	return 2.0 * int_part == d;
+}
+
+double round_ieee_754(double d) {
+	double i = floor(d);
+	d -= i;
+	if (d < 0.5)
+		return i;
+	if (d > 0.5)
+		return i + 1.0;
+	if (is_even(i))
+		return i;
+	return i + 1.0;
+}
+
+double round_float_hte(double value, int digits)
+{
+	if (value) {
+
+		int missing_digits = digits - (int)log10(fabs(value)) - (fabs(value) > 1.f);
+
+		double exp = pow(10.f, missing_digits > 0 ? missing_digits : 0);
+
+		value *= exp;
+		value = round_ieee_754(value);
+		value /= exp;
+	}
+	return value;
+};
+
+#ifdef WIN32
+#define _FIX2FLT(x) (round_float_hte(FIX2FLT(x),6))
+#else
+#define _FIX2FLT(x) FIX2FLT(x)
+#endif
+
 GF_EXPORT
 GF_EventType gf_dom_event_type_by_name(const char *name)
 {
@@ -1533,7 +1579,18 @@
 				end.y += rel_ref_pt.y;
 			}
 #ifndef PARSE_PATH_ONLY
-			gf_path_add_cubic_to(path, ct_orig.x, ct_orig.y, ct_end.x, ct_end.y, end.x, end.y);
+			switch (prev_c) {
+			case 'c':
+			case 'C':
+			case 's':
+			case 'S':
+				gf_path_add_cubic_to(path, ct_orig.x, ct_orig.y, ct_end.x, ct_end.y, end.x, end.y);
+				break;
+			default:
+				gf_path_add_quadratic_to(path, ct_end.x, ct_end.y, end.x, end.y);
+				break;
+			}
+
 #endif
 			rel_ref_pt = end;
 			ct_orig = ct_end;
@@ -1984,7 +2041,7 @@
 	u32 unit_len = 0;
 	u32 read_chars;
 	if (!number || !value_string) return 0;
-	
+
 	if (!strcmp(value_string, "inherit")) {
 		number->type = SVG_NUMBER_INHERIT;
 		return 7;
@@ -2464,7 +2521,7 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Fail to allocate SMIL time\n"));
 		return;
 	}
-	
+
 	gf_list_add(values, value);
 
 	switch (e->sgprivate->tag) {
@@ -3014,6 +3071,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_svg_parse_element_id(GF_Node *n, const char *nodename, Bool warning_if_defined)
 {
 	GF_SceneGraph *sg = gf_node_get_graph((GF_Node *)n);
@@ -3251,7 +3309,7 @@
 	case SVG_Transform_Translate_datatype:
 	{
 		u32 i = 0;
-		SVG_Point *p = (SVG_Point *)info->far_ptr;;
+		SVG_Point *p = (SVG_Point *)info->far_ptr;
 		i+=svg_parse_number(&(attribute_content[i]), &(p->x), 0);
 		if (attribute_content[i] == 0) {
 			p->y = 0;
@@ -3263,7 +3321,7 @@
 	case SVG_Transform_Scale_datatype:
 	{
 		u32 i = 0;
-		SVG_Point *p = (SVG_Point *)info->far_ptr;;
+		SVG_Point *p = (SVG_Point *)info->far_ptr;
 		i+=svg_parse_number(&(attribute_content[i]), &(p->x), 0);
 		if (attribute_content[i] == 0) {
 			p->y = p->x;
@@ -3282,7 +3340,7 @@
 	case SVG_Transform_Rotate_datatype:
 	{
 		u32 i = 0;
-		SVG_Point_Angle *p = (SVG_Point_Angle *)info->far_ptr;;
+		SVG_Point_Angle *p = (SVG_Point_Angle *)info->far_ptr;
 		i+=svg_parse_number(&(attribute_content[i]), &(p->angle), 1);
 		if (attribute_content[i] == 0) {
 			p->y = p->x = 0;
@@ -3386,6 +3444,7 @@
 	one_style[attributeNameLen] = sep;
 }
 
+GF_EXPORT
 void gf_svg_parse_style(GF_Node *n, char *style)
 {
 	u32 i = 0;
@@ -3748,7 +3807,7 @@
 	else if (l->type == SVG_NUMBER_AUTO) return gf_strdup("auto");
 	else if (l->type == SVG_NUMBER_AUTO_REVERSE) return gf_strdup("auto-reverse");
 	else {
-		sprintf(tmp, "%g", FIX2FLT(l->value) );
+		sprintf(tmp, "%g", _FIX2FLT(l->value));
 		if (l->type == SVG_NUMBER_PERCENTAGE) strcat(tmp, "%");
 		else if (l->type == SVG_NUMBER_EMS) strcat(tmp, "em");
 		else if (l->type == SVG_NUMBER_EXS) strcat(tmp, "ex");
@@ -3823,14 +3882,14 @@
 		case GF_PATH_CLOSE:
 			pt = &path->points[i];
 			if (!i || (*contour == i-1) ) {
-				sprintf(szT, "M%g %g", FIX2FLT(pt->x), FIX2FLT(pt->y));
+				sprintf(szT, "M%g %g", _FIX2FLT(pt->x), _FIX2FLT(pt->y));
 				if (i) contour++;
 			} else if (path->tags[i]==GF_PATH_CLOSE) {
 				sprintf(szT, "z");
 			} else {
-				if (i && (last_pt.x==pt->x)) sprintf(szT, "V%g", FIX2FLT(pt->y));
-				else if (i && (last_pt.y==pt->y)) sprintf(szT, "H%g", FIX2FLT(pt->x));
-				else sprintf(szT, "L%g %g", FIX2FLT(pt->x), FIX2FLT(pt->y));
+				if (i && (last_pt.x==pt->x)) sprintf(szT, "V%g", _FIX2FLT(pt->y));
+				else if (i && (last_pt.y==pt->y)) sprintf(szT, "H%g", _FIX2FLT(pt->x));
+				else sprintf(szT, "L%g %g", _FIX2FLT(pt->x), _FIX2FLT(pt->y));
 			}
 			last_pt = *pt;
 			i++;
@@ -3838,7 +3897,7 @@
 		case GF_PATH_CURVE_CONIC:
 			ct1 = &path->points[i];
 			end = &path->points[i+1];
-			sprintf(szT, "Q%g %g %g %g", FIX2FLT(ct1->x), FIX2FLT(ct1->y), FIX2FLT(end->x), FIX2FLT(end->y));
+			sprintf(szT, "Q%g %g %g %g", _FIX2FLT(ct1->x), _FIX2FLT(ct1->y), _FIX2FLT(end->x), _FIX2FLT(end->y));
 
 			last_pt = *end;
 			if (path->tags[i+2]==GF_PATH_CLOSE) {
@@ -3850,7 +3909,7 @@
 			ct1 = &path->points[i];
 			ct2 = &path->points[i+1];
 			end = &path->points[i+2];
-			sprintf(szT, "C%g %g %g %g %g %g", FIX2FLT(ct1->x), FIX2FLT(ct1->y), FIX2FLT(ct2->x), FIX2FLT(ct2->y), FIX2FLT(end->x), FIX2FLT(end->y));
+			sprintf(szT, "C%g %g %g %g %g %g", _FIX2FLT(ct1->x), _FIX2FLT(ct1->y), _FIX2FLT(ct2->x), _FIX2FLT(ct2->y), _FIX2FLT(end->x), _FIX2FLT(end->y));
 			last_pt = *end;
 			if (path->tags[i+2]==GF_PATH_CLOSE) {
 				strcat(szT, "z");
@@ -3868,7 +3927,7 @@
 #else
 static void svg_dump_point(SVG_Point *pt, char *attValue)
 {
-	if (pt) sprintf(attValue, "%g %g ", FIX2FLT(pt->x), FIX2FLT(pt->y) );
+	if (pt) sprintf(attValue, "%g %g ", _FIX2FLT(pt->x), _FIX2FLT(pt->y) );
 }
 static void svg_dump_path(SVG_PathData *path, char *attValue)
 {
@@ -3993,13 +4052,13 @@
 	attValue[0]=0;
 	/*try to do a simple decomposition...*/
 	if (!matrix->m[1] && !matrix->m[3]) {
-		if (matrix->m[2] != 0 || matrix->m[5] != 0) sprintf(attValue, "translate(%g,%g)", FIX2FLT(matrix->m[2]), FIX2FLT(matrix->m[5]) );
+		if (matrix->m[2] != 0 || matrix->m[5] != 0) sprintf(attValue, "translate(%g,%g)", _FIX2FLT(matrix->m[2]), _FIX2FLT(matrix->m[5]) );
 		if ((matrix->m[0]!=FIX_ONE) || (matrix->m[4]!=FIX_ONE)) {
 			char szT[1024];
 			if ((matrix->m[0]==-FIX_ONE) && (matrix->m[4]==-FIX_ONE)) {
 				strcpy(szT, " rotate(180)");
 			} else {
-				sprintf(szT, " scale(%g,%g)", FIX2FLT(matrix->m[0]), FIX2FLT(matrix->m[4]) );
+				sprintf(szT, " scale(%g,%g)", _FIX2FLT(matrix->m[0]), _FIX2FLT(matrix->m[4]) );
 			}
 			strcat(attValue, szT);
 		}
@@ -4013,27 +4072,27 @@
 			angle = gf_divfix(180*angle, GF_PI);
 			if ((sx==sy) && ( ABS(FIX_ONE - ABS(sx) ) < FIX_ONE/100)) {
 				if (matrix->m[2] != 0 || matrix->m[5] != 0)
-					sprintf(attValue, "translate(%g,%g) rotate(%g)", FIX2FLT(matrix->m[2]), FIX2FLT(matrix->m[5]), FIX2FLT(gf_divfix(angle*180, GF_PI) ) );
+					sprintf(attValue, "translate(%g,%g) rotate(%g)", _FIX2FLT(matrix->m[2]), _FIX2FLT(matrix->m[5]), _FIX2FLT(gf_divfix(angle*180, GF_PI) ) );
 				else
-					sprintf(attValue, "rotate(%g)", FIX2FLT(gf_divfix(angle*180, GF_PI) ) );
+					sprintf(attValue, "rotate(%g)", _FIX2FLT(gf_divfix(angle*180, GF_PI) ) );
 			} else {
 				if (matrix->m[2] != 0 || matrix->m[5] != 0)
-					sprintf(attValue, "translate(%g,%g) scale(%g,%g) rotate(%g)", FIX2FLT(matrix->m[2]), FIX2FLT(matrix->m[5]), FIX2FLT(sx), FIX2FLT(sy), FIX2FLT(gf_divfix(angle*180, GF_PI) ) );
+					sprintf(attValue, "translate(%g,%g) scale(%g,%g) rotate(%g)", _FIX2FLT(matrix->m[2]), _FIX2FLT(matrix->m[5]), _FIX2FLT(sx), _FIX2FLT(sy), _FIX2FLT(gf_divfix(angle*180, GF_PI) ) );
 				else
-					sprintf(attValue, "scale(%g,%g) rotate(%g)", FIX2FLT(sx), FIX2FLT(sy), FIX2FLT(gf_divfix(angle*180, GF_PI) ) );
+					sprintf(attValue, "scale(%g,%g) rotate(%g)", _FIX2FLT(sx), _FIX2FLT(sy), _FIX2FLT(gf_divfix(angle*180, GF_PI) ) );
 			}
 		} else {
 			Fixed a = angle;
 			if (a<0) a += GF_2PI;
 			if (matrix->m[2] != 0 || matrix->m[5] != 0)
-				sprintf(attValue, "translate(%g,%g) rotate(%g)", FIX2FLT(matrix->m[2]), FIX2FLT(matrix->m[5]), FIX2FLT(gf_divfix(a*180, GF_PI) ) );
+				sprintf(attValue, "translate(%g,%g) rotate(%g)", _FIX2FLT(matrix->m[2]), _FIX2FLT(matrix->m[5]), _FIX2FLT(gf_divfix(a*180, GF_PI) ) );
 			else
-				sprintf(attValue, "rotate(%g)", FIX2FLT(gf_divfix(a*180, GF_PI) ) );
+				sprintf(attValue, "rotate(%g)", _FIX2FLT(gf_divfix(a*180, GF_PI) ) );
 		}
 	}
 	/*default*/
 	if (!strlen(attValue))
-		sprintf(attValue, "matrix(%g %g %g %g %g %g)", FIX2FLT(matrix->m[0]), FIX2FLT(matrix->m[3]), FIX2FLT(matrix->m[1]), FIX2FLT(matrix->m[4]), FIX2FLT(matrix->m[2]), FIX2FLT(matrix->m[5]) );
+		sprintf(attValue, "matrix(%g %g %g %g %g %g)", _FIX2FLT(matrix->m[0]), _FIX2FLT(matrix->m[3]), _FIX2FLT(matrix->m[1]), _FIX2FLT(matrix->m[4]), _FIX2FLT(matrix->m[2]), _FIX2FLT(matrix->m[5]) );
 
 	return gf_strdup(attValue);
 }
@@ -4313,7 +4372,7 @@
 		}
 		break;
 	case LASeR_Size_datatype:
-		sprintf(tmp, "%g %g", FIX2FLT(((LASeR_Size *)info->far_ptr)->width), FIX2FLT(((LASeR_Size *)info->far_ptr)->height));
+		sprintf(tmp, "%g %g", _FIX2FLT(((LASeR_Size *)info->far_ptr)->width), _FIX2FLT(((LASeR_Size *)info->far_ptr)->height));
 		return gf_strdup(tmp);
 	/* end of keyword type parsing */
 
@@ -4370,7 +4429,7 @@
 		for (i=0; i<count; i++) {
 			char szT[200];
 			SVG_Point *p = (SVG_Point *)gf_list_get(l, i);
-			sprintf(szT, "%g %g", FIX2FLT(p->x), FIX2FLT(p->y));
+			sprintf(szT, "%g %g", _FIX2FLT(p->x), _FIX2FLT(p->y));
 			attVal = gf_realloc(attVal, sizeof(char)*(strlen(szT)+strlen(attVal)+ (i ? 2 : 1) ));
 			if (i) strcat(attVal, " ");
 			strcat(attVal, szT);
@@ -4391,7 +4450,7 @@
 		for (i=0; i<count; i++) {
 			char szT[1000];
 			Fixed *p = (Fixed *)gf_list_get(l, i);
-			sprintf(szT, "%g", FIX2FLT(*p));
+			sprintf(szT, "%g", _FIX2FLT(*p));
 			attVal = gf_realloc(attVal, sizeof(char)*(strlen(szT)+strlen(attVal)+ (i ? 2 : 1) ));
 			if (i) strcat(attVal, " ");
 			strcat(attVal, szT);
@@ -4424,7 +4483,7 @@
 	{
 		SVG_ViewBox *v = (SVG_ViewBox *)info->far_ptr;
 		if (v->is_set) {
-			sprintf(tmp, "%g %g %g %g", FIX2FLT(v->x), FIX2FLT(v->y), FIX2FLT(v->width), FIX2FLT(v->height) );
+			sprintf(tmp, "%g %g %g %g", _FIX2FLT(v->x), _FIX2FLT(v->y), _FIX2FLT(v->width), _FIX2FLT(v->height) );
 			return gf_strdup(tmp);
 		} else
 			return gf_strdup("none");
@@ -4554,7 +4613,7 @@
 	{
 #if DUMP_COORDINATES
 		GF_Matrix2D *m = (GF_Matrix2D *)info->far_ptr;
-		sprintf(tmp, "%g %g", FIX2FLT(m->m[2]), FIX2FLT(m->m[5]));
+		sprintf(tmp, "%g %g", _FIX2FLT(m->m[2]), _FIX2FLT(m->m[5]));
 		return gf_strdup(tmp);
 #endif
 	}
@@ -4564,7 +4623,7 @@
 	{
 		SVG_Transform *t= (SVG_Transform *)info->far_ptr;
 		if (t->is_ref) {
-			sprintf(tmp, "ref(svg,%g,%g)", FIX2FLT(t->mat.m[2]), FIX2FLT(t->mat.m[5]) );
+			sprintf(tmp, "ref(svg,%g,%g)", _FIX2FLT(t->mat.m[2]), _FIX2FLT(t->mat.m[5]) );
 			return gf_strdup(tmp);
 		} else {
 			return gf_svg_dump_matrix(&t->mat);
@@ -4576,7 +4635,7 @@
 	{
 		SVG_Point *pt = (SVG_Point *)info->far_ptr;
 #if DUMP_COORDINATES
-		sprintf(tmp, "%g %g", FIX2FLT(pt->x), FIX2FLT(pt->y) );
+		sprintf(tmp, "%g %g", _FIX2FLT(pt->x), _FIX2FLT(pt->y) );
 		return gf_strdup(tmp);
 #endif
 	}
@@ -4587,9 +4646,9 @@
 		SVG_Point *pt = (SVG_Point *)info->far_ptr;
 #if DUMP_COORDINATES
 		if (pt->x == pt->y) {
-			sprintf(tmp, "%g", FIX2FLT(pt->x));
+			sprintf(tmp, "%g", _FIX2FLT(pt->x));
 		} else {
-			sprintf(tmp, "%g %g", FIX2FLT(pt->x), FIX2FLT(pt->y) );
+			sprintf(tmp, "%g %g", _FIX2FLT(pt->x), _FIX2FLT(pt->y) );
 		}
 		return gf_strdup(tmp);
 #endif
@@ -4601,7 +4660,7 @@
 	{
 		Fixed *f = (Fixed *)info->far_ptr;
 #if DUMP_COORDINATES
-		sprintf(tmp, "%g", FIX2FLT( 180 * gf_divfix(*f, GF_PI) ));
+		sprintf(tmp, "%g", _FIX2FLT( 180 * gf_divfix(*f, GF_PI) ));
 		return gf_strdup(tmp);
 #endif
 	}
@@ -4612,9 +4671,9 @@
 		SVG_Point_Angle *pt = (SVG_Point_Angle *)info->far_ptr;
 #if DUMP_COORDINATES
 		if (pt->x || pt->y) {
-			sprintf(tmp, "%g %g %g", FIX2FLT( 180 * gf_divfix(pt->angle, GF_PI) ), FIX2FLT(pt->x), FIX2FLT(pt->y) );
+			sprintf(tmp, "%g %g %g", _FIX2FLT( 180 * gf_divfix(pt->angle, GF_PI) ), _FIX2FLT(pt->x), _FIX2FLT(pt->y) );
 		} else {
-			sprintf(tmp, "%g", FIX2FLT(gf_divfix(180 * pt->angle, GF_PI) ));
+			sprintf(tmp, "%g", _FIX2FLT(gf_divfix(180 * pt->angle, GF_PI) ));
 		}
 		return gf_strdup(tmp);
 #endif
@@ -4713,7 +4772,7 @@
 		SMIL_RepeatCount *rep = (SMIL_RepeatCount *)info->far_ptr;
 		if (rep->type == SMIL_REPEATCOUNT_INDEFINITE) return gf_strdup("indefinite");
 		else if (rep->type == SMIL_REPEATCOUNT_DEFINED) {
-			sprintf(tmp, "%g", FIX2FLT(rep->count) );
+			sprintf(tmp, "%g", _FIX2FLT(rep->count) );
 			return gf_strdup(tmp);
 		}
 		else {
@@ -4801,7 +4860,7 @@
 	{
 #if DUMP_COORDINATES
 		SVG_Point *p = (SVG_Point *)info->far_ptr;
-		sprintf(tmp, "%g %g", FIX2FLT(p->x), FIX2FLT(p->y));
+		sprintf(tmp, "%g %g", _FIX2FLT(p->x), _FIX2FLT(p->y));
 		return gf_strdup(tmp);
 #endif
 	}
@@ -4811,7 +4870,7 @@
 	case SMIL_KeySplines_datatype:
 	{
 		Fixed *p = (Fixed *)info->far_ptr;
-		sprintf(tmp, "%g", FIX2FLT(*p));
+		sprintf(tmp, "%g", _FIX2FLT(*p));
 		return gf_strdup(tmp);
 	}
 	break;
@@ -4823,7 +4882,7 @@
 	case SVG_ViewBox_datatype:
 	{
 		Fixed *v = (Fixed *)info->far_ptr;
-		sprintf(tmp, "%g", FIX2FLT(*v));
+		sprintf(tmp, "%g", _FIX2FLT(*v));
 		return gf_strdup(tmp);
 	}
 	break;
@@ -4831,7 +4890,7 @@
 	{
 		/*TODO: fix this: should be an SVG_Length*/
 		Fixed *p = (Fixed *)info->far_ptr;
-		sprintf(tmp, "%g", FIX2FLT(*p));
+		sprintf(tmp, "%g", _FIX2FLT(*p));
 		return gf_strdup(tmp);
 	}
 	break;
@@ -5366,7 +5425,7 @@
 static GF_Err svg_point_muladd(Fixed alpha, SVG_Point *pta, Fixed beta, SVG_Point *ptb, SVG_Point *ptc)
 {
 	if (!pta || !ptb || !ptc) return GF_BAD_PARAM;
-	
+
 	ptc->x = gf_mulfix(alpha, pta->x) + gf_mulfix(beta, ptb->x);
 	ptc->y = gf_mulfix(alpha, pta->y) + gf_mulfix(beta, ptb->y);
 	return GF_OK;

gpac-0.7.1.tar.gz/src/scenegraph/svg_smjs.c -> gpac-0.8.0.tar.gz/src/scenegraph/svg_smjs.c Changed

gpac-0.7.1.tar.gz/src/scenegraph/svg_types.c -> gpac-0.8.0.tar.gz/src/scenegraph/svg_types.c Changed

gpac-0.7.1.tar.gz/src/scenegraph/vrml_proto.c -> gpac-0.8.0.tar.gz/src/scenegraph/vrml_proto.c Changed

@@ -31,7 +31,7 @@
 
 #ifndef GPAC_DISABLE_VRML
 
-
+GF_EXPORT
 GF_Proto *gf_sg_proto_new(GF_SceneGraph *inScene, u32 ProtoID, char *name, Bool unregistered)
 {
 	GF_Proto *tmp;
@@ -68,7 +68,7 @@
 	return tmp;
 }
 
-
+GF_EXPORT
 GF_Err gf_sg_proto_set_in_graph(GF_Proto *proto, GF_SceneGraph *inScene, Bool set_in)
 {
 	u32 i;
@@ -97,7 +97,7 @@
 	return gf_list_add(insertIn, proto);
 }
 
-
+GF_EXPORT
 GF_Err gf_sg_proto_del(GF_Proto *proto)
 {
 	GF_Node *node;
@@ -162,11 +162,13 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_SceneGraph *gf_sg_proto_get_graph(GF_Proto *proto)
 {
 	return proto ? proto->sub_graph : NULL;
 }
 
+GF_EXPORT
 void gf_sg_proto_set_private(GF_Proto *p, void *ptr, void (*OnDelete)(void *ptr) )
 {
 	if (p) {
@@ -174,6 +176,8 @@
 		p->OnDelete = OnDelete;
 	}
 }
+
+GF_EXPORT
 void *gf_sg_proto_get_private(GF_Proto *p)
 {
 	return p ? p->userpriv : NULL;
@@ -185,12 +189,14 @@
 	return proto ? &proto->ExternProto : NULL;
 }
 
+GF_EXPORT
 GF_Err gf_sg_proto_add_node_code(GF_Proto *proto, GF_Node *pNode)
 {
 	if (!proto) return GF_BAD_PARAM;
 	return gf_list_add(proto->node_code, pNode);
 }
 
+GF_EXPORT
 GF_ProtoFieldInterface *gf_sg_proto_field_find_by_name(GF_Proto *proto, char *fieldName)
 {
 	GF_ProtoFieldInterface *ptr;
@@ -201,6 +207,7 @@
 	return NULL;
 }
 
+GF_EXPORT
 GF_ProtoFieldInterface *gf_sg_proto_field_new(GF_Proto *proto, u32 fieldType, u32 eventType, char *fieldName)
 {
 	GF_ProtoFieldInterface *tmp;
@@ -255,6 +262,7 @@
 	return tmp;
 }
 
+GF_EXPORT
 void gf_sg_proto_field_set_private(GF_ProtoFieldInterface *field, void *ptr, void (*OnDelete)(void *ptr))
 {
 	if (field) {
@@ -263,13 +271,14 @@
 	}
 }
 
+GF_EXPORT
 void *gf_sg_proto_field_get_private(GF_ProtoFieldInterface *field)
 {
 	return field ? field->userpriv : NULL;
 }
 
 
-
+GF_EXPORT
 GF_Err gf_sg_proto_field_get_field(GF_ProtoFieldInterface *field, GF_FieldInfo *info)
 {
 	if (!field || !info) return GF_BAD_PARAM;
@@ -304,7 +313,7 @@
 		return GF_OK;
 	}
 
-	/*otherwise this is an instanciated proto*/
+	/*otherwise this is an instantiated proto*/
 	if (node->sgprivate->tag!=TAG_ProtoNode) return GF_BAD_PARAM;
 
 	inst = (GF_ProtoInstance *) node;
@@ -507,7 +516,7 @@
 		node->sgprivate->UserPrivate = NULL;
 		/*NO RENDER, this is filtered at the generic gf_node_traverse to cope with instanciations and externProto*/
 		/*load code*/
-		gf_sg_proto_instanciate((GF_ProtoInstance *)node);
+		gf_sg_proto_instantiate((GF_ProtoInstance *)node);
 	}
 	return node;
 }
@@ -556,7 +565,7 @@
 }
 
 /*performs common initialization of routes ISed fields and protos once everything is loaded*/
-void gf_sg_proto_instanciate(GF_ProtoInstance *proto_node)
+void gf_sg_proto_instantiate(GF_ProtoInstance *proto_node)
 {
 	GF_Node *node, *orig;
 	GF_Route *route, *r2;
@@ -635,7 +644,7 @@
 		gf_list_add(proto->instances, proto_node);
 	}
 
-	/*OVERRIDE the proto instance (eg don't instanciate an empty externproto...)*/
+	/*OVERRIDE the proto instance (eg don't instantiate an empty externproto...)*/
 	proto_node->proto_interface = proto;
 
 	/*clone all nodes*/
@@ -746,7 +755,7 @@
 	/*set this proto as owner of the new graph*/
 	proto_node->sgprivate->scenegraph->pOwningProto = proto_node;
 
-	/*instanciate fields*/
+	/*instantiate fields*/
 	i=0;
 	while ((field = (GF_ProtoFieldInterface*)gf_list_enum(proto->proto_fields, &i))) {
 		GF_SAFEALLOC(inst, GF_ProtoField);
@@ -761,8 +770,8 @@
 		/*this is OK to call on GF_Node (returns NULL) and MFNode (returns gf_list_new() )*/
 		inst->field_pointer = gf_sg_vrml_field_pointer_new(inst->FieldType);
 
-		/*regular field, duplicate from default value or instanciated one if specified (since
-		a proto may be partially instanciated when used in another proto)*/
+		/*regular field, duplicate from default value or instantiated one if specified (since
+		a proto may be partially instantiated when used in another proto)*/
 		if (gf_sg_vrml_get_sf_type(inst->FieldType) != GF_SG_VRML_SFNODE) {
 			if (from_inst) {
 				from_field = (GF_ProtoField *)gf_list_get(from_inst->fields, i-1);
@@ -779,12 +788,13 @@
 }
 
 
-
+GF_EXPORT
 GF_Node *gf_sg_proto_create_instance(GF_SceneGraph *sg, GF_Proto *proto)
 {
 	return gf_sg_proto_create_node(sg, proto, NULL);
 }
 
+GF_EXPORT
 GF_Err gf_sg_proto_load_code(GF_Node *node)
 {
 	GF_ProtoInstance *inst;
@@ -792,7 +802,7 @@
 	inst = (GF_ProtoInstance *) node;
 	if (!inst->proto_interface) return GF_BAD_PARAM;
 	if (inst->flags & GF_SG_PROTO_LOADED) return GF_OK;
-	gf_sg_proto_instanciate(inst);
+	gf_sg_proto_instantiate(inst);
 	return GF_OK;
 }
 
@@ -886,6 +896,7 @@
 /*Note on ISed fields: we cannot support fan-in on proto, eg we assume only one eventIn field can receive events
 thus situations where a proto receives eventIn from outside and the node with ISed eventIn receives event
 from inside the proto are undefined*/
+GF_EXPORT
 GF_Err gf_sg_proto_field_set_ised(GF_Proto *proto, u32 protoFieldIndex, GF_Node *node, u32 nodeFieldIndex)
 {
 	GF_Err e;
@@ -976,6 +987,7 @@
 	return gf_list_add(proto->sub_graph->Routes, r);
 }
 
+GF_EXPORT
 GF_Err gf_sg_proto_instance_set_ised(GF_Node *protoinst, u32 protoFieldIndex, GF_Node *node, u32 nodeFieldIndex)
 {
 	GF_Err e;
@@ -1141,12 +1153,14 @@
 	return GF_BAD_PARAM;
 }
 
+GF_EXPORT
 u32 gf_sg_proto_get_field_count(GF_Proto *proto)
 {
 	if (!proto) return 0;
 	return gf_list_count(proto->proto_fields);
 }
 
+GF_EXPORT
 GF_ProtoFieldInterface *gf_sg_proto_field_find(GF_Proto *proto, u32 fieldIndex)
 {
 	if (!proto) return NULL;
@@ -1236,11 +1250,13 @@
 }
 
 /*returns the ID of the proto*/
+GF_EXPORT
 u32 gf_sg_proto_get_id(GF_Proto *proto)
 {
 	return proto->ID;
 }
 
+GF_EXPORT
 const char *gf_sg_proto_get_class_name(GF_Proto *proto)
 {
 	return (const char *) proto->Name;
@@ -1256,6 +1272,7 @@
 	return n->sgprivate->tag;
 }
 
+GF_EXPORT
 Bool gf_sg_proto_field_is_sftime_offset(GF_Node *node, GF_FieldInfo *field)
 {
 	u32 i;

gpac-0.7.1.tar.gz/src/scenegraph/vrml_route.c -> gpac-0.8.0.tar.gz/src/scenegraph/vrml_route.c Changed

@@ -77,6 +77,7 @@
 	return NULL;
 }
 
+GF_EXPORT
 void gf_sg_route_del(GF_Route *r)
 {
 	GF_SceneGraph *sg;
@@ -105,7 +106,7 @@
 	gf_list_del_item(sg->routes_to_activate, r);
 }
 
-
+GF_EXPORT
 GF_Err gf_sg_route_del_by_id(GF_SceneGraph *sg,u32 routeID)
 {
 	GF_Route *r;
@@ -179,7 +180,7 @@
 	gf_list_del_item(sg->routes_to_activate, r);
 }
 
-
+GF_EXPORT
 GF_Route *gf_sg_route_find(GF_SceneGraph *sg, u32 RouteID)
 {
 	GF_Route *r;
@@ -190,6 +191,7 @@
 	return NULL;
 }
 
+GF_EXPORT
 GF_Route *gf_sg_route_find_by_name(GF_SceneGraph *sg, char *name)
 {
 	GF_Route *r;
@@ -203,7 +205,7 @@
 	return NULL;
 }
 
-
+GF_EXPORT
 GF_Err gf_sg_route_set_id(GF_Route *route, u32 ID)
 {
 	GF_Route *ptr;
@@ -214,11 +216,14 @@
 	route->ID = ID;
 	return GF_OK;
 }
+
+GF_EXPORT
 u32 gf_sg_route_get_id(GF_Route *route)
 {
 	return route->ID;
 }
 
+GF_EXPORT
 GF_Err gf_sg_route_set_name(GF_Route *route, char *name)
 {
 	GF_Route *ptr;
@@ -229,6 +234,8 @@
 	route->name = gf_strdup(name);
 	return GF_OK;
 }
+
+GF_EXPORT
 char *gf_sg_route_get_name(GF_Route *route)
 {
 	return route->name;

gpac-0.7.1.tar.gz/src/scenegraph/vrml_script.c -> gpac-0.8.0.tar.gz/src/scenegraph/vrml_script.c Changed

gpac-0.7.1.tar.gz/src/scenegraph/vrml_smjs.c -> gpac-0.8.0.tar.gz/src/scenegraph/vrml_smjs.c Changed

@@ -60,6 +60,8 @@
 	return (JS_AddRoot(cx, rp)==JS_TRUE) ? 1 : 0;
 #endif
 }
+
+GF_EXPORT
 Bool gf_js_add_named_root(JSContext *cx, void *rp, u32 type, const char *name)
 {
 #if (JS_VERSION>=185)
@@ -1500,7 +1502,7 @@
 			SMJS_FREE(c, node_name);
 			return JS_FALSE;
 		}
-		/*OK, instanciate proto code*/
+		/*OK, instantiate proto code*/
 		if (gf_sg_proto_load_code(new_node) != GF_OK) {
 			gf_node_unregister(new_node, NULL);
 			SMJS_FREE(c, node_name);
@@ -4296,7 +4298,7 @@
 			if (n->sgprivate->tag == TAG_ProtoNode) {
 				GF_ProtoInstance *proto_inst = (GF_ProtoInstance *) n;
 				if (!proto_inst->RenderingNode && !(proto_inst->flags&GF_SG_PROTO_LOADED) )
-					gf_sg_proto_instanciate(proto_inst);
+					gf_sg_proto_instantiate(proto_inst);
 			}
 
 			slot = SMJS_GET_PRIVATE(priv->js_ctx, pf);
@@ -4491,6 +4493,7 @@
 	}
 }
 
+GF_EXPORT
 void gf_js_vrml_flush_event_out(GF_Node *node, GF_ScriptPriv *priv)
 {
 	u32 i;
@@ -4925,6 +4928,7 @@
 	}
 }
 
+GF_EXPORT
 void gf_sg_handle_dom_event_for_vrml(GF_Node *node, GF_DOM_Event *event, GF_Node *observer)
 {
 #ifndef GPAC_DISABLE_SVG
@@ -5032,7 +5036,7 @@
 
 #endif
 
-
+GF_EXPORT
 Bool gf_sg_has_scripting()
 {
 #ifdef GPAC_HAS_SPIDERMONKEY

gpac-0.7.1.tar.gz/src/scenegraph/vrml_tools.c -> gpac-0.8.0.tar.gz/src/scenegraph/vrml_tools.c Changed

@@ -163,6 +163,7 @@
 	gf_node_unregister_children(pNode, par->removeChildren);
 }
 
+GF_EXPORT
 GF_Err gf_sg_delete_all_protos(GF_SceneGraph *scene)
 {
 	if (!scene) return GF_BAD_PARAM;
@@ -180,7 +181,7 @@
 	scene->GetExternProtoLib = GetExternProtoLib;
 }
 
-
+GF_EXPORT
 u32 gf_sg_get_next_available_route_id(GF_SceneGraph *sg)
 {
 	u32 i, count;
@@ -200,11 +201,13 @@
 	}
 }
 
+GF_EXPORT
 void gf_sg_set_max_defined_route_id(GF_SceneGraph *sg, u32 ID)
 {
 	sg->max_defined_route_id = MAX(sg->max_defined_route_id, ID);
 }
 
+GF_EXPORT
 u32 gf_sg_get_next_available_proto_id(GF_SceneGraph *sg)
 {
 	u32 i, count;
@@ -224,6 +227,7 @@
 }
 
 //adds a child in the children list
+GF_EXPORT
 GF_Err gf_node_insert_child(GF_Node *parent, GF_Node *new_child, s32 Position)
 {
 	GF_ParentNode *node = (GF_ParentNode *) parent;
@@ -236,6 +240,7 @@
 }
 
 /*for V4Studio...*/
+GF_EXPORT
 GF_Err gf_node_remove_child(GF_Node *parent, GF_Node *toremove_child)
 {
 	if (!gf_node_list_del_child(& ((GF_ParentNode *) parent)->children, toremove_child)) return GF_BAD_PARAM;
@@ -244,11 +249,13 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 void gf_sg_script_load(GF_Node *n)
 {
 	if (n && n->sgprivate->scenegraph->script_load) n->sgprivate->scenegraph->script_load(n);
 }
 
+GF_EXPORT
 GF_Proto *gf_sg_find_proto(GF_SceneGraph *sg, u32 ProtoID, char *name)
 {
 	GF_Proto *proto;
@@ -476,6 +483,7 @@
 	return tmp;
 }
 
+GF_EXPORT
 void *gf_sg_vrml_field_pointer_new(u32 FieldType)
 {
 	switch (FieldType) {
@@ -618,6 +626,7 @@
 	if (cb.buffer) gf_free(cb.buffer);
 }
 
+GF_EXPORT
 void gf_sg_vrml_field_pointer_del(void *field, u32 FieldType)
 {
 	GF_Node *node;
@@ -1046,6 +1055,7 @@
 //	newly created slot
 //	!! Doesnt work for MFNodes
 //	InsertAt is the 0-based index for the new slot
+GF_EXPORT
 GF_Err gf_sg_vrml_mf_insert(void *mf, u32 FieldType, void **new_ptr, u32 InsertAt)
 {
 	char *buffer;
@@ -1187,6 +1197,7 @@
 
 
 //remove the specified item (0-based index)
+GF_EXPORT
 GF_Err gf_sg_vrml_mf_remove(void *mf, u32 FieldType, u32 RemoveFrom)
 {
 	char *buffer;
@@ -1538,7 +1549,7 @@
 }
 
 
-
+GF_EXPORT
 u32 gf_node_get_num_fields_in_mode(GF_Node *Node, u8 IndexMode)
 {
 	assert(Node);

gpac-0.7.1.tar.gz/src/scenegraph/x3d_nodes.c -> gpac-0.8.0.tar.gz/src/scenegraph/x3d_nodes.c Changed

gpac-0.7.1.tar.gz/src/scenegraph/xbl_process.c -> gpac-0.8.0.tar.gz/src/scenegraph/xbl_process.c Changed

gpac-0.7.1.tar.gz/src/scenegraph/xml_ns.c -> gpac-0.8.0.tar.gz/src/scenegraph/xml_ns.c Changed

gpac-0.7.1.tar.gz/src/terminal/channel.c -> gpac-0.8.0.tar.gz/src/terminal/channel.c Changed

@@ -28,6 +28,7 @@
 #include <gpac/internal/compositor_dev.h>
 #include <gpac/sync_layer.h>
 #include <gpac/constants.h>
+#include <gpac/isomedia.h>
 
 #include "media_memory.h"
 #include "media_control.h"
@@ -117,10 +118,11 @@
 	tmp->esd = esd;
 	tmp->es_state = GF_ESM_ES_SETUP;
 
-	nbBits = sizeof(u32) * 8 - esd->slConfig->AUSeqNumLength;
-	tmp->max_au_sn = 0xFFFFFFFF >> nbBits;
-	nbBits = sizeof(u32) * 8 - esd->slConfig->packetSeqNumLength;
-	tmp->max_pck_sn = 0xFFFFFFFF >> nbBits;
+	nbBits = esd->slConfig->AUSeqNumLength;
+	tmp->max_au_sn = (u32)(( ((u64)1) << nbBits ) - 1);
+
+	nbBits = esd->slConfig->packetSeqNumLength;
+	tmp->max_pck_sn = (u32)(( ((u64)1) << nbBits ) - 1);
 
 	tmp->skip_sl = (esd->slConfig->predefined == SLPredef_SkipSL) ? 1 : 0;
 
@@ -201,7 +203,7 @@
 	//if we share the clock with a clock from the same clock namespace but the clock was inherited
 	//don't trust ESIDs (typically happen in DASH where all streams may end up with the same ID...)
 	if (ch->clock_inherited) return GF_FALSE;
-	
+
 	/*if the clock is not in the same namespace (used with dynamic scenes), it's not ours*/
 	if (gf_list_find(ch->odm->net_service->Clocks, ch->clock)<0) return 0;
 	/*It occurs in TS stream when PCR is provided in a dedicated stream. Suppose that the channel owns a clock*/
@@ -238,8 +240,9 @@
 	/*and start buffering - pull channels always turn off buffering immediately, otherwise
 	buffering size is setup by the network service - except InputSensor*/
 	if ((ch->esd->decoderConfig->streamType != GF_STREAM_INTERACT) || ch->esd->URLString) {
-		if (! ch->is_pulling)
+		if (! ch->is_pulling && !ch->odm->disable_buffer_at_next_play) {
 			gf_es_buffer_on(ch);
+		}
 	}
 	ch->last_au_time = gf_term_get_time(ch->odm->term);
 	ch->es_state = GF_ESM_ES_RUNNING;
@@ -512,9 +515,9 @@
 	max = 3*ch->MaxBufferOccupancy/2;
 	if (max<300000) max = 300000;
 
-	if( (ch->MaxBuffer && (ch->BufferTime > (s32) max) ) || (ch->AU_Count > max/100) //eg 100fps seconds
+	if( (ch->MaxBuffer && (ch->BufferTime > (s32) max) ) || (ch->AU_Count > max)
 	 ) {
-		if (ch->AU_Count>10000) {
+		if (ch->AU_Count > max) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s): Something really wrong, too many AUs (%d) in decoding buffer - trashing buffers\n", ch->esd->ESID, ch->odm->net_service->url, ch->AU_Count));
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s): Something really wrong, decoding buffer exceeded (%d ms vs %d max) - trashing buffers\n", ch->esd->ESID, ch->odm->net_service->url, ch->BufferTime, ch->MaxBuffer));
@@ -955,7 +958,7 @@
 	}
 
 	/*we ignore OCRs for the moment*/
-	if (hdr.OCRflag==1) {
+	if (hdr.OCRflag) {
 		if (!ch->IsClockInit) {
 			/*channel is the OCR, re-initialize the clock with the proper OCR*/
 			if (gf_es_owns_clock(ch)) {
@@ -990,8 +993,9 @@
 
 			}
 		} else 	if (hdr.OCRflag==2) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %u clock disctontinuity was signaled\n", ch->esd->ESID, gf_clock_real_time(ch->clock) ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %u clock discontinuity was signaled\n", ch->esd->ESID, gf_clock_real_time(ch->clock) ));
 			gf_clock_discontinuity(ch->clock, ch->odm->parentscene, (hdr.m2ts_pcr==2) ? GF_TRUE : GF_FALSE);
+			gf_es_buffer_on(ch);
 
 			//and re-init timing
 			gf_es_receive_sl_packet(serv, ch, payload, payload_size, header, reception_status);
@@ -1021,7 +1025,7 @@
 			if (ch->IsClockInit && (ABS(pcr_diff) > 60000) && (ABS(pcr_pcrprev_diff) > 60000) ) {
 				discontinuity = GF_TRUE;
 			}
-			//try to ignore PCR disc signaling if our PCR diff seems to be reasonnable 
+			//try to ignore PCR disc signaling if our PCR diff seems to be reasonnable
 			if ((hdr.m2ts_pcr==2) && (ABS(pcr_diff) <= 60000)) {
 				discontinuity = GF_FALSE;
 			}
@@ -1182,14 +1186,17 @@
 				}
 
 				if (ch->odm->parentscene && ch->odm->parentscene->root_od->addon) {
-					s64 res = gf_scene_adjust_timestamp_for_addon(ch->odm->parentscene->root_od->addon, ch->CTS);
-					if (res<0) return;
-					ch->CTS = (u32) res;
-
+					s64 res;
+					if (!ch->odm->parentscene->root_od->addon->timeline_ready && (ch->odm->parentscene->root_od->addon->url[0]==0))
+						return;
+						
 					res = gf_scene_adjust_timestamp_for_addon(ch->odm->parentscene->root_od->addon, ch->DTS);
 					if (res<0) res=0;
 					ch->DTS = (u32) res;
-
+					
+					res = gf_scene_adjust_timestamp_for_addon(ch->odm->parentscene->root_od->addon, ch->CTS);
+					if (res<0) return;
+					ch->CTS = (u32) res;
 				}
 
 				if (ch->clock->probe_ocr && gf_es_owns_clock(ch)) {
@@ -1412,6 +1419,12 @@
 			evt.sai = hdr.sai;
 			evt.saiz = hdr.saiz;
 			evt.IV_size = hdr.IV_size;
+			evt.crypt_byte_block = hdr.crypt_byte_block;
+			evt.skip_byte_block = hdr.skip_byte_block;
+			if (!evt.IV_size) {
+				evt.constant_IV_size = hdr.constant_IV_size;
+				memmove(evt.constant_IV, hdr.constant_IV, hdr.constant_IV_size);
+			}
 		}
 		e = ch->ipmp_tool->process(ch->ipmp_tool, &evt);
 
@@ -1487,28 +1500,8 @@
 	if (ch->es_state != GF_ESM_ES_RUNNING) return NULL;
 
 	if (!ch->is_pulling) {
-		GF_NetworkCommand com;
-		Bool flush_data = GF_FALSE;
 		gf_mx_p(ch->mx);
 
-		if (ch->odm->term->bench_mode && !ch->AU_buffer_first) {
-			memset(&com, 0, sizeof(GF_NetworkCommand));
-			com.command_type = GF_NET_BUFFER_QUERY;
-			com.base.on_channel = NULL;
-			gf_service_command(ch->service, &com, GF_OK);
-			if (!com.buffer.occupancy)
-				flush_data = GF_TRUE;
-		} else {
-			if (!ch->AU_buffer_first || (ch->BufferTime < (s32) ch->MaxBuffer/2) )
-				flush_data = GF_TRUE;
-		}
-		if (flush_data) {
-			/*query buffer level, don't sleep if too low*/
-			com.command_type = GF_NET_SERVICE_FLUSH_DATA;
-			com.base.on_channel = ch;
-			gf_term_service_command(ch->service, &com);
-		}
-
 		/*we must update buffering before fetching in order to stop buffering for streams with very few
 		updates (especially streams with one update, like most of OD streams)*/
 		if (ch->BufferOn && ch->AU_buffer_first) gf_es_update_buffering(ch, 0);
@@ -1616,10 +1609,11 @@
 				return NULL;
 			}
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s) at %u - Dispatch Pull AU DTS %u - CTS %u - size %d - RAP %d\n", ch->esd->ESID, ch->odm->net_service->url, gf_clock_real_time(ch->clock), ch->DTS, ch->CTS, ch->AU_buffer_pull->dataLength, ch->AU_buffer_pull->flags&1 ? 1 : 0));
-
 		ch->AU_buffer_pull->flags = 0;
 		if (ch->IsRap) ch->AU_buffer_pull->flags |= GF_DB_AU_RAP;
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s) at %u - Dispatch Pull AU DTS %u - CTS %u - size %d - RAP %d\n", ch->esd->ESID, ch->odm->net_service->url, gf_clock_real_time(ch->clock), ch->DTS, ch->CTS, ch->AU_buffer_pull->dataLength, ch->AU_buffer_pull->flags&1 ? 1 : 0));
+
 	} else if (reagg_au) {
 		ch->AU_buffer_pull->data = reagg_au;
 		ch->AU_buffer_pull->dataLength = reagg_au_size;
@@ -1680,6 +1674,7 @@
 			if (ch->AU_buffer_pull->flags & GF_DB_AU_REAGGREGATED) {
 				gf_free(ch->AU_buffer_pull->data);
 			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[ODM%d] ES%d (%s) Droping pull AU CTS %d\n", ch->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, ch->AU_buffer_pull->CTS));
 			gf_term_channel_release_sl_packet(ch->service, ch);
 			ch->AU_buffer_pull->data = NULL;
 			ch->AU_buffer_pull->dataLength = 0;
@@ -1704,7 +1699,7 @@
 	ch->AU_buffer_first = au->next;
 
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[ODM%d] ES%d Droping AU CTS %d\n", ch->odm->OD->objectDescriptorID, ch->esd->ESID, au->CTS));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[ODM%d] ES%d (%s) Droping AU CTS %d\n", ch->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, au->CTS));
 
 	au->next = NULL;
 	gf_db_unit_del(au);
@@ -1850,6 +1845,9 @@
 		}
 	}
 
+	if (ch && ch->odm && ch->odm->codec && !ch->is_pulling && (ch->MaxBuffer <= ch->odm->term->low_latency_buffer_max))
+		ch->odm->codec->flags |= GF_ESM_CODEC_IS_LOW_LATENCY;
+
 	if (ch->esd->decoderConfig->streamType == GF_STREAM_PRIVATE_SCENE &&
 	 ch->esd->decoderConfig->objectTypeIndication == GPAC_OTI_PRIVATE_SCENE_EPG) {
 		ch->bypass_sl_and_db = 1;
@@ -1900,7 +1898,7 @@
 
 	/*push all cfg data*/
 	/*CommonEncryption*/
-	if ((drm_cfg->scheme_type == GF_4CC('c', 'e', 'n', 'c')) || (drm_cfg->scheme_type == GF_4CC('c','b','c','1')) || (drm_cfg->scheme_type == GF_4CC('c', 'e', 'n', 's')) || (drm_cfg->scheme_type == GF_4CC('c','b','c','s'))) {
+	if ((drm_cfg->scheme_type == GF_ISOM_CENC_SCHEME) || (drm_cfg->scheme_type == GF_ISOM_CBC_SCHEME) || (drm_cfg->scheme_type == GF_ISOM_CENS_SCHEME) || (drm_cfg->scheme_type == GF_ISOM_CBCS_SCHEME)) {
 		evt.config_data_code = drm_cfg->scheme_type;
 		memset(&cenc_cfg, 0, sizeof(cenc_cfg));
 		cenc_cfg.scheme_version = drm_cfg->scheme_version;
@@ -1911,7 +1909,7 @@
 	} else {
 		/*ISMA and OMA*/
 		if (drm_cfg->contentID) {
-			evt.config_data_code = GF_4CC('o','d','r','m');
+			evt.config_data_code = GF_ISOM_ODRM_SCHEME;
 			memset(&cfg, 0, sizeof(cfg));
 			cfg.scheme_version = drm_cfg->scheme_version;
 			cfg.scheme_type = drm_cfg->scheme_type;
@@ -1926,7 +1924,7 @@
 			cfg.oma_drm_textual_headers_len = drm_cfg->oma_drm_textual_headers_len;
 			evt.config_data = &cfg;
 		} else {
-			evt.config_data_code = GF_4CC('i','s','m','a');
+			evt.config_data_code = GF_ISOM_ISMA_SCHEME;
 			memset(&isma_cfg, 0, sizeof(isma_cfg));
 			isma_cfg.scheme_version = drm_cfg->scheme_version;
 			isma_cfg.scheme_type = drm_cfg->scheme_type;

gpac-0.7.1.tar.gz/src/terminal/decoder.c -> gpac-0.8.0.tar.gz/src/terminal/decoder.c Changed

@@ -53,6 +53,11 @@
 			base_layer->dependsOnESID = 0xFFFF;
 			return NULL;
 		default:
+			if (odm->parentscene->root_od->addon->addon_type == GF_ADDON_TYPE_SPLICED) {
+				*e = GF_OK;
+				odm->splice_addon_mtype = base_layer->decoderConfig->streamType;
+				return NULL;
+			}
 			break;
 		}
 	}
@@ -113,6 +118,36 @@
 	return tmp;
 }
 
+static void codec_check_frame_output_mode(GF_Codec *codec)
+{
+	GF_CodecCapability cap;
+	codec->direct_frame_output = GF_FALSE;
+	codec->direct_vout = GF_FALSE;
+
+	if (codec->type == GF_STREAM_VISUAL) {
+		cap.CapCode = GF_CODEC_FRAME_OUTPUT;
+		gf_codec_get_capability(codec, &cap);
+		if (cap.cap.valueBool) {
+			cap.CapCode = GF_CODEC_FRAME_OUTPUT;
+			cap.cap.valueInt = gf_sc_use_3d(codec->odm->term->compositor) ? 2 : 1;
+			if ((gf_codec_set_capability(codec, cap)==GF_OK) && (((GF_MediaDecoder*)codec->decio)->GetOutputFrame != NULL))
+				codec->direct_frame_output = GF_TRUE;
+		}
+		if (!codec->direct_frame_output) {
+			//this works but we need at least double buffering of textures on the GPU which we don't have now
+			if ( gf_sc_use_raw_texture(codec->odm->term->compositor)) {
+				cap.CapCode = GF_CODEC_RAW_MEMORY;
+				gf_codec_get_capability(codec, &cap);
+				if (cap.cap.valueBool) {
+					cap.CapCode = GF_CODEC_RAW_MEMORY;
+					if ((gf_codec_set_capability(codec, cap)==GF_OK) && (((GF_MediaDecoder*)codec->decio)->GetOutputBuffer != NULL))
+						codec->direct_vout = GF_TRUE;
+				}
+			}
+		}
+	}
+}
+
 GF_Err gf_codec_add_channel(GF_Codec *codec, GF_Channel *ch)
 {
 	GF_Err e;
@@ -125,9 +160,6 @@
 
 	if (!ch || !ch->esd) return GF_BAD_PARAM;
 
-	if (ch && ch->odm && !ch->is_pulling && (ch->MaxBuffer <= ch->odm->term->low_latency_buffer_max))
-		codec->flags |= GF_ESM_CODEC_IS_LOW_LATENCY;
-
 	/*only for valid codecs (eg not OCR)*/
 	if (codec->decio) config_decio = GF_TRUE;
 	else if (codec->odm->term->bench_mode==2) {
@@ -151,71 +183,44 @@
 		}
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[Codec] Attaching stream %d to codec %s\n", ch->esd->ESID, codec->decio->module_name));
 
-		if (codec->type == GF_STREAM_VISUAL) {
-			cap.CapCode = GF_CODEC_FRAME_OUTPUT;
-			gf_codec_get_capability(codec, &cap);
-			if (cap.cap.valueBool) {
-				cap.CapCode = GF_CODEC_FRAME_OUTPUT;
-				cap.cap.valueInt = gf_sc_use_3d(codec->odm->term->compositor) ? 2 : 1;
-				if ((gf_codec_set_capability(codec, cap)==GF_OK) && (((GF_MediaDecoder*)codec->decio)->GetOutputFrame != NULL))
-					codec->direct_frame_output = GF_TRUE;
-			}
-			if (!codec->direct_frame_output) {
-				//this works but we need at least double buffering of textures on the GPU which we don't have now
-				if ( gf_sc_use_raw_texture(codec->odm->term->compositor)) {
-					cap.CapCode = GF_CODEC_RAW_MEMORY;
-					gf_codec_get_capability(codec, &cap);
-					if (cap.cap.valueBool) {
-						cap.CapCode = GF_CODEC_RAW_MEMORY;
-						if ((gf_codec_set_capability(codec, cap)==GF_OK) && (((GF_MediaDecoder*)codec->decio)->GetOutputBuffer != NULL))
-							codec->direct_vout = GF_TRUE;
-					}
-				}
-			}
-		}
+		codec_check_frame_output_mode(codec);
 
 		if (codec->odm->term->bench_mode==2) {
 			e = GF_OK;
 		} else {
+			Bool force_annex_b = GF_FALSE;
+			GF_NetworkCommand com;
 			/*lock the channel before setup in case we are using direct_decode */
 			gf_mx_p(ch->mx);
 			ch->esd->service_url = (ch->odm && ch->odm->net_service) ? ch->odm->net_service->url : NULL;
 
-		//test code to force annexB format for AVC/SVC or HEVC/LHEVC streams
-#if GPAC_ANDROID
-			{
-				char *dsi = NULL;
-				GF_NetworkCommand com;
-				u32 len = 0;
-#if 0
-				if (ch->esd->decoderConfig->decoderSpecificInfo) {
-					dsi = ch->esd->decoderConfig->decoderSpecificInfo->data;
-					ch->esd->decoderConfig->decoderSpecificInfo->data = NULL;
-					len = ch->esd->decoderConfig->decoderSpecificInfo->dataLength;
-					ch->esd->decoderConfig->decoderSpecificInfo->dataLength=0;
-				}
-				e = codec->decio->AttachStream(codec->decio, ch->esd);
-				if (ch->esd->decoderConfig->decoderSpecificInfo) {
-					ch->esd->decoderConfig->decoderSpecificInfo->data = dsi;
-					ch->esd->decoderConfig->decoderSpecificInfo->dataLength = 0;
-				}
-#endif
-				cap.CapCode = GF_CODEC_FORCE_ANNEXB;
-				gf_codec_get_capability(codec, &cap);
-				if (cap.cap.valueBool) {
-					memset(&com, 0, sizeof(GF_NetworkCommand));
-					com.command_type = GF_NET_CHAN_NALU_MODE;
-					com.nalu_mode.extract_mode = 1;
-					com.base.on_channel = ch;
-					gf_term_service_command(ch->service, &com);
-				}
+			cap.CapCode = GF_CODEC_FORCE_ANNEXB;
+			gf_codec_get_capability(codec, &cap);
+			if (cap.cap.valueBool) {
+				force_annex_b = GF_TRUE;
+			}
 
+			if (force_annex_b && ch->esd->decoderConfig->decoderSpecificInfo) {
+				gf_free(ch->esd->decoderConfig->decoderSpecificInfo->data);
+				ch->esd->decoderConfig->decoderSpecificInfo->data = NULL;
+				ch->esd->decoderConfig->decoderSpecificInfo->dataLength=0;
 			}
 
 			e = codec->decio->AttachStream(codec->decio, ch->esd);
-#else
-			e = codec->decio->AttachStream(codec->decio, ch->esd);
-#endif
+			while (e == GF_PROFILE_NOT_SUPPORTED) {
+				e = gf_codec_change_decoder(codec, ch->esd, GF_TRUE);
+				if (e) break;
+				codec_check_frame_output_mode(codec);
+				e = codec->decio->AttachStream(codec->decio, ch->esd);
+			}
+
+			if (force_annex_b) {
+				memset(&com, 0, sizeof(GF_NetworkCommand));
+				com.command_type = GF_NET_CHAN_NALU_MODE;
+				com.nalu_mode.extract_mode = 1;
+				com.base.on_channel = ch;
+				gf_term_service_command(ch->service, &com);
+			}
 
 			gf_mx_v(ch->mx);
 		}
@@ -459,7 +464,7 @@
 	}
 }
 
-static void MediaDecoder_GetNextAU(GF_Codec *codec, GF_Channel **activeChannel, GF_DBUnit **nextAU)
+static void MediaDecoder_GetNextAU(GF_Codec *codec, GF_Channel **activeChannel, GF_DBUnit **nextAU, Bool *prev_channel_unreliable)
 {
 	GF_Channel *ch;
 	GF_DBUnit *AU;
@@ -467,13 +472,18 @@
 	GF_ObjectManager *current_odm = codec->odm;
 	u32 count, curCTS, i, stream_state, now=0;
 	Bool scalable_check = 0;
+	Bool splice_check = 0;
 	s32 cts_diff;
 	Bool no_au_in_enhancement = GF_FALSE;
+	GF_Channel *spliced_channel = NULL;
+	GF_DBUnit *spliced_AU = NULL;
+	GF_AddonMedia *addon=NULL;
 	*nextAU = NULL;
 	*activeChannel = NULL;
+	*prev_channel_unreliable = GF_FALSE;
 	curCTS = 0;
 
-browse_scalable:
+rebrowse_object:
 
 	count = gf_list_count(src_channels);
 	if (!count) return;
@@ -617,6 +627,11 @@
 				if ((*nextAU)->flags & GF_DB_AU_REAGGREGATED) {
 					scalable_check = 2;
 				} else {
+					if (codec->last_unit_dts && (AU->DTS<codec->last_unit_dts)) {
+						gf_es_drop_au(ch);
+						ch->stream_state = 1;
+						goto refetch_AU;
+					}
 					GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("AU in enhancement layer DTS %u - CTS %d too early for this AU\n", AU->DTS, AU->CTS));
 				}
 			}
@@ -624,21 +639,72 @@
 	}
 	//scalable addon, browse channels in scalable object
 	if (current_odm->upper_layer_odm) {
+		GF_CodecCapability cap;
+		Bool check_addon = GF_TRUE;
+
 		if (*nextAU) {
-			if (gf_scene_check_addon_restart(current_odm->upper_layer_odm->parentscene->root_od->addon, (*nextAU)->CTS, (*nextAU)->DTS)) {
-				//due to some issues in openhevc we reset the decoder when we restart the scalable addon
-				GF_CodecCapability cap;
-				cap.CapCode = GF_CODEC_WAIT_RAP;
-				gf_codec_set_capability(codec, cap);
+			GF_AddonMedia *addon;
+			/*lock net in case the addon gets destroyed*/
+			gf_term_lock_net(current_odm->term, GF_TRUE);
+			addon = current_odm->upper_layer_odm ? current_odm->upper_layer_odm->parentscene->root_od->addon : NULL;
+			gf_term_lock_net(current_odm->term, GF_FALSE);
+
+			if (!addon) {
+				check_addon = GF_FALSE;
+				current_odm->upper_layer_odm = NULL;
+				//switch off enhancement layer
+				if (codec->coding_config_changed) {
+					cap.CapCode = GF_CODEC_MEDIA_LAYER_DETACH;
+					cap.cap.valueInt = 0;
+					gf_codec_set_capability(codec, cap);
+				}
+			} else {
+
+				if (gf_scene_check_addon_restart(addon, (*nextAU)->CTS, (*nextAU)->DTS)) {
+					//due to some issues in openhevc we reset the decoder when we restart the scalable addon
+					GF_CodecCapability cap;
+					cap.CapCode = GF_CODEC_WAIT_RAP;
+					gf_codec_set_capability(codec, cap);
+				}
+
+				assert(addon->addon_type==GF_ADDON_TYPE_SCALABLE);
+				if (addon->is_splicing) {
+					//addon start not yet reached
+					if (addon->splice_start > (*nextAU)->CTS ) check_addon = GF_FALSE;
+					//addon end reached
+					if ((addon->is_over==2) || ((addon->splice_end>=0) && (addon->splice_end <= (*nextAU)->CTS) ) ) {
+						check_addon = GF_FALSE;
+						//switch off enhancement layer
+						if (codec->coding_config_changed) {
+							cap.CapCode = GF_CODEC_MEDIA_SWITCH_QUALITY;
+							cap.cap.valueInt = 0;
+							gf_codec_set_capability(codec, cap);
+						}
+
+						gf_list_del_item(codec->odm->parentscene->declared_addons, addon);
+						gf_scene_reset_addon(addon, GF_TRUE);
+						current_odm->upper_layer_odm = NULL;
+						*prev_channel_unreliable = GF_TRUE;
+					}
+					//switch on enhancement layer
+					if (check_addon && !codec->coding_config_changed) {
+						codec->coding_config_changed = GF_TRUE;
+						cap.CapCode = GF_CODEC_MEDIA_SWITCH_QUALITY;
+						cap.cap.valueInt = 1;
+						gf_codec_set_capability(codec, cap);
+					}
+				}
 			}
 		}
-		current_odm = current_odm->upper_layer_odm;
-		src_channels = current_odm->channels;
-		scalable_check = 1;
-		goto browse_scalable;
+		if (check_addon) {
+			current_odm = current_odm->upper_layer_odm;
+			src_channels = current_odm->channels;
+			scalable_check = 1;
+			goto rebrowse_object;
+		}
 	}
 
-	if (*nextAU && no_au_in_enhancement ) {
+	if (*nextAU && no_au_in_enhancement ) {
 		//do we have time to wait for the enhancement to be filled ?
 		if (now < (*nextAU)->DTS) {
 			//GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] Enhancement layer not ready for this AU (DTS %u) at OTB %d- decoding postponed\n", codec->decio->module_name, (*nextAU)->DTS, now));
@@ -649,6 +715,97 @@
 		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] Warning: could not find enhancement layer for this AU (DTS %u) at OTB %d - decoding only base\n", codec->decio->module_name, (*nextAU)->DTS, now));
 	}
 
+	if (!splice_check && *nextAU && codec->odm->parentscene->has_splicing_addons) {
+		Bool check_coding_config = GF_FALSE;
+		count = gf_list_count(codec->odm->parentscene->declared_addons);
+		for (i=0; i<count; i++) {
+			GF_AddonMedia *an_addon = gf_list_get(codec->odm->parentscene->declared_addons, i);
+			if (an_addon->addon_type!=GF_ADDON_TYPE_SPLICED) continue;
+			if (an_addon->splice_start<0) continue;
+			if (an_addon->splice_start > (*nextAU)->CTS ) continue;
+			//addon end reached
+			if ((an_addon->is_over==2) ||
+				((an_addon->splice_end>=0) && an_addon->splice_end <= (*nextAU)->CTS )
+			) {
+				if (codec->in_splice) {
+					assert(an_addon->nb_splicing);
+					an_addon->nb_splicing --;
+					codec->in_splice = GF_FALSE;
+					check_coding_config = codec->coding_config_changed;
+				}
+				if (!an_addon->nb_splicing) {
+					gf_scene_reset_addon(an_addon, GF_TRUE);
+					gf_list_rem(codec->odm->parentscene->declared_addons, i);
+					i--;
+					count--;
+					*prev_channel_unreliable = GF_TRUE;
+				}
+				continue;
+			}
+
+			addon = an_addon;
+			break;
+		}
+		if (!addon && check_coding_config) {
+			codec->coding_config_changed = GF_FALSE;
+			gf_codec_change_decoder(codec, (*activeChannel)->esd, GF_FALSE);
+		}
+		//we found our addon, browse for same codec
+		if (addon && addon->root_od->subscene) {
+			count = gf_list_count(addon->root_od->subscene->resources);
+			for (i=0; i<count; i++) {
+				GF_ObjectManager *an_odm = gf_list_get(addon->root_od->subscene->resources, i);
+				if (an_odm->splice_addon_mtype == codec->type) {
+					spliced_channel = *activeChannel;
+					spliced_AU = *nextAU;
+					*activeChannel = NULL;
+					*nextAU = NULL;
+					current_odm = an_odm;
+					src_channels = an_odm->channels;
+					splice_check = 1;
+					goto rebrowse_object;
+				}
+			}
+		}
+	}
+	if (splice_check) {
+		Bool is_over = *nextAU ? 0 : addon->is_over;
+		if (!is_over) {
+			//nextAU might be NULL if no RAP yet arrived on spliced channel
+			if (*nextAU && spliced_AU && spliced_AU->CTS <= (*nextAU)->CTS) {
+				gf_es_drop_au(spliced_channel);
+			}
+
+			if (!codec->in_splice) {
+				GF_DefaultDescriptor *dsi1, *dsi2;
+				dsi1 = spliced_channel->esd->decoderConfig->decoderSpecificInfo;
+				dsi2 = (*activeChannel)->esd->decoderConfig->decoderSpecificInfo;
+				if (!codec->coding_config_changed
+				&& (
+				(spliced_channel->esd->decoderConfig->objectTypeIndication != (*activeChannel)->esd->decoderConfig->objectTypeIndication)
+				|| (!dsi1 || ! dsi2 || (dsi1->dataLength != dsi2->dataLength)
+
+				|| memcmp(dsi1->data, dsi2->data, dsi1->dataLength)	)
+				)
+				) {
+
+					gf_codec_change_decoder(codec, (*activeChannel)->esd, GF_FALSE);
+					codec->coding_config_changed = GF_TRUE;
+				}
+				codec->in_splice = GF_TRUE;
+				addon->nb_splicing++;
+			}
+		} else {
+			if (addon->is_over) addon->is_over = 2;
+			*activeChannel = spliced_channel;
+			*nextAU = spliced_AU;
+			if (codec->coding_config_changed) {
+				gf_codec_change_decoder(codec, (*activeChannel)->esd, GF_FALSE);
+				codec->coding_config_changed = GF_FALSE;
+			}
+		}
+	}
+
 	if (codec->is_reordering && *nextAU && codec->first_frame_dispatched) {
 		u32 diff = 0;
 
@@ -981,7 +1138,8 @@
 		if (dec->trusted_cts && (CU->prev->dataLength && CU->prev->TS > CU->TS) ) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[%s] ODM%d codec is reordering but CTSs are out of order (%u vs %u prev) - forcing CTS recomputing\n", dec->decio->module_name, dec->odm->OD->objectDescriptorID, CU->TS, CU->prev->TS));
 
-			dec->trusted_cts = GF_FALSE;
+			//dec->trusted_cts = GF_FALSE;
+			CU->TS = CU->prev->TS;
 		}
 		if (!dec->trusted_cts) {
 			/*first dispatch from decoder, store CTS*/
@@ -1070,10 +1228,12 @@
 	u64 now, entryTime;
 	u32 mmlevel, cts;
 	u32 first, obj_time, unit_size;
-	GF_MediaDecoder *mdec = (GF_MediaDecoder*)codec->decio;
+	GF_MediaDecoder *mdec;
 	GF_Err e = GF_OK;
 	s32 cts_diff;
 	u32 scal_unit_size=0;
+	Bool prev_channel_unreliable;
+
 	CU = NULL;
 
 	/*if video codec muted don't decode (try to saves ressources)
@@ -1096,7 +1256,8 @@
 
 
 	/*fetch next AU in DTS order for this codec*/
-	MediaDecoder_GetNextAU(codec, &ch, &AU);
+	MediaDecoder_GetNextAU(codec, &ch, &AU, &prev_channel_unreliable);
+	mdec = (GF_MediaDecoder*)codec->decio;
 
 	/*no active channel return*/
 	if (!AU || !ch) {
@@ -1359,7 +1520,7 @@
 			unit_size = 0;
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d: force drop requested in fast playback for AU CTS %u\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, AU->CTS));
 		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] At %u ODM%d ES%d decoding frame DTS %u CTS %u size %d (%d in channels)\n", codec->decio->module_name, gf_clock_real_time(ch->clock), codec->odm->OD->objectDescriptorID, ch->esd->ESID, AU->DTS, AU->CTS, AU->dataLength, ch->AU_Count));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] At %u ODM%d ES%d (%s) decoding frame DTS %u CTS %u size %d (%d in channels)\n", codec->decio->module_name, gf_clock_real_time(ch->clock), codec->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, AU->DTS, AU->CTS, AU->dataLength, ch->AU_Count));
 			e = mdec->ProcessData(mdec, AU->data, AU->dataLength, ch->esd->ESID, &CU->TS, CU->data, &unit_size, AU->PaddingBits, mmlevel);
 		}
 		now = gf_sys_clock_high_res() - now;
@@ -1377,6 +1538,7 @@
 			if (codec->CB->LastRenderedTS) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d ES%d: Resize output buffer requested\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID));
 				codec->force_cb_resize = unit_size;
+				gf_cm_abort_buffering(codec->CB);
 				return GF_OK;
 			}
 			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d ES%d: Resizing output buffer %d -> %d\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, codec->CB->UnitSize, unit_size));
@@ -1420,8 +1582,7 @@
 		processing a scalable stream*/
 		case GF_OK:
 			if (unit_size) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] At %u ODM%d ES%d decoded frame DTS %u CTS %u size %d in "LLU" us - %d in CB\n", codec->decio->module_name, gf_clock_real_time(ch->clock), codec->odm->OD->objectDescriptorID, ch->esd->ESID, AU->DTS, AU->CTS, AU->dataLength, now, codec->CB->UnitCount + 1));
-
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] At %u ODM%d ES%d (%s) decoded frame DTS %u CTS %u size %d in "LLU" us - %d in CB\n", codec->decio->module_name, gf_clock_real_time(ch->clock), codec->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, AU->DTS, AU->CTS, AU->dataLength, now, codec->CB->UnitCount + 1));
 
 				if (codec->direct_frame_output) {
 					Bool needs_resize = 0;
@@ -1488,7 +1649,7 @@
 			/*release but no dispatch*/
 			UnlockCompositionUnit(codec, CU, 0);
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[%s] Unsupported profile detected, blacklisting decoder for this stream and changing decoder\n", codec->decio->module_name ));
-			return gf_codec_change_decoder(codec);
+			return gf_codec_change_decoder(codec, NULL, GF_TRUE);
 		case GF_CODEC_BUFFER_UNAVAILABLE:
 			if (unit_size) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] At %u ODM%d ES%d decoded frame DTS %u CTS %u size %d in "LLU" us - %d in CB\n", codec->decio->module_name, gf_clock_real_time(ch->clock), codec->odm->OD->objectDescriptorID, ch->esd->ESID, AU->DTS, AU->CTS, AU->dataLength, now, codec->CB->UnitCount + 1));
@@ -1573,7 +1734,12 @@
 			return e;
 		}
 
-		MediaDecoder_GetNextAU(codec, &ch, &AU);
+		MediaDecoder_GetNextAU(codec, &ch, &AU, &prev_channel_unreliable);
+		mdec = (GF_MediaDecoder*)codec->decio;
+		//in splicing we may have destroyed the previous channel, discard the info
+		if (prev_channel_unreliable)
+			prev_ch = ch ? ch : gf_list_get(codec->inChannels, 0);
+
 		/*same CTS: same output, likely scalable stream so don't release the CB*/
 		if (AU && (AU->CTS == cts) && (ch != prev_ch) ) {
 			if (scal_unit_size < unit_size) scal_unit_size = unit_size;
@@ -1609,8 +1775,9 @@
 		if (cts_diff < 0) cts_diff = -cts_diff;
 		//the decoder is dispathing CTS in the previous time base , override the timestamp ...
 		if (cts_diff > 20000 ) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[%s] decoded frame CTS %d but input frame CTS %d, lilely due to clock discontinuity\n", codec->decio->module_name, CU->TS, cts));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[%s] decoded frame CTS %d but input frame CTS %d, likely due to clock discontinuity\n", codec->decio->module_name, CU->TS, cts));
 			CU->TS = cts;
+			CU->TS = 0;
 		}
 
 		UnlockCompositionUnit(codec, CU, unit_size);
@@ -1637,6 +1804,7 @@
 			return GF_OK;
 		}
 	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Exit decode loop because no more space in CB\n", codec->decio->module_name));
 	return GF_OK;
 }
 
@@ -1866,14 +2034,16 @@
 {
 	u32 conf = 0;
 	u32 i_es;
+
+	codec->hybrid_layered_coded = 0;
 	for (i_es=0; i_es<gf_list_count(codec->odm->OD->ESDescriptors); i_es++) {
 		GF_ESD *an_esd = gf_list_get(codec->odm->OD->ESDescriptors, i_es);
 		u32 c;
 		if (an_esd->decoderConfig->streamType != esd->decoderConfig->streamType) continue;
-		if (an_esd->dependsOnESID && (an_esd->decoderConfig->objectTypeIndication != esd->decoderConfig->objectTypeIndication)) {
+		if (an_esd->dependsOnESID && (an_esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_LHVC) && (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_AVC)) {
 			codec->hybrid_layered_coded = 1;
 		}
-		c = ifce->CanHandleStream(ifce, an_esd->decoderConfig->streamType, an_esd, PL);
+		c = ifce->CanHandleStream(ifce, an_esd->decoderConfig->streamType, i_es ? an_esd : esd, PL);
 		if (!conf || (c<conf) ) conf=c;
 	}
 	return conf;
@@ -2043,14 +2213,14 @@
 	return GF_CODEC_NOT_FOUND;
 }
 
-GF_Err gf_codec_change_decoder(GF_Codec *codec)
+GF_Err gf_codec_change_decoder(GF_Codec *codec, GF_ESD *for_esd, Bool do_blacklist)
 {
 	GF_Err e;
 	u32 i, count;
 	GF_ESD *esd=NULL;
 	if (!codec || !codec->decio) return GF_CODEC_NOT_FOUND;
 	if (!codec->blacklisted) codec->blacklisted = gf_list_new();
-	gf_list_add(codec->blacklisted, gf_strdup(codec->decio->module_name) );
+	if (do_blacklist) gf_list_add(codec->blacklisted, gf_strdup(codec->decio->module_name) );
 
 	count = gf_list_count(codec->inChannels);
 	for (i=0; i<count; i++) {
@@ -2062,13 +2232,19 @@
 	}
 	gf_modules_close_interface((GF_BaseInterface *) codec->decio);
 	codec->decio = NULL;
-	if (!esd) return GF_CODEC_NOT_FOUND;
-	e = Codec_LoadModule(codec, esd, codec->profile_level);
+	if (!esd && !for_esd) return GF_CODEC_NOT_FOUND;
+	e = Codec_LoadModule(codec, for_esd ? for_esd : esd, codec->profile_level);
 	if (e) return e;
 	if (!codec->decio) return GF_CODEC_NOT_FOUND;
 
+	if (for_esd) {
+		return codec->decio->AttachStream(codec->decio, for_esd);
+	}
+
 	for (i=0; i<count; i++) {
 		GF_Channel *ch = gf_list_get(codec->inChannels, i);
+		if (ch->esd == for_esd) continue;
+
 		if (ch && ch->esd) {
 			codec->decio->AttachStream(codec->decio, ch->esd);
 		}

gpac-0.7.1.tar.gz/src/terminal/input_sensor.c -> gpac-0.8.0.tar.gz/src/terminal/input_sensor.c Changed

gpac-0.7.1.tar.gz/src/terminal/media_manager.c -> gpac-0.8.0.tar.gz/src/terminal/media_manager.c Changed

@@ -274,13 +274,8 @@
 	return 0;
 }
 
-static u32 MM_SimulationStep_Decoder(GF_Terminal *term, u32 *nb_active_decs)
+static void MM_handleServices(GF_Terminal *term)
 {
-	CodecEntry *ce;
-	GF_Err e;
-	u32 count, remain;
-	u32 time_taken, time_slice, time_left;
-
 #ifndef GF_DISABLE_LOG
 	term->compositor->networks_time = gf_sys_clock();
 #endif
@@ -292,6 +287,15 @@
 	term->compositor->networks_time = gf_sys_clock() - term->compositor->networks_time;
 #endif
 
+}
+
+static u32 MM_SimulationStep_Decoder(GF_Terminal *term, u32 *nb_active_decs)
+{
+	CodecEntry *ce;
+	GF_Err e;
+	u32 count, remain;
+	u32 time_taken, time_slice, time_left;
+
 #ifndef GF_DISABLE_LOG
 	term->compositor->decoders_time = gf_sys_clock();
 #endif
@@ -362,6 +366,7 @@
 	Bool do_scene = (term->flags & GF_TERM_NO_VISUAL_THREAD) ? 1 : 0;
 	Bool do_codec = (term->flags & GF_TERM_NO_DECODER_THREAD) ? 0 : 1;
 	Bool do_regulate = (term->user->init_flags & GF_TERM_NO_REGULATION) ? 0 : 1;
+	Bool no_compositor_thread = (term->user->init_flags & GF_TERM_NO_COMPOSITOR_THREAD) ? 1 : 0;
 
 	gf_th_set_priority(term->mm_thread, term->priority);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[MediaManager] Entering thread ID %d\n", gf_th_id() ));
@@ -370,6 +375,10 @@
 	while (term->flags & GF_TERM_RUNNING) {
 		u32 nb_decs = 0;
 		u32 left = 0;
+
+		if (!no_compositor_thread) 
+			MM_handleServices(term);
+
 		if (do_codec) left = MM_SimulationStep_Decoder(term, &nb_decs);
 		else left = term->frame_duration;
 
@@ -505,19 +514,6 @@
 		locked = gf_mx_try_lock(term->mm_mx);
 	}
 
-	if (reason == 0) {
-		cap.CapCode = GF_CODEC_ABORT;
-		cap.cap.valueInt = 0;
-		gf_codec_set_capability(codec, cap);
-
-		if (codec->decio && codec->odm->mo && (codec->odm->mo->flags & GF_MO_DISPLAY_REMOVE) ) {
-			cap.CapCode = GF_CODEC_SHOW_SCENE;
-			cap.cap.valueInt = 0;
-			gf_codec_set_capability(codec, cap);
-			codec->odm->mo->flags &= ~GF_MO_DISPLAY_REMOVE;
-		}
-	}
-
 	/*for audio codec force CB to stop state to discard any pending AU. Not doing so would lead to a wrong estimation of the clock drift
 	when resuming the object*/
 	if (codec->type==GF_STREAM_AUDIO) {
@@ -538,6 +534,20 @@
 		gf_cm_set_eos(codec->CB);
 	}
 
+	/*signal the codec we stopped*/
+	if (reason == 0) {
+		cap.CapCode = GF_CODEC_ABORT;
+		cap.cap.valueInt = 0;
+		gf_codec_set_capability(codec, cap);
+
+		if (codec->decio && codec->odm->mo && (codec->odm->mo->flags & GF_MO_DISPLAY_REMOVE) ) {
+			cap.CapCode = GF_CODEC_SHOW_SCENE;
+			cap.cap.valueInt = 0;
+			gf_codec_set_capability(codec, cap);
+			codec->odm->mo->flags &= ~GF_MO_DISPLAY_REMOVE;
+		}
+	}
+
 	/*don't wait for end of thread since this can be triggered within the decoding thread*/
 	if (ce->flags & GF_MM_CE_RUNNING) {
 		ce->flags &= ~GF_MM_CE_RUNNING;
@@ -682,6 +692,8 @@
 	u32 sleep_time=0;
 	u32 dec_time = 0, step_start_time = gf_sys_clock();
 
+	MM_handleServices(term);
+
 	if (term->flags & GF_TERM_NO_DECODER_THREAD) {
 		MM_SimulationStep_Decoder(term, &nb_decs);
 		dec_time = gf_sys_clock() - step_start_time;
@@ -719,8 +731,8 @@
 	/*update till frame mature*/
 	while (1) {
 
+		gf_term_handle_services(term);
 		if (term->flags & GF_TERM_NO_DECODER_THREAD) {
-			gf_term_handle_services(term);
 			gf_mx_p(term->mm_mx);
 			i=0;
 			while ((ce = (CodecEntry*)gf_list_enum(term->codecs, &i))) {

gpac-0.7.1.tar.gz/src/terminal/media_memory.c -> gpac-0.8.0.tar.gz/src/terminal/media_memory.c Changed

gpac-0.7.1.tar.gz/src/terminal/media_object.c -> gpac-0.8.0.tar.gz/src/terminal/media_object.c Changed

@@ -192,7 +192,7 @@
 	return res;
 }
 
-
+GF_EXPORT
 void gf_mo_unregister(GF_Node *node, GF_MediaObject *mo)
 {
 	if (mo && node) {
@@ -240,7 +240,7 @@
 }
 
 GF_EXPORT
-Bool gf_mo_get_audio_info(GF_MediaObject *mo, u32 *sample_rate, u32 *bits_per_sample, u32 *num_channels, u32 *channel_config)
+Bool gf_mo_get_audio_info(GF_MediaObject *mo, u32 *sample_rate, u32 *bits_per_sample, u32 *num_channels, u32 *channel_config, Bool *forced_layout)
 {
 	if (!mo->odm || !mo->odm->codec || (mo->type != GF_MEDIA_OBJECT_AUDIO)) return GF_FALSE;
 
@@ -248,6 +248,19 @@
 	if (bits_per_sample) *bits_per_sample = mo->bits_per_sample;
 	if (num_channels) *num_channels = mo->num_channels;
 	if (channel_config) *channel_config = mo->channel_config;
+	if (forced_layout) *forced_layout = GF_FALSE;
+
+	if (mo->odm->ambi_ch_id) {
+		if (mo->num_channels>1) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d]: tagged as ambisonic channel %d but has %d channels, ignoring ambisonic tag\n", mo->odm->OD->objectDescriptorID, mo->odm->ambi_ch_id, mo->num_channels ));
+		} else {
+			if (num_channels) *num_channels = 1;
+			if (channel_config) *channel_config = 1 << (mo->odm->ambi_ch_id - 1);
+			if (forced_layout) *forced_layout = GF_TRUE;
+
+		}
+	}
+
 	return GF_TRUE;
 }
 
@@ -361,13 +374,17 @@
 			mo->srd_full_w = com.srd.width;
 			mo->srd_full_h = com.srd.height;
 
-			if (mo->odm->parentscene->is_dynamic_scene && !mo->odm->parentscene->is_srd) {
-				mo->odm->parentscene->is_srd = GF_TRUE;
+			if (mo->odm->parentscene->is_dynamic_scene) {
+				if ((mo->srd_w == mo->srd_full_w) && (mo->srd_h == mo->srd_full_h)) {
+					mo->odm->parentscene->srd_type = 2;
+				} else if (!mo->odm->parentscene->srd_type) {
+					mo->odm->parentscene->srd_type = 1;
+				}
 			}
 		}
 		// SRD object with no size but global scene size: HEVC tiled bas object
 		else if (com.srd.width && com.srd.height) {
-			if (mo->odm->parentscene->is_dynamic_scene && !mo->odm->parentscene->is_srd) {
+			if (mo->odm->parentscene->is_dynamic_scene && !mo->odm->parentscene->srd_type) {
 				mo->odm->parentscene->is_tiled_srd = GF_TRUE;
 			}
 		}
@@ -555,12 +572,21 @@
 
 
 		if (!(mo->odm->term->flags & GF_TERM_DROP_LATE_FRAMES)) {
-			//if the next AU is at most 1 sec from the current clock use no drop mode
-//			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] At %d frame TS %u next frame TS %d next data length %d (%d in CB)\n", mo->odm->OD->objectDescriptorID, obj_time, CU->TS, CU->next->TS, CU->next->dataLength, codec->CB->UnitCount));
-			if (CU->next->dataLength && (CU->next->TS + 1000 >= obj_time)) {
+			if (mo->odm->term->compositor->force_late_frame_draw) {
+				mo->flags |= GF_MO_IN_RESYNC;
+			}
+			else if (mo->flags & GF_MO_IN_RESYNC) {
+				if (CU->next->TS >= obj_time) {
+					skip_resync = GF_TRUE;
+					mo->flags &= ~GF_MO_IN_RESYNC;
+				}
+			}
+			//if the next AU is at most 200 ms from the current clock use no drop mode
+			else if (CU->next->dataLength && (CU->next->TS + 200 >= obj_time)) {
 				skip_resync = GF_TRUE;
 			} else {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] At %u frame TS %u next frame TS %d too late in no-drop mode, enabling drop - resync mode %d\n", mo->odm->OD->objectDescriptorID, obj_time, CU->TS, CU->next->TS, resync));
+				mo->flags |= GF_MO_IN_RESYNC;
 			}
 		}
 	}
@@ -587,12 +613,13 @@
 	}
 
 	if (resync) {
-		u32 nb_dropped = 0;
 		while (1) {
 			if (codec->ck->speed > 0 ? CU->TS >= obj_time : CU->TS <= obj_time )
 				break;
 
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] Try to drop frame TS %u next frame TS %u length %d obj time %u\n", mo->odm->OD->objectDescriptorID, CU->TS, CU->next->TS, CU->next->dataLength, obj_time));
+			if (mo->timestamp != CU->TS) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] Try to drop frame TS %u next frame TS %u length %d obj time %u\n", mo->odm->OD->objectDescriptorID, CU->TS, CU->next->TS, CU->next->dataLength, obj_time));
+			}
 
 			if (!CU->next->dataLength) {
 				if (force_decode_mode) {
@@ -617,11 +644,11 @@
 				break;
 			}
 
-			nb_dropped ++;
-			if (nb_dropped>=1) {
+			if (mo->timestamp != CU->TS) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] At OTB %u dropped frame TS %u\n", mo->odm->OD->objectDescriptorID, obj_time, CU->TS));
 				codec->nb_dropped++;
 			}
+
 			/*discard*/
 			CU->RenderedLength = CU->dataLength = 0;
 			gf_cm_drop_output(codec->CB);
@@ -907,6 +934,12 @@
 		/*if object not in media queue, add it*/
 		if (gf_list_find(mo->odm->term->media_queue, mo->odm)<0) {
 			gf_list_add(mo->odm->term->media_queue, mo->odm);
+		} else {
+			//ODM was queued for PLAY and we stop it, keep in queue for stoping buffers but don't send net commands
+			if (mo->odm->action_type == GF_ODM_ACTION_PLAY) {
+				//force a stop without network commands
+				mo->odm->state = GF_ODM_STATE_STOP_NO_NET;
+			}
 		}
 
 		/*signal STOP request*/
@@ -914,8 +947,9 @@
 			mo->odm->action_type = GF_ODM_ACTION_DELETE;
 			ret = GF_TRUE;
 		}
-		else
+		else if (mo->odm->action_type!=GF_ODM_ACTION_DELETE) {
 			mo->odm->action_type = GF_ODM_ACTION_STOP;
+		}
 
 		gf_term_lock_media_queue(mo->odm->term, GF_FALSE);
 	} else {
@@ -1269,6 +1303,13 @@
 }
 
 GF_EXPORT
+Bool gf_mo_is_started(GF_MediaObject *mo)
+{
+	if (mo && mo->odm && mo->odm->codec && gf_clock_is_started(mo->odm->codec->ck)) return GF_TRUE;
+	return GF_FALSE;
+}
+
+GF_EXPORT
 Bool gf_mo_is_done(GF_MediaObject *mo)
 {
 	Bool res = GF_FALSE;
@@ -1524,11 +1565,12 @@
 	vr_info->srd_max_x = scene->srd_max_x;
 	vr_info->srd_max_y = scene->srd_max_y;
 	vr_info->is_tiled_srd = scene->is_tiled_srd;
+	vr_info->has_full_coverage = (scene->srd_type==2) ? GF_TRUE : GF_FALSE;
 	
 	gf_sg_get_scene_size_info(scene->graph, &vr_info->scene_width, &vr_info->scene_height);
 
 	gf_odm_lock(mo->odm, 0);
-	return (!scene->vr_type && !scene->is_srd) ? GF_FALSE : GF_TRUE;
+	return (!scene->vr_type && !scene->srd_type) ? GF_FALSE : GF_TRUE;
 }
 
 /*sets quality hint for this media object - quality_rank is between 0 (min quality) and 100 (max quality)*/

gpac-0.7.1.tar.gz/src/terminal/network_service.c -> gpac-0.8.0.tar.gz/src/terminal/network_service.c Changed

@@ -204,8 +204,11 @@
 		if (service->subservice_disconnect) {
 			if (service->owner && service->subservice_disconnect==1) {
 				GF_Scene *scene = service->owner->subscene ? service->owner->subscene : service->owner->parentscene;
+				s32 idx = gf_list_del_item(scene->resources, service->owner);
 				/*destroy all media*/
 				gf_scene_disconnect(scene, 1);
+				if (idx>=0)
+					gf_list_add(scene->resources, service->owner);
 			}
 			return;
 		}
@@ -257,6 +260,7 @@
 	return 1;
 }
 
+
 static void term_on_media_add(GF_ClientService *service, GF_Descriptor *media_desc, Bool no_scene_check)
 {
 	u32 i, min_od_id;
@@ -283,8 +287,6 @@
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Service %s] %s\n", service->url, media_desc ? "Adding new media object" : "Regenerating scene graph"));
 	if (!media_desc) {
-		if (!no_scene_check)
-			gf_scene_regenerate(scene);
 		return;
 	}
 
@@ -435,13 +437,35 @@
 	with the compositor*/
 	gf_term_lock_net(term, 0);
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] setup object - MO %08x\n", odm->OD->objectDescriptorID, odm->mo));
-	gf_odm_setup_object(odm, service);
+	//we post a task to make sure the AttachStream of the decoder is always called from the main thread when no compositor thread (needed for GL nvidia setup)
+	gf_term_lock_media_queue(term, GF_TRUE);
+
+	if (!odm->net_service) {
+		if (odm->flags & GF_ODM_DESTROYED) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] Object has been scheduled for destruction - ignoring object setup\n", odm->OD->objectDescriptorID));
+			return;
+		}
+		odm->net_service = service;
+		assert(odm->OD);
+		if (!odm->OD->URLString)
+			odm->net_service->nb_odm_users++;
+	}
 
 	/*OD inserted by service: resetup scene*/
-	if (!no_scene_check && scene->is_dynamic_scene) gf_scene_regenerate(scene);
+	odm->action_type = GF_ODM_ACTION_SETUP;
+	gf_list_add(term->media_queue, odm);
+	gf_term_lock_media_queue(term, GF_FALSE);
 }
 
+void gf_odm_setup_task(GF_ObjectManager *odm)
+{
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] setup object - MO %08x\n", odm->OD->objectDescriptorID, odm->mo));
+	gf_odm_setup_object(odm, odm->net_service);
+
+	gf_scene_regenerate(odm->parentscene);
+}
+
+
 static void gather_buffer_level(GF_ObjectManager *odm, GF_ClientService *service, GF_NetworkCommand *com, u32 *max_buffer_time)
 {
 	u32 j, count = gf_list_count(odm->channels);
@@ -450,7 +474,7 @@
 		if (ch->service != service) continue;
 		if (ch->es_state != GF_ESM_ES_RUNNING) continue;
 		if (com->base.on_channel && (com->base.on_channel != ch)) continue;
-		if (ch->dispatch_after_db || ch->bypass_sl_and_db || ch->IsEndOfStream) continue;
+		if (ch->dispatch_after_db || ch->bypass_sl_and_db/* || ch->IsEndOfStream*/) continue;
 
 		//if not in hybrid mode, perform buffer management only on base layer -this is because we don't signal which ESs are on/off in the underlying service ...
 		if (ch->esd->dependsOnESID) {
@@ -533,6 +557,8 @@
 			com->buffer.occupancy = (max_buffer_time < com->buffer.max) ? 0 : 2;
 			com->buffer.max = 1;
 			com->buffer.min = 0;
+		} else if (com->buffer.occupancy && max_buffer_time>com->buffer.occupancy) {
+			com->buffer.occupancy = max_buffer_time;
 		}
 		return;
 	}
@@ -1081,6 +1107,8 @@
 	serv->fn_command = term_on_command;
 	serv->fn_data_packet = term_on_data_packet;
 	serv->fn_add_media = term_on_media_add;
+
+	if (owner && owner->OD && owner->OD->RedirectOnly) serv->serviceID = owner->OD->ServiceID;
 	return serv;
 }
 
@@ -1208,7 +1236,7 @@
 {
 	GF_Err e;
 	GF_DownloadSession * sess;
-	char *sURL, *orig_url;
+	char *sURL, *orig_url, *frag;
 	if (!service) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] service is null, cannot create new download session for %s.\n", url));
 		return NULL;
@@ -1217,6 +1245,9 @@
 	sURL = gf_url_concatenate(service->url, url);
 	/*path was absolute*/
 	if (!sURL) sURL = gf_strdup(url);
+	frag = strchr(sURL, '#');
+	if (frag) frag[0] = 0;
+	
 	assert( service->term );
 
 	orig_url = service->pending_service_session ? (char *) gf_dm_sess_get_original_resource_name(service->pending_service_session) : NULL;
@@ -1477,3 +1508,12 @@
 	ns->cache = NULL;
 	return e;
 }
+
+
+GF_EXPORT
+GF_DownloadManager *gf_term_service_get_dm(GF_ClientService *ns)
+{
+	if (!ns->term) return NULL;
+	return ns->term->downloader;
+}
+

gpac-0.7.1.tar.gz/src/terminal/object_browser.c -> gpac-0.8.0.tar.gz/src/terminal/object_browser.c Changed

gpac-0.7.1.tar.gz/src/terminal/object_manager.c -> gpac-0.8.0.tar.gz/src/terminal/object_manager.c Changed

@@ -91,6 +91,13 @@
 	}
 	if (odm->lower_layer_odm) {
 		odm->lower_layer_odm->upper_layer_odm = NULL;
+		if (odm->lower_layer_odm->codec) {
+			GF_CodecCapability cap;
+			//switch off enhancement layer
+			cap.CapCode = GF_CODEC_MEDIA_LAYER_DETACH;
+			cap.cap.valueInt = 0;
+			gf_codec_set_capability(odm->lower_layer_odm->codec, cap);
+		}
 	}
 	/*make sure we are not in the media queue*/
 	gf_term_lock_media_queue(odm->term, GF_TRUE);
@@ -251,8 +258,6 @@
 					break;
 				}
 			}
-		} else {
-			assert(ns->nb_odm_users);
 		}
 		odm->net_service = NULL;
 		if (!ns->nb_odm_users) gf_term_close_service(odm->term, ns);
@@ -265,6 +270,13 @@
 	/*delete from the parent scene.*/
 	if (odm->parentscene) {
 		GF_Event evt;
+
+		if (odm->addon) {
+			gf_list_del_item(odm->parentscene->declared_addons, odm->addon);
+			gf_scene_reset_addon(odm->addon, GF_FALSE);
+			odm->addon = NULL;
+		}
+
 		evt.type = GF_EVENT_CONNECT;
 		evt.connect.is_connected = GF_FALSE;
 		gf_term_forward_event(odm->term, &evt, GF_FALSE, GF_TRUE);
@@ -319,7 +331,7 @@
 
 	if (odm->subscene) {
 		char *sep = strchr(sub_url, '#');
-		if (sep && !strnicmp(sep, "#LIVE360", 8)) {
+		if (sep && ( !strnicmp(sep, "#LIVE360", 8) || !strnicmp(sep, "#360", 4) || !strnicmp(sep, "#VR", 3) ) ) {
 			sep[0] = 0;
 			odm->subscene->vr_type = 1;
 		}
@@ -362,6 +374,8 @@
 
 		/*if desc is NULL for a media, the media will be declared later by the service (gf_term_media_add)*/
 		if (od_type != GF_MEDIA_OBJECT_SCENE) {
+			if (odm->ambi_ch_id) odm->net_service->serviceID = odm->ambi_ch_id;
+			odm->ambi_ch_id = 0;
 			return;
 		}
 		/*create empty service descriptor, this will automatically create a dynamic scene*/
@@ -416,6 +430,9 @@
 	if (redirect_url && !strnicmp(redirect_url, "views://", 8)) {
 		gf_scene_generate_views(odm->subscene ? odm->subscene : odm->parentscene , (char *) redirect_url + 8, (char*)odm->parentscene ? odm->parentscene->root_od->net_service->url : NULL);
 	}
+	else if (redirect_url && !strnicmp(redirect_url, "mosaic://", 9)) {
+		gf_scene_generate_mosaic(odm->subscene ? odm->subscene : odm->parentscene , (char *) redirect_url + 9, (char*)odm->parentscene ? odm->parentscene->root_od->net_service->url : NULL);
+	}
 	/*it may happen that this object was inserted in a dynamic scene from a service through a URL redirect. In which case,
 	the scene regeneration might not have been completed since the redirection was not done yet - force a scene regenerate*/
 	else if (odm->parentscene && odm->parentscene->is_dynamic_scene) {
@@ -700,15 +717,32 @@
 	assert(odm->OD);
 	if (odm->OD->URLString) {
 		GF_ClientService *parent = odm->net_service;
-		char *url = odm->OD->URLString;
+		char *url;
 		char *parent_url = NULL;
-		odm->OD->URLString = NULL;
+		//remote OD not in our service, don't resolve
+		if (odm->OD->ServiceID && odm->parentscene->selected_service_id && (odm->parentscene->selected_service_id!=odm->OD->ServiceID)) {
+			assert(gf_list_find(odm->parentscene->resources, odm) >= 0);
+			odm->net_service->nb_odm_users++;
+			gf_term_lock_net(odm->term, GF_FALSE);
+			return;
+		}
+
 		/*store original OD ID */
 		if (!odm->media_current_time) odm->media_current_time = odm->OD->objectDescriptorID;
+		/*store original serviceID */
+		odm->ambi_ch_id = odm->OD->ServiceID;
 
-		gf_odf_desc_del((GF_Descriptor *)odm->OD);
-		odm->OD = NULL;
-		odm->net_service = NULL;
+		if (odm->OD->RedirectOnly) {
+			url = gf_strdup(odm->OD->URLString);
+			odm->net_service->nb_odm_users++;
+		} else {
+			url = odm->OD->URLString;
+			odm->OD->URLString = NULL;
+
+			gf_odf_desc_del((GF_Descriptor *)odm->OD);
+			odm->OD = NULL;
+			odm->net_service = NULL;
+		}
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Object redirection to %s (MO %08x)\n", url, odm->mo));
 
 		/*if object is a scene, create the inline before connecting the object.
@@ -722,6 +756,8 @@
 		parent_url = parent ? parent->url : NULL;
 		if (parent_url && !strnicmp(parent_url, "views://", 8))
 			parent_url = NULL;
+		else if (parent_url && !strnicmp(parent_url, "mosaic://", 9))
+			parent_url = NULL;
 
 		gf_term_post_connect_object(odm->term, odm, url, parent_url);
 		gf_free(url);
@@ -733,6 +769,11 @@
 		odm->OD->objectDescriptorID = odm->media_current_time;
 		odm->media_current_time = 0;
 		odm->flags |= GF_ODM_REMOTE_OD;
+		//restore serviceID
+		odm->OD->ServiceID = odm->ambi_ch_id;
+		odm->ambi_ch_id = 0;
+	} else if (!odm->OD->ServiceID) {
+		odm->OD->ServiceID = odm->net_service->serviceID;
 	}
 
 	/*HACK - temp storage of sync ref*/
@@ -942,6 +983,20 @@
 			gf_term_send_event(odm->term,&evt);
 			return;
 		}
+	} else if (odm->codec) {
+		GF_NetworkCommand com;
+		memset(&com, 0, sizeof(GF_NetworkCommand));
+		com.base.command_type = GF_NET_SERVICE_INFO;
+		com.info.on_channel = gf_list_get(odm->channels, 0);
+		gf_term_service_command(odm->net_service, &com);
+
+		if (com.info.role) {
+			if (!strncmp(com.info.role, "ambi", 4)) {
+				odm->ambi_ch_id = atoi(com.info.role + 4);
+				if (odm->ambi_ch_id > odm->parentscene->ambisonic_type)
+					odm->parentscene->ambisonic_type = odm->ambi_ch_id;
+			}
+		}
 	}
 
 	/*if object codec is prefered one, auto select*/
@@ -1045,7 +1100,7 @@
 	/*if OCR stream force self-synchro !!*/
 	if (esd->decoderConfig->streamType==GF_STREAM_OCR) clockID = esd->ESID;
 	if (!clockID) {
-		/*if no clock ID but depandancy, force the clock to be the base layer for AV but not systems (animation streams, ..)*/
+		/*if no clock ID but dependency, force the clock to be the base layer for AV but not systems (animation streams, ..)*/
 		if ((esd->decoderConfig->streamType==GF_STREAM_VISUAL) || (esd->decoderConfig->streamType==GF_STREAM_AUDIO)) clockID = esd->dependsOnESID;
 		if (!clockID) clockID = esd->ESID;
 	}
@@ -1559,7 +1614,7 @@
 	MediaControlStack *ctrl;
 #endif
 	GF_Clock *parent_ck = NULL;
-
+	
 	if (odm->codec && odm->codec->CB && !(odm->flags & GF_ODM_PREFETCH)) {
 		/*reset*/
 		gf_cm_set_status(odm->codec->CB, CB_STOP);
@@ -1679,7 +1734,7 @@
 #ifndef GPAC_DISABLE_VRML
 		ctrl = parent_ck ? parent_ck->mc : gf_odm_get_mediacontrol(odm);
 		/*override range and speed with MC*/
-		if (ctrl) {
+		if (ctrl && !odm->disable_buffer_at_next_play) {
 			//for addon, use current clock settings (media control is ignored)
 			if (!odm->parentscene || !odm->parentscene->root_od->addon) {
 				//this is fake timeshift, eg we are playing a VoD as a timeshift service: stop and start times have already been adjusted
@@ -1755,6 +1810,7 @@
 	}
 	if (nb_failure) {
 		odm->state = GF_ODM_STATE_BLOCKED;
+		odm->disable_buffer_at_next_play = GF_FALSE;
 		return;
 	}
 
@@ -1782,6 +1838,8 @@
 	if (odm->oci_codec) gf_term_start_codec(odm->oci_codec, 0);
 #endif
 
+	odm->disable_buffer_at_next_play = GF_FALSE;
+
 	if (odm->flags & GF_ODM_PAUSE_QUEUED) {
 		odm->flags &= ~GF_ODM_PAUSE_QUEUED;
 		media_control_paused = 1;
@@ -1909,8 +1967,8 @@
 			evt.channel = ch;
 			ch->ipmp_tool->process(ch->ipmp_tool, &evt);
 		}
-
-		if (ch->service) {
+		
+		if (ch->service &&  (odm->state != GF_ODM_STATE_STOP_NO_NET ) ) {
 			com.base.on_channel = ch;
 			gf_term_service_command(ch->service, &com);
 			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d %s] CH %d At OTB %u requesting STOP\n", odm->OD->objectDescriptorID, odm->net_service->url, ch->esd->ESID, gf_clock_time(ch->clock)));
@@ -1990,7 +2048,10 @@
 	} else {
 		if (nb_eos != count) return;
 	}
-
+	if (odm->addon && odm->addon->is_splicing)
+		odm->addon->is_over = 1;
+	if (odm->parentscene && odm->parentscene->root_od->addon && odm->parentscene->root_od->addon->is_splicing)
+		odm->parentscene->root_od->addon->is_over = 1;
 
 	gf_term_service_media_event(odm, GF_EVENT_MEDIA_LOAD_DONE);

gpac-0.7.1.tar.gz/src/terminal/scene.c -> gpac-0.8.0.tar.gz/src/terminal/scene.c Changed

@@ -121,6 +121,7 @@
 	SFURL_RESET(scene->dims_url);
 }
 
+GF_EXPORT
 void gf_scene_del(GF_Scene *scene)
 {
 	gf_mx_p(scene->root_od->term->net_mx);
@@ -491,6 +492,7 @@
 #ifndef GPAC_DISABLE_X3D
 					case TAG_X3D_Inline:
 #endif
+						if (obj->num_open) gf_mo_stop(obj);
 						gf_node_set_private(n, NULL);
 						break;
 					}
@@ -537,7 +539,7 @@
 		j=0;
 		while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &j))) {
 			if (max_buff_val < ch->MaxBuffer) max_buff_val = ch->MaxBuffer;
-			
+
 			/*count only re-buffering channels*/
 			if (!ch->BufferOn) continue;
 			if (ch->MaxBuffer) {
@@ -696,6 +698,7 @@
 	return GF_FALSE;
 }
 
+GF_EXPORT
 GF_MediaObject *gf_scene_get_media_object_ex(GF_Scene *scene, MFURL *url, u32 obj_type_hint, Bool lock_timelines, GF_MediaObject *sync_ref, Bool force_new_if_not_attached, GF_Node *node)
 {
 	GF_MediaObject *obj;
@@ -1251,16 +1254,16 @@
 	}
 }
 
-static GF_Node *load_vr_proto_node(GF_SceneGraph *sg, const char *def_name)
+static GF_Node *load_vr_proto_node(GF_SceneGraph *sg, const char *name, const char *def_name)
 {
 	GF_Proto *proto;
 	GF_Node *node;
-	char *name = "urn:inet:gpac:builtin:VRGeometry";
-	
-	proto = gf_sg_find_proto(sg, 0, name);
+	if (!name) name = "urn:inet:gpac:builtin:VRGeometry";
+
+	proto = gf_sg_find_proto(sg, 0, (char *) name);
 	if (!proto) {
 		MFURL *url;
-		proto = gf_sg_proto_new(sg, 0, name, GF_FALSE);
+		proto = gf_sg_proto_new(sg, 0, (char *) name, GF_FALSE);
 		url = gf_sg_proto_get_extern_url(proto);
 		if (url)
 			url->vals = gf_malloc(sizeof(SFURL));
@@ -1269,7 +1272,6 @@
 			return NULL;
 		}
 		url->count=1;
-		url->vals = gf_malloc(sizeof(SFURL));
 		url->vals[0].url = gf_strdup(name);
 	}
 	node = gf_sg_proto_create_instance(sg, proto);
@@ -1305,15 +1307,15 @@
 	((M_Appearance *)n2)->texture = (GF_Node *)mt;
 	gf_node_register((GF_Node *)mt, n2);
 
-	if (scene->is_srd) {
+	if (scene->srd_type) {
 		GF_Node *app = n2;
-		
+
 		if (scene->vr_type) {
-			n2 = load_vr_proto_node(scene->graph, name_geo);
+			n2 = load_vr_proto_node(scene->graph, NULL, name_geo);
 		} else {
 			n2 = is_create_node(scene->graph, TAG_MPEG4_Rectangle, name_geo);
 		}
-		
+
 		((M_Shape *)n1)->geometry = n2;
 		gf_node_register(n2, n1);
 		//force appearance material2D.filled = TRUE
@@ -1337,7 +1339,7 @@
 to update the OD ressources, we still take care of it*/
 void gf_scene_regenerate(GF_Scene *scene)
 {
-	GF_Node *n1, *n2;
+	GF_Node *n1, *n2, *root;
 	GF_Event evt;
 	M_AudioClip *ac;
 	M_MovieTexture *mt;
@@ -1352,16 +1354,17 @@
 
 	gf_sc_lock(scene->root_od->term->compositor, 1);
 
-	ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO");
+	ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1");
 
 	/*this is the first time, generate a scene graph*/
 	if (!ac) {
 		GF_Event evt;
-		
+
 		/*create an OrderedGroup*/
 		n1 = is_create_node(scene->graph, scene->vr_type ? TAG_MPEG4_Group : TAG_MPEG4_OrderedGroup, NULL);
 		gf_sg_set_root_node(scene->graph, n1);
 		gf_node_register(n1, NULL);
+		root = n1;
 
 		if (! scene->root_od->parentscene) {
 			n2 = is_create_node(scene->graph, TAG_MPEG4_Background2D, "DYN_BACK");
@@ -1403,7 +1406,7 @@
 		gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
 		gf_node_register(n2, n1);
 
-		ac = (M_AudioClip *) is_create_node(scene->graph, TAG_MPEG4_AudioClip, "DYN_AUDIO");
+		ac = (M_AudioClip *) is_create_node(scene->graph, TAG_MPEG4_AudioClip, "DYN_AUDIO1");
 		ac->startTime = gf_scene_get_time(scene);
 		((M_Sound2D *)n2)->source = (GF_Node *)ac;
 		gf_node_register((GF_Node *)ac, n2);
@@ -1457,7 +1460,13 @@
 			gf_node_list_add_child( &((GF_ParentNode *)addon_layer)->children, (GF_Node*)addon_scene);
 			gf_node_register((GF_Node *)addon_scene, (GF_Node *)addon_layer);
 		}
-		
+		//VR mode, add VR headup
+		else {
+			GF_Node *vrhud = load_vr_proto_node(scene->graph, "urn:inet:gpac:builtin:VRHUD", NULL);
+			gf_node_list_add_child( &((GF_ParentNode *)root)->children, (GF_Node*)vrhud);
+			gf_node_register(vrhud, root);
+		}
+
 
 		//send activation for sensors
 		memset(&evt, 0, sizeof(GF_Event));
@@ -1471,11 +1480,44 @@
 		}
 	}
 
+	if (scene->ambisonic_type) {
+		char szName[20];
+		SFURL url;
+		u32 i, count;
+		GF_Node *an, *root = gf_sg_get_root_node(scene->graph);
+		url.url = NULL;
+		url.OD_ID = 0;
 
-	ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO");
-	set_media_url(scene, &scene->audio_url, (GF_Node*)ac, &ac->url, GF_STREAM_AUDIO);
+		count = gf_list_count(scene->resources);
+		for (i=0; i<count; i++) {
+			GF_ObjectManager *odm = gf_list_get(scene->resources, i);
+			if (!odm->ambi_ch_id) continue;
+
+			sprintf(szName, "DYN_AUDIO%d", odm->ambi_ch_id);
+			an = gf_sg_find_node_by_name(scene->graph, szName);
+			if (!an) {
+				/*create an sound2D and an audioClip node*/
+				an = is_create_node(scene->graph, TAG_MPEG4_Sound2D, NULL);
+				gf_node_list_add_child( &((GF_ParentNode *)root)->children, an);
+				gf_node_register(an, root);
+
+				ac = (M_AudioClip *) is_create_node(scene->graph, TAG_MPEG4_AudioClip, szName);
+				ac->startTime = gf_scene_get_time(scene);
+				((M_Sound2D *)an)->source = (GF_Node *)ac;
+				gf_node_register((GF_Node *)ac, an);
+			}
+			ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, szName);
 
-	if (scene->is_srd) {
+			url.OD_ID = odm->OD->objectDescriptorID;
+			set_media_url(scene, &url, (GF_Node*)ac, &ac->url, GF_STREAM_AUDIO);
+		}
+	} else {
+		ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1");
+		set_media_url(scene, &scene->audio_url, (GF_Node*)ac, &ac->url, GF_STREAM_AUDIO);
+	}
+
+
+	if (scene->srd_type) {
 		char szName[20], szTex[20], szGeom[20];
 		u32 i, nb_srd = 0, srd_missing = 0;
 		GF_ObjectManager *a_odm;
@@ -1527,7 +1569,7 @@
 		scene->srd_min_y = min_y;
 		scene->srd_max_x = max_x;
 		scene->srd_max_y = max_y;
-		
+
 		url.url = NULL;
 		gf_sg_get_scene_size_info(scene->graph, &sw, &sh);
 		i=0;
@@ -1548,7 +1590,7 @@
 				if (!scene->dyn_ck && a_odm->codec) {
 					scene->dyn_ck = a_odm->codec->ck;
 				}
-				
+
 				if (scene->vr_type) {
 					n2 = gf_sg_find_node_by_name(scene->graph, szGeom);
 					gf_node_changed(n2, NULL);
@@ -1695,6 +1737,30 @@
 
 	gf_sc_lock(scene->root_od->term->compositor, 1);
 	if (scene->selected_service_id != service_id) {
+		u32 i;
+		GF_ObjectManager *odm, *remote_odm = NULL;
+		//delete all objects with given service ID
+		i=0;
+		while ((odm = gf_list_enum(scene->resources, &i))) {
+			if (odm->OD->ServiceID!=scene->selected_service_id) continue;
+			if (odm->OD->URLString) {
+				remote_odm = odm;
+				assert(remote_odm->net_service->nb_odm_users);
+				remote_odm->net_service->nb_odm_users--;
+				remote_odm->net_service = scene->root_od->net_service;
+				remote_odm->net_service->nb_odm_users++;
+			}
+			//delete all objects from this service
+			else if (remote_odm) {
+				gf_term_lock_media_queue(scene->root_od->term, 1);
+				if (odm->net_service==remote_odm->net_service) odm->net_service->owner = odm;
+				odm->action_type = GF_ODM_ACTION_DELETE;
+				gf_list_add(scene->root_od->term->media_queue, odm);
+				gf_term_lock_media_queue(scene->root_od->term, 0);
+			}
+		}
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Scene] Switching %s from service %d to service %d (media time %g)\n", scene->root_od->net_service->url, scene->selected_service_id, service_id, (Double)scene->root_od->media_start_time/1000.0));
+
 		scene->selected_service_id = service_id;
 		scene->audio_url.OD_ID = 0;
 		scene->visual_url.OD_ID = 0;
@@ -1706,7 +1772,20 @@
 			scene->root_od->media_start_time = gf_clock_media_time(scene->dyn_ck);
 			scene->dyn_ck = NULL;
 		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Scene] Switching %s from service %d to service %d (media time %g)\n", scene->root_od->net_service->url, scene->selected_service_id, service_id, (Double)scene->root_od->media_start_time/1000.0));
+		if (remote_odm) {
+			i=0;
+			while ((odm = gf_list_enum(scene->resources, &i))) {
+				if (odm->OD->ServiceID!=scene->selected_service_id) continue;
+				if (odm->OD->RedirectOnly) {
+					//gf_odm_setup_object will increment the number of odms in net service (it's supposed to
+					//be called only upon startup, but we reuse the function). Since we are already registered
+					//with the service, decrement before calling
+					odm->net_service->nb_odm_users--;
+					gf_odm_setup_object(odm, odm->net_service);
+				}
+				break;
+			}
+		}
 		gf_scene_regenerate(scene);
 	}
 	gf_sc_lock(scene->root_od->term->compositor, 0);
@@ -1729,7 +1808,7 @@
 
 
 	if (odm->state) {
-		if (check_odm_deactivate(&scene->audio_url, odm, gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO")) ) return;
+		if (check_odm_deactivate(&scene->audio_url, odm, gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1")) ) return;
 		if (check_odm_deactivate(&scene->visual_url, odm, gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1") )) return;
 		if (check_odm_deactivate(&scene->text_url, odm, gf_sg_find_node_by_name(scene->graph, "DYN_TEXT") )) return;
 	}
@@ -1738,6 +1817,9 @@
 	if (!odm->codec && odm->subscene) {
 		M_Inline *dscene = (M_Inline *) gf_sg_find_node_by_name(scene->graph, "ADDON_SCENE");
 
+		if (!dscene)
+			return;
+
 		if (odm->addon && odm->addon->addon_type==GF_ADDON_TYPE_MAIN) {
 			return;
 		}
@@ -1749,7 +1831,7 @@
 	}
 
 	if (odm->codec->type == GF_STREAM_AUDIO) {
-		M_AudioClip *ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO");
+		M_AudioClip *ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1");
 		if (!ac) return;
 		if (scene->audio_url.url) gf_free(scene->audio_url.url);
 		scene->audio_url.url = NULL;
@@ -1822,7 +1904,7 @@
 	scene->main_addon_selected = set_on;
 
 	if (set_on) {
-		odm_deactivate(gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO"));
+		odm_deactivate(gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1"));
 		odm_deactivate(gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1"));
 		odm_deactivate(gf_sg_find_node_by_name(scene->graph, "DYN_TEXT"));
 
@@ -1851,7 +1933,7 @@
 		scene->sys_clock_at_main_activation = 0;
 		scene->obj_clock_at_main_activation = 0;
 
-		odm_activate(&scene->audio_url, gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO"));
+		odm_activate(&scene->audio_url, gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1"));
 		odm_activate(&scene->visual_url, gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1"));
 		odm_activate(&scene->text_url, gf_sg_find_node_by_name(scene->graph, "DYN_TEXT"));
 
@@ -2042,7 +2124,7 @@
 
 	/*also check nodes since they may be deactivated (end of stream)*/
 	if (scene->is_dynamic_scene) {
-		M_AudioClip *ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO");
+		M_AudioClip *ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1");
 		M_MovieTexture *mt = (M_MovieTexture *) gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1");
 		M_AnimationStream *as = (M_AnimationStream *) gf_sg_find_node_by_name(scene->graph, "DYN_TEXT");
 		if (ac) {
@@ -2078,15 +2160,15 @@
 		width /= 2;
 		height /= 2;
 		/*if we already processed a force size in 360, don't do it again*/
-		if (scene->force_size_set) 
+		if (scene->force_size_set)
 			return;
 
 #ifndef GPAC_DISABLE_VRML
 		scene->force_size_set = GF_TRUE;
-		if (! scene->is_srd) {
+		if (! scene->srd_type) {
 			GF_Node *node = gf_sg_find_node_by_name(scene->graph, "DYN_GEOM1");
 			if (node && (((M_Sphere *)node)->radius == FIX_ONE)) {
-				u32 radius = MAX(width, height) / 2;
+				u32 radius = MAX(width, height)/4;
 
 				((M_Sphere *)node)->radius = - INT2FIX(radius);
 				gf_node_changed(node, NULL);
@@ -2103,7 +2185,7 @@
 			com.base.command_type = GF_NET_SERVICE_HAS_FORCED_VIDEO_SIZE;
 			gf_term_service_command(scene->root_od->net_service, &com);
 		}
-		
+
 		if (scene->root_od->term->root_scene == scene) {
 			if (com.par.width && com.par.height) {
 				gf_sc_set_scene_size(scene->root_od->term->compositor, width, height, 1);
@@ -2114,10 +2196,15 @@
 					gf_sc_set_size(scene->root_od->term->compositor, 0, 0);
 				}
 			} else {
-				/*need output resize*/
-				gf_sg_set_scene_size_info(scene->graph, width, height, 1);
-				gf_sc_set_scene(scene->root_od->term->compositor, scene->graph);
-				gf_sc_set_size(scene->root_od->term->compositor, width, height);
+				if (scene->vr_type) {
+					width = MAX(width, height) / 2;
+					gf_sg_set_scene_size_info(scene->graph, 0, 0, 1);
+				} else {
+					/*need output resize*/
+					gf_sg_set_scene_size_info(scene->graph, width, height, 1);
+					gf_sc_set_scene(scene->root_od->term->compositor, scene->graph);
+					gf_sc_set_size(scene->root_od->term->compositor, width, height);
+				}
 			}
 
 		} else if (!scene->force_size_set) {
@@ -2131,7 +2218,7 @@
 				gf_sg_set_scene_size_info(scene->graph, width, height, 1);
 			}
 			scene->force_size_set = 1;
-		} else {
+			} else {
 			u32 w, h;
 			gf_sg_get_scene_size_info(scene->graph, &w, &h);
 			if (!com.par.width && !com.par.height && ((w<width) || (h<height)) ) {
@@ -2169,7 +2256,7 @@
 	} else {
 		gf_sg_set_scene_size_info(scene->graph, width, height, GF_TRUE);
 	}
-	if (scene->is_srd)
+	if (scene->srd_type)
 		gf_scene_regenerate(scene);
 
 #ifndef GPAC_DISABLE_VRML
@@ -2460,10 +2547,10 @@
 
 	gf_sc_set_option(scene->root_od->term->compositor, GF_OPT_USE_OPENGL, 1);
 
-	gf_sg_set_scene_size_info(scene->graph, 0, 0, 1);
-	gf_sc_set_scene(scene->root_od->term->compositor, scene->graph);
-	scene->graph_attached = 1;
 	scene->is_dynamic_scene = 2;
+	gf_sg_set_scene_size_info(scene->graph, 0, 0, 1);
+
+	gf_scene_attach_to_compositor(scene);
 
 	evt.type = GF_EVENT_CONNECT;
 	evt.connect.is_connected = 1;
@@ -2471,13 +2558,118 @@
 #endif
 }
 
-void scene_reset_addon(GF_AddonMedia *addon, Bool disconnect)
+void gf_scene_generate_mosaic(GF_Scene *scene, char *url, char *parent_path)
 {
-	if (disconnect && addon->root_od) {
-		gf_odm_disconnect(addon->root_od, 1);
+#ifndef GPAC_DISABLE_VRML
+	char *url_search, *cur_url;
+	Bool use_old_syntax = 1;
+	GF_Node *n1;
+	M_Inline *inl;
+	Bool first_pass = GF_TRUE;
+	u32 nb_items=0, nb_rows=0, nb_cols=0;
+	s32 width=1920, height=1080, x, y, tw=0, th=0;
+
+	GF_Event evt;
+	gf_sc_node_destroy(scene->root_od->term->compositor, NULL, scene->graph);
+	gf_sg_reset(scene->graph);
+
+	scene->force_single_timeline = GF_FALSE;
+	n1 = is_create_node(scene->graph, TAG_MPEG4_OrderedGroup, NULL);
+	gf_sg_set_root_node(scene->graph, n1);
+	gf_node_register(n1, NULL);
+
+	if (strstr(url, "::")) use_old_syntax = 0;
+
+restart:
+	url_search = cur_url = url;
+	x = y = 0;
+	while (1) {
+		char *sep;
+
+		if (use_old_syntax) {
+			sep = strchr(url_search, ':');
+			/*if :// or :\ is found, skip it*/
+			if (sep && ( ((sep[1] == '/') && (sep[2] == '/')) || (sep[1] == '\\') ) ) {
+				url_search = sep+1;
+				continue;
+			}
+		} else {
+			sep = strstr(url_search, "::");
+		}
+		if (sep) sep[0] = 0;
+
+		if (first_pass) {
+			nb_items ++;
+		} else {
+			GF_Node *tr = is_create_node(scene->graph, TAG_MPEG4_Transform2D, NULL);
+			GF_Node *layer = is_create_node(scene->graph, TAG_MPEG4_Layer2D, NULL);
+			gf_node_register(tr, n1);
+			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, tr);
+
+			((M_Transform2D *)tr)->translation.x = (Fixed)(-width/2 + tw/2 + x*tw);
+			((M_Transform2D *)tr)->translation.y = (Fixed)(height/2 - th/2 - y*th);
+
+			x++;
+			if (x==nb_cols) {
+				y++;
+				x=0;
+			}
+
+			gf_node_register(layer, tr);
+			gf_node_list_add_child( &((M_Transform2D *)tr)->children, layer);
+			((M_Layer2D *)layer)->size.x = INT2FIX(tw);
+			((M_Layer2D *)layer)->size.y = INT2FIX(th);
+
+			inl = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, NULL);
+			gf_node_list_add_child( &((M_Layer2D *)layer)->children, (GF_Node *)inl);
+			gf_node_register((GF_Node*) inl, layer);
+
+			gf_sg_vrml_mf_reset(&inl->url, GF_SG_VRML_MFURL);
+			gf_sg_vrml_mf_append(&inl->url, GF_SG_VRML_MFURL, NULL);
+			inl->url.vals[0].url = gf_url_concatenate(parent_path, cur_url);
+		}
+
+		if (!sep) break;
+		sep[0] = ':';
+		if (use_old_syntax) {
+			cur_url = sep+1;
+		} else {
+			cur_url = sep+2;
+		}
+		url_search = cur_url;
+	}
+	if (first_pass) {
+		first_pass = GF_FALSE;
+		nb_cols=(u32) gf_ceil( gf_sqrt(nb_items) );
+		nb_rows=nb_items/nb_cols;
+		if (nb_cols * nb_rows < nb_items) nb_rows++;
+		tw = width/nb_cols;
+		th = height/nb_rows;
+		goto restart;
 	}
+
+	scene->is_dynamic_scene = 2;
+	gf_sg_set_scene_size_info(scene->graph, width, height, 1);
+
+	gf_scene_attach_to_compositor(scene);
+
+	evt.type = GF_EVENT_CONNECT;
+	evt.connect.is_connected = 1;
+	gf_term_send_event(scene->root_od->term, &evt);
+#endif
+}
+
+void gf_scene_reset_addon(GF_AddonMedia *addon, Bool disconnect)
+{
 	if (addon->root_od) {
+		GF_Terminal *term = addon->root_od->term;
+		gf_term_lock_net(term, GF_TRUE);
 		addon->root_od->addon = NULL;
+		if (disconnect) {				
+			gf_scene_remove_object(addon->root_od->parentscene, addon->root_od, 2);
+			gf_odm_disconnect(addon->root_od, 1);
+		}
+		gf_term_lock_net(term, GF_FALSE);
 	}
 
 	if (addon->url) gf_free(addon->url);
@@ -2490,7 +2682,7 @@
 		GF_AddonMedia *addon = gf_list_last(scene->declared_addons);
 		gf_list_rem_last(scene->declared_addons);
 
-		scene_reset_addon(addon, 0);
+		gf_scene_reset_addon(addon, GF_FALSE);
 	}
 }
 
@@ -2512,7 +2704,10 @@
 	//we force the timeline of the addon to be locked with the main scene
 	mo = gf_scene_get_media_object(scene, &url, GF_MEDIA_OBJECT_SCENE, GF_TRUE);
 
-	if (!mo || !mo->odm) return;
+	if (!mo || !mo->odm) {
+		assert(0);
+		return;
+	}
 
 	addon->root_od = mo->odm;
 	mo->odm->addon = addon;
@@ -2557,13 +2752,30 @@
 			if (addon_info->enable_if_defined)
 				addon->enabled = GF_TRUE;
 
+			//declaration of start time
+			if (addon->is_splicing && (addon->splice_start<0) && addon_info->is_splicing) {
+				addon->splice_in_pts = addon_info->splice_time_pts;
+
+				if (addon->splice_in_pts) {
+					addon->media_pts = (u64) (addon_info->splice_start_time);
+					addon->splice_start = addon_info->splice_start_time / 90;
+					addon->splice_end = addon_info->splice_end_time / 90;
+				} else {
+					addon->media_pts = (u64)(addon_info->splice_start_time * 90000);
+					addon->splice_start = addon_info->splice_start_time * 1000;
+					addon->splice_end = addon_info->splice_end_time * 1000;
+				}
+			}
+			
 			//restart addon
 			if (!addon->root_od && addon->timeline_ready && addon->enabled) {
 				load_associated_media(scene, addon);
 			}
 			//nothing associated, deactivate addon
-			if (!addon_info->external_URL) {
-				scene_reset_addon(addon, 1);
+			if (!addon_info->external_URL || !strlen(addon_info->external_URL) ) {
+				gf_list_rem(scene->declared_addons, i);
+				gf_scene_reset_addon(addon, GF_TRUE);
+				gf_scene_toggle_addons(scene, GF_FALSE);
 			} else if (strcmp(addon_info->external_URL, addon->url)) {
 				//reconfigure addon
 				gf_free(addon->url);
@@ -2572,9 +2784,10 @@
 			}
 			return;
 		}
+		addon = NULL;
 	}
 
-	if (!addon_info->external_URL) {
+	if (!addon_info->external_URL || !strlen(addon_info->external_URL) ) {
 		return;
 	}
 
@@ -2594,6 +2807,25 @@
 	addon->url = gf_strdup(addon_info->external_URL);
 	addon->media_timescale = 1;
 	addon->timeline_ready = (addon_info->timeline_id<0) ? 1 : 0;
+	addon->splice_in_pts = addon_info->splice_time_pts;
+	if (addon_info->is_splicing) {
+		addon->addon_type = GF_ADDON_TYPE_SPLICED;
+		scene->has_splicing_addons = GF_TRUE;
+
+		if (addon->splice_in_pts) {
+			addon->media_pts = (u64) (addon_info->splice_start_time);
+			addon->splice_start = addon_info->splice_start_time / 90;
+			addon->splice_end = addon_info->splice_end_time / 90;
+		} else {
+			addon->media_pts = (u64)(addon_info->splice_start_time * 90000);
+
+			addon->splice_start = addon_info->splice_start_time * 1000;
+			addon->splice_end = addon_info->splice_end_time * 1000;
+		}
+	} else {
+		addon->splice_start = addon_info->splice_start_time;
+		addon->splice_end = addon_info->splice_end_time;
+	}
 
 	if (!new_addon) return;
 
@@ -2640,7 +2872,7 @@
 		 //this is a splicing point, discard all previsously declared splicing addons
 		 || prev_addon->is_splicing
 		 ) {
-			scene_reset_addon(prev_addon, GF_TRUE);
+			gf_scene_reset_addon(prev_addon, GF_TRUE);
 			gf_list_rem(scene->declared_addons, i);
 			i--;
 			count--;
@@ -2753,6 +2985,10 @@
 	if (timestamp_based)
 		*timestamp_based = (addon->timeline_id>=0) ? 0 : 1;
 
+	if (addon->is_splicing) {
+		return ((Double)addon->media_timestamp) / addon->media_timescale;
+	}
+
 	//get PTS diff (clock is in ms, pt is in 90k)
 	media_time = clock_time;
 	media_time -= addon->media_pts/90000.0;
@@ -2766,6 +3002,13 @@
 {
 	s64 media_ts_ms;
 	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;
+			addon->min_dts_set = GF_TRUE;
+		}
+		orig_ts -= addon->splice_min_dts;
+	}
 	media_ts_ms = orig_ts;
 	media_ts_ms -= (addon->media_timestamp*1000) / addon->media_timescale;
 	media_ts_ms += (addon->media_pts/90);
@@ -2797,7 +3040,7 @@
 	if (!odm_base) return;
 
 	base_ch = gf_list_get(odm_base->channels, 0);
-	
+
 	switch (base_ch->esd->decoderConfig->objectTypeIndication) {
 	case GPAC_OTI_VIDEO_AVC:
 	case GPAC_OTI_VIDEO_SVC:
@@ -2826,7 +3069,7 @@
 	nalu_annex_b = 1;
 	if (base_ch->esd->decoderConfig->decoderSpecificInfo && base_ch->esd->decoderConfig->decoderSpecificInfo->dataLength)
 		nalu_annex_b = 0;
-	
+
 	if (0 && odm_base->codec->hybrid_layered_coded && ch->esd->decoderConfig->decoderSpecificInfo && ch->esd->decoderConfig->decoderSpecificInfo->dataLength) {
 		nalu_annex_b = 0;
 		if (force_attach) {
@@ -2854,8 +3097,15 @@
 
 	}
 
-	//signal to the base decoder that we will want full quality
 	caps.CapCode = GF_CODEC_MEDIA_SWITCH_QUALITY;
-	caps.cap.valueInt = 2;
+	// splicing, signal to the base decoder that we will want low quality and wait for splice activation
+	if (odm->parentscene->root_od->addon->is_splicing) {
+		caps.cap.valueInt = 0;
+	}
+	//not splicing, signal to the base decoder that we will want full quality right now
+	else {
+		caps.cap.valueInt = 2;
+	}
 	odm_base->codec->decio->SetCapabilities(odm_base->codec->decio, caps);
+
 }

gpac-0.7.1.tar.gz/src/terminal/svg_external.c -> gpac-0.8.0.tar.gz/src/terminal/svg_external.c Changed

gpac-0.7.1.tar.gz/src/terminal/terminal.c -> gpac-0.8.0.tar.gz/src/terminal/terminal.c Changed

@@ -88,6 +88,7 @@
 	}
 }
 
+GF_EXPORT
 void gf_term_message(GF_Terminal *term, const char *service, const char *message, GF_Err error)
 {
 	gf_term_message_ex(term, service, message, error, 0);
@@ -408,9 +409,6 @@
 #endif
 
 	gf_term_load_shortcuts(term);
-
-	/*reload compositor config*/
-	gf_sc_set_option(term->compositor, GF_OPT_RELOAD_CONFIG, 1);
 }
 
 static Bool gf_term_get_user_pass(void *usr_cbk, const char *site_url, char *usr_name, char *password)
@@ -582,6 +580,11 @@
 		gf_scene_generate_views(term->root_scene, (char *) URL+8, (char*)parent_path);
 		return;
 	}
+	else if (!strnicmp(URL, "mosaic://", 9)) {
+		odm->OD = (GF_ObjectDescriptor *)gf_odf_desc_new(GF_ODF_OD_TAG);
+		gf_scene_generate_mosaic(term->root_scene, (char *) URL+9, (char*)parent_path);
+		return;
+	}
 
 	/*connect - we don't have any parentID */
 	gf_term_connect_object(term, odm, (char *) URL, (char*)parent_path);
@@ -818,7 +821,7 @@
 	e = GF_IO_ERR;
 	timeout = 1000;
 	while (term->root_scene || gf_list_count(term->net_services) || gf_list_count(term->net_services_to_remove)) {
-		gf_sleep(30);
+		gf_sleep(10);
 		/*this shouldn't be needed but unfortunately there's a bug hanging around there...*/
 		timeout--;
 		if (!timeout) break;
@@ -827,8 +830,10 @@
 		assert(!gf_list_count(term->net_services));
 		assert(!gf_list_count(term->net_services_to_remove));
 		e = GF_OK;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] All network services deleted\n"));
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Couldn not unload all services in 10 seconds, will leak ...\n"));
 	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] All network services deleted\n"));
 
 	/*unload extensions*/
 	for (i=0; i< gf_list_count(term->extensions); i++) {
@@ -955,7 +960,7 @@
 		term->root_scene = NULL;
 	}
 	handle_services = 0;
-	if (term->flags & GF_TERM_NO_DECODER_THREAD)
+	if (term->flags & GF_TERM_NO_COMPOSITOR_THREAD)
 		handle_services = 1;
 	/*if an unthreaded term extension decides to disconnect the scene (validator does so), we must flush services now
 	because we are called from gf_term_handle_services*/
@@ -1010,6 +1015,8 @@
 		return GF_OK;
 	case GF_OPT_RELOAD_CONFIG:
 		gf_term_reload_cfg(term);
+		/*reload compositor config*/
+		gf_sc_set_option(term->compositor, GF_OPT_RELOAD_CONFIG, 1);
 		return GF_OK;
 	case GF_OPT_MEDIA_CACHE:
 		gf_term_set_cache_state(term, value);
@@ -1200,6 +1207,9 @@
 			gf_scene_mpeg4_inline_restart(odm->subscene);
 #endif
 			break;
+		case GF_ODM_ACTION_SETUP:
+			gf_odm_setup_task(odm);
+			break;
 		}
 
 		/*relock before sending play/pause*/
@@ -1220,6 +1230,8 @@
 		/*if object has already been attached to its service (eg, task was posted but media_add occured inbetween), ignore*/
 		if (!connect->odm->net_service && !(connect->odm->flags & GF_ODM_DESTROYED) ) {
 			gf_term_connect_object(term, connect->odm, connect->service_url, connect->parent_url);
+		} else if (connect->odm->OD && connect->odm->OD->RedirectOnly) {
+			gf_term_connect_object(term, connect->odm, connect->service_url, connect->parent_url);
 		}
 
 //		gf_mx_v(term->net_mx);
@@ -1367,6 +1379,7 @@
 	gf_term_lock_media_queue(term, 0);
 }
 
+GF_EXPORT
 void gf_term_lock_compositor(GF_Terminal *term, Bool LockIt)
 {
 	gf_sc_lock(term->compositor, LockIt);
@@ -1594,7 +1607,7 @@
 			continue;
 
 		/*if service has timeline locked to its parent scene, only reuse it if new object does as well*/
-		if (ns->owner->flags & GF_ODM_INHERIT_TIMELINE) {
+		if (ns->owner && ns->owner->flags & GF_ODM_INHERIT_TIMELINE) {
 			if (!(odm->flags & GF_ODM_INHERIT_TIMELINE)) continue;
 		}
 
@@ -1640,6 +1653,13 @@
 	if (net_locked)
 		gf_term_lock_net(term, 0);
 
+	if (odm->net_service) {
+		assert(odm->net_service->owner != odm);
+		assert(odm->OD);
+		assert(odm->OD->URLString);
+		assert(odm->net_service->nb_odm_users);
+		odm->net_service->nb_odm_users--;
+	}
 	odm->net_service = gf_term_service_new(term, odm, serviceURL, (odm->addon || reloc_result) ? NULL : parent_url, &e);
 	if (!odm->net_service) {
 		gf_term_message(term, serviceURL, "Cannot open service", e);
@@ -1930,7 +1950,55 @@
 			gf_scene_register_associated_media(term->root_scene, &addon_info);
 			return GF_OK;
 		}
-		//new add-on
+		//new splicing add-on
+		if (term->root_scene && !strncmp(com, "splice ", 7)) {
+			char *sep;
+			Double start, end;
+			Bool is_pts = GF_FALSE;
+			GF_AssociatedContentLocation addon_info;
+			memset(&addon_info, 0, sizeof(GF_AssociatedContentLocation));
+			com += 7;
+			if (!strnicmp(com, "pts ", 4)) {
+				is_pts = GF_TRUE;
+				com += 4;
+			}
+			sep = strchr(com, ':');
+			start = 0;
+			end = -1;
+			if (sep) {
+				sep[0]=0;
+				if (sscanf(com, "%lf-%lf", &start, &end) != 2) {
+					end = -1;
+					sscanf(com, "%lf", &start);
+				}
+				sep[0]=':';
+				addon_info.external_URL = sep+1;
+			}
+			//splice end, locate first splice with no end set and set it
+			else if (sscanf(com, "%lf", &end)==1) {
+				u32 count = gf_list_count(term->root_scene->declared_addons);
+				for (i=0; i<count; i++) {
+					GF_AddonMedia *addon = gf_list_get(term->root_scene->declared_addons, i);
+					if (addon->is_splicing && (addon->splice_end<0) ) {
+						addon->splice_end = end;
+						break;
+					}
+				}
+				return GF_OK;
+			} else {
+				//splice now, until end of spliced media
+				addon_info.external_URL = com;
+			}
+			addon_info.is_splicing = GF_TRUE;
+			addon_info.timeline_id = -100;
+			addon_info.splice_start_time = start;
+			addon_info.splice_end_time = end;
+			addon_info.splice_end_time = end;
+			addon_info.splice_time_pts = is_pts;
+			gf_scene_register_associated_media(term->root_scene, &addon_info);
+			return GF_OK;
+		}
+		//select object
 		if (term->root_scene && !strncmp(com, "select ", 7)) {
 			u32 idx = atoi(com+7);
 			gf_term_select_object(term, gf_list_get(term->root_scene->resources, idx));

gpac-0.7.1.tar.gz/src/utils/alloc.c -> gpac-0.8.0.tar.gz/src/utils/alloc.c Changed

@@ -211,6 +211,8 @@
 #ifdef WIN32
 #define SYMBOL_MAX_SIZE 50
 #include <windows.h>
+/* on visual studio 2015 windows sdk 8.1 dbghelp has a typedef enum with no name that throws a warning */
+#pragma warning(disable: 4091)
 #include <dbghelp.h>
 #pragma comment(lib, "dbghelp.lib")
 /*memory ownership to the caller*/
@@ -242,7 +244,7 @@
 			gf_memory_log(GF_MEMORY_WARNING, "[MemoryInfo] Not enough space to hold backtrace - truncating\n");
 			break;
 		}
-		
+
 		len = _snprintf(s_backtrace+bt_idx, SYMBOL_MAX_SIZE-1, "\t%02u 0x%I64X %s", (unsigned int) (frames-i-1), symbol->Address, symbol_name);
 		if (len<0) len = SYMBOL_MAX_SIZE-1;
 		s_backtrace[bt_idx+len]='\n';
@@ -275,12 +277,12 @@
 			gf_memory_log(GF_MEMORY_WARNING, "[MemoryInfo] Not enough space to hold backtrace - truncating\n");
 			break;
 		}
-		
+
 		len = snprintf(s_backtrace+bt_idx, SYMBOL_MAX_SIZE-1, "\t%02zu %s", i, messages[i]);
 		if (len<0) len = SYMBOL_MAX_SIZE-1;
 		s_backtrace[bt_idx+len]='\n';
 		bt_idx += (len+1);
-		
+
 	}
 	assert(bt_idx < STACK_PRINT_SIZE*SYMBOL_MAX_SIZE);
 	s_backtrace[bt_idx-1] = '\0';
@@ -501,7 +503,7 @@
 	element->ptr = ptr;
 	element->size = size;
 	element->line = line;
-	
+
 #ifndef GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE
 if (gf_mem_backtrace_enabled) {
 element->backtrace_stack = MALLOC(sizeof(char) * STACK_PRINT_SIZE * SYMBOL_MAX_SIZE);
@@ -704,7 +706,6 @@
 }
 
 
-#if 1
 Bool gf_check_address(void *ptr)
 {
 	Bool res = GF_TRUE;
@@ -732,7 +733,6 @@
 	gf_mx_v(gpac_allocations_lock);
 	return res;
 }
-#endif
 
 /*returns the size of the unregistered block*/
 static int unregister_address(void *ptr, const char *filename, int line)
@@ -815,7 +815,7 @@
 	char msg[1024];
 	assert(strlen(fmt) < 200);
 	va_start(vl, fmt);
-	vsprintf(msg, fmt, vl);
+	vsnprintf(msg, 1024, fmt, vl);
 	GF_LOG(level, GF_LOG_MEMORY, (msg));
 	va_end(vl);
 }
@@ -917,6 +917,7 @@
 }
 #endif
 
+GF_EXPORT
 int gf_asprintf(char **strp, const char *fmt, ...)
 {
 	s32 size;

gpac-0.7.1.tar.gz/src/utils/base_encoding.c -> gpac-0.8.0.tar.gz/src/utils/base_encoding.c Changed

@@ -235,10 +235,16 @@
 	z_stream d_stream;
 	GF_Err e = GF_OK;
 	int err;
+	Bool owns_buffer=GF_TRUE;
 	u32 size = 4096;
 
-	*uncompressed_data = (char*)gf_malloc(sizeof(char)*4096);
-	if (!*uncompressed_data) return GF_OUT_OF_MEM;
+	if (! *uncompressed_data) {
+		*uncompressed_data = (char*)gf_malloc(sizeof(char)*4096);
+		if (!*uncompressed_data) return GF_OUT_OF_MEM;
+	} else {
+		owns_buffer = GF_FALSE;
+		size = *out_size;
+	}
 
 	d_stream.zalloc = (alloc_func)0;
 	d_stream.zfree = (free_func)0;
@@ -246,9 +252,11 @@
 	d_stream.next_in = (Bytef*)data;
 	d_stream.avail_in = data_len;
 	d_stream.next_out = (Bytef*) *uncompressed_data;
-	d_stream.avail_out = 4096;
+	d_stream.avail_out = size;
+
+//	err = inflateInit(&d_stream);
+	err = inflateInit2(&d_stream, 16+MAX_WBITS);
 
-	err = inflateInit(&d_stream);
 	if (err == Z_OK) {
 		while (d_stream.total_in < data_len) {
 			err = inflate(&d_stream, Z_NO_FLUSH);
@@ -269,12 +277,155 @@
 		return e;
 	}
 	if (e!=GF_OK) {
-		gf_free(*uncompressed_data);
-		*uncompressed_data = NULL;
+		if (owns_buffer) {
+			gf_free(*uncompressed_data);
+			*uncompressed_data = NULL;
+		}
 	}
 	return e;
 }
-
+#else
+GF_EXPORT
+GF_Err gf_gz_decompress_payload(char *data, u32 data_len, char **uncompressed_data, u32 *out_size)
+{
+	*out_size = 0;
+	return GF_NOT_SUPPORTED;
+}
+GF_EXPORT
+GF_Err gf_gz_compress_payload(char **data, u32 data_len, u32 *max_size)
+{
+	*max_size = 0;
+	return GF_NOT_SUPPORTED;
+}
 #endif /*GPAC_DISABLE_ZLIB*/
 
+
+#ifdef GPAC_HAS_LZMA
+
+#include <lzma.h>
+
+#define LZMA_COMPRESS_SAFE	2
+
+GF_EXPORT
+GF_Err gf_lz_compress_payload(char **data, u32 data_len, u32 *max_size)
+{
+	u32 block_size, comp_size;
+	lzma_options_lzma opt_lzma2;
+	lzma_stream strm = LZMA_STREAM_INIT;
+
+	lzma_lzma_preset(&opt_lzma2, LZMA_PRESET_DEFAULT);
+	lzma_filter filters[] = {
+			{ .id = LZMA_FILTER_X86, .options = NULL },
+			{ .id = LZMA_FILTER_LZMA2, .options = &opt_lzma2 },
+			{ .id = LZMA_VLI_UNKNOWN, .options = NULL },
+	};
+	lzma_ret ret = lzma_stream_encoder(&strm, filters, LZMA_CHECK_NONE);
+	if (ret != LZMA_OK) return GF_IO_ERR;
+
+	block_size = data_len*LZMA_COMPRESS_SAFE;
+	if (block_size < 64) block_size = 64;
+	char *dest = (char *)gf_malloc(sizeof(char)*block_size);
+
+
+	strm.next_in = (const uint8_t *) (*data);
+	strm.avail_in = data_len;
+	strm.next_out = (uint8_t *) dest;
+	strm.avail_out = block_size;
+
+	ret = lzma_code(&strm, LZMA_FINISH);
+	if ((ret != LZMA_OK) && (ret != LZMA_STREAM_END)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[LZMA] compressed data failure, code %d\n", ret ));
+		return GF_IO_ERR;
+	}
+	comp_size = block_size - strm.avail_out;
+
+	if (data_len < comp_size) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[LZMA] compressed data (%d) larger than input (%d)\n", (u32) comp_size, (u32) data_len ));
+	}
+
+	if (*max_size < comp_size) {
+		*max_size = block_size;
+		*data = (char*)gf_realloc(*data, block_size * sizeof(char));
+	}
+
+	memcpy((*data) , dest, sizeof(char) * comp_size);
+	*max_size = (u32) comp_size;
+	gf_free(dest);
+
+	lzma_end(&strm);
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_lz_decompress_payload(char *data, u32 data_len, char **uncompressed_data, u32 *out_size)
+{
+	lzma_stream strm = LZMA_STREAM_INIT;
+	lzma_ret ret = lzma_stream_decoder(&strm, UINT64_MAX, 0);
+	if (ret != LZMA_OK) return GF_IO_ERR;
+
+	Bool owns_buffer=GF_TRUE;
+	u32 block_size = 4096;
+	u32 done = 0;
+	u32 alloc_size = 0;
+	u8 block[4096];
+	u8 *dst_buffer = NULL;
+
+	if (*uncompressed_data) {
+		owns_buffer = GF_FALSE;
+		dst_buffer = (u8 *) *uncompressed_data;
+		alloc_size = *out_size;
+	} else {
+		*out_size = 0;
+	}
+
+	strm.next_in = (const uint8_t *) data;
+	strm.avail_in = data_len;
+	strm.next_out = (uint8_t *) block;
+	strm.avail_out = block_size;
+
+	while (1) {
+		lzma_ret ret = lzma_code(&strm, LZMA_FINISH);
+
+		if ((strm.avail_out == 0) || (ret == LZMA_STREAM_END)) {
+			u32 uncomp_size = block_size - strm.avail_out;
+
+			if (done + uncomp_size > alloc_size) {
+				alloc_size = done + uncomp_size;
+				dst_buffer = gf_realloc(dst_buffer, alloc_size);
+				*out_size = alloc_size;
+			}
+			memcpy(dst_buffer + done, block, uncomp_size);
+			done += uncomp_size;
+
+			strm.next_out = (uint8_t *) block;
+			strm.avail_out = block_size;
+		}
+		if (ret == LZMA_STREAM_END) break;
+		if (ret != LZMA_OK) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[LZMA] error decompressing data: %d\n", ret ));
+			if (owns_buffer) gf_free(dst_buffer);
+			return GF_IO_ERR;
+		}
+	}
+
+	*uncompressed_data = (char *) dst_buffer;
+	*out_size = done;
+	return GF_OK;
+}
+#else
+GF_EXPORT
+GF_Err gf_lz_decompress_payload(char *data, u32 data_len, char **uncompressed_data, u32 *out_size)
+{
+	*out_size = 0;
+	return GF_NOT_SUPPORTED;
+}
+GF_EXPORT
+GF_Err gf_lz_compress_payload(char **data, u32 data_len, u32 *max_size)
+{
+	*max_size = 0;
+	return GF_NOT_SUPPORTED;
+}
+
+#endif /*GPAC_HAS_LZMA*/
+
 #endif /* GPAC_DISABLE_CORE_TOOLS*/

gpac-0.7.1.tar.gz/src/utils/bitstream.c -> gpac-0.8.0.tar.gz/src/utils/bitstream.c Changed

@@ -61,8 +61,50 @@
 
 	char *buffer_io;
 	u32 buffer_io_size, buffer_written;
+
+	u64 cookie;
 };
 
+GF_Err gf_bs_reassign_buffer(GF_BitStream *bs, const char *buffer, u64 BufferSize)
+{
+	if (!bs) return GF_BAD_PARAM;
+	if (bs->bsmode == GF_BITSTREAM_READ) {
+		bs->original = (char*)buffer;
+		bs->size = BufferSize;
+		bs->position = 0;
+		bs->current = 0;
+		bs->nbBits = 8;
+		bs->current = 0;
+		return GF_OK;
+	}
+	if (bs->bsmode==GF_BITSTREAM_WRITE) {
+		if (!buffer || !BufferSize) return GF_BAD_PARAM;
+		bs->original = (char*)buffer;
+		bs->size = BufferSize;
+		bs->position = 0;
+		bs->current = 0;
+		bs->nbBits = 0;
+		bs->current = 0;
+		return GF_OK;
+	}
+	if (bs->bsmode!=GF_BITSTREAM_WRITE_DYN) return GF_BAD_PARAM;
+	if (bs->original) return GF_BAD_PARAM;
+
+	bs->position = 0;
+	bs->current = 0;
+	bs->nbBits = 0;
+	bs->current = 0;
+	bs->size = BufferSize ? BufferSize : BS_MEM_BLOCK_ALLOC_SIZE;
+	if (buffer) {
+		bs->original = (char *) buffer;
+	} else {
+		bs->original = (char *) gf_malloc(sizeof(char) * ((u32) bs->size));
+		if (! bs->original) {
+			return GF_OUT_OF_MEM;
+		}
+	}
+	return GF_OK;
+}
 
 GF_EXPORT
 GF_BitStream *gf_bs_new(const char *buffer, u64 BufferSize, u32 mode)
@@ -186,9 +228,8 @@
 	gf_free(bs);
 }
 
-
 /*returns 1 if aligned wrt current mode, 0 otherwise*/
-static Bool BS_IsAlign(GF_BitStream *bs)
+Bool gf_bs_is_align(GF_BitStream *bs)
 {
 	switch (bs->bsmode) {
 	case GF_BITSTREAM_READ:
@@ -204,23 +245,28 @@
 static u8 BS_ReadByte(GF_BitStream *bs)
 {
 	if (bs->bsmode == GF_BITSTREAM_READ) {
+		u8 res;
 		if (bs->position >= bs->size) {
 			if (bs->EndOfStream) bs->EndOfStream(bs->par);
 			return 0;
 		}
-		return (u32) bs->original[bs->position++];
+		res = bs->original[bs->position++];
+		return res;
 	}
 	if (bs->buffer_io)
 		bs_flush_cache(bs);
 
 	/*we are in FILE mode, test for end of file*/
 	if (!feof(bs->stream)) {
+		u8 res;
 		assert(bs->position<=bs->size);
 		bs->position++;
-		return (u32) fgetc(bs->stream);
+		res = fgetc(bs->stream);
+		return res;
 	}
-	if (bs->EndOfStream) bs->EndOfStream(bs->par);
-	else {
+	if (bs->EndOfStream) {
+		bs->EndOfStream(bs->par);
+	} else {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[BS] Attempt to overread bitstream\n"));
 	}
 	assert(bs->position <= 1+bs->size);
@@ -406,7 +452,7 @@
 
 	if (bs->position+nbBytes > bs->size) return 0;
 
-	if (BS_IsAlign(bs)) {
+	if (gf_bs_is_align(bs)) {
 		s32 bytes_read;
 		switch (bs->bsmode) {
 		case GF_BITSTREAM_READ:
@@ -440,9 +486,14 @@
 static void BS_WriteByte(GF_BitStream *bs, u8 val)
 {
 	/*we don't allow write on READ buffers*/
-	if ( (bs->bsmode == GF_BITSTREAM_READ) || (bs->bsmode == GF_BITSTREAM_FILE_READ) ) return;
-	if (!bs->original && !bs->stream) return;
-
+	if ( (bs->bsmode == GF_BITSTREAM_READ) || (bs->bsmode == GF_BITSTREAM_FILE_READ) ) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[BS] Attempt to write on read bitstream\n"));
+		return;
+	}
+	if (!bs->original && !bs->stream) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[BS] Attempt to write on unassigned bitstream\n"));
+		return;
+	}
 	/*we are in MEM mode*/
 	if ( (bs->bsmode == GF_BITSTREAM_WRITE) || (bs->bsmode == GF_BITSTREAM_WRITE_DYN) ) {
 		if (bs->position == bs->size) {
@@ -450,9 +501,9 @@
 			if (bs->bsmode != GF_BITSTREAM_WRITE_DYN) return;
 			/*gf_realloc if enough space...*/
 			if (bs->size > 0xFFFFFFFF) return;
-			bs->original = (char*)gf_realloc(bs->original, (u32) (bs->size * 2));
-			if (!bs->original) return;
-			bs->size *= 2;
+			bs->size = bs->size ? (bs->size * 2) : BS_MEM_BLOCK_ALLOC_SIZE;
+			bs->original = (char*)gf_realloc(bs->original, (u32)bs->size);
+			if (!bs->original) return;	
 		}
 		if (bs->original)
 			bs->original[bs->position] = val;
@@ -489,25 +540,37 @@
 }
 
 GF_EXPORT
-void gf_bs_write_int(GF_BitStream *bs, s32 value, s32 nBits)
+void gf_bs_write_int(GF_BitStream *bs, s32 _value, s32 nBits)
 {
-	value <<= sizeof (s32) * 8 - nBits;
+	u32 value, nb_shift;
+	if (!nBits) return;
+	//move to unsigned to avoid sanitizer warnings when we pass a value not codable on the given number of bits
+	//we do this when setting bit fileds to all 1's
+	value = (u32) _value;
+	nb_shift = sizeof (s32) * 8 - nBits;
+	if (nb_shift)
+		value <<= nb_shift;
+
 	while (--nBits >= 0) {
-		BS_WriteBit (bs, value < 0);
+		//but check value as signed
+		BS_WriteBit (bs, ((s32)value) < 0);
 		value <<= 1;
 	}
 }
 
 GF_EXPORT
-void gf_bs_write_long_int(GF_BitStream *bs, s64 value, s32 nBits)
+void gf_bs_write_long_int(GF_BitStream *bs, s64 _value, s32 nBits)
 {
+	if (!nBits) return;
 	if (nBits>64) {
 		gf_bs_write_int(bs, 0, nBits-64);
-		gf_bs_write_long_int(bs, value, 64);
+		gf_bs_write_long_int(bs, _value, 64);
 	} else {
+		//cf note in gf_bs_write_int
+		u64 value = (u64) _value;
 		value <<= sizeof (s64) * 8 - nBits;
 		while (--nBits >= 0) {
-			BS_WriteBit (bs, value < 0);
+			BS_WriteBit (bs, ((s64)value) < 0);
 			value <<= 1;
 		}
 	}
@@ -558,7 +621,7 @@
 GF_EXPORT
 u32 gf_bs_write_byte(GF_BitStream *bs, u8 byte, u32 repeat_count)
 {
-	if (!BS_IsAlign(bs) || bs->buffer_io) {
+	if (!gf_bs_is_align(bs) || bs->buffer_io) {
 		u32 count = 0;
 		while (count<repeat_count) {
 			gf_bs_write_int(bs, byte, 8);
@@ -643,7 +706,7 @@
 	u64 begin = bs->position;
 	if (!nbBytes) return 0;
 
-	if (BS_IsAlign(bs)) {
+	if (gf_bs_is_align(bs)) {
 		switch (bs->bsmode) {
 		case GF_BITSTREAM_WRITE:
 			if (bs->position+nbBytes > bs->size)
@@ -776,9 +839,9 @@
 	return nbBytes;
 }
 
-/*For DYN mode, this gets the content out*/
+/*For DYN mode, this gets the content out without cutting the buffer to the number of written bytes*/
 GF_EXPORT
-void gf_bs_get_content(GF_BitStream *bs, char **output, u32 *outSize)
+void gf_bs_get_content_no_truncate(GF_BitStream *bs, char **output, u32 *outSize, u32 *alloc_size)
 {
 	/*only in WRITE MEM mode*/
 	if (bs->bsmode != GF_BITSTREAM_WRITE_DYN) return;
@@ -787,18 +850,33 @@
 		*outSize = 0;
 		gf_free(bs->original);
 	} else {
-		s32 copy = BS_CutBuffer(bs);
-		if (copy < 0) {
-			*output = NULL;
-		} else
+		if (alloc_size) {
+			/*Align our buffer or we're dead!*/
+			gf_bs_align(bs);
+			*alloc_size = (u32) bs->size;
+			*outSize = (u32) bs->position;
 			*output = bs->original;
-		*outSize = (u32) bs->size;
+		} else {
+			s32 copy = BS_CutBuffer(bs);
+			if (copy < 0) {
+				*output = NULL;
+			} else
+				*output = bs->original;
+			*outSize = (u32) bs->size;
+		}
 	}
 	bs->original = NULL;
 	bs->size = 0;
 	bs->position = 0;
 }
 
+/*For DYN mode, this gets the content out*/
+GF_EXPORT
+void gf_bs_get_content(GF_BitStream *bs, char **output, u32 *outSize)
+{
+	gf_bs_get_content_no_truncate(bs, output, outSize, NULL);
+}
+
 /*	Skip nbytes.
 	Align
 	If READ (MEM or FILE) mode, just read n times 8 bit
@@ -859,7 +937,14 @@
 		if (!bs->original) return GF_BAD_PARAM;
 		/*0 for write, read will be done automatically*/
 		if (offset >= bs->size) {
-			if ( (bs->bsmode == GF_BITSTREAM_READ) || (bs->bsmode == GF_BITSTREAM_WRITE) ) return GF_BAD_PARAM;
+			if ( (bs->bsmode == GF_BITSTREAM_READ) || (bs->bsmode == GF_BITSTREAM_WRITE) ) {
+				if (offset > bs->size) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[BS] Attempt to seek to %d after end of bitstream %d, assuming seek to end\n", offset, bs->size));
+				}
+				bs->position = bs->size;
+				bs->nbBits = (bs->bsmode == GF_BITSTREAM_READ) ? 8 : 0;
+				return GF_OK;
+			}
 			/*in DYN, gf_realloc ...*/
 			bs->original = (char*)gf_realloc(bs->original, (u32) (offset + 1));
 			if (!bs->original)
@@ -978,6 +1063,14 @@
 
 
 GF_EXPORT
+u64 gf_bs_read_u64_le(GF_BitStream *bs)
+{
+	u32 low = gf_bs_read_u32_le(bs);
+	u64 high = gf_bs_read_u32_le(bs);
+	return (high << 32) + low;
+}
+
+GF_EXPORT
 u32 gf_bs_read_u32_le(GF_BitStream *bs)
 {
 	u32 ret, v;
@@ -1048,7 +1141,6 @@
 void gf_bs_truncate(GF_BitStream *bs)
 {
 	bs->size = bs->position;
-	if (bs->stream) return;
 }
 
 
@@ -1063,11 +1155,11 @@
 	gf_bs_get_content(src, &data, &data_len);
 	if (!data || !data_len)
 	{
-		if (data) {
-			gf_free(data);
-			return GF_IO_ERR;
-		}
-		return GF_OK;
+			if (data) {
+					gf_free(data);
+					return GF_IO_ERR;
+			}
+			return GF_OK;
 	}
 	written = gf_bs_write_data(dst, data, data_len);
 	gf_free(data);
@@ -1099,3 +1191,19 @@
 		break;
 	}
 }
+
+u64 gf_bs_set_cookie(GF_BitStream *bs, u64 cookie)
+{
+	u64 res = 0;
+	if (bs) {
+		res = bs->cookie;
+		bs->cookie = cookie;
+	}
+	return res;
+}
+
+u64 gf_bs_get_cookie(GF_BitStream *bs)
+{
+	if (!bs) return 0;
+	return bs->cookie;
+}

gpac-0.7.1.tar.gz/src/utils/cache.c -> gpac-0.8.0.tar.gz/src/utils/cache.c Changed

@@ -164,6 +164,8 @@
 	Bool memory_stored;
 	u32 mem_allocated;
 	u8 *mem_storage;
+	char *forced_headers;
+	u32 downtime;
 };
 
 Bool delete_cache_files(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info) {
@@ -183,6 +185,21 @@
 
 static const char * cache_file_prefix = "gpac_cache_";
 
+Bool gather_cache_size(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
+{
+	u64 *out_size = (u64 *)cbck;
+	if (!strncmp(cache_file_prefix, item_name, strlen(cache_file_prefix))) {
+		*out_size += file_info->size;
+	}
+	return 0;
+}
+
+u64 gf_cache_get_size(const char * directory) {
+	u64 size = 0;
+	gf_enum_directory(directory, GF_FALSE, gather_cache_size, (void*)&size, NULL);
+	return size;
+}
+
 GF_Err gf_cache_delete_all_cached_files(const char * directory) {
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("Deleting cached files in %s...\n", directory));
 	return gf_enum_directory( directory, GF_FALSE, delete_cache_files, (void*)cache_file_prefix, NULL);
@@ -216,6 +233,7 @@
 	return entry ? entry->serverETag : NULL;
 }
 
+GF_EXPORT
 const char * gf_cache_get_mime_type ( const DownloadedCacheEntry entry )
 {
 	return entry ? entry->mimeType : NULL;
@@ -236,6 +254,7 @@
 }
 
 
+GF_EXPORT
 GF_Err gf_cache_set_etag_on_server(const DownloadedCacheEntry entry, const char * eTag ) {
 	if (!entry)
 		return GF_BAD_PARAM;
@@ -254,6 +273,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_cache_set_mime_type(const DownloadedCacheEntry entry, const char * mime_type ) {
 	if (!entry)
 		return GF_BAD_PARAM;
@@ -279,6 +299,7 @@
 	return entry ? entry->range_end : 0;
 }
 
+GF_EXPORT
 const char * gf_cache_get_url ( const DownloadedCacheEntry entry )
 {
 	return entry ? entry->url : NULL;
@@ -299,6 +320,7 @@
 	return entry ? entry->diskLastModified : NULL;
 }
 
+GF_EXPORT
 GF_Err gf_cache_set_last_modified_on_server ( const DownloadedCacheEntry entry, const char * newLastModified )
 {
 	if (!entry)
@@ -351,6 +373,7 @@
 	return entry ? entry->cacheSize : -1;
 }
 
+GF_EXPORT
 const char * gf_cache_get_cache_filename( const DownloadedCacheEntry entry )
 {
 	return entry ? entry->cache_filename : NULL;
@@ -383,6 +406,7 @@
 static const char * default_cache_file_suffix = ".dat";
 static const char * cache_file_info_suffix = ".txt";
 
+GF_EXPORT
 DownloadedCacheEntry gf_cache_create_entry ( GF_DownloadManager * dm, const char * cache_directory, const char * url , u64 start_range, u64 end_range, Bool mem_storage)
 {
 	char tmp[_CACHE_TMP_SIZE];
@@ -426,7 +450,7 @@
 	GF_SAFEALLOC(entry, struct __DownloadedCacheEntryStruct);
 
 	if ( !entry ) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("gf_cache_create_entry:%d : OUT of memory !\n", __LINE__));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("gf_cache_create_entry:%d : out of memory !\n", __LINE__));
 		return NULL;
 	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, entry=%p\n", __LINE__, entry));
@@ -517,7 +541,7 @@
 	if ( !entry->properties )
 	{
 		GF_Err err;
-		/* OUT of memory ? */
+		/* out of memory ? */
 		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, aborting due to OUT of MEMORY !\n", __LINE__));
 		err = gf_cache_delete_entry ( entry );
 		if ( err != GF_OK ) {
@@ -549,6 +573,7 @@
 	return entry;
 }
 
+GF_EXPORT
 GF_Err gf_cache_set_content_length( const DownloadedCacheEntry entry, u32 length )
 {
 	CHECK_ENTRY;
@@ -620,6 +645,7 @@
 	return e;
 }
 
+GF_EXPORT
 GF_Err gf_cache_open_write_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess )
 {
 	CHECK_ENTRY;
@@ -823,9 +849,12 @@
 		gf_free ( entry->mimeType );
 		entry->mimeType = NULL;
 	}
-	if (entry->mem_storage) {
+	if (entry->mem_storage && entry->mem_allocated) {
 		gf_free(entry->mem_storage);
 	}
+	if ( entry->forced_headers ) {
+		gf_free ( entry->forced_headers );
+	}
 
 	if ( entry->cache_filename ) {
 		gf_free ( entry->cache_filename );
@@ -960,4 +989,73 @@
 	return GF_FALSE;
 }
 
+Bool gf_cache_set_mime(const DownloadedCacheEntry entry, const char *mime)
+{
+	if (!entry || !entry->memory_stored) return GF_FALSE;
+	if (entry->mimeType) gf_free(entry->mimeType);
+	entry->mimeType = gf_strdup(mime);
+	return GF_TRUE;
+}
+
+Bool gf_cache_set_range(const DownloadedCacheEntry entry, u64 size, u64 start_range, u64 end_range)
+{
+	if (!entry || !entry->memory_stored) return GF_FALSE;
+	entry->range_start = start_range;
+	entry->range_end = end_range;
+	entry->contentLength = (u32) size;
+	return GF_TRUE;
+}
+
+Bool gf_cache_set_headers(const DownloadedCacheEntry entry, const char *headers)
+{
+	if (!entry || !entry->memory_stored) return GF_FALSE;
+	if (entry->forced_headers) gf_free(entry->forced_headers);
+	entry->forced_headers = headers ? gf_strdup(headers) : NULL;
+	return GF_TRUE;
+}
+
+char *gf_cache_get_forced_headers(const DownloadedCacheEntry entry)
+{
+	if (!entry) return NULL;
+	return entry->forced_headers;
+}
+void gf_cache_set_downtime(const DownloadedCacheEntry entry, u32 download_time_ms)
+{
+	if (entry) entry->downtime = download_time_ms;
+}
+u32 gf_cache_get_downtime(const DownloadedCacheEntry entry)
+{
+	if (!entry) return 0;
+	return entry->downtime;
+}
+
+Bool gf_cache_set_content(const DownloadedCacheEntry entry, char *data, u32 size, Bool copy)
+{
+	if (!entry || !entry->memory_stored) return GF_FALSE;
+
+	if (!copy) {
+		if (entry->mem_allocated) gf_free(entry->mem_storage);
+		entry->mem_storage = (u8 *) data;
+		entry->written_in_cache = size;
+		entry->mem_allocated = 0;
+		sprintf(entry->cache_filename, "gmem://%d@%p", entry->written_in_cache, entry->mem_storage);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] Storing %d bytes to memory from external module\n", size));
+		return GF_TRUE;
+	}
+	if ( size >= entry->mem_allocated) {
+		u32 new_size;
+		new_size = MAX(entry->mem_allocated*2, size+1);
+		entry->mem_storage = (u8*)gf_realloc(entry->mem_allocated ? entry->mem_storage : NULL, (new_size+2));
+		entry->mem_allocated = new_size;
+		sprintf(entry->cache_filename, "gmem://%d@%p", entry->contentLength, entry->mem_storage);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] Reallocating memory cache to %d bytes\n", new_size));
+	}
+	memcpy(entry->mem_storage, data, size);
+	entry->mem_storage[size] = 0;
+	entry->written_in_cache = size;
+	sprintf(entry->cache_filename, "gmem://%d@%p", entry->written_in_cache, entry->mem_storage);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] Storing %d bytes to cache memory\n", size));
+	return GF_FALSE;
+}
+
 #endif

gpac-0.7.1.tar.gz/src/utils/color.c -> gpac-0.8.0.tar.gz/src/utils/color.c Changed

gpac-0.7.1.tar.gz/src/utils/configfile.c -> gpac-0.8.0.tar.gz/src/utils/configfile.c Changed

gpac-0.7.1.tar.gz/src/utils/dlmalloc.c -> gpac-0.8.0.tar.gz/src/utils/dlmalloc.c Changed

gpac-0.7.1.tar.gz/src/utils/downloader.c -> gpac-0.8.0.tar.gz/src/utils/downloader.c Changed

@@ -41,11 +41,6 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
-#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
-#pragma comment(lib, "ssleay32")
-#pragma comment(lib, "libeay32")
-#endif
-
 #endif
 
 #ifdef __USE_POSIX
@@ -138,8 +133,10 @@
 	u32 flags;
 	u32 total_size, bytes_done, icy_metaint, icy_count, icy_bytes;
 	u64 start_time;
+	u64 chunk_run_time;
 	u32 bytes_per_sec;
 	u64 start_time_utc;
+	Bool last_chunk_found;
 	Bool connection_close;
 	Bool is_range_continuation;
 	/*0: no cache reconfig before next GET request: 1: try to rematch the cache entry: 2: force to create a new cache entry (for byte-range cases)*/
@@ -185,6 +182,8 @@
 
 	char *remaining_data;
 	u32 remaining_data_size;
+
+	Bool local_cache_only;
 };
 
 struct __gf_download_manager
@@ -202,7 +201,7 @@
 	u32 limit_data_rate, read_buf_size;
 	u64 max_cache_size;
 	Bool allow_broken_certificate;
-	
+
 	GF_List *skip_proxy_servers;
 	GF_List *credentials;
 	GF_List *cache_entries;
@@ -211,6 +210,9 @@
 #ifdef GPAC_HAS_SSL
 	SSL_CTX *ssl_ctx;
 #endif
+
+	Bool (*local_cache_url_provider_cbk)(void *udta, char *url, Bool cache_destroy);
+	void *lc_udta;
 };
 
 #ifdef GPAC_HAS_SSL
@@ -229,12 +231,6 @@
 		RAND_load_file(random_file, 16384);
 
 	if (RAND_status ()) return;
-
-#ifdef WIN32
-	RAND_screen ();
-	if (RAND_status ())
-		return;
-#endif
 }
 
 #endif
@@ -390,10 +386,18 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTPS] Error while initializing Random Number generator, failed to init SSL !\n"));
 		return GF_TRUE;
 	}
+
+	/* per https://www.openssl.org/docs/man1.1.0/ssl/OPENSSL_init_ssl.html
+	** As of version 1.1.0 OpenSSL will automatically allocate all resources that it needs so no explicit initialisation is required.
+	** Similarly it will also automatically deinitialise as required.
+	*/
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 	SSL_library_init();
 	SSL_load_error_strings();
 	SSLeay_add_all_algorithms();
 	SSLeay_add_ssl_algorithms();
+#endif
+
 	_ssl_is_initialized = GF_TRUE;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initalization of SSL library complete.\n"));
 	return GF_FALSE;
@@ -420,6 +424,7 @@
 	}
 
 	switch (mode) {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 	case 0:
 		meth = SSLv23_client_method();
 		break;
@@ -434,6 +439,11 @@
 	case 3:
 		meth = TLSv1_client_method();
 		break;
+#else /* for openssl 1.1+ this is the prefered method */
+	case 0:
+		meth = TLS_client_method();
+		break;
+#endif
 	default:
 		goto error;
 	}
@@ -585,6 +595,11 @@
 		u32 i, count;
 		entry = gf_dm_find_cached_entry_by_url(sess);
 		if (!entry) {
+			if (sess->local_cache_only) {
+				sess->cache_entry = NULL;
+				sess->last_error = GF_URL_ERROR;
+				return;
+			}
 			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);
 			gf_mx_p( sess->dm->cache_mx );
 			gf_list_add(sess->dm->cache_entries, entry);
@@ -664,6 +679,8 @@
 	if (sess && sess->dm && url) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] Requesting deletion for %s\n", url));
 		gf_dm_delete_cached_file_entry(sess->dm, url);
+		if (sess->local_cache_only && sess->dm->local_cache_url_provider_cbk)
+			sess->dm->local_cache_url_provider_cbk(sess->dm->lc_udta, (char *) url, GF_TRUE);
 	}
 }
 
@@ -751,7 +768,11 @@
 		sess->th = NULL;
 	}
 
-	if (sess->dm) gf_list_del_item(sess->dm->sessions, sess);
+	if (sess->dm) {
+		gf_mx_p(sess->dm->cache_mx);
+		gf_list_del_item(sess->dm->sessions, sess);
+		gf_mx_v(sess->dm->cache_mx);
+	}
 
 	gf_dm_remove_cache_entry_from_session(sess);
 	sess->cache_entry = NULL;
@@ -769,7 +790,7 @@
 		gf_sk_del(sess->sock);
 	gf_list_del(sess->headers);
 	gf_mx_del(sess->mx);
-	
+
 	gf_free(sess);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Downloader] gf_dm_sess_del(%p) : DONE\n", sess ));
 }
@@ -978,7 +999,8 @@
 		info->canonicalRepresentation = (char*)gf_malloc(strlen(info->protocol)+strlen(info->server_name)+1+strlen(port)+strlen(info->remotePath));
 		strcpy(info->canonicalRepresentation, info->protocol);
 		strcat(info->canonicalRepresentation, info->server_name);
-		strcat(info->canonicalRepresentation, port);
+		if (info->port!=80)
+			strcat(info->canonicalRepresentation, port);
 		strcat(info->canonicalRepresentation, info->remotePath);
 	}
 	gf_free(copyOfUrl);
@@ -987,6 +1009,39 @@
 	return GF_OK;
 }
 
+char *gf_cache_get_forced_headers(const DownloadedCacheEntry entry);
+u32 gf_cache_get_downtime(const DownloadedCacheEntry entry);
+
+static void gf_dm_sess_reload_cached_headers(GF_DownloadSession *sess)
+{
+	char *hdrs;
+
+	if (!sess->local_cache_only) return;
+
+	hdrs = gf_cache_get_forced_headers(sess->cache_entry);
+
+	gf_dm_clear_headers(sess);
+	while (hdrs) {
+		char *sep2, *sepL = strstr(hdrs, "\r\n");
+		if (sepL) sepL[0] = 0;
+		sep2 = strchr(hdrs, ':');
+		if (sep2) {
+			GF_HTTPHeader *hdr;
+			GF_SAFEALLOC(hdr, GF_HTTPHeader);
+			sep2[0]=0;
+			hdr->name = gf_strdup(hdrs);
+			sep2[0]=':';
+			sep2++;
+			while (sep2[0]==' ') sep2++;
+			hdr->value = gf_strdup(sep2);
+			gf_list_add(sess->headers, hdr);
+		}
+		if (!sepL) break;
+		sepL[0] = '\r';
+		hdrs = sepL + 2;
+	}
+}
+
 GF_EXPORT
 GF_Err gf_dm_sess_setup_from_url(GF_DownloadSession *sess, const char *url)
 {
@@ -1003,6 +1058,9 @@
 	else if (sess->status>GF_NETIO_DISCONNECTED)
 		socket_changed = GF_TRUE;
 
+	assert(sess->status != GF_NETIO_WAIT_FOR_REPLY);
+	assert(sess->status != GF_NETIO_DATA_EXCHANGE);
+
 	//strip fragment
 	sep_frag = strchr(url, '#');
 	if (sep_frag) sep_frag[0]=0;
@@ -1094,9 +1152,39 @@
 		if (sess->sock) gf_sk_del(sess->sock);
 		sess->sock = NULL;
 		sess->status = GF_NETIO_SETUP;
+#ifdef GPAC_HAS_SSL
+		if (sess->ssl) {
+			SSL_shutdown(sess->ssl);
+			SSL_free(sess->ssl);
+			sess->ssl = NULL;
+		}
+#endif
+
 	}
 	sess->total_size=0;
 	sess->bytes_done=0;
+	assert(sess->remaining_data_size==0);
+
+	sess->local_cache_only = GF_FALSE;
+	if (sess->dm->local_cache_url_provider_cbk) {
+		Bool res = sess->dm->local_cache_url_provider_cbk(sess->dm->lc_udta, (char *)url, GF_FALSE);
+		if (res == GF_TRUE) {
+			sess->local_cache_only = GF_TRUE;
+			gf_free(sess->orig_url);
+			sess->orig_url = gf_strdup(url);
+			sess->last_error = GF_OK;
+			gf_dm_configure_cache(sess);
+			sess->status = GF_NETIO_DATA_TRANSFERED;
+			sess->total_size = gf_cache_get_content_length(sess->cache_entry);
+			sess->bytes_done = sess->total_size;
+			sess->total_time_since_req = gf_cache_get_downtime(sess->cache_entry);
+			if (sess->total_time_since_req)
+				sess->bytes_per_sec = (u32) ((1000 * (u64) sess->bytes_done) / sess->total_time_since_req);
+			else
+				sess->bytes_per_sec = 0;
+			gf_dm_sess_reload_cached_headers(sess);
+		}
+	}
 	return sess->last_error;
 }
 
@@ -1139,7 +1227,7 @@
 {
 	GF_DownloadSession *sess;
 	if (!dm) return NULL;
-	
+
 	GF_SAFEALLOC(sess, GF_DownloadSession);
 	if (!sess) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("%s:%d Cannot allocate session for URL %s: OUT OF MEMORY!\n", __FILE__, __LINE__, url));
@@ -1160,8 +1248,8 @@
 		gf_free(sess);
 		return NULL;
 	}
-	
-	
+
+
 	assert( dm );
 
 	*e = gf_dm_sess_setup_from_url(sess, url);
@@ -1194,7 +1282,9 @@
 	sess = gf_dm_sess_new_simple(dm, url, dl_flags, user_io, usr_cbk, e);
 	if (sess) {
 		sess->dm = dm;
+		gf_mx_p(dm->cache_mx);
 		gf_list_add(dm->sessions, sess);
+		gf_mx_v(dm->cache_mx);
 	}
 	return sess;
 }
@@ -1219,7 +1309,7 @@
 		gf_mx_v(sess->mx);
 		return GF_IP_CONNECTION_CLOSED;
 	}
-	
+
 #ifdef GPAC_HAS_SSL
 	if (sess->ssl) {
 		s32 size;
@@ -1391,8 +1481,8 @@
 		sess->status = GF_NETIO_CONNECTED;
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connected to %s:%d\n", proxy, proxy_port));
 		gf_dm_sess_notify_state(sess, GF_NETIO_CONNECTED, GF_OK);
-		gf_sk_set_buffer_size(sess->sock, GF_TRUE, GF_DOWNLOAD_BUFFER_SIZE);
-		gf_sk_set_buffer_size(sess->sock, GF_FALSE, GF_DOWNLOAD_BUFFER_SIZE);
+//		gf_sk_set_buffer_size(sess->sock, GF_TRUE, GF_DOWNLOAD_BUFFER_SIZE);
+//		gf_sk_set_buffer_size(sess->sock, GF_FALSE, GF_DOWNLOAD_BUFFER_SIZE);
 	}
 
 #ifdef GPAC_HAS_SSL
@@ -1445,7 +1535,11 @@
 							const GENERAL_NAME *altname = sk_GENERAL_NAME_value(altnames, i);
 							if (altname->type == GEN_DNS)
 							{
-								unsigned char *altname_str = ASN1_STRING_data(altname->d.ia5);
+								#if OPENSSL_VERSION_NUMBER < 0x10100000L
+									unsigned char *altname_str = ASN1_STRING_data(altname->d.ia5);
+								#else
+									unsigned char *altname_str = (unsigned char *)ASN1_STRING_get0_data(altname->d.ia5);
+								#endif
 								gf_list_add(valid_names, altname_str);
 							}
 						}
@@ -1542,6 +1636,7 @@
 		case GF_NETIO_DATA_EXCHANGE:
 		case GF_NETIO_DISCONNECTED:
 		case GF_NETIO_STATE_ERROR:
+		case GF_NETIO_DATA_TRANSFERED:
 			go = GF_FALSE;
 			break;
 		default:
@@ -1633,6 +1728,7 @@
 		case GF_NETIO_DATA_EXCHANGE:
 			sess->do_requests(sess);
 			break;
+		case GF_NETIO_DATA_TRANSFERED:
 		case GF_NETIO_DISCONNECTED:
 		case GF_NETIO_STATE_ERROR:
 			go = GF_FALSE;
@@ -1643,7 +1739,6 @@
 		case GF_NETIO_GET_CONTENT:
 		case GF_NETIO_PARSE_HEADER:
 		case GF_NETIO_PARSE_REPLY:
-		case GF_NETIO_DATA_TRANSFERED:
 			break;
 
 		default:
@@ -1675,6 +1770,7 @@
 			}
 			break;
 		case GF_NETIO_DATA_EXCHANGE:
+		case GF_NETIO_DATA_TRANSFERED:
 		case GF_NETIO_DISCONNECTED:
 		case GF_NETIO_STATE_ERROR:
 			go = GF_FALSE;
@@ -1716,20 +1812,13 @@
 	u64 out_size;
 } cache_probe;
 
-static Bool gather_cache_size(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
-{
-	u64 *out_size = (u64 *) cbck;
-	*out_size += file_info->size;
-	return 0;
-}
 
 static void gf_dm_clean_cache(GF_DownloadManager *dm)
 {
-	u64 out_size = 0;
-	gf_enum_directory(dm->cache_directory, GF_FALSE, gather_cache_size, &out_size, "*");
+	u64 out_size = gf_cache_get_size(dm->cache_directory);
 	if (out_size >= dm->max_cache_size) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Cache] Cache size %d exceeds max allowed %d, deleting entire cache\n", out_size, dm->max_cache_size));
-		gf_cleanup_dir(dm->cache_directory);
+		gf_cache_delete_all_cached_files(dm->cache_directory);
 	}
 }
 
@@ -1800,7 +1889,7 @@
 		dm->limit_data_rate = 1000 * atoi(opt) / 8;
 	else
 		gf_cfg_set_key(cfg, "Downloader", "MaxRate", "0");
-	
+
 
 	dm->read_buf_size = GF_DOWNLOAD_BUFFER_SIZE;
 	//when rate is limited, use smaller smaller read size
@@ -1821,7 +1910,8 @@
 			dm->allow_offline_cache = GF_TRUE;
 	}
 
-	dm->allow_offline_cache = GF_FALSE;
+	dm->clean_cache = GF_FALSE;
+	dm->allow_broken_certificate = GF_FALSE;
 	if (cfg) {
 		opt = gf_cfg_get_key(cfg, "Downloader", "CleanCache");
 		if (opt) {
@@ -2027,7 +2117,7 @@
 }
 
 
-static char *gf_dm_get_chunk_data(GF_DownloadSession *sess, char *body_start, u32 *payload_size, u32 *header_size)
+static char *gf_dm_get_chunk_data(GF_DownloadSession *sess, Bool first_chunk_in_payload, char *body_start, u32 *payload_size, u32 *header_size)
 {
 	u32 size;
 	s32 res;
@@ -2057,6 +2147,11 @@
 		if ((body_start[0]=='\r') && (body_start[1]=='\n')) {
 			body_start += 2;
 			*header_size = 2;
+			//chunk exactly ends our packet, reset session start time
+			if (*payload_size == 2) {
+				sess->chunk_run_time += gf_sys_clock_high_res() - sess->start_time;
+				sess->start_time = 0;
+			}
 		}
 		if (*payload_size <= 4) {
 			*header_size = 0;
@@ -2067,6 +2162,16 @@
 		//not enough bytes to read CRLF, don't bother parsing
 		te_header = NULL;
 	}
+
+	//start of a new chunk, update start time
+	if (!sess->start_time) {
+		sess->start_time = gf_sys_clock_high_res();
+		//assume RTT is session reply time, and that chunk transfer started RTT/2 ago
+		if (first_chunk_in_payload && sess->start_time > sess->reply_time/2)
+			sess->start_time -= sess->reply_time/2;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTP] First byte in chunk received (%d bytes in packet), new start time %u ms\n", *payload_size, (u32) sess->start_time/1000));
+	}
+
 	//cannot parse now, copy over the bytes
 	if (!te_header) {
 		*header_size = 0;
@@ -2095,19 +2200,30 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTP] Chunk Start: Header \"%s\" - header size %d - payload size %d at UTC "LLD"\n", body_start, 2+strlen(body_start), size, gf_net_get_utc()));
 
 	te_header[0] = '\r';
+	if (!size) sess->last_chunk_found = GF_TRUE;
 	return te_header+2;
 }
 
 
 static void dm_sess_update_download_rate(GF_DownloadSession * sess, Bool always_check)
 {
-	u32 runtime;
+	u64 runtime;
 	if (!always_check && (sess->bytes_done==sess->total_size)) return;
 
 	/*update state*/
-	runtime = (u32) (gf_sys_clock_high_res() - sess->start_time) / 1000;
+	runtime = sess->chunk_run_time;
+	if (sess->start_time) {
+		runtime += (gf_sys_clock_high_res() - sess->start_time);
+	}
 	if (!runtime) runtime=1;
-	sess->bytes_per_sec = (u32) (1000 * (u64) sess->bytes_done / runtime);
+
+	sess->bytes_per_sec = (u32) ((1000000 * (u64) sess->bytes_done) / runtime);
+
+	if (sess->chunked) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] bandwidth estimation: download time "LLD" us (chunk download time "LLD" us) - bytes %u - rate %u kbps\n", runtime, sess->chunk_run_time, sess->bytes_done, sess->bytes_per_sec*8/1000));
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] bandwidth estimation: download time "LLD" us - bytes %u - rate %u kbps\n", runtime, sess->bytes_done, sess->bytes_per_sec*8/1000));
+	}
 }
 
 
@@ -2115,6 +2231,7 @@
 {
 	u32 nbBytes, remaining, hdr_size;
 	u8 *data;
+	Bool first_chunk_in_payload = GF_TRUE;
 	Bool flush_chunk = GF_FALSE;
 	GF_NETIO_Parameter par;
 
@@ -2124,7 +2241,8 @@
 	if (!payload)
 		return; //nothing to do
 	if (sess->chunked) {
- 		data = (u8 *) gf_dm_get_chunk_data(sess, (char *) payload, &nbBytes, &hdr_size);
+ 		data = (u8 *) gf_dm_get_chunk_data(sess, first_chunk_in_payload, (char *) payload, &nbBytes, &hdr_size);
+		first_chunk_in_payload = GF_FALSE;
 		if (!hdr_size && !data) {
 			/* keep the data and wait for the rest */
 			if (sess->remaining_data) gf_free(sess->remaining_data);
@@ -2146,7 +2264,7 @@
 			flush_chunk = GF_TRUE;
 		}
 		/*chunk transfer is done*/
-		if (!nbBytes) {
+		if (sess->last_chunk_found) {
 			sess->total_size = sess->bytes_done;
 		}
 	} else {
@@ -2160,7 +2278,7 @@
 		sess->init_data_size += nbBytes;
 	}
 
-
+	//we have some new bytes received
 	if (nbBytes && !sess->remaining_data_size) {
 		sess->bytes_done += nbBytes;
 		dm_sess_update_download_rate(sess, GF_TRUE);
@@ -2186,7 +2304,7 @@
 		}
 
 	}
-
+	//and we're done
 	if (sess->total_size && (sess->bytes_done == sess->total_size)) {
 		gf_dm_disconnect(sess, GF_FALSE);
 		par.msg_type = GF_NETIO_DATA_TRANSFERED;
@@ -2200,9 +2318,9 @@
 		gf_dm_sess_user_io(sess, &par);
 		sess->total_time_since_req = (u32) (gf_sys_clock_high_res() - sess->request_start_time);
 
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] url %s downloaded in "LLU" us (%d kbps) (%d us since request - got response in %d us)\n", gf_cache_get_url(sess->cache_entry),
-		 gf_sys_clock_high_res() - sess->start_time, 8*sess->bytes_per_sec/1024, sess->total_time_since_req, sess->reply_time ));
-		
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] url %s (%d bytes) downloaded in "LLU" us (%d kbps) (%d us since request - got response in %d us)\n", gf_cache_get_url(sess->cache_entry), sess->bytes_done,
+		 gf_sys_clock_high_res() - sess->start_time, 8*sess->bytes_per_sec/1000, sess->total_time_since_req, sess->reply_time ));
+
 		if (sess->chunked && (payload_size==2))
 			payload_size=0;
 	}
@@ -2216,9 +2334,6 @@
 	if (!sess->nb_left_in_chunk && remaining) {
 		sess->nb_left_in_chunk = remaining;
 	} else if (payload_size) {
-		if (sess->chunked && (payload_size==2))
-			payload_size=2;
-	
 		gf_dm_data_received(sess, payload, payload_size, store_in_init, rewrite_size);
 	}
 }
@@ -2358,6 +2473,8 @@
 
 	gf_dm_clear_headers(sess);
 
+	assert(sess->remaining_data_size == 0);
+
 	if (sess->needs_cache_reconfig) {
 		gf_dm_configure_cache(sess);
 		sess->needs_cache_reconfig = 0;
@@ -2778,7 +2895,7 @@
 		GF_NETIO_Parameter par;
 		sess->reply_time = (u32) (gf_sys_clock_high_res() - sess->request_start_time);
 		sess->rsp_hdr_size = 0;
-		sess->total_size = sess->bytes_done = gf_cache_get_content_length(sess->cache_entry);;
+		sess->total_size = sess->bytes_done = gf_cache_get_content_length(sess->cache_entry);
 
 		memset(&par, 0, sizeof(GF_NETIO_Parameter));
 		par.msg_type = GF_NETIO_DATA_TRANSFERED;
@@ -2794,7 +2911,11 @@
 	sess->start_time = gf_sys_clock_high_res();
 	sess->start_time_utc = gf_net_get_utc();
 	sess->chunked = GF_FALSE;
-
+	sess->chunk_run_time = 0;
+	sess->last_chunk_found = GF_FALSE;
+	gf_sk_reset(sess->sock);
+	sHTTP[0] = 0;
+	
 	while (1) {
 		e = gf_dm_read_data(sess, sHTTP + bytesRead, buf_size - bytesRead, &res);
 		switch (e) {
@@ -2805,6 +2926,7 @@
 					sess->status = GF_NETIO_STATE_ERROR;
 					return GF_IP_NETWORK_EMPTY;
 				}
+				assert(res==0);
 				return GF_OK;
 			}
 			continue;
@@ -2825,7 +2947,8 @@
 			}
 			return e;
 		case GF_OK:
-			if (!res) return GF_OK;
+			if (!res)
+				return GF_OK;
 			break;
 		default:
 			goto exit;
@@ -2904,7 +3027,7 @@
 			hdrp->value = gf_strdup(hdr_val);
 			gf_list_add(sess->headers, hdrp);
 		}
-	
+
 		if (sep) sep[0]=':';
 		if (hdr_sep) hdr_sep[0] = '\r';
 	}
@@ -3407,6 +3530,7 @@
 	return e;
 }
 
+GF_EXPORT
 GF_Err gf_dm_wget_with_cache(GF_DownloadManager * dm, const char *url, const char *filename, u64 start_range, u64 end_range, char **redirected_url)
 {
 	GF_Err e;
@@ -3525,6 +3649,7 @@
 	return dnload ? dnload->status : GF_NETIO_STATE_ERROR;
 }
 
+GF_EXPORT
 GF_Err gf_dm_sess_reset(GF_DownloadSession *sess)
 {
 	if (!sess) return GF_BAD_PARAM;
@@ -3542,6 +3667,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 const char * gf_cache_get_cache_filename_range( const GF_DownloadSession * sess, u64 startOffset, u64 endOffset ) {
 	u32 i, count;
 	if (!sess || !sess->dm || endOffset < startOffset)
@@ -3784,4 +3910,77 @@
 }
 
 
+GF_EXPORT
+GF_Err gf_dm_set_localcache_provider(GF_DownloadManager *dm, Bool (*local_cache_url_provider_cbk)(void *udta, char *url, Bool is_cache_destroy), void *lc_udta)
+{
+	if (!dm) return GF_BAD_PARAM;
+	dm->local_cache_url_provider_cbk = local_cache_url_provider_cbk;
+	dm->lc_udta = lc_udta;
+	return GF_OK;
+
+}
+
+Bool gf_cache_set_mime(const DownloadedCacheEntry entry, const char *mime);
+Bool gf_cache_set_range(const DownloadedCacheEntry entry, u64 size, u64 start_range, u64 end_range);
+Bool gf_cache_set_content(const DownloadedCacheEntry entry, char *data, u32 size, Bool copy);
+Bool gf_cache_set_headers(const DownloadedCacheEntry entry, const char *headers);
+Bool gf_cache_set_downtime(const DownloadedCacheEntry entry, u32 download_time_ms);
+
+GF_EXPORT
+const DownloadedCacheEntry gf_dm_add_cache_entry(GF_DownloadManager *dm, const char *szURL, char *data, u64 size, u64 start_range, u64 end_range, const char *mime, Bool clone_memory, u32 download_time_ms)
+{
+	u32 i, count;
+	DownloadedCacheEntry the_entry = NULL;
+
+	gf_mx_p(dm->cache_mx );
+	count = gf_list_count(dm->cache_entries);
+	for (i = 0 ; i < count; i++) {
+		const char * url;
+		DownloadedCacheEntry e = (DownloadedCacheEntry)gf_list_get(dm->cache_entries, i);
+		assert(e);
+		url = gf_cache_get_url(e);
+		assert( url );
+		if (strcmp(url, szURL)) continue;
+
+		if (end_range) {
+			if (start_range != gf_cache_get_start_range(e)) continue;
+			if (end_range != gf_cache_get_end_range(e)) continue;
+		}
+		/*OK that's ours*/
+		the_entry = e;
+		break;
+	}
+	if (!the_entry) {
+		the_entry = gf_cache_create_entry(dm, "", szURL, 0, 0, GF_TRUE);
+		if (!the_entry) return NULL;
+		gf_list_add(dm->cache_entries, the_entry);
+	}
+
+	gf_cache_set_mime(the_entry, mime);
+	gf_cache_set_range(the_entry, size, start_range, end_range);
+	gf_cache_set_content(the_entry, data, (u32) size, clone_memory ? GF_TRUE : GF_FALSE);
+	gf_cache_set_downtime(the_entry, download_time_ms);
+
+	gf_mx_v(dm->cache_mx );
+	return the_entry;
+}
+
+GF_EXPORT
+GF_Err gf_dm_force_headers(GF_DownloadManager *dm, const DownloadedCacheEntry entry, const char *headers)
+{
+	u32 i, count;
+	Bool res;
+	if (!entry) return GF_BAD_PARAM;
+	gf_mx_p(dm->cache_mx);
+	res = gf_cache_set_headers(entry, headers);
+	count = gf_list_count(dm->sessions);
+	for (i=0; i<count; i++) {
+		GF_DownloadSession *sess = gf_list_get(dm->sessions, i);
+		if (sess->cache_entry != entry) continue;
+		gf_dm_sess_reload_cached_headers(sess);
+	}
+	gf_mx_v(dm->cache_mx);
+	return res ? GF_OK : GF_BAD_PARAM;
+}
+
 #endif

gpac-0.7.1.tar.gz/src/utils/error.c -> gpac-0.8.0.tar.gz/src/utils/error.c Changed

@@ -33,26 +33,32 @@
 #endif
 
 
-static char szTYPE[5];
+static char szTYPE[9];
 
 
 GF_EXPORT
 const char *gf_4cc_to_str(u32 type)
 {
 	u32 ch, i;
-	char *ptr, *name = (char *)szTYPE;
-	if (!type) return "";
-	ptr = name;
+	Bool is_ok=GF_TRUE;
+	char *name = (char *)szTYPE;
+	if (!type) return "00000000";
+
 	for (i = 0; i < 4; i++, name++) {
 		ch = type >> (8 * (3-i) ) & 0xff;
 		if ( ch >= 0x20 && ch <= 0x7E ) {
 			*name = ch;
 		} else {
-			*name = '.';
+			is_ok=GF_FALSE;
+			break;
 		}
 	}
-	*name = 0;
-	return (const char *) ptr;
+	if (is_ok) {
+		*name = 0;
+		return (const char *) szTYPE;
+	}
+	sprintf(szTYPE, "%02X%02X%02X%02X", (type>>24)&0xFF, (type>>16)&0xFF, (type>>8)&0xFF, (type)&0xFF);
+	return (const char *) szTYPE;
 }
 
 
@@ -119,6 +125,7 @@
 GF_EXPORT
 void gf_set_progress(const char *title, u64 done, u64 total)
 {
+	if (done>total) done=total;
 	if (prog_cbk) {
 		prog_cbk(user_cbk, title, done, total);
 	}
@@ -172,20 +179,37 @@
 	{ GF_LOG_SCHEDULER, "scheduler", GF_LOG_INFO },
 };
 
+#define GF_LOG_TOOL_MAX_NAME_SIZE (GF_LOG_TOOL_MAX*10)
+
 GF_EXPORT
-GF_Err gf_log_modify_tools_levels(const char *val)
+GF_Err gf_log_modify_tools_levels(const char *val_)
 {
 #ifndef GPAC_DISABLE_LOG
-	u32 level;
-	char *sep, *sep_level;
+	char tmp[GF_LOG_TOOL_MAX_NAME_SIZE];
+	const char *val = tmp;
+	if (!val_) val_ = "";
+	assert(strlen(val_) < GF_LOG_TOOL_MAX_NAME_SIZE);
+	strncpy(tmp, val_, GF_LOG_TOOL_MAX_NAME_SIZE - 1);
+	tmp[GF_LOG_TOOL_MAX_NAME_SIZE - 1] = 0;
+
 	while (val && strlen(val)) {
+		u32 level;
 		const char *next_val = NULL;
 		const char *tools = NULL;
 		/*look for log level*/
-		sep_level = strchr(val, '@');
+		char *sep_level = strchr(val, '@');
 		if (!sep_level) {
-			fprintf(stderr, "Unrecognized log format %s - expecting logTool@logLevel\n", val);
-			return GF_BAD_PARAM;
+			if (!strcmp(val, "ncl")) {
+				void default_log_callback_no_col(void *cbck, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list vlist);
+
+				gf_log_set_callback(NULL, default_log_callback_no_col);
+				if (!val[3]) break;
+				val += 4;
+				continue;
+			} else {
+				fprintf(stderr, "Unrecognized log format %s - expecting logTool@logLevel\n", val);
+				return GF_BAD_PARAM;
+			}
 		}
 
 		if (!strnicmp(sep_level+1, "error", 5)) {
@@ -218,7 +242,7 @@
 		while (tools) {
 			u32 i;
 
-			sep = strchr(tools, ':');
+			char *sep = strchr(tools, ':');
 			if (sep) sep[0] = 0;
 
 			if (!stricmp(tools, "all")) {
@@ -338,6 +362,11 @@
 	return GF_FALSE;
 }
 
+void default_log_callback_no_col(void *cbck, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list vlist)
+{
+	vfprintf(stderr, fmt, vlist);
+}
+
 #define RED "\x1b[31m"
 #define YELLOW "\x1b[33m"
 #define GREEN "\x1b[32m"
@@ -374,7 +403,7 @@
 			SetConsoleTextAttribute(console, FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE);
 			break;
 	}
-	
+
 	vfprintf(stderr, fmt, vlist);
 	SetConsoleTextAttribute(console, console_attr_ori);
 #elif !defined(_WIN32_WCE)
@@ -774,7 +803,9 @@
 #ifdef GPAC_DISABLE_STREAMING
 	 "GPAC_DISABLE_STREAMING "
 #endif
-
+#ifdef GPAC_DISABLE_ATSC
+	 "GPAC_DISABLE_ATSC "
+#endif
 	 ;
 	return features;
 }

gpac-0.7.1.tar.gz/src/utils/list.c -> gpac-0.8.0.tar.gz/src/utils/list.c Changed

gpac-0.7.1.tar.gz/src/utils/math.c -> gpac-0.8.0.tar.gz/src/utils/math.c Changed

gpac-0.7.1.tar.gz/src/utils/module.c -> gpac-0.8.0.tar.gz/src/utils/module.c Changed

gpac-0.7.1.tar.gz/src/utils/os_config_init.c -> gpac-0.8.0.tar.gz/src/utils/os_config_init.c Changed

gpac-0.7.1.tar.gz/src/utils/os_divers.c -> gpac-0.8.0.tar.gz/src/utils/os_divers.c Changed

@@ -340,6 +340,7 @@
 #endif
 }
 
+GF_EXPORT
 void gf_get_user_name(char *buf, u32 buf_size)
 {
 	strcpy(buf, "mpeg4-user");
@@ -397,6 +398,7 @@
 char gf_prompt_get_char() {
 	return 0;
 }
+GF_EXPORT
 void gf_prompt_set_echo_off(Bool echo_off) {
 	return;
 }
@@ -416,6 +418,7 @@
 	return getchar();
 }
 
+GF_EXPORT
 void gf_prompt_set_echo_off(Bool echo_off)
 {
 	DWORD flags;
@@ -454,6 +457,7 @@
 	if (new_line) fprintf(stderr, "\n");
 }
 
+GF_EXPORT
 void gf_prompt_set_echo_off(Bool echo_off)
 {
 	init_keyboard();
@@ -1415,18 +1419,35 @@
 	return res;
 }
 
-
+GF_EXPORT
 char * gf_get_default_cache_directory() {
+	char szPath[GF_MAX_PATH];
+	char* root_tmp;
+	size_t len;
 #ifdef _WIN32_WCE
-	return gf_strdup( "\\windows\\temp" );
+	strcpy(szPath, "\\windows\\temp" );
 #elif defined(WIN32)
-	char szPath[MAX_PATH];
-	/*ivica patch*/
-	GetTempPath(MAX_PATH, szPath);
-	return gf_strdup( szPath );
+	GetTempPath(GF_MAX_PATH, szPath);
 #else
-	return gf_strdup("/tmp");
+	strcpy(szPath, "/tmp");
 #endif
+
+	root_tmp = gf_strdup(szPath);
+
+	len = strlen(szPath);
+	if (szPath[len-1] != GF_PATH_SEPARATOR) {
+		szPath[len] = GF_PATH_SEPARATOR;
+		szPath[len+1] = 0;
+	}
+
+	strcat(szPath, "gpac_cache");
+
+	if ( !gf_dir_exists(szPath) && gf_mkdir(szPath)!=GF_OK ) {
+		return root_tmp;
+	}
+
+	gf_free(root_tmp);
+	return gf_strdup(szPath);
 }
 
 
@@ -1681,7 +1702,7 @@
 	if (sec) {
 		*sec = (u32) (now.tv_sec) + ntp_shift;
 	}
-	
+
 	if (frac) {
 		frac_part = now.tv_usec * 0xFFFFFFFFULL;
 		frac_part /= 1000000;
@@ -1949,7 +1970,7 @@
 
 
 GF_EXPORT
-GF_Err gf_bin128_parse(char *string, bin128 value)
+GF_Err gf_bin128_parse(const char *string, bin128 value)
 {
 	u32 len;
 	u32	i=0;
@@ -1967,12 +1988,18 @@
 				break;
 			sprintf(szV, "%c%c", string[j], string[j+1]);
 			sscanf(szV, "%x", &v);
+			if (i > 15) {
+				// force error check below
+				i++;
+				break;
+			}
 			value[i] = v;
 			i++;
+
 		}
 	}
 	if (i != 16) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[CORE] 128bit blob is not 16-bytes long: %s\n", string));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CORE] 128bit blob is not 16-bytes long: %s\n", string));
 		return GF_BAD_PARAM;
 	}
 	return GF_OK;

gpac-0.7.1.tar.gz/src/utils/os_file.c -> gpac-0.8.0.tar.gz/src/utils/os_file.c Changed

@@ -34,6 +34,7 @@
 #elif defined(WIN32)
 
 #include <windows.h>
+#include <process.h>
 #include <direct.h>
 #include <sys/stat.h>
 #include <share.h>
@@ -53,7 +54,41 @@
 #endif
 
 
-GF_Err gf_rmdir(char *DirPathName)
+#if defined(WIN32)
+static wchar_t* utf8_to_wcs(const char* str)
+{
+	size_t source_len;
+	wchar_t* result;
+	if (str == 0) return 0;
+	source_len = strlen(str);
+	result = gf_calloc(source_len + 1, sizeof(wchar_t));
+	if (!result)
+		return 0;
+	if (gf_utf8_mbstowcs(result, source_len, &str) < 0) {
+		gf_free(result);
+		return 0;
+	}
+	return result;
+}
+static char* wcs_to_utf8(const wchar_t* str)
+{
+	size_t source_len;
+	char* result;
+	if (str == 0) return 0;
+	source_len = wcslen(str);
+	result = gf_calloc(source_len + 1, UTF8_MAX_BYTES_PER_CHAR);
+	if (!result)
+		return 0;
+	if (gf_utf8_wcstombs(result, source_len * UTF8_MAX_BYTES_PER_CHAR, &str) < 0) {
+		gf_free(result);
+		return 0;
+	}
+	return result;
+}
+#endif
+
+GF_EXPORT
+GF_Err gf_rmdir(const char *DirPathName)
 {
 #if defined (_WIN32_WCE)
 	TCHAR swzName[MAX_PATH];
@@ -65,8 +100,13 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot delete directory %s: last error %d\n", DirPathName, err ));
 	}
 #elif defined (WIN32)
-	int res = rmdir(DirPathName);
-	if (res==-1) {
+	int res;
+	wchar_t* wcsDirPathName = utf8_to_wcs(DirPathName);
+	if (!wcsDirPathName)
+		return GF_IO_ERR;
+	res = _wrmdir(wcsDirPathName);
+	gf_free(wcsDirPathName);
+	if (res == -1) {
 		int err = GetLastError();
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot delete directory %s: last error %d\n", DirPathName, err ));
 		return GF_IO_ERR;
@@ -82,7 +122,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_mkdir(char* DirPathName)
+GF_Err gf_mkdir(const char* DirPathName)
 {
 #if defined (_WIN32_WCE)
 	TCHAR swzName[MAX_PATH];
@@ -94,7 +134,12 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s: last error %d\n", DirPathName, err ));
 	}
 #elif defined (WIN32)
-	int res = mkdir(DirPathName);
+	int res;
+	wchar_t* wcsDirPathName = utf8_to_wcs(DirPathName);
+	if (!wcsDirPathName)
+		return GF_IO_ERR;
+	res = _wmkdir(wcsDirPathName);
+	gf_free(wcsDirPathName);
 	if (res==-1) {
 		int err = GetLastError();
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s: last error %d\n", DirPathName, err ));
@@ -116,7 +161,7 @@
 
 
 GF_EXPORT
-Bool gf_dir_exists(char* DirPathName)
+Bool gf_dir_exists(const char* DirPathName)
 {
 #if defined (_WIN32_WCE)
 	TCHAR swzName[MAX_PATH];
@@ -126,7 +171,12 @@
 	att = GetFileAttributes(swzName);
 	return (att != INVALID_FILE_ATTRIBUTES && (att & FILE_ATTRIBUTE_DIRECTORY)) ? GF_TRUE : GF_FALSE;
 #elif defined (WIN32)
-	DWORD att = GetFileAttributes(DirPathName);
+	DWORD att;
+	wchar_t* wcsDirPathName = utf8_to_wcs(DirPathName);
+	if (!wcsDirPathName)
+		return GF_FALSE;
+	att = GetFileAttributesW(wcsDirPathName);
+	gf_free(wcsDirPathName);
 	return (att != INVALID_FILE_ATTRIBUTES && (att & FILE_ATTRIBUTE_DIRECTORY)) ? GF_TRUE : GF_FALSE;
 #else
 	DIR* dir = opendir(DirPathName);
@@ -149,7 +199,8 @@
 	return GF_FALSE;
 }
 
-GF_Err gf_cleanup_dir(char* DirPathName)
+GF_EXPORT
+GF_Err gf_cleanup_dir(const char* DirPathName)
 {
 	Bool directory_clean_mode;
 
@@ -174,7 +225,15 @@
 	return (DeleteFile(swzName)==0) ? GF_IO_ERR : GF_OK;
 #elif defined(WIN32)
 	/* success if != 0 */
-	return (DeleteFile(fileName)==0) ? GF_IO_ERR : GF_OK;
+	{
+		BOOL op_result;
+		wchar_t* wcsFileName = utf8_to_wcs(fileName);
+		if (!wcsFileName)
+			return GF_IO_ERR;
+		op_result = DeleteFileW(wcsFileName);
+		gf_free(wcsFileName);
+		return (op_result==0) ? GF_IO_ERR : GF_OK;
+	}
 #else
 	/* success is == 0 */
 	return ( remove(fileName) == 0) ? GF_OK : GF_IO_ERR;
@@ -230,7 +289,19 @@
 	return (MoveFile(swzName, swzNewName) == 0 ) ? GF_IO_ERR : GF_OK;
 #elif defined(WIN32)
 	/* success if != 0 */
-	return (MoveFile(fileName, newFileName) == 0 ) ? GF_IO_ERR : GF_OK;
+	BOOL op_result;
+	wchar_t* wcsFileName = utf8_to_wcs(fileName);
+	wchar_t* wcsNewFileName = utf8_to_wcs(newFileName);
+	if (!wcsFileName || !wcsNewFileName)
+	{
+		if (wcsFileName) gf_free(wcsFileName);
+		if (wcsNewFileName) gf_free(wcsNewFileName);
+		return GF_IO_ERR;
+	}
+	op_result = MoveFileW(wcsFileName, wcsNewFileName);
+	gf_free(wcsFileName);
+	gf_free(wcsNewFileName);
+	return ( op_result == 0 ) ? GF_IO_ERR : GF_OK;
 #else
 	GF_Err e = GF_IO_ERR;
 	char cmd[1024], *arg1, *arg2;
@@ -285,7 +356,13 @@
 	return time_ms;
 #elif defined(WIN32) && !defined(__GNUC__)
 	struct _stat64 sb;
-	if (_stat64(filename, &sb) != 0) return 0;
+	int op_result;
+	wchar_t* wcsFilename = utf8_to_wcs(filename);
+	if (!wcsFilename)
+		return 0;
+	op_result = _wstat64(wcsFilename, &sb);
+	gf_free(wcsFilename);
+	if (op_result != 0) return 0;
 	return sb.st_mtime;
 #else
 	struct stat sb;
@@ -316,26 +393,33 @@
 	if (GetTempFileName(pPath, TEXT("git"), 0, pTemp))
 		res = _wfopen(pTemp, TEXT("w+b"));
 #elif defined(WIN32)
-	char tmp[MAX_PATH];
 	res = tmpfile();
+
 	if (!res) {
+		wchar_t tmp[MAX_PATH];
+
 		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Win32] system failure for tmpfile(): 0x%08x\n", GetLastError()));
 
 		/*tmpfile() may fail under vista ...*/
-		if (GetEnvironmentVariable("TEMP", tmp, MAX_PATH)) {
-			char tmp2[MAX_PATH], *t_file;
+		if (GetEnvironmentVariableW(L"TEMP", tmp, MAX_PATH)) {
+			wchar_t tmp2[MAX_PATH], *t_file;
+			char* mbs_t_file;
 			gf_rand_init(GF_FALSE);
-			sprintf(tmp2, "gpac_%08x_", gf_rand());
-			t_file = tempnam(tmp, tmp2);
-			res = gf_fopen(t_file, "w+b");
+			swprintf(tmp2, MAX_PATH, L"gpac_%d_%08x_", _getpid(), gf_rand());
+			t_file = _wtempnam(tmp, tmp2);
+			mbs_t_file = wcs_to_utf8(t_file);
+			if (!mbs_t_file)
+				return 0;
+			res = gf_fopen(mbs_t_file, "w+b");
 			if (res) {
 				gpac_file_handles--;
 				if (fileName) {
-					*fileName = gf_strdup(t_file);
+					*fileName = gf_strdup(mbs_t_file);
 				} else {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[Win32] temporary file %s won't be deleted - contact the GPAC team\n", t_file));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[Win32] temporary file %s won't be deleted - contact the GPAC team\n", mbs_t_file));
 				}
 			}
+			gf_free(mbs_t_file);
 			free(t_file);
 		}
 	}
@@ -353,7 +437,11 @@
 GF_EXPORT
 GF_Err gf_enum_directory(const char *dir, Bool enum_directory, gf_enum_dir_item enum_dir_fct, void *cbck, const char *filter)
 {
+#ifdef WIN32
+	wchar_t item_path[GF_MAX_PATH];
+#else
 	char item_path[GF_MAX_PATH];
+#endif
 	GF_FileEnumInfo file_info;
 
 #if defined(_WIN32_WCE)
@@ -361,12 +449,17 @@
 	unsigned short path[GF_MAX_PATH];
 	unsigned short w_filter[GF_MAX_PATH];
 	char file[GF_MAX_PATH];
+#elif defined(WIN32)
+	wchar_t path[GF_MAX_PATH], *file;
+	wchar_t w_filter[GF_MAX_PATH];
+	wchar_t w_dir[GF_MAX_PATH];
+	char *mbs_file, *mbs_item_path;
 #else
 	char path[GF_MAX_PATH], *file;
 #endif
 
 #ifdef WIN32
-	WIN32_FIND_DATA FindData;
+	WIN32_FIND_DATAW FindData;
 	HANDLE SearchH;
 #else
 	DIR *the_dir;
@@ -433,28 +526,36 @@
 	CE_CharToWide(_path, path);
 	CE_CharToWide((char *)filter, w_filter);
 #elif defined(WIN32)
-	switch (dir[strlen(dir) - 1]) {
+	{
+		const char* tmpdir = dir;
+		gf_utf8_mbstowcs(w_dir, sizeof(w_dir), &tmpdir);
+	}
+	switch (w_dir[wcslen(w_dir) - 1]) {
 	case '/':
 	case '\\':
-		sprintf(path, "%s*", dir);
+		swprintf(path, MAX_PATH, L"%s*", w_dir);
 		break;
 	default:
-		sprintf(path, "%s%c*", dir, GF_PATH_SEPARATOR);
+		swprintf(path, MAX_PATH, L"%s%c*", w_dir, GF_PATH_SEPARATOR);
 		break;
 	}
+	{
+		const char* tmpfilter = filter;
+		gf_utf8_mbstowcs(w_filter, sizeof(w_filter), &tmpfilter);
+	}
 #else
 	strcpy(path, dir);
 	if (path[strlen(path)-1] != '/') strcat(path, "/");
 #endif
 
 #ifdef WIN32
-	SearchH= FindFirstFile(path, &FindData);
+	SearchH= FindFirstFileW(path, &FindData);
 	if (SearchH == INVALID_HANDLE_VALUE) return GF_IO_ERR;
 
 #if defined (_WIN32_WCE)
 	_path[strlen(_path)-1] = 0;
 #else
-	path[strlen(path)-1] = 0;
+	path[wcslen(path)-1] = 0;
 #endif
 
 	while (SearchH != INVALID_HANDLE_VALUE) {
@@ -478,8 +579,8 @@
 		if (!wcscmp(FindData.cFileName, _T(".") )) goto next;
 		if (!wcscmp(FindData.cFileName, _T("..") )) goto next;
 #elif defined(WIN32)
-		if (!strcmp(FindData.cFileName, ".")) goto next;
-		if (!strcmp(FindData.cFileName, "..")) goto next;
+		if (!wcscmp(FindData.cFileName, L".")) goto next;
+		if (!wcscmp(FindData.cFileName, L"..")) goto next;
 #else
 		if (!strcmp(the_file->d_name, "..")) goto next;
 		if (the_file->d_name[0] == '.') goto next;
@@ -500,12 +601,12 @@
 			wcslwr(ext);
 			if (!wcsstr(w_filter, ext)) goto next;
 #elif defined(WIN32)
-			char ext[30];
-			char *sep = strrchr(FindData.cFileName, '.');
+			wchar_t ext[30];
+			wchar_t *sep = wcsrchr(FindData.cFileName, L'.');
 			if (!sep) goto next;
-			strcpy(ext, sep+1);
-			strlwr(ext);
-			if (!strstr(filter, ext)) goto next;
+			wcscpy(ext, sep+1);
+			wcslwr(ext);
+			if (!wcsstr(w_filter, ext)) goto next;
 #else
 			char ext[30];
 			char *sep = strrchr(the_file->d_name, '.');
@@ -531,8 +632,8 @@
 		strcpy(item_path, _path);
 		strcat(item_path, file);
 #elif defined(WIN32)
-		strcpy(item_path, path);
-		strcat(item_path, FindData.cFileName);
+		wcscpy(item_path, path);
+		wcscat(item_path, FindData.cFileName);
 		file = FindData.cFileName;
 #else
 		strcpy(item_path, path);
@@ -570,20 +671,36 @@
 			}
 		}
 #endif
-		if (enum_dir_fct(cbck, file, item_path, &file_info)) {
+
 #ifdef WIN32
+		mbs_file = wcs_to_utf8(file);
+		mbs_item_path = wcs_to_utf8(item_path);
+		if (!mbs_file || !mbs_item_path)
+		{
+			if (mbs_file) gf_free(mbs_file);
+			if (mbs_item_path) gf_free(mbs_item_path);
+			return GF_IO_ERR;
+		}
+		if (enum_dir_fct(cbck, mbs_file, mbs_item_path, &file_info)) {
 			BOOL ret = FindClose(SearchH);
 			if (!ret) {
 				DWORD err = GetLastError();
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[core] FindClose() in gf_enum_directory() returned(1) the following error code: %d\n", err));
 			}
+#else
+		if (enum_dir_fct(cbck, file, item_path, &file_info)) {
 #endif
 			break;
 		}
 
+#ifdef WIN32
+		gf_free(mbs_file);
+		gf_free(mbs_item_path);
+#endif
+
 next:
 #ifdef WIN32
-		if (!FindNextFile(SearchH, &FindData)) {
+		if (!FindNextFileW(SearchH, &FindData)) {
 			BOOL ret = FindClose(SearchH);
 			if (!ret) {
 				DWORD err = GetLastError();
@@ -651,47 +768,20 @@
 	FILE *res = NULL;
 
 #if defined(WIN32)
-	Bool is_create;
-	is_create = (strchr(mode, 'w') == NULL) ? GF_FALSE : GF_TRUE;
-	if (!is_create) {
-		if (strchr(mode, 'a')) {
-			res = fopen(file_name, "rb");
-			if (res) {
-				fclose(res);
-				res = fopen(file_name, mode);
-			}
-		} else {
-			res = fopen(file_name, mode);
-		}
-	}
-	if (!res) {
-		const char *str_src;
-		wchar_t *wname;
-		wchar_t *wmode;
-		size_t len;
-		size_t len_res;
-		if (!is_create) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Could not open file %s mode %s in UTF-8 mode, trying UTF-16\n", file_name, mode));
-		}
-		len = (strlen(file_name) + 1)*sizeof(wchar_t);
-		wname = (wchar_t *)gf_malloc(len);
-		str_src = file_name;
-		len_res = gf_utf8_mbstowcs(wname, len, &str_src);
-		if (len_res == -1) {
-			return NULL;
-		}
-		len = (strlen(mode) + 1)*sizeof(wchar_t);
-		wmode = (wchar_t *)gf_malloc(len);
-		str_src = mode;
-		len_res = gf_utf8_mbstowcs(wmode, len, &str_src);
-		if (len_res == -1) {
-			return NULL;
-		}
+	wchar_t *wname;
+	wchar_t *wmode;
 
-		res = _wfsopen(wname, wmode, _SH_DENYNO);
-		gf_free(wname);
-		gf_free(wmode);
+	wname = utf8_to_wcs(file_name);
+	wmode = utf8_to_wcs(mode);
+	if (!wname || !wmode)
+	{
+		if (wname) gf_free(wname);
+		if (wmode) gf_free(wmode);
+		return NULL;
 	}
+	res = _wfsopen(wname, wmode, _SH_DENYNO);
+	gf_free(wname);
+	gf_free(wmode);
 #elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_ANDROID)
 	res = fopen64(file_name, mode);
 #elif (defined(GPAC_CONFIG_FREEBSD) || defined(GPAC_CONFIG_DARWIN))

gpac-0.7.1.tar.gz/src/utils/os_module.c -> gpac-0.8.0.tar.gz/src/utils/os_module.c Changed

gpac-0.7.1.tar.gz/src/utils/os_net.c -> gpac-0.8.0.tar.gz/src/utils/os_net.c Changed

@@ -149,8 +149,6 @@
 #endif
 
 
-#define SOCK_MICROSEC_WAIT	500
-
 #ifdef GPAC_HAS_IPV6
 static u32 ipv6_check_state = 0;
 #endif
@@ -186,6 +184,8 @@
 	struct sockaddr_in dest_addr;
 #endif
 	u32 dest_addr_len;
+
+	u32 usec_wait;
 };
 
 
@@ -210,7 +210,7 @@
 	return GF_NOT_SUPPORTED;
 }
 
-
+GF_EXPORT
 u32 gf_net_has_ipv6()
 {
 #ifdef GPAC_HAS_IPV6
@@ -310,6 +310,7 @@
 	return (ret == SOCKET_ERROR) ? GF_IP_ADDRESS_NOT_FOUND : GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_sk_get_local_ip(GF_Socket *sock, char *buffer)
 {
 #ifdef GPAC_HAS_IPV6
@@ -366,6 +367,7 @@
 	tmp->dest_addr_len = sizeof(struct sockaddr);
 #endif
 
+	tmp->usec_wait = 500;
 #ifdef WIN32
 	wsa_init ++;
 #endif
@@ -375,6 +377,7 @@
 GF_EXPORT
 GF_Err gf_sk_set_buffer_size(GF_Socket *sock, Bool SendBuffer, u32 NewSize)
 {
+	u32 nsize=0, psize;
 	s32 res;
 	if (!sock || !sock->socket) return GF_BAD_PARAM;
 
@@ -388,6 +391,16 @@
 	} else {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Socket] Set socket %s buffer size to %d\n", SendBuffer ? "send" : "receive", NewSize));
 	}
+	psize = sizeof(u32);
+	if (SendBuffer) {
+		res = getsockopt(sock->socket, SOL_SOCKET, SO_SNDBUF, (char *) &nsize, &psize );
+	} else {
+		res = getsockopt(sock->socket, SOL_SOCKET, SO_RCVBUF, (char *) &nsize, &psize );
+	}
+	if ((res>=0) && (nsize=!NewSize)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Socket] Asked to set socket %s buffer size to %d but system used %d\n", SendBuffer ? "send" : "receive", NewSize, nsize));
+	}
+
 	return GF_OK;
 }
 
@@ -465,20 +478,29 @@
 	gf_free(sock);
 }
 
+GF_EXPORT
 void gf_sk_reset(GF_Socket *sock)
 {
 	u32 clear;
 	if (sock) setsockopt(sock->socket, SOL_SOCKET, SO_ERROR, (char *) &clear, sizeof(u32) );
 }
 
+GF_EXPORT
 s32 gf_sk_get_handle(GF_Socket *sock)
 {
 	return (s32) sock->socket;
 }
 
+void gf_sk_set_usec_wait(GF_Socket *sock, u32 usec_wait)
+{
+	if (!sock) return;
+	sock->usec_wait = (usec_wait>=1000000) ? 500 : usec_wait;
+}
+
 
 
 //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)
 {
 	s32 ret;
@@ -850,7 +872,7 @@
 	FD_ZERO(&Group);
 	FD_SET(sock->socket, &Group);
 	timeout.tv_sec = 0;
-	timeout.tv_usec = SOCK_MICROSEC_WAIT;
+	timeout.tv_usec = sock->usec_wait;
 
 	//TODO CHECK IF THIS IS CORRECT
 	ready = select((int) sock->socket+1, NULL, &Group, NULL, &timeout);
@@ -941,7 +963,7 @@
 	Bool is_ipv6 = GF_FALSE;
 	u32 type;
 #endif
-	unsigned long local_add_id;
+	u32 local_add_id;
 
 	if (!sock || sock->socket) return GF_BAD_PARAM;
 
@@ -1085,7 +1107,8 @@
 
 		memset(&local_address, 0, sizeof(struct sockaddr_in ));
 		local_address.sin_family = AF_INET;
-		local_address.sin_addr.s_addr = (u32) local_add_id;
+//		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));
@@ -1098,14 +1121,14 @@
 		}
 		/*setup local interface*/
 		if (local_interface_ip) {
-			ret = setsockopt(sock->socket, IPPROTO_IP, IP_MULTICAST_IF, (char *) &local_add_id, sizeof(local_add_id));
+			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;
 		}
 	}
 
 	/*now join the multicast*/
 	M_req.imr_multiaddr.s_addr = inet_addr(multi_IPAdd);
-	M_req.imr_interface.s_addr = (u32) local_add_id;
+	M_req.imr_interface.s_addr = local_add_id;
 
 	ret = setsockopt(sock->socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *) &M_req, sizeof(M_req));
 	if (ret == SOCKET_ERROR) {
@@ -1140,32 +1163,63 @@
 	return GF_OK;
 }
 
+#include <gpac/list.h>
+struct __tag_sock_group
+{
+	GF_List *sockets;
+	fd_set group;
+};
 
-//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
-GF_EXPORT
-GF_Err gf_sk_receive(GF_Socket *sock, char *buffer, u32 length, u32 startFrom, u32 *BytesRead)
+GF_SockGroup *gf_sk_group_new()
+{
+	GF_SockGroup *tmp;
+	GF_SAFEALLOC(tmp, GF_SockGroup);
+	tmp->sockets = gf_list_new();
+	FD_ZERO(&tmp->group);
+	return tmp;
+}
+
+void gf_sk_group_del(GF_SockGroup *sg)
+{
+	gf_list_del(sg->sockets);
+	gf_free(sg);
+}
+
+void gf_sk_group_register(GF_SockGroup *sg, GF_Socket *sk)
+{
+	if (sg && sk) {
+		gf_list_add(sg->sockets, sk);
+	}
+}
+void gf_sk_group_unregister(GF_SockGroup *sg, GF_Socket *sk)
+{
+	if (sg && sk) {
+		gf_list_del_item(sg->sockets, sk);
+	}
+}
+
+GF_Err gf_sk_group_select(GF_SockGroup *sg, u32 usec_wait)
 {
-	s32 res;
-#ifndef __SYMBIAN32__
 	s32 ready;
+	u32 i=0;
 	struct timeval timeout;
-	fd_set Group;
-#endif
+	u32 max_fd=0;
+	GF_Socket *sock;
 
-	*BytesRead = 0;
-	if (!sock->socket) return GF_BAD_PARAM;
-	if (startFrom >= length) return GF_IO_ERR;
-
-#ifndef __SYMBIAN32__
-	//can we read?
-	FD_ZERO(&Group);
-	FD_SET(sock->socket, &Group);
-	timeout.tv_sec = 0;
-	timeout.tv_usec = SOCK_MICROSEC_WAIT;
+	FD_ZERO(&sg->group);
+	while ((sock = gf_list_enum(sg->sockets, &i))) {
+		FD_SET(sock->socket, &sg->group);
+		if (max_fd < (u32) sock->socket) max_fd = (u32) sock->socket;
+	}
+	if (usec_wait>=1000000) {
+		timeout.tv_sec = usec_wait/1000000;
+		timeout.tv_usec = (u32) (usec_wait - (timeout.tv_sec*1000000));
+	} else {
+		timeout.tv_sec = 0;
+		timeout.tv_usec = usec_wait;
+	}
+	ready = select((int) max_fd+1, &sg->group, NULL, NULL, &timeout);
 
-	ready = select((int) sock->socket+1, &Group, NULL, NULL, &timeout);
 	if (ready == SOCKET_ERROR) {
 		switch (LASTSOCKERROR) {
 		case EBADF:
@@ -1182,10 +1236,66 @@
 			return GF_IP_NETWORK_FAILURE;
 		}
 	}
-	if (!ready || !FD_ISSET(sock->socket, &Group)) {
+	if (!ready) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[socket] nothing to be read - ready %d\n", ready));
 		return GF_IP_NETWORK_EMPTY;
 	}
+	return GF_OK;
+}
+
+Bool gf_sk_group_sock_is_set(GF_SockGroup *sg, GF_Socket *sk)
+{
+	if (sg && sk && FD_ISSET(sk->socket, &sg->group)) return GF_TRUE;
+	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
+GF_Err gf_sk_receive_internal(GF_Socket *sock, char *buffer, u32 length, u32 startFrom, u32 *BytesRead, Bool do_select)
+{
+	s32 res;
+#ifndef __SYMBIAN32__
+	s32 ready;
+	struct timeval timeout;
+	fd_set Group;
+#endif
+
+	*BytesRead = 0;
+	if (!sock || !sock->socket) return GF_BAD_PARAM;
+	if (startFrom >= length) return GF_IO_ERR;
+
+#ifndef __SYMBIAN32__
+	if (do_select) {
+		//can we read?
+		timeout.tv_sec = 0;
+		timeout.tv_usec = sock->usec_wait;
+		FD_ZERO(&Group);
+		FD_SET(sock->socket, &Group);
+		ready = select((int) sock->socket+1, &Group, NULL, NULL, &timeout);
+
+		if (ready == SOCKET_ERROR) {
+			switch (LASTSOCKERROR) {
+			case EBADF:
+				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[socket] cannot select, BAD descriptor\n"));
+				return GF_IP_CONNECTION_CLOSED;
+			case EAGAIN:
+				return GF_IP_SOCK_WOULD_BLOCK;
+			case EINTR:
+				/* Interrupted system call, not really important... */
+				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[socket] network is lost\n"));
+				return GF_IP_NETWORK_EMPTY;
+			default:
+				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[socket] cannot select (error %d)\n", LASTSOCKERROR));
+				return GF_IP_NETWORK_FAILURE;
+			}
+		}
+		if (!ready || !FD_ISSET(sock->socket, &Group)) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[socket] nothing to be read - ready %d\n", ready));
+			return GF_IP_NETWORK_EMPTY;
+		}
+	}
 #endif
 	if (sock->flags & GF_SOCK_HAS_PEER)
 		res = (s32) recvfrom(sock->socket, (char *) buffer + startFrom, length - startFrom, 0, (struct sockaddr *)&sock->dest_addr, &sock->dest_addr_len);
@@ -1224,7 +1334,19 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_sk_receive(GF_Socket *sock, char *buffer, u32 length, u32 startFrom, u32 *BytesRead)
+{
+	return gf_sk_receive_internal(sock, buffer, length, startFrom, BytesRead, GF_TRUE);
+}
 
+GF_EXPORT
+GF_Err gf_sk_receive_no_select(GF_Socket *sock, char *buffer, u32 length, u32 startFrom, u32 *BytesRead)
+{
+	return gf_sk_receive_internal(sock, buffer, length, startFrom, BytesRead, GF_FALSE);
+}
+
+GF_EXPORT
 GF_Err gf_sk_listen(GF_Socket *sock, u32 MaxConnection)
 {
 	s32 i;
@@ -1236,6 +1358,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_sk_accept(GF_Socket *sock, GF_Socket **newConnection)
 {
 	u32 client_address_size;
@@ -1253,7 +1376,7 @@
 	FD_ZERO(&Group);
 	FD_SET(sock->socket, &Group);
 	timeout.tv_sec = 0;
-	timeout.tv_usec = SOCK_MICROSEC_WAIT;
+	timeout.tv_usec = sock->usec_wait;
 
 	//TODO - check if this is correct
 	ready = select((int) sock->socket+1, &Group, NULL, NULL, &timeout);
@@ -1305,6 +1428,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_sk_get_local_info(GF_Socket *sock, u16 *Port, u32 *Familly)
 {
 #ifdef GPAC_HAS_IPV6
@@ -1340,6 +1464,7 @@
 }
 
 //we have to do this for the server sockets as we use only one thread
+GF_EXPORT
 GF_Err gf_sk_server_mode(GF_Socket *sock, Bool serverOn)
 {
 	u32 one;
@@ -1355,6 +1480,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_sk_get_remote_address(GF_Socket *sock, char *buf)
 {
 #ifdef GPAC_HAS_IPV6
@@ -1375,6 +1501,7 @@
 
 
 //send length bytes of a buffer
+GF_EXPORT
 GF_Err gf_sk_send_to(GF_Socket *sock, const char *buffer, u32 length, char *remoteHost, u16 remotePort)
 {
 	u32 count, remote_add_len;
@@ -1400,7 +1527,7 @@
 	FD_ZERO(&Group);
 	FD_SET(sock->socket, &Group);
 	timeout.tv_sec = 0;
-	timeout.tv_usec = SOCK_MICROSEC_WAIT;
+	timeout.tv_usec = sock->usec_wait;
 
 	//TODO - check if this is correct
 	ready = select((int) sock->socket+1, NULL, &Group, NULL, &timeout);
@@ -1466,9 +1593,7 @@
 	return GF_OK;
 }
 
-
-
-
+GF_EXPORT
 GF_Err gf_sk_receive_wait(GF_Socket *sock, char *buffer, u32 length, u32 startFrom, u32 *BytesRead, u32 Second )
 {
 	s32 res;
@@ -1486,7 +1611,7 @@
 	FD_ZERO(&Group);
 	FD_SET(sock->socket, &Group);
 	timeout.tv_sec = Second;
-	timeout.tv_usec = SOCK_MICROSEC_WAIT;
+	timeout.tv_usec = sock->usec_wait;
 
 	ready = select((int) sock->socket+1, &Group, NULL, NULL, &timeout);
 	if (ready == SOCKET_ERROR) {
@@ -1518,6 +1643,7 @@
 
 
 //send length bytes of a buffer
+GF_EXPORT
 GF_Err gf_sk_send_wait(GF_Socket *sock, const char *buffer, u32 length, u32 Second )
 {
 	u32 count;
@@ -1536,7 +1662,7 @@
 	FD_ZERO(&Group);
 	FD_SET(sock->socket, &Group);
 	timeout.tv_sec = Second;
-	timeout.tv_usec = SOCK_MICROSEC_WAIT;
+	timeout.tv_usec = sock->usec_wait;
 
 	//TODO - check if this is correct
 	ready = select((int) sock->socket+1, NULL, &Group, NULL, &timeout);

gpac-0.7.1.tar.gz/src/utils/os_thread.c -> gpac-0.8.0.tar.gz/src/utils/os_thread.c Changed

@@ -148,8 +148,10 @@
 {
 	int err;
 	/* We do not use any destructor */
-	if (err = pthread_key_create(&currentThreadInfoKey, NULL))
+	err = pthread_key_create(&currentThreadInfoKey, NULL);
+	if (err) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex] pthread_key_create() failed with error %d\n", err));
+	}
 }
 
 GF_Thread * gf_th_current() {
@@ -230,6 +232,11 @@
 	t->args = param;
 	t->_signal = gf_sema_new(1, 0);
 
+	if (!t->_signal)
+		return GF_IO_ERR;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_MUTEX, ("[Thread %s] Starting\n", t->log_name));
+
 #ifdef WIN32
 	t->threadH = CreateThread(NULL, t->stackSize, &(RunThread), (void *)t, 0, &id);
 	if (t->threadH != NULL) {
@@ -268,6 +275,7 @@
 	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;
 }
 
@@ -333,7 +341,7 @@
 	gf_free(t);
 }
 
-
+GF_EXPORT
 void gf_th_set_priority(GF_Thread *t, s32 priority)
 {
 #ifdef WIN32
@@ -393,6 +401,7 @@
 #endif
 }
 
+GF_EXPORT
 u32 gf_th_status(GF_Thread *t)
 {
 	if (!t) return 0;
@@ -535,7 +544,7 @@
 	int retCode;
 #endif
 #ifndef GPAC_DISABLE_LOG
-	const char *mx_holder_name = log_th_name(mx->Holder);
+	const char *mx_holder_name = mx->Holder ? log_th_name(mx->Holder) : "none";
 #endif
 	u32 caller;
 	assert(mx);
@@ -699,12 +708,8 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex] CloseHandle when deleting semaphore failed with error code %d\n", err));
 	}
 #elif defined(__DARWIN__) || defined(__APPLE__)
-#ifdef GPAC_IPHONE
 	sem_close(sm->hSemaphore);
-#else
-	sem_close(sm->hSemaphore);
-//	sem_destroy(sm->hSemaphore);
-#endif
+	sem_unlink(sm->SemName);
 	gf_free(sm->SemName);
 #else
 	sem_destroy(sm->hSemaphore);

gpac-0.7.1.tar.gz/src/utils/url.c -> gpac-0.8.0.tar.gz/src/utils/url.c Changed

gpac-0.7.1.tar.gz/src/utils/utf.c -> gpac-0.8.0.tar.gz/src/utils/utf.c Changed

@@ -388,32 +388,40 @@
 GF_EXPORT
 size_t gf_utf8_wcstombs(char* dest, size_t len, const unsigned short** srcp)
 {
-	const UTF16** sourceStart = srcp;
-	const UTF16* sourceEnd = *srcp + gf_utf8_wcslen(*srcp);
-	UTF8* targetStart = (UTF8*) dest;
-	UTF8* targetEnd = (UTF8*) dest + len;
-	ConversionFlags flags = strictConversion;
-
-	ConversionResult res = ConvertUTF16toUTF8(sourceStart, sourceEnd, &targetStart, targetEnd, flags);
-	if (res != conversionOK) return (size_t)-1;
-	*targetStart = 0;
-	*srcp=NULL;
-	return strlen(dest);
+	if (!srcp || !*srcp)
+		return 0;
+	else {
+		const UTF16** sourceStart = srcp;
+		const UTF16* sourceEnd = *srcp + gf_utf8_wcslen(*srcp);
+		UTF8* targetStart = (UTF8*) dest;
+		UTF8* targetEnd = (UTF8*) dest + len;
+		ConversionFlags flags = strictConversion;
+
+		ConversionResult res = ConvertUTF16toUTF8(sourceStart, sourceEnd, &targetStart, targetEnd, flags);
+		if (res != conversionOK) return (size_t)-1;
+		*targetStart = 0;
+		*srcp=NULL;
+		return strlen(dest);
+	}
 }
 
 GF_EXPORT
 size_t gf_utf8_mbstowcs(unsigned short* dest, size_t len, const char** srcp)
 {
-	const UTF8** sourceStart = (const UTF8**) srcp;
-	const UTF8* sourceEnd = (const UTF8*) ( *srcp + strlen( *srcp) );
-	UTF16* targetStart = (UTF16* ) dest;
-	UTF16* targetEnd = (UTF16* ) (dest + len);
-	ConversionFlags flags = strictConversion;
-	ConversionResult res = ConvertUTF8toUTF16(sourceStart, sourceEnd, &targetStart, targetEnd, flags);
-	if (res != conversionOK) return (size_t)-1;
-	*targetStart = 0;
-	*srcp=NULL;
-	return gf_utf8_wcslen(dest);
+	if (!srcp || !*srcp)
+		return 0;
+	else {
+		const UTF8** sourceStart = (const UTF8**) srcp;
+		const UTF8* sourceEnd = (const UTF8*) ( *srcp + strlen( *srcp) );
+		UTF16* targetStart = (UTF16* ) dest;
+		UTF16* targetEnd = (UTF16* ) (dest + len);
+		ConversionFlags flags = strictConversion;
+		ConversionResult res = ConvertUTF8toUTF16(sourceStart, sourceEnd, &targetStart, targetEnd, flags);
+		if (res != conversionOK) return (size_t)-1;
+		*targetStart = 0;
+		*srcp=NULL;
+		return gf_utf8_wcslen(dest);
+	}
 }

gpac-0.7.1.tar.gz/src/utils/xml_parser.c -> gpac-0.8.0.tar.gz/src/utils/xml_parser.c Changed

@@ -220,14 +220,16 @@
 	char szM[20];
 
 	va_start(args, fmt);
-	vsprintf(parser->err_msg, fmt, args);
+	vsnprintf(parser->err_msg, ARRAY_LENGTH(parser->err_msg), fmt, args);
 	va_end(args);
 
-	sprintf(szM, " - Line %d: ", parser->line + 1);
-	strcat(parser->err_msg, szM);
-	len = (u32) strlen(parser->err_msg);
-	strncpy(parser->err_msg + len, parser->buffer+ (linepos ? linepos : parser->current_pos), 10);
-	parser->err_msg[len + 10] = 0;
+	if (strlen(parser->err_msg)+30 < ARRAY_LENGTH(parser->err_msg)) {
+		snprintf(szM, 20, " - Line %d: ", parser->line + 1);
+		strcat(parser->err_msg, szM);
+		len = (u32) strlen(parser->err_msg);
+		strncpy(parser->err_msg + len, parser->buffer+ (linepos ? linepos : parser->current_pos), 10);
+		parser->err_msg[len + 10] = 0;
+	}
 	parser->sax_state = SAX_STATE_SYNTAX_ERROR;
 }
 
@@ -1222,7 +1224,7 @@
 		if (e) return e;
 
 
-		e = gf_xml_sax_parse(parser, xml_mem_address+3);
+		e = gf_xml_sax_parse(parser, xml_mem_address+4);
 		if (parser->on_progress) parser->on_progress(parser->sax_cbck, parser->file_pos, parser->file_size);
 
 		parser->elt_start_pos = parser->elt_end_pos = 0;
@@ -1241,7 +1243,7 @@
 	test = gf_fopen(fileName, "rb");
 	if (!test) return GF_URL_ERROR;
 	gf_fseek(test, 0, SEEK_END);
-	assert(gf_ftell(test) < 1<<31);
+	assert(gf_ftell(test) < 0xFFFFFFFF);
 	parser->file_size = (u32) gf_ftell(test);
 	gf_fclose(test);
 
@@ -1375,7 +1377,7 @@
 							}\
 							if (__is_copy) { memmove(szLine, __str, sizeof(char)*_len); szLine[_len] = 0; }\
 							else strcat(szLine, __str); \
- 
+
 	from_buffer=GF_FALSE;
 #ifdef NO_GZIP
 	if (!parser->f_in) from_buffer=GF_TRUE;
@@ -1646,7 +1648,7 @@
 		par->root = node;
 		gf_list_add(par->root_nodes, node);
 	}
-	
+
 	for (i=0; i<nb_attributes; i++) {
 		GF_XMLAttribute *att;
 		GF_SAFEALLOC(att, GF_XMLAttribute);
@@ -1713,7 +1715,7 @@
 	GF_DOMParser *dom;
 	GF_SAFEALLOC(dom, GF_DOMParser);
 	if (!dom) return NULL;
-	
+
 	dom->root_nodes = gf_list_new();
 	return dom;
 }
@@ -1854,7 +1856,7 @@
 	}	\
 	strcat((*str), v);	\
 	*size += vlen;	\
- 
+
 	switch (node->type) {
 	case GF_XML_CDATA_TYPE:
 		SET_STRING("![CDATA[");
@@ -2005,7 +2007,7 @@
 	else if (strstr(att->value, "0X")) { u32 __i; sscanf(att->value+2, "%X", &__i); _value = __i; }\
 	else sscanf(att->value, _fmt, &_value); \
 	}\
- 
+
 
 static GF_Err gf_xml_parse_bit_sequence_bs(GF_XMLNode *bsroot, GF_BitStream *bs)
 {
@@ -2062,7 +2064,11 @@
 				value = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
 				nb_bits = 32;
 			} else if (!stricmp(att->name, "ID128")) {
-				gf_bin128_parse(att->value, word128);
+				GF_Err e = gf_bin128_parse(att->value, word128);
+ if (e != GF_OK) {
+ GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[XML/NHML] Cannot parse ID128\n"));
+ return e;
+ }
 				use_word128 = GF_TRUE;
 			} else if (!stricmp(att->name, "textmode")) {
 				if (!strcmp(att->value, "yes")) use_text = GF_TRUE;

gpac-0.7.1.tar.gz/static.mak -> gpac-0.8.0.tar.gz/static.mak Changed

gpac-0.7.1.tar.gz/tests/README.MD -> gpac-0.8.0.tar.gz/tests/README.MD Changed

gpac-0.7.1.tar.gz/tests/make_tests.sh -> gpac-0.8.0.tar.gz/tests/make_tests.sh Changed

@@ -49,6 +49,7 @@
 fuzz_all=0
 fuzz_duration=60
 no_fuzz_cleanup=0
+skip_next_hash_test=0
 
 current_script=""
 
@@ -79,7 +80,8 @@
 #dir where all logs are generated
 LOGS_DIR="$LOCAL_OUT_DIR/logs"
 #temp dir for any test
-TEMP_DIR="$LOCAL_OUT_DIR/temp"
+INTERN_TEMP_DIR="$LOCAL_OUT_DIR/temp"
+TEMP_DIR=$INTERN_TEMP_DIR
 
 ALL_REPORTS="$LOCAL_OUT_DIR/all_results.xml"
 ALL_LOGS="$LOCAL_OUT_DIR/all_logs.txt"
@@ -114,8 +116,8 @@
 mkdir $RULES_DIR
 fi
 
-if [ ! -e $TEMP_DIR ] ; then
-mkdir $TEMP_DIR
+if [ ! -e $INTERN_TEMP_DIR ] ; then
+mkdir $INTERN_TEMP_DIR
 fi
 
 L_ERR=1
@@ -162,14 +164,15 @@
 
 print_usage ()
 {
-echo "GPAC Test Suite Usage: use either one of this command or no command at all"
+echo "GPAC Test Suite Usage: $0 [<options>] [<SCRIPTS>]"
+echo ""
 echo "*** Test suite validation options"
-echo " -clean [ARG]: removes all removes all results (logs, stat cache and video). If ARG is specified, only clean tests generated by script ARG."
+echo " -clean [ARG]: removes all removes all results (logs, stat cache and video). If ARG is specified, only clean tests generated by scripts ARG."
 echo " -play-all: force playback of BT and XMT files for BIFS (by default only MP4)."
 echo " -no-hash: runs test suite without hash checking."
 echo ""
 echo "*** Test suite generation options"
-echo " -clean-hash [ARG]: removes all generated hash, logs, stat cache and videos. If ARG is specified, only clean tests generated by script ARG."
+echo " -clean-hash [ARG]: removes all generated hash, logs, stat cache and videos. If ARG is specified, only clean tests generated by scripts ARG."
 echo " -hash: regenerate tests with missing hash files."
 echo " -uirec: generates UI event traces."
 echo " -uiplay: replays all recorded UI event traces."
@@ -187,6 +190,7 @@
 echo " -keep-avi: keeps raw AVI files (warning this can be pretty big)"
 echo " -keep-tmp: keeps tmp folder used in tests (erased by default)"
 echo " -sync-hash: syncs all remote reference hashes with local base"
+echo " -git-hash: syncs all remote reference hashes from git with local base"
 echo " -sync-media: syncs all remote media with local base (warning this can be long)"
 echo " -sync-refs: syncs all remote reference videos with local base (warning this can be long)"
 echo " -sync-before: syncs all remote resources with local base (warning this can be long) before running the tests"
@@ -194,6 +198,8 @@
 echo " -track-stack: track stack in malloc and turns on -warn option"
 echo " -noplay: disables MP4Client tests"
 echo " -test=NAME only executes given test"
+echo " -precommit alias for -sync-before -git-hash -warn -noplay. Before commit/push, you should run ./make_tests -precommit"
+echo " SCRIPTS only runs the scripts provided as arguments, by default runs everything in $SCRIPTS_DIR"
 echo " -v: set verbose output"
 echo " -h: print this help"
 }
@@ -207,19 +213,25 @@
 mkdir $EXTERNAL_MEDIA_DIR
 fi
 cd $EXTERNAL_MEDIA_DIR
- wget -q -m -nH --no-parent --cut-dirs=4 --reject "*.gif" "$REFERENCE_DIR/media/"
+ wget -q -m -nH --no-parent --cut-dirs=4 --reject "*.gif" --reject "index.html*" --restrict-file-names=nocontrol "$REFERENCE_DIR/media/"
 cd "$main_dir"
 }
 
-#performs mirroring of media
 sync_hash ()
 {
-log $L_INF "- Mirroring reference hashes from from $REFERENCE_DIR to $HASH_DIR"
+log $L_INF "- Mirroring reference hashes from from github to $HASH_DIR"
 cd $HASH_DIR
-wget -q -m -nH --no-parent --cut-dirs=4 --reject "*.gif" "$REFERENCE_DIR/hash_refs/"
+if [ ! -d ".git" ]; then
+ rm -f *
+ git clone https://github.com/gpac/gpac-test-hash.git .
+else
+ git fetch origin
+ git reset --hard origin/master
+fi
 cd "$main_dir"
 }
 
+
 #performs mirroring of media and references hash & videos
 sync_refs ()
 {
@@ -230,7 +242,7 @@
 }
 
 
-url_arg=""
+url_arg=()
 do_clean=0
 keep_avi=0
 do_clean_hash=0
@@ -240,7 +252,7 @@
 track_stack=0
 speed=1
 single_test_name=""
-erase_temp_dir=1
+keep_temp_dir=0
 
 #Parse arguments
 for i in $* ; do
@@ -263,7 +275,7 @@
 "-keep-avi")
 keep_avi=1;;
 "-keep-tmp")
- erase_temp_dir=0;;
+ keep_temp_dir=1;;
 "-no-hash")
 disable_hash=1;;
 "-strict")
@@ -280,6 +292,8 @@
 "-sync-hash")
 sync_hash
 exit;;
+ "-git-hash")
+ sync_hash;;
 "-sync-media")
 sync_media;;
 "-sync-refs")
@@ -300,6 +314,12 @@
 ;;
 "-v")
 verbose=1;;
+ "-precommit")
+ sync_media
+ sync_hash
+ log_after_fail=1
+ MP4CLIENT_NOT_FOUND=1
+ ;;
 "-h")
 print_usage
 exit;;
@@ -307,12 +327,7 @@
 log $L_ERR "Unknown Option \"$i\" - check usage (-h)"
 exit;;
 *)
- if [ -n "$url_arg" ] ; then
- log $L_ERR "More than one input specified - check usage (-h)"
- exit
- else
- url_arg=$i
- fi
+ url_arg+=("$i")
 ;;
 esac
 done
@@ -329,9 +344,8 @@
 #force cleaning as well
 do_clean=1
 
- if [ -n "$url_arg" ] ; then
- do_clean=1
- else
+ #when using specific scripts, cleanup will be done in test_begin()
+ if [ "${#url_arg[@]}" -eq 0 ] ; then
 read -p "This will remove all referenced videos and hashes. Are you sure (y/n)?" choice
 if [ $choice != "y" ] ; then
 log $L_ERR "Canceled"
@@ -347,10 +361,8 @@
 if [ $do_clean != 0 ] ; then
 rm -f $ALL_REPORTS > /dev/null
 rm -f $ALL_LOGS > /dev/null
- rm -rf $TEMP_DIR/* 2> /dev/null
- if [ -n "$url_arg" ] ; then
- do_clean=1
- else
+ rm -rf $INTERN_TEMP_DIR/* 2> /dev/null
+ if [ "${#url_arg[@]}" -eq 0 ] ; then
 echo "Deleting cache (logs, stats and videos)"
 rm -rf $LOGS_DIR/* > /dev/null
 rm -rf $VIDEO_DIR/* 2> /dev/null
@@ -443,21 +455,25 @@
 MP4Client -run-for 0 2> /dev/null
 res=$?
 if [ $res != 0 ] ; then
+ # to remove when travis is ready to execute playback tests
 MP4CLIENT_NOT_FOUND=1
 echo ""
 log $L_WAR "WARNING: MP4Client not found (ret $res) - launch results:"
 MP4Client -run-for 0
 res=$?
 if [ $res = 0 ] ; then
- log $L_INF "MP4Client returned $res on second run - enabling all playback tests"
+ log $L_INF "MP4Client returned $res on second run - all playback tests ready but still disabled"
 else
 echo "** MP4Client returned $res - disabling all playback tests - dumping GPAC config file **"
 cat $HOME/.gpac/GPAC.cfg
 echo "** End of dump **"
+ MP4CLIENT_NOT_FOUND=1
 fi
 fi
 fi
 
+disable_playback=$MP4CLIENT_NOT_FOUND
+
 MP42TS -h 2> /dev/null
 res=$?
 if [ $res != 0 ] ; then
@@ -514,9 +530,11 @@
 MP42TS="MP42TS $base_args"
 DASHCAST="DashCast $base_args"
 
-$MP4BOX -version 2> $TEMP_DIR/version.txt
-VERSION="`head -1 $TEMP_DIR/version.txt | cut -d ' ' -f 5-` "
-rm $TEMP_DIR/version.txt
+$MP4BOX -version 2> $INTERN_TEMP_DIR/version.txt
+VERSION="`head -1 $INTERN_TEMP_DIR/version.txt | cut -d ' ' -f 5-` "
+rm $INTERN_TEMP_DIR/version.txt
+log $L_INF "GPAC version: $VERSION"
+log $L_INF ""
 
 #reset all the possible return values
 reset_stat ()
@@ -548,10 +566,17 @@
 result=""
 TEST_NAME=$1
 fuzz_test=$fuzz_all
+ is_fuzz_test=0
 reference_hash_valid="$HASH_DIR/$TEST_NAME-valid-hash"
 
 log $L_DEB "Starting test $TEST_NAME"
 
+ TEMP_DIR=$INTERN_TEMP_DIR
+
+ report="$TEMP_DIR/$TEST_NAME-temp.txt"
+ LOGS="$LOGS_DIR/$TEST_NAME-logs.txt-new"
+ final_report="$LOGS_DIR/$TEST_NAME-passed.xml"
+
 
 if [ $do_clean != 0 ] ; then
 if [ $do_clean_hash != 0 ] ; then
@@ -578,9 +603,12 @@
 return
 fi
 
- report="$TEMP_DIR/$TEST_NAME-temp.txt"
- LOGS="$LOGS_DIR/$TEST_NAME-logs.txt-new"
- final_report="$LOGS_DIR/$TEST_NAME-passed.xml"
+ if [ $keep_temp_dir != 0 ] ; then
+ 	TEMP_DIR="$INTERN_TEMP_DIR/$TEST_NAME"
+	if [ ! -e $TEMP_DIR ] ; then
+		mkdir $TEMP_DIR
+	fi
+ fi
 
 #reset defaults
 dump_dur=$DEF_DUMP_DUR
@@ -606,7 +634,7 @@
 fi
 fi
 
- if [ $MP4CLIENT_NOT_FOUND > 0 ] ; then
+ if [ $MP4CLIENT_NOT_FOUND = 0 ] ; then
 skip_play_hash=1
 fi
 
@@ -676,6 +704,8 @@
 #wait for all sub-tests to complete (some may use subshells)
 wait
 
+ TEMP_DIR=$INTERN_TEMP_DIR
+
 if [ $# -gt 0 ] ; then
 log $L_ERR "> in test $TEST_NAME in script $current_script line $BASH_LINENO"
 log $L_ERR "	@test_end takes no argument - wrong call"
@@ -760,6 +790,7 @@
 HASH_TEST=""
 HASH_NOT_FOUND=0
 HASH_FAIL=0
+ SRC_NOT_FOUND=0
 
 source $i
 nb_test_hash=$((nb_test_hash + 1))
@@ -767,6 +798,11 @@
 result="$HASH_TEST:HashNotFound $result"
 nb_hash_missing=$((nb_hash_missing + 1))
 test_exec_na=$((test_exec_na + 1))
+ elif [ $SRC_NOT_FOUND -eq 1 ] ; then
+ result="$HASH_TEST:HashSourceNotFound $result"
+ test_ok=0
+ nb_hash_fail=$((nb_hash_fail + 1))
+ test_exec_na=$((test_exec_na + 1))
 elif [ $HASH_FAIL -eq 1 ] ; then
 result="$HASH_TEST:HashFail $result"
 test_ok=0
@@ -785,8 +821,8 @@
 if [ $generate_hash = 1 ] ; then
 log $L_DEB "Test $TEST_NAME $nb_subtests subtests and $nb_test_hash hashes"
 nb_hashes=$((nb_test_hash + nb_test_hash))
-	#only allow no hash if only one subtest
- if [ $subtest_idx -gt 1 ] && [ $nb_hashes -lt $subtest_idx ] ; then
+ 	#only allow no hash if only one subtest or fuzzing
+ if [ $subtest_idx -gt 1 ] && [ $nb_hashes -lt $subtest_idx ] && [ $is_fuzz_test = 0 ]; then
 log $L_ERR "Test $TEST_NAME has too few hash tests: $nb_hashes for $nb_subtests subtests - please fix"
 result="NOT ENOUGH HASHES"
 else
@@ -830,6 +866,7 @@
 log $L_ERR "$TEST_NAME: $result"
 fi
 
+shopt -u nullglob
 }
 
 do_fuzz()
@@ -886,6 +923,7 @@
 ret=0
 do_test ()
 {
+ skip_next_hash_test=0
 
 if [ $# -gt 2 ] ; then
 log $L_ERR "> in test $TEST_NAME in script $current_script line $BASH_LINENO"
@@ -902,19 +940,24 @@
 return
 fi
 
- if [ $MP4CLIENT_NOT_FOUND != 0 ] ; then
+ if [ $MP4CLIENT_NOT_FOUND = 1 ] ; then
 	case $1 in MP4Client*)
 		return
 	esac
 fi
+
 log L_DEB "executing $1"
 
 subtest_idx=$((subtest_idx + 1))
 
 log_subtest="$LOGS_DIR/$TEST_NAME-logs-$subtest_idx-$2.txt"
- stat_subtest="$TEMP_DIR/$TEST_NAME-stats-$subtest_idx-$2.sh"
+ stat_subtest="$INTERN_TEMP_DIR/$TEST_NAME-stats-$subtest_idx-$2.sh"
 SUBTEST_NAME=$2
 
+ if [ $fuzz_test = 1 ] ; then
+ is_fuzz_test=1
+ fi
+
 if [ $enable_fuzzing = 0 ] ; then
 fuzz_test=0
 fi
@@ -980,6 +1023,7 @@
 if [ -n "$res_err" ]; then
 echo "Negative test detected, reverting to success (found \"$res_err\" in stderr)" >> $log_subtest
 rv=0
+ skip_next_hash_test=1
 echo "" > $stat_subtest
 break
 fi
@@ -1024,12 +1068,17 @@
 return
 fi
 
+ if [ $MP4CLIENT_NOT_FOUND = 1 ] ; then
+ return
+ fi
+
+
 if [ $single_test = 1 ] ; then
 FULL_SUBTEST="$TEST_NAME"
 else
 FULL_SUBTEST="$TEST_NAME-$2"
 fi
- AVI_DUMP="$TEMP_DIR/$FULL_SUBTEST-dump"
+ AVI_DUMP="$INTERN_TEMP_DIR/$FULL_SUBTEST-dump"
 
 args="$MP4CLIENT -avi 0-$dump_dur -out $AVI_DUMP -size $dump_size $1"
 
@@ -1044,6 +1093,9 @@
 
 #don't try hash if error
 if [ $ret != 0 ] ; then
+ if [ $keep_avi != 0 ] ; then
+ rm "$AVI_DUMP.avi" 2> /dev/null
+ fi
 return
 fi
 
@@ -1085,6 +1137,10 @@
 #@do_hash_test: generates a hash for $1 file , compare it to HASH_DIR/$TEST_NAME$2.hash
 do_hash_test ()
 {
+ if [ $skip_next_hash_test = 1 ] ; then
+ skip_next_hash_test=0
+ return
+ fi
 
 if [ $# -gt 2 ] ; then
 log $L_ERR "> in test $TEST_NAME in script $current_script line $BASH_LINENO"
@@ -1105,30 +1161,43 @@
 return
 fi
 
- STATHASH_SH="$TEMP_DIR/$TEST_NAME-stathash-$2.sh"
+ STATHASH_SH="$INTERN_TEMP_DIR/$TEST_NAME-stathash-$2.sh"
 
- test_hash="$TEMP_DIR/$TEST_NAME-$2-test.hash"
+ test_hash="$INTERN_TEMP_DIR/$TEST_NAME-$2-test.hash"
 ref_hash="$HASH_DIR/$TEST_NAME-$2.hash"
 
 echo "HASH_TEST=$2" > $STATHASH_SH
 
- echo "Computing $1 ($2) hash: " >> $log_subtest
+ #redefine log subtest var using the hash name in case the subtest was a subscript (do_test &)
+ log_subt="$LOGS_DIR/$TEST_NAME-logs-$subtest_idx-$2.txt"
+
+ echo "Computing $1 ($2) hash: " >> $log_subt
 file_to_hash="$1"
 
 # for text files, we remove potential CR chars
 # to prevent having different hashes on different platforms
- if [ -n "$(file -b $1 | grep text)" ] || [ ${1: -4} == ".lsr" ] ; then
+ if [ -n "$(file -b $1 | grep text)" ] || [ ${1: -4} == ".lsr" ] || [ ${1: -4} == ".svg" ] ; then
 file_to_hash="to_hash_$(basename $1)"
- tr -d '\r' < "$1" > "$file_to_hash"
+ if [ -f $1 ]; then
+ tr -d '\r' < "$1" > "$file_to_hash"
+ fi
 fi
 
- $MP4BOX -hash -std $file_to_hash > $test_hash 2>> $log_subtest
+ $MP4BOX -hash -std $file_to_hash > $test_hash 2>> $log_subt
 
- if [ "$file_to_hash" != "$1" ]; then
+ if [ "$file_to_hash" != "$1" ] && [ -f "$file_to_hash" ]; then
 rm "$file_to_hash"
 fi
 
 if [ $generate_hash = 0 ] ; then
+ if [ ! -f $1 ] ; then
+ echo "SRC_NOT_FOUND=1" >> $STATHASH_SH
+ echo "HASH_FAIL=0" >> $STATHASH_SH
+ echo "not found $1"
+ return
+ fi
+
+ echo "SRC_NOT_FOUND=0" >> $STATHASH_SH
 if [ ! -f $ref_hash ] ; then
 echo "HASH_NOT_FOUND=1" >> $STATHASH_SH
 return
@@ -1140,11 +1209,31 @@
 rv=$?
 
 if [ $rv != 0 ] ; then
+ hashres=0
 fhash=`hexdump -ve '1/1 "%.2X"' $ref_hash`
- echo "Hash fail, ref hash $ref_hash was $fhash" >> $log_subtest
- echo "HASH_FAIL=1" >> $STATHASH_SH
+ echo "Hash fail, ref hash $ref_hash was $fhash" >> $log_subt
+ shopt -s nullglob
+ for alt_ref in "$ref_hash-alt"* ; do
+ $DIFF $test_hash $alt_ref > /dev/null
+ rv_alt=$?
+ if [ $rv_alt != 0 ] ; then
+ fhash=`hexdump -ve '1/1 "%.2X"' $alt_ref`
+ echo "Hash alt fail, alt ref $alt_ref was $fhash" >> $log_subt
+ else
+ hashres=1
+ echo "Hash alt OK with alt ref $alt_ref" >> $log_subt
+ break
+ fi
+ done
+ shopt -u nullglob
+ if [ $hashres != 0 ] ; then
+ echo "Hash OK for $1" >> $log_subt
+ echo "HASH_FAIL=0" >> $STATHASH_SH
+ else
+ echo "HASH_FAIL=1" >> $STATHASH_SH
+ fi
 else
- echo "Hash OK for $1" >> $log_subtest
+ echo "Hash OK for $1" >> $log_subt
 echo "HASH_FAIL=0" >> $STATHASH_SH
 fi
 rm $test_hash
@@ -1162,8 +1251,8 @@
 log $L_ERR "> in test $TEST_NAME in script $current_script line $BASH_LINENO"
 log $L_ERR "	@do_compare_file_hashes takes only two arguments - wrong call (first arg is $1)"
 fi
-test_hash_first="$TEMP_DIR/$TEST_NAME-$(basename $1).hash"
-test_hash_second="$TEMP_DIR/$TEST_NAME-$(basename $2).hash"
+test_hash_first="$INTERN_TEMP_DIR/$TEST_NAME-$(basename $1).hash"
+test_hash_second="$INTERN_TEMP_DIR/$TEST_NAME-$(basename $2).hash"
 
 $MP4BOX -hash -std $1 > $test_hash_first 2> /dev/null
 $MP4BOX -hash -std $1 > $test_hash_second 2> /dev/null
@@ -1346,7 +1435,7 @@
 echo "<GPACTestSuite version=\"$VERSION\" platform=\"$platform\" start_date=\"$start_date\" end_date=\"$(date '+%d/%m/%Y %H:%M:%S')\">" >> $ALL_REPORTS
 
 
-if [ $erase_temp_dir != 0 ] ; then
+if [ $keep_temp_dir != 1 ] ; then
 rm -rf $TEMP_DIR/* 2> /dev/null
 fi
 
@@ -1391,7 +1480,6 @@
 TESTS_TOTAL=$((TESTS_TOTAL + 1))
 if [ $TEST_SKIP = 0 ] ; then
 TESTS_DONE=$((TESTS_DONE + 1))
-cp $i "test.txt"
 else
 TESTS_SKIP=$((TESTS_SKIP + $TEST_SKIP))
 fi
@@ -1531,28 +1619,39 @@
 # disable nullglobing in case sub-scripts aren't made for it
 shopt -u nullglob
 
+
+# by default run everything in scripts/ dir
+scripts_torun="$SCRIPTS_DIR/*.sh"
+
+# if a subset of tests was provided, run only these
+if [ "${#url_arg[@]}" -gt 0 ] ; then
+ scripts_torun="${url_arg[@]}"
+fi
+
 #run our tests
-if [ -n "$url_arg" ] ; then
- current_script=$url_arg
- source $url_arg
-else
- for i in $SCRIPTS_DIR/*.sh ; do
- if [ $verbose = 1 ] ; then
- log $L_DEB "Source script: $i"
- fi
- current_script=$i
- source $i
- cd $main_dir
- #break if error and error
- if [ $strict_mode = 1 ] ; then
- #wait for all tests to be done before checking error marker
- wait
- if [ -f $TEST_ERR_FILE ] ; then
- break
- fi
- fi
- done
+for i in $scripts_torun ; do
+if [ $verbose = 1 ] ; then
+ log $L_DEB "Source script: $i"
 fi
+current_script=$i
+source $i
+cd $main_dir
+#break if error and error
+if [ $strict_mode = 1 ] ; then
+ #wait for all tests to be done before checking error marker
+ wait
+ if [ -f $TEST_ERR_FILE ] ; then
+ break
+ fi
+fi
+
+#cleanup temp dir
+if [ $keep_temp_dir != 1 ] ; then
+ rm -rf $TEMP_DIR/* 2> /dev/null
+fi
+
+done
+
 
 #wait for all tests to be done, since some tests may use subshells
 wait

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/count_video.mp4 Added

gpac-0.7.1.tar.gz/tests/media/auxiliary_files/counter.hvc -> gpac-0.8.0.tar.gz/tests/media/auxiliary_files/counter.hvc Changed

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/enstvid.ivf Added

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/video.av1 Added

gpac-0.7.1.tar.gz/tests/media/bifs/bifs-media-imagetexture-transparent.bt -> gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-imagetexture-transparent.bt Changed

gpac-0.8.0.tar.gz/tests/media/dash_cues Added

gpac-0.8.0.tar.gz/tests/media/dash_cues/counter_cues_cts.xml Added

gpac-0.8.0.tar.gz/tests/media/dash_cues/counter_cues_cts_broken.xml Added

gpac-0.8.0.tar.gz/tests/media/dash_cues/counter_cues_dts.xml Added

gpac-0.8.0.tar.gz/tests/media/dash_cues/counter_cues_pres_time.xml Added

gpac-0.8.0.tar.gz/tests/media/dash_cues/counter_cues_sn.xml Added

gpac-0.8.0.tar.gz/tests/media/encryption/adobe.xml Changed

gpac-0.8.0.tar.gz/tests/media/encryption/cbc.xml Changed

gpac-0.8.0.tar.gz/tests/media/encryption/cbcs.xml Added

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" />
+<GPACDRM type="CENC AES-CBC Pattern">
+
+<DRMInfo type="pssh" version="0">
+<BS ID128="9A04F07998404286AB92E65BE0885F95"/>
+<BS data="application/data;base64:ACE125"/>
+<BS sourceFile="cenc_blob.bin"/>
+</DRMInfo>
+
+
+<DRMInfo type="pssh" version="1" cypherOffset="9" cypherIV="0x00000000000000000000000000000001" cypherKey="0x6770616363656E6364726D746F6F6C31">
+<BS ID128="6770616363656E6364726D746F6F6C31"/>
+<BS value="1" bits="32"/>
+<BS ID128="0x279926496a7f5d25da69f2b3b2799a7f"/>
+<BS bits="8" string="CID=Toto"/>
+<BS ID128="0xccc0f2b3b279926496a7f5d25da692f6"/>
+</DRMInfo>
+
+<CrypTrack trackID="1" IsEncrypted="1" IV_size="16" first_IV="0x0a610676cb88f302d10ac8bc66e039ed" saiSavedBox="senc">
+<key KID="0x279926496a7f5d25da69f2b3b2799a7f" value="0xccc0f2b3b279926496a7f5d25da692f6"/>
+</CrypTrack>
+
+</GPACDRM>
+
+

gpac-0.8.0.tar.gz/tests/media/encryption/cbcs_const.xml Added

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" />
+<GPACDRM type="CENC AES-CBC Pattern">
+
+<DRMInfo type="pssh" version="0">
+<BS ID128="9A04F07998404286AB92E65BE0885F95"/>
+<BS data="application/data;base64:ACE125"/>
+<BS sourceFile="cenc_blob.bin"/>
+</DRMInfo>
+
+
+<DRMInfo type="pssh" version="1" cypherOffset="9" cypherIV="0x00000000000000000000000000000001" cypherKey="0x6770616363656E6364726D746F6F6C31">
+<BS ID128="6770616363656E6364726D746F6F6C31"/>
+<BS value="1" bits="32"/>
+<BS ID128="0x279926496a7f5d25da69f2b3b2799a7f"/>
+<BS bits="8" string="CID=Toto"/>
+<BS ID128="0xccc0f2b3b279926496a7f5d25da692f6"/>
+</DRMInfo>
+
+<CrypTrack trackID="1" IsEncrypted="1" constant_IV_size="16" constant_IV="0x0a610676cb88f302d10ac8bc66e039ed" saiSavedBox="senc">
+<key KID="0x279926496a7f5d25da69f2b3b2799a7f" value="0xccc0f2b3b279926496a7f5d25da692f6"/>
+</CrypTrack>
+
+</GPACDRM>
+
+

gpac-0.8.0.tar.gz/tests/media/encryption/cens.xml Added

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" />
+<GPACDRM type="CENC AES-CTR Pattern">
+
+<DRMInfo type="pssh" version="0">
+<BS ID128="9A04F07998404286AB92E65BE0885F95"/>
+<BS data="application/data;base64:ACE125"/>
+<BS sourceFile="cenc_blob.bin"/>
+</DRMInfo>
+
+
+<DRMInfo type="pssh" version="1" cypherOffset="9" cypherKey="0x6770616363656E6364726D746F6F6C31" cypherIV="0x00000000000000000000000000000001">
+<BS ID128="6770616363656E6364726D746F6F6C31"/>
+<BS value="1" bits="32"/>
+<BS ID128="0x279926496a7f5d25da69f2b3b2799a7f"/>
+<BS bits="8" string="CID=Toto"/>
+<BS ID128="0x5544694d47473326622665665a396b36"/>
+</DRMInfo>
+
+<CrypTrack trackID="1" IsEncrypted="1" IV_size="16" first_IV="0x0a610676cb88f302d10ac8bc66e039ed" saiSavedBox="senc" skip_byte_block="1" crypt_byte_block="10">
+<key KID="0x279926496a7f5d25da69f2b3b2799a7f" value="0x5544694d47473326622665665a396b36"/>
+</CrypTrack>
+
+</GPACDRM>
+
+

gpac-0.8.0.tar.gz/tests/media/encryption/cens_64iv.xml Added

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" />
+<GPACDRM type="CENC AES-CTR Pattern">
+
+<DRMInfo type="pssh" version="0">
+<BS ID128="9A04F07998404286AB92E65BE0885F95"/>
+<BS data="application/data;base64:ACE125"/>
+<BS sourceFile="cenc_blob.bin"/>
+</DRMInfo>
+
+
+<DRMInfo type="pssh" version="1" cypherOffset="9" cypherKey="0x6770616363656E6364726D746F6F6C31" cypherIV="0x00000000000000000000000000000001">
+<BS ID128="6770616363656E6364726D746F6F6C31"/>
+<BS value="1" bits="32"/>
+<BS ID128="0x279926496a7f5d25da69f2b3b2799a7f"/>
+<BS bits="8" string="CID=Toto"/>
+<BS ID128="0x5544694d47473326622665665a396b36"/>
+</DRMInfo>
+
+<CrypTrack trackID="1" IsEncrypted="1" IV_size="8" first_IV="0xd10ac8bc66e039ed" saiSavedBox="senc" skip_byte_block="1" crypt_byte_block="10">
+<key KID="0x279926496a7f5d25da69f2b3b2799a7f" value="0x5544694d47473326622665665a396b36"/>
+</CrypTrack>
+
+</GPACDRM>
+
+

gpac-0.8.0.tar.gz/tests/media/encryption/ctr.xml Added

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_64iv.xml Added

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_64iv_clearbytes.xml Added

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_ba_always.xml Added

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_ba_none.xml Added

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_forceclear.xml Added

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_piff.xml Added

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_rap.xml Added

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_roll.xml Changed

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_shdr.xml Added

gpac-0.8.0.tar.gz/tests/media/encryption/isma.xml Added

gpac-0.7.1.tar.gz/tests/media/webvtt/svg.vtt -> gpac-0.8.0.tar.gz/tests/media/webvtt/svg.vtt Changed

gpac-0.7.1.tar.gz/tests/media/webvtt/timestamps-invalid.vtt -> gpac-0.8.0.tar.gz/tests/media/webvtt/timestamps-invalid.vtt Changed

gpac-0.8.0.tar.gz/tests/rules/counter_cues_cts-negctts-dash-stderr.txt Added

gpac-0.8.0.tar.gz/tests/rules/counter_cues_cts_broken-edits-dash-stderr.txt Added

gpac-0.8.0.tar.gz/tests/rules/counter_cues_cts_broken-negctts-dash-stderr.txt Added

gpac-0.8.0.tar.gz/tests/scripts/aac_sbr.sh Added

gpac-0.8.0.tar.gz/tests/scripts/audelim.sh Added

gpac-0.8.0.tar.gz/tests/scripts/audio_sample_entry.sh Added

gpac-0.8.0.tar.gz/tests/scripts/auxv.sh Added

gpac-0.7.1.tar.gz/tests/scripts/bifs_all.sh -> gpac-0.8.0.tar.gz/tests/scripts/bifs_all.sh Changed

gpac-0.8.0.tar.gz/tests/scripts/charset.sh Added

gpac-0.7.1.tar.gz/tests/scripts/compositor_modes.sh -> gpac-0.8.0.tar.gz/tests/scripts/compositor_modes.sh Changed

gpac-0.8.0.tar.gz/tests/scripts/dash-cenc.sh Added

gpac-0.8.0.tar.gz/tests/scripts/dash-descriptor.sh Added

gpac-0.8.0.tar.gz/tests/scripts/dash-dynamic.sh Added

@@ -0,0 +1,177 @@
+#!/bin/sh
+
+test_begin "dash-dynamic-simple"
+
+if [ $test_skip  = 0 ] ; then
+
+$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264:dur=10 -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_audio.aac:dur=10 -new $TEMP_DIR/file.mp4 2> /dev/null
+
+do_test "$MP4BOX -dash-live 2000 -closest -subdur 2000 -profile live -mpd-refresh 10 -time-shift -1 -run-for 4000 $TEMP_DIR/file.mp4#video $TEMP_DIR/file.mp4#audio -out $TEMP_DIR/file.mpd" "dash-gen" &
+
+sleep 1
+
+dump_dur=2
+do_playback_test "$TEMP_DIR/file.mpd" "dash-play"
+
+#wait for the end of the MP4Box
+wait
+
+#hash the final MPD (written as  static)
+do_hash_test $TEMP_DIR/file.mpd "hash-mpd"
+
+#hash 3rd segment of video and audio, making sur the tfdt is correct
+do_hash_test $TEMP_DIR/file_dash_track1_2.m4s "hash-seg2-video"
+do_hash_test $TEMP_DIR/file_dash_track2_2.m4s "hash-seg2-audio"
+
+fi
+
+test_end
+
+
+test_begin "dash-dynamic-loop"
+
+if [ $test_skip  = 0 ] ; then
+
+#import 2.4sec (2.4 gops) and dash using loop mode
+$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264:dur=2.4 -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_audio.aac:dur=2.4 -new $TEMP_DIR/file.mp4 2> /dev/null
+
+do_test "$MP4BOX -dash-live 2000 -closest -subdur 2000 -profile live -mpd-refresh 10 -time-shift -1 -run-for 4000 $TEMP_DIR/file.mp4#video $TEMP_DIR/file.mp4#audio -out $TEMP_DIR/file.mpd" "dash-gen" &
+
+sleep 1
+
+dump_dur=2
+do_playback_test "$TEMP_DIR/file.mpd" "dash-play"
+
+#wait for the end of the MP4Box
+wait
+
+#hash the final MPD (written as  static)
+do_hash_test $TEMP_DIR/file.mpd "hash-mpd"
+
+#hash 3rd segment of video and audio
+do_hash_test $TEMP_DIR/file_dash_track1_2.m4s "hash-seg2-video"
+do_hash_test $TEMP_DIR/file_dash_track2_2.m4s "hash-seg2-audio"
+
+fi
+
+test_end
+
+
+
+test_begin "dash-dynamic-loop-dur-less-than-seg"
+
+if [ $test_skip  = 0 ] ; then
+
+#import 10 sec (10 gops) and dash for a shorter media duration using loop mode
+$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264:dur=10 -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_audio.aac:dur=10 -new $TEMP_DIR/file.mp4 2> /dev/null
+
+do_test "$MP4BOX -dash-live 2000 -subdur 2000 -profile live -mpd-refresh 10 -time-shift -1 -run-for 4000 $TEMP_DIR/file.mp4#video:dur=1.40001 $TEMP_DIR/file.mp4#audio:dur=1.40001 -out $TEMP_DIR/file.mpd" "dash-gen" &
+
+sleep 1
+
+dump_dur=2
+do_playback_test "$TEMP_DIR/file.mpd" "dash-play"
+
+#wait for the end of the MP4Box
+wait
+
+#hash the final MPD (written as  static)
+do_hash_test $TEMP_DIR/file.mpd "hash-mpd"
+
+do_hash_test $TEMP_DIR/file_dash_track1_2.m4s "hash-seg2-video"
+do_hash_test $TEMP_DIR/file_dash_track2_2.m4s "hash-seg2-audio"
+
+fi
+
+test_end
+
+
+test_begin "dash-dynamic-loop-dur-greater-than-seg"
+
+if [ $test_skip  = 0 ] ; then
+
+#import 10 sec (10 gops) and dash for a shorter media duration using loop mode
+$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264:dur=10 -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_audio.aac:dur=10 -new $TEMP_DIR/file.mp4 2> /dev/null
+
+do_test "$MP4BOX -dash-live 2000 -subdur 2000 -profile live -mpd-refresh 10 -time-shift -1 -run-for 4000 $TEMP_DIR/file.mp4#video:dur=2.4001 $TEMP_DIR/file.mp4#audio:dur=2.40001 -out $TEMP_DIR/file.mpd" "dash-gen" &
+
+sleep 1
+
+dump_dur=2
+do_playback_test "$TEMP_DIR/file.mpd" "dash-play"
+
+#wait for the end of the MP4Box
+wait
+
+#hash the final MPD (written as  static)
+do_hash_test $TEMP_DIR/file.mpd "hash-mpd"
+
+do_hash_test $TEMP_DIR/file_dash_track1_2.m4s "hash-seg2-video"
+do_hash_test $TEMP_DIR/file_dash_track2_2.m4s "hash-seg2-audio"
+
+fi
+
+test_end
+
+
+test_begin "dash-dynamic-noloop-dur-less-than-seg"
+
+if [ $test_skip  = 0 ] ; then
+
+#import 10 sec (10 gops) and dash for a shorter media duration using loop mode
+$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264:dur=10 -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_audio.aac:dur=10 -new $TEMP_DIR/file.mp4 2> /dev/null
+
+do_test "$MP4BOX -dash-live 2000 -subdur 2000 -profile live -mpd-refresh 10 -time-shift -1 -run-for 4000 -no-loop $TEMP_DIR/file.mp4#video:dur=1.4001 $TEMP_DIR/file.mp4#audio:dur=1.4001 -out $TEMP_DIR/file.mpd" "dash-gen" &
+
+sleep 1
+
+dump_dur=2
+do_playback_test "$TEMP_DIR/file.mpd" "dash-play"
+
+#wait for the end of the MP4Box
+wait
+
+#hash the final MPD (written as  static)
+do_hash_test $TEMP_DIR/file.mpd "hash-mpd"
+
+do_hash_test $TEMP_DIR/file_dash_track1_p2_1.m4s "hash-seg1p2-video"
+do_hash_test $TEMP_DIR/file_dash_track2_p2_1.m4s "hash-seg1p2-audio"
+
+do_hash_test $TEMP_DIR/file_dash_track1_p3_1.m4s "hash-seg1p3-video"
+do_hash_test $TEMP_DIR/file_dash_track2_p3_1.m4s "hash-seg1p3-audio"
+
+fi
+
+test_end
+
+
+test_begin "dash-dynamic-noloop-dur-greater-than-seg"
+
+if [ $test_skip  = 0 ] ; then
+
+#import 10 sec (10 gops) and dash for a shorter media duration using loop mode
+$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264:dur=10 -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_audio.aac:dur=10 -new $TEMP_DIR/file.mp4 2> /dev/null
+
+do_test "$MP4BOX -dash-live 2000 -subdur 2000 -profile live -mpd-refresh 10 -time-shift -1 -run-for 4000 -no-loop $TEMP_DIR/file.mp4#video:dur=2.4001 $TEMP_DIR/file.mp4#audio:dur=2.4001 -out $TEMP_DIR/file.mpd" "dash-gen" &
+
+sleep 1
+
+dump_dur=2
+do_playback_test "$TEMP_DIR/file.mpd" "dash-play"
+
+#wait for the end of the MP4Box
+wait
+
+#hash the final MPD (written as  static)
+do_hash_test $TEMP_DIR/file.mpd "hash-mpd"
+
+do_hash_test $TEMP_DIR/file_dash_track1_2.m4s "hash-seg2p1-video"
+do_hash_test $TEMP_DIR/file_dash_track2_2.m4s "hash-seg2p1-audio"
+
+do_hash_test $TEMP_DIR/file_dash_track1_p2_1.m4s "hash-seg1p2-video"
+do_hash_test $TEMP_DIR/file_dash_track2_p2_1.m4s "hash-seg1p2-audio"
+
+fi
+
+test_end
+

gpac-0.7.1.tar.gz/tests/scripts/dash-if-live.sh -> gpac-0.8.0.tar.gz/tests/scripts/dash-if-live.sh Changed

gpac-0.7.1.tar.gz/tests/scripts/dash-if-ondemand.sh -> gpac-0.8.0.tar.gz/tests/scripts/dash-if-ondemand.sh Changed

gpac-0.7.1.tar.gz/tests/scripts/dash-live.sh -> gpac-0.8.0.tar.gz/tests/scripts/dash-live.sh Changed

gpac-0.8.0.tar.gz/tests/scripts/dash-main-singlefile.sh Added

gpac-0.8.0.tar.gz/tests/scripts/dash-main.sh Added

gpac-0.8.0.tar.gz/tests/scripts/dash-media-input-dur.sh Added

gpac-0.7.1.tar.gz/tests/scripts/dash-multiperiod.sh -> gpac-0.8.0.tar.gz/tests/scripts/dash-multiperiod.sh Changed

@@ -1,24 +1,19 @@
 test_begin "dash-multiperiod"
 
 do_test "$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_320x180_128kbps.264:dur=5 -new $TEMP_DIR/counter_video_180.mp4" "multiperiod-input-preparation_180"
-
-do_test "$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_640x360_192kbps.264:dur=5 -new $TEMP_DIR/counter_video_360.mp4" "multiperiod-input-preparation2_320"
-
-do_test "$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264:dur=5 -new $TEMP_DIR/counter_video_720.mp4" "multiperiod-input-preparation3_720"
-
-do_test "$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1920x1080_768kbps.264:dur=5 -new $TEMP_DIR/counter_video_1080.mp4" "multiperiod-input-preparation4_1080"
-
 do_test "$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_audio.aac:dur=5 -new $TEMP_DIR/counter_audio.mp4" "multiperiod-input-preparation_audio"
 
-do_test "$MP4BOX -bs-switching no -dash 10000 -frag 1000 -dash-profile live \
--out $TEMP_DIR/file.mpd -segment-name mp4-live-periods-\$RepresentationID\$-\$Number\$ \
-$TEMP_DIR/counter_audio.mp4:id=aaclc:Period=P1 $TEMP_DIR/counter_video_1080.mp4:id=h264bl_full:Period=P1 \
-$TEMP_DIR/counter_video_180.mp4:id=h264bl_low:Period=P1 \
-$TEMP_DIR/counter_audio.mp4:id=aaclc_p2:Period=P2 $TEMP_DIR/counter_video_360.mp4:id=h264bl_mid:Period=P2 \
-$TEMP_DIR/counter_video_720.mp4:id=h264bl_hd:Period=P2" "dash-multiperiod"
+do_test "$MP4BOX -bs-switching no -dash 1000 -dash-profile live \
+-out $TEMP_DIR/file.mpd -segment-name \$RepresentationID\$-\$Number\$ \
+$TEMP_DIR/counter_audio.mp4:id=ap1:Period=P1 $TEMP_DIR/counter_video_180.mp4:id=vp1:Period=P1 \
+$TEMP_DIR/counter_audio.mp4:id=ap2:Period=P2 $TEMP_DIR/counter_video_180.mp4:id=vp2:Period=P2" "dash-multiperiod"
 
+do_hash_test $TEMP_DIR/file.mpd "mpd"
+do_hash_test $TEMP_DIR/vp1-.mp4 "initp1"
+do_hash_test $TEMP_DIR/vp2-.mp4 "initp2"
 
-do_playback_test "$TEMP_DIR/file.mpd" "play-dash-live-periods"
+#correct but currently broken in gpac
+#do_playback_test "$TEMP_DIR/file.mpd" "play-dash-live-periods"
 
 test_end

gpac-0.8.0.tar.gz/tests/scripts/dash-srd-hevc.sh Added

gpac-0.8.0.tar.gz/tests/scripts/dash-ssix.sh Added

gpac-0.8.0.tar.gz/tests/scripts/dash-subtitle.sh Added

gpac-0.8.0.tar.gz/tests/scripts/dash-template.sh Added

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+base_test()
+{
+
+test_begin $1
+
+do_test "$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264 -new $TEMP_DIR/file.mp4" "dash-input-preparation"
+
+#test bandwidth, time and init
+do_test "$MP4BOX -dash 1000 -out $TEMP_DIR/file.mpd $TEMP_DIR/file.mp4$2" "$1-dash"
+
+do_hash_test $TEMP_DIR/file.mpd "$1-hash-mpd"
+
+do_hash_test $TEMP_DIR/$3 "$1-hash-init"
+
+do_hash_test $TEMP_DIR/$4 "$1-hash-seg"
+
+do_playback_test "$TEMP_DIR/file.mpd" "$1-play"
+
+test_end
+
+}
+
+base_test "dash-template-bandwidth-time" ":bandwidth=600000 -profile live -segment-name test-\$Bandwidth\$-\$Time%05d\$\$Init=is\$" "test-600000-is.mp4" "test-600000-01000.m4s"
+
+base_test "dash-template-repid-number" ":id=myrep -profile live -segment-name test-\$RepresentationID\$-\$Number%d\$" "test-myrep-.mp4" "test-myrep-10.m4s"
+
+base_test "dash-template-baseurl-global-path" ":id=myrep -base-url some_dir/ -profile live -segment-name \$Path=some_dir/\$test-\$RepresentationID\$-\$Number%d\$" "some_dir/test-myrep-.mp4" "some_dir/test-myrep-10.m4s"
+
+base_test "dash-template-baseurl-rep-path" ":id=myrep:baseURL=some_dir/ -profile live -segment-name \$Path=some_dir/\$test-\$RepresentationID\$-\$Number%d\$" "some_dir/test-myrep-.mp4" "some_dir/test-myrep-10.m4s"

gpac-0.8.0.tar.gz/tests/scripts/dash-timeline.sh Added

gpac-0.7.1.tar.gz/tests/scripts/dash.sh -> gpac-0.8.0.tar.gz/tests/scripts/dash.sh Changed

@@ -1,11 +1,21 @@
 #!/bin/sh
 
-test_begin "dash"
+test_begin "dash-basic"
 
-do_test "$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264 -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_audio.aac -new $TEMP_DIR/file.mp4" "dash-input-preparation"
+do_test "$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264 -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_audio.aac -new $TEMP_DIR/file.mp4" "input-preparation"
+do_hash_test "$TEMP_DIR/file.mp4" "input-preparation"
 
-do_test "$MP4BOX -dash 1000 $TEMP_DIR/file.mp4#video $TEMP_DIR/file.mp4#audio -out $TEMP_DIR/file.mpd" "basic-dash"
 
-do_playback_test "$TEMP_DIR/file.mpd" "play-basic-dash"
+if [ -f "$TEMP_DIR/file.mpd" ] ; then
+	rm "$TEMP_DIR/file.mpd"
+fi
+
+do_test "$MP4BOX -dash 1000 -rap $TEMP_DIR/file.mp4#video $TEMP_DIR/file.mp4#audio -out $TEMP_DIR/file.mpd" "mpd"
+
+do_hash_test "$TEMP_DIR/file.mpd" "mpd"
+do_hash_test "$TEMP_DIR/file_dash_track1_init.mp4" "segment-video"
+do_hash_test "$TEMP_DIR/file_dash_track2_init.mp4" "segment-audio"
+
+do_playback_test "$TEMP_DIR/file.mpd" "play"
 
 test_end

gpac-0.8.0.tar.gz/tests/scripts/dash_cues.sh Added

gpac-0.7.1.tar.gz/tests/scripts/encryption.sh -> gpac-0.8.0.tar.gz/tests/scripts/encryption.sh Changed

@@ -1,25 +1,21 @@
 
-#create our test file
-mp4file="$TEMP_DIR/source_media.mp4"
-$MP4BOX -add $MEDIA_DIR/auxiliary_files/enst_video.h264 -add $MEDIA_DIR/auxiliary_files/enst_audio.aac -new $mp4file 2> /dev/null
-
 
-crypto_test()
+crypto_unit_test()
 {
 
-cryptfile="$TEMP_DIR/$1-crypted.mp4"
-decryptfile="$TEMP_DIR/$1-decrypted.mp4"
-
 test_begin "encryption-$1"
 
 if [ $test_skip  = 1 ] ; then
  return
 fi
 
+cryptfile="$TEMP_DIR/$1-crypted.mp4"
+decryptfile="$TEMP_DIR/$1-decrypted.mp4"
+
 do_test "$MP4BOX -crypt $2 -out $cryptfile $mp4file" "Encrypt"
 do_hash_test $cryptfile "crypt"
 
-do_test "$MP4BOX -decrypt $2 -out $decryptfile $mp4file" "Decrypt"
+do_test "$MP4BOX -decrypt $2 -out $decryptfile $cryptfile" "Decrypt"
 do_hash_test $decryptfile "decrypt"
 
 #compare hashes of source and decrypted
@@ -30,6 +26,16 @@
 result="Hash is not the same between source content and decrypted content"
 fi
 
+#do dash test
+do_test "$MP4BOX -dash 4000 -profile live -out $TEMP_DIR/test.mpd $cryptfile" "DASH"
+
+dashfile="$TEMP_DIR/$1-crypted_dashinit.mp4"
+do_hash_test $dashfile "crypt-dash-init"
+
+dashfile="$TEMP_DIR/$1-crypted_dash1.m4s"
+do_hash_test $dashfile "crypt-dash-seg"
+
+#playback test of files for which we can retrieve the key
 if [ $1 != "adobe" ] ; then
 do_playback_test "$cryptfile" "play"
 fi
@@ -38,24 +44,85 @@
 
 }
 
-#test adobe
-crypto_test "adobe" $MEDIA_DIR/encryption/drm_adobe.xml &
+crypto_test_file()
+{
+
+for drm in $MEDIA_DIR/encryption/*.xml ; do
+#vp9 only supports ctr for now
+if [ $1 == "vp9" ] ; then
+ case $drm in
+ *cbc* )
+ 	continue ;;
+ *adobe* )
+ 	continue ;;
+ *isma* )
+ 	continue ;;
+ *cens* )
+ 	continue ;;
+ *clearbytes* )
+ 	continue ;;
+ *forceclear* )
+ 	continue ;;
+ esac
+elif [ $1 != "avc" ] ; then
+ case $drm in
+ *clearbytes* )
+ 	continue ;;
+ *forceclear* )
+ 	continue ;;
+ esac
+fi
+
+name=$(basename $drm)
+name=${name%%.*}
 
-#test isma
-crypto_test "isma" $MEDIA_DIR/encryption/drm_isma.xml &
+crypto_unit_test "$name-$1" $drm
 
-#test cenc CTR
-crypto_test "cenc-ctr" $MEDIA_DIR/encryption/drm_ctr.xml &
+done
 
-#test cenc CBC
-crypto_test "cenc-cbc" $MEDIA_DIR/encryption/drm_cbc.xml &
+}
 
-#test cenc CBC
-crypto_test "cenc-cens" $MEDIA_DIR/encryption/drm_cens.xml &
+mp4file="$TEMP_DIR/source_media.mp4"
 
-#test cenc CBC
-crypto_test "cenc-cbcs" $MEDIA_DIR/encryption/drm_cbcs.xml &
+#AVC
+$MP4BOX -add $MEDIA_DIR/auxiliary_files/enst_video.h264 -new $mp4file 2> /dev/null
+crypto_test_file "avc"
 
+#AAC
+$MP4BOX -add $MEDIA_DIR/auxiliary_files/enst_audio.aac -new $mp4file 2> /dev/null
+crypto_test_file "aac"
 
-wait
+#HEVC
+$MP4BOX -add $MEDIA_DIR/auxiliary_files/counter.hvc -new $mp4file 2> /dev/null
+crypto_test_file "hevc"
+
+#AV1
+$MP4BOX -add $MEDIA_DIR/auxiliary_files/video.av1 -new $mp4file 2> /dev/null
+crypto_test_file "av1"
+
+rm -f $mp4file 2> /dev/null
+
+
+if [ $EXTERNAL_MEDIA_AVAILABLE = 0 ] ; then
+ return
+fi
+
+#test encryption of AVC with emul prev byte in non encrypted NAL
+test_begin "encryption-avc-ebp"
+
+$MP4BOX -crypt $MEDIA_DIR/encryption/cbcs.xml $EXTERNAL_MEDIA_DIR/misc/avc_sei_epb.mp4 -out $mp4file 2> /dev/null
+do_hash_test $mp4file "crypt-avc-epb"
 rm -f $mp4file 2> /dev/null
+
+test_end
+
+#AV1 with small tiles less than 16 bytes
+$MP4BOX -add $EXTERNAL_MEDIA_DIR/import/obu_tiles4x2_grp4.av1 -new $mp4file 2> /dev/null
+crypto_test_file "av1small"
+
+
+#VP9, we only test CTR
+$MP4BOX -add $EXTERNAL_MEDIA_DIR/import/counter_1280_720_I_25_500k.ivf -new $mp4file 2> /dev/null
+crypto_test_file "vp9"
+
+

gpac-0.8.0.tar.gz/tests/scripts/encryption_import.sh Added

gpac-0.7.1.tar.gz/tests/scripts/fuzz-base.sh -> gpac-0.8.0.tar.gz/tests/scripts/fuzz-base.sh Changed

@@ -4,7 +4,6 @@
 {
  name=$(basename $1)
  mp4file="$TEMP_DIR/$name.mp4"
- mp4hint="$TEMP_DIR/$name.hint.tmp"
 
  test_begin "fuzz-base-$name"
 
@@ -17,13 +16,6 @@
  #encode media
  do_test "$MP4BOX -mp4 $1 -out $mp4file" "MediaEncode"
 
- #hint media
- do_test "$MP4BOX -hint $mp4file -out $mp4hint" "MediaHint"
- rm $mp4hint
-
- #MP4 playback for 1 sec only (too long otherwise)
- do_test "$MP4CLIENT -run-for 0 $mp4file" "MediaPlay"
-
  rm $mp4file
  test_end
 }
@@ -31,29 +23,8 @@
 #@mp4_test execute basics MP4Box tests on source file: -add, -info, -dts, -hint -drtp -sdp -unhint and MP4 Playback
 fuzz_import ()
 {
- do_hint=1
- do_play=1
-
- #ignore xlst & others, no hinting for images
- case $1 in
- *.jpg )
-  do_hint=0 ;;
- *.jpeg )
-  do_hint=0 ;;
- *.png )
-  do_hint=0 ;;
- *.mj2 )
-  do_hint=0 ;;
- *.qcp )
-  do_play=0 ;;
- #no support for hinting or playback yet
- *.ismt )
-  do_hint=0 && do_play=0 ;;
- esac
-
  name=$(basename $1)
  mp4file="$TEMP_DIR/$name.mp4"
- mp4hint="$TEMP_DIR/$name.hint.tmp"
 
  test_begin "fuzz-base-$name"
 
@@ -68,17 +39,6 @@
  #import media
  do_test "$MP4BOX -add $1 -new $mp4file" "MediaImport"
 
- if [ $do_hint != 0 ] ; then
-  #hint media
-  do_test "$MP4BOX -hint $mp4file -out $mp4hint" "MediaHint"
-  rm $mp4hint
- fi
-
- if [ $do_play != 0 ] ; then
-  #MP4 playback for 1 sec only (too long otherwise)
-  do_test "$MP4CLIENT -run-for 0 $mp4file" "MediaPlay"
- fi
-
  rm $mp4file
  test_end
 }

gpac-0.7.1.tar.gz/tests/scripts/iff.sh -> gpac-0.8.0.tar.gz/tests/scripts/iff.sh Changed

@@ -1,15 +1,77 @@
 #!/bin/sh
 
+if [ $EXTERNAL_MEDIA_AVAILABLE = 0 ] ; then
+  return
+fi
+
+COUNTERFILE=$EXTERNAL_MEDIA_DIR/counter/counter_1280_720_I_25_tiled_500kb.hevc
+
 test_begin "iff"
 
-iff_file="$TEMP_DIR/test.heic"
-do_test "$MP4BOX -add-image $MEDIA_DIR/auxiliary_files/counter.hvc:id=1 -set-primary 1 -ab heic -new $iff_file" "create-iff"
-do_hash_test $iff_file "create-iff"
-do_test "$MP4BOX -diso $iff_file" "diso-iff"
+ if [ $test_skip  = 1 ] ; then
+  return
+ fi
+
+iff_file="$TEMP_DIR/basic.heic"
+do_test "$MP4BOX -add-image $COUNTERFILE -ab heic -new $iff_file" "create-iff-basic"
+do_hash_test $iff_file "create-iff-basic"
+do_test "$MP4BOX -diso $iff_file" "diso-iff-basic"
+
+iff_file="$TEMP_DIR/basic-time.heic"
+do_test "$MP4BOX -add-image $COUNTERFILE:time=1.2 -ab heic -new $iff_file" "create-iff-basic-time"
+do_hash_test $iff_file "create-iff-basic-time"
+do_test "$MP4BOX -diso $iff_file" "diso-iff-basic-time"
+
+iff_file="$TEMP_DIR/basic-id.heic"
+do_test "$MP4BOX -add-image $COUNTERFILE:id=42 -ab heic -new $iff_file" "create-iff-basic-id"
+do_hash_test $iff_file "create-iff-basic-id"
+do_test "$MP4BOX -diso $iff_file" "diso-iff-basic-id"
+
+iff_file="$TEMP_DIR/basic-primary.heic"
+do_test "$MP4BOX -add-image $COUNTERFILE:primary -ab heic -new $iff_file" "create-iff-basic-primary"
+do_hash_test $iff_file "create-iff-basic-primary"
+do_test "$MP4BOX -diso $iff_file" "diso-iff-basic-primary"
+
+iff_file="$TEMP_DIR/basic-name.heic"
+do_test "$MP4BOX -add-image $COUNTERFILE:name=MyImage -ab heic -new $iff_file" "create-iff-basic-name"
+do_hash_test $iff_file "create-iff-basic-name"
+do_test "$MP4BOX -diso $iff_file" "diso-iff-basic-name"
 
-iff_tile_file="$TEMP_DIR/test-tile.heic"
-do_test "$MP4BOX -add-image $MEDIA_DIR/auxiliary_files/counter.hvc:tilemode=base:id=1 -set-primary 1 -ab heic -new $iff_tile_file" "create-iff-tiled"
+iff_file="$TEMP_DIR/basic-hidden.heic"
+do_test "$MP4BOX -add-image $COUNTERFILE:hidden -ab heic -new $iff_file" "create-iff-basic-hidden"
+do_hash_test $iff_file "create-iff-basic-hidden"
+do_test "$MP4BOX -diso $iff_file" "diso-iff-basic-hidden"
+
+iff_file="$TEMP_DIR/basic-rotation.heic"
+do_test "$MP4BOX -add-image $COUNTERFILE:rotation=90 -ab heic -new $iff_file" "create-iff-basic-rotation"
+do_hash_test $iff_file "create-iff-basic-rotation"
+do_test "$MP4BOX -diso $iff_file" "diso-iff-basic-rotation"
+
+iff_file="$TEMP_DIR/basic-all.heic"
+do_test "$MP4BOX -add-image $COUNTERFILE:id=2:primary:name=Test:time=4.2:hidden:rotation=90 -ab heic -new $iff_file" "create-iff-basic-all"
+do_hash_test $iff_file "create-iff-basic-all"
+do_test "$MP4BOX -diso $iff_file" "diso-iff-basic-all"
+
+iff_file="$TEMP_DIR/2images.heic"
+do_test "$MP4BOX -add-image $COUNTERFILE:time=0:primary -add-image $COUNTERFILE:time=4.2 -ab heic -new $iff_file" "create-iff-2images"
+do_hash_test $iff_file "create-iff-2images"
+do_test "$MP4BOX -diso $iff_file" "diso-iff-2images"
+
+iff_file="$TEMP_DIR/2images-ref.heic"
+do_test "$MP4BOX -add-image $COUNTERFILE:id=1:time=0:primary -add-image $COUNTERFILE:time=4.2:id=2:ref=thmb,1 -ab heic -new $iff_file" "create-iff-2images-ref"
+do_hash_test $iff_file "create-iff-2images-ref"
+do_test "$MP4BOX -diso $iff_file" "diso-iff-2images-ref"
+
+iff_tile_file="$TEMP_DIR/tiled.heic"
+do_test "$MP4BOX -add-image $COUNTERFILE:split_tiles:primary -ab heic -new $iff_tile_file" "create-iff-tiled"
 do_hash_test $iff_tile_file "create-iff-tiled"
 do_test "$MP4BOX -diso $iff_tile_file" "diso-iff-tiled"
 
+#test pict video handler + add image
+iff_file="$TEMP_DIR/vidseq.heic"
+do_test "$MP4BOX -add $COUNTERFILE:hdlr=pict -ab heic -new $iff_file" "create-pict-heif"
+do_hash_test $iff_file "create-pict-heif"
+do_test "$MP4BOX -add-image $COUNTERFILE:primary $iff_file" "add-image-pict"
+do_hash_test $iff_file "add-image-pict"
+
 test_end

gpac-0.7.1.tar.gz/tests/scripts/item.sh -> gpac-0.8.0.tar.gz/tests/scripts/item.sh Changed

@@ -4,6 +4,10 @@
 
 test_begin "meta"
 
+ if [ $test_skip  = 1 ] ; then
+  return
+ fi
+
 do_test "$MP4BOX -set-meta Metadata:id=0 $EXTERNAL_MEDIA_DIR/item/counter_noItems1.mp4 -out $mp4file" "set0"
 do_hash_test $mp4file "set0"
 do_test "$MP4BOX -set-meta Metadata:id=1 $EXTERNAL_MEDIA_DIR/item/counter_noItems2.mp4 -out $mp4file" "set1"
@@ -18,13 +22,13 @@
 do_test "$MP4BOX -set-primary id=2 $mp4file" "set-primary"
 do_hash_test $mp4file "mp4box-set-primary"
 
-do_test "$MP4BOX $EXTERNAL_MEDIA_DIR/item/counter_noItems.mp4 -dump-item 1:path=$TEMP_DIR/file1.html" "dump-item1"
+do_test "$MP4BOX $mp4file -dump-item 1:path=$TEMP_DIR/file1.html" "dump-item1"
 do_hash_test $TEMP_DIR/file1.html "dump-item1"
-do_test "$MP4BOX $EXTERNAL_MEDIA_DIR/item/counter_noItems.mp4 -dump-item 2:path=$TEMP_DIR/file1.css" "dump-item2"
+do_test "$MP4BOX $mp4file -dump-item 2:path=$TEMP_DIR/file1.css" "dump-item2"
 do_hash_test $TEMP_DIR/file1.css "dump-item2"
-do_test "$MP4BOX $EXTERNAL_MEDIA_DIR/item/counter_noItems.mp4 -dump-item 3:path=$TEMP_DIR/file1.js" "dump-item3"
+do_test "$MP4BOX $mp4file -dump-item 3:path=$TEMP_DIR/file1.js" "dump-item3"
 do_hash_test $TEMP_DIR/file1.js "dump-item3"
-do_test "$MP4BOX $EXTERNAL_MEDIA_DIR/item/counter_noItems.mp4 -dump-item 4:path=$TEMP_DIR/file1.svg" "dump-item4"
+do_test "$MP4BOX $mp4file -dump-item 4:path=$TEMP_DIR/file1.svg" "dump-item4"
 do_hash_test $TEMP_DIR/file1.svg "dump-item4"

gpac-0.7.1.tar.gz/tests/scripts/laser_all.sh -> gpac-0.8.0.tar.gz/tests/scripts/laser_all.sh Changed

gpac-0.7.1.tar.gz/tests/scripts/mp4box-base.sh -> gpac-0.8.0.tar.gz/tests/scripts/mp4box-base.sh Changed

@@ -1,7 +1,7 @@
 
 
 test_begin "mp4box-base-dump"
-if [ $test_skip = 1 ] ; then
+if [ "$test_skip" = 1 ] ; then
  return
 fi
 
@@ -14,24 +14,29 @@
 
 do_test "$MP4BOX  -raw 1 $mp4file -out $TEMP_DIR/test.tmp" "raw-264"
 do_hash_test $TEMP_DIR/test.tmp "raw-264"
+rm $TEMP_DIR/test.tmp 2&>/dev/null
 
 do_test "$MP4BOX  -raw 2 $mp4file -out $TEMP_DIR/test.tmp" "raw-aac"
 do_hash_test $TEMP_DIR/test.tmp "raw-aac"
+rm $TEMP_DIR/test.tmp 2&>/dev/null
 
 do_test "$MP4BOX  -raw 3 $mp4file -out $TEMP_DIR/test.tmp" "raw-text"
 do_hash_test $TEMP_DIR/test.tmp "raw-text"
+rm $TEMP_DIR/test.tmp 2&>/dev/null
 
 do_test "$MP4BOX  -srt 3 $mp4file -out $TEMP_DIR/test.tmp" "srt-text"
 do_hash_test $TEMP_DIR/test.tmp "srt-text"
+rm $TEMP_DIR/test.tmp 2&>/dev/null
 
 do_test "$MP4BOX  -ttxt 3 $mp4file -out $TEMP_DIR/test.tmp" "ttxt-text"
 do_hash_test $TEMP_DIR/test.tmp "ttxt-text"
+rm $TEMP_DIR/test.tmp 2&>/dev/null
 
 
 do_test "$MP4BOX -raws 1 $mp4file" "raw-samples"
-n=`ls $TEMP_DIR/test_track* | wc -l`
+n=`ls -1f $TEMP_DIR/test_track* | wc -l | tr -d ' '`
 n=${n#0}
-if [ $n != 173 ] ; then
+if [ "$n" != 173 ] ; then
 result="Wrong sample count $n (expected 173)"
 fi
 rm $TEMP_DIR/test_track* 2&>/dev/null
@@ -49,8 +54,9 @@
 do_test "$MP4BOX -brand MP4V:1 -ab iso6 -inter 250 $mp4file" "interleave-250ms"
 do_hash_test $mp4file "interleave-250ms"
 
-do_test "$MP4BOX -rb iso6 -frag 1000 $mp4file" "frag-1s"
-do_hash_test $mp4file "frag-1s"
+do_test "$MP4BOX -rb iso6 -frag 1000 $mp4file -out $TEMP_DIR/frag-1s.mp4" "frag-1s"
+do_hash_test "$TEMP_DIR/frag-1s.mp4" "frag-1s"
+mv "$TEMP_DIR/frag-1s.mp4" $mp4file
 
 test_end

gpac-0.8.0.tar.gz/tests/scripts/mp4box-deps.sh Added

gpac-0.7.1.tar.gz/tests/scripts/mp4box-io.sh -> gpac-0.8.0.tar.gz/tests/scripts/mp4box-io.sh Changed

gpac-0.7.1.tar.gz/tests/scripts/mp4box-lang.sh -> gpac-0.8.0.tar.gz/tests/scripts/mp4box-lang.sh Changed

@@ -28,10 +28,6 @@
 
 rm $output 2> /dev/null
 my_test_with_hash "$MP4BOX -lang all=en-US $TEMP_DIR/file.mp4 -out $output" "all-2-2-char"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -lang all=en-US $TEMP_DIR/file.mp4 -out $output"
-
 my_test_with_hash "$MP4BOX -lang all=fr-FR $TEMP_DIR/file.mp4 -out $output" "all-twice"
 
 rm $output 2> /dev/null
@@ -42,6 +38,8 @@
 
 rm $output 2> /dev/null
 my_test_with_hash "$MP4BOX -lang en-US $TEMP_DIR/file.mp4 -out $output" "2-2-char"
+my_test_with_hash "$MP4BOX -add $output -new $TEMP_DIR/out2.mp4" "copy"
+rm $TEMP_DIR/out2.mp4 2> /dev/null
 
 rm $output 2> /dev/null
 my_test_with_hash "$MP4BOX -lang 1=en $TEMP_DIR/file.mp4 -out $output" "track-2-char"
@@ -51,19 +49,10 @@
 
 rm $output 2> /dev/null
 my_test_with_hash "$MP4BOX -lang 1=en-US $TEMP_DIR/file.mp4 -out $output" "track-2-2-char"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -lang 1=en-US $TEMP_DIR/file.mp4 -out $output"
 my_test_with_hash "$MP4BOX -lang 2=en-US $output" "second-track"
 
 rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -lang en-US $TEMP_DIR/file.mp4 -out $output" 
-my_test_with_hash "$MP4BOX -add $output -new $TEMP_DIR/out2.mp4" "copy"
-rm $TEMP_DIR/out2.mp4 2> /dev/null
-
-rm $output 2> /dev/null
 my_test_with_hash "$MP4BOX -add $TEMP_DIR/file.mp4#1:lang=en -new $output" "param-2-char"
-my_test_with_hash "$MP4BOX -info $output"
 
 rm $output 2> /dev/null
 my_test_with_hash "$MP4BOX -add $TEMP_DIR/file.mp4#1:lang=eng -new $output" "param-3-char"

gpac-0.8.0.tar.gz/tests/scripts/mp4box-timescale.sh Added

gpac-0.7.1.tar.gz/tests/scripts/mp4client-base.sh -> gpac-0.8.0.tar.gz/tests/scripts/mp4client-base.sh Changed

@@ -1,3 +1,7 @@
+if [ $disable_playback != 0 ] ; then
+return
+fi
+
 
 #1- test MP4Client -guid
 single_playback_test "-guid" "mp4client-gui"
@@ -5,7 +9,7 @@
 #2- test playback of raw media
 single_playback_test "$MEDIA_DIR/auxiliary_files/count_english.mp3" "mp4client-mp3"
 
-single_playback_test "$MEDIA_DIR/auxiliary_files/count_video.cmp" "mp4client-m4vp2"
+single_playback_test "$MEDIA_DIR/auxiliary_files/count_video.mp4" "mp4client-m4vp2"
 
 single_playback_test "$MEDIA_DIR/auxiliary_files/enst_video.h264" "mp4client-h264"
 
@@ -44,14 +48,14 @@
 
 single_playback_test "-opt Video:DriverName=sdl_out -opt Compositor:OpenGLMode=disable -no-save $MEDIA_DIR/auxiliary_files/logo.jpg" "mp4client-sdl2d-jpg"
 
-single_playback_test "-opt Video:DriverName=sdl_out -opt Compositor:OpenGLMode=disable -no-save $MEDIA_DIR/auxiliary_files/count_video.cmp" "mp4client-sdl2d-yuv"
+single_playback_test "-opt Video:DriverName=sdl_out -opt Compositor:OpenGLMode=disable -no-save $MEDIA_DIR/auxiliary_files/count_video.mp4" "mp4client-sdl2d-yuv"
 
 single_playback_test "-opt Video:DriverName=sdl_out -opt Compositor:OpenGLMode=disable -no-save $MEDIA_DIR/bifs/bifs-2D-background-background2D-image.bt" "mp4client-sdl2d-compose"
 
 
 single_playback_test "-opt Video:DriverName=sdl_out -opt Compositor:OpenGLMode=hybrid -no-save $MEDIA_DIR/auxiliary_files/logo.jpg" "mp4client-sdlgl-jpg"
 
-single_playback_test "-opt Video:DriverName=sdl_out -opt Compositor:OpenGLMode=hybrid -no-save $MEDIA_DIR/auxiliary_files/count_video.cmp" "mp4client-sdlgl-yuv"
+single_playback_test "-opt Video:DriverName=sdl_out -opt Compositor:OpenGLMode=hybrid -no-save $MEDIA_DIR/auxiliary_files/count_video.mp4" "mp4client-sdlgl-yuv"
 
 single_playback_test "-opt Video:DriverName=sdl_out -opt Compositor:OpenGLMode=hybrid -no-save $MEDIA_DIR/bifs/bifs-2D-background-background2D-image.bt" "mp4client-sdlgl-compose"

gpac-0.7.1.tar.gz/tests/scripts/mp4client-dash-config.sh -> gpac-0.8.0.tar.gz/tests/scripts/mp4client-dash-config.sh Changed

gpac-0.7.1.tar.gz/tests/scripts/mp4client-dash.sh -> gpac-0.8.0.tar.gz/tests/scripts/mp4client-dash.sh Changed

gpac-0.7.1.tar.gz/tests/scripts/mp4client-http.sh -> gpac-0.8.0.tar.gz/tests/scripts/mp4client-http.sh Changed

@@ -1,35 +1,38 @@
+if [ $disable_playback != 0 ] ; then
+return
+fi
 
 #progressive bifs in http
-single_playback_test "-guid http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/bifs/bifs-2D-background-background2D-bind.bt" "mp4client-http-bt"
+single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/bifs/bifs-2D-background-background2D-bind.bt" "mp4client-http-bt"
 
 #progressive bifs in https
-single_playback_test "-guid https://raw.githubusercontent.com/gpac/gpac/master/tests/media/bifs/bifs-2D-background-background2D-image.bt" "mp4client-https-bt"
+single_playback_test " https://raw.githubusercontent.com/gpac/gpac/master/tests/media/bifs/bifs-2D-background-background2D-image.bt" "mp4client-https-bt"
 
 #progressive jpg (same code for jpg & png)
-single_playback_test "-guid http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/auxiliary_files/sky.jpg" "mp4client-http-jpg"
+single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/auxiliary_files/sky.jpg" "mp4client-http-jpg"
 
 #progressive mp3
-single_playback_test "-guid http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/auxiliary_files/count_french.mp3" "mp4client-http-mp3"
+single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/auxiliary_files/count_french.mp3" "mp4client-http-mp3"
 
 #progressive aac
-single_playback_test "-guid http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/auxiliary_files/enst_audio.aac" "mp4client-http-aac"
+single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/auxiliary_files/enst_audio.aac" "mp4client-http-aac"
 
 #progressive ac3
-single_playback_test "-guid http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/resources/media/counter/counter_30s_audio.ac3" "mp4client-http-ac3"
+single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/resources/media/counter/counter_30s_audio.ac3" "mp4client-http-ac3"
 
 #progressive amr
-single_playback_test "-guid http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/resources/media/import/bear_audio.amr" "mp4client-http-amr"
+single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/resources/media/import/bear_audio.amr" "mp4client-http-amr"
 
 #progressive bifs with commands in http
-single_playback_test "-guid http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/bifs/bifs-command-animated-osmo4logo.bt" "mp4client-http-bt-commands"
+single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/bifs/bifs-command-animated-osmo4logo.bt" "mp4client-http-bt-commands"
 
 #progressive MP4 with commands in http
-single_playback_test "-guid http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/bifs/bifs-command-animated-osmo4logo.mp4" "mp4client-http-mp4-commands"
+single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/bifs/bifs-command-animated-osmo4logo.mp4" "mp4client-http-mp4-commands"
 
 
 #progressive MP4 AV in http
-single_playback_test "-guid http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/uhd/mux_sources/hevcds_720p60_3M.mp4" "mp4client-http-mp4av"
+single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/uhd/mux_sources/hevcds_720p60_3M.mp4" "mp4client-http-mp4av"
 
 
 #re-run progressive bifs in http to test the cache
-single_playback_test "-guid http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/bifs/bifs-2D-background-background2D-bind.bt" "mp4client-http-bt-cached"
+single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/bifs/bifs-2D-background-background2D-bind.bt" "mp4client-http-bt-cached"

gpac-0.7.1.tar.gz/tests/scripts/mp4client-rawout.sh -> gpac-0.8.0.tar.gz/tests/scripts/mp4client-rawout.sh Changed

@@ -1,3 +1,7 @@
+if [ $disable_playback != 0 ] ; then
+return
+fi
+
 #test all the rendering color mode and texturing tools of the soft rasterizer using raw output module
 
 run_rawout_tests()
@@ -5,7 +9,7 @@
  opts="-opt Video:DriverName=raw_out -opt RAWVideo:PixelFormat=$1 -no-save"
  single_playback_test "$opts -run-for 1" "mp4client-rawout-$1-gui"
  single_playback_test "$opts $MEDIA_DIR/auxiliary_files/logo.jpg" "mp4client-rawout-$1-jpg"
- single_playback_test "$opts $MEDIA_DIR/auxiliary_files/count_video.cmp" "mp4client-rawout-$1-yuv"
+ single_playback_test "$opts $MEDIA_DIR/auxiliary_files/count_video.mp4" "mp4client-rawout-$1-yuv"
  single_playback_test "$opts $MEDIA_DIR/bifs/bifs-2D-background-background2D-image.bt" "mp4client-rawout-$1-back"
  single_playback_test "$opts $MEDIA_DIR/bifs/bifs-2D-texturing-gradients-transparent.bt" "mp4client-rawout-$1-gradalpha"
  single_playback_test "$opts $MEDIA_DIR/bifs/bifs-2D-texturing-imagetexture-shapes.bt" "mp4client-rawout-$1-texture"

gpac-0.7.1.tar.gz/tests/scripts/negctts.sh -> gpac-0.8.0.tar.gz/tests/scripts/negctts.sh Changed

gpac-0.7.1.tar.gz/tests/scripts/nhml-subs.sh -> gpac-0.8.0.tar.gz/tests/scripts/nhml-subs.sh Changed

gpac-0.8.0.tar.gz/tests/scripts/no-frags-default.sh Added

gpac-0.8.0.tar.gz/tests/scripts/qt_prores.sh Added

gpac-0.7.1.tar.gz/tests/scripts/smooth.sh -> gpac-0.8.0.tar.gz/tests/scripts/smooth.sh Changed

gpac-0.7.1.tar.gz/tests/scripts/swf.sh -> gpac-0.8.0.tar.gz/tests/scripts/swf.sh Changed

gpac-0.7.1.tar.gz/tests/scripts/test_prl.sh -> gpac-0.8.0.tar.gz/tests/scripts/test_prl.sh Changed

gpac-0.7.1.tar.gz/tests/scripts/xmlin.sh -> gpac-0.8.0.tar.gz/tests/scripts/xmlin.sh Changed