Packman Build Service PMBS

Changes of Revision 3

gpac.changes Changed

gpac.spec Changed

@@ -24,8 +24,15 @@
 %define xulrunner192_version %(rpm -q --qf '%%{VERSION}' mozilla-xulrunner192-devel | sed 's|\\..*$||')
 %endif
 
+# obs@botter.cc - ugly hack to disable compilation with xulrunnner 17.0.2
+%if 0%{?xulrunner_version} == 17
+%define wo_applications 1
+%else
+%define wo_applications 0
+%endif
+
 Name:           gpac
-Version:        0.5.0.svn4192
+Version:        0.5.0.svn4296
 Release:        1.pm.1
 License:        LGPL-2.1+
 Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
@@ -45,6 +52,8 @@
 Patch3:		gpac-0.5.0-64bit-portability.patch
 #PATCH-FIX-UPSTREAM i@marguerite.su - export functions x264 needs
 Patch4:		gpac-0.5.0-x264-export.patch
+#PATCH-FIX-UPSTREAM obs@botter.cc - disable applications osmozilla, osmo4_wx
+Patch10:	gpac-0.5.0-disable-applications.patch
 BuildRequires:  DirectFB-devel
 BuildRequires:  ImageMagick
 BuildRequires:  Mesa-devel
@@ -152,6 +161,7 @@
 
 Author:         Jean Le Feuvre <jeanlf@users.sourceforge.net>
 
+%if ! %{wo_applications}
 %package -n Osmo4
 Summary:        MPEG-4 Media player based on gpac
 Group:          Productivity/Multimedia/Video/Players
@@ -186,6 +196,7 @@
 %description browser-plugin
 Osmozilla is a GPAC plugin for Mozilla-based browsers.
 %endif
+%endif
 
 %prep
 %setup -q
@@ -200,6 +211,9 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%if %{wo_applications}
+%patch10 -p1
+%endif
 
 # unpack amr files
 install -dm 755 modules/amr_float_dec/amr_nb_ft
@@ -286,6 +300,9 @@
 %if ! 0%{?sles_version}
     --xulsdk-path=`pkg-config --variable=sdkdir libxul` \
 %endif
+%if %{wo_applications}
+    --disable-scenegraph \
+%endif
     --extra-cflags="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DXP_UNIX -fPIC" 
 
 # make the beast (NO parallel build possible ...)
@@ -308,6 +325,7 @@
 make install-lib \
     DESTDIR=%{buildroot}
 
+%if ! %{wo_applications}
 # browser-plugin
 %if ! 0%{?sles_version}
 install -dm 755 %{buildroot}%{_libdir}/browser-plugins
@@ -316,6 +334,7 @@
 install -m 755 bin/gcc/nposmozilla.xpt \
     %{buildroot}%{_libdir}/browser-plugins
 %endif
+%endif
 
 # generated sggen binaries
 for i in MPEG4 SVG X3D; do
@@ -325,21 +344,24 @@
 install -m 755 bin/gcc/mp4* \
     %{buildroot}%{_bindir}
 
-# Osmo4
-install -m 755 bin/gcc/Osmo4 \
-    %{buildroot}%{_bindir}
-
 # udptsseg
 install -m 755 bin/gcc/udptsseg \
     %{buildroot}%{_bindir}
 
+%if ! %{wo_applications}
+# Osmo4
+install -m 755 bin/gcc/Osmo4 \
+    %{buildroot}%{_bindir}
+
 # icon
 install -dm 755 %{buildroot}%{_datadir}/pixmaps
 convert -size 48x48 applications/osmo4_wx/osmo4.xpm \
     Osmo4.png
 install -m 644 Osmo4.png \
     %{buildroot}%{_datadir}/pixmaps
+%endif
 
+%if ! %{wo_applications}
 # menu-entry
 install -dm 755 %{buildroot}%{_datadir}/applications
 cat > Osmo4.desktop << EOF
@@ -353,6 +375,7 @@
 Terminal=false
 EOF
 %suse_update_desktop_file -i Osmo4 AudioVideo Player
+%endif
 
 # static lib
 rm -rf %{buildroot}%{_libdir}/*.a
@@ -368,7 +391,9 @@
 %doc AUTHORS BUGS Changelog COPYING README TODO
 %doc doc/configuration.html
 %{_bindir}/MP4Box
+%if ! %{wo_applications}
 %{_bindir}/MP4Client
+%endif
 %{_bindir}/MPEG4Gen
 %{_bindir}/X3DGen
 %{_bindir}/SVGGen
@@ -390,6 +415,7 @@
 %{_includedir}/%{name}/
 %{_libdir}/*.so
 
+%if ! %{wo_applications}
 %files -n Osmo4
 %defattr(-,root,root)
 %{_bindir}/Osmo4
@@ -401,5 +427,6 @@
 %defattr(-,root,root)
 %{_libdir}/browser-plugins/nposmozilla.*
 %endif
+%endif
 
-%changelog
\ No newline at end of file
+%changelog

gpac-0.5.0-64bit-portability.patch Changed

gpac-0.5.0-disable-applications.patch Added

gpac-0.5.0.svn4192.tar.bz2/README -> gpac-0.5.0.svn4296.tar.bz2/README Changed

gpac-0.5.0.svn4192.tar.bz2/applications/m3u82mpd/main.c -> gpac-0.5.0.svn4296.tar.bz2/applications/m3u82mpd/main.c Changed

gpac-0.5.0.svn4192.tar.bz2/applications/mp42ts/main.c -> gpac-0.5.0.svn4296.tar.bz2/applications/mp42ts/main.c Changed

@@ -36,6 +36,8 @@
 #include <gpac/scene_engine.h>
 #endif
 
+#define USE_ISOBMF_REWRITE
+
 
 #ifdef GPAC_DISABLE_ISOM
 
@@ -137,13 +139,16 @@
 	u32 image_repeat_ms, nb_repeat_last;
 	void *dsi;
 	u32 dsi_size;
-	u32 nalu_size;
+
 	void *dsi_and_rap;
 	Bool loop;
 	Bool is_repeat;
 	u64 ts_offset;
 	M2TSProgram *prog;
-	char nalu_delim[6];
+
+#ifndef USE_ISOBMF_REWRITE
+	u32 nalu_size;
+#endif
 } GF_ESIMP4;
 
 typedef struct
@@ -215,6 +220,7 @@
 			pck.flags |= GF_ESI_DATA_HAS_DTS;
 		}
 
+#ifndef USE_ISOBMF_REWRITE
 		if (priv->nalu_size) {
 			Bool nalu_delim_sent = 0;
 			u32 remain = priv->sample->dataLength;
@@ -271,7 +277,10 @@
 				ptr += size;
 			}
 
-		} else {
+		} else 
+#endif //USE_ISOBMF_REWRITE
+		
+		{
 
 			if (priv->sample->IsRAP && priv->dsi && priv->dsi_size) {
 				pck.data = priv->dsi;
@@ -363,6 +372,9 @@
 	if (dcd->decoderSpecificInfo && dcd->decoderSpecificInfo->dataLength) {
 		switch (dcd->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:
 			ifce->decoder_config = gf_malloc(sizeof(char)*dcd->decoderSpecificInfo->dataLength);
 			ifce->decoder_config_size = dcd->decoderSpecificInfo->dataLength;
 			memcpy(ifce->decoder_config, dcd->decoderSpecificInfo->data, dcd->decoderSpecificInfo->dataLength);
@@ -372,14 +384,21 @@
 			priv->dsi_size = dcd->decoderSpecificInfo->dataLength;
 			memcpy(priv->dsi, dcd->decoderSpecificInfo->data, dcd->decoderSpecificInfo->dataLength);
 			break;
+		case GPAC_OTI_VIDEO_HEVC:
+			gf_isom_set_nalu_extract_mode(mp4, track_num, GF_ISOM_NALU_EXTRACT_LAYER_ONLY | GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG | GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG);
+			break;
 		case GPAC_OTI_VIDEO_AVC:
 		{
-#ifndef GPAC_DISABLE_AV_PARSERS
+#ifdef USE_ISOBMF_REWRITE
+			gf_isom_set_nalu_extract_mode(mp4, track_num, GF_ISOM_NALU_EXTRACT_LAYER_ONLY | GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG | GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG);
+
+#elif !defined(GPAC_DISABLE_AV_PARSERS)
 			GF_AVCConfigSlot *slc;
 			u32 i;
 			GF_BitStream *bs;
 			GF_AVCConfig *avccfg = gf_isom_avc_config_get(mp4, track_num, 1);
 			priv->nalu_size = avccfg->nal_unit_size;
+
 			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 			for (i=0; i<gf_list_count(avccfg->sequenceParameterSets);i++) {
 				slc = gf_list_get(avccfg->sequenceParameterSets, i);
@@ -395,9 +414,7 @@
 			gf_bs_del(bs);
 			gf_odf_avc_cfg_del(avccfg);
 #endif
-			priv->nalu_delim[3] = 1;
-			priv->nalu_delim[4] = 0; /*this will be nal header*/
-			priv->nalu_delim[5] = 0xF0 /*7 "all supported NALUs" (=111) + rbsp trailing (10000)*/;
+
 		}
 			break;
 		}
@@ -1893,9 +1910,8 @@
 	return GF_BAD_PARAM;
 }
 
-/* adapted from http://svn.assembla.com/svn/legend/segmenter/segmenter.c */
-static GF_Err write_manifest(char *manifest, char *segment_dir, u32 segment_duration, char *segment_prefix, char *http_prefix, 
-							u32 first_segment, u32 last_segment, Bool end) {
+static GF_Err write_manifest(char *manifest, char *segment_dir, u32 segment_duration, char *segment_prefix, char *http_prefix, u32 first_segment, u32 last_segment, Bool end) 
+{
 	FILE *manifest_fp;
 	u32 i;
 	char manifest_tmp_name[GF_MAX_PATH];

gpac-0.5.0.svn4192.tar.bz2/applications/mp4box/filedump.c -> gpac-0.5.0.svn4296.tar.bz2/applications/mp4box/filedump.c Changed

@@ -814,7 +814,7 @@
 }
 #endif
 
-void dump_file_ts(GF_ISOFile *file, char *inName)
+void dump_file_timestamps(GF_ISOFile *file, char *inName)
 {
 	u32 i, j, k, count;
 	Bool has_error;
@@ -872,6 +872,250 @@
 	if (has_error) fprintf(stderr, "\tFile has CTTS table errors\n");
 }
 
+
+static void dump_nalu(FILE *dump, char *ptr, u32 ptr_size, Bool is_svc, Bool is_hevc)
+{
+	u8 type;
+	u8 dependency_id, quality_id, temporal_id;
+	u8 track_ref_index;
+	u32 data_offset, sps_id, pps_id;
+	
+	if (is_hevc) {
+		type = (ptr[0]  & 0x7E) >> 1;
+		fprintf(dump, "code=\"%d\" type=\"", type);
+		switch (type) {
+		case GF_HEVC_NALU_SLICE_TRAIL_N: fputs("TRAIL_N slice segment", dump); break;
+		case GF_HEVC_NALU_SLICE_TRAIL_R: fputs("TRAIL_R slice segment", dump); break;
+		case GF_HEVC_NALU_SLICE_TSA_N: fputs("TSA_N slice segment", dump); break;
+		case GF_HEVC_NALU_SLICE_TSA_R: fputs("TSA_R slice segment", dump); break;
+		case GF_HEVC_NALU_SLICE_STSA_N: fputs("STSA_N slice segment", dump); break;
+		case GF_HEVC_NALU_SLICE_STSA_R: fputs("STSA_R slice segment", dump); break;
+		case GF_HEVC_NALU_SLICE_RADL_N: fputs("RADL_N slice segment", dump); break;
+		case GF_HEVC_NALU_SLICE_RADL_R: fputs("RADL_R slice segment", dump); break;
+		case GF_HEVC_NALU_SLICE_RASL_N: fputs("RASL_N slice segment", dump); break;
+		case GF_HEVC_NALU_SLICE_RASL_R: fputs("RASL_R slice segment", dump); break;
+		case GF_HEVC_NALU_SLICE_BLA_W_LP: fputs("Broken link access slice (W LP)", dump); break;
+		case GF_HEVC_NALU_SLICE_BLA_W_DLP: fputs("Broken link access slice (W DLP)", dump); break;
+		case GF_HEVC_NALU_SLICE_BLA_N_LP: fputs("Broken link access slice (N LP)", dump); break;
+		case GF_HEVC_NALU_SLICE_IDR_W_DLP: fputs("IDR slice (W DLP)", dump); break;
+		case GF_HEVC_NALU_SLICE_IDR_N_LP: fputs("IDR slice (N LP)", dump); break;
+		case GF_HEVC_NALU_SLICE_CRA: fputs("CRA slice", dump); break;
+
+		case GF_HEVC_NALU_VID_PARAM: fputs("Video Parameter Set", dump); break;
+		case GF_HEVC_NALU_SEQ_PARAM: fputs("Sequence Parameter Set", dump); break;
+		case GF_HEVC_NALU_PIC_PARAM: fputs("Picture Parameter Set", dump); break;
+		case GF_HEVC_NALU_ACCESS_UNIT: fputs("AU Delimiter", dump); break;
+		case GF_HEVC_NALU_END_OF_SEQ: fputs("End of Sequence", dump); break;
+		case GF_HEVC_NALU_END_OF_STREAM: fputs("End of Stream", dump); break;
+		case GF_HEVC_NALU_FILLER_DATA: fputs("Filler Data", dump); break;
+		case GF_HEVC_NALU_SEI_PREFIX: fputs("SEI Prefix", dump); break;
+		case GF_HEVC_NALU_SEI_SUFFIX: fputs("SEI Suffix", dump); break;
+		default:
+			fputs("UNKNOWN", dump); break;
+		}
+		fputs("\"", dump);
+		return;
+	} 
+	
+	type = ptr[0] & 0x1F;
+	fprintf(dump, "code=\"%d\" type=\"", type);
+	switch (type) {
+	case GF_AVC_NALU_NON_IDR_SLICE: fputs("Non IDR slice", dump); break;
+	case GF_AVC_NALU_DP_A_SLICE: fputs("DP Type A slice", dump); break;
+	case GF_AVC_NALU_DP_B_SLICE: fputs("DP Type B slice", dump); break;
+	case GF_AVC_NALU_DP_C_SLICE: fputs("DP Type C slice", dump); break;
+	case GF_AVC_NALU_IDR_SLICE: fputs("IDR slice", dump); break;
+	case GF_AVC_NALU_SEI: fputs("SEI Message", dump); break;
+	case GF_AVC_NALU_SEQ_PARAM: 
+		fputs("SequenceParameterSet", dump); 
+		gf_avc_get_sps_info(ptr, ptr_size, &sps_id, NULL, NULL, NULL, NULL);
+		fprintf(dump, "\" sps_id=\"%d", sps_id);
+		break;
+	case GF_AVC_NALU_PIC_PARAM: 
+		fputs("PictureParameterSet", dump);
+		gf_avc_get_pps_info(ptr, ptr_size, &pps_id, &sps_id);
+		fprintf(dump, "\" pps_id=\"%d\" sps_id=\"%d", pps_id, sps_id);
+		break;
+	case GF_AVC_NALU_ACCESS_UNIT: fputs("AccessUnit delimiter", dump); break;
+	case GF_AVC_NALU_END_OF_SEQ: fputs("EndOfSequence", dump); break;
+	case GF_AVC_NALU_END_OF_STREAM: fputs("EndOfStream", dump); break;
+	case GF_AVC_NALU_FILLER_DATA: fputs("Filler data", dump); break;
+	case GF_AVC_NALU_SEQ_PARAM_EXT: fputs("SequenceParameterSetExtension", dump); break;
+	case GF_AVC_NALU_SVC_PREFIX_NALU: fputs("SVCPrefix", dump); break;
+	case GF_AVC_NALU_SVC_SUBSEQ_PARAM: 
+		fputs("SVCSubsequenceParameterSet", dump); 
+		gf_avc_get_sps_info(ptr, ptr_size, &sps_id, NULL, NULL, NULL, NULL);
+		fprintf(dump, "\" sps_id=\"%d", sps_id);
+		break;
+	case GF_AVC_NALU_SLICE_AUX: fputs("Auxiliary Slice", dump); break;
+
+	case GF_AVC_NALU_SVC_SLICE: 
+		fputs(is_svc ? "SVCSlice" : "CodedSliceExtension", dump);
+		dependency_id = (ptr[2] & 0x70) >> 4;
+		quality_id = (ptr[2] & 0x0F);
+		temporal_id = (ptr[3] & 0xE0) >> 5;
+		fprintf(dump, "\" dependency_id=\"%d\" quality_id=\"%d\" temporal_id=\"%d", dependency_id, quality_id, temporal_id);
+		break;
+	case 30: fputs("SVCAggregator", dump); break;
+	case 31:
+		fputs("SVCExtractor", dump); 
+		track_ref_index = (u8) ptr[4];
+		data_offset = (ptr[6] << 12) + (ptr[7] << 8) + (ptr[8] << 4) + ptr[9];
+		fprintf(dump, "\" track_ref_index=\"%d\" data_offset=\"%d", track_ref_index, data_offset);
+		break;
+
+	default:
+		fputs("UNKNOWN", dump); break;
+	}
+	fputs("\"", dump);
+}
+
+void dump_file_nal(GF_ISOFile *file, u32 trackID, char *inName)
+{
+	u32 i, count, track, nalh_size, timescale, cur_extract_mode;
+	Bool is_hevc = 0;
+	FILE *dump;
+	s32 countRef;
+#ifndef GPAC_DISABLE_AV_PARSERS
+	GF_AVCConfig *avccfg, *svccfg;
+	GF_HEVCConfig *hevccfg;
+	GF_AVCConfigSlot *slc;
+#endif
+
+	if (inName) {
+		char szBuf[GF_MAX_PATH];
+		strcpy(szBuf, inName);
+		sprintf(szBuf, "%s_%d_nalu.xml", inName, trackID);
+		dump = gf_f64_open(szBuf, "wt");
+	} else {
+		dump = stderr;
+	}
+	track = gf_isom_get_track_by_id(file, trackID);
+
+	count = gf_isom_get_sample_count(file, track);
+
+	timescale = gf_isom_get_media_timescale(file, track);
+
+	cur_extract_mode = gf_isom_get_nalu_extract_mode(file, track);
+
+	fprintf(dump, "<NALUTrack trackID=\"%d\" SampleCount=\"%d\" TimeScale=\"%d\">\n", trackID, count, timescale);
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+	avccfg = gf_isom_avc_config_get(file, track, 1);
+	svccfg = gf_isom_svc_config_get(file, track, 1);
+	hevccfg = gf_isom_hevc_config_get(file, track, 1);
+	fprintf(dump, " <NALUConfig>\n");
+
+#define DUMP_ARRAY(arr, name)\
+	if (arr) {\
+		for (i=0; i<gf_list_count(arr); i++) {\
+			slc = gf_list_get(arr, i);\
+			fprintf(dump, "  <%s number=\"%d\" size=\"%d\"", name, i+1, slc->size);\
+			dump_nalu(dump, slc->data, slc->size, svccfg ? 1 : 0, is_hevc);\
+			fprintf(dump, "/>\n");\
+		}\
+	}\
+
+	nalh_size = 0;
+
+	if (avccfg) {
+		nalh_size = avccfg->nal_unit_size;
+
+		DUMP_ARRAY(avccfg->sequenceParameterSets, "AVCSPSArray")
+		DUMP_ARRAY(avccfg->pictureParameterSets, "AVCPPSArray")
+		DUMP_ARRAY(avccfg->sequenceParameterSetExtensions, "AVCSPSExArray")
+	}
+	if (svccfg) {
+		if (!nalh_size) nalh_size = svccfg->nal_unit_size;
+		DUMP_ARRAY(svccfg->sequenceParameterSets, "SVCSPSArray")
+		DUMP_ARRAY(svccfg->pictureParameterSets, "SVCPPSArray")
+	}
+	if (hevccfg) {
+		nalh_size = hevccfg->nal_unit_size;
+		is_hevc = 1;
+		for (i=0; i<gf_list_count(hevccfg->param_array); i++) {
+			GF_HEVCParamArray *ar = gf_list_get(hevccfg->param_array, i);
+			if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
+				DUMP_ARRAY(ar->nalus, "HEVCSPSArray")
+			} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
+				DUMP_ARRAY(ar->nalus, "HEVCPPSArray")
+			} else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
+				DUMP_ARRAY(ar->nalus, "HEVCVPSArray")
+			} else { 
+				DUMP_ARRAY(ar->nalus, "HEVCUnknownPSArray")
+			}
+		}
+	}
+#endif
+	fprintf(dump, " </NALUConfig>\n");
+
+	/*for testing dependency*/
+	countRef = gf_isom_get_reference_count(file, track, GF_ISOM_REF_SCAL);
+	if (countRef > 0)
+	{
+		u32 refTrackID;
+		fprintf(dump, " <SCALReferences>\n");
+		for (i = 1; i <= (u32) countRef; i++)
+		{
+			gf_isom_get_reference_ID(file, track, GF_ISOM_REF_SCAL, i, &refTrackID);
+			fprintf(dump, "  <SCALReference number=\"%d\" refTrackID=\"%d\"/>\n", i, refTrackID);
+		}
+			
+		fprintf(dump, " </SCALReferences>\n");
+	}
+
+	fprintf(dump, " <NALUSamples>\n");
+	gf_isom_set_nalu_extract_mode(file, track, GF_ISOM_NALU_EXTRACT_INSPECT);
+	for (i=0; i<count; i++) {
+		u64 dts, cts;
+		u32 size, nal_size, idx;
+		char *ptr;
+		GF_ISOSample *samp = gf_isom_get_sample(file, track, i+1, NULL);
+		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;
+		while (size) {
+			u32 v = nalh_size;
+			nal_size = 0;
+			while (v) {
+				nal_size |= (u8) *ptr;
+				ptr++;
+				v-=1;
+				if (v) nal_size<<=8;
+			}
+			if (nalh_size + nal_size > size) {
+				fprintf(dump, "   \n", idx, nal_size, size);
+				break;
+			} else {
+				fprintf(dump, "   <NALU number=\"%d\" size=\"%d\" ", idx, nal_size);
+				dump_nalu(dump, ptr, nal_size, svccfg ? 1 : 0, is_hevc);
+				fprintf(dump, "/>\n");
+			}
+			idx++;
+			ptr+=nal_size;
+			size -= nal_size + nalh_size;
+		}
+		fprintf(dump, "  </Sample>\n");
+		gf_isom_sample_del(&samp);
+
+		fprintf(dump, "\n");
+		gf_set_progress("Analysing Track NALUs", i+1, count);
+	}
+	fprintf(dump, " </NALUSamples>\n");
+	fprintf(dump, "</NALUTrack>\n");
+
+	if (inName) fclose(dump);
+	if (avccfg) gf_odf_avc_cfg_del(avccfg);
+	if (svccfg) gf_odf_avc_cfg_del(svccfg);
+	gf_isom_set_nalu_extract_mode(file, track, cur_extract_mode);
+}
+
 #ifndef GPAC_DISABLE_ISOM_DUMP
 
 void dump_file_ismacryp(GF_ISOFile *file, char *inName)
@@ -1095,7 +1339,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;
+	u32 trackNum, i, j, max_rate, rate, ts, mtype, msub_type, timescale, sr, nb_ch, count, alt_group, nb_groups, nb_edits;
 	u64 time_slice, dur, size;
 	u8 bps;
 	GF_ESD *esd;
@@ -1108,7 +1352,11 @@
 	}
 
 	timescale = gf_isom_get_media_timescale(file, trackNum);
-	fprintf(stderr, "Track # %d Info - TrackID %d - TimeScale %d - Duration %s\n", trackNum, trackID, timescale, format_duration(gf_isom_get_media_duration(file, trackNum), timescale, szDur));
+	fprintf(stderr, "Track # %d Info - TrackID %d - TimeScale %d - Media Duration %s\n", trackNum, trackID, timescale, format_duration(gf_isom_get_media_duration(file, trackNum), timescale, szDur));
+	nb_edits = gf_isom_get_edit_segment_count(file, trackNum);
+	if (nb_edits)
+		fprintf(stderr, "Track has %d edit lists: track duration is %s\n", nb_edits, format_duration(gf_isom_get_track_duration(file, trackNum), gf_isom_get_timescale(file), szDur));
+
 	if (gf_isom_is_track_in_root_od(file, trackNum) ) fprintf(stderr, "Track is present in Root OD\n");
 	if (!gf_isom_is_track_enabled(file, trackNum))  fprintf(stderr, "Track is disabled\n");
 	gf_isom_get_media_language(file, trackNum, sType);
@@ -1145,8 +1393,12 @@
 		|| (msub_type==GF_ISOM_SUBTYPE_MPEG4_CRYP) 
 		|| (msub_type==GF_ISOM_SUBTYPE_AVC_H264)
 		|| (msub_type==GF_ISOM_SUBTYPE_AVC2_H264)
+		|| (msub_type==GF_ISOM_SUBTYPE_AVC3_H264)
+		|| (msub_type==GF_ISOM_SUBTYPE_AVC4_H264)
 		|| (msub_type==GF_ISOM_SUBTYPE_SVC_H264)
 		|| (msub_type==GF_ISOM_SUBTYPE_LSR1)
+		|| (msub_type==GF_ISOM_SUBTYPE_HVC1)
+		|| (msub_type==GF_ISOM_SUBTYPE_HEV1)
 	)  {
 		esd = gf_isom_get_esd(file, trackNum, 1);
 		if (!esd) {
@@ -1214,7 +1466,7 @@
 							}
 						}
 						if (avccfg->chroma_bit_depth) {
-							fprintf(stderr, "\tChroma format %d - Luma bit depth %d - chroma bot depth %d\n", avccfg->chroma_format, avccfg->luma_bit_depth, avccfg->chroma_bit_depth);
+							fprintf(stderr, "\tChroma format %d - Luma bit depth %d - chroma bit depth %d\n", avccfg->chroma_format, avccfg->luma_bit_depth, avccfg->chroma_bit_depth);
 						}
 						gf_odf_avc_cfg_del(avccfg);
 					}
@@ -1237,7 +1489,42 @@
 						gf_odf_avc_cfg_del(svccfg);
 					}
 #endif /*GPAC_DISABLE_AV_PARSERS*/
+
+				} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+					GF_HEVCConfig *hevccfg;
+#endif
+
+					gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
+					if (full_dump) fprintf(stderr, "\t");
+					fprintf(stderr, "HEVC Video - Visual Size %d x %d\n", w, h);
+#ifndef GPAC_DISABLE_AV_PARSERS
+					hevccfg = gf_isom_hevc_config_get(file, trackNum, 1);
+					if (!hevccfg ) {
+						fprintf(stderr, "\n\n\tNon-compliant HEVC track: hvcC not found in sample description\n");
+					} else {
+						u32 k;
+						fprintf(stderr, "\tHEVC Info: Profile IDC %d - Level IDC %d - Chroma Format %d\n", hevccfg->profile_idc, hevccfg->level_idc, hevccfg->chromaFormat);
+						fprintf(stderr, "\tNAL Unit length bits: %d - profile compatibility 0x%08X\n", 8*hevccfg->nal_unit_size, hevccfg->profile_compatibility_indications);
+						fprintf(stderr, "\tParameter Sets: ");
+						for (k=0; k<gf_list_count(hevccfg->param_array); k++) {
+							GF_HEVCParamArray *ar=gf_list_get(hevccfg->param_array, k);
+							if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
+								fprintf(stderr, "%d SPS ", gf_list_count(ar->nalus));
+							}
+							else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
+								fprintf(stderr, "%d PPS ", gf_list_count(ar->nalus));
+							}
+							if (ar->type==GF_HEVC_NALU_VID_PARAM) {
+								fprintf(stderr, "%d VPS ", gf_list_count(ar->nalus));
+							}
+						}
+						fprintf(stderr, "\n\tBit Depth luma %d - Chroma %d - %d temporal layers\n", hevccfg->luma_bit_depth, hevccfg->chroma_bit_depth, hevccfg->numTemporalLayers);
+						gf_odf_hevc_cfg_del(hevccfg);
+					}
+#endif /*GPAC_DISABLE_AV_PARSERS*/
 				} 
+
 				/*OGG media*/
 				else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_MEDIA_OGG) {
 					char *szName;
@@ -1289,7 +1576,8 @@
 					if (full_dump) fprintf(stderr, "\t");
 					if (e) fprintf(stderr, "Corrupted AAC Config\n");
 					else {
-						fprintf(stderr, "MPEG-%d Audio %s - %d Channel(s) - SampleRate %d", is_mp2 ? 2 : 4, gf_m4a_object_type_name(a_cfg.base_object_type), a_cfg.nb_chan, a_cfg.base_sr);
+						fprintf(stderr, "%s - %d Channel(s) - SampleRate %d", gf_m4a_object_type_name(a_cfg.base_object_type), a_cfg.nb_chan, a_cfg.base_sr);
+						if (is_mp2) fprintf(stderr, " (MPEG-2 Signaling)"); 
 						if (a_cfg.has_sbr) fprintf(stderr, " - SBR SampleRate %d", a_cfg.sbr_sr);
 						if (a_cfg.has_ps) fprintf(stderr, " - PS");
 						fprintf(stderr, "\n");
@@ -1791,7 +2079,7 @@
 				fprintf(stderr, "\tTempo (BPM): %d\n", tag[1]);
 			}
 		}
-		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_TRACKNUMBER, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tTrackNumber: %d / %d\n", tag[3], tag[5]);
+		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_TRACKNUMBER, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tTrackNumber: %d / %d\n", (0xff00 & (tag[2]<<8)) | (0xff & tag[3]), (0xff00 & (tag[4]<<8)) | (0xff & tag[5]));
 		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_TRACK, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tTrack: %s\n", tag);
 		if (gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_GROUP, &tag, &tag_len)==GF_OK) fprintf(stderr, "\tGroup: %s\n", tag);
 
@@ -1811,111 +2099,7 @@
 
 
 #ifndef GPAC_DISABLE_MPEG2TS
-#include <gpac/internal/isomedia_dev.h>
-
-typedef struct
-{	
-	Bool start_indexing;
 
-	/* For indexing the TS*/
-	Double segment_duration;
-	Bool segment_at_rap;
-	u32 subsegs_per_segment;
-	char *segment_name;
-	char *segment_ext;
-	char *rep_id;
-	Bool use_url_template;
-	char *init_seg_name;
-	Bool single_segment;
-
-	u32 segment_index;
-
-	FILE *index_file;
-	char index_file_name[GF_MAX_PATH];
-	GF_BitStream *index_bs;
-
-	char mpd_file_name[GF_MAX_PATH];
-	FILE *mpd_file;
-	/* temporary file to store the MPD segment description before writing the header */
-	FILE *mpd_segs;
-
-	u32 reference_pid;
-	GF_M2TS_PES *reference_stream;
-	
-	u32 nb_pes_in_segment;
-	/* earliest presentation time for the whole segment */
-	u64 first_PTS;
-
-	/* earliest presentation time for the subsegment being processed */
-	u64 base_PTS;
-	/* byte offset for the start of subsegment being processed */
-	u32 base_offset;
-	/* last presentation time for the subsegment being processed (before the next subsegment is started) */
-	u64 last_PTS;
-	/* last decoding time for the subsegment being processed */
-	u64 last_DTS;
-	/* byte offset for the last PES packet for the subsegment being processed */
-	u32 last_offset;
-
-	/* earliest presentation time for the previous subsegment */
-	u64 prev_base_PTS;
-	/* byte offset for the start of the previous subsegment */
-	u32 prev_base_offset;
-	/* last presentation time for the previous subsegment */
-	u64 prev_last_PTS;
-	/* byte offset for the last PES packet for the previous subsegment */
-	u32 prev_last_offset;
-
-	/* indicates if the current subsegment contains a SAP and its SAP type*/
-	u32 SAP_type;
-	/* indicates if the first PES in the current subsegment is a SAP*/
-	Bool first_pes_sap;
-	/* Presentation time for the first RAP encountered in the subsegment */
-	u64 first_SAP_PTS;
-	/* byte offset for the first RAP encountered in the subsegment */
-	u32 first_SAP_offset;
-	u64 prev_last_SAP_PTS;
-	u32 prev_last_SAP_offset;
-	u64 last_SAP_PTS;
-	u32 last_SAP_offset;
-
-	/*Interpolated PCR value for the pcrb*/
-	u64 interpolated_pcr_value;
-	u64 last_pcr_value;
-
-	/* information about the first PAT found in the subsegment */
-	u32 last_pat_position;
-	u32 first_pat_position;
-	u32 prev_last_pat_position;
-	Bool first_pat_position_valid;
-	u32 pat_version;
-
-	/* information about the first CAT found in the subsegment */
-	u32 last_cat_position;
-	u32 first_cat_position;
-	u32 prev_last_cat_position;
-	Bool first_cat_position_valid;
-	u32 cat_version;
-
-	/* information about the first PMT found in the subsegment */
-	u32 last_pmt_position;
-	u32 first_pmt_position;
-	u32 prev_last_pmt_position;
-	Bool first_pmt_position_valid;
-	u32 pmt_version;
-
-	/* information about the first PCR found in the subsegment */
-	u32 last_pcr_position;
-	u32 first_pcr_position;
-	Bool first_pcr_position_valid;
-	u32 prev_last_pcr_position;
-
-	//GF_List *sidxs;
-	GF_SegmentIndexBox *sidx;
-	
-	//GF_List *pcrbs;
-	GF_PcrInfoBox *pcrb;
-} GF_M2TS_IndexingInfo;
 
 typedef struct
 {
@@ -1939,202 +2123,9 @@
 	u32 dump_pid;
 	Bool has_seen_pat;
 
-	GF_M2TS_IndexingInfo index_info;
-
 } GF_M2TS_Dump;
 
-/* Initializes an SIDX */
-static GF_SegmentIndexBox *m2ts_sidx_new(u32 pid, u64 PTS, u64 position)
-{						
-	GF_SegmentIndexBox *sidx = (GF_SegmentIndexBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SIDX);
-	sidx->reference_ID = pid;
-	/* timestamps in MPEG-2 are expressed in 90 kHz timescale */
-	sidx->timescale = 90000;
-	/* first encountered PTS on the PID for this subsegment */
-	sidx->earliest_presentation_time = PTS;
-	sidx->first_offset = position;
-	return sidx;
-}
-
-static void m2ts_sidx_add_entry(GF_SegmentIndexBox *sidx, Bool ref_type, 
-								u32 size, u32 duration, Bool first_is_SAP, u32 sap_type, u32 RAP_delta_time)
-{
-	GF_SIDXReference *ref;
-	sidx->nb_refs++;
-	sidx->refs = gf_realloc(sidx->refs, sidx->nb_refs*sizeof(GF_SIDXReference));
-	ref = &(sidx->refs[sidx->nb_refs-1]);
-	ref->reference_type = ref_type;
-	ref->reference_size = size;
-	ref->subsegment_duration = duration;
-	ref->starts_with_SAP = first_is_SAP;
-	ref->SAP_type = sap_type;
-	ref->SAP_delta_time = (sap_type ? RAP_delta_time: 0);
-}
-
-static void m2ts_pcrb_add_entry(GF_PcrInfoBox *pcrb, u64 interpolatedPCR)
-{
-	pcrb->subsegment_count++;
-	pcrb->pcr_values = gf_realloc(pcrb->pcr_values, pcrb->subsegment_count*sizeof(u64));
-	
-	pcrb->pcr_values[pcrb->subsegment_count-1] = interpolatedPCR;
-}
-
-static void m2ts_sidx_update_prev_entry_duration(GF_SegmentIndexBox *sidx, u32 duration)
-{
-	GF_SIDXReference *ref;
-	if (sidx->nb_refs == 0) return;
-	ref = &(sidx->refs[sidx->nb_refs-1]);
-	ref->subsegment_duration = duration;
-}
-
-static void m2ts_sidx_finalize_size(GF_M2TS_IndexingInfo *index_info, u64 file_size)
-{
-	GF_SIDXReference *ref;
-	if (index_info->sidx->nb_refs == 0) return;
-	ref = &(index_info->sidx->refs[index_info->sidx->nb_refs-1]);
-	ref->reference_size = (u32)(file_size - index_info->prev_base_offset);
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Subsegment: position-range ajdustment:%d-%d (%d bytes)\n", index_info->prev_base_offset, (u32)file_size, ref->reference_size));
-}
-
-static void m2ts_sidx_flush_entry(GF_M2TS_IndexingInfo *index_info) 
-{
-	u32 size; 
-	u32 duration, prev_duration; 
-	u32 SAP_delta_time; 
-	u32 SAP_offset;
-
-	u32 end_offset;
-
-	if (!index_info->sidx) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Segment: Reference PID: %d, EPTime: "LLU", Start Offset: %d bytes\n", index_info->reference_pid, index_info->base_PTS, index_info->base_offset));
-		index_info->sidx = m2ts_sidx_new(index_info->reference_pid, index_info->base_PTS, index_info->base_offset);
-	}
-	
-	if (!index_info->pcrb) {
-		index_info->pcrb = (GF_PcrInfoBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_PCRB);
-	}
-
-	/* determine the end of the current index */
-	if (index_info->segment_at_rap) {
-		/*split at PAT*/
-		end_offset = index_info->last_pat_position;
-	} else {
-		/* split at PES header */
-		end_offset = index_info->last_offset; 
-	}
-
-	/* close the current index */ 
-	size = (u32)(end_offset - index_info->base_offset);
-	duration = (u32)(index_info->last_PTS - index_info->base_PTS);
-	SAP_delta_time= (u32)(index_info->first_SAP_PTS - index_info->base_PTS);
-	SAP_offset = (u32)(index_info->first_SAP_offset - index_info->base_offset);
-	m2ts_sidx_add_entry(index_info->sidx, 0, size, duration, index_info->first_pes_sap, index_info->SAP_type, SAP_delta_time);
-	m2ts_pcrb_add_entry(index_info->pcrb, index_info->interpolated_pcr_value);
-
-	/* adjust the previous index duration */
-	if (index_info->sidx->nb_refs > 0 && (index_info->base_PTS < index_info->prev_last_PTS) ) {
-		prev_duration = (u32)(index_info->base_PTS-index_info->prev_base_PTS);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("           time-range adj.: %.03f-%.03f / %.03f sec.\n", 		
-			(index_info->prev_base_PTS - index_info->first_PTS)/90000.0, 
-			(index_info->base_PTS - index_info->first_PTS)/90000.0, prev_duration/90000.0);
-		m2ts_sidx_update_prev_entry_duration(index_info->sidx, prev_duration));
-	}
-
-	/* Printing result */
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Subsegment:"));
-	//time-range:position-range: 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (" %.03f-%0.3f / %.03f sec., %d-%d / %d bytes, ",
-		(index_info->base_PTS - index_info->first_PTS)/90000.0, 
-		(index_info->last_PTS - index_info->first_PTS)/90000.0, duration/90000.0,
-		index_info->base_offset, end_offset, size));
-	if (index_info->SAP_type) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("RAP @ %.03f sec. / %d bytes", (index_info->first_SAP_PTS - index_info->first_PTS)/90000.0, 
-			SAP_offset));
-	}
-	if (index_info->first_pat_position_valid) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", PAT @ %d bytes", (u32)(index_info->first_pat_position - index_info->base_offset)));
-	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No PAT"));
-	}
-	if (index_info->first_cat_position_valid) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", CAT @ %d bytes", (u32)(index_info->first_cat_position - index_info->base_offset)));
-	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No CAT"));
-	}
-	if (index_info->first_pmt_position_valid) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", PMT @ %d bytes", (u32)(index_info->first_pmt_position - index_info->base_offset)));
-	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No PMT"));
-	}
-	if (index_info->first_pcr_position_valid) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", PCR @ %d bytes", (u32)(index_info->first_pcr_position - index_info->base_offset)));
-	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No PCR"));
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("\n"));
-
-	/* save the current values for later adjustments */
-	index_info->prev_last_SAP_PTS = index_info->last_SAP_PTS;
-	index_info->prev_last_SAP_offset = index_info->last_SAP_offset;
-	index_info->prev_last_PTS = index_info->last_PTS;
-	index_info->prev_last_offset = index_info->last_offset;
-	index_info->prev_base_PTS = index_info->base_PTS;
-	index_info->base_PTS = index_info->last_PTS;
-	index_info->prev_base_offset = index_info->base_offset;
-	index_info->prev_last_pat_position = index_info->last_pat_position;
-	index_info->prev_last_cat_position = index_info->last_cat_position;
-	index_info->prev_last_pmt_position = index_info->last_pmt_position;
-	index_info->prev_last_pcr_position = index_info->last_pcr_position;
-	
-	/* update the values for the new index*/
-	index_info->base_offset = end_offset;
-	index_info->SAP_type = 0;
-	index_info->first_SAP_PTS = 0;
-	index_info->first_SAP_offset = 0;
-	index_info->first_pes_sap = 0;
-	index_info->nb_pes_in_segment = 0;
-	index_info->last_DTS = 0;
-
-	if (index_info->last_pat_position >= index_info->base_offset) {
-		index_info->first_pat_position_valid = 1;
-		index_info->first_pat_position = index_info->last_pat_position;
-	} else {
-		index_info->first_pat_position_valid = 0;
-		index_info->first_pat_position = 0;
-	}
-	if (index_info->last_cat_position >= index_info->base_offset) {
-		index_info->first_cat_position_valid = 1;
-		index_info->first_cat_position = index_info->last_cat_position;
-	} else {
-		index_info->first_cat_position_valid = 0;
-		index_info->first_cat_position = 0;
-	}
-	if (index_info->last_pmt_position >= index_info->base_offset) {
-		index_info->first_pmt_position_valid = 1;
-		index_info->first_pmt_position = index_info->last_pmt_position;
-	} else {
-		index_info->first_pmt_position_valid = 0;
-		index_info->first_pmt_position = 0;
-	}
-	if (index_info->last_pcr_position >= index_info->base_offset) {
-		index_info->first_pcr_position_valid = 1;
-		index_info->first_pcr_position = index_info->last_pcr_position;
-	} else {
-		index_info->first_pcr_position_valid = 0;
-		index_info->first_pcr_position = 0;
-	}
-}
 
-static void m2ts_check_indexing(GF_M2TS_IndexingInfo *index_info)
-{
-	u32 delta_time = (u32)(index_info->last_PTS - index_info->base_PTS);
-	u32 segment_duration = (u32)(index_info->segment_duration*90000);
-	/* we need to create an SIDX entry when the duration of the previous entry is too big */
-	if (delta_time >= segment_duration) {
-		m2ts_sidx_flush_entry(index_info);
-	} 
-}
 
 static void on_m2ts_dump_event(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
 {
@@ -2142,29 +2133,14 @@
 	GF_M2TS_Program *prog;
 	GF_M2TS_PES_PCK *pck;
 	GF_M2TS_Dump *dumper = (GF_M2TS_Dump *)ts->user;
-	GF_M2TS_IndexingInfo *index_info = &dumper->index_info;
 
 	switch (evt_type) {
 	case GF_M2TS_EVT_PAT_FOUND:
-		if (index_info->start_indexing) {
-			if (!index_info->first_pat_position_valid) {
-				index_info->first_pat_position_valid = 1;
-				index_info->first_pat_position = (ts->pck_number-1)*188;
-			}
-			index_info->last_pat_position = (ts->pck_number-1)*188;
-		}
 		if (dumper->timestamps_info_file) {
 			fprintf(dumper->timestamps_info_file, "%u\t%d\n", ts->pck_number, 0);
 		}
 		break;
 	case GF_M2TS_EVT_PAT_UPDATE:
-		if (index_info->start_indexing) {
-			if (!index_info->first_pat_position_valid) {
-				index_info->first_pat_position_valid = 1;
-				index_info->first_pat_position = (ts->pck_number-1)*188;
-			}
-			index_info->last_pat_position = (ts->pck_number-1)*188;
-		}
 		if (dumper->timestamps_info_file) {
 			fprintf(dumper->timestamps_info_file, "%u\t%d\n", ts->pck_number, 0);
 		}
@@ -2173,50 +2149,22 @@
 		/* WARNING: We detect the pat on a repetition, probably to ensure that we also have seen all the PMT 
 		   To be checked */
 		dumper->has_seen_pat = 1;
-		if (index_info->start_indexing) {
-			if (!index_info->first_pat_position_valid) {
-				index_info->first_pat_position_valid = 1;
-				index_info->first_pat_position = (ts->pck_number-1)*188;
-			}
-			index_info->last_pat_position = (ts->pck_number-1)*188;
-		}
 		if (dumper->timestamps_info_file) {
 			fprintf(dumper->timestamps_info_file, "%u\t%d\n", ts->pck_number, 0);
 		}
 //		fprintf(stderr, "Repeated PAT found - %d programs\n", gf_list_count(ts->programs) );
 		break;
 	case GF_M2TS_EVT_CAT_FOUND:
-		if (index_info->start_indexing) {
-			if (!index_info->first_cat_position_valid) {
-				index_info->first_cat_position_valid = 1;
-				index_info->first_cat_position = (ts->pck_number-1)*188;
-			}
-			index_info->last_cat_position = (ts->pck_number-1)*188;
-		}
 		if (dumper->timestamps_info_file) {
 			fprintf(dumper->timestamps_info_file, "%u\t%d\n", ts->pck_number, 0);
 		}
 		break;
 	case GF_M2TS_EVT_CAT_UPDATE:
-		if (index_info->start_indexing) {
-			if (!index_info->first_cat_position_valid) {
-				index_info->first_cat_position_valid = 1;
-				index_info->first_cat_position = (ts->pck_number-1)*188;
-			}
-			index_info->last_cat_position = (ts->pck_number-1)*188;
-		}
 		if (dumper->timestamps_info_file) {
 			fprintf(dumper->timestamps_info_file, "%u\t%d\n", ts->pck_number, 0);
 		}
 		break;
 	case GF_M2TS_EVT_CAT_REPEAT:
-		if (index_info->start_indexing) {
-			if (!index_info->first_cat_position_valid) {
-				index_info->first_cat_position_valid = 1;
-				index_info->first_cat_position = (ts->pck_number-1)*188;
-			}
-			index_info->last_cat_position = (ts->pck_number-1)*188;
-		}
 		if (dumper->timestamps_info_file) {
 			fprintf(dumper->timestamps_info_file, "%u\t%d\n", ts->pck_number, 0);
 		}
@@ -2225,13 +2173,7 @@
 		prog = (GF_M2TS_Program*)par;
 		if (gf_list_count(ts->programs)>1 && prog->number!=dumper->prog_number)
 			break;
-		if (index_info->start_indexing) {
-			if (!index_info->first_pmt_position_valid) {
-				index_info->first_pmt_position_valid = 1;
-				index_info->first_pmt_position = (ts->pck_number-1)*188;
-			}
-			index_info->last_pmt_position = (ts->pck_number-1)*188;
-		}
+		
 		count = gf_list_count(prog->streams);
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Program number %d found - %d streams:\n", prog->number, count));
@@ -2246,11 +2188,6 @@
 				if (pes->mpeg4_es_id) GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (" - MPEG-4 ES ID %d", pes->mpeg4_es_id));
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("\n"));
 			} 
-			if (es->pid == prog->pcr_pid) {
-				/* we create indexing information on the stream used for carrying the PCR */
-				index_info->reference_pid = prog->pcr_pid;
-				index_info->reference_stream = (GF_M2TS_PES *)es;
-			}
 		}
 		if (dumper->timestamps_info_file) {
 			fprintf(dumper->timestamps_info_file, "%u\t%d\n", ts->pck_number, prog->pmt_pid);
@@ -2260,13 +2197,6 @@
 		prog = (GF_M2TS_Program*)par;
 		if (gf_list_count(ts->programs)>1 && prog->number!=dumper->prog_number)
 			break;
-		if (index_info->start_indexing) {
-			if (!index_info->first_pmt_position_valid) {
-				index_info->first_pmt_position_valid = 1;
-				index_info->first_pmt_position = (ts->pck_number-1)*188;
-			}
-			index_info->last_pmt_position = (ts->pck_number-1)*188;
-		}
 		if (dumper->timestamps_info_file) {
 			fprintf(dumper->timestamps_info_file, "%u\t%d\n", ts->pck_number, prog->pmt_pid);
 		}
@@ -2275,13 +2205,6 @@
 		prog = (GF_M2TS_Program*)par;
 		if (gf_list_count(ts->programs)>1 && prog->number!=dumper->prog_number)
 			break;
-		if (index_info->start_indexing) {
-			if (!index_info->first_pmt_position_valid) {
-				index_info->first_pmt_position_valid = 1;
-				index_info->first_pmt_position = (ts->pck_number-1)*188;
-			}
-			index_info->last_pmt_position = (ts->pck_number-1)*188;
-		}
 		if (dumper->timestamps_info_file) {
 			fprintf(dumper->timestamps_info_file, "%u\t%d\n", ts->pck_number, prog->pmt_pid);
 		}
@@ -2321,66 +2244,37 @@
 			/*FIXME : not used GF_M2TS_Program *prog = pes->program; */
 			/* Interpolated PCR value for the TS packet containing the PES header start */
 			u64 interpolated_pcr_value = 0;
-			if (pes->last_pcr_value && pes->before_last_pcr_value && pes->last_pcr_value > pes->before_last_pcr_value) {
+			if (pes->last_pcr_value && pes->before_last_pcr_value_pck_number && pes->last_pcr_value > pes->before_last_pcr_value) {
 				u32 delta_pcr_pck_num = pes->last_pcr_value_pck_number - pes->before_last_pcr_value_pck_number;
 				u32 delta_pts_pcr_pck_num = pes->pes_start_packet_number - pes->last_pcr_value_pck_number;
 				u64 delta_pcr_value = pes->last_pcr_value - pes->before_last_pcr_value; 
+				if ((pes->pes_start_packet_number > pes->last_pcr_value_pck_number)
+					&& (pes->last_pcr_value > pes->before_last_pcr_value)) {
+					
+						pes->last_pcr_value = pes->before_last_pcr_value;
+				}
 				/* we can compute the interpolated pcr value for the packet containing the PES header */
 				interpolated_pcr_value = pes->last_pcr_value + (u64)((delta_pcr_value*delta_pts_pcr_pck_num*1.0)/delta_pcr_pck_num);
-				index_info->interpolated_pcr_value = interpolated_pcr_value;
-				index_info->last_pcr_value = pes->last_pcr_value;
 			}
 			
 			if (dumper->timestamps_info_file) {
+				Double diff;
 				fprintf(dumper->timestamps_info_file, "%u\t%d\t", pck->stream->pes_start_packet_number, pck->stream->pid);
 				if (interpolated_pcr_value) fprintf(dumper->timestamps_info_file, "%f", interpolated_pcr_value/(300.0 * 90000));
 				fprintf(dumper->timestamps_info_file, "\t");
 				if (pck->DTS) fprintf(dumper->timestamps_info_file, "%f", (pck->DTS / 90000.0));
-				fprintf(dumper->timestamps_info_file, "\t%f\t%d\t%d\n", pck->PTS / 90000.0, (pck->flags & GF_M2TS_PES_PCK_RAP ? 1 : 0), (pck->flags & GF_M2TS_PES_PCK_DISCONTINUITY ? 1 : 0));
-			}
-		}
-		if (index_info->start_indexing) {
-			/* we process packets only for the given PID */
-			if (pck->stream->pid != index_info->reference_pid) {
-				break;
-			} else {
-				if (index_info->last_DTS != pck->DTS) {
-					index_info->last_DTS = pck->DTS;
-					index_info->nb_pes_in_segment++;
-				}
-
-				/* we store the fact that there is at least a RAP for the index
-				and we store the PTS of the first encountered RAP in the index*/
-				if (pck->flags & GF_M2TS_PES_PCK_RAP) {
-					index_info->SAP_type = 1;
-					if (!index_info->first_SAP_PTS || (index_info->first_SAP_PTS > pck->PTS)) {
-						index_info->first_SAP_PTS = pck->PTS;
-						index_info->first_SAP_offset = (pck->stream->pes_start_packet_number-1)*188;
-					}
-					index_info->last_SAP_PTS = pck->PTS;
-					index_info->last_SAP_offset = (pck->stream->pes_start_packet_number-1)*188;
-
-					if (index_info->nb_pes_in_segment==1) {
-						index_info->first_pes_sap = 1;
-					}
-				}
-				/* we need to know the earliest PTS value (RAP or not) in the index*/
-				if (!index_info->base_PTS || (index_info->base_PTS > pck->PTS)) {
-					index_info->base_PTS = pck->PTS;
-				}
-				/* we need to know the earliest PTS value for the whole file (segment) */
-				if (!index_info->first_PTS || (index_info->first_PTS > pck->PTS)) {
-					index_info->first_PTS = pck->PTS;
-				}
-				if (pck->PTS > index_info->last_PTS) {
-					/* we use the last PTS for first approximation of the duration */
-					index_info->last_PTS = pck->PTS;
-					index_info->last_offset = (index_info->reference_stream->pes_start_packet_number-1)*188;
+				fprintf(dumper->timestamps_info_file, "\t%f\t%d\t%d", pck->PTS / 90000.0, (pck->flags & GF_M2TS_PES_PCK_RAP ? 1 : 0), (pck->flags & GF_M2TS_PES_PCK_DISCONTINUITY ? 1 : 0));
+				if (interpolated_pcr_value) {
+					diff = (pck->DTS ? pck->DTS : pck->PTS) / 90000.0;
+					diff -= pes->last_pcr_value / (300.0 * 90000);
+					fprintf(dumper->timestamps_info_file, "\t%f\n", diff);
+					if (diff<0) fprintf(stderr, "Warning: detected PTS/DTS value less than current PCR of %g sec\n", diff);
+				} else {
+					fprintf(dumper->timestamps_info_file, "\t\n");
 				}
-
-				m2ts_check_indexing(index_info);
 			}
 		}
+
 		if (dumper->has_seen_pat && dumper->pes_out && (dumper->dump_pid == pck->stream->pid)) {
 			gf_fwrite(pck->data, pck->data_len, 1, dumper->pes_out);
 		}
@@ -2392,13 +2286,6 @@
 		if (dumper->timestamps_info_file) {
 			fprintf(dumper->timestamps_info_file, "%u\t%d\t%f\t\t\t\t%d\n", pck->stream->program->last_pcr_value_pck_number, pck->stream->pid, pck->PTS / (300*90000.0), (pck->flags & GF_M2TS_PES_PCK_DISCONTINUITY ? 1 : 0));
 		}
-		if (index_info->start_indexing) {
-			if (!index_info->first_pcr_position_valid) {
-				index_info->first_pcr_position_valid = 1;
-				index_info->first_pcr_position = (ts->pck_number-1)*188;
-			}
-			index_info->last_pcr_position = (ts->pck_number-1)*188;
-		}
 		break;
 	case GF_M2TS_EVT_SL_PCK:
 #if 0
@@ -2431,227 +2318,6 @@
 	}
 }
 
-static void mpd_duration(Double duration, char *duration_string)
-{
-	u32 h, m;
-	Double s;
-
-	h = (u32) (duration/3600);
-	m = (u32) (duration-h*60)/60;
-	s = (duration - h*3600 - m*60);
-	if (h) sprintf(duration_string, "PT%dH%dM%.2fS", h, m, s);	
-	else if (m) sprintf(duration_string, "PT%dM%.2fS", m, s);	
-	else if (s) sprintf(duration_string, "PT%.2fS", s);	
-	else sprintf(duration_string, "PT0S");	
-}
-
-static void mpd_start(GF_M2TS_IndexingInfo *index_info, Bool is_first_rep, Bool on_demand, const char *media_file_name, 
-			   Double file_duration, Bool split_seg_at_rap, u64 file_size, Double bufferTime, u32 dash_profile,
-				const char *copyright, const char *mpd_title, const char *mpd_source, const char *mpd_info_url)
-{
-	char duration_string[100];
-	char buffer_string[100];
-	u32 bandwidth, i;
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
-	GF_MediaImporter import;
-#endif
-	char szCodecs[1000];
-	u32 width, height, sample_rate, nb_channels, langCode;
-	GF_Err e;
-	FILE *mpd = index_info->mpd_file;
-
-	/*get codecs*/	
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
-	memset(&import, 0, sizeof(GF_MediaImporter));
-	import.trackID = 0;
-	import.flags = GF_IMPORT_PROBE_ONLY;
-	import.in_name = (char *)media_file_name;
-	e = gf_media_import(&import);
-#else
-	fprintf(stderr, "Warning: generating MPD without media import support\n");
-#endif
-	strcpy(szCodecs, "");
-	width = height = sample_rate = nb_channels = langCode = 0;
-
-
-	bandwidth = (u32) (file_size * 8 / file_duration);	
-	mpd_duration(file_duration, duration_string);
-	mpd_duration(bufferTime, buffer_string);
-
-	if (is_first_rep) {
-		fprintf(mpd, "<?xml version=\"1.0\"?>\n");
-		fprintf(mpd, "\n");
-
-		fprintf(mpd, "<MPD type=\"%s\" xmlns=\"urn:mpeg:DASH:schema:MPD:2011\" profiles=\"%s\" minBufferTime=\"%s\" mediaPresentationDuration=\"%s\">\n", (on_demand ? "static": "dynamic"), (dash_profile==GF_DASH_PROFILE_LIVE) ? "urn:mpeg:dash:profile:mp2t-simple:2011" : "urn:mpeg:dash:profile:mp2t-main:2011", buffer_string, duration_string);
-		fprintf(mpd, " <ProgramInformation moreInformationURL=\"%s\">\n", mpd_info_url ? mpd_info_url : "http://gpac.sourceforge.net");
-		if (mpd_title) 
-			fprintf(mpd, "  <Title>mpd_title</Title>\n");
-		else
-			fprintf(mpd, "  <Title>%s generated by GPAC</Title>\n", index_info->mpd_file_name);
-
-		if (mpd_source) 
-			fprintf(mpd, "  <Source>%s</Source>\n", mpd_source);
-		if (copyright)
-			fprintf(mpd, "  <Copyright>%s</Copyright>\n", copyright);
-		fprintf(mpd, " </ProgramInformation>\n");
-		fprintf(mpd, " <Period start=\"PT0S\" duration=\"%s\" minBufferTime=\"%s\">\n", duration_string, buffer_string);	
-		fprintf(mpd, "  <AdaptationSet segmentAlignment=\"true\" bitstreamSwitching=\"true\" subsegmentAlignment=\"true\">\n");
-	}
-
-	if (!e) {
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
-		for (i=0; i<import.nb_tracks;i++) {
-			if (strlen(import.tk_info[i].szCodecProfile)) {
-				if (strlen(szCodecs)) strcat(szCodecs, ",");
-				strcat(szCodecs, import.tk_info[i].szCodecProfile);
-			}
-
-			if (import.tk_info[i].type==GF_ISOM_MEDIA_VISUAL) {
-				if (!width) width = import.tk_info[i].video_info.width;
-				if (!height) height = import.tk_info[i].video_info.height;
-				fprintf(mpd, "   <ContentComponent id=\"%d\" contentType=\"video\"/>\n", import.tk_info[i].track_num);
-			}
-			else if (import.tk_info[i].type==GF_ISOM_MEDIA_AUDIO) {
-				if (!sample_rate) sample_rate = import.tk_info[i].audio_info.sample_rate;
-				if (!nb_channels) nb_channels = import.tk_info[i].audio_info.nb_channels;
-				fprintf(mpd, "   <ContentComponent id=\"%d\" contentType=\"audio\"/>\n", import.tk_info[i].track_num);
-			}
-			if (!langCode && import.tk_info[i].lang) langCode = import.tk_info[i].lang;
-		}
-#endif
-	}
-
-	fprintf(mpd, "   <Representation id=\"%s\" mimeType=\"video/mp2t\" codecs=\"%s\"", index_info->rep_id, szCodecs);
-	if (width && height) fprintf(mpd, " width=\"%d\" height=\"%d\"", width, height);
-	if (sample_rate) fprintf(mpd, " audioSamplingRate=\"%d\"", sample_rate);
-	if (langCode) fprintf(mpd, " lang=\"%s\"", gf_4cc_to_str(langCode) );
-	fprintf(mpd, " startWithRAP=\"%s\"", split_seg_at_rap ? "1" : "false");
-	fprintf(mpd, " bandwidth=\"%d\"", bandwidth);
-	fprintf(mpd, ">\n");
-	if (nb_channels) 
-		fprintf(mpd, "    <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\"/>\n", nb_channels);
-
-}
-
-void mpd_end(FILE *mpd, Bool is_last_rep)
-{
-    fprintf(mpd, "   </Representation>\n");
-	if (is_last_rep) {
-		fprintf(mpd, "  </AdaptationSet>\n");
-		fprintf(mpd, " </Period>\n");
-		fprintf(mpd, "</MPD>");
-	}
-}
-
-static void write_mpd_segment_info(GF_M2TS_IndexingInfo *index_info, char *mpeg2ts_file, u32 bandwidth)
-{
-	char SegName[GF_MAX_PATH];
-	u32 i;
-	u64 start;
-
-	if (index_info->single_segment) {
-
-		if (!index_info->segment_name) {
-			fprintf(index_info->mpd_file, "    <BaseURL>%s</BaseURL>\n", mpeg2ts_file);
-		} else if (index_info->single_segment) {
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 1, SegName, mpeg2ts_file, index_info->rep_id, index_info->segment_name, "ts", 0, bandwidth, index_info->segment_index);
-			fprintf(index_info->mpd_file, "    <BaseURL>%s</BaseURL>\n", SegName);
-		}
-
-		fprintf(index_info->mpd_file, "    <SegmentBase>\n");
-		fprintf(index_info->mpd_file, "     <RepresentationIndex>%s</RepresentationIndex>\n", index_info->index_file_name);
-		fprintf(index_info->mpd_file, "    </SegmentBase>\n");
-		/*we reweite the file*/
-		if (index_info->segment_name) {
-			FILE *in, *out;
-			char buf[3760];
-
-			in = gf_f64_open(mpeg2ts_file, "rb");
-			out = gf_f64_open(SegName, "wb");
-			while (1) {
-				u32 read = fread(buf, 1, 3760, in);
-				if (!read) break;
-				fwrite(buf, 1, read, out);
-			}
-			fclose(in);
-			fclose(out);
-		}
-		return;
-	} 
-	if (index_info->segment_name && index_info->use_url_template) {
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, 1, SegName, mpeg2ts_file, index_info->rep_id, index_info->segment_name, "ts", 0, bandwidth, index_info->segment_index);
-		fprintf(index_info->mpd_file, "    <SegmentTemplate timescale=\"1000\" duration=\"%d\" startNumber=\"0\" media=\"%s\" >\n", (u32) (1000*index_info->segment_duration), SegName); 
-	} else {
-		fprintf(index_info->mpd_file, "    <SegmentList timescale=\"1000\" duration=\"%d\">\n", (u32) (1000*index_info->segment_duration)); 
-	}
-
-	/*not used for now*/
-	if (index_info->init_seg_name) {
-		fprintf(index_info->mpd_file, "     <Initialization sourceURL=\"%s\"/>\n", index_info->init_seg_name);
-	}
-	fprintf(index_info->mpd_file, "     <RepresentationIndex>%s</RepresentationIndex>\n", index_info->index_file_name); 
-
-	if (!index_info->segment_name) {
-		start=index_info->sidx->first_offset;
-		for (i=0; i<index_info->sidx->nb_refs; i++) {
-			GF_SIDXReference *ref = &index_info->sidx->refs[i];
-			fprintf(index_info->mpd_file, "     <SegmentURL mediaRange=\""LLD"-"LLD"\"/>\n", start, start+ref->reference_size-1);
-			start += ref->reference_size;
-		}
-	} else {
-		FILE *src, *dst;
-		u64 pos, end;
-		src= gf_f64_open(mpeg2ts_file, "rb");
-		start=index_info->sidx->first_offset;
-		for (i=0; i<index_info->sidx->nb_refs; i++) {
-			char buf[4096];
-			GF_SIDXReference *ref = &index_info->sidx->refs[i];
-
-
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 1, SegName, mpeg2ts_file, index_info->rep_id, index_info->segment_name, "ts", 0, bandwidth, index_info->segment_index);
-
-			if (index_info->use_url_template!=2) {
-				dst = gf_f64_open(SegName, "wb");
-
-				gf_f64_seek(src, start, SEEK_SET);
-				pos = start;
-				end = start+ref->reference_size;
-				while (pos<end) {
-					u32 res;
-					u32 to_read = 4096;
-					if (pos+4096 >= end) {
-						to_read = (u32) (end-pos);
-					}
-					res = fread(buf, 1, to_read, src);
-					if (res==to_read) {
-						res = fwrite(buf, 1, to_read, dst);
-					}
-					if (res!=to_read) {
-						fprintf(stderr, "IO error while Extracting segment %03d / %03d\r", i+1, index_info->sidx->nb_refs);
-						break;
-					}
-					pos += res;
-				}
-				fclose(dst);
-			}
-			start += ref->reference_size;
-			index_info->segment_index++;
-
-			if (!index_info->use_url_template) 
-				fprintf(index_info->mpd_file, "     <SegmentURL media=\"%s\"/>\n", SegName);
-
-			fprintf(stderr, "Extracting segment %03d / %03d\r", i+1, index_info->sidx->nb_refs);
-		}
-		fclose(src);
-	}		
-//		fprintf(index_info->mpd_file, "     <SegmentURL media=\"%s\" index=\"%s\"/>\n", media_file_name, index_info->index_file_name);
-	if (index_info->segment_name && index_info->use_url_template) {
-		fprintf(index_info->mpd_file, "    </SegmentTemplate>\n");
-	} else {
-		fprintf(index_info->mpd_file, "    </SegmentList>\n");
-	}
-}
-
 void dump_mpeg2_ts(char *mpeg2ts_file, char *out_name, Bool prog_num)
 {
 	char data[188];
@@ -2669,6 +2335,7 @@
 	}
 	ts = gf_m2ts_demux_new();
 	ts->on_event = on_m2ts_dump_event;
+	ts->notify_pes_timing = 1;
 	memset(&dumper, 0, sizeof(GF_M2TS_Dump));
 	ts->user = &dumper;
 	dumper.prog_number = prog_num;
@@ -2705,6 +2372,7 @@
 		gf_m2ts_process_data(ts, data, size);
 		if (dumper.has_seen_pat) break;
 	}
+	dumper.has_seen_pat = 1;
 
 	if (prog_num) {
 		sprintf(dumper.timestamps_info_name, "%s_prog_%d_timestamps.txt", mpeg2ts_file, prog_num/*, mpeg2ts_file*/);
@@ -2713,7 +2381,7 @@
 			fprintf(stderr, "Cannot open file %s\n", dumper.timestamps_info_name);
 			return;
 		}
-		fprintf(dumper.timestamps_info_file, "PCK#\tPID\tPCR\tDTS\tPTS\tRAP\tDiscontinuity\n");
+		fprintf(dumper.timestamps_info_file, "PCK#\tPID\tPCR\tDTS\tPTS\tRAP\tDiscontinuity\tDTS-PCR Diff\n");
 	}
 
 	gf_m2ts_reset_parsers(ts);
@@ -2746,181 +2414,7 @@
 
 }
 
-void dash_mpeg2_ts(char *mpeg2ts_file, char *mpd_name, Double dash_duration, Bool seg_at_rap, u32 subseg_per_seg,
-				   char *seg_name, char *seg_ext, Bool use_url_template, Bool single_segment, u32 rep_first_or_last, char *rep_id, u32 dash_profile,
-				   const char *copyright, const char *mpd_title, const char *mpd_source, const char *mpd_info_url)
-{
-	char data[188], szSegmentName[GF_MAX_PATH];
-	char *c, *f, *basename;
-	GF_M2TS_Dump dumper;
-	u64 file_size;
-	u32 bandwidth;
-	Double file_duration;
-	u32 size;
-	u64 fsize, fdone;
-	GF_M2TS_Demuxer *ts;
-	FILE *src;
-
-	src = gf_f64_open(mpeg2ts_file, "rb");
-	if (!src) {
-		fprintf(stderr, "Cannot open %s: no such file\n", mpeg2ts_file);
-		return;
-	}
-	ts = gf_m2ts_demux_new();
-	ts->on_event = on_m2ts_dump_event;
-	memset(&dumper, 0, sizeof(GF_M2TS_Dump));
-	ts->user = &dumper;
-
-	szSegmentName[0] = 0;
-
-	if (dash_profile==1) {
-		seg_at_rap = 1;
-	}
-
-	dumper.index_info.segment_duration = dash_duration;
-	dumper.index_info.segment_at_rap = seg_at_rap;
-	dumper.index_info.subsegs_per_segment = subseg_per_seg;
-	dumper.index_info.use_url_template = use_url_template;
-	dumper.index_info.init_seg_name = NULL;
-	dumper.index_info.single_segment = (single_segment || !seg_name) ? 1 : 0;
-	dumper.index_info.rep_id = rep_id;
-	dumper.index_info.segment_ext = seg_ext ? seg_ext : "ts";
-
-	if (seg_name && strstr(seg_name, "%s")) {
-		f = strrchr(mpeg2ts_file, '/');
-		if (!f) f = strrchr(mpeg2ts_file, '\\');
-		if (!f) f = mpeg2ts_file;
-		else f = f+1;
-		c = strrchr(f, '.');
-		if (c) c[0] = 0;
-		sprintf(szSegmentName, seg_name, f);
-		if (c) c[0] = '.';
-	} else if (seg_name) {
-		strcpy(szSegmentName, seg_name);
-	}
-	dumper.index_info.segment_name = seg_name ? szSegmentName : NULL;
-
-	basename = mpd_name ? mpd_name : mpeg2ts_file;
-	c = strrchr(basename, '.');
-	if (c) *c = 0;
-	f = NULL;
-	if (!mpd_name) {
-		f = strrchr(basename, '/');
-		if (!f) f = strrchr(basename, '\\');
-	}
-	if (!f) f = basename;
-	else f = f+1;
-
-	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, 1, dumper.index_info.index_file_name, f ? f+1 : basename, rep_id, szSegmentName, seg_ext ? seg_ext : "six", 0, 0, 0);
-	if (c) *c = '.';
-	
-	dumper.index_info.index_file = NULL;
-	dumper.index_info.index_bs = NULL;
-	if (dumper.index_info.use_url_template!=2) {
-		GF_SegmentTypeBox *styp;
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-		dumper.index_info.index_file = gf_f64_open(dumper.index_info.index_file_name, "wb");
-		dumper.index_info.index_bs = gf_bs_from_file(dumper.index_info.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->minorVersion = 0;
-		styp->altBrand = (u32*)gf_malloc(sizeof(u32));
-		styp->altBrand[0] = styp->majorBrand;
-		styp->altCount = 1;
-		gf_isom_box_size((GF_Box *)styp);
-		gf_isom_box_write((GF_Box *)styp, dumper.index_info.index_bs);
-		gf_isom_box_del((GF_Box *)styp);
-#endif
-	}
-
-	gf_f64_seek(src, 0, SEEK_END);
-	fsize = gf_f64_tell(src);
-	gf_f64_seek(src, 0, SEEK_SET);
-	fdone = 0;
-
-	/* first loop to process all packets between two PAT, and assume all signaling was found between these 2 PATs */
-	while (!feof(src)) {
-		size = fread(data, 1, 188, src);
-		if (size<188) break;
-
-		gf_m2ts_process_data(ts, data, size);
-		if (dumper.has_seen_pat) break;
-	}
-
-	gf_m2ts_reset_parsers(ts);
-	gf_f64_seek(src, 0, SEEK_SET);
-	fdone = 0;
-	dumper.index_info.start_indexing = 1;
-	fprintf(stderr, "Starting indexing ...\n");
-
-	if (mpd_name) {
-		strcpy(dumper.index_info.mpd_file_name, mpd_name);
-	} else {
-		char *sep = strrchr(mpeg2ts_file, '/');
-		if (!sep) sep = strrchr(mpeg2ts_file, '\\');
-		strcpy(dumper.index_info.mpd_file_name, sep ? sep+1 : mpeg2ts_file);
-		sep = strrchr(dumper.index_info.mpd_file_name, '.');
-		if (sep) sep[0] = 0;
-		strcat(dumper.index_info.mpd_file_name, ".mpd");
-	}
-	if (rep_first_or_last&1) {
-		dumper.index_info.mpd_file = gf_f64_open(dumper.index_info.mpd_file_name, "wt");
-	} else {
-		dumper.index_info.mpd_file = gf_f64_open(dumper.index_info.mpd_file_name, "a+t");
-	}
-	if (!dumper.index_info.mpd_file) {
-		fprintf(stderr, "Cannot open file %s\n", dumper.index_info.mpd_file_name);
-		return;
-	}
-
-	while (!feof(src)) {
-		size = fread(data, 1, 188, src);
-		if (size<188) break;
-
-		gf_m2ts_process_data(ts, data, size);
 
-		fdone += size;
-		gf_set_progress("MPEG-2 TS Parsing", fdone, fsize);
-	}
-
-	/* flush SIDX entry for the last packets */
-	m2ts_sidx_flush_entry(&dumper.index_info);
-	gf_f64_seek(src, 0, SEEK_END);
-	file_size = gf_f64_tell(src);
-	m2ts_sidx_finalize_size(&dumper.index_info, file_size);
-	fprintf(stderr, "Indexing done (1 sidx, %d entries).\n", dumper.index_info.sidx->nb_refs);
-
-	file_duration = (dumper.index_info.last_PTS-dumper.index_info.first_PTS)/90000.0;
-	bandwidth = (u32) (file_size * 8 / file_duration);	
-
-	mpd_start(&dumper.index_info, (rep_first_or_last & 1), 1, mpeg2ts_file, (dumper.index_info.last_PTS-dumper.index_info.first_PTS)/90000.0, dumper.index_info.segment_at_rap, file_size, dumper.index_info.segment_duration/4, 
-		dash_profile, copyright, mpd_title, mpd_source, mpd_info_url);
-
-	write_mpd_segment_info(&dumper.index_info, mpeg2ts_file, bandwidth);
-	mpd_end(dumper.index_info.mpd_file, (rep_first_or_last & 2) ? 1 : 0);
-	
-	fclose(src);
-	gf_m2ts_demux_del(ts);
-
-
-	if (dumper.index_info.sidx) {
-		gf_isom_box_size((GF_Box *)dumper.index_info.sidx);
-		if (dumper.index_info.index_bs) gf_isom_box_write((GF_Box *)dumper.index_info.sidx, dumper.index_info.index_bs);
-		gf_isom_box_del((GF_Box *)dumper.index_info.sidx);
-	}
-	
-	// ToDo: Should be configurable by some switch
-	if (dumper.index_info.pcrb) {
-		gf_isom_box_size((GF_Box *)dumper.index_info.pcrb);
-		if (dumper.index_info.index_bs) gf_isom_box_write((GF_Box *)dumper.index_info.pcrb, dumper.index_info.index_bs);
-		gf_isom_box_del((GF_Box *)dumper.index_info.pcrb);
-
-	}
-	if (dumper.index_info.mpd_file) fclose(dumper.index_info.mpd_file);
-	if (dumper.index_info.index_file) fclose(dumper.index_info.index_file);
-	if (dumper.index_info.index_bs) gf_bs_del(dumper.index_info.index_bs);
-}
 #endif /*GPAC_DISABLE_MPEG2TS*/

gpac-0.5.0.svn4192.tar.bz2/applications/mp4box/fileimport.c -> gpac-0.5.0.svn4296.tar.bz2/applications/mp4box/fileimport.c Changed

@@ -41,6 +41,7 @@
 #ifndef GPAC_DISABLE_VRML
 #include <gpac/nodes_mpeg4.h>
 #endif
+#include <gpac/network.h>
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
@@ -155,13 +156,34 @@
 	if (!found && trackID) fprintf(stderr, "Cannot find track %d in file\n", trackID);
 }
 
+static void set_chapter_track(GF_ISOFile *file, u32 track, u32 chapter_ref_trak)
+{
+	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_enabled(file, track, 0);
+
+	ref_duration = gf_isom_get_media_duration(file, chapter_ref_trak);
+	chap_duration = gf_isom_get_media_duration(file, track);
+	scale = (Double) (s64) gf_isom_get_media_timescale(file, track);
+	scale /= gf_isom_get_media_timescale(file, chapter_ref_trak);
+	ref_duration = (u64) (ref_duration * scale);
+
+	if (chap_duration < ref_duration) {
+		chap_duration -= gf_isom_get_sample_duration(file, track, gf_isom_get_sample_count(file, track));
+		chap_duration = ref_duration - chap_duration;
+		gf_isom_set_last_sample_duration(file, track, (u32) chap_duration);
+	}
+}
+
 GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, Double force_fps, u32 frames_per_sample)
 {
-	u32 track_id, i, timescale, track, stype, profile, level, new_timescale, rescale;
+	u32 track_id, i, timescale, track, stype, profile, level, new_timescale, rescale, svc_mode;
 	s32 par_d, par_n, prog_id, delay;
 	s32 tw, th, tx, ty, txtw, txth, txtx, txty;
 	Bool do_audio, do_video, do_all, disable, track_layout, text_layout, chap_ref, is_chap, is_chap_file, keep_handler, negative_cts_offset;
-	u32 group, handler, rvc_predefined;
+	u32 group, handler, rvc_predefined, check_track_for_svc;
 	const char *szLan;
 	GF_Err e;
 	GF_MediaImporter import;
@@ -171,6 +193,11 @@
 	new_timescale = 1;
 	rescale = 0;
 	text_layout = 0;
+	/*0: merge all 
+	  1: split base and all SVC in two tracks
+	  2: split all base and SVC layers in dedicated tracks
+	 */
+	svc_mode = 0;
 
 	memset(&import, 0, sizeof(GF_MediaImporter));
 
@@ -308,6 +335,15 @@
 		}
 		/*force all composition offsets to be positive*/
 		else if (!strnicmp(ext+1, "negctts", 7)) negative_cts_offset = 1;
+		/*split SVC layers*/
+		else if (!strnicmp(ext+1, "svcmode=", 8)) {
+			if (!stricmp(ext+9, "splitall"))
+				svc_mode = 2;
+			else if (!stricmp(ext+9, "splitbase"))
+				svc_mode = 1;
+			else if (!stricmp(ext+9, "merged"))
+				svc_mode = 0;
+		}
 
 		/*unrecognized, assume name has colon in it*/
 		else {
@@ -405,12 +441,13 @@
 		import.text_y = txty;
 	}
 
+	check_track_for_svc = 0;
 
 	import.dest = dest;
 	import.video_fps = force_fps;
 	import.frames_per_sample = frames_per_sample;
 	import.flags = import_flags;
-
+	
 	if (!import.nb_tracks) {
 		u32 count, o_count;
 		o_count = gf_isom_get_track_count(import.dest);
@@ -443,13 +480,12 @@
 			if (handler_name) gf_isom_set_handler_name(import.dest, i+1, handler_name);
 			else if (!keep_handler) {
 				char szHName[1024];
-				char *fName = strrchr(inName, '/');
-				if (!fName) fName = strrchr(inName, '\\');
+				const char *fName = gf_url_get_resource_name((const  char *)inName);
+				fName = strchr(fName, '.');
+				if (fName) fName += 1;
+				else fName = "?";
 
-				if (!fName) fName = inName;
-				else fName = fName+1;
-
-				sprintf(szHName, "%s - Imported with GPAC %s", fName, GPAC_FULL_VERSION);
+				sprintf(szHName, "*%s@GPAC%s", fName, GPAC_FULL_VERSION);
 				gf_isom_set_handler_name(import.dest, i+1, szHName);
 			}
 			if (handler) gf_isom_set_media_type(import.dest, i+1, handler);
@@ -465,8 +501,7 @@
 				gf_isom_set_media_subtype(import.dest, i+1, 1, stype);
 
 			if (is_chap && chap_ref) {
-				gf_isom_set_track_reference(import.dest, chap_ref, GF_4CC('c','h','a','p'), gf_isom_get_track_id(import.dest, i+1) );
-				gf_isom_set_track_enabled(import.dest, i+1, 0);
+				set_chapter_track(import.dest, i+1, chap_ref);
 			}
 
 			if (profile || level) 
@@ -476,6 +511,9 @@
 				keep_sys_tracks = 1;
 
 			gf_isom_set_composition_offset_mode(import.dest, i+1, negative_cts_offset);
+
+			if (gf_isom_get_avc_svc_type(import.dest, i+1, 1)>=GF_ISOM_AVCTYPE_AVC_SVC)
+				check_track_for_svc = i+1;
 		}
 	} else {
 		for (i=0; i<import.nb_tracks; i++) {
@@ -528,13 +566,12 @@
 			if (handler_name) gf_isom_set_handler_name(import.dest, track, handler_name);
 			else if (!keep_handler) {
 				char szHName[1024];
-				char *fName = strrchr(inName, '/');
-				if (!fName) fName = strrchr(inName, '\\');
-
-				if (!fName) fName = inName;
-				else fName = fName+1;
+				const char *fName = gf_url_get_resource_name((const  char *)inName);
+				fName = strchr(fName, '.');
+				if (fName) fName += 1;
+				else fName = "?";
 
-				sprintf(szHName, "%s - Imported with GPAC %s", fName, GPAC_FULL_VERSION);
+				sprintf(szHName, "%s@GPAC%s", fName, GPAC_FULL_VERSION);
 				gf_isom_set_handler_name(import.dest, track, szHName);
 			}
 			if (handler) gf_isom_set_media_type(import.dest, track, handler);
@@ -550,8 +587,7 @@
 				gf_isom_set_media_subtype(import.dest, track, 1, stype);
 
 			if (is_chap && chap_ref) {
-				gf_isom_set_track_reference(import.dest, chap_ref, GF_4CC('c','h','a','p'), gf_isom_get_track_id(import.dest, i+1) );
-				gf_isom_set_track_enabled(import.dest, track, 0);
+				set_chapter_track(import.dest, track, chap_ref);
 			}
 
 			if (profile || level) 
@@ -598,6 +634,9 @@
 			}
 			
 			gf_isom_set_composition_offset_mode(import.dest, track, negative_cts_offset);
+
+			if (gf_isom_get_avc_svc_type(import.dest, track, 1)>=GF_ISOM_AVCTYPE_AVC_SVC)
+				check_track_for_svc = track;
 		}
 		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");
@@ -611,6 +650,27 @@
 			e = gf_isom_add_chapter(import.dest, 0, 0, chapter_name);
 		}
 	}
+
+	/*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));
+			e = GF_OK;
+		}
+	}
+
+	if (check_track_for_svc) {
+		if (svc_mode) {
+			e = gf_media_split_svc(import.dest, check_track_for_svc, (svc_mode==2) ? 1 : 0);
+			if (e) goto exit;
+		} else {
+			e = gf_media_merge_svc(import.dest, check_track_for_svc, 1);
+			if (e) goto exit;
+		}
+	}
+
 exit:
 	if (handler_name) gf_free(handler_name);
 	if (chapter_name ) gf_free(chapter_name );
@@ -1325,8 +1385,10 @@
 	for (i=0; i<nb_tracks; i++) {
 		u64 last_DTS, dest_track_dur_before_cat;
 		u32 nb_edits = 0;
+		Bool skip_lang_test = 1;
 		Bool use_ts_dur = 1;
 		Bool merge_edits = 0;
+		Bool new_track = 0;
 		mtype = gf_isom_get_media_type(orig, i+1);
 		switch (mtype) {
 		case GF_ISOM_MEDIA_HINT:
@@ -1350,8 +1412,56 @@
 		}
 
 		dst_tk = 0;
-		tk_id = gf_isom_get_track_id(orig, i+1);
+		/*if we had a temporary import of the file, check if the original track ID matches the dst one. If so, skip all language detection code*/
+		tk_id = gf_isom_get_track_original_id(orig, i+1);
+		if (!tk_id) {
+			tk_id = gf_isom_get_track_id(orig, i+1);
+			skip_lang_test = 0;
+		}
 		dst_tk = gf_isom_get_track_by_id(dest, tk_id);
+
+
+		if (dst_tk) {
+			if (mtype != gf_isom_get_media_type(dest, dst_tk))
+				dst_tk = 0;
+			else if (gf_isom_get_media_subtype(dest, dst_tk, 1) != gf_isom_get_media_subtype(orig, i+1, 1))
+				dst_tk = 0;
+		}
+
+		if (!dst_tk) {
+			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) {
+						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);
+						if ((ow==w) && (oh==h)) {
+							dst_tk = j+1;
+							break;
+						}
+					}
+					/*check language code*/
+					else if (!skip_lang_test && (mtype==GF_ISOM_MEDIA_AUDIO)) {
+						u32 lang_src, lang_dst;
+						char lang[4];
+						lang[3]=0;
+						gf_isom_get_media_language(orig, i+1, lang);
+						lang_src = GF_4CC(lang[0], lang[1], lang[2], lang[3]);
+						gf_isom_get_media_language(dest, j+1, lang);
+						lang_dst = GF_4CC(lang[0], lang[1], lang[2], lang[3]);
+						if (lang_dst==lang_src) {
+							dst_tk = j+1;
+							break;
+						}
+					} else {
+						dst_tk = j+1;
+						break;
+					}
+				}
+			}
+		}
+
 		if (dst_tk) {
 			u32 stype = gf_isom_get_media_subtype(dest, dst_tk, 1);
 			/*we MUST have the same codec*/
@@ -1373,7 +1483,7 @@
 			}
 
 			/*merge AVC config if possible*/
-			if (!dst_tk && ((stype == GF_ISOM_SUBTYPE_AVC_H264) || (stype == GF_ISOM_SUBTYPE_AVC2_H264))  ) {
+			if (!dst_tk && ((stype == GF_ISOM_SUBTYPE_AVC_H264) || (stype == GF_ISOM_SUBTYPE_AVC2_H264) || (stype == GF_ISOM_SUBTYPE_AVC3_H264) || (stype == GF_ISOM_SUBTYPE_AVC4_H264))  ) {
 				GF_AVCConfig *avc_src, *avc_dst;
 				dst_tk = gf_isom_get_track_by_id(dest, tk_id);
 				
@@ -1447,45 +1557,13 @@
 			}
 		}
 
-		if (!dst_tk) {
-			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) {
-						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);
-						if ((ow==w) && (oh==h)) {
-							dst_tk = j+1;
-							break;
-						}
-					}
-					/*check language code*/
-					else if (mtype==GF_ISOM_MEDIA_AUDIO) {
-						u32 lang_src, lang_dst;
-						char lang[4];
-						lang[3]=0;
-						gf_isom_get_media_language(orig, i+1, lang);
-						lang_src = GF_4CC(lang[0], lang[1], lang[2], lang[3]);
-						gf_isom_get_media_language(dest, j+1, lang);
-						lang_dst = GF_4CC(lang[0], lang[1], lang[2], lang[3]);
-						if (lang_dst==lang_src) {
-							dst_tk = j+1;
-							break;
-						}
-					} else {
-						dst_tk = j+1;
-						break;
-					}
-				}
-			}
-		}
-		/*looks like a new file*/
+		/*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, 1, &dst_tk);
 			if (e) goto err_exit;
 			gf_isom_clone_pl_indications(orig, dest);
+			new_track = 1;
 
 			if (align_timelines) {
 				u32 max_timescale = 0;
@@ -1550,7 +1628,7 @@
 			u32 di;
 			samp = gf_isom_get_sample(orig, i+1, j+1, &di);
 			last_DTS = samp->DTS;
-			samp->DTS =  (u64) (ts_scale * samp->DTS + insert_dts);
+			samp->DTS =  (u64) (ts_scale * samp->DTS + (new_track ? 0 : insert_dts));
 			samp->CTS_Offset =  (u32) (samp->CTS_Offset * ts_scale);
 
 			if (gf_isom_is_self_contained(orig, i+1, di)) {
@@ -1573,7 +1651,24 @@
 			gf_isom_set_last_sample_duration(dest, dst_tk, (u32) insert_dts);
 		}
 
-		if (merge_edits) {
+		if (new_track && insert_dts) {
+			u64 media_dur = gf_isom_get_media_duration(orig, i+1);
+			/*convert from media time to track time*/
+			Double rescale = (Float) gf_isom_get_timescale(dest);
+			rescale /= (Float) gf_isom_get_media_timescale(dest, dst_tk);
+			/*convert from orig to dst time scale*/
+			rescale *= ts_scale;
+
+			gf_isom_set_edit_segment(dest, dst_tk, 0, (u64) (s64) (insert_dts*rescale), 0, GF_ISOM_EDIT_EMPTY);
+			gf_isom_set_edit_segment(dest, dst_tk, (u64) (s64) (insert_dts*rescale), (u64) (s64) (media_dur*rescale), 0, GF_ISOM_EDIT_NORMAL);
+		}
+		else if (merge_edits) {
+			/*convert from media time to track time*/
+			Double rescale = (Float) gf_isom_get_timescale(dest);
+			rescale /= (Float) gf_isom_get_media_timescale(dest, dst_tk);
+			/*convert from orig to dst time scale*/
+			rescale *= ts_scale;
+
 			/*get the first edit normal mode and add the new track dur*/
 			for (j=nb_edits; j>0; j--) {
 				u64 editTime, segmentDuration, mediaTime;
@@ -1581,14 +1676,18 @@
 				gf_isom_get_edit_segment(dest, dst_tk, j, &editTime, &segmentDuration, &mediaTime, &editMode);
 
 				if (editMode==GF_ISOM_EDIT_NORMAL) {
+					Double prev_dur = (Double) (s64) dest_track_dur_before_cat;
 					Double dur = (Double) (s64) gf_isom_get_media_duration(orig, i+1);
-					/*convert to dst time scale*/
-					dur *= ts_scale;
 
-					/*convert to track time scale*/
-					ts_scale = (Float) gf_isom_get_timescale(dest);
-					ts_scale /= (Float) gf_isom_get_media_timescale(dest, dst_tk);
-					dur *= ts_scale;
+					dur *= rescale;
+					prev_dur *= rescale;
+					
+					/*safety test: some files have broken edit lists. If no more than 2 entries, check that the segment duration 
+					is less or equal to the movie duration*/
+					if (prev_dur < segmentDuration) {
+						fprintf(stderr, "Warning: suspicious edit list entry found: duration %g sec but longest track duration before cat is %g - fixing it\n", (Double) (s64) segmentDuration/1000.0, prev_dur/1000);
+						segmentDuration = (u64) (s64) ( (Double) (s64) (dest_track_dur_before_cat - mediaTime) * rescale ); 
+					}
 
 					segmentDuration += (u64) (s64) dur;
 					gf_isom_modify_edit_segment(dest, dst_tk, j, segmentDuration, mediaTime, editMode);

gpac-0.5.0.svn4192.tar.bz2/applications/mp4box/main.c -> gpac-0.5.0.svn4296.tar.bz2/applications/mp4box/main.c Changed

@@ -25,6 +25,7 @@
 
 
 #include <gpac/download.h>
+#include <gpac/network.h>
 
 #ifndef GPAC_DISABLE_SMGR
 #include <gpac/scene_manager.h>
@@ -69,7 +70,7 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, Double force_fps, u32 frames_per_sample);
-GF_Err split_isomedia_file(GF_ISOFile *mp4, Double split_dur, u32 split_size_kb, char *inName, Double InterleavingTime, Double chunk_start, Bool adjust_split_end, char *outName, const char *tmpdir);
+GF_Err split_isomedia_file(GF_ISOFile *mp4, Double split_dur, u32 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);
 
 #if !defined(GPAC_DISABLE_SCENE_ENCODER)
@@ -107,7 +108,8 @@
 void DumpSDP(GF_ISOFile *file, char *inName);
 #endif
 
-void dump_file_ts(GF_ISOFile *file, char *inName);
+void dump_file_timestamps(GF_ISOFile *file, char *inName);
+void dump_file_nal(GF_ISOFile *file, u32 trackID, char *inName);
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
 void dump_file_ismacryp(GF_ISOFile *file, char *inName);
@@ -122,10 +124,6 @@
 
 #ifndef GPAC_DISABLE_MPEG2TS
 void dump_mpeg2_ts(char *mpeg2ts_file, char *pes_out_name, Bool prog_num);
-
-void dash_mpeg2_ts(char *mpeg2ts_file, char *mpd_name, Double dash_duration, Bool seg_at_rap, u32 subseg_per_seg,
-				   char *seg_name, char *seg_ext, Bool use_url_template, Bool single_segment, u32 rep_first_or_last, char *rep_id, u32 dash_profile,
-				   const char *copyright, const char *mpd_title, const char *mpd_source, const char *mpd_info_url);
 #endif 
 
 
@@ -205,6 +203,7 @@
 			"                       * Note: By default input (MP4,3GP) file is overwritten\n"
 			" -tmp dirname         specifies directory for temporary file creation\n"
 			"                       * Note: Default temp dir is OS-dependent\n"
+			" -write-buffer SIZE   specifies write buffer in bytes for ISOBMF files\n"
 			" -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"
@@ -214,6 +213,7 @@
 			"                       * Note 1: some tracks may be removed in the process\n"
 			"                       * Note 2: always on for *.3gp *.3g2 *.3gpp\n"
 			" -ipod                rewrites the file for iPod\n"
+			" -psp                 rewrites the file for PSP devices\n" 
 			" -brand ABCD[:v]      sets major brand of file, with optional version\n"
 			" -ab ABCD             adds given brand to file's alternate brand list\n"
 			" -rb ABCD             removes given brand from file's alternate brand list\n"
@@ -266,18 +266,26 @@
 void PrintDASHUsage()
 {
 	fprintf(stderr, "DASH Options:\n"
-			" -dash dur            enables DASH-ing of the file(s) with a segment duration of DUR\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"
 			" -frag time_in_ms     Specifies a fragment duration of time_in_ms.\n"
 			"                       * Note: By default, this is the DASH duration\n"
-			" -out filename        specifies output file name\n"
-			"                       * Note: By default input (MP4,3GP) file is overwritten\n"
+			" -out filename        specifies output MPD file name.\n"
 			" -tmp dirname         specifies directory for temporary file creation\n"
 			"                       * Note: Default temp dir is OS-dependent\n"
-			" -dash-profile NAME   specifies the target DASH profile: \"onDemand\", \"live\", \"main\", \"simple\", \"full\"\n"
+			" -profile NAME   specifies the target DASH profile: \"onDemand\", \"live\", \"main\", \"simple\", \"full\"\n"
 			"                       * This will set default option values to ensure conformance to the desired profile\n"
+			"                       * Default profile is \"full\" in static mode, \"live\" in dynamic mode\n"
+			"\n"
+			"Input media files to dash can use the following modifiers\n"
+			" \":id=NAME\"         sets the representation ID to NAME\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"
+			" \":bandwidth=VALUE\" sets the representation's bandwidth to a given value\n"
+			" \":role=VALUE\"      sets the role of this representation (cf DASH spec).\n"
+			"                       media with different roles belong to different adaptation sets.\n"
 			"\n"
 			" -rap                 segments begin with random access points\n"
 			"                       Note: segment duration may not be exactly what asked by\n"
@@ -287,12 +295,24 @@
 			"                       \"-frag\" since encoded video data is not modified\n"
 			" -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"
 			" -segment-ext name    sets the segment extension. Default is m4s, \"null\" means no extension\n"
-			" -mpd-title string    Sets MPD title.\n"
-			" -mpd-source string   Sets MPD source.\n"
-			" -mpd-info-url string Sets MPD info url.\n"
+			" -base-url string     sets Base url at MPD level. Can be used several times.\n"
+			" -mpd-title string    sets MPD title.\n"
+			" -mpd-source string   sets MPD source.\n"
+			" -mpd-info-url string sets MPD info url.\n"
 			" -cprt string         adds copyright string to MPD\n"
-			" -dash-ctx FILE       Stores/restore DASH timing from FILE.\n"
+			" -dash-live[=F] dur   generates a live DASH session using dur segment duration, optionnally 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"
+			" -dash-ctx FILE       stores/restore DASH timing from FILE.\n"
+			" -dynamic             uses dynamic MPD type instead of static.\n"
+			" -mpd-refresh TIME    specifies MPD update time in seconds.\n"
+			" -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"
+			" -min-buffer TIME     specifies MPD min buffer time in milliseconds\n"
+			" -ast-offset TIME     specifies MPD AvailabilityStartTime offset in seconds. Default is 1 sec delay\n"
 			"\n"
 			"Advanced Options, should not be needed when using -dash-profile:\n"
 			" -subsegs-per-sidx N  sets the number of subsegments to be written in each SIDX box\n"
@@ -300,10 +320,10 @@
 			"                       If -1, no SIDX box is used\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"
-			" -single-segment      Uses a single segment for the whole file (OnDemand profile). \n"
-			" -single-file         Uses a single file for the whole file (default). \n"
-			" -bs-switching MODE   Sets bitstream switching to \"yes\" (default), \"no\" or \"single\" to test with single input.\n" 
+			" -daisy-chain         uses daisy-chain SIDX instead of hierarchical. Ignored if frags/sidx is 0.\n"
+			" -single-segment      uses a single segment for the whole file (OnDemand profile). \n"
+			" -single-file         uses a single file for the whole file (default). \n"
+			" -bs-switching MODE   sets bitstream switching to \"inband\" (default), \"merge\", \"no\" or \"single\" to test with single input.\n" 
 			" -dash-ts-prog N      program_number to be considered in case of an MPTS input file.\n"
 			"\n");
 }
@@ -554,6 +574,7 @@
 			" -saf                 remux file to SAF multiplex\n"
 			" -dvbhdemux           demux DVB-H file into IP Datagrams\n"
 			"                       * Note: can be used when encoding scene descriptions\n"
+			" -raw-layer ID        same as -raw but skips SVC/MVC extractors when extracting\n" 
 			" -diod                extracts file IOD in raw format when supported\n" 
 			"\n");
 }
@@ -573,6 +594,7 @@
 			" -diso                scene IsoMedia file boxes in XML output\n"
 			" -drtp                rtp hint samples structure to XML output\n"
 			" -dts                 prints sample timing to text output\n"
+			" -dnal trackID        prints NAL sample info of given track\n"
 			" -sdp                 dumps SDP description of hinted file\n"
 			" -dcr                 ISMACryp samples structure to XML output\n"
 			" -dump-cover          Extracts cover art\n"
@@ -849,6 +871,10 @@
 		bw = gf_hinter_track_get_bandwidth(hinter);
 		tot_bw += bw;
 		flags = gf_hinter_track_get_flags(hinter);
+	
+		//set extraction mode for AVC/SVC
+		gf_isom_set_nalu_extract_mode(file, i+1, GF_ISOM_NALU_EXTRACT_LAYER_ONLY);
+
 		gf_hinter_track_get_payload_name(hinter, szPayload);
 		fprintf(stderr, "Hinting track ID %d - Type \"%s:%s\" (%s) - BW %d kbps\n", gf_isom_get_track_id(file, i+1), gf_4cc_to_str(mtype), gf_4cc_to_str(mtype), szPayload, bw);
 		if (flags & GP_RTP_PCK_SYSTEMS_CAROUSEL) fprintf(stderr, "\tMPEG-4 Systems stream carousel enabled\n");
@@ -1192,7 +1218,7 @@
 			}
 		}
 		else if (!strnicmp(szSlot, "trackID=", 8) || !strchr(szSlot, '=') ) {
-			__tsel_list = realloc(__tsel_list, sizeof(TSELAction) * (*nb_tsel_act + 1));
+			__tsel_list = gf_realloc(__tsel_list, sizeof(TSELAction) * (*nb_tsel_act + 1));
 			tsel_list = *__tsel_list;
 
 			tsel_act = &tsel_list[*nb_tsel_act];
@@ -1251,35 +1277,26 @@
 };
 
 #define MP4BOX_EXIT_WITH_CODE(__ret_code)	\
-	if (sdp_lines) free(sdp_lines); \
-	if (metas) free(metas); \
-	if (tracks) free(tracks); \
-	if (tsel_acts) free(tsel_acts); \
-	if (brand_add) free(brand_add); \
-	if (brand_rem) free(brand_rem); \
-	if (dash_inputs) free(dash_inputs); \
+	if (mpd_base_urls) gf_free(mpd_base_urls);	\
+	if (sdp_lines) gf_free(sdp_lines); \
+	if (metas) gf_free(metas); \
+	if (tracks) gf_free(tracks); \
+	if (tsel_acts) gf_free(tsel_acts); \
+	if (brand_add) gf_free(brand_add); \
+	if (brand_rem) gf_free(brand_rem); \
+	if (dash_inputs) gf_free(dash_inputs); \
+	gf_sys_close();	\
 	return __ret_code; \
 
 
-typedef struct 
-{
-	char *file_name;
-	char szID[100];
-
-	u32 adaptation_set;
-	u32 group_id;
-	/*only set for the first representation in the set*/
-	u32 nb_rep_in_adaptation_set;
-} DashInput;
-
-DashInput *set_dash_input(DashInput *dash_inputs, char *name, u32 *nb_dash_inputs)
+GF_DashSegmenterInput *set_dash_input(GF_DashSegmenterInput *dash_inputs, char *name, u32 *nb_dash_inputs)
 {
-	DashInput *di;
+	GF_DashSegmenterInput *di;
 	char *sep = strchr(name, ':');
 	if (sep && (sep[1]=='\\')) sep = strchr(sep+1, ':');
 
-	dash_inputs = realloc(dash_inputs, sizeof(DashInput) * (*nb_dash_inputs + 1) );
-	memset(&dash_inputs[*nb_dash_inputs], 0, sizeof(DashInput) );
+	dash_inputs = gf_realloc(dash_inputs, sizeof(GF_DashSegmenterInput) * (*nb_dash_inputs + 1) );
+	memset(&dash_inputs[*nb_dash_inputs], 0, sizeof(GF_DashSegmenterInput) );
 	di = &dash_inputs[*nb_dash_inputs];
 	(*nb_dash_inputs)++;
 
@@ -1289,7 +1306,10 @@
 		while (opts) {
 			sep = strchr(opts, ':');
 			if (sep) sep[0] = 0;
-			if (!strnicmp(opts, "id=", 3)) strncpy(di->szID, opts+3, 99);
+			if (!strnicmp(opts, "id=", 3)) strncpy(di->representationID, opts+3, 99);
+			else if (!strnicmp(opts, "period=", 7)) strncpy(di->periodID, opts+7, 99);
+			else if (!strnicmp(opts, "bandwidth=", 10)) di->bandwidth = atoi(opts+10);
+			else if (!strnicmp(opts, "role=", 5)) strncpy(di->role, opts+5, 99);
 			
 			if (!sep) break;
 			sep[0] = ':';
@@ -1297,7 +1317,7 @@
 		}
 	}
 	di->file_name = name;
-	if (!strlen(di->szID)) sprintf(di->szID, "%d", *nb_dash_inputs);
+	if (!strlen(di->representationID)) sprintf(di->representationID, "%d", *nb_dash_inputs);
 
 	return dash_inputs;
 }
@@ -1311,7 +1331,7 @@
 	GF_SMEncodeOptions opts;
 #endif
 	SDPLine *sdp_lines = NULL;
-	Double InterleavingTime, split_duration, split_start, import_fps, dash_duration;
+	Double interleaving_time, split_duration, split_start, import_fps, dash_duration, dash_subduration;
 	MetaAction *metas = NULL;
 	TrackAction *tracks = NULL;
 	TSELAction *tsel_acts = NULL;
@@ -1319,10 +1339,15 @@
 	s32 subsegs_per_sidx;
 	u32 *brand_add = NULL;
 	u32 *brand_rem = NULL;
-	u32 i, stat_level, hint_flags, info_track_id, import_flags, nb_add, nb_cat, ismaCrypt, agg_samples, nb_sdp_ex, max_ptime, raw_sample_num, split_size, nb_meta_act, nb_track_act, rtp_rate, major_brand, nb_alt_brand_add, nb_alt_brand_rem, old_interleave, car_dur, minor_version, conv_type, nb_tsel_acts, program_number, bitstream_switching_mode;
+	GF_DashSwitchingMode bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
+	u32 i, stat_level, hint_flags, info_track_id, import_flags, nb_add, nb_cat, ismaCrypt, agg_samples, nb_sdp_ex, max_ptime, raw_sample_num, split_size, nb_meta_act, nb_track_act, rtp_rate, major_brand, nb_alt_brand_add, nb_alt_brand_rem, old_interleave, car_dur, minor_version, conv_type, nb_tsel_acts, program_number, dump_nal, time_shift_depth, dash_dynamic;
 	Bool HintIt, needSave, FullInter, Frag, HintInter, dump_std, dump_rtp, dump_mode, regular_iod, trackID, remove_sys_tracks, remove_hint, force_new, remove_root_od, import_subtitle, dump_chap;
-	Bool print_sdp, print_info, open_edit, track_dump_type, dump_isom, dump_cr, force_ocr, encode, do_log, do_flat, dump_srt, dump_ttxt, dump_ts, do_saf, dump_m2ts, dump_cart, do_hash, verbose, force_cat, align_cat, pack_wgt, single_group;
-	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;
+	Bool print_sdp, print_info, open_edit, track_dump_type, dump_isom, dump_cr, force_ocr, encode, do_log, do_flat, dump_srt, dump_ttxt, dump_timestamps, do_saf, dump_m2ts, dump_cart, do_hash, verbose, force_cat, align_cat, pack_wgt, single_group, dash_live;
+	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;
+	Double min_buffer = 1.5;
+	u32 ast_shift_sec = 1;
+	char **mpd_base_urls = NULL;
+	u32 nb_mpd_base_urls=0;
 
 #ifndef GPAC_DISABLE_MPD
 	Bool do_mpd = 0;
@@ -1335,6 +1360,7 @@
 	u32 MTUSize = 1450;
 #endif
 	GF_ISOFile *file;
+	u32 mpd_update_time = 0;
 	Bool stream_rtp=0;
 	Bool live_scene=0;
 	Bool enable_mem_tracker = 0;
@@ -1342,12 +1368,13 @@
 	Bool daisy_chain_sidx=0;
 	Bool single_segment=0;
 	Bool single_file=0;
-	GF_DashProfile dash_profile = GF_DASH_PROFILE_FULL;
+	Bool segment_timeline=0;
+	GF_DashProfile dash_profile = GF_DASH_PROFILE_UNKNOWN;
 	Bool use_url_template=0;
 	Bool seg_at_rap=0;
 	Bool frag_at_rap=0;
 	Bool adjust_split_end = 0;
-	DashInput *dash_inputs = NULL;
+	GF_DashSegmenterInput *dash_inputs = NULL;
 	u32 nb_dash_inputs = 0;
 	char *gf_logs = NULL;
 	char *seg_ext = NULL;
@@ -1355,33 +1382,30 @@
 	const char *dash_source = NULL;
 	const char *dash_more_info = NULL;
 
-	if (argc < 2) {
-		PrintUsage();
-		MP4BOX_EXIT_WITH_CODE(1);
-	}
-
 	nb_tsel_acts = nb_add = nb_cat = nb_track_act = nb_sdp_ex = max_ptime = raw_sample_num = nb_meta_act = rtp_rate = major_brand = nb_alt_brand_add = nb_alt_brand_rem = car_dur = minor_version = 0;
 	e = GF_OK;
 	split_duration = 0.0;
 	split_start = -1.0;
-	InterleavingTime = 0.0;
-	dash_duration = 0.0;
+	interleaving_time = 0.0;
+	dash_duration = dash_subduration = 0.0;
 	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 = 0;
 	dump_mode = Frag = force_ocr = remove_sys_tracks = agg_samples = remove_hint = keep_sys_tracks = remove_root_od = single_group = 0;
-	conv_type = HintIt = needSave = print_sdp = print_info = regular_iod = dump_std = open_edit = dump_isom = dump_rtp = dump_cr = dump_chap = dump_srt = dump_ttxt = force_new = dump_ts = dump_m2ts = dump_cart = import_subtitle = force_cat = pack_wgt = 0;
-	bitstream_switching_mode = 1;
+	conv_type = HintIt = needSave = print_sdp = print_info = regular_iod = dump_std = open_edit = dump_isom = dump_rtp = dump_cr = dump_chap = dump_srt = dump_ttxt = force_new = dump_timestamps = dump_m2ts = dump_cart = import_subtitle = force_cat = pack_wgt = dash_live = 0;
+	dash_dynamic = 0;
 	/*align cat is the new default behaviour for -cat*/
 	align_cat = 1;
 	subsegs_per_sidx = 0;
 	track_dump_type = 0;
 	ismaCrypt = 0;
+	time_shift_depth = 0;
 	file = NULL;
 	itunes_tags = pes_dump = NULL;
-	seg_name = dash_ctx = NULL;
+	seg_name = dash_ctx_file = NULL;
 
 #ifndef GPAC_DISABLE_SCENE_ENCODER
 	memset(&opts, 0, sizeof(opts));
@@ -1399,6 +1423,26 @@
 	swf_flatten_angle = 0.0f;
 	tmpdir = NULL;
 
+
+
+	for (i = 1; i < (u32) argc ; i++) {
+		if (!strcmp(argv[i], "-mem-track")) {
+#ifdef GPAC_MEMORY_TRACKING
+			enable_mem_tracker = 1;
+#else
+			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n"); 
+#endif
+			break;
+		}
+	}
+
+	gf_sys_init(enable_mem_tracker);
+	if (argc < 2) {
+		PrintUsage();
+		MP4BOX_EXIT_WITH_CODE(1);
+	}
+
+
 	/*parse our args*/
 	for (i = 1; i < (u32) argc ; i++) {
 		arg = argv[i];
@@ -1431,6 +1475,8 @@
 		else if (!stricmp(arg, "-version")) { PrintVersion(); MP4BOX_EXIT_WITH_CODE(0); }
 		else if (!stricmp(arg, "-sdp")) print_sdp = 1;
 		else if (!stricmp(arg, "-quiet")) quiet = 2;
+		else if (!strcmp(argv[i], "-mem-track")) continue;
+
 		else if (!stricmp(arg, "-logs")) {
 			CHECK_NEXT_ARG
 			gf_logs = argv[i+1];
@@ -1460,6 +1506,12 @@
 			trackID = atoi(argv[i+1]);
 			i++;
 		}
+		else if (!stricmp(arg, "-raw-layer")) {
+			CHECK_NEXT_ARG
+				track_dump_type = GF_EXPORT_NATIVE | GF_EXPORT_SVC_LAYER;
+			trackID = atoi(argv[i+1]);
+			i++;
+		}
 		else if (!stricmp(arg, "-qcp")) {
 			CHECK_NEXT_ARG
 			track_dump_type = GF_EXPORT_NATIVE | GF_EXPORT_USE_QCP;
@@ -1559,12 +1611,17 @@
 		}
 		else if (!stricmp(arg, "-drtp")) dump_rtp = 1;
 		else if (!stricmp(arg, "-dts")) {
-			dump_ts = 1;
+			dump_timestamps = 1;
 			if ( ((i+1<(u32) argc) && inName) || (i+2<(u32) argc) ) {
 				if (argv[i+1][0] != '-') program_number = atoi(argv[i+1]);
 				i++;
 			}
-		} else if (!stricmp(arg, "-dcr")) dump_cr = 1;
+		} else if (!stricmp(arg, "-dnal")) {
+			CHECK_NEXT_ARG
+				dump_nal = atoi(argv[i+1]);
+			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)) {
 				char szTk[20];
@@ -1610,6 +1667,7 @@
 		else if (!stricmp(arg, "-isma")) { conv_type = GF_ISOM_CONV_TYPE_ISMA; open_edit = 1; }
 		else if (!stricmp(arg, "-3gp")) { conv_type = GF_ISOM_CONV_TYPE_3GPP; open_edit = 1; }
 		else if (!stricmp(arg, "-ipod")) { conv_type = GF_ISOM_CONV_TYPE_IPOD; open_edit = 1; }
+		else if (!stricmp(arg, "-psp")) { conv_type = GF_ISOM_CONV_TYPE_PSP; open_edit = 1; }
 		else if (!stricmp(arg, "-ismax")) { conv_type = GF_ISOM_CONV_TYPE_ISMA_EX; open_edit = 1; }
 
 		else if (!stricmp(arg, "-no-sys") || !stricmp(arg, "-nosys")) { remove_sys_tracks = 1; open_edit = 1; }
@@ -1618,33 +1676,35 @@
 		else if (!stricmp(arg, "-tmp")) {
 			CHECK_NEXT_ARG tmpdir = argv[i+1]; i++; 
 		}
+		else if (!stricmp(arg, "-write-buffer")) {
+			CHECK_NEXT_ARG 
+			gf_isom_set_output_buffering(NULL, atoi(argv[i+1]));
+			i++; 
+		}
 		else if (!stricmp(arg, "-cprt")) { CHECK_NEXT_ARG cprt = argv[i+1]; i++; if (!dash_duration) open_edit = 1; }
 		else if (!stricmp(arg, "-chap")) { CHECK_NEXT_ARG chap_file = argv[i+1]; i++; open_edit = 1; }
-		else if (!strcmp(arg, "-mem-track")) {
-#ifdef GPAC_MEMORY_TRACKING
-			enable_mem_tracker = 1;
-#else
-			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n"); 
-#endif
-		} else if (!strcmp(arg, "-strict-error")) {
+		else if (!strcmp(arg, "-strict-error")) {
 			gf_log_set_strict_error(1);
 		} else if (!stricmp(arg, "-inter") || !stricmp(arg, "-old-inter")) {
 			CHECK_NEXT_ARG
-			InterleavingTime = atof(argv[i+1]) / 1000;
+			interleaving_time = atof(argv[i+1]) / 1000;
 			open_edit = 1;
 			needSave = 1;
 			if (!stricmp(arg, "-old-inter")) old_interleave = 1;
 			i++;
 		} else if (!stricmp(arg, "-frag")) {
 			CHECK_NEXT_ARG
-			InterleavingTime = atof(argv[i+1]) / 1000;
+			interleaving_time = atof(argv[i+1]) / 1000;
 			needSave = 1;
 			i++;
 			Frag = 1;
 		} else if (!stricmp(arg, "-dash")) {
 			CHECK_NEXT_ARG
 			dash_duration = atof(argv[i+1]) /	 1000;
-			needSave = 1;
+			i++;
+		} else if (!stricmp(arg, "-subdur")) {
+			CHECK_NEXT_ARG
+			dash_subduration = atof(argv[i+1]) /	 1000;
 			i++;
 		} else if (!stricmp(arg, "-dash-ts-prog")) {
 			CHECK_NEXT_ARG
@@ -1664,17 +1724,56 @@
 			i++;
 		} else if (!stricmp(arg, "-bs-switching")) {
 			CHECK_NEXT_ARG
-			if (!stricmp(argv[i+1], "no") || !stricmp(argv[i+1], "off")) bitstream_switching_mode = 0;
-			else if (!stricmp(argv[i+1], "single"))  bitstream_switching_mode = 2;
-			else bitstream_switching_mode = 1;
+			if (!stricmp(argv[i+1], "no") || !stricmp(argv[i+1], "off")) bitstream_switching_mode = GF_DASH_BSMODE_NONE;
+			else if (!stricmp(argv[i+1], "merge"))  bitstream_switching_mode = GF_DASH_BSMODE_MERGED;
+			else if (!stricmp(argv[i+1], "single"))  bitstream_switching_mode = GF_DASH_BSMODE_SINGLE;
+			else if (!stricmp(argv[i+1], "inband"))  bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
+			else bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
+			i++;
+		}
+		else if (!stricmp(arg, "-dynamic")) { dash_dynamic = 1; }
+		else if (!strnicmp(arg, "-dash-live", 10) || !strnicmp(arg, "-ddbg-live", 10)) {
+			dash_dynamic = !strnicmp(arg, "-ddbg-live", 10) ? 2 : 1;
+			dash_live = 1;
+			if (arg[10]=='=') {
+				dash_ctx_file = arg+11;
+			}
+			CHECK_NEXT_ARG
+			dash_duration = atof(argv[i+1]) / 1000;
+			i++;
+		}
+		else if (!stricmp(arg, "-mpd-refresh")) { CHECK_NEXT_ARG mpd_update_time = atoi(argv[i+1]); i++;   }
+		else if (!stricmp(arg, "-time-shift")) { 
+			CHECK_NEXT_ARG 
+			time_shift_depth = (u32) atoi(argv[i+1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-min-buffer")) { 
+			CHECK_NEXT_ARG 
+			min_buffer = atoi(argv[i+1]);
+			min_buffer /= 1000;
+			i++;
+		}
+		else if (!stricmp(arg, "-ast-offset")) { 
+			CHECK_NEXT_ARG 
+			ast_shift_sec = (u32) atoi(argv[i+1]);
 			i++;
 		}
 		else if (!stricmp(arg, "-mpd-title")) { CHECK_NEXT_ARG dash_title = argv[i+1]; i++; }
 		else if (!stricmp(arg, "-mpd-source")) { CHECK_NEXT_ARG dash_source = argv[i+1]; i++; }
 		else if (!stricmp(arg, "-mpd-info-url")) { CHECK_NEXT_ARG dash_more_info = argv[i+1]; i++; }
+		else if (!stricmp(arg, "-base-url")) { 
+			CHECK_NEXT_ARG 
+			dash_more_info = argv[i+1]; 
+			mpd_base_urls = gf_realloc(mpd_base_urls, (nb_mpd_base_urls+1)*sizeof(char**));
+			mpd_base_urls[nb_mpd_base_urls] = argv[i+1];
+			nb_mpd_base_urls++;
+			i++; 
+		}
+		
 		else if (!stricmp(arg, "-dash-ctx")) {
 			CHECK_NEXT_ARG
-			dash_ctx = argv[i+1];
+			dash_ctx_file = argv[i+1];
 			i++;
 		} else if (!stricmp(arg, "-daisy-chain")) {
 			daisy_chain_sidx = 1;
@@ -1682,7 +1781,7 @@
 			single_segment = 1;
 		} else if (!stricmp(arg, "-single-file")) {
 			single_file = 1;
-		} else if (!stricmp(arg, "-dash-profile")) {
+		} 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;
 			else if (!stricmp(argv[i+1], "onDemand")) dash_profile = GF_DASH_PROFILE_ONDEMAND;
@@ -1694,8 +1793,9 @@
 			if ((arg[13]=='=') && arg[14]) {
 				if (!strcmp( &arg[14], "simulate")) use_url_template = 2;
 			}
-		}		
-		else if (!stricmp(arg, "-itags")) { CHECK_NEXT_ARG itunes_tags = argv[i+1]; i++; open_edit = 1; }
+		} else if (!stricmp(arg, "-segment-timeline")) {
+			segment_timeline = 1;
+		} else if (!stricmp(arg, "-itags")) { CHECK_NEXT_ARG itunes_tags = argv[i+1]; i++; open_edit = 1; }
 #ifndef GPAC_DISABLE_ISOM_HINTING
 		else if (!stricmp(arg, "-hint")) { open_edit = 1; HintIt = 1; }
 		else if (!stricmp(arg, "-unhint")) { open_edit = 1; remove_hint = 1; }
@@ -1743,7 +1843,7 @@
 		else if (!stricmp(arg, "-add-sdp") || !stricmp(arg, "-sdp_ex")) {
 			char *id;
 			CHECK_NEXT_ARG
-			sdp_lines = realloc(sdp_lines, sizeof(SDPLine) * (nb_sdp_ex+1) );
+			sdp_lines = gf_realloc(sdp_lines, sizeof(SDPLine) * (nb_sdp_ex+1) );
 
 			id = strchr(argv[i+1], ':');
 			if (id) {
@@ -1813,7 +1913,7 @@
 		}
 		else if (!stricmp(arg, "-rem") || !stricmp(arg, "-disable") || !stricmp(arg, "-enable")) {
 			CHECK_NEXT_ARG
-			tracks = realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
 
 			if (!stricmp(arg, "-enable")) tracks[nb_track_act].act_type = 6;
 			else if (!stricmp(arg, "-disable")) tracks[nb_track_act].act_type = 7;
@@ -1826,10 +1926,11 @@
 		else if (!stricmp(arg, "-par")) {
 			char szTK[20], *ext;
 			CHECK_NEXT_ARG
-			tracks = realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
 
 			tracks[nb_track_act].act_type = 4;
-			strcpy(szTK, argv[i+1]);
+			assert(strlen(argv[i+1])+1 <= sizeof(szTK));
+			strncpy(szTK, argv[i+1], sizeof(szTK));
 			ext = strchr(szTK, '=');
 			if (!ext) {
 				fprintf(stderr, "Bad format for track par - expecting ID=PAR_NUM:PAR_DEN got %s\n", argv[i+1]);
@@ -1838,7 +1939,13 @@
 			if (!stricmp(ext+1, "none")) {
 				tracks[nb_track_act].par_num = tracks[nb_track_act].par_den = -1;
 			} else {
-				sscanf(ext+1, "%d:%d", &tracks[nb_track_act].par_num, &tracks[nb_track_act].par_den);
+				sscanf(ext+1, "%d", &tracks[nb_track_act].par_num);
+				ext = strchr(ext+1, ':');
+				if (!ext) {
+					fprintf(stderr, "Bad format for track par - expecting ID=PAR_NUM:PAR_DEN got %s\n", argv[i+1]);
+					MP4BOX_EXIT_WITH_CODE(1);
+				}
+				sscanf(ext+1, "%d", &tracks[nb_track_act].par_den);
 			}
 			ext[0] = 0;
 			tracks[nb_track_act].trackID = atoi(szTK);
@@ -1849,7 +1956,7 @@
 		else if (!stricmp(arg, "-lang")) {
 			char szTK[20], *ext;
 			CHECK_NEXT_ARG
-			tracks = realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
 
 			tracks[nb_track_act].act_type = 1;
 			tracks[nb_track_act].lang[3] = 0;
@@ -1873,7 +1980,7 @@
 		else if (!stricmp(arg, "-delay")) {
 			char szTK[20], *ext;
 			CHECK_NEXT_ARG
-			tracks = realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
 
 			strcpy(szTK, argv[i+1]);
 			ext = strchr(szTK, '=');
@@ -1892,7 +1999,7 @@
 		else if (!stricmp(arg, "-ref")) {
 			char *szTK, *ext;
 			CHECK_NEXT_ARG
-			tracks = realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
 
 			szTK = argv[i+1];
 			ext = strchr(szTK, ':');
@@ -1918,7 +2025,7 @@
 		else if (!stricmp(arg, "-name")) {
 			char szTK[GF_MAX_PATH], *ext;
 			CHECK_NEXT_ARG
-			tracks = realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
 
 			strcpy(szTK, argv[i+1]);
 			ext = strchr(szTK, '=');
@@ -2050,7 +2157,7 @@
 		else if (!stricmp(arg, "-set-kms")) {
 			char szTK[20], *ext;
 			CHECK_NEXT_ARG
-			tracks = realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
 
 			strncpy(szTK, argv[i+1], 19);
 			ext = strchr(szTK, '=');
@@ -2108,7 +2215,7 @@
 		}
 		/*meta*/
 		else if (!stricmp(arg, "-set-meta")) { 
-			metas = realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
+			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
 
 			metas[nb_meta_act].act_type = 0;
 			parse_meta_args(&metas[nb_meta_act], argv[i+1]);
@@ -2117,7 +2224,7 @@
 			i++;
 		}
 		else if (!stricmp(arg, "-add-item")) { 
-			metas = realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
+			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
 
 			metas[nb_meta_act].act_type = 1;
 			parse_meta_args(&metas[nb_meta_act], argv[i+1]);
@@ -2126,7 +2233,7 @@
 			i++;
 		}
 		else if (!stricmp(arg, "-rem-item")) { 
-			metas = realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
+			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
 
 			metas[nb_meta_act].act_type = 2;
 			parse_meta_args(&metas[nb_meta_act], argv[i+1]);
@@ -2135,7 +2242,7 @@
 			i++;
 		}
 		else if (!stricmp(arg, "-set-primary")) { 
-			metas = realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
+			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
 
 			metas[nb_meta_act].act_type = 3;
 			parse_meta_args(&metas[nb_meta_act], argv[i+1]);
@@ -2144,7 +2251,7 @@
 			i++;
 		}
 		else if (!stricmp(arg, "-set-xml")) { 
-			metas = realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
+			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
 
 			metas[nb_meta_act].act_type = 4;
 			parse_meta_args(&metas[nb_meta_act], argv[i+1]);
@@ -2153,7 +2260,7 @@
 			i++;
 		}
 		else if (!stricmp(arg, "-rem-xml")) { 
-			metas = realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
+			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
 
 			metas[nb_meta_act].act_type = 6;
 			if (parse_meta_args(&metas[nb_meta_act], argv[i+1])) i++;
@@ -2161,7 +2268,7 @@
 			open_edit = 1;
 		}
 		else if (!stricmp(arg, "-dump-xml")) { 
-			metas = realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
+			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
 
 			metas[nb_meta_act].act_type = 7;
 			parse_meta_args(&metas[nb_meta_act], argv[i+1]);
@@ -2169,7 +2276,7 @@
 			i++;
 		}
 		else if (!stricmp(arg, "-dump-item")) { 
-			metas = realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
+			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
 
 			metas[nb_meta_act].act_type = 8;
 			parse_meta_args(&metas[nb_meta_act], argv[i+1]);
@@ -2216,7 +2323,7 @@
 		else if (!stricmp(arg, "-ab")) { 
 			char *b = argv[i+1];
 			CHECK_NEXT_ARG 
-			brand_add = realloc(brand_add, sizeof(u32) * (nb_alt_brand_add+1));
+			brand_add = gf_realloc(brand_add, sizeof(u32) * (nb_alt_brand_add+1));
 
 			brand_add[nb_alt_brand_add] = GF_4CC(b[0], b[1], b[2], b[3]);
 			nb_alt_brand_add++;
@@ -2226,7 +2333,7 @@
 		else if (!stricmp(arg, "-rb")) { 
 			char *b = argv[i+1];
 			CHECK_NEXT_ARG 
-			brand_rem = realloc(brand_rem, sizeof(u32) * (nb_alt_brand_rem+1));
+			brand_rem = gf_realloc(brand_rem, sizeof(u32) * (nb_alt_brand_rem+1));
 
 			brand_rem[nb_alt_brand_rem] = GF_4CC(b[0], b[1], b[2], b[3]);
 			nb_alt_brand_rem++;
@@ -2301,12 +2408,12 @@
 		dump_std = 1;
 	}
 
-	if (!InterleavingTime) {
+	if (!interleaving_time) {
 		/*by default use single fragment per dash segment*/
 		if (dash_duration) 
-			InterleavingTime = dash_duration;
+			interleaving_time = dash_duration;
 		else
-			InterleavingTime = 0.5;
+			interleaving_time = 0.5;
 	}
 
 	if (dump_std) 
@@ -2363,7 +2470,10 @@
 	}
 
 	/*init libgpac*/
-	gf_sys_init(enable_mem_tracker);
+	if (enable_mem_tracker) {
+		gf_sys_close();
+		gf_sys_init(enable_mem_tracker);
+	}
 
 	if (gf_logs) {
 		gf_log_set_tools_levels(gf_logs);
@@ -2390,7 +2500,7 @@
 		Bool remote = 0;
 		char *mpd_base_url = gf_strdup(inName);
 		if (!strnicmp(inName, "http://", 7)) {
-			e = gf_dm_wget(inName, "tmp_main.m3u8");
+			e = gf_dm_wget(inName, "tmp_main.m3u8", 0, 0);
 			if (e != GF_OK) {
 				fprintf(stderr, "Cannot retrieve M3U8 (%s): %s\n", inName, gf_error_to_string(e));
 				gf_free(mpd_base_url);
@@ -2495,11 +2605,30 @@
 		}
 		for (i=0; i<(u32) argc; i++) {
 			if (!strcmp(argv[i], "-add")) {
-				e = import_file(file, argv[i+1], import_flags, import_fps, agg_samples);
+				char *src = argv[i+1];
+
+				e = import_file(file, src, import_flags, import_fps, agg_samples);
 				if (e) {
-					fprintf(stderr, "Error importing %s: %s\n", argv[i+1], gf_error_to_string(e));
-					gf_isom_delete(file);
-					MP4BOX_EXIT_WITH_CODE(1);
+					while (src) {
+						char *sep = strchr(src, '+');
+						if (sep) sep[0] = 0;
+
+						e = import_file(file, src, import_flags, import_fps, agg_samples);
+
+						if (sep) {
+							sep[0] = '+';
+							src = sep+1;
+						} else {
+							src= NULL;
+						}
+						if (e)
+							break;
+					}
+					if (e) {
+						fprintf(stderr, "Error importing %s: %s\n", argv[i+1], gf_error_to_string(e));
+						gf_isom_delete(file);
+						MP4BOX_EXIT_WITH_CODE(1);
+					}
 				}
 				i++;
 			}
@@ -2611,6 +2740,93 @@
 	} 
 #endif
 
+
+	if (dash_duration) {
+		char szMPD[GF_MAX_PATH], *sep;
+		GF_Config *dash_ctx = NULL;
+		u32 do_abort = 0;
+		gf_log_set_tool_level(GF_LOG_DASH, GF_LOG_INFO);
+		strcpy(outfile, outName ? outName : gf_url_get_resource_name(inName) );
+		sep = strrchr(outfile, '.');
+		if (sep) sep[0] = 0;
+		if (!outName) strcat(outfile, "_dash");
+		strcpy(szMPD, outfile);
+		strcat(szMPD, ".mpd");
+
+		if (dash_dynamic)
+			fprintf(stderr, "Live DASH-ing - press 'q' to quit, 's' to save context and quit\n");
+
+		if (!dash_ctx_file && dash_live) {
+			dash_ctx = gf_cfg_new(NULL, NULL);
+		} else if (dash_ctx_file) {
+			if (force_new) 
+				gf_delete_file(dash_ctx_file);
+
+			dash_ctx = gf_cfg_force_new(NULL, dash_ctx_file);
+		}
+
+		if (dash_profile==GF_DASH_PROFILE_UNKNOWN)
+			dash_profile = dash_dynamic ? GF_DASH_PROFILE_LIVE : GF_DASH_PROFILE_FULL;
+
+		if (!dash_dynamic) {
+			time_shift_depth = 0;
+			mpd_update_time = 0;
+		} else if ((dash_profile>=GF_DASH_PROFILE_MAIN) && !use_url_template && !mpd_update_time) {
+			/*use a default MPD update of dash_duration sec*/
+			mpd_update_time = (u32)  (dash_subduration ? dash_subduration : dash_duration);
+			fprintf(stderr, "Using default MPD refresh of %d seconds\n", mpd_update_time);
+		}
+
+		while (!do_abort) {
+
+			e = gf_dasher_segment_files(szMPD, dash_inputs, nb_dash_inputs, dash_profile, dash_title, dash_source, cprt, dash_more_info,
+										(const char **) mpd_base_urls, nb_mpd_base_urls, 
+									   use_url_template, segment_timeline,  single_segment, single_file, bitstream_switching_mode,
+									   seg_at_rap, dash_duration, seg_name, seg_ext,
+									   interleaving_time, subsegs_per_sidx, daisy_chain_sidx, frag_at_rap, tmpdir,
+									   dash_ctx, dash_dynamic, mpd_update_time, time_shift_depth, dash_subduration, min_buffer, ast_shift_sec);
+			if (e) break;
+
+			if (dash_live) {
+				u32 sleep_for = gf_dasher_next_update_time(dash_ctx, mpd_update_time);
+				fprintf(stderr, "sleep for %d ms\n", sleep_for);
+				while (1) {
+					if (gf_prompt_has_input()) {
+						char c = (char) gf_prompt_get_char(); 
+						if (c=='q') { do_abort = 1; break; }
+						if (c=='s') { do_abort = 2; break; }
+					}
+
+					if (dash_dynamic == 2) {
+						break;
+					}
+					if (sleep_for<100) 
+						break;
+					gf_sleep(100);
+
+					sleep_for = gf_dasher_next_update_time(dash_ctx, mpd_update_time);
+				}
+			} else {
+				break;
+			}
+		}
+		
+		if (dash_ctx) {
+			if (do_abort==2) {
+				char szName[1024];
+				fprintf(stderr, "Enter file name to save dash context:\n");
+				if (scanf("%s", szName) == 1) {
+					gf_cfg_set_filename(dash_ctx, szName);
+					gf_cfg_save(dash_ctx);
+				}
+			}
+			gf_cfg_del(dash_ctx);
+		}
+		if (e) fprintf(stderr, "Error DASHing file: %s\n", gf_error_to_string(e));
+
+		MP4BOX_EXIT_WITH_CODE( (e!=GF_OK) ? 1 : 0 );
+	}
+
 	else if (!file
 #ifndef GPAC_DISABLE_MEDIA_EXPORT
 		&& !(track_dump_type & GF_EXPORT_AVI_NATIVE)
@@ -2684,24 +2900,11 @@
 				}
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 
-				if (dash_duration) {
-					if (subsegs_per_sidx<0) subsegs_per_sidx = 0;
-#ifndef GPAC_DISABLE_MPEG2TS
-					for (i=0; i<nb_dash_inputs; i++) {
-						u32 rep_first_or_last = 0;
-						if (!i) rep_first_or_last |= 1;
-						if (i+1 == nb_dash_inputs) rep_first_or_last |= 1<<1;
-
-						dash_mpeg2_ts(dash_inputs[i].file_name, outName, dash_duration, seg_at_rap, subsegs_per_sidx,
-							seg_name, seg_ext, use_url_template, (single_segment||single_file) ? 1 : 0, rep_first_or_last, dash_inputs[i].szID, 
-							dash_profile, cprt, dash_title, dash_source, dash_more_info);
-					}
-#endif
-				} else if (dump_m2ts) {
+				if (dump_m2ts) {
 #ifndef GPAC_DISABLE_MPEG2TS
 					dump_mpeg2_ts(inName, pes_dump, program_number);
 #endif
-				} else if (dump_ts) { /* dump_ts means dump time stamp information */
+				} else if (dump_timestamps) {
 #ifndef GPAC_DISABLE_MPEG2TS
 					dump_mpeg2_ts(inName, pes_dump, program_number);
 #endif
@@ -2811,7 +3014,9 @@
 #endif
 #endif
 
-	if (dump_ts) dump_file_ts(file, dump_std ? NULL : outfile);
+	if (dump_timestamps) dump_file_timestamps(file, dump_std ? NULL : outfile);
+	if (dump_nal) dump_file_nal(file, dump_nal, dump_std ? NULL : outfile);
+	
 	if (do_hash) {
 		u8 hash[20];
 		e = gf_media_get_file_hash(inName, hash);
@@ -2854,7 +3059,7 @@
 
 #if !(definedGPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
 	if (split_duration || split_size) {
-		split_isomedia_file(file, split_duration, split_size, inName, InterleavingTime, split_start, adjust_split_end, outName, tmpdir);
+		split_isomedia_file(file, split_duration, split_size, inName, interleaving_time, split_start, adjust_split_end, outName, tmpdir);
 		/*never save file when splitting is desired*/
 		open_edit = 0;
 		needSave = 0;
@@ -2951,7 +3156,6 @@
 	}
 	if (!open_edit && !needSave) {
 		if (file) gf_isom_delete(file);
-		gf_sys_close();
 		MP4BOX_EXIT_WITH_CODE(0);
 	}
 
@@ -3015,7 +3219,6 @@
 	if (!encode) {
 		if (!file) {
 			fprintf(stderr, "Nothing to do - exiting\n");
-			gf_sys_close();
 			MP4BOX_EXIT_WITH_CODE(0);
 		}
 		if (outName) {
@@ -3075,6 +3278,8 @@
 					switch (gf_isom_get_media_subtype(file, i+1, 1)) {
 					case GF_ISOM_SUBTYPE_AVC_H264:
 					case GF_ISOM_SUBTYPE_AVC2_H264:
+					case GF_ISOM_SUBTYPE_AVC3_H264:
+					case GF_ISOM_SUBTYPE_AVC4_H264:
 						fprintf(stderr, "Forcing AVC/H264 SAR to 1:1...\n");
 						gf_media_change_par(file, i+1, 1, 1);
 						break;
@@ -3308,8 +3513,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[5]=t;}
-				else if (sscanf(val, "%u", &n) == 1) { _t[3]=n;}
+				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;
 				if (tlen) gf_isom_apple_set_tag(file, itag, _t, tlen);
 			}
@@ -3346,497 +3551,21 @@
 		needSave = 1;
 	}
 
-	/*split file*/
-	if (dash_duration) {
-		u32 segment_mode;
-		char *sep, szMPD[GF_MAX_PATH], szInit[GF_MAX_PATH], szSegName[GF_MAX_PATH], szSolvedSegName[GF_MAX_PATH];
-		u32 j, k, cur_adaptation_set;
-		GF_ISOFile *init_seg = NULL;
-		u32 max_adaptation_set = 0;
-		u32 cur_group_id = 0;
-		u32 max_sap_type = 0;
-		Bool sps_merge_failed = 0;
-		Double period_duration = 0;
-
-		/*classify all input in possible adaptation sets*/
-		for (k=0; k<nb_dash_inputs; k++) {
-			GF_ISOFile *set_file;
-			/*this file already belongs to an adaptation set*/
-			if (dash_inputs[k].adaptation_set) continue;
-
-			max_adaptation_set ++;
-			dash_inputs[k].adaptation_set = max_adaptation_set;
-			dash_inputs[k].nb_rep_in_adaptation_set = 1;
-			set_file = gf_isom_open(dash_inputs[k].file_name, GF_ISOM_OPEN_READ, NULL);
-
-			for (i=k+1; i<nb_dash_inputs; i++) {
-				Bool valid_in_adaptation_set = 1;
-				Bool assign_to_group = 1;
-				GF_ISOFile *in = gf_isom_open(dash_inputs[i].file_name, GF_ISOM_OPEN_READ, NULL);
-
-				for (j=0; j<gf_isom_get_track_count(set_file); j++) {
-					u32 mtype, msub_type;
-					Bool same_codec = 1;
-					u32 track = gf_isom_get_track_by_id(in, gf_isom_get_track_id(set_file, j+1));
-
-					if (!track) {
-						valid_in_adaptation_set = 0;
-						assign_to_group = 0;
-						break;
-					}
-					mtype = gf_isom_get_media_type(set_file, j+1);
-					if (mtype != gf_isom_get_media_type(in, j+1)) {
-						valid_in_adaptation_set = 0;
-						assign_to_group = 0;
-						break;
-					}
-					msub_type = gf_isom_get_media_subtype(set_file, j+1, 1);
-					if (msub_type != gf_isom_get_media_subtype(in, j+1, 1)) same_codec = 0;
-					if ((msub_type==GF_ISOM_SUBTYPE_MPEG4) 
-						|| (msub_type==GF_ISOM_SUBTYPE_MPEG4_CRYP) 
-						|| (msub_type==GF_ISOM_SUBTYPE_AVC_H264)
-						|| (msub_type==GF_ISOM_SUBTYPE_AVC2_H264)
-						|| (msub_type==GF_ISOM_SUBTYPE_SVC_H264)
-						|| (msub_type==GF_ISOM_SUBTYPE_LSR1)
-					) {
-						GF_DecoderConfig *dcd1 = gf_isom_get_decoder_config(set_file, j+1, 1);
-						GF_DecoderConfig *dcd2 = gf_isom_get_decoder_config(in, j+1, 1);
-						if (dcd1 && dcd2 && (dcd1->streamType==dcd2->streamType) && (dcd1->objectTypeIndication==dcd2->objectTypeIndication)) {
-							same_codec = 1;
-						} else {
-							same_codec = 0;
-						}
-						if (dcd1) gf_odf_desc_del((GF_Descriptor *)dcd1);
-						if (dcd2) gf_odf_desc_del((GF_Descriptor *)dcd2);
-					}
-
-					if (!same_codec) {
-						valid_in_adaptation_set = 0;
-						break;
-					}
-
-					if ((mtype!=GF_ISOM_MEDIA_VISUAL) && (mtype!=GF_ISOM_MEDIA_HINT)) {
-						char szLang1[4], szLang2[4];
-						szLang1[3] = szLang2[3] = 0;
-						gf_isom_get_media_language(set_file, j+1, szLang1);
-						gf_isom_get_media_language(in, j+1, szLang2);
-						if (stricmp(szLang1, szLang2)) {
-							valid_in_adaptation_set = 0;
-							break;
-						}
-					}
-					if (mtype==GF_ISOM_MEDIA_VISUAL) {
-						u32 w1, h1, w2, h2;
-						Bool rap, roll;
-						u32 roll_dist, sap_type;
-
-						gf_isom_get_track_layout_info(set_file, j+1, &w1, &h1, NULL, NULL, NULL);
-						gf_isom_get_track_layout_info(in, j+1, &w2, &h2, NULL, NULL, NULL);
-						
-						if (h1*w2 != h2*w1) {
-							valid_in_adaptation_set = 0;
-							break;
-						}
-
-						gf_isom_get_sample_rap_roll_info(in, j+1, 0, &rap, &roll, &roll_dist);
-						if (roll_dist>0) sap_type = 4;
-						else if (roll) sap_type = 3;
-						else if (rap) sap_type = 1;
-						else sap_type = 1;
-						if (max_sap_type<sap_type) max_sap_type = sap_type;
-					}
-				}
-				gf_isom_close(in);
-				if (valid_in_adaptation_set) {
-					dash_inputs[i].adaptation_set = max_adaptation_set;
-					dash_inputs[k].nb_rep_in_adaptation_set ++;
-				} else if (assign_to_group) {
-					if (!dash_inputs[k].group_id) {
-						cur_group_id++;
-						dash_inputs[k].group_id = cur_group_id;
-					}
-					dash_inputs[i].group_id = cur_group_id;						
-				}
-
-			}
-		}
-
-		/*check requested profiles can be generated, or adjust them*/
-		if (max_sap_type>=3) {
-			if (dash_profile)
-				fprintf(stderr, "WARNING! Max SAP type %d detected\n\tswitching to FULL profile\n", max_sap_type);
-			dash_profile = 0;
-		}
-		if ((dash_profile==GF_DASH_PROFILE_LIVE) && !seg_name) {
-			fprintf(stderr, "WARNING! DASH Live profile requested but no -segment-name\n\tusing \"%%s_dash\" by default\n\n");
-			seg_name = "%s_dash";
-		}
-
-		/*adjust params based on profiles*/
-		switch (dash_profile) {
-		case GF_DASH_PROFILE_LIVE:
-			seg_at_rap = 1;
-			use_url_template = 1;
-			single_segment = single_file = 0;
-			break;
-		case GF_DASH_PROFILE_ONDEMAND:
-			seg_at_rap = 1;
-			single_segment = 1;
-			/*BS switching is meaningless in onDemand profile*/
-			bitstream_switching_mode = 0;
-			use_url_template = single_file = 0;
-			break;
-		case GF_DASH_PROFILE_MAIN:
-			seg_at_rap = 1;
-			single_segment = 0;
-			break;
-		default:
-			break;
-		}
-
-		segment_mode = single_segment ? 1 : (single_file ? 2 : 0);
-
-		if (single_segment) {
-			fprintf(stderr, "DASH-ing file%s - single segment\nSubsegment duration %.3f - Fragment duration: %.3f secs\n", (nb_dash_inputs>1) ? "s" : "", dash_duration, InterleavingTime);
-			subsegs_per_sidx = 0;
-//			seg_name = seg_ext = NULL;
-		} else {
-			if (!seg_ext) seg_ext = "m4s";
-			fprintf(stderr, "DASH-ing file%s: %.2fs segments %.2fs fragments ", (nb_dash_inputs>1) ? "s" : "", dash_duration, InterleavingTime);
-			if (subsegs_per_sidx<0) fprintf(stderr, "no sidx used");
-			else if (subsegs_per_sidx) fprintf(stderr, "%d subsegments per sidx", subsegs_per_sidx);
-			else fprintf(stderr, "single sidx per segment");
-			fprintf(stderr, "\n");
-		}
-		if (frag_at_rap) seg_at_rap = 1;
-
-		if (seg_at_rap) {
-			fprintf(stderr, "Spliting segments %sat GOP boundaries\n", frag_at_rap ? "and fragments " : "");
-		}
-
-		szSegName[0] = 0;
-		if (outName && seg_name) {
-			if (gf_url_get_resource_path(outName, szSegName)) {
-				strcat(szSegName, seg_name);
-				seg_name = szSegName;
-			}
-		}
-
-		strcpy(outfile, outName ? outName : gf_url_get_resource_name(inName) );
-		sep = strrchr(outfile, '.');
-		if (sep) sep[0] = 0;
-		if (!outName) strcat(outfile, "_dash");
-
-		strcpy(szMPD, outfile);
-		strcat(szMPD, ".mpd");
-
-		for (cur_adaptation_set=0; cur_adaptation_set < max_adaptation_set; cur_adaptation_set++) {
-			u32 first_rep_in_set=0;
-			u32 max_width = 0;
-			u32 max_height = 0;
-			u32 fps_num = 0;
-			u32 fps_denum = 0;
-			Bool use_bs_switching = bitstream_switching_mode ? 1 : 0;
-			Bool variable_seg_rad_name = 0;
-			char szLang[4];
-			char szFPS[100];
-			Bool is_first_rep=0;
-			Bool skip_init_segment_creation = 0;
-
-			while (dash_inputs[first_rep_in_set].adaptation_set!=cur_adaptation_set+1)
-				first_rep_in_set++;
-
-			strcpy(outfile, outName ? outName : gf_url_get_resource_name(inName) );
-			sep = strrchr(outfile, '.');
-			if (sep) sep[0] = 0;
-			if (!outName) strcat(outfile, "_dash");
-
-			if (max_adaptation_set==1) {
-				strcpy(szInit, outfile);
-				strcat(szInit, "_init.mp4");
-			} else {
-				sprintf(szInit, "%s_set%d_init.mp4", outfile, cur_adaptation_set+1);
-			}
-			if ((bitstream_switching_mode==1) && dash_inputs[first_rep_in_set].nb_rep_in_adaptation_set==1)
-				use_bs_switching = 0;
-
-			init_seg = NULL;
-			if (! use_bs_switching) {
-				skip_init_segment_creation = 1;
-			}
-			/*fixme - dash context should be cleaned up
-			if we already wrote the InitializationSegment, get rid of it`(no overwrite) and let the dashing routine open it*/
-			else if (dash_ctx) {
-				const char *init_seg_name;
-				GF_Config *dctx = gf_cfg_new(NULL, dash_ctx);
-				if (dctx && ((init_seg_name = gf_cfg_get_key(dctx, "DASH", "InitializationSegment")) != NULL)) {
-					skip_init_segment_creation = 1;
-					init_seg = gf_isom_open(init_seg_name, GF_ISOM_OPEN_READ, NULL);
-				}
-				gf_cfg_del(dctx);
-			}
-
-			if (skip_init_segment_creation) {
-				/*we still need to open the first file to dash so that we can list ContentComponents in the MPD*/
-				if (!init_seg)
-					init_seg = gf_isom_open(dash_inputs[first_rep_in_set].file_name, GF_ISOM_OPEN_READ, NULL);
-				for (j=0; j<gf_isom_get_track_count(init_seg); j++) {
-					Double dur = (Double) gf_isom_get_track_duration(init_seg, j+1);
-					dur /= gf_isom_get_timescale(init_seg);
-					if (dur>period_duration) period_duration = dur;
-				}
-			} else {
-				init_seg = gf_isom_open(szInit, GF_ISOM_OPEN_WRITE, tmpdir);
-				for (i=0; i<nb_dash_inputs; i++) {
-					u32 j;
-					Double dur;
-					GF_ISOFile *in;
-					
-					if (dash_inputs[i].adaptation_set!=cur_adaptation_set+1)
-						continue;
-
-					in = file;
-					if (i) {
-						in = gf_isom_open(dash_inputs[i].file_name, GF_ISOM_OPEN_READ, NULL);
-						if (!in) {
-							fprintf(stderr, "Error while opening %s: %s\n", dash_inputs[i].file_name, gf_error_to_string( gf_isom_last_error(NULL) ));
-							gf_isom_delete(file);
-							gf_sys_close();
-							MP4BOX_EXIT_WITH_CODE(0);
-						}
-					}
-					for (j=0; j<gf_isom_get_track_count(in); j++) {
-						u32 track = gf_isom_get_track_by_id(init_seg, gf_isom_get_track_id(in, j+1));
-						if (track) {
-							u32 outDescIndex;
-							if ( gf_isom_get_sample_description_count(in, j+1) != 1) {
-								fprintf(stderr, "Cannot merge track with multiple sample descriptions (file %s) - try disabling bitstream switching\n", dash_inputs[i].file_name );
-								gf_isom_delete(init_seg);
-								gf_isom_delete(in);
-								gf_sys_close();
-								MP4BOX_EXIT_WITH_CODE(0);
-							}
-
-							/*if not the same sample desc we might need to clone it*/
-							if (! gf_isom_is_same_sample_description(in, j+1, 1, init_seg, track, 1)) {
-								Bool do_merge = 1;
-								u32 stype1, stype2;
-								stype1 = gf_isom_get_media_subtype(in, j+1, 1);
-								stype2 = gf_isom_get_media_subtype(init_seg, track, 1);
-								if (stype1 != stype2) do_merge = 0;
-								switch (stype1) {
-								case GF_4CC( 'a', 'v', 'c', '1'):
-								case GF_4CC( 'a', 'v', 'c', '2'):
-								case GF_4CC( 's', 'v', 'c', '1'):
-									break;
-								default:
-									do_merge = 0;
-									break;
-								}
-								if (do_merge) {
-									u32 k, l, sps_id1, sps_id2;
-									GF_AVCConfig *avccfg1 = gf_isom_avc_config_get(in, j+1, 1);
-									GF_AVCConfig *avccfg2 = gf_isom_avc_config_get(init_seg, track, 1);
-	#ifndef GPAC_DISABLE_AV_PARSERS
-									for (k=0; k<gf_list_count(avccfg2->sequenceParameterSets); k++) {
-										GF_AVCConfigSlot *slc = gf_list_get(avccfg2->sequenceParameterSets, k);
-										gf_avc_get_sps_info(slc->data, slc->size, &sps_id1, NULL, NULL, NULL, NULL);
-										for (l=0; l<gf_list_count(avccfg1->sequenceParameterSets); l++) {
-											GF_AVCConfigSlot *slc_orig = gf_list_get(avccfg1->sequenceParameterSets, l);
-											gf_avc_get_sps_info(slc_orig->data, slc_orig->size, &sps_id2, NULL, NULL, NULL, NULL);
-											if (sps_id2==sps_id1) {
-												do_merge = 0;
-												break;
-											}
-										}
-									}
-	#endif
-									/*no conflicts in SPS ids, merge all SPS in a single sample desc*/
-									if (do_merge) {
-										while (gf_list_count(avccfg1->sequenceParameterSets)) {
-											GF_AVCConfigSlot *slc = gf_list_get(avccfg1->sequenceParameterSets, 0);
-											gf_list_rem(avccfg1->sequenceParameterSets, 0);
-											gf_list_add(avccfg2->sequenceParameterSets, slc);
-										}
-										while (gf_list_count(avccfg1->pictureParameterSets)) {
-											GF_AVCConfigSlot *slc = gf_list_get(avccfg1->pictureParameterSets, 0);
-											gf_list_rem(avccfg1->pictureParameterSets, 0);
-											gf_list_add(avccfg2->pictureParameterSets, slc);
-										}
-										gf_isom_avc_config_update(init_seg, track, 1, avccfg2);
-									} else {
-										sps_merge_failed = 1;
-									}
-									gf_odf_avc_cfg_del(avccfg1);
-									gf_odf_avc_cfg_del(avccfg2);
-								}
-
-								/*cannot merge, clone*/
-								if (!do_merge)
-									gf_isom_clone_sample_description(init_seg, track, in, j+1, 1, NULL, NULL, &outDescIndex);
-							}
-						} else {
-							gf_isom_clone_track(in, j+1, init_seg, 0, &track);
-						}
-						dur = (Double) gf_isom_get_track_duration(in, j+1);
-						dur /= gf_isom_get_timescale(in);
-						if (dur>period_duration) period_duration = dur;
-					}
-					gf_isom_set_brand_info(init_seg, GF_4CC('i','s','o','5'), 1);
-					gf_isom_modify_alternate_brand(init_seg, GF_4CC('d','a','s','h'), 1);
-					if (i) gf_isom_close(in);
-				}
-				if (sps_merge_failed) {
-					fprintf(stderr, "Couldnt merge AVC|H264 SPS from different files (same SPS ID used) - different sample descriptions will be used\n");
-				}
-			}
-			if (!seg_name) use_url_template = 0;
-
-			szFPS[0] = 0;
-			szLang[0] = 0;
-			/*compute some max defaults*/
-			for (i=0; i<nb_dash_inputs && !e; i++) {
-				GF_ISOFile *in;
-				
-				if (dash_inputs[i].adaptation_set!=cur_adaptation_set+1)
-					continue;
-
-				in = file;
-				if (i) in = gf_isom_open(dash_inputs[i].file_name, GF_ISOM_OPEN_READ, NULL);
-
-				for (j=0; j<gf_isom_get_track_count(in); j++) {
-					if (gf_isom_get_sample_count(in, j+1)<2)
-						continue;
-
-					if ( gf_isom_get_media_type(in, j+1) == GF_ISOM_MEDIA_VISUAL) {
-						u32 w, h;
-						u32 mscale, sample_dur;
-						gf_isom_get_visual_info(in, j+1, 1, &w, &h);
-						if (w>max_width) max_width = w;
-						if (h>max_height) max_height = h;
-						mscale = gf_isom_get_media_timescale(in, j+1);
-						/*get duration of 2nd sample*/
-						sample_dur = gf_isom_get_sample_duration(in, j+1, 2);
-										
-						if (! fps_num || !fps_denum) {
-							fps_num = mscale;
-							fps_denum = sample_dur;
-						}
-						else if (fps_num *sample_dur < mscale * fps_denum) {
-							fps_num = mscale;
-							fps_denum = sample_dur;
-						}
-					}
-					/*non-video tracks, get lang*/
-					else {
-						szLang[3] = 0;
-						gf_isom_get_media_language(in, j+1, szLang);
-					}
-				}
-				if (i) gf_isom_close(in);
-			}
-			if (max_width && max_height) {
-				gf_media_get_reduced_frame_rate(&fps_num, &fps_denum);
-				if (fps_denum>1) 
-					sprintf(szFPS, "%d/%d", fps_num, fps_denum);
-				else
-					sprintf(szFPS, "%d", fps_num);
-			}
-
-			e = gf_media_mpd_start(szMPD, dash_profile, dash_title, dash_source, cprt, dash_more_info, use_url_template, segment_mode, dash_ctx, init_seg, use_bs_switching, period_duration, cur_adaptation_set ? 0 : 1, dash_inputs[first_rep_in_set].group_id, max_width, max_height, szFPS, szLang);
-
-			if (skip_init_segment_creation) {
-				gf_isom_close(init_seg);
-				init_seg = NULL;
-			}
-
-			is_first_rep = 1;
-			for (i=0; i<nb_dash_inputs && !e; i++) {
-				char szOutName[GF_MAX_PATH], *segment_name;
-				GF_ISOFile *in;
-				
-				if (dash_inputs[i].adaptation_set!=cur_adaptation_set+1)
-					continue;
-
-				in = file;
-				if (i) in = gf_isom_open(dash_inputs[i].file_name, GF_ISOM_OPEN_READ, NULL);
-
-				segment_name = seg_name;
-
-//				if (nb_dash_inputs>1) 
-				{
-					strcpy(outfile, gf_url_get_resource_name(dash_inputs[i].file_name));
-					sep = strrchr(outfile, '.');
-					if (sep) sep[0] = 0;
-		
-					if (seg_name) {
-						if (strstr(seg_name, "%s")) {
-							sprintf(szSolvedSegName, seg_name, outfile);
-							variable_seg_rad_name = 1;
-						} else {
-							strcpy(szSolvedSegName, seg_name);
-						}
-						segment_name = szSolvedSegName;
-					}
-					strcat(outfile, "_dash");
-
-					if (outName && gf_url_get_resource_path(outName, szOutName)) {
-						strcat(szOutName, outfile);
-						strcpy(outfile, szOutName);
-					}
-				}
-				if (nb_dash_inputs>1) {
-					fprintf(stderr, "DASHing file %s\n", dash_inputs[i].file_name);
-				}
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-				e = gf_media_segment_file(in, outfile, InterleavingTime, szMPD, seg_at_rap ? 2 : 1, dash_duration, segment_name, seg_ext, subsegs_per_sidx, daisy_chain_sidx, use_url_template, segment_mode, dash_ctx, init_seg, dash_inputs[i].szID, is_first_rep, variable_seg_rad_name, frag_at_rap);
-#else
-				fprintf(stderr, "GPAC was compiled without fragment support\n");
-				e = GF_NOT_SUPPORTED;
-#endif
-				if (e) {
-					fprintf(stderr, "Error while DASH-ing file: %s\n", gf_error_to_string(e));
-					break;
-				}
-				if (i) gf_isom_close(in);
-				is_first_rep = 0;
-			}
-			/*close MPD*/
-			if (!e) e = gf_media_mpd_end(szMPD, (cur_adaptation_set+1==max_adaptation_set) ? 1 : 0);
-			
-			if (!e) {
-				/*if init segment shared, write to file*/
-//				if (nb_dash_inputs>1) 
-				{
-					gf_isom_close(init_seg);
-				} 
-/*
-				else {
-					gf_isom_delete(init_seg);
-					gf_delete_file(szInit);
-				}
-*/
-			}
-		}
-		gf_isom_delete(file);
-		gf_sys_close();
-		MP4BOX_EXIT_WITH_CODE( (e!=GF_OK) ? 1 : 0 );
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-	} else if (Frag) {
-		if (!InterleavingTime) InterleavingTime = 0.5;
+	if (Frag) {
+		if (!interleaving_time) interleaving_time = 0.5;
 		if (HintIt) fprintf(stderr, "Warning: cannot hint and fragment - ignoring hint\n");
-		fprintf(stderr, "Fragmenting file (%.3f seconds fragments)\n", InterleavingTime);
-		e = gf_media_fragment_file(file, outfile, InterleavingTime);
+		fprintf(stderr, "Fragmenting file (%.3f seconds fragments)\n", interleaving_time);
+		e = gf_media_fragment_file(file, outfile, interleaving_time);
 		if (e) fprintf(stderr, "Error while fragmenting file: %s\n", gf_error_to_string(e));
 		gf_isom_delete(file);
 		if (!e && !outName && !force_new) {
 			if (gf_delete_file(inName)) fprintf(stderr, "Error removing file %s\n", inName);
 			else if (gf_move_file(outfile, inName)) fprintf(stderr, "Error renaming file %s to %s\n", outfile, inName);
 		}
-		gf_sys_close();
 		MP4BOX_EXIT_WITH_CODE( (e!=GF_OK) ? 1 : 0 );
-#endif
 	}
+#endif
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
 	if (HintIt) {
@@ -3853,14 +3582,14 @@
 	/*full interleave (sample-based) if just hinted*/
 	if (FullInter) {
 		e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_TIGHT);
-	} else if (!InterleavingTime) {
+	} else if (!interleaving_time) {
 		e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_STREAMABLE);
 		needSave = 1;
 	} else if (do_flat) {
 		e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_FLAT);
 		needSave = 1;
 	} else {
-		e = gf_isom_make_interleave(file, InterleavingTime);
+		e = gf_isom_make_interleave(file, interleaving_time);
 		if (!e && !old_interleave) e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_DRIFT_INTERLEAVED);
 	}
 	if (e) goto err_exit;
@@ -3937,8 +3666,8 @@
 		}
 		if (HintIt && FullInter) fprintf(stderr, "Hinted file - Full Interleaving\n");
 		else if (FullInter) fprintf(stderr, "Full Interleaving\n");
-		else if (do_flat || !InterleavingTime) fprintf(stderr, "Flat storage\n");
-		else fprintf(stderr, "%.3f secs Interleaving%s\n", InterleavingTime, old_interleave ? " - no drift control" : "");
+		else if (do_flat || !interleaving_time) fprintf(stderr, "Flat storage\n");
+		else fprintf(stderr, "%.3f secs Interleaving%s\n", interleaving_time, old_interleave ? " - no drift control" : "");
 
 		e = gf_isom_close(file);
 
@@ -3949,21 +3678,17 @@
 	} else {
 		gf_isom_delete(file);
 	}
-	/*close libgpac*/
-	gf_sys_close();
 
 	if (e) fprintf(stderr, "Error: %s\n", gf_error_to_string(e));
 	MP4BOX_EXIT_WITH_CODE( (e!=GF_OK) ? 1 : 0 );
 #else
 	/*close libgpac*/
-	gf_sys_close();
 	gf_isom_delete(file);
 	fprintf(stderr, "Error: Read-only version of MP4Box.\n");
 	MP4BOX_EXIT_WITH_CODE(1);
 #endif
 err_exit:
 	/*close libgpac*/
-	gf_sys_close();
 	if (file) gf_isom_delete(file);		
 	fprintf(stderr, "\n\tError: %s\n", gf_error_to_string(e));
 	MP4BOX_EXIT_WITH_CODE(1);

gpac-0.5.0.svn4192.tar.bz2/applications/mp4client/main.c -> gpac-0.5.0.svn4296.tar.bz2/applications/mp4client/main.c Changed

gpac-0.5.0.svn4192.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/GPACInstance.java -> gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/GPACInstance.java Changed

gpac-0.5.0.svn4192.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/GPACInstanceInterface.java -> gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/GPACInstanceInterface.java Changed

gpac-0.5.0.svn4192.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/GpacCallback.java -> gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/GpacCallback.java Changed

gpac-0.5.0.svn4192.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/GpacConfig.java -> gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/GpacConfig.java Changed

gpac-0.5.0.svn4192.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/Osmo4.java -> gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/Osmo4.java Changed

@@ -2,7 +2,7 @@
  *  Osmo on Android
  *  Aug/2010
  *  NGO Van Luyen
- * $Id: Osmo4.java 4029 2012-05-14 09:51:16Z jeanlf $
+ * $Id: Osmo4.java 4276 2013-01-09 12:49:21Z cconcolato $
  *
  */
 package com.gpac.Osmo4;
@@ -62,7 +62,7 @@
 /**
  * The main Osmo4 activity, used to launch everything
  * 
- * @version $Revision: 4029 $
+ * @version $Revision: 4276 $
  * 
  */
 public class Osmo4 extends Activity implements GpacCallback {
@@ -121,6 +121,9 @@
         super.onCreate(savedInstanceState);
         requestWindowFeature(Window.FEATURE_PROGRESS);
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, 
+                                WindowManager.LayoutParams.FLAG_FULLSCREEN);
 
         MPEGVSensor.initSensorManager((SensorManager) getSystemService(Context.SENSOR_SERVICE));
 
@@ -677,7 +680,7 @@
     // long start = System.currentTimeMillis();
     // byte buffer[] = new byte[1024];
     // int[] ids = getAllRawResources();
-    //        String currentRevision = "$Revision: 4029 $"; //$NON-NLS-1$
+    //        String currentRevision = "$Revision: 4276 $"; //$NON-NLS-1$
     // File revisionFile = gpacConfig.getGpacLastRevFile();
     // boolean fastStartup = false;
     // // We check if we already copied all the modules once without error...
@@ -959,7 +962,7 @@
                 sb.append("Description: "); //$NON-NLS-1$
                 sb.append(e.getLocalizedMessage());
                 sb.append('\n');
-                sb.append("Revision: $Revision: 4029 $"); //$NON-NLS-1$
+                sb.append("Revision: $Revision: 4276 $"); //$NON-NLS-1$
                 sb.append("\nConfiguration information :\n") //$NON-NLS-1$
                   .append(gpacConfig.getConfigAsText());
                 builder.setMessage(sb.toString());

gpac-0.5.0.svn4192.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/extra/FileArrayAdapter.java -> gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/extra/FileArrayAdapter.java Changed

gpac-0.5.0.svn4192.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/extra/FileChooserActivity.java -> gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/extra/FileChooserActivity.java Changed

gpac-0.5.0.svn4192.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/extra/FileEntry.java -> gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/extra/FileEntry.java Changed

gpac-0.5.0.svn4192.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/logs/GpacLogger.java -> gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/logs/GpacLogger.java Changed

gpac-0.5.0.svn4296.tar.bz2/applications/ts2hds Added

gpac-0.5.0.svn4296.tar.bz2/applications/ts2hds/Makefile Added

gpac-0.5.0.svn4296.tar.bz2/applications/ts2hds/f4m.c Added

@@ -0,0 +1,173 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Author: Romain Bouqueau
+ *			Copyright (c) Romain Bouqueau 2012-
+ *				All rights reserved
+ *
+ *          Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
+ *
+ *  This file is part of GPAC / TS to HDS (ts2hds) application
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include "ts2hds.h"
+
+#include <gpac/base_coding.h>
+
+//#define ADOBE_INLINED_BOOTSTRAP
+
+struct __tag_adobe_stream
+{
+	FILE *f;
+	const char *id;
+	const char *base_url;
+	u32 bitrate;
+};
+
+struct __tag_adobe_multirate
+{
+	FILE *f;
+	const char *id;
+	const char *base_url;
+	GF_List *streams;
+};
+
+static GF_Err adobe_gen_stream_manifest(AdobeStream *as) 
+{ 
+	fprintf(as->f, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"); 
+	fprintf(as->f, "<manifest xmlns=\"http://ns.adobe.com/f4m/1.0\">\n"); 
+	fprintf(as->f, "<id>%s</id>\n", as->id); 
+	if (as->base_url) 
+		fprintf(as->f, "<baseURL>%s</baseURL>\n", as->base_url); 
+	fprintf(as->f, "<bootstrapInfo profile=\"named\" id=\"boot_%s_%d\" url=\"%s_%d.bootstrap\"/>\n", as->id, as->bitrate, as->id, as->bitrate); 
+	fprintf(as->f, "<media url=\"%s_%u_\" bitrate=\"%u\" bootstrapInfoId=\"boot_%s_%d\"/>\n", as->id, as->bitrate, as->bitrate, as->id, as->bitrate); 
+	fprintf(as->f, "</manifest>\n"); 
+
+	return GF_OK; 
+}
+
+AdobeMultirate *adobe_alloc_multirate_manifest(char *id)
+{
+	AdobeMultirate *am = gf_calloc(1, sizeof(AdobeMultirate));
+	char filename[GF_MAX_PATH];
+
+	//default init
+	am->base_url = "http://localhost/hds/tmp";
+	am->id = id;
+	sprintf(filename, "%s.f4m", am->id);
+	am->f = fopen(filename, "wt");
+	if (!am->f) {
+		fprintf(stderr, "Couldn't create Adobe multirate manifest file: %s\n", filename);
+		assert(0);
+		gf_free(am);
+		return NULL;
+	}
+	am->streams = gf_list_new();
+
+	//create a fake stream
+	{
+		AdobeStream *as = gf_calloc(1, sizeof(AdobeStream));
+		as->id = "HD";
+		as->bitrate = 100;
+		sprintf(filename, "%s_%s_%d.f4m", am->id, as->id, as->bitrate); 
+		as->f = fopen(filename, "wt"); 
+		if (!as->f) { 
+			fprintf(stderr, "Couldn't create Adobe stream manifest file: %s\n", filename); 
+			assert(0); 
+			gf_list_del(am->streams); 
+			gf_free(as); 
+			gf_free(am); 
+			return NULL; 
+		} 
+		gf_list_add(am->streams, as);
+	}
+
+	return am;
+}
+
+void adobe_free_multirate_manifest(AdobeMultirate *am)
+{
+	u32 i;
+
+	if (am->f)
+		fclose(am->f);
+
+	for (i=0; i<gf_list_count(am->streams); i++) {
+		AdobeStream *as = gf_list_get(am->streams, i);
+		assert(as);
+		if (as->f) 
+			fclose(as->f); 
+		//TODO: base_url and id may be stored as gf_strdup in the future
+		gf_list_rem(am->streams, i);
+		gf_free(as);
+	}
+	gf_list_del(am->streams);
+
+	gf_free(am);
+}
+
+GF_Err adobe_gen_multirate_manifest(AdobeMultirate* am, char *bootstrap, size_t bootstrap_size)
+{
+	GF_Err e;
+	u32 i;
+#ifdef ADOBE_INLINED_BOOTSTRAP
+	char bootstrap64[GF_MAX_PATH];
+	u32 bootstrap64_len;
+#endif
+
+	fprintf(am->f, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
+	fprintf(am->f, "<manifest xmlns=\"http://ns.adobe.com/f4m/2.0\">\n");
+	fprintf(am->f, "<id>%s</id>\n", am->id);
+	fprintf(am->f, "<baseURL>%s</baseURL>\n", am->base_url);
+    fprintf(am->f, "<streamType>live</streamType>\n");
+
+	assert(am->streams);
+	for (i=0; i<gf_list_count(am->streams); i++) {
+		AdobeStream *as = gf_list_get(am->streams, i);
+		assert(as);
+#ifdef ADOBE_INLINED_BOOTSTRAP
+		fprintf(am->f, "<bootstrapInfo profile=\"named\" id=\"boot_%s_%d\">\n", as->id, as->bitrate);
+		bootstrap64_len = gf_base64_encode(bootstrap, bootstrap_size, bootstrap64, GF_MAX_PATH);
+		fwrite(bootstrap64, bootstrap64_len, 1, am->f);
+		if (bootstrap64_len >= GF_MAX_PATH) {
+			fprintf(stderr, "Bootstrap may have been truncated for stream %s_%d.\n", as->id, as->bitrate);
+			assert(0);
+		}
+		fprintf(am->f, "\n</bootstrapInfo>\n");
+#else
+		{
+			char filename[GF_MAX_PATH];
+			FILE *bstfile;
+			sprintf(filename, "%s_%d.bootstrap", as->id, as->bitrate);
+			bstfile = fopen(filename, "wb");
+			gf_fwrite(bootstrap, bootstrap_size, 1, bstfile);
+			fclose(bstfile);
+		}
+#endif
+		e = adobe_gen_stream_manifest(as); 
+		if (!e) { 
+			if (!am->base_url && !as->base_url) 
+				fprintf(stderr, "Warning: no base_url specified\n"); 
+
+			fprintf(am->f, "<media href=\"%s_%s_%d.f4m\" bitrate=\"%d\"/>\n", am->id, as->id, as->bitrate, as->bitrate); 
+		}
+	}
+	fprintf(am->f, "</manifest>\n");
+
+	return GF_OK;
+}

gpac-0.5.0.svn4296.tar.bz2/applications/ts2hds/f4v.c Added

@@ -0,0 +1,185 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Author: Romain Bouqueau
+ *			Copyright (c) Romain Bouqueau 2012-
+ *				All rights reserved
+ *
+ *          Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
+ *
+ *  This file is part of GPAC / TS to HDS (ts2hds) application
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include "ts2hds.h"
+
+//we need to write Adobe custom boxes
+#include <gpac/internal/isomedia_dev.h>
+
+GF_Err adobize_segment(GF_ISOFile *isom_file, AdobeHDSCtx *ctx)
+{
+	GF_Err e;
+	GF_BitStream *bs;
+
+	GF_AdobeFragRandomAccessBox *afra = (GF_AdobeFragRandomAccessBox*)	afra_New();
+	GF_AfraEntry *ae                  = (GF_AfraEntry*)					gf_calloc(1, sizeof(GF_AfraEntry));
+	GF_AdobeBootstrapInfoBox *abst    = (GF_AdobeBootstrapInfoBox*)		abst_New();
+	GF_AdobeSegmentRunTableBox *asrt  = (GF_AdobeSegmentRunTableBox*)	asrt_New();
+	GF_AdobeSegmentRunEntry *asre     = (GF_AdobeSegmentRunEntry*)		gf_calloc(1, sizeof(GF_AdobeSegmentRunEntry));
+	GF_AdobeFragmentRunTableBox *afrt = (GF_AdobeFragmentRunTableBox*)	afrt_New();
+	GF_AdobeFragmentRunEntry *afre    = (GF_AdobeFragmentRunEntry*)		gf_calloc(1, sizeof(GF_AdobeFragmentRunEntry));
+
+	u64 init_seg_time = ctx->curr_time;
+	u32 seg_duration = (u32)gf_isom_get_duration(isom_file);
+
+	//update context
+	ctx->curr_time += seg_duration;
+
+	//Adobe specific boxes
+	//Random Access
+	afra->type = GF_4CC('a', 'f', 'r', 'a');
+	afra->version = 0;
+	afra->flags = 0;
+	afra->long_ids = 1;
+	afra->long_offsets = 1;
+	afra->global_entries = 0;
+	afra->time_scale = gf_isom_get_timescale(isom_file);
+
+	afra->entry_count = 1;
+	ae->time = init_seg_time;
+	ae->offset = 3999;
+	gf_list_add(afra->local_access_entries, ae);
+
+	afra->global_entries = 0;
+	afra->global_entry_count = 0;
+
+	e = gf_list_add(isom_file->TopBoxes, afra);
+	if (e) {
+		fprintf(stderr, "Impossible to write AFRA box: %s\n", gf_error_to_string(e));
+		assert(0);
+		return e;
+	}
+
+	//Bootstrap Info
+	abst->type = GF_4CC('a', 'b', 's', 't');
+	abst->version = 0;
+	abst->flags = 0;
+	abst->bootstrapinfo_version = 1;
+	abst->profile = 0;
+	abst->live = 1;
+	abst->update = 0;
+	abst->time_scale = gf_isom_get_timescale(isom_file);
+	abst->current_media_time = init_seg_time+seg_duration;
+	abst->smpte_time_code_offset = 0;
+
+	abst->movie_identifier = NULL;
+	abst->drm_data = NULL;
+	abst->meta_data = NULL;
+
+	abst->server_entry_count = 0;
+	abst->quality_entry_count = 0;
+
+	abst->segment_run_table_count = 1;
+	{
+		//Segment Run
+		asrt->type = GF_4CC('a', 's', 'r', 't');
+		asrt->version = 0;
+		asrt->flags = 0;
+		asrt->segment_run_entry_count = 1;
+		{
+			asre->first_segment = ctx->segnum;
+			asre->fragment_per_segment = 1;
+		}
+		e = gf_list_add(asrt->segment_run_entry_table, asre);
+		if (e) {
+			fprintf(stderr, "Impossible to write ASR Entry: %s\n", gf_error_to_string(e));
+			assert(0);
+			return e;
+		}
+	}
+	e = gf_list_add(abst->segment_run_table_entries, asrt);
+	if (e) {
+		fprintf(stderr, "Impossible to write ASRT box: %s\n", gf_error_to_string(e));
+		assert(0);
+		return e;
+	}
+
+	abst->fragment_run_table_count = 1;
+	{
+		//Fragment Run
+		afrt->type = GF_4CC('a', 'f', 'r', 't');
+		afrt->version = 0;
+		afrt->flags = 0;
+		afrt->timescale = gf_isom_get_timescale(isom_file);
+		afrt->fragment_run_entry_count = 1;
+		{
+			afre->first_fragment = 1;
+			afre->first_fragment_timestamp = 0;
+			afre->fragment_duration = seg_duration;
+		}
+		e = gf_list_add(afrt->fragment_run_entry_table, afre);
+		if (e) {
+			fprintf(stderr, "Impossible to write AFR Entry: %s\n", gf_error_to_string(e));
+			assert(0);
+			return e;
+		}
+	}
+	e = gf_list_add(abst->fragment_run_table_entries, afrt);
+	if (e) {
+		fprintf(stderr, "Impossible to write AFRT box: %s\n", gf_error_to_string(e));
+		assert(0);
+		return e;
+	}
+
+	e = gf_list_add(isom_file->TopBoxes, abst);
+	if (e) {
+		fprintf(stderr, "Impossible to write ABST box: %s\n", gf_error_to_string(e));
+		assert(0);
+		return e;
+	}
+
+	e = abst_Size((GF_Box*)abst);
+	if (e) {
+		fprintf(stderr, "Impossible to compute ABST box size: %s\n", gf_error_to_string(e));
+		assert(0);
+		return e;
+	}
+	ctx->bootstrap_size = (size_t)abst->size;
+	ctx->bootstrap = gf_malloc(ctx->bootstrap_size);
+	bs = gf_bs_new(ctx->bootstrap, ctx->bootstrap_size, GF_BITSTREAM_WRITE);
+	e = abst_Write((GF_Box*)abst, bs);
+	if (e) {
+		fprintf(stderr, "Impossible to code the ABST box: %s\n", gf_error_to_string(e));
+		assert(0);
+		gf_bs_del(bs);
+		return e;
+	}
+	gf_bs_del(bs);
+
+	//set brands as reversed engineered from f4v files
+	/*e = gf_isom_reset_alt_brands(isom_file);
+	if (e) {
+		fprintf(stderr, "Warning: couldn't reset ISOM brands: %s\n", gf_error_to_string(e));
+		assert(0);
+	}*/
+	gf_isom_set_brand_info(isom_file, GF_4CC('f','4','v',' '), 1);
+	gf_isom_modify_alternate_brand(isom_file, GF_4CC('i','s','o','m'), 1);
+	gf_isom_modify_alternate_brand(isom_file, GF_4CC('m','p','4','2'), 1);
+	gf_isom_modify_alternate_brand(isom_file, GF_4CC('m','4','v',' '), 1);
+
+	return GF_OK;
+}
\ No newline at end of file

gpac-0.5.0.svn4296.tar.bz2/applications/ts2hds/main.c Added

@@ -0,0 +1,305 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Author: Romain Bouqueau
+ *			Copyright (c) Romain Bouqueau 2012-
+ *				All rights reserved
+ *
+ *          Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
+ *
+ *  This file is part of GPAC / TS to HDS (ts2hds) application
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include "ts2hds.h"
+
+//FIXME: test only
+//#include <gpac/internal/isomedia_dev.h>
+//#include <gpac/base_coding.h>
+
+#ifdef WIN32
+#define strnicmp _strnicmp
+#endif
+
+#define CHECK_NEXT_ARG	if (i+1==(u32)argc) { fprintf(stderr, "Missing arg - please check usage\n"); exit(1); }
+
+#ifdef GPAC_DISABLE_ISOM
+
+#error "Cannot compile TS2HDS if GPAC is not built with ISO File Format support"
+
+#endif
+
+
+static GFINLINE void usage(const char * progname) 
+{
+	fprintf(stderr, "USAGE: %s -i input -o output\n"
+					"\n"
+#ifdef GPAC_MEMORY_TRACKING
+					"\t-mem-track:  enables memory tracker\n"
+#endif
+		);
+}
+
+
+/*parse TS2HDS arguments*/
+static GFINLINE GF_Err parse_args(int argc, char **argv, char **input, char **output, u64 *curr_time, u32 *segnum)
+{
+	Bool input_found=0, output_found=0;
+	char *arg = NULL, *error_msg = "no argument found";
+	s32 i;
+
+	for (i=1; i<argc; i++) {
+		arg = argv[i];
+		if (!strnicmp(arg, "-h", 2) || strstr(arg, "-help")) {
+			usage(argv[0]);
+			return GF_EOS;
+		} else if (!strnicmp(arg, "-input", 6)) {
+			CHECK_NEXT_ARG
+			*input = argv[++i];
+			input_found = 1;
+		} else if (!strnicmp(arg, "-output", 6)) {
+			CHECK_NEXT_ARG
+			*output = argv[++i];
+			output_found = 1;
+		} else if (!strnicmp(arg, "-segnum", 6)) {
+			CHECK_NEXT_ARG
+			*segnum = atoi(argv[++i]);
+		} else if (!strnicmp(arg, "-mem-track", 10)) {
+#ifdef GPAC_MEMORY_TRACKING
+			gf_sys_close();
+			gf_sys_init(1);
+			gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
+#else
+			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n"); 
+#endif
+		} else {
+			error_msg = "unknown option \"%s\"";
+			goto error;
+		}
+	}
+
+	/*syntax is correct; now testing the presence of mandatory arguments*/
+	if (input_found && output_found) {
+		return GF_OK;
+	} else {
+		if (!input_found)
+			fprintf(stderr, "Error: input argument not found\n\n");
+		if (!output_found)
+			fprintf(stderr, "Error: output argument not found\n\n");
+		return GF_BAD_PARAM;
+	}
+
+error:	
+	if (!arg) {
+		fprintf(stderr, "Error: %s\n\n", error_msg);
+	} else {
+		fprintf(stderr, "Error: %s \"%s\"\n\n", error_msg, arg);
+	}
+	return GF_BAD_PARAM;
+}
+
+int main(int argc, char **argv)
+{
+	/********************/
+	/*   declarations   */
+	/********************/
+	char *input, *output, tmpstr[GF_MAX_PATH];
+	GF_ISOFile *isom_file_in, *isom_file_out;
+	GF_MediaImporter import;
+	AdobeHDSCtx ctx;
+	GF_Err e;
+	u32 i;
+	
+	/*****************/
+	/*   gpac init   */
+	/*****************/
+	gf_sys_init(0);
+	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
+	
+	/***********************/
+	/*   initialisations   */
+	/***********************/
+	input = NULL;
+	output = NULL;
+	isom_file_in = NULL;
+	isom_file_out = NULL;
+	memset(&import, 0, sizeof(GF_MediaImporter));
+	e = GF_OK;
+	memset(&ctx, 0, sizeof(ctx));
+	
+	ctx.curr_time = 0;
+	ctx.segnum = 1;
+
+	/*********************************************/
+	/*   parse arguments and build HDS context   */
+	/*********************************************/
+	if (GF_OK != parse_args(argc, argv, &input, &output, &ctx.curr_time, &ctx.segnum)) {
+		usage(argv[0]);
+		goto exit;
+	}
+
+	ctx.multirate_manifest = adobe_alloc_multirate_manifest(output);
+
+#if 0 /*'moov' conversion tests*/
+	{
+		char metamoov64[GF_MAX_PATH];
+		u32 metamoov64_len;
+		unsigned char metamoov[GF_MAX_PATH];
+		u32 metamoov_len=GF_MAX_PATH;
+		FILE *f = fopen("metamoov64"/*input*/, "rt");
+		gf_f64_seek(f, 0, SEEK_END);
+		metamoov64_len = (u32)gf_f64_tell(f);
+		gf_f64_seek(f, 0, SEEK_SET);
+		fread(metamoov64, metamoov64_len, 1, f);
+		metamoov_len = gf_base64_decode(metamoov64, metamoov64_len, metamoov, metamoov_len);
+		fclose(f);
+		f = fopen("metamoov", "wb");
+		fwrite(metamoov, metamoov_len, 1, f);
+		fclose(f);
+		return 0;
+	}
+#endif
+
+#if 0 /*'abst'conversion tests*/
+	{
+		char bootstrap64[GF_MAX_PATH];
+		u32 bootstrap64_len;
+		unsigned char bootstrap[GF_MAX_PATH];
+		u32 bootstrap_len=GF_MAX_PATH;
+		GF_AdobeBootstrapInfoBox *abst = (GF_AdobeBootstrapInfoBox *)abst_New();
+		GF_BitStream *bs;
+#if 1 //64
+		FILE *f = fopen("bootstrap64"/*input*/, "rt");
+		gf_f64_seek(f, 0, SEEK_END);
+		bootstrap64_len = (u32)gf_f64_tell(f);
+		gf_f64_seek(f, 0, SEEK_SET);
+		fread(bootstrap64, bootstrap64_len, 1, f);
+		bootstrap_len = gf_base64_decode(bootstrap64, bootstrap64_len, bootstrap, bootstrap_len);
+#else //binary bootstrap
+		FILE *f = fopen("bootstrap.bin"/*input*/, "rb");
+		gf_f64_seek(f, 0, SEEK_END);
+		bootstrap_len = (u32)gf_f64_tell(f);
+		gf_f64_seek(f, 0, SEEK_SET);
+		fread(bootstrap, bootstrap_len, 1, f);
+#endif
+		bs = gf_bs_new(bootstrap+8, bootstrap_len-8, GF_BITSTREAM_READ);
+		abst->size = bootstrap[2]*256+bootstrap[3];
+		assert(abst->size<GF_MAX_PATH);
+		abst_Read((GF_Box*)abst, bs);
+		gf_bs_del(bs);
+		//then rewrite with just one 'afrt'
+		memset(bootstrap, 0, bootstrap_len);
+		bs = gf_bs_new(bootstrap, bootstrap_len, GF_BITSTREAM_WRITE);
+		abst_Write((GF_Box*)abst, bs);
+		bootstrap_len = (u32)gf_bs_get_position(bs);
+		gf_bs_del(bs);
+		fclose(f);
+		f = fopen("bootstrap", "wt");
+		bootstrap64_len = gf_base64_encode(bootstrap, bootstrap_len, bootstrap64, GF_MAX_PATH);
+		fwrite(bootstrap64, bootstrap64_len, 1, f);
+		fprintf(f, "\n\n");
+		abst_dump((GF_Box*)abst, f);
+		fclose(f);
+		abst_del((GF_Box*)abst);
+		return 0;
+	}
+#endif
+
+	/*****************/
+	/*   main loop   */
+	/*****************/
+	import.trackID = 0;
+	import.in_name = input;
+	import.flags = GF_IMPORT_PROBE_ONLY;
+
+	//create output or open when recovering from a saved state
+	sprintf(tmpstr, "%s_import.mp4", input);
+	isom_file_in = gf_isom_open(tmpstr, GF_ISOM_WRITE_EDIT, NULL);
+	if (!isom_file_in) {
+		fprintf(stderr, "Error opening output file %s: %s\n", tmpstr, gf_error_to_string(e));
+		assert(0);
+		goto exit;
+	}
+	import.dest = isom_file_in;
+
+	//probe input
+	e = gf_media_import(&import);
+	if (e) {
+		fprintf(stderr, "Error while importing input file %s: %s\n", input, gf_error_to_string(e));
+		assert(0);
+		goto exit;
+	}
+
+	//import input data
+	import.flags = 0;
+	for (i=0; i<import.nb_tracks; i++) {
+		import.trackID = import.tk_info[i].track_num;
+		e = gf_media_import(&import);
+		if (e) {
+			fprintf(stderr, "Error while importing track number %u, input file %s: %s\n", import.trackID, input, gf_error_to_string(e));
+			assert(0);
+			goto exit;
+		}
+	}
+
+	//Adobe specific stuff
+	e = adobize_segment(isom_file_in, &ctx);
+	if (e) {
+		fprintf(stderr, "Couldn't turn the ISOM fragmented file into an Adobe f4v segment: %s\n", gf_error_to_string(e));
+		assert(0);
+		goto exit;
+	}
+
+	//interleave data and remove imported file
+	//FIXME: set multiple fragments: 
+	sprintf(tmpstr, "%s_HD_100_Seg%u-Frag1", output, ctx.segnum); //FIXME: "HD", "100" and fragnum: pass as arg
+	//e = gf_media_fragment_file(isom_file_in, tmpstr, 1.0);
+	e = gf_media_fragment_file(isom_file_in, tmpstr, 1.0+gf_isom_get_duration(isom_file_in)/gf_isom_get_timescale(isom_file_in));
+	if (e) {
+		fprintf(stderr, "Error while fragmenting file to output %s: %s\n", output, gf_error_to_string(e));
+		assert(0);
+		goto exit;
+	}
+	gf_isom_delete(isom_file_in);
+	isom_file_in = NULL;
+
+	e = adobe_gen_multirate_manifest(ctx.multirate_manifest, ctx.bootstrap, ctx.bootstrap_size);
+	if (e) {
+		fprintf(stderr, "Couldn't generate Adobe f4m manifest: %s\n", gf_error_to_string(e));
+		assert(0);
+		goto exit;
+	}
+
+exit:
+	//delete intermediate mp4 file
+	if (isom_file_in)
+		gf_isom_delete(isom_file_in);
+
+	if (ctx.multirate_manifest)
+		adobe_free_multirate_manifest(ctx.multirate_manifest);
+
+	if (ctx.bootstrap) {
+		gf_free(ctx.bootstrap);
+		//ctx.bootstrap = NULL;
+		//ctx.bootstrap_size = 0;
+	}
+
+	gf_sys_close();
+	
+	return !e ? 0 : 1;
+}
+

gpac-0.5.0.svn4296.tar.bz2/applications/ts2hds/ts2hds.h Added

@@ -0,0 +1,48 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Author: Romain Bouqueau
+ *			Copyright (c) Romain Bouqueau 2012-
+ *				All rights reserved
+ *
+ *          Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
+ *
+ *  This file is part of GPAC / TS to HDS (ts2hds) application
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <gpac/media_tools.h>
+
+//f4m
+typedef struct __tag_adobe_stream AdobeStream;
+typedef struct __tag_adobe_multirate AdobeMultirate;
+AdobeMultirate *adobe_alloc_multirate_manifest(char *id);
+void adobe_free_multirate_manifest(AdobeMultirate *am);
+GF_Err adobe_gen_multirate_manifest(AdobeMultirate* am, char *bootstrap, size_t bootstrap_size);
+
+//context
+typedef struct
+{
+	u64 curr_time;
+	u32 segnum;
+	char *bootstrap;
+	size_t bootstrap_size;
+	AdobeMultirate *multirate_manifest;
+} AdobeHDSCtx;
+
+//f4v
+GF_Err adobize_segment(GF_ISOFile *isom_file, AdobeHDSCtx *ctx);

gpac-0.5.0.svn4192.tar.bz2/bin/smartphone 2003 (armv4)/release/install/gpac.inf -> gpac-0.5.0.svn4296.tar.bz2/bin/smartphone 2003 (armv4)/release/install/gpac.inf Changed

gpac-0.5.0.svn4192.tar.bz2/build/android/jni/libgpac/Android.mk -> gpac-0.5.0.svn4296.tar.bz2/build/android/jni/libgpac/Android.mk Changed

gpac-0.5.0.svn4192.tar.bz2/build/android/res/drawable-hdpi/icon.png -> gpac-0.5.0.svn4296.tar.bz2/build/android/res/drawable-hdpi/icon.png Changed

gpac-0.5.0.svn4192.tar.bz2/build/android/res/drawable-ldpi/icon.png -> gpac-0.5.0.svn4296.tar.bz2/build/android/res/drawable-ldpi/icon.png Changed

gpac-0.5.0.svn4192.tar.bz2/build/android/res/drawable-mdpi/icon.png -> gpac-0.5.0.svn4296.tar.bz2/build/android/res/drawable-mdpi/icon.png Changed

gpac-0.5.0.svn4192.tar.bz2/build/msvc10/GPAX.vcxproj -> gpac-0.5.0.svn4296.tar.bz2/build/msvc10/GPAX.vcxproj Changed

gpac-0.5.0.svn4192.tar.bz2/build/msvc10/Osmo4.vcxproj -> gpac-0.5.0.svn4296.tar.bz2/build/msvc10/Osmo4.vcxproj Changed

gpac-0.5.0.svn4192.tar.bz2/build/msvc10/libgpac.vcxproj -> gpac-0.5.0.svn4296.tar.bz2/build/msvc10/libgpac.vcxproj Changed

@@ -319,6 +319,12 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <ClCompile Include="..\..\src\isomedia\box_code_adobe.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
     <ClCompile Include="..\..\src\isomedia\box_code_apple.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

gpac-0.5.0.svn4192.tar.bz2/build/msvc10/mp4client.vcxproj -> gpac-0.5.0.svn4296.tar.bz2/build/msvc10/mp4client.vcxproj Changed

gpac-0.5.0.svn4192.tar.bz2/build/msvc10/osmophone.vcxproj -> gpac-0.5.0.svn4296.tar.bz2/build/msvc10/osmophone.vcxproj Changed

gpac-0.5.0.svn4192.tar.bz2/build/msvc8/libgpac.vcproj -> gpac-0.5.0.svn4296.tar.bz2/build/msvc8/libgpac.vcproj Changed

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

gpac-0.5.0.svn4192.tar.bz2/build/msvc9/ffmpeg_in.vcproj -> gpac-0.5.0.svn4296.tar.bz2/build/msvc9/ffmpeg_in.vcproj Changed

@@ -51,7 +51,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include,../../include/win32"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -78,7 +78,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="avformat-52.lib avcodec-52.lib avutil-50.lib swscale-0.lib"
 				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -117,7 +116,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|Smartphone 2003 (ARMV4)"
 			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="2"
@@ -139,36 +138,35 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ffmpeg_in_rel/ffmpeg_in.tlb"
+				TypeLibraryName=".\obj/ffmpeg_in_deb/ffmpeg_in.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include/,../../include/wince"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;EMULATE_INTTYPES"
+				MinimalRebuild="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DisableSpecificWarnings="4090"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1036"
 			/>
 			<Tool
@@ -176,44 +174,51 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="avformat-52.lib avcodec-52.lib avutil-50.lib swscale-0.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
+				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib avformat-52.lib avcodec-52.lib avutil-50.lib swscale-0.lib"
+				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
+				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
 				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)/gm_ffmpeg_in.pdb"
+				SubSystem="9"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
+				SupportUnloadOfDelayLoadedDLL="false"
 				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
+				TargetMachine="3"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCCodeSignTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
+				RegisterOutput="0"
+				AdditionalFiles="avcodec-52.dll|C:\code_cyril\gpac\bin\smartphone 2003 (armv4)\release|%CSIDL_PROGRAM_FILES%\gpac|0;avformat-52.dll|C:\code_cyril\gpac\bin\smartphone 2003 (armv4)\release|%CSIDL_PROGRAM_FILES%\gpac|0;avutil-49.dll|C:\code_cyril\gpac\bin\smartphone 2003 (armv4)\release|%CSIDL_PROGRAM_FILES%\gpac|0"
+			/>
+			<DebuggerTool
+			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
+			Name="Release|Win32"
 			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="2"
@@ -235,35 +240,36 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\obj/ffmpeg_in_deb/ffmpeg_in.tlb"
+				TypeLibraryName=".\obj/ffmpeg_in_rel/ffmpeg_in.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/,../../include/wince"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;EMULATE_INTTYPES"
-				MinimalRebuild="true"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include/,../../include/win32"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
+				StringPooling="true"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
+				DisableSpecificWarnings="4090"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1036"
 			/>
 			<Tool
@@ -271,48 +277,40 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="coredll.lib corelibc.lib commctrl.lib secchk.lib ccrtrtti.lib avformat-52.lib avcodec-52.lib avutil-50.lib swscale-0.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
+				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
 				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_ffmpeg_in.pdb"
-				SubSystem="9"
+				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				SupportUnloadOfDelayLoadedDLL="false"
 				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
+				OutputFile="$(IntDir)\$(ProjectName).bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCCodeSignTool"
+				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles="avcodec-52.dll|C:\code_cyril\gpac\bin\smartphone 2003 (armv4)\release|%CSIDL_PROGRAM_FILES%\gpac|0;avformat-52.dll|C:\code_cyril\gpac\bin\smartphone 2003 (armv4)\release|%CSIDL_PROGRAM_FILES%\gpac|0;avutil-49.dll|C:\code_cyril\gpac\bin\smartphone 2003 (armv4)\release|%CSIDL_PROGRAM_FILES%\gpac|0"
-			/>
-			<DebuggerTool
-			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Smartphone 2003 (ARMV4)"
@@ -433,7 +431,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32"
+				Name="Debug|Smartphone 2003 (ARMV4)"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -442,7 +440,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
+				Name="Release|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -473,7 +471,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32"
+				Name="Debug|Smartphone 2003 (ARMV4)"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -482,7 +480,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
+				Name="Release|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -517,7 +515,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32"
+				Name="Debug|Smartphone 2003 (ARMV4)"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -526,7 +524,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
+				Name="Release|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"

gpac-0.5.0.svn4192.tar.bz2/build/msvc9/gpac.sln -> gpac-0.5.0.svn4296.tar.bz2/build/msvc9/gpac.sln Changed

@@ -348,7 +348,6 @@
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.Build.0 = Debug|Win32
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
@@ -356,7 +355,6 @@
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.ActiveCfg = Release|Win32
 		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.Build.0 = Release|Win32
 		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)

gpac-0.5.0.svn4192.tar.bz2/build/msvc9/libgpac.vcproj -> gpac-0.5.0.svn4296.tar.bz2/build/msvc9/libgpac.vcproj Changed

gpac-0.5.0.svn4192.tar.bz2/build/msvc9/redirect_av.vcproj -> gpac-0.5.0.svn4296.tar.bz2/build/msvc9/redirect_av.vcproj Changed

@@ -51,7 +51,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include,../../include/win32"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -79,7 +79,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="avformat-52.lib avcodec-52.lib avutil-50.lib swscale-0.lib"
 				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -118,7 +117,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|Smartphone 2003 (ARMV4)"
 			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="2"
@@ -140,37 +139,35 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_rel/redirect_av.tlb"
+				TypeLibraryName=".\obj/dymmy_in_deb/redirect_av.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
 				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DisableSpecificWarnings="4090"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1036"
 			/>
 			<Tool
@@ -178,44 +175,47 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="avformat-52.lib avcodec-52.lib avutil-50.lib swscale-0.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
+				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
+				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				ModuleDefinitionFile="..\..\modules\redirect_av\redirect_av.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)/gm_redirect_av.pdb"
+				SubSystem="9"
 				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
+				TargetMachine="3"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
+				OutputFile="$(OutDir)/$(ProjectName).bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCCodeSignTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
+			Name="Release|Win32"
 			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="2"
@@ -237,35 +237,37 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\obj/dymmy_in_deb/redirect_av.tlb"
+				TypeLibraryName=".\obj/dymmy_in_rel/redirect_av.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include,../../include/win32"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="false"
+				DisableSpecificWarnings="4090"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1036"
 			/>
 			<Tool
@@ -273,40 +275,39 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
+				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				ModuleDefinitionFile="..\..\modules\redirect_av\redirect_av.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_redirect_av.pdb"
-				SubSystem="9"
+				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
+				ModuleDefinitionFile=""
+				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile="$(OutDir)/$(ProjectName).bsc"
+				OutputFile="$(IntDir)\$(ProjectName).bsc"
 			/>
 			<Tool
-				Name="VCCodeSignTool"
+				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
+				Name="VCAppVerifierTool"
 			/>
-			<DebuggerTool
+			<Tool
+				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
@@ -390,6 +391,9 @@
 				OutputFile="$(IntDir)\$(ProjectName).bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -425,7 +429,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32"
+				Name="Debug|Smartphone 2003 (ARMV4)"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -434,7 +438,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
+				Name="Release|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"

gpac-0.5.0.svn4296.tar.bz2/build/msvc9/ts2hds.vcproj Added

@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="ts2hds"
+	ProjectGUID="{4EEE620A-776D-4D48-AF1B-636B3F255E4C}"
+	RootNamespace="ts2hds"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include"
+				AdditionalUsingDirectories=""
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="zlib.lib libeay32.lib ssleay32.lib"
+				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/ts2hds.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="zlib.lib libeay32.lib ssleay32.lib"
+				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/ts2hds.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)\$(ConfigurationName)"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\applications\ts2hds\f4m.c"
+			>
+		</File>
+		<File
+			RelativePath="..\..\applications\ts2hds\f4v.c"
+			>
+		</File>
+		<File
+			RelativePath="..\..\applications\ts2hds\main.c"
+			>
+		</File>
+		<File
+			RelativePath="..\..\applications\ts2hds\ts2hds.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

gpac-0.5.0.svn4192.tar.bz2/build/xcode/gpac4ios.xcodeproj/project.pbxproj -> gpac-0.5.0.svn4296.tar.bz2/build/xcode/gpac4ios.xcodeproj/project.pbxproj Changed

@@ -497,6 +497,7 @@
 		970A28621344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
 		970A28631344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
 		970A28641344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
+		97116F211646E38D00BD1AD0 /* box_code_adobe.c in Sources */ = {isa = PBXBuildFile; fileRef = 97116F201646E38D00BD1AD0 /* box_code_adobe.c */; };
 		973B2E3115BAAE3D00394854 /* generic_subtitle.c in Sources */ = {isa = PBXBuildFile; fileRef = 973B2E3015BAAE3D00394854 /* generic_subtitle.c */; };
 		9747B6EF14864C6400280D95 /* ait.h in Headers */ = {isa = PBXBuildFile; fileRef = 9747B6EC14864C6400280D95 /* ait.h */; };
 		9747B6F014864C6400280D95 /* dsmcc.h in Headers */ = {isa = PBXBuildFile; fileRef = 9747B6ED14864C6400280D95 /* dsmcc.h */; };
@@ -979,6 +980,7 @@
 		970A270D1343540C0007362C /* libgcc_s.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgcc_s.1.dylib; path = usr/lib/libgcc_s.1.dylib; sourceTree = SDKROOT; };
 		970A283F134462AE0007362C /* libgpac_dynamic.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgpac_dynamic.dylib; path = "build/Release-iphonesimulator/libgpac_dynamic.dylib"; sourceTree = SOURCE_ROOT; };
 		970A28521344632F0007362C /* libgpac_dynamic.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgpac_dynamic.dylib; path = ../../bin/iOS/osmo4ios.app/libgpac_dynamic.dylib; sourceTree = SOURCE_ROOT; };
+		97116F201646E38D00BD1AD0 /* box_code_adobe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_code_adobe.c; sourceTree = "<group>"; };
 		973B2E3015BAAE3D00394854 /* generic_subtitle.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = generic_subtitle.c; sourceTree = "<group>"; };
 		9747B6EC14864C6400280D95 /* ait.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ait.h; sourceTree = "<group>"; };
 		9747B6ED14864C6400280D95 /* dsmcc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dsmcc.h; sourceTree = "<group>"; };
@@ -1684,6 +1686,7 @@
 		71CCF19F1277045100339E12 /* isomedia */ = {
 			isa = PBXGroup;
 			children = (
+				97116F201646E38D00BD1AD0 /* box_code_adobe.c */,
 				973B2E3015BAAE3D00394854 /* generic_subtitle.c */,
 				71CCF1A01277045100339E12 /* avc_ext.c */,
 				71CCF1A11277045100339E12 /* box_code_3gpp.c */,
@@ -3208,6 +3211,7 @@
 				97793E5115E6370D005123E1 /* dash_client.c in Sources */,
 				97E08C69160F684B00BBDC34 /* swf_svg.c in Sources */,
 				97DB67C51627B22F00A7E054 /* dash_segmenter.c in Sources */,
+				97116F211646E38D00BD1AD0 /* box_code_adobe.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

gpac-0.5.0.svn4192.tar.bz2/configure -> gpac-0.5.0.svn4296.tar.bz2/configure Changed

@@ -18,13 +18,7 @@
 
 
 #remember the ./configure command line
-for v in "$@"; do
-    r="${v#*=}"
-    l="${v%$r}"
-    test "$r" = "${r#* }" || r="'$r'"
-    GPAC_CONFIGURATION="${GPAC_CONFIGURATION# } ${l}${r}"
-done
-
+GPAC_CONFIGURATION="$@"
 
 TMPC="${TMPDIR1}/gpac-conf-${RANDOM}-$$-${RANDOM}.c"
 TMPH="${TMPDIR1}/gpac-conf-${RANDOM}-$$-${RANDOM}.h"
@@ -150,6 +144,7 @@
 disable_isoff_frag="no"
 disable_isoff_hint="no"
 disable_isoff_frag="no"
+disable_isoff_hds="no"
 disable_streaming="no"
 disable_player="no"
 disable_scenegraph="no"
@@ -283,6 +278,7 @@
   --disable-isoff-write    disable ISO File Format edit/write
   --disable-isoff-hint     disable ISO File Format hinting
   --disable-isoff-frag     disable fragments in ISO File Format
+  --disable-isoff-hds      disable HDS support in ISO File Format
   --disable-streaming      disable RTP/RTSP/SDP
   --disable-dvbx           disable DVB-specific tools (MPE, FEC, DSM-CC)
   --disable-vobsub         disable VobSub support
@@ -294,7 +290,7 @@
 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]
   --use-ft=OPT             force FreeType OPT=[no,local]
-  --use-zlib=OPT           force ZLIB OPT=[no,local]
+  --use-zlib=OPT           force ZLIB OPT=[no,system,local]
   --use-jpeg=OPT           force JPEG OPT=[no,local]
   --use-png=OPT            force PNG OPT=[no,local]
   --use-faad=OPT           force FAAD OPT=[no,local]
@@ -653,7 +649,7 @@
       has_zlib="system"
   fi
 fi
-if test "$has_zlib" = "no" ; then
+if test "$has_zlib" = "force-no" ; then
   if $cc -o $TMPO $TMPC -I"$local_inc/zlib" -L$local_lib -lz 2> /dev/null  ; then
     has_zlib="local"
   fi
@@ -674,7 +670,8 @@
 
 
 #look for spidermonkey JS support
-has_mozjs_pkgcfg="no"
+mozjs_pkgcfg="no"
+
 
 #spidermonkey test for new API
 if test "$has_js" = "no" ; then
@@ -693,12 +690,19 @@
     else
         #try pkg-config
         if $pkg_config --exists mozilla-js 2> /dev/null  ; then
-            has_mozjs_pkgcfg="yes"
-            js_flags=`$pkg_config --cflags mozilla-js`
-            js_lib_pkg=`$pkg_config --libs mozilla-js`
+            mozjs_pkgcfg="mozilla-js"
+        elif $pkg_config --exists mozjs 2> /dev/null  ; then
+            mozjs_pkgcfg="mozjs"
+        elif $pkg_config --exists mozjs185 2> /dev/null  ; then
+            mozjs_pkgcfg="mozjs185"
+	fi
+
+        if test $mozjs_pkgcfg != "no" ; then
+            js_flags=`$pkg_config --cflags $mozjs_pkgcfg`
+            js_lib_pkg=`$pkg_config --libs $mozjs_pkgcfg`
             if $cc -o $TMPO $TMPC $js_flags $js_lib_pkg $LDFLAGS -lpthread 2> /dev/null  ; then
                 has_js="system"
-                js_lib=`$pkg_config --libs mozilla-js`
+                js_lib=`$pkg_config --libs $mozjs_pkgcfg`
             fi
         #try firefox folders (starting at ubuntu 11.10, no pkg-config)
         elif ls -d /usr/lib/firefox* > /dev/null 2>&1 ; then
@@ -789,12 +793,19 @@
             #dc added end
         else
             if $pkg_config --exists mozilla-js 2> /dev/null  ; then
-		has_mozjs_pkgcfg="yes"
-                js_flags=`$pkg_config --cflags mozilla-js`
-                js_lib_pkg=`$pkg_config --libs mozilla-js`
+		mozjs_pkgcfg="mozilla-js"
+            elif $pkg_config --exists mozjs 2> /dev/null  ; then
+		mozjs_pkgcfg="mozjs"
+            elif $pkg_config --exists mozjs185 2> /dev/null  ; then
+		mozjs_pkgcfg="mozjs185"
+	    fi
+
+	    if test mozjs_pkgcfg != "no" ; then
+                js_flags=`$pkg_config --cflags $mozjs_pkgcfg`
+                js_lib_pkg=`$pkg_config --libs $mozjs_pkgcfg`
                 if $cc -o $TMPO $TMPC $js_flags $js_lib_pkg $LDFLAGS -lpthread 2> /dev/null  ; then
                     has_js="system"
-                    js_lib=`$pkg_config --libs mozilla-js`
+                    js_lib=`$pkg_config --libs $mozjs_pkgcfg`
                 fi
             fi
             if test "$has_js" = "no" ; then
@@ -854,6 +865,10 @@
 EOF
 	                if $cc -o $TMPO $TMPC $js_flags $LDFLAGS $js_lib 2> /dev/null  ; then
 	                    js_flags="-DUSE_FFDEV_12 $js_flags"
+	                elif grep JSMutableHandleValue $js_inc/jsapi.h | grep JSHasInstanceOp > /dev/null 2>&1 ; then
+	                    	js_flags="-DUSE_FFDEV_18 $js_flags"
+	                elif grep JSMutableHandleValue $js_inc/jsapi.h > /dev/null 2>&1 ; then
+	                    	js_flags="-DUSE_FFDEV_18 $js_flags"
 	                elif ! grep JS_ConstructObject $js_inc/jsapi.h > /dev/null 2>&1 ; then
 	                    	js_flags="-DUSE_FFDEV_16 $js_flags"
 	                elif grep JSHandleObject $js_inc/jsapi.h > /dev/null 2>&1 ; then
@@ -1698,8 +1713,13 @@
                         echo 
                     fi
                 fi
+				has_zlib=$tmp_has_zlib
+			elif test "$tmp_has_zlib" = "no" ; then
+				echo 
+				echo "WARNING!! : you have forced not to use ZLIB. This will disable some core functionalities of GPAC."
+				echo 
+				has_zlib="force-no"
             fi
-            has_png=$tmp_has_png
             ;;
         --use-ogg=*) has_ogg=${opt#--use-ogg=}
             ;;
@@ -1714,7 +1734,7 @@
         --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_saf="yes"; disable_smgr="yes"; disable_mpd="yes"; disable_dash="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_saf="yes"; disable_smgr="yes"; disable_mpd="yes"; disable_dash="yes"; disable_isoff_hds = "yes"
             ;;
 
         --disable-3d) disable_3d="yes"
@@ -1851,6 +1871,10 @@
             ;;
         --enable-isoff-frag) disable_isoff_frag="no"
             ;;
+        --disable-isoff-hds) disable_isoff_hds="yes"
+            ;;
+        --enable-isoff-hds) disable_isoff_hds="no"
+            ;;
         --disable-streaming) disable_streaming="yes"
             ;;
         --enable-streaming) disable_streaming="no"
@@ -2005,8 +2029,8 @@
         #xulrunner directories are sometimes included through js/xul/ff packages
         if test ! "$has_js" = "no" -a ! "$has_js" = "local" ; then
             if $cc -o $TMPO $TMPCPP $js_flags $js_lib_pkg $LDFLAGS 2> /dev/null  ; then
-                if test "$has_mozjs_pkgcfg" = "yes" ; then
-                    xul_flags=`$pkg_config --cflags mozilla-js`
+                if test "$mozjs_pkgcfg" != "no" ; then
+                    xul_flags=`$pkg_config --cflags $mozjs_pkgcfg`
                     has_xul="$has_js"
                 fi
             fi
@@ -2390,6 +2414,11 @@
     echo "ISO File Format fragments disabled"
     echo "#define GPAC_DISABLE_ISOM_FRAGMENTS" >> $TMPH
 fi
+if test "$disable_isoff_hds" = "yes" ; then
+    echo "ISO File Format Adobe HDS disabled"
+    echo "#define GPAC_DISABLE_ISOM_ADOBE" >> $TMPH
+fi
+
 if test "$disable_streaming" = "yes" ; then
     echo "RTP/RTSP/SDP streaming disabled"
     echo "#define GPAC_DISABLE_STREAMING" >> $TMPH
@@ -2677,6 +2706,9 @@
     echo "#define GPAC_HAS_SPIDERMONKEY" >> $TMPH
 fi
 echo "CONFIG_ZLIB=$has_zlib" >> config.mak
+if test "$has_zlib" = "no" ; then
+    echo "#define GPAC_DISABLE_ZLIB" >> $TMPH
+fi
 echo "CONFIG_FT=$has_ft" >> config.mak
 
 echo "CONFIG_JPEG=$has_jpeg" >> config.mak
@@ -2750,6 +2782,7 @@
 echo "DISABLE_OD_DUMP=$disable_od_dump" >> config.mak
 echo "DISABLE_OD_PARSE=$disable_od_parse" >> config.mak
 echo "MINIMAL_OD=$disable_od" >> config.mak
+echo "DISABLE_ISOM_ADOBE=$disable_isoff_hds" >> config.mak
 
 if test "$disable_parsers" = "yes" ; then
     disable_m2ts_mux="yes"

gpac-0.5.0.svn4192.tar.bz2/doc/configuration.html -> gpac-0.5.0.svn4296.tar.bz2/doc/configuration.html Changed

gpac-0.5.0.svn4192.tar.bz2/extra_lib/include/libavcodec/avcodec.h -> gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavcodec/avcodec.h Changed

@@ -22,33 +22,64 @@
 #define AVCODEC_AVCODEC_H
 
 /**
- * @file libavcodec/avcodec.h
+ * @file
  * external API header
  */
 
 #include <errno.h>
+#include "libavutil/samplefmt.h"
 #include "libavutil/avutil.h"
+#include "libavutil/cpu.h"
+#include "libavutil/dict.h"
+#include "libavutil/log.h"
+#include "libavutil/pixfmt.h"
+#include "libavutil/rational.h"
+#include "libavutil/audioconvert.h"
 
-#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 29
-#define LIBAVCODEC_VERSION_MICRO  0
-
-#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
-                                               LIBAVCODEC_VERSION_MINOR, \
-                                               LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_VERSION      AV_VERSION(LIBAVCODEC_VERSION_MAJOR,    \
-                                           LIBAVCODEC_VERSION_MINOR,    \
-                                           LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
-
-#define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-
-#define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
-#define AV_TIME_BASE            1000000
-#define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
+#include "libavcodec/version.h"
+/**
+ * @defgroup libavc Encoding/Decoding Library
+ * @{
+ *
+ * @defgroup lavc_decoding Decoding
+ * @{
+ * @}
+ *
+ * @defgroup lavc_encoding Encoding
+ * @{
+ * @}
+ *
+ * @defgroup lavc_codec Codecs
+ * @{
+ * @defgroup lavc_codec_native Native Codecs
+ * @{
+ * @}
+ * @defgroup lavc_codec_wrappers External library wrappers
+ * @{
+ * @}
+ * @defgroup lavc_codec_hwaccel Hardware Accelerators bridge
+ * @{
+ * @}
+ * @}
+ * @defgroup lavc_internal Internal
+ * @{
+ * @}
+ * @}
+ *
+ */
 
 /**
- * Identifies the syntax and semantics of the bitstream.
+ * @defgroup lavc_core Core functions/structures.
+ * @ingroup libavc
+ *
+ * Basic definitions, functions for querying libavcodec capabilities,
+ * allocating core structures, etc.
+ * @{
+ */
+
+
+/**
+ * Identify the syntax and semantics of the bitstream.
  * The principle is roughly:
  * Two decoders with the same ID can decode the same streams.
  * Two encoders with the same ID can encode compatible streams.
@@ -57,359 +88,454 @@
  *
  * If you add a codec ID to this list, add it so that
  * 1. no value of a existing codec ID changes (that would break ABI),
- * 2. it is as close as possible to similar codecs.
+ * 2. Give it a value which when taken as ASCII is recognized uniquely by a human as this specific codec.
+ *    This ensures that 2 forks can independently add AVCodecIDs without producing conflicts.
+ *
+ * After adding new codec IDs, do not forget to add an entry to the codec
+ * descriptor list and bump libavcodec minor version.
  */
-enum CodecID {
-    CODEC_ID_NONE,
+enum AVCodecID {
+    AV_CODEC_ID_NONE,
 
     /* video codecs */
-    CODEC_ID_MPEG1VIDEO,
-    CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-    CODEC_ID_MPEG2VIDEO_XVMC,
-    CODEC_ID_H261,
-    CODEC_ID_H263,
-    CODEC_ID_RV10,
-    CODEC_ID_RV20,
-    CODEC_ID_MJPEG,
-    CODEC_ID_MJPEGB,
-    CODEC_ID_LJPEG,
-    CODEC_ID_SP5X,
-    CODEC_ID_JPEGLS,
-    CODEC_ID_MPEG4,
-    CODEC_ID_RAWVIDEO,
-    CODEC_ID_MSMPEG4V1,
-    CODEC_ID_MSMPEG4V2,
-    CODEC_ID_MSMPEG4V3,
-    CODEC_ID_WMV1,
-    CODEC_ID_WMV2,
-    CODEC_ID_H263P,
-    CODEC_ID_H263I,
-    CODEC_ID_FLV1,
-    CODEC_ID_SVQ1,
-    CODEC_ID_SVQ3,
-    CODEC_ID_DVVIDEO,
-    CODEC_ID_HUFFYUV,
-    CODEC_ID_CYUV,
-    CODEC_ID_H264,
-    CODEC_ID_INDEO3,
-    CODEC_ID_VP3,
-    CODEC_ID_THEORA,
-    CODEC_ID_ASV1,
-    CODEC_ID_ASV2,
-    CODEC_ID_FFV1,
-    CODEC_ID_4XM,
-    CODEC_ID_VCR1,
-    CODEC_ID_CLJR,
-    CODEC_ID_MDEC,
-    CODEC_ID_ROQ,
-    CODEC_ID_INTERPLAY_VIDEO,
-    CODEC_ID_XAN_WC3,
-    CODEC_ID_XAN_WC4,
-    CODEC_ID_RPZA,
-    CODEC_ID_CINEPAK,
-    CODEC_ID_WS_VQA,
-    CODEC_ID_MSRLE,
-    CODEC_ID_MSVIDEO1,
-    CODEC_ID_IDCIN,
-    CODEC_ID_8BPS,
-    CODEC_ID_SMC,
-    CODEC_ID_FLIC,
-    CODEC_ID_TRUEMOTION1,
-    CODEC_ID_VMDVIDEO,
-    CODEC_ID_MSZH,
-    CODEC_ID_ZLIB,
-    CODEC_ID_QTRLE,
-    CODEC_ID_SNOW,
-    CODEC_ID_TSCC,
-    CODEC_ID_ULTI,
-    CODEC_ID_QDRAW,
-    CODEC_ID_VIXL,
-    CODEC_ID_QPEG,
-    CODEC_ID_XVID,
-    CODEC_ID_PNG,
-    CODEC_ID_PPM,
-    CODEC_ID_PBM,
-    CODEC_ID_PGM,
-    CODEC_ID_PGMYUV,
-    CODEC_ID_PAM,
-    CODEC_ID_FFVHUFF,
-    CODEC_ID_RV30,
-    CODEC_ID_RV40,
-    CODEC_ID_VC1,
-    CODEC_ID_WMV3,
-    CODEC_ID_LOCO,
-    CODEC_ID_WNV1,
-    CODEC_ID_AASC,
-    CODEC_ID_INDEO2,
-    CODEC_ID_FRAPS,
-    CODEC_ID_TRUEMOTION2,
-    CODEC_ID_BMP,
-    CODEC_ID_CSCD,
-    CODEC_ID_MMVIDEO,
-    CODEC_ID_ZMBV,
-    CODEC_ID_AVS,
-    CODEC_ID_SMACKVIDEO,
-    CODEC_ID_NUV,
-    CODEC_ID_KMVC,
-    CODEC_ID_FLASHSV,
-    CODEC_ID_CAVS,
-    CODEC_ID_JPEG2000,
-    CODEC_ID_VMNC,
-    CODEC_ID_VP5,
-    CODEC_ID_VP6,
-    CODEC_ID_VP6F,
-    CODEC_ID_TARGA,
-    CODEC_ID_DSICINVIDEO,
-    CODEC_ID_TIERTEXSEQVIDEO,
-    CODEC_ID_TIFF,
-    CODEC_ID_GIF,
-    CODEC_ID_FFH264,
-    CODEC_ID_DXA,
-    CODEC_ID_DNXHD,
-    CODEC_ID_THP,
-    CODEC_ID_SGI,
-    CODEC_ID_C93,
-    CODEC_ID_BETHSOFTVID,
-    CODEC_ID_PTX,
-    CODEC_ID_TXD,
-    CODEC_ID_VP6A,
-    CODEC_ID_AMV,
-    CODEC_ID_VB,
-    CODEC_ID_PCX,
-    CODEC_ID_SUNRAST,
-    CODEC_ID_INDEO4,
-    CODEC_ID_INDEO5,
-    CODEC_ID_MIMIC,
-    CODEC_ID_RL2,
-    CODEC_ID_8SVX_EXP,
-    CODEC_ID_8SVX_FIB,
-    CODEC_ID_ESCAPE124,
-    CODEC_ID_DIRAC,
-    CODEC_ID_BFI,
-    CODEC_ID_CMV,
-    CODEC_ID_MOTIONPIXELS,
-    CODEC_ID_TGV,
-    CODEC_ID_TGQ,
-    CODEC_ID_TQI,
-    CODEC_ID_AURA,
-    CODEC_ID_AURA2,
-    CODEC_ID_V210X,
-    CODEC_ID_TMV,
-    CODEC_ID_V210,
+    AV_CODEC_ID_MPEG1VIDEO,
+    AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
+    AV_CODEC_ID_MPEG2VIDEO_XVMC,
+    AV_CODEC_ID_H261,
+    AV_CODEC_ID_H263,
+    AV_CODEC_ID_RV10,
+    AV_CODEC_ID_RV20,
+    AV_CODEC_ID_MJPEG,
+    AV_CODEC_ID_MJPEGB,
+    AV_CODEC_ID_LJPEG,
+    AV_CODEC_ID_SP5X,
+    AV_CODEC_ID_JPEGLS,
+    AV_CODEC_ID_MPEG4,
+    AV_CODEC_ID_RAWVIDEO,
+    AV_CODEC_ID_MSMPEG4V1,
+    AV_CODEC_ID_MSMPEG4V2,
+    AV_CODEC_ID_MSMPEG4V3,
+    AV_CODEC_ID_WMV1,
+    AV_CODEC_ID_WMV2,
+    AV_CODEC_ID_H263P,
+    AV_CODEC_ID_H263I,
+    AV_CODEC_ID_FLV1,
+    AV_CODEC_ID_SVQ1,
+    AV_CODEC_ID_SVQ3,
+    AV_CODEC_ID_DVVIDEO,
+    AV_CODEC_ID_HUFFYUV,
+    AV_CODEC_ID_CYUV,
+    AV_CODEC_ID_H264,
+    AV_CODEC_ID_INDEO3,
+    AV_CODEC_ID_VP3,
+    AV_CODEC_ID_THEORA,
+    AV_CODEC_ID_ASV1,
+    AV_CODEC_ID_ASV2,
+    AV_CODEC_ID_FFV1,
+    AV_CODEC_ID_4XM,
+    AV_CODEC_ID_VCR1,
+    AV_CODEC_ID_CLJR,
+    AV_CODEC_ID_MDEC,
+    AV_CODEC_ID_ROQ,
+    AV_CODEC_ID_INTERPLAY_VIDEO,
+    AV_CODEC_ID_XAN_WC3,
+    AV_CODEC_ID_XAN_WC4,
+    AV_CODEC_ID_RPZA,
+    AV_CODEC_ID_CINEPAK,
+    AV_CODEC_ID_WS_VQA,
+    AV_CODEC_ID_MSRLE,
+    AV_CODEC_ID_MSVIDEO1,
+    AV_CODEC_ID_IDCIN,
+    AV_CODEC_ID_8BPS,
+    AV_CODEC_ID_SMC,
+    AV_CODEC_ID_FLIC,
+    AV_CODEC_ID_TRUEMOTION1,
+    AV_CODEC_ID_VMDVIDEO,
+    AV_CODEC_ID_MSZH,
+    AV_CODEC_ID_ZLIB,
+    AV_CODEC_ID_QTRLE,
+    AV_CODEC_ID_SNOW,
+    AV_CODEC_ID_TSCC,
+    AV_CODEC_ID_ULTI,
+    AV_CODEC_ID_QDRAW,
+    AV_CODEC_ID_VIXL,
+    AV_CODEC_ID_QPEG,
+    AV_CODEC_ID_PNG,
+    AV_CODEC_ID_PPM,
+    AV_CODEC_ID_PBM,
+    AV_CODEC_ID_PGM,
+    AV_CODEC_ID_PGMYUV,
+    AV_CODEC_ID_PAM,
+    AV_CODEC_ID_FFVHUFF,
+    AV_CODEC_ID_RV30,
+    AV_CODEC_ID_RV40,
+    AV_CODEC_ID_VC1,
+    AV_CODEC_ID_WMV3,
+    AV_CODEC_ID_LOCO,
+    AV_CODEC_ID_WNV1,
+    AV_CODEC_ID_AASC,
+    AV_CODEC_ID_INDEO2,
+    AV_CODEC_ID_FRAPS,
+    AV_CODEC_ID_TRUEMOTION2,
+    AV_CODEC_ID_BMP,
+    AV_CODEC_ID_CSCD,
+    AV_CODEC_ID_MMVIDEO,
+    AV_CODEC_ID_ZMBV,
+    AV_CODEC_ID_AVS,
+    AV_CODEC_ID_SMACKVIDEO,
+    AV_CODEC_ID_NUV,
+    AV_CODEC_ID_KMVC,
+    AV_CODEC_ID_FLASHSV,
+    AV_CODEC_ID_CAVS,
+    AV_CODEC_ID_JPEG2000,
+    AV_CODEC_ID_VMNC,
+    AV_CODEC_ID_VP5,
+    AV_CODEC_ID_VP6,
+    AV_CODEC_ID_VP6F,
+    AV_CODEC_ID_TARGA,
+    AV_CODEC_ID_DSICINVIDEO,
+    AV_CODEC_ID_TIERTEXSEQVIDEO,
+    AV_CODEC_ID_TIFF,
+    AV_CODEC_ID_GIF,
+    AV_CODEC_ID_DXA,
+    AV_CODEC_ID_DNXHD,
+    AV_CODEC_ID_THP,
+    AV_CODEC_ID_SGI,
+    AV_CODEC_ID_C93,
+    AV_CODEC_ID_BETHSOFTVID,
+    AV_CODEC_ID_PTX,
+    AV_CODEC_ID_TXD,
+    AV_CODEC_ID_VP6A,
+    AV_CODEC_ID_AMV,
+    AV_CODEC_ID_VB,
+    AV_CODEC_ID_PCX,
+    AV_CODEC_ID_SUNRAST,
+    AV_CODEC_ID_INDEO4,
+    AV_CODEC_ID_INDEO5,
+    AV_CODEC_ID_MIMIC,
+    AV_CODEC_ID_RL2,
+    AV_CODEC_ID_ESCAPE124,
+    AV_CODEC_ID_DIRAC,
+    AV_CODEC_ID_BFI,
+    AV_CODEC_ID_CMV,
+    AV_CODEC_ID_MOTIONPIXELS,
+    AV_CODEC_ID_TGV,
+    AV_CODEC_ID_TGQ,
+    AV_CODEC_ID_TQI,
+    AV_CODEC_ID_AURA,
+    AV_CODEC_ID_AURA2,
+    AV_CODEC_ID_V210X,
+    AV_CODEC_ID_TMV,
+    AV_CODEC_ID_V210,
+    AV_CODEC_ID_DPX,
+    AV_CODEC_ID_MAD,
+    AV_CODEC_ID_FRWU,
+    AV_CODEC_ID_FLASHSV2,
+    AV_CODEC_ID_CDGRAPHICS,
+    AV_CODEC_ID_R210,
+    AV_CODEC_ID_ANM,
+    AV_CODEC_ID_BINKVIDEO,
+    AV_CODEC_ID_IFF_ILBM,
+    AV_CODEC_ID_IFF_BYTERUN1,
+    AV_CODEC_ID_KGV1,
+    AV_CODEC_ID_YOP,
+    AV_CODEC_ID_VP8,
+    AV_CODEC_ID_PICTOR,
+    AV_CODEC_ID_ANSI,
+    AV_CODEC_ID_A64_MULTI,
+    AV_CODEC_ID_A64_MULTI5,
+    AV_CODEC_ID_R10K,
+    AV_CODEC_ID_MXPEG,
+    AV_CODEC_ID_LAGARITH,
+    AV_CODEC_ID_PRORES,
+    AV_CODEC_ID_JV,
+    AV_CODEC_ID_DFA,
+    AV_CODEC_ID_WMV3IMAGE,
+    AV_CODEC_ID_VC1IMAGE,
+    AV_CODEC_ID_UTVIDEO,
+    AV_CODEC_ID_BMV_VIDEO,
+    AV_CODEC_ID_VBLE,
+    AV_CODEC_ID_DXTORY,
+    AV_CODEC_ID_V410,
+    AV_CODEC_ID_XWD,
+    AV_CODEC_ID_CDXL,
+    AV_CODEC_ID_XBM,
+    AV_CODEC_ID_ZEROCODEC,
+    AV_CODEC_ID_MSS1,
+    AV_CODEC_ID_MSA1,
+    AV_CODEC_ID_TSCC2,
+    AV_CODEC_ID_MTS2,
+    AV_CODEC_ID_CLLC,
+    AV_CODEC_ID_MSS2,
+    AV_CODEC_ID_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_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'),
 
     /* various PCM "codecs" */
-    CODEC_ID_PCM_S16LE= 0x10000,
-    CODEC_ID_PCM_S16BE,
-    CODEC_ID_PCM_U16LE,
-    CODEC_ID_PCM_U16BE,
-    CODEC_ID_PCM_S8,
-    CODEC_ID_PCM_U8,
-    CODEC_ID_PCM_MULAW,
-    CODEC_ID_PCM_ALAW,
-    CODEC_ID_PCM_S32LE,
-    CODEC_ID_PCM_S32BE,
-    CODEC_ID_PCM_U32LE,
-    CODEC_ID_PCM_U32BE,
-    CODEC_ID_PCM_S24LE,
-    CODEC_ID_PCM_S24BE,
-    CODEC_ID_PCM_U24LE,
-    CODEC_ID_PCM_U24BE,
-    CODEC_ID_PCM_S24DAUD,
-    CODEC_ID_PCM_ZORK,
-    CODEC_ID_PCM_S16LE_PLANAR,
-    CODEC_ID_PCM_DVD,
-    CODEC_ID_PCM_F32BE,
-    CODEC_ID_PCM_F32LE,
-    CODEC_ID_PCM_F64BE,
-    CODEC_ID_PCM_F64LE,
+    AV_CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
+    AV_CODEC_ID_PCM_S16LE = 0x10000,
+    AV_CODEC_ID_PCM_S16BE,
+    AV_CODEC_ID_PCM_U16LE,
+    AV_CODEC_ID_PCM_U16BE,
+    AV_CODEC_ID_PCM_S8,
+    AV_CODEC_ID_PCM_U8,
+    AV_CODEC_ID_PCM_MULAW,
+    AV_CODEC_ID_PCM_ALAW,
+    AV_CODEC_ID_PCM_S32LE,
+    AV_CODEC_ID_PCM_S32BE,
+    AV_CODEC_ID_PCM_U32LE,
+    AV_CODEC_ID_PCM_U32BE,
+    AV_CODEC_ID_PCM_S24LE,
+    AV_CODEC_ID_PCM_S24BE,
+    AV_CODEC_ID_PCM_U24LE,
+    AV_CODEC_ID_PCM_U24BE,
+    AV_CODEC_ID_PCM_S24DAUD,
+    AV_CODEC_ID_PCM_ZORK,
+    AV_CODEC_ID_PCM_S16LE_PLANAR,
+    AV_CODEC_ID_PCM_DVD,
+    AV_CODEC_ID_PCM_F32BE,
+    AV_CODEC_ID_PCM_F32LE,
+    AV_CODEC_ID_PCM_F64BE,
+    AV_CODEC_ID_PCM_F64LE,
+    AV_CODEC_ID_PCM_BLURAY,
+    AV_CODEC_ID_PCM_LXF,
+    AV_CODEC_ID_S302M,
+    AV_CODEC_ID_PCM_S8_PLANAR,
 
     /* various ADPCM codecs */
-    CODEC_ID_ADPCM_IMA_QT= 0x11000,
-    CODEC_ID_ADPCM_IMA_WAV,
-    CODEC_ID_ADPCM_IMA_DK3,
-    CODEC_ID_ADPCM_IMA_DK4,
-    CODEC_ID_ADPCM_IMA_WS,
-    CODEC_ID_ADPCM_IMA_SMJPEG,
-    CODEC_ID_ADPCM_MS,
-    CODEC_ID_ADPCM_4XM,
-    CODEC_ID_ADPCM_XA,
-    CODEC_ID_ADPCM_ADX,
-    CODEC_ID_ADPCM_EA,
-    CODEC_ID_ADPCM_G726,
-    CODEC_ID_ADPCM_CT,
-    CODEC_ID_ADPCM_SWF,
-    CODEC_ID_ADPCM_YAMAHA,
-    CODEC_ID_ADPCM_SBPRO_4,
-    CODEC_ID_ADPCM_SBPRO_3,
-    CODEC_ID_ADPCM_SBPRO_2,
-    CODEC_ID_ADPCM_THP,
-    CODEC_ID_ADPCM_IMA_AMV,
-    CODEC_ID_ADPCM_EA_R1,
-    CODEC_ID_ADPCM_EA_R3,
-    CODEC_ID_ADPCM_EA_R2,
-    CODEC_ID_ADPCM_IMA_EA_SEAD,
-    CODEC_ID_ADPCM_IMA_EA_EACS,
-    CODEC_ID_ADPCM_EA_XAS,
-    CODEC_ID_ADPCM_EA_MAXIS_XA,
-    CODEC_ID_ADPCM_IMA_ISS,
+    AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
+    AV_CODEC_ID_ADPCM_IMA_WAV,
+    AV_CODEC_ID_ADPCM_IMA_DK3,
+    AV_CODEC_ID_ADPCM_IMA_DK4,
+    AV_CODEC_ID_ADPCM_IMA_WS,
+    AV_CODEC_ID_ADPCM_IMA_SMJPEG,
+    AV_CODEC_ID_ADPCM_MS,
+    AV_CODEC_ID_ADPCM_4XM,
+    AV_CODEC_ID_ADPCM_XA,
+    AV_CODEC_ID_ADPCM_ADX,
+    AV_CODEC_ID_ADPCM_EA,
+    AV_CODEC_ID_ADPCM_G726,
+    AV_CODEC_ID_ADPCM_CT,
+    AV_CODEC_ID_ADPCM_SWF,
+    AV_CODEC_ID_ADPCM_YAMAHA,
+    AV_CODEC_ID_ADPCM_SBPRO_4,
+    AV_CODEC_ID_ADPCM_SBPRO_3,
+    AV_CODEC_ID_ADPCM_SBPRO_2,
+    AV_CODEC_ID_ADPCM_THP,
+    AV_CODEC_ID_ADPCM_IMA_AMV,
+    AV_CODEC_ID_ADPCM_EA_R1,
+    AV_CODEC_ID_ADPCM_EA_R3,
+    AV_CODEC_ID_ADPCM_EA_R2,
+    AV_CODEC_ID_ADPCM_IMA_EA_SEAD,
+    AV_CODEC_ID_ADPCM_IMA_EA_EACS,
+    AV_CODEC_ID_ADPCM_EA_XAS,
+    AV_CODEC_ID_ADPCM_EA_MAXIS_XA,
+    AV_CODEC_ID_ADPCM_IMA_ISS,
+    AV_CODEC_ID_ADPCM_G722,
+    AV_CODEC_ID_ADPCM_IMA_APC,
+    AV_CODEC_ID_VIMA       = MKBETAG('V','I','M','A'),
 
     /* AMR */
-    CODEC_ID_AMR_NB= 0x12000,
-    CODEC_ID_AMR_WB,
+    AV_CODEC_ID_AMR_NB = 0x12000,
+    AV_CODEC_ID_AMR_WB,
 
     /* RealAudio codecs*/
-    CODEC_ID_RA_144= 0x13000,
-    CODEC_ID_RA_288,
+    AV_CODEC_ID_RA_144 = 0x13000,
+    AV_CODEC_ID_RA_288,
 
     /* various DPCM codecs */
-    CODEC_ID_ROQ_DPCM= 0x14000,
-    CODEC_ID_INTERPLAY_DPCM,
-    CODEC_ID_XAN_DPCM,
-    CODEC_ID_SOL_DPCM,
+    AV_CODEC_ID_ROQ_DPCM = 0x14000,
+    AV_CODEC_ID_INTERPLAY_DPCM,
+    AV_CODEC_ID_XAN_DPCM,
+    AV_CODEC_ID_SOL_DPCM,
 
     /* audio codecs */
-    CODEC_ID_MP2= 0x15000,
-    CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
-    CODEC_ID_AAC,
-    CODEC_ID_AC3,
-    CODEC_ID_DTS,
-    CODEC_ID_VORBIS,
-    CODEC_ID_DVAUDIO,
-    CODEC_ID_WMAV1,
-    CODEC_ID_WMAV2,
-    CODEC_ID_MACE3,
-    CODEC_ID_MACE6,
-    CODEC_ID_VMDAUDIO,
-    CODEC_ID_SONIC,
-    CODEC_ID_SONIC_LS,
-    CODEC_ID_FLAC,
-    CODEC_ID_MP3ADU,
-    CODEC_ID_MP3ON4,
-    CODEC_ID_SHORTEN,
-    CODEC_ID_ALAC,
-    CODEC_ID_WESTWOOD_SND1,
-    CODEC_ID_GSM, ///< as in Berlin toast format
-    CODEC_ID_QDM2,
-    CODEC_ID_COOK,
-    CODEC_ID_TRUESPEECH,
-    CODEC_ID_TTA,
-    CODEC_ID_SMACKAUDIO,
-    CODEC_ID_QCELP,
-    CODEC_ID_WAVPACK,
-    CODEC_ID_DSICINAUDIO,
-    CODEC_ID_IMC,
-    CODEC_ID_MUSEPACK7,
-    CODEC_ID_MLP,
-    CODEC_ID_GSM_MS, /* as found in WAV */
-    CODEC_ID_ATRAC3,
-    CODEC_ID_VOXWARE,
-    CODEC_ID_APE,
-    CODEC_ID_NELLYMOSER,
-    CODEC_ID_MUSEPACK8,
-    CODEC_ID_SPEEX,
-    CODEC_ID_WMAVOICE,
-    CODEC_ID_WMAPRO,
-    CODEC_ID_WMALOSSLESS,
-    CODEC_ID_ATRAC3P,
-    CODEC_ID_EAC3,
-    CODEC_ID_SIPR,
-    CODEC_ID_MP1,
-    CODEC_ID_TWINVQ,
-    CODEC_ID_TRUEHD,
-    CODEC_ID_MP4ALS,
+    AV_CODEC_ID_MP2 = 0x15000,
+    AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
+    AV_CODEC_ID_AAC,
+    AV_CODEC_ID_AC3,
+    AV_CODEC_ID_DTS,
+    AV_CODEC_ID_VORBIS,
+    AV_CODEC_ID_DVAUDIO,
+    AV_CODEC_ID_WMAV1,
+    AV_CODEC_ID_WMAV2,
+    AV_CODEC_ID_MACE3,
+    AV_CODEC_ID_MACE6,
+    AV_CODEC_ID_VMDAUDIO,
+    AV_CODEC_ID_FLAC,
+    AV_CODEC_ID_MP3ADU,
+    AV_CODEC_ID_MP3ON4,
+    AV_CODEC_ID_SHORTEN,
+    AV_CODEC_ID_ALAC,
+    AV_CODEC_ID_WESTWOOD_SND1,
+    AV_CODEC_ID_GSM, ///< as in Berlin toast format
+    AV_CODEC_ID_QDM2,
+    AV_CODEC_ID_COOK,
+    AV_CODEC_ID_TRUESPEECH,
+    AV_CODEC_ID_TTA,
+    AV_CODEC_ID_SMACKAUDIO,
+    AV_CODEC_ID_QCELP,
+    AV_CODEC_ID_WAVPACK,
+    AV_CODEC_ID_DSICINAUDIO,
+    AV_CODEC_ID_IMC,
+    AV_CODEC_ID_MUSEPACK7,
+    AV_CODEC_ID_MLP,
+    AV_CODEC_ID_GSM_MS, /* as found in WAV */
+    AV_CODEC_ID_ATRAC3,
+    AV_CODEC_ID_VOXWARE,
+    AV_CODEC_ID_APE,
+    AV_CODEC_ID_NELLYMOSER,
+    AV_CODEC_ID_MUSEPACK8,
+    AV_CODEC_ID_SPEEX,
+    AV_CODEC_ID_WMAVOICE,
+    AV_CODEC_ID_WMAPRO,
+    AV_CODEC_ID_WMALOSSLESS,
+    AV_CODEC_ID_ATRAC3P,
+    AV_CODEC_ID_EAC3,
+    AV_CODEC_ID_SIPR,
+    AV_CODEC_ID_MP1,
+    AV_CODEC_ID_TWINVQ,
+    AV_CODEC_ID_TRUEHD,
+    AV_CODEC_ID_MP4ALS,
+    AV_CODEC_ID_ATRAC1,
+    AV_CODEC_ID_BINKAUDIO_RDFT,
+    AV_CODEC_ID_BINKAUDIO_DCT,
+    AV_CODEC_ID_AAC_LATM,
+    AV_CODEC_ID_QDMC,
+    AV_CODEC_ID_CELT,
+    AV_CODEC_ID_G723_1,
+    AV_CODEC_ID_G729,
+    AV_CODEC_ID_8SVX_EXP,
+    AV_CODEC_ID_8SVX_FIB,
+    AV_CODEC_ID_BMV_AUDIO,
+    AV_CODEC_ID_RALF,
+    AV_CODEC_ID_IAC,
+    AV_CODEC_ID_ILBC,
+    AV_CODEC_ID_OPUS_DEPRECATED,
+    AV_CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
+    AV_CODEC_ID_8SVX_RAW    = MKBETAG('8','S','V','X'),
+    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'),
 
     /* 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,
+    AV_CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
+    AV_CODEC_ID_DVD_SUBTITLE = 0x17000,
+    AV_CODEC_ID_DVB_SUBTITLE,
+    AV_CODEC_ID_TEXT,  ///< raw UTF-8 text
+    AV_CODEC_ID_XSUB,
+    AV_CODEC_ID_SSA,
+    AV_CODEC_ID_MOV_TEXT,
+    AV_CODEC_ID_HDMV_PGS_SUBTITLE,
+    AV_CODEC_ID_DVB_TELETEXT,
+    AV_CODEC_ID_SRT,
+    AV_CODEC_ID_MICRODVD   = MKBETAG('m','D','V','D'),
+    AV_CODEC_ID_EIA_608    = MKBETAG('c','6','0','8'),
+    AV_CODEC_ID_JACOSUB    = MKBETAG('J','S','U','B'),
+    AV_CODEC_ID_SAMI       = MKBETAG('S','A','M','I'),
+    AV_CODEC_ID_REALTEXT   = MKBETAG('R','T','X','T'),
+    AV_CODEC_ID_SUBVIEWER  = MKBETAG('S','u','b','V'),
+    AV_CODEC_ID_SUBRIP     = MKBETAG('S','R','i','p'),
+    AV_CODEC_ID_WEBVTT     = MKBETAG('W','V','T','T'),
 
     /* other specific kind of codecs (generally used for attachments) */
-    CODEC_ID_TTF= 0x18000,
+    AV_CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
+    AV_CODEC_ID_TTF = 0x18000,
+    AV_CODEC_ID_BINTEXT    = MKBETAG('B','T','X','T'),
+    AV_CODEC_ID_XBIN       = MKBETAG('X','B','I','N'),
+    AV_CODEC_ID_IDF        = MKBETAG( 0 ,'I','D','F'),
+    AV_CODEC_ID_OTF        = MKBETAG( 0 ,'O','T','F'),
 
-    CODEC_ID_PROBE= 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
+    AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it
 
-    CODEC_ID_MPEG2TS= 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
+    AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
                                 * stream (only used by libavformat) */
-};
+    AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
+                                * stream (only used by libavformat) */
+    AV_CODEC_ID_FFMETADATA = 0x21000,   ///< Dummy codec for streams containing only metadata information.
 
-enum CodecType {
-    CODEC_TYPE_UNKNOWN = -1,
-    CODEC_TYPE_VIDEO,
-    CODEC_TYPE_AUDIO,
-    CODEC_TYPE_DATA,
-    CODEC_TYPE_SUBTITLE,
-    CODEC_TYPE_ATTACHMENT,
-    CODEC_TYPE_NB
+#if FF_API_CODEC_ID
+#include "old_codec_ids.h"
+#endif
 };
 
+#if FF_API_CODEC_ID
+#define CodecID AVCodecID
+#endif
+
 /**
- * all in native-endian format
+ * This struct describes the properties of a single codec described by an
+ * AVCodecID.
+ * @see avcodec_get_descriptor()
  */
-enum SampleFormat {
-    SAMPLE_FMT_NONE = -1,
-    SAMPLE_FMT_U8,              ///< unsigned 8 bits
-    SAMPLE_FMT_S16,             ///< signed 16 bits
-    SAMPLE_FMT_S32,             ///< signed 32 bits
-    SAMPLE_FMT_FLT,             ///< float
-    SAMPLE_FMT_DBL,             ///< double
-    SAMPLE_FMT_NB               ///< Number of sample formats. DO NOT USE if dynamically linking to libavcodec
-};
+typedef struct AVCodecDescriptor {
+    enum AVCodecID     id;
+    enum AVMediaType type;
+    /**
+     * Name of the codec described by this descriptor. It is non-empty and
+     * unique for each codec descriptor. It should contain alphanumeric
+     * characters and '_' only.
+     */
+    const char      *name;
+    /**
+     * A more descriptive name for this codec. May be NULL.
+     */
+    const char *long_name;
+    /**
+     * Codec properties, a combination of AV_CODEC_PROP_* flags.
+     */
+    int             props;
+} AVCodecDescriptor;
 
-/* Audio channel masks */
-#define CH_FRONT_LEFT             0x00000001
-#define CH_FRONT_RIGHT            0x00000002
-#define CH_FRONT_CENTER           0x00000004
-#define CH_LOW_FREQUENCY          0x00000008
-#define CH_BACK_LEFT              0x00000010
-#define CH_BACK_RIGHT             0x00000020
-#define CH_FRONT_LEFT_OF_CENTER   0x00000040
-#define CH_FRONT_RIGHT_OF_CENTER  0x00000080
-#define CH_BACK_CENTER            0x00000100
-#define CH_SIDE_LEFT              0x00000200
-#define CH_SIDE_RIGHT             0x00000400
-#define CH_TOP_CENTER             0x00000800
-#define CH_TOP_FRONT_LEFT         0x00001000
-#define CH_TOP_FRONT_CENTER       0x00002000
-#define CH_TOP_FRONT_RIGHT        0x00004000
-#define CH_TOP_BACK_LEFT          0x00008000
-#define CH_TOP_BACK_CENTER        0x00010000
-#define CH_TOP_BACK_RIGHT         0x00020000
-#define CH_STEREO_LEFT            0x20000000  ///< Stereo downmix.
-#define CH_STEREO_RIGHT           0x40000000  ///< See CH_STEREO_LEFT.
-
-/* Audio channel convenience macros */
-#define CH_LAYOUT_MONO              (CH_FRONT_CENTER)
-#define CH_LAYOUT_STEREO            (CH_FRONT_LEFT|CH_FRONT_RIGHT)
-#define CH_LAYOUT_2_1               (CH_LAYOUT_STEREO|CH_BACK_CENTER)
-#define CH_LAYOUT_SURROUND          (CH_LAYOUT_STEREO|CH_FRONT_CENTER)
-#define CH_LAYOUT_4POINT0           (CH_LAYOUT_SURROUND|CH_BACK_CENTER)
-#define CH_LAYOUT_2_2               (CH_LAYOUT_STEREO|CH_SIDE_LEFT|CH_SIDE_RIGHT)
-#define CH_LAYOUT_QUAD              (CH_LAYOUT_STEREO|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_5POINT0           (CH_LAYOUT_SURROUND|CH_SIDE_LEFT|CH_SIDE_RIGHT)
-#define CH_LAYOUT_5POINT1           (CH_LAYOUT_5POINT0|CH_LOW_FREQUENCY)
-#define CH_LAYOUT_5POINT0_BACK      (CH_LAYOUT_SURROUND|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_5POINT1_BACK      (CH_LAYOUT_5POINT0_BACK|CH_LOW_FREQUENCY)
-#define CH_LAYOUT_7POINT1           (CH_LAYOUT_5POINT1|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_7POINT1_WIDE      (CH_LAYOUT_5POINT1_BACK|\
-                                          CH_FRONT_LEFT_OF_CENTER|CH_FRONT_RIGHT_OF_CENTER)
-#define CH_LAYOUT_STEREO_DOWNMIX    (CH_STEREO_LEFT|CH_STEREO_RIGHT)
+/**
+ * Codec uses only intra compression.
+ * Video codecs only.
+ */
+#define AV_CODEC_PROP_INTRA_ONLY    (1 << 0)
+/**
+ * Codec supports lossy compression. Audio and video codecs only.
+ * @note a codec may support both lossy and lossless
+ * compression modes
+ */
+#define AV_CODEC_PROP_LOSSY         (1 << 1)
+/**
+ * Codec supports lossless compression. Audio and video codecs only.
+ */
+#define AV_CODEC_PROP_LOSSLESS      (1 << 2)
 
+#if FF_API_OLD_DECODE_AUDIO
 /* in bytes */
 #define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+#endif
 
 /**
+ * @ingroup lavc_decoding
  * Required number of additionally allocated bytes at the end of the input bitstream for decoding.
  * This is mainly needed because some optimized bitstream readers read
  * 32 or 64 bit at once and could read over the end.<br>
  * Note: If the first 23 bits of the additional bytes are not 0, then damaged
  * MPEG bitstreams could cause overread and segfault.
  */
-#define FF_INPUT_BUFFER_PADDING_SIZE 8
+#define FF_INPUT_BUFFER_PADDING_SIZE 16
 
 /**
+ * @ingroup lavc_encoding
  * minimum encoding buffer size
  * Used to avoid some checks during header writing.
  */
@@ -417,6 +543,7 @@
 
 
 /**
+ * @ingroup lavc_encoding
  * motion estimation type.
  */
 enum Motion_Est_ID {
@@ -432,52 +559,58 @@
     ME_TESA,        ///< transformed exhaustive search algorithm
 };
 
+/**
+ * @ingroup lavc_decoding
+ */
 enum AVDiscard{
     /* We leave some space between them for extensions (drop some
      * keyframes for intra-only or drop just some bidir frames). */
-    AVDISCARD_NONE   =-16, ///< discard nothing
-    AVDISCARD_DEFAULT=  0, ///< discard useless packets like 0 size packets in avi
-    AVDISCARD_NONREF =  8, ///< discard all non reference
-    AVDISCARD_BIDIR  = 16, ///< discard all bidirectional frames
-    AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes
-    AVDISCARD_ALL    = 48, ///< discard all
+    AVDISCARD_NONE    =-16, ///< discard nothing
+    AVDISCARD_DEFAULT =  0, ///< discard useless packets like 0 size packets in avi
+    AVDISCARD_NONREF  =  8, ///< discard all non reference
+    AVDISCARD_BIDIR   = 16, ///< discard all bidirectional frames
+    AVDISCARD_NONKEY  = 32, ///< discard all frames except keyframes
+    AVDISCARD_ALL     = 48, ///< discard all
 };
 
 enum AVColorPrimaries{
-    AVCOL_PRI_BT709      =1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
-    AVCOL_PRI_UNSPECIFIED=2,
-    AVCOL_PRI_BT470M     =4,
-    AVCOL_PRI_BT470BG    =5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_PRI_SMPTE170M  =6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
-    AVCOL_PRI_SMPTE240M  =7, ///< functionally identical to above
-    AVCOL_PRI_FILM       =8,
-    AVCOL_PRI_NB           , ///< Not part of ABI
+    AVCOL_PRI_BT709       = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
+    AVCOL_PRI_UNSPECIFIED = 2,
+    AVCOL_PRI_BT470M      = 4,
+    AVCOL_PRI_BT470BG     = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
+    AVCOL_PRI_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
+    AVCOL_PRI_SMPTE240M   = 7, ///< functionally identical to above
+    AVCOL_PRI_FILM        = 8,
+    AVCOL_PRI_NB             , ///< Not part of ABI
 };
 
 enum AVColorTransferCharacteristic{
-    AVCOL_TRC_BT709      =1, ///< also ITU-R BT1361
-    AVCOL_TRC_UNSPECIFIED=2,
-    AVCOL_TRC_GAMMA22    =4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_TRC_GAMMA28    =5, ///< also ITU-R BT470BG
-    AVCOL_TRC_NB           , ///< Not part of ABI
+    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_SMPTE240M   = 7,
+    AVCOL_TRC_NB             , ///< Not part of ABI
 };
 
 enum AVColorSpace{
-    AVCOL_SPC_RGB        =0,
-    AVCOL_SPC_BT709      =1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
-    AVCOL_SPC_UNSPECIFIED=2,
-    AVCOL_SPC_FCC        =4,
-    AVCOL_SPC_BT470BG    =5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
-    AVCOL_SPC_SMPTE170M  =6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
-    AVCOL_SPC_SMPTE240M  =7,
-    AVCOL_SPC_NB           , ///< Not part of ABI
+    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_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
+    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
 };
 
 /**
@@ -486,16 +619,32 @@
  *  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
+    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,
+    AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED = 2,
+    AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED  = 3,
+    AV_AUDIO_SERVICE_TYPE_DIALOGUE          = 4,
+    AV_AUDIO_SERVICE_TYPE_COMMENTARY        = 5,
+    AV_AUDIO_SERVICE_TYPE_EMERGENCY         = 6,
+    AV_AUDIO_SERVICE_TYPE_VOICE_OVER        = 7,
+    AV_AUDIO_SERVICE_TYPE_KARAOKE           = 8,
+    AV_AUDIO_SERVICE_TYPE_NB                   , ///< Not part of ABI
 };
 
+/**
+ * @ingroup lavc_encoding
+ */
 typedef struct RcOverride{
     int start_frame;
     int end_frame;
@@ -515,7 +664,6 @@
 #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>.
-#define CODEC_FLAG_PART   0x0080  ///< Use data partitioning.
 /**
  * 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
@@ -524,7 +672,6 @@
 #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_EXTERN_HUFF     0x1000   ///< Use external Huffman table (for MJPEG).
 #define CODEC_FLAG_GRAY            0x2000   ///< Only decode/encode grayscale.
 #define CODEC_FLAG_EMU_EDGE        0x4000   ///< Don't draw edges.
 #define CODEC_FLAG_PSNR            0x8000   ///< error[?] variables will be set during encoding.
@@ -533,39 +680,25 @@
 #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_ALT_SCAN       0x00100000 ///< Use alternate scan.
 #define CODEC_FLAG_GLOBAL_HEADER  0x00400000 ///< Place global headers in extradata instead of every keyframe.
 #define CODEC_FLAG_BITEXACT       0x00800000 ///< Use only bitexact stuff (except (I)DCT).
 /* Fx : Flag for h263+ extra options */
 #define CODEC_FLAG_AC_PRED        0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction
-#define CODEC_FLAG_H263P_UMV      0x02000000 ///< unlimited motion vector
-#define CODEC_FLAG_CBP_RD         0x04000000 ///< Use rate distortion optimization for cbp.
-#define CODEC_FLAG_QP_RD          0x08000000 ///< Use rate distortion optimization for qp selectioon.
-#define CODEC_FLAG_H263P_AIV      0x00000008 ///< H.263 alternative inter VLC
-#define CODEC_FLAG_OBMC           0x00000001 ///< OBMC
 #define CODEC_FLAG_LOOP_FILTER    0x00000800 ///< loop filter
-#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000
 #define CODEC_FLAG_INTERLACED_ME  0x20000000 ///< interlaced motion estimation
-#define CODEC_FLAG_SVCD_SCAN_OFFSET 0x40000000 ///< Will reserve space for SVCD scan offset user data.
 #define CODEC_FLAG_CLOSED_GOP     0x80000000
 #define CODEC_FLAG2_FAST          0x00000001 ///< Allow non spec compliant speedup tricks.
-#define CODEC_FLAG2_STRICT_GOP    0x00000002 ///< Strictly enforce GOP size.
 #define CODEC_FLAG2_NO_OUTPUT     0x00000004 ///< Skip bitstream encoding.
 #define CODEC_FLAG2_LOCAL_HEADER  0x00000008 ///< Place global headers at every keyframe instead of in extradata.
-#define CODEC_FLAG2_BPYRAMID      0x00000010 ///< H.264 allow B-frames to be used as references.
-#define CODEC_FLAG2_WPRED         0x00000020 ///< H.264 weighted biprediction for B-frames
-#define CODEC_FLAG2_MIXED_REFS    0x00000040 ///< H.264 one reference per partition, as opposed to one reference per macroblock
-#define CODEC_FLAG2_8X8DCT        0x00000080 ///< H.264 high profile 8x8 transform
-#define CODEC_FLAG2_FASTPSKIP     0x00000100 ///< H.264 fast pskip
-#define CODEC_FLAG2_AUD           0x00000200 ///< H.264 access unit delimiters
-#define CODEC_FLAG2_BRDO          0x00000400 ///< B-frame rate-distortion optimization
-#define CODEC_FLAG2_INTRA_VLC     0x00000800 ///< Use MPEG-2 intra VLC table.
-#define CODEC_FLAG2_MEMC_ONLY     0x00001000 ///< Only do ME/MC (I frames -> ref, P frame -> ME+MC).
-#define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format.
+#define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format. DEPRECATED!!!!
+#if FF_API_MPV_GLOBAL_OPTS
+#define CODEC_FLAG_CBP_RD         0x04000000 ///< Use rate distortion optimization for cbp.
+#define CODEC_FLAG_QP_RD          0x08000000 ///< Use rate distortion optimization for qp selectioon.
+#define CODEC_FLAG2_STRICT_GOP    0x00000002 ///< Strictly enforce GOP size.
 #define CODEC_FLAG2_SKIP_RD       0x00004000 ///< RD optimal MB level residual skipping
+#endif
 #define CODEC_FLAG2_CHUNKS        0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
-#define CODEC_FLAG2_NON_LINEAR_QUANT 0x00010000 ///< Use MPEG-2 nonlinear quantizer.
-#define CODEC_FLAG2_BIT_RESERVOIR 0x00020000 ///< Use a bit reservoir when encoding if possible
+#define CODEC_FLAG2_SHOW_ALL      0x00400000 ///< Show all frames before the first keyframe
 
 /* Unsupported options :
  *              Syntax Arithmetic coding (SAC)
@@ -576,18 +709,36 @@
 
 #define CODEC_CAP_DRAW_HORIZ_BAND 0x0001 ///< Decoder can use draw_horiz_band callback.
 /**
- * Codec uses get_buffer() for allocating buffers.
- * direct rendering method 1
+ * 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
-/* If 'parse_only' field is true, then avcodec_parse_frame() can be used. */
-#define CODEC_CAP_PARSE_ONLY      0x0004
 #define CODEC_CAP_TRUNCATED       0x0008
 /* Codec can export data for HW decoding (XvMC). */
 #define CODEC_CAP_HWACCEL         0x0010
 /**
- * Codec has a nonzero delay and needs to be fed with NULL at the end to get the delayed data.
- * If this is not set, the codec is guaranteed to never be fed with NULL data.
+ * Encoder or decoder requires flushing with NULL input at the end in order to
+ * give the complete and correct output.
+ *
+ * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
+ *       with NULL data. The user can still send NULL data to the public encode
+ *       or decode function, but libavcodec will not pass it along to the codec
+ *       unless this flag is set.
+ *
+ * Decoders:
+ * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
+ * avpkt->size=0 at the end to get the delayed data until the decoder no longer
+ * returns frames.
+ *
+ * Encoders:
+ * The encoder needs to be fed with NULL data at the end of encoding until the
+ * encoder no longer returns data.
+ *
+ * NOTE: For encoders implementing the AVCodec.encode2() function, setting this
+ *       flag also means that the encoder must set the pts and duration for
+ *       each output packet. If this flag is not set, the pts and duration will
+ *       be determined by libavcodec from the input frame.
  */
 #define CODEC_CAP_DELAY           0x0020
 /**
@@ -599,6 +750,61 @@
  * Codec can export data for HW decoding (VDPAU).
  */
 #define CODEC_CAP_HWACCEL_VDPAU    0x0080
+/**
+ * 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
+ * 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
+/**
+ * Codec is experimental and is thus avoided in favor of non experimental
+ * encoders
+ */
+#define CODEC_CAP_EXPERIMENTAL     0x0200
+/**
+ * Codec should fill in channel configuration and samplerate instead of container
+ */
+#define CODEC_CAP_CHANNEL_CONF     0x0400
+
+/**
+ * Codec is able to deal with negative linesizes
+ */
+#define CODEC_CAP_NEG_LINESIZES    0x0800
+
+/**
+ * Codec supports frame-level multithreading.
+ */
+#define CODEC_CAP_FRAME_THREADS    0x1000
+/**
+ * Codec supports slice-based (or partition-based) multithreading.
+ */
+#define CODEC_CAP_SLICE_THREADS    0x2000
+/**
+ * Codec supports changed parameters at any point.
+ */
+#define CODEC_CAP_PARAM_CHANGE     0x4000
+/**
+ * Codec supports avctx->thread_count == 0 (auto).
+ */
+#define CODEC_CAP_AUTO_THREADS     0x8000
+/**
+ * Audio encoder supports receiving a different number of samples in each call.
+ */
+#define CODEC_CAP_VARIABLE_FRAME_SIZE 0x10000
+/**
+ * Codec is intra only.
+ */
+#define CODEC_CAP_INTRA_ONLY       0x40000000
+/**
+ * Codec is lossless.
+ */
+#define CODEC_CAP_LOSSLESS         0x80000000
 
 //The following defines may change, don't expect compatibility if you use them.
 #define MB_TYPE_INTRA4x4   0x0001
@@ -653,256 +859,91 @@
     int16_t position[3][2];
 }AVPanScan;
 
-#define FF_COMMON_FRAME \
-    /**\
-     * pointer to the picture planes.\
-     * This might be different from the first allocated byte\
-     * - encoding: \
-     * - decoding: \
-     */\
-    uint8_t *data[4];\
-    int linesize[4];\
-    /**\
-     * pointer to the first allocated byte of the picture. Can be used in get_buffer/release_buffer.\
-     * This isn't used by libavcodec unless the default get/release_buffer() is used.\
-     * - encoding: \
-     * - decoding: \
-     */\
-    uint8_t *base[4];\
-    /**\
-     * 1 -> keyframe, 0-> not\
-     * - encoding: Set by libavcodec.\
-     * - decoding: Set by libavcodec.\
-     */\
-    int key_frame;\
-\
-    /**\
-     * Picture type of the frame, see ?_TYPE below.\
-     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).\
-     * - decoding: Set by libavcodec.\
-     */\
-    int pict_type;\
-\
-    /**\
-     * presentation timestamp in time_base units (time when frame should be shown to user)\
-     * If AV_NOPTS_VALUE then frame_rate = 1/time_base will be assumed.\
-     * - encoding: MUST be set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    int64_t pts;\
-\
-    /**\
-     * picture number in bitstream order\
-     * - encoding: set by\
-     * - decoding: Set by libavcodec.\
-     */\
-    int coded_picture_number;\
-    /**\
-     * picture number in display order\
-     * - encoding: set by\
-     * - decoding: Set by libavcodec.\
-     */\
-    int display_picture_number;\
-\
-    /**\
-     * quality (between 1 (good) and FF_LAMBDA_MAX (bad)) \
-     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).\
-     * - decoding: Set by libavcodec.\
-     */\
-    int quality; \
-\
-    /**\
-     * buffer age (1->was last buffer and dint change, 2->..., ...).\
-     * Set to INT_MAX if the buffer has not been used yet.\
-     * - encoding: unused\
-     * - decoding: MUST be set by get_buffer().\
-     */\
-    int age;\
-\
-    /**\
-     * is this picture used as reference\
-     * The values for this are the same as the MpegEncContext.picture_structure\
-     * variable, that is 1->top field, 2->bottom field, 3->frame/both fields.\
-     * Set to 4 for delayed, non-reference frames.\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec. (before get_buffer() call)).\
-     */\
-    int reference;\
-\
-    /**\
-     * QP table\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    int8_t *qscale_table;\
-    /**\
-     * QP store stride\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    int qstride;\
-\
-    /**\
-     * mbskip_table[mb]>=1 if MB didn't change\
-     * stride= mb_width = (width+15)>>4\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    uint8_t *mbskip_table;\
-\
-    /**\
-     * motion vector table\
-     * @code\
-     * example:\
-     * int mv_sample_log2= 4 - motion_subsample_log2;\
-     * int mb_width= (width+15)>>4;\
-     * int mv_stride= (mb_width << mv_sample_log2) + 1;\
-     * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];\
-     * @endcode\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    int16_t (*motion_val[2])[2];\
-\
-    /**\
-     * macroblock type table\
-     * mb_type_base + mb_width + 2\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    uint32_t *mb_type;\
-\
-    /**\
-     * log2 of the size of the block which a single vector in motion_val represents: \
-     * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    uint8_t motion_subsample_log2;\
-\
-    /**\
-     * for some private data of the user\
-     * - encoding: unused\
-     * - decoding: Set by user.\
-     */\
-    void *opaque;\
-\
-    /**\
-     * error\
-     * - encoding: Set by libavcodec. if flags&CODEC_FLAG_PSNR.\
-     * - decoding: unused\
-     */\
-    uint64_t error[4];\
-\
-    /**\
-     * type of the buffer (to keep track of who has to deallocate data[*])\
-     * - encoding: Set by the one who allocates it.\
-     * - decoding: Set by the one who allocates it.\
-     * Note: User allocated (direct rendering) & internal buffers cannot coexist currently.\
-     */\
-    int type;\
-    \
-    /**\
-     * When decoding, this signals how much the picture must be delayed.\
-     * extra_delay = repeat_pict / (2*fps)\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    int repeat_pict;\
-    \
-    /**\
-     * \
-     */\
-    int qscale_type;\
-    \
-    /**\
-     * The content of the picture is interlaced.\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec. (default 0)\
-     */\
-    int interlaced_frame;\
-    \
-    /**\
-     * If the content is interlaced, is top field displayed first.\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    int top_field_first;\
-    \
-    /**\
-     * Pan scan.\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    AVPanScan *pan_scan;\
-    \
-    /**\
-     * Tell user application that palette has changed from previous frame.\
-     * - encoding: ??? (no palette-enabled encoder yet)\
-     * - decoding: Set by libavcodec. (default 0).\
-     */\
-    int palette_has_changed;\
-    \
-    /**\
-     * codec suggestion on buffer type if != 0\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec. (before get_buffer() call)).\
-     */\
-    int buffer_hints;\
-\
-    /**\
-     * DCT coefficients\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec.\
-     */\
-    short *dct_coeff;\
-\
-    /**\
-     * motion referece frame index\
-     * - encoding: Set by user.\
-     * - decoding: Set by libavcodec.\
-     */\
-    int8_t *ref_index[2];\
-\
-    /**\
-     * reordered opaque 64bit number (generally a PTS) from AVCodecContext.reordered_opaque\
-     * output in AVFrame.reordered_opaque\
-     * - encoding: unused\
-     * - decoding: Read by user.\
-     */\
-    int64_t reordered_opaque;\
-\
-    /**\
-     * hardware accelerator private data (FFmpeg allocated)\
-     * - encoding: unused\
-     * - decoding: Set by libavcodec\
-     */\
-    void *hwaccel_picture_private;\
-
-
 #define FF_QSCALE_TYPE_MPEG1 0
 #define FF_QSCALE_TYPE_MPEG2 1
 #define FF_QSCALE_TYPE_H264  2
+#define FF_QSCALE_TYPE_VP56  3
 
 #define FF_BUFFER_TYPE_INTERNAL 1
 #define FF_BUFFER_TYPE_USER     2 ///< direct rendering buffers (image is (de)allocated by user)
 #define FF_BUFFER_TYPE_SHARED   4 ///< Buffer from somewhere else; don't deallocate image (data/base), all other tables are not shared.
 #define FF_BUFFER_TYPE_COPY     8 ///< Just a (modified) copy of some other buffer, don't deallocate anything.
 
-
-#define FF_I_TYPE  1 ///< Intra
-#define FF_P_TYPE  2 ///< Predicted
-#define FF_B_TYPE  3 ///< Bi-dir predicted
-#define FF_S_TYPE  4 ///< S(GMC)-VOP MPEG4
-#define FF_SI_TYPE 5 ///< Switching Intra
-#define FF_SP_TYPE 6 ///< Switching Predicted
-#define FF_BI_TYPE 7
-
 #define FF_BUFFER_HINTS_VALID    0x01 // Buffer hints value is meaningful (if 0 ignore).
 #define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer.
 #define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content.
 #define FF_BUFFER_HINTS_REUSABLE 0x08 // Codec will reuse the buffer (update).
 
+/**
+ * @defgroup lavc_packet AVPacket
+ *
+ * Types and functions for working with AVPacket.
+ * @{
+ */
+enum AVPacketSideDataType {
+    AV_PKT_DATA_PALETTE,
+    AV_PKT_DATA_NEW_EXTRADATA,
+
+    /**
+     * An AV_PKT_DATA_PARAM_CHANGE side data packet is laid out as follows:
+     * @code
+     * u32le param_flags
+     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT)
+     *     s32le channel_count
+     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)
+     *     u64le channel_layout
+     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE)
+     *     s32le sample_rate
+     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS)
+     *     s32le width
+     *     s32le height
+     * @endcode
+     */
+    AV_PKT_DATA_PARAM_CHANGE,
+
+    /**
+     * An AV_PKT_DATA_H263_MB_INFO side data packet contains a number of
+     * structures with info about macroblocks relevant to splitting the
+     * packet into smaller packets on macroblock edges (e.g. as for RFC 2190).
+     * That is, it does not necessarily contain info about all macroblocks,
+     * as long as the distance between macroblocks in the info is smaller
+     * than the target payload size.
+     * Each MB info structure is 12 bytes, and is laid out as follows:
+     * @code
+     * u32le bit offset from the start of the packet
+     * u8    current quantizer at the start of the macroblock
+     * u8    GOB number
+     * u16le macroblock address within the GOB
+     * u8    horizontal MV predictor
+     * u8    vertical MV predictor
+     * u8    horizontal MV predictor for block number 3
+     * u8    vertical MV predictor for block number 3
+     * @endcode
+     */
+    AV_PKT_DATA_H263_MB_INFO,
+
+    /**
+     * Recommmends skipping the specified number of samples
+     * @code
+     * u32le number of samples to skip from start of this packet
+     * u32le number of samples to skip from end of this packet
+     * u8    reason for start skip
+     * u8    reason for end   skip (0=padding silence, 1=convergence)
+     * @endcode
+     */
+    AV_PKT_DATA_SKIP_SAMPLES=70,
+
+    /**
+     * An AV_PKT_DATA_JP_DUALMONO side data packet indicates that
+     * the packet may contain "dual mono" audio specific to Japanese DTV
+     * and if it is true, recommends only the selected channel to be used.
+     * @code
+     * u8    selected channels (0=mail/left, 1=sub/right, 2=both)
+     * @endcode
+     */
+    AV_PKT_DATA_JP_DUALMONO,
+};
+
 typedef struct AVPacket {
     /**
      * Presentation timestamp in AVStream->time_base units; the time at which
@@ -923,8 +964,22 @@
     uint8_t *data;
     int   size;
     int   stream_index;
+    /**
+     * A combination of AV_PKT_FLAG values
+     */
     int   flags;
     /**
+     * Additional packet data that can be provided by the container.
+     * Packet can contain several types of side information.
+     */
+    struct {
+        uint8_t *data;
+        int      size;
+        enum AVPacketSideDataType type;
+    } *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.
      */
@@ -941,6 +996,8 @@
      * the very first frame or from this keyframe.
      * Is AV_NOPTS_VALUE if unknown.
      * This field is not the display duration of the current packet.
+     * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
+     * set.
      *
      * The purpose of this field is to allow seeking in streams that have no
      * keyframes in the conventional sense. It corresponds to the
@@ -950,286 +1007,474 @@
      */
     int64_t convergence_duration;
 } AVPacket;
-#define PKT_FLAG_KEY   0x0001
+#define AV_PKT_FLAG_KEY     0x0001 ///< The packet contains a keyframe
+#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
 
+enum AVSideDataParamChangeFlags {
+    AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT  = 0x0001,
+    AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002,
+    AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE    = 0x0004,
+    AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS     = 0x0008,
+};
 /**
- * Audio Video Frame.
- * New fields can be added to the end of FF_COMMON_FRAME with minor version
- * bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump. No fields should be added into AVFrame before or after
- * FF_COMMON_FRAME!
- * sizeof(AVFrame) must not be used outside libav*.
+ * @}
  */
-typedef struct AVFrame {
-    FF_COMMON_FRAME
-} AVFrame;
 
 /**
- * main external API structure.
- * New fields can be added to the end with minor version bumps.
- * Removal, reordering and changes to existing fields require a major
- * version bump.
- * sizeof(AVCodecContext) must not be used outside libav*.
+ * Audio Video Frame.
+ * New fields can be added to the end of AVFRAME with minor version
+ * bumps. 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.
+ * Removal, reordering and changes in the remaining cases require
+ * a major version bump.
+ * sizeof(AVFrame) must not be used outside libavcodec.
  */
-typedef struct AVCodecContext {
+typedef struct AVFrame {
+#define AV_NUM_DATA_POINTERS 8
     /**
-     * information on struct for av_log
-     * - set by avcodec_alloc_context
+     * pointer to the picture/channel planes.
+     * This might be different from the first allocated byte
+     * - encoding: Set by user
+     * - decoding: set by AVCodecContext.get_buffer()
      */
-    const AVClass *av_class;
+    uint8_t *data[AV_NUM_DATA_POINTERS];
+
     /**
-     * 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.
+     * Size, in bytes, of the data for each picture/channel plane.
+     *
+     * For audio, only linesize[0] may be set. For planar audio, each channel
+     * plane must be the same size.
+     *
+     * - encoding: Set by user
+     * - decoding: set by AVCodecContext.get_buffer()
      */
-    int bit_rate;
+    int linesize[AV_NUM_DATA_POINTERS];
 
     /**
-     * number of bits the bitstream is allowed to diverge from the reference.
-     *           the reference can be CBR (for CBR pass1) or VBR (for pass2)
-     * - encoding: Set by user; unused for constant quantizer encoding.
-     * - decoding: unused
+     * 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 by get_buffer(),
+     * but for planar audio with more channels that can fit in data,
+     * extended_data must be used by the decoder in order to access all
+     * channels.
+     *
+     * encoding: set by user
+     * decoding: set by AVCodecContext.get_buffer()
      */
-    int bit_rate_tolerance;
+    uint8_t **extended_data;
 
     /**
-     * CODEC_FLAG_*.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
+     * width and height of the video frame
+     * - encoding: unused
+     * - decoding: Read by user.
      */
-    int flags;
+    int width, height;
+
+    /**
+     * number of audio samples (per channel) described by this frame
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    int nb_samples;
 
     /**
-     * Some codecs need additional format info. It is stored here.
-     * If any muxer uses this then ALL demuxers/parsers AND encoders for the
-     * specific codec MUST set it correctly otherwise stream copy breaks.
-     * In general use of this field by muxers is not recommanded.
+     * format of the frame, -1 if unknown or unset
+     * Values correspond to enum AVPixelFormat for video frames,
+     * enum AVSampleFormat for audio)
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int format;
+
+    /**
+     * 1 -> keyframe, 0-> not
      * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec. (FIXME: Is this OK?)
+     * - decoding: Set by libavcodec.
      */
-    int sub_id;
+    int key_frame;
 
     /**
-     * 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
+     * Picture type of the frame, see ?_TYPE below.
+     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).
+     * - decoding: Set by libavcodec.
      */
-    int me_method;
+    enum AVPictureType pict_type;
 
     /**
-     * some codecs need / can use extradata like 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
-     * than extradata_size to avoid prolems if it is read with the bitstream reader.
-     * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
-     * - encoding: Set/allocated/freed by libavcodec.
-     * - decoding: Set/allocated/freed by user.
+     * pointer to the first allocated byte of the picture. Can be used in get_buffer/release_buffer.
+     * This isn't used by libavcodec unless the default get/release_buffer() is used.
+     * - encoding:
+     * - decoding:
      */
-    uint8_t *extradata;
-    int extradata_size;
+    uint8_t *base[AV_NUM_DATA_POINTERS];
 
     /**
-     * This is the fundamental unit of time (in seconds) in terms
-     * of which frame timestamps are represented. For fixed-fps content,
-     * timebase should be 1/framerate and timestamp increments should be
-     * identically 1.
+     * sample aspect ratio for the video frame, 0/1 if unknown/unspecified
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    AVRational sample_aspect_ratio;
+
+    /**
+     * presentation timestamp in time_base units (time when frame should be shown to user)
+     * If AV_NOPTS_VALUE then frame_rate = 1/time_base will be assumed.
      * - encoding: MUST be set by user.
      * - decoding: Set by libavcodec.
      */
-    AVRational time_base;
+    int64_t pts;
 
-    /* video only */
     /**
-     * picture width / height.
-     * - encoding: MUST be set by user.
+     * reordered pts from the last AVPacket that has been input into the decoder
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int64_t pkt_pts;
+
+    /**
+     * dts from the last AVPacket that has been input into the decoder
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int64_t pkt_dts;
+
+    /**
+     * picture number in bitstream order
+     * - encoding: set by
      * - decoding: Set by libavcodec.
-     * Note: For compatibility it is possible to set this instead of
-     * coded_width/height before decoding.
      */
-    int width, height;
+    int coded_picture_number;
+    /**
+     * picture number in display order
+     * - encoding: set by
+     * - decoding: Set by libavcodec.
+     */
+    int display_picture_number;
 
-#define FF_ASPECT_EXTENDED 15
+    /**
+     * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
+     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).
+     * - decoding: Set by libavcodec.
+     */
+    int quality;
 
     /**
-     * the number of pictures in a group of pictures, or 0 for intra_only
-     * - encoding: Set by user.
-     * - decoding: unused
+     * is this picture used as reference
+     * The values for this are the same as the MpegEncContext.picture_structure
+     * variable, that is 1->top field, 2->bottom field, 3->frame/both fields.
+     * Set to 4 for delayed, non-reference frames.
+     * - encoding: unused
+     * - decoding: Set by libavcodec. (before get_buffer() call)).
      */
-    int gop_size;
+    int reference;
+
+    /**
+     * QP table
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
+     */
+    int8_t *qscale_table;
+    /**
+     * QP store stride
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
+     */
+    int qstride;
+
+    /**
+     *
+     */
+    int qscale_type;
 
     /**
-     * Pixel format, see PIX_FMT_xxx.
+     * mbskip_table[mb]>=1 if MB didn't change
+     * stride= mb_width = (width+15)>>4
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
+     */
+    uint8_t *mbskip_table;
+
+    /**
+     * motion vector table
+     * @code
+     * example:
+     * int mv_sample_log2= 4 - motion_subsample_log2;
+     * int mb_width= (width+15)>>4;
+     * int mv_stride= (mb_width << mv_sample_log2) + 1;
+     * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
+     * @endcode
      * - encoding: Set by user.
      * - decoding: Set by libavcodec.
      */
-    enum PixelFormat pix_fmt;
+    int16_t (*motion_val[2])[2];
 
     /**
-     * Frame rate emulation. If not zero, the lower layer (i.e. format handler)
-     * has to read frames at native frame rate.
+     * macroblock type table
+     * mb_type_base + mb_width + 2
      * - encoding: Set by user.
-     * - decoding: unused
+     * - decoding: Set by libavcodec.
      */
-    int rate_emu;
+    uint32_t *mb_type;
 
     /**
-     * If non NULL, 'draw_horiz_band' is called by the libavcodec
-     * decoder to draw a horizontal band. It improves cache usage. Not
-     * all codecs can do that. You must check the codec capabilities
-     * beforehand.
-     * The function is also used by hardware acceleration APIs.
-     * It is called at least once during frame decoding to pass
-     * the data needed for hardware render.
-     * In that mode instead of pixel data, AVFrame points to
-     * a structure specific to the acceleration API. The application
-     * reads the structure and can change some fields to indicate progress
-     * or mark state.
+     * DCT coefficients
      * - encoding: unused
-     * - decoding: Set by user.
-     * @param height the height of the slice
-     * @param y the y position of the slice
-     * @param type 1->top field, 2->bottom field, 3->frame
-     * @param offset offset into the AVFrame.data from which the slice should be read
+     * - decoding: Set by libavcodec.
      */
-    void (*draw_horiz_band)(struct AVCodecContext *s,
-                            const AVFrame *src, int offset[4],
-                            int y, int type, int height);
-
-    /* audio only */
-    int sample_rate; ///< samples per second
-    int channels;    ///< number of audio channels
+    short *dct_coeff;
 
     /**
-     * audio sample format
+     * motion reference frame index
+     * the order in which these are stored can depend on the codec.
      * - encoding: Set by user.
      * - decoding: Set by libavcodec.
      */
-    enum SampleFormat sample_fmt;  ///< sample format, currently unused
+    int8_t *ref_index[2];
 
-    /* The following data should not be initialized. */
     /**
-     * Samples per packet, initialized when calling 'init'.
+     * for some private data of the user
+     * - encoding: unused
+     * - decoding: Set by user.
      */
-    int frame_size;
-    int frame_number;   ///< audio or video frame number
-    int real_pict_num;  ///< Returns the real picture number of previous encoded frame.
+    void *opaque;
 
     /**
-     * Number of frames the decoded output will be delayed relative to
-     * the encoded input.
-     * - encoding: Set by libavcodec.
+     * error
+     * - encoding: Set by libavcodec. if flags&CODEC_FLAG_PSNR.
      * - decoding: unused
      */
-    int delay;
+    uint64_t error[AV_NUM_DATA_POINTERS];
 
-    /* - encoding parameters */
-    float qcompress;  ///< amount of qscale change between easy & hard scenes (0.0-1.0)
-    float qblur;      ///< amount of qscale smoothing over time (0.0-1.0)
+    /**
+     * type of the buffer (to keep track of who has to deallocate data[*])
+     * - encoding: Set by the one who allocates it.
+     * - decoding: Set by the one who allocates it.
+     * Note: User allocated (direct rendering) & internal buffers cannot coexist currently.
+     */
+    int type;
 
     /**
-     * minimum quantizer
-     * - encoding: Set by user.
-     * - decoding: unused
+     * When decoding, this signals how much the picture must be delayed.
+     * extra_delay = repeat_pict / (2*fps)
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
      */
-    int qmin;
+    int repeat_pict;
 
     /**
-     * maximum quantizer
+     * The content of the picture is interlaced.
      * - encoding: Set by user.
-     * - decoding: unused
+     * - decoding: Set by libavcodec. (default 0)
      */
-    int qmax;
+    int interlaced_frame;
 
     /**
-     * maximum quantizer difference between frames
+     * If the content is interlaced, is top field displayed first.
      * - encoding: Set by user.
-     * - decoding: unused
+     * - decoding: Set by libavcodec.
      */
-    int max_qdiff;
+    int top_field_first;
 
     /**
-     * maximum number of B-frames between non-B-frames
-     * Note: The output will be delayed by max_b_frames+1 relative to the input.
-     * - encoding: Set by user.
-     * - decoding: unused
+     * Tell user application that palette has changed from previous frame.
+     * - encoding: ??? (no palette-enabled encoder yet)
+     * - decoding: Set by libavcodec. (default 0).
      */
-    int max_b_frames;
+    int palette_has_changed;
 
     /**
-     * qscale factor between IP and B-frames
-     * If > 0 then the last P-frame quantizer will be used (q= lastp_q*factor+offset).
-     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
-     * - encoding: Set by user.
-     * - decoding: unused
+     * codec suggestion on buffer type if != 0
+     * - encoding: unused
+     * - decoding: Set by libavcodec. (before get_buffer() call)).
      */
-    float b_quant_factor;
+    int buffer_hints;
 
-    /** obsolete FIXME remove */
-    int rc_strategy;
-#define FF_RC_STRATEGY_XVID 1
+    /**
+     * Pan scan.
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    AVPanScan *pan_scan;
 
-    int b_frame_strategy;
+    /**
+     * 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
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int64_t reordered_opaque;
 
     /**
-     * hurry up amount
+     * hardware accelerator private data (FFmpeg-allocated)
      * - encoding: unused
-     * - decoding: Set by user. 1-> Skip B-frames, 2-> Skip IDCT/dequant too, 5-> Skip everything except header
-     * @deprecated Deprecated in favor of skip_idct and skip_frame.
+     * - decoding: Set by libavcodec
      */
-    int hurry_up;
+    void *hwaccel_picture_private;
 
-    struct AVCodec *codec;
+    /**
+     * the AVCodecContext which ff_thread_get_buffer() was last called on
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    struct AVCodecContext *owner;
 
-    void *priv_data;
+    /**
+     * used by multithreading to store frame-specific info
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    void *thread_opaque;
 
-    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.  */
+    /**
+     * log2 of the size of the block which a single vector in motion_val represents:
+     * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)
+     * - encoding: unused
+     * - decoding: Set by libavcodec.
+     */
+    uint8_t motion_subsample_log2;
 
+    /**
+     * Sample rate of the audio data.
+     *
+     * - encoding: unused
+     * - decoding: read by user
+     */
+    int sample_rate;
 
-    /* The RTP callback: This function is called    */
-    /* every time the encoder has a packet to send. */
-    /* It depends on the encoder if the data starts */
-    /* with a Start Code (it should). H.263 does.   */
-    /* mb_nb contains the number of macroblocks     */
-    /* encoded in the RTP payload.                  */
-    void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);
+    /**
+     * Channel layout of the audio data.
+     *
+     * - encoding: unused
+     * - decoding: read by user.
+     */
+    uint64_t channel_layout;
 
-    /* statistics, used for 2-pass encoding */
-    int mv_bits;
-    int header_bits;
-    int i_tex_bits;
-    int p_tex_bits;
-    int i_count;
-    int p_count;
-    int skip_count;
-    int misc_bits;
+    /**
+     * 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;
 
     /**
-     * number of bits used for the previously encoded frame
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
+     * 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.
      */
-    int frame_bits;
+    int64_t pkt_pos;
 
     /**
-     * Private data of the user, can be used to carry app specific stuff.
+     * 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 user.
+     * - decoding: Set by libavcodec.
      */
-    void *opaque;
+    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.
+     */
+    int64_t channels;
+} 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);
+
+struct AVCodecInternal;
+
+enum AVFieldOrder {
+    AV_FIELD_UNKNOWN,
+    AV_FIELD_PROGRESSIVE,
+    AV_FIELD_TT,          //< Top coded_first, top displayed first
+    AV_FIELD_BB,          //< Bottom coded first, bottom displayed first
+    AV_FIELD_TB,          //< Top coded first, bottom displayed first
+    AV_FIELD_BT,          //< Bottom coded first, top displayed first
+};
+
+/**
+ * main external API structure.
+ * New fields can be added to the end with minor version bumps.
+ * Removal, reordering and changes to existing fields require a major
+ * version bump.
+ * Please use AVOptions (av_opt* / av_set/get*()) to access these fields from user
+ * applications.
+ * sizeof(AVCodecContext) must not be used outside libav*.
+ */
+typedef struct AVCodecContext {
+    /**
+     * information on struct for av_log
+     * - set by avcodec_alloc_context3
+     */
+    const AVClass *av_class;
+    int log_level_offset;
 
-    char codec_name[32];
-    enum CodecType codec_type; /* see CODEC_TYPE_xxx */
-    enum CodecID codec_id; /* see CODEC_ID_xxx */
+    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 */
 
     /**
      * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
@@ -1237,7 +1482,7 @@
      * A demuxer should set this to what is stored in the field used to identify the codec.
      * If there are multiple such fields in a container then the demuxer should choose the one
      * which maximizes the information about the used codec.
-     * If the codec tag field in a container is larger then 32 bits then the demuxer should
+     * If the codec tag field in a container is larger than 32 bits then the demuxer should
      * remap the longer ID to 32 bits with a table or other structure. Alternatively a new
      * extra_codec_tag + size could be added but for this a clear advantage must be demonstrated
      * first.
@@ -1247,223 +1492,299 @@
     unsigned int codec_tag;
 
     /**
-     * Work around bugs in encoders which sometimes cannot be detected automatically.
-     * - encoding: Set by user
-     * - decoding: Set by user
+     * 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.
      */
-    int workaround_bugs;
-#define FF_BUG_AUTODETECT       1  ///< autodetection
-#define FF_BUG_OLD_MSMPEG4      2
-#define FF_BUG_XVID_ILACE       4
-#define FF_BUG_UMP4             8
-#define FF_BUG_NO_PADDING       16
-#define FF_BUG_AMV              32
-#define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.
-#define FF_BUG_QPEL_CHROMA      64
-#define FF_BUG_STD_QPEL         128
-#define FF_BUG_QPEL_CHROMA2     256
-#define FF_BUG_DIRECT_BLOCKSIZE 512
-#define FF_BUG_EDGE             1024
-#define FF_BUG_HPEL_CHROMA      2048
-#define FF_BUG_DC_CLIP          4096
-#define FF_BUG_MS               8192 ///< Work around various bugs in Microsoft's broken decoders.
-//#define FF_BUG_FAKE_SCALABILITY 16 //Autodetection should work 100%.
+    unsigned int stream_codec_tag;
 
+#if FF_API_SUB_ID
     /**
-     * luma single coefficient elimination threshold
+     * @deprecated this field is unused
+     */
+    attribute_deprecated int sub_id;
+#endif
+
+    void *priv_data;
+
+    /**
+     * Private context used for internal data.
+     *
+     * Unlike priv_data, this is not codec-specific. It is used in general
+     * libavcodec functions.
+     */
+    struct AVCodecInternal *internal;
+
+    /**
+     * Private data of the user, can be used to carry app specific stuff.
      * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    void *opaque;
+
+    /**
+     * the average bitrate
+     * - encoding: Set by user; unused for constant quantizer encoding.
+     * - decoding: Set by libavcodec. 0 or some bitrate if this info is available in the stream.
+     */
+    int bit_rate;
+
+    /**
+     * number of bits the bitstream is allowed to diverge from the reference.
+     *           the reference can be CBR (for CBR pass1) or VBR (for pass2)
+     * - encoding: Set by user; unused for constant quantizer encoding.
      * - decoding: unused
      */
-    int luma_elim_threshold;
+    int bit_rate_tolerance;
 
     /**
-     * chroma single coeff elimination threshold
+     * Global quality for codecs which cannot change it per frame.
+     * This should be proportional to MPEG-1/2/4 qscale.
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int chroma_elim_threshold;
+    int global_quality;
 
     /**
-     * strictly follow the standard (MPEG4, ...).
      * - encoding: Set by user.
-     * - decoding: Set by user.
-     * Setting this to STRICT or higher means the encoder and decoder will
-     * generally do stupid things. While setting it to inofficial or lower
-     * will mean the encoder might use things that are not supported by all
-     * spec compliant decoders. Decoders make no difference between normal,
-     * inofficial and experimental, that is they always try to decode things
-     * when they can unless they are explicitly asked to behave stupid
-     * (=strictly conform to the specs)
+     * - decoding: unused
      */
-    int strict_std_compliance;
-#define FF_COMPLIANCE_VERY_STRICT   2 ///< Strictly conform to a older more strict version of the spec or reference software.
-#define FF_COMPLIANCE_STRICT        1 ///< Strictly conform to all the things in the spec no matter what consequences.
-#define FF_COMPLIANCE_NORMAL        0
-#define FF_COMPLIANCE_INOFFICIAL   -1 ///< Allow inofficial extensions.
-#define FF_COMPLIANCE_EXPERIMENTAL -2 ///< Allow nonstandardized experimental things.
+    int compression_level;
+#define FF_COMPRESSION_DEFAULT -1
 
     /**
-     * qscale offset between IP and B-frames
+     * CODEC_FLAG_*.
      * - encoding: Set by user.
-     * - decoding: unused
+     * - decoding: Set by user.
      */
-    float b_quant_offset;
+    int flags;
 
     /**
-     * Error recognization; higher values will detect more errors but may
-     * misdetect some more or less valid parts as errors.
-     * - encoding: unused
+     * CODEC_FLAG2_*
+     * - encoding: Set by user.
      * - decoding: Set by user.
      */
-    int error_recognition;
-#define FF_ER_CAREFUL         1
-#define FF_ER_COMPLIANT       2
-#define FF_ER_AGGRESSIVE      3
-#define FF_ER_VERY_AGGRESSIVE 4
+    int flags2;
 
     /**
-     * Called at the beginning of each frame to get a buffer for it.
-     * If pic.reference is set then the frame will be read later by libavcodec.
-     * avcodec_align_dimensions() should be used to find the required width and
-     * height, as they normally need to be rounded up to the next multiple of 16.
-     * - encoding: unused
-     * - decoding: Set by libavcodec., user can override.
+     * some codecs need / can use extradata like 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
+     * than extradata_size to avoid prolems if it is read with the bitstream reader.
+     * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
+     * - encoding: Set/allocated/freed by libavcodec.
+     * - decoding: Set/allocated/freed by user.
      */
-    int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
+    uint8_t *extradata;
+    int extradata_size;
 
     /**
-     * Called to release buffers which were allocated with get_buffer.
-     * A released buffer can be reused in get_buffer().
-     * pic.data[*] must be set to NULL.
-     * - encoding: unused
-     * - decoding: Set by libavcodec., user can override.
+     * This is the fundamental unit of time (in seconds) in terms
+     * of which frame timestamps are represented. For fixed-fps content,
+     * timebase should be 1/framerate and timestamp increments should be
+     * identically 1.
+     * - encoding: MUST be set by user.
+     * - decoding: Set by libavcodec.
      */
-    void (*release_buffer)(struct AVCodecContext *c, AVFrame *pic);
+    AVRational time_base;
 
     /**
-     * Size of the frame reordering buffer in the decoder.
-     * For MPEG-2 it is 1 IPB or 0 low delay IP.
+     * For some codecs, the time base is closer to the field rate than the frame rate.
+     * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration
+     * if no telecine is used ...
+     *
+     * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2.
+     */
+    int ticks_per_frame;
+
+    /**
+     * Encoding: Number of frames delay there will be from the encoder input to
+     *           the decoder output. (we assume the decoder matches the spec)
+     * Decoding: Number of frames delay in addition to what a standard decoder
+     *           as specified in the spec would produce.
+     *
+     * Video:
+     *   Number of frames the decoded output will be delayed relative to the
+     *   encoded input.
+     *
+     * Audio:
+     *   For encoding, this is the number of "priming" samples added 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 decoding, this is the number of samples the decoder needs to
+     *   output before the decoder's output is valid. When seeking, you should
+     *   start decoding this many samples prior to your desired seek point.
+     *
      * - encoding: Set by libavcodec.
      * - decoding: Set by libavcodec.
      */
-    int has_b_frames;
+    int delay;
+
 
+    /* video only */
     /**
-     * number of bytes per packet if constant and known or 0
-     * Used by some WAV based audio codecs.
+     * picture width / height.
+     * - encoding: MUST be set by user.
+     * - decoding: Set by libavcodec.
+     * Note: For compatibility it is possible to set this instead of
+     * coded_width/height before decoding.
      */
-    int block_align;
+    int width, height;
 
-    int parse_only; /* - decoding only: If true, only parsing is done
-                       (function avcodec_parse_frame()). The frame
-                       data is returned. Only MPEG codecs support this now. */
+    /**
+     * Bitstream width / height, may be different from width/height if lowres enabled.
+     * - encoding: unused
+     * - decoding: Set by user before init if known. Codec should override / dynamically change if needed.
+     */
+    int coded_width, coded_height;
+
+#define FF_ASPECT_EXTENDED 15
 
     /**
-     * 0-> h263 quant 1-> mpeg quant
+     * the number of pictures in a group of pictures, or 0 for intra_only
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int mpeg_quant;
+    int gop_size;
 
     /**
-     * pass1 encoding statistics output buffer
-     * - encoding: Set by libavcodec.
-     * - decoding: unused
+     * Pixel format, see AV_PIX_FMT_xxx.
+     * May be set by the demuxer if known from headers.
+     * May be overridden by the decoder if it knows better.
+     * - encoding: Set by user.
+     * - decoding: Set by user if known, overridden by libavcodec if known
      */
-    char *stats_out;
+    enum AVPixelFormat pix_fmt;
 
     /**
-     * pass2 encoding statistics input buffer
-     * Concatenated stuff from stats_out of pass1 should be placed here.
-     * - encoding: Allocated/set/freed by user.
+     * Motion estimation algorithm used for video coding.
+     * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),
+     * 8 (umh), 9 (iter), 10 (tesa) [7, 8, 10 are x264 specific, 9 is snow specific]
+     * - encoding: MUST be set by user.
      * - decoding: unused
      */
-    char *stats_in;
+    int me_method;
 
     /**
-     * ratecontrol qmin qmax limiting method
-     * 0-> clipping, 1-> use a nice continous function to limit qscale wthin qmin/qmax.
-     * - encoding: Set by user.
-     * - decoding: unused
+     * If non NULL, 'draw_horiz_band' is called by the libavcodec
+     * decoder to draw a horizontal band. It improves cache usage. Not
+     * all codecs can do that. You must check the codec capabilities
+     * beforehand.
+     * When multithreading is used, it may be called from multiple threads
+     * at the same time; threads might draw different parts of the same AVFrame,
+     * or multiple AVFrames, and there is no guarantee that slices will be drawn
+     * in order.
+     * The function is also used by hardware acceleration APIs.
+     * It is called at least once during frame decoding to pass
+     * the data needed for hardware render.
+     * In that mode instead of pixel data, AVFrame points to
+     * a structure specific to the acceleration API. The application
+     * reads the structure and can change some fields to indicate progress
+     * or mark state.
+     * - encoding: unused
+     * - decoding: Set by user.
+     * @param height the height of the slice
+     * @param y the y position of the slice
+     * @param type 1->top field, 2->bottom field, 3->frame
+     * @param offset offset into the AVFrame.data from which the slice should be read
      */
-    float rc_qsquish;
-
-    float rc_qmod_amp;
-    int rc_qmod_freq;
+    void (*draw_horiz_band)(struct AVCodecContext *s,
+                            const AVFrame *src, int offset[AV_NUM_DATA_POINTERS],
+                            int y, int type, int height);
 
     /**
-     * ratecontrol override, see RcOverride
-     * - encoding: Allocated/set/freed by user.
-     * - decoding: unused
+     * callback to negotiate the pixelFormat
+     * @param fmt is the list of formats which are supported by the codec,
+     * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.
+     * The first is always the native one.
+     * @return the chosen format
+     * - encoding: unused
+     * - decoding: Set by user, if not set the native format will be chosen.
      */
-    RcOverride *rc_override;
-    int rc_override_count;
+    enum AVPixelFormat (*get_format)(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
 
     /**
-     * rate control equation
-     * - encoding: Set by user
+     * maximum number of B-frames between non-B-frames
+     * Note: The output will be delayed by max_b_frames+1 relative to the input.
+     * - encoding: Set by user.
      * - decoding: unused
      */
-    const char *rc_eq;
+    int max_b_frames;
 
     /**
-     * maximum bitrate
+     * qscale factor between IP and B-frames
+     * If > 0 then the last P-frame quantizer will be used (q= lastp_q*factor+offset).
+     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int rc_max_rate;
+    float b_quant_factor;
+
+    /** obsolete FIXME remove */
+    int rc_strategy;
+#define FF_RC_STRATEGY_XVID 1
+
+    int b_frame_strategy;
 
+#if FF_API_MPV_GLOBAL_OPTS
     /**
-     * minimum bitrate
+     * luma single coefficient elimination threshold
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int rc_min_rate;
+    attribute_deprecated int luma_elim_threshold;
 
     /**
-     * decoder bitstream buffer size
+     * chroma single coeff elimination threshold
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int rc_buffer_size;
-    float rc_buffer_aggressivity;
+    attribute_deprecated int chroma_elim_threshold;
+#endif
 
     /**
-     * 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).
+     * qscale offset between IP and B-frames
      * - encoding: Set by user.
      * - decoding: unused
      */
-    float i_quant_factor;
+    float b_quant_offset;
 
     /**
-     * qscale offset between P and I-frames
+     * Size of the frame reordering buffer in the decoder.
+     * For MPEG-2 it is 1 IPB or 0 low delay IP.
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    int has_b_frames;
+
+    /**
+     * 0-> h263 quant 1-> mpeg quant
      * - encoding: Set by user.
      * - decoding: unused
      */
-    float i_quant_offset;
+    int mpeg_quant;
 
     /**
-     * initial complexity for pass1 ratecontrol
+     * qscale factor between P and I-frames
+     * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset).
+     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
      * - encoding: Set by user.
      * - decoding: unused
      */
-    float rc_initial_cplx;
+    float i_quant_factor;
 
     /**
-     * DCT algorithm, see FF_DCT_* below
+     * qscale offset between P and I-frames
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int dct_algo;
-#define FF_DCT_AUTO    0
-#define FF_DCT_FASTINT 1
-#define FF_DCT_INT     2
-#define FF_DCT_MMX     3
-#define FF_DCT_MLIB    4
-#define FF_DCT_ALTIVEC 5
-#define FF_DCT_FAAN    6
+    float i_quant_offset;
 
     /**
      * luminance masking (0-> disabled)
@@ -1501,93 +1822,12 @@
     float dark_masking;
 
     /**
-     * IDCT algorithm, see FF_IDCT_* below.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int idct_algo;
-#define FF_IDCT_AUTO          0
-#define FF_IDCT_INT           1
-#define FF_IDCT_SIMPLE        2
-#define FF_IDCT_SIMPLEMMX     3
-#define FF_IDCT_LIBMPEG2MMX   4
-#define FF_IDCT_PS2           5
-#define FF_IDCT_MLIB          6
-#define FF_IDCT_ARM           7
-#define FF_IDCT_ALTIVEC       8
-#define FF_IDCT_SH4           9
-#define FF_IDCT_SIMPLEARM     10
-#define FF_IDCT_H264          11
-#define FF_IDCT_VP3           12
-#define FF_IDCT_IPP           13
-#define FF_IDCT_XVIDMMX       14
-#define FF_IDCT_CAVS          15
-#define FF_IDCT_SIMPLEARMV5TE 16
-#define FF_IDCT_SIMPLEARMV6   17
-#define FF_IDCT_SIMPLEVIS     18
-#define FF_IDCT_WMV2          19
-#define FF_IDCT_FAAN          20
-#define FF_IDCT_EA            21
-#define FF_IDCT_SIMPLENEON    22
-#define FF_IDCT_SIMPLEALPHA   23
-
-    /**
      * slice count
      * - encoding: Set by libavcodec.
      * - decoding: Set by user (or 0).
      */
     int slice_count;
     /**
-     * slice offsets in the frame in bytes
-     * - encoding: Set/allocated by libavcodec.
-     * - decoding: Set/allocated by user (or NULL).
-     */
-    int *slice_offset;
-
-    /**
-     * error concealment flags
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int error_concealment;
-#define FF_EC_GUESS_MVS   1
-#define FF_EC_DEBLOCK     2
-
-    /**
-     * dsp_mask could be add used to disable unwanted CPU features
-     * CPU features (i.e. MMX, SSE. ...)
-     *
-     * With the FORCE flag you may instead enable given CPU features.
-     * (Dangerous: Usable in case of misdetection, improper usage however will
-     * result into program crash.)
-     */
-    unsigned dsp_mask;
-#define FF_MM_FORCE    0x80000000 /* Force usage of selected flags (OR) */
-    /* lower 16 bits - CPU features */
-#define FF_MM_MMX      0x0001 ///< standard MMX
-#define FF_MM_3DNOW    0x0004 ///< AMD 3DNOW
-#if LIBAVCODEC_VERSION_MAJOR < 53
-#define FF_MM_MMXEXT   0x0002 ///< SSE integer functions or AMD MMX ext
-#endif
-#define FF_MM_MMX2     0x0002 ///< SSE integer functions or AMD MMX ext
-#define FF_MM_SSE      0x0008 ///< SSE functions
-#define FF_MM_SSE2     0x0010 ///< PIV SSE2 functions
-#define FF_MM_3DNOWEXT 0x0020 ///< AMD 3DNowExt
-#define FF_MM_SSE3     0x0040 ///< Prescott SSE3 functions
-#define FF_MM_SSSE3    0x0080 ///< Conroe SSSE3 functions
-#define FF_MM_SSE4     0x0100 ///< Penryn SSE4.1 functions
-#define FF_MM_SSE42    0x0200 ///< Nehalem SSE4.2 functions
-#define FF_MM_IWMMXT   0x0100 ///< XScale IWMMXT
-#define FF_MM_ALTIVEC  0x0001 ///< standard AltiVec
-
-    /**
-     * bits per sample/pixel from the demuxer (needed for huffyuv).
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by user.
-     */
-     int bits_per_coded_sample;
-
-    /**
      * prediction method (needed for huffyuv)
      * - encoding: Set by user.
      * - decoding: unused
@@ -1598,6 +1838,13 @@
 #define FF_PRED_MEDIAN 2
 
     /**
+     * slice offsets in the frame in bytes
+     * - encoding: Set/allocated by libavcodec.
+     * - decoding: Set/allocated by user (or NULL).
+     */
+    int *slice_offset;
+
+    /**
      * sample aspect ratio (0 if unknown)
      * That is the width of a pixel divided by the height of the pixel.
      * Numerator and denominator must be relatively prime and smaller than 256 for some video standards.
@@ -1607,67 +1854,6 @@
     AVRational sample_aspect_ratio;
 
     /**
-     * the picture in the bitstream
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    AVFrame *coded_frame;
-
-    /**
-     * debug
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int debug;
-#define FF_DEBUG_PICT_INFO   1
-#define FF_DEBUG_RC          2
-#define FF_DEBUG_BITSTREAM   4
-#define FF_DEBUG_MB_TYPE     8
-#define FF_DEBUG_QP          16
-#define FF_DEBUG_MV          32
-#define FF_DEBUG_DCT_COEFF   0x00000040
-#define FF_DEBUG_SKIP        0x00000080
-#define FF_DEBUG_STARTCODE   0x00000100
-#define FF_DEBUG_PTS         0x00000200
-#define FF_DEBUG_ER          0x00000400
-#define FF_DEBUG_MMCO        0x00000800
-#define FF_DEBUG_BUGS        0x00001000
-#define FF_DEBUG_VIS_QP      0x00002000
-#define FF_DEBUG_VIS_MB_TYPE 0x00004000
-#define FF_DEBUG_BUFFERS     0x00008000
-
-    /**
-     * debug
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int debug_mv;
-#define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
-#define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
-#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
-
-    /**
-     * error
-     * - encoding: Set by libavcodec if flags&CODEC_FLAG_PSNR.
-     * - decoding: unused
-     */
-    uint64_t error[4];
-
-    /**
-     * minimum MB quantizer
-     * - encoding: unused
-     * - decoding: unused
-     */
-    int mb_qmin;
-
-    /**
-     * maximum MB quantizer
-     * - encoding: unused
-     * - decoding: unused
-     */
-    int mb_qmax;
-
-    /**
      * motion estimation comparison function
      * - encoding: Set by user.
      * - decoding: unused
@@ -1751,17 +1937,6 @@
     int me_subpel_quality;
 
     /**
-     * callback to negotiate the pixelFormat
-     * @param fmt is the list of formats which are supported by the codec,
-     * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.
-     * The first is always the native one.
-     * @return the chosen format
-     * - encoding: unused
-     * - decoding: Set by user, if not set the native format will be chosen.
-     */
-    enum PixelFormat (*get_format)(struct AVCodecContext *s, const enum PixelFormat * fmt);
-
-    /**
      * DTG active format information (additional aspect ratio
      * information only used in DVB MPEG-2 transport streams)
      * 0 if not set.
@@ -1802,65 +1977,14 @@
      */
     int inter_quant_bias;
 
+#if FF_API_COLOR_TABLE_ID
     /**
      * color table ID
      * - encoding: unused
      * - decoding: Which clrtable should be used for 8bit RGB images.
      *             Tables have to be stored somewhere. FIXME
      */
-    int color_table_id;
-
-    /**
-     * internal_buffer count
-     * Don't touch, used by libavcodec default_get_buffer().
-     */
-    int internal_buffer_count;
-
-    /**
-     * internal_buffers
-     * Don't touch, used by libavcodec default_get_buffer().
-     */
-    void *internal_buffer;
-
-#define FF_LAMBDA_SHIFT 7
-#define FF_LAMBDA_SCALE (1<<FF_LAMBDA_SHIFT)
-#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
-#define FF_LAMBDA_MAX (256*128-1)
-
-#define FF_QUALITY_SCALE FF_LAMBDA_SCALE //FIXME maybe remove
-    /**
-     * Global quality for codecs which cannot change it per frame.
-     * This should be proportional to MPEG-1/2/4 qscale.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int global_quality;
-
-#define FF_CODER_TYPE_VLC       0
-#define FF_CODER_TYPE_AC        1
-#define FF_CODER_TYPE_RAW       2
-#define FF_CODER_TYPE_RLE       3
-#define FF_CODER_TYPE_DEFLATE   4
-    /**
-     * coder type
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int coder_type;
-
-    /**
-     * context model
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int context_model;
-#if 0
-    /**
-     *
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    uint8_t * (*realloc)(struct AVCodecContext *s, uint8_t *buf, int buf_size);
+    attribute_deprecated int color_table_id;
 #endif
 
     /**
@@ -1905,14 +2029,6 @@
     uint16_t *inter_matrix;
 
     /**
-     * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-     * This is used to work around some encoder bugs.
-     * - encoding: unused
-     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.
-     */
-    unsigned int stream_codec_tag;
-
-    /**
      * scene change detection threshold
      * 0 is default, larger means fewer detected scene changes.
      * - encoding: Set by user.
@@ -1921,427 +2037,531 @@
     int scenechange_threshold;
 
     /**
-     * minimum Lagrange multipler
+     * noise reduction strength
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int lmin;
+    int noise_reduction;
 
+#if FF_API_INTER_THRESHOLD
     /**
-     * maximum Lagrange multipler
+     * @deprecated this field is unused
+     */
+    attribute_deprecated int inter_threshold;
+#endif
+
+#if FF_API_MPV_GLOBAL_OPTS
+    /**
+     * @deprecated use mpegvideo private options instead
+     */
+    attribute_deprecated int quantizer_noise_shaping;
+#endif
+
+    /**
+     * Motion estimation threshold below which no motion estimation is
+     * performed, but instead the user specified motion vectors are used.
+     *
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int lmax;
+    int me_threshold;
 
     /**
-     * palette control structure
-     * - encoding: ??? (no palette-enabled encoder yet)
-     * - decoding: Set by user.
+     * Macroblock threshold below which the user specified macroblock types will be used.
+     * - encoding: Set by user.
+     * - decoding: unused
      */
-    struct AVPaletteControl *palctrl;
+    int mb_threshold;
 
     /**
-     * noise reduction strength
+     * precision of the intra DC coefficient - 8
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int noise_reduction;
+    int intra_dc_precision;
 
     /**
-     * Called at the beginning of a frame to get cr buffer for it.
-     * Buffer type (size, hints) must be the same. libavcodec won't check it.
-     * libavcodec will pass previous buffer in pic, function should return
-     * same buffer or new buffer with old frame "painted" into it.
-     * If pic.data[0] == NULL must behave like get_buffer().
+     * Number of macroblock rows at the top which are skipped.
      * - encoding: unused
-     * - decoding: Set by libavcodec., user can override
+     * - decoding: Set by user.
      */
-    int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
+    int skip_top;
 
     /**
-     * Number of bits which should be loaded into the rc buffer before decoding starts.
-     * - encoding: Set by user.
-     * - decoding: unused
+     * Number of macroblock rows at the bottom which are skipped.
+     * - encoding: unused
+     * - decoding: Set by user.
      */
-    int rc_initial_buffer_occupancy;
+    int skip_bottom;
 
     /**
-     *
+     * Border processing masking, raises the quantizer for mbs on the borders
+     * of the picture.
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int inter_threshold;
+    float border_masking;
 
     /**
-     * CODEC_FLAG2_*
+     * minimum MB lagrange multipler
      * - encoding: Set by user.
-     * - decoding: Set by user.
+     * - decoding: unused
      */
-    int flags2;
+    int mb_lmin;
 
     /**
-     * Simulates errors in the bitstream to test error concealment.
+     * maximum MB lagrange multipler
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int error_rate;
+    int mb_lmax;
 
     /**
-     * MP3 antialias algorithm, see FF_AA_* below.
-     * - encoding: unused
-     * - decoding: Set by user.
+     *
+     * - encoding: Set by user.
+     * - decoding: unused
      */
-    int antialias_algo;
-#define FF_AA_AUTO    0
-#define FF_AA_FASTINT 1 //not implemented yet
-#define FF_AA_INT     2
-#define FF_AA_FLOAT   3
+    int me_penalty_compensation;
+
     /**
-     * quantizer noise shaping
+     *
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int quantizer_noise_shaping;
+    int bidir_refine;
 
     /**
-     * thread count
-     * is used to decide how many independent tasks should be passed to execute()
+     *
      * - encoding: Set by user.
-     * - decoding: Set by user.
+     * - decoding: unused
      */
-    int thread_count;
+    int brd_scale;
 
     /**
-     * The codec may call this to execute several independent things.
-     * It will return only after finishing all tasks.
-     * The user may replace this with some multithreaded implementation,
-     * the default implementation will execute the parts serially.
-     * @param count the number of things to execute
-     * - encoding: Set by libavcodec, user can override.
-     * - decoding: Set by libavcodec, user can override.
+     * minimum GOP size
+     * - encoding: Set by user.
+     * - decoding: unused
      */
-    int (*execute)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg), void *arg2, int *ret, int count, int size);
+    int keyint_min;
 
     /**
-     * thread opaque
-     * Can be used by execute() to store some per AVCodecContext stuff.
-     * - encoding: set by execute()
-     * - decoding: set by execute()
+     * number of reference frames
+     * - encoding: Set by user.
+     * - decoding: Set by lavc.
      */
-    void *thread_opaque;
+    int refs;
 
     /**
-     * Motion estimation threshold below which no motion estimation is
-     * performed, but instead the user specified motion vectors are used.
-     *
+     * chroma qp offset from luma
      * - encoding: Set by user.
      * - decoding: unused
      */
-     int me_threshold;
+    int chromaoffset;
 
     /**
-     * Macroblock threshold below which the user specified macroblock types will be used.
+     * Multiplied by qscale for each frame and added to scene_change_score.
      * - encoding: Set by user.
      * - decoding: unused
      */
-     int mb_threshold;
+    int scenechange_factor;
 
     /**
-     * precision of the intra DC coefficient - 8
+     *
+     * Note: Value depends upon the compare function used for fullpel ME.
      * - encoding: Set by user.
      * - decoding: unused
      */
-     int intra_dc_precision;
+    int mv0_threshold;
 
     /**
-     * noise vs. sse weight for the nsse comparsion function
+     * Adjust sensitivity of b_frame_strategy 1.
      * - encoding: Set by user.
      * - decoding: unused
      */
-     int nsse_weight;
+    int b_sensitivity;
 
     /**
-     * Number of macroblock rows at the top which are skipped.
-     * - encoding: unused
-     * - decoding: Set by user.
+     * Chromaticity coordinates of the source primaries.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
      */
-     int skip_top;
+    enum AVColorPrimaries color_primaries;
 
     /**
-     * Number of macroblock rows at the bottom which are skipped.
-     * - encoding: unused
-     * - decoding: Set by user.
+     * Color Transfer Characteristic.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
      */
-     int skip_bottom;
+    enum AVColorTransferCharacteristic color_trc;
 
     /**
-     * profile
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
+     * YUV colorspace type.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
      */
-     int profile;
-#define FF_PROFILE_UNKNOWN -99
-#define FF_PROFILE_AAC_MAIN 0
-#define FF_PROFILE_AAC_LOW  1
-#define FF_PROFILE_AAC_SSR  2
-#define FF_PROFILE_AAC_LTP  3
+    enum AVColorSpace colorspace;
 
     /**
-     * level
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
+     * MPEG vs JPEG YUV range.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
      */
-     int level;
-#define FF_LEVEL_UNKNOWN -99
+    enum AVColorRange color_range;
 
     /**
-     * low resolution decoding, 1-> 1/2 size, 2->1/4 size
-     * - encoding: unused
-     * - decoding: Set by user.
+     * This defines the location of chroma samples.
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
      */
-     int lowres;
+    enum AVChromaLocation chroma_sample_location;
 
     /**
-     * Bitstream width / height, may be different from width/height if lowres
-     * or other things are used.
-     * - encoding: unused
-     * - decoding: Set by user before init if known. Codec should override / dynamically change if needed.
+     * Number of slices.
+     * Indicates number of picture subdivisions. Used for parallelized
+     * decoding.
+     * - encoding: Set by user
+     * - decoding: unused
      */
-    int coded_width, coded_height;
+    int slices;
+
+    /** Field order
+     * - encoding: set by libavcodec
+     * - decoding: Set by user.
+     */
+    enum AVFieldOrder field_order;
+
+    /* audio only */
+    int sample_rate; ///< samples per second
+    int channels;    ///< number of audio channels
 
     /**
-     * frame skip threshold
+     * audio sample format
      * - encoding: Set by user.
-     * - decoding: unused
+     * - decoding: Set by libavcodec.
      */
-    int frame_skip_threshold;
+    enum AVSampleFormat sample_fmt;  ///< sample format
 
+    /* The following data should not be initialized. */
     /**
-     * frame skip factor
-     * - encoding: Set by user.
-     * - decoding: unused
+     * Samples per packet, initialized when calling 'init'.
      */
-    int frame_skip_factor;
+    int frame_size;
 
     /**
-     * frame skip exponent
-     * - encoding: Set by user.
-     * - decoding: unused
+     * Frame counter, set by libavcodec.
+     *
+     * - decoding: total number of frames returned from the decoder so far.
+     * - encoding: total number of frames passed to the encoder so far.
+     *
+     *   @note the counter is not incremented if encoding/decoding resulted in
+     *   an error.
      */
-    int frame_skip_exp;
+    int frame_number;
 
     /**
-     * frame skip comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
+     * number of bytes per packet if constant and known or 0
+     * Used by some WAV based audio codecs.
      */
-    int frame_skip_cmp;
+    int block_align;
 
     /**
-     * Border processing masking, raises the quantizer for mbs on the borders
-     * of the picture.
+     * Audio cutoff bandwidth (0 means "automatic")
      * - encoding: Set by user.
      * - decoding: unused
      */
-    float border_masking;
+    int cutoff;
 
+#if FF_API_REQUEST_CHANNELS
     /**
-     * minimum MB lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
+     * Decoder should decode to this many channels if it can (0 for default)
+     * - encoding: unused
+     * - decoding: Set by user.
+     * @deprecated Deprecated in favor of request_channel_layout.
      */
-    int mb_lmin;
+    int request_channels;
+#endif
 
     /**
-     * maximum MB lagrange multipler
-     * - encoding: Set by user.
-     * - decoding: unused
+     * Audio channel layout.
+     * - encoding: set by user.
+     * - decoding: set by user, may be overwritten by libavcodec.
      */
-    int mb_lmax;
+    uint64_t channel_layout;
 
     /**
-     *
+     * Request decoder to use this channel layout if it can (0 for default)
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    uint64_t request_channel_layout;
+
+    /**
+     * Type of service that the audio stream conveys.
      * - encoding: Set by user.
-     * - decoding: unused
+     * - decoding: Set by libavcodec.
      */
-    int me_penalty_compensation;
+    enum AVAudioServiceType audio_service_type;
 
     /**
-     *
-     * - encoding: unused
+     * desired sample format
+     * - encoding: Not used.
      * - decoding: Set by user.
+     * Decoder will decode to this format if it can.
      */
-    enum AVDiscard skip_loop_filter;
+    enum AVSampleFormat request_sample_fmt;
 
     /**
+     * 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.
+     *
+     * 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 user.
+     * - decoding: Set by libavcodec, user can override.
      */
-    enum AVDiscard skip_idct;
+    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 user.
+     * - decoding: Set by libavcodec, user can override.
      */
-    enum AVDiscard skip_frame;
+    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.
+     */
+    int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
+
+
+    /* - encoding parameters */
+    float qcompress;  ///< amount of qscale change between easy & hard scenes (0.0-1.0)
+    float qblur;      ///< amount of qscale smoothing over time (0.0-1.0)
+
+    /**
+     * minimum quantizer
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int bidir_refine;
+    int qmin;
 
     /**
-     *
+     * maximum quantizer
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int brd_scale;
+    int qmax;
 
     /**
-     * constant rate factor - quality-based VBR - values ~correspond to qps
+     * maximum quantizer difference between frames
      * - encoding: Set by user.
      * - decoding: unused
      */
-    float crf;
+    int max_qdiff;
 
     /**
-     * constant quantization parameter rate control method
+     * ratecontrol qmin qmax limiting method
+     * 0-> clipping, 1-> use a nice continuous function to limit qscale wthin qmin/qmax.
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int cqp;
+    float rc_qsquish;
+
+    float rc_qmod_amp;
+    int rc_qmod_freq;
 
     /**
-     * minimum GOP size
+     * decoder bitstream buffer size
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int keyint_min;
+    int rc_buffer_size;
 
     /**
-     * number of reference frames
-     * - encoding: Set by user.
-     * - decoding: Set by lavc.
+     * ratecontrol override, see RcOverride
+     * - encoding: Allocated/set/freed by user.
+     * - decoding: unused
      */
-    int refs;
+    int rc_override_count;
+    RcOverride *rc_override;
 
     /**
-     * chroma qp offset from luma
-     * - encoding: Set by user.
+     * rate control equation
+     * - encoding: Set by user
      * - decoding: unused
      */
-    int chromaoffset;
+    const char *rc_eq;
 
     /**
-     * Influences how often B-frames are used.
+     * maximum bitrate
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int bframebias;
+    int rc_max_rate;
 
     /**
-     * trellis RD quantization
+     * minimum bitrate
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int trellis;
+    int rc_min_rate;
+
+    float rc_buffer_aggressivity;
 
     /**
-     * Reduce fluctuations in qp (before curve compression).
+     * initial complexity for pass1 ratecontrol
      * - encoding: Set by user.
      * - decoding: unused
      */
-    float complexityblur;
+    float rc_initial_cplx;
 
     /**
-     * in-loop deblocking filter alphac0 parameter
-     * alpha is in the range -6...6
+     * Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow.
      * - encoding: Set by user.
-     * - decoding: unused
+     * - decoding: unused.
      */
-    int deblockalpha;
+    float rc_max_available_vbv_use;
 
     /**
-     * in-loop deblocking filter beta parameter
-     * beta is in the range -6...6
+     * Ratecontrol attempt to use, at least, <value> times the amount needed to prevent a vbv overflow.
+     * - encoding: Set by user.
+     * - decoding: unused.
+     */
+    float rc_min_vbv_overflow_use;
+
+    /**
+     * Number of bits which should be loaded into the rc buffer before decoding starts.
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int deblockbeta;
+    int rc_initial_buffer_occupancy;
 
+#define FF_CODER_TYPE_VLC       0
+#define FF_CODER_TYPE_AC        1
+#define FF_CODER_TYPE_RAW       2
+#define FF_CODER_TYPE_RLE       3
+#define FF_CODER_TYPE_DEFLATE   4
     /**
-     * macroblock subpartition sizes to consider - p8x8, p4x4, b8x8, i8x8, i4x4
+     * coder type
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int partitions;
-#define X264_PART_I4X4 0x001  /* Analyze i4x4 */
-#define X264_PART_I8X8 0x002  /* Analyze i8x8 (requires 8x8 transform) */
-#define X264_PART_P8X8 0x010  /* Analyze p16x8, p8x16 and p8x8 */
-#define X264_PART_P4X4 0x020  /* Analyze p8x4, p4x8, p4x4 */
-#define X264_PART_B8X8 0x100  /* Analyze b16x8, b8x16 and b8x8 */
+    int coder_type;
 
     /**
-     * direct MV prediction mode - 0 (none), 1 (spatial), 2 (temporal), 3 (auto)
+     * context model
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int directpred;
+    int context_model;
 
     /**
-     * Audio cutoff bandwidth (0 means "automatic")
+     * minimum Lagrange multipler
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int cutoff;
+    int lmin;
 
     /**
-     * Multiplied by qscale for each frame and added to scene_change_score.
+     * maximum Lagrange multipler
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int scenechange_factor;
+    int lmax;
 
     /**
-     *
-     * Note: Value depends upon the compare function used for fullpel ME.
+     * frame skip threshold
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int mv0_threshold;
+    int frame_skip_threshold;
 
     /**
-     * Adjusts sensitivity of b_frame_strategy 1.
+     * frame skip factor
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int b_sensitivity;
+    int frame_skip_factor;
 
     /**
+     * frame skip exponent
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int compression_level;
-#define FF_COMPRESSION_DEFAULT -1
+    int frame_skip_exp;
 
     /**
-     * Sets whether to use LPC mode - used by FLAC encoder.
+     * frame skip comparison function
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int use_lpc;
+    int frame_skip_cmp;
 
     /**
-     * LPC coefficient precision - used by FLAC encoder
+     * trellis RD quantization
      * - encoding: Set by user.
      * - decoding: unused
      */
-    int lpc_coeff_precision;
+    int trellis;
 
     /**
      * - encoding: Set by user.
@@ -2356,157 +2576,541 @@
     int max_prediction_order;
 
     /**
-     * search method for selecting prediction order
-     * - encoding: Set by user.
+     * 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)
+     */
+    int64_t timecode_frame_start;
+
+    /* The RTP callback: This function is called    */
+    /* every time the encoder has a packet to send. */
+    /* It depends on the encoder if the data starts */
+    /* with a Start Code (it should). H.263 does.   */
+    /* mb_nb contains the number of macroblocks     */
+    /* encoded in the RTP payload.                  */
+    void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);
+
+    int rtp_payload_size;   /* The size of the RTP payload: the coder will  */
+                            /* do its best to deliver a chunk with size     */
+                            /* below rtp_payload_size, the chunk will start */
+                            /* with a start code on some codecs like H.263. */
+                            /* This doesn't take account of any particular  */
+                            /* headers inside the transmitted RTP payload.  */
+
+    /* statistics, used for 2-pass encoding */
+    int mv_bits;
+    int header_bits;
+    int i_tex_bits;
+    int p_tex_bits;
+    int i_count;
+    int p_count;
+    int skip_count;
+    int misc_bits;
+
+    /**
+     * number of bits used for the previously encoded frame
+     * - encoding: Set by libavcodec.
      * - decoding: unused
      */
-    int prediction_order_method;
+    int frame_bits;
 
     /**
-     * - encoding: Set by user.
+     * pass1 encoding statistics output buffer
+     * - encoding: Set by libavcodec.
      * - decoding: unused
      */
-    int min_partition_order;
+    char *stats_out;
 
     /**
-     * - encoding: Set by user.
+     * pass2 encoding statistics input buffer
+     * Concatenated stuff from stats_out of pass1 should be placed here.
+     * - encoding: Allocated/set/freed by user.
      * - decoding: unused
      */
-    int max_partition_order;
+    char *stats_in;
+
+    /**
+     * Work around bugs in encoders which sometimes cannot be detected automatically.
+     * - encoding: Set by user
+     * - decoding: Set by user
+     */
+    int workaround_bugs;
+#define FF_BUG_AUTODETECT       1  ///< autodetection
+#define FF_BUG_OLD_MSMPEG4      2
+#define FF_BUG_XVID_ILACE       4
+#define FF_BUG_UMP4             8
+#define FF_BUG_NO_PADDING       16
+#define FF_BUG_AMV              32
+#define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.
+#define FF_BUG_QPEL_CHROMA      64
+#define FF_BUG_STD_QPEL         128
+#define FF_BUG_QPEL_CHROMA2     256
+#define FF_BUG_DIRECT_BLOCKSIZE 512
+#define FF_BUG_EDGE             1024
+#define FF_BUG_HPEL_CHROMA      2048
+#define FF_BUG_DC_CLIP          4096
+#define FF_BUG_MS               8192 ///< Work around various bugs in Microsoft's broken decoders.
+#define FF_BUG_TRUNCATED       16384
 
     /**
-     * GOP timecode frame start number, in non drop frame format
+     * strictly follow the standard (MPEG4, ...).
      * - encoding: Set by user.
-     * - decoding: unused
+     * - decoding: Set by user.
+     * Setting this to STRICT or higher means the encoder and decoder will
+     * generally do stupid things, whereas setting it to unofficial or lower
+     * will mean the encoder might produce output that is not supported by all
+     * spec-compliant decoders. Decoders don't differentiate between normal,
+     * unofficial and experimental (that is, they always try to decode things
+     * when they can) unless they are explicitly asked to behave stupidly
+     * (=strictly conform to the specs)
      */
-    int64_t timecode_frame_start;
+    int strict_std_compliance;
+#define FF_COMPLIANCE_VERY_STRICT   2 ///< Strictly conform to an older more strict version of the spec or reference software.
+#define FF_COMPLIANCE_STRICT        1 ///< Strictly conform to all the things in the spec no matter what consequences.
+#define FF_COMPLIANCE_NORMAL        0
+#define FF_COMPLIANCE_UNOFFICIAL   -1 ///< Allow unofficial extensions
+#define FF_COMPLIANCE_EXPERIMENTAL -2 ///< Allow nonstandardized experimental things.
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
     /**
-     * Decoder should decode to this many channels if it can (0 for default)
+     * error concealment flags
      * - encoding: unused
      * - decoding: Set by user.
-     * @deprecated Deprecated in favor of request_channel_layout.
      */
-    int request_channels;
-#endif
+    int error_concealment;
+#define FF_EC_GUESS_MVS   1
+#define FF_EC_DEBLOCK     2
 
     /**
-     * Percentage of dynamic range compression to be applied by the decoder.
-     * The default value is 1.0, corresponding to full compression.
+     * debug
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int debug;
+#define FF_DEBUG_PICT_INFO   1
+#define FF_DEBUG_RC          2
+#define FF_DEBUG_BITSTREAM   4
+#define FF_DEBUG_MB_TYPE     8
+#define FF_DEBUG_QP          16
+#define FF_DEBUG_MV          32
+#define FF_DEBUG_DCT_COEFF   0x00000040
+#define FF_DEBUG_SKIP        0x00000080
+#define FF_DEBUG_STARTCODE   0x00000100
+#define FF_DEBUG_PTS         0x00000200
+#define FF_DEBUG_ER          0x00000400
+#define FF_DEBUG_MMCO        0x00000800
+#define FF_DEBUG_BUGS        0x00001000
+#define FF_DEBUG_VIS_QP      0x00002000
+#define FF_DEBUG_VIS_MB_TYPE 0x00004000
+#define FF_DEBUG_BUFFERS     0x00008000
+#define FF_DEBUG_THREADS     0x00010000
+
+    /**
+     * debug
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int debug_mv;
+#define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
+#define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
+#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
+
+    /**
+     * Error recognition; may misdetect some more or less valid parts as errors.
      * - encoding: unused
      * - decoding: Set by user.
      */
-    float drc_scale;
+    int err_recognition;
+#define AV_EF_CRCCHECK  (1<<0)
+#define AV_EF_BITSTREAM (1<<1)
+#define AV_EF_BUFFER    (1<<2)
+#define AV_EF_EXPLODE   (1<<3)
+
+#define AV_EF_CAREFUL    (1<<16)
+#define AV_EF_COMPLIANT  (1<<17)
+#define AV_EF_AGGRESSIVE (1<<18)
+
 
     /**
      * opaque 64bit 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.
      */
     int64_t reordered_opaque;
 
     /**
+     * Hardware accelerator in use
+     * - encoding: unused.
+     * - decoding: Set by libavcodec
+     */
+    struct AVHWAccel *hwaccel;
+
+    /**
+     * Hardware accelerator context.
+     * For some hardware accelerators, a global context needs to be
+     * provided by the user. In that case, this holds display-dependent
+     * data FFmpeg cannot instantiate itself. Please refer to the
+     * FFmpeg HW accelerator documentation to know how to fill this
+     * is. e.g. for VA API, this is a struct vaapi_context.
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    void *hwaccel_context;
+
+    /**
+     * error
+     * - encoding: Set by libavcodec if flags&CODEC_FLAG_PSNR.
+     * - decoding: unused
+     */
+    uint64_t error[AV_NUM_DATA_POINTERS];
+
+    /**
+     * DCT algorithm, see FF_DCT_* below
+     * - encoding: Set by user.
+     * - decoding: unused
+     */
+    int dct_algo;
+#define FF_DCT_AUTO    0
+#define FF_DCT_FASTINT 1
+#define FF_DCT_INT     2
+#define FF_DCT_MMX     3
+#define FF_DCT_ALTIVEC 5
+#define FF_DCT_FAAN    6
+
+    /**
+     * IDCT algorithm, see FF_IDCT_* below.
+     * - encoding: Set by user.
+     * - decoding: Set by user.
+     */
+    int idct_algo;
+#define FF_IDCT_AUTO          0
+#define FF_IDCT_INT           1
+#define FF_IDCT_SIMPLE        2
+#define FF_IDCT_SIMPLEMMX     3
+#define FF_IDCT_LIBMPEG2MMX   4
+#if FF_API_MMI
+#define FF_IDCT_MMI           5
+#endif
+#define FF_IDCT_ARM           7
+#define FF_IDCT_ALTIVEC       8
+#define FF_IDCT_SH4           9
+#define FF_IDCT_SIMPLEARM     10
+#define FF_IDCT_H264          11
+#define FF_IDCT_VP3           12
+#define FF_IDCT_IPP           13
+#define FF_IDCT_XVIDMMX       14
+#define FF_IDCT_CAVS          15
+#define FF_IDCT_SIMPLEARMV5TE 16
+#define FF_IDCT_SIMPLEARMV6   17
+#define FF_IDCT_SIMPLEVIS     18
+#define FF_IDCT_WMV2          19
+#define FF_IDCT_FAAN          20
+#define FF_IDCT_EA            21
+#define FF_IDCT_SIMPLENEON    22
+#define FF_IDCT_SIMPLEALPHA   23
+#define FF_IDCT_BINK          24
+
+#if FF_API_DSP_MASK
+    /**
+     * Unused.
+     * @deprecated use av_set_cpu_flags_mask() instead.
+     */
+    attribute_deprecated unsigned dsp_mask;
+#endif
+
+    /**
+     * bits per sample/pixel from the demuxer (needed for huffyuv).
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by user.
+     */
+     int bits_per_coded_sample;
+
+    /**
      * Bits per sample/pixel of internal libavcodec pixel/sample format.
-     * This field is applicable only when sample_fmt is SAMPLE_FMT_S32.
      * - encoding: set by user.
      * - decoding: set by libavcodec.
      */
     int bits_per_raw_sample;
 
     /**
-     * Audio channel layout.
-     * - encoding: set by user.
-     * - decoding: set by libavcodec.
+     * low resolution decoding, 1-> 1/2 size, 2->1/4 size
+     * - encoding: unused
+     * - decoding: Set by user.
      */
-    int64_t channel_layout;
+     int lowres;
 
     /**
-     * Request decoder to use this channel layout if it can (0 for default)
-     * - encoding: unused
+     * the picture in the bitstream
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    AVFrame *coded_frame;
+
+    /**
+     * thread count
+     * is used to decide how many independent tasks should be passed to execute()
+     * - encoding: Set by user.
      * - decoding: Set by user.
      */
-    int64_t request_channel_layout;
+    int thread_count;
 
     /**
-     * Ratecontrol attempt to use, at maximum, <value> of what can be used without an underflow.
+     * Which multithreading methods to use.
+     * Use of FF_THREAD_FRAME will increase decoding delay by one frame per thread,
+     * so clients which cannot provide future frames should not use it.
+     *
+     * - encoding: Set by user, otherwise the default is used.
+     * - decoding: Set by user, otherwise the default is used.
+     */
+    int thread_type;
+#define FF_THREAD_FRAME   1 ///< Decode more than one frame at once
+#define FF_THREAD_SLICE   2 ///< Decode more than one part of a single frame at once
+
+    /**
+     * Which multithreading methods are in use by the codec.
+     * - encoding: Set by libavcodec.
+     * - decoding: Set by libavcodec.
+     */
+    int active_thread_type;
+
+    /**
+     * Set by the client if its custom get_buffer() callback can be called
+     * synchronously from another thread, which allows faster multithreaded decoding.
+     * draw_horiz_band() will be called from other threads regardless of this setting.
+     * Ignored if the default get_buffer() is used.
      * - encoding: Set by user.
-     * - decoding: unused.
+     * - decoding: Set by user.
      */
-    float rc_max_available_vbv_use;
+    int thread_safe_callbacks;
 
     /**
-     * Ratecontrol attempt to use, at least, <value> times the amount needed to prevent a vbv overflow.
+     * The codec may call this to execute several independent things.
+     * It will return only after finishing all tasks.
+     * The user may replace this with some multithreaded implementation,
+     * the default implementation will execute the parts serially.
+     * @param count the number of things to execute
+     * - encoding: Set by libavcodec, user can override.
+     * - decoding: Set by libavcodec, user can override.
+     */
+    int (*execute)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg), void *arg2, int *ret, int count, int size);
+
+    /**
+     * The codec may call this to execute several independent things.
+     * It will return only after finishing all tasks.
+     * The user may replace this with some multithreaded implementation,
+     * the default implementation will execute the parts serially.
+     * Also see avcodec_thread_init and e.g. the --enable-pthread configure option.
+     * @param c context passed also to func
+     * @param count the number of things to execute
+     * @param arg2 argument passed unchanged to func
+     * @param ret return values of executed functions, must have space for "count" values. May be NULL.
+     * @param func function that will be called count times, with jobnr from 0 to count-1.
+     *             threadnr will be in the range 0 to c->thread_count-1 < MAX_THREADS and so that no
+     *             two instances of func executing at the same time will have the same threadnr.
+     * @return always 0 currently, but code should handle a future improvement where when any call to func
+     *         returns < 0 no further calls to func may be done and < 0 is returned.
+     * - encoding: Set by libavcodec, user can override.
+     * - decoding: Set by libavcodec, user can override.
+     */
+    int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
+
+    /**
+     * thread opaque
+     * Can be used by execute() to store some per AVCodecContext stuff.
+     * - encoding: set by execute()
+     * - decoding: set by execute()
+     */
+    void *thread_opaque;
+
+    /**
+     * noise vs. sse weight for the nsse comparsion function
      * - encoding: Set by user.
-     * - decoding: unused.
+     * - decoding: unused
      */
-    float rc_min_vbv_overflow_use;
+     int nsse_weight;
 
     /**
-     * Hardware accelerator in use
-     * - encoding: unused.
-     * - decoding: Set by libavcodec
+     * profile
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
      */
-    struct AVHWAccel *hwaccel;
+     int profile;
+#define FF_PROFILE_UNKNOWN -99
+#define FF_PROFILE_RESERVED -100
+
+#define FF_PROFILE_AAC_MAIN 0
+#define FF_PROFILE_AAC_LOW  1
+#define FF_PROFILE_AAC_SSR  2
+#define FF_PROFILE_AAC_LTP  3
+#define FF_PROFILE_AAC_HE   4
+#define FF_PROFILE_AAC_HE_V2 28
+#define FF_PROFILE_AAC_LD   22
+#define FF_PROFILE_AAC_ELD  38
+
+#define FF_PROFILE_DTS         20
+#define FF_PROFILE_DTS_ES      30
+#define FF_PROFILE_DTS_96_24   40
+#define FF_PROFILE_DTS_HD_HRA  50
+#define FF_PROFILE_DTS_HD_MA   60
+
+#define FF_PROFILE_MPEG2_422    0
+#define FF_PROFILE_MPEG2_HIGH   1
+#define FF_PROFILE_MPEG2_SS     2
+#define FF_PROFILE_MPEG2_SNR_SCALABLE  3
+#define FF_PROFILE_MPEG2_MAIN   4
+#define FF_PROFILE_MPEG2_SIMPLE 5
+
+#define FF_PROFILE_H264_CONSTRAINED  (1<<9)  // 8+1; constraint_set1_flag
+#define FF_PROFILE_H264_INTRA        (1<<11) // 8+3; constraint_set3_flag
+
+#define FF_PROFILE_H264_BASELINE             66
+#define FF_PROFILE_H264_CONSTRAINED_BASELINE (66|FF_PROFILE_H264_CONSTRAINED)
+#define FF_PROFILE_H264_MAIN                 77
+#define FF_PROFILE_H264_EXTENDED             88
+#define FF_PROFILE_H264_HIGH                 100
+#define FF_PROFILE_H264_HIGH_10              110
+#define FF_PROFILE_H264_HIGH_10_INTRA        (110|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_HIGH_422             122
+#define FF_PROFILE_H264_HIGH_422_INTRA       (122|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_HIGH_444             144
+#define FF_PROFILE_H264_HIGH_444_PREDICTIVE  244
+#define FF_PROFILE_H264_HIGH_444_INTRA       (244|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_CAVLC_444            44
+
+#define FF_PROFILE_VC1_SIMPLE   0
+#define FF_PROFILE_VC1_MAIN     1
+#define FF_PROFILE_VC1_COMPLEX  2
+#define FF_PROFILE_VC1_ADVANCED 3
+
+#define FF_PROFILE_MPEG4_SIMPLE                     0
+#define FF_PROFILE_MPEG4_SIMPLE_SCALABLE            1
+#define FF_PROFILE_MPEG4_CORE                       2
+#define FF_PROFILE_MPEG4_MAIN                       3
+#define FF_PROFILE_MPEG4_N_BIT                      4
+#define FF_PROFILE_MPEG4_SCALABLE_TEXTURE           5
+#define FF_PROFILE_MPEG4_SIMPLE_FACE_ANIMATION      6
+#define FF_PROFILE_MPEG4_BASIC_ANIMATED_TEXTURE     7
+#define FF_PROFILE_MPEG4_HYBRID                     8
+#define FF_PROFILE_MPEG4_ADVANCED_REAL_TIME         9
+#define FF_PROFILE_MPEG4_CORE_SCALABLE             10
+#define FF_PROFILE_MPEG4_ADVANCED_CODING           11
+#define FF_PROFILE_MPEG4_ADVANCED_CORE             12
+#define FF_PROFILE_MPEG4_ADVANCED_SCALABLE_TEXTURE 13
+#define FF_PROFILE_MPEG4_SIMPLE_STUDIO             14
+#define FF_PROFILE_MPEG4_ADVANCED_SIMPLE           15
+
+    /**
+     * level
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+     int level;
+#define FF_LEVEL_UNKNOWN -99
 
     /**
-     * For some codecs, the time base is closer to the field rate than the frame rate.
-     * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration
-     * if no telecine is used ...
      *
-     * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2.
+     * - encoding: unused
+     * - decoding: Set by user.
      */
-    int ticks_per_frame;
+    enum AVDiscard skip_loop_filter;
 
     /**
-     * Hardware accelerator context.
-     * For some hardware accelerators, a global context needs to be
-     * provided by the user. In that case, this holds display-dependent
-     * data FFmpeg cannot instantiate itself. Please refer to the
-     * FFmpeg HW accelerator documentation to know how to fill this
-     * is. e.g. for VA API, this is a struct vaapi_context.
+     *
      * - encoding: unused
-     * - decoding: Set by user
+     * - decoding: Set by user.
      */
-    void *hwaccel_context;
+    enum AVDiscard skip_idct;
 
     /**
-     * Chromaticity coordinates of the source primaries.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
+     *
+     * - encoding: unused
+     * - decoding: Set by user.
      */
-    enum AVColorPrimaries color_primaries;
+    enum AVDiscard skip_frame;
 
     /**
-     * Color Transfer Characteristic.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
+     * Header containing style information for text subtitles.
+     * For SUBTITLE_ASS subtitle type, it should contain the whole ASS
+     * [Script Info] and [V4+ Styles] section, plus the [Events] line and
+     * the Format line following. It shouldn't include any Dialogue line.
+     * - encoding: Set/allocated/freed by user (before avcodec_open2())
+     * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2())
      */
-    enum AVColorTransferCharacteristic color_trc;
+    uint8_t *subtitle_header;
+    int subtitle_header_size;
 
     /**
-     * YUV colorspace type.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
+     * Simulates errors in the bitstream to test error concealment.
+     * - encoding: Set by user.
+     * - decoding: unused
      */
-    enum AVColorSpace colorspace;
+    int error_rate;
 
     /**
-     * MPEG vs JPEG YUV range.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
+     * Current packet as passed into the decoder, to avoid having
+     * to pass the packet into every function. Currently only valid
+     * inside lavc and get/release_buffer callbacks.
+     * - decoding: set by avcodec_decode_*, read by get_buffer() for setting pkt_pts
+     * - encoding: unused
      */
-    enum AVColorRange color_range;
+    AVPacket *pkt;
 
     /**
-     * This defines the location of chroma samples.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
+     * VBV delay coded in the last frame (in periods of a 27 MHz clock).
+     * Used for compliant TS muxing.
+     * - encoding: Set by libavcodec.
+     * - decoding: unused.
+     */
+    uint64_t vbv_delay;
+
+    /**
+     * Timebase in which pkt_dts/pts and AVPacket.dts/pts are.
+     * Code outside libavcodec should access this field using:
+     * avcodec_set_pkt_timebase(avctx)
+     * - encoding unused.
+     * - decodimg set by user
+     */
+    AVRational pkt_timebase;
+
+    /**
+     * AVCodecDescriptor
+     * Code outside libavcodec should access this field using:
+     * avcodec_get_codec_descriptior(avctx)
+     * - encoding: unused.
+     * - decoding: set by libavcodec.
      */
-     enum AVChromaLocation chroma_sample_location;
+    const AVCodecDescriptor *codec_descriptor;
+
+    /**
+     * Current statistics for PTS correction.
+     * - decoding: maintained and used by libavcodec, not intended to be used by user apps
+     * - encoding: unused
+     */
+    int64_t pts_correction_num_faulty_pts; /// Number of incorrect PTS values so far
+    int64_t pts_correction_num_faulty_dts; /// Number of incorrect DTS values so far
+    int64_t pts_correction_last_pts;       /// PTS of the last frame
+    int64_t pts_correction_last_dts;       /// DTS of the last frame
 } AVCodecContext;
 
+AVRational av_codec_get_pkt_timebase         (const AVCodecContext *avctx);
+void       av_codec_set_pkt_timebase         (AVCodecContext *avctx, AVRational val);
+
+const AVCodecDescriptor *av_codec_get_codec_descriptor(const AVCodecContext *avctx);
+void                     av_codec_set_codec_descriptor(AVCodecContext *avctx, const AVCodecDescriptor *desc);
+
+/**
+ * AVProfile.
+ */
+typedef struct AVProfile {
+    int profile;
+    const char *name; ///< short name for the profile
+} AVProfile;
+
+typedef struct AVCodecDefault AVCodecDefault;
+
+struct AVSubtitle;
+
 /**
  * AVCodec.
  */
@@ -2518,34 +3122,88 @@
      * This is the primary way to find a codec from the user perspective.
      */
     const char *name;
-    enum CodecType type;
-    enum CodecID id;
-    int priv_data_size;
-    int (*init)(AVCodecContext *);
-    int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data);
-    int (*close)(AVCodecContext *);
-    int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt);
+    /**
+     * Descriptive name for the codec, meant to be more human readable than name.
+     * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
+     */
+    const char *long_name;
+    enum AVMediaType type;
+    enum AVCodecID id;
     /**
      * Codec capabilities.
      * see CODEC_CAP_*
      */
     int capabilities;
+    const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
+    const enum AVPixelFormat *pix_fmts;     ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
+    const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
+    const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
+    const uint64_t *channel_layouts;         ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
+    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}
+
+    /*****************************************************************
+     * No fields below this line are part of the public API. They
+     * may not be used outside of libavcodec and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+    int priv_data_size;
     struct AVCodec *next;
     /**
+     * @name Frame-level threading support functions
+     * @{
+     */
+    /**
+     * If defined, called on thread contexts when they are created.
+     * If the codec allocates writable tables in init(), re-allocate them here.
+     * priv_data will be set to a copy of the original.
+     */
+    int (*init_thread_copy)(AVCodecContext *);
+    /**
+     * Copy necessary context variables from a previous thread context to the current one.
+     * If not defined, the next thread will start automatically; otherwise, the codec
+     * must call ff_thread_finish_setup().
+     *
+     * dst and src will (rarely) point to the same context, in which case memcpy should be skipped.
+     */
+    int (*update_thread_context)(AVCodecContext *dst, const AVCodecContext *src);
+    /** @} */
+
+    /**
+     * Private codec-specific defaults.
+     */
+    const AVCodecDefault *defaults;
+
+    /**
+     * Initialize codec static data, called from avcodec_register().
+     */
+    void (*init_static_data)(struct AVCodec *codec);
+
+    int (*init)(AVCodecContext *);
+    int (*encode_sub)(AVCodecContext *, uint8_t *buf, int buf_size,
+                      const struct AVSubtitle *sub);
+    /**
+     * Encode data to an AVPacket.
+     *
+     * @param      avctx          codec context
+     * @param      avpkt          output AVPacket (may contain a user-provided buffer)
+     * @param[in]  frame          AVFrame containing the raw data to be encoded
+     * @param[out] got_packet_ptr encoder sets to 0 or 1 to indicate that a
+     *                            non-empty packet was returned in avpkt.
+     * @return 0 on success, negative error code on failure
+     */
+    int (*encode2)(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame,
+                   int *got_packet_ptr);
+    int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt);
+    int (*close)(AVCodecContext *);
+    /**
      * Flush buffers.
      * Will be called when seeking
      */
     void (*flush)(AVCodecContext *);
-    const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
-    const enum PixelFormat *pix_fmts;       ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
-    /**
-     * Descriptive name for the codec, meant to be more human readable than \p name.
-     * You \e should use the NULL_IF_CONFIG_SMALL() macro to define it.
-     */
-    const char *long_name;
-    const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
-    const enum SampleFormat *sample_fmts;   ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
-    const int64_t *channel_layouts;         ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
 } AVCodec;
 
 /**
@@ -2562,23 +3220,23 @@
     /**
      * Type of codec implemented by the hardware accelerator.
      *
-     * See CODEC_TYPE_xxx
+     * See AVMEDIA_TYPE_xxx
      */
-    enum CodecType type;
+    enum AVMediaType type;
 
     /**
      * Codec implemented by the hardware accelerator.
      *
-     * See CODEC_ID_xxx
+     * See AV_CODEC_ID_xxx
      */
-    enum CodecID id;
+    enum AVCodecID id;
 
     /**
      * Supported pixel format.
      *
      * Only hardware accelerated formats are supported here.
      */
-    enum PixelFormat pix_fmt;
+    enum AVPixelFormat pix_fmt;
 
     /**
      * Hardware accelerated codec capabilities.
@@ -2594,7 +3252,7 @@
      * Meaningful frame information (codec specific) is guaranteed to
      * be parsed at this point. This function is mandatory.
      *
-     * Note that \p buf can be NULL along with \p buf_size set to 0.
+     * Note that buf can be NULL along with buf_size set to 0.
      * Otherwise, this means the whole frame is available at this point.
      *
      * @param avctx the codec context
@@ -2639,39 +3297,24 @@
 } AVHWAccel;
 
 /**
+ * @defgroup lavc_picture AVPicture
+ *
+ * Functions for working with AVPicture
+ * @{
+ */
+
+/**
  * four components are given, that's all.
  * the last component is alpha
  */
 typedef struct AVPicture {
-    uint8_t *data[4];
-    int linesize[4];       ///< number of bytes per line
+    uint8_t *data[AV_NUM_DATA_POINTERS];
+    int linesize[AV_NUM_DATA_POINTERS];     ///< number of bytes per line
 } AVPicture;
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
 /**
- * AVPaletteControl
- * This structure defines a method for communicating palette changes
- * between and demuxer and a decoder.
- *
- * @deprecated Use AVPacket to send palette changes instead.
- * This is totally broken.
- */
-#define AVPALETTE_SIZE 1024
-#define AVPALETTE_COUNT 256
-typedef struct AVPaletteControl {
-
-    /* Demuxer sets this to 1 to indicate the palette has changed;
-     * decoder resets to 0. */
-    int palette_changed;
-
-    /* 4-byte ARGB palette entries, stored in native byte order; note that
-     * the individual palette components should be on a 8-bit scale; if
-     * the palette data comes from an IBM VGA native format, the component
-     * data is probably 6 bits in size and needs to be scaled. */
-    unsigned int palette[AVPALETTE_COUNT];
-
-} AVPaletteControl attribute_deprecated;
-#endif
+ * @}
+ */
 
 enum AVSubtitleType {
     SUBTITLE_NONE,
@@ -2709,10 +3352,16 @@
 
     /**
      * 0 terminated ASS/SSA compatible event line.
-     * The pressentation of this is unaffected by the other values in this
+     * The presentation of this is unaffected by the other values in this
      * struct.
      */
     char *ass;
+
+    /**
+     * 1 indicates this subtitle is a forced subtitle.
+     * A forced subtitle should be displayed even when subtitles are hidden.
+     */
+    int forced;
 } AVSubtitleRect;
 
 typedef struct AVSubtitle {
@@ -2721,673 +3370,605 @@
     uint32_t end_display_time; /* relative to packet pts, in ms */
     unsigned num_rects;
     AVSubtitleRect **rects;
+    int64_t pts;    ///< Same as packet pts, in AV_TIME_BASE
 } AVSubtitle;
 
-/* packet functions */
-
 /**
- * @deprecated use NULL instead
+ * 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 void av_destruct_packet_nofree(AVPacket *pkt);
+AVCodec *av_codec_next(const AVCodec *c);
 
 /**
- * Default packet destructor.
+ * Return the LIBAVCODEC_VERSION_INT constant.
  */
-void av_destruct_packet(AVPacket *pkt);
+unsigned avcodec_version(void);
 
 /**
- * Initialize optional fields of a packet with default values.
- *
- * @param pkt packet
+ * Return the libavcodec build-time configuration.
  */
-void av_init_packet(AVPacket *pkt);
+const char *avcodec_configuration(void);
 
 /**
- * Allocate the payload of a packet and initialize its fields with
- * default values.
- *
- * @param pkt packet
- * @param size wanted payload size
- * @return 0 if OK, AVERROR_xxx otherwise
+ * Return the libavcodec license.
  */
-int av_new_packet(AVPacket *pkt, int size);
+const char *avcodec_license(void);
 
 /**
- * Reduce packet size, correctly zeroing padding
+ * Register the codec codec and initialize libavcodec.
  *
- * @param pkt packet
- * @param size new size
+ * @warning either this function or avcodec_register_all() must be called
+ * before any other libavcodec functions.
+ *
+ * @see avcodec_register_all()
  */
-void av_shrink_packet(AVPacket *pkt, int size);
+void avcodec_register(AVCodec *codec);
 
 /**
- * @warning This is a hack - the packet memory allocation stuff is broken. The
- * packet is allocated if it was not really allocated.
+ * Register all the codecs, parsers and bitstream filters which were enabled at
+ * configuration time. If you do not call this function you can select exactly
+ * which formats you want to support, by using the individual registration
+ * functions.
+ *
+ * @see avcodec_register
+ * @see av_register_codec_parser
+ * @see av_register_bitstream_filter
  */
-int av_dup_packet(AVPacket *pkt);
+void avcodec_register_all(void);
+
 
+#if FF_API_ALLOC_CONTEXT
 /**
- * Free a packet.
+ * Allocate an AVCodecContext and set its fields to default values.  The
+ * resulting struct can be deallocated by simply calling av_free().
  *
- * @param pkt packet to free
+ * @return An AVCodecContext filled with default values or NULL on failure.
+ * @see avcodec_get_context_defaults
+ *
+ * @deprecated use avcodec_alloc_context3()
  */
-void av_free_packet(AVPacket *pkt);
-
-/* resample.c */
-
-struct ReSampleContext;
-struct AVResampleContext;
+attribute_deprecated
+AVCodecContext *avcodec_alloc_context(void);
 
-typedef struct ReSampleContext ReSampleContext;
+/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
+ *  we WILL change its arguments and name a few times! */
+attribute_deprecated
+AVCodecContext *avcodec_alloc_context2(enum AVMediaType);
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
 /**
- * @deprecated Use av_audio_resample_init() instead.
+ * Set the fields of the given AVCodecContext to default values.
+ *
+ * @param s The AVCodecContext of which the fields should be set to default values.
+ * @deprecated use avcodec_get_context_defaults3
  */
-attribute_deprecated ReSampleContext *audio_resample_init(int output_channels, int input_channels,
-                                                          int output_rate, int input_rate);
+attribute_deprecated
+void avcodec_get_context_defaults(AVCodecContext *s);
+
+/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
+ *  we WILL change its arguments and name a few times! */
+attribute_deprecated
+void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType);
 #endif
+
 /**
- *  Initializes audio resampling context
+ * 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().
+ *
+ * @param codec if non-NULL, allocate private data and initialize defaults
+ *              for the given codec. It is illegal to then call avcodec_open2()
+ *              with a different codec.
+ *              If NULL, then the codec-specific defaults won't be initialized,
+ *              which may result in suboptimal default settings (this is
+ *              important mainly for encoders, e.g. libx264).
  *
- * @param output_channels  number of output channels
- * @param input_channels   number of input channels
- * @param output_rate      output sample rate
- * @param input_rate       input sample rate
- * @param sample_fmt_out   requested output sample format
- * @param sample_fmt_in    input sample format
- * @param filter_length    length of each FIR filter in the filterbank relative to the cutoff freq
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear           If 1 then the used FIR filter will be linearly interpolated
-                           between the 2 closest, if 0 the closest will be used
- * @param cutoff           cutoff frequency, 1.0 corresponds to half the output sampling rate
- * @return allocated ReSampleContext, NULL if error occured
+ * @return An AVCodecContext filled with default values or NULL on failure.
+ * @see avcodec_get_context_defaults
  */
-ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
-                                        int output_rate, int input_rate,
-                                        enum SampleFormat sample_fmt_out,
-                                        enum SampleFormat sample_fmt_in,
-                                        int filter_length, int log2_phase_count,
-                                        int linear, double cutoff);
-
-int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples);
-void audio_resample_close(ReSampleContext *s);
-
+AVCodecContext *avcodec_alloc_context3(const AVCodec *codec);
 
 /**
- * Initializes an audio resampler.
- * Note, if either rate is not an integer then simply scale both rates up so they are.
- * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear If 1 then the used FIR filter will be linearly interpolated
-                 between the 2 closest, if 0 the closest will be used
- * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
+ * 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.
  */
-struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff);
+int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec);
 
 /**
- * resamples.
- * @param src an array of unconsumed samples
- * @param consumed the number of samples of src which have been consumed are returned here
- * @param src_size the number of unconsumed samples available
- * @param dst_size the amount of space in samples available in dst
- * @param update_ctx If this is 0 then the context will not be modified, that way several channels can be resampled with the same context.
- * @return the number of samples written in dst or -1 if an error occurred
+ * Get the AVClass for AVCodecContext. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
+ *
+ * @see av_opt_find().
  */
-int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx);
-
+const AVClass *avcodec_get_class(void);
 
 /**
- * Compensates samplerate/timestamp drift. The compensation is done by changing
- * the resampler parameters, so no audible clicks or similar distortions occur
- * @param compensation_distance distance in output samples over which the compensation should be performed
- * @param sample_delta number of output samples which should be output less
+ * Get the AVClass for AVFrame. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
  *
- * 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
+ * @see av_opt_find().
  */
-void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance);
-void av_resample_close(struct AVResampleContext *c);
+const AVClass *avcodec_get_frame_class(void);
 
 /**
- * Allocate memory for a picture.  Call avpicture_free to free it.
+ * Get the AVClass for AVSubtitleRect. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
  *
- * @param picture the picture to be filled in
- * @param pix_fmt the format of the picture
- * @param width the width of the picture
- * @param height the height of the picture
- * @return zero if successful, a negative value if not
+ * @see av_opt_find().
  */
-int avpicture_alloc(AVPicture *picture, enum PixelFormat pix_fmt, int width, int height);
+const AVClass *avcodec_get_subtitle_rect_class(void);
 
 /**
- * Free a picture previously allocated by avpicture_alloc().
+ * Copy the settings of the source AVCodecContext into the destination
+ * AVCodecContext. The resulting destination codec context will be
+ * unopened, i.e. you are required to call avcodec_open2() before you
+ * can use this AVCodecContext to decode/encode video/audio data.
  *
- * @param picture the AVPicture to be freed
+ * @param dest target codec context, should be initialized with
+ *             avcodec_alloc_context3(), but otherwise uninitialized
+ * @param src source codec context
+ * @return AVERROR() on error (e.g. memory allocation error), 0 on success
  */
-void avpicture_free(AVPicture *picture);
+int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
 
 /**
- * Fill in the AVPicture fields.
- * The fields of the given AVPicture are filled in by using the 'ptr' address
- * which points to the image data buffer. Depending on the specified picture
- * format, one or multiple image data pointers and line sizes will be set.
- * If a planar format is specified, several pointers will be set pointing to
- * the different picture planes and the line sizes of the different planes
- * will be stored in the lines_sizes array.
- * Call with ptr == NULL to get the required size for the ptr buffer.
- *
- * @param picture AVPicture whose fields are to be filled in
- * @param ptr Buffer which will contain or contains the actual image data
- * @param pix_fmt The format in which the picture data is stored.
- * @param width the width of the image in pixels
- * @param height the height of the image in pixels
- * @return size of the image data in bytes
+ * Allocate an AVFrame and set its fields to default values.  The resulting
+ * struct must be freed using avcodec_free_frame().
+ *
+ * @return An AVFrame filled with default values or NULL on failure.
+ * @see avcodec_get_frame_defaults
  */
-int avpicture_fill(AVPicture *picture, uint8_t *ptr,
-                   int pix_fmt, int width, int height);
-int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width, int height,
-                     unsigned char *dest, int dest_size);
+AVFrame *avcodec_alloc_frame(void);
 
 /**
- * Calculate the size in bytes that a picture of the given width and height
- * would occupy if stored in the given picture format.
- * Note that this returns the size of a compact representation as generated
- * by avpicture_layout, which can be smaller than the size required for e.g.
- * avpicture_fill.
- *
- * @param pix_fmt the given picture format
- * @param width the width of the image
- * @param height the height of the image
- * @return Image data size in bytes or -1 on error (e.g. too large dimensions).
- */
-int avpicture_get_size(enum PixelFormat pix_fmt, int width, int height);
-void avcodec_get_chroma_sub_sample(enum PixelFormat pix_fmt, int *h_shift, int *v_shift);
-const char *avcodec_get_pix_fmt_name(enum PixelFormat pix_fmt);
-void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
+ * Set the fields of the given AVFrame to default values.
+ *
+ * @param frame The AVFrame of which the fields should be set to default values.
+ */
+void avcodec_get_frame_defaults(AVFrame *frame);
 
 /**
- * Returns the pixel format corresponding to the name \p name.
+ * Free the frame and any dynamically allocated objects in it,
+ * e.g. extended_data.
  *
- * If there is no pixel format with name \p name, then looks for a
- * pixel format with the name corresponding to the native endian
- * format of \p name.
- * For example in a little-endian system, first looks for "gray16",
- * then for "gray16le".
+ * @param frame frame to be freed. The pointer will be set to NULL.
  *
- * Finally if no pixel format has been found, returns \c PIX_FMT_NONE.
+ * @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()).
  */
-enum PixelFormat avcodec_get_pix_fmt(const char* name);
-unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat p);
-
-#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) */
+void avcodec_free_frame(AVFrame **frame);
 
+#if FF_API_AVCODEC_OPEN
 /**
- * Computes what kind of losses will occur when converting from one specific
- * pixel format to another.
- * When converting from one pixel format to another, information loss may occur.
- * For example, when converting from RGB24 to GRAY, the color information will
- * be lost. Similarly, other losses occur when converting from some formats to
- * other formats. These losses can involve loss of chroma, but also loss of
- * resolution, loss of color depth, loss due to the color space conversion, loss
- * of the alpha bits or loss due to color quantization.
- * avcodec_get_fix_fmt_loss() informs you about the various types of losses
- * which will occur when converting from one pixel format to another.
+ * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
+ * function the context has to be allocated.
  *
- * @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.
+ * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
+ * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
+ * retrieving a codec.
+ *
+ * @warning This function is not thread safe!
+ *
+ * @code
+ * avcodec_register_all();
+ * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
+ * if (!codec)
+ *     exit(1);
+ *
+ * context = avcodec_alloc_context3(codec);
+ *
+ * if (avcodec_open(context, codec) < 0)
+ *     exit(1);
+ * @endcode
+ *
+ * @param avctx The context which will be set up to use the given codec.
+ * @param codec The codec to use within the context.
+ * @return zero on success, a negative value on error
+ * @see avcodec_alloc_context3, avcodec_find_decoder, avcodec_find_encoder, avcodec_close
+ *
+ * @deprecated use avcodec_open2
  */
-int avcodec_get_pix_fmt_loss(enum PixelFormat dst_pix_fmt, enum PixelFormat src_pix_fmt,
-                             int has_alpha);
+attribute_deprecated
+int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
+#endif
 
 /**
- * Finds the best pixel format to convert to given a certain source pixel
- * format.  When converting from one pixel format to another, information loss
- * may occur.  For example, when converting from RGB24 to GRAY, the color
- * information will be lost. Similarly, other losses occur when converting from
- * some formats to other formats. avcodec_find_best_pix_fmt() searches which of
- * the given pixel formats should be used to suffer the least amount of loss.
- * The pixel formats from which it chooses one, are determined by the
- * \p pix_fmt_mask parameter.
+ * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
+ * function the context has to be allocated with avcodec_alloc_context3().
+ *
+ * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
+ * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
+ * retrieving a codec.
+ *
+ * @warning This function is not thread safe!
  *
  * @code
- * src_pix_fmt = PIX_FMT_YUV420P;
- * pix_fmt_mask = (1 << PIX_FMT_YUV422P) || (1 << PIX_FMT_RGB24);
- * dst_pix_fmt = avcodec_find_best_pix_fmt(pix_fmt_mask, src_pix_fmt, alpha, &loss);
+ * avcodec_register_all();
+ * av_dict_set(&opts, "b", "2.5M", 0);
+ * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
+ * if (!codec)
+ *     exit(1);
+ *
+ * context = avcodec_alloc_context3(codec);
+ *
+ * if (avcodec_open2(context, codec, opts) < 0)
+ *     exit(1);
  * @endcode
  *
- * @param[in] pix_fmt_mask bitmask determining which pixel format to choose from
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
- * @return The best pixel format to convert to or -1 if none was found.
+ * @param avctx The context to initialize.
+ * @param codec The codec to open this context for. If a non-NULL codec has been
+ *              previously passed to avcodec_alloc_context3() or
+ *              avcodec_get_context_defaults3() for this context, then this
+ *              parameter MUST be either NULL or equal to the previously passed
+ *              codec.
+ * @param options A dictionary filled with AVCodecContext and codec-private options.
+ *                On return this object will be filled with options that were not found.
+ *
+ * @return zero on success, a negative value on error
+ * @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(),
+ *      av_dict_set(), av_opt_find().
  */
-enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelFormat src_pix_fmt,
-                              int has_alpha, int *loss_ptr);
-
+int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options);
 
 /**
- * Print in buf the string corresponding to the pixel format with
- * number pix_fmt, or an header if pix_fmt is negative.
+ * Close a given AVCodecContext and free all the data associated with it
+ * (but not the AVCodecContext itself).
  *
- * @param[in] buf the buffer where to write the string
- * @param[in] buf_size the size of buf
- * @param[in] pix_fmt the number of the pixel format to print the corresponding info string, or
- * a negative value to print the corresponding header.
- * Meaningful values for obtaining a pixel format info vary from 0 to PIX_FMT_NB -1.
+ * 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.
  */
-void avcodec_pix_fmt_string (char *buf, int buf_size, enum PixelFormat pix_fmt);
-
-#define FF_ALPHA_TRANSP       0x0001 /* image has some totally transparent pixels */
-#define FF_ALPHA_SEMI_TRANSP  0x0002 /* image has some transparent pixels */
+int avcodec_close(AVCodecContext *avctx);
 
 /**
- * Tell if an image really has transparent alpha values.
- * @return ored mask of FF_ALPHA_xxx constants
+ * Free all allocated data in the given subtitle struct.
+ *
+ * @param sub AVSubtitle to free.
  */
-int img_get_alpha_info(const AVPicture *src,
-                       enum PixelFormat pix_fmt, int width, int height);
+void avsubtitle_free(AVSubtitle *sub);
 
-/* deinterlace a picture */
-/* deinterlace - if not supported return -1 */
-int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
-                          enum PixelFormat pix_fmt, int width, int height);
+/**
+ * @}
+ */
 
-/* external high level API */
+/**
+ * @addtogroup lavc_packet
+ * @{
+ */
 
 /**
- * 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.
+ * Default packet destructor.
  */
-AVCodec *av_codec_next(AVCodec *c);
+void av_destruct_packet(AVPacket *pkt);
 
 /**
- * Returns the LIBAVCODEC_VERSION_INT constant.
+ * Initialize optional fields of a packet with default values.
+ *
+ * Note, this does not touch the data and size members, which have to be
+ * initialized separately.
+ *
+ * @param pkt packet
  */
-unsigned avcodec_version(void);
+void av_init_packet(AVPacket *pkt);
 
 /**
- * Initializes libavcodec.
+ * Allocate the payload of a packet and initialize its fields with
+ * default values.
  *
- * @warning This function \e must be called before any other libavcodec
- * function.
+ * @param pkt packet
+ * @param size wanted payload size
+ * @return 0 if OK, AVERROR_xxx otherwise
  */
-void avcodec_init(void);
+int av_new_packet(AVPacket *pkt, int size);
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
 /**
- * @deprecated Deprecated in favor of avcodec_register().
+ * Reduce packet size, correctly zeroing padding
+ *
+ * @param pkt packet
+ * @param size new size
  */
-attribute_deprecated void register_avcodec(AVCodec *codec);
-#endif
+void av_shrink_packet(AVPacket *pkt, int size);
 
 /**
- * Register the codec \p codec and initialize libavcodec.
+ * Increase packet size, correctly zeroing padding
  *
- * @see avcodec_init()
+ * @param pkt packet
+ * @param grow_by number of bytes by which to increase the size of the packet
  */
-void avcodec_register(AVCodec *codec);
+int av_grow_packet(AVPacket *pkt, int grow_by);
+
+/**
+ * @warning This is a hack - the packet memory allocation stuff is broken. The
+ * packet is allocated if it was not really allocated.
+ */
+int av_dup_packet(AVPacket *pkt);
 
 /**
- * Finds a registered encoder with a matching codec ID.
+ * Copy packet, including contents
  *
- * @param id CodecID of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
+ * @return 0 on success, negative AVERROR on fail
  */
-AVCodec *avcodec_find_encoder(enum CodecID id);
+int av_copy_packet(AVPacket *dst, AVPacket *src);
 
 /**
- * Finds a registered encoder with the specified name.
+ * Free a packet.
  *
- * @param name name of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
+ * @param pkt packet to free
  */
-AVCodec *avcodec_find_encoder_by_name(const char *name);
+void av_free_packet(AVPacket *pkt);
 
 /**
- * Finds a registered decoder with a matching codec ID.
+ * Allocate new information of a packet.
  *
- * @param id CodecID of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
+ * @param pkt packet
+ * @param type side information type
+ * @param size side information size
+ * @return pointer to fresh allocated data or NULL otherwise
  */
-AVCodec *avcodec_find_decoder(enum CodecID id);
+uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+                                 int size);
 
 /**
- * Finds a registered decoder with the specified name.
+ * Shrink the already allocated side data buffer
  *
- * @param name name of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
+ * @param pkt packet
+ * @param type side information type
+ * @param size new side information size
+ * @return 0 on success, < 0 on failure
  */
-AVCodec *avcodec_find_decoder_by_name(const char *name);
-void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
+int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+                               int size);
 
 /**
- * Sets the fields of the given AVCodecContext to default values.
+ * Get side information from packet.
  *
- * @param s The AVCodecContext of which the fields should be set to default values.
+ * @param pkt packet
+ * @param type desired side information type
+ * @param size pointer for side information size to store (optional)
+ * @return pointer to data if present or NULL otherwise
  */
-void avcodec_get_context_defaults(AVCodecContext *s);
+uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+                                 int *size);
+
+int av_packet_merge_side_data(AVPacket *pkt);
+
+int av_packet_split_side_data(AVPacket *pkt);
 
-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
- *  we WILL change its arguments and name a few times! */
-void avcodec_get_context_defaults2(AVCodecContext *s, enum CodecType);
 
 /**
- * Allocates an AVCodecContext and sets its fields to default values.  The
- * resulting struct can be deallocated by simply calling av_free().
- *
- * @return An AVCodecContext filled with default values or NULL on failure.
- * @see avcodec_get_context_defaults
+ * @}
  */
-AVCodecContext *avcodec_alloc_context(void);
 
-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
- *  we WILL change its arguments and name a few times! */
-AVCodecContext *avcodec_alloc_context2(enum CodecType);
+/**
+ * @addtogroup lavc_decoding
+ * @{
+ */
 
 /**
- * Sets the fields of the given AVFrame to default values.
+ * Find a registered decoder with a matching codec ID.
  *
- * @param pic The AVFrame of which the fields should be set to default values.
+ * @param id AVCodecID of the requested decoder
+ * @return A decoder if one was found, NULL otherwise.
  */
-void avcodec_get_frame_defaults(AVFrame *pic);
+AVCodec *avcodec_find_decoder(enum AVCodecID id);
 
 /**
- * Allocates an AVFrame and sets its fields to default values.  The resulting
- * struct can be deallocated by simply calling av_free().
+ * Find a registered decoder with the specified name.
  *
- * @return An AVFrame filled with default values or NULL on failure.
- * @see avcodec_get_frame_defaults
+ * @param name name of the requested decoder
+ * @return A decoder if one was found, NULL otherwise.
  */
-AVFrame *avcodec_alloc_frame(void);
+AVCodec *avcodec_find_decoder_by_name(const char *name);
 
 int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
 void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
 int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
-void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
 
 /**
- * Checks if the given dimension of a picture is valid, meaning that all
- * bytes of the picture can be addressed with a signed int.
+ * 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.
  *
- * @param[in] w Width of the picture.
- * @param[in] h Height of the picture.
- * @return Zero if valid, a negative value if invalid.
- */
-int avcodec_check_dimensions(void *av_log_ctx, unsigned int w, unsigned int h);
-enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt);
-
-int avcodec_thread_init(AVCodecContext *s, int thread_count);
-void avcodec_thread_free(AVCodecContext *s);
-int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
-int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
-//FIXME func typedef
+ * @return Required padding in pixels.
+ */
+unsigned avcodec_get_edge_width(void);
 
 /**
- * Initializes the AVCodecContext to use the given AVCodec. Prior to using this
- * function the context has to be allocated.
+ * 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.
  *
- * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
- * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
- * retrieving a codec.
- *
- * @warning This function is not thread safe!
- *
- * @code
- * avcodec_register_all();
- * codec = avcodec_find_decoder(CODEC_ID_H264);
- * if (!codec)
- *     exit(1);
- *
- * context = avcodec_alloc_context();
- *
- * if (avcodec_open(context, codec) < 0)
- *     exit(1);
- * @endcode
- *
- * @param avctx The context which will be set up to use the given codec.
- * @param codec The codec to use within the context.
- * @return zero on success, a negative value on error
- * @see avcodec_alloc_context, avcodec_find_decoder, avcodec_find_encoder
+ * May only be used if a codec with CODEC_CAP_DR1 has been opened.
+ * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
+ * according to avcodec_get_edge_width() before.
  */
-int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
+void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
 /**
- * Decodes an audio frame from \p buf into \p samples.
- * Wrapper function which calls avcodec_decode_audio3.
+ * Modify width and height values so that they will result in a memory
+ * buffer that is acceptable for the codec if you also ensure that all
+ * line sizes are a multiple of the respective linesize_align[i].
  *
- * @deprecated Use avcodec_decode_audio3 instead.
- * @param avctx the codec context
- * @param[out] samples the output buffer
- * @param[in,out] frame_size_ptr the output buffer size in bytes
- * @param[in] buf the input buffer
- * @param[in] buf_size the input buffer size in bytes
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame could be decompressed.
+ * May only be used if a codec with CODEC_CAP_DR1 has been opened.
+ * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
+ * according to avcodec_get_edge_width() before.
  */
-attribute_deprecated int avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples,
-                         int *frame_size_ptr,
-                         const uint8_t *buf, int buf_size);
-#endif
+void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
+                               int linesize_align[AV_NUM_DATA_POINTERS]);
 
+#if FF_API_OLD_DECODE_AUDIO
 /**
- * Decodes the audio frame of size avpkt->size from avpkt->data into samples.
+ * 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.
+ * 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 decompressed, \p frame_size_ptr is zero. Otherwise, it is the
- * decompressed frame size in \e bytes.
+ * could be outputted, frame_size_ptr is zero. Otherwise, it is the
+ * decompressed frame size in bytes.
  *
- * @warning You \e must set \p frame_size_ptr to the allocated size of the
+ * @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 \c FF_INPUT_BUFFER_PADDING_SIZE larger than
+ * @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 \p avpkt->data should be set to 0 to ensure that
+ * @warning The end of the input buffer avpkt->data should be set to 0 to ensure that
  * no overreading happens for damaged MPEG streams.
  *
- * @note You might have to align the input buffer \p avpkt->data and output buffer \p
+ * @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, the
- * bitstream should have 4 byte alignment at minimum and all sample data should
- * be 16 byte aligned unless the CPU doesn't need it (AltiVec and SSE do). If
- * the linesize is not a multiple of 16 then there's no sense in aligning the
- * start of the buffer to 16.
+ * 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
+ * @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 could be decompressed.
+ * used or zero if no frame data was decompressed (used) from the input AVPacket.
  */
-int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
+attribute_deprecated int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
                          int *frame_size_ptr,
                          AVPacket *avpkt);
+#endif
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
 /**
- * Decodes a video frame from \p buf into \p picture.
- * Wrapper function which calls avcodec_decode_video2.
+ * Decode the audio frame of size avpkt->size from avpkt->data into frame.
  *
- * @deprecated Use avcodec_decode_video2 instead.
- * @param avctx the codec context
- * @param[out] picture The AVFrame in which the decoded video frame will be stored.
- * @param[in] buf the input buffer
- * @param[in] buf_size the size of the input buffer in bytes
- * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame could be decompressed.
+ * Some decoders may support multiple frames in a single AVPacket. Such
+ * decoders would then just decode the first frame. In this case,
+ * avcodec_decode_audio4 has to be called again with an AVPacket containing
+ * the remaining data in order to decode the second frame, etc...
+ * Even if no frames are returned, the packet needs to be fed to the decoder
+ * with remaining data until it is completely consumed or an error occurs.
+ *
+ * @warning The input buffer, avpkt->data must be FF_INPUT_BUFFER_PADDING_SIZE
+ *          larger than the actual read bytes because some optimized bitstream
+ *          readers read 32 or 64 bits at once and could read over the end.
+ *
+ * @note You might have to align the input buffer. The alignment requirements
+ *       depend on the CPU and the decoder.
+ *
+ * @param      avctx the codec context
+ * @param[out] frame The AVFrame in which to store decoded audio samples.
+ *                   Decoders request a buffer of a particular size by setting
+ *                   AVFrame.nb_samples prior to calling get_buffer(). The
+ *                   decoder may, however, only utilize part of the buffer by
+ *                   setting AVFrame.nb_samples to a smaller value in the
+ *                   output frame.
+ * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is
+ *                           non-zero.
+ * @param[in]  avpkt The input AVPacket containing the input buffer.
+ *                   At least avpkt->data and avpkt->size should be set. Some
+ *                   decoders might also require additional fields to be set.
+ * @return A negative error code is returned if an error occurred during
+ *         decoding, otherwise the number of bytes consumed from the input
+ *         AVPacket is returned.
  */
-attribute_deprecated int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture,
-                         int *got_picture_ptr,
-                         const uint8_t *buf, int buf_size);
-#endif
+int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
+                          int *got_frame_ptr, const AVPacket *avpkt);
 
 /**
- * Decodes the video frame of size avpkt->size from avpkt->data into picture.
+ * Decode the video frame of size avpkt->size from avpkt->data into picture.
  * Some decoders may support multiple frames in a single AVPacket, such
  * decoders would then just decode the first frame.
  *
- * @warning The input buffer must be \c FF_INPUT_BUFFER_PADDING_SIZE larger than
+ * @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 \p buf should be set to 0 to ensure that
+ * @warning The end of the input buffer buf should be set to 0 to ensure that
  * no overreading happens for damaged MPEG streams.
  *
- * @note You might have to align the input buffer \p avpkt->data and output buffer \p
- * samples. The alignment requirements depend on the CPU: on some CPUs it isn't
+ * @note You might have to align the input buffer avpkt->data.
+ * The alignment requirements depend on the CPU: on some CPUs it isn't
  * necessary at all, on others it won't work at all if not aligned and on others
- * it will work but it will have an impact on performance. In practice, the
- * bitstream should have 4 byte alignment at minimum and all sample data should
- * be 16 byte aligned unless the CPU doesn't need it (AltiVec and SSE do). If
- * the linesize is not a multiple of 16 then there's no sense in aligning the
- * start of the buffer to 16.
+ * it will work but it will have an impact on performance.
+ *
+ * In practice, avpkt->data should have 4 byte alignment at minimum.
  *
- * @note Some codecs have a delay between input and output, these need to be
- * feeded with avpkt->data=NULL, avpkt->size=0 at the end to return the remaining frames.
+ * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
+ * between input and output, these need to be fed with avpkt->data=NULL,
+ * avpkt->size=0 at the end to return the remaining frames.
  *
  * @param avctx the codec context
  * @param[out] picture The AVFrame in which the decoded video frame will be stored.
+ *             Use avcodec_alloc_frame to get an AVFrame, the codec will
+ *             allocate memory for the actual bitmap.
+ *             with default get/release_buffer(), the decoder frees/reuses the bitmap as it sees fit.
+ *             with overridden get/release_buffer() (needs CODEC_CAP_DR1) the user decides into what buffer the decoder
+ *                   decodes and the decoder tells the user once it does not need the data anymore,
+ *                   the user app can at this point free/reuse/keep the memory as it sees fit.
+ *
  * @param[in] avpkt The input AVpacket containing the input buffer.
+ *            You can create such packet with av_init_packet() and by then setting
+ *            data and size, some decoders might in addition need other fields like
+ *            flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
+ *            fields possible.
  * @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.
  */
 int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
                          int *got_picture_ptr,
-                         AVPacket *avpkt);
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-/* Decode a subtitle message. Return -1 if error, otherwise return the
- * number of bytes used. If no subtitle could be decompressed,
- * got_sub_ptr is zero. Otherwise, the subtitle is stored in *sub. */
-attribute_deprecated int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub,
-                            int *got_sub_ptr,
-                            const uint8_t *buf, int buf_size);
-#endif
+                         const AVPacket *avpkt);
 
 /**
- * Decodes a subtitle message.
- * Returns a negative value on error, otherwise returns the number of bytes used.
- * If no subtitle could be decompressed, \p got_sub_ptr is zero.
- * Otherwise, the subtitle is stored in \p *sub.
+ * Decode a subtitle message.
+ * Return a negative value on error, otherwise return the number of bytes used.
+ * If no subtitle could be decompressed, got_sub_ptr is zero.
+ * Otherwise, the subtitle is stored in *sub.
+ * Note that CODEC_CAP_DR1 is not available for subtitle codecs. This is for
+ * simplicity, because the performance difference is expect to be negligible
+ * and reusing a get_buffer written for video codecs would probably perform badly
+ * due to a potentially very different allocation pattern.
  *
  * @param avctx the codec context
- * @param[out] sub The AVSubtitle in which the decoded subtitle will be stored.
+ * @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[in,out] got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero.
  * @param[in] avpkt The input AVPacket containing the input buffer.
  */
 int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
                             int *got_sub_ptr,
                             AVPacket *avpkt);
-int avcodec_parse_frame(AVCodecContext *avctx, uint8_t **pdata,
-                        int *data_size_ptr,
-                        uint8_t *buf, int buf_size);
 
 /**
- * Encodes an audio frame from \p samples into \p buf.
- *
- * @note The output buffer should be at least \c FF_MIN_BUFFER_SIZE bytes large.
- * However, for PCM audio the user will know how much space is needed
- * because it depends on the value passed in \p 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 \p avctx.
- * For PCM audio the number of samples read from \p samples is equal to
- * \p buf_size * input_sample_size / output_sample_size.
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used to encode the data read from the input buffer.
+ * @defgroup lavc_parsing Frame parsing
+ * @{
  */
-int avcodec_encode_audio(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                         const short *samples);
 
-/**
- * Encodes a video frame from \p pict into \p buf.
- * The input picture should be
- * stored using a specific format, namely \c avctx.pix_fmt.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer for the bitstream of encoded frame
- * @param[in] buf_size the size of the output buffer in bytes
- * @param[in] pict the input picture to encode
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used from the output buffer.
- */
-int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                         const AVFrame *pict);
-int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                            const AVSubtitle *sub);
-
-int avcodec_close(AVCodecContext *avctx);
-
-/**
- * Register all the codecs, parsers and bitstream filters which were enabled at
- * configuration time. If you do not call this function you can select exactly
- * which formats you want to support, by using the individual registration
- * functions.
- *
- * @see avcodec_register
- * @see av_register_codec_parser
- * @see av_register_bitstream_filter
- */
-void avcodec_register_all(void);
-
-/**
- * Flush buffers, should be called when seeking or when switching to a different stream.
- */
-void avcodec_flush_buffers(AVCodecContext *avctx);
-
-void avcodec_default_free_buffers(AVCodecContext *s);
-
-/* misc useful functions */
-
-/**
- * Returns a single letter to describe the given picture type \p pict_type.
- *
- * @param[in] pict_type the picture type
- * @return A single character representing the picture type.
- */
-char av_get_pict_type_char(int pict_type);
-
-/**
- * Returns codec bits per sample.
- *
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
-int av_get_bits_per_sample(enum CodecID codec_id);
-
-/**
- * Returns sample format bits per sample.
- *
- * @param[in] sample_fmt the sample format
- * @return Number of bits per sample or zero if unknown for the given sample format.
- */
-int av_get_bits_per_sample_format(enum SampleFormat sample_fmt);
-
-/* frame parsing */
 typedef struct AVCodecParserContext {
     void *priv_data;
     struct AVCodecParser *parser;
@@ -3423,14 +4004,18 @@
 
     int flags;
 #define PARSER_FLAG_COMPLETE_FRAMES           0x0001
+#define PARSER_FLAG_ONCE                      0x0002
+/// Set if the parser has a valid file offset
+#define PARSER_FLAG_FETCHED_OFFSET            0x0004
+#define PARSER_FLAG_USE_CODEC_TS              0x1000
 
     int64_t offset;      ///< byte offset from starting packet start
     int64_t cur_frame_end[AV_PARSER_PTS_NB];
 
-    /*!
+    /**
      * Set by parser to 1 for key frames and 0 for non-key frames.
      * It is initialized to -1, so if the parser doesn't set this flag,
-     * old-style fallback using FF_I_TYPE picture type as key frames
+     * old-style fallback using AV_PICTURE_TYPE_I picture type as key frames
      * will be used.
      */
     int key_frame;
@@ -3443,6 +4028,8 @@
      * the very first frame or from this keyframe.
      * Is AV_NOPTS_VALUE if unknown.
      * This field is not the display duration of the current frame.
+     * This field has no meaning if the packet does not have AV_PKT_FLAG_KEY
+     * set.
      *
      * The purpose of this field is to allow seeking in streams that have no
      * keyframes in the conventional sense. It corresponds to the
@@ -3509,6 +4096,13 @@
      * Previous frame byte position.
      */
     int64_t last_pos;
+
+    /**
+     * Duration of the current frame.
+     * For audio, this is in units of 1 / AVCodecContext.sample_rate.
+     * For all other types, this is in units of AVCodecContext.time_base.
+     */
+    int duration;
 } AVCodecParserContext;
 
 typedef struct AVCodecParser {
@@ -3529,15 +4123,6 @@
 void av_register_codec_parser(AVCodecParser *parser);
 AVCodecParserContext *av_parser_init(int codec_id);
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
-attribute_deprecated
-int av_parser_parse(AVCodecParserContext *s,
-                    AVCodecContext *avctx,
-                    uint8_t **poutbuf, int *poutbuf_size,
-                    const uint8_t *buf, int buf_size,
-                    int64_t pts, int64_t dts);
-#endif
-
 /**
  * Parse a packet.
  *
@@ -3579,6 +4164,593 @@
                      const uint8_t *buf, int buf_size, int keyframe);
 void av_parser_close(AVCodecParserContext *s);
 
+/**
+ * @}
+ * @}
+ */
+
+/**
+ * @addtogroup lavc_encoding
+ * @{
+ */
+
+/**
+ * Find a registered encoder with a matching codec ID.
+ *
+ * @param id AVCodecID of the requested encoder
+ * @return An encoder if one was found, NULL otherwise.
+ */
+AVCodec *avcodec_find_encoder(enum AVCodecID id);
+
+/**
+ * Find a registered encoder with the specified name.
+ *
+ * @param name name of the requested encoder
+ * @return An encoder if one was found, NULL otherwise.
+ */
+AVCodec *avcodec_find_encoder_by_name(const char *name);
+
+#if FF_API_OLD_ENCODE_AUDIO
+/**
+ * Encode an audio frame from samples into buf.
+ *
+ * @deprecated Use avcodec_encode_audio2 instead.
+ *
+ * @note The output buffer should be at least FF_MIN_BUFFER_SIZE bytes large.
+ * However, for codecs with avctx->frame_size equal to 0 (e.g. PCM) the user
+ * will know how much space is needed because it depends on the value passed
+ * in buf_size as described below. In that case a lower value can be used.
+ *
+ * @param avctx the codec context
+ * @param[out] buf the output buffer
+ * @param[in] buf_size the output buffer size
+ * @param[in] samples the input buffer containing the samples
+ * The number of samples read from this buffer is frame_size*channels,
+ * both of which are defined in avctx.
+ * For codecs which have avctx->frame_size equal to 0 (e.g. PCM) the number of
+ * samples read from samples is equal to:
+ * buf_size * 8 / (avctx->channels * av_get_bits_per_sample(avctx->codec_id))
+ * This also implies that av_get_bits_per_sample() must not return 0 for these
+ * codecs.
+ * @return On error a negative value is returned, on success zero or the number
+ * of bytes used to encode the data read from the input buffer.
+ */
+int attribute_deprecated avcodec_encode_audio(AVCodecContext *avctx,
+                                              uint8_t *buf, int buf_size,
+                                              const short *samples);
+#endif
+
+/**
+ * Encode a frame of audio.
+ *
+ * Takes input samples from frame and writes the next output packet, if
+ * available, to avpkt. The output packet does not necessarily contain data for
+ * the most recent frame, as encoders can delay, split, and combine input frames
+ * internally as needed.
+ *
+ * @param avctx     codec context
+ * @param avpkt     output AVPacket.
+ *                  The user can supply an output buffer by setting
+ *                  avpkt->data and avpkt->size prior to calling the
+ *                  function, but if the size of the user-provided data is not
+ *                  large enough, encoding will fail. If avpkt->data and
+ *                  avpkt->size are set, avpkt->destruct must also be set. All
+ *                  other AVPacket fields will be reset by the encoder using
+ *                  av_init_packet(). If avpkt->data is NULL, the encoder will
+ *                  allocate it. The encoder will set avpkt->size to the size
+ *                  of the output packet.
+ *
+ *                  If this function fails or produces no output, avpkt will be
+ *                  freed using av_free_packet() (i.e. avpkt->destruct will be
+ *                  called to free the user supplied buffer).
+ * @param[in] frame AVFrame containing the raw audio data to be encoded.
+ *                  May be NULL when flushing an encoder that has the
+ *                  CODEC_CAP_DELAY capability set.
+ *                  If CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
+ *                  can have any number of samples.
+ *                  If it is not set, frame->nb_samples must be equal to
+ *                  avctx->frame_size for all frames except the last.
+ *                  The final frame may be smaller than avctx->frame_size.
+ * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
+ *                            output packet is non-empty, and to 0 if it is
+ *                            empty. If the function returns an error, the
+ *                            packet can be assumed to be invalid, and the
+ *                            value of got_packet_ptr is undefined and should
+ *                            not be used.
+ * @return          0 on success, negative error code on failure
+ */
+int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
+                          const AVFrame *frame, int *got_packet_ptr);
+
+#if FF_API_OLD_ENCODE_VIDEO
+/**
+ * @deprecated use avcodec_encode_video2() instead.
+ *
+ * Encode a video frame from pict into buf.
+ * The input picture should be
+ * stored using a specific format, namely avctx.pix_fmt.
+ *
+ * @param avctx the codec context
+ * @param[out] buf the output buffer for the bitstream of encoded frame
+ * @param[in] buf_size the size of the output buffer in bytes
+ * @param[in] pict the input picture to encode
+ * @return On error a negative value is returned, on success zero or the number
+ * of bytes used from the output buffer.
+ */
+attribute_deprecated
+int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
+                         const AVFrame *pict);
+#endif
+
+/**
+ * Encode a frame of video.
+ *
+ * Takes input raw video data from frame and writes the next output packet, if
+ * available, to avpkt. The output packet does not necessarily contain data for
+ * the most recent frame, as encoders can delay and reorder input frames
+ * internally as needed.
+ *
+ * @param avctx     codec context
+ * @param avpkt     output AVPacket.
+ *                  The user can supply an output buffer by setting
+ *                  avpkt->data and avpkt->size prior to calling the
+ *                  function, but if the size of the user-provided data is not
+ *                  large enough, encoding will fail. All other AVPacket fields
+ *                  will be reset by the encoder using av_init_packet(). If
+ *                  avpkt->data is NULL, the encoder will allocate it.
+ *                  The encoder will set avpkt->size to the size of the
+ *                  output packet. The returned data (if any) belongs to the
+ *                  caller, he is responsible for freeing it.
+ *
+ *                  If this function fails or produces no output, avpkt will be
+ *                  freed using av_free_packet() (i.e. avpkt->destruct will be
+ *                  called to free the user supplied buffer).
+ * @param[in] frame AVFrame containing the raw video data to be encoded.
+ *                  May be NULL when flushing an encoder that has the
+ *                  CODEC_CAP_DELAY capability set.
+ * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
+ *                            output packet is non-empty, and to 0 if it is
+ *                            empty. If the function returns an error, the
+ *                            packet can be assumed to be invalid, and the
+ *                            value of got_packet_ptr is undefined and should
+ *                            not be used.
+ * @return          0 on success, negative error code on failure
+ */
+int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
+                          const AVFrame *frame, int *got_packet_ptr);
+
+int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
+                            const AVSubtitle *sub);
+
+
+/**
+ * @}
+ */
+
+#if FF_API_AVCODEC_RESAMPLE
+/**
+ * @defgroup lavc_resample Audio resampling
+ * @ingroup libavc
+ * @deprecated use libswresample instead
+ *
+ * @{
+ */
+struct ReSampleContext;
+struct AVResampleContext;
+
+typedef struct ReSampleContext ReSampleContext;
+
+/**
+ *  Initialize audio resampling context.
+ *
+ * @param output_channels  number of output channels
+ * @param input_channels   number of input channels
+ * @param output_rate      output sample rate
+ * @param input_rate       input sample rate
+ * @param sample_fmt_out   requested output sample format
+ * @param sample_fmt_in    input sample format
+ * @param filter_length    length of each FIR filter in the filterbank relative to the cutoff frequency
+ * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
+ * @param linear           if 1 then the used FIR filter will be linearly interpolated
+                           between the 2 closest, if 0 the closest will be used
+ * @param cutoff           cutoff frequency, 1.0 corresponds to half the output sampling rate
+ * @return allocated ReSampleContext, NULL if error occurred
+ */
+attribute_deprecated
+ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
+                                        int output_rate, int input_rate,
+                                        enum AVSampleFormat sample_fmt_out,
+                                        enum AVSampleFormat sample_fmt_in,
+                                        int filter_length, int log2_phase_count,
+                                        int linear, double cutoff);
+
+attribute_deprecated
+int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples);
+
+/**
+ * Free resample context.
+ *
+ * @param s a non-NULL pointer to a resample context previously
+ *          created with av_audio_resample_init()
+ */
+attribute_deprecated
+void audio_resample_close(ReSampleContext *s);
+
+
+/**
+ * Initialize an audio resampler.
+ * Note, if either rate is not an integer then simply scale both rates up so they are.
+ * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq
+ * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
+ * @param linear If 1 then the used FIR filter will be linearly interpolated
+                 between the 2 closest, if 0 the closest will be used
+ * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
+ */
+attribute_deprecated
+struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff);
+
+/**
+ * Resample an array of samples using a previously configured context.
+ * @param src an array of unconsumed samples
+ * @param consumed the number of samples of src which have been consumed are returned here
+ * @param src_size the number of unconsumed samples available
+ * @param dst_size the amount of space in samples available in dst
+ * @param update_ctx If this is 0 then the context will not be modified, that way several channels can be resampled with the same context.
+ * @return the number of samples written in dst or -1 if an error occurred
+ */
+attribute_deprecated
+int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx);
+
+
+/**
+ * Compensate samplerate/timestamp drift. The compensation is done by changing
+ * the resampler parameters, so no audible clicks or similar distortions occur
+ * @param compensation_distance distance in output samples over which the compensation should be performed
+ * @param sample_delta number of output samples which should be output less
+ *
+ * example: av_resample_compensate(c, 10, 500)
+ * here instead of 510 samples only 500 samples would be output
+ *
+ * note, due to rounding the actual compensation might be slightly different,
+ * especially if the compensation_distance is large and the in_rate used during init is small
+ */
+attribute_deprecated
+void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance);
+attribute_deprecated
+void av_resample_close(struct AVResampleContext *c);
+
+/**
+ * @}
+ */
+#endif
+
+/**
+ * @addtogroup lavc_picture
+ * @{
+ */
+
+/**
+ * Allocate memory for a picture.  Call avpicture_free() to free it.
+ *
+ * @see avpicture_fill()
+ *
+ * @param picture the picture to be filled in
+ * @param pix_fmt the format of the picture
+ * @param width the width of the picture
+ * @param height the height of the picture
+ * @return zero if successful, a negative value if not
+ */
+int avpicture_alloc(AVPicture *picture, enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ * Free a picture previously allocated by avpicture_alloc().
+ * The data buffer used by the AVPicture is freed, but the AVPicture structure
+ * itself is not.
+ *
+ * @param picture the AVPicture to be freed
+ */
+void avpicture_free(AVPicture *picture);
+
+/**
+ * Fill in the AVPicture fields, always assume a linesize alignment of
+ * 1.
+ *
+ * @see av_image_fill_arrays()
+ */
+int avpicture_fill(AVPicture *picture, uint8_t *ptr,
+                   enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ * Copy pixel data from an AVPicture into a buffer, always assume a
+ * linesize alignment of 1.
+ *
+ * @see av_image_copy_to_buffer()
+ */
+int avpicture_layout(const AVPicture* src, enum AVPixelFormat pix_fmt,
+                     int width, int height,
+                     unsigned char *dest, int dest_size);
+
+/**
+ * Calculate the size in bytes that a picture of the given width and height
+ * would occupy if stored in the given picture format.
+ * Always assume a linesize alignment of 1.
+ *
+ * @see av_image_get_buffer_size().
+ */
+int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ *  deinterlace - if not supported return -1
+ */
+int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
+                          enum AVPixelFormat pix_fmt, int width, int height);
+/**
+ * Copy image src to dst. Wraps av_image_copy().
+ */
+void av_picture_copy(AVPicture *dst, const AVPicture *src,
+                     enum AVPixelFormat pix_fmt, int width, int height);
+
+/**
+ * Crop image top and left side.
+ */
+int av_picture_crop(AVPicture *dst, const AVPicture *src,
+                    enum AVPixelFormat pix_fmt, int top_band, int left_band);
+
+/**
+ * Pad image.
+ */
+int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum AVPixelFormat pix_fmt,
+            int padtop, int padbottom, int padleft, int padright, int *color);
+
+/**
+ * @}
+ */
+
+/**
+ * @defgroup lavc_misc Utility functions
+ * @ingroup libavc
+ *
+ * Miscellaneous utility functions related to both encoding and decoding
+ * (or neither).
+ * @{
+ */
+
+/**
+ * @defgroup lavc_misc_pixfmt Pixel formats
+ *
+ * Functions for working with pixel formats.
+ * @{
+ */
+
+void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift);
+
+/**
+ * Return a value representing the fourCC code associated to the
+ * pixel format pix_fmt, or 0 if no associated fourCC code can be
+ * found.
+ */
+unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat pix_fmt);
+
+#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).
+ */
+int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt,
+                             int has_alpha);
+
+#if FF_API_FIND_BEST_PIX_FMT
+/**
+ * @deprecated use avcodec_find_best_pix_fmt_of_2() instead.
+ *
+ * Find the best pixel format to convert to given a certain source pixel
+ * format.  When converting from one pixel format to another, information loss
+ * may occur.  For example, when converting from RGB24 to GRAY, the color
+ * information will be lost. Similarly, other losses occur when converting from
+ * some formats to other formats. avcodec_find_best_pix_fmt() searches which of
+ * the given pixel formats should be used to suffer the least amount of loss.
+ * The pixel formats from which it chooses one, are determined by the
+ * pix_fmt_mask parameter.
+ *
+ * Note, only the first 64 pixel formats will fit in pix_fmt_mask.
+ *
+ * @code
+ * src_pix_fmt = AV_PIX_FMT_YUV420P;
+ * pix_fmt_mask = (1 << AV_PIX_FMT_YUV422P) | (1 << AV_PIX_FMT_RGB24);
+ * dst_pix_fmt = avcodec_find_best_pix_fmt(pix_fmt_mask, src_pix_fmt, alpha, &loss);
+ * @endcode
+ *
+ * @param[in] pix_fmt_mask bitmask determining which pixel format to choose from
+ * @param[in] src_pix_fmt source pixel format
+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
+ * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
+ * @return The best pixel format to convert to or -1 if none was found.
+ */
+attribute_deprecated
+enum AVPixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum AVPixelFormat src_pix_fmt,
+                              int has_alpha, int *loss_ptr);
+#endif /* FF_API_FIND_BEST_PIX_FMT */
+
+/**
+ * Find the best pixel format to convert to given a certain source pixel
+ * format.  When converting from one pixel format to another, information loss
+ * may occur.  For example, when converting from RGB24 to GRAY, the color
+ * information will be lost. Similarly, other losses occur when converting from
+ * some formats to other formats. avcodec_find_best_pix_fmt_of_2() searches which of
+ * the given pixel formats should be used to suffer the least amount of loss.
+ * The pixel formats from which it chooses one, are determined by the
+ * pix_fmt_list parameter.
+ *
+ *
+ * @param[in] pix_fmt_list AV_PIX_FMT_NONE terminated array of pixel formats to choose from
+ * @param[in] src_pix_fmt source pixel format
+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
+ * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
+ * @return The best pixel format to convert to or -1 if none was found.
+ */
+enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(enum AVPixelFormat *pix_fmt_list,
+                                            enum AVPixelFormat src_pix_fmt,
+                                            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.
+ */
+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_FORK_ABI
+enum AVPixelFormat avcodec_find_best_pix_fmt2(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);
+
+/**
+ * @}
+ */
+
+void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
+
+/**
+ * Put a string representing the codec tag codec_tag in buf.
+ *
+ * @param buf_size size in bytes of buf
+ * @return the length of the string that would have been generated if
+ * enough space had been available, excluding the trailing null
+ */
+size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag);
+
+void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
+
+/**
+ * Return a name for the specified profile, if available.
+ *
+ * @param codec the codec that is searched for the given profile
+ * @param profile the profile value for which a name is requested
+ * @return A name for the profile if found, NULL otherwise.
+ */
+const char *av_get_profile_name(const AVCodec *codec, int profile);
+
+int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
+int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
+//FIXME func typedef
+
+/**
+ * Fill audio frame data and linesize.
+ * AVFrame extended_data channel pointers are allocated if necessary for
+ * planar audio.
+ *
+ * @param frame       the AVFrame
+ *                    frame->nb_samples must be set prior to calling the
+ *                    function. This function fills in frame->data,
+ *                    frame->extended_data, frame->linesize[0].
+ * @param nb_channels channel count
+ * @param sample_fmt  sample format
+ * @param buf         buffer to use for frame data
+ * @param buf_size    size of buffer
+ * @param align       plane size sample alignment (0 = default)
+ * @return            0 on success, negative error code on failure
+ */
+int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
+                             enum AVSampleFormat sample_fmt, const uint8_t *buf,
+                             int buf_size, int align);
+
+/**
+ * Flush buffers, should be called when seeking or when switching to a different stream.
+ */
+void avcodec_flush_buffers(AVCodecContext *avctx);
+
+void avcodec_default_free_buffers(AVCodecContext *s);
+
+/**
+ * Return codec bits per sample.
+ *
+ * @param[in] codec_id the codec
+ * @return Number of bits per sample or zero if unknown for the given codec.
+ */
+int av_get_bits_per_sample(enum AVCodecID codec_id);
+
+/**
+ * Return the PCM codec associated with a sample format.
+ * @param be  endianness, 0 for little, 1 for big,
+ *            -1 (or anything else) for native
+ * @return  AV_CODEC_ID_PCM_* or AV_CODEC_ID_NONE
+ */
+enum AVCodecID av_get_pcm_codec(enum AVSampleFormat fmt, int be);
+
+/**
+ * Return codec bits per sample.
+ * Only return non-zero if the bits per sample is exactly correct, not an
+ * approximation.
+ *
+ * @param[in] codec_id the codec
+ * @return Number of bits per sample or zero if unknown for the given codec.
+ */
+int av_get_exact_bits_per_sample(enum AVCodecID codec_id);
+
+/**
+ * Return audio frame duration.
+ *
+ * @param avctx        codec context
+ * @param frame_bytes  size of the frame, or 0 if unknown
+ * @return             frame duration, in samples, if known. 0 if not able to
+ *                     determine.
+ */
+int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes);
+
 
 typedef struct AVBitStreamFilterContext {
     void *priv_data;
@@ -3612,15 +4784,14 @@
 /* memory */
 
 /**
- * Reallocates the given block if it is not large enough, otherwise it
- * does nothing.
+ * Reallocate the given block if it is not large enough, otherwise do nothing.
  *
  * @see av_realloc
  */
-void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size);
+void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
 
 /**
- * Allocates a buffer, reusing the given one if large enough.
+ * 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
@@ -3631,74 +4802,58 @@
  * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
  *                 *size 0 if an error occurred.
  */
-void av_fast_malloc(void *ptr, unsigned int *size, unsigned int min_size);
+void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
 
 /**
- * Copy image 'src' to 'dst'.
- */
-void av_picture_copy(AVPicture *dst, const AVPicture *src,
-                     enum PixelFormat pix_fmt, int width, int height);
-
-/**
- * Crop image top and left side.
+ * Same behaviour av_fast_malloc but the buffer has additional
+ * FF_INPUT_PADDING_SIZE at the end which will will always be 0.
+ *
+ * In addition the whole buffer will initially and after resizes
+ * be 0-initialized so that no uninitialized data will ever appear.
  */
-int av_picture_crop(AVPicture *dst, const AVPicture *src,
-                    enum PixelFormat pix_fmt, int top_band, int left_band);
+void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size);
 
 /**
- * Pad image.
+ * Same behaviour av_fast_padded_malloc except that buffer will always
+ * be 0-initialized after call.
  */
-int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum PixelFormat pix_fmt,
-            int padtop, int padbottom, int padleft, int padright, int *color);
-
-unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
+void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size);
 
 /**
- * Parses \p str and put in \p width_ptr and \p height_ptr the detected values.
+ * Encode extradata length to a buffer. Used by xiph codecs.
  *
- * @return 0 in case of a successful parsing, a negative value otherwise
- * @param[in] str the string to parse: it has to be a string in the format
- * <width>x<height> or a valid video frame size abbreviation.
- * @param[in,out] width_ptr pointer to the variable which will contain the detected
- * frame width value
- * @param[in,out] height_ptr pointer to the variable which will contain the detected
- * frame height value
+ * @param s buffer to write to; must be at least (v/255+1) bytes long
+ * @param v size of extradata in bytes
+ * @return number of bytes written to the buffer.
  */
-int av_parse_video_frame_size(int *width_ptr, int *height_ptr, const char *str);
+unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
 
 /**
- * Parses \p str and put in \p frame_rate the detected values.
- *
- * @return 0 in case of a successful parsing, a negative value otherwise
- * @param[in] str the string to parse: it has to be a string in the format
- * <frame_rate_num>/<frame_rate_den>, a float number or a valid video rate abbreviation
- * @param[in,out] frame_rate pointer to the AVRational which will contain the detected
- * frame rate
+ * 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.
+ */
+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
  */
-int av_parse_video_frame_rate(AVRational *frame_rate, const char *str);
-
-/* error handling */
-#if EINVAL > 0
-#define AVERROR(e) (-(e)) /**< Returns a negative error code from a POSIX error code, to return from library functions. */
-#define AVUNERROR(e) (-(e)) /**< Returns a POSIX error code from a library function error return value. */
-#else
-/* Some platforms have E* and errno already negated. */
-#define AVERROR(e) (e)
-#define AVUNERROR(e) (e)
-#endif
-#define AVERROR_UNKNOWN     AVERROR(EINVAL)  /**< unknown error */
-#define AVERROR_IO          AVERROR(EIO)     /**< I/O error */
-#define AVERROR_NUMEXPECTED AVERROR(EDOM)    /**< Number syntax expected in filename. */
-#define AVERROR_INVALIDDATA AVERROR(EINVAL)  /**< invalid data found */
-#define AVERROR_NOMEM       AVERROR(ENOMEM)  /**< not enough memory */
-#define AVERROR_NOFMT       AVERROR(EILSEQ)  /**< unknown format */
-#define AVERROR_NOTSUPP     AVERROR(ENOSYS)  /**< Operation not supported. */
-#define AVERROR_NOENT       AVERROR(ENOENT)  /**< No such file or directory. */
-#define AVERROR_EOF         AVERROR(EPIPE)   /**< End of file. */
-#define AVERROR_PATCHWELCOME    -MKTAG('P','A','W','E') /**< Not yet implemented in FFmpeg. Patches welcome. */
+void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3);
 
 /**
- * Registers the hardware accelerator \p hwaccel.
+ * Register the hardware accelerator hwaccel.
  */
 void av_register_hwaccel(AVHWAccel *hwaccel);
 
@@ -3709,4 +4864,81 @@
  */
 AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel);
 
+
+/**
+ * Lock operation used by lockmgr
+ */
+enum AVLockOp {
+  AV_LOCK_CREATE,  ///< Create a mutex
+  AV_LOCK_OBTAIN,  ///< Lock the mutex
+  AV_LOCK_RELEASE, ///< Unlock the mutex
+  AV_LOCK_DESTROY, ///< Free mutex resources
+};
+
+/**
+ * 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.
+ */
+int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op));
+
+/**
+ * Get the type of the given codec.
+ */
+enum AVMediaType avcodec_get_type(enum AVCodecID codec_id);
+
+/**
+ * Get the name of a codec.
+ * @return  a static string identifying the codec; never NULL
+ */
+const char *avcodec_get_name(enum AVCodecID id);
+
+/**
+ * @return a positive value if s is open (i.e. avcodec_open2() was called on it
+ * with no corresponding avcodec_close()), 0 otherwise.
+ */
+int avcodec_is_open(AVCodecContext *s);
+
+/**
+ * @return a non-zero number if codec is an encoder, zero otherwise
+ */
+int av_codec_is_encoder(const AVCodec *codec);
+
+/**
+ * @return a non-zero number if codec is a decoder, zero otherwise
+ */
+int av_codec_is_decoder(const AVCodec *codec);
+
+/**
+ * @return descriptor for given codec ID or NULL if no descriptor exists.
+ */
+const AVCodecDescriptor *avcodec_descriptor_get(enum AVCodecID id);
+
+/**
+ * Iterate over all codec descriptors known to libavcodec.
+ *
+ * @param prev previous descriptor. NULL to get the first descriptor.
+ *
+ * @return next descriptor or NULL after the last descriptor
+ */
+const AVCodecDescriptor *avcodec_descriptor_next(const AVCodecDescriptor *prev);
+
+/**
+ * @return codec descriptor with the given name or NULL if no such descriptor
+ *         exists.
+ */
+const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name);
+
+/**
+ * @}
+ */
+
 #endif /* AVCODEC_AVCODEC_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavcodec/avfft.h Added

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavcodec/dxva2.h Added

@@ -0,0 +1,88 @@
+/*
+ * 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.
+ */
+
+#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
+
+/**
+ * This structure is used to provides the necessary configurations and data
+ * to the DXVA2 FFmpeg HWAccel implementation.
+ *
+ * The application must make it available as AVCodecContext.hwaccel_context.
+ */
+struct dxva_context {
+    /**
+     * DXVA2 decoder object
+     */
+    IDirectXVideoDecoder *decoder;
+
+    /**
+     * DXVA2 configuration used to create the decoder
+     */
+    const DXVA2_ConfigPictureDecode *cfg;
+
+    /**
+     * The number of surface in the surface array
+     */
+    unsigned surface_count;
+
+    /**
+     * The array of Direct3D surfaces used to create the decoder
+     */
+    LPDIRECT3DSURFACE9 *surface;
+
+    /**
+     * A bit field configuring the workarounds needed for using the decoder
+     */
+    uint64_t workaround;
+
+    /**
+     * Private to the FFmpeg AVHWAccel implementation
+     */
+    unsigned report_id;
+};
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_DXVA_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavcodec/old_codec_ids.h Added

@@ -0,0 +1,398 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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
+    CODEC_ID_MPEG2VIDEO_XVMC,
+    CODEC_ID_H261,
+    CODEC_ID_H263,
+    CODEC_ID_RV10,
+    CODEC_ID_RV20,
+    CODEC_ID_MJPEG,
+    CODEC_ID_MJPEGB,
+    CODEC_ID_LJPEG,
+    CODEC_ID_SP5X,
+    CODEC_ID_JPEGLS,
+    CODEC_ID_MPEG4,
+    CODEC_ID_RAWVIDEO,
+    CODEC_ID_MSMPEG4V1,
+    CODEC_ID_MSMPEG4V2,
+    CODEC_ID_MSMPEG4V3,
+    CODEC_ID_WMV1,
+    CODEC_ID_WMV2,
+    CODEC_ID_H263P,
+    CODEC_ID_H263I,
+    CODEC_ID_FLV1,
+    CODEC_ID_SVQ1,
+    CODEC_ID_SVQ3,
+    CODEC_ID_DVVIDEO,
+    CODEC_ID_HUFFYUV,
+    CODEC_ID_CYUV,
+    CODEC_ID_H264,
+    CODEC_ID_INDEO3,
+    CODEC_ID_VP3,
+    CODEC_ID_THEORA,
+    CODEC_ID_ASV1,
+    CODEC_ID_ASV2,
+    CODEC_ID_FFV1,
+    CODEC_ID_4XM,
+    CODEC_ID_VCR1,
+    CODEC_ID_CLJR,
+    CODEC_ID_MDEC,
+    CODEC_ID_ROQ,
+    CODEC_ID_INTERPLAY_VIDEO,
+    CODEC_ID_XAN_WC3,
+    CODEC_ID_XAN_WC4,
+    CODEC_ID_RPZA,
+    CODEC_ID_CINEPAK,
+    CODEC_ID_WS_VQA,
+    CODEC_ID_MSRLE,
+    CODEC_ID_MSVIDEO1,
+    CODEC_ID_IDCIN,
+    CODEC_ID_8BPS,
+    CODEC_ID_SMC,
+    CODEC_ID_FLIC,
+    CODEC_ID_TRUEMOTION1,
+    CODEC_ID_VMDVIDEO,
+    CODEC_ID_MSZH,
+    CODEC_ID_ZLIB,
+    CODEC_ID_QTRLE,
+    CODEC_ID_SNOW,
+    CODEC_ID_TSCC,
+    CODEC_ID_ULTI,
+    CODEC_ID_QDRAW,
+    CODEC_ID_VIXL,
+    CODEC_ID_QPEG,
+    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'),
+
+    /* 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_8SVX_RAW    = MKBETAG('8','S','V','X'),
+    CODEC_ID_SONIC       = MKBETAG('S','O','N','C'),
+    CODEC_ID_SONIC_LS    = MKBETAG('S','O','N','L'),
+    CODEC_ID_PAF_AUDIO   = MKBETAG('P','A','F','A'),
+    CODEC_ID_OPUS        = MKBETAG('O','P','U','S'),
+
+    /* subtitle codecs */
+    CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
+    CODEC_ID_DVD_SUBTITLE = 0x17000,
+    CODEC_ID_DVB_SUBTITLE,
+    CODEC_ID_TEXT,  ///< raw UTF-8 text
+    CODEC_ID_XSUB,
+    CODEC_ID_SSA,
+    CODEC_ID_MOV_TEXT,
+    CODEC_ID_HDMV_PGS_SUBTITLE,
+    CODEC_ID_DVB_TELETEXT,
+    CODEC_ID_SRT,
+    CODEC_ID_MICRODVD   = MKBETAG('m','D','V','D'),
+    CODEC_ID_EIA_608    = MKBETAG('c','6','0','8'),
+    CODEC_ID_JACOSUB    = MKBETAG('J','S','U','B'),
+    CODEC_ID_SAMI       = MKBETAG('S','A','M','I'),
+    CODEC_ID_REALTEXT   = MKBETAG('R','T','X','T'),
+    CODEC_ID_SUBVIEWER  = MKBETAG('S','u','b','V'),
+
+    /* other specific kind of codecs (generally used for attachments) */
+    CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
+    CODEC_ID_TTF = 0x18000,
+    CODEC_ID_BINTEXT    = MKBETAG('B','T','X','T'),
+    CODEC_ID_XBIN       = MKBETAG('X','B','I','N'),
+    CODEC_ID_IDF        = MKBETAG( 0 ,'I','D','F'),
+    CODEC_ID_OTF        = MKBETAG( 0 ,'O','T','F'),
+
+    CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
+
+    CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
+                                * stream (only used by libavformat) */
+    CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
+                                * stream (only used by libavformat) */
+    CODEC_ID_FFMETADATA = 0x21000,   ///< Dummy codec for streams containing only metadata information.
+
+#endif /* AVCODEC_OLD_CODEC_IDS_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavcodec/vaapi.h Added

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

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavcodec/vda.h Added

@@ -0,0 +1,226 @@
+/*
+ * 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/version.h"
+
+#if FF_API_VDA_ASYNC
+#include <pthread.h>
+#endif
+
+#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
+
+/**
+ * @defgroup lavc_codec_hwaccel_vda VDA
+ * @ingroup lavc_codec_hwaccel
+ *
+ * @{
+ */
+
+#if FF_API_VDA_ASYNC
+/**
+ * This structure is used to store decoded frame information and data.
+ *
+ * @deprecated Use synchronous decoding mode.
+ */
+typedef struct {
+    /**
+     * The PTS of the frame.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by libavcodec.
+     */
+    int64_t             pts;
+
+    /**
+     * The CoreVideo buffer that contains the decoded data.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by libavcodec.
+     */
+    CVPixelBufferRef    cv_buffer;
+
+    /**
+     * A pointer to the next frame.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by libavcodec.
+     */
+    struct vda_frame    *next_frame;
+} vda_frame;
+#endif
+
+/**
+ * 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;
+
+#if FF_API_VDA_ASYNC
+    /**
+     * VDA frames queue ordered by presentation timestamp.
+     *
+     * @deprecated Use synchronous decoding mode.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by libavcodec.
+     */
+    vda_frame           *queue;
+
+    /**
+     * Mutex for locking queue operations.
+     *
+     * @deprecated Use synchronous decoding mode.
+     *
+     * - encoding: unused
+     * - decoding: Set/Unset by libavcodec.
+     */
+    pthread_mutex_t     queue_mutex;
+#endif
+
+    /**
+     * 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;
+};
+
+/** 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);
+
+#if FF_API_VDA_ASYNC
+/**
+ * Return the top frame of the queue.
+ *
+ * @deprecated Use synchronous decoding mode.
+ */
+vda_frame *ff_vda_queue_pop(struct vda_context *vda_ctx);
+
+/**
+ * Release the given frame.
+ *
+ * @deprecated Use synchronous decoding mode.
+ */
+void ff_vda_release_vda_frame(vda_frame *frame);
+#endif
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_VDA_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavcodec/vdpau.h Added

@@ -0,0 +1,94 @@
+/*
+ * The Video Decode and Presentation API for UNIX (VDPAU) is used for
+ * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
+ *
+ * Copyright (C) 2008 NVIDIA
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VDPAU_H
+#define AVCODEC_VDPAU_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_vdpau
+ * Public libavcodec VDPAU header.
+ */
+
+
+/**
+ * @defgroup lavc_codec_hwaccel_vdpau VDPAU Decoder and Renderer
+ * @ingroup lavc_codec_hwaccel
+ *
+ * VDPAU hardware acceleration has two modules
+ * - VDPAU decoding
+ * - VDPAU presentation
+ *
+ * The VDPAU decoding module parses all headers using FFmpeg
+ * parsing mechanisms and uses VDPAU for the actual decoding.
+ *
+ * As per the current implementation, the actual decoding
+ * and rendering (API calls) are done as part of the VDPAU
+ * presentation (vo_vdpau.c) module.
+ *
+ * @{
+ */
+
+#include <vdpau/vdpau.h>
+#include <vdpau/vdpau_x11.h>
+
+/** @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.
+
+    /** 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;
+
+    /** picture parameter information for all supported codecs */
+    union VdpPictureInfo {
+        VdpPictureInfoH264        h264;
+        VdpPictureInfoMPEG1Or2    mpeg;
+        VdpPictureInfoVC1          vc1;
+        VdpPictureInfoMPEG4Part2 mpeg4;
+    } info;
+};
+
+/* @}*/
+
+#endif /* AVCODEC_VDPAU_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavcodec/version.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 AVCODEC_VERSION_H
+#define AVCODEC_VERSION_H
+
+/**
+ * @file
+ * @ingroup libavc
+ * Libavcodec version macros.
+ */
+
+#include "libavutil/avutil.h"
+
+#define LIBAVCODEC_VERSION_MAJOR 54
+#define LIBAVCODEC_VERSION_MINOR 67
+#define LIBAVCODEC_VERSION_MICRO 100
+
+#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
+                                               LIBAVCODEC_VERSION_MINOR, \
+                                               LIBAVCODEC_VERSION_MICRO)
+#define LIBAVCODEC_VERSION      AV_VERSION(LIBAVCODEC_VERSION_MAJOR,    \
+                                           LIBAVCODEC_VERSION_MINOR,    \
+                                           LIBAVCODEC_VERSION_MICRO)
+#define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
+
+#define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
+
+/**
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ */
+
+#ifndef FF_API_REQUEST_CHANNELS
+#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_ALLOC_CONTEXT
+#define FF_API_ALLOC_CONTEXT    (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_AVCODEC_OPEN
+#define FF_API_AVCODEC_OPEN     (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_OLD_DECODE_AUDIO
+#define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_OLD_TIMECODE
+#define FF_API_OLD_TIMECODE (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+
+#ifndef FF_API_OLD_ENCODE_AUDIO
+#define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_OLD_ENCODE_VIDEO
+#define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_MPV_GLOBAL_OPTS
+#define FF_API_MPV_GLOBAL_OPTS  (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_COLOR_TABLE_ID
+#define FF_API_COLOR_TABLE_ID   (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_INTER_THRESHOLD
+#define FF_API_INTER_THRESHOLD  (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_SUB_ID
+#define FF_API_SUB_ID           (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_DSP_MASK
+#define FF_API_DSP_MASK         (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_FIND_BEST_PIX_FMT
+#define FF_API_FIND_BEST_PIX_FMT (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_CODEC_ID
+#define FF_API_CODEC_ID          (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_VDA_ASYNC
+#define FF_API_VDA_ASYNC         (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_AVCODEC_RESAMPLE
+#define FF_API_AVCODEC_RESAMPLE  (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_LIBMPEG2
+#define FF_API_LIBMPEG2          (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_MMI
+#define FF_API_MMI               (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+
+#endif /* AVCODEC_VERSION_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavcodec/xvmc.h Added

@@ -0,0 +1,168 @@
+/*
+ * 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 "avcodec.h"
+
+/**
+ * @defgroup lavc_codec_hwaccel_xvmc XvMC
+ * @ingroup lavc_codec_hwaccel
+ *
+ * @{
+ */
+
+#define AV_XVMC_ID                    0x1DC711C0  /**< special value to ensure that regular pixel routines haven't corrupted the struct
+                                                       the number is 1337 speak for the letters IDCT MCo (motion compensation) */
+
+struct xvmc_pix_fmt {
+    /** The field contains the special constant value AV_XVMC_ID.
+        It is used as a test that the application correctly uses the API,
+        and that there is no corruption caused by pixel routines.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             xvmc_id;
+
+    /** Pointer to the block array allocated by XvMCCreateBlocks().
+        The array has to be freed by XvMCDestroyBlocks().
+        Each group of 64 values represents one data block of differential
+        pixel information (in MoCo mode) or coefficients for IDCT.
+        - application - set the pointer during initialization
+        - libavcodec  - fills coefficients/pixel data into the array
+    */
+    short*          data_blocks;
+
+    /** Pointer to the macroblock description array allocated by
+        XvMCCreateMacroBlocks() and freed by XvMCDestroyMacroBlocks().
+        - application - set the pointer during initialization
+        - libavcodec  - fills description data into the array
+    */
+    XvMCMacroBlock* mv_blocks;
+
+    /** Number of macroblock descriptions that can be stored in the mv_blocks
+        array.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             allocated_mv_blocks;
+
+    /** Number of blocks that can be stored at once in the data_blocks array.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             allocated_data_blocks;
+
+    /** Indicate that the hardware would interpret data_blocks as IDCT
+        coefficients and perform IDCT on them.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             idct;
+
+    /** In MoCo mode it indicates that intra macroblocks are assumed to be in
+        unsigned format; same as the XVMC_INTRA_UNSIGNED flag.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             unsigned_intra;
+
+    /** Pointer to the surface allocated by XvMCCreateSurface().
+        It has to be freed by XvMCDestroySurface() on application exit.
+        It identifies the frame and its state on the video hardware.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    XvMCSurface*    p_surface;
+
+/** Set by the decoder before calling ff_draw_horiz_band(),
+    needed by the XvMCRenderSurface function. */
+//@{
+    /** Pointer to the surface used as past reference
+        - application - unchanged
+        - libavcodec  - set
+    */
+    XvMCSurface*    p_past_surface;
+
+    /** Pointer to the surface used as future reference
+        - application - unchanged
+        - libavcodec  - set
+    */
+    XvMCSurface*    p_future_surface;
+
+    /** top/bottom field or frame
+        - application - unchanged
+        - libavcodec  - set
+    */
+    unsigned int    picture_structure;
+
+    /** XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
+        - application - unchanged
+        - libavcodec  - set
+    */
+    unsigned int    flags;
+//}@
+
+    /** Number of macroblock descriptions in the mv_blocks array
+        that have already been passed to the hardware.
+        - application - zeroes it on get_buffer().
+                        A successful ff_draw_horiz_band() may increment it
+                        with filled_mb_block_num or zero both.
+        - libavcodec  - unchanged
+    */
+    int             start_mv_blocks_num;
+
+    /** Number of new macroblock descriptions in the mv_blocks array (after
+        start_mv_blocks_num) that are filled by libavcodec and have to be
+        passed to the hardware.
+        - application - zeroes it on get_buffer() or after successful
+                        ff_draw_horiz_band().
+        - libavcodec  - increment with one of each stored MB
+    */
+    int             filled_mv_blocks_num;
+
+    /** Number of the next free data block; one data block consists of
+        64 short values in the data_blocks array.
+        All blocks before this one have already been claimed by placing their
+        position into the corresponding block description structure field,
+        that are part of the mv_blocks array.
+        - application - zeroes it on get_buffer().
+                        A successful ff_draw_horiz_band() may zero it together
+                        with start_mb_blocks_num.
+        - libavcodec  - each decoded macroblock increases it by the number
+                        of coded blocks it contains.
+    */
+    int             next_free_data_block_num;
+};
+
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_XVMC_H */

gpac-0.5.0.svn4192.tar.bz2/extra_lib/include/libavformat/avformat.h -> gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavformat/avformat.h Changed

@@ -21,111 +21,295 @@
 #ifndef AVFORMAT_AVFORMAT_H
 #define AVFORMAT_AVFORMAT_H
 
-#define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 33
-#define LIBAVFORMAT_VERSION_MICRO  0
-
-#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
-                                               LIBAVFORMAT_VERSION_MINOR, \
-                                               LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_VERSION     AV_VERSION(LIBAVFORMAT_VERSION_MAJOR,   \
-                                           LIBAVFORMAT_VERSION_MINOR,   \
-                                           LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
-
-#define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
+/**
+ * @file
+ * @ingroup libavf
+ * Main libavformat public API header
+ */
 
 /**
- * Returns the LIBAVFORMAT_VERSION_INT constant.
+ * @defgroup libavf I/O and Muxing/Demuxing Library
+ * @{
+ *
+ * Libavformat (lavf) is a library for dealing with various media container
+ * formats. Its main two purposes are demuxing - i.e. splitting a media file
+ * into component streams, and the reverse process of muxing - writing supplied
+ * data in a specified container format. It also has an @ref lavf_io
+ * "I/O module" which supports a number of protocols for accessing the data (e.g.
+ * file, tcp, http and others). Before using lavf, you need to call
+ * av_register_all() to register all compiled muxers, demuxers and protocols.
+ * Unless you are absolutely sure you won't use libavformat's network
+ * capabilities, you should also call avformat_network_init().
+ *
+ * A supported input format is described by an AVInputFormat struct, conversely
+ * an output format is described by AVOutputFormat. You can iterate over all
+ * registered input/output formats using the av_iformat_next() /
+ * av_oformat_next() functions. The protocols layer is not part of the public
+ * API, so you can only get the names of supported protocols with the
+ * avio_enum_protocols() function.
+ *
+ * Main lavf structure used for both muxing and demuxing is AVFormatContext,
+ * which exports all information about the file being read or written. As with
+ * most Libavformat structures, its size is not part of public ABI, so it cannot be
+ * allocated on stack or directly with av_malloc(). To create an
+ * AVFormatContext, use avformat_alloc_context() (some functions, like
+ * avformat_open_input() might do that for you).
+ *
+ * Most importantly an AVFormatContext contains:
+ * @li the @ref AVFormatContext.iformat "input" or @ref AVFormatContext.oformat
+ * "output" format. It is either autodetected or set by user for input;
+ * always set by user for output.
+ * @li an @ref AVFormatContext.streams "array" of AVStreams, which describe all
+ * elementary streams stored in the file. AVStreams are typically referred to
+ * using their index in this array.
+ * @li an @ref AVFormatContext.pb "I/O context". It is either opened by lavf or
+ * set by user for input, always set by user for output (unless you are dealing
+ * with an AVFMT_NOFILE format).
+ *
+ * @section lavf_options Passing options to (de)muxers
+ * Lavf allows to configure muxers and demuxers using the @ref avoptions
+ * mechanism. Generic (format-independent) libavformat options are provided by
+ * AVFormatContext, they can be examined from a user program by calling
+ * av_opt_next() / av_opt_find() on an allocated AVFormatContext (or its AVClass
+ * from avformat_get_class()). Private (format-specific) options are provided by
+ * AVFormatContext.priv_data if and only if AVInputFormat.priv_class /
+ * AVOutputFormat.priv_class of the corresponding format struct is non-NULL.
+ * Further options may be provided by the @ref AVFormatContext.pb "I/O context",
+ * if its AVClass is non-NULL, and the protocols layer. See the discussion on
+ * nesting in @ref avoptions documentation to learn how to access those.
+ *
+ * @defgroup lavf_decoding Demuxing
+ * @{
+ * Demuxers read a media file and split it into chunks of data (@em packets). A
+ * @ref AVPacket "packet" contains one or more encoded frames which belongs to a
+ * single elementary stream. In the lavf API this process is represented by the
+ * avformat_open_input() function for opening a file, av_read_frame() for
+ * reading a single packet and finally avformat_close_input(), which does the
+ * cleanup.
+ *
+ * @section lavf_decoding_open Opening a media file
+ * The minimum information required to open a file is its URL or filename, which
+ * is passed to avformat_open_input(), as in the following code:
+ * @code
+ * const char    *url = "in.mp3";
+ * AVFormatContext *s = NULL;
+ * int ret = avformat_open_input(&s, url, NULL, NULL);
+ * if (ret < 0)
+ *     abort();
+ * @endcode
+ * The above code attempts to allocate an AVFormatContext, open the
+ * specified file (autodetecting the format) and read the header, exporting the
+ * information stored there into s. Some formats do not have a header or do not
+ * store enough information there, so it is recommended that you call the
+ * avformat_find_stream_info() function which tries to read and decode a few
+ * frames to find missing information.
+ *
+ * In some cases you might want to preallocate an AVFormatContext yourself with
+ * avformat_alloc_context() and do some tweaking on it before passing it to
+ * avformat_open_input(). One such case is when you want to use custom functions
+ * for reading input data instead of lavf internal I/O layer.
+ * To do that, create your own AVIOContext with avio_alloc_context(), passing
+ * your reading callbacks to it. Then set the @em pb field of your
+ * AVFormatContext to newly created AVIOContext.
+ *
+ * Since the format of the opened file is in general not known until after
+ * avformat_open_input() has returned, it is not possible to set demuxer private
+ * options on a preallocated context. Instead, the options should be passed to
+ * avformat_open_input() wrapped in an AVDictionary:
+ * @code
+ * AVDictionary *options = NULL;
+ * av_dict_set(&options, "video_size", "640x480", 0);
+ * av_dict_set(&options, "pixel_format", "rgb24", 0);
+ *
+ * if (avformat_open_input(&s, url, NULL, &options) < 0)
+ *     abort();
+ * av_dict_free(&options);
+ * @endcode
+ * This code passes the private options 'video_size' and 'pixel_format' to the
+ * demuxer. They would be necessary for e.g. the rawvideo demuxer, since it
+ * cannot know how to interpret raw video data otherwise. If the format turns
+ * out to be something different than raw video, those options will not be
+ * recognized by the demuxer and therefore will not be applied. Such unrecognized
+ * options are then returned in the options dictionary (recognized options are
+ * consumed). The calling program can handle such unrecognized options as it
+ * wishes, e.g.
+ * @code
+ * AVDictionaryEntry *e;
+ * if (e = av_dict_get(options, "", NULL, AV_DICT_IGNORE_SUFFIX)) {
+ *     fprintf(stderr, "Option %s not recognized by the demuxer.\n", e->key);
+ *     abort();
+ * }
+ * @endcode
+ *
+ * After you have finished reading the file, you must close it with
+ * avformat_close_input(). It will free everything associated with the file.
+ *
+ * @section lavf_decoding_read Reading from an opened file
+ * Reading data from an opened AVFormatContext is done by repeatedly calling
+ * av_read_frame() on it. Each call, if successful, will return an AVPacket
+ * containing encoded data for one AVStream, identified by
+ * AVPacket.stream_index. This packet may be passed straight into the libavcodec
+ * decoding functions avcodec_decode_video2(), avcodec_decode_audio4() or
+ * avcodec_decode_subtitle2() if the caller wishes to decode the data.
+ *
+ * AVPacket.pts, AVPacket.dts and AVPacket.duration timing information will be
+ * set if known. They may also be unset (i.e. AV_NOPTS_VALUE for
+ * pts/dts, 0 for duration) if the stream does not provide them. The timing
+ * information will be in AVStream.time_base units, i.e. it has to be
+ * multiplied by the timebase to convert them to seconds.
+ *
+ * The packet data belongs to the demuxer and is invalid after the next call to
+ * av_read_frame(). The user must free the packet with av_free_packet() before
+ * calling av_read_frame() again or closing the file.
+ *
+ * @section lavf_decoding_seek Seeking
+ * @}
+ *
+ * @defgroup lavf_encoding Muxing
+ * @{
+ * @}
+ *
+ * @defgroup lavf_io I/O Read/Write
+ * @{
+ * @}
+ *
+ * @defgroup lavf_codec Demuxers
+ * @{
+ * @defgroup lavf_codec_native Native Demuxers
+ * @{
+ * @}
+ * @defgroup lavf_codec_wrappers External library wrappers
+ * @{
+ * @}
+ * @}
+ * @defgroup lavf_protos I/O Protocols
+ * @{
+ * @}
+ * @defgroup lavf_internal Internal
+ * @{
+ * @}
+ * @}
+ *
  */
-unsigned avformat_version(void);
 
 #include <time.h>
 #include <stdio.h>  /* FILE */
 #include "libavcodec/avcodec.h"
+#include "libavutil/dict.h"
+#include "libavutil/log.h"
 
 #include "avio.h"
+#include "libavformat/version.h"
+
+#if FF_API_AV_GETTIME
+#include "libavutil/time.h"
+#endif
 
 struct AVFormatContext;
 
 
-/*
- * Public Metadata API.
+/**
+ * @defgroup metadata_api Public Metadata API
+ * @{
+ * @ingroup libavf
  * The metadata API allows libavformat to export metadata tags to a client
- * application using a sequence of key/value pairs.
+ * application when demuxing. Conversely it allows a client application to
+ * set metadata when muxing.
+ *
+ * Metadata is exported or set as pairs of key/value strings in the 'metadata'
+ * fields of the AVFormatContext, AVStream, AVChapter and AVProgram structs
+ * using the @ref lavu_dict "AVDictionary" API. Like all strings in FFmpeg,
+ * metadata is assumed to be UTF-8 encoded Unicode. Note that metadata
+ * exported by demuxers isn't checked to be valid UTF-8 in most cases.
+ *
  * Important concepts to keep in mind:
- * 1. Keys are unique; there can never be 2 tags with the same key. This is
+ * -  Keys are unique; there can never be 2 tags with the same key. This is
  *    also meant semantically, i.e., a demuxer should not knowingly produce
  *    several keys that are literally different but semantically identical.
  *    E.g., key=Author5, key=Author6. In this example, all authors must be
  *    placed in the same tag.
- * 2. Metadata is flat, not hierarchical; there are no subtags. If you
+ * -  Metadata is flat, not hierarchical; there are no subtags. If you
  *    want to store, e.g., the email address of the child of producer Alice
  *    and actor Bob, that could have key=alice_and_bobs_childs_email_address.
- * 3. A tag whose value is localized for a particular language is appended
- *    with a dash character ('-') and the ISO 639-2/B 3-letter language code.
- *    For example: Author-ger=Michael, Author-eng=Mike
- *    The original/default language is in the unqualified "Author" tag.
- *    A demuxer should set a default if it sets any translated tag.
- */
-
-#define AV_METADATA_MATCH_CASE      1
-#define AV_METADATA_IGNORE_SUFFIX   2
-
-typedef struct {
-    char *key;
-    char *value;
-}AVMetadataTag;
-
-typedef struct AVMetadata AVMetadata;
-typedef struct AVMetadataConv AVMetadataConv;
-
-/**
- * Gets a metadata element with matching key.
- * @param prev Set to the previous matching element to find the next.
- * @param flags Allows case as well as suffix-insensitive comparisons.
- * @return Found tag or NULL, changing key or value leads to undefined behavior.
- */
-AVMetadataTag *
-av_metadata_get(AVMetadata *m, const char *key, const AVMetadataTag *prev, int flags);
-
-/**
- * Sets the given tag in m, overwriting an existing tag.
- * @param key tag key to add to m (will be av_strduped)
- * @param value tag value to add to m (will be av_strduped)
- * @return >= 0 on success otherwise an error code <0
- */
-int av_metadata_set(AVMetadata **pm, const char *key, const char *value);
-
-/**
- * Convert all the metadata sets from ctx according to the source and
- * destination conversion tables.
- * @param d_conv destination tags format conversion table
- * @param s_conv source tags format conversion table
- */
-void av_metadata_conv(struct AVFormatContext *ctx,const AVMetadataConv *d_conv,
-                                                  const AVMetadataConv *s_conv);
-
-/**
- * Frees all the memory allocated for an AVMetadata struct.
+ * -  Several modifiers can be applied to the tag name. This is done by
+ *    appending a dash character ('-') and the modifier name in the order
+ *    they appear in the list below -- e.g. foo-eng-sort, not foo-sort-eng.
+ *    -  language -- a tag whose value is localized for a particular language
+ *       is appended with the ISO 639-2/B 3-letter language code.
+ *       For example: Author-ger=Michael, Author-eng=Mike
+ *       The original/default language is in the unqualified "Author" tag.
+ *       A demuxer should set a default if it sets any translated tag.
+ *    -  sorting  -- a modified version of a tag that should be used for
+ *       sorting will have '-sort' appended. E.g. artist="The Beatles",
+ *       artist-sort="Beatles, The".
+ *
+ * -  Demuxers attempt to export metadata in a generic format, however tags
+ *    with no generic equivalents are left as they are stored in the container.
+ *    Follows a list of generic tag names:
+ *
+ @verbatim
+ album        -- name of the set this work belongs to
+ album_artist -- main creator of the set/album, if different from artist.
+                 e.g. "Various Artists" for compilation albums.
+ artist       -- main creator of the work
+ comment      -- any additional description of the file.
+ composer     -- who composed the work, if different from artist.
+ copyright    -- name of copyright holder.
+ creation_time-- date when the file was created, preferably in ISO 8601.
+ date         -- date when the work was created, preferably in ISO 8601.
+ disc         -- number of a subset, e.g. disc in a multi-disc collection.
+ encoder      -- name/settings of the software/hardware that produced the file.
+ encoded_by   -- person/group who created the file.
+ filename     -- original name of the file.
+ genre        -- <self-evident>.
+ language     -- main language in which the work is performed, preferably
+                 in ISO 639-2 format. Multiple languages can be specified by
+                 separating them with commas.
+ performer    -- artist who performed the work, if different from artist.
+                 E.g for "Also sprach Zarathustra", artist would be "Richard
+                 Strauss" and performer "London Philharmonic Orchestra".
+ publisher    -- name of the label/publisher.
+ service_name     -- name of the service in broadcasting (channel name).
+ service_provider -- name of the service provider in broadcasting.
+ title        -- name of the work.
+ track        -- number of this work in the set, can be in form current/total.
+ variant_bitrate -- the total bitrate of the bitrate variant that the current stream is part of
+ @endverbatim
+ *
+ * Look in the examples section for an application example how to use the Metadata API.
+ *
+ * @}
  */
-void av_metadata_free(AVMetadata **m);
-
 
 /* packet functions */
 
 
 /**
- * Allocate and read the payload of a packet and initialize its fields with
- * default values.
+ * Allocate and read the payload of a packet and initialize its
+ * fields with default values.
  *
  * @param pkt packet
  * @param size desired payload size
  * @return >0 (read size) if OK, AVERROR_xxx otherwise
  */
-int av_get_packet(ByteIOContext *s, AVPacket *pkt, int size);
+int av_get_packet(AVIOContext *s, AVPacket *pkt, int size);
 
 
+/**
+ * Read data and append it to the current content of the AVPacket.
+ * If pkt->size is 0 this is identical to av_get_packet.
+ * Note that this uses av_grow_packet and thus involves a realloc
+ * which is inefficient. Thus this function should only be used
+ * when there is no reasonable way to know (an upper bound of)
+ * the final size.
+ *
+ * @param pkt packet
+ * @param size amount of data to read
+ * @return >0 (read size) if OK, AVERROR_xxx otherwise, previous data
+ *         will not be lost even if an error occurs.
+ */
+int av_append_packet(AVIOContext *s, AVPacket *pkt, int size);
+
 /*************************************************/
 /* fractional numbers for exact pts handling */
 
@@ -142,39 +326,20 @@
 
 struct AVCodecTag;
 
-/** This structure contains the data a format has to probe a file. */
+/**
+ * This structure contains the data a format has to probe a file.
+ */
 typedef struct AVProbeData {
     const char *filename;
-    unsigned char *buf;
-    int buf_size;
+    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 */
 } AVProbeData;
 
 #define AVPROBE_SCORE_MAX 100               ///< maximum score, half of that is used for file-extension-based detection
+#define AVPROBE_SCORE_RETRY (AVPROBE_SCORE_MAX/4)
 #define AVPROBE_PADDING_SIZE 32             ///< extra allocated bytes at the end of the probe buffer
 
-typedef struct AVFormatParameters {
-    AVRational time_base;
-    int sample_rate;
-    int channels;
-    int width;
-    int height;
-    enum PixelFormat pix_fmt;
-    int channel; /**< Used to select DV channel. */
-    const char *standard; /**< TV standard, NTSC, PAL, SECAM */
-    unsigned int mpeg2ts_raw:1;  /**< Force raw MPEG-2 transport stream output, if possible. */
-    unsigned int mpeg2ts_compute_pcr:1; /**< Compute exact PCR for each transport
-                                            stream packet (only meaningful if
-                                            mpeg2ts_raw is TRUE). */
-    unsigned int initial_pause:1;       /**< Do not begin to play the stream
-                                            immediately (RTSP only). */
-    unsigned int prealloced_context:1;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    enum CodecID video_codec_id;
-    enum CodecID audio_codec_id;
-#endif
-} AVFormatParameters;
-
-//! Demuxer will use url_fopen, no opened file should be provided by the caller.
+/// Demuxer will use avio_open, no opened file should be provided by the caller.
 #define AVFMT_NOFILE        0x0001
 #define AVFMT_NEEDNUMBER    0x0002 /**< Needs '%d' in filename. */
 #define AVFMT_SHOW_IDS      0x0008 /**< Show format stream IDs numbers. */
@@ -183,9 +348,29 @@
 #define AVFMT_GLOBALHEADER  0x0040 /**< Format wants global header. */
 #define AVFMT_NOTIMESTAMPS  0x0080 /**< Format does not need / have any timestamps. */
 #define AVFMT_GENERIC_INDEX 0x0100 /**< Use generic index building code. */
-#define AVFMT_TS_DISCONT    0x0200 /**< Format allows timestamp discontinuities. */
+#define AVFMT_TS_DISCONT    0x0200 /**< Format allows timestamp discontinuities. Note, muxers always require valid (monotone) timestamps */
 #define AVFMT_VARIABLE_FPS  0x0400 /**< Format allows variable fps. */
+#define AVFMT_NODIMENSIONS  0x0800 /**< Format does not need width/height */
+#define AVFMT_NOSTREAMS     0x1000 /**< Format does not require any streams */
+#define AVFMT_NOBINSEARCH   0x2000 /**< Format does not allow to fallback to binary search via read_timestamp */
+#define AVFMT_NOGENSEARCH   0x4000 /**< Format does not allow to fallback to generic search */
+#define AVFMT_NO_BYTE_SEEK  0x8000 /**< Format does not allow seeking by bytes */
+#define AVFMT_ALLOW_FLUSH  0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */
+#if LIBAVFORMAT_VERSION_MAJOR <= 54
+#define AVFMT_TS_NONSTRICT 0x8020000 //we try to be compatible to the ABIs of ffmpeg and major forks
+#else
+#define AVFMT_TS_NONSTRICT 0x20000
+#endif
+                                   /**< Format does not require strictly
+                                        increasing timestamps, but they must
+                                        still be monotonic */
+
+#define AVFMT_SEEK_TO_PTS   0x4000000 /**< Seeking is based on PTS */
 
+/**
+ * @addtogroup lavf_encoding
+ * @{
+ */
 typedef struct AVOutputFormat {
     const char *name;
     /**
@@ -196,69 +381,157 @@
     const char *long_name;
     const char *mime_type;
     const char *extensions; /**< comma-separated filename extensions */
-    /** size of private data so that it can be allocated in the wrapper */
-    int priv_data_size;
     /* output support */
-    enum CodecID audio_codec; /**< default audio codec */
-    enum CodecID video_codec; /**< default video codec */
-    int (*write_header)(struct AVFormatContext *);
-    int (*write_packet)(struct AVFormatContext *, AVPacket *pkt);
-    int (*write_trailer)(struct AVFormatContext *);
-    /** can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_GLOBALHEADER */
+    enum AVCodecID audio_codec;    /**< default audio codec */
+    enum AVCodecID video_codec;    /**< default video codec */
+    enum AVCodecID subtitle_codec; /**< default subtitle codec */
+    /**
+     * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE,
+     * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS,
+     * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH,
+     * AVFMT_TS_NONSTRICT
+     */
     int flags;
-    /** Currently only used to set pixel format if not YUV420P. */
-    int (*set_parameters)(struct AVFormatContext *, AVFormatParameters *);
-    int (*interleave_packet)(struct AVFormatContext *, AVPacket *out,
-                             AVPacket *in, int flush);
 
     /**
      * List of supported codec_id-codec_tag pairs, ordered by "better
-     * choice first". The arrays are all terminated by CODEC_ID_NONE.
+     * choice first". The arrays are all terminated by AV_CODEC_ID_NONE.
      */
     const struct AVCodecTag * const *codec_tag;
 
-    enum CodecID subtitle_codec; /**< default subtitle codec */
 
-    const AVMetadataConv *metadata_conv;
+    const AVClass *priv_class; ///< AVClass for the private context
 
-    /* private fields */
+    /*****************************************************************
+     * No fields below this line are part of the public API. They
+     * may not be used outside of libavformat and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
     struct AVOutputFormat *next;
+    /**
+     * size of private data so that it can be allocated in the wrapper
+     */
+    int priv_data_size;
+
+    int (*write_header)(struct AVFormatContext *);
+    /**
+     * Write a packet. If AVFMT_ALLOW_FLUSH is set in flags,
+     * pkt can be NULL in order to flush data buffered in the muxer.
+     * When flushing, return 0 if there still is more data to flush,
+     * or 1 if everything was flushed and there is no more buffered
+     * data.
+     */
+    int (*write_packet)(struct AVFormatContext *, AVPacket *pkt);
+    int (*write_trailer)(struct AVFormatContext *);
+    /**
+     * Currently only used to set pixel format if not YUV420P.
+     */
+    int (*interleave_packet)(struct AVFormatContext *, AVPacket *out,
+                             AVPacket *in, int flush);
+    /**
+     * Test if the given codec can be stored in this container.
+     *
+     * @return 1 if the codec is supported, 0 if it is not.
+     *         A negative number if unknown.
+     *         MKTAG('A', 'P', 'I', 'C') if the codec is only supported as AV_DISPOSITION_ATTACHED_PIC
+     */
+    int (*query_codec)(enum AVCodecID id, int std_compliance);
+
+    void (*get_output_timestamp)(struct AVFormatContext *s, int stream,
+                                 int64_t *dts, int64_t *wall);
 } AVOutputFormat;
+/**
+ * @}
+ */
 
+/**
+ * @addtogroup lavf_decoding
+ * @{
+ */
 typedef struct AVInputFormat {
+    /**
+     * A comma separated list of short names for the format. New names
+     * may be appended with a minor bump.
+     */
     const char *name;
+
     /**
      * Descriptive name for the format, meant to be more human-readable
      * than name. You should use the NULL_IF_CONFIG_SMALL() macro
      * to define it.
      */
     const char *long_name;
-    /** Size of private data so that it can be allocated in the wrapper. */
+
+    /**
+     * Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
+     * AVFMT_GENERIC_INDEX, AVFMT_TS_DISCONT, AVFMT_NOBINSEARCH,
+     * AVFMT_NOGENSEARCH, AVFMT_NO_BYTE_SEEK, AVFMT_SEEK_TO_PTS.
+     */
+    int flags;
+
+    /**
+     * If extensions are defined, then no probe is done. You should
+     * usually not use extension format guessing because it is not
+     * reliable enough
+     */
+    const char *extensions;
+
+    const struct AVCodecTag * const *codec_tag;
+
+    const AVClass *priv_class; ///< AVClass for the private context
+
+    /*****************************************************************
+     * No fields below this line are part of the public API. They
+     * may not be used outside of libavformat and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+    struct AVInputFormat *next;
+
+    /**
+     * Raw demuxers store their codec ID here.
+     */
+    int raw_codec_id;
+
+    /**
+     * Size of private data so that it can be allocated in the wrapper.
+     */
     int priv_data_size;
+
     /**
      * Tell if a given file has a chance of being parsed as this format.
      * The buffer provided is guaranteed to be AVPROBE_PADDING_SIZE bytes
      * big so you do not have to check for that unless you need more.
      */
     int (*read_probe)(AVProbeData *);
-    /** Read the format header and initialize the AVFormatContext
-       structure. Return 0 if OK. 'ap' if non-NULL contains
-       additional parameters. Only used in raw format right
-       now. 'av_new_stream' should be called to create new streams.  */
-    int (*read_header)(struct AVFormatContext *,
-                       AVFormatParameters *ap);
-    /** Read one packet and put it in 'pkt'. pts and flags are also
-       set. 'av_new_stream' can be called only if the flag
-       AVFMTCTX_NOHEADER is used.
-       @return 0 on success, < 0 on error.
-               When returning an error, pkt must not have been allocated
-               or must be freed before returning */
+
+    /**
+     * Read the format header and initialize the AVFormatContext
+     * structure. Return 0 if OK. Only used in raw format right
+     * now. 'avformat_new_stream' should be called to create new streams.
+     */
+    int (*read_header)(struct AVFormatContext *);
+
+    /**
+     * Read one packet and put it in 'pkt'. pts and flags are also
+     * set. 'avformat_new_stream' can be called only if the flag
+     * AVFMTCTX_NOHEADER is used and only in the calling thread (not in a
+     * background thread).
+     * @return 0 on success, < 0 on error.
+     *         When returning an error, pkt must not have been allocated
+     *         or must be freed before returning
+     */
     int (*read_packet)(struct AVFormatContext *, AVPacket *pkt);
-    /** Close the stream. The AVFormatContext and AVStreams are not
-       freed by this function */
+
+    /**
+     * Close the stream. The AVFormatContext and AVStreams are not
+     * freed by this function
+     */
     int (*read_close)(struct AVFormatContext *);
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
     /**
      * Seek to a given timestamp relative to the frames in
      * stream component stream_index.
@@ -269,32 +542,26 @@
      */
     int (*read_seek)(struct AVFormatContext *,
                      int stream_index, int64_t timestamp, int flags);
-#endif
+
     /**
-     * Gets the next timestamp in stream[stream_index].time_base units.
+     * Get the next timestamp in stream[stream_index].time_base units.
      * @return the timestamp or AV_NOPTS_VALUE if an error occurred
      */
     int64_t (*read_timestamp)(struct AVFormatContext *s, int stream_index,
                               int64_t *pos, int64_t pos_limit);
-    /** Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER. */
-    int flags;
-    /** If extensions are defined, then no probe is done. You should
-       usually not use extension format guessing because it is not
-       reliable enough */
-    const char *extensions;
-    /** General purpose read-only value that the format can use. */
-    int value;
 
-    /** Start/resume playing - only meaningful if using a network-based format
-       (RTSP). */
+    /**
+     * Start/resume playing - only meaningful if using a network-based format
+     * (RTSP).
+     */
     int (*read_play)(struct AVFormatContext *);
 
-    /** Pause playing - only meaningful if using a network-based format
-       (RTSP). */
+    /**
+     * Pause playing - only meaningful if using a network-based format
+     * (RTSP).
+     */
     int (*read_pause)(struct AVFormatContext *);
 
-    const struct AVCodecTag * const *codec_tag;
-
     /**
      * Seek to timestamp ts.
      * Seeking will be done so that the point from which all active streams
@@ -302,23 +569,30 @@
      * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
      */
     int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
-
-    const AVMetadataConv *metadata_conv;
-
-    /* private fields */
-    struct AVInputFormat *next;
 } AVInputFormat;
+/**
+ * @}
+ */
 
 enum AVStreamParseType {
     AVSTREAM_PARSE_NONE,
     AVSTREAM_PARSE_FULL,       /**< full parsing and repack */
     AVSTREAM_PARSE_HEADERS,    /**< Only parse headers, do not repack. */
     AVSTREAM_PARSE_TIMESTAMPS, /**< full parsing and interpolation of timestamps for frames not starting on a packet boundary */
+    AVSTREAM_PARSE_FULL_ONCE,  /**< full parsing and repack of the first frame only, only implemented for H.264 currently */
+    AVSTREAM_PARSE_FULL_RAW=MKTAG(0,'R','A','W'),       /**< full parsing and repack with timestamp and position generation by parser for raw
+                                                             this assumes that each packet in the file contains no demuxer level headers and
+                                                             just codec level data, otherwise position generation would fail */
 };
 
 typedef struct AVIndexEntry {
     int64_t pos;
-    int64_t timestamp;
+    int64_t timestamp;        /**<
+                               * Timestamp in AVStream.time_base units, preferably the time from which on correctly decoded frames are available
+                               * when seeking to this entry. That means preferable PTS on keyframe based formats.
+                               * But demuxers can choose to store a different timestamp, if it is more convenient for the implementation or nothing better
+                               * is known
+                               */
 #define AVINDEX_KEYFRAME 0x0001
     int flags:2;
     int size:30; //Yeah, trying to keep the size of this small to reduce memory requirements (it is 24 vs. 32 bytes due to possible 8-byte alignment).
@@ -333,6 +607,23 @@
 #define AV_DISPOSITION_KARAOKE   0x0020
 
 /**
+ * Track should be used during playback by default.
+ * Useful for subtitle track that should be displayed
+ * even when user did not explicitly ask for subtitles.
+ */
+#define AV_DISPOSITION_FORCED    0x0040
+#define AV_DISPOSITION_HEARING_IMPAIRED  0x0080  /**< stream for hearing impaired audiences */
+#define AV_DISPOSITION_VISUAL_IMPAIRED   0x0100  /**< stream for visual impaired audiences */
+#define AV_DISPOSITION_CLEAN_EFFECTS     0x0200  /**< stream without voice */
+/**
+ * The stream is stored in the file as an attached picture/"cover art" (e.g.
+ * APIC frame in ID3v2). The single packet associated with it will be returned
+ * among the first few packets read from the file unless seeking takes place.
+ * It can also be accessed at any time in AVStream.attached_pic.
+ */
+#define AV_DISPOSITION_ATTACHED_PIC      0x0400
+
+/**
  * Stream structure.
  * New fields can be added to the end with minor version bumps.
  * Removal, reordering and changes to existing fields require a major
@@ -341,8 +632,25 @@
  */
 typedef struct AVStream {
     int index;    /**< stream index in AVFormatContext */
-    int id;       /**< format-specific stream ID */
-    AVCodecContext *codec; /**< codec context */
+    /**
+     * Format-specific stream ID.
+     * decoding: set by libavformat
+     * encoding: set by the user
+     */
+    int id;
+    /**
+     * Codec context associated with this stream. Allocated and freed by
+     * libavformat.
+     *
+     * - decoding: The demuxer exports codec information stored in the headers
+     *             here.
+     * - encoding: The user sets codec information, the muxer writes it to the
+     *             output. Mandatory fields as specified in AVCodecContext
+     *             documentation must be set even if this AVCodecContext is
+     *             not actually used for encoding.
+     */
+    AVCodecContext *codec;
+#if FF_API_R_FRAME_RATE
     /**
      * Real base framerate of the stream.
      * This is the lowest framerate with which all timestamps can be
@@ -352,29 +660,27 @@
      * approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
      */
     AVRational r_frame_rate;
+#endif
     void *priv_data;
 
-    /* internal data used in av_find_stream_info() */
-    int64_t first_dts;
-    /** encoding: pts generation when outputting stream */
+    /**
+     * 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. For fixed-fps content,
-     * time base should be 1/framerate and timestamp increments should be 1.
+     * of which frame timestamps are represented.
+     *
+     * decoding: set by libavformat
+     * encoding: 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.
      */
     AVRational time_base;
-    int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
-    /* ffmpeg.c private use */
-    int stream_copy; /**< If set, just copy stream. */
-    enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed.
-    //FIXME move stuff to a flags field?
-    /** Quality, as it has been removed from AVCodecContext and put in AVVideoFrame.
-     * MN: dunno if that is the right place for it */
-    float quality;
+
     /**
-     * Decoding: pts of the first frame of the stream, in stream time base.
+     * Decoding: pts of the first frame of the stream in presentation order, in stream time base.
      * Only set this if you are absolutely 100% sure that the value you set
      * it to really is the pts of the first frame.
      * This may be undefined (AV_NOPTS_VALUE).
@@ -382,6 +688,7 @@
      * demuxer must NOT set this.
      */
     int64_t start_time;
+
     /**
      * Decoding: duration of the stream, in stream time base.
      * If a source file does not specify a duration, but does specify
@@ -389,36 +696,11 @@
      */
     int64_t duration;
 
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    char language[4]; /** ISO 639-2/B 3-letter language code (empty string if undefined) */
-#endif
-
-    /* av_read_frame() support */
-    enum AVStreamParseType need_parsing;
-    struct AVCodecParserContext *parser;
-
-    int64_t cur_dts;
-    int last_IP_duration;
-    int64_t last_IP_pts;
-    /* av_seek_frame() support */
-    AVIndexEntry *index_entries; /**< Only used if the format does not
-                                    support seeking natively. */
-    int nb_index_entries;
-    unsigned int index_entries_allocated_size;
-
     int64_t nb_frames;                 ///< number of frames in this stream if known or 0
 
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    int64_t unused[4+1];
-
-    char *filename; /**< source filename of the stream */
-#endif
-
     int disposition; /**< AV_DISPOSITION_* bit field */
 
-    AVProbeData probe_data;
-#define MAX_REORDER_DELAY 16
-    int64_t pts_buffer[MAX_REORDER_DELAY+1];
+    enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed.
 
     /**
      * sample aspect ratio (0 if unknown)
@@ -427,12 +709,54 @@
      */
     AVRational sample_aspect_ratio;
 
-    AVMetadata *metadata;
+    AVDictionary *metadata;
 
-    /* av_read_frame() support */
-    const uint8_t *cur_ptr;
-    int cur_len;
-    AVPacket cur_pkt;
+    /**
+     * Average framerate
+     */
+    AVRational avg_frame_rate;
+
+    /**
+     * For streams with AV_DISPOSITION_ATTACHED_PIC disposition, this packet
+     * will contain the attached picture.
+     *
+     * decoding: set by libavformat, must not be modified by the caller.
+     * encoding: unused
+     */
+    AVPacket attached_pic;
+
+    /*****************************************************************
+     * All fields below this line are not part of the public API. They
+     * may not be used outside of libavformat and can be changed and
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+
+    /**
+     * Stream information used internally by av_find_stream_info()
+     */
+#define MAX_STD_TIMEBASES (60*12+6)
+    struct {
+        int64_t last_dts;
+        int64_t duration_gcd;
+        int duration_count;
+        double duration_error[2][2][MAX_STD_TIMEBASES];
+        int64_t codec_info_duration;
+        int64_t codec_info_duration_fields;
+        int found_decoder;
+
+        /**
+         * Those are used for average framerate estimation.
+         */
+        int64_t fps_first_dts;
+        int     fps_first_dts_idx;
+        int64_t fps_last_dts;
+        int     fps_last_dts_idx;
+
+    } *info;
+
+    int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
 
     // Timestamp generation support:
     /**
@@ -443,6 +767,80 @@
      * AV_NOPTS_VALUE by default.
      */
     int64_t reference_dts;
+    int64_t first_dts;
+    int64_t cur_dts;
+    int64_t last_IP_pts;
+    int last_IP_duration;
+
+    /**
+     * Number of packets to buffer for codec probing
+     */
+#define MAX_PROBE_PACKETS 2500
+    int probe_packets;
+
+    /**
+     * Number of frames that have been demuxed during av_find_stream_info()
+     */
+    int codec_info_nb_frames;
+
+    /**
+     * Stream Identifier
+     * This is the MPEG-TS stream identifier +1
+     * 0 means unknown
+     */
+    int stream_identifier;
+
+    int64_t interleaver_chunk_size;
+    int64_t interleaver_chunk_duration;
+
+    /* av_read_frame() support */
+    enum AVStreamParseType need_parsing;
+    struct AVCodecParserContext *parser;
+
+    /**
+     * last packet in packet_buffer for this stream when muxing.
+     */
+    struct AVPacketList *last_in_packet_buffer;
+    AVProbeData probe_data;
+#define MAX_REORDER_DELAY 16
+    int64_t pts_buffer[MAX_REORDER_DELAY+1];
+
+    AVIndexEntry *index_entries; /**< Only used if the format does not
+                                    support seeking natively. */
+    int nb_index_entries;
+    unsigned int index_entries_allocated_size;
+
+    /**
+     * stream probing state
+     * -1   -> probing finished
+     *  0   -> no probing requested
+     * rest -> perform probing with request_probe being the minimum score to accept.
+     * NOT PART OF PUBLIC API
+     */
+    int request_probe;
+    /**
+     * Indicates that everything up to the next keyframe
+     * should be discarded.
+     */
+    int skip_to_keyframe;
+
+    /**
+     * Number of samples to skip at the start of the frame decoded from the next packet.
+     */
+    int skip_samples;
+
+    /**
+     * Number of internally decoded frames, used internally in libavformat, do not access
+     * its lifetime differs from info which is why its not in that structure.
+     */
+    int nb_decoded_frames;
+
+    /**
+     * Timestamp offset added to timestamps before muxing
+     * NOT PART OF PUBLIC API
+     */
+    int64_t mux_ts_offset;
+
 } AVStream;
 
 #define AV_PROGRAM_RUNNING 1
@@ -455,15 +853,15 @@
  */
 typedef struct AVProgram {
     int            id;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    char           *provider_name; ///< network name for DVB streams
-    char           *name;          ///< service name for DVB streams
-#endif
     int            flags;
     enum AVDiscard discard;        ///< selects which program to discard and which to feed to the caller
     unsigned int   *stream_index;
     unsigned int   nb_stream_indexes;
-    AVMetadata *metadata;
+    AVDictionary *metadata;
+
+    int program_num;
+    int pmt_pid;
+    int pcr_pid;
 } AVProgram;
 
 #define AVFMTCTX_NOHEADER      0x0001 /**< signal that no header is present
@@ -473,100 +871,128 @@
     int id;                 ///< unique ID to identify the chapter
     AVRational time_base;   ///< time base in which the start/end timestamps are specified
     int64_t start, end;     ///< chapter start/end time in time_base units
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    char *title;            ///< chapter title
-#endif
-    AVMetadata *metadata;
+    AVDictionary *metadata;
 } AVChapter;
 
-#define MAX_STREAMS 20
+
+/**
+ * The duration of a video can be estimated through various ways, and this enum can be used
+ * to know how the duration was estimated.
+ */
+enum AVDurationEstimationMethod {
+    AVFMT_DURATION_FROM_PTS,    ///< Duration accurately estimated from PTSes
+    AVFMT_DURATION_FROM_STREAM, ///< Duration estimated from a stream with a known duration
+    AVFMT_DURATION_FROM_BITRATE ///< Duration estimated from bitrate (less accurate)
+};
 
 /**
  * Format I/O context.
  * New fields can be added to the end with minor version bumps.
  * Removal, reordering and changes to existing fields require a major
  * version bump.
- * sizeof(AVFormatContext) must not be used outside libav*.
+ * sizeof(AVFormatContext) must not be used outside libav*, use
+ * avformat_alloc_context() to create an AVFormatContext.
  */
 typedef struct AVFormatContext {
-    const AVClass *av_class; /**< Set by avformat_alloc_context. */
-    /* Can only be iformat or oformat, not both at the same time. */
+    /**
+     * A class for logging and AVOptions. Set by avformat_alloc_context().
+     * Exports (de)muxer private options if they exist.
+     */
+    const AVClass *av_class;
+
+    /**
+     * Can only be iformat or oformat, not both at the same time.
+     *
+     * decoding: set by avformat_open_input().
+     * encoding: set by the user.
+     */
     struct AVInputFormat *iformat;
     struct AVOutputFormat *oformat;
+
+    /**
+     * Format private data. This is an AVOptions-enabled struct
+     * if and only if iformat/oformat.priv_class is not NULL.
+     */
     void *priv_data;
-    ByteIOContext *pb;
-    unsigned int nb_streams;
-    AVStream *streams[MAX_STREAMS];
-    char filename[1024]; /**< input or output filename */
-    /* stream info */
-    int64_t timestamp;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    char title[512];
-    char author[512];
-    char copyright[512];
-    char comment[512];
-    char album[512];
-    int year;  /**< ID3 year, 0 if none */
-    int track; /**< track number, 0 if none */
-    char genre[32]; /**< ID3 genre */
-#endif
 
+    /**
+     * I/O context.
+     *
+     * decoding: either set by the user before avformat_open_input() (then
+     * the user must close it manually) or set by avformat_open_input().
+     * encoding: set by the user.
+     *
+     * Do NOT set this field if AVFMT_NOFILE flag is set in
+     * iformat/oformat.flags. In such a case, the (de)muxer will handle
+     * I/O in some other way and this field will be NULL.
+     */
+    AVIOContext *pb;
+
+    /* stream info */
     int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */
-    /* private data for pts handling (do not modify directly). */
-    /** This buffer is only needed when packets were already buffered but
-       not decoded, for example to get the codec parameters in MPEG
-       streams. */
-    struct AVPacketList *packet_buffer;
 
-    /** Decoding: position of the first frame of the component, in
-       AV_TIME_BASE fractional seconds. NEVER set this value directly:
-       It is deduced from the AVStream values.  */
+    /**
+     * A list of all streams in the file. New streams are created with
+     * avformat_new_stream().
+     *
+     * decoding: streams are created by libavformat in avformat_open_input().
+     * If AVFMTCTX_NOHEADER is set in ctx_flags, then new streams may also
+     * appear in av_read_frame().
+     * encoding: streams are created by the user before avformat_write_header().
+     */
+    unsigned int nb_streams;
+    AVStream **streams;
+
+    char filename[1024]; /**< input or output filename */
+
+    /**
+     * Decoding: position of the first frame of the component, in
+     * AV_TIME_BASE fractional seconds. NEVER set this value directly:
+     * It is deduced from the AVStream values.
+     */
     int64_t start_time;
-    /** Decoding: duration of the stream, in AV_TIME_BASE fractional
-       seconds. NEVER set this value directly: it is deduced from the
-       AVStream values.  */
-    int64_t duration;
-    /** decoding: total file size, 0 if unknown */
-    int64_t file_size;
-    /** Decoding: total stream bitrate in bit/s, 0 if not
-       available. Never set it directly if the file_size and the
-       duration are known as FFmpeg can compute it automatically. */
-    int bit_rate;
 
-    /* av_read_frame() support */
-    AVStream *cur_st;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-    const uint8_t *cur_ptr_deprecated;
-    int cur_len_deprecated;
-    AVPacket cur_pkt_deprecated;
-#endif
+    /**
+     * Decoding: duration of the stream, in AV_TIME_BASE fractional
+     * seconds. Only set this value if you know none of the individual stream
+     * durations and also do not set any of them. This is deduced from the
+     * AVStream values if not set.
+     */
+    int64_t duration;
 
-    /* av_seek_frame() support */
-    int64_t data_offset; /** offset of the first packet */
-    int index_built;
+    /**
+     * Decoding: total stream bitrate in bit/s, 0 if not
+     * available. Never set it directly if the file_size and the
+     * duration are known as FFmpeg can compute it automatically.
+     */
+    int bit_rate;
 
-    int mux_rate;
-    int packet_size;
-    int preload;
+    unsigned int packet_size;
     int max_delay;
 
-#define AVFMT_NOOUTPUTLOOP -1
-#define AVFMT_INFINITEOUTPUTLOOP 0
-    /** number of times to loop output in formats that support it */
-    int loop_output;
-
     int flags;
 #define AVFMT_FLAG_GENPTS       0x0001 ///< Generate missing pts even if it requires parsing future frames.
 #define AVFMT_FLAG_IGNIDX       0x0002 ///< Ignore index.
 #define AVFMT_FLAG_NONBLOCK     0x0004 ///< Do not block when reading packets from input.
+#define AVFMT_FLAG_IGNDTS       0x0008 ///< Ignore DTS on frames that contain both DTS & PTS
+#define AVFMT_FLAG_NOFILLIN     0x0010 ///< Do not infer any values from other values, just return what is stored in the container
+#define AVFMT_FLAG_NOPARSE      0x0020 ///< Do not use AVParsers, you also must set AVFMT_FLAG_NOFILLIN as the fillin code works on frames and no parsing -> no frames. Also seeking to frames can not work if parsing to find frame boundaries has been disabled
+#define AVFMT_FLAG_NOBUFFER     0x0040 ///< Do not buffer frames when possible
+#define AVFMT_FLAG_CUSTOM_IO    0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
+#define AVFMT_FLAG_DISCARD_CORRUPT  0x0100 ///< Discard frames marked corrupted
+#define AVFMT_FLAG_MP4A_LATM    0x8000 ///< Enable RTP MP4A-LATM payload
+#define AVFMT_FLAG_SORT_DTS    0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down)
+#define AVFMT_FLAG_PRIV_OPT    0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted)
+#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Don't merge side data but keep it separate.
 
-    int loop_input;
-    /** decoding: size of data to probe; encoding: unused. */
+    /**
+     * decoding: size of data to probe; encoding: unused.
+     */
     unsigned int probesize;
 
     /**
-     * Maximum time (in AV_TIME_BASE units) during which the input should
-     * be analyzed in av_find_stream_info().
+     * decoding: maximum time (in AV_TIME_BASE units) during which the input should
+     * be analyzed in avformat_find_stream_info().
      */
     int max_analyze_duration;
 
@@ -580,17 +1006,19 @@
      * Forced video codec_id.
      * Demuxing: Set by user.
      */
-    enum CodecID video_codec_id;
+    enum AVCodecID video_codec_id;
+
     /**
      * Forced audio codec_id.
      * Demuxing: Set by user.
      */
-    enum CodecID audio_codec_id;
+    enum AVCodecID audio_codec_id;
+
     /**
      * Forced subtitle codec_id.
      * Demuxing: Set by user.
      */
-    enum CodecID subtitle_codec_id;
+    enum AVCodecID subtitle_codec_id;
 
     /**
      * Maximum amount of memory in bytes to use for the index of each stream.
@@ -613,6 +1041,41 @@
     unsigned int nb_chapters;
     AVChapter **chapters;
 
+    AVDictionary *metadata;
+
+    /**
+     * Start time of the stream in real world time, in microseconds
+     * since the unix epoch (00:00 1st January 1970). That is, pts=0
+     * in the stream was captured at this real world time.
+     * - encoding: Set by user.
+     * - decoding: Unused.
+     */
+    int64_t start_time_realtime;
+
+    /**
+     * decoding: number of frames used to probe fps
+     */
+    int fps_probe_size;
+
+    /**
+     * Error recognition; higher values will detect more errors but may
+     * misdetect some more or less valid parts as errors.
+     * - encoding: unused
+     * - decoding: Set by user.
+     */
+    int error_recognition;
+
+    /**
+     * Custom interrupt callbacks for the I/O layer.
+     *
+     * decoding: set by the user before avformat_open_input().
+     * encoding: set by the user before avformat_write_header()
+     * (mainly useful for AVFMT_NOFILE formats). The callback
+     * should also be passed to avio_open2() if it's used to
+     * open the file.
+     */
+    AVIOInterruptCB interrupt_callback;
+
     /**
      * Flags to enable debugging.
      */
@@ -620,6 +1083,89 @@
 #define FF_FDEBUG_TS        0x0001
 
     /**
+     * Transport stream id.
+     * This will be moved into demuxer private options. Thus no API/ABI compatibility
+     */
+    int ts_id;
+
+    /**
+     * Audio preload in microseconds.
+     * Note, not all formats support this and unpredictable things may happen if it is used when not supported.
+     * - encoding: Set by user via AVOptions (NO direct access)
+     * - decoding: unused
+     */
+    int audio_preload;
+
+    /**
+     * Max chunk time in microseconds.
+     * Note, not all formats support this and unpredictable things may happen if it is used when not supported.
+     * - encoding: Set by user via AVOptions (NO direct access)
+     * - decoding: unused
+     */
+    int max_chunk_duration;
+
+    /**
+     * Max chunk size in bytes
+     * Note, not all formats support this and unpredictable things may happen if it is used when not supported.
+     * - encoding: Set by user via AVOptions (NO direct access)
+     * - decoding: unused
+     */
+    int max_chunk_size;
+
+    /**
+     * forces the use of wallclock timestamps as pts/dts of packets
+     * This has undefined results in the presence of B frames.
+     * - encoding: unused
+     * - decoding: Set by user via AVOptions (NO direct access)
+     */
+    int use_wallclock_as_timestamps;
+
+    /**
+     * Avoids negative timestamps during muxing
+     *  0 -> allow negative timestamps
+     *  1 -> avoid negative timestamps
+     * -1 -> choose automatically (default)
+     * Note, this is only works when interleave_packet_per_dts is in use
+     * - encoding: Set by user via AVOptions (NO direct access)
+     * - decoding: unused
+     */
+    int avoid_negative_ts;
+
+    /**
+     * avio flags, used to force AVIO_FLAG_DIRECT.
+     * - encoding: unused
+     * - decoding: Set by user via AVOptions (NO direct access)
+     */
+    int avio_flags;
+
+    /**
+     * The duration field can be estimated through various ways, and this field can be used
+     * to know how the duration was estimated.
+     * - encoding: unused
+     * - decoding: Read by user via AVOptions (NO direct access)
+     */
+    enum AVDurationEstimationMethod duration_estimation_method;
+
+    /*****************************************************************
+     * 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
@@ -627,21 +1173,83 @@
      */
     struct AVPacketList *raw_packet_buffer;
     struct AVPacketList *raw_packet_buffer_end;
-
-    struct AVPacketList *packet_buffer_end;
-
-    AVMetadata *metadata;
+    /**
+     * Packets split by the parser get queued here.
+     */
+    struct AVPacketList *parse_queue;
+    struct AVPacketList *parse_queue_end;
+    /**
+     * Remaining size available for raw_packet_buffer, in bytes.
+     */
+#define RAW_PACKET_BUFFER_SIZE 2500000
+    int raw_packet_buffer_remaining_size;
 } AVFormatContext;
 
+/**
+ * Returns the method used to set ctx->duration.
+ *
+ * @return AVFMT_DURATION_FROM_PTS, AVFMT_DURATION_FROM_STREAM, or AVFMT_DURATION_FROM_BITRATE.
+ */
+enum AVDurationEstimationMethod av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx);
+
 typedef struct AVPacketList {
     AVPacket pkt;
     struct AVPacketList *next;
 } AVPacketList;
 
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
-extern AVInputFormat *first_iformat;
-extern AVOutputFormat *first_oformat;
-#endif
+
+/**
+ * @defgroup lavf_core Core functions
+ * @ingroup libavf
+ *
+ * Functions for querying libavformat capabilities, allocating core structures,
+ * etc.
+ * @{
+ */
+
+/**
+ * Return the LIBAVFORMAT_VERSION_INT constant.
+ */
+unsigned avformat_version(void);
+
+/**
+ * Return the libavformat build-time configuration.
+ */
+const char *avformat_configuration(void);
+
+/**
+ * Return the libavformat license.
+ */
+const char *avformat_license(void);
+
+/**
+ * Initialize libavformat and register all the muxers, demuxers and
+ * protocols. If you do not call this function, then you can select
+ * exactly which formats you want to support.
+ *
+ * @see av_register_input_format()
+ * @see av_register_output_format()
+ * @see av_register_protocol()
+ */
+void av_register_all(void);
+
+void av_register_input_format(AVInputFormat *format);
+void av_register_output_format(AVOutputFormat *format);
+
+/**
+ * Do global initialization of network components. This is optional,
+ * but recommended, since it avoids the overhead of implicitly
+ * doing the setup for each session.
+ *
+ * Calling this function will become mandatory if using network
+ * protocols at some major version bump.
+ */
+int avformat_network_init(void);
+
+/**
+ * Undo the initialization done by avformat_network_init.
+ */
+int avformat_network_deinit(void);
 
 /**
  * If f is NULL, returns the first registered input format,
@@ -657,98 +1265,98 @@
  */
 AVOutputFormat *av_oformat_next(AVOutputFormat *f);
 
-enum CodecID av_guess_image2_codec(const char *filename);
-
-/* XXX: Use automatic init with either ELF sections or C file parser */
-/* modules. */
-
-/* utils.c */
-void av_register_input_format(AVInputFormat *format);
-void av_register_output_format(AVOutputFormat *format);
-AVOutputFormat *guess_stream_format(const char *short_name,
-                                    const char *filename,
-                                    const char *mime_type);
-AVOutputFormat *guess_format(const char *short_name,
-                             const char *filename,
-                             const char *mime_type);
-
 /**
- * Guesses the codec ID based upon muxer and filename.
+ * Allocate an AVFormatContext.
+ * avformat_free_context() can be used to free the context and everything
+ * allocated by the framework within it.
  */
-enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
-                            const char *filename, const char *mime_type,
-                            enum CodecType type);
+AVFormatContext *avformat_alloc_context(void);
 
 /**
- * Send a nice hexadecimal dump of a buffer to the specified file stream.
- *
- * @param f The file stream pointer where the dump should be sent to.
- * @param buf buffer
- * @param size buffer size
+ * Free an AVFormatContext and all its streams.
+ * @param s context to free
+ */
+void avformat_free_context(AVFormatContext *s);
+
+/**
+ * Get the AVClass for AVFormatContext. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
  *
- * @see av_hex_dump_log, av_pkt_dump, av_pkt_dump_log
+ * @see av_opt_find().
  */
-void av_hex_dump(FILE *f, uint8_t *buf, int size);
+const AVClass *avformat_get_class(void);
 
 /**
- * Send a nice hexadecimal dump of a buffer to the log.
+ * Add a new stream to a media file.
  *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param buf buffer
- * @param size buffer size
+ * When demuxing, it is called by the demuxer in read_header(). If the
+ * flag AVFMTCTX_NOHEADER is set in s.ctx_flags, then it may also
+ * be called in read_packet().
+ *
+ * When muxing, should be called by the user before avformat_write_header().
  *
- * @see av_hex_dump, av_pkt_dump, av_pkt_dump_log
+ * @param c If non-NULL, the AVCodecContext corresponding to the new stream
+ * will be initialized to use this codec. This is needed for e.g. codec-specific
+ * defaults to be set, so codec should be provided if it is known.
+ *
+ * @return newly created stream or NULL on error.
  */
-void av_hex_dump_log(void *avcl, int level, uint8_t *buf, int size);
+AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c);
+
+AVProgram *av_new_program(AVFormatContext *s, int id);
 
 /**
- * Send a nice dump of a packet to the specified file stream.
- *
- * @param f The file stream pointer where the dump should be sent to.
- * @param pkt packet to dump
- * @param dump_payload True if the payload must be displayed, too.
+ * @}
  */
-void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload);
 
+
+#if FF_API_PKT_DUMP
+attribute_deprecated void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload);
+attribute_deprecated void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt,
+                                          int dump_payload);
+#endif
+
+#if FF_API_ALLOC_OUTPUT_CONTEXT
 /**
- * Send a nice dump of a packet to the log.
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
- * @param pkt packet to dump
- * @param dump_payload True if the payload must be displayed, too.
+ * @deprecated deprecated in favor of avformat_alloc_output_context2()
  */
-void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, int dump_payload);
+attribute_deprecated
+AVFormatContext *avformat_alloc_output_context(const char *format,
+                                               AVOutputFormat *oformat,
+                                               const char *filename);
+#endif
 
 /**
- * Initialize libavformat and register all the muxers, demuxers and
- * protocols. If you do not call this function, then you can select
- * exactly which formats you want to support.
+ * Allocate an AVFormatContext for an output format.
+ * avformat_free_context() can be used to free the context and
+ * everything allocated by the framework within it.
  *
- * @see av_register_input_format()
- * @see av_register_output_format()
- * @see av_register_protocol()
+ * @param *ctx is set to the created format context, or to NULL in
+ * case of failure
+ * @param oformat format to use for allocating the context, if NULL
+ * format_name and filename are used instead
+ * @param format_name the name of output format to use for allocating the
+ * context, if NULL filename is used instead
+ * @param filename the name of the filename to use for allocating the
+ * context, may be NULL
+ * @return >= 0 in case of success, a negative AVERROR code in case of
+ * failure
  */
-void av_register_all(void);
-
-/** codec tag <-> codec id */
-enum CodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
-unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum CodecID id);
+int avformat_alloc_output_context2(AVFormatContext **ctx, AVOutputFormat *oformat,
+                                   const char *format_name, const char *filename);
 
-/* media file input */
+/**
+ * @addtogroup lavf_decoding
+ * @{
+ */
 
 /**
- * Finds AVInputFormat based on the short name of the input format.
+ * Find AVInputFormat based on the short name of the input format.
  */
 AVInputFormat *av_find_input_format(const char *short_name);
 
 /**
- * Guess file format.
+ * Guess the file format.
  *
  * @param is_opened Whether the file is already opened; determines whether
  *                  demuxers with or without AVFMT_NOFILE are probed.
@@ -756,44 +1364,71 @@
 AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
 
 /**
- * Allocates all the structures needed to read an input stream.
- *        This does not open the needed codecs for decoding the stream[s].
+ * Guess the file format.
+ *
+ * @param is_opened Whether the file is already opened; determines whether
+ *                  demuxers with or without AVFMT_NOFILE are probed.
+ * @param score_max A probe score larger that this is required to accept a
+ *                  detection, the variable is set to the actual detection
+ *                  score afterwards.
+ *                  If the score is <= AVPROBE_SCORE_MAX / 4 it is recommended
+ *                  to retry with a larger probe buffer.
  */
-int av_open_input_stream(AVFormatContext **ic_ptr,
-                         ByteIOContext *pb, const char *filename,
-                         AVInputFormat *fmt, AVFormatParameters *ap);
+AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max);
 
 /**
- * Open a media file as input. The codecs are not opened. Only the file
- * header (if present) is read.
+ * Guess the file format.
  *
- * @param ic_ptr The opened media file handle is put here.
- * @param filename filename to open
- * @param fmt If non-NULL, force the file format to use.
- * @param buf_size optional buffer size (zero if default is OK)
- * @param ap Additional parameters needed when opening the file
- *           (NULL if default).
- * @return 0 if OK, AVERROR_xxx otherwise
+ * @param is_opened Whether the file is already opened; determines whether
+ *                  demuxers with or without AVFMT_NOFILE are probed.
+ * @param score_ret The score of the best detection.
  */
-int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
-                       AVInputFormat *fmt,
-                       int buf_size,
-                       AVFormatParameters *ap);
+AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score_ret);
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
 /**
- * @deprecated Use avformat_alloc_context() instead.
+ * Probe a bytestream to determine the input format. Each time a probe returns
+ * with a score that is too low, the probe buffer size is increased and another
+ * attempt is made. When the maximum probe size is reached, the input format
+ * with the highest score is returned.
+ *
+ * @param pb the bytestream to probe
+ * @param fmt the input format is put here
+ * @param filename the filename of the stream
+ * @param logctx the log context
+ * @param offset the offset within the bytestream to probe from
+ * @param max_probe_size the maximum probe buffer size (zero for default)
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR code otherwise
  */
-attribute_deprecated AVFormatContext *av_alloc_format_context(void);
-#endif
+int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
+                          const char *filename, void *logctx,
+                          unsigned int offset, unsigned int max_probe_size);
 
 /**
- * Allocate an AVFormatContext.
- * Can be freed with av_free() but do not forget to free everything you
- * explicitly allocated as well!
+ * Open an input stream and read the header. The codecs are not opened.
+ * The stream must be closed with av_close_input_file().
+ *
+ * @param ps Pointer to user-supplied AVFormatContext (allocated by avformat_alloc_context).
+ *           May be a pointer to NULL, in which case an AVFormatContext is allocated by this
+ *           function and written into ps.
+ *           Note that a user-supplied AVFormatContext will be freed on failure.
+ * @param filename Name of the stream to open.
+ * @param fmt If non-NULL, this parameter forces a specific input format.
+ *            Otherwise the format is autodetected.
+ * @param options  A dictionary filled with AVFormatContext and demuxer-private options.
+ *                 On return this parameter will be destroyed and replaced with a dict containing
+ *                 options that were not found. May be NULL.
+ *
+ * @return 0 on success, a negative AVERROR on failure.
+ *
+ * @note If you want to use custom IO, preallocate the format context and set its pb field.
  */
-AVFormatContext *avformat_alloc_context(void);
+int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options);
 
+attribute_deprecated
+int av_demuxer_open(AVFormatContext *ic);
+
+#if FF_API_FORMAT_PARAMETERS
 /**
  * Read packets of a media file to get stream information. This
  * is useful for file formats with no headers such as MPEG. This
@@ -806,10 +1441,84 @@
  * @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
+ * function also computes the real framerate in case of MPEG-2 repeat
+ * frame mode.
+ * The logical file position is not changed by this function;
+ * examined packets may be buffered for later processing.
+ *
+ * @param ic media file handle
+ * @param options  If non-NULL, an ic.nb_streams long array of pointers to
+ *                 dictionaries, where i-th member contains options for
+ *                 codec corresponding to i-th stream.
+ *                 On return each dictionary will be filled with options that were not found.
+ * @return >=0 if OK, AVERROR_xxx on error
+ *
+ * @note this function isn't guaranteed to open all the codecs, so
+ *       options being non-empty at return is a perfectly normal behavior.
+ *
+ * @todo Let the user decide somehow what information is needed so that
+ *       we do not waste time getting stuff the user does not need.
+ */
+int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options);
+
+/**
+ * Find the programs which belong to a given stream.
+ *
+ * @param ic    media file handle
+ * @param last  the last found program, the search will start after this
+ *              program, or from the beginning if it is NULL
+ * @param s     stream index
+ * @return the next program which belongs to s, NULL if no program is found or
+ *         the last program is not among the programs of ic.
+ */
+AVProgram *av_find_program_from_stream(AVFormatContext *ic, AVProgram *last, int s);
 
 /**
+ * Find the "best" stream in the file.
+ * The best stream is determined according to various heuristics as the most
+ * likely to be what the user expects.
+ * If the decoder parameter is non-NULL, av_find_best_stream will find the
+ * default decoder for the stream's codec; streams for which no decoder can
+ * be found are ignored.
+ *
+ * @param ic                media file handle
+ * @param type              stream type: video, audio, subtitles, etc.
+ * @param wanted_stream_nb  user-requested stream number,
+ *                          or -1 for automatic selection
+ * @param related_stream    try to find a stream related (eg. in the same
+ *                          program) to this one, or -1 if none
+ * @param decoder_ret       if non-NULL, returns the decoder for the
+ *                          selected stream
+ * @param flags             flags; none are currently defined
+ * @return  the non-negative stream number in case of success,
+ *          AVERROR_STREAM_NOT_FOUND if no stream with the requested type
+ *          could be found,
+ *          AVERROR_DECODER_NOT_FOUND if streams were found but no decoder
+ * @note  If av_find_best_stream returns successfully and decoder_ret is not
+ *        NULL, then *decoder_ret is guaranteed to be set to a valid AVCodec.
+ */
+int av_find_best_stream(AVFormatContext *ic,
+                        enum AVMediaType type,
+                        int wanted_stream_nb,
+                        int related_stream,
+                        AVCodec **decoder_ret,
+                        int flags);
+
+#if FF_API_READ_PACKET
+/**
+ * @deprecated use AVFMT_FLAG_NOFILLIN | AVFMT_FLAG_NOPARSE to read raw
+ * unprocessed packets
+ *
  * Read a transport packet from a media file.
  *
  * This function is obsolete and should never be used.
@@ -819,10 +1528,17 @@
  * @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
+ * that what is there are valid frames for the decoder. It will split what is
+ * stored in the file into frames and return one for each call. It will not
+ * omit invalid data between valid frames so as to give the decoder the maximum
+ * information possible for decoding.
  *
  * The returned packet is valid
  * until the next av_read_frame() or until av_close_input_file() and
@@ -876,9 +1592,9 @@
  * @param ts target timestamp
  * @param max_ts largest acceptable timestamp
  * @param flags flags
- * @returns >=0 on success, error code otherwise
+ * @return >=0 on success, error code otherwise
  *
- * @NOTE This is part of the new seek API which is still under construction.
+ * @note This is part of the new seek API which is still under construction.
  *       Thus do not use this yet. It may change at any time, do not expect
  *       ABI compatibility yet!
  */
@@ -897,19 +1613,27 @@
  */
 int av_read_pause(AVFormatContext *s);
 
+#if FF_API_CLOSE_INPUT_FILE
 /**
- * Free a AVFormatContext allocated by av_open_input_stream.
- * @param s context to free
- */
-void av_close_input_stream(AVFormatContext *s);
-
-/**
+ * @deprecated use avformat_close_input()
  * Close a media file (but not its codecs).
  *
  * @param s media file handle
  */
+attribute_deprecated
 void av_close_input_file(AVFormatContext *s);
+#endif
+
+/**
+ * Close an opened input AVFormatContext. Free it and all its contents
+ * and set *s to NULL.
+ */
+void avformat_close_input(AVFormatContext **s);
+/**
+ * @}
+ */
 
+#if FF_API_NEW_STREAM
 /**
  * Add a new stream to a media file.
  *
@@ -920,117 +1644,44 @@
  * @param s media file handle
  * @param id file-format-dependent stream ID
  */
+attribute_deprecated
 AVStream *av_new_stream(AVFormatContext *s, int id);
-AVProgram *av_new_program(AVFormatContext *s, int id);
-
-/**
- * Add a new chapter.
- * This function is NOT part of the public API
- * and should ONLY be used by demuxers.
- *
- * @param s media file handle
- * @param id unique ID for this chapter
- * @param start chapter start time in time_base units
- * @param end chapter end time in time_base units
- * @param title chapter title
- *
- * @return AVChapter or NULL on error
- */
-AVChapter *ff_new_chapter(AVFormatContext *s, int id, AVRational time_base,
-                          int64_t start, int64_t end, const char *title);
+#endif
 
+#if FF_API_SET_PTS_INFO
 /**
- * Set the pts for a given stream.
- *
- * @param s stream
- * @param pts_wrap_bits number of bits effectively used by the pts
- *        (used for wrap control, 33 is the value for MPEG)
- * @param pts_num numerator to convert to seconds (MPEG: 1)
- * @param pts_den denominator to convert to seconds (MPEG: 90000)
+ * @deprecated this function is not supposed to be called outside of lavf
  */
+attribute_deprecated
 void av_set_pts_info(AVStream *s, int pts_wrap_bits,
-                     int pts_num, int pts_den);
+                     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
-
-int av_find_default_stream_index(AVFormatContext *s);
-
-/**
- * Gets the index for a specific timestamp.
- * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond
- *                 to the timestamp which is <= the requested one, if backward
- *                 is 0, then it will be >=
- *              if AVSEEK_FLAG_ANY seek to any frame, only keyframes otherwise
- * @return < 0 if no such timestamp could be found
- */
-int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags);
+#define AVSEEK_FLAG_FRAME    8 ///< seeking based on frame number
 
 /**
- * Ensures the index uses less memory than the maximum specified in
- * AVFormatContext.max_index_size by discarding entries if it grows
- * too large.
- * This function is not part of the public API and should only be called
- * by demuxers.
+ * @addtogroup lavf_encoding
+ * @{
  */
-void ff_reduce_index(AVFormatContext *s, int stream_index);
-
 /**
- * Add an index entry into a sorted list. Update the entry if the list
- * already contains it.
+ * Allocate the stream private data and write the stream header to
+ * an output media file.
  *
- * @param timestamp timestamp in the time base of the given stream
- */
-int av_add_index_entry(AVStream *st, int64_t pos, int64_t timestamp,
-                       int size, int distance, int flags);
-
-/**
- * Does a binary search using av_index_search_timestamp() and
- * AVCodec.read_timestamp().
- * This is not supposed to be called directly by a user application,
- * but by demuxers.
- * @param target_ts target timestamp in the time base of the given stream
- * @param stream_index stream number
- */
-int av_seek_frame_binary(AVFormatContext *s, int stream_index,
-                         int64_t target_ts, int flags);
-
-/**
- * Updates cur_dts of all streams based on the given timestamp and AVStream.
+ * @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 openened 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.
  *
- * Stream ref_st unchanged, others set cur_dts in their native time base.
- * Only needed for timestamp wrapping or if (dts not set and pts!=dts).
- * @param timestamp new dts expressed in time_base of param ref_st
- * @param ref_st reference stream giving time_base of param timestamp
- */
-void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp);
-
-/**
- * Does a binary search using read_timestamp().
- * This is not supposed to be called directly by a user application,
- * but by demuxers.
- * @param target_ts target timestamp in the time base of the given stream
- * @param stream_index stream number
- */
-int64_t av_gen_search(AVFormatContext *s, int stream_index,
-                      int64_t target_ts, int64_t pos_min,
-                      int64_t pos_max, int64_t pos_limit,
-                      int64_t ts_min, int64_t ts_max,
-                      int flags, int64_t *ts_ret,
-                      int64_t (*read_timestamp)(struct AVFormatContext *, int , int64_t *, int64_t ));
-
-/** media file output */
-int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap);
-
-/**
- * Allocate the stream private data and write the stream header to an
- * output media file.
+ * @return 0 on success, negative AVERROR on failure.
  *
- * @param s media file handle
- * @return 0 if OK, AVERROR_xxx on error
+ * @see av_opt_find, av_dict_set, avio_open, av_oformat_next.
  */
-int av_write_header(AVFormatContext *s);
+int avformat_write_header(AVFormatContext *s, AVDictionary **options);
 
 /**
  * Write a packet to an output media file.
@@ -1041,13 +1692,17 @@
  *
  * @param s media file handle
  * @param pkt The packet, which contains the stream_index, buf/buf_size,
-              dts/pts, ...
- * @return < 0 on error, = 0 if OK, 1 if end of stream wanted
+ *            dts/pts, ...
+ *            This can be NULL (at any time, not just at the end), in
+ *            order to immediately flush data buffered within the muxer,
+ *            for muxers that buffer up data internally before writing it
+ *            to the output.
+ * @return < 0 on error, = 0 if OK, 1 if flushed and there is no more data to flush
  */
 int av_write_frame(AVFormatContext *s, AVPacket *pkt);
 
 /**
- * Writes a packet to an output media file ensuring correct interleaving.
+ * Write a packet to an output media file ensuring correct interleaving.
  *
  * The packet must contain one audio or video frame.
  * If the packets are already correctly interleaved, the application should
@@ -1057,109 +1712,224 @@
  * demuxer level.
  *
  * @param s media file handle
- * @param pkt The packet, which contains the stream_index, buf/buf_size,
-              dts/pts, ...
- * @return < 0 on error, = 0 if OK, 1 if end of stream wanted
+ * @param pkt The packet containing the data to be written. Libavformat takes
+ * ownership of the data and will free it when it sees fit using the packet's
+ * This can be NULL (at any time, not just at the end), to flush the
+ * interleaving queues.
+ * @ref AVPacket.destruct "destruct" field. The caller must not access the data
+ * after this function returns, as it may already be freed.
+ * Packet's @ref AVPacket.stream_index "stream_index" field must be set to the
+ * index of the corresponding stream in @ref AVFormatContext.streams
+ * "s.streams".
+ * It is very strongly recommended that timing information (@ref AVPacket.pts
+ * "pts", @ref AVPacket.dts "dts" @ref AVPacket.duration "duration") is set to
+ * correct values.
+ *
+ * @return 0 on success, a negative AVERROR on error.
  */
 int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
 
+#if FF_API_INTERLEAVE_PACKET
 /**
- * Interleave a packet per dts in an output media file.
- *
- * Packets with pkt->destruct == av_destruct_packet will be freed inside this
- * function, so they cannot be used after it. Note that calling av_free_packet()
- * on them is still safe.
- *
- * @param s media file handle
- * @param out the interleaved packet will be output here
- * @param in the input packet
- * @param flush 1 if no further packets are available as input and all
- *              remaining packets should be output
- * @return 1 if a packet was output, 0 if no packet could be output,
- *         < 0 if an error occurred
+ * @deprecated this function was never meant to be called by the user
+ * programs.
  */
+attribute_deprecated
 int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
                                  AVPacket *pkt, int flush);
+#endif
 
 /**
- * @brief Write the stream trailer to an output media file and
- *        free the file private data.
+ * Write the stream trailer to an output media file and free the
+ * file private data.
  *
- * May only be called after a successful call to av_write_header.
+ * May only be called after a successful call to avformat_write_header.
  *
  * @param s media file handle
  * @return 0 if OK, AVERROR_xxx on error
  */
 int av_write_trailer(AVFormatContext *s);
 
-void dump_format(AVFormatContext *ic,
-                 int index,
-                 const char *url,
-                 int is_output);
+/**
+ * Return the output format in the list of registered output formats
+ * which best matches the provided parameters, or return NULL if
+ * there is no match.
+ *
+ * @param short_name if non-NULL checks if short_name matches with the
+ * names of the registered formats
+ * @param filename if non-NULL checks if filename terminates with the
+ * extensions of the registered formats
+ * @param mime_type if non-NULL checks if mime_type matches with the
+ * MIME type of the registered formats
+ */
+AVOutputFormat *av_guess_format(const char *short_name,
+                                const char *filename,
+                                const char *mime_type);
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
 /**
- * Parses width and height out of string str.
- * @deprecated Use av_parse_video_frame_size instead.
+ * Guess the codec ID based upon muxer and filename.
  */
-attribute_deprecated int parse_image_size(int *width_ptr, int *height_ptr,
-                                          const char *str);
+enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
+                            const char *filename, const char *mime_type,
+                            enum AVMediaType type);
 
 /**
- * Converts framerate from a string to a fraction.
- * @deprecated Use av_parse_video_frame_rate instead.
+ * Get timing information for the data currently output.
+ * The exact meaning of "currently output" depends on the format.
+ * It is mostly relevant for devices that have an internal buffer and/or
+ * work in real time.
+ * @param s          media file handle
+ * @param stream     stream in the media file
+ * @param dts[out]   DTS of the last packet output for the stream, in stream
+ *                   time_base units
+ * @param wall[out]  absolute time when that packet whas output,
+ *                   in microsecond
+ * @return  0 if OK, AVERROR(ENOSYS) if the format does not support it
+ * Note: some formats or devices may not allow to measure dts and wall
+ * atomically.
  */
-attribute_deprecated int parse_frame_rate(int *frame_rate, int *frame_rate_base,
-                                          const char *arg);
-#endif
+int av_get_output_timestamp(struct AVFormatContext *s, int stream,
+                            int64_t *dts, int64_t *wall);
+
 
 /**
- * Parses datestr and returns a corresponding number of microseconds.
- * @param datestr String representing a date or a duration.
- * - If a date the syntax is:
- * @code
- *  [{YYYY-MM-DD|YYYYMMDD}]{T| }{HH[:MM[:SS[.m...]]][Z]|HH[MM[SS[.m...]]][Z]}
- * @endcode
- * Time is local time unless Z is appended, in which case it is
- * interpreted as UTC.
- * If the year-month-day part is not specified it takes the current
- * year-month-day.
- * Returns the number of microseconds since 1st of January, 1970 up to
- * the time of the parsed date or INT64_MIN if datestr cannot be
- * successfully parsed.
- * - If a duration the syntax is:
- * @code
- *  [-]HH[:MM[:SS[.m...]]]
- *  [-]S+[.m...]
- * @endcode
- * Returns the number of microseconds contained in a time interval
- * with the specified duration or INT64_MIN if datestr cannot be
- * successfully parsed.
- * @param duration Flag which tells how to interpret datestr, if
- * not zero datestr is interpreted as a duration, otherwise as a
- * date.
+ * @}
+ */
+
+
+/**
+ * @defgroup lavf_misc Utility functions
+ * @ingroup libavf
+ * @{
+ *
+ * Miscellaneous utility functions related to both muxing and demuxing
+ * (or neither).
+ */
+
+/**
+ * Send a nice hexadecimal dump of a buffer to the specified file stream.
+ *
+ * @param f The file stream pointer where the dump should be sent to.
+ * @param buf buffer
+ * @param size buffer size
+ *
+ * @see av_hex_dump_log, av_pkt_dump2, av_pkt_dump_log2
+ */
+void av_hex_dump(FILE *f, const uint8_t *buf, int size);
+
+/**
+ * Send a nice hexadecimal dump of a buffer to the log.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message, lower values signifying
+ * higher importance.
+ * @param buf buffer
+ * @param size buffer size
+ *
+ * @see av_hex_dump, av_pkt_dump2, av_pkt_dump_log2
+ */
+void av_hex_dump_log(void *avcl, int level, const uint8_t *buf, int size);
+
+/**
+ * Send a nice dump of a packet to the specified file stream.
+ *
+ * @param f The file stream pointer where the dump should be sent to.
+ * @param pkt packet to dump
+ * @param dump_payload True if the payload must be displayed, too.
+ * @param st AVStream that the packet belongs to
+ */
+void av_pkt_dump2(FILE *f, AVPacket *pkt, int dump_payload, AVStream *st);
+
+
+/**
+ * Send a nice dump of a packet to the log.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message, lower values signifying
+ * higher importance.
+ * @param pkt packet to dump
+ * @param dump_payload True if the payload must be displayed, too.
+ * @param st AVStream that the packet belongs to
+ */
+void av_pkt_dump_log2(void *avcl, int level, AVPacket *pkt, int dump_payload,
+                      AVStream *st);
+
+/**
+ * Get the AVCodecID for the given codec tag tag.
+ * If no codec id is found returns AV_CODEC_ID_NONE.
+ *
+ * @param tags list of supported codec_id-codec_tag pairs, as stored
+ * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
+ */
+enum AVCodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
+
+/**
+ * Get the codec tag for the given codec id id.
+ * If no codec tag is found returns 0.
+ *
+ * @param tags list of supported codec_id-codec_tag pairs, as stored
+ * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
+ */
+unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum AVCodecID id);
+
+int av_find_default_stream_index(AVFormatContext *s);
+
+/**
+ * Get the index for a specific timestamp.
+ * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond
+ *                 to the timestamp which is <= the requested one, if backward
+ *                 is 0, then it will be >=
+ *              if AVSEEK_FLAG_ANY seek to any frame, only keyframes otherwise
+ * @return < 0 if no such timestamp could be found
  */
-int64_t parse_date(const char *datestr, int duration);
+int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags);
 
-/** Gets the current time in microseconds. */
-int64_t av_gettime(void);
+/**
+ * Add an index entry into a sorted list. Update the entry if the list
+ * already contains it.
+ *
+ * @param timestamp timestamp in the time base of the given stream
+ */
+int av_add_index_entry(AVStream *st, int64_t pos, int64_t timestamp,
+                       int size, int distance, int flags);
 
-/* ffm-specific for ffserver */
-#define FFM_PACKET_SIZE 4096
-int64_t ffm_read_write_index(int fd);
-int ffm_write_write_index(int fd, int64_t pos);
-void ffm_set_write_index(AVFormatContext *s, int64_t pos, int64_t file_size);
 
 /**
- * Attempts to find a specific tag in a URL.
+ * Split a URL string into components.
+ *
+ * The pointers to buffers for storing individual components may be null,
+ * in order to ignore that component. Buffers for components not found are
+ * set to empty strings. If the port is not found, it is set to a negative
+ * value.
  *
- * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done.
- * Return 1 if found.
+ * @param proto the buffer for the protocol
+ * @param proto_size the size of the proto buffer
+ * @param authorization the buffer for the authorization
+ * @param authorization_size the size of the authorization buffer
+ * @param hostname the buffer for the host name
+ * @param hostname_size the size of the hostname buffer
+ * @param port_ptr a pointer to store the port number in
+ * @param path the buffer for the path
+ * @param path_size the size of the path buffer
+ * @param url the URL to split
  */
-int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
+void av_url_split(char *proto,         int proto_size,
+                  char *authorization, int authorization_size,
+                  char *hostname,      int hostname_size,
+                  int *port_ptr,
+                  char *path,          int path_size,
+                  const char *url);
+
+
+void av_dump_format(AVFormatContext *ic,
+                    int index,
+                    const char *url,
+                    int is_output);
 
 /**
- * Returns in 'buf' the path with '%d' replaced by a number.
+ * Return in 'buf' the path with '%d' replaced by a number.
  *
  * Also handles the '%0nd' format where 'n' is the total number
  * of digits and '%%'.
@@ -1190,49 +1960,96 @@
  *           all the contexts in the array (an AVCodecContext per RTP stream)
  *           must contain only one AVStream.
  * @param n_files number of AVCodecContexts contained in ac
- * @param buff buffer where the SDP will be stored (must be allocated by
- *             the caller)
+ * @param buf buffer where the SDP will be stored (must be allocated by
+ *            the caller)
  * @param size the size of the buffer
  * @return 0 if OK, AVERROR_xxx on error
  */
-int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size);
+int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size);
 
-#ifdef HAVE_AV_CONFIG_H
+/**
+ * Return a positive value if the given filename has one of the given
+ * extensions, 0 otherwise.
+ *
+ * @param extensions a comma-separated list of filename extensions
+ */
+int av_match_ext(const char *filename, const char *extensions);
 
-void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem);
+/**
+ * Test if the given container can store a codec.
+ *
+ * @param std_compliance standards compliance level, one of FF_COMPLIANCE_*
+ *
+ * @return 1 if codec with ID codec_id can be stored in ofmt, 0 if it cannot.
+ *         A negative number if this information is not available.
+ */
+int avformat_query_codec(AVOutputFormat *ofmt, enum AVCodecID codec_id, int std_compliance);
 
-#ifdef __GNUC__
-#define dynarray_add(tab, nb_ptr, elem)\
-do {\
-    __typeof__(tab) _tab = (tab);\
-    __typeof__(elem) _elem = (elem);\
-    (void)sizeof(**_tab == _elem); /* check that types are compatible */\
-    ff_dynarray_add((intptr_t **)_tab, nb_ptr, (intptr_t)_elem);\
-} while(0)
-#else
-#define dynarray_add(tab, nb_ptr, elem)\
-do {\
-    ff_dynarray_add((intptr_t **)(tab), nb_ptr, (intptr_t)(elem));\
-} while(0)
-#endif
+/**
+ * @defgroup riff_fourcc RIFF FourCCs
+ * @{
+ * Get the tables mapping RIFF FourCCs to libavcodec AVCodecIDs. The tables are
+ * meant to be passed to av_codec_get_id()/av_codec_get_tag() as in the
+ * following code:
+ * @code
+ * uint32_t tag = MKTAG('H', '2', '6', '4');
+ * const struct AVCodecTag *table[] = { avformat_get_riff_video_tags(), 0 };
+ * enum AVCodecID id = av_codec_get_id(table, tag);
+ * @endcode
+ */
+/**
+ * @return the table mapping RIFF FourCCs for video to libavcodec AVCodecID.
+ */
+const struct AVCodecTag *avformat_get_riff_video_tags(void);
+/**
+ * @return the table mapping RIFF FourCCs for audio to AVCodecID.
+ */
+const struct AVCodecTag *avformat_get_riff_audio_tags(void);
+
+/**
+ * @}
+ */
 
-time_t mktimegm(struct tm *tm);
-struct tm *brktimegm(time_t secs, struct tm *tm);
-const char *small_strptime(const char *p, const char *fmt,
-                           struct tm *dt);
+/**
+ * Guess the sample aspect ratio of a frame, based on both the stream and the
+ * frame aspect ratio.
+ *
+ * Since the frame aspect ratio is set by the codec but the stream aspect ratio
+ * is set by the demuxer, these two may not be equal. This function tries to
+ * return the value that you should use if you would like to display the frame.
+ *
+ * Basic logic is to use the stream aspect ratio if it is set to something sane
+ * otherwise use the frame aspect ratio. This way a container setting, which is
+ * usually easy to modify can override the coded value in the frames.
+ *
+ * @param format the format context which the stream is part of
+ * @param stream the stream which the frame is part of
+ * @param frame the frame with the aspect ratio to be determined
+ * @return the guessed (valid) sample_aspect_ratio, 0/1 if no idea
+ */
+AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *stream, AVFrame *frame);
 
-struct in_addr;
-int resolve_host(struct in_addr *sin_addr, const char *hostname);
+/**
+ * Check if the stream st contained in s is matched by the stream specifier
+ * spec.
+ *
+ * See the "stream specifiers" chapter in the documentation for the syntax
+ * of spec.
+ *
+ * @return  >0 if st is matched by spec;
+ *          0  if st is not matched by spec;
+ *          AVERROR code if spec is invalid
+ *
+ * @note  A stream specifier can match several streams in the format.
+ */
+int avformat_match_stream_specifier(AVFormatContext *s, AVStream *st,
+                                    const char *spec);
 
-void url_split(char *proto, int proto_size,
-               char *authorization, int authorization_size,
-               char *hostname, int hostname_size,
-               int *port_ptr,
-               char *path, int path_size,
-               const char *url);
+void avformat_queue_attached_pictures(AVFormatContext *s);
 
-int match_ext(const char *filename, const char *extensions);
 
-#endif /* HAVE_AV_CONFIG_H */
+/**
+ * @}
+ */
 
 #endif /* AVFORMAT_AVFORMAT_H */

gpac-0.5.0.svn4192.tar.bz2/extra_lib/include/libavformat/avio.h -> gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavformat/avio.h Changed

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

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavformat/version.h Added

@@ -0,0 +1,89 @@
+/*
+ * 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/avutil.h"
+
+#define LIBAVFORMAT_VERSION_MAJOR 54
+#define LIBAVFORMAT_VERSION_MINOR 33
+#define LIBAVFORMAT_VERSION_MICRO 100
+
+#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
+                                               LIBAVFORMAT_VERSION_MINOR, \
+                                               LIBAVFORMAT_VERSION_MICRO)
+#define LIBAVFORMAT_VERSION     AV_VERSION(LIBAVFORMAT_VERSION_MAJOR,   \
+                                           LIBAVFORMAT_VERSION_MINOR,   \
+                                           LIBAVFORMAT_VERSION_MICRO)
+#define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
+
+#define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
+
+/**
+ * FF_API_* defines may be placed below to indicate public API that will be
+ * dropped at a future version bump. The defines themselves are not part of
+ * the public API and may change, break or disappear at any time.
+ */
+
+#ifndef FF_API_OLD_AVIO
+#define FF_API_OLD_AVIO                (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_PKT_DUMP
+#define FF_API_PKT_DUMP                (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_ALLOC_OUTPUT_CONTEXT
+#define FF_API_ALLOC_OUTPUT_CONTEXT    (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_FORMAT_PARAMETERS
+#define FF_API_FORMAT_PARAMETERS       (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_NEW_STREAM
+#define FF_API_NEW_STREAM              (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_SET_PTS_INFO
+#define FF_API_SET_PTS_INFO            (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_CLOSE_INPUT_FILE
+#define FF_API_CLOSE_INPUT_FILE        (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_APPLEHTTP_PROTO
+#define FF_API_APPLEHTTP_PROTO         (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_READ_PACKET
+#define FF_API_READ_PACKET             (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_INTERLEAVE_PACKET
+#define FF_API_INTERLEAVE_PACKET       (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_AV_GETTIME
+#define FF_API_AV_GETTIME              (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_R_FRAME_RATE
+#define FF_API_R_FRAME_RATE            (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
+
+#endif /* AVFORMAT_VERSION_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/adler32.h Added

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

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/aes.h Added

@@ -0,0 +1,67 @@
+/*
+ * 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
+ * @{
+ */
+
+#if FF_API_CONTEXT_SIZE
+extern attribute_deprecated const int av_aes_size;
+#endif
+
+struct AVAES;
+
+/**
+ * Allocate an AVAES context.
+ */
+struct AVAES *av_aes_alloc(void);
+
+/**
+ * Initialize an AVAES context.
+ * @param key_bits 128, 192 or 256
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ * @param count number of 16 byte blocks
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param iv initialization vector for CBC mode, if NULL then ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_AES_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/attributes.h Added

@@ -0,0 +1,154 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Macro definitions for various function/variable attributes
+ */
+
+#ifndef AVUTIL_ATTRIBUTES_H
+#define AVUTIL_ATTRIBUTES_H
+
+#ifdef __GNUC__
+#    define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)
+#else
+#    define AV_GCC_VERSION_AT_LEAST(x,y) 0
+#endif
+
+#ifndef av_always_inline
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_always_inline __attribute__((always_inline)) inline
+#elif defined(_MSC_VER)
+#    define av_always_inline __forceinline
+#else
+#    define av_always_inline inline
+#endif
+#endif
+
+#ifndef av_extern_inline
+#if defined(__ICL) && __ICL >= 1210 || defined(__GNUC_STDC_INLINE__)
+#    define av_extern_inline extern inline
+#else
+#    define av_extern_inline inline
+#endif
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_noinline __attribute__((noinline))
+#else
+#    define av_noinline
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_pure __attribute__((pure))
+#else
+#    define av_pure
+#endif
+
+#ifndef av_restrict
+#define av_restrict restrict
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(2,6)
+#    define av_const __attribute__((const))
+#else
+#    define av_const
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(4,3)
+#    define av_cold __attribute__((cold))
+#else
+#    define av_cold
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(4,1)
+#    define av_flatten __attribute__((flatten))
+#else
+#    define av_flatten
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define attribute_deprecated __attribute__((deprecated))
+#else
+#    define attribute_deprecated
+#endif
+
+/**
+ * Disable warnings about deprecated features
+ * This is useful for sections of code kept for backward compatibility and
+ * scheduled for removal.
+ */
+#ifndef AV_NOWARN_DEPRECATED
+#if AV_GCC_VERSION_AT_LEAST(4,6)
+#    define AV_NOWARN_DEPRECATED(code) \
+        _Pragma("GCC diagnostic push") \
+        _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \
+        code \
+        _Pragma("GCC diagnostic pop")
+#else
+#    define AV_NOWARN_DEPRECATED(code) code
+#endif
+#endif
+
+
+#if defined(__GNUC__)
+#    define av_unused __attribute__((unused))
+#else
+#    define av_unused
+#endif
+
+/**
+ * Mark a variable as used and prevent the compiler from optimizing it
+ * away.  This is useful for variables accessed only from inline
+ * assembler without the compiler being aware.
+ */
+#if AV_GCC_VERSION_AT_LEAST(3,1)
+#    define av_used __attribute__((used))
+#else
+#    define av_used
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(3,3)
+#   define av_alias __attribute__((may_alias))
+#else
+#   define av_alias
+#endif
+
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(__clang__)
+#    define av_uninit(x) x=x
+#else
+#    define av_uninit(x) x
+#endif
+
+#ifdef __GNUC__
+#    define av_builtin_constant_p __builtin_constant_p
+#    define av_printf_format(fmtpos, attrpos) __attribute__((__format__(__printf__, fmtpos, attrpos)))
+#else
+#    define av_builtin_constant_p(x) 0
+#    define av_printf_format(fmtpos, attrpos)
+#endif
+
+#if AV_GCC_VERSION_AT_LEAST(2,5)
+#    define av_noreturn __attribute__((noreturn))
+#else
+#    define av_noreturn
+#endif
+
+#endif /* AVUTIL_ATTRIBUTES_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/audio_fifo.h Added

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

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/audioconvert.h Added

@@ -0,0 +1,208 @@
+/*
+ * 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_AUDIOCONVERT_H
+#define AVUTIL_AUDIOCONVERT_H
+
+#include <stdint.h>
+
+/**
+ * @file
+ * audio conversion routines
+ */
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ */
+
+/**
+ * @defgroup channel_masks Audio channel masks
+ * @{
+ */
+#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 convenience macros
+ * @{
+ * */
+#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_NB
+};
+
+/**
+ * @}
+ */
+
+/**
+ * Return a channel layout id that matches name, or 0 if no match is found.
+ *
+ * name can be one or several of the following notations,
+ * separated by '+' or '|':
+ * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0,
+ *   5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix);
+ * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC,
+ *   SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR);
+ * - a number of channels, in decimal, optionally followed by 'c', yielding
+ *   the default channel layout for that number of channels (@see
+ *   av_get_default_channel_layout);
+ * - a channel layout mask, in hexadecimal starting with "0x" (see the
+ *   AV_CH_* macros).
+ *
+ * Example: "stereo+FC" = "2+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_AUDIOCONVERT_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/avassert.h Added

@@ -0,0 +1,66 @@
+/*
+ * 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_FATAL, "Assertion %s failed at %s:%d\n",    \
+               AV_STRINGIFY(cond), __FILE__, __LINE__);                 \
+        abort();                                                        \
+    }                                                                   \
+} while (0)
+
+
+/**
+ * assert() equivalent, that does not lie in speed critical code.
+ * These asserts() thus can be enabled without fearing speedloss.
+ */
+#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0
+#define av_assert1(cond) av_assert0(cond)
+#else
+#define av_assert1(cond) ((void)0)
+#endif
+
+
+/**
+ * assert() equivalent, that does lie in speed critical code.
+ */
+#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1
+#define av_assert2(cond) av_assert0(cond)
+#else
+#define av_assert2(cond) ((void)0)
+#endif
+
+#endif /* AVUTIL_AVASSERT_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/avconfig.h Added

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/avstring.h Added

@@ -0,0 +1,209 @@
+/*
+ * 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 "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);
+
+/**
+ * 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);
+
+/**
+ * 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 characters to uppercase.
+ */
+static inline int av_toupper(int c)
+{
+    if (c >= 'a' && c <= 'z')
+        c ^= 0x20;
+    return c;
+}
+
+/**
+ * Locale-independent conversion of ASCII characters to lowercase.
+ */
+static inline int av_tolower(int c)
+{
+    if (c >= 'A' && c <= 'Z')
+        c ^= 0x20;
+    return c;
+}
+
+/**
+ * Locale-independent 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);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_AVSTRING_H */

gpac-0.5.0.svn4192.tar.bz2/extra_lib/include/libavutil/avutil.h -> gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/avutil.h Changed

@@ -22,42 +22,238 @@
 #define AVUTIL_AVUTIL_H
 
 /**
- * @file libavutil/avutil.h
+ * @file
  * external API header
  */
 
+/*
+ * @mainpage
+ *
+ * @section ffmpeg_intro Introduction
+ *
+ * This document describes the usage of the different libraries
+ * provided by FFmpeg.
+ *
+ * @li @ref libavc "libavcodec" encoding/decoding library
+ * @li @subpage libavfilter graph based frame editing library
+ * @li @ref libavf "libavformat" I/O and muxing/demuxing library
+ * @li @ref lavd "libavdevice" special devices muxing/demuxing library
+ * @li @ref lavu "libavutil" common utility library
+ * @li @subpage libpostproc post processing library
+ * @li @subpage libswscale  color conversion and scaling library
+ */
+
+/**
+ * @defgroup lavu Common utility functions
+ *
+ * @brief
+ * libavutil contains the code shared across all the other FFmpeg
+ * libraries
+ *
+ * @note In order to use the functions provided by avutil you must include
+ * the specific header.
+ *
+ * @{
+ *
+ * @defgroup lavu_crypto Crypto and Hashing
+ *
+ * @{
+ * @}
+ *
+ * @defgroup lavu_math Maths
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_string String Manipulation
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_mem Memory Management
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_data Data Structures
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_audio Audio related
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_error Error Codes
+ *
+ * @{
+ *
+ * @}
+ *
+ * @defgroup lavu_misc Other
+ *
+ * @{
+ *
+ * @defgroup lavu_internal Internal
+ *
+ * Not exported functions, for internal usage only
+ *
+ * @{
+ *
+ * @}
+ */
+
 
-#define AV_STRINGIFY(s)         AV_TOSTRING(s)
-#define AV_TOSTRING(s) #s
+/**
+ * @addtogroup lavu_ver
+ * @{
+ */
 
-#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)
+/**
+ * Return the LIBAVUTIL_VERSION_INT constant.
+ */
+unsigned avutil_version(void);
 
-#define LIBAVUTIL_VERSION_MAJOR 50
-#define LIBAVUTIL_VERSION_MINOR  3
-#define LIBAVUTIL_VERSION_MICRO  0
+/**
+ * Return the libavutil build-time configuration.
+ */
+const char *avutil_configuration(void);
 
-#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
+/**
+ * Return the libavutil license.
+ */
+const char *avutil_license(void);
 
-#define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
+/**
+ * @}
+ */
 
 /**
- * Returns the LIBAVUTIL_VERSION_INT constant.
+ * @addtogroup lavu_media Media Type
+ * @brief Media Type
+ */
+
+enum AVMediaType {
+    AVMEDIA_TYPE_UNKNOWN = -1,  ///< Usually treated as AVMEDIA_TYPE_DATA
+    AVMEDIA_TYPE_VIDEO,
+    AVMEDIA_TYPE_AUDIO,
+    AVMEDIA_TYPE_DATA,          ///< Opaque data information usually continuous
+    AVMEDIA_TYPE_SUBTITLE,
+    AVMEDIA_TYPE_ATTACHMENT,    ///< Opaque data information usually sparse
+    AVMEDIA_TYPE_NB
+};
+
+/**
+ * Return a string describing the media_type enum, NULL if media_type
+ * is unknown.
+ */
+const char *av_get_media_type_string(enum AVMediaType media_type);
+
+/**
+ * @defgroup lavu_const Constants
+ * @{
+ *
+ * @defgroup lavu_enc Encoding specific
+ *
+ * @note those definition should move to avcodec
+ * @{
+ */
+
+#define FF_LAMBDA_SHIFT 7
+#define FF_LAMBDA_SCALE (1<<FF_LAMBDA_SHIFT)
+#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
+#define FF_LAMBDA_MAX (256*128-1)
+
+#define FF_QUALITY_SCALE FF_LAMBDA_SCALE //FIXME maybe remove
+
+/**
+ * @}
+ * @defgroup lavu_time Timestamp specific
+ *
+ * FFmpeg internal timebase and timestamp definitions
+ *
+ * @{
+ */
+
+/**
+ * @brief Undefined timestamp value
+ *
+ * Usually reported by demuxer that work on containers that do not provide
+ * either pts or dts.
+ */
+
+#define AV_NOPTS_VALUE          ((int64_t)UINT64_C(0x8000000000000000))
+
+/**
+ * Internal time base represented as integer
+ */
+
+#define AV_TIME_BASE            1000000
+
+/**
+ * Internal time base represented as fractional value
+ */
+
+#define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
+
+/**
+ * @}
+ * @}
+ * @defgroup lavu_picture Image related
+ *
+ * AVPicture types, pixel formats and basic image planes manipulation.
+ *
+ * @{
+ */
+
+enum AVPictureType {
+    AV_PICTURE_TYPE_NONE = 0, ///< Undefined
+    AV_PICTURE_TYPE_I,     ///< Intra
+    AV_PICTURE_TYPE_P,     ///< Predicted
+    AV_PICTURE_TYPE_B,     ///< Bi-dir predicted
+    AV_PICTURE_TYPE_S,     ///< S(GMC)-VOP MPEG4
+    AV_PICTURE_TYPE_SI,    ///< Switching Intra
+    AV_PICTURE_TYPE_SP,    ///< Switching Predicted
+    AV_PICTURE_TYPE_BI,    ///< BI type
+};
+
+/**
+ * Return a single letter to describe the given picture type
+ * pict_type.
+ *
+ * @param[in] pict_type the picture type @return a single character
+ * representing the picture type, '?' if pict_type is unknown
+ */
+char av_get_picture_type_char(enum AVPictureType pict_type);
+
+/**
+ * @}
  */
-unsigned avutil_version(void);
 
 #include "common.h"
+#include "error.h"
+#include "version.h"
 #include "mathematics.h"
 #include "rational.h"
 #include "intfloat_readwrite.h"
 #include "log.h"
 #include "pixfmt.h"
 
+/**
+ * Return x default pointer in case p is NULL.
+ */
+static inline void *av_x_if_null(const void *p, const void *x)
+{
+    return (void *)(intptr_t)(p ? p : x);
+}
+
+/**
+ * @}
+ * @}
+ */
+
 #endif /* AVUTIL_AVUTIL_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/base64.h Added

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

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/blowfish.h Added

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

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/bprint.h Added

@@ -0,0 +1,157 @@
+/*
+ * 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 "attributes.h"
+
+/**
+ * Define a structure with extra padding to a fixed size
+ * This helps ensuring binary compatibility with future versions.
+ */
+#define FF_PAD_STRUCTURE(size, ...) \
+    __VA_ARGS__ \
+    char reserved_padding[size - sizeof(struct { __VA_ARGS__ })];
+
+/**
+ * Buffer to print data progressively
+ *
+ * The string buffer grows as necessary and is always 0-terminated.
+ * The content of the string is never accessed, and thus is
+ * encoding-agnostic and can even hold binary data.
+ *
+ * Small buffers are kept in the structure itself, and thus require no
+ * memory allocation at all (unless the contents of the buffer is needed
+ * after the structure goes out of scope). This is almost as lightweight as
+ * declaring a local "char buf[512]".
+ *
+ * The length of the string can go beyond the allocated size: the buffer is
+ * then truncated, but the functions still keep account of the actual total
+ * length.
+ *
+ * In other words, buf->len can be greater than buf->size and records the
+ * total length of what would have been to the buffer if there had been
+ * enough memory.
+ *
+ * Append operations do not need to be tested for failure: if a memory
+ * allocation fails, data stop being appended to the buffer, but the length
+ * is still updated. This situation can be tested with
+ * av_bprint_is_complete().
+ *
+ * The size_max field determines several possible behaviours:
+ *
+ * size_max = -1 (= UINT_MAX) or any large value will let the buffer be
+ * reallocated as necessary, with an amortized linear cost.
+ *
+ * size_max = 0 prevents writing anything to the buffer: only the total
+ * length is computed. The write operations can then possibly be repeated in
+ * a buffer with exactly the necessary size
+ * (using size_init = size_max = len + 1).
+ *
+ * size_max = 1 is automatically replaced by the exact size available in the
+ * structure itself, thus ensuring no dynamic memory allocation. The
+ * internal buffer is large enough to hold a reasonable paragraph of text,
+ * such as the current paragraph.
+ */
+typedef struct AVBPrint {
+    FF_PAD_STRUCTURE(1024,
+    char *str;         /** string so far */
+    unsigned len;      /** length so far */
+    unsigned size;     /** allocated memory */
+    unsigned size_max; /** maximum allocated memory */
+    char reserved_internal_buffer[1];
+    )
+} AVBPrint;
+
+/**
+ * Convenience macros for special values for av_bprint_init() size_max
+ * parameter.
+ */
+#define AV_BPRINT_SIZE_UNLIMITED  ((unsigned)-1)
+#define AV_BPRINT_SIZE_AUTOMATIC  1
+#define AV_BPRINT_SIZE_COUNT_ONLY 0
+
+/**
+ * Init a print buffer.
+ *
+ * @param buf        buffer to init
+ * @param size_init  initial size (including the final 0)
+ * @param size_max   maximum size;
+ *                   0 means do not write anything, just count the length;
+ *                   1 is replaced by the maximum value for automatic storage;
+ *                   any large value means that the internal buffer will be
+ *                   reallocated as needed up to that limit; -1 is converted to
+ *                   UINT_MAX, the largest limit possible.
+ *                   Check also AV_BPRINT_SIZE_* macros.
+ */
+void av_bprint_init(AVBPrint *buf, unsigned size_init, unsigned size_max);
+
+/**
+ * Init a print buffer using a pre-existing buffer.
+ *
+ * The buffer will not be reallocated.
+ *
+ * @param buf     buffer structure to init
+ * @param buffer  byte buffer to use for the string data
+ * @param size    size of buffer
+ */
+void av_bprint_init_for_buffer(AVBPrint *buf, char *buffer, unsigned size);
+
+/**
+ * Append a formated string to a print buffer.
+ */
+void av_bprintf(AVBPrint *buf, const char *fmt, ...) av_printf_format(2, 3);
+
+/**
+ * Append char c n times to a print buffer.
+ */
+void av_bprint_chars(AVBPrint *buf, char c, unsigned n);
+
+/**
+ * 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);
+
+#endif /* AVUTIL_BPRINT_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/bswap.h Added

@@ -0,0 +1,109 @@
+/*
+ * 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_ARM
+#   include "arm/bswap.h"
+#elif ARCH_AVR32
+#   include "avr32/bswap.h"
+#elif ARCH_BFIN
+#   include "bfin/bswap.h"
+#elif ARCH_SH4
+#   include "sh4/bswap.h"
+#elif ARCH_X86
+#   include "x86/bswap.h"
+#endif
+
+#endif /* HAVE_AV_CONFIG_H */
+
+#define AV_BSWAP16C(x) (((x) << 8 & 0xff00)  | ((x) >> 8 & 0x00ff))
+#define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16))
+#define AV_BSWAP64C(x) (AV_BSWAP32C(x) << 32 | AV_BSWAP32C((x) >> 32))
+
+#define AV_BSWAPC(s, x) AV_BSWAP##s##C(x)
+
+#ifndef av_bswap16
+static av_always_inline av_const uint16_t av_bswap16(uint16_t x)
+{
+    x= (x>>8) | (x<<8);
+    return x;
+}
+#endif
+
+#ifndef av_bswap32
+static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
+{
+    return AV_BSWAP32C(x);
+}
+#endif
+
+#ifndef av_bswap64
+static inline uint64_t av_const av_bswap64(uint64_t x)
+{
+    return (uint64_t)av_bswap32(x) << 32 | av_bswap32(x >> 32);
+}
+#endif
+
+// be2ne ... big-endian to native-endian
+// le2ne ... little-endian to native-endian
+
+#if AV_HAVE_BIGENDIAN
+#define av_be2ne16(x) (x)
+#define av_be2ne32(x) (x)
+#define av_be2ne64(x) (x)
+#define av_le2ne16(x) av_bswap16(x)
+#define av_le2ne32(x) av_bswap32(x)
+#define av_le2ne64(x) av_bswap64(x)
+#define AV_BE2NEC(s, x) (x)
+#define AV_LE2NEC(s, x) AV_BSWAPC(s, x)
+#else
+#define av_be2ne16(x) av_bswap16(x)
+#define av_be2ne32(x) av_bswap32(x)
+#define av_be2ne64(x) av_bswap64(x)
+#define av_le2ne16(x) (x)
+#define av_le2ne32(x) (x)
+#define av_le2ne64(x) (x)
+#define AV_BE2NEC(s, x) AV_BSWAPC(s, x)
+#define AV_LE2NEC(s, x) (x)
+#endif
+
+#define AV_BE2NE16C(x) AV_BE2NEC(16, x)
+#define AV_BE2NE32C(x) AV_BE2NEC(32, x)
+#define AV_BE2NE64C(x) AV_BE2NEC(64, x)
+#define AV_LE2NE16C(x) AV_LE2NEC(16, x)
+#define AV_LE2NE32C(x) AV_LE2NEC(32, x)
+#define AV_LE2NE64C(x) AV_LE2NEC(64, x)
+
+#endif /* AVUTIL_BSWAP_H */

gpac-0.5.0.svn4192.tar.bz2/extra_lib/include/libavutil/common.h -> gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/common.h Changed

@@ -19,7 +19,7 @@
  */
 
 /**
- * @file libavutil/common.h
+ * @file
  * common internal and external API header
  */
 
@@ -28,124 +28,29 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <inttypes.h>
 #include <limits.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#if !defined(EMULATE_INTTYPES)
-#	include <inttypes.h>
-#else
-	typedef signed char  int8_t;
-	typedef signed short int16_t;
-	typedef signed int   int32_t;
-	typedef unsigned char  uint8_t;
-	typedef unsigned short uint16_t;
-	typedef unsigned int   uint32_t;
-
-#	ifdef CONFIG_WIN32
-		typedef signed __int64   int64_t;
-		typedef unsigned __int64 uint64_t;
-#	else /* other OS */
-		typedef signed long long   int64_t;
-		typedef unsigned long long uint64_t;
-#	endif /* other OS */
-#endif /* HAVE_INTTYPES_H */
-
-
-#ifndef INT64_C
-# ifdef CONFIG_MSVC
-#  define INT64_C(x)  (x ## i64)
-#  define UINT64_C(x)  (x ## Ui64)
-# else
-#  define INT64_C(x)  (x ## LL)
-#  define UINT64_C(x)  (x ## ULL)
-# endif
-#endif
-
-#ifdef __GNUC__
-#    define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)
-#else
-#    define AV_GCC_VERSION_AT_LEAST(x,y) 0
-#endif
-
-#ifndef av_always_inline
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_always_inline __attribute__((always_inline)) inline
-#else
-#    define av_always_inline inline
-#endif
-#endif
-
-#ifndef av_noinline
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_noinline __attribute__((noinline))
-#else
-#    define av_noinline
-#endif
-#endif
-
-#ifndef av_pure
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_pure __attribute__((pure))
-#else
-#    define av_pure
-#endif
-#endif
-
-#ifndef av_const
-#if AV_GCC_VERSION_AT_LEAST(2,6)
-#    define av_const __attribute__((const))
-#else
-#    define av_const
-#endif
-#endif
-
-#ifndef av_cold
-#if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,3)
-#    define av_cold __attribute__((cold))
-#else
-#    define av_cold
-#endif
-#endif
-
-#ifndef av_flatten
-#if AV_GCC_VERSION_AT_LEAST(4,1)
-#    define av_flatten __attribute__((flatten))
-#else
-#    define av_flatten
-#endif
-#endif
+#include "attributes.h"
+#include "version.h"
+#include "libavutil/avconfig.h"
 
-#ifndef attribute_deprecated
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define attribute_deprecated __attribute__((deprecated))
+#if AV_HAVE_BIGENDIAN
+#   define AV_NE(be, le) (be)
 #else
-#    define attribute_deprecated
-#endif
-#endif
-
-#ifndef av_unused
-#if defined(__GNUC__)
-#    define av_unused __attribute__((unused))
-#else
-#    define av_unused
-#endif
-#endif
-
-#ifndef av_uninit
-#if defined(__GNUC__) && !defined(__ICC)
-#    define av_uninit(x) x=x
-#else
-#    define av_uninit(x) x
-#endif
+#   define AV_NE(be, le) (le)
 #endif
 
 //rounded division & shift
 #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
 /* assume b>0 */
 #define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
+#define FFUDIV(a,b) (((a)>0 ?(a):(a)-(b)+1) / (b))
+#define FFUMOD(a,b) ((a)-(b)*FFUDIV(a,b))
 #define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
 #define FFSIGN(a) ((a) > 0 ? 1 : -1)
 
@@ -161,7 +66,14 @@
 /* misc math functions */
 extern const uint8_t ff_log2_tab[256];
 
-static inline av_const int av_log2(unsigned int v)
+/**
+ * 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
+
+static av_always_inline av_const int av_log2_c(unsigned int v)
 {
     int n = 0;
     if (v & 0xffff0000) {
@@ -177,7 +89,7 @@
     return n;
 }
 
-static inline av_const int av_log2_16bit(unsigned int v)
+static av_always_inline av_const int av_log2_16bit_c(unsigned int v)
 {
     int n = 0;
     if (v & 0xff00) {
@@ -189,14 +101,22 @@
     return n;
 }
 
+#ifdef HAVE_AV_CONFIG_H
+#   include "config.h"
+#   include "intmath.h"
+#endif
+
+/* Pull in unguarded fallback defines at the end of this file. */
+#include "common.h"
+
 /**
- * Clips a signed integer value into the amin-amax range.
+ * Clip a signed integer value into the amin-amax range.
  * @param a value to clip
  * @param amin minimum value of the clip range
  * @param amax maximum value of the clip range
  * @return clipped value
  */
-static inline av_const int av_clip(int a, int amin, int amax)
+static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
 {
     if      (a < amin) return amin;
     else if (a > amax) return amax;
@@ -204,56 +124,156 @@
 }
 
 /**
- * Clips a signed integer value into the 0-255 range.
+ * Clip a signed integer value into the 0-255 range.
  * @param a value to clip
  * @return clipped value
  */
-static inline av_const uint8_t av_clip_uint8(int a)
+static av_always_inline av_const uint8_t av_clip_uint8_c(int a)
 {
-    if (a&(~255)) return (-a)>>31;
-    else          return a;
+    if (a&(~0xFF)) return (-a)>>31;
+    else           return a;
 }
 
 /**
- * Clips a signed integer value into the -32768,32767 range.
+ * Clip a signed integer value into the -128,127 range.
  * @param a value to clip
  * @return clipped value
  */
-static inline av_const int16_t av_clip_int16(int a)
+static av_always_inline av_const int8_t av_clip_int8_c(int a)
 {
-    if ((a+32768) & ~65535) return (a>>31) ^ 32767;
-    else                    return a;
+    if ((a+0x80) & ~0xFF) return (a>>31) ^ 0x7F;
+    else                  return a;
 }
 
 /**
- * Clips a float value into the amin-amax range.
+ * Clip a signed integer value into the 0-65535 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const uint16_t av_clip_uint16_c(int a)
+{
+    if (a&(~0xFFFF)) return (-a)>>31;
+    else             return a;
+}
+
+/**
+ * Clip a signed integer value into the -32768,32767 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const int16_t av_clip_int16_c(int a)
+{
+    if ((a+0x8000) & ~0xFFFF) return (a>>31) ^ 0x7FFF;
+    else                      return a;
+}
+
+/**
+ * Clip a signed 64-bit integer value into the -2147483648,2147483647 range.
+ * @param a value to clip
+ * @return clipped value
+ */
+static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a)
+{
+    if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (a>>63) ^ 0x7FFFFFFF;
+    else                                         return (int32_t)a;
+}
+
+/**
+ * Clip a signed integer to an unsigned power of two range.
+ * @param  a value to clip
+ * @param  p bit position to clip at
+ * @return clipped value
+ */
+static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p)
+{
+    if (a & ~((1<<p) - 1)) return -a >> 31 & ((1<<p) - 1);
+    else                   return  a;
+}
+
+/**
+ * Add two signed 32-bit values with saturation.
+ *
+ * @param  a one value
+ * @param  b another value
+ * @return sum with signed saturation
+ */
+static av_always_inline int av_sat_add32_c(int a, int b)
+{
+    return av_clipl_int32((int64_t)a + b);
+}
+
+/**
+ * Add a doubled value to another value with saturation at both stages.
+ *
+ * @param  a first value
+ * @param  b value doubled and added to a
+ * @return sum with signed saturation
+ */
+static av_always_inline int av_sat_dadd32_c(int a, int b)
+{
+    return av_sat_add32(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
  * @param amax maximum value of the clip range
  * @return clipped value
  */
-static inline av_const float av_clipf(float a, float amin, float amax)
+static av_always_inline av_const float av_clipf_c(float a, float amin, float amax)
 {
     if      (a < amin) return amin;
     else if (a > amax) return amax;
     else               return a;
 }
 
-#define MKTAG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24))
-#define MKBETAG(a,b,c,d) (d | (c << 8) | (b << 16) | (a << 24))
-
-/*!
- * \def GET_UTF8(val, GET_BYTE, ERROR)
- * Converts a UTF-8 character (up to 4 bytes long) to its 32-bit UCS-4 encoded form
- * \param val is the output and should be of type uint32_t. It holds the converted
- * UCS-4 character and should be a left value.
- * \param GET_BYTE gets UTF-8 encoded bytes from any proper source. It can be
- * a function or a statement whose return value or evaluated value is of type
- * uint8_t. It will be executed up to 4 times for values in the valid UTF-8 range,
- * and up to 7 times in the general case.
- * \param ERROR action that should be taken when an invalid UTF-8 byte is returned
- * from GET_BYTE. It should be a statement that jumps out of the macro,
- * like exit(), goto, return, break, or continue.
+/** Compute ceil(log2(x)).
+ * @param x value used to compute ceil(log2(x))
+ * @return computed ceiling of log2(x)
+ */
+static av_always_inline av_const int av_ceil_log2_c(int x)
+{
+    return av_log2((x - 1) << 1);
+}
+
+/**
+ * Count number of bits set to one in x
+ * @param x value to count bits of
+ * @return the number of bits set to one in x
+ */
+static av_always_inline av_const int av_popcount_c(uint32_t x)
+{
+    x -= (x >> 1) & 0x55555555;
+    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
+    x = (x + (x >> 4)) & 0x0F0F0F0F;
+    x += x >> 8;
+    return (x + (x >> 16)) & 0x3F;
+}
+
+/**
+ * Count number of bits set to one in x
+ * @param x value to count bits of
+ * @return the number of bits set to one in x
+ */
+static av_always_inline av_const int av_popcount64_c(uint64_t x)
+{
+    return av_popcount((uint32_t)x) + av_popcount(x >> 32);
+}
+
+#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
+#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
+
+/**
+ * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form.
+ *
+ * @param val      Output value, must be an lvalue of type uint32_t.
+ * @param GET_BYTE Expression reading one byte from the input.
+ *                 Evaluated up to 7 times (4 for the currently
+ *                 assigned Unicode range).  With a memory buffer
+ *                 input, this could be *ptr++.
+ * @param ERROR    Expression to be evaluated on invalid input,
+ *                 typically a goto statement.
  */
 #define GET_UTF8(val, GET_BYTE, ERROR)\
     val= GET_BYTE;\
@@ -270,16 +290,37 @@
         }\
     }
 
-/*!
- * \def PUT_UTF8(val, tmp, PUT_BYTE)
- * Converts a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).
- * \param val is an input-only argument and should be of type uint32_t. It holds
+/**
+ * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form.
+ *
+ * @param val       Output value, must be an lvalue of type uint32_t.
+ * @param GET_16BIT Expression returning two bytes of UTF-16 data converted
+ *                  to native byte order.  Evaluated one or two times.
+ * @param ERROR     Expression to be evaluated on invalid input,
+ *                  typically a goto statement.
+ */
+#define GET_UTF16(val, GET_16BIT, ERROR)\
+    val = GET_16BIT;\
+    {\
+        unsigned int hi = val - 0xD800;\
+        if (hi < 0x800) {\
+            val = GET_16BIT - 0xDC00;\
+            if (val > 0x3FFU || hi > 0x3FFU)\
+                ERROR\
+            val += (hi<<10) + 0x10000;\
+        }\
+    }\
+
+/**
+ * @def PUT_UTF8(val, tmp, PUT_BYTE)
+ * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).
+ * @param val is an input-only argument and should be of type uint32_t. It holds
  * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If
  * val is given as a function it is executed only once.
- * \param tmp is a temporary variable and should be of type uint8_t. It
+ * @param tmp is a temporary variable and should be of type uint8_t. It
  * represents an intermediate value during conversion that is to be
  * output by PUT_BYTE.
- * \param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
+ * @param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
  * It could be a function or a statement, and uses tmp as the input byte.
  * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be
  * executed up to 4 times for values in the valid UTF-8 range and up to
@@ -306,11 +347,91 @@
         }\
     }
 
+/**
+ * @def PUT_UTF16(val, tmp, PUT_16BIT)
+ * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).
+ * @param val is an input-only argument and should be of type uint32_t. It holds
+ * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If
+ * val is given as a function it is executed only once.
+ * @param tmp is a temporary variable and should be of type uint16_t. It
+ * represents an intermediate value during conversion that is to be
+ * output by PUT_16BIT.
+ * @param PUT_16BIT writes the converted UTF-16 data to any proper destination
+ * in desired endianness. It could be a function or a statement, and uses tmp
+ * as the input byte.  For example, PUT_BYTE could be "*output++ = tmp;"
+ * PUT_BYTE will be executed 1 or 2 times depending on input character.
+ */
+#define PUT_UTF16(val, tmp, PUT_16BIT)\
+    {\
+        uint32_t in = val;\
+        if (in < 0x10000) {\
+            tmp = in;\
+            PUT_16BIT\
+        } else {\
+            tmp = 0xD800 | ((in - 0x10000) >> 10);\
+            PUT_16BIT\
+            tmp = 0xDC00 | ((in - 0x10000) & 0x3FF);\
+            PUT_16BIT\
+        }\
+    }\
+
+
+
 #include "mem.h"
 
 #ifdef HAVE_AV_CONFIG_H
-#    include "config.h"
 #    include "internal.h"
 #endif /* HAVE_AV_CONFIG_H */
 
 #endif /* AVUTIL_COMMON_H */
+
+/*
+ * The following definitions are outside the multiple inclusion guard
+ * to ensure they are immediately available in intmath.h.
+ */
+
+#ifndef av_log2
+#   define av_log2       av_log2_c
+#endif
+#ifndef av_log2_16bit
+#   define av_log2_16bit av_log2_16bit_c
+#endif
+#ifndef av_ceil_log2
+#   define av_ceil_log2     av_ceil_log2_c
+#endif
+#ifndef av_clip
+#   define av_clip          av_clip_c
+#endif
+#ifndef av_clip_uint8
+#   define av_clip_uint8    av_clip_uint8_c
+#endif
+#ifndef av_clip_int8
+#   define av_clip_int8     av_clip_int8_c
+#endif
+#ifndef av_clip_uint16
+#   define av_clip_uint16   av_clip_uint16_c
+#endif
+#ifndef av_clip_int16
+#   define av_clip_int16    av_clip_int16_c
+#endif
+#ifndef av_clipl_int32
+#   define av_clipl_int32   av_clipl_int32_c
+#endif
+#ifndef av_clip_uintp2
+#   define av_clip_uintp2   av_clip_uintp2_c
+#endif
+#ifndef av_sat_add32
+#   define av_sat_add32     av_sat_add32_c
+#endif
+#ifndef av_sat_dadd32
+#   define av_sat_dadd32    av_sat_dadd32_c
+#endif
+#ifndef av_clipf
+#   define av_clipf         av_clipf_c
+#endif
+#ifndef av_popcount
+#   define av_popcount      av_popcount_c
+#endif
+#ifndef av_popcount64
+#   define av_popcount64    av_popcount64_c
+#endif

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/cpu.h Added

@@ -0,0 +1,108 @@
+/*
+ * 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
+#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
+#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_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)
+
+/**
+ * Return the flags which specify extensions supported by the CPU.
+ * The returned value is affected by av_force_cpu_flags() if that was used
+ * before. So av_get_cpu_flags() can easily be used in a application to
+ * detect the enabled cpu flags.
+ */
+int av_get_cpu_flags(void);
+
+/**
+ * Disables cpu detection and forces the specified flags.
+ * -1 is a special case that disables forcing of specific flags.
+ */
+void av_force_cpu_flags(int flags);
+
+/**
+ * Set a mask on flags returned by av_get_cpu_flags().
+ * This function is mainly useful for testing.
+ * Please use av_force_cpu_flags() and av_get_cpu_flags() instead which are more flexible
+ *
+ * @warning this function is not thread safe.
+ */
+attribute_deprecated void av_set_cpu_flags_mask(int mask);
+
+/**
+ * Parse CPU flags from a string.
+ *
+ * The returned flags contain the specified flags as well as related unspecified flags.
+ *
+ * This function exists only for compatibility with libav.
+ * Please use av_parse_cpu_caps() when possible.
+ * @return a combination of AV_CPU_* flags, negative on error.
+ */
+attribute_deprecated
+int av_parse_cpu_flags(const char *s);
+
+/**
+ * Parse CPU caps from a string and update the given AV_CPU_* flags based on that.
+ *
+ * @return negative on error.
+ */
+int av_parse_cpu_caps(unsigned *flags, const char *s);
+
+/* The following CPU-specific functions shall not be called directly. */
+int ff_get_cpu_flags_arm(void);
+int ff_get_cpu_flags_ppc(void);
+int ff_get_cpu_flags_x86(void);
+
+#endif /* AVUTIL_CPU_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/crc.h Added

@@ -0,0 +1,43 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CRC_H
+#define AVUTIL_CRC_H
+
+#include <stdint.h>
+#include <stddef.h>
+#include "attributes.h"
+
+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_MAX,         /*< Not part of public API! Do not use outside libavutil. */
+}AVCRCId;
+
+int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size);
+const AVCRC *av_crc_get_table(AVCRCId crc_id);
+uint32_t av_crc(const AVCRC *ctx, uint32_t start_crc, const uint8_t *buffer, size_t length) av_pure;
+
+#endif /* AVUTIL_CRC_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/dict.h Added

@@ -0,0 +1,135 @@
+/*
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General 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
+
+/**
+ * @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
+ * 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);
+ *
+ * AVDictionaryEntry *t = NULL;
+ * 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
+#define AV_DICT_IGNORE_SUFFIX   2
+#define AV_DICT_DONT_STRDUP_KEY 4   /**< Take ownership of a key that's been
+                                         allocated with av_malloc() and children. */
+#define AV_DICT_DONT_STRDUP_VAL 8   /**< Take ownership of a value that's been
+                                         allocated with av_malloc() and chilren. */
+#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.
+ *
+ * @param prev Set to the previous matching element to find the next.
+ *             If set to NULL the first matching element is returned.
+ * @param flags Allows case as well as suffix-insensitive comparisons.
+ * @return Found entry or NULL, changing key or value leads to undefined behavior.
+ */
+AVDictionaryEntry *
+av_dict_get(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.
+ *
+ * @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);
+
+/**
+ * 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, AVDictionary *src, int flags);
+
+/**
+ * Free all the memory allocated for an AVDictionary struct
+ * and all keys and values.
+ */
+void av_dict_free(AVDictionary **m);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_DICT_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/error.h Added

@@ -0,0 +1,116 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * error code definitions
+ */
+
+#ifndef AVUTIL_ERROR_H
+#define AVUTIL_ERROR_H
+
+#include <errno.h>
+#include <stddef.h>
+
+/**
+ * @addtogroup lavu_error
+ *
+ * @{
+ */
+
+
+/* error handling */
+#if EDOM > 0
+#define AVERROR(e) (-(e))   ///< Returns a negative error code from a POSIX error code, to return from library functions.
+#define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value.
+#else
+/* Some platforms have E* and errno already negated. */
+#define AVERROR(e) (e)
+#define AVUNERROR(e) (e)
+#endif
+
+#define FFERRTAG(a, b, c, d) (-(int)MKTAG(a, b, c, d))
+
+#define AVERROR_BSF_NOT_FOUND      FFERRTAG(0xF8,'B','S','F') ///< Bitstream filter not found
+#define AVERROR_BUG                FFERRTAG( 'B','U','G','!') ///< Internal bug, also see AVERROR_BUG2
+#define AVERROR_BUFFER_TOO_SMALL   FFERRTAG( 'B','U','F','S') ///< Buffer too small
+#define AVERROR_DECODER_NOT_FOUND  FFERRTAG(0xF8,'D','E','C') ///< Decoder not found
+#define AVERROR_DEMUXER_NOT_FOUND  FFERRTAG(0xF8,'D','E','M') ///< Demuxer not found
+#define AVERROR_ENCODER_NOT_FOUND  FFERRTAG(0xF8,'E','N','C') ///< Encoder not found
+#define AVERROR_EOF                FFERRTAG( 'E','O','F',' ') ///< End of file
+#define AVERROR_EXIT               FFERRTAG( 'E','X','I','T') ///< Immediate exit was requested; the called function should not be restarted
+#define AVERROR_EXTERNAL           FFERRTAG( 'E','X','T',' ') ///< Generic error in an external library
+#define AVERROR_FILTER_NOT_FOUND   FFERRTAG(0xF8,'F','I','L') ///< Filter not found
+#define AVERROR_INVALIDDATA        FFERRTAG( 'I','N','D','A') ///< Invalid data found when processing input
+#define AVERROR_MUXER_NOT_FOUND    FFERRTAG(0xF8,'M','U','X') ///< Muxer not found
+#define AVERROR_OPTION_NOT_FOUND   FFERRTAG(0xF8,'O','P','T') ///< Option not found
+#define AVERROR_PATCHWELCOME       FFERRTAG( 'P','A','W','E') ///< Not yet implemented in FFmpeg, patches welcome
+#define AVERROR_PROTOCOL_NOT_FOUND FFERRTAG(0xF8,'P','R','O') ///< Protocol not found
+#define AVERROR_STREAM_NOT_FOUND   FFERRTAG(0xF8,'S','T','R') ///< Stream not found
+
+/**
+ * This is semantically identical to AVERROR_BUG
+ * it has been introduced in Libav after our AVERROR_BUG and with a modified value.
+ */
+#define AVERROR_BUG2               FFERRTAG( 'B','U','G',' ')
+#define AVERROR_UNKNOWN            FFERRTAG( 'U','N','K','N') ///< Unknown error, typically from an external library
+
+#define AV_ERROR_MAX_STRING_SIZE 64
+
+/**
+ * Put a description of the AVERROR code errnum in errbuf.
+ * In case of failure the global variable errno is set to indicate the
+ * error. Even in case of failure av_strerror() will print a generic
+ * error message indicating the errnum provided to errbuf.
+ *
+ * @param errnum      error code to describe
+ * @param errbuf      buffer to which description is written
+ * @param errbuf_size the size in bytes of errbuf
+ * @return 0 on success, a negative value if a description for errnum
+ * cannot be found
+ */
+int av_strerror(int errnum, char *errbuf, size_t errbuf_size);
+
+/**
+ * Fill the provided buffer with a string containing an error string
+ * corresponding to the AVERROR code errnum.
+ *
+ * @param errbuf         a buffer
+ * @param errbuf_size    size in bytes of errbuf
+ * @param errnum         error code to describe
+ * @return the buffer in input, filled with the error description
+ * @see av_strerror()
+ */
+static inline char *av_make_error_string(char *errbuf, size_t errbuf_size, int errnum)
+{
+    av_strerror(errnum, errbuf, errbuf_size);
+    return errbuf;
+}
+
+/**
+ * Convenience macro, the return value should be used only directly in
+ * function arguments but never stand-alone.
+ */
+#define av_err2str(errnum) \
+    av_make_error_string((char[AV_ERROR_MAX_STRING_SIZE]){0}, AV_ERROR_MAX_STRING_SIZE, errnum)
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_ERROR_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/eval.h Added

@@ -0,0 +1,146 @@
+/*
+ * 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);
+
+#if FF_API_OLD_EVAL_NAMES
+/**
+ * @deprecated Deprecated in favor of av_expr_parse_and_eval().
+ */
+attribute_deprecated
+int av_parse_and_eval_expr(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);
+
+/**
+ * @deprecated Deprecated in favor of av_expr_parse().
+ */
+attribute_deprecated
+int av_parse_expr(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);
+/**
+ * @deprecated Deprecated in favor of av_expr_eval().
+ */
+attribute_deprecated
+double av_eval_expr(AVExpr *e, const double *const_values, void *opaque);
+
+/**
+ * @deprecated Deprecated in favor of av_expr_free().
+ */
+attribute_deprecated
+void av_free_expr(AVExpr *e);
+#endif /* FF_API_OLD_EVAL_NAMES */
+
+/**
+ * Parse the string in numstr and return its value as a double. If
+ * the string is empty, contains only whitespaces, or does not contain
+ * an initial substring that has the expected syntax for a
+ * floating-point number, no conversion is performed. In this case,
+ * returns a value of zero and the value returned in tail is the value
+ * of numstr.
+ *
+ * @param numstr a string representing a number, may contain one of
+ * the International System number postfixes, for example 'K', 'M',
+ * 'G'. If 'i' is appended after the postfix, powers of 2 are used
+ * instead of powers of 10. The 'B' postfix multiplies the value for
+ * 8, and can be appended after another postfix or used alone. This
+ * allows using for example 'KB', 'MiB', 'G' and 'B' as postfix.
+ * @param tail if non-NULL puts here the pointer to the char next
+ * after the last parsed character
+ */
+double av_strtod(const char *numstr, char **tail);
+
+#endif /* AVUTIL_EVAL_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/fifo.h Added

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

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/file.h Added

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

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/imgutils.h Added

@@ -0,0 +1,197 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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"
+
+/**
+ * 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.
+ *
+ * @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 == 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 src           buffer which will contain or contains the actual image data, can be NULL
+ * @param pix_fmt       the pixel format of the image
+ * @param width         the width of the image in pixels
+ * @param height        the height of the image in pixels
+ * @param align         the value used in src for linesize alignment
+ * @return the size in bytes required for src, a negative error code
+ * in case of failure
+ */
+int av_image_fill_arrays(uint8_t *dst_data[4], int dst_linesize[4],
+                         const uint8_t *src,
+                         enum AVPixelFormat pix_fmt, int width, int height, int align);
+
+/**
+ * Return the size in bytes of the amount of data required to store an
+ * image with the given parameters.
+ *
+ * @param[in] align the assumed linesize alignment
+ */
+int av_image_get_buffer_size(enum AVPixelFormat pix_fmt, int width, int height, int align);
+
+/**
+ * Copy image data from an image into a buffer.
+ *
+ * av_image_get_buffer_size() can be used to compute the required size
+ * for the buffer to fill.
+ *
+ * @param dst           a buffer into which picture data will be copied
+ * @param dst_size      the size in bytes of dst
+ * @param src_data      pointers containing the source image data
+ * @param src_linesizes linesizes for the image in src_data
+ * @param pix_fmt       the pixel format of the source image
+ * @param width         the width of the source image in pixels
+ * @param height        the height of the source image in pixels
+ * @param align         the assumed linesize alignment for dst
+ * @return the number of bytes written to dst, or a negative value
+ * (error code) on error
+ */
+int av_image_copy_to_buffer(uint8_t *dst, int dst_size,
+                            const uint8_t * const src_data[4], const int src_linesize[4],
+                            enum AVPixelFormat pix_fmt, int width, int height, int align);
+
+/**
+ * Check if the given dimension of an image is valid, meaning that all
+ * bytes of the image can be addressed with a signed int.
+ *
+ * @param w the width of the picture
+ * @param h the height of the picture
+ * @param log_offset the offset to sum to the log level for logging with log_ctx
+ * @param log_ctx the parent logging context, it may be NULL
+ * @return >= 0 if valid, a negative error code otherwise
+ */
+int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
+
+int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt);
+
+/**
+ * @}
+ */
+
+
+#endif /* AVUTIL_IMGUTILS_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/intfloat.h Added

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

gpac-0.5.0.svn4192.tar.bz2/extra_lib/include/libavutil/intfloat_readwrite.h -> gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/intfloat_readwrite.h Changed

@@ -21,10 +21,8 @@
 #ifndef AVUTIL_INTFLOAT_READWRITE_H
 #define AVUTIL_INTFLOAT_READWRITE_H
 
-#if !defined(WIN32) && !defined(_WIN32_WCE)
 #include <stdint.h>
-#endif
-#include "common.h"
+#include "attributes.h"
 
 /* IEEE 80 bits extended float */
 typedef struct AVExtFloat  {
@@ -32,11 +30,11 @@
     uint8_t mantissa[8];
 } AVExtFloat;
 
-double av_int2dbl(int64_t v) av_const;
-float av_int2flt(int32_t v) av_const;
-double av_ext2dbl(const AVExtFloat ext) av_const;
-int64_t av_dbl2int(double d) av_const;
-int32_t av_flt2int(float d) av_const;
-AVExtFloat av_dbl2ext(double d) av_const;
+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 /* AVUTIL_INTFLOAT_READWRITE_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/intreadwrite.h Added

@@ -0,0 +1,528 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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|64) and AV_(COPY|SWAP|ZERO)(64|128) macros.
+ * Preprocessor symbols must be defined, even if these are implemented
+ * as inline functions.
+ */
+
+#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_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_RN64) && !defined(AV_RL64)
+#       define AV_RL64(p) AV_RN64(p)
+#   elif !defined(AV_RN64) &&  defined(AV_RL64)
+#       define AV_RN64(p) AV_RL64(p)
+#   endif
+
+#   if    defined(AV_WN64) && !defined(AV_WL64)
+#       define AV_WL64(p, v) AV_WN64(p, v)
+#   elif !defined(AV_WN64) &&  defined(AV_WL64)
+#       define AV_WN64(p, v) AV_WL64(p, v)
+#   endif
+
+#endif /* !AV_HAVE_BIGENDIAN */
+
+/*
+ * Define AV_[RW]N helper macros to simplify definitions not provided
+ * by per-arch headers.
+ */
+
+#if defined(__GNUC__) && !defined(__TI_COMPILER_VERSION__)
+
+union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias;
+union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias;
+union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
+
+#   define AV_RN(s, p) (((const union unaligned_##s *) (p))->l)
+#   define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v))
+
+#elif defined(__DECC)
+
+#   define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))
+#   define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v))
+
+#elif AV_HAVE_FAST_UNALIGNED
+
+#   define AV_RN(s, p) (((const av_alias##s*)(p))->u##s)
+#   define AV_WN(s, p, v) (((av_alias##s*)(p))->u##s = (v))
+
+#else
+
+#ifndef AV_RB16
+#   define AV_RB16(x)                           \
+    ((((const uint8_t*)(x))[0] << 8) |          \
+      ((const uint8_t*)(x))[1])
+#endif
+#ifndef AV_WB16
+#   define AV_WB16(p, darg) do {                \
+        unsigned d = (darg);                    \
+        ((uint8_t*)(p))[1] = (d);               \
+        ((uint8_t*)(p))[0] = (d)>>8;            \
+    } while(0)
+#endif
+
+#ifndef AV_RL16
+#   define AV_RL16(x)                           \
+    ((((const uint8_t*)(x))[1] << 8) |          \
+      ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL16
+#   define AV_WL16(p, darg) do {                \
+        unsigned d = (darg);                    \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+    } while(0)
+#endif
+
+#ifndef AV_RB32
+#   define AV_RB32(x)                                \
+    (((uint32_t)((const uint8_t*)(x))[0] << 24) |    \
+               (((const uint8_t*)(x))[1] << 16) |    \
+               (((const uint8_t*)(x))[2] <<  8) |    \
+                ((const uint8_t*)(x))[3])
+#endif
+#ifndef AV_WB32
+#   define AV_WB32(p, darg) do {                \
+        unsigned d = (darg);                    \
+        ((uint8_t*)(p))[3] = (d);               \
+        ((uint8_t*)(p))[2] = (d)>>8;            \
+        ((uint8_t*)(p))[1] = (d)>>16;           \
+        ((uint8_t*)(p))[0] = (d)>>24;           \
+    } while(0)
+#endif
+
+#ifndef AV_RL32
+#   define AV_RL32(x)                                \
+    (((uint32_t)((const uint8_t*)(x))[3] << 24) |    \
+               (((const uint8_t*)(x))[2] << 16) |    \
+               (((const uint8_t*)(x))[1] <<  8) |    \
+                ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL32
+#   define AV_WL32(p, darg) do {                \
+        unsigned d = (darg);                    \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[2] = (d)>>16;           \
+        ((uint8_t*)(p))[3] = (d)>>24;           \
+    } while(0)
+#endif
+
+#ifndef AV_RB64
+#   define AV_RB64(x)                                   \
+    (((uint64_t)((const uint8_t*)(x))[0] << 56) |       \
+     ((uint64_t)((const uint8_t*)(x))[1] << 48) |       \
+     ((uint64_t)((const uint8_t*)(x))[2] << 40) |       \
+     ((uint64_t)((const uint8_t*)(x))[3] << 32) |       \
+     ((uint64_t)((const uint8_t*)(x))[4] << 24) |       \
+     ((uint64_t)((const uint8_t*)(x))[5] << 16) |       \
+     ((uint64_t)((const uint8_t*)(x))[6] <<  8) |       \
+      (uint64_t)((const uint8_t*)(x))[7])
+#endif
+#ifndef AV_WB64
+#   define AV_WB64(p, darg) do {                \
+        uint64_t d = (darg);                    \
+        ((uint8_t*)(p))[7] = (d);               \
+        ((uint8_t*)(p))[6] = (d)>>8;            \
+        ((uint8_t*)(p))[5] = (d)>>16;           \
+        ((uint8_t*)(p))[4] = (d)>>24;           \
+        ((uint8_t*)(p))[3] = (d)>>32;           \
+        ((uint8_t*)(p))[2] = (d)>>40;           \
+        ((uint8_t*)(p))[1] = (d)>>48;           \
+        ((uint8_t*)(p))[0] = (d)>>56;           \
+    } while(0)
+#endif
+
+#ifndef AV_RL64
+#   define AV_RL64(x)                                   \
+    (((uint64_t)((const uint8_t*)(x))[7] << 56) |       \
+     ((uint64_t)((const uint8_t*)(x))[6] << 48) |       \
+     ((uint64_t)((const uint8_t*)(x))[5] << 40) |       \
+     ((uint64_t)((const uint8_t*)(x))[4] << 32) |       \
+     ((uint64_t)((const uint8_t*)(x))[3] << 24) |       \
+     ((uint64_t)((const uint8_t*)(x))[2] << 16) |       \
+     ((uint64_t)((const uint8_t*)(x))[1] <<  8) |       \
+      (uint64_t)((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL64
+#   define AV_WL64(p, darg) do {                \
+        uint64_t d = (darg);                    \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[2] = (d)>>16;           \
+        ((uint8_t*)(p))[3] = (d)>>24;           \
+        ((uint8_t*)(p))[4] = (d)>>32;           \
+        ((uint8_t*)(p))[5] = (d)>>40;           \
+        ((uint8_t*)(p))[6] = (d)>>48;           \
+        ((uint8_t*)(p))[7] = (d)>>56;           \
+    } while(0)
+#endif
+
+#if AV_HAVE_BIGENDIAN
+#   define AV_RN(s, p)    AV_RB##s(p)
+#   define AV_WN(s, p, v) AV_WB##s(p, v)
+#else
+#   define AV_RN(s, p)    AV_RL##s(p)
+#   define AV_WN(s, p, v) AV_WL##s(p, v)
+#endif
+
+#endif /* HAVE_FAST_UNALIGNED */
+
+#ifndef AV_RN16
+#   define AV_RN16(p) AV_RN(16, p)
+#endif
+
+#ifndef AV_RN32
+#   define AV_RN32(p) AV_RN(32, p)
+#endif
+
+#ifndef AV_RN64
+#   define AV_RN64(p) AV_RN(64, p)
+#endif
+
+#ifndef AV_WN16
+#   define AV_WN16(p, v) AV_WN(16, p, v)
+#endif
+
+#ifndef AV_WN32
+#   define AV_WN32(p, v) AV_WN(32, p, v)
+#endif
+
+#ifndef AV_WN64
+#   define AV_WN64(p, v) AV_WN(64, p, v)
+#endif
+
+#if AV_HAVE_BIGENDIAN
+#   define AV_RB(s, p)    AV_RN##s(p)
+#   define AV_WB(s, p, v) AV_WN##s(p, v)
+#   define AV_RL(s, p)    av_bswap##s(AV_RN##s(p))
+#   define AV_WL(s, p, v) AV_WN##s(p, av_bswap##s(v))
+#else
+#   define AV_RB(s, p)    av_bswap##s(AV_RN##s(p))
+#   define AV_WB(s, p, v) AV_WN##s(p, av_bswap##s(v))
+#   define AV_RL(s, p)    AV_RN##s(p)
+#   define AV_WL(s, p, v) AV_WN##s(p, v)
+#endif
+
+#define AV_RB8(x)     (((const uint8_t*)(x))[0])
+#define AV_WB8(p, d)  do { ((uint8_t*)(p))[0] = (d); } while(0)
+
+#define AV_RL8(x)     AV_RB8(x)
+#define AV_WL8(p, d)  AV_WB8(p, d)
+
+#ifndef AV_RB16
+#   define AV_RB16(p)    AV_RB(16, p)
+#endif
+#ifndef AV_WB16
+#   define AV_WB16(p, v) AV_WB(16, p, v)
+#endif
+
+#ifndef AV_RL16
+#   define AV_RL16(p)    AV_RL(16, p)
+#endif
+#ifndef AV_WL16
+#   define AV_WL16(p, v) AV_WL(16, p, v)
+#endif
+
+#ifndef AV_RB32
+#   define AV_RB32(p)    AV_RB(32, p)
+#endif
+#ifndef AV_WB32
+#   define AV_WB32(p, v) AV_WB(32, p, v)
+#endif
+
+#ifndef AV_RL32
+#   define AV_RL32(p)    AV_RL(32, p)
+#endif
+#ifndef AV_WL32
+#   define AV_WL32(p, v) AV_WL(32, p, v)
+#endif
+
+#ifndef AV_RB64
+#   define AV_RB64(p)    AV_RB(64, p)
+#endif
+#ifndef AV_WB64
+#   define AV_WB64(p, v) AV_WB(64, p, v)
+#endif
+
+#ifndef AV_RL64
+#   define AV_RL64(p)    AV_RL(64, p)
+#endif
+#ifndef AV_WL64
+#   define AV_WL64(p, v) AV_WL(64, p, v)
+#endif
+
+#ifndef AV_RB24
+#   define AV_RB24(x)                           \
+    ((((const uint8_t*)(x))[0] << 16) |         \
+     (((const uint8_t*)(x))[1] <<  8) |         \
+      ((const uint8_t*)(x))[2])
+#endif
+#ifndef AV_WB24
+#   define AV_WB24(p, d) do {                   \
+        ((uint8_t*)(p))[2] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[0] = (d)>>16;           \
+    } while(0)
+#endif
+
+#ifndef AV_RL24
+#   define AV_RL24(x)                           \
+    ((((const uint8_t*)(x))[2] << 16) |         \
+     (((const uint8_t*)(x))[1] <<  8) |         \
+      ((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL24
+#   define AV_WL24(p, d) do {                   \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[2] = (d)>>16;           \
+    } while(0)
+#endif
+
+/*
+ * 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
+
+/* Parameters for AV_COPY*, AV_SWAP*, AV_ZERO* must be
+ * naturally aligned. They may be implemented using MMX,
+ * so emms_c() must be called before using any float code
+ * afterwards.
+ */
+
+#define AV_COPY(n, d, s) \
+    (((av_alias##n*)(d))->u##n = ((const av_alias##n*)(s))->u##n)
+
+#ifndef AV_COPY16
+#   define AV_COPY16(d, s) AV_COPY(16, d, s)
+#endif
+
+#ifndef AV_COPY32
+#   define AV_COPY32(d, s) AV_COPY(32, d, s)
+#endif
+
+#ifndef AV_COPY64
+#   define AV_COPY64(d, s) AV_COPY(64, d, s)
+#endif
+
+#ifndef AV_COPY128
+#   define AV_COPY128(d, s)                    \
+    do {                                       \
+        AV_COPY64(d, s);                       \
+        AV_COPY64((char*)(d)+8, (char*)(s)+8); \
+    } while(0)
+#endif
+
+#define AV_SWAP(n, a, b) FFSWAP(av_alias##n, *(av_alias##n*)(a), *(av_alias##n*)(b))
+
+#ifndef AV_SWAP64
+#   define AV_SWAP64(a, b) AV_SWAP(64, a, b)
+#endif
+
+#define AV_ZERO(n, d) (((av_alias##n*)(d))->u##n = 0)
+
+#ifndef AV_ZERO16
+#   define AV_ZERO16(d) AV_ZERO(16, d)
+#endif
+
+#ifndef AV_ZERO32
+#   define AV_ZERO32(d) AV_ZERO(32, d)
+#endif
+
+#ifndef AV_ZERO64
+#   define AV_ZERO64(d) AV_ZERO(64, d)
+#endif
+
+#ifndef AV_ZERO128
+#   define AV_ZERO128(d)         \
+    do {                         \
+        AV_ZERO64(d);            \
+        AV_ZERO64((char*)(d)+8); \
+    } while(0)
+#endif
+
+#endif /* AVUTIL_INTREADWRITE_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/lfg.h Added

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

gpac-0.5.0.svn4192.tar.bz2/extra_lib/include/libavutil/log.h -> gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/log.h Changed

@@ -23,14 +23,29 @@
 
 #include <stdarg.h>
 #include "avutil.h"
+#include "attributes.h"
+
+typedef enum {
+    AV_CLASS_CATEGORY_NA = 0,
+    AV_CLASS_CATEGORY_INPUT,
+    AV_CLASS_CATEGORY_OUTPUT,
+    AV_CLASS_CATEGORY_MUXER,
+    AV_CLASS_CATEGORY_DEMUXER,
+    AV_CLASS_CATEGORY_ENCODER,
+    AV_CLASS_CATEGORY_DECODER,
+    AV_CLASS_CATEGORY_FILTER,
+    AV_CLASS_CATEGORY_BITSTREAM_FILTER,
+    AV_CLASS_CATEGORY_SWSCALER,
+    AV_CLASS_CATEGORY_SWRESAMPLER,
+    AV_CLASS_CATEGORY_NB, ///< not part of ABI/API
+}AVClassCategory;
 
 /**
- * Describes the class of an AVClass context structure. That is an
+ * Describe the class of an AVClass context structure. That is an
  * arbitrary struct of which the first field is a pointer to an
  * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.).
  */
-typedef struct AVCLASS AVClass;
-struct AVCLASS {
+typedef struct AVClass {
     /**
      * The name of the class; usually it is the same name as the
      * context structure type to which the AVClass is associated.
@@ -39,7 +54,7 @@
 
     /**
      * A pointer to a function which returns the name of a context
-     * instance \p ctx associated with the class.
+     * instance ctx associated with the class.
      */
     const char* (*item_name)(void* ctx);
 
@@ -49,7 +64,57 @@
      * @see av_set_default_options()
      */
     const struct AVOption *option;
-};
+
+    /**
+     * LIBAVUTIL_VERSION with which this structure was created.
+     * This is used to allow fields to be added without requiring major
+     * version bumps everywhere.
+     */
+
+    int version;
+
+    /**
+     * Offset in the structure where log_level_offset is stored.
+     * 0 means there is no such variable
+     */
+    int log_level_offset_offset;
+
+    /**
+     * Offset in the structure where a pointer to the parent context for loging is stored.
+     * for example a decoder that uses eval.c could pass its AVCodecContext to eval as such
+     * parent context. And a av_log() implementation could then display the parent context
+     * can be NULL of course
+     */
+    int parent_log_context_offset;
+
+    /**
+     * Return next AVOptions-enabled child or NULL
+     */
+    void* (*child_next)(void *obj, void *prev);
+
+    /**
+     * Return an AVClass corresponding to next potential
+     * AVOptions-enabled child.
+     *
+     * The difference between child_next and this is that
+     * child_next iterates over _already existing_ objects, while
+     * child_class_next iterates over _all possible_ children.
+     */
+    const struct AVClass* (*child_class_next)(const struct AVClass *prev);
+
+    /**
+     * Category used for visualization (like color)
+     * This is only set if the category is equal for all objects using this class.
+     * available since version (51 << 16 | 56 << 8 | 100)
+     */
+    AVClassCategory category;
+
+    /**
+     * Callback to return the category.
+     * available since version (51 << 16 | 59 << 8 | 100)
+     */
+    AVClassCategory (*get_category)(void* ctx);
+} AVClass;
 
 /* av_log API */
 
@@ -87,8 +152,10 @@
  */
 #define AV_LOG_DEBUG    48
 
+#define AV_LOG_MAX_OFFSET (AV_LOG_DEBUG - AV_LOG_QUIET)
+
 /**
- * Sends the specified message to the log if the level is less than or equal
+ * Send the specified message to the log if the level is less than or equal
  * to the current av_log_level. By default, all logging messages are sent to
  * stderr. This behavior can be altered by setting a different av_vlog callback
  * function.
@@ -101,16 +168,46 @@
  * subsequent arguments are converted to output.
  * @see av_vlog
  */
-#ifdef __GNUC__
-void av_log(void*, int level, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 3, 4)));
-#else
-void av_log(void*, int level, const char *fmt, ...);
-#endif
+void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4);
 
-void av_vlog(void*, int level, const char *fmt, va_list);
+void av_vlog(void *avcl, int level, const char *fmt, va_list);
 int av_log_get_level(void);
 void av_log_set_level(int);
 void av_log_set_callback(void (*)(void*, int, const char*, va_list));
 void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
+const char* av_default_item_name(void* ctx);
+AVClassCategory av_default_get_category(void *ptr);
+
+/**
+ * Format a line of log the same way as the default callback.
+ * @param line          buffer to receive the formated line
+ * @param line_size     size of the buffer
+ * @param print_prefix  used to store whether the prefix must be printed;
+ *                      must point to a persistent integer initially set to 1
+ */
+void av_log_format_line(void *ptr, int level, const char *fmt, va_list vl,
+                        char *line, int line_size, int *print_prefix);
+
+/**
+ * av_dlog macros
+ * Useful to print debug messages that shouldn't get compiled in normally.
+ */
+
+#ifdef DEBUG
+#    define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
+#else
+#    define av_dlog(pctx, ...) do { if (0) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0)
+#endif
+
+/**
+ * Skip repeated messages, this requires the user app to use av_log() instead of
+ * (f)printf as the 2 would otherwise interfere and lead to
+ * "Last message repeated x times" messages below (f)printf messages with some
+ * bad luck.
+ * Also to receive the last, "last repeated" line if any, the user app must
+ * call av_log(NULL, AV_LOG_QUIET, "%s", ""); at the end
+ */
+#define AV_LOG_SKIP_REPEATED 1
+void av_log_set_flags(int arg);
 
 #endif /* AVUTIL_LOG_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/lzo.h Added

@@ -0,0 +1,77 @@
+/*
+ * 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);
+
+/**
+ * @brief deliberately overlapping memcpy implementation
+ * @param dst destination buffer; must be padded with 12 additional bytes
+ * @param back how many bytes back we start (the initial size of the overlapping window), must be > 0
+ * @param cnt number of bytes to copy, must be >= 0
+ *
+ * cnt > back is valid, this will copy the bytes we just copied,
+ * thus creating a repeating pattern with a period length of back.
+ */
+void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_LZO_H */

gpac-0.5.0.svn4192.tar.bz2/extra_lib/include/libavutil/mathematics.h -> gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/mathematics.h Changed

@@ -21,12 +21,11 @@
 #ifndef AVUTIL_MATHEMATICS_H
 #define AVUTIL_MATHEMATICS_H
 
-#if !defined(WIN32) && !defined(_WIN32_WCE)
 #include <stdint.h>
-#endif
 #include <math.h>
-#include "common.h"
+#include "attributes.h"
 #include "rational.h"
+#include "intfloat.h"
 
 #ifndef M_E
 #define M_E            2.7182818284590452354   /* e */
@@ -37,12 +36,33 @@
 #ifndef M_LN10
 #define M_LN10         2.30258509299404568402  /* log_e 10 */
 #endif
+#ifndef M_LOG2_10
+#define M_LOG2_10      3.32192809488736234787  /* log_2 10 */
+#endif
+#ifndef M_PHI
+#define M_PHI          1.61803398874989484820   /* phi / golden ratio */
+#endif
 #ifndef M_PI
 #define M_PI           3.14159265358979323846  /* pi */
 #endif
 #ifndef M_SQRT1_2
 #define M_SQRT1_2      0.70710678118654752440  /* 1/sqrt(2) */
 #endif
+#ifndef M_SQRT2
+#define M_SQRT2        1.41421356237309504880  /* sqrt(2) */
+#endif
+#ifndef NAN
+#define NAN            av_int2float(0x7fc00000)
+#endif
+#ifndef INFINITY
+#define INFINITY       av_int2float(0x7f800000)
+#endif
+
+/**
+ * @addtogroup lavu_math
+ * @{
+ */
+
 
 enum AVRounding {
     AV_ROUND_ZERO     = 0, ///< Round toward zero.
@@ -52,23 +72,58 @@
     AV_ROUND_NEAR_INF = 5, ///< Round to nearest and halfway cases away from zero.
 };
 
+/**
+ * Return the greatest common divisor of a and b.
+ * If both a and b are 0 or either or both are <0 then behavior is
+ * undefined.
+ */
 int64_t av_const av_gcd(int64_t a, int64_t b);
 
 /**
- * Rescales a 64-bit integer with rounding to nearest.
+ * Rescale a 64-bit integer with rounding to nearest.
  * A simple a*b/c isn't possible as it can overflow.
  */
 int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const;
 
 /**
- * Rescales a 64-bit integer with specified rounding.
+ * Rescale a 64-bit integer with specified rounding.
  * A simple a*b/c isn't possible as it can overflow.
  */
 int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_const;
 
 /**
- * Rescales a 64-bit integer by 2 rational numbers.
+ * Rescale a 64-bit integer by 2 rational numbers.
  */
 int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
 
+/**
+ * Rescale a 64-bit integer by 2 rational numbers with specified rounding.
+ */
+int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq,
+                         enum AVRounding) av_const;
+
+/**
+ * Compare 2 timestamps each in its own timebases.
+ * The result of the function is undefined if one of the timestamps
+ * is outside the int64_t range when represented in the others timebase.
+ * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position
+ */
+int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
+
+/**
+ * Compare 2 integers modulo mod.
+ * That is we compare integers a and b for which only the least
+ * significant log2(mod) bits are known.
+ *
+ * @param mod must be a power of 2
+ * @return a negative value if a is smaller than b
+ *         a positive value if a is greater than b
+ *         0                if a equals          b
+ */
+int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod);
+
+/**
+ * @}
+ */
+
 #endif /* AVUTIL_MATHEMATICS_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/md5.h Added

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

gpac-0.5.0.svn4192.tar.bz2/extra_lib/include/libavutil/mem.h -> gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/mem.h Changed

@@ -19,14 +19,45 @@
  */
 
 /**
- * @file libavutil/mem.h
+ * @file
  * memory handling functions
  */
 
 #ifndef AVUTIL_MEM_H
 #define AVUTIL_MEM_H
 
-#include "common.h"
+#include <limits.h>
+
+#include "attributes.h"
+#include "error.h"
+#include "avutil.h"
+
+/**
+ * @addtogroup lavu_mem
+ * @{
+ */
+
+
+#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C)
+    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
+    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
+#elif defined(__TI_COMPILER_VERSION__)
+    #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__)
+    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
+    #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (n))) v
+#elif defined(_MSC_VER)
+    #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
+    #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v
+#else
+    #define DECLARE_ALIGNED(n,t,v)      t v
+    #define DECLARE_ASM_CONST(n,t,v)    static const t v
+#endif
 
 #if AV_GCC_VERSION_AT_LEAST(3,1)
     #define av_malloc_attrib __attribute__((__malloc__))
@@ -34,38 +65,64 @@
     #define av_malloc_attrib
 #endif
 
-#if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,3)
-    #define av_alloc_size(n) __attribute__((alloc_size(n)))
+#if AV_GCC_VERSION_AT_LEAST(4,3)
+    #define av_alloc_size(...) __attribute__((alloc_size(__VA_ARGS__)))
 #else
-    #define av_alloc_size(n)
+    #define av_alloc_size(...)
 #endif
 
 /**
- * Allocates a block of \p size bytes with alignment suitable for all
+ * Allocate a block of size bytes with alignment suitable for all
  * memory accesses (including vectors if available on the CPU).
  * @param size Size in bytes for the memory block to be allocated.
  * @return Pointer to the allocated block, NULL if the block cannot
  * be allocated.
  * @see av_mallocz()
  */
-void *av_malloc(unsigned int size) av_malloc_attrib av_alloc_size(1);
+void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
 
 /**
- * Allocates or reallocates a block of memory.
- * If \p ptr is NULL and \p size > 0, allocates a new block. If \p
- * size is zero, frees the memory block pointed to by \p ptr.
- * @param size Size in bytes for the memory block to be allocated or
- * reallocated.
+ * Helper function to allocate a block of size * nmemb bytes with
+ * using av_malloc()
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Pointer to the allocated block, NULL if the block cannot
+ * be allocated.
+ * @see av_malloc()
+ */
+av_alloc_size(1,2) static inline void *av_malloc_array(size_t nmemb, size_t size)
+{
+    if (size <= 0 || nmemb >= INT_MAX / size)
+        return NULL;
+    return av_malloc(nmemb * size);
+}
+
+/**
+ * Allocate or reallocate a block of memory.
+ * If ptr is NULL and size > 0, allocate a new block. If
+ * size is zero, free the memory block pointed to by ptr.
  * @param ptr Pointer to a memory block already allocated with
  * av_malloc(z)() or av_realloc() or NULL.
+ * @param size Size in bytes for 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.
  * @see av_fast_realloc()
  */
-void *av_realloc(void *ptr, unsigned int size) av_alloc_size(2);
+void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
 
 /**
- * Frees a memory block which has been allocated with av_malloc(z)() or
+ * Allocate or reallocate a block of memory.
+ * This function does the same thing as av_realloc, except:
+ * - It takes two arguments and checks the result of the multiplication for
+ *   integer overflow.
+ * - It frees the input block in case of failure, thus avoiding the memory
+ *   leak with the classic "buf = realloc(buf); if (!buf) return -1;".
+ */
+void *av_realloc_f(void *ptr, size_t nelem, size_t elsize);
+
+/**
+ * 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.
@@ -75,25 +132,54 @@
 void av_free(void *ptr);
 
 /**
- * Allocates a block of \p size bytes with alignment suitable for all
+ * Allocate a block of size bytes with alignment suitable for all
  * memory accesses (including vectors if available on the CPU) and
- * zeroes all the bytes of the block.
+ * zero all the bytes of the block.
  * @param size Size in bytes for the memory block to be allocated.
  * @return Pointer to the allocated block, NULL if it cannot be allocated.
  * @see av_malloc()
  */
-void *av_mallocz(unsigned int size) av_malloc_attrib av_alloc_size(1);
+void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
 
 /**
- * Duplicates the string \p s.
+ * Allocate a block of nmemb * size bytes with alignment suitable for all
+ * memory accesses (including vectors if available on the CPU) and
+ * zero all the bytes of the block.
+ * The allocation will fail if nmemb * size is greater than or equal
+ * to INT_MAX.
+ * @param nmemb
+ * @param size
+ * @return Pointer to the allocated block, NULL if it cannot be allocated.
+ */
+void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib;
+
+/**
+ * Helper function to allocate a block of size * nmemb bytes with
+ * using av_mallocz()
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Pointer to the allocated block, NULL if the block cannot
+ * be allocated.
+ * @see av_mallocz()
+ * @see av_malloc_array()
+ */
+av_alloc_size(1,2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
+{
+    if (size <= 0 || nmemb >= INT_MAX / size)
+        return NULL;
+    return av_mallocz(nmemb * size);
+}
+
+/**
+ * Duplicate the string s.
  * @param s string to be duplicated
  * @return Pointer to a newly allocated string containing a
- * copy of \p s or NULL if the string cannot be allocated.
+ * copy of s or NULL if the string cannot be allocated.
  */
 char *av_strdup(const char *s) av_malloc_attrib;
 
 /**
- * Frees a memory block which has been allocated with av_malloc(z)() or
+ * 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.
@@ -101,4 +187,37 @@
  */
 void av_freep(void *ptr);
 
+/**
+ * Add an element to a dynamic array.
+ *
+ * @param tab_ptr Pointer to the array.
+ * @param nb_ptr  Pointer to the number of elements in the array.
+ * @param elem    Element to be added.
+ */
+void av_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem);
+
+/**
+ * Multiply two size_t values checking for overflow.
+ * @return  0 if success, AVERROR(EINVAL) if overflow.
+ */
+static inline int av_size_mult(size_t a, size_t b, size_t *r)
+{
+    size_t t = a * b;
+    /* Hack inspired from glibc: only try the division if nelem and elsize
+     * are both greater than sqrt(SIZE_MAX). */
+    if ((a | b) >= ((size_t)1 << (sizeof(size_t) * 4)) && a && t / a != b)
+        return AVERROR(EINVAL);
+    *r = t;
+    return 0;
+}
+
+/**
+ * Set the maximum size that may me allocated in one block.
+ */
+void av_max_alloc(size_t max);
+
+/**
+ * @}
+ */
+
 #endif /* AVUTIL_MEM_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/old_pix_fmts.h Added

@@ -0,0 +1,171 @@
+/*
+ * 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
+    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
+    PIX_FMT_XVMC_MPEG2_IDCT,
+    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
+    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
+    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
+    PIX_FMT_BGR4,      ///< packed RGB 1:2:1 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)
+    PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, 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
+    PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
+
+    PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
+    PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
+    PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
+    PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
+    PIX_FMT_GRAY8A,    ///< 8bit gray, 8bit alpha
+    PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
+    PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
+
+    //the following 10 formats have the disadvantage of needing 1 format for each bit depth, thus
+    //If you want to support multiple bit depths, then using PIX_FMT_YUV420P16* with the bpp stored separately
+    //is better
+    PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
+
+#ifdef AV_PIX_FMT_ABI_GIT_MASTER
+    PIX_FMT_RGBA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+    PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+    PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+    PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+#endif
+    PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
+    PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big endian
+    PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little endian
+    PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big endian
+    PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little endian
+    PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big endian
+    PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little endian
+
+#ifndef AV_PIX_FMT_ABI_GIT_MASTER
+    PIX_FMT_RGBA64BE=0x123,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+    PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+    PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+    PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+#endif
+    PIX_FMT_0RGB=0x123+4,      ///< packed RGB 8:8:8, 32bpp, 0RGB0RGB...
+    PIX_FMT_RGB0,      ///< packed RGB 8:8:8, 32bpp, RGB0RGB0...
+    PIX_FMT_0BGR,      ///< packed BGR 8:8:8, 32bpp, 0BGR0BGR...
+    PIX_FMT_BGR0,      ///< packed BGR 8:8:8, 32bpp, BGR0BGR0...
+    PIX_FMT_YUVA444P,  ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
+    PIX_FMT_YUVA422P,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
+
+    PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_GBRP12BE,    ///< planar GBR 4:4:4 36bpp, big endian
+    PIX_FMT_GBRP12LE,    ///< planar GBR 4:4:4 36bpp, little endian
+    PIX_FMT_GBRP14BE,    ///< planar GBR 4:4:4 42bpp, big endian
+    PIX_FMT_GBRP14LE,    ///< planar GBR 4:4:4 42bpp, little endian
+
+    PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
+#endif /* AVUTIL_OLD_PIX_FMTS_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/opt.h Added

@@ -0,0 +1,637 @@
+/*
+ * AVOptions
+ * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_OPT_H
+#define AVUTIL_OPT_H
+
+/**
+ * @file
+ * AVOptions
+ */
+
+#include "rational.h"
+#include "avutil.h"
+#include "dict.h"
+#include "log.h"
+
+/**
+ * @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 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     = 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 to a string and
+ *      create the constants themselves as options of type AV_OPT_TYPE_CONST
+ *      with their unit field set to the same string.
+ *      Their default_val field should contain the value of the named
+ *      constant.
+ *      For example, to add some named constants for the test_flags option
+ *      above, put the following into the child_opts array:
+ *      @code
+ *      { "test_flags", "This is a test option of flags type.",
+ *        offsetof(child_struct, flags_opt), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, "test_unit" },
+ *      { "flag1", "This is a flag with value 16", 0, AV_OPT_TYPE_CONST, { .i64 = 16 }, 0, 0, "test_unit" },
+ *      @endcode
+ *
+ * @section avoptions_use Using AVOptions
+ * This section deals with accessing options in an AVOptions-enabled struct.
+ * Such structs in FFmpeg are e.g. AVCodecContext in libavcodec or
+ * AVFormatContext in libavformat.
+ *
+ * @subsection avoptions_use_examine Examining AVOptions
+ * The basic functions for examining options are av_opt_next(), which iterates
+ * over all options defined for one object, and av_opt_find(), which searches
+ * for an option with the given name.
+ *
+ * The situation is more complicated with nesting. An AVOptions-enabled struct
+ * may have AVOptions-enabled children. Passing the AV_OPT_SEARCH_CHILDREN flag
+ * to av_opt_find() will make the function search children recursively.
+ *
+ * For enumerating there are basically two cases. The first is when you want to
+ * get all options that may potentially exist on the struct and its children
+ * (e.g.  when constructing documentation). In that case you should call
+ * av_opt_child_class_next() recursively on the parent struct's AVClass.  The
+ * second case is when you have an already initialized struct with all its
+ * children and you want to get all options that can be actually written or read
+ * from it. In that case you should call av_opt_child_next() recursively (and
+ * av_opt_next() on each result).
+ *
+ * @subsection avoptions_use_get_set Reading and writing AVOptions
+ * When setting options, you often have a string read directly from the
+ * user. In such a case, simply passing it to av_opt_set() is enough. For
+ * non-string type options, av_opt_set() will parse the string according to the
+ * option type.
+ *
+ * Similarly av_opt_get() will read any option type and convert it to a string
+ * which will be returned. Do not forget that the string is allocated, so you
+ * have to free it with av_free().
+ *
+ * In some cases it may be more convenient to put all options into an
+ * AVDictionary and call av_opt_set_dict() on it. A specific case of this
+ * are the format/codec open functions in lavf/lavc which take a dictionary
+ * filled with option as a parameter. This allows to set some options
+ * that cannot be set otherwise, since e.g. the input file format is not known
+ * before the file is actually opened.
+ */
+
+enum AVOptionType{
+    AV_OPT_TYPE_FLAGS,
+    AV_OPT_TYPE_INT,
+    AV_OPT_TYPE_INT64,
+    AV_OPT_TYPE_DOUBLE,
+    AV_OPT_TYPE_FLOAT,
+    AV_OPT_TYPE_STRING,
+    AV_OPT_TYPE_RATIONAL,
+    AV_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
+    AV_OPT_TYPE_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'),
+#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
+#define AV_OPT_FLAG_METADATA        4   ///< some data extracted or inserted into the file like title, comment, ...
+#define AV_OPT_FLAG_AUDIO_PARAM     8
+#define AV_OPT_FLAG_VIDEO_PARAM     16
+#define AV_OPT_FLAG_SUBTITLE_PARAM  32
+#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;
+
+#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 string and binary options 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);
+
+/**
+ * @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
+
+/**
+ * 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);
+/**
+ * @}
+ */
+
+/**
+ * @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 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);
+/**
+ * @}
+ */
+/**
+ * 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);
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_OPT_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/parseutils.h Added

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

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/pixdesc.h Added

@@ -0,0 +1,209 @@
+/*
+ * pixel format descriptor
+ * Copyright (c) 2009 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PIXDESC_H
+#define AVUTIL_PIXDESC_H
+
+#include <inttypes.h>
+#include "pixfmt.h"
+
+typedef struct AVComponentDescriptor{
+    uint16_t plane        :2;            ///< which of the 4 planes contains the component
+
+    /**
+     * 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;
+    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;
+
+/**
+ * Descriptor that unambiguously describes how the bits of a pixel are
+ * stored in the up to 4 data planes of an image. It also stores the
+ * subsampling factors and number of components.
+ *
+ * @note This is separate of the colorspace (RGB, YCbCr, YPbPr, JPEG-style YUV
+ *       and all the YUV variants) AVPixFmtDescriptor just stores how values
+ *       are stored not what these values represent.
+ */
+typedef struct AVPixFmtDescriptor{
+    const char *name;
+    uint8_t nb_components;      ///< The number of components each pixel has, (1-4)
+
+    /**
+     * Amount to shift the luma width right to find the chroma width.
+     * For YV12 this is 1 for example.
+     * chroma_width = -((-luma_width) >> log2_chroma_w)
+     * The note above is needed to ensure rounding up.
+     * This value only refers to the chroma components.
+     */
+    uint8_t log2_chroma_w;      ///< chroma_width = -((-luma_width )>>log2_chroma_w)
+
+    /**
+     * Amount to shift the luma height right to find the chroma height.
+     * For YV12 this is 1 for example.
+     * chroma_height= -((-luma_height) >> log2_chroma_h)
+     * The note above is needed to ensure rounding up.
+     * This value only refers to the chroma components.
+     */
+    uint8_t log2_chroma_h;
+    uint8_t flags;
+
+    /**
+     * Parameters that describe how pixels are packed.
+     * If the format has 2 or 4 components, then alpha is last.
+     * If the format has 1 or 2 components, then luma is 0.
+     * If the format has 3 or 4 components,
+     * if the RGB flag is set then 0 is red, 1 is green and 2 is blue;
+     * otherwise 0 is luma, 1 is chroma-U and 2 is chroma-V.
+     */
+    AVComponentDescriptor comp[4];
+}AVPixFmtDescriptor;
+
+#define PIX_FMT_BE        1 ///< Pixel format is big-endian.
+#define PIX_FMT_PAL       2 ///< Pixel format has a palette in data[1], values are indexes in this palette.
+#define PIX_FMT_BITSTREAM 4 ///< All values of a component are bit-wise packed end to end.
+#define PIX_FMT_HWACCEL   8 ///< Pixel format is an HW accelerated format.
+#define PIX_FMT_PLANAR   16 ///< At least one pixel component is not in the first data plane
+#define PIX_FMT_RGB      32 ///< The pixel format contains RGB-like data (as opposed to YUV/grayscale)
+/**
+ * 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 PIX_FMT_PSEUDOPAL 64
+
+#if FF_API_PIX_FMT_DESC
+/**
+ * The array of all the pixel format descriptors.
+ */
+extern const AVPixFmtDescriptor av_pix_fmt_descriptors[];
+#endif
+
+/**
+ * Read a line from an image, and write the values of the
+ * pixel format component c to dst.
+ *
+ * @param data the array containing the pointers to the planes of the image
+ * @param linesize the array containing the linesizes of the image
+ * @param desc the pixel format descriptor for the image
+ * @param x the horizontal coordinate of the first pixel to read
+ * @param y the vertical coordinate of the first pixel to read
+ * @param w the width of the line to read, that is the number of
+ * values to write to dst
+ * @param read_pal_component if not zero and the format is a paletted
+ * format writes the values corresponding to the palette
+ * component c in data[1] to dst, rather than the palette indexes in
+ * data[0]. The behavior is undefined if the format is not paletted.
+ */
+void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
+                        const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component);
+
+/**
+ * Write the values from src to the pixel format component c of an
+ * image line.
+ *
+ * @param src array containing the values to write
+ * @param data the array containing the pointers to the planes of the
+ * image to write into. It is supposed to be zeroed.
+ * @param linesize the array containing the linesizes of the image
+ * @param desc the pixel format descriptor for the image
+ * @param x the horizontal coordinate of the first pixel to write
+ * @param y the vertical coordinate of the first pixel to write
+ * @param w the width of the line to write, that is the number of
+ * values to write to the image line
+ */
+void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],
+                         const AVPixFmtDescriptor *desc, int x, int y, int c, int w);
+
+/**
+ * Return the pixel format corresponding to name.
+ *
+ * If there is no pixel format with name name, then looks for a
+ * pixel format with the name corresponding to the native endian
+ * format of name.
+ * For example in a little-endian system, first looks for "gray16",
+ * then for "gray16le".
+ *
+ * Finally if no pixel format has been found, returns AV_PIX_FMT_NONE.
+ */
+enum AVPixelFormat av_get_pix_fmt(const char *name);
+
+/**
+ * Return the short name for a pixel format, NULL in case pix_fmt is
+ * unknown.
+ *
+ * @see av_get_pix_fmt(), av_get_pix_fmt_string()
+ */
+const char *av_get_pix_fmt_name(enum AVPixelFormat pix_fmt);
+
+/**
+ * Print in buf the string corresponding to the pixel format with
+ * number pix_fmt, or an header if pix_fmt is negative.
+ *
+ * @param buf the buffer where to write the string
+ * @param buf_size the size of buf
+ * @param pix_fmt the number of the pixel format to print the
+ * corresponding info string, or a negative value to print the
+ * corresponding header.
+ */
+char *av_get_pix_fmt_string (char *buf, int buf_size, enum AVPixelFormat pix_fmt);
+
+/**
+ * Return the number of bits per pixel used by the pixel format
+ * described by pixdesc.
+ *
+ * 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 a pixel format descriptor for provided pixel format or NULL if
+ * this pixel format is unknown.
+ */
+const AVPixFmtDescriptor *av_pix_fmt_desc_get(enum AVPixelFormat pix_fmt);
+
+/**
+ * Iterate over all pixel format descriptors known to libavutil.
+ *
+ * @param prev previous descriptor. NULL to get the first descriptor.
+ *
+ * @return next descriptor or NULL after the last descriptor
+ */
+const AVPixFmtDescriptor *av_pix_fmt_desc_next(const AVPixFmtDescriptor *prev);
+
+/**
+ * @return an AVPixelFormat id described by desc, or AV_PIX_FMT_NONE if desc
+ * is not a valid pointer to a pixel format descriptor.
+ */
+enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc);
+
+#endif /* AVUTIL_PIXDESC_H */

gpac-0.5.0.svn4192.tar.bz2/extra_lib/include/libavutil/pixfmt.h -> gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/pixfmt.h Changed

@@ -22,22 +22,28 @@
 #define AVUTIL_PIXFMT_H
 
 /**
- * @file libavutil/pixfmt.h
+ * @file
  * pixel format definitions
  *
- * @warning This file has to be considered an internal but installed
- * header, so it should not be directly included in your projects.
  */
 
+#include "libavutil/avconfig.h"
+#include "libavutil/version.h"
+
+#define AVPALETTE_SIZE 1024
+#define AVPALETTE_COUNT 256
+
 /**
- * Pixel format. Notes:
+ * Pixel format.
  *
+ * @note
  * PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
  * color is put together as:
  *  (A << 24) | (R << 16) | (G << 8) | B
  * This is stored as BGRA on little-endian CPU architectures and ARGB on
  * big-endian CPUs.
  *
+ * @par
  * When the pixel format is palettized RGB (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
@@ -47,105 +53,275 @@
  * This is important as many custom PAL8 video codecs that were designed
  * to run on the IBM VGA graphics adapter use 6-bit palette components.
  *
+ * @par
  * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like
  * for pal8. This palette is filled in automatically by the function
  * allocating the picture.
  *
- * Note, make sure that all newly added big endian formats have pix_fmt&1==1
- *       and that all newly added little endian formats have pix_fmt&1==0
- *       this allows simpler detection of big vs little endian.
+ * @note
+ * make sure that all newly added big endian formats have pix_fmt&1==1
+ * and that all newly added little endian formats have pix_fmt&1==0
+ * this allows simpler detection of big vs little endian.
  */
-enum PixelFormat {
-    PIX_FMT_NONE= -1,
-    PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
-    PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-    PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
-    PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
-    PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-    PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
-    PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-    PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
-    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black
-    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white
-    PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
-    PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG)
-    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG)
-    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG)
-    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
-    PIX_FMT_XVMC_MPEG2_IDCT,
-    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
-    PIX_FMT_BGR4,      ///< packed RGB 1:2:1,  4bpp, (msb)1B 2G 1R(lsb)
-    PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
-    PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    PIX_FMT_RGB4,      ///< packed RGB 1:2:1,  4bpp, (msb)1R 2G 1B(lsb)
-    PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
-    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 for UV
-    PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-
-    PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
-    PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
-    PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
-    PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-
-    PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
-    PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
-    PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
-    PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG)
-    PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
-    PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, big-endian
-    PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, little-endian
-
-    PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
-    PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
-    PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
-    PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
-
-    PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
-    PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
-    PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
-    PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
-
-    PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
-    PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
-    PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-
-    PIX_FMT_YUV420PLE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420PBE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV422PLE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV422PBE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV444PLE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444PBE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-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
+enum AVPixelFormat {
+    AV_PIX_FMT_NONE = -1,
+    AV_PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
+    AV_PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
+    AV_PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
+    AV_PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
+    AV_PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+    AV_PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
+    AV_PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
+    AV_PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
+    AV_PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
+    AV_PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
+    AV_PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
+    AV_PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
+    AV_PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
+    AV_PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
+    AV_PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
+    AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
+    AV_PIX_FMT_XVMC_MPEG2_IDCT,
+    AV_PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
+    AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
+    AV_PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
+    AV_PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+    AV_PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
+    AV_PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
+    AV_PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
+    AV_PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
+    AV_PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
+    AV_PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
+
+    AV_PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
+    AV_PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
+    AV_PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
+    AV_PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
+
+    AV_PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
+    AV_PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
+    AV_PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
+    AV_PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
+    AV_PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+    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
+    AV_PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
+    AV_PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
+
+    AV_PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
+    AV_PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
+    AV_PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
+    AV_PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
+
+    AV_PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
+    AV_PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
+    AV_PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
+    AV_PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
+
+    AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
+    AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
+    AV_PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+
+    AV_PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    AV_PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    AV_PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    AV_PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    AV_PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    AV_PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    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
+    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_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
+    AV_PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
+
+    //the following 10 formats have the disadvantage of needing 1 format for each bit depth, thus
+    //If you want to support multiple bit depths, then using AV_PIX_FMT_YUV420P16* with the bpp stored separately
+    //is better
+    AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    AV_PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    AV_PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    AV_PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    AV_PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    AV_PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    AV_PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    AV_PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    AV_PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    AV_PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    AV_PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
+
+#ifdef AV_PIX_FMT_ABI_GIT_MASTER
+    AV_PIX_FMT_RGBA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+    AV_PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+    AV_PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+    AV_PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+#endif
+    AV_PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
+    AV_PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big endian
+    AV_PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little endian
+    AV_PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big endian
+    AV_PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little endian
+    AV_PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big endian
+    AV_PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little endian
+
+    /**
+     * duplicated pixel formats for compatibility with libav.
+     * FFmpeg supports these formats since May 8 2012 and Jan 28 2012 (commits f9ca1ac7 and 143a5c55)
+     * Libav added them Oct 12 2012 with incompatible values (commit 6d5600e85)
+     */
+    AV_PIX_FMT_YUVA422P_LIBAV,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
+    AV_PIX_FMT_YUVA444P_LIBAV,  ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
+
+#ifndef AV_PIX_FMT_ABI_GIT_MASTER
+    AV_PIX_FMT_RGBA64BE=0x123,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+    AV_PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+    AV_PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+    AV_PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+#endif
+    AV_PIX_FMT_0RGB=0x123+4,      ///< packed RGB 8:8:8, 32bpp, 0RGB0RGB...
+    AV_PIX_FMT_RGB0,      ///< packed RGB 8:8:8, 32bpp, RGB0RGB0...
+    AV_PIX_FMT_0BGR,      ///< packed BGR 8:8:8, 32bpp, 0BGR0BGR...
+    AV_PIX_FMT_BGR0,      ///< packed BGR 8:8:8, 32bpp, BGR0BGR0...
+    AV_PIX_FMT_YUVA444P,  ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
+    AV_PIX_FMT_YUVA422P,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
+
+    AV_PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    AV_PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    AV_PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    AV_PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    AV_PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    AV_PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    AV_PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    AV_PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    AV_PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    AV_PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    AV_PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    AV_PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    AV_PIX_FMT_GBRP12BE,    ///< planar GBR 4:4:4 36bpp, big endian
+    AV_PIX_FMT_GBRP12LE,    ///< planar GBR 4:4:4 36bpp, little endian
+    AV_PIX_FMT_GBRP14BE,    ///< planar GBR 4:4:4 42bpp, big endian
+    AV_PIX_FMT_GBRP14LE,    ///< planar GBR 4:4:4 42bpp, little endian
+
+    AV_PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
+
+#if FF_API_PIX_FMT
+#include "old_pix_fmts.h"
+#endif
 };
 
-#ifdef WORDS_BIGENDIAN
-#   define PIX_FMT_NE(be, le) PIX_FMT_##be
+#if AV_HAVE_INCOMPATIBLE_FORK_ABI
+#define AV_PIX_FMT_YUVA422P AV_PIX_FMT_YUVA422P_LIBAV
+#define AV_PIX_FMT_YUVA444P AV_PIX_FMT_YUVA444P_LIBAV
+#endif
+
+
+#define AV_PIX_FMT_Y400A AV_PIX_FMT_GRAY8A
+#define AV_PIX_FMT_GBR24P AV_PIX_FMT_GBRP
+
+#if AV_HAVE_BIGENDIAN
+#   define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be
 #else
-#   define PIX_FMT_NE(be, le) PIX_FMT_##le
+#   define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##le
 #endif
 
-#define PIX_FMT_RGB32   PIX_FMT_NE(ARGB, BGRA)
-#define PIX_FMT_RGB32_1 PIX_FMT_NE(RGBA, ABGR)
-#define PIX_FMT_BGR32   PIX_FMT_NE(ABGR, RGBA)
-#define PIX_FMT_BGR32_1 PIX_FMT_NE(BGRA, ARGB)
-
-#define PIX_FMT_GRAY16 PIX_FMT_NE(GRAY16BE, GRAY16LE)
-#define PIX_FMT_RGB48  PIX_FMT_NE(RGB48BE,  RGB48LE)
-#define PIX_FMT_RGB565 PIX_FMT_NE(RGB565BE, RGB565LE)
-#define PIX_FMT_RGB555 PIX_FMT_NE(RGB555BE, RGB555LE)
-#define PIX_FMT_BGR565 PIX_FMT_NE(BGR565BE, BGR565LE)
-#define PIX_FMT_BGR555 PIX_FMT_NE(BGR555BE, BGR555LE)
-
-#define PIX_FMT_YUV420P16 PIX_FMT_NE(YUV420PBE, YUV420PLE)
-#define PIX_FMT_YUV422P16 PIX_FMT_NE(YUV422PBE, YUV422PLE)
-#define PIX_FMT_YUV444P16 PIX_FMT_NE(YUV444PBE, YUV444PLE)
+#define AV_PIX_FMT_RGB32   AV_PIX_FMT_NE(ARGB, BGRA)
+#define AV_PIX_FMT_RGB32_1 AV_PIX_FMT_NE(RGBA, ABGR)
+#define AV_PIX_FMT_BGR32   AV_PIX_FMT_NE(ABGR, RGBA)
+#define AV_PIX_FMT_BGR32_1 AV_PIX_FMT_NE(BGRA, ARGB)
+#define AV_PIX_FMT_0RGB32  AV_PIX_FMT_NE(0RGB, BGR0)
+#define AV_PIX_FMT_0BGR32  AV_PIX_FMT_NE(0BGR, RGB0)
+
+#define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE)
+#define AV_PIX_FMT_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_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_YUV420P9  AV_PIX_FMT_NE(YUV420P9BE , YUV420P9LE)
+#define AV_PIX_FMT_YUV422P9  AV_PIX_FMT_NE(YUV422P9BE , YUV422P9LE)
+#define AV_PIX_FMT_YUV444P9  AV_PIX_FMT_NE(YUV444P9BE , YUV444P9LE)
+#define AV_PIX_FMT_YUV420P10 AV_PIX_FMT_NE(YUV420P10BE, YUV420P10LE)
+#define AV_PIX_FMT_YUV422P10 AV_PIX_FMT_NE(YUV422P10BE, YUV422P10LE)
+#define AV_PIX_FMT_YUV444P10 AV_PIX_FMT_NE(YUV444P10BE, YUV444P10LE)
+#define AV_PIX_FMT_YUV420P12 AV_PIX_FMT_NE(YUV420P12BE, YUV420P12LE)
+#define AV_PIX_FMT_YUV422P12 AV_PIX_FMT_NE(YUV422P12BE, YUV422P12LE)
+#define AV_PIX_FMT_YUV444P12 AV_PIX_FMT_NE(YUV444P12BE, YUV444P12LE)
+#define AV_PIX_FMT_YUV420P14 AV_PIX_FMT_NE(YUV420P14BE, YUV420P14LE)
+#define AV_PIX_FMT_YUV422P14 AV_PIX_FMT_NE(YUV422P14BE, YUV422P14LE)
+#define AV_PIX_FMT_YUV444P14 AV_PIX_FMT_NE(YUV444P14BE, YUV444P14LE)
+#define AV_PIX_FMT_YUV420P16 AV_PIX_FMT_NE(YUV420P16BE, YUV420P16LE)
+#define AV_PIX_FMT_YUV422P16 AV_PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
+#define AV_PIX_FMT_YUV444P16 AV_PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
+
+#define AV_PIX_FMT_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)
+
+#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
 
 #endif /* AVUTIL_PIXFMT_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/random_seed.h Added

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

gpac-0.5.0.svn4192.tar.bz2/extra_lib/include/libavutil/rational.h -> gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/rational.h Changed

@@ -20,7 +20,7 @@
  */
 
 /**
- * @file libavutil/rational.h
+ * @file
  * rational numbers
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
@@ -28,10 +28,14 @@
 #ifndef AVUTIL_RATIONAL_H
 #define AVUTIL_RATIONAL_H
 
-#if !defined(WIN32) && !defined(_WIN32_WCE)
 #include <stdint.h>
-#endif
-#include "common.h"
+#include <limits.h>
+#include "attributes.h"
+
+/**
+ * @addtogroup lavu_math
+ * @{
+ */
 
 /**
  * rational number numerator/denominator
@@ -42,20 +46,23 @@
 } AVRational;
 
 /**
- * Compares two rationals.
+ * Compare two rationals.
  * @param a first rational
  * @param b second rational
- * @return 0 if a==b, 1 if a>b and -1 if a<b
+ * @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
  */
 static inline int av_cmp_q(AVRational a, AVRational b){
     const int64_t tmp= a.num * (int64_t)b.den - b.num * (int64_t)a.den;
 
-    if(tmp) return (tmp>>63)|1;
-    else    return 0;
+    if(tmp) return ((tmp ^ a.den ^ b.den)>>63)|1;
+    else if(b.den && a.den) return 0;
+    else if(a.num && b.num) return (a.num>>31) - (b.num>>31);
+    else                    return INT_MIN;
 }
 
 /**
- * Converts rational to double.
+ * Convert rational to double.
  * @param a rational to convert
  * @return (double) a
  */
@@ -64,7 +71,7 @@
 }
 
 /**
- * Reduces a fraction.
+ * Reduce a fraction.
  * This is useful for framerate calculations.
  * @param dst_num destination numerator
  * @param dst_den destination denominator
@@ -76,7 +83,7 @@
 int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max);
 
 /**
- * Multiplies two rationals.
+ * Multiply two rationals.
  * @param b first rational
  * @param c second rational
  * @return b*c
@@ -84,7 +91,7 @@
 AVRational av_mul_q(AVRational b, AVRational c) av_const;
 
 /**
- * Divides one rational by another.
+ * Divide one rational by another.
  * @param b first rational
  * @param c second rational
  * @return b/c
@@ -92,7 +99,7 @@
 AVRational av_div_q(AVRational b, AVRational c) av_const;
 
 /**
- * Adds two rationals.
+ * Add two rationals.
  * @param b first rational
  * @param c second rational
  * @return b+c
@@ -100,7 +107,7 @@
 AVRational av_add_q(AVRational b, AVRational c) av_const;
 
 /**
- * Subtracts one rational from another.
+ * Subtract one rational from another.
  * @param b first rational
  * @param c second rational
  * @return b-c
@@ -108,7 +115,20 @@
 AVRational av_sub_q(AVRational b, AVRational c) av_const;
 
 /**
- * Converts a double precision floating point number to a rational.
+ * Invert a rational.
+ * @param q value
+ * @return 1 / q
+ */
+static av_always_inline AVRational av_inv_q(AVRational q)
+{
+    AVRational r = { q.den, q.num };
+    return r;
+}
+
+/**
+ * Convert a double precision floating point number to a rational.
+ * inf is expressed as {1,0} or {-1,0} depending on the sign.
+ *
  * @param d double to convert
  * @param max the maximum allowed numerator and denominator
  * @return (AVRational) d
@@ -116,16 +136,20 @@
 AVRational av_d2q(double d, int max) av_const;
 
 /**
- * @return 1 if \q1 is nearer to \p q than \p q2, -1 if \p q2 is nearer
- * than \p q1, 0 if they have the same distance.
+ * @return 1 if q1 is nearer to q than q2, -1 if q2 is nearer
+ * than q1, 0 if they have the same distance.
  */
 int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
 
 /**
- * Finds the nearest value in \p q_list to \p q.
+ * Find the nearest value in q_list to q.
  * @param q_list an array of rationals terminated by {0, 0}
  * @return the index of the nearest value found in the array
  */
 int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
 
+/**
+ * @}
+ */
+
 #endif /* AVUTIL_RATIONAL_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/samplefmt.h Added

@@ -0,0 +1,240 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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"
+
+/**
+ * Audio Sample Formats
+ *
+ * @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.
+ *
+ * @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.
+ *
+ * @par
+ * The data layout as used in av_samples_fill_arrays() and elsewhere in Libav
+ * (such as AVFrame in libavcodec) is as follows:
+ *
+ * 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);
+
+/**
+ * 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
+ */
+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
+ * @see av_samples_fill_arrays()
+ */
+int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels,
+                     int nb_samples, enum AVSampleFormat sample_fmt, int align);
+
+/**
+ * Copy samples from src to dst.
+ *
+ * @param dst destination array of pointers to data planes
+ * @param src source array of pointers to data planes
+ * @param dst_offset offset in samples at which the data will be written to dst
+ * @param src_offset offset in samples at which the data will be read from src
+ * @param nb_samples number of samples to be copied
+ * @param nb_channels number of audio channels
+ * @param sample_fmt audio sample format
+ */
+int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset,
+                    int src_offset, int nb_samples, int nb_channels,
+                    enum AVSampleFormat sample_fmt);
+
+/**
+ * Fill an audio buffer with silence.
+ *
+ * @param audio_data  array of pointers to data planes
+ * @param offset      offset in samples at which to start filling
+ * @param nb_samples  number of samples to fill
+ * @param nb_channels number of audio channels
+ * @param sample_fmt  audio sample format
+ */
+int av_samples_set_silence(uint8_t **audio_data, int offset, int nb_samples,
+                           int nb_channels, enum AVSampleFormat sample_fmt);
+
+#endif /* AVUTIL_SAMPLEFMT_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/sha.h Added

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

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/time.h Added

@@ -0,0 +1,41 @@
+/*
+ * 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);
+
+/**
+ * Sleep for a period of time.  Although the duration is expressed in
+ * microseconds, the actual delay may be rounded to the precision of the
+ * system timer.
+ *
+ * @param  usec Number of microseconds to sleep.
+ * @return zero on success or (negative) error code.
+ */
+int av_usleep(unsigned usec);
+
+#endif /* AVUTIL_TIME_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/timecode.h Added

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

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/timestamp.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
+ * timestamp utils, mostly useful for debugging/logging purposes
+ */
+
+#ifndef AVUTIL_TIMESTAMP_H
+#define AVUTIL_TIMESTAMP_H
+
+#include "common.h"
+
+#define AV_TS_MAX_STRING_SIZE 32
+
+/**
+ * Fill the provided buffer with a string containing a timestamp
+ * representation.
+ *
+ * @param buf a buffer with size in bytes of at least AV_TS_MAX_STRING_SIZE
+ * @param ts the timestamp to represent
+ * @return the buffer in input
+ */
+static inline char *av_ts_make_string(char *buf, int64_t ts)
+{
+    if (ts == AV_NOPTS_VALUE) snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS");
+    else                      snprintf(buf, AV_TS_MAX_STRING_SIZE, "%"PRId64"", ts);
+    return buf;
+}
+
+/**
+ * Convenience macro, the return value should be used only directly in
+ * function arguments but never stand-alone.
+ */
+#define av_ts2str(ts) av_ts_make_string((char[AV_TS_MAX_STRING_SIZE]){0}, ts)
+
+/**
+ * Fill the provided buffer with a string containing a timestamp time
+ * representation.
+ *
+ * @param buf a buffer with size in bytes of at least AV_TS_MAX_STRING_SIZE
+ * @param ts the timestamp to represent
+ * @param tb the timebase of the timestamp
+ * @return the buffer in input
+ */
+static inline char *av_ts_make_time_string(char *buf, int64_t ts, AVRational *tb)
+{
+    if (ts == AV_NOPTS_VALUE) snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS");
+    else                      snprintf(buf, AV_TS_MAX_STRING_SIZE, "%.6g", av_q2d(*tb) * ts);
+    return buf;
+}
+
+/**
+ * Convenience macro, the return value should be used only directly in
+ * function arguments but never stand-alone.
+ */
+#define av_ts2timestr(ts, tb) av_ts_make_time_string((char[AV_TS_MAX_STRING_SIZE]){0}, ts, tb)
+
+#endif /* AVUTIL_TIMESTAMP_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/version.h Added

@@ -0,0 +1,138 @@
+/*
+ * 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
+
+/**
+ * @defgroup 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)
+
+/**
+ * @}
+ */
+
+/**
+ * @defgroup version_utils Library Version Macros
+ *
+ * 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 51
+#define LIBAVUTIL_VERSION_MINOR 76
+#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_OLD_EVAL_NAMES
+#define FF_API_OLD_EVAL_NAMES           (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
+#ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
+#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
+#ifndef FF_API_FIND_OPT
+#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
+#ifndef FF_API_AV_FIFO_PEEK
+#define FF_API_AV_FIFO_PEEK             (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
+#ifndef FF_API_OLD_AVOPTIONS
+#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
+#ifndef FF_API_OLD_TC_ADJUST_FRAMENUM
+#define FF_API_OLD_TC_ADJUST_FRAMENUM   (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
+#ifndef FF_API_PIX_FMT
+#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
+#ifndef FF_API_CONTEXT_SIZE
+#define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
+#ifndef FF_API_PIX_FMT_DESC
+#define FF_API_PIX_FMT_DESC             (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
+#ifndef FF_API_AV_REVERSE
+#define FF_API_AV_REVERSE               (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_VERSION_H */
+

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libavutil/xtea.h Added

@@ -0,0 +1,62 @@
+/*
+ * 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>
+
+/**
+ * @defgroup lavu_xtea XTEA
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+typedef struct AVXTEA {
+    uint32_t key[16];
+} AVXTEA;
+
+/**
+ * Initialize an AVXTEA context.
+ *
+ * @param ctx an AVXTEA context
+ * @param key a key of 16 bytes used for encryption/decryption
+ */
+void av_xtea_init(struct AVXTEA *ctx, const uint8_t key[16]);
+
+/**
+ * Encrypt or decrypt a buffer using a previously initialized context.
+ *
+ * @param ctx an AVXTEA context
+ * @param dst destination array, can be equal to src
+ * @param src source array, can be equal to dst
+ * @param count number of 8 byte blocks
+ * @param iv initialization vector for CBC mode, if NULL then ECB will be used
+ * @param decrypt 0 for encryption, 1 for decryption
+ */
+void av_xtea_crypt(struct AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
+                   int count, uint8_t *iv, int decrypt);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_XTEA_H */

gpac-0.5.0.svn4192.tar.bz2/extra_lib/include/libswscale/swscale.h -> gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libswscale/swscale.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2003 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (C) 2001-2011 Michael Niedermayer <michaelni@gmx.at>
  *
  * This file is part of FFmpeg.
  *
@@ -22,31 +22,32 @@
 #define SWSCALE_SWSCALE_H
 
 /**
- * @file libswscale/swscale.h
+ * @file
  * @brief
  *     external api for the swscale stuff
  */
 
-#include "libavutil/avutil.h"
+#include <stdint.h>
 
-#define LIBSWSCALE_VERSION_MAJOR 0
-#define LIBSWSCALE_VERSION_MINOR 7
-#define LIBSWSCALE_VERSION_MICRO 1
+#include "libavutil/avutil.h"
+#include "libavutil/log.h"
+#include "libavutil/pixfmt.h"
+#include "version.h"
 
-#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
+/**
+ * Return the LIBSWSCALE_VERSION_INT constant.
+ */
+unsigned swscale_version(void);
 
-#define LIBSWSCALE_IDENT        "SwS" AV_STRINGIFY(LIBSWSCALE_VERSION)
+/**
+ * Return the libswscale build-time configuration.
+ */
+const char *swscale_configuration(void);
 
 /**
- * Returns the LIBSWSCALE_VERSION_INT constant.
+ * Return the libswscale license.
  */
-unsigned swscale_version(void);
+const char *swscale_license(void);
 
 /* values for the flags, the stuff on the command line is different */
 #define SWS_FAST_BILINEAR     1
@@ -77,11 +78,21 @@
 #define SWS_ACCURATE_RND      0x40000
 #define SWS_BITEXACT          0x80000
 
+#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
+#if LIBSWSCALE_VERSION_MAJOR < 3
 #define SWS_CPU_CAPS_MMX2     0x20000000
+#endif
 #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
 
@@ -93,17 +104,24 @@
 #define SWS_CS_SMPTE240M      7
 #define SWS_CS_DEFAULT        5
 
-
+/**
+ * Return a pointer to yuv<->rgb coefficients for the given colorspace
+ * suitable for sws_setColorspaceDetails().
+ *
+ * @param colorspace One of the SWS_CS_* macros. If invalid,
+ * SWS_CS_DEFAULT is used.
+ */
+const int *sws_getCoefficients(int colorspace);
 
 // when used for filters they must have an odd number of elements
 // coeffs cannot be shared between vectors
-typedef struct {
+typedef struct SwsVector {
     double *coeff;              ///< pointer to the list of coefficients
     int length;                 ///< number of coefficients in the vector
 } SwsVector;
 
 // vectors can be shared
-typedef struct {
+typedef struct SwsFilter {
     SwsVector *lumH;
     SwsVector *lumV;
     SwsVector *chrH;
@@ -112,10 +130,42 @@
 
 struct SwsContext;
 
+/**
+ * Return a positive value if pix_fmt is a supported input format, 0
+ * otherwise.
+ */
+int sws_isSupportedInput(enum AVPixelFormat pix_fmt);
+
+/**
+ * Return a positive value if pix_fmt is a supported output format, 0
+ * otherwise.
+ */
+int sws_isSupportedOutput(enum AVPixelFormat pix_fmt);
+
+/**
+ * Allocate an empty SwsContext. This must be filled and passed to
+ * sws_init_context(). For filling see AVOptions, options.c and
+ * sws_setColorspaceDetails().
+ */
+struct SwsContext *sws_alloc_context(void);
+
+/**
+ * Initialize the swscaler context sws_context.
+ *
+ * @return zero or positive value on success, a negative value on
+ * error
+ */
+int sws_init_context(struct SwsContext *sws_context, SwsFilter *srcFilter, SwsFilter *dstFilter);
+
+/**
+ * Free the swscaler context swsContext.
+ * If swsContext is NULL, then does nothing.
+ */
 void sws_freeContext(struct SwsContext *swsContext);
 
+#if FF_API_SWS_GETCONTEXT
 /**
- * Allocates and returns a SwsContext. You need it to perform
+ * Allocate and return an SwsContext. You need it to perform
  * scaling/conversion operations using sws_scale().
  *
  * @param srcW the width of the source image
@@ -126,18 +176,26 @@
  * @param dstFormat the destination image format
  * @param flags specify which algorithm and options to use for rescaling
  * @return a pointer to an allocated context, or NULL in case of error
+ * @note this function is to be removed after a saner alternative is
+ *       written
+ * @deprecated Use sws_getCachedContext() instead.
  */
-struct SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat,
-                                  int dstW, int dstH, enum PixelFormat dstFormat,
+struct SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
+                                  int dstW, int dstH, enum AVPixelFormat dstFormat,
                                   int flags, SwsFilter *srcFilter,
                                   SwsFilter *dstFilter, const double *param);
+#endif
 
 /**
- * Scales the image slice in \p srcSlice and puts the resulting scaled
- * slice in the image in \p dst. A slice is a sequence of consecutive
+ * Scale the image slice in srcSlice and put the resulting scaled
+ * slice in the image in dst. A slice is a sequence of consecutive
  * rows in an image.
  *
- * @param context   the scaling context previously created with
+ * Slices have to be provided in sequential order, either in
+ * top-bottom or bottom-top order. If slices are provided in
+ * non-sequential order the behavior of the function is undefined.
+ *
+ * @param c         the scaling context previously created with
  *                  sws_getContext()
  * @param srcSlice  the array containing the pointers to the planes of
  *                  the source slice
@@ -154,20 +212,18 @@
  *                  the destination image
  * @return          the height of the output slice
  */
-int sws_scale(struct SwsContext *context, uint8_t* srcSlice[], int srcStride[],
-              int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]);
-#if LIBSWSCALE_VERSION_MAJOR < 1
-/**
- * @deprecated Use sws_scale() instead.
- */
-int sws_scale_ordered(struct SwsContext *context, uint8_t* src[],
-                      int srcStride[], int srcSliceY, int srcSliceH,
-                      uint8_t* dst[], int dstStride[]) attribute_deprecated;
-#endif
+int sws_scale(struct SwsContext *c, const uint8_t *const srcSlice[],
+              const int srcStride[], int srcSliceY, int srcSliceH,
+              uint8_t *const dst[], const int dstStride[]);
 
 /**
- * @param inv_table the yuv2rgb coefficients, normally ff_yuv2rgb_coeffs[x]
- * @param fullRange if 1 then the luma range is 0..255 if 0 it is 16..235
+ * @param dstRange flag indicating the while-black range of the output (1=jpeg / 0=mpeg)
+ * @param srcRange flag indicating the while-black range of the input (1=jpeg / 0=mpeg)
+ * @param table the yuv2rgb coefficients describing the output yuv space, normally ff_yuv2rgb_coeffs[x]
+ * @param inv_table the yuv2rgb coefficients describing the input yuv space, normally ff_yuv2rgb_coeffs[x]
+ * @param brightness 16.16 fixed point brightness correction
+ * @param contrast 16.16 fixed point contrast correction
+ * @param saturation 16.16 fixed point saturation correction
  * @return -1 if not supported
  */
 int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4],
@@ -182,31 +238,35 @@
                              int *brightness, int *contrast, int *saturation);
 
 /**
- * Returns a normalized Gaussian curve used to filter stuff
- * quality=3 is high quality, lower is lower quality.
+ * Allocate and return an uninitialized vector with length coefficients.
+ */
+SwsVector *sws_allocVec(int length);
+
+/**
+ * Return a normalized Gaussian curve used to filter stuff
+ * quality = 3 is high quality, lower is lower quality.
  */
 SwsVector *sws_getGaussianVec(double variance, double quality);
 
 /**
- * Allocates and returns a vector with \p length coefficients, all
- * with the same value \p c.
+ * Allocate and return a vector with length coefficients, all
+ * with the same value c.
  */
 SwsVector *sws_getConstVec(double c, int length);
 
 /**
- * Allocates and returns a vector with just one coefficient, with
+ * Allocate and return a vector with just one coefficient, with
  * value 1.0.
  */
 SwsVector *sws_getIdentityVec(void);
 
 /**
- * Scales all the coefficients of \p a by the \p scalar value.
+ * Scale all the coefficients of a by the scalar value.
  */
 void sws_scaleVec(SwsVector *a, double scalar);
 
 /**
- * Scales all the coefficients of \p a so that their sum equals \p
- * height."
+ * Scale all the coefficients of a so that their sum equals height.
  */
 void sws_normalizeVec(SwsVector *a, double height);
 void sws_convVec(SwsVector *a, SwsVector *b);
@@ -215,21 +275,14 @@
 void sws_shiftVec(SwsVector *a, int shift);
 
 /**
- * Allocates and returns a clone of the vector \p a, that is a vector
- * with the same coefficients as \p a.
+ * Allocate and return a clone of the vector a, that is a vector
+ * with the same coefficients as a.
  */
 SwsVector *sws_cloneVec(SwsVector *a);
 
-#if LIBSWSCALE_VERSION_MAJOR < 1
-/**
- * @deprecated Use sws_printVec2() instead.
- */
-attribute_deprecated void sws_printVec(SwsVector *a);
-#endif
-
 /**
- * Prints with av_log() a textual representation of the vector \p a
- * if \p log_level <= av_log_level.
+ * 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);
 
@@ -242,22 +295,53 @@
 void sws_freeFilter(SwsFilter *filter);
 
 /**
- * Checks if \p context can be reused, otherwise reallocates a new
- * one.
+ * Check if context can be reused, otherwise reallocate a new one.
  *
- * If \p context is NULL, just calls sws_getContext() to get a new
+ * If context is NULL, just calls sws_getContext() to get a new
  * context. Otherwise, checks if the parameters are the ones already
- * saved in \p context. If that is the case, returns the current
- * context. Otherwise, frees \p context and gets a new context with
+ * saved in context. If that is the case, returns the current
+ * context. Otherwise, frees context and gets a new context with
  * the new parameters.
  *
- * Be warned that \p srcFilter and \p dstFilter are not checked, they
+ * Be warned that srcFilter and dstFilter are not checked, they
  * are assumed to remain the same.
  */
 struct SwsContext *sws_getCachedContext(struct SwsContext *context,
-                                        int srcW, int srcH, enum PixelFormat srcFormat,
-                                        int dstW, int dstH, enum PixelFormat dstFormat,
+                                        int srcW, int srcH, enum AVPixelFormat srcFormat,
+                                        int dstW, int dstH, enum AVPixelFormat dstFormat,
                                         int flags, SwsFilter *srcFilter,
                                         SwsFilter *dstFilter, const double *param);
 
+/**
+ * Convert an 8-bit paletted frame into a frame with a color depth of 32 bits.
+ *
+ * The output frame will have the same packed format as the palette.
+ *
+ * @param src        source frame buffer
+ * @param dst        destination frame buffer
+ * @param num_pixels number of pixels to convert
+ * @param palette    array with [256] entries, which must match color arrangement (RGB or BGR) of src
+ */
+void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette);
+
+/**
+ * Convert an 8-bit paletted frame into a frame with a color depth of 24 bits.
+ *
+ * With the palette format "ABCD", the destination frame ends up with the format "ABC".
+ *
+ * @param src        source frame buffer
+ * @param dst        destination frame buffer
+ * @param num_pixels number of pixels to convert
+ * @param palette    array with [256] entries, which must match color arrangement (RGB or BGR) of src
+ */
+void sws_convertPalette8ToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette);
+
+/**
+ * Get the AVClass for swsContext. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
+ *
+ * @see av_opt_find().
+ */
+const AVClass *sws_get_class(void);
+
 #endif /* SWSCALE_SWSCALE_H */

gpac-0.5.0.svn4296.tar.bz2/extra_lib/include/libswscale/version.h Added

@@ -0,0 +1,59 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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/avutil.h"
+
+#define LIBSWSCALE_VERSION_MAJOR 2
+#define LIBSWSCALE_VERSION_MINOR 1
+#define LIBSWSCALE_VERSION_MICRO 101
+
+#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_GETCONTEXT
+#define FF_API_SWS_GETCONTEXT  (LIBSWSCALE_VERSION_MAJOR < 3)
+#endif
+#ifndef FF_API_SWS_CPU_CAPS
+#define FF_API_SWS_CPU_CAPS    (LIBSWSCALE_VERSION_MAJOR < 3)
+#endif
+#ifndef FF_API_SWS_FORMAT_NAME
+#define FF_API_SWS_FORMAT_NAME  (LIBSWSCALE_VERSION_MAJOR < 3)
+#endif
+
+#endif /* SWSCALE_VERSION_H */

gpac-0.5.0.svn4192.tar.bz2/include/gpac/avparse.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/avparse.h Changed

gpac-0.5.0.svn4192.tar.bz2/include/gpac/bitstream.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/bitstream.h Changed

gpac-0.5.0.svn4192.tar.bz2/include/gpac/config_file.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/config_file.h Changed

gpac-0.5.0.svn4192.tar.bz2/include/gpac/configuration.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/configuration.h Changed

gpac-0.5.0.svn4192.tar.bz2/include/gpac/constants.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/constants.h Changed

@@ -268,6 +268,10 @@
 	GPAC_OTI_VIDEO_AVC = 0x21,
 	/*!OTI for AVC Parameter sets streams*/
 	GPAC_OTI_VIDEO_AVC_PS = 0x22,
+	/*!OTI for HEVC video */
+	GPAC_OTI_VIDEO_HEVC = 0x23,
+	/*!OTI for H264-SVC streams*/
+	GPAC_OTI_VIDEO_SVC = 0x24,
 	/*!OTI for MPEG-4 AAC streams*/
     GPAC_OTI_AUDIO_AAC_MPEG4 = 0x40,
 
@@ -544,7 +548,8 @@
 #define GF_AVC_NALU_SVC_SUBSEQ_PARAM	15
 #define GF_AVC_NALU_SLICE_AUX			19
 
-#define GF_AVC_NALU_SVC_SLICE 0x14
+#define GF_AVC_NALU_SVC_SLICE 20	//0x14
+
 
 /*#define GF_SVC_NALU_SLICE 0x14
 #define GF_SVC_NALU_NAL_EXT_PARAM 14
@@ -562,6 +567,40 @@
 #define GF_AVC_TYPE2_SI 9
 
 
+
+/*HEVC NAL unit types*/
+enum {
+	GF_HEVC_NALU_SLICE_TRAIL_N = 0,
+	GF_HEVC_NALU_SLICE_TRAIL_R = 1,
+	GF_HEVC_NALU_SLICE_TSA_N = 2,
+	GF_HEVC_NALU_SLICE_TSA_R = 3,
+	GF_HEVC_NALU_SLICE_STSA_N = 4,
+	GF_HEVC_NALU_SLICE_STSA_R = 5,
+	GF_HEVC_NALU_SLICE_RADL_N = 6,
+	GF_HEVC_NALU_SLICE_RADL_R = 7,
+	GF_HEVC_NALU_SLICE_RASL_N = 8,
+	GF_HEVC_NALU_SLICE_RASL_R = 9,
+
+	GF_HEVC_NALU_SLICE_BLA_W_LP = 16,
+	GF_HEVC_NALU_SLICE_BLA_W_DLP = 17,
+	GF_HEVC_NALU_SLICE_BLA_N_LP = 18,
+
+	GF_HEVC_NALU_SLICE_IDR_W_DLP = 19,
+	GF_HEVC_NALU_SLICE_IDR_N_LP = 20,
+	GF_HEVC_NALU_SLICE_CRA = 21,
+
+	GF_HEVC_NALU_VID_PARAM = 32,
+	GF_HEVC_NALU_SEQ_PARAM = 33,
+	GF_HEVC_NALU_PIC_PARAM = 34,
+	GF_HEVC_NALU_ACCESS_UNIT = 35,
+	GF_HEVC_NALU_END_OF_SEQ = 36,
+	GF_HEVC_NALU_END_OF_STREAM = 37,
+	GF_HEVC_NALU_FILLER_DATA = 38,
+	GF_HEVC_NALU_SEI_PREFIX = 39,
+	GF_HEVC_NALU_SEI_SUFFIX = 40,
+};
+
+
 /*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};
 static const unsigned int GF_QCELP_RATE_TO_SIZE_NB = 7;

gpac-0.5.0.svn4192.tar.bz2/include/gpac/dash.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/dash.h Changed

@@ -57,6 +57,9 @@
 	GF_DASH_EVENT_CREATE_PLAYBACK,
 	/*event sent when reseting groups at period switch or at exit - user should unload playback chain(s) at this point*/
 	GF_DASH_EVENT_DESTROY_PLAYBACK,
+
+	GF_DASH_EVENT_BUFFERING,
+	GF_DASH_EVENT_BUFFER_DONE,
 } GF_DASHEventType;
 
 /*structure used for all IO operations for DASH*/
@@ -83,7 +86,7 @@
 	/*resetup the file session with a new resource to get - this allows persistent connection usage with HTTP servers*/
 	GF_Err (*setup_from_url)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *url);
 	/*set download range for the file session*/
-	GF_Err (*set_range)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, u64 start_range, u64 end_range);
+	GF_Err (*set_range)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, u64 start_range, u64 end_range, Bool discontinue_cache);
 	/*initialize the file session - all the headers shall be fetched before returning*/
 	GF_Err (*init)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
 	/*download the content - synchronous call: all the file shall be fetched before returning*/
@@ -125,7 +128,8 @@
 						   u32 auto_switch_count, 
 						   Bool keep_files, 
 						   Bool disable_switching, 
-						   GF_DASHInitialSelectionMode first_select_mode);
+						   GF_DASHInitialSelectionMode first_select_mode,
+						   Bool enable_buffering);
 
 /*delete the DASH client*/
 void gf_dash_del(GF_DashClient *dash);
@@ -142,7 +146,7 @@
 void gf_dash_get_info(GF_DashClient *dash, const char **title, const char **source);
 
 /*switches quality up or down*/
-void gf_dash_switch_quality(GF_DashClient *dash, Bool switch_up);
+void gf_dash_switch_quality(GF_DashClient *dash, Bool switch_up, Bool force_immediate_switch);
 
 /*indicates whether the DASH client is running or not. For the moment, the DASH client is always run by an internal thread*/
 Bool gf_dash_is_running(GF_DashClient *dash);
@@ -174,11 +178,13 @@
 const char *gf_dash_group_get_segment_init_url(GF_DashClient *dash, u32 idx, u64 *start_range, u64 *end_range);
 
 /*returns the URL and byte range of the next media resource to play in this group. 
-If switching occured and no bitstream switching is possible, also set the url and byte range of the media file required to intialize the playback
+If switching occured, sets switching_index to the new representation index.
+If no bitstream switching is possible, also set the url and byte range of the media file required to intialize 
+the playback of the next segment
 original_url is optional and may be used to het the URI of the segment
 */
 GF_Err gf_dash_group_get_next_segment_location(GF_DashClient *dash, u32 idx, const char **url, u64 *start_range, u64 *end_range, 
-											const char **switching_url, u64 *switching_start_range, u64 *switching_end_range, 
+											s32 *switching_index, const char **switching_url, u64 *switching_start_range, u64 *switching_end_range, 
 											const char **original_url);
 /*discards the first media resource in the queue of this group*/
 void gf_dash_group_discard_segment(GF_DashClient *dash, u32 idx);
@@ -209,10 +215,20 @@
 Double gf_dash_get_playback_start_range(GF_DashClient *dash);
 /*when seeking, this flag is set when the seek is outside of the previously playing segment.*/
 Bool gf_dash_group_segment_switch_forced(GF_DashClient *dash, u32 idx);
+/*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);
 
 /*returns the start_time of the first segment in the queue (usually the one being played)*/
 Double gf_dash_group_current_segment_start_time(GF_DashClient *dash, u32 idx);
 
+/*allow reloading of MPD on the local file system - usefull for testing live generators*/
+void gf_dash_allow_local_mpd_update(GF_DashClient *dash, Bool allow_local_mpd_update);
+
+/*gets media info for representation*/
+GF_Err gf_dash_group_get_representation_info(GF_DashClient *dash, u32 idx, u32 representation_idx, u32 *width, u32 *height, u32 *audio_samplerate, u32 *bandwidth, const char **codecs);
+
+void gf_dash_get_buffer_info_buffering(GF_DashClient *dash, u32 *total_buffer, u32 *media_buffered);
+
 #endif //GPAC_DISABLE_DASH_CLIENT

gpac-0.5.0.svn4192.tar.bz2/include/gpac/download.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/download.h Changed

@@ -170,6 +170,9 @@
         GF_NETIO_SESSION_NOT_CACHED	=	1<<1,
 		/*indicates that the connection to the server should be kept once the download is successfully completed*/
         GF_NETIO_SESSION_PERSISTENT =	1<<2,
+		/*file is stored in memory, and the cache name is set to gpac://%u@%p, where %d is the size in bytes and %d is the the pointer to the memory.
+		Memory cached files are destroyed upon downloader destruction*/
+        GF_NETIO_SESSION_MEMORY_CACHE	=	1<<3,
     };
 
 
@@ -318,9 +321,10 @@
      *\param sess the download session
      *\param start_range HTTP download start range in byte 
      *\param end_range HTTP download end range in byte 
+     *\param discontinue If set, forces a new cache entry if byte range are not continuous. Otherwise a single cache entry is used to reconstruct the file
      *\note this can only be used when the session is not threaded
      */
-	GF_Err gf_dm_sess_set_range(GF_DownloadSession *sess, u64 start_range, u64 end_range);
+	GF_Err gf_dm_sess_set_range(GF_DownloadSession *sess, u64 start_range, u64 end_range, Bool discontinue_cache);
     /*!
      *\brief get cache file name
      *
@@ -414,7 +418,7 @@
      * \return GF_OK if everything went fine, an error otherwise
      */
     GF_Err gf_dm_wget_with_cache(GF_DownloadManager * dm,
-                                const char *url, const char *filename);
+                                const char *url, const char *filename, u64 start_range, u64 end_range);
 
     /*!
      * \brief Same as gf_dm_wget_with_cache, but initializes the GF_DownloadManager by itself.
@@ -423,7 +427,7 @@
      * \param filename The filename to download
      * \return GF_OK if everything went fine, an error otherwise
      */
-    GF_Err gf_dm_wget(const char *url, const char *filename);
+    GF_Err gf_dm_wget(const char *url, const char *filename, u64 start_range, u64 end_range);
 
     /*!
      *\brief Reset session

gpac-0.5.0.svn4192.tar.bz2/include/gpac/ietf.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/ietf.h Changed

gpac-0.5.0.svn4192.tar.bz2/include/gpac/internal/compositor_dev.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/internal/compositor_dev.h Changed

gpac-0.5.0.svn4192.tar.bz2/include/gpac/internal/isomedia_dev.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/internal/isomedia_dev.h Changed

@@ -198,8 +198,13 @@
 	GF_ISOM_BOX_TYPE_PASP	= GF_4CC( 'p', 'a', 's', 'p' ),
 	GF_ISOM_BOX_TYPE_AVC1	= GF_4CC( 'a', 'v', 'c', '1' ),
 	GF_ISOM_BOX_TYPE_AVC2	= GF_4CC( 'a', 'v', 'c', '2' ),
+	GF_ISOM_BOX_TYPE_AVC3	= GF_4CC( 'a', 'v', 'c', '3' ),
+	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_HVCC	= GF_4CC( 'h', 'v', 'c', 'C' ),
+	GF_ISOM_BOX_TYPE_HVC1	= GF_4CC( 'h', 'v', 'c', '1' ),
+	GF_ISOM_BOX_TYPE_HEV1	= GF_4CC( 'h', 'e', 'v', '1' ),
 
 	/*LASeR extension*/
 	GF_ISOM_BOX_TYPE_LSRC	= GF_4CC( 'l', 's', 'r', 'C' ),
@@ -288,6 +293,14 @@
 	/*internal type for track references*/
 	GF_ISOM_BOX_TYPE_REFT	= GF_4CC( 'R', 'E', 'F', 'T' ),
 
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+	/* Adobe extensions */
+	GF_ISOM_BOX_TYPE_ABST	= GF_4CC( 'a', 'b', 's', 't' ),
+	GF_ISOM_BOX_TYPE_AFRA	= GF_4CC( 'a', 'f', 'r', 'a' ),
+	GF_ISOM_BOX_TYPE_ASRT	= GF_4CC( 'a', 's', 'r', 't' ),
+	GF_ISOM_BOX_TYPE_AFRT	= GF_4CC( 'a', 'f', 'r', 't' ),
+#endif
+
 	/* Apple extensions */
 
 	GF_ISOM_BOX_TYPE_ILST	= GF_4CC( 'i', 'l', 's', 't' ),
@@ -441,8 +454,6 @@
 {
 	GF_ISOM_BOX
 	GF_EditListBox *editList;
-
-	Bool last_is_empty;
 } GF_EditBox;
 
 
@@ -520,6 +531,13 @@
 	char *name;
 	/*private for editing*/
 	Bool is_unpacked;
+	/*private for checking dependency*/
+	u32 originalFile;
+	u32 originalID;
+
+	/*private for SVC/MVC extractors resolution*/
+	s32 extractor_mode;
+	Bool has_base_layer;
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	u64 dts_at_seg_start;
@@ -780,6 +798,7 @@
 	GF_SLConfig *slc;
 } GF_LASeRSampleEntryBox;
 
+/*rewrites avcC based on the given esd - this destroys the esd*/
 GF_Err LSR_UpdateESD(GF_LASeRSampleEntryBox *lsr, GF_ESD *esd);
 
 typedef struct
@@ -835,6 +854,12 @@
 
 typedef struct
 {
+	GF_ISOM_BOX
+	GF_HEVCConfig *config;
+} GF_HEVCConfigurationBox;
+
+typedef struct
+{
 	GF_ISOM_VISUAL_SAMPLE_ENTRY
 	GF_ESDBox *esd;
 	/*used for Publishing*/
@@ -843,6 +868,9 @@
 	/*avc extensions - we merged with regular 'mp4v' box to handle isma E&A signaling of AVC*/
 	GF_AVCConfigurationBox *avc_config;
 	GF_AVCConfigurationBox *svc_config;
+	/*hevc extension*/
+	GF_HEVCConfigurationBox *hevc_config;
+
 	GF_MPEG4BitRateBox *bitrate;
 	/*ext descriptors*/
 	GF_MPEG4ExtensionDescriptorsBox *descr;
@@ -853,6 +881,8 @@
 
 } GF_MPEGVisualSampleEntryBox;
 
+Bool gf_isom_is_nalu_based_entry(GF_MediaBox *mdia, GF_SampleEntryBox *_entry);
+GF_Err gf_isom_nalu_sample_rewrite(GF_MediaBox *mdia, GF_ISOSample *sample, u32 sampleNumber, GF_MPEGVisualSampleEntryBox *entry);
 
 /*this is the default visual sdst (to handle unknown media)*/
 typedef struct
@@ -876,7 +906,8 @@
 	u16 compression_id;				\
 	u16 packet_size;				\
 	u16 samplerate_hi;				\
-	u16 samplerate_lo;
+	u16 samplerate_lo;				\
+	u8 extensions[36];				\
 
 
 typedef struct 
@@ -1554,7 +1585,8 @@
 	GF_ISOM_TRAF_SAMPLE_DUR	=	0x08,
 	GF_ISOM_TRAF_SAMPLE_SIZE	=	0x10,
 	GF_ISOM_TRAF_SAMPLE_FLAGS	=	0x20,
-	GF_ISOM_TRAF_DUR_EMPTY	=	0x10000
+	GF_ISOM_TRAF_DUR_EMPTY	=	0x10000,
+	GF_ISOM_MOOF_BASE_OFFSET	=	0x20000,
 };
 
 typedef struct
@@ -1948,6 +1980,96 @@
 	u64 *pcr_values;
 } GF_PcrInfoBox;
 
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+
+/*Adobe specific boxes*/
+typedef struct
+{
+	u64 time;
+	u64 offset;
+} GF_AfraEntry;
+
+typedef struct
+{
+	u64 time;
+	u32 segment;
+	u32 fragment;
+	u64 afra_offset;
+	u64 offset_from_afra;
+} GF_GlobalAfraEntry;
+
+typedef struct __adobe_frag_random_access_box
+{
+	GF_ISOM_FULL_BOX
+	Bool long_ids;
+	Bool long_offsets;
+	Bool global_entries;
+	u8 reserved;
+	u32 time_scale;
+	u32 entry_count;
+	GF_List *local_access_entries;
+	u32 global_entry_count;
+	GF_List *global_access_entries;
+} GF_AdobeFragRandomAccessBox;
+
+typedef struct __adobe_bootstrap_info_box
+{
+	GF_ISOM_FULL_BOX
+	u32 bootstrapinfo_version;
+	u8 profile;
+	Bool live;
+	Bool update;
+	u8 reserved;
+	u32 time_scale;
+	u64 current_media_time;
+	u64 smpte_time_code_offset;
+	char *movie_identifier;
+	u8 server_entry_count;
+	GF_List *server_entry_table;
+	u8 quality_entry_count;
+	GF_List *quality_entry_table;
+	char *drm_data;
+	char *meta_data;
+	u8 segment_run_table_count;
+	GF_List *segment_run_table_entries;
+	u8 fragment_run_table_count;
+	GF_List *fragment_run_table_entries;
+} GF_AdobeBootstrapInfoBox;
+
+typedef struct
+{
+	u32 first_segment;
+	u32 fragment_per_segment;
+} GF_AdobeSegmentRunEntry;
+
+typedef struct __adobe_segment_run_table_box
+{
+	GF_ISOM_FULL_BOX
+	u8 quality_entry_count;
+	GF_List *quality_segment_url_modifiers;
+	u32 segment_run_entry_count;
+	GF_List *segment_run_entry_table;
+} GF_AdobeSegmentRunTableBox;
+
+typedef struct
+{
+	u32 first_fragment;
+	u64 first_fragment_timestamp;
+	u32 fragment_duration;
+	u8 discontinuity_indicator;
+} GF_AdobeFragmentRunEntry;
+
+typedef struct __adobe_fragment_run_table_box
+{
+	GF_ISOM_FULL_BOX
+	u32 timescale;
+	u8 quality_entry_count;
+	GF_List *quality_segment_url_modifiers;
+	u32 fragment_run_entry_count;
+	GF_List *fragment_run_entry_table;
+} GF_AdobeFragmentRunTableBox;
+
+#endif /*GPAC_DISABLE_ISOM_ADOBE*/
 
 
 /***********************************************************
@@ -2227,6 +2349,11 @@
 #define GF_ISOM_GET_FRAG_SYNC(flag) ( ! ( ( (flag) >> 16) & 0x1))
 #define GF_ISOM_GET_FRAG_DEG(flag)	(flag) & 0x7FFF
 
+#define GF_ISOM_GET_FRAG_LEAD(flag) ( (flag) >> 26) & 0x3
+#define GF_ISOM_GET_FRAG_DEPENDS(flag) ( (flag) >> 24) & 0x3
+#define GF_ISOM_GET_FRAG_DEPENDED(flag) ( (flag) >> 22) & 0x3
+#define GF_ISOM_GET_FRAG_REDUNDANT(flag) ( (flag) >> 20) & 0x3
+
 #define GF_ISOM_GET_FRAG_DEPEND_FLAGS(lead, depends, depended, redundant) ( (lead<<26) | (depends<<24) | (depended<<22) | (redundant<<20) )
 #define GF_ISOM_RESET_FRAG_DEPEND_FLAGS(flags) flags = flags & 0xFFFFF
 
@@ -2317,6 +2444,7 @@
 GF_TrackBox *gf_isom_get_track_from_file(GF_ISOFile *the_file, u32 trackNumber);
 GF_TrackBox *gf_isom_get_track(GF_MovieBox *moov, u32 trackNumber);
 GF_TrackBox *gf_isom_get_track_from_id(GF_MovieBox *moov, u32 trackID);
+GF_TrackBox *gf_isom_get_track_from_original_id(GF_MovieBox *moov, u32 originalID, u32 originalFile);
 u32 gf_isom_get_tracknum_from_id(GF_MovieBox *moov, u32 trackID);
 /*open a movie*/
 GF_ISOFile *gf_isom_open_file(const char *fileName, u32 OpenMode, const char *tmp_dir);
@@ -2345,6 +2473,9 @@
 GF_Err Media_FindDataRef(GF_DataReferenceBox *dref, char *URLname, char *URNname, u32 *dataRefIndex);
 Bool Media_IsSelfContained(GF_MediaBox *mdia, u32 StreamDescIndex);
 
+
+GF_TrackBox *GetTrackbyID(GF_MovieBox *moov, u32 TrackID);
+
 /*check the TimeToSample for the given time and return the Sample number
 if the entry is not found, return the closest sampleNumber in prevSampleNumber and 0 in sampleNumber
 if the DTS required is after all DTSs in the list, set prevSampleNumber and SampleNumber to 0
@@ -2476,8 +2607,11 @@
 GF_Err mdia_AddBox(GF_Box *s, GF_Box *a);
 GF_Err stbl_AddBox(GF_SampleTableBox *ptr, GF_Box *a);
 
-GF_Err AVC_UpdateESD(GF_MPEGVisualSampleEntryBox *avc, GF_ESD *esd);
+/*rewrites avcC based on the given esd - this destroys the esd*/
+GF_Err AVC_HEVC_UpdateESD(GF_MPEGVisualSampleEntryBox *avc, GF_ESD *esd);
 void AVC_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *avc);
+void HEVC_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *avc);
+
 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);
@@ -2665,6 +2799,15 @@
 GF_GenericSubtitleSample *gf_isom_parse_generic_subtitle_sample_from_data(char *data, u32 dataLength);
 
 
+/*do not throw fatal errors if boxes are duplicated, just warn and remove extra ones*/
+#define ERROR_ON_DUPLICATED_BOX(__abox, __parent) {	\
+		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);\
+		return GF_OK;\
+	}
+
 /*
 	these are exported just in case, there should never be needed outside the lib
 */
@@ -3151,7 +3294,11 @@
 
 GF_Box *avc1_New();
 GF_Box *avc2_New();
+GF_Box *avc3_New();
+GF_Box *avc4_New();
 GF_Box *svc1_New();
+GF_Box *hvc1_New();
+GF_Box *hev1_New();
 
 GF_Box *m4ds_New();
 void m4ds_del(GF_Box *s);
@@ -3323,6 +3470,32 @@
 GF_Err iSFM_Size(GF_Box *s);
 #endif
 
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+/* Adobe extensions */
+void abst_del(GF_Box *s);
+GF_Err abst_Read(GF_Box *s, GF_BitStream *bs);
+GF_Box *abst_New();
+void afra_del(GF_Box *s);
+GF_Err afra_Read(GF_Box *s, GF_BitStream *bs);
+GF_Box *afra_New();
+void asrt_del(GF_Box *s);
+GF_Err asrt_Read(GF_Box *s, GF_BitStream *bs);
+GF_Box *asrt_New();
+void afrt_del(GF_Box *s);
+GF_Err afrt_Read(GF_Box *s, GF_BitStream *bs);
+GF_Box *afrt_New();
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err abst_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err abst_Size(GF_Box *s);
+GF_Err afra_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err afra_Size(GF_Box *s);
+GF_Err asrt_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err asrt_Size(GF_Box *s);
+GF_Err afrt_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err afrt_Size(GF_Box *s);
+#endif
+#endif /*GPAC_DISABLE_ISOM_ADOBE*/
+
 /* Apple extensions */
 void ilst_del(GF_Box *s);
 void ListItem_del(GF_Box *s);
@@ -3476,6 +3649,14 @@
 GF_Err schm_dump(GF_Box *a, FILE * trace);
 GF_Err schi_dump(GF_Box *a, FILE * trace);
 
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+/*Adobe extensions*/
+GF_Err abst_dump(GF_Box *a, FILE * trace);
+GF_Err afra_dump(GF_Box *a, FILE * trace);
+GF_Err asrt_dump(GF_Box *a, FILE * trace);
+GF_Err afrt_dump(GF_Box *a, FILE * trace);
+#endif
+
 /*Apple extensions*/
 GF_Err ilst_dump(GF_Box *a, FILE * trace);
 GF_Err ListItem_dump(GF_Box *a, FILE * trace);
@@ -3713,6 +3894,13 @@
 GF_Err cslg_Read(GF_Box *s, GF_BitStream *bs);
 GF_Err cslg_dump(GF_Box *a, FILE * trace);
 
+GF_Box *hvcc_New();
+void hvcc_del(GF_Box *);
+GF_Err hvcc_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err hvcc_Size(GF_Box *s);
+GF_Err hvcc_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err hvcc_dump(GF_Box *a, FILE * trace);
+
 #endif /*GPAC_DISABLE_ISOM*/
 
 #ifdef __cplusplus

gpac-0.5.0.svn4192.tar.bz2/include/gpac/internal/m3u8.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/internal/m3u8.h Changed

gpac-0.5.0.svn4192.tar.bz2/include/gpac/internal/media_dev.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/internal/media_dev.h Changed

@@ -49,9 +49,15 @@
 
 /*returns 0 if not a start code, or size of start code (3 or 4 bytes). If start code, bitstream
 is positionned AFTER start code*/
-u32 AVC_IsStartCode(GF_BitStream *bs);
+u32 gf_media_nalu_is_start_code(GF_BitStream *bs);
+
 /*returns size of chunk between current and next startcode (excluding startcode sizes), 0 if no more startcodes (eos)*/
-u32 AVC_NextStartCode(GF_BitStream *bs);
+u32 gf_media_nalu_next_start_code_bs(GF_BitStream *bs);
+
+/*return nb bytes from current data until the next start code and set the size of the next start code (3 or 4 bytes)
+returns data_len if no startcode found and sets sc_size to 0 (last nal in payload)*/
+u32 gf_media_nalu_next_start_code(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);
@@ -133,6 +139,7 @@
 	u32 slice_group_count;			/* num_slice_groups_minus1 + 1*/
 	/*used to discard repeated SPSs - 0: not parsed, 1 parsed, 2 sent*/
 	u32 status;
+
 } AVC_PPS;
 
 typedef struct 
@@ -194,30 +201,174 @@
 	Bool is_svc;
 } AVCState;
 
+typedef struct
+{
+	u32 NALUnitHeader;
+	u8 track_ref_index;
+	s8 sample_offset;
+	u32 data_offset;
+	u32 data_length;
+} SVC_Extractor;
+
+
 /*return sps ID or -1 if error*/
-s32 AVC_ReadSeqInfo(char *sps_data, u32 sps_size, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos);
+s32 gf_media_avc_read_sps(char *sps_data, u32 sps_size, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos);
 /*return pps ID or -1 if error*/
-s32 AVC_ReadPictParamSet(char *pps_data, u32 pps_size, AVCState *avc);
+s32 gf_media_avc_read_pps(char *pps_data, u32 pps_size, AVCState *avc);
 /*return sps ID or -1 if error*/
-s32 AVC_ReadSeqParamSetExtId(char *spse_data, u32 spse_size);
+s32 gf_media_avc_read_sps_ext(char *spse_data, u32 spse_size);
 /*is slice an IDR*/
-Bool AVC_SliceIsIDR(AVCState *avc);
+Bool gf_media_avc_slice_is_IDR(AVCState *avc);
 /*is slice containing intra MB only*/
-Bool AVC_SliceIsIntra(AVCState *avc);
+Bool gf_media_avc_slice_is_intra(AVCState *avc);
 /*parses NALU, updates avc state and returns:
 	1 if NALU part of new frame
 	0 if NALU part of prev frame
 	-1 if bitstream error
 */
-s32 AVC_ParseNALU(GF_BitStream *bs, u32 nal_hdr, AVCState *avc);
+s32 gf_media_avc_parse_nalu(GF_BitStream *bs, u32 nal_hdr, AVCState *avc);
 /*remove SEI messages not allowed in MP4*/
 /*nota: 'buffer' remains unmodified but cannot be set const*/
-u32 AVC_ReformatSEI_NALU(char *buffer, u32 nal_size, AVCState *avc);
+u32 gf_media_avc_reformat_sei(char *buffer, u32 nal_size, AVCState *avc);
 
 #ifndef GPAC_DISABLE_ISOM
-GF_Err AVC_ChangePAR(GF_AVCConfig *avcc, s32 ar_n, s32 ar_d);
+GF_Err gf_media_avc_change_par(GF_AVCConfig *avcc, s32 ar_n, s32 ar_d);
 #endif
 
+
+
+typedef struct
+{
+	Bool profile_present_flag, level_present_flag, tier_flag;
+	u8 profile_space;
+	u8 profile_idc;
+	u32 profile_compatibility_flag;
+	u8 level_idc;
+} HEVC_SublayerPTL;
+
+typedef struct
+{
+	u8 profile_space, tier_flag, profile_idc, level_idc;
+	u32 profile_compatibility_flag;
+	
+	HEVC_SublayerPTL sub_ptl[8];
+} HEVC_ProfileTierLevel;
+
+typedef struct
+{
+	u32 num_negative_pics;
+	u32 num_positive_pics;
+	s32 delta_poc[16];
+} HEVC_ReferencePictureSets;
+
+typedef struct
+{
+	s32 id, vps_id; 
+	/*used to discard repeated SPSs - 0: not parsed, 1 parsed, 2 stored*/
+	u32 state;
+	u32 width, height;
+
+	HEVC_ProfileTierLevel ptl;
+
+	u8 chroma_format_idc;
+	Bool cw_flag ;
+	u32 cw_left, cw_right, cw_top, cw_bottom;
+	u8 bit_depth_luma;
+	u8 bit_depth_chroma;
+	u8 log2_max_pic_order_cnt_lsb;
+	Bool separate_colour_plane_flag;
+
+	u32 max_CU_width, max_CU_height, max_CU_depth;
+	u32 bitsSliceSegmentAddress;
+
+	u32 num_short_term_ref_pic_sets, num_long_term_ref_pic_sps;
+	HEVC_ReferencePictureSets rps[64];
+} HEVC_SPS;
+
+typedef struct
+{
+	s32 id; 
+	u32 sps_id; 
+	/*used to discard repeated SPSs - 0: not parsed, 1 parsed, 2 stored*/
+	u32 state;
+
+	Bool dependent_slice_segments_enabled_flag, tiles_enabled_flag, uniform_spacing_flag;
+	u32 num_extra_slice_header_bits;
+	Bool slice_segment_header_extension_present_flag, output_flag_present_flag;
+} HEVC_PPS;
+
+typedef struct
+{
+	u16 avg_bit_rate, max_bit_rate, avg_pic_rate;
+	u8 constand_pic_rate_idc;
+} HEVC_RateInfo;
+
+typedef struct
+{
+	s32 id; 
+	/*used to discard repeated SPSs - 0: not parsed, 1 parsed, 2 stored*/
+	u32 state;
+	u8 max_sub_layer;
+	HEVC_ProfileTierLevel ptl;
+
+	HEVC_SublayerPTL sub_ptl[8];
+	HEVC_RateInfo rates[8];
+
+} HEVC_VPS;
+
+typedef struct
+{
+	AVCSeiRecoveryPoint recovery_point;
+	AVCSeiPicTiming pic_timing;
+
+} HEVC_SEI;
+
+typedef struct
+{
+	u8 nal_unit_type;
+	s8 temporal_id;
+
+	u32 frame_num, poc_lsb, slice_type;
+
+	s32 redundant_pic_cnt;
+
+	s32 poc;
+	u32 poc_msb, poc_msb_prev, poc_lsb_prev, frame_num_prev;
+	s32 frame_num_offset, frame_num_offset_prev;
+
+	HEVC_SPS *sps;
+	HEVC_PPS *pps;
+} HEVCSliceInfo;
+
+typedef struct
+{
+	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*/
+
+	HEVC_PPS pps[64];
+
+	HEVC_VPS vps[16];
+
+	HEVCSliceInfo s_info;
+	HEVC_SEI sei;
+
+	Bool is_svc;
+} HEVCState;
+
+enum
+{
+	GF_HEVC_TYPE_B = 0,
+	GF_HEVC_TYPE_P = 1,
+	GF_HEVC_TYPE_I = 2,
+};
+s32 gf_media_hevc_read_vps(char *data, u32 size, HEVCState *hevc);
+s32 gf_media_hevc_read_sps(char *data, u32 size, HEVCState *hevc);
+s32 gf_media_hevc_read_pps(char *data, u32 size, HEVCState *hevc);
+s32 gf_media_hevc_parse_nalu(GF_BitStream *bs, HEVCState *hevc, u8 *nal_unit_type, u8 *temporal_id);
+Bool gf_media_hevc_slice_is_intra(HEVCState *hevc);
+Bool gf_media_hevc_slice_is_IDR(HEVCState *hevc);
+
+
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
 typedef struct
@@ -249,5 +400,17 @@
 
 #endif
 
+
+typedef enum
+{
+	GF_DASH_TEMPLATE_SEGMENT = 0,
+	GF_DASH_TEMPLATE_INITIALIZATION,
+	GF_DASH_TEMPLATE_TEMPLATE,
+	GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE,
+	GF_DASH_TEMPLATE_REPINDEX,
+} 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 *seg_rad_name, const char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number, Bool use_segment_timeline);
+
 #endif		/*_GF_MEDIA_DEV_H_*/

gpac-0.5.0.svn4192.tar.bz2/include/gpac/internal/mpd.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/internal/mpd.h Changed

gpac-0.5.0.svn4192.tar.bz2/include/gpac/internal/smjs_api.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/internal/smjs_api.h Changed

@@ -52,6 +52,14 @@
 /*new APIs*/
 #if (JS_VERSION>=185)
 
+#ifdef USE_FFDEV_18
+#define USE_FFDEV_17
+#endif
+
+#ifdef USE_FFDEV_17
+#define USE_FFDEV_16
+#endif
+
 #ifdef USE_FFDEV_16
 #define USE_FFDEV_15
 #endif
@@ -85,6 +93,24 @@
 #define JS_NewDouble(c, v)	v
 #define JS_PropertyStub_forSetter JS_StrictPropertyStub
 
+#if defined(USE_FFDEV_17)
+
+#define SMJS_DECL_FUNC_PROP_SET(func_name) JSBool func_name(JSContext *c, JSHandleObject __hobj, JSHandleId __hid, JSBool strict, JSMutableHandleValue __vp) 
+#define SMJS_FUNC_PROP_SET(func_name) SMJS_DECL_FUNC_PROP_SET(func_name) { JSObject *obj = *(__hobj._); jsid id = *(__hid._); jsval *vp = __vp._;
+#define SMJS_FUNC_PROP_SET_NOVP(func_name) SMJS_DECL_FUNC_PROP_SET(func_name) { JSObject *obj = *(__hobj._); jsid id = *(__hid._);
+
+#define SMJS_DECL_FUNC_PROP_GET(func_name) JSBool func_name(JSContext *c, JSHandleObject __hobj, JSHandleId __hid, JSMutableHandleValue __vp)
+#define SMJS_FUNC_PROP_GET(func_name) SMJS_DECL_FUNC_PROP_GET( func_name ) { JSObject *obj = *(__hobj._); jsid id = *(__hid._); jsval *vp = __vp._;
+#define SMJS_CALL_PROP_STUB() JS_PropertyStub(c, __hobj, __hid, __vp)
+#define DECL_FINALIZE(func_name) void func_name(JSFreeOp *fop, JSObject *obj) { void *c = NULL;
+
+#define SMJS_FUNCTION_SPEC(__name, __fun, __argc) JS_FS(__name, __fun, __argc, 0)
+#define SMJS_PROPERTY_SPEC(__name, __tinyid, __flags, __getter, __setter) \
+    {__name, __tinyid, __flags, JSOP_WRAPPER(__getter), JSOP_WRAPPER(__setter)}
+
+
+#else
+
 #ifdef USE_FFDEV_15
 
 #define SMJS_DECL_FUNC_PROP_SET(func_name) JSBool func_name(JSContext *c, JSHandleObject __hobj, JSHandleId __hid, JSBool strict, jsval *vp) 
@@ -105,8 +131,14 @@
 
 #endif
 
+#define SMJS_FUNC_PROP_SET_NOVP	SMJS_FUNC_PROP_SET
 
 #define SMJS_FUNCTION_SPEC(__name, __fun, __argc) {__name, __fun, __argc, 0}
+#define SMJS_PROPERTY_SPEC(__name, __tinyid, __flags, __getter, __setter) \
+    {__name, __tinyid, __flags, __getter, __setter}
+
+#endif
+
 #define SMJS_FUNCTION(__name) __name(JSContext *c, uintN argc, jsval *argsvp)
 #define SMJS_FUNCTION_EXT(__name, __ext) __name(JSContext *c, uintN argc, jsval *argsvp, __ext)
 #define SMJS_ARGS	jsval *argv = JS_ARGV(c, argsvp);
@@ -178,6 +210,7 @@
 
 #define SMJS_DECL_FUNC_PROP_SET(func_name) JSBool func_name(JSContext *c, JSObject *obj, jsval id, jsval *vp)
 #define SMJS_FUNC_PROP_SET(func_name) SMJS_DECL_FUNC_PROP_SET(func_name) {
+#define SMJS_FUNC_PROP_SET_NOVP	SMJS_FUNC_PROP_SET
 #define SMJS_DECL_FUNC_PROP_GET(func_name) JSBool func_name(JSContext *c, JSObject *obj, jsval id, jsval *vp) 
 #define SMJS_FUNC_PROP_GET(func_name) SMJS_DECL_FUNC_PROP_GET( func_name) { 
 #define DECL_FINALIZE(func_name) void func_name(JSContext *c, JSObject *obj) {
@@ -187,6 +220,7 @@
 #define SMJS_PROP_GETTER jsval id
 #define JS_PropertyStub_forSetter JS_PropertyStub
 #define SMJS_FUNCTION_SPEC(__name, __fun, __argc) {__name, __fun, __argc, 0, 0}
+#define SMJS_PROPERTY_SPEC(__name, __tinyid, __flags, __getter, __setter) {__name, __tinyid, __flags, __getter, __setter}
 #define SMJS_FUNCTION(__name) __name(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 #define SMJS_FUNCTION_EXT(__name, __ext) __name(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval, __ext)
 #define SMJS_ARGS
@@ -219,7 +253,9 @@
 #endif
 
 #if (JS_VERSION>=185)
-#ifdef USE_FFDEV_15
+#if defined(USE_FFDEV_18)
+JSBool gf_sg_js_has_instance(JSContext *cx, JSHandleObject obj, JSMutableHandleValue vp, JSBool *bp);
+#elif defined(USE_FFDEV_15)
 JSBool gf_sg_js_has_instance(JSContext *c, JSHandleObject obj,const jsval *val, JSBool *vp);
 #else
 JSBool gf_sg_js_has_instance(JSContext *c, JSObject *obj,const jsval *val, JSBool *vp);

gpac-0.5.0.svn4192.tar.bz2/include/gpac/isomedia.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/isomedia.h Changed

@@ -35,43 +35,6 @@
 
 #include <gpac/tools.h>
 
-#ifndef GPAC_DISABLE_ISOM
-
-#include <gpac/mpeg4_odf.h>
-
-/*the isomedia file*/
-typedef struct __tag_isom GF_ISOFile;
-
-/*media sample object*/
-typedef struct
-{
-	/*data size*/
-	u32 dataLength;
-	/*data with padding if requested*/
-	char *data;
-	/*decoding time*/
-	u64 DTS;
-	/*relative offset for composition if needed*/
-	s32 CTS_Offset;
-	/*Random Access Point flag:
-	 0: not random access
-	 1: regular RAP, 
-	 2: sample is a redundant RAP. If set when adding the sample, this will create a sample dependency entry
-	*/
-	u8 IsRAP;
-} GF_ISOSample;
-
-
-/*creates a new empty sample*/
-GF_ISOSample *gf_isom_sample_new();
-
-/*delete a sample. NOTE:the buffer content will be destroyed by default.
-if you wish to keep the buffer, set dataLength to 0 in the sample 
-before deleting it
-the pointer is set to NULL after deletion*/
-void gf_isom_sample_del(GF_ISOSample **samp);
-
-
 
 /********************************************************************
 				FILE FORMAT CONSTANTS
@@ -141,7 +104,10 @@
 	/*ref type for Hint tracks*/
 	GF_ISOM_REF_HINT		= GF_4CC( 'h', 'i', 'n', 't' ),
 	/*ref type for QT Chapter tracks*/
-	GF_ISOM_REF_CHAP		= GF_4CC( 'c', 'h', 'a', 'p' )
+	GF_ISOM_REF_CHAP		= GF_4CC( 'c', 'h', 'a', 'p' ),
+	/*ref type for the SVC tracks*/
+	GF_ISOM_REF_BASE = GF_4CC( 's', 'b', 'a', 's' ),
+	GF_ISOM_REF_SCAL = GF_4CC( 's', 'c', 'a', 'l' )
 };
 
 /*Track Edition flag*/
@@ -213,7 +179,11 @@
 	GF_AVCConfig to MPEG-4 ESD*/
 	GF_ISOM_SUBTYPE_AVC_H264		= GF_4CC( 'a', 'v', 'c', '1' ),
 	GF_ISOM_SUBTYPE_AVC2_H264		= GF_4CC( 'a', 'v', 'c', '2' ),
+	GF_ISOM_SUBTYPE_AVC3_H264		= GF_4CC( 'a', 'v', 'c', '3' ),
+	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_HVC1			= GF_4CC( 'h', 'v', 'c', '1' ),
+	GF_ISOM_SUBTYPE_HEV1			= GF_4CC( 'h', 'e', 'v', '1' ),
 
 	/*3GPP(2) extension subtypes*/
 	GF_ISOM_SUBTYPE_3GP_H263		= GF_4CC( 's', '2', '6', '3' ),
@@ -305,6 +275,41 @@
 	GF_ISOM_PL_INLINE,
 };
 
+#ifndef GPAC_DISABLE_ISOM
+
+#include <gpac/mpeg4_odf.h>
+
+/*the isomedia file*/
+typedef struct __tag_isom GF_ISOFile;
+
+/*media sample object*/
+typedef struct
+{
+	/*data size*/
+	u32 dataLength;
+	/*data with padding if requested*/
+	char *data;
+	/*decoding time*/
+	u64 DTS;
+	/*relative offset for composition if needed*/
+	s32 CTS_Offset;
+	/*Random Access Point flag:
+	 0: not random access
+	 1: regular RAP, 
+	 2: sample is a redundant RAP. If set when adding the sample, this will create a sample dependency entry
+	*/
+	u8 IsRAP;
+} GF_ISOSample;
+
+
+/*creates a new empty sample*/
+GF_ISOSample *gf_isom_sample_new();
+
+/*delete a sample. NOTE:the buffer content will be destroyed by default.
+if you wish to keep the buffer, set dataLength to 0 in the sample 
+before deleting it
+the pointer is set to NULL after deletion*/
+void gf_isom_sample_del(GF_ISOSample **samp);
 
 /********************************************************************
 				GENERAL API FUNCTIONS
@@ -340,6 +345,11 @@
 
 Bool gf_isom_moov_first(GF_ISOFile *movie);
 
+/*sets write cache size for files when creating them. If size is 0, writing
+only relies on the underlying OS fwrite/fgetc
+If movie is NULL, assigns the default write cache size for any new movie*/
+GF_Err gf_isom_set_output_buffering(GF_ISOFile *movie, u32 size);
+
 /********************************************************************
 				STREAMING API FUNCTIONS
 ********************************************************************/
@@ -407,6 +417,9 @@
 /*return the track number of the track of specified ID, or 0 if error*/
 u32 gf_isom_get_track_by_id(GF_ISOFile *the_file, u32 trackID);
 
+/*return the original trackID of the track number n, or 0 if error*/
+u32 gf_isom_get_track_original_id(GF_ISOFile *movie, u32 trackNumber);
+
 /*gets the enable flag of a track 0: NO, 1: yes, 2: error*/
 u8 gf_isom_is_track_enabled(GF_ISOFile *the_file, u32 trackNumber);
 
@@ -534,6 +547,9 @@
 */
 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)*/
+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);
 
@@ -619,8 +635,13 @@
 */
 GF_Err gf_isom_get_reference(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType, u32 referenceIndex, u32 *refTrack);
 
-/*Return 1 if the given track has a reference to the given TreckID of a given ReferenceType, 0 otherwise*/
-Bool gf_isom_has_track_reference(GF_ISOFile *movie, u32 trackNumber, u32 referenceType, u32 refTrackID);
+/*Return the referenced track ID for a track and a given ReferenceType and Index
+return -1 if error, 0 if the reference is a NULL one, or the trackNumber
+*/
+GF_Err gf_isom_get_reference_ID(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType, u32 referenceIndex, u32 *refTrackID);
+
+/*Return referenceIndex if the given track has a reference to the given TreckID of a given ReferenceType, 0 otherwise*/
+u32 gf_isom_has_track_reference(GF_ISOFile *movie, u32 trackNumber, u32 referenceType, u32 refTrackID);
 
 u8 gf_isom_get_pl_indication(GF_ISOFile *the_file, u8 PL_Code);
 
@@ -788,6 +809,9 @@
 returns error if trackID is already in used in the file*/
 GF_Err gf_isom_set_track_id(GF_ISOFile *the_file, u32 trackNumber, u32 trackID);
 
+/*force to rewrite all dependencies when trackID changes*/
+GF_Err gf_isom_rewrite_track_dependencies(GF_ISOFile *movie, u32 trackNumber);
+
 /*Add samples to a track. Use streamDescriptionIndex to specify the desired stream (if several)*/
 GF_Err gf_isom_add_sample(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_ISOSample *sample);
 
@@ -1547,9 +1571,40 @@
 
 /*gets uncompressed AVC config - user is responsible for deleting it*/
 GF_AVCConfig *gf_isom_avc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
-/*gets uncompressed AVC config - user is responsible for deleting it*/
+/*gets uncompressed SVC config - user is responsible for deleting it*/
 GF_AVCConfig *gf_isom_svc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
 
+/*gets uncompressed HEVC config - user is responsible for deleting it*/
+GF_HEVCConfig *gf_isom_hevc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
+
+typedef enum
+{
+	GF_ISOM_AVCTYPE_NONE=0,
+	GF_ISOM_AVCTYPE_AVC_ONLY,
+	GF_ISOM_AVCTYPE_AVC_SVC,
+	GF_ISOM_AVCTYPE_SVC_ONLY,
+} GF_ISOMAVCType;
+
+u32 gf_isom_get_avc_svc_type(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
+
+
+enum
+{
+	/*all extractors are rewritten*/
+	GF_ISOM_NALU_EXTRACT_DEFAULT = 0,
+	/*all extractors are skipped but NALU data from this track is kept*/
+	GF_ISOM_NALU_EXTRACT_LAYER_ONLY,
+	/*all extractors are kept (untouched sample) - used for dumping modes*/
+	GF_ISOM_NALU_EXTRACT_INSPECT,
+	/*above mode is applied and PPS/SPS/... are appended in the front of every IDR*/
+	GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG = 1<<16,
+	/*above mode is applied and all start codes are rewritten*/
+	GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG = 2<<16,
+};
+
+GF_Err gf_isom_set_nalu_extract_mode(GF_ISOFile *the_file, u32 trackNumber, u32 nalu_extract_mode);
+u32 gf_isom_get_nalu_extract_mode(GF_ISOFile *the_file, u32 trackNumber);
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 /*creates new AVC config*/
 GF_Err gf_isom_avc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex);
@@ -1557,6 +1612,20 @@
 GF_Err gf_isom_avc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_AVCConfig *cfg);
 /*updates SVC config. If is_additional is set, the SVCConfig will be added to the AVC sample description, otherwise the sample description will be SVC-only*/
 GF_Err gf_isom_svc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_AVCConfig *cfg, Bool is_additional);
+/*creates new SVC config*/
+GF_Err gf_isom_svc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex);
+/*deletes SVC config*/
+GF_Err gf_isom_svc_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)*/
+GF_Err gf_isom_avc_set_inband_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
+
+
+/*creates new AVC config*/
+GF_Err gf_isom_hevc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_HEVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex);
+/*updates AVC config*/
+GF_Err gf_isom_hevc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg);
+
 #endif /*GPAC_DISABLE_ISOM_WRITE*/

gpac-0.5.0.svn4192.tar.bz2/include/gpac/media_tools.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/media_tools.h Changed

@@ -33,6 +33,7 @@
 
 #include <gpac/isomedia.h>
 #include <gpac/avparse.h>
+#include <gpac/config_file.h>
 
 /*computes file hash. If file is ISO-based, computre hash according to OMA (P)DCF (without MutableDRMInformation box)*/
 GF_Err gf_media_get_file_hash(const char *file, u8 hash[20]);
@@ -253,10 +254,23 @@
 /*rewrite AVC samples if nalu size_length has to be changed*/
 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 */
+GF_Err gf_media_split_svc(GF_ISOFile *file, u32 track, Bool splitAll);
+
+/* Merge SVC layers*/
+GF_Err gf_media_merge_svc(GF_ISOFile *file, u32 track, Bool mergeAll);
+
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 
 
-#ifndef GPAC_DISABLE_ISOM_WRITE
+typedef struct 
+{
+	char *file_name;
+	char representationID[100];
+	char periodID[100];
+	char role[100];
+	u32 bandwidth;
+} GF_DashSegmenterInput;
 
 typedef enum
 {
@@ -265,34 +279,38 @@
 	GF_DASH_PROFILE_LIVE,
 	GF_DASH_PROFILE_ONDEMAND,
 	GF_DASH_PROFILE_MAIN,
+
+	/*internal use only*/
+	GF_DASH_PROFILE_UNKNOWN
 } GF_DashProfile;
 
-/*starts MPD file */
-GF_Err gf_media_mpd_start(char *mpd_name, GF_DashProfile profile, const char *title, const char *source, const char *copyright, const char *moreInfoURL, Bool use_url_template, u32 single_segment_mode, char *dash_ctx, GF_ISOFile *init_segment,  Bool bitstream_switching_mode, Double period_duration, Bool first_adaptation_set, u32 group_id, u32 max_width, u32 max_height, char *szMaxFPS, char *szLang);
-GF_Err gf_media_mpd_end(char *mpd_name, Bool last_adaptation_set);
 
 typedef enum
 {
-	GF_DASH_TEMPLATE_SEGMENT = 0,
-	GF_DASH_TEMPLATE_INITIALIZATION,
-	GF_DASH_TEMPLATE_TEMPLATE,
-	GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE,
-	GF_DASH_TEMPLATE_REPINDEX,
-} GF_DashTemplateSegmentType;
+	GF_DASH_BSMODE_NONE = 0,
+	GF_DASH_BSMODE_INBAND,
+	GF_DASH_BSMODE_MERGED,
+	GF_DASH_BSMODE_SINGLE
+} GF_DashSwitchingMode;
+
+GF_Err gf_dasher_segment_files(const char *mpd_name, GF_DashSegmenterInput *inputs, u32 nb_inputs, GF_DashProfile profile, 
+							   const char *mpd_title, const char *mpd_source, const char *mpd_copyright,
+							   const char *mpd_moreInfoURL, const char **mpd_base_urls, u32 nb_mpd_base_urls, 
+							   Bool use_url_template, Bool use_segment_timeline,  Bool single_segment, Bool single_file, GF_DashSwitchingMode bitstream_switching_mode,
+							   Bool segments_start_with_rap, Double dash_duration_sec, char *seg_rad_name, char *seg_ext,
+							   Double frag_duration_sec, s32 subsegs_per_sidx, Bool daisy_chain_sidx, Bool fragments_start_with_rap, const char *tmp_dir,  
+							   GF_Config *dash_ctx, u32 dash_dynamic, u32 mpd_update_time, u32 time_shift_depth, Double subduration, Double min_buffer, u32 ast_shift_sec);
+
+/*returns time to wait until end of currently generated segments*/
+u32 gf_dasher_next_update_time(GF_Config *dash_ctx, u32 mpd_update_time);
 
-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 *seg_rad_name, char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number);
+#ifndef GPAC_DISABLE_ISOM_WRITE
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-/*save file as fragmented movie
-@dash_mode: 0 = DASH not used, 1 = DASH used without GOP spliting, 2 = DASH used with GOP spliting, */
-GF_Err gf_media_segment_file(GF_ISOFile *input, const char *output_file, Double max_duration_sec, const char *mpd_name,
-							  u32 dash_mode, Double dash_duration_sec, char *seg_rad_name, char *seg_ext, 
-							  s32 subsegs_per_sidx, Bool daisy_chain_sidx, Bool use_url_template, Bool single_segment_mode, 
-							  const char *dash_ctx_file, GF_ISOFile *sample_descs, char *rep_id, Bool first_in_set, Bool variable_seg_rad_name, Bool fragments_start_with_rap);
-
-
+/*save file as fragmented movie*/
 GF_Err gf_media_fragment_file(GF_ISOFile *input, const char *output_file, Double max_duration_sec);
 
+
 #endif
 
 #endif
@@ -331,6 +349,8 @@
 	GF_EXPORT_USE_QCP = (1<<11),
 	/*indicates full NHML dump*/
 	GF_EXPORT_NHML_FULL = (1<<11),
+	/**/
+	GF_EXPORT_SVC_LAYER = (1<<12),
 	/*ony probes extraction format*/
 	GF_EXPORT_PROBE_ONLY = (1<<30),
 	/*when set by user during export, will abort*/

gpac-0.5.0.svn4192.tar.bz2/include/gpac/modules/audio_out.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/modules/audio_out.h Changed

gpac-0.5.0.svn4192.tar.bz2/include/gpac/modules/service.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/modules/service.h Changed

gpac-0.5.0.svn4192.tar.bz2/include/gpac/mpeg4_odf.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/mpeg4_odf.h Changed

@@ -697,6 +697,9 @@
 	GF_List *IPIDataSet;
 	GF_List *IPMPDescriptorPointers;
 	GF_List *extensionDescriptors;
+
+	/* 1 if this stream is referenced by type GF_ISOM_REF_BASE, 0 otherwise*/
+	Bool has_ref_base;
 } GF_ESD;
 
 
@@ -880,6 +883,36 @@
 } GF_AVCConfig;
 
 
+
+/*used for SPS/PPS/VPS/SEI*/
+typedef struct
+{
+	u8 type;
+	u8 array_completeness;
+	GF_List *nalus;
+} GF_HEVCParamArray;
+
+
+typedef struct 
+{
+	u8 configurationVersion;
+	u8 profile_space;
+	u8 profile_idc;
+	u8 constraint_indicator_flags;
+	u8 level_idc;
+	u32 profile_compatibility_indications;
+	u8 chromaFormat;
+	u8 luma_bit_depth;
+	u8 chroma_bit_depth;
+	u16 avgFrameRate;
+	u8 constantFrameRate;
+	u8 numTemporalLayers;
+
+	u8 nal_unit_size;
+	
+	GF_List *param_array;
+} GF_HEVCConfig;
+
 /************************************************************
 				Media Control Extensions
 ************************************************************/
@@ -1073,6 +1106,14 @@
 /*writes GF_AVCConfig as MPEG-4 DSI*/
 GF_Err gf_odf_avc_cfg_write(GF_AVCConfig *cfg, char **outData, u32 *outSize);
 
+
+GF_HEVCConfig *gf_odf_hevc_cfg_new();
+void gf_odf_hevc_cfg_del(GF_HEVCConfig *cfg);
+GF_Err gf_odf_hevc_cfg_write_bs(GF_HEVCConfig *cfg, GF_BitStream *bs);
+GF_Err gf_odf_hevc_cfg_write(GF_HEVCConfig *cfg, char **outData, u32 *outSize);
+GF_HEVCConfig *gf_odf_hevc_cfg_read_bs(GF_BitStream *bs);
+GF_HEVCConfig *gf_odf_hevc_cfg_read(char *dsi, u32 dsi_size);
+
 /*destroy the descriptors in a list but not the list*/
 GF_Err gf_odf_desc_list_del(GF_List *descList);

gpac-0.5.0.svn4192.tar.bz2/include/gpac/mpegts.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/mpegts.h Changed

@@ -206,6 +206,7 @@
 	GF_M2TS_SYSTEMS_MPEG4_SECTIONS	= 0x13,
 
 	GF_M2TS_VIDEO_H264				= 0x1B,
+	GF_M2TS_VIDEO_HEVC				= 0x24,
 
 	GF_M2TS_AUDIO_AC3				= 0x81,
 	GF_M2TS_AUDIO_DTS				= 0x8A,
@@ -251,6 +252,14 @@
 /*returns readable name for given stream type*/
 const char *gf_m2ts_get_stream_name(u32 streamType);
 
+/*returns 1 if file is an MPEG-2 TS */
+Bool gf_m2ts_probe_file(const char *fileName);
+
+/*shifts all timing by the given value 
+@is_pes: array of GF_M2TS_MAX_STREAMS u8 set to 1 for PES PIDs to be restamped
+*/
+GF_Err gf_m2ts_restamp(char *buffer, u32 size, s64 ts_shift, u8 *is_pes);
+
 /*PES data framing modes*/
 enum
 {
@@ -349,6 +358,7 @@
 	GF_M2TS_EVT_AIT_FOUND,
 	/*DSCM-CC has been found (carousel) */
 	GF_M2TS_EVT_DSMCC_FOUND,
+	GF_M2TS_EVT_EOS,
 
 };
 
@@ -457,16 +467,18 @@
 /*ES flags*/
 enum
 {
+	/*ES is a PES stream*/
+	GF_M2TS_ES_IS_PES = 1,
 	/*ES is a section stream*/
-	GF_M2TS_ES_IS_SECTION = 1,
+	GF_M2TS_ES_IS_SECTION = 1<<1,
 	/*ES is an mpeg-4 flexmux stream*/
-	GF_M2TS_ES_IS_FMC = 1<<1,
+	GF_M2TS_ES_IS_FMC = 1<<2,
 	/*ES is an mpeg-4 SL-packetized stream*/
-	GF_M2TS_ES_IS_SL = 1<<2,
+	GF_M2TS_ES_IS_SL = 1<<3,
 	/*ES is an mpeg-4 Object Descriptor SL-packetized stream*/
-	GF_M2TS_ES_IS_MPEG4_OD = 1<<3,
+	GF_M2TS_ES_IS_MPEG4_OD = 1<<4,
 	/*ES is a DVB MPE stream*/
-	GF_M2TS_ES_IS_MPE = 1<<4,
+	GF_M2TS_ES_IS_MPE = 1<<5,
 	
 	/*all flags above this mask are used by importers & co*/
 	GF_M2TS_ES_STATIC_FLAGS_MASK = 0x0000FFFF,
@@ -747,6 +759,8 @@
 	u32 stb_at_last_pcr;
 	u32 nb_pck;
 	Bool loop_demux;
+	const char *ts_data_chunk;
+	u32 ts_data_chunk_size;
 
 	/* "Network" =  "MobileIP", "DefaultMCastInterface" */
 	Bool MobileIPEnabled;
@@ -782,6 +796,7 @@
 	Bool direct_mpe;
 
 	Bool dvb_h_demux;
+	Bool notify_pes_timing;
 	
 	/*user callback - MUST NOT BE NULL*/
 	void (*on_mpe_event)(struct tag_m2ts_demux *ts, u32 evt_type, void *par);
@@ -989,7 +1004,7 @@
 	/*avg bitrate compute*/
 	u64 last_br_time;
 	u32 bytes_since_last_time, pes_since_last_time;
-
+	u64 last_dts;
 	/*MPEG-4 over MPEG-2*/
 	u8 table_id;
 	GF_SLHeader sl_header;

gpac-0.5.0.svn4192.tar.bz2/include/gpac/rtp_streamer.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/rtp_streamer.h Changed

gpac-0.5.0.svn4192.tar.bz2/include/gpac/setup.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/setup.h Changed

gpac-0.5.0.svn4192.tar.bz2/include/gpac/tools.h -> gpac-0.5.0.svn4296.tar.bz2/include/gpac/tools.h Changed

gpac-0.5.0.svn4192.tar.bz2/modules/avcap/avcap.cpp -> gpac-0.5.0.svn4296.tar.bz2/modules/avcap/avcap.cpp Changed

gpac-0.5.0.svn4192.tar.bz2/modules/dx_hw/dx_audio.c -> gpac-0.5.0.svn4296.tar.bz2/modules/dx_hw/dx_audio.c Changed

gpac-0.5.0.svn4192.tar.bz2/modules/ffmpeg_in/ffmpeg_decode.c -> gpac-0.5.0.svn4296.tar.bz2/modules/ffmpeg_in/ffmpeg_decode.c Changed

@@ -38,6 +38,10 @@
 #undef USE_AVCODEC2
 #endif
 
+#if (LIBAVCODEC_VERSION_MAJOR >= 54) && (LIBAVCODEC_VERSION_MINOR >= 35)
+#define USE_AVCTX3
+#endif
+
 
 
 /**
@@ -170,7 +174,12 @@
 		frame = &ffd->base_frame;
 	}
 	if (!(*ctx)){
+
+#ifdef USE_AVCTX3
+	  *ctx = avcodec_alloc_context3(NULL);
+#else
 	  *ctx = avcodec_alloc_context();
+#endif
 	}
 
 	/*private FFMPEG DSI*/
@@ -281,7 +290,7 @@
 		if ((ffd->oti==GPAC_OTI_VIDEO_MPEG4_PART2) || (ffd->oti == GPAC_OTI_VIDEO_AVC)) {
 			/*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->data) {
+			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
 
 				/*for regular MPEG-4, try to decode and if this fails try H263 decoder at first frame*/
 				if (ffd->oti==GPAC_OTI_VIDEO_MPEG4_PART2) {
@@ -318,7 +327,11 @@
 		(*ctx)->pix_fmt = ffd->raw_pix_fmt;
 		if ((*ctx)->extradata && strstr((*ctx)->extradata, "BottomUp")) ffd->flipped = 1;
 	} else {
+#ifdef USE_AVCTX3
+		if (avcodec_open2((*ctx), (*codec), NULL )<0) return GF_NON_COMPLIANT_BITSTREAM;
+#else
 		if (avcodec_open((*ctx), (*codec) )<0) return GF_NON_COMPLIANT_BITSTREAM;
+#endif
 	}
 
 	/*setup audio streams*/
@@ -696,88 +709,114 @@
 	w = ctx->width;
 	h = ctx->height;
 
-	if (ffd->check_h264_isma) {
-		/*for AVC bitstreams after ISMA decryption, in case (as we do) the decryption DRM tool
-		doesn't put back nalu size, do it ourselves...*/
-		if (inBuffer && !inBuffer[0] && !inBuffer[1] && !inBuffer[2] && (inBuffer[3]==0x01)) {
-			u32 nalu_size;
-			char *start, *end, *bufferEnd;
-
-			start = inBuffer;
-			end = inBuffer + 4;
-			bufferEnd = inBuffer + inBufferLength;
-			/* FIXME : SOUCHAY : not sure of exact behaviour, but old one was reading non-allocated memory */
-			while ((end+3) < bufferEnd) {
-				if (!end[0] && !end[1] && !end[2] && (end[3]==0x01)) {
-					nalu_size = end - start - 4;
-					start[0] = (nalu_size>>24)&0xFF;
-					start[1] = (nalu_size>>16)&0xFF;
-					start[2] = (nalu_size>>8)&0xFF;
-					start[3] = (nalu_size)&0xFF;
-					start = end;
-					end = start+4;
-					continue;
+	/*we have a valid frame not yet dispatched*/
+	if (ffd->had_pic) {
+		ffd->had_pic = 0;
+		gotpic = 1;
+	} else {
+		if (ffd->check_h264_isma) {
+			/*for AVC bitstreams after ISMA decryption, in case (as we do) the decryption DRM tool
+			doesn't put back nalu size, do it ourselves...*/
+			if (inBuffer && !inBuffer[0] && !inBuffer[1] && !inBuffer[2] && (inBuffer[3]==0x01)) {
+				u32 nalu_size;
+				char *start, *end, *bufferEnd;
+
+				start = inBuffer;
+				end = inBuffer + 4;
+				bufferEnd = inBuffer + inBufferLength;
+				/* FIXME : SOUCHAY : not sure of exact behaviour, but old one was reading non-allocated memory */
+				while ((end+3) < bufferEnd) {
+					if (!end[0] && !end[1] && !end[2] && (end[3]==0x01)) {
+						nalu_size = end - start - 4;
+						start[0] = (nalu_size>>24)&0xFF;
+						start[1] = (nalu_size>>16)&0xFF;
+						start[2] = (nalu_size>>8)&0xFF;
+						start[3] = (nalu_size)&0xFF;
+						start = end;
+						end = start+4;
+						continue;
+					}
+					end++;
 				}
-				end++;
+				nalu_size = (inBuffer+inBufferLength) - start - 4;
+				start[0] = (nalu_size>>24)&0xFF;
+				start[1] = (nalu_size>>16)&0xFF;
+				start[2] = (nalu_size>>8)&0xFF;
+				start[3] = (nalu_size)&0xFF;
+				ffd->check_h264_isma = 2;
+			}
+			/*if we had ISMA E&A and lost it this is likely due to a pck loss - do NOT switch back to regular*/
+			else if (ffd->check_h264_isma == 1) {
+				ffd->check_h264_isma = 0;
 			}
-			nalu_size = (inBuffer+inBufferLength) - start - 4;
-			start[0] = (nalu_size>>24)&0xFF;
-			start[1] = (nalu_size>>16)&0xFF;
-			start[2] = (nalu_size>>8)&0xFF;
-			start[3] = (nalu_size)&0xFF;
-			ffd->check_h264_isma = 2;
-		}
-		/*if we had ISMA E&A and lost it this is likely due to a pck loss - do NOT switch back to regular*/
-		else if (ffd->check_h264_isma == 1) {
-			ffd->check_h264_isma = 0;
 		}
-	}
 
-#ifdef USE_AVCODEC2
-	if (avcodec_decode_video2(ctx, frame, &gotpic, &pkt) < 0) {
+	#ifdef USE_AVCODEC2
+		if (avcodec_decode_video2(ctx, frame, &gotpic, &pkt) < 0) {
+	#else
+		if (avcodec_decode_video(ctx, frame, &gotpic, inBuffer, inBufferLength) < 0) {
+	#endif
+			if (!ffd->check_short_header) {
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+
+			/*switch to H263 (ffmpeg MPEG-4 codec doesn't understand short headers)*/
+			{
+				u32 old_codec = (*codec)->id;
+				ffd->check_short_header = 0;
+				/*OK we loose the DSI stored in the codec context, but H263 doesn't need any, and if we're
+				here this means the DSI was broken, so no big deal*/
+				avcodec_close(ctx);
+				*codec = avcodec_find_decoder(CODEC_ID_H263);
+
+#ifdef USE_AVCTX3
+				if (! (*codec) || (avcodec_open2(ctx, *codec, NULL)<0)) return GF_NON_COMPLIANT_BITSTREAM;
 #else
-	if (avcodec_decode_video(ctx, frame, &gotpic, inBuffer, inBufferLength) < 0) {
+				if (! (*codec) || (avcodec_open(ctx, *codec)<0)) return GF_NON_COMPLIANT_BITSTREAM;
 #endif
-		if (!ffd->check_short_header) {
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
 
-		/*switch to H263 (ffmpeg MPEG-4 codec doesn't understand short headers)*/
-		{
-			u32 old_codec = (*codec)->id;
-			ffd->check_short_header = 0;
-			/*OK we loose the DSI stored in the codec context, but H263 doesn't need any, and if we're
-			here this means the DSI was broken, so no big deal*/
-			avcodec_close(ctx);
-			*codec = avcodec_find_decoder(CODEC_ID_H263);
-			if (! (*codec) || (avcodec_open(ctx, *codec)<0)) return GF_NON_COMPLIANT_BITSTREAM;
-#if USE_AVCODEC2
-			if (avcodec_decode_video2(ctx, frame, &gotpic, &pkt) < 0) {
+	#if USE_AVCODEC2
+				if (avcodec_decode_video2(ctx, frame, &gotpic, &pkt) < 0) {
+	#else
+				if (avcodec_decode_video(ctx, frame, &gotpic, inBuffer, inBufferLength) < 0) {
+	#endif
+					/*nope, stay in MPEG-4*/
+					avcodec_close(ctx);
+					*codec = avcodec_find_decoder(old_codec);
+					assert(*codec);
+#ifdef USE_AVCTX3
+					avcodec_open2(ctx, *codec, NULL);
 #else
-			if (avcodec_decode_video(ctx, frame, &gotpic, inBuffer, inBufferLength) < 0) {
+					avcodec_open(ctx, *codec);
 #endif
-				/*nope, stay in MPEG-4*/
-				avcodec_close(ctx);
-				*codec = avcodec_find_decoder(old_codec);
-				assert(*codec);
-				avcodec_open(ctx, *codec);
-				return GF_NON_COMPLIANT_BITSTREAM;
+					return GF_NON_COMPLIANT_BITSTREAM;
+				}
 			}
 		}
-	}
 
-	if (!gotpic && (!ctx->width || !ctx->height) ) {
-		ctx->width = w;
-		ctx->height = h;
-		return GF_OK;
+	/*
+		if (!gotpic && (!ctx->width || !ctx->height) ) {
+			ctx->width = w;
+			ctx->height = h;
+			return GF_OK;
+		}
+	*/
+		/*some streams use odd width/height frame values*/
+		if (ffd->out_pix_fmt == GF_PIXEL_YV12) {
+			if (ctx->width%2) ctx->width++;
+			if (ctx->height%2) ctx->height++;
+		}
 	}
 
-	/*some streams use odd width/height frame values*/
-	if (ffd->out_pix_fmt == GF_PIXEL_YV12) {
-		if (ctx->width%2) ctx->width++;
-		if (ctx->height%2) ctx->height++;
+	/*we have a picture and need resize, do it*/
+	if (gotpic && ffd->needs_output_resize) {
+		ffd->needs_output_resize=0;
+		ffd->had_pic = 1;
+		*outBufferLength = ffd->out_size;
+		return GF_BUFFER_TOO_SMALL;
 	}
 
+
 	/*recompute outsize in case on-the-fly change*/
 	if ((w != ctx->width) || (h != ctx->height)) {
 		outsize = ctx->width * ctx->height * 3;
@@ -787,6 +826,17 @@
 			ffd->yuv_size = 3 * ctx->width * ctx->height / 2;
 		}
 		ffd->out_size = outsize;
+
+		if (!ffd->no_par_update && ctx->sample_aspect_ratio.num && ctx->sample_aspect_ratio.den) {
+			ffd->previous_par = (ctx->sample_aspect_ratio.num<<16) | ctx->sample_aspect_ratio.den;
+		}
+
+		/*we didn't get any picture: wait for a picture before resizing output buffer, otherwise we will have no 
+		video in the output buffer*/
+		if (!gotpic) {
+			ffd->needs_output_resize = 1;
+			return GF_OK;
+		}
 		*outBufferLength = ffd->out_size;
 		if (ffd->check_h264_isma) {
 			inBuffer[0] = inBuffer[1] = inBuffer[2] = 0;
@@ -798,22 +848,26 @@
 			*cached_sws = NULL;
 		}
 #endif
-		if (!ffd->no_par_update && ctx->sample_aspect_ratio.num && ctx->sample_aspect_ratio.den) {
-			ffd->previous_par = (ctx->sample_aspect_ratio.num<<16) | ctx->sample_aspect_ratio.den;
-		}
+		ffd->had_pic = 1;
 		return GF_BUFFER_TOO_SMALL;
 	}
 	/*check PAR in case on-the-fly change*/
 	if (!ffd->no_par_update && ctx->sample_aspect_ratio.num && ctx->sample_aspect_ratio.den) {
 		u32 new_par = (ctx->sample_aspect_ratio.num<<16) | ctx->sample_aspect_ratio.den;
-		if (new_par != ffd->previous_par) {
+		if (ffd->previous_par && (new_par != ffd->previous_par)) {
 			ffd->previous_par = new_par;
+
+			if (!gotpic) {
+				ffd->needs_output_resize = 1;
+				return GF_OK;
+			}
 			*outBufferLength = ffd->out_size;
+			ffd->had_pic = 1;
 			return GF_BUFFER_TOO_SMALL;
 		}
 	}
 
-	if (mmlevel	== GF_CODEC_LEVEL_SEEK) return GF_OK;
+//	if (mmlevel	== GF_CODEC_LEVEL_SEEK) return GF_OK;
 
 	if (!gotpic) return GF_OK;
 
@@ -955,6 +1009,9 @@
 				GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
 				if (!cfg) return GF_CODEC_SUPPORTED;
 
+				if (esd->has_ref_base)
+					is_svc = 1;
+
 				/*decode all NALUs*/
 				count = gf_list_count(cfg->sequenceParameterSets);
 				for (i=0; i<count; i++) {

gpac-0.5.0.svn4192.tar.bz2/modules/ffmpeg_in/ffmpeg_demux.c -> gpac-0.5.0.svn4296.tar.bz2/modules/ffmpeg_in/ffmpeg_demux.c Changed

gpac-0.5.0.svn4192.tar.bz2/modules/ffmpeg_in/ffmpeg_in.h -> gpac-0.5.0.svn4296.tar.bz2/modules/ffmpeg_in/ffmpeg_in.h Changed

gpac-0.5.0.svn4192.tar.bz2/modules/freenect/freenect.c -> gpac-0.5.0.svn4296.tar.bz2/modules/freenect/freenect.c Changed

gpac-0.5.0.svn4192.tar.bz2/modules/gpac_js/gpac_js.c -> gpac-0.5.0.svn4296.tar.bz2/modules/gpac_js/gpac_js.c Changed

@@ -849,21 +849,21 @@
 	GF_JSAPIParam par;
 
 	JSPropertySpec gpacEvtClassProps[] = {
-		{"type",			 0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-		{"keycode",			 1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-		{"mouse_x",			 2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-		{"mouse_y",			 3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-		{"picked",			 4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-		{"wheel",			 5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-		{"button",			 6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-		{0, 0, 0, 0, 0}
+		SMJS_PROPERTY_SPEC("type",			 0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("keycode",			 1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("mouse_x",			 2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("mouse_y",			 3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("picked",			 4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("wheel",			 5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("button",			 6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 	};
 	JSFunctionSpec gpacEvtClassFuncs[] = {
 		SMJS_FUNCTION_SPEC(0, 0, 0)
 	};
 
 	JSPropertySpec gpacClassProps[] = {
-		{0, 0, 0, 0, 0}
+		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 	};
 	JSFunctionSpec gpacClassFuncs[] = {
 		SMJS_FUNCTION_SPEC("getOption",		gpac_getOption, 3),
@@ -906,7 +906,6 @@
 
 	if (!scene) return;
 
-
 	JS_SETUP_CLASS(gjs->gpacClass, "GPAC", JSCLASS_HAS_PRIVATE, gpac_getProperty, gpac_setProperty, JS_FinalizeStub);
 
 	if (!gjs->gpac_obj) {

gpac-0.5.0.svn4192.tar.bz2/modules/isom_in/isom_in.h -> gpac-0.5.0.svn4296.tar.bz2/modules/isom_in/isom_in.h Changed

gpac-0.5.0.svn4192.tar.bz2/modules/isom_in/load.c -> gpac-0.5.0.svn4296.tar.bz2/modules/isom_in/load.c Changed

gpac-0.5.0.svn4192.tar.bz2/modules/isom_in/read.c -> gpac-0.5.0.svn4296.tar.bz2/modules/isom_in/read.c Changed

@@ -56,6 +56,7 @@
 static GFINLINE Bool isor_is_local(const char *url)
 {
 	if (!strnicmp(url, "file://", 7)) return 1;
+	if (!strnicmp(url, "gmem://", 7)) return 1;
 	if (strstr(url, "://")) return 0;
 	/*the rest is local (mounted on FS)*/
 	return 1;
@@ -497,7 +498,7 @@
 
 GF_Err ISOR_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
 {
-	u32 ESID;
+	u32 ESID, base_track, count, i;
 	ISOMChannel *ch;
 	GF_NetworkCommand com;
 	u32 track;
@@ -561,6 +562,7 @@
 	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;
@@ -568,9 +570,32 @@
 	case GF_ISOM_MEDIA_SCENE:
 		ch->streamType = GF_STREAM_SCENE;
 		break;
+	case GF_ISOM_MEDIA_VISUAL:
+		count = gf_isom_get_track_count(ch->owner->mov);
+		base_track = 0;
+		for (i = 0; i < count; i++)
+		{
+			gf_isom_get_reference(ch->owner->mov, i+1, GF_ISOM_REF_BASE, 1, &base_track);
+			if (base_track)
+				break;
+		}
+		ch->base_track = base_track;
+		ch->next_track = 0;
+
+		/*set track to last layer (hopefully max quality)*/
+		if (base_track) {
+			for (i = 0; i < count; i++) {
+				gf_isom_get_reference(ch->owner->mov, i+1, GF_ISOM_REF_BASE, 1, &base_track);
+				if (base_track==ch->base_track)
+					ch->track = i+1;
+			}
+		}
+		/*in scalable mode add SPS/PPS in-band*/
+		gf_isom_set_nalu_extract_mode(ch->owner->mov, ch->track, GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
+		break;
 	}
 
-	ch->has_edit_list = gf_isom_get_edit_segment_count(ch->owner->mov, ch->track) ? 1 : 0;
+	ch->has_edit_list = gf_isom_get_edit_list_type(ch->owner->mov, ch->track, &ch->dts_offset) ? 1 : 0;
 	ch->has_rap = (gf_isom_has_sync_points(ch->owner->mov, ch->track)==1) ? 1 : 0;
 	ch->time_scale = gf_isom_get_media_timescale(ch->owner->mov, ch->track);
 
@@ -698,11 +723,64 @@
 	return val_ts;
 }
 
+/*switch channel quality. Return next channel or current channel if error*/
+static
+u32 gf_channel_switch_quality(ISOMChannel *ch, GF_ISOFile *the_file, Bool switch_up)
+{
+	u32 i, count, next_track, trackID, cur_track;
+	s32 ref_count;
+
+	cur_track = ch->next_track ? ch->next_track : ch->track;
+	count = gf_isom_get_track_count(the_file);
+	trackID = gf_isom_get_track_id(the_file, cur_track);
+	next_track = 0;
+
+	if (switch_up)
+	{
+		for (i = 0; i < count; i++)
+		{
+			ref_count = gf_isom_get_reference_count(the_file, i+1, GF_ISOM_REF_SCAL);
+			if (ref_count < 0)
+				return cur_track; //error
+			else if (ref_count == 0)
+				continue;
+			/*next track is the one that has the last reference of type GF_ISOM_REF_SCAL refers to this current track*/
+			else if ((u32)ref_count == gf_isom_has_track_reference(the_file, i+1, GF_ISOM_REF_SCAL, trackID))
+			{
+				next_track = i+1;
+				break;
+			}
+		}
+		/*this is the highest quality*/ 
+		if (!next_track)
+			return cur_track;
+	}
+	else
+	{
+		if (cur_track == ch->base_track)
+			return cur_track;
+		ref_count = gf_isom_get_reference_count(the_file, cur_track, GF_ISOM_REF_SCAL);
+		if (ref_count < 0)
+			return cur_track;
+		gf_isom_get_reference(the_file, cur_track, GF_ISOM_REF_SCAL, ref_count, &next_track);
+		if (!next_track)
+			return cur_track;
+	}
+
+	/*in scalable mode add SPS/PPS in-band*/
+	gf_isom_set_nalu_extract_mode(the_file, next_track, GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
+
+	return next_track;
+}
+
+
 GF_Err ISOR_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
 {
 	Double track_dur, media_dur;
 	ISOMChannel *ch;
 	ISOMReader *read;
+	u32 count, i;
+
 	if (!plug || !plug->priv || !com) return GF_SERVICE_ERROR;
 	read = (ISOMReader *) plug->priv;
 
@@ -735,6 +813,20 @@
 		}
 		return GF_NOT_SUPPORTED;
 	}
+
+	if (com->command_type == GF_NET_SERVICE_QUALITY_SWITCH)
+	{
+		count = gf_list_count(read->channels);
+		for (i = 0; i < count; i++)
+		{
+			ch = (ISOMChannel *)gf_list_get(read->channels, i);
+			if (ch->base_track) {
+				ch->next_track = gf_channel_switch_quality(ch, read->mov, com->switch_quality.up);
+			}
+		}
+		return GF_OK;
+	}
+
 	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
 
 	ch = isor_get_channel(read, com->base.on_channel);
@@ -818,9 +910,9 @@
 			}
 			gf_odf_desc_del((GF_Descriptor *) dcd);
 		}
-	}
 		return GF_OK;
 	}
+	}
 	return GF_NOT_SUPPORTED;
 }

gpac-0.5.0.svn4192.tar.bz2/modules/isom_in/read_ch.c -> gpac-0.5.0.svn4296.tar.bz2/modules/isom_in/read_ch.c Changed

@@ -98,9 +98,24 @@
 			ch->wait_for_segment_switch = 0;
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Track %d - cur sample %d - new sample count %d\n", ch->track, ch->sample_num, gf_isom_get_sample_count(ch->owner->mov, ch->track) ));
 			if (param.url_query.next_url_init_or_switch_segment) {
-				ch->needs_codec_update = 1;
+				ch->track = gf_isom_get_track_by_id(read->mov, ch->track_id);
+				if (!ch->track) {
+					if (gf_isom_get_track_count(read->mov)==1) {
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Mismatch between track IDs of different representations\n"));
+						ch->track = 1;
+					} else {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Mismatch between track IDs of different representations\n"));
+					}
+				}
+
+				/*rewrite all upcoming SPS/PPS into the samples*/
+				gf_isom_set_nalu_extract_mode(read->mov, ch->track, GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
+
 				/*we changed our moov structure, sample_num now starts from 0*/
 				ch->sample_num = 0;
+			} else {
+				/*no need to rewrite upcoming SPS/PPS into the samples*/
+				gf_isom_set_nalu_extract_mode(read->mov, ch->track, GF_ISOM_NALU_EXTRACT_DEFAULT);
 			}
 		}
 	} else {
@@ -163,11 +178,12 @@
 			ch->last_state = GF_ISOM_INCOMPLETE_FILE;
 		} else if (ch->sample_num) {
 			ch->last_state = (ch->owner->frag_type==1) ? GF_OK : GF_EOS;
+			ch->to_init = 0;
 		}
 	} else {
 		ch->sample_time = ch->sample->DTS;
+		ch->to_init = 0;
 	}
-	ch->to_init = 0;
 	ch->current_slh.decodingTimeStamp = ch->start;
 	ch->current_slh.compositionTimeStamp = ch->start;
 	ch->current_slh.randomAccessPointFlag = ch->sample ? ch->sample->IsRAP : 0;
@@ -205,23 +221,28 @@
 			} else {
 				/*if we get the same sample, figure out next interesting time (current sample + DTS gap to next sample should be a good bet)*/
 				if (prev_sample == ch->sample_num) {
-					u32 time_diff = 2;
-					u32 sample_num = ch->sample_num ? ch->sample_num : 1;
-					GF_ISOSample *s1 = gf_isom_get_sample(ch->owner->mov, ch->track, sample_num, NULL);
-					GF_ISOSample *s2 = gf_isom_get_sample(ch->owner->mov, ch->track, sample_num+1, NULL);
+					if (ch->owner->frag_type && (ch->sample_num==gf_isom_get_sample_count(ch->owner->mov, ch->track))) {
+						if (ch->sample) 
+							gf_isom_sample_del(&ch->sample);
+					} else {
+						u32 time_diff = 2;
+						u32 sample_num = ch->sample_num ? ch->sample_num : 1;
+						GF_ISOSample *s1 = gf_isom_get_sample(ch->owner->mov, ch->track, sample_num, NULL);
+						GF_ISOSample *s2 = gf_isom_get_sample(ch->owner->mov, ch->track, sample_num+1, NULL);
 
-					gf_isom_sample_del(&ch->sample);
+						gf_isom_sample_del(&ch->sample);
 
-					if (s2 && s1) {
-						assert(s2->DTS >= s1->DTS);
-						time_diff = (u32) (s2->DTS - s1->DTS);
-						e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + time_diff, &ivar, GF_ISOM_SEARCH_FORWARD, &ch->sample, &ch->sample_num);
-					} else if (s1 && !s2) {
-						e = GF_EOS;
-					}
-					gf_isom_sample_del(&s1);
-					gf_isom_sample_del(&s2);
+						if (s2 && s1) {
+							assert(s2->DTS >= s1->DTS);
+							time_diff = (u32) (s2->DTS - s1->DTS);
+							e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + time_diff, &ivar, GF_ISOM_SEARCH_FORWARD, &ch->sample, &ch->sample_num);
+						} else if (s1 && !s2) {
+							e = GF_EOS;
+						}
+						gf_isom_sample_del(&s1);
+						gf_isom_sample_del(&s2);
 
+					}
 				}
 
 				/*we jumped to another segment - if RAP is needed look for closest rap in decoding order and
@@ -259,6 +280,19 @@
 			ch->sample_num++;
 			goto fetch_next;
 		}
+		if (ch->sample && ch->sample->IsRAP && ch->next_track) {
+			ch->track = ch->next_track;
+			ch->next_track = 0;
+			gf_isom_sample_del(&ch->sample);
+			goto fetch_next;
+		}
+		if (ch->sample && ch->dts_offset) {
+			if ( (ch->dts_offset<0) && (ch->sample->DTS < (u64) -ch->dts_offset)) {
+				ch->sample->DTS = 0;
+			} else {
+				ch->sample->DTS += ch->dts_offset;
+			}
+		}
 	}
 	if (!ch->sample) {
 		/*incomplete file - check if we're still downloading or not*/
@@ -325,62 +359,6 @@
 			ch->current_slh.isma_encrypted = 0;
 		}
 	}
-
-	/*this is ugly we need a rearchitecture of the streaming part of GPAC to handle codec changes properly - fortunately in DASH we cannot switch codec on
-	the fly (not in the same representation)!! */
-	if (ch->sample && ch->needs_codec_update) {
-		GF_AVCConfig *avccfg, *svccfg;
-		GF_AVCConfigSlot *slc;
-		GF_BitStream *bs;
-		u32 i; 
-		ch->needs_codec_update = 0;
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Codec configuration changed - rewriting sample\n"));
-
-		switch (gf_isom_get_media_subtype(ch->owner->mov, ch->track, 1)) {
-		case GF_ISOM_SUBTYPE_AVC_H264:
-		case GF_ISOM_SUBTYPE_AVC2_H264:
-		case GF_ISOM_SUBTYPE_SVC_H264:
-			avccfg = gf_isom_avc_config_get(ch->owner->mov, ch->track, 1);
-			svccfg = gf_isom_svc_config_get(ch->owner->mov, ch->track, 1);
-
-			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			if (avccfg) {
-				for (i=0; i<gf_list_count(avccfg->sequenceParameterSets); i++) {
-					slc = gf_list_get(avccfg->sequenceParameterSets, i);
-					gf_bs_write_int(bs, slc->size, avccfg->nal_unit_size*8);
-					gf_bs_write_data(bs, slc->data, slc->size);
-				}
-				for (i=0; i<gf_list_count(avccfg->pictureParameterSets); i++) {
-					slc = gf_list_get(avccfg->pictureParameterSets, i);
-					gf_bs_write_int(bs, slc->size, avccfg->nal_unit_size*8);
-					gf_bs_write_data(bs, slc->data, slc->size);
-				}
-				gf_odf_avc_cfg_del(avccfg);
-			}
-			if (svccfg) {
-				for (i=0; i<gf_list_count(svccfg->sequenceParameterSets); i++) {
-					slc = gf_list_get(svccfg->sequenceParameterSets, i);
-					gf_bs_write_int(bs, slc->size, avccfg->nal_unit_size*8);
-					gf_bs_write_data(bs, slc->data, slc->size);
-				}
-				for (i=0; i<gf_list_count(svccfg->pictureParameterSets); i++) {
-					slc = gf_list_get(svccfg->pictureParameterSets, i);
-					gf_bs_write_int(bs, slc->size, avccfg->nal_unit_size*8);
-					gf_bs_write_data(bs, slc->data, slc->size);
-				}
-				gf_odf_avc_cfg_del(svccfg);
-			}
-			gf_bs_write_data(bs, ch->sample->data, ch->sample->dataLength);
-			gf_free(ch->sample->data);
-			ch->sample->data = 0;
-			gf_bs_get_content(bs, &ch->sample->data, &ch->sample->dataLength);
-			gf_bs_del(bs);
-			break;
-		default:
-			break;
-		}
-	}
 }
 
 void isor_reader_release_sample(ISOMChannel *ch)

gpac-0.5.0.svn4192.tar.bz2/modules/mp3_in/mp3_in.c -> gpac-0.5.0.svn4296.tar.bz2/modules/mp3_in/mp3_in.c Changed

@@ -131,13 +131,35 @@
 	}
 }
 
-
-static Bool MP3_ConfigureFromFile(MP3Reader *read)
+/**
+ * Returns TRUE if file is ready to be read, FALSE otherwise
+ * @param read Reader
+ * @param minSizeToRead How much bytes do we need to start reading at minimum
+ */
+static Bool MP3_ConfigureFromFile(MP3Reader *read, u32 *minSizeToRead)
 {
+	unsigned char id3v2[10];
 	u32 hdr, size;
 	u64 pos;
 	if (!read->stream) return 0;
-
+	/* ID3VVFFFFSIZE = 13bytes
+         * ID3 string
+	 * VV = Version
+         * F = Flags
+         * SIZE = 32bits size with first Most Significant bit set to 0 -> 28 bits
+	 * Size starts AFTER this header, meaning we have to add 10 bytes
+	 */
+	pos = fread(id3v2, sizeof(unsigned char), 10, read->stream);
+	*minSizeToRead = 0;
+	if (pos == 10){
+		/* Did we read an ID3v2 ? */
+		if (id3v2[0] == 'I' && id3v2[1] == 'D' && id3v2[2] == '3'){
+			int sz = 10 + ((id3v2[9] & 0x7f) + ((id3v2[8] & 0x7f) << 7) + ((id3v2[7] & 0x7f) << 14) + ((id3v2[6] & 0x7f) << 21));
+			//printf("Size of id3v2 header = %d\n", sz);
+			*minSizeToRead = sz;
+		}
+	}
+	gf_f64_seek(read->stream, 0, SEEK_SET);
 	hdr = gf_mp3_get_next_header(read->stream);
 	if (!hdr) return 0;
 	read->sample_rate = gf_mp3_sampling_rate(hdr);
@@ -318,14 +340,15 @@
 			read->stream = gf_f64_open((char *) szCache, "rb");
 			if (!read->stream) e = GF_SERVICE_ERROR;
 			else {
+				u32 minSizeToRead = 0;
 				/*if full file at once (in cache) parse duration*/
 				if (e==GF_EOS) read->is_remote = 0;
 				e = GF_OK;
 				/*not enough data*/
-				if (!MP3_ConfigureFromFile(read)) {
+				if (!MP3_ConfigureFromFile(read, &minSizeToRead)) {
 					gf_dm_sess_get_stats(read->dnload, NULL, NULL, NULL, &bytes_done, NULL, NULL);
 					/*bad data - there's likely some ID3 around...*/
-					if (bytes_done>100*1024) {
+					if (bytes_done>(100*1024 + minSizeToRead)) {
 						e = GF_CORRUPTED_DATA;
 					} else {
 						fclose(read->stream);
@@ -366,6 +389,7 @@
 static GF_Err MP3_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
 {
 	char szURL[2048];
+	u32 minSizeToRead = 0;
 	char *ext;
 	GF_Err reply;
 	MP3Reader *read = plug->priv;
@@ -389,7 +413,7 @@
 	read->stream = gf_f64_open(szURL, "rb");
 	if (!read->stream) {
 		reply = GF_URL_ERROR;
-	} else if (!MP3_ConfigureFromFile(read)) {
+	} else if (!MP3_ConfigureFromFile(read, &minSizeToRead)) {
 		fclose(read->stream);
 		read->stream = NULL;
 		reply = GF_NOT_SUPPORTED;
@@ -532,7 +556,8 @@
 			read->done = 0;
 			/*PLAY after complete download, estimate duration*/
 			if (!read->is_remote && !read->duration) {
-				MP3_ConfigureFromFile(read);
+				u32 minSizeToRead = 0;
+				MP3_ConfigureFromFile(read, &minSizeToRead);
 				if (read->duration) {
 					GF_NetworkCommand rcfg;
 					rcfg.base.on_channel = read->ch;

gpac-0.5.0.svn4192.tar.bz2/modules/mpd_in/mpd_in.c -> gpac-0.5.0.svn4296.tar.bz2/modules/mpd_in/mpd_in.c Changed

@@ -44,7 +44,11 @@
 
 	Bool connection_ack_sent;
 	Bool in_seek;
+	Bool memory_storage;
+	Bool use_max_res, immediate_switch;
     Double previous_start_range;
+	/*max width & height in all active representations*/
+	u32 width, height;
 } GF_MPD_In;
 
 typedef struct 
@@ -148,10 +152,14 @@
 			return GF_SERVICE_ERROR;
 		}
 
+		if (discard_first_cache_entry) {
+			gf_dash_group_discard_segment(mpdin->dash, group_idx);
+		}
+
 		while (gf_dash_is_running(mpdin->dash) ) {
 			group_done=0;
 			nb_segments_cached = gf_dash_group_get_num_segments_ready(mpdin->dash, group_idx, &group_done);
-			if (nb_segments_cached>=2) 
+			if (nb_segments_cached>=1) 
 				break;
 
 			if (group_done) {
@@ -165,28 +173,24 @@
 							gf_dash_request_period_switch(mpdin->dash);
 							break;
 						}
-						gf_sleep(20);
+						gf_sleep(30);
 					}
 				} 
 				return GF_EOS;
 			}
-            gf_sleep(16);
+            gf_sleep(30);
         }
 	
 		nb_segments_cached = gf_dash_group_get_num_segments_ready(mpdin->dash, group_idx, &group_done);
-        if (nb_segments_cached < 2) {
+        if (nb_segments_cached < 1) {
             GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[MPD_IN] No more file in cache, EOS\n"));
             return GF_EOS;
         } else {
             GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Had to wait for %u ms for the only cache file to be downloaded\n", (gf_sys_clock() - timer)));
         }
 
-		if (discard_first_cache_entry) {
-			gf_dash_group_discard_segment(mpdin->dash, group_idx);
-		}
-
 		gf_dash_group_get_next_segment_location(mpdin->dash, group_idx, &param->url_query.next_url, &param->url_query.start_range, &param->url_query.end_range, 
-								&param->url_query.next_url_init_or_switch_segment, &param->url_query.switch_start_range , &param->url_query.switch_end_range,
+								NULL, &param->url_query.next_url_init_or_switch_segment, &param->url_query.switch_start_range , &param->url_query.switch_end_range,
 								&src_url);
 
         {
@@ -313,9 +317,11 @@
 
 GF_DASHFileIOSession mpdin_dash_io_create(GF_DASHFileIO *dashio, Bool persistent, const char *url)
 {
+	GF_DownloadSession *sess;
 	u32 flags = GF_NETIO_SESSION_NOT_THREADED;
 	GF_MPD_In *mpdin = (GF_MPD_In *)dashio->udta;
-	GF_DownloadSession *sess;
+	if (mpdin->memory_storage)
+		flags |= GF_NETIO_SESSION_MEMORY_CACHE;
 
 	if (persistent) flags |= GF_NETIO_SESSION_PERSISTENT;
 	sess = gf_term_download_new(mpdin->service, url, flags, NULL, NULL);
@@ -333,9 +339,9 @@
 {
 	return gf_dm_sess_setup_from_url((GF_DownloadSession *)session, url);
 }
-GF_Err mpdin_dash_io_set_range(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, u64 start_range, u64 end_range)
+GF_Err mpdin_dash_io_set_range(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, u64 start_range, u64 end_range, Bool discontinue_cache)
 {
-	return gf_dm_sess_set_range((GF_DownloadSession *)session, start_range, end_range);
+	return gf_dm_sess_set_range((GF_DownloadSession *)session, start_range, end_range, discontinue_cache);
 }
 GF_Err mpdin_dash_io_init(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
 {
@@ -404,8 +410,7 @@
 
 		/*select input services if possible*/
 		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
-			const char *mime, *init_segment;
-			
+			const char *mime, *init_segment;			
 			if (!gf_dash_is_group_selected(mpdin->dash, i))
 				continue;
 
@@ -422,7 +427,14 @@
 					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, 0);
 				} else {
+					u32 w, h;
 					group->service_connected = 1;
+					w = h = 0;
+					gf_dash_group_get_video_info(mpdin->dash, i, &w, &h);
+					if (w && h && w>mpdin->width && h>mpdin->height) {
+						mpdin->width = w;
+						mpdin->height = h;
+					}
 				}
 			}
 		}
@@ -455,8 +467,14 @@
 			gf_dash_set_group_udta(mpdin->dash, i, NULL);
 		}
 		mpdin->service->subservice_disconnect = 0;
+		return GF_OK;
 	}
 
+	if (dash_evt==GF_DASH_EVENT_BUFFERING) {
+		u32 tot, done;
+		gf_dash_get_buffer_info_buffering(mpdin->dash, &tot, &done);
+		fprintf(stderr, "DASH: Buffering %g%% out of %d ms\n", (100.0*done)/tot, tot);
+	}
 	return GF_OK;
 }
 
@@ -468,7 +486,7 @@
     GF_Err e;
 	u32 max_cache_duration, auto_switch_count;
 	GF_DASHInitialSelectionMode first_select_mode;
-	Bool keep_files, disable_switching;
+	Bool keep_files, disable_switching, enable_buffering;
 
     GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Service Connection request (%p) from terminal for %s\n", serv, url));
 
@@ -521,11 +539,27 @@
     else if (opt && !strcmp(opt, "minQuality")) first_select_mode = GF_DASH_SELECT_QUALITY_LOWEST;
     else if (opt && !strcmp(opt, "maxQuality")) first_select_mode = GF_DASH_SELECT_QUALITY_HIGHEST;
     else first_select_mode = GF_DASH_SELECT_BANDWIDTH_LOWEST;
+
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "MemoryStorage");
+	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "MemoryStorage", "no");
+	mpdin->memory_storage = (opt && !strcmp(opt, "yes")) ? 1 : 0;
+
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "UseMaxResolution");
+	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "UseMaxResolution", "yes");
+	mpdin->use_max_res = (!opt || !strcmp(opt, "yes")) ? 1 : 0;
+
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "ImmediateSwitching");
+	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "ImmediateSwitching", "no");
+	mpdin->immediate_switch = (opt && !strcmp(opt, "yes")) ? 1 : 0;
 	
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "EnableBuffering");
+	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "EnableBuffering", "yes");
+	enable_buffering = (opt && !strcmp(opt, "yes")) ? 1 : 0;
+
 	mpdin->in_seek = 0;
 	mpdin->previous_start_range = -1;
 
-	mpdin->dash = gf_dash_new(&mpdin->dash_io, max_cache_duration, auto_switch_count, keep_files, disable_switching, first_select_mode);
+	mpdin->dash = gf_dash_new(&mpdin->dash_io, max_cache_duration, auto_switch_count, keep_files, disable_switching, first_select_mode, enable_buffering);
 
 	if (!mpdin->dash) {
         GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD_IN] Error - cannot create DASH Client for %s\n", url));
@@ -533,9 +567,9 @@
 		return GF_OK;
 	}
 
- 	/*dash thread starts at the end of gf_dash_open */
+	/*dash thread starts at the end of gf_dash_open */
 	e = gf_dash_open(mpdin->dash, url);
-	if (!mpdin->dash) {
+	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD_IN] Error - cannot initialize DASH Client for %s: %s\n", url, gf_error_to_string(e) ));
         gf_term_on_connect(mpdin->service, NULL, e);
 		return GF_OK;
@@ -549,14 +583,17 @@
 	GF_MPD_In *mpdin = (GF_MPD_In*) plug->priv;
     GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Service Description request from terminal for %s\n", sub_url));
 	for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
+		GF_Descriptor *desc;
 		GF_MPDGroup *mudta;
 		if (!gf_dash_is_group_selected(mpdin->dash, i))
 			continue;
 		mudta = gf_dash_get_group_udta(mpdin->dash, i);
 		if (!mudta) continue;
 		if (mudta->service_descriptor_fetched) continue;
-		mudta->service_descriptor_fetched = 1;
-		return mudta->segment_ifce->GetServiceDescriptor(mudta->segment_ifce, expect_type, sub_url);
+
+		desc = mudta->segment_ifce->GetServiceDescriptor(mudta->segment_ifce, expect_type, sub_url);
+		if (desc) mudta->service_descriptor_fetched = 1;
+		return desc;
 	}
 	return NULL;
 }
@@ -612,8 +649,13 @@
 		}
         return GF_NOT_SUPPORTED;
 
+	case GF_NET_SERVICE_HAS_FORCED_VIDEO_SIZE:
+		com->par.width = mpdin->use_max_res ? mpdin->width : 0;
+		com->par.height = mpdin->use_max_res ? mpdin->height : 0;
+        return GF_OK;
+
 	case GF_NET_SERVICE_QUALITY_SWITCH:
-		gf_dash_switch_quality(mpdin->dash, com->switch_quality.up);
+		gf_dash_switch_quality(mpdin->dash, com->switch_quality.up, mpdin->immediate_switch);
         return GF_OK;
 	}
 	/*not supported*/

gpac-0.5.0.svn4192.tar.bz2/modules/mpegts_in/mpegts_in.c -> gpac-0.5.0.svn4296.tar.bz2/modules/mpegts_in/mpegts_in.c Changed

@@ -181,6 +181,10 @@
 		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
 		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_AVC;
 		break;
+	case GF_M2TS_VIDEO_HEVC:
+		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_HEVC;
+		break;
 	case GF_M2TS_AUDIO_MPEG1:
 		esd->decoderConfig->streamType = GF_STREAM_AUDIO;
 		esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_MPEG1;
@@ -191,6 +195,9 @@
 		break;
 	case GF_M2TS_AUDIO_LATM_AAC:
 	case GF_M2TS_AUDIO_AAC:
+	case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
+	case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
+	case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
 		if (!dsi) {
 			/*turn on parsing to get AAC config
 				NB: we removed "no file regulation" since we may get broken files where PMT declares an AAC stream but no AAC PID is in the MUX
@@ -512,6 +519,9 @@
 	case GF_M2TS_EVT_SL_PCK:
 		MP2TS_SendSLPacket(m2ts, param);
 		break;
+	case GF_M2TS_EVT_EOS:
+		gf_term_on_sl_packet(m2ts->service, ((GF_M2TS_PES *)param)->user, NULL, 0, NULL, GF_EOS);
+		break;
 	case GF_M2TS_EVT_AAC_CFG:
 	{
 		GF_M2TS_PES_PCK *pck = (GF_M2TS_PES_PCK*)param;
@@ -888,6 +898,9 @@
 				return desc;
 			}
 		}
+		/*if we expect scene, return NULL and repost a connection ack when we get the PMT*/
+		if (expect_type==GF_MEDIA_OBJECT_SCENE) 
+			return NULL;
 		if (m2ts->epg_requested) {
 			GF_ObjectDescriptor *od = M2TS_GenerateEPG_OD(m2ts);
 			m2ts->epg_requested = 0;
@@ -1155,8 +1168,8 @@
 			gf_free(prog);
 		}
 		gf_list_del(m2ts->ts->requested_progs);
+		m2ts->ts->requested_progs = NULL;
 	}
-	m2ts->ts->requested_progs = NULL;
 	if( m2ts->ts->requested_pids ){
 		count = gf_list_count(m2ts->ts->requested_pids);
 		for (i = 0; i < count; i++) {
@@ -1164,8 +1177,8 @@
 			gf_free(prog);
 		}
 		gf_list_del(m2ts->ts->requested_pids);
+		m2ts->ts->requested_pids = NULL;
 	}
-	m2ts->ts->requested_pids = NULL;
 	if (m2ts->network_buffer)
 		gf_free(m2ts->network_buffer);
 	m2ts->network_buffer = NULL;

gpac-0.5.0.svn4192.tar.bz2/modules/opensvc_dec/opensvc_dec.c -> gpac-0.5.0.svn4296.tar.bz2/modules/opensvc_dec/opensvc_dec.c Changed

@@ -182,12 +182,15 @@
 	OSVCDec *ctx = (OSVCDec*) ifcg->privateStack;
 	switch (capability.CapCode) {
 	case GF_CODEC_MEDIA_SWITCH_QUALITY:
+
 		if (capability.cap.valueInt) {
-			// set layer up (command=1)
-			UpdateLayer( ctx->DqIdTable, &ctx->CurrDqId, &ctx->TemporalCom, &ctx->TemporalId, ctx->MaxDqId, 1 );
+			if (ctx->CurrDqId < ctx->MaxDqId)
+				// set layer up (command=1)
+				UpdateLayer( ctx->DqIdTable, &ctx->CurrDqId, &ctx->TemporalCom, &ctx->TemporalId, ctx->MaxDqId, 1 );
 		} else {
-			// set layer down (command=0)
-			UpdateLayer( ctx->DqIdTable, &ctx->CurrDqId, &ctx->TemporalCom, &ctx->TemporalId, ctx->MaxDqId, 0 );
+			if (ctx->CurrDqId > 0)
+				// set layer down (command=0)
+				UpdateLayer( ctx->DqIdTable, &ctx->CurrDqId, &ctx->TemporalCom, &ctx->TemporalId, ctx->MaxDqId, 0 );
 		}
 		return GF_OK;
 	}
@@ -207,6 +210,7 @@
 	OPENSVCFRAME pic;
     int Layer[4];
 	OSVCDec *ctx = (OSVCDec*) ifcg->privateStack;
+	u32 curMaxDqId = ctx->MaxDqId;
 
 	if (!ES_ID || (ES_ID!=ctx->ES_ID) || !ctx->codec) {
 		*outBufferLength = 0;
@@ -217,25 +221,37 @@
 		return GF_BUFFER_TOO_SMALL;
 	}
 
+	ctx->MaxDqId = GetDqIdMax(inBuffer, inBufferLength, ctx->nalu_size_length, ctx->DqIdTable, ctx->nalu_size_length ? 1 : 0);
+	if(!ctx->InitParseAU){
+		if (ctx->MaxDqId == -1) {
+			//AVC stream in a h264 file 
+			ctx->MaxDqId = 0;
+		} else {
+			//Firts time only, we parse the first AU to know the file configuration
+			//does not need to ba called again ever after, unless SPS or PPS changed
+			ParseAuPlayers(ctx->codec, inBuffer, inBufferLength, ctx->nalu_size_length, ctx->nalu_size_length ? 1 : 0);
+		}
+		ctx->InitParseAU = 1;
+	}
+/*
+	if (curMaxDqId != ctx->MaxDqId)
+	{
+		if (ctx->MaxDqId == -1)
+			ctx->MaxDqId = 0;
+		else
+			ParseAuPlayers(ctx->codec, inBuffer, inBufferLength, ctx->nalu_size_length, ctx->nalu_size_length ? 1 : 0);
+		ctx->CurrDqId = ctx->MaxDqId;
+	}
+//	SetCommandLayer(Layer, ctx->MaxDqId, ctx->CurrDqId, &ctx->TemporalCom, ctx->TemporalId);
+*/
+	ctx->TemporalCom = 0;
+	SetCommandLayer(Layer, ctx->MaxDqId, ctx->MaxDqId, &ctx->TemporalCom, 0);
+
 	got_pic = 0;
 	if (ctx->nalu_size_length) {
 		u32 i, nalu_size = 0;
 		u8 *ptr = inBuffer;
 
-		ctx->MaxDqId = GetDqIdMax(inBuffer, inBufferLength, ctx->nalu_size_length, ctx->DqIdTable, 1);
-		if(!ctx->InitParseAU){
-			if (ctx->MaxDqId == -1) {
-				//AVC stream in a h264 file 
-				ctx->MaxDqId = 0;
-			} else {
-				//Firts time only, we parse the first AU to know the file configuration
-				//does not need to ba called again ever after, unless SPS or PPS changed
-				ParseAuPlayers(ctx->codec, inBuffer, inBufferLength, ctx->nalu_size_length, 1);
-			}
-			ctx->InitParseAU = 1;
-		}
-        SetCommandLayer(Layer, ctx->MaxDqId, ctx->CurrDqId, &ctx->TemporalCom, ctx->TemporalId);
-
 		while (inBufferLength) {
 			for (i=0; i<ctx->nalu_size_length; i++) {
 				nalu_size = (nalu_size<<8) + ptr[i];
@@ -256,7 +272,7 @@
 	}
 	if (got_pic!=1) return GF_OK;
 
-	if ((pic.Width != ctx->width) || (pic.Height!=ctx->height)) {
+	if ((curMaxDqId != ctx->MaxDqId) || (pic.Width != ctx->width) || (pic.Height!=ctx->height)) {
 		ctx->width = pic.Width;
 		ctx->stride = pic.Width + 32;
 		ctx->height = pic.Height;
@@ -289,6 +305,9 @@
 			GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
 			if (!cfg) return GF_CODEC_NOT_SUPPORTED;
 
+			if (esd->has_ref_base)
+				is_svc = 1;
+
 			/*decode all NALUs*/
 			count = gf_list_count(cfg->sequenceParameterSets);
 			for (i=0; i<count; i++) {

gpac-0.5.0.svn4192.tar.bz2/modules/platinum/GPACPlatinum.cpp -> gpac-0.5.0.svn4296.tar.bz2/modules/platinum/GPACPlatinum.cpp Changed

@@ -541,13 +541,13 @@
 	if (!prop_name) return JS_FALSE;
 
 	if (!strcmp(prop_name, "Name")) {
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, dev->m_device->GetFriendlyName()) );
+		VPASSIGN( STRING_TO_JSVAL( JS_NewStringCopyZ(c, dev->m_device->GetFriendlyName()) ) );
 	}
 	else if (!strcmp(prop_name, "UUID")) {
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, dev->m_device->GetUUID()) );
+		VPASSIGN( STRING_TO_JSVAL( JS_NewStringCopyZ(c, dev->m_device->GetUUID()) ) );
 	}
 	else if (!strcmp(prop_name, "PresentationURL")) {
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, dev->m_device->m_PresentationURL) );
+		VPASSIGN( STRING_TO_JSVAL( JS_NewStringCopyZ(c, dev->m_device->m_PresentationURL) )  );
 	}
 	else if (!strcmp(prop_name, "ServicesCount")) {
 		u32 count = gf_list_count(dev->m_Services);
@@ -555,7 +555,7 @@
 			dev->RefreshServiceList();
 			count = gf_list_count(dev->m_Services);
 		}
-		*vp = INT_TO_JSVAL(count);
+		VPASSIGN( INT_TO_JSVAL(count)  );
 	}
 	SMJS_FREE(c, prop_name);	
 	return JS_TRUE;
@@ -663,22 +663,22 @@
 	if (!prop_name) return JS_FALSE;
 
 	if (!strcmp(prop_name, "MediaRendererEnabled")) {
-		*vp = BOOLEAN_TO_JSVAL( upnp->m_pMediaRenderer ? JS_TRUE : JS_FALSE );
+		VPASSIGN( BOOLEAN_TO_JSVAL( upnp->m_pMediaRenderer ? JS_TRUE : JS_FALSE ) );
 	}
 	else if (!strcmp(prop_name, "MediaServerEnabled")) {
-		*vp = BOOLEAN_TO_JSVAL( upnp->m_pMediaServer ? JS_TRUE : JS_FALSE);
+		VPASSIGN( BOOLEAN_TO_JSVAL( upnp->m_pMediaServer ? JS_TRUE : JS_FALSE)	);
 	}
 	else if (!strcmp(prop_name, "MediaControlEnabled")) {
-		*vp = BOOLEAN_TO_JSVAL( upnp->m_pAVCtrlPoint ? JS_TRUE : JS_FALSE);
+		VPASSIGN( BOOLEAN_TO_JSVAL( upnp->m_pAVCtrlPoint ? JS_TRUE : JS_FALSE)	);
 	}
 	else if (!strcmp(prop_name, "MediaServersCount")) {
-		*vp = INT_TO_JSVAL( upnp->m_pAVCtrlPoint ? gf_list_count(upnp->m_pAVCtrlPoint->m_MediaServers) : 0);
+		VPASSIGN( INT_TO_JSVAL( upnp->m_pAVCtrlPoint ? gf_list_count(upnp->m_pAVCtrlPoint->m_MediaServers) : 0)	);
 	}
 	else if (!strcmp(prop_name, "MediaRenderersCount")) {
-		*vp = INT_TO_JSVAL( upnp->m_pAVCtrlPoint ? gf_list_count(upnp->m_pAVCtrlPoint->m_MediaRenderers) : 0);
+		VPASSIGN( INT_TO_JSVAL( upnp->m_pAVCtrlPoint ? gf_list_count(upnp->m_pAVCtrlPoint->m_MediaRenderers) : 0) );
 	}
 	else if (!strcmp(prop_name, "DevicesCount")) {
-		*vp = INT_TO_JSVAL( upnp->m_pGenericController ? gf_list_count(upnp->m_pGenericController->m_Devices) : 0);
+		VPASSIGN( INT_TO_JSVAL( upnp->m_pGenericController ? gf_list_count(upnp->m_pGenericController->m_Devices) : 0) );
 	}
 	SMJS_FREE(c, prop_name);
 	return JS_TRUE;
@@ -699,18 +699,18 @@
 	if (!prop_name) return JS_FALSE;
 
 	if (upnp->m_pMediaRenderer ) {
-		if (!strcmp(prop_name, "MovieDuration") && JSVAL_IS_DOUBLE(*vp)) {
+		if (!strcmp(prop_name, "MovieDuration") && JSVAL_IS_DOUBLE( VPGET() )) {
 			jsdouble d;
-			JS_ValueToNumber(c, *vp, &d);
+			JS_ValueToNumber(c, VPGET(), &d);
 			upnp->m_pMediaRenderer->SetDuration(d, 1);
 		}
-		else if (!strcmp(prop_name, "MovieTime") && JSVAL_IS_DOUBLE(*vp)) {
+		else if (!strcmp(prop_name, "MovieTime") && JSVAL_IS_DOUBLE( VPGET() )) {
 			jsdouble d;
-			JS_ValueToNumber(c, *vp, &d);
+			JS_ValueToNumber(c, VPGET(), &d);
 			upnp->m_pMediaRenderer->SetTime(d);
 		}
-		else if (!strcmp(prop_name, "MovieURL") && JSVAL_IS_STRING(*vp) ) {
-			char *url = SMJS_CHARS(c, *vp);
+		else if (!strcmp(prop_name, "MovieURL") && JSVAL_IS_STRING( VPGET() ) ) {
+			char *url = SMJS_CHARS(c, VPGET() );
 			if (url) upnp->m_pMediaRenderer->SetConnected(url);
 			SMJS_FREE(c, url);
 		}
@@ -1454,7 +1454,7 @@
 {
 	u32 i, count;
 	JSPropertySpec upnpClassProps[] = {
-		{0, 0, 0, 0, 0}
+		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 	};
 	JSFunctionSpec upnpClassFuncs[] = {
 		SMJS_FUNCTION_SPEC("BindRenderer", upnp_bind_renderer, 0),
@@ -1522,7 +1522,7 @@
 	
 	/*setup JS bindings*/
 	JSPropertySpec upnpDeviceClassProps[] = {
-		{0, 0, 0, 0, 0}
+		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 	};
 	JSFunctionSpec upnpDeviceClassFuncs[] = {
 		SMJS_FUNCTION_SPEC("FindService", upnp_device_find_service, 0),

gpac-0.5.0.svn4192.tar.bz2/modules/platinum/GPACPlatinum.h -> gpac-0.5.0.svn4296.tar.bz2/modules/platinum/GPACPlatinum.h Changed

gpac-0.5.0.svn4192.tar.bz2/modules/platinum/GenericDevice.cpp -> gpac-0.5.0.svn4296.tar.bz2/modules/platinum/GenericDevice.cpp Changed

gpac-0.5.0.svn4192.tar.bz2/modules/redirect_av/ffmpeg_ts_muxer.c -> gpac-0.5.0.svn4296.tar.bz2/modules/redirect_av/ffmpeg_ts_muxer.c Changed

@@ -1,6 +1,19 @@
 #include "ts_muxer.h"
 #include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
+
+#ifdef AVIO_FLAG_WRITE
+#include <libavutil/samplefmt.h>
+#define url_fopen avio_open
+#define url_fclose avio_close
+#define URL_WRONLY	AVIO_FLAG_WRITE
+#define av_write_header(__a)	avformat_write_header(__a, NULL)
+#define dump_format av_dump_format
+
+#define SAMPLE_FMT_S16 AV_SAMPLE_FMT_S16
+#endif
+
+
 #define STREAM_FRAME_RATE 25 /* 25 images/s */
 #define STREAM_NB_FRAMES  ((int)(STREAM_DURATION * STREAM_FRAME_RATE))
 #define STREAM_PIX_FMT PIX_FMT_YUV420P /* default pix_fmt */
@@ -221,13 +234,17 @@
 
     }
     //av_set_pts_info(ts->audio_st, 33, 1, audioBitRateInBitsPerSec);
-    /* set the output parameters (must be done even if no
+
+#ifndef AVIO_FLAG_WRITE
+	/* set the output parameters (must be done even if no
        parameters). */
     if (av_set_parameters(ts->oc, NULL) < 0) {
         fprintf(stderr, "Invalid output format parameters\n");
         return NULL;
     }
-    dump_format(ts->oc, 0, avr->destination, 1);
+#endif
+	
+	dump_format(ts->oc, 0, avr->destination, 1);
     GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[AVRedirect] DUMPING to %s...\n", ts->destination));
 
     if (avcodec_open(ts->video_st->codec, avr->videoCodec) < 0) {

gpac-0.5.0.svn4192.tar.bz2/modules/redirect_av/redirect_av.c -> gpac-0.5.0.svn4296.tar.bz2/modules/redirect_av/redirect_av.c Changed

gpac-0.5.0.svn4192.tar.bz2/modules/sdl_out/Makefile -> gpac-0.5.0.svn4296.tar.bz2/modules/sdl_out/Makefile Changed

gpac-0.5.0.svn4192.tar.bz2/modules/widgetman/widget.c -> gpac-0.5.0.svn4296.tar.bz2/modules/widgetman/widget.c Changed

gpac-0.5.0.svn4192.tar.bz2/modules/widgetman/widgetman.c -> gpac-0.5.0.svn4296.tar.bz2/modules/widgetman/widgetman.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/Makefile -> gpac-0.5.0.svn4296.tar.bz2/src/Makefile Changed

gpac-0.5.0.svn4192.tar.bz2/src/compositor/audio_input.c -> gpac-0.5.0.svn4296.tar.bz2/src/compositor/audio_input.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/compositor/audio_mixer.c -> gpac-0.5.0.svn4296.tar.bz2/src/compositor/audio_mixer.c Changed

@@ -52,6 +52,8 @@
 
 	Fixed speed;
 	Fixed pan[6];
+
+	Bool muted;
 } MixerInput;
 
 struct __audiomix
@@ -578,6 +580,7 @@
 		return 0;
 	}
 
+	single_source->muted = single_source->src->IsMuted(single_source->src->callback);
 	/*this happens if input SR cannot be mapped to output audio hardware*/
 	if (single_source->src->samplerate != am->sample_rate) goto do_mix;
 	/*note we don't check output cfg: if the number of channel is the same then the channel cfg is the 
@@ -590,7 +593,7 @@
 
 	ptr = (char *)buffer;
 	in_size = buffer_size;
-	is_muted = single_source->src->IsMuted(single_source->src->callback);
+	is_muted = single_source->muted;
 
 	while (buffer_size) {
 		data = single_source->src->FetchFrame(single_source->src->callback, &size, delay);
@@ -631,7 +634,8 @@
 	single_source = NULL;
 	for (i=0; i<count; i++) {
 		in = (MixerInput *)gf_list_get(am->sources, i);
-		if (in->src->IsMuted(in->src->callback)) continue;
+		in->muted = in->src->IsMuted(in->src->callback);
+		if (in->muted) continue;
 
 		if (in->buffer_size < nb_samples) { 
 			for (j=0; j<GF_SR_MAX_CHANNELS; j++) {
@@ -648,11 +652,16 @@
 
 		/*if cfg unknown or changed (AudioBuffer child...) invalidate cfg settings*/
 		if (!in->src->GetConfig(in->src, 0)) {
-			nb_act_src = 0;
-			am->must_reconfig = 1;
-			/*if main mixer reconfig asap*/
-			if (am->ar) gf_mixer_reconfig(am);
-			break;
+			if (!am->must_reconfig) {
+				am->must_reconfig = 1;
+				/*if main mixer reconfig asap*/
+				if (am->ar) gf_mixer_reconfig(am);
+			}
+			//however keep the current mixer config and output some audio ...
+//			nb_act_src = 0;
+//			break;
+			in->muted = 1;
+			continue;
 		} else if (in->speed==0) {
 			in->out_samples_to_write = 0;
 		} else {
@@ -690,6 +699,10 @@
 		/*fill*/
 		for (i=0; i<count; i++) {
 			in = (MixerInput *)gf_list_get(am->sources, i);
+			if (in->muted) {
+				in->out_samples_to_write = 0;
+				continue;
+			}
 			if (in->out_samples_to_write>in->out_samples_written) {
 				gf_mixer_fetch_input(am, in, delay + 8000 * i / am->bits_per_sample / am->sample_rate / am->nb_channels);
 				if (in->out_samples_to_write>in->out_samples_written) nb_to_fill++;
@@ -698,6 +711,7 @@
 		/*release - this is done in 2 steps in case 2 audio object use the same source...*/
 		for (i=0; i<count; i++) {
 			in = (MixerInput *)gf_list_get(am->sources, i);
+			if (in->muted) continue;
 			if (in->in_bytes_used) in->src->ReleaseFrame(in->src->callback, in->in_bytes_used-1);
 			in->in_bytes_used = 0;
 		}

gpac-0.5.0.svn4192.tar.bz2/src/compositor/audio_render.c -> gpac-0.5.0.svn4296.tar.bz2/src/compositor/audio_render.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/compositor/compositor.c -> gpac-0.5.0.svn4296.tar.bz2/src/compositor/compositor.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/compositor/compositor_2d.c -> gpac-0.5.0.svn4296.tar.bz2/src/compositor/compositor_2d.c Changed

@@ -783,6 +783,8 @@
 
 GF_Err compositor_2d_set_aspect_ratio(GF_Compositor *compositor)
 {
+	u32 old_vp_width, old_vp_height;
+	Bool changed = 0;
 	Double ratio;
 	GF_Event evt;
 	GF_Err e;
@@ -793,6 +795,9 @@
 	compositor->vp_x = compositor->vp_y = 0;
 	scaleX = scaleY = FIX_ONE;
 
+	old_vp_width = compositor->vp_width;
+	old_vp_height = compositor->vp_height;
+
 	/*force complete clean*/
 	compositor->traverse_state->invalidate_all = 1;
 
@@ -892,14 +897,23 @@
 	}
 #endif
 
+	if (compositor->was_system_memory != evt.setup.system_memory) changed = 1;
+	else if (old_vp_width != compositor->vp_width) changed=1;
+	else if (old_vp_height != compositor->vp_height) changed=1;
+	else if (compositor->was_opengl != evt.setup.opengl_mode) changed=1;
+	
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor2D] Reconfiguring display size %d x %d - opengl %s - use %s memory\n", evt.setup.width, evt.setup.height,
-		(evt.setup.opengl_mode==2) ? "Offscreen" : (evt.setup.opengl_mode==1) ? "yes" : "no", evt.setup.system_memory ? "systems" : "video"
-		));
+	if (changed) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor2D] Reconfiguring display size %d x %d - opengl %s - use %s memory\n", evt.setup.width, evt.setup.height,
+			(evt.setup.opengl_mode==2) ? "Offscreen" : (evt.setup.opengl_mode==1) ? "yes" : "no", evt.setup.system_memory ? "systems" : "video"
+			));
 
-	e = compositor->video_out->ProcessEvent(compositor->video_out, &evt);
-	if (e) return e;
+		e = compositor->video_out->ProcessEvent(compositor->video_out, &evt);
+		if (e) return e;
 
+		compositor->was_opengl = evt.setup.opengl_mode;
+		compositor->was_system_memory = evt.setup.system_memory;		
+	}
 	if (compositor->has_size_info) {
 		compositor->traverse_state->vp_size.x = INT2FIX(compositor->scene_width);
 		compositor->traverse_state->vp_size.y = INT2FIX(compositor->scene_height);
@@ -907,6 +921,7 @@
 		compositor->traverse_state->vp_size.x = INT2FIX(compositor->output_width);
 		compositor->traverse_state->vp_size.y = INT2FIX(compositor->output_height);
 	}
+
 	/*set scale factor*/
 	compositor_set_ar_scale(compositor, scaleX, scaleY);
 	return GF_OK;

gpac-0.5.0.svn4192.tar.bz2/src/compositor/texturing.c -> gpac-0.5.0.svn4296.tar.bz2/src/compositor/texturing.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/export.cpp -> gpac-0.5.0.svn4296.tar.bz2/src/export.cpp Changed

@@ -84,8 +84,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
 
 /* Memory */
 #ifdef GPAC_MEMORY_TRACKING
@@ -167,6 +169,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_position) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_refreshed_size) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_set_output_buffering) )
 
 /* Thread */
 #pragma comment (linker, EXPORT_SYMBOL(gf_th_new) )
@@ -236,6 +239,7 @@
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_init) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_cfg_force_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_remove) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_save) )
@@ -249,7 +253,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_insert_key) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_del_section) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_get_filename) )
-
+#pragma comment (linker, EXPORT_SYMBOL(gf_cfg_set_filename) )
 
 #ifndef GPAC_DISABLE_PLAYER
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_new) )
@@ -618,6 +622,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_sync) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_edit_list_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_edit_segment_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_edit_segment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_copyright_count) )
@@ -633,6 +638,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_decoder_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_reference_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_reference) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_reference_ID) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_track_reference) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_filename) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_brand_info) )
@@ -661,9 +667,11 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_ismacryp_media) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_ismacryp_delete_sample) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_ismacryp_sample) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_avc_svc_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_avc_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_svc_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_3gp_config_get) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_hevc_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_meta_item_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_meta_item_by_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_meta_item_info) )
@@ -691,7 +699,9 @@
 #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_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) )
 
 # ifndef GPAC_DISABLE_ISOM_DUMP
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_dump) )
@@ -720,6 +730,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_creation_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_enabled) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_id) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_rewrite_track_dependencies) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_sample) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_sample_shadow) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_append_sample_data) )
@@ -845,6 +856,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sample_rap_group) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sample_roll_group) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_composition_offset_mode) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_output_buffering) )
+
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_setup_hint_track) )
@@ -890,12 +903,14 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_append_sdp) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_append_sdp_extended) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_append_sdp_decoding_dependency) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_send_au) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_send_au_with_sn) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_send_data) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_format_sdp_header) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_disable_auto_rtcp) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_send_rtcp) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_get_payload_type) )
 
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_streamer_new) )
@@ -1073,6 +1088,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_import_chapters) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_change_pl) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_avc_rewrite_samples) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_split_svc) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_merge_svc) )
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -1081,6 +1098,7 @@
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 #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) )
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
@@ -1608,6 +1626,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_set_pes_framing) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_get_stream_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_crc32_check) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_restamp) )
+
 
 /* carousel.h */
 #ifdef GPAC_ENABLE_DSMCC
@@ -1670,15 +1690,16 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_wget_with_cache) )
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_mpd_start) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_mpd_end) )
+/*to be removed once TS fragmenter is moved to libgpac */
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_mpd_format_segment_name) )
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_fragment_file) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_segment_file) )
 #endif
 #endif
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_segment_files) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_next_update_time) )
+
 /* dvb_mpe.h */
 #ifdef GPAC_ENST_PRIVATE
 #pragma comment (linker, EXPORT_SYMBOL(gf_dvb_mpe_section_del) )
@@ -1721,6 +1742,17 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_segment_switch_forced) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_current_segment_start_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_presentation_time_offset) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_video_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_representation_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_buffer_info_buffering) )
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_vps) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_sps) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_pps) )
+#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_media_nalu_next_start_code) )
 
 #endif

gpac-0.5.0.svn4192.tar.bz2/src/ietf/rtp_packetizer.c -> gpac-0.5.0.svn4296.tar.bz2/src/ietf/rtp_packetizer.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/ietf/rtp_streamer.c -> gpac-0.5.0.svn4296.tar.bz2/src/ietf/rtp_streamer.c Changed

@@ -295,6 +295,12 @@
 			rtp_type = GF_RTP_PAYT_H264_AVC;
 			PL_ID = 0x0F;
 			break;
+		/*H264-SVC*/
+		case GPAC_OTI_VIDEO_SVC:
+			required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
+			rtp_type = GF_RTP_PAYT_H264_SVC;
+			PL_ID = 0x0F;
+			break;
 		}
 		break;
 
@@ -342,6 +348,8 @@
 			break;
 		case GF_ISOM_SUBTYPE_AVC_H264:
 		case GF_ISOM_SUBTYPE_AVC2_H264:
+		case GF_ISOM_SUBTYPE_AVC3_H264:
+		case GF_ISOM_SUBTYPE_AVC4_H264:
 		case GF_ISOM_SUBTYPE_SVC_H264:
 		{
 			required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
@@ -572,7 +580,7 @@
 		sprintf(sdpLine, "a=fmtp:%d maxptime=%d\n", rtp->packetizer->PayloadType, rtp->packetizer->auh_size*20);
 	}
 	/*H264/AVC*/
-	else if (rtp->packetizer->rtp_payt == GF_RTP_PAYT_H264_AVC) {
+	else if (rtp->packetizer->rtp_payt == GF_RTP_PAYT_H264_AVC || rtp->packetizer->rtp_payt == GF_RTP_PAYT_H264_SVC) {
 		GF_AVCConfig *avcc = dsi ? gf_odf_avc_cfg_read(dsi, dsi_len) : NULL;
 
 		if (avcc) {
@@ -672,6 +680,42 @@
 } 
 
 GF_EXPORT
+GF_Err gf_rtp_streamer_append_sdp_decoding_dependency(GF_ISOFile *isofile, u32 isotrack, u8 *payload_type, char **out_sdp_buffer) 
+{
+	u32 size, i, ref_track;
+	s32 count;
+	char sdp[20000], sdpLine[10000];
+
+	sprintf(sdp, "a=mid:L%d\n", isotrack);
+
+	count = gf_isom_get_reference_count(isofile, isotrack, GF_ISOM_REF_SCAL);
+	if (count > 0)
+	{
+		sprintf(sdpLine, "a=depend:%d lay", payload_type[isotrack-1]);
+		strcat(sdp, sdpLine);
+		for (i = 0; i < (u32) count; i++) 
+		{
+			gf_isom_get_reference(isofile, isotrack, GF_ISOM_REF_SCAL, i+1, &ref_track);
+			sprintf(sdpLine, " L%d:%d", ref_track, payload_type[ref_track-1]);
+			strcat(sdp, sdpLine);
+		}
+		strcat(sdp, "\n");
+	}
+
+	size = strlen(sdp) + (*out_sdp_buffer ? strlen(*out_sdp_buffer) : 0) + 1;
+	if ( !*out_sdp_buffer) {
+		*out_sdp_buffer = gf_malloc(sizeof(char)*size);
+		if (! *out_sdp_buffer) return GF_OUT_OF_MEM;
+		strcpy(*out_sdp_buffer, sdp);
+	} else {
+		*out_sdp_buffer = gf_realloc(*out_sdp_buffer, sizeof(char)*size);
+		if (! *out_sdp_buffer) return GF_OUT_OF_MEM;
+		strcat(*out_sdp_buffer, sdp);
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
 char *gf_rtp_streamer_format_sdp_header(char *app_name, char *ip_dest, char *session_name, char *iod64)
 {
 	u64 size;
@@ -743,5 +787,11 @@
 	return gf_rtp_send_rtcp_report(streamer->channel, NULL, NULL);
 }
 
+GF_EXPORT
+u8 gf_rtp_streamer_get_payload_type(GF_RTPStreamer *streamer)
+{
+	return streamer->packetizer->PayloadType;
+}
+
 #endif /*GPAC_DISABLE_STREAMING && GPAC_DISABLE_ISOM*/

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/avc_ext.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/avc_ext.c Changed

@@ -32,6 +32,374 @@
 
 #ifndef GPAC_DISABLE_ISOM
 
+
+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 0;
+	if (_entry->type==GF_ISOM_BOX_TYPE_GNRV) return 0;
+	entry = (GF_MPEGVisualSampleEntryBox*)_entry;
+	if (!entry) return 0;
+	if (entry->avc_config || entry->svc_config || entry->hevc_config) return 1;
+	return 0;
+}
+
+
+static void rewrite_nalus_list(GF_List *nalus, GF_BitStream *bs, Bool rewrite_start_codes, u32 nal_unit_size_field)
+{
+	u32 i, count = gf_list_count(nalus);
+	for (i=0; i<count; i++) {
+		GF_AVCConfigSlot *sl = gf_list_get(nalus, i);
+		if (rewrite_start_codes) gf_bs_write_u32(bs, 1);
+		else gf_bs_write_int(bs, sl->size, 8*nal_unit_size_field);
+		gf_bs_write_data(bs, sl->data, sl->size);
+	}				
+}
+
+static void merge_nalus_list(GF_List  *src, GF_List *dst)
+{
+	u32 i, count = gf_list_count(src);
+	for (i=0; i<count; i++) {
+		void *p = gf_list_get(src, i);
+		if (p) gf_list_insert(dst, p, 0);
+	}
+}
+
+static void merge_nalus(GF_MPEGVisualSampleEntryBox *entry, GF_List *sps, GF_List *pps)
+{
+	if (entry->avc_config) {
+		merge_nalus_list(entry->avc_config->config->sequenceParameterSets, sps);
+		merge_nalus_list(entry->avc_config->config->sequenceParameterSetExtensions, sps);
+		merge_nalus_list(entry->avc_config->config->pictureParameterSets, pps);
+	}
+	if (entry->svc_config) {
+		merge_nalus_list(entry->svc_config->config->sequenceParameterSets, sps);
+		merge_nalus_list(entry->svc_config->config->pictureParameterSets, pps);
+	}
+}
+
+
+/* Rewrite mode:
+ * mode = 0: playback
+ * mode = 1: streaming
+ */
+GF_Err gf_isom_nalu_sample_rewrite(GF_MediaBox *mdia, GF_ISOSample *sample, u32 sampleNumber, GF_MPEGVisualSampleEntryBox *entry)
+{
+	Bool is_hevc = 0;
+	GF_Err e = GF_OK;
+	GF_ISOSample *ref_samp;
+	GF_BitStream *src_bs, *ref_bs, *dst_bs;
+	u64 offset;
+	u32 ref_nalu_size, data_offset, data_length, copy_size, nal_size, max_size, di, nal_unit_size_field, cur_extract_mode, extractor_mode;
+	Bool rewrite_ps, rewrite_start_codes;
+	u8 ref_track_ID, ref_track_num;
+	s8 sample_offset, nal_type;
+	u32 nal_hdr;
+	char *buffer;
+	GF_ISOFile *file = mdia->mediaTrack->moov->mov;
+
+	src_bs = ref_bs = dst_bs = NULL;
+	ref_samp = NULL;
+	buffer = NULL;
+	rewrite_ps = (mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG) ? 1 : 0;
+	if (! sample->IsRAP) rewrite_ps = 0;
+	rewrite_start_codes = (mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG) ? 1 : 0;
+	extractor_mode = mdia->mediaTrack->extractor_mode&0x0000FFFF;
+
+	if (extractor_mode == GF_ISOM_NALU_EXTRACT_INSPECT) {
+		if (!rewrite_ps && !rewrite_start_codes)
+			return GF_OK;
+	}
+
+	if (!entry) return GF_BAD_PARAM;
+	nal_unit_size_field = 0;
+	/*if svc rewrire*/
+	if (entry->svc_config && entry->svc_config->config) nal_unit_size_field = entry->svc_config->config->nal_unit_size;
+	/*if mvc rewrire*/
+
+	/*otherwise do nothing*/
+	else if (!rewrite_ps && !rewrite_start_codes) {
+		return GF_OK;
+	}
+
+	if (!nal_unit_size_field) {
+		if (entry->avc_config) nal_unit_size_field = entry->avc_config->config->nal_unit_size;
+		else if (entry->hevc_config) {
+			nal_unit_size_field = entry->hevc_config->config->nal_unit_size;
+			is_hevc = 1;
+		}
+	}
+	if (!nal_unit_size_field) return GF_ISOM_INVALID_FILE;
+
+	dst_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	src_bs = gf_bs_new(sample->data, sample->dataLength, GF_BITSTREAM_READ);
+	max_size = 4096;
+
+	/*rewrite start code with NALU delim*/
+	if (rewrite_start_codes) {
+		gf_bs_write_int(dst_bs, 1, 32);
+		if (is_hevc) {
+			gf_bs_write_int(dst_bs, 0, 1);
+			gf_bs_write_int(dst_bs, GF_HEVC_NALU_ACCESS_UNIT, 6);
+			gf_bs_write_int(dst_bs, 0, 9);
+			/*pic-type - by default we signal all slice types possible*/
+			gf_bs_write_int(dst_bs, 2, 3);
+			gf_bs_write_int(dst_bs, 0, 5);
+		} else {
+			gf_bs_write_int(dst_bs, (sample->data[0] & 0x60) | GF_AVC_NALU_ACCESS_UNIT, 8);
+			gf_bs_write_int(dst_bs, 0xF0 , 8); /*7 "all supported NALUs" (=111) + rbsp trailing (10000)*/;
+		}
+	}
+
+	if (rewrite_ps) {
+		if (is_hevc) {
+			u32 i, count;
+			count = gf_list_count(entry->hevc_config->config->param_array);
+			for (i=0; i<count; i++) {
+				GF_HEVCParamArray *ar = gf_list_get(entry->hevc_config->config->param_array, i);
+				rewrite_nalus_list(ar->nalus, dst_bs, rewrite_start_codes, nal_unit_size_field);
+			}
+
+			/*little optimization if we are not asked to start codes: copy over the sample*/
+			if (!rewrite_start_codes) {
+				gf_bs_write_data(dst_bs, sample->data, sample->dataLength);
+				gf_free(sample->data);
+				sample->data = NULL;
+				gf_bs_get_content(dst_bs, &sample->data, &sample->dataLength);
+				gf_bs_del(src_bs);
+				gf_bs_del(dst_bs);
+				return GF_OK;
+			}
+		} else {
+
+			/*this is an SVC track: get all SPS/PPS from this track down to the base layer and rewrite them*/
+			if (mdia->mediaTrack->has_base_layer) {
+				u32 j;
+				GF_List *nalu_sps = gf_list_new();
+				GF_List *nalu_pps = gf_list_new();
+				GF_TrackReferenceTypeBox *dpnd = NULL;
+				Track_FindRef(mdia->mediaTrack, GF_ISOM_REF_SCAL, &dpnd);
+
+#if 0
+				/*get all upper layers with SCAL reference to this track*/
+				for (j = 0; j < gf_isom_get_track_count(file); j++) {
+					if (gf_isom_has_track_reference(file, j+1, GF_ISOM_REF_SCAL, mdia->mediaTrack->Header->trackID)) {
+						u32 tkID;
+						GF_TrackBox *base_track;
+						GF_MPEGVisualSampleEntryBox *base_entry;
+						gf_isom_get_reference_ID(file, j+1, GF_ISOM_REF_SCAL, 1, &tkID);
+						
+						base_track = GetTrackbyID(mdia->mediaTrack->moov, tkID);
+						base_entry = base_track ? gf_list_get(base_track->Media->information->sampleTable->SampleDescription->other_boxes, 0) : NULL;
+						if (base_entry)
+							merge_nalus(base_entry, nalu_sps, nalu_pps);
+					}
+				}
+
+#endif
+
+				merge_nalus(entry, nalu_sps, nalu_pps);
+				if (dpnd) {
+					for (j=0; j<dpnd->trackIDCount; j++) {
+						GF_TrackBox *base_track = GetTrackbyID(mdia->mediaTrack->moov, dpnd->trackIDs[j]);
+						GF_MPEGVisualSampleEntryBox *base_entry = base_track ? gf_list_get(base_track->Media->information->sampleTable->SampleDescription->other_boxes, 0) : NULL;
+						if (base_entry)
+							merge_nalus(base_entry, nalu_sps, nalu_pps);
+					}
+				}
+
+				//rewrite nalus
+				rewrite_nalus_list(nalu_sps, dst_bs, rewrite_start_codes, nal_unit_size_field);
+				rewrite_nalus_list(nalu_pps, dst_bs, rewrite_start_codes, nal_unit_size_field);
+
+				gf_list_del(nalu_sps);
+				gf_list_del(nalu_pps);
+			} else {
+
+				if (entry->avc_config) {
+					rewrite_nalus_list(entry->avc_config->config->sequenceParameterSets, dst_bs, rewrite_start_codes, nal_unit_size_field);
+					rewrite_nalus_list(entry->avc_config->config->pictureParameterSets, dst_bs, rewrite_start_codes, nal_unit_size_field);
+					rewrite_nalus_list(entry->avc_config->config->sequenceParameterSetExtensions, dst_bs, rewrite_start_codes, nal_unit_size_field);
+				}
+
+				/*add svc config */
+				if (entry->svc_config) {
+					rewrite_nalus_list(entry->svc_config->config->sequenceParameterSets, dst_bs, rewrite_start_codes, nal_unit_size_field);
+					rewrite_nalus_list(entry->svc_config->config->pictureParameterSets, dst_bs, rewrite_start_codes, nal_unit_size_field);
+				}
+
+				/*little optimization if we are not asked to rewrite extractors or start codes: copy over the sample*/
+				if (!entry->svc_config && !rewrite_start_codes) {
+					gf_bs_write_data(dst_bs, sample->data, sample->dataLength);
+					gf_free(sample->data);
+					sample->data = NULL;
+					gf_bs_get_content(dst_bs, &sample->data, &sample->dataLength);
+					gf_bs_del(src_bs);
+					gf_bs_del(dst_bs);
+					return GF_OK;
+				}
+			
+			}
+		}
+	}
+
+	buffer = (char *)gf_malloc(sizeof(char)*max_size);
+
+	while (gf_bs_available(src_bs))
+	{
+		nal_size = gf_bs_read_int(src_bs, 8*nal_unit_size_field);
+		if (nal_size>max_size) {
+			buffer = (char*) gf_realloc(buffer, sizeof(char)*nal_size);
+			max_size = nal_size;
+		}
+		if (is_hevc) {
+			nal_hdr = gf_bs_read_u16(src_bs);
+			nal_type = (nal_hdr&0x7E00) >> 9;
+		} else {
+			nal_hdr = gf_bs_read_u8(src_bs);
+			nal_type = nal_hdr & 0x1F;
+		} 
+
+		if (is_hevc) {
+			/*we already wrote this stuff*/
+			if (nal_type==GF_HEVC_NALU_ACCESS_UNIT) {
+				gf_bs_skip_bytes(src_bs, nal_size-2);
+				continue;
+			}
+
+			/*rewrite nal*/
+			gf_bs_read_data(src_bs, buffer, nal_size-2);
+			if (rewrite_start_codes) 
+				gf_bs_write_u32(dst_bs, 1);
+			else
+				gf_bs_write_int(dst_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);
+
+			continue;
+		} 
+		
+		/*we already wrote this stuff*/
+		if (nal_type==GF_AVC_NALU_ACCESS_UNIT) {
+			gf_bs_skip_bytes(src_bs, nal_size-1);
+			continue;
+		}
+
+		//extractor
+		if (nal_type == 31) {
+			switch (extractor_mode) {
+			case 0:
+				gf_bs_read_int(src_bs, 24); //3 bytes of NALUHeader in extractor
+				ref_track_ID = gf_bs_read_u8(src_bs);
+				sample_offset = (s8) gf_bs_read_int(src_bs, 8);
+				data_offset = gf_bs_read_u32(src_bs);
+				data_length = gf_bs_read_u32(src_bs);
+
+				ref_track_num = gf_isom_get_track_by_id(file, ref_track_ID);
+				if (!ref_track_num) {
+					e = GF_BAD_PARAM;
+					goto exit;
+				}
+				cur_extract_mode = gf_isom_get_nalu_extract_mode(file, ref_track_num);
+				gf_isom_set_nalu_extract_mode(file, ref_track_num, GF_ISOM_NALU_EXTRACT_INSPECT);
+				ref_samp = gf_isom_get_sample(file, ref_track_num, sampleNumber+sample_offset, &di);
+				if (!ref_samp) {
+					e = GF_IO_ERR;
+					goto exit;
+				}
+				ref_bs = gf_bs_new(ref_samp->data, ref_samp->dataLength, GF_BITSTREAM_READ);
+				offset = 0;
+				while (gf_bs_available(ref_bs)) {
+					if (gf_bs_get_position(ref_bs) < data_offset) {
+						ref_nalu_size = gf_bs_read_int(ref_bs, 8*nal_unit_size_field);
+						offset += ref_nalu_size + nal_unit_size_field;
+						if ((offset > data_offset) || (offset >= gf_bs_get_size(ref_bs))) {
+							e = GF_BAD_PARAM;
+							goto exit;
+						}
+
+						e = gf_bs_seek(ref_bs, offset);
+						if (e)
+							goto exit;
+						continue;
+					}
+					ref_nalu_size = gf_bs_read_int(ref_bs, 8*nal_unit_size_field);
+					copy_size = data_length ? data_length : ref_nalu_size;
+					assert(copy_size <= ref_nalu_size);
+					nal_hdr = gf_bs_read_u8(ref_bs); //rewrite NAL type
+					if ((copy_size-1)>max_size) {
+						buffer = (char*)gf_realloc(buffer, sizeof(char)*(copy_size-1));
+						max_size = copy_size-1;
+					}			
+					gf_bs_read_data(ref_bs, buffer, copy_size-1);
+
+					if (rewrite_start_codes) 
+						gf_bs_write_u32(dst_bs, 1);
+					else
+						gf_bs_write_int(dst_bs, copy_size, 8*nal_unit_size_field);
+
+					gf_bs_write_u8(dst_bs, nal_hdr);
+					gf_bs_write_data(dst_bs, buffer, copy_size-1);
+				}
+
+				gf_isom_sample_del(&ref_samp);
+				ref_samp = NULL;
+				gf_bs_del(ref_bs);
+				ref_bs = NULL;
+				gf_isom_set_nalu_extract_mode(file, ref_track_num, cur_extract_mode);
+				break;
+			default:
+				//skip to end of this NALU
+				gf_bs_skip_bytes(src_bs, nal_size-1);
+				continue;
+			}
+		} else {
+			gf_bs_read_data(src_bs, buffer, nal_size-1);
+			if (rewrite_start_codes) 
+				gf_bs_write_u32(dst_bs, 1);
+			else
+				gf_bs_write_int(dst_bs, nal_size, 8*nal_unit_size_field);
+
+			gf_bs_write_u8(dst_bs, nal_hdr);
+			gf_bs_write_data(dst_bs, buffer, nal_size-1);
+		}
+	}
+	/*done*/
+	gf_free(sample->data);
+	sample->data = NULL;
+	gf_bs_get_content(dst_bs, &sample->data, &sample->dataLength);
+
+exit:
+	if (ref_samp) gf_isom_sample_del(&ref_samp);
+	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 (buffer) gf_free(buffer);
+	return e;
+}
+
+GF_HEVCConfig *HEVC_DuplicateConfig(GF_HEVCConfig *cfg)
+{
+	char *data;
+	u32 data_size;
+	GF_HEVCConfig *new_cfg;
+	GF_BitStream *bs;
+	
+	if (!cfg) return NULL;
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	gf_odf_hevc_cfg_write_bs(cfg, bs);
+
+	gf_bs_get_content(bs, &data, &data_size);
+	gf_bs_del(bs);
+	bs = gf_bs_new(data, data_size, GF_BITSTREAM_READ);
+
+	new_cfg = gf_odf_hevc_cfg_read_bs(bs);
+	gf_bs_del(bs);
+	gf_free(data);
+	return new_cfg;
+}
+
 static GF_AVCConfig *AVC_DuplicateConfig(GF_AVCConfig *cfg)
 {
 	u32 i, count;
@@ -128,14 +496,41 @@
 			gf_odf_avc_cfg_write(avcc, &avc->emul_esd->decoderConfig->decoderSpecificInfo->data, &avc->emul_esd->decoderConfig->decoderSpecificInfo->dataLength);
 			gf_odf_avc_cfg_del(avcc);
 		}
-	} else {
+	} else if (avc->svc_config) {
 		svcc = AVC_DuplicateConfig(avc->svc_config->config);
 		gf_odf_avc_cfg_write(svcc, &avc->emul_esd->decoderConfig->decoderSpecificInfo->data, &avc->emul_esd->decoderConfig->decoderSpecificInfo->dataLength);
 		gf_odf_avc_cfg_del(svcc);
 	}
 }
 
-GF_Err AVC_UpdateESD(GF_MPEGVisualSampleEntryBox *avc, GF_ESD *esd)
+void HEVC_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *hevc)
+{
+	if (hevc->emul_esd) gf_odf_desc_del((GF_Descriptor *)hevc->emul_esd);
+	hevc->emul_esd = gf_odf_desc_esd_new(2);
+	hevc->emul_esd->decoderConfig->streamType = GF_STREAM_VISUAL;
+	hevc->emul_esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_HEVC;
+	if (hevc->bitrate) {
+		hevc->emul_esd->decoderConfig->bufferSizeDB = hevc->bitrate->bufferSizeDB;
+		hevc->emul_esd->decoderConfig->avgBitrate = hevc->bitrate->avgBitrate;
+		hevc->emul_esd->decoderConfig->maxBitrate = hevc->bitrate->maxBitrate;
+	}
+	if (hevc->descr) {
+		u32 i=0; 
+		GF_Descriptor *desc,*clone;
+		i=0;
+		while ((desc = (GF_Descriptor *)gf_list_enum(hevc->descr->descriptors, &i))) {
+			clone = NULL;
+			gf_odf_desc_copy(desc, &clone);
+			if (gf_odf_desc_add_desc((GF_Descriptor *)hevc->emul_esd, clone) != GF_OK) 
+				gf_odf_desc_del(clone);
+		}
+	}
+	if (hevc->hevc_config && hevc->hevc_config->config) {
+		gf_odf_hevc_cfg_write(hevc->hevc_config->config, &hevc->emul_esd->decoderConfig->decoderSpecificInfo->data, &hevc->emul_esd->decoderConfig->decoderSpecificInfo->dataLength);
+	}
+}
+
+GF_Err AVC_HEVC_UpdateESD(GF_MPEGVisualSampleEntryBox *avc, GF_ESD *esd)
 {
 	if (!avc->bitrate) avc->bitrate = (GF_MPEG4BitRateBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_BTRT);
 	if (avc->descr) gf_isom_box_del((GF_Box *) avc->descr);
@@ -178,14 +573,27 @@
 
 	/*update GF_AVCConfig*/
 	if (!avc->svc_config) {
-		if (!avc->avc_config) avc->avc_config = (GF_AVCConfigurationBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_AVCC);
-		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-			if (avc->avc_config->config) gf_odf_avc_cfg_del(avc->avc_config->config);
-			avc->avc_config->config = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+		if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) {
+			if (!avc->hevc_config) avc->hevc_config = (GF_HEVCConfigurationBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_HVCC);
+			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
+				if (avc->hevc_config->config) gf_odf_hevc_cfg_del(avc->hevc_config->config);
+				avc->hevc_config->config = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+			}
+		} else {
+			if (!avc->avc_config) avc->avc_config = (GF_AVCConfigurationBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_AVCC);
+			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
+				if (avc->avc_config->config) gf_odf_avc_cfg_del(avc->avc_config->config);
+				avc->avc_config->config = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+			}
 		}
-		gf_odf_desc_del((GF_Descriptor *)esd);
+
+	}
+	gf_odf_desc_del((GF_Descriptor *)esd);
+	if (avc->hevc_config) {
+		HEVC_RewriteESDescriptor(avc);
+	} else {
+		AVC_RewriteESDescriptor(avc);
 	}
-	AVC_RewriteESDescriptor(avc);
 	return GF_OK;
 }
 
@@ -234,12 +642,14 @@
 	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 || !DescriptionIndex) return GF_BAD_PARAM;
+	if (!trak || !trak->Media || !DescriptionIndex) return GF_BAD_PARAM;
 	entry = (GF_MPEGVisualSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex-1);
 	if (!entry) return GF_BAD_PARAM;
 	switch (entry->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:
 		break;
 	default:
@@ -249,6 +659,7 @@
 	switch (op_type) {
 	/*AVCC replacement*/
 	case 0:
+		if (!cfg) return GF_BAD_PARAM;
 		if (!entry->avc_config) entry->avc_config = (GF_AVCConfigurationBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_AVCC);
 		if (entry->avc_config->config) gf_odf_avc_cfg_del(entry->avc_config->config);
 		entry->avc_config->config = AVC_DuplicateConfig(cfg);
@@ -256,6 +667,7 @@
 		break;
 	/*SVCC replacement*/
 	case 1:
+		if (!cfg) return GF_BAD_PARAM;
 		if (!entry->svc_config) entry->svc_config = (GF_AVCConfigurationBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_SVCC);
 		if (entry->svc_config->config) gf_odf_avc_cfg_del(entry->svc_config->config);
 		entry->svc_config->config = AVC_DuplicateConfig(cfg);
@@ -263,6 +675,7 @@
 		break;
 	/*SVCC replacement and AVC removal*/
 	case 2:
+		if (!cfg) return GF_BAD_PARAM;
 		if (entry->avc_config) {
 			gf_isom_box_del((GF_Box*)entry->avc_config);
 			entry->avc_config = NULL;
@@ -272,11 +685,45 @@
 		entry->svc_config->config = AVC_DuplicateConfig(cfg);
 		entry->type = GF_ISOM_BOX_TYPE_SVC1;
 		break;
+	/*AVCC removal and switch to avc3*/
+	case 3:
+		if (!entry->avc_config || !entry->avc_config->config) 
+			return GF_BAD_PARAM;
+
+		if (entry->svc_config) {
+			gf_isom_box_del((GF_Box*)entry->svc_config);
+			entry->svc_config = NULL;
+		}
+
+		while (gf_list_count(entry->avc_config->config->sequenceParameterSets)) {
+			GF_AVCConfigSlot *sl = gf_list_get(entry->avc_config->config->sequenceParameterSets, 0);
+			gf_list_rem(entry->avc_config->config->sequenceParameterSets, 0);
+			if (sl->data) gf_free(sl->data);
+			gf_free(sl);
+		}
+
+		while (gf_list_count(entry->avc_config->config->pictureParameterSets)) {
+			GF_AVCConfigSlot *sl = gf_list_get(entry->avc_config->config->pictureParameterSets, 0);
+			gf_list_rem(entry->avc_config->config->pictureParameterSets, 0);
+			if (sl->data) gf_free(sl->data);
+			gf_free(sl);
+		}
+
+		if (entry->type == GF_ISOM_BOX_TYPE_AVC1)
+			entry->type = GF_ISOM_BOX_TYPE_AVC3;
+		else if (entry->type == GF_ISOM_BOX_TYPE_AVC2)
+			entry->type = GF_ISOM_BOX_TYPE_AVC4;
+		break;
 	}
 	AVC_RewriteESDescriptor(entry);
 	return GF_OK;
 }
 
+GF_Err gf_isom_avc_set_inband_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
+{
+	return gf_isom_avc_config_update_ex(the_file, trackNumber, DescriptionIndex, NULL, 3);
+}
+
 GF_EXPORT
 GF_Err gf_isom_avc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_AVCConfig *cfg)
 {
@@ -288,6 +735,37 @@
 	return gf_isom_avc_config_update_ex(the_file, trackNumber, DescriptionIndex, cfg, is_add ? 1 : 2);
 }
 
+GF_Err gf_isom_svc_config_del(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
+{
+	GF_TrackBox *trak;
+	GF_Err e;
+	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 || !DescriptionIndex) return GF_BAD_PARAM;
+	entry = (GF_MPEGVisualSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex-1);
+	if (!entry) return GF_BAD_PARAM;
+	switch (entry->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:
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+
+	if (entry->svc_config) {
+			gf_isom_box_del((GF_Box*)entry->svc_config);
+			entry->svc_config = NULL;
+		}
+	AVC_RewriteESDescriptor(entry);
+	return GF_OK;
+}
+
 GF_EXPORT
 GF_Err gf_isom_set_ipod_compatible(GF_ISOFile *the_file, u32 trackNumber)
 {
@@ -305,7 +783,11 @@
 	switch (entry->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_HVC1:
+	case GF_ISOM_BOX_TYPE_HEV1:
 		break;
 	default:
 		return GF_OK;
@@ -317,6 +799,113 @@
 	return GF_OK;
 }
 
+GF_Err gf_isom_svc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *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(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		if (e) return e;
+	}
+	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	//create a new entry
+	entry = (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SVC1);
+	if (!entry) return GF_OUT_OF_MEM;
+	entry->svc_config = (GF_AVCConfigurationBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_SVCC);
+	entry->svc_config->config = AVC_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);
+	AVC_RewriteESDescriptor(entry);
+	return e;
+}
+
+GF_Err gf_isom_hevc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_HEVCConfig *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(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		if (e) return e;
+	}
+	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	//create a new entry
+	entry = (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_HVC1);
+	if (!entry) return GF_OUT_OF_MEM;
+	entry->hevc_config = (GF_HEVCConfigurationBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_HVCC);
+	entry->hevc_config->config = HEVC_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);
+	HEVC_RewriteESDescriptor(entry);
+	return e;
+}
+
+GF_Err gf_isom_hevc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg)
+{
+	u32 i, array_incomplete;
+	GF_TrackBox *trak;
+	GF_Err e;
+	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 || !DescriptionIndex) return GF_BAD_PARAM;
+	entry = (GF_MPEGVisualSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex-1);
+	if (!entry) return GF_BAD_PARAM;
+	switch (entry->type) {
+	case GF_ISOM_BOX_TYPE_HVC1:
+	case GF_ISOM_BOX_TYPE_HEV1:
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+
+	if (!entry->hevc_config) entry->hevc_config = (GF_HEVCConfigurationBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_HVCC);
+	if (entry->hevc_config->config) gf_odf_hevc_cfg_del(entry->hevc_config->config);
+	entry->hevc_config->config = HEVC_DuplicateConfig(cfg);
+
+	array_incomplete = 0;
+	for (i=0; i<gf_list_count(entry->hevc_config->config->param_array); i++) {
+		GF_HEVCParamArray *ar = gf_list_get(entry->hevc_config->config->param_array, i);
+		if (!ar->array_completeness) {
+			array_incomplete = 1;
+			break;
+		}
+	}
+	entry->type = array_incomplete ? GF_ISOM_BOX_TYPE_HEV1 : GF_ISOM_BOX_TYPE_HVC1;
+	
+	HEVC_RewriteESDescriptor(entry);
+	return GF_OK;
+}
+
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 GF_EXPORT
@@ -326,26 +915,80 @@
 	GF_MPEGVisualSampleEntryBox *entry;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !trak->Media || !DescriptionIndex) return NULL;
+	if (gf_isom_get_avc_svc_type(the_file, trackNumber, DescriptionIndex)==GF_ISOM_AVCTYPE_NONE)
+		return NULL;
+
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex-1);
 	if (!entry) return NULL;
-	//if (entry->type != GF_ISOM_BOX_TYPE_AVC1) return NULL;
+
 	if (!entry->avc_config) return NULL;
 	return AVC_DuplicateConfig(entry->avc_config->config);
 }
 
 GF_EXPORT
+GF_HEVCConfig *gf_isom_hevc_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) return NULL;
+	switch (entry->type) {
+	case GF_ISOM_BOX_TYPE_HVC1: 
+	case GF_ISOM_BOX_TYPE_HEV1: 
+		break;
+	default:
+		return NULL;
+	}
+	if (!entry->hevc_config) return NULL;
+	return HEVC_DuplicateConfig(entry->hevc_config->config);
+}
+
+GF_EXPORT
 GF_AVCConfig *gf_isom_svc_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;
+	if (gf_isom_get_avc_svc_type(the_file, trackNumber, DescriptionIndex)==GF_ISOM_AVCTYPE_NONE)
+		return NULL;
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex-1);
 	if (!entry) return NULL;
 	if (!entry->svc_config) return NULL;
 	return AVC_DuplicateConfig(entry->svc_config->config);
 }
 
+
+GF_EXPORT
+u32 gf_isom_get_avc_svc_type(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 GF_ISOM_AVCTYPE_NONE;
+	if (trak->Media->handler->handlerType != GF_ISOM_MEDIA_VISUAL) 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;
+	switch (entry->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:
+		break;
+	default:
+		return GF_ISOM_AVCTYPE_NONE;
+	}
+	if (entry->avc_config && !entry->svc_config) return GF_ISOM_AVCTYPE_AVC_ONLY;
+	if (entry->avc_config && entry->svc_config) return GF_ISOM_AVCTYPE_AVC_SVC;
+	if (!entry->avc_config && entry->svc_config) return GF_ISOM_AVCTYPE_SVC_ONLY;
+	return GF_ISOM_AVCTYPE_NONE;
+}
+
+
 void btrt_del(GF_Box *s)
 {
 	GF_MPEG4BitRateBox *ptr = (GF_MPEG4BitRateBox *)s;
@@ -517,7 +1160,7 @@
 				AVCState avc;
 				s32 idx, vui_flag_pos;
 				GF_AVCConfigSlot *sl = gf_list_get(ptr->config->sequenceParameterSets, 0);
-				idx = AVC_ReadSeqInfo(sl->data+1, sl->size-1, &avc, 0, &vui_flag_pos);
+				idx = gf_media_avc_read_sps(sl->data+1, sl->size-1, &avc, 0, &vui_flag_pos);
 				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;
@@ -668,4 +1311,75 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
+
+void hvcc_del(GF_Box *s)
+{
+	GF_HEVCConfigurationBox *ptr = (GF_HEVCConfigurationBox*)s;
+	if (ptr->config) gf_odf_hevc_cfg_del(ptr->config);
+	gf_free(ptr);
+}
+
+GF_Err hvcc_Read(GF_Box *s, GF_BitStream *bs)
+{
+	u64 pos;
+	GF_HEVCConfigurationBox *ptr = (GF_HEVCConfigurationBox *)s;
+
+	if (ptr->config) gf_odf_hevc_cfg_del(ptr->config);
+	
+	pos = gf_bs_get_position(bs);
+	ptr->config = gf_odf_hevc_cfg_read_bs(bs);
+	pos = gf_bs_get_position(bs) - pos ;
+	if (pos < ptr->size)
+		ptr->size -= (u32) pos;
+
+	return GF_OK;
+}
+GF_Box *hvcc_New()
+{
+	GF_HEVCConfigurationBox *tmp = (GF_HEVCConfigurationBox *) gf_malloc(sizeof(GF_HEVCConfigurationBox));
+	if (tmp == NULL) return NULL;
+	memset(tmp, 0, sizeof(GF_HEVCConfigurationBox));
+	tmp->type = GF_ISOM_BOX_TYPE_HVCC;
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err hvcc_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_HEVCConfigurationBox *ptr = (GF_HEVCConfigurationBox *) s;
+	if (!s) return GF_BAD_PARAM;
+	if (!ptr->config) return GF_OK;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
+	return gf_odf_hevc_cfg_write_bs(ptr->config, bs);
+}
+GF_Err hvcc_Size(GF_Box *s)
+{
+	GF_Err e;
+	u32 i, count, j, subcount;
+	GF_HEVCConfigurationBox *ptr = (GF_HEVCConfigurationBox *)s;
+	e = gf_isom_box_get_size(s);
+	if (e) return e;
+	if (!ptr->config) {
+		ptr->size = 0;
+		return e;
+	}
+	ptr->size += 16;
+
+	count = gf_list_count(ptr->config->param_array);
+	for (i=0; i<count; i++) {
+		GF_HEVCParamArray *ar = gf_list_get(ptr->config->param_array, i);
+		ptr->size += 3;
+		subcount = gf_list_count(ar->nalus);
+		for (j=0; j<subcount; j++) {
+			ptr->size += 2 + ((GF_AVCConfigSlot *)gf_list_get(ar->nalus, j))->size;
+		}
+	}
+	return GF_OK;
+}
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/box_code_3gpp.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/box_code_3gpp.c Changed

@@ -1216,22 +1216,22 @@
 
 static GF_Err dims_AddBox(GF_Box *s, GF_Box *a)
 {
-	GF_DIMSSampleEntryBox *p = (GF_DIMSSampleEntryBox  *)s;
+	GF_DIMSSampleEntryBox *ptr = (GF_DIMSSampleEntryBox  *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_DIMC:
-		if (p->config) return GF_ISOM_INVALID_FILE;
-		p->config = (GF_DIMSSceneConfigBox*)a;
+		if (ptr->config) ERROR_ON_DUPLICATED_BOX(a, ptr)
+		ptr->config = (GF_DIMSSceneConfigBox*)a;
 		break;
 	case GF_ISOM_BOX_TYPE_DIST:
-		if (p->scripts) return GF_ISOM_INVALID_FILE;
-		p->scripts = (GF_DIMSScriptTypesBox*)a;
+		if (ptr->scripts) ERROR_ON_DUPLICATED_BOX(a, ptr)
+		ptr->scripts = (GF_DIMSScriptTypesBox*)a;
 		break;
 	case GF_ISOM_BOX_TYPE_BTRT:
-		if (p->bitrate) return GF_ISOM_INVALID_FILE;
-		p->bitrate = (GF_MPEG4BitRateBox*)a;
+		if (ptr->bitrate) ERROR_ON_DUPLICATED_BOX(a, ptr)
+		ptr->bitrate = (GF_MPEG4BitRateBox*)a;
 		break;
 	case GF_ISOM_BOX_TYPE_SINF:
-		gf_list_add(p->protections, a);
+		gf_list_add(ptr->protections, a);
 		break;
 	default:
 		return gf_isom_box_add_default(s, a);

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/box_code_adobe.c Added

@@ -0,0 +1,691 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Author: Romain Bouqueau
+ *			Copyright (c) Romain Bouqueau 2012-
+ *				All rights reserved
+ *
+ *          Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
+ *
+ *  This file is part of GPAC / ISO Media File Format 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/isomedia_dev.h>
+
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+
+#ifndef GPAC_DISABLE_ISOM
+
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+
+void abst_del(GF_Box *s)
+{
+	GF_AdobeBootstrapInfoBox *ptr = (GF_AdobeBootstrapInfoBox *)s;
+	if (ptr == NULL) return;
+
+	if (ptr->movie_identifier)
+		gf_free(ptr->movie_identifier);
+	if (ptr->drm_data)
+		gf_free(ptr->drm_data);
+	if (ptr->meta_data)
+		gf_free(ptr->meta_data);
+
+	while (gf_list_count(ptr->server_entry_table)) {
+		gf_free(gf_list_get(ptr->server_entry_table, 0));
+		gf_list_rem(ptr->server_entry_table, 0);
+	}
+	gf_list_del(ptr->server_entry_table);
+
+	while (gf_list_count(ptr->quality_entry_table)) {
+		gf_free(gf_list_get(ptr->quality_entry_table, 0));
+		gf_list_rem(ptr->quality_entry_table, 0);
+	}
+	gf_list_del(ptr->quality_entry_table);
+
+	while (gf_list_count(ptr->segment_run_table_entries)) {
+		gf_isom_box_del((GF_Box *)gf_list_get(ptr->segment_run_table_entries, 0));
+		gf_list_rem(ptr->segment_run_table_entries, 0);
+	}
+	gf_list_del(ptr->segment_run_table_entries);
+
+	while (gf_list_count(ptr->fragment_run_table_entries)) {
+		gf_isom_box_del((GF_Box *)gf_list_get(ptr->fragment_run_table_entries, 0));
+		gf_list_rem(ptr->fragment_run_table_entries, 0);
+	}
+	gf_list_del(ptr->fragment_run_table_entries);
+
+	gf_free(ptr);
+}
+
+GF_Err abst_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_AdobeBootstrapInfoBox *ptr = (GF_AdobeBootstrapInfoBox *)s;
+	int i;
+	u32 tmp_strsize = (u32) ptr->size - 8;
+	char *tmp_str = gf_malloc(sizeof(char)*tmp_strsize);
+
+	GF_Err e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	ptr->bootstrapinfo_version = gf_bs_read_u32(bs);
+	ptr->profile = gf_bs_read_int(bs, 2);
+	ptr->live = gf_bs_read_int(bs, 1);
+	ptr->update = gf_bs_read_int(bs, 1);
+	ptr->reserved = gf_bs_read_int(bs, 4);
+	ptr->time_scale = gf_bs_read_u32(bs);
+	ptr->current_media_time = gf_bs_read_u64(bs);
+	ptr->smpte_time_code_offset = gf_bs_read_u64(bs);
+	i=0;
+	tmp_strsize=(u32)ptr->size-8;
+	while (tmp_strsize) {
+		tmp_str[i] = gf_bs_read_u8(bs);
+		tmp_strsize--;
+		if (!tmp_str[i])
+			break;
+		i++;
+	}
+	if (i)
+		ptr->movie_identifier = gf_strdup(tmp_str);
+	
+	ptr->server_entry_count = gf_bs_read_u8(bs);
+	for (i=0; i<ptr->server_entry_count; i++) {
+		int j=0;
+		tmp_strsize=(u32)ptr->size-8;
+		while (tmp_strsize) {
+			tmp_str[j] = gf_bs_read_u8(bs);
+			tmp_strsize--;
+			if (!tmp_str[j])
+				break;
+			j++;
+		}
+		gf_list_insert(ptr->server_entry_table, gf_strdup(tmp_str), i);
+	}
+	
+	ptr->quality_entry_count = gf_bs_read_u8(bs);
+	for (i=0; i<ptr->quality_entry_count; i++) {
+		int j=0;
+		tmp_strsize=(u32)ptr->size-8;
+		while (tmp_strsize) {
+			tmp_str[j] = gf_bs_read_u8(bs);
+			tmp_strsize--;
+			if (!tmp_str[j])
+				break;
+			j++;
+		}
+		gf_list_insert(ptr->quality_entry_table, gf_strdup(tmp_str), i);
+	}
+
+	i=0;
+	tmp_strsize=(u32)ptr->size-8;
+	while (tmp_strsize) {
+		tmp_str[i] = gf_bs_read_u8(bs);
+		tmp_strsize--;
+		if (!tmp_str[i])
+			break;
+		i++;
+	}
+	if (i)
+		ptr->drm_data = gf_strdup(tmp_str);
+
+	i=0;
+	tmp_strsize=(u32)ptr->size-8;
+	while (tmp_strsize) {
+		tmp_str[i] = gf_bs_read_u8(bs);
+		tmp_strsize--;
+		if (!tmp_str[i])
+			break;
+		i++;
+	}
+	if (i)
+		ptr->meta_data = gf_strdup(tmp_str);
+	
+	ptr->segment_run_table_count = gf_bs_read_u8(bs);
+	for (i=0; i<ptr->segment_run_table_count; i++) {
+		GF_AdobeSegmentRunTableBox *asrt;
+		e = gf_isom_parse_box((GF_Box **)&asrt, bs);
+		if (e) return e;
+		gf_list_insert(ptr->segment_run_table_entries, asrt, i);
+	}
+	
+	ptr->fragment_run_table_count = gf_bs_read_u8(bs);
+	for (i=0; i<ptr->fragment_run_table_count; i++) {
+		GF_AdobeFragmentRunTableBox *afrt;	
+		e = gf_isom_parse_box((GF_Box **)&afrt, bs);
+		if (e) return e;
+		gf_list_insert(ptr->fragment_run_table_entries, afrt, i);
+	}
+
+	gf_free(tmp_str);
+
+	return GF_OK;
+}
+
+GF_Box *abst_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AdobeBootstrapInfoBox, GF_ISOM_BOX_TYPE_ABST);
+	tmp->server_entry_table = gf_list_new();
+	tmp->quality_entry_table = gf_list_new();
+	tmp->segment_run_table_entries = gf_list_new();
+	tmp->fragment_run_table_entries = gf_list_new();
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err abst_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	unsigned int i;
+	GF_AdobeBootstrapInfoBox *ptr = (GF_AdobeBootstrapInfoBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	gf_bs_write_u32(bs, ptr->bootstrapinfo_version);
+	gf_bs_write_int(bs, ptr->profile, 2);
+	gf_bs_write_int(bs, ptr->live, 1);
+	gf_bs_write_int(bs, ptr->update, 1);
+	gf_bs_write_int(bs, ptr->reserved, 4);
+	gf_bs_write_u32(bs, ptr->time_scale);
+	gf_bs_write_u64(bs, ptr->current_media_time);
+	gf_bs_write_u64(bs, ptr->smpte_time_code_offset);
+	if (ptr->movie_identifier)
+		gf_bs_write_data(bs, ptr->movie_identifier, (u32)strlen(ptr->movie_identifier) + 1);
+	else
+		gf_bs_write_u8(bs, 0);
+
+	gf_bs_write_u8(bs, ptr->server_entry_count);
+	for (i=0; i<ptr->server_entry_count; i++) {
+		char *str = (char*)gf_list_get(ptr->server_entry_table, i);
+		gf_bs_write_data(bs, str, (u32)strlen(str) + 1);
+	}
+
+	gf_bs_write_u8(bs, ptr->quality_entry_count);
+	for (i=0; i<ptr->quality_entry_count; i++) {
+		char *str = (char*)gf_list_get(ptr->quality_entry_table, i);
+		gf_bs_write_data(bs, str, (u32)strlen(str) + 1);
+	}
+
+	if (ptr->drm_data)
+		gf_bs_write_data(bs, ptr->drm_data, (u32)strlen(ptr->drm_data) + 1);
+	else
+		gf_bs_write_u8(bs, 0);
+
+	if (ptr->meta_data)
+		gf_bs_write_data(bs, ptr->meta_data, (u32)strlen(ptr->meta_data) + 1);
+	else
+		gf_bs_write_u8(bs, 0);
+
+	gf_bs_write_u8(bs, ptr->segment_run_table_count);
+	for (i=0; i<ptr->segment_run_table_count; i++) {
+		e = gf_isom_box_write((GF_Box *)gf_list_get(ptr->segment_run_table_entries, i), bs);
+		if (e) return e;
+	}
+
+	gf_bs_write_u8(bs, ptr->fragment_run_table_count);
+	for (i=0; i<ptr->fragment_run_table_count; i++) {
+		e = gf_isom_box_write((GF_Box *)gf_list_get(ptr->fragment_run_table_entries, i), bs);
+		if (e) return e;
+	}
+
+	return GF_OK;
+}
+
+
+GF_Err abst_Size(GF_Box *s)
+{
+	GF_Err e;
+	int i;
+	GF_AdobeBootstrapInfoBox *ptr = (GF_AdobeBootstrapInfoBox *)s;
+	
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+
+	s->size += 25
+			+ (ptr->movie_identifier ? (strlen(ptr->movie_identifier) + 1) : 1)
+			+ 1;
+
+	for (i=0; i<ptr->server_entry_count; i++)
+			s->size += strlen(gf_list_get(ptr->server_entry_table, i)) + 1;
+
+	s->size += 1;
+
+	for (i=0; i<ptr->quality_entry_count; i++)
+			s->size += strlen(gf_list_get(ptr->quality_entry_table, i)) + 1;
+
+	s->size += (ptr->drm_data ? (strlen(ptr->drm_data) + 1) : 1)
+			+ (ptr->meta_data ? (strlen(ptr->meta_data) + 1) : 1)
+			+ 1;
+
+	for (i=0; i<ptr->segment_run_table_count; i++) {
+		GF_Box *box = (GF_Box *)gf_list_get(ptr->segment_run_table_entries, i);
+		e = gf_isom_box_size(box);
+		if (e) return e;
+		s->size += box->size;
+	}
+		
+	s->size += 1;
+	for (i=0; i<ptr->fragment_run_table_count; i++) {
+		GF_Box *box = (GF_Box *)gf_list_get(ptr->fragment_run_table_entries, i);
+		e = gf_isom_box_size(box);
+		if (e) return e;
+		s->size += box->size;
+	}
+
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+void afra_del(GF_Box *s)
+{
+	GF_AdobeFragRandomAccessBox *ptr = (GF_AdobeFragRandomAccessBox *)s;
+	if (ptr == NULL) return;
+
+	while (gf_list_count(ptr->local_access_entries)) {
+		gf_free(gf_list_get(ptr->local_access_entries, 0));
+		gf_list_rem(ptr->local_access_entries, 0);
+	}
+	gf_list_del(ptr->local_access_entries);
+
+	while (gf_list_count(ptr->global_access_entries)) {
+		gf_free(gf_list_get(ptr->global_access_entries, 0));
+		gf_list_rem(ptr->global_access_entries, 0);
+	}
+	gf_list_del(ptr->global_access_entries);
+
+	gf_free(ptr);
+}
+
+GF_Err afra_Read(GF_Box *s, GF_BitStream *bs)
+{
+	unsigned int i;
+	GF_AdobeFragRandomAccessBox *ptr = (GF_AdobeFragRandomAccessBox *)s;
+
+	GF_Err e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	ptr->long_ids = gf_bs_read_int(bs, 1);
+	ptr->long_offsets = gf_bs_read_int(bs, 1);
+	ptr->global_entries = gf_bs_read_int(bs, 1);
+	ptr->reserved = gf_bs_read_int(bs, 5);
+	ptr->time_scale = gf_bs_read_u32(bs);
+
+	ptr->entry_count = gf_bs_read_u32(bs);
+	for (i=0; i<ptr->entry_count; i++) {
+		GF_AfraEntry *ae = gf_malloc(sizeof(GF_AfraEntry));
+
+		ae->time = gf_bs_read_u64(bs);
+		if (ptr->long_offsets)
+			ae->offset = gf_bs_read_u64(bs);
+		else
+			ae->offset = gf_bs_read_u32(bs);
+
+		gf_list_insert(ptr->local_access_entries, ae, i);
+	}
+
+	if (ptr->global_entries) {
+		ptr->global_entry_count = gf_bs_read_u32(bs);
+		for (i=0; i<ptr->global_entry_count; i++) {
+			GF_GlobalAfraEntry *ae = gf_malloc(sizeof(GF_GlobalAfraEntry));
+
+			ae->time = gf_bs_read_u64(bs);
+			if (ptr->long_ids) {
+				ae->segment = gf_bs_read_u32(bs);
+				ae->fragment = gf_bs_read_u32(bs);
+			} else {
+				ae->segment = gf_bs_read_u16(bs);
+				ae->fragment = gf_bs_read_u16(bs);
+			}
+			if (ptr->long_offsets) {
+				ae->afra_offset = gf_bs_read_u64(bs);
+				ae->offset_from_afra = gf_bs_read_u64(bs);
+			}else {
+				ae->afra_offset = gf_bs_read_u32(bs);
+				ae->offset_from_afra = gf_bs_read_u32(bs);
+			}
+
+			gf_list_insert(ptr->global_access_entries, ae, i);
+		}
+	}
+
+	return GF_OK;
+}
+
+GF_Box *afra_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AdobeFragRandomAccessBox, GF_ISOM_BOX_TYPE_AFRA);
+	tmp->local_access_entries = gf_list_new();
+	tmp->global_access_entries = gf_list_new();
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err afra_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	unsigned int i;
+	GF_AdobeFragRandomAccessBox *ptr = (GF_AdobeFragRandomAccessBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	gf_bs_write_int(bs, ptr->long_ids, 1);
+	gf_bs_write_int(bs, ptr->long_offsets, 1);
+	gf_bs_write_int(bs, ptr->global_entries, 1);
+	gf_bs_write_int(bs, 0, 5);
+	gf_bs_write_u32(bs, ptr->time_scale);
+
+	gf_bs_write_u32(bs, ptr->entry_count);
+	for (i=0; i<ptr->entry_count; i++) {
+		GF_AfraEntry *ae = (GF_AfraEntry *)gf_list_get(ptr->local_access_entries, i);
+		gf_bs_write_u64(bs, ae->time);
+		if (ptr->long_offsets)
+			gf_bs_write_u64(bs, ae->offset);
+		else
+			gf_bs_write_u32(bs, (u32)ae->offset);
+	}
+
+	if (ptr->global_entries) {
+		gf_bs_write_u32(bs, ptr->global_entry_count);
+		for (i=0; i<ptr->global_entry_count; i++) {
+			GF_GlobalAfraEntry *gae = (GF_GlobalAfraEntry *)gf_list_get(ptr->global_access_entries, i);
+			gf_bs_write_u64(bs, gae->time);
+			if (ptr->long_ids) {
+				gf_bs_write_u32(bs, gae->segment);
+				gf_bs_write_u32(bs, gae->fragment);
+			} else {
+				gf_bs_write_u16(bs, (u16)gae->segment);
+				gf_bs_write_u16(bs, (u16)gae->fragment);
+			}
+			if (ptr->long_offsets) {
+				gf_bs_write_u64(bs, gae->afra_offset);
+				gf_bs_write_u64(bs, gae->offset_from_afra);
+			} else {
+				gf_bs_write_u32(bs, (u32)gae->afra_offset);
+				gf_bs_write_u32(bs, (u32)gae->offset_from_afra);
+			}
+		}
+	}
+
+	return GF_OK;
+}
+
+
+GF_Err afra_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_AdobeFragRandomAccessBox *ptr = (GF_AdobeFragRandomAccessBox *)s;
+
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+
+	s->size += 9
+			+ ptr->entry_count * (ptr->long_offsets ? 16 : 12)
+			+ (ptr->global_entries ? 4 + ptr->global_entry_count * (4 + (ptr->long_offsets ? 16 : 8) + (ptr->long_ids ? 8 : 4)) : 0);
+
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+void asrt_del(GF_Box *s)
+{
+	GF_AdobeSegmentRunTableBox *ptr = (GF_AdobeSegmentRunTableBox *)s;
+	if (ptr == NULL) return;
+
+	while (gf_list_count(ptr->quality_segment_url_modifiers)) {
+		gf_free(gf_list_get(ptr->quality_segment_url_modifiers, 0));
+		gf_list_rem(ptr->quality_segment_url_modifiers, 0);
+	}
+	gf_list_del(ptr->quality_segment_url_modifiers);
+
+	while (gf_list_count(ptr->segment_run_entry_table)) {
+		gf_free(gf_list_get(ptr->segment_run_entry_table, 0));
+		gf_list_rem(ptr->segment_run_entry_table, 0);
+	}
+	gf_list_del(ptr->segment_run_entry_table);
+
+	gf_free(ptr);
+}
+
+GF_Err asrt_Read(GF_Box *s, GF_BitStream *bs)
+{
+	unsigned int i;
+	GF_AdobeSegmentRunTableBox *ptr = (GF_AdobeSegmentRunTableBox *)s;
+
+	GF_Err e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	ptr->quality_entry_count = gf_bs_read_u8(bs);
+	for (i=0; i<ptr->quality_entry_count; i++) {
+		int j=0;
+		u32 tmp_strsize=(u32)ptr->size-8;
+		char *tmp_str = (char*) gf_malloc(tmp_strsize);
+		while (tmp_strsize) {
+			tmp_str[j] = gf_bs_read_u8(bs);
+			tmp_strsize--;
+			if (!tmp_str[j])
+				break;
+			j++;
+		}
+		gf_list_insert(ptr->quality_segment_url_modifiers, tmp_str, i);
+	}
+
+	ptr->segment_run_entry_count = gf_bs_read_u32(bs);
+	for (i=0; i<ptr->segment_run_entry_count; i++) {
+		GF_AdobeSegmentRunEntry *sre = gf_malloc(sizeof(GF_AdobeSegmentRunEntry));
+		sre->first_segment = gf_bs_read_u32(bs);
+		sre->fragment_per_segment = gf_bs_read_u32(bs);
+		gf_list_insert(ptr->segment_run_entry_table, sre, i);
+	}
+
+	return GF_OK;
+}
+
+GF_Box *asrt_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AdobeSegmentRunTableBox, GF_ISOM_BOX_TYPE_ASRT);
+	tmp->quality_segment_url_modifiers = gf_list_new();
+	tmp->segment_run_entry_table = gf_list_new();
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err asrt_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	unsigned int i;
+	GF_AdobeSegmentRunTableBox *ptr = (GF_AdobeSegmentRunTableBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	gf_bs_write_u8(bs, ptr->quality_entry_count);
+	for (i=0; i<ptr->quality_entry_count; i++) {
+		char *str = (char*)gf_list_get(ptr->quality_segment_url_modifiers, i);
+		gf_bs_write_data(bs, str, (u32)strlen(str) + 1);
+	}
+
+	gf_bs_write_u32(bs, ptr->segment_run_entry_count);
+	for (i=0; i<ptr->segment_run_entry_count; i++) {
+		GF_AdobeSegmentRunEntry *sre = (GF_AdobeSegmentRunEntry *)gf_list_get(ptr->segment_run_entry_table, i);
+		gf_bs_write_u32(bs, sre->first_segment);
+		gf_bs_write_u32(bs, sre->fragment_per_segment);
+	}
+
+	return GF_OK;
+}
+
+
+GF_Err asrt_Size(GF_Box *s)
+{
+	int i;
+	GF_Err e;
+	GF_AdobeSegmentRunTableBox *ptr = (GF_AdobeSegmentRunTableBox *)s;
+
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+
+	s->size += 5;
+
+	for (i=0; i<ptr->quality_entry_count; i++)
+		s->size += strlen(gf_list_get(ptr->quality_segment_url_modifiers, i)) + 1;
+
+	s->size += ptr->segment_run_entry_count * sizeof(GF_AdobeSegmentRunEntry);
+
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+void afrt_del(GF_Box *s)
+{
+	GF_AdobeFragmentRunTableBox *ptr = (GF_AdobeFragmentRunTableBox *)s;
+	if (ptr == NULL) return;
+
+	while (gf_list_count(ptr->quality_segment_url_modifiers)) {
+		gf_free(gf_list_get(ptr->quality_segment_url_modifiers, 0));
+		gf_list_rem(ptr->quality_segment_url_modifiers, 0);
+	}
+	gf_list_del(ptr->quality_segment_url_modifiers);
+
+	while (gf_list_count(ptr->fragment_run_entry_table)) {
+		gf_free(gf_list_get(ptr->fragment_run_entry_table, 0));
+		gf_list_rem(ptr->fragment_run_entry_table, 0);
+	}
+	gf_list_del(ptr->fragment_run_entry_table);
+
+	gf_free(ptr);
+}
+
+GF_Err afrt_Read(GF_Box *s, GF_BitStream *bs)
+{
+	unsigned int i;
+	GF_AdobeFragmentRunTableBox *ptr = (GF_AdobeFragmentRunTableBox *)s;
+
+	GF_Err e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	ptr->timescale = gf_bs_read_u32(bs);
+
+	ptr->quality_entry_count = gf_bs_read_u8(bs);
+	for (i=0; i<ptr->quality_entry_count; i++) {
+		int j=0;
+		u32 tmp_strsize=(u32)ptr->size-8;
+		char *tmp_str = (char*) gf_malloc(tmp_strsize);
+		while (tmp_strsize) {
+			tmp_str[j] = gf_bs_read_u8(bs);
+			tmp_strsize--;
+			if (!tmp_str[j])
+				break;
+			j++;
+		}
+		gf_list_insert(ptr->quality_segment_url_modifiers, tmp_str, i);
+	}
+
+	ptr->fragment_run_entry_count = gf_bs_read_u32(bs);
+	for (i=0; i<ptr->fragment_run_entry_count; i++) {
+		GF_AdobeFragmentRunEntry *fre = gf_malloc(sizeof(GF_AdobeFragmentRunEntry));
+		fre->first_fragment = gf_bs_read_u32(bs);
+		fre->first_fragment_timestamp = gf_bs_read_u64(bs);
+		fre->fragment_duration = gf_bs_read_u32(bs);
+		if (!fre->fragment_duration)
+			fre->discontinuity_indicator = gf_bs_read_u8(bs);
+		gf_list_insert(ptr->fragment_run_entry_table, fre, i);
+	}
+
+	return GF_OK;
+}
+
+GF_Box *afrt_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AdobeFragmentRunTableBox, GF_ISOM_BOX_TYPE_AFRT);
+	tmp->quality_segment_url_modifiers = gf_list_new();
+	tmp->fragment_run_entry_table = gf_list_new();
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err afrt_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	unsigned int i;
+	GF_AdobeFragmentRunTableBox *ptr = (GF_AdobeFragmentRunTableBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	gf_bs_write_u32(bs, ptr->timescale);
+	gf_bs_write_u8(bs, ptr->quality_entry_count);
+	for (i=0; i<ptr->quality_entry_count; i++) {
+		char *str = (char*)gf_list_get(ptr->quality_segment_url_modifiers, i);
+		gf_bs_write_data(bs, str, (u32)strlen(str) + 1);
+	}
+
+	gf_bs_write_u32(bs, ptr->fragment_run_entry_count);
+	for (i=0; i<ptr->fragment_run_entry_count; i++) {
+		GF_AdobeFragmentRunEntry *fre = (GF_AdobeFragmentRunEntry *)gf_list_get(ptr->fragment_run_entry_table, i);
+		gf_bs_write_u32(bs, fre->first_fragment);
+		gf_bs_write_u64(bs, fre->first_fragment_timestamp);
+		gf_bs_write_u32(bs, fre->fragment_duration);
+		if (!fre->fragment_duration)
+			gf_bs_write_u8(bs, fre->discontinuity_indicator);
+	}
+
+	return GF_OK;
+}
+
+
+GF_Err afrt_Size(GF_Box *s)
+{
+	u32 i;
+	GF_Err e;
+	GF_AdobeFragmentRunTableBox *ptr = (GF_AdobeFragmentRunTableBox *)s;
+
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+
+	s->size += 5;
+
+	for (i=0; i<ptr->quality_entry_count; i++)
+		s->size += strlen(gf_list_get(ptr->quality_segment_url_modifiers, i)) + 1;
+
+	s->size += 4;
+
+	for (i=0; i<ptr->fragment_run_entry_count; i++) {
+		GF_AdobeFragmentRunEntry *fre = (GF_AdobeFragmentRunEntry *)gf_list_get(ptr->fragment_run_entry_table, i);
+		if (fre->fragment_duration)
+			s->size += 16;
+		else
+			s->size += 17;
+	}
+
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+#endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
+
+#endif /*GPAC_DISABLE_ISOM*/
+
+#endif /*GPAC_DISABLE_ISOM_ADOBE*/

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/box_code_base.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/box_code_base.c Changed

@@ -25,6 +25,8 @@
 
 #include <gpac/internal/isomedia_dev.h>
 
+
+
 #ifndef GPAC_DISABLE_ISOM
 
 void co64_del(GF_Box *s)
@@ -747,7 +749,8 @@
 	GF_DataInformationBox *ptr = (GF_DataInformationBox *)s;
 	switch(a->type) {
 	case GF_ISOM_BOX_TYPE_DREF:
-		if (ptr->dref) return GF_ISOM_INVALID_FILE;
+		if (ptr->dref) ERROR_ON_DUPLICATED_BOX(a, ptr)
+
 		ptr->dref = (GF_DataReferenceBox *)a;
 		return GF_OK;		
 	default:
@@ -806,9 +809,18 @@
 }
 
 
-GF_Err dref_AddDataEntry(GF_DataReferenceBox *ptr, GF_Box *entry)
+GF_Err dref_AddDataEntry(GF_Box *ptr, GF_Box *entry)
 {
-	return gf_isom_box_add_default((GF_Box *)ptr, 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;
 }
 
 GF_Err dref_Read(GF_Box *s, GF_BitStream *bs)
@@ -824,7 +836,7 @@
 	gf_bs_read_u32(bs);
 	ptr->size -= 4;
 
-	return gf_isom_read_box_list(s, bs, gf_isom_box_add_default);
+	return gf_isom_read_box_list(s, bs, dref_AddDataEntry);
 }
 
 GF_Box *dref_New()
@@ -1285,6 +1297,7 @@
 void gnrm_del(GF_Box *s)
 {
 	GF_GenericSampleEntryBox *ptr = (GF_GenericSampleEntryBox *)s;
+	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)ptr);
 	if (ptr->data) gf_free(ptr->data);
 	gf_free(ptr);
 }
@@ -2780,17 +2793,20 @@
 	GF_MediaBox *ptr = (GF_MediaBox *)s;
 	switch(a->type) {
 	case GF_ISOM_BOX_TYPE_MDHD:
-	   if (ptr->mediaHeader) return GF_ISOM_INVALID_FILE;
+	   if (ptr->mediaHeader) ERROR_ON_DUPLICATED_BOX(a, ptr)
+
 	   ptr->mediaHeader = (GF_MediaHeaderBox *)a;
 	   return GF_OK;
    
 	case GF_ISOM_BOX_TYPE_HDLR:
-	   if (ptr->handler) return GF_ISOM_INVALID_FILE;
+	   if (ptr->handler) ERROR_ON_DUPLICATED_BOX(a, ptr)
+
 	   ptr->handler = (GF_HandlerBox *)a;
 	   return GF_OK;
    
 	case GF_ISOM_BOX_TYPE_MINF:
-	   if (ptr->information) return GF_ISOM_INVALID_FILE;
+	   if (ptr->information) ERROR_ON_DUPLICATED_BOX(a, ptr)
+
 	   ptr->information = (GF_MediaInformationBox *)a;
 	   return GF_OK;
 	default:
@@ -2946,17 +2962,20 @@
 	case GF_ISOM_BOX_TYPE_SMHD:
 	case GF_ISOM_BOX_TYPE_HMHD:
 	case GF_ISOM_BOX_TYPE_GMHD:
-		if (ptr->InfoHeader) return GF_ISOM_INVALID_FILE;
+		if (ptr->InfoHeader) ERROR_ON_DUPLICATED_BOX(a, ptr)
+
 		ptr->InfoHeader = a;
 		return GF_OK;
 	
 	case GF_ISOM_BOX_TYPE_DINF:
-		if (ptr->dataInformation ) return GF_ISOM_INVALID_FILE;
+		if (ptr->dataInformation) ERROR_ON_DUPLICATED_BOX(a, ptr)
+		
 		ptr->dataInformation = (GF_DataInformationBox *)a;
 		return GF_OK;
 		
 	case GF_ISOM_BOX_TYPE_STBL:
-		if (ptr->sampleTable ) return GF_ISOM_INVALID_FILE;
+		if (ptr->sampleTable ) ERROR_ON_DUPLICATED_BOX(a, ptr)
+
 		ptr->sampleTable = (GF_SampleTableBox *)a;
 		return GF_OK;
 	default:
@@ -3052,7 +3071,8 @@
 	GF_MovieFragmentBox *ptr = (GF_MovieFragmentBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_MFHD:
-		if (ptr->mfhd) return GF_ISOM_INVALID_FILE;
+		if (ptr->mfhd) ERROR_ON_DUPLICATED_BOX(a, ptr)
+
 		ptr->mfhd = (GF_MovieFragmentHeaderBox *) a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_TRAF:
@@ -3140,7 +3160,7 @@
 	GF_MovieBox *ptr = (GF_MovieBox *)s;
 	switch (a->type ) {
 	case GF_ISOM_BOX_TYPE_IODS:
-		if (ptr->iods) return GF_ISOM_INVALID_FILE;
+		if (ptr->iods) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->iods = (GF_ObjectDescriptorBox *)a;
 		//if no IOD, delete the box
 		if (!ptr->iods->descriptor) {
@@ -3150,25 +3170,25 @@
 		return GF_OK;
 		
 	case GF_ISOM_BOX_TYPE_MVHD:
-		if (ptr->mvhd) return GF_ISOM_INVALID_FILE;
+		if (ptr->mvhd) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->mvhd = (GF_MovieHeaderBox *)a;
 		return GF_OK;
 		
 	case GF_ISOM_BOX_TYPE_UDTA:
-		if (ptr->udta) return GF_ISOM_INVALID_FILE;
+		if (ptr->udta) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->udta = (GF_UserDataBox *)a;
 		return GF_OK;
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	case GF_ISOM_BOX_TYPE_MVEX:
-		if (ptr->mvex) return GF_ISOM_INVALID_FILE;
+		if (ptr->mvex) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->mvex = (GF_MovieExtendsBox *)a;
 		ptr->mvex->mov = ptr->mov;
 		return GF_OK;
 #endif
 
 	case GF_ISOM_BOX_TYPE_META:
-		if (ptr->meta) return GF_ISOM_INVALID_FILE;
+		if (ptr->meta) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->meta = (GF_MetaBox *)a;
 		return GF_OK;
 		
@@ -3297,14 +3317,14 @@
 	GF_MPEGAudioSampleEntryBox *ptr = (GF_MPEGAudioSampleEntryBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_ESDS:
-		if (ptr->esd) return GF_ISOM_INVALID_FILE;
+		if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->esd = (GF_ESDBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_SINF:
 		gf_list_add(ptr->protections, a);
 		break;
 	case GF_4CC('w','a','v','e'):
-		if (ptr->esd) return GF_ISOM_INVALID_FILE;
+		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;
@@ -3426,7 +3446,7 @@
 	GF_MPEGSampleEntryBox *ptr = (GF_MPEGSampleEntryBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_ESDS:
-		if (ptr->esd) return GF_ISOM_INVALID_FILE;
+		if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->esd = (GF_ESDBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_SINF:
@@ -3503,6 +3523,7 @@
 	if (ptr->slc) gf_odf_desc_del((GF_Descriptor *)ptr->slc);
 	if (ptr->avc_config) gf_isom_box_del((GF_Box *) ptr->avc_config);
 	if (ptr->svc_config) gf_isom_box_del((GF_Box *) ptr->svc_config);
+	if (ptr->hevc_config) gf_isom_box_del((GF_Box *) ptr->hevc_config);
 	if (ptr->bitrate) gf_isom_box_del((GF_Box *) ptr->bitrate);
 	if (ptr->descr) gf_isom_box_del((GF_Box *) ptr->descr);
 	if (ptr->ipod_ext) gf_isom_box_del((GF_Box *)ptr->ipod_ext);
@@ -3520,38 +3541,42 @@
 	GF_MPEGVisualSampleEntryBox *ptr = (GF_MPEGVisualSampleEntryBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_ESDS:
-		if (ptr->esd) return GF_ISOM_INVALID_FILE;
+		if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->esd = (GF_ESDBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_SINF:
 		gf_list_add(ptr->protections, a);
 		break;
 	case GF_ISOM_BOX_TYPE_AVCC:
-		if (ptr->avc_config) return GF_ISOM_INVALID_FILE;
+		if (ptr->avc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->avc_config = (GF_AVCConfigurationBox *)a;
 		break;
+	case GF_ISOM_BOX_TYPE_HVCC:
+		if (ptr->hevc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
+		ptr->hevc_config = (GF_HEVCConfigurationBox *)a;
+		break;
 	case GF_ISOM_BOX_TYPE_SVCC:
-		if (ptr->svc_config) return GF_ISOM_INVALID_FILE;
+		if (ptr->svc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->svc_config = (GF_AVCConfigurationBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_BTRT:
-		if (ptr->bitrate) return GF_ISOM_INVALID_FILE;
+		if (ptr->bitrate) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->bitrate = (GF_MPEG4BitRateBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_M4DS:
-		if (ptr->descr) return GF_ISOM_INVALID_FILE;
+		if (ptr->descr) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->descr = (GF_MPEG4ExtensionDescriptorsBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_UUID:
-		if (ptr->ipod_ext) return GF_ISOM_INVALID_FILE;
+		if (ptr->ipod_ext) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->ipod_ext = (GF_UnknownUUIDBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_PASP:
-		if (ptr->pasp) return GF_ISOM_INVALID_FILE;
+		if (ptr->pasp) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->pasp = (GF_PixelAspectRatioBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_RVCC:
-		if (ptr->rvcc) return GF_ISOM_INVALID_FILE;
+		if (ptr->rvcc) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->rvcc = (GF_RVCConfigurationBox *)a;
 		break;
 	default:
@@ -3570,6 +3595,8 @@
 	if (e) return e;
 	/*this is an AVC sample desc*/
 	if (mp4v->avc_config || mp4v->svc_config) AVC_RewriteESDescriptor(mp4v);
+	/*this is an HEVC sample desc*/
+	if (mp4v->hevc_config ) HEVC_RewriteESDescriptor(mp4v);
 	return GF_OK;
 }
 
@@ -3598,11 +3625,32 @@
 	return mp4v_encv_avc1_new(GF_ISOM_BOX_TYPE_AVC2);
 }
 
+GF_Box *avc3_New()
+{
+	return mp4v_encv_avc1_new(GF_ISOM_BOX_TYPE_AVC3);
+}
+
+GF_Box *avc4_New()
+{
+	return mp4v_encv_avc1_new(GF_ISOM_BOX_TYPE_AVC4);
+}
+
 GF_Box *svc1_New()
 {
 	return mp4v_encv_avc1_new(GF_ISOM_BOX_TYPE_SVC1);
 }
 
+GF_Box *hvc1_New()
+{
+	return mp4v_encv_avc1_new(GF_ISOM_BOX_TYPE_HVC1);
+}
+
+GF_Box *hev1_New()
+{
+	return mp4v_encv_avc1_new(GF_ISOM_BOX_TYPE_HEV1);
+}
+
+
 GF_Box *encv_New()
 {
 	return mp4v_encv_avc1_new(GF_ISOM_BOX_TYPE_ENCV);
@@ -3635,6 +3683,10 @@
 			e = gf_isom_box_write((GF_Box *) ptr->avc_config, bs);
 			if (e) return e;
 		}
+		if (ptr->hevc_config && ptr->hevc_config->config) {
+			e = gf_isom_box_write((GF_Box *) ptr->hevc_config, bs);
+			if (e) return e;
+		}
 		if (ptr->ipod_ext)	{
 			e = gf_isom_box_write((GF_Box *) ptr->ipod_ext, bs);
 			if (e) return e;
@@ -3673,19 +3725,28 @@
 		if (e) return e;
 		ptr->size += ptr->esd->size;
 	} else {
-		if (!ptr->avc_config && !ptr->svc_config)
+		if (!ptr->avc_config && !ptr->svc_config && !ptr->hevc_config) {
 			return GF_ISOM_INVALID_FILE;
+		}
 
+		if (ptr->hevc_config && ptr->hevc_config->config) {
+			e = gf_isom_box_size((GF_Box *)ptr->hevc_config);
+			if (e) return e;
+			ptr->size += ptr->hevc_config->size;
+		} 
+		
 		if (ptr->avc_config && ptr->avc_config->config) {
 			e = gf_isom_box_size((GF_Box *) ptr->avc_config); 
 			if (e) return e;
 			ptr->size += ptr->avc_config->size;
 		}
+
 		if (ptr->svc_config && ptr->svc_config->config) {
 			e = gf_isom_box_size((GF_Box *) ptr->svc_config); 
 			if (e) return e;
 			ptr->size += ptr->svc_config->size;
 		}
+
 		if (ptr->ipod_ext) {
 			e = gf_isom_box_size((GF_Box *) ptr->ipod_ext);
 			if (e) return e;
@@ -4323,36 +4384,36 @@
 	if (!a) return GF_OK;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_STTS:
-		if (ptr->TimeToSample) return GF_ISOM_INVALID_FILE;
+		if (ptr->TimeToSample) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->TimeToSample = (GF_TimeToSampleBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_CTTS:
-		if (ptr->CompositionOffset) return GF_ISOM_INVALID_FILE;
+		if (ptr->CompositionOffset) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->CompositionOffset = (GF_CompositionOffsetBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_CSLG:
-		if (ptr->CompositionToDecode) return GF_ISOM_INVALID_FILE;
+		if (ptr->CompositionToDecode) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->CompositionToDecode = (GF_CompositionToDecodeBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_STSS:
-		if (ptr->SyncSample) return GF_ISOM_INVALID_FILE;
+		if (ptr->SyncSample) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->SyncSample = (GF_SyncSampleBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_STSD:
-		if (ptr->SampleDescription) return GF_ISOM_INVALID_FILE;
+		if (ptr->SampleDescription) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->SampleDescription  =(GF_SampleDescriptionBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_STZ2:
 	case GF_ISOM_BOX_TYPE_STSZ:
-		if (ptr->SampleSize) return GF_ISOM_INVALID_FILE;
+		if (ptr->SampleSize) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->SampleSize = (GF_SampleSizeBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_STSC:
-		if (ptr->SampleToChunk) return GF_ISOM_INVALID_FILE;
+		if (ptr->SampleToChunk) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->SampleToChunk = (GF_SampleToChunkBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_PADB:
-		if (ptr->PaddingBits) return GF_ISOM_INVALID_FILE;
+		if (ptr->PaddingBits) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->PaddingBits = (GF_PaddingBitsBox *) a;
 		break;
 
@@ -4365,25 +4426,25 @@
 		ptr->ChunkOffset = a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_STSH:
-		if (ptr->ShadowSync) return GF_ISOM_INVALID_FILE;
+		if (ptr->ShadowSync) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->ShadowSync = (GF_ShadowSyncBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_STDP:
-		if (ptr->DegradationPriority) return GF_ISOM_INVALID_FILE;
+		if (ptr->DegradationPriority) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->DegradationPriority = (GF_DegradationPriorityBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_SDTP:
-		if (ptr->SampleDep) return GF_ISOM_INVALID_FILE;
+		if (ptr->SampleDep) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->SampleDep= (GF_SampleDependencyTypeBox *)a;
 		break;
 
 	case GF_ISOM_BOX_TYPE_STSF:
-		if (ptr->Fragments) return GF_ISOM_INVALID_FILE;
+		if (ptr->Fragments) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->Fragments = (GF_SampleFragmentBox *)a;
 		break;
 	
 	case GF_ISOM_BOX_TYPE_SUBS:
-		if (ptr->SubSamples) return GF_ISOM_INVALID_FILE;
+		if (ptr->SubSamples) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->SubSamples = (GF_SubSampleInformationBox *)a;
 		break;
 
@@ -4444,8 +4505,14 @@
 				gf_isom_box_del(a);
 				return e;
 			}
+
+			if (a->size>8) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" has %d extra bytes\n", gf_4cc_to_str(a->type), a->size));
+				gf_bs_skip_bytes(bs, a->size-8);
+			}
 			a->size = s;
 		}
+
 		if (ptr->size<a->size) {
 			gf_isom_box_del(a);
 			return GF_ISOM_INVALID_FILE;
@@ -4760,6 +4827,7 @@
 	for (entry = 0; entry < ptr->nb_entries; entry++) {
 		ptr->priorities[entry] = gf_bs_read_u16(bs);
 	}
+	ptr->size -= 2*ptr->nb_entries;
 	return GF_OK;
 }
 
@@ -4901,7 +4969,11 @@
 	case GF_ISOM_BOX_TYPE_RTP_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_HVC1:
+	case GF_ISOM_BOX_TYPE_HEV1:
 	case GF_ISOM_BOX_TYPE_TX3G:
 	case GF_ISOM_BOX_TYPE_TEXT:
 	case GF_ISOM_BOX_TYPE_ENCT:
@@ -5849,21 +5921,21 @@
 	
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_TFHD:
-		if (ptr->tfhd) return GF_ISOM_INVALID_FILE;
+		if (ptr->tfhd) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->tfhd = (GF_TrackFragmentHeaderBox *) a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_TRUN:
 		return gf_list_add(ptr->TrackRuns, a);
 	case GF_ISOM_BOX_TYPE_SDTP:
-		if (ptr->sdtp) return GF_ISOM_INVALID_FILE;
+		if (ptr->sdtp) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->sdtp = (GF_SampleDependencyTypeBox *)a;
 		return GF_OK;
     case GF_ISOM_BOX_TYPE_TFDT:
-        if (ptr->tfdt) return GF_ISOM_INVALID_FILE;
+        if (ptr->tfdt) ERROR_ON_DUPLICATED_BOX(a, ptr)
         ptr->tfdt = (GF_TFBaseMediaDecodeTimeBox*) a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SUBS:
-		if (ptr->subs) return GF_ISOM_INVALID_FILE;
+		if (ptr->subs) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->subs = (GF_SubSampleInformationBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SBGP:
@@ -5884,7 +5956,7 @@
 		return GF_OK;		
 	case GF_ISOM_BOX_TYPE_UUID:
 		if ( ((GF_UUIDBox *)a)->internal_4cc==GF_ISOM_BOX_UUID_PSEC) {
-			if (ptr->piff_sample_encryption) return GF_ISOM_INVALID_FILE;
+			if (ptr->piff_sample_encryption) ERROR_ON_DUPLICATED_BOX(a, ptr)
 			ptr->piff_sample_encryption = (GF_PIFFSampleEncryptionBox *)a;
 			ptr->piff_sample_encryption->traf = ptr;
 			return GF_OK;
@@ -5900,8 +5972,45 @@
 
 GF_Err traf_Read(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e = gf_isom_read_box_list(s, bs, traf_AddBox);
-	return e;
+	GF_Box *a;
+
+	GF_TrackFragmentBox *ptr = (GF_TrackFragmentBox *)s;
+
+	while (ptr->size) {
+		GF_Err e = gf_isom_parse_box(&a, bs);
+		if (e) return e;
+
+
+		//we need to read the DegPriority in a different way...
+		if ((a->type == GF_ISOM_BOX_TYPE_STDP) || (a->type == GF_ISOM_BOX_TYPE_SDTP)) { 
+			u32 nb_samples=0, i=0;
+			u64 s = a->size;
+			for (i=0; i<gf_list_count(ptr->TrackRuns); i++) {
+				GF_TrackFragmentRunBox *trun = gf_list_get(ptr->TrackRuns, i);
+				nb_samples+=trun->sample_count;
+			}
+			if (a->type == GF_ISOM_BOX_TYPE_STDP) {
+				if (nb_samples) ((GF_DegradationPriorityBox *)a)->nb_entries = nb_samples;
+				e = stdp_Read(a, bs);
+			} else {
+				if (nb_samples) ((GF_SampleDependencyTypeBox *)a)->sampleCount = nb_samples;
+				e = sdtp_Read(a, bs);
+			}
+			if (e) {
+				gf_isom_box_del(a);
+				return e;
+			}
+			a->size = s;
+		}
+		if (ptr->size<a->size) {
+			gf_isom_box_del(a);
+			return GF_ISOM_INVALID_FILE;
+		}
+		ptr->size -= a->size;
+		e = traf_AddBox((GF_Box*)ptr, a);
+		if (e) return e;
+	}
+	return GF_OK;
 }
 
 GF_Box *traf_New()
@@ -6066,10 +6175,14 @@
 		case GF_ISOM_SUBTYPE_3GP_H263:
 		case GF_ISOM_BOX_TYPE_GHNT:
 		case GF_ISOM_BOX_TYPE_RTP_STSD:
-		case GF_ISOM_BOX_TYPE_AVC1:
 		case GF_ISOM_BOX_TYPE_METX:
 		case GF_ISOM_BOX_TYPE_METT:
+		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_HVC1:
+		case GF_ISOM_BOX_TYPE_HEV1:
 		case GF_ISOM_BOX_TYPE_SVC1:
 		case GF_ISOM_BOX_TYPE_TX3G:
 		case GF_ISOM_BOX_TYPE_TEXT:
@@ -6151,27 +6264,27 @@
 	if (!a) return GF_OK;
 	switch(a->type) {
 	case GF_ISOM_BOX_TYPE_TKHD:
-		if (ptr->Header) return GF_ISOM_INVALID_FILE;
+		if (ptr->Header) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->Header = (GF_TrackHeaderBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_EDTS:
-		if (ptr->editBox) return GF_ISOM_INVALID_FILE;
+		if (ptr->editBox) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->editBox = (GF_EditBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_UDTA:
-		if (ptr->udta) return GF_ISOM_INVALID_FILE;
+		if (ptr->udta) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->udta = (GF_UserDataBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_META:
-		if (ptr->meta) return GF_ISOM_INVALID_FILE;
+		if (ptr->meta) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->meta = (GF_MetaBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_TREF:
-		if (ptr->References) return GF_ISOM_INVALID_FILE;
+		if (ptr->References) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->References = (GF_TrackReferenceBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_MDIA:
-		if (ptr->Media) return GF_ISOM_INVALID_FILE;
+		if (ptr->Media) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->Media = (GF_MediaBox *)a;
 		((GF_MediaBox *)a)->mediaTrack = ptr;
 		return GF_OK;
@@ -6435,6 +6548,11 @@
 	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;
 }
 
@@ -7128,7 +7246,7 @@
 		gf_list_add(ptr->protections, a);
 		break;
 	case GF_ISOM_BOX_TYPE_BTRT:
-		if (ptr->bitrate) return GF_ISOM_INVALID_FILE;
+		if (ptr->bitrate) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->bitrate = (GF_MPEG4BitRateBox *)a;
 		break;
 	default:
@@ -7499,15 +7617,15 @@
 	GF_LASeRSampleEntryBox *ptr = (GF_LASeRSampleEntryBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_LSRC:
-		if (ptr->lsr_config) return GF_ISOM_INVALID_FILE;
+		if (ptr->lsr_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->lsr_config = (GF_LASERConfigurationBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_BTRT:
-		if (ptr->bitrate) return GF_ISOM_INVALID_FILE;
+		if (ptr->bitrate) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->bitrate = (GF_MPEG4BitRateBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_M4DS:
-		if (ptr->descr) return GF_ISOM_INVALID_FILE;
+		if (ptr->descr) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->descr = (GF_MPEG4ExtensionDescriptorsBox *)a;
 		break;
 	default:
@@ -8145,7 +8263,7 @@
 	{
 		GF_DefaultSampleGroupDescriptionEntry *ptr = (GF_DefaultSampleGroupDescriptionEntry *)entry;
 		if (ptr->data) gf_free(ptr->data);
-		gf_free(ptr->data);
+		gf_free(ptr);
 	}
 
 	}

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/box_dump.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/box_dump.c Changed

@@ -305,13 +305,19 @@
 	case GF_ISOM_BOX_TYPE_AVCC: 
 	case GF_ISOM_BOX_TYPE_SVCC: 
 		return avcc_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_HVCC: 
+		return hvcc_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_BTRT:
 		return btrt_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_M4DS:
 		return m4ds_dump(a, trace);
 	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_HVC1: 
+	case GF_ISOM_BOX_TYPE_HEV1: 
 		return mp4v_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_PASP:
 		return pasp_dump(a, trace);
@@ -406,6 +412,17 @@
 	case GF_ISOM_BOX_TYPE_COVR:
 	case GF_ISOM_BOX_TYPE_iTunesSpecificInfo:
 		return apple_tag_dump(a, trace);
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+	/*Adobe extensions*/
+	case GF_ISOM_BOX_TYPE_ABST:
+		return abst_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_AFRA:
+		return afra_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_ASRT:
+		return asrt_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_AFRT:
+		return afrt_dump(a, trace);
+#endif
 	/*Apple extensions*/
 	case GF_ISOM_BOX_TYPE_ILST:
 		return ilst_dump(a, trace);
@@ -517,6 +534,11 @@
 		case GF_ISOM_BOX_TYPE_STYP:
 		case GF_ISOM_BOX_TYPE_SIDX:
 		case GF_ISOM_BOX_TYPE_PCRB:
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+		/*Adobe specific*/
+		case GF_ISOM_BOX_TYPE_AFRA:
+		case GF_ISOM_BOX_TYPE_ABST:
+#endif
 #endif
 		case GF_ISOM_BOX_TYPE_MFRA:
 			break;
@@ -537,7 +559,7 @@
 {
 	GF_FullBox *p;
 	p = (GF_FullBox *)a;
-	fprintf(trace, "<FullBoxInfo Version=\"%d\" Flags=\"%d\"/>\n", p->version, p->flags);
+	fprintf(trace, "<FullBoxInfo Version=\"%d\" Flags=\"0x%X\"/>\n", p->version, p->flags);
 	return GF_OK;
 }
 
@@ -929,7 +951,7 @@
 	//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);
+		fprintf(trace, " CompressorName=\"%s\"\n", p->compressor_name+1);
 
 }
 
@@ -946,6 +968,7 @@
 	if (p->esd) {
 		gf_box_dump(p->esd, trace);
 	} else {
+		if (p->hevc_config) gf_box_dump(p->hevc_config, trace);
 		if (p->avc_config) gf_box_dump(p->avc_config, trace);
 		if (p->ipod_ext) gf_box_dump(p->ipod_ext, trace);
 		if (p->descr) gf_box_dump(p->descr, trace);
@@ -1007,7 +1030,7 @@
 {
 	GF_GenericVisualSampleEntryBox *p = (GF_GenericVisualSampleEntryBox *)a;
 	fprintf(trace, "<VisualSampleDescriptionBox DataReferenceIndex=\"%d\" Version=\"%d\" Revision=\"%d\" Vendor=\"%d\" TemporalQuality=\"%d\" SpacialQuality=\"%d\" Width=\"%d\" Height=\"%d\" HorizontalResolution=\"%d\" VerticalResolution=\"%d\" CompressorName=\"%s\" BitDepth=\"%d\">\n",
-		p->dataReferenceIndex, p->version, p->revision, p->vendor, p->temporal_quality, p->spatial_quality, p->Width, p->Height, p->horiz_res, p->vert_res, p->compressor_name, p->bit_depth);
+		p->dataReferenceIndex, p->version, p->revision, p->vendor, p->temporal_quality, p->spatial_quality, p->Width, p->Height, p->horiz_res, p->vert_res, p->compressor_name+1, p->bit_depth);
 	a->type = p->EntryType;
 	DumpBox(a, trace);
 	a->type = GF_ISOM_BOX_TYPE_GNRV;
@@ -1123,14 +1146,9 @@
 	GF_CompositionToDecodeBox *p;
 
 	p = (GF_CompositionToDecodeBox *)a;
-	fprintf(trace, "<CompositionToDecodeBox>\n");
+	fprintf(trace, "<CompositionToDecodeBox compositionToDTSShift=\"%d\" leastDecodeToDisplayDelta=\"%d\" compositionStartTime=\"%d\" compositionEndTime=\"%d\">\n", p->leastDecodeToDisplayDelta, p->greatestDecodeToDisplayDelta, p->compositionStartTime, p->compositionEndTime);
 	DumpBox(a, trace);
 	gf_full_box_dump(a, trace);
-	fprintf(trace, "<CompositionToDTSShift=\"%d\"/>\n", p->compositionToDTSShift);
-	fprintf(trace, "<LeastDecodeToDisplayDelta=\"%d\"/>\n", p->leastDecodeToDisplayDelta);
-	fprintf(trace, "<GreatestDecodeToDisplayDelta=\"%d\"/>\n", p->greatestDecodeToDisplayDelta);
-	fprintf(trace, "<CompositionStartTime=\"%d\"/>\n", p->compositionStartTime);
-	fprintf(trace, "<CompositionEndTime=\"%d\"/>\n", p->compositionEndTime);
 	gf_box_dump_done("CompositionToDecodeBox", a, trace);
 	return GF_OK;
 }
@@ -1664,6 +1682,43 @@
 	return GF_OK;
 }
 
+GF_Err hvcc_dump(GF_Box *a, FILE * trace)
+{
+	u32 i, count;
+	GF_HEVCConfigurationBox *p = (GF_HEVCConfigurationBox *) a;
+
+	fprintf(trace, "<HEVCConfigurationBox>\n");
+
+	fprintf(trace, "<HEVCDecoderConfigurationRecord nal_unit_size=\"%d\" configurationVersion=\"%d\" profile_space=\"%d\" profile_idc=\"%d\" constraint_indicator_flags=\"%d\" ",
+					p->config->nal_unit_size, p->config->configurationVersion, p->config->profile_space, p->config->profile_idc, p->config->constraint_indicator_flags);
+	fprintf(trace, "chroma_format=\"%d\" luma_bit_depth=\"%d\" chroma_bit_depth=\"%d\" avgFrameRate=\"%d\" constantFrameRate=\"%d\" numTemporalLayers=\"%d\"",
+		p->config->chromaFormat, p->config->luma_bit_depth, p->config->chroma_bit_depth, p->config->avgFrameRate, p->config->constantFrameRate, p->config->numTemporalLayers);
+
+	fprintf(trace, ">\n");
+
+	count = gf_list_count(p->config->param_array);
+	for (i=0; i<count; i++) {
+		u32 nalucount, j;
+		GF_HEVCParamArray *ar = gf_list_get(p->config->param_array, i);
+		fprintf(trace, "<ParameterSetArray nalu_type=\"%d\" complete_set=\"%d\">\n", ar->type, ar->array_completeness);
+		nalucount = gf_list_count(ar->nalus);
+		for (j=0; j<nalucount; j++) {
+			GF_AVCConfigSlot *c = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j);
+			fprintf(trace, "<ParameterSet size=\"%d\" content=\"", c->size);
+			DumpData(trace, c->data, c->size);
+			fprintf(trace, "\"/>\n");
+		}
+		fprintf(trace, "</ParameterSetArray>\n");
+	}
+
+	fprintf(trace, "</HEVCDecoderConfigurationRecord>\n");
+
+	DumpBox(a, trace);
+	gf_box_dump_done(NULL, a, trace);
+	fprintf(trace, "</HEVCConfigurationBox>\n");
+	return GF_OK;
+}
+
 GF_Err m4ds_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
@@ -2283,6 +2338,19 @@
 	return GF_OK;
 }
 
+void sample_flags_dump(const char *name, u32 sample_flags, FILE * trace)
+{
+	fprintf(trace, "<%s", name);
+	fprintf(trace, " IsLeading=\"%d\"", GF_ISOM_GET_FRAG_LEAD(sample_flags) );
+	fprintf(trace, " SampleDependsOn=\"%d\"", GF_ISOM_GET_FRAG_DEPENDS(sample_flags) );
+	fprintf(trace, " SampleIsDependedOn=\"%d\"", GF_ISOM_GET_FRAG_DEPENDED(sample_flags) );
+	fprintf(trace, " SampleHasRedundancy=\"%d\"", GF_ISOM_GET_FRAG_REDUNDANT(sample_flags) );
+	fprintf(trace, " SamplePadding=\"%d\"", GF_ISOM_GET_FRAG_PAD(sample_flags) );
+	fprintf(trace, " SampleSync=\"%d\"", GF_ISOM_GET_FRAG_SYNC(sample_flags));
+	fprintf(trace, " SampleDegradationPriority=\"%d\"", GF_ISOM_GET_FRAG_DEG(sample_flags));
+	fprintf(trace, "/>\n");
+}
+
 GF_Err trex_dump(GF_Box *a, FILE * trace)
 {
 	GF_TrackExtendsBox *p;
@@ -2291,10 +2359,8 @@
 	fprintf(trace, "<TrackExtendsBox TrackID=\"%d\"", p->trackID);
 
 	fprintf(trace, " SampleDescriptionIndex=\"%d\" SampleDuration=\"%d\" SampleSize=\"%d\"", p->def_sample_desc_index, p->def_sample_duration, p->def_sample_size);
-	fprintf(trace, " SamplePadding=\"%d\" SampleSync=\"%d\" SampleDegradationPriority=\"%d\"",
-		GF_ISOM_GET_FRAG_PAD(p->def_sample_flags), GF_ISOM_GET_FRAG_SYNC(p->def_sample_flags), GF_ISOM_GET_FRAG_DEG(p->def_sample_flags));
-
 	fprintf(trace, ">\n");
+	sample_flags_dump("DefaultSampleFlags", p->def_sample_flags, trace);
 	DumpBox(a, trace);
 	gf_full_box_dump(a, trace);
 	gf_box_dump_done("TrackExtendsBox", a, trace);
@@ -2353,9 +2419,8 @@
 	p = (GF_TrackFragmentHeaderBox *)a;
 	fprintf(trace, "<TrackFragmentHeaderBox TrackID=\"%d\"", p->trackID);
 
-	if (p->flags & GF_ISOM_TRAF_BASE_OFFSET) {
-		fprintf(trace, " BaseDataOffset=\""LLD"\"", LLD_CAST p->base_data_offset);
-	}
+	fprintf(trace, " BaseDataOffset=\"%s\"", (p->flags & GF_ISOM_MOOF_BASE_OFFSET) ? "moof" : ((p->flags & GF_ISOM_TRAF_BASE_OFFSET) ? "traf" : "file") );
+
 	if (p->flags & GF_ISOM_TRAF_SAMPLE_DESC)
 		fprintf(trace, " SampleDescriptionIndex=\"%d\"", p->sample_desc_index);
 	if (p->flags & GF_ISOM_TRAF_SAMPLE_DUR)
@@ -2367,6 +2432,7 @@
 		fprintf(trace, " SampleSync=\"%d\"", GF_ISOM_GET_FRAG_SYNC(p->def_sample_flags));
 		fprintf(trace, " SampleDegradationPriority=\"%d\"", GF_ISOM_GET_FRAG_DEG(p->def_sample_flags));
 	}
+
 	fprintf(trace, ">\n");
 
 	DumpBox(a, trace);
@@ -2386,10 +2452,11 @@
 
 	if (p->flags & GF_ISOM_TRUN_DATA_OFFSET)
 		fprintf(trace, " DataOffset=\"%d\"", p->data_offset);
+	fprintf(trace, ">\n");
+
 	if (p->flags & GF_ISOM_TRUN_FIRST_FLAG) {
-		fprintf(trace, " FirstSamplePadding=\"%d\" FirstSampleSync=\"%d\" FirstSampleDegradationPriority=\"%d\"", GF_ISOM_GET_FRAG_PAD(p->first_sample_flags), GF_ISOM_GET_FRAG_SYNC(p->first_sample_flags), GF_ISOM_GET_FRAG_DEG(p->first_sample_flags));
+		sample_flags_dump("FirstSampleFlags", p->first_sample_flags, trace);
 	}
-	fprintf(trace, ">\n");
 	DumpBox(a, trace);
 	gf_full_box_dump(a, trace);
 
@@ -3345,6 +3412,116 @@
 	return GF_OK;
 }
 
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+
+GF_Err abst_dump(GF_Box *a, FILE * trace)
+{
+	u32 i;
+	GF_AdobeBootstrapInfoBox *p = (GF_AdobeBootstrapInfoBox*)a;
+	fprintf(trace, "<AdobeBootstrapBox BootstrapinfoVersion=\"%u\" Profile=\"%u\" Live=\"%u\" Update=\"%u\" TimeScale=\"%u\" CurrentMediaTime=\""LLU"\" SmpteTimeCodeOffset=\""LLU"\" ",
+		p->bootstrapinfo_version, p->profile, p->live, p->update, p->time_scale, p->current_media_time, p->smpte_time_code_offset);
+	if (p->movie_identifier)
+		fprintf(trace, "MovieIdentifier=\"%s\" ", p->movie_identifier);
+	if (p->drm_data)
+		fprintf(trace, "DrmData=\"%s\" ", p->drm_data);
+	if (p->meta_data)
+		fprintf(trace, "MetaData=\"%s\" ", p->meta_data);
+	fprintf(trace, ">\n");
+	DumpBox(a, trace);
+	gf_full_box_dump(a, trace);
+
+	for (i=0; i<p->server_entry_count; i++) {
+		char *str = (char*)gf_list_get(p->server_entry_table, i);
+		fprintf(trace, "<ServerEntry>%s</ServerEntry>\n", str);
+	}
+
+	for (i=0; i<p->quality_entry_count; i++) {
+		char *str = (char*)gf_list_get(p->quality_entry_table, i);
+		fprintf(trace, "<QualityEntry>%s</QualityEntry>\n", str);
+	}
+
+	for (i=0; i<p->segment_run_table_count; i++)
+		gf_box_dump(gf_list_get(p->segment_run_table_entries, i), trace);
+
+	for (i=0; i<p->fragment_run_table_count; i++)
+		gf_box_dump(gf_list_get(p->fragment_run_table_entries, i), trace);
+
+	gf_box_dump_done("AdobeBootstrapBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err afra_dump(GF_Box *a, FILE * trace)
+{
+	u32 i;
+	GF_AdobeFragRandomAccessBox *p = (GF_AdobeFragRandomAccessBox*)a;
+	fprintf(trace, "<AdobeFragmentRandomAccessBox LongIDs=\"%u\" LongOffsets=\"%u\" TimeScale=\"%u\">\n", p->long_ids, p->long_offsets, p->time_scale);
+	DumpBox(a, trace);
+	gf_full_box_dump(a, trace);
+
+	for (i=0; i<p->entry_count; i++) {
+		GF_AfraEntry *ae = (GF_AfraEntry *)gf_list_get(p->local_access_entries, i);
+		fprintf(trace, "<LocalAccessEntry Time=\""LLU"\" Offset=\""LLU"\"/>\n", ae->time, ae->offset);
+	}
+
+	for (i=0; i<p->global_entry_count; i++) {
+		GF_GlobalAfraEntry *gae = (GF_GlobalAfraEntry *)gf_list_get(p->global_access_entries, i);
+		fprintf(trace, "<GlobalAccessEntry Time=\""LLU"\" Segment=\"%u\" Fragment=\"%u\" AfraOffset=\""LLU"\" OffsetFromAfra=\""LLU"\"/>\n",
+				gae->time, gae->segment, gae->fragment, gae->afra_offset, gae->offset_from_afra);
+	}
+
+	gf_box_dump_done("AdobeFragmentRandomAccessBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err afrt_dump(GF_Box *a, FILE * trace)
+{
+	u32 i;
+	GF_AdobeFragmentRunTableBox *p = (GF_AdobeFragmentRunTableBox*)a;
+	fprintf(trace, "<AdobeFragmentRunTableBox TimeScale=\"%u\">\n", p->timescale);
+	DumpBox(a, trace);
+	gf_full_box_dump(a, trace);
+
+	for (i=0; i<p->quality_entry_count; i++) {
+		char *str = (char*)gf_list_get(p->quality_segment_url_modifiers, i);
+		fprintf(trace, "<QualityEntry>%s</QualityEntry>\n", str);
+	}
+
+	for (i=0; i<p->fragment_run_entry_count; i++) {
+		GF_AdobeFragmentRunEntry *fre = (GF_AdobeFragmentRunEntry *)gf_list_get(p->fragment_run_entry_table, i);
+		fprintf(trace, "<FragmentRunEntry FirstFragment=\"%u\" FirstFragmentTimestamp=\""LLU"\" FirstFragmentDuration=\"%u\"", fre->first_fragment, fre->first_fragment_timestamp, fre->fragment_duration);
+		if (!fre->fragment_duration)
+			fprintf(trace, " DiscontinuityIndicator=\"%u\"", fre->discontinuity_indicator);
+		fprintf(trace, "/>\n");
+	}
+
+	gf_box_dump_done("AdobeFragmentRunTableBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err asrt_dump(GF_Box *a, FILE * trace)
+{
+	u32 i;
+	GF_AdobeSegmentRunTableBox *p = (GF_AdobeSegmentRunTableBox*)a;
+	fprintf(trace, "<AdobeSegmentRunTableBox>\n");
+	DumpBox(a, trace);
+	gf_full_box_dump(a, trace);
+	
+	for (i=0; i<p->quality_entry_count; i++) {
+		char *str = (char*)gf_list_get(p->quality_segment_url_modifiers, i);
+		fprintf(trace, "<QualityEntry>%s</QualityEntry>\n", str);
+	}
+
+	for (i=0; i<p->segment_run_entry_count; i++) {
+		GF_AdobeSegmentRunEntry *sre = (GF_AdobeSegmentRunEntry *)gf_list_get(p->segment_run_entry_table, i);
+		fprintf(trace, "<SegmentRunEntry FirstSegment=\"%u\" FragmentsPerSegment=\"%u\"/>\n", sre->first_segment, sre->fragment_per_segment);
+	}
+
+	gf_box_dump_done("AdobeSegmentRunTableBox", a, trace);
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_ADOBE*/
+
 GF_Err ilst_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/box_funcs.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/box_funcs.c Changed

@@ -501,12 +501,18 @@
 		a = avcc_New();
 		if (a) a->type = boxType;
 		return a;
+	case GF_ISOM_BOX_TYPE_HVCC: 
+		return hvcc_New();
 
 	case GF_ISOM_BOX_TYPE_BTRT: return btrt_New();
 	case GF_ISOM_BOX_TYPE_M4DS: return m4ds_New();
 	case GF_ISOM_BOX_TYPE_AVC1: return avc1_New();
 	case GF_ISOM_BOX_TYPE_AVC2: return avc2_New();
+	case GF_ISOM_BOX_TYPE_AVC3: return avc3_New();
+	case GF_ISOM_BOX_TYPE_AVC4: return avc4_New();
 	case GF_ISOM_BOX_TYPE_SVC1: return svc1_New();
+	case GF_ISOM_BOX_TYPE_HVC1: return hvc1_New();
+	case GF_ISOM_BOX_TYPE_HEV1: return hev1_New();
 
 	/*3GPP streaming text*/
 	case GF_ISOM_BOX_TYPE_FTAB: return ftab_New();
@@ -551,6 +557,14 @@
 	case GF_ISOM_BOX_TYPE_UUID: 
 		return uuid_New();
 
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+	/* Adobe extensions */
+	case GF_ISOM_BOX_TYPE_ABST: return abst_New();
+	case GF_ISOM_BOX_TYPE_AFRA: return afra_New();
+	case GF_ISOM_BOX_TYPE_ASRT: return asrt_New();
+	case GF_ISOM_BOX_TYPE_AFRT: return afrt_New();
+#endif
+
 	/* Apple extensions */
 	case GF_ISOM_BOX_TYPE_ILST: return ilst_New();
 	
@@ -787,8 +801,13 @@
 	case GF_ISOM_BOX_TYPE_M4DS: m4ds_del(a); return;
 	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_HVC1:
+	case GF_ISOM_BOX_TYPE_HEV1:
 		mp4v_del(a); return;
+	case GF_ISOM_BOX_TYPE_HVCC: hvcc_del(a); return;
 
 	/*3GPP streaming text*/
 	case GF_ISOM_BOX_TYPE_FTAB: ftab_del(a); return;
@@ -850,6 +869,14 @@
 		}
 		return;
 
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+	/* Adobe extensions */
+	case GF_ISOM_BOX_TYPE_ABST: abst_del(a); return;
+	case GF_ISOM_BOX_TYPE_AFRA: afra_del(a); return;
+	case GF_ISOM_BOX_TYPE_ASRT: asrt_del(a); return;
+	case GF_ISOM_BOX_TYPE_AFRT: afrt_del(a); return;
+#endif
+
 	/* Apple extensions */
 	case GF_ISOM_BOX_TYPE_ILST: ilst_del(a); return;
 	
@@ -1050,8 +1077,14 @@
 	case GF_ISOM_BOX_TYPE_M4DS: return m4ds_Read(a, bs);
 	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_HVC1:
+	case GF_ISOM_BOX_TYPE_HEV1:
 		return mp4v_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_HVCC: 
+		return hvcc_Read(a, bs);
 
 	/*3GPP streaming text*/
 	case GF_ISOM_BOX_TYPE_FTAB: return ftab_Read(a, bs);
@@ -1097,6 +1130,15 @@
 		default:
 			return uuid_Read(a, bs);
 		}
+
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+	/* Adobe extensions */
+	case GF_ISOM_BOX_TYPE_ABST: return abst_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_AFRA: return afra_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_ASRT: return asrt_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_AFRT: return afrt_Read(a, bs);
+#endif
+
 	/* Apple extensions */
 	case GF_ISOM_BOX_TYPE_ILST: return ilst_Read(a, bs);
 
@@ -1294,11 +1336,17 @@
 	case GF_ISOM_BOX_TYPE_AVCC: 
 	case GF_ISOM_BOX_TYPE_SVCC: 
 		return avcc_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_HVCC: 
+		return hvcc_Write(a, bs);
 	case GF_ISOM_BOX_TYPE_BTRT: return btrt_Write(a, bs);
 	case GF_ISOM_BOX_TYPE_M4DS: return m4ds_Write(a, bs);
 	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_HVC1:
+	case GF_ISOM_BOX_TYPE_HEV1:
 		return mp4v_Write(a, bs);
 
 	/*3GPP streaming text*/
@@ -1346,6 +1394,14 @@
 			return uuid_Write(a, bs);
 		}
 
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+	/* Adobe extensions */
+	case GF_ISOM_BOX_TYPE_ABST: return abst_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_AFRA: return afra_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_ASRT: return asrt_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_AFRT: return afrt_Write(a, bs);
+#endif
+
 	/* Apple extensions */
 	case GF_ISOM_BOX_TYPE_ILST: return ilst_Write(a, bs);
 
@@ -1551,11 +1607,17 @@
 	case GF_ISOM_BOX_TYPE_AVCC: 
 	case GF_ISOM_BOX_TYPE_SVCC: 
 		return avcc_Size(a);
+	case GF_ISOM_BOX_TYPE_HVCC: 
+		return hvcc_Size(a);
 	case GF_ISOM_BOX_TYPE_BTRT: return btrt_Size(a);
 	case GF_ISOM_BOX_TYPE_M4DS: return m4ds_Size(a);
 	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_HVC1:
+	case GF_ISOM_BOX_TYPE_HEV1:
 		return mp4v_Size(a);
 
 	/*3GPP streaming text*/
@@ -1603,6 +1665,14 @@
 			return uuid_Size(a);
 		}
 
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+	/* Adobe extensions */
+	case GF_ISOM_BOX_TYPE_ABST: return abst_Size(a);
+	case GF_ISOM_BOX_TYPE_AFRA: return afra_Size(a);
+	case GF_ISOM_BOX_TYPE_ASRT: return asrt_Size(a);
+	case GF_ISOM_BOX_TYPE_AFRT: return afrt_Size(a);
+#endif
+
 	/* Apple extensions */
 	case GF_ISOM_BOX_TYPE_ILST: return ilst_Size(a);

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/data_map.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/data_map.c Changed

@@ -28,6 +28,21 @@
 
 #ifndef GPAC_DISABLE_ISOM
 
+
+static u32 default_write_buffering_size = 0;
+
+GF_EXPORT
+GF_Err gf_isom_set_output_buffering(GF_ISOFile *movie, u32 size)
+{
+	if (!movie) {
+		default_write_buffering_size = size;
+		return GF_OK;
+	}
+	if (!movie->editFileMap) return GF_BAD_PARAM;
+	return gf_bs_set_output_buffering(movie->editFileMap->bs, size);
+}
+
+
 void gf_isom_datamap_del(GF_DataMap *ptr)
 {
 	if (!ptr) return;
@@ -115,6 +130,10 @@
 #else
 		return GF_NOT_SUPPORTED;
 #endif
+	} else if (!strncmp(location, "gmem://", 7)) {
+		*outDataMap = gf_isom_fdm_new(location, GF_ISOM_DATA_MAP_READ);
+		if (! (*outDataMap)) return GF_IO_ERR;
+		return GF_OK;
 	}
 
 	extern_file = !gf_url_is_local(location);
@@ -160,38 +179,45 @@
 {
 	GF_DataEntryBox *ent;
 	GF_MediaInformationBox *minf;
-	u32 SelfCont;
+	u32 SelfCont, count;
 	GF_Err e = GF_OK;
 	if ((mdia == NULL) || (! mdia->information) || !dataRefIndex)
 		return GF_ISOM_INVALID_MEDIA;
 
 	minf = mdia->information;
 
-	if (dataRefIndex > gf_list_count(minf->dataInformation->dref->other_boxes))
-		return GF_BAD_PARAM;
+	count = gf_list_count(minf->dataInformation->dref->other_boxes);
+	if (!count) {
+		SelfCont = 1;
+		ent = NULL;
+	} else {
+		if (dataRefIndex > gf_list_count(minf->dataInformation->dref->other_boxes))
+			return GF_BAD_PARAM;
+
+		ent = (GF_DataEntryBox*)gf_list_get(minf->dataInformation->dref->other_boxes, dataRefIndex - 1);
+		if (ent == NULL) return GF_ISOM_INVALID_MEDIA;
 
-	ent = (GF_DataEntryBox*)gf_list_get(minf->dataInformation->dref->other_boxes, dataRefIndex - 1);
-	if (ent == NULL) return GF_ISOM_INVALID_MEDIA;
+		//if the current dataEntry is the desired one, and not self contained, return
+		if ((minf->dataEntryIndex == dataRefIndex) && (ent->flags != 1)) {
+			return GF_OK;
+		}
 
-	//if the current dataEntry is the desired one, and not self contained, return
-	if ((minf->dataEntryIndex == dataRefIndex) && (ent->flags != 1)) {
-		return GF_OK;
+		SelfCont = 0;
+		switch (ent->type) {
+		case GF_ISOM_BOX_TYPE_URL:
+		case GF_ISOM_BOX_TYPE_URN:
+			if (ent->flags == 1) SelfCont = 1;
+			break;
+		default:
+			SelfCont = 1;
+			break;
+		}
 	}
 
 	//we need to open a new one
 	//first close the existing one
 	if (minf->dataHandler) gf_isom_datamap_close(minf);
 
-	SelfCont = 0;
-	switch (ent->type) {
-	case GF_ISOM_BOX_TYPE_URL:
-	case GF_ISOM_BOX_TYPE_URN:
-		if (ent->flags == 1) SelfCont = 1;
-		break;
-	default:
-		SelfCont = 1;
-		break;
-	}
 	//if self-contained, assign the input file
 	if (SelfCont) {
 		//if no edit, open the input file
@@ -297,6 +323,11 @@
 		gf_free(tmp);
 		return NULL;
 	}
+
+	if (default_write_buffering_size) {
+		gf_bs_set_output_buffering(tmp->bs, default_write_buffering_size);
+	}
+
 	return (GF_DataMap *)tmp;
 }
 
@@ -320,6 +351,18 @@
 		bs_mode = GF_BITSTREAM_READ;
 	}
 #endif
+	if (!strncmp(sPath, "gmem://", 7)) {
+		u32 size;
+		void *mem_address;
+		if (sscanf(sPath, "gmem://%d@%p", &size, &mem_address) != 2)
+			return NULL;
+		tmp->bs = gf_bs_new((const char *)mem_address, size, GF_BITSTREAM_READ);
+		if (!tmp->bs) {
+			gf_free(tmp);
+			return NULL;
+		}
+		return (GF_DataMap *)tmp;
+	}
 
 	switch (mode) {
 	case GF_ISOM_DATA_MAP_READ:
@@ -362,6 +405,9 @@
 		gf_free(tmp);
 		return NULL;
 	}
+	if (default_write_buffering_size) {
+		gf_bs_set_output_buffering(tmp->bs, default_write_buffering_size);
+	}
 	return (GF_DataMap *)tmp;
 }
 
@@ -369,7 +415,8 @@
 {
 	if (!ptr || (ptr->type != GF_ISOM_DATA_FILE)) return;
 	if (ptr->bs) gf_bs_del(ptr->bs);
-	if (ptr->stream && !ptr->is_stdout) fclose(ptr->stream);
+	if (ptr->stream && !ptr->is_stdout)
+		fclose(ptr->stream);
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	if (ptr->temp_file) {
@@ -403,7 +450,7 @@
 		//rewind to original (if seek fails, return 0 cause this means:
 		//1- no support for seek on the platform
 		//2- corrupted file for the OS
-		fflush(ptr->stream);
+		if (ptr->stream) fflush(ptr->stream);
 		gf_bs_seek(ptr->bs, ptr->curPos);
 	}
 	ptr->last_acces_was_read = 1;
@@ -449,7 +496,7 @@
 	}
 	ptr->curPos = gf_bs_get_position(ptr->bs);
 	//flush the stream !!
-	fflush(ptr->stream);
+	if (ptr->stream) fflush(ptr->stream);
 	return GF_OK;
 }

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/drm_sample.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/drm_sample.c Changed

@@ -337,6 +337,7 @@
 	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;
 	return GF_OK;
 }
 
@@ -403,10 +404,17 @@
 	/*special case for AVC1*/
 	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:
 		original_format = GF_4CC('2','6','4','b');
 		sea->type = GF_ISOM_BOX_TYPE_ENCV;
 		break;
+	case GF_ISOM_BOX_TYPE_HVC1: 
+	case GF_ISOM_BOX_TYPE_HEV1: 
+		original_format = GF_4CC('2','6','5','b');
+		sea->type = GF_ISOM_BOX_TYPE_ENCV;
+		break;
 	case GF_ISOM_BOX_TYPE_MP4S:
 	case GF_ISOM_BOX_TYPE_LSR1:
 		original_format = sea->type;
@@ -467,8 +475,12 @@
 	case GF_ISOM_BOX_TYPE_MP4V:
 	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_D263:
+	case GF_ISOM_BOX_TYPE_HVC1: 
+	case GF_ISOM_BOX_TYPE_HEV1: 
 		original_format = sea->type;
 		sea->type = GF_ISOM_BOX_TYPE_ENCV;
 		break;

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/isom_intern.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/isom_intern.c Changed

@@ -51,9 +51,10 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Error: %s not received before merging frament\n", mov->moov ? "mvex" : "moov" ));
 		return GF_ISOM_INVALID_FILE;
 	}
-	//and all fragments must be continous
+	//and all fragments must be continous - we do not throw an error as we may still want to be able to concatenate depednent representation 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)) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Error: wrong sequence number: got %d but last one was %d\n", moof->mfhd->sequence_number, mov->NextMoofNumber));
+		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;
 	}
 
@@ -323,7 +324,6 @@
 	return GF_OK;
 }
 
-
 GF_ISOFile *gf_isom_new_movie()
 {
 	GF_ISOFile *mov = (GF_ISOFile*)gf_malloc(sizeof(GF_ISOFile));
@@ -481,6 +481,20 @@
 	return NULL;
 }
 
+GF_TrackBox *gf_isom_get_track_from_original_id(GF_MovieBox *moov, u32 originalID, u32 originalFile) 
+{
+	u32 i, count;
+	GF_TrackBox *trak;
+	if (!moov || !originalID) return NULL;
+
+	count = gf_list_count(moov->trackList);
+	for (i = 0; i<count; i++) {
+		trak = (GF_TrackBox*)gf_list_get(moov->trackList, i);
+		if ((trak->originalFile == originalFile) && (trak->originalID == originalID)) return trak;
+	}
+	return NULL;
+}
+
 GF_TrackBox *gf_isom_get_track_from_file(GF_ISOFile *movie, u32 trackNumber)
 {
 	GF_TrackBox *trak;
@@ -500,6 +514,7 @@
 	u64 firstDTS;
 #endif
 	u32 i;
+	Bool last_is_empty = 0;
 	u64 time, lastSampleTime;
 	s64 mtime;
 	GF_EdtsEntry *ent;
@@ -549,7 +564,25 @@
 				goto ent_found;
 		}
 		time += ent->segmentDuration;
+		last_is_empty = ent->segmentDuration ? 0 : 1;
+	}
+
+	if (last_is_empty) {
+		ent = (GF_EdtsEntry *)gf_list_last(trak->editBox->editList->entryList);
+		if (ent->mediaRate==1) {
+			*MediaTime = movieTime + ent->mediaTime;
+		} else {
+			ent = (GF_EdtsEntry *)gf_list_get(trak->editBox->editList->entryList, 0);
+			if (ent->mediaRate==-1) {
+				u64 dur = (u64) (ent->segmentDuration * scale_ts);
+				*MediaTime = (movieTime > dur) ? (movieTime-dur) : 0;
+			}
+		}
+		*useEdit = 0;
+		return GF_OK;
 	}
+
+
 	//we had nothing in the list (strange file but compliant...)
 	//return the 1 to 1 mapped vale of the last media sample
 	if (!ent) {

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/isom_read.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/isom_read.c Changed

@@ -92,17 +92,28 @@
 GF_EXPORT
 Bool gf_isom_probe_file(const char *fileName)
 {
-	unsigned char data[4];
-	u32 type;
-	FILE *f = gf_f64_open(fileName, "rb");
-	if (!f) return 0;
-	type = 0;
-	if (fread(data, 1, 4, f) == 4) {
+	u32 type = 0;
+
+	if (!strncmp(fileName, "gmem://", 7)) {
+		u32 size;
+		u8 *mem_address;
+		if (sscanf(fileName, "gmem://%d@%p", &size, &mem_address) != 2) {
+			return GF_URL_ERROR;
+		} 
+		if (size>8)
+			type = GF_4CC(mem_address[4], mem_address[5], mem_address[6], mem_address[7]);
+	} else {
+		unsigned char data[4];
+		FILE *f = gf_f64_open(fileName, "rb");
+		if (!f) return 0;
+		type = 0;
 		if (fread(data, 1, 4, f) == 4) {
-			type = GF_4CC(data[0], data[1], data[2], data[3]);
+			if (fread(data, 1, 4, f) == 4) {
+				type = GF_4CC(data[0], data[1], data[2], data[3]);
+			}
 		}
+		fclose(f);
 	}
-	fclose(f);
 	switch (type) {
 	case GF_ISOM_BOX_TYPE_MOOV:
 	case GF_ISOM_BOX_TYPE_MDAT:
@@ -110,6 +121,11 @@
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	case GF_ISOM_BOX_TYPE_MOOF:
 	case GF_ISOM_BOX_TYPE_STYP:
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+	/*Adobe specific*/
+	case GF_ISOM_BOX_TYPE_AFRA:
+	case GF_ISOM_BOX_TYPE_ABST:
+#endif
 #endif
 	case GF_ISOM_BOX_TYPE_FREE:
 	case GF_ISOM_BOX_TYPE_SKIP:
@@ -400,6 +416,16 @@
 	return 0;
 }
 
+GF_EXPORT
+u32 gf_isom_get_track_original_id(GF_ISOFile *movie, u32 trackNumber)
+{
+	GF_TrackBox *trak;
+	if (!movie) return 0;
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return 0;
+	return trak->originalID;
+}
+
 //return the timescale of the movie, 0 if error
 GF_EXPORT
 Bool gf_isom_has_movie(GF_ISOFile *file)
@@ -563,7 +589,7 @@
 
 
 //Return the number of track references of a track for a given ReferenceType
-//return -1 if error
+//return 0 if error
 GF_EXPORT
 s32 gf_isom_get_reference_count(GF_ISOFile *movie, u32 trackNumber, u32 referenceType)
 {
@@ -617,10 +643,35 @@
 	return GF_OK;
 }
 
-//Return the number of track references of a track for a given ReferenceType
+//Return the referenced track ID for a track and a given ReferenceType and Index
+//return -1 if error, 0 if the reference is a NULL one, or the trackNumber
+GF_EXPORT
+GF_Err gf_isom_get_reference_ID(GF_ISOFile *movie, u32 trackNumber, u32 referenceType, u32 referenceIndex, u32 *refTrackID)
+{
+	GF_Err e;
+	GF_TrackBox *trak;
+	GF_TrackReferenceTypeBox *dpnd;
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+
+	*refTrackID = 0;
+	if (!trak || !trak->References) return GF_BAD_PARAM;
+
+	dpnd = NULL;
+	e = Track_FindRef(trak, referenceType, &dpnd);
+	if (e) return e;
+	if (!dpnd) return GF_BAD_PARAM;
+
+	if (referenceIndex > dpnd->trackIDCount) return GF_BAD_PARAM;
+
+	*refTrackID = dpnd->trackIDs[referenceIndex-1];
+
+	return GF_OK;
+}
+
+//Return referenceIndex if the given track has a reference to the given TreckID of a given ReferenceType
 //return -1 if error
 GF_EXPORT
-Bool gf_isom_has_track_reference(GF_ISOFile *movie, u32 trackNumber, u32 referenceType, u32 refTrackID)
+u32 gf_isom_has_track_reference(GF_ISOFile *movie, u32 trackNumber, u32 referenceType, u32 refTrackID)
 {
 	u32 i;
 	GF_TrackBox *trak;
@@ -633,7 +684,7 @@
 	if ( (movie->LastError = Track_FindRef(trak, referenceType, &dpnd)) ) return 0;
 	if (!dpnd) return 0;
 	for (i=0; i<dpnd->trackIDCount; i++) {
-		if (dpnd->trackIDs[i]==refTrackID) return 1;
+		if (dpnd->trackIDs[i]==refTrackID) return i+1;
 	}
 	return 0;
 }
@@ -1506,6 +1557,42 @@
 
 //get the number of edited segment
 GF_EXPORT
+Bool gf_isom_get_edit_list_type(GF_ISOFile *the_file, u32 trackNumber, s64 *mediaOffset)
+{
+	GF_EdtsEntry *ent;
+	GF_TrackBox *trak;
+	u32 count;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return 0;
+	*mediaOffset = 0;
+	if (!trak->editBox || !trak->editBox->editList) return 0;
+
+	ent = gf_list_last(trak->editBox->editList->entryList);
+	if (!ent || ent->segmentDuration) return 1;
+
+	count = gf_list_count(trak->editBox->editList->entryList);
+	/*mediaRate>0, the track playback shall start at media time>0 -> mediaOffset is < 0 */
+	if ((count==1) && (ent->mediaRate==1)) {
+		*mediaOffset = - ent->mediaTime;
+		return 0;
+	} else if (count==2) {
+		ent = gf_list_get(trak->editBox->editList->entryList, 0);
+		/*mediaRate==-1, the track playback shall be empty for segmentDuration -> mediaOffset is > 0 */
+		if (ent->mediaRate==-1) {
+			Double time = (Double) ent->segmentDuration;
+			time /= trak->moov->mvhd->timeScale;
+			time *= trak->Media->mediaHeader->timeScale;
+
+			*mediaOffset = (s64) time;
+			return 0;
+		}
+	}
+	return 1;
+}
+
+
+//get the number of edited segment
+GF_EXPORT
 u32 gf_isom_get_edit_segment_count(GF_ISOFile *the_file, u32 trackNumber)
 {
 	GF_TrackBox *trak;
@@ -2157,8 +2244,12 @@
 	case GF_ISOM_SUBTYPE_3GP_H263:
 	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_GNRV:
+	case GF_ISOM_BOX_TYPE_HVC1: 
+	case GF_ISOM_BOX_TYPE_HEV1: 
 		*Width = ((GF_VisualSampleEntryBox*)entry)->Width;
 		*Height = ((GF_VisualSampleEntryBox*)entry)->Height;
 		return GF_OK;
@@ -2233,8 +2324,12 @@
 	case GF_ISOM_SUBTYPE_3GP_H263:
 	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_GNRV:
+	case GF_ISOM_BOX_TYPE_HVC1: 
+	case GF_ISOM_BOX_TYPE_HEV1: 
 		*hSpacing = ((GF_VisualSampleEntryBox*)entry)->pasp ? ((GF_VisualSampleEntryBox*)entry)->pasp->hSpacing : 0;
 		*vSpacing = ((GF_VisualSampleEntryBox*)entry)->pasp ? ((GF_VisualSampleEntryBox*)entry)->pasp->vSpacing : 0;
 		return GF_OK;
@@ -2412,8 +2507,12 @@
 			case GF_ISOM_SUBTYPE_3GP_EVRC: nb_evrc++; break;
 			case GF_ISOM_SUBTYPE_3GP_QCELP: nb_qcelp++; break;
 			case GF_ISOM_SUBTYPE_3GP_SMV: nb_smv++; break;
-			case GF_ISOM_SUBTYPE_AVC_H264: nb_avc++; break;
-			case GF_ISOM_SUBTYPE_AVC2_H264: nb_avc++; break;
+			case GF_ISOM_SUBTYPE_AVC_H264:
+			case GF_ISOM_SUBTYPE_AVC2_H264: 
+			case GF_ISOM_SUBTYPE_AVC3_H264: 
+			case GF_ISOM_SUBTYPE_AVC4_H264: 
+				nb_avc++; 
+				break;
 			case GF_ISOM_SUBTYPE_SVC_H264: nb_avc++; break;
 			case GF_ISOM_SUBTYPE_MPEG4:
 			case GF_ISOM_SUBTYPE_MPEG4_CRYP:
@@ -2676,8 +2775,12 @@
 	case GF_ISOM_BOX_TYPE_MP4V:
 	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_ENCV:
+	case GF_ISOM_BOX_TYPE_HVC1: 
+	case GF_ISOM_BOX_TYPE_HEV1: 
 		break;
 	default:
 		return GF_BAD_PARAM;
@@ -2840,4 +2943,30 @@
 
 #endif
 
+GF_EXPORT
+GF_Err gf_isom_set_nalu_extract_mode(GF_ISOFile *the_file, u32 trackNumber, u32 nalu_extract_mode)
+{
+	GF_TrackReferenceTypeBox *dpnd;
+	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+	trak->extractor_mode = nalu_extract_mode;
+
+	if (!trak->References) return GF_OK;
+
+	/*get base*/
+	dpnd = NULL;
+	trak->has_base_layer = 0;
+	Track_FindRef(trak, GF_ISOM_REF_SCAL, &dpnd);
+	if (dpnd) trak->has_base_layer = 1;
+	return GF_OK;
+}
+
+GF_EXPORT
+u32 gf_isom_get_nalu_extract_mode(GF_ISOFile *the_file, u32 trackNumber)
+{
+	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return 0;
+	return trak->extractor_mode;
+}
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/isom_store.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/isom_store.c Changed

@@ -362,10 +362,12 @@
 	}
 	//get the payload...
 	bytes = gf_isom_datamap_get_data(map, mw->buffer, size, offset);
-	if (bytes != size) return GF_IO_ERR;
+	if (bytes != size) 
+		return GF_IO_ERR;
 	//write it to our stream...
 	bytes = gf_bs_write_data(bs, mw->buffer, size);
-	if (bytes != size) return GF_IO_ERR;
+	if (bytes != size) 
+		return GF_IO_ERR;
 
 	mw->nb_done++;
 	gf_set_progress("ISO File Writing", mw->nb_done, mw->total_samples);
@@ -675,6 +677,10 @@
 			case GF_ISOM_BOX_TYPE_META:
 			case GF_ISOM_BOX_TYPE_FTYP:
 			case GF_ISOM_BOX_TYPE_PDIN:
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+			case GF_ISOM_BOX_TYPE_AFRA:
+			case GF_ISOM_BOX_TYPE_ABST:
+#endif
 				break;
 			case GF_ISOM_BOX_TYPE_MDAT:
 				//in case we're capturing
@@ -705,6 +711,21 @@
 		e = WriteMoovAndMeta(movie, writers, bs);
 		if (e) goto exit;
 
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+		i=0;
+		while ((a = (GF_Box*)gf_list_enum(movie->TopBoxes, &i))) {
+			switch (a->type) {
+			case GF_ISOM_BOX_TYPE_AFRA:
+			case GF_ISOM_BOX_TYPE_ABST:
+				e = gf_isom_box_size(a);
+				if (e) goto exit;
+				e = gf_isom_box_write(a, bs);
+				if (e) goto exit;
+				break;
+			}
+		}
+#endif
+
 		/*if data has been written, update mdat size*/
 		if (totSize) {
 			offset = gf_bs_get_position(bs);
@@ -1234,6 +1255,7 @@
 	return e;
 }
 
+extern u32 default_write_buffering_size;
 
 GF_Err WriteToFile(GF_ISOFile *movie)
 {
@@ -1255,13 +1277,15 @@
 	if (movie->openMode == GF_ISOM_OPEN_WRITE) {
 		e = WriteFlat(&mw, 0, movie->editFileMap->bs);
 	} else {
+		u32 buffer_size = movie->editFileMap ? gf_bs_get_output_buffering(movie->editFileMap->bs) : 0;
 		Bool is_stdout = 0;
 		if (!strcmp(movie->finalName, "std"))
 			is_stdout = 1;
 
 		//OK, we need a new bitstream
 		stream = is_stdout ? stdout : gf_f64_open(movie->finalName, "w+b");
-		if (!stream) return GF_IO_ERR;
+		if (!stream) 
+			return GF_IO_ERR;
 		bs = gf_bs_from_file(stream, GF_BITSTREAM_WRITE);
 		if (!bs) {
 			if (!is_stdout)
@@ -1269,6 +1293,10 @@
 			return GF_OUT_OF_MEM;
 		}
 
+		if (buffer_size) {
+			gf_bs_set_output_buffering(bs, buffer_size);
+		}
+
 		switch (movie->storageMode) {
 		case GF_ISOM_STORE_TIGHT:
 		case GF_ISOM_STORE_INTERLEAVED:

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/isom_write.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/isom_write.c Changed

@@ -1171,7 +1171,11 @@
 	case GF_ISOM_SUBTYPE_3GP_H263:
 	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_HVC1: 
+	case GF_ISOM_BOX_TYPE_HEV1: 
 		((GF_VisualSampleEntryBox*)entry)->Width = Width;
 		((GF_VisualSampleEntryBox*)entry)->Height = Height;
 		trak->Header->width = Width<<16;
@@ -1215,7 +1219,11 @@
 	case GF_ISOM_SUBTYPE_3GP_H263:
 	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_HVC1: 
+	case GF_ISOM_BOX_TYPE_HEV1: 
 		break;
 	default:
 		return GF_BAD_PARAM;
@@ -2363,6 +2371,8 @@
 GF_Err gf_isom_clone_movie(GF_ISOFile *orig_file, GF_ISOFile *dest_file, Bool clone_tracks, Bool keep_hint_tracks)
 {
 	GF_Err e;
+	u32 i;
+	GF_Box *box;
 	
 	e = CanAccessMovie(dest_file, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
@@ -2395,6 +2405,8 @@
 		orig_file->moov->trackList = old_tracks;
 		gf_list_del(tracks);
 		orig_file->moov->iods = (GF_ObjectDescriptorBox*)iods;
+		gf_list_add(dest_file->TopBoxes, dest_file->moov);
+
 		if (clone_tracks) { 
 			for (i=0; i<gf_list_count(orig_file->moov->trackList); i++) {
 				GF_TrackBox *trak = gf_list_get( orig_file->moov->trackList, i);
@@ -2412,6 +2424,33 @@
 		}
 		dest_file->moov->mov = dest_file;
 	}
+
+	//duplicate other boxes
+	i=0;
+	while ((box = (GF_Box*)gf_list_get(orig_file->TopBoxes, i++))) {
+		switch(box->type) {
+			case GF_ISOM_BOX_TYPE_MOOV:
+			case GF_ISOM_BOX_TYPE_META:
+			case GF_ISOM_BOX_TYPE_MDAT:
+			case GF_ISOM_BOX_TYPE_FTYP:
+			case GF_ISOM_BOX_TYPE_PDIN:
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+			case GF_ISOM_BOX_TYPE_STYP:
+			case GF_ISOM_BOX_TYPE_SIDX:
+			case GF_ISOM_BOX_TYPE_MOOF:
+#endif
+			case GF_4CC('j','P',' ',' '):
+				break;
+			default:
+				{
+					GF_Box *box2 = NULL;
+					gf_isom_clone_box(box, &box2);
+					gf_list_add(dest_file->TopBoxes, box2);
+				}
+				break;
+		}
+	}
+
 	return GF_OK;
 }
 
@@ -2422,6 +2461,7 @@
 	GF_TrackBox *trak, *new_tk;
 	GF_BitStream *bs;
 	char *data;
+	const char *buffer;
 	u32 data_size;
 	Double ts_scale;
 	GF_Err e;
@@ -2481,6 +2521,12 @@
 
 	moov_AddBox((GF_Box*)dest_file->moov, (GF_Box *)new_tk);
 
+	/*set originalID*/
+	new_tk->originalID = trak->Header->trackID;
+	/*set originalFile*/
+	buffer = gf_isom_get_filename(orig_file);
+	new_tk->originalFile = gf_crc_32(buffer, sizeof(buffer));
+
 	/*rewrite edit list segmentDuration to new movie timescale*/
 	ts_scale = dest_file->moov->mvhd->timeScale;
 	ts_scale /= orig_file->moov->mvhd->timeScale;
@@ -2945,6 +2991,36 @@
 	return GF_OK;
 }
 
+/*force to rewrite all dependencies when the trackID of referenced track changes*/
+GF_EXPORT
+GF_Err gf_isom_rewrite_track_dependencies(GF_ISOFile *movie, u32 trackNumber)
+{
+	GF_TrackReferenceTypeBox *ref;
+	GF_TrackBox *trak, *a_trak;
+	u32 i, k;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak)
+		return GF_BAD_PARAM;
+	if (!trak->References) 
+		return GF_OK;
+
+	i=0;
+	while ((ref = (GF_TrackReferenceTypeBox *)gf_list_enum(trak->References->other_boxes, &i))) {
+		for (k=0; k < ref->trackIDCount; k++) {
+			a_trak = gf_isom_get_track_from_original_id(movie->moov, ref->trackIDs[k], trak->originalFile);
+			if (a_trak) {
+				ref->trackIDs[k] = a_trak->Header->trackID;
+			} else {
+				a_trak = gf_isom_get_track_from_id(movie->moov, ref->trackIDs[k]);
+				/*we should have a track with no original ID (not imported) - should we rewrite the dependency ?*/
+				if (! a_trak || a_trak->originalID) return GF_BAD_PARAM;
+			}
+		}
+	}
+
+	return GF_OK;
+}
 
 GF_EXPORT
 GF_Err gf_isom_modify_cts_offset(GF_ISOFile *the_file, u32 trackNumber, u32 sample_number, u32 offset)
@@ -3230,21 +3306,25 @@
 			break;
 		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_HVC1:
+		case GF_ISOM_BOX_TYPE_HEV1:
 		{
 			GF_MPEGVisualSampleEntryBox *avc1 = (GF_MPEGVisualSampleEntryBox *)ent1;
 			GF_MPEGVisualSampleEntryBox *avc2 = (GF_MPEGVisualSampleEntryBox *)ent2;
 			data1 = data2 = NULL;
 
 			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			a = (GF_Box *)avc1->avc_config;
+			a = avc1->hevc_config ? (GF_Box *) avc1->hevc_config : (GF_Box *) avc1->avc_config;
 			gf_isom_box_size(a);
 			gf_isom_box_write(a, bs);
 			gf_bs_get_content(bs, &data1, &data1_size);
 			gf_bs_del(bs);
 
 			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			a = (GF_Box *)avc2->avc_config;
+			a = avc2->hevc_config ? (GF_Box *) avc2->hevc_config : (GF_Box *) avc2->avc_config;
 			gf_isom_box_size(a);
 			gf_isom_box_write(a, bs);
 			gf_bs_get_content(bs, &data2, &data2_size);
@@ -4071,8 +4151,12 @@
 	case GF_ISOM_BOX_TYPE_MP4V:
 	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_ENCV:
+	case GF_ISOM_BOX_TYPE_HVC1: 
+	case GF_ISOM_BOX_TYPE_HEV1: 
 		break;
 	default:
 		return GF_BAD_PARAM;
@@ -4381,7 +4465,6 @@
 	}
 }
 
-
 #endif	/*!defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_WRITE)*/

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/media.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/media.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/movie_fragments.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/movie_fragments.c Changed

@@ -389,7 +389,7 @@
 
 #ifndef USE_BASE_DATA_OFFSET
 	if (movie->use_segments) {
-		traf->tfhd->flags = 0;
+		traf->tfhd->flags = GF_ISOM_MOOF_BASE_OFFSET;
 	} else 
 #endif
 	{
@@ -883,7 +883,7 @@
 	if (e) return e;
 
 	if (start_range) *start_range = (u32) movie->root_sidx_offset;
-	if (end_range) *end_range = (u32) gf_bs_get_position(bs);
+	if (end_range) *end_range = (u32) gf_bs_get_position(bs)-1;
 
 	return GF_OK;
 }
@@ -950,7 +950,7 @@
 	}
 
 	/*write STYP if we write to a different file or if we write the last segment*/
-	if ((!movie->append_segment && !movie->segment_start) || last_segment) {
+	if (!movie->append_segment && !movie->segment_start ) {
 
 		/*modify brands STYP*/
 
@@ -1360,7 +1360,7 @@
 	} else {
 		assert(gf_list_count(movie->moof_list) == 0);
 		movie->segment_start = gf_bs_get_position(movie->editFileMap->bs);
-		/*if movieFileMap is not null, we are concatenating segments to the original move, force a copy*/
+		/*if movieFileMap is not null, we are concatenating segments to the original movie, force a copy*/
 		if (movie->movieFileMap)
 			movie->append_segment = 1;
 	}

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/sample_descs.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/sample_descs.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/stbl_read.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/stbl_read.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/stbl_write.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/stbl_write.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/isomedia/track.c -> gpac-0.5.0.svn4296.tar.bz2/src/isomedia/track.c Changed

@@ -197,7 +197,7 @@
 			} else {
 				esd->decoderConfig->rvc_config = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
 				if (mime_type && !strcmp(mime_type, "application/rvc-config+xml+gz") ) {
-#ifndef GPAC_DISABLE_CORE_TOOLS
+#if !defined(GPAC_DISABLE_CORE_TOOLS) && !defined(GPAC_DISABLE_ZLIB)
 					gf_gz_decompress_payload(rvc_cfg_data, rvc_cfg_size, &esd->decoderConfig->rvc_config->data, &esd->decoderConfig->rvc_config->dataLength);
 					gf_free(rvc_cfg_data);
 #endif
@@ -367,22 +367,17 @@
 
 	//if we have an edit list, the duration is the sum of all the editList 
 	//entries' duration (always expressed in MovieTimeScale)
-	if (trak->editBox && !trak->editBox->last_is_empty && trak->editBox->editList) {
+	if (trak->editBox && trak->editBox->editList) {
 		trackDuration = 0;
 		elst = trak->editBox->editList;
 		i=0;
 		while ((ent = (GF_EdtsEntry*)gf_list_enum(elst->entryList, &i))) {
 			trackDuration += ent->segmentDuration;
-			if (ent->mediaRate && !ent->segmentDuration) {
-				trak->editBox->last_is_empty = 1;
-			}
-		}
-
-		if (trak->editBox->last_is_empty) {
-			ent = (GF_EdtsEntry*) gf_list_last(elst->entryList);
-			ent->segmentDuration = trackDuration;
 		}
 	}
+	if (!trackDuration) {
+		trackDuration = (trak->Media->mediaHeader->duration * trak->moov->mvhd->timeScale) / trak->Media->mediaHeader->timeScale;
+	}
 	trak->Header->duration = trackDuration;
 	trak->Header->modificationTime = gf_isom_get_mp4time();
 	return GF_OK;
@@ -464,8 +459,9 @@
 			//add chunk on first sample
 			if (!j) {
 				data_offset = base_offset;
-				//aggregated offset
-				if (!(traf->tfhd->flags & GF_ISOM_TRAF_BASE_OFFSET)) data_offset += chunk_size;
+				//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;
 
 				if (trun->flags & GF_ISOM_TRUN_DATA_OFFSET) {
 					data_offset += trun->data_offset;
@@ -876,8 +872,12 @@
 			break;
 		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:
-			e = AVC_UpdateESD((GF_MPEGVisualSampleEntryBox*)entry, esd);
+		case GF_ISOM_BOX_TYPE_HVC1: 
+		case GF_ISOM_BOX_TYPE_HEV1: 
+			e = AVC_HEVC_UpdateESD((GF_MPEGVisualSampleEntryBox*)entry, esd);
 			if (e) return e;
 			break;
 		case GF_ISOM_BOX_TYPE_LSR1:
@@ -886,7 +886,7 @@
 			break;
 			
 		default:
-			gf_odf_desc_del((GF_Descriptor *) esd);
+			//gf_odf_desc_del((GF_Descriptor *) esd);
 			break;
 		}
 	} else {
@@ -904,7 +904,12 @@
 			if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) {
 				entry_v = (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_AVC1);
 				if (!entry_v) return GF_OUT_OF_MEM;
-				e = AVC_UpdateESD((GF_MPEGVisualSampleEntryBox*)entry_v, esd);
+				e = AVC_HEVC_UpdateESD((GF_MPEGVisualSampleEntryBox*)entry_v, esd);
+			} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) {
+				entry_v = (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_HVC1);
+				if (!entry_v) return GF_OUT_OF_MEM;
+				e = AVC_HEVC_UpdateESD((GF_MPEGVisualSampleEntryBox*)entry_v, esd);
+				
 			} else {
 				entry_v = (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MP4V);
 				if (!entry_v) return GF_OUT_OF_MEM;

gpac-0.5.0.svn4192.tar.bz2/src/media_tools/av_parsers.c -> gpac-0.5.0.svn4296.tar.bz2/src/media_tools/av_parsers.c Changed

@@ -1461,7 +1461,7 @@
 	0
 };
 
-static u32 avc_get_ue(GF_BitStream *bs)
+static u32 bs_get_ue(GF_BitStream *bs)
 {
 	u8 coded;
 	u32 bits = 0, read = 0;
@@ -1478,14 +1478,14 @@
 	return gf_bs_read_int(bs, bits + 1) - 1;
 }
 
-static s32 avc_get_se(GF_BitStream *bs) 
+static s32 bs_get_se(GF_BitStream *bs) 
 {
-	u32 v = avc_get_ue(bs);
+	u32 v = bs_get_ue(bs);
 	if ((v & 0x1) == 0) return (s32) (0 - (v>>1));
 	return (v + 1) >> 1;
 }
 
-u32 AVC_IsStartCode(GF_BitStream *bs)
+u32 gf_media_nalu_is_start_code(GF_BitStream *bs)
 {
 	u8 s1, s2, s3, s4;
 	Bool is_sc = 0;
@@ -1506,7 +1506,7 @@
 
 /*read that amount of data at each IO access rather than fetching byte by byte...*/
 #define AVC_CACHE_SIZE	4096
-u32 AVC_NextStartCode(GF_BitStream *bs)
+u32 gf_media_nalu_next_start_code_bs(GF_BitStream *bs)
 {
 	u32 v, bpos;
 	char avc_cache[AVC_CACHE_SIZE];
@@ -1539,7 +1539,37 @@
 	return (u32) (end-start);
 }
 
-Bool AVC_SliceIsIntra(AVCState *avc) 
+u32 gf_media_nalu_next_start_code(u8 *data, u32 data_len, u32 *sc_size)
+{
+	u32 v, bpos;
+	u32 end;
+	
+	bpos = 0;
+	end = 0;
+	v = 0xffffffff;
+	while (!end) {
+		/*refill cache*/
+		if (bpos == (u32) data_len) 
+			break;
+
+		v = ( (v<<8) & 0xFFFFFF00) | ((u32) data[bpos]);
+		bpos++;
+		if (v == 0x00000001) {
+			end = bpos-4;
+			*sc_size = 4;
+			return end;
+		}
+		else if ( (v & 0x00FFFFFF) == 0x00000001) {
+			end = bpos-3;
+			*sc_size = 3;
+			return end;
+		}
+	}
+	if (!end) end = data_len;
+	return (u32) (end);
+}
+
+Bool gf_media_avc_slice_is_intra(AVCState *avc) 
 {
 	switch (avc->s_info.slice_type) {
 		case GF_AVC_TYPE_I:
@@ -1552,7 +1582,7 @@
 	}
 }
 
-Bool AVC_SliceIsIDR(AVCState *avc) 
+Bool gf_media_avc_slice_is_IDR(AVCState *avc) 
 {
 	if (avc->sei.recovery_point.valid)
 	{
@@ -1561,7 +1591,7 @@
 	}
 	if (avc->s_info.nal_unit_type != GF_AVC_NALU_IDR_SLICE)
 		return 0;
-	return AVC_SliceIsIntra(avc);
+	return gf_media_avc_slice_is_intra(avc);
 }
 
 static const struct { u32 w, h; } avc_sar[14] =
@@ -1578,14 +1608,16 @@
 {
 	int i, cpb_cnt_minus1;
 
-	cpb_cnt_minus1 = avc_get_ue(bs);	/*cpb_cnt_minus1*/
+	cpb_cnt_minus1 = bs_get_ue(bs);		/*cpb_cnt_minus1*/
+	if (cpb_cnt_minus1 > 31)
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[avc-h264] invalid cpb_cnt_minus1 value: %d (expected in [0;31])\n", cpb_cnt_minus1));
 	gf_bs_read_int(bs, 4);				/*bit_rate_scale*/
 	gf_bs_read_int(bs, 4);				/*cpb_size_scale*/
 
 	/*for( SchedSelIdx = 0; SchedSelIdx <= cpb_cnt_minus1; SchedSelIdx++ ) {*/
 	for (i=0; i<=cpb_cnt_minus1; i++) {
-		avc_get_ue(bs);					/*bit_rate_value_minus1[ SchedSelIdx ]*/
-		avc_get_ue(bs);					/*cpb_size_value_minus1[ SchedSelIdx ]*/
+		bs_get_ue(bs);					/*bit_rate_value_minus1[ SchedSelIdx ]*/
+		bs_get_ue(bs);					/*cpb_size_value_minus1[ SchedSelIdx ]*/
 		gf_bs_read_int(bs, 1);			/*cbr_flag[ SchedSelIdx ]*/
 	}
 	gf_bs_read_int(bs, 5);											/*initial_cpb_removal_delay_length_minus1*/
@@ -1733,7 +1765,7 @@
 	return nal_size-emulation_bytes_count; 
 } 
 
-s32 AVC_ReadSeqInfo(char *sps_data, u32 sps_size, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos)
+s32 gf_media_avc_read_sps(char *sps_data, u32 sps_size, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos)
 {
 	AVC_SPS *sps;
 	u32 ChromaArrayType = 0;
@@ -1753,6 +1785,8 @@
 	}
 	if (vui_flag_pos) *vui_flag_pos = 0;
 
+	/*nal hdr*/ gf_bs_read_int(bs, 8);
+
 	profile_idc = gf_bs_read_int(bs, 8);
 
 	pcomp = gf_bs_read_int(bs, 8);
@@ -1765,7 +1799,7 @@
 	/*SubsetSps is used to be sure that AVC SPS are not going to be scratched
 	by subset SPS. According to the SVC standard, subset SPS can have the same sps_id 
 	than its base layer, but it does not refer to the same SPS. */
-	sps_id = avc_get_ue(bs) + GF_SVC_SSPS_ID_SHIFT * subseq_sps;
+	sps_id = bs_get_ue(bs) + GF_SVC_SSPS_ID_SHIFT * subseq_sps;
 	if (sps_id >=32) {
 		sps_id = -1;
 		goto exit;
@@ -1789,7 +1823,7 @@
 	case 86:
 	case 118:
 	case 128:
-		chroma_format_idc = avc_get_ue(bs);
+		chroma_format_idc = bs_get_ue(bs);
 		ChromaArrayType = chroma_format_idc;
 		if (chroma_format_idc == 3) {
 			u8 separate_colour_plane_flag = gf_bs_read_int(bs, 1);
@@ -1800,8 +1834,8 @@
 			*/
 			if (separate_colour_plane_flag) ChromaArrayType = 0;
 		}
-		luma_bd = avc_get_ue(bs);
-		chroma_bd = avc_get_ue(bs);
+		luma_bd = bs_get_ue(bs);
+		chroma_bd = bs_get_ue(bs);
 		/*qpprime_y_zero_transform_bypass_flag = */ gf_bs_read_int(bs, 1);
 		/*seq_scaling_matrix_present_flag*/
 		if (gf_bs_read_int(bs, 1)) {
@@ -1812,7 +1846,7 @@
 					u32 sl = k<6 ? 16 : 64;
 					for (z=0; z<sl; z++) {
 						if (next) {
-							s32 delta = avc_get_se(bs);
+							s32 delta = bs_get_se(bs);
 							next = (last + delta + 256) % 256;
 						}
 						last = next ? next : last;
@@ -1826,29 +1860,29 @@
 	sps->profile_idc = profile_idc;
 	sps->level_idc = level_idc;
 	sps->prof_compat = pcomp;
-	sps->log2_max_frame_num = avc_get_ue(bs) + 4;
-	sps->poc_type = avc_get_ue(bs);
+	sps->log2_max_frame_num = bs_get_ue(bs) + 4;
+	sps->poc_type = bs_get_ue(bs);
 	sps->chroma_format = chroma_format_idc;
 	sps->luma_bit_depth_m8 = luma_bd;
 	sps->chroma_bit_depth_m8 = chroma_bd;
 
 	if (sps->poc_type == 0) {
-		sps->log2_max_poc_lsb = avc_get_ue(bs) + 4;
+		sps->log2_max_poc_lsb = bs_get_ue(bs) + 4;
 	} else if(sps->poc_type == 1) {
 		sps->delta_pic_order_always_zero_flag = gf_bs_read_int(bs, 1);
-		sps->offset_for_non_ref_pic = avc_get_se(bs);
-		sps->offset_for_top_to_bottom_field = avc_get_se(bs);
-		sps->poc_cycle_length = avc_get_ue(bs);
-		for(i=0; i<sps->poc_cycle_length; i++) sps->offset_for_ref_frame[i] = avc_get_se(bs);
+		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);
+		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;
 	}
-	avc_get_ue(bs); /*ref_frame_count*/
+	bs_get_ue(bs); /*ref_frame_count*/
 	gf_bs_read_int(bs, 1); /*gaps_in_frame_num_allowed_flag*/
-	mb_width = avc_get_ue(bs) + 1;
-	mb_height= avc_get_ue(bs) + 1;
+	mb_width = bs_get_ue(bs) + 1;
+	mb_height= bs_get_ue(bs) + 1;
 
 	sps->frame_mbs_only_flag = gf_bs_read_int(bs, 1);
 
@@ -1860,10 +1894,10 @@
 	gf_bs_read_int(bs, 1); /*direct_8x8_inference_flag*/
 	cl = cr = ct = cb = 0;
 	if (gf_bs_read_int(bs, 1)) /*crop*/ {
-		cl = avc_get_ue(bs); /*crop_left*/
-		cr = avc_get_ue(bs); /*crop_right*/
-		ct = avc_get_ue(bs); /*crop_top*/
-		cb = avc_get_ue(bs); /*crop_bottom*/
+		cl = bs_get_ue(bs); /*crop_left*/
+		cr = bs_get_ue(bs); /*crop_right*/
+		ct = bs_get_ue(bs); /*crop_top*/
+		cb = bs_get_ue(bs); /*crop_bottom*/
 
 		sps->width = 16*mb_width - 2*(cl + cr);
 		sps->height -= (2-sps->frame_mbs_only_flag)*2*(ct + cb);
@@ -1899,8 +1933,8 @@
 		}
 
 		if (gf_bs_read_int(bs, 1)) {	/* chroma_location_info_present_flag */
-			avc_get_ue(bs);				/* chroma_sample_location_type_top_field */
-			avc_get_ue(bs);				/* chroma_sample_location_type_bottom_field */
+			bs_get_ue(bs);				/* chroma_sample_location_type_top_field */
+			bs_get_ue(bs);				/* chroma_sample_location_type_bottom_field */
 		}
 
 		sps->vui.timing_info_present_flag = gf_bs_read_int(bs, 1);
@@ -1943,10 +1977,10 @@
 					/*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);
 				}
-				/*seq_scaled_ref_layer_left_offset*/ avc_get_se(bs);
-				/*seq_scaled_ref_layer_top_offset*/avc_get_se(bs); 
-				/*seq_scaled_ref_layer_right_offset*/avc_get_se(bs);
-				/*seq_scaled_ref_layer_bottom_offset*/avc_get_se(bs);
+				/*seq_scaled_ref_layer_left_offset*/ bs_get_se(bs);
+				/*seq_scaled_ref_layer_top_offset*/bs_get_se(bs); 
+				/*seq_scaled_ref_layer_right_offset*/bs_get_se(bs);
+				/*seq_scaled_ref_layer_bottom_offset*/bs_get_se(bs);
 			}
 			if (/*seq_tcoeff_level_prediction_flag*/gf_bs_read_int(bs, 1)) {
 				/*adaptive_tcoeff_level_prediction_flag*/ gf_bs_read_int(bs, 1);
@@ -1956,13 +1990,13 @@
 			/*svc_vui_parameters_present*/
 			if (gf_bs_read_int(bs, 1)) {
 				u32 i, vui_ext_num_entries_minus1;
-				vui_ext_num_entries_minus1 = avc_get_ue(bs);
+				vui_ext_num_entries_minus1 = bs_get_ue(bs);
 
 				for (i=0; i <= vui_ext_num_entries_minus1; i++) {
 					u8 vui_ext_nal_hrd_parameters_present_flag, vui_ext_vcl_hrd_parameters_present_flag, vui_ext_timing_info_present_flag;
-					/*u8 vui_ext_dependency_id = */gf_bs_read_int(bs, 3);
-					/*u8 vui_ext_quality_id = */gf_bs_read_int(bs, 4);
-					/*u8 vui_ext_temporal_id = */gf_bs_read_int(bs, 3);
+					/*u8 vui_ext_dependency_id =*/ gf_bs_read_int(bs, 3);
+					/*u8 vui_ext_quality_id =*/ gf_bs_read_int(bs, 4);
+					/*u8 vui_ext_temporal_id =*/ gf_bs_read_int(bs, 3);
 					vui_ext_timing_info_present_flag = gf_bs_read_int(bs, 1);
 					if (vui_ext_timing_info_present_flag) {
 						/*u32 vui_ext_num_units_in_tick = */gf_bs_read_int(bs, 32);
@@ -2001,7 +2035,7 @@
 	return sps_id;
 }
 
-s32 AVC_ReadPictParamSet(char *pps_data, u32 pps_size, AVCState *avc)
+s32 gf_media_avc_read_pps(char *pps_data, u32 pps_size, AVCState *avc)
 {
 	GF_BitStream *bs;
 	char *pps_data_without_emulation_bytes = NULL;
@@ -2017,7 +2051,10 @@
 		pps_id = -1;
 		goto exit;
 	}
-	pps_id = avc_get_ue(bs);
+	/*nal hdr*/gf_bs_read_u8(bs);
+
+
+	pps_id = bs_get_ue(bs);
 	if (pps_id>=255) {
 		pps_id = -1;
 		goto exit;
@@ -2025,7 +2062,7 @@
 	pps = &avc->pps[pps_id];
    
 	if (!pps->status) pps->status = 1;
-	pps->sps_id = avc_get_ue(bs);
+	pps->sps_id = bs_get_ue(bs);
 	if (pps->sps_id >= 32) {
 		pps->sps_id = 0;
 		pps_id = -1;
@@ -2039,19 +2076,19 @@
 	avc->sps_active_idx = pps->sps_id; /*set active sps*/
 	/*pps->cabac = */gf_bs_read_int(bs, 1);
 	pps->pic_order_present= gf_bs_read_int(bs, 1);
-	pps->slice_group_count= avc_get_ue(bs) + 1;
-	if (pps->slice_group_count > 1 ) /*pps->mb_slice_group_map_type = */avc_get_ue(bs);
-	/*pps->ref_count[0]= */avc_get_ue(bs) /*+ 1*/;
-	/*pps->ref_count[1]= */avc_get_ue(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->ref_count[0] > 32) || (pps->ref_count[1] > 32)) goto exit;
 	*/
 	
 	/*pps->weighted_pred = */gf_bs_read_int(bs, 1);
 	/*pps->weighted_bipred_idc = */gf_bs_read_int(bs, 2);
-	/*pps->init_qp = */avc_get_se(bs) /*+ 26*/;
-	/*pps->init_qs= */avc_get_se(bs) /*+ 26*/;
-	/*pps->chroma_qp_index_offset = */avc_get_se(bs);
+	/*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->constrained_intra_pred = */gf_bs_read_int(bs, 1);
 	pps->redundant_pic_cnt_present = gf_bs_read_int(bs, 1);
@@ -2062,7 +2099,7 @@
 	return pps_id;
 }
 
-s32 AVC_ReadSeqParamSetExtId(char *spse_data, u32 spse_size)
+s32 gf_media_avc_read_sps_ext(char *spse_data, u32 spse_size)
 {
 	GF_BitStream *bs;
 	char *spse_data_without_emulation_bytes = NULL;
@@ -2074,9 +2111,9 @@
 	spse_data_without_emulation_bytes_size = avc_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);
 	
-	sps_id = -1;
-	if (bs) 
-		sps_id = avc_get_ue(bs);
+	/*nal header*/gf_bs_read_u8(bs);
+
+	sps_id = bs_get_ue(bs);
 
 	gf_bs_del(bs);
 	gf_free(spse_data_without_emulation_bytes);
@@ -2104,11 +2141,11 @@
 	s32 pps_id;
 
 	/*s->current_picture.reference= h->nal_ref_idc != 0;*/
-	/*first_mb_in_slice = */avc_get_ue(bs);
-	si->slice_type = avc_get_ue(bs);
+	/*first_mb_in_slice = */bs_get_ue(bs);
+	si->slice_type = bs_get_ue(bs);
 	if (si->slice_type > 9) return -1;
 
-	pps_id = avc_get_ue(bs);
+	pps_id = bs_get_ue(bs);
 	if (pps_id>255) return -1;
 	si->pps = &avc->pps[pps_id];
 	if (!si->pps->slice_group_count) return -2;
@@ -2125,20 +2162,20 @@
 			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 = avc_get_ue(bs);
+		si->idr_pic_id = bs_get_ue(bs);
    
 	if (si->sps->poc_type==0) {
 		si->poc_lsb = gf_bs_read_int(bs, si->sps->log2_max_poc_lsb);
 		if (si->pps->pic_order_present && !si->field_pic_flag) {
-			si->delta_poc_bottom = avc_get_se(bs);
+			si->delta_poc_bottom = bs_get_se(bs);
 		}
 	} else if ((si->sps->poc_type==1) && !si->sps->delta_pic_order_always_zero_flag) {
-		si->delta_poc[0] = avc_get_se(bs);
+		si->delta_poc[0] = bs_get_se(bs);
 		if ((si->pps->pic_order_present==1) && !si->field_pic_flag)
-			si->delta_poc[1] = avc_get_se(bs);
+			si->delta_poc[1] = bs_get_se(bs);
 	}
 	if (si->pps->redundant_pic_cnt_present) {
-		si->redundant_pic_cnt = avc_get_ue(bs);
+		si->redundant_pic_cnt = bs_get_ue(bs);
 	}
 	return 0;
 }
@@ -2149,11 +2186,11 @@
 	s32 pps_id;
 
 	/*s->current_picture.reference= h->nal_ref_idc != 0;*/
-	/*first_mb_in_slice = */avc_get_ue(bs);
-	si->slice_type = avc_get_ue(bs);
+	/*first_mb_in_slice = */bs_get_ue(bs);
+	si->slice_type = bs_get_ue(bs);
 	if (si->slice_type > 9) return -1;
 
-	pps_id = avc_get_ue(bs);
+	pps_id = bs_get_ue(bs);
 	if (pps_id>255)
 		return -1;
 	si->pps = &avc->pps[pps_id];
@@ -2174,20 +2211,20 @@
 		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 || si ->NalHeader.idr_pic_flag)
-		si->idr_pic_id = avc_get_ue(bs);
+		si->idr_pic_id = bs_get_ue(bs);
    
 	if (si->sps->poc_type==0) {
 		si->poc_lsb = gf_bs_read_int(bs, si->sps->log2_max_poc_lsb);
  	if (si->pps->pic_order_present && !si->field_pic_flag) {
-			si->delta_poc_bottom = avc_get_se(bs);
+			si->delta_poc_bottom = bs_get_se(bs);
 		}
 	} else if ((si->sps->poc_type==1) && !si->sps->delta_pic_order_always_zero_flag) {
-		si->delta_poc[0] = avc_get_se(bs);
+		si->delta_poc[0] = bs_get_se(bs);
 		if ((si->pps->pic_order_present==1) && !si->field_pic_flag)
-			si->delta_poc[1] = avc_get_se(bs);
+			si->delta_poc[1] = bs_get_se(bs);
 	}
 	if (si->pps->redundant_pic_cnt_present) {
-		si->redundant_pic_cnt = avc_get_ue(bs);
+		si->redundant_pic_cnt = bs_get_ue(bs);
 	}
 	return 0;
 }
@@ -2197,7 +2234,7 @@
 {
 	AVCSeiRecoveryPoint *rp = &avc->sei.recovery_point;
 
-	rp->frame_cnt = avc_get_ue(bs);
+	rp->frame_cnt = bs_get_ue(bs);
 	rp->exact_match_flag = gf_bs_read_int(bs, 1);
 	rp->broken_link_flag = gf_bs_read_int(bs, 1);
 	rp->changing_slice_group_idc = gf_bs_read_int(bs, 2);
@@ -2379,7 +2416,7 @@
 		si->poc = field_poc[1];
 }
 
-s32 AVC_ParseNALU(GF_BitStream *bs, u32 nal_hdr, AVCState *avc)
+s32 gf_media_avc_parse_nalu(GF_BitStream *bs, u32 nal_hdr, AVCState *avc)
 {
 	u8 idr_flag;
 	s32 slice, ret;
@@ -2483,6 +2520,7 @@
 		break;
 	case GF_AVC_NALU_SEQ_PARAM:
 	case GF_AVC_NALU_PIC_PARAM:
+	case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
 		return 0;
 	default:
 		if (avc->s_info.nal_unit_type <= GF_AVC_NALU_IDR_SLICE) ret = 1;
@@ -2511,7 +2549,7 @@
 	return ret;
 }
 
-u32 AVC_ReformatSEI_NALU(char *buffer, u32 nal_size, AVCState *avc)
+u32 gf_media_avc_reformat_sei(char *buffer, u32 nal_size, AVCState *avc)
 {
 	u32 ptype, psize, hdr, written, var;
 	u64 start;
@@ -2671,7 +2709,7 @@
 	return 0xFF;
 }
 
-GF_Err AVC_ChangePAR(GF_AVCConfig *avcc, s32 ar_n, s32 ar_d)
+GF_Err gf_media_avc_change_par(GF_AVCConfig *avcc, s32 ar_n, s32 ar_d)
 {
 	GF_BitStream *orig, *mod;
 	AVCState avc;
@@ -2687,7 +2725,7 @@
 	while ((slc = (GF_AVCConfigSlot *)gf_list_enum(avcc->sequenceParameterSets, &i))) {
 		char *no_emulation_buf = NULL;
 		u32 no_emulation_buf_size = 0, emulation_bytes = 0;
-		idx = AVC_ReadSeqInfo(slc->data+1/*skip NALU type*/, slc->size-1, &avc, 0, &bit_offset);
+		idx = gf_media_avc_read_sps(slc->data, slc->size, &avc, 0, &bit_offset);
 		if (idx<0) {
 			if ( orig )
 				gf_bs_del(orig);
@@ -2704,14 +2742,15 @@
 		mod = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
 		/*copy over till vui flag*/
-		while (bit_offset) {
+		assert(bit_offset>=8);
+		while (bit_offset-8/*bit_offset doesn't take care of the first byte (NALU type)*/) {
 			flag = gf_bs_read_int(orig, 1);
 			gf_bs_write_int(mod, flag, 1);
 			bit_offset--;
 		}
 		/*check VUI*/
 		flag = gf_bs_read_int(orig, 1);
-		gf_bs_write_int(mod, 1, 1);
+		gf_bs_write_int(mod, 1, 1); /*vui_parameters_present_flag*/
 		if (flag) {
 			/*aspect_ratio_info_present_flag*/
 			if (gf_bs_read_int(orig, 1)) {
@@ -2778,7 +2817,7 @@
 	memset(&avc, 0, sizeof(AVCState));
 	avc.sps_active_idx = -1;
 
-	idx = AVC_ReadSeqInfo(sps_data+1/*skip NALU type*/, sps_size-1, &avc, 0, NULL);
+	idx = gf_media_avc_read_sps(sps_data, sps_size, &avc, 0, NULL);
 	if (idx<0) {
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
@@ -2792,11 +2831,636 @@
 	return GF_OK;
 }
 
-#endif /*GPAC_DISABLE_AV_PARSERS*/
+GF_EXPORT
+GF_Err gf_avc_get_pps_info(char *pps_data, u32 pps_size, u32 *pps_id, u32 *sps_id)
+{
+	GF_BitStream *bs;
+	char *pps_data_without_emulation_bytes = NULL;
+	u32 pps_data_without_emulation_bytes_size = 0;
+	GF_Err e = GF_OK;
+
+	/*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);
+	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;
+		goto exit;
+	}
+	/*nal hdr*/ gf_bs_read_int(bs, 8);
+
+	*pps_id = bs_get_ue(bs);  
+	*sps_id = bs_get_ue(bs);
+
+exit:
+	gf_bs_del(bs);
+	gf_free(pps_data_without_emulation_bytes);
+	return e;
+}
+
+
+/**********
+HEVC parsing
+**********/
+
+Bool gf_media_hevc_slice_is_intra(HEVCState *hevc)
+{
+	switch (hevc->s_info.nal_unit_type) {
+	case GF_HEVC_NALU_SLICE_BLA_W_LP:
+	case GF_HEVC_NALU_SLICE_BLA_W_DLP:
+	case GF_HEVC_NALU_SLICE_BLA_N_LP:
+	case GF_HEVC_NALU_SLICE_IDR_W_DLP:
+	case GF_HEVC_NALU_SLICE_IDR_N_LP:
+	case GF_HEVC_NALU_SLICE_CRA:
+		return 1;
+	default:
+		return 0;
+	}
+}
+
+Bool gf_media_hevc_slice_is_IDR(HEVCState *hevc) 
+{
+	if (hevc->sei.recovery_point.valid)
+	{
+		hevc->sei.recovery_point.valid = 0;
+		return 1;
+	}
+	switch (hevc->s_info.nal_unit_type) {
+	case GF_HEVC_NALU_SLICE_IDR_W_DLP:
+	case GF_HEVC_NALU_SLICE_IDR_N_LP:
+		return 1;
+	default:
+		return 0;
+	}
+}
+
+static s32 hevc_parse_slice_segment(GF_BitStream *bs, HEVCState *hevc, HEVCSliceInfo *si) 
+{
+	HEVC_PPS *pps;
+	HEVC_SPS *sps;
+	s32 pps_id;
+	Bool dependent_slice_segment_flag = 0;
+	Bool first_slice_segment_in_pic_flag = gf_bs_read_int(bs, 1);
+	Bool RapPicFlag = 0;
+	Bool IDRPicFlag = 0;
+	
+	switch (si->nal_unit_type) {
+	case GF_HEVC_NALU_SLICE_IDR_W_DLP:
+	case GF_HEVC_NALU_SLICE_IDR_N_LP:
+		IDRPicFlag = 1;
+		RapPicFlag = 1;
+		break;
+	case GF_HEVC_NALU_SLICE_BLA_W_LP:
+	case GF_HEVC_NALU_SLICE_BLA_W_DLP:
+	case GF_HEVC_NALU_SLICE_BLA_N_LP:
+	case GF_HEVC_NALU_SLICE_CRA:
+		RapPicFlag = 1;
+		break;
+	}
+
+	if (RapPicFlag) {
+		/*Bool no_output_of_prior_pics_flag = */gf_bs_read_int(bs, 1);
+	}
+	pps_id = bs_get_ue(bs);
+	if (pps_id>=64) return -1;
+
+	pps = &hevc->pps[pps_id];
+	sps = &hevc->sps[pps->sps_id];
+	si->sps = sps;
+	si->pps = pps;
+
+	if (!first_slice_segment_in_pic_flag && pps->dependent_slice_segments_enabled_flag) {
+		dependent_slice_segment_flag = gf_bs_read_int(bs, 1);
+	}
+
+	{
+		if (!first_slice_segment_in_pic_flag) {
+			/*slice_segment_address = */gf_bs_read_int(bs, sps->bitsSliceSegmentAddress);
+		}
+	}
+	
+	if( !dependent_slice_segment_flag ) {
+		gf_bs_read_int(bs, pps->num_extra_slice_header_bits);
+
+		si->slice_type = bs_get_ue(bs);
+
+		if(pps->output_flag_present_flag)
+			/*pic_output_flag = */gf_bs_read_int(bs, 1);
+		
+		if (sps->separate_colour_plane_flag == 1)
+			/*colour_plane_id = */gf_bs_read_int(bs, 2);
+
+		if (IDRPicFlag) {
+			si->poc_lsb = 0;
+		} else {
+			si->poc_lsb = gf_bs_read_int(bs, sps->log2_max_pic_order_cnt_lsb);
+		}
+	}
+	return 0;
+}
+
+static void hevc_compute_poc(HEVCSliceInfo *si)
+{
+	u32 max_poc_lsb = 1 << (si->sps->log2_max_pic_order_cnt_lsb);
+
+	/* frame_num_offset */
+	switch (si->nal_unit_type) {
+	case GF_HEVC_NALU_SLICE_IDR_W_DLP:
+	case GF_HEVC_NALU_SLICE_IDR_N_LP:
+	case GF_HEVC_NALU_SLICE_CRA:
+		si->poc_lsb_prev = 0;
+		si->poc_msb_prev = 0;
+		break;
+	}
+	
+	if ((si->poc_lsb < si->poc_lsb_prev) && (si->poc_lsb_prev - si->poc_lsb >= max_poc_lsb / 2) )
+		si->poc_msb = si->poc_msb_prev + max_poc_lsb;
+	else if ((si->poc_lsb > si->poc_lsb_prev) && (si->poc_lsb - si->poc_lsb_prev > max_poc_lsb / 2))
+		si->poc_msb = si->poc_msb_prev - max_poc_lsb;
+	else
+		si->poc_msb = si->poc_msb_prev;
+
+	switch (si->nal_unit_type) {
+	case GF_HEVC_NALU_SLICE_BLA_W_LP:
+	case GF_HEVC_NALU_SLICE_BLA_W_DLP:
+	case GF_HEVC_NALU_SLICE_BLA_N_LP:
+		si->poc_msb  = 0;
+		break;
+	}
+	si->poc = si->poc_msb + si->poc_lsb;
+}
+
+void profile_tier_level(GF_BitStream *bs, Bool ProfilePresentFlag, u8 MaxNumSubLayersMinus1, HEVC_ProfileTierLevel *ptl)
+{
+	u32 i;
+	if (ProfilePresentFlag) {
+		ptl->profile_space = gf_bs_read_int(bs, 2);
+		ptl->tier_flag = gf_bs_read_int(bs, 1);
+		ptl->profile_idc = gf_bs_read_int(bs, 5);
 
+		ptl->profile_compatibility_flag = gf_bs_read_int(bs, 32);
 
+		/*general_reserved_zero_16bits  = */gf_bs_read_int(bs, 16);
+	}
+	ptl->level_idc = gf_bs_read_int(bs, 8);
+	for (i=0; i<MaxNumSubLayersMinus1; i++) {
+		if (ProfilePresentFlag)
+			ptl->sub_ptl[i].profile_present_flag = gf_bs_read_int(bs, 1);
+		ptl->sub_ptl[i].level_present_flag = gf_bs_read_int(bs, 1);
+		if (ProfilePresentFlag && ptl->sub_ptl[i].profile_present_flag) {
+			ptl->sub_ptl[i].profile_space = gf_bs_read_int(bs, 2);
+			ptl->sub_ptl[i].tier_flag = gf_bs_read_int(bs, 1);
+			ptl->sub_ptl[i].profile_idc = gf_bs_read_int(bs, 5);
+			ptl->sub_ptl[i].profile_compatibility_flag = gf_bs_read_int(bs, 32);
+			/*sub_layer_reserved_zero_16bits*/gf_bs_read_int(bs, 16);
+		}
+		if (ptl->sub_ptl[i].level_present_flag)
+			ptl->sub_ptl[i].level_idc = gf_bs_read_int(bs, 8);
+	}
+}
+
+void bit_rate_pic_rate_info(GF_BitStream *bs, u8 level_low, u8 level_high, HEVC_VPS *vps)
+{
+	u8 i;
+	for (i=level_low; i<=level_high; i++) {
+		Bool bit_rate_info_present_flag = gf_bs_read_int(bs, 1);
+		Bool pic_rate_info_present_flag = gf_bs_read_int(bs, 1);
+		if (bit_rate_info_present_flag) {
+			vps->rates[i].avg_bit_rate = gf_bs_read_int(bs, 16);
+			vps->rates[i].max_bit_rate = gf_bs_read_int(bs, 16);
+		}
+		if (pic_rate_info_present_flag) {
+			vps->rates[i].constand_pic_rate_idc = gf_bs_read_int(bs, 2);
+			vps->rates[i].avg_pic_rate = gf_bs_read_int(bs, 16);
+		}
+	}
+}
+
+s32 gf_media_hevc_read_vps(char *data, u32 size, HEVCState *hevc)
+{
+	GF_BitStream *bs;
+	char *data_without_emulation_bytes = NULL;
+	u32 data_without_emulation_bytes_size = 0;
+	s32 vps_id = -1;
+	HEVC_VPS *vps;
+
+	/*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);
+	bs = gf_bs_new(data_without_emulation_bytes, data_without_emulation_bytes_size, GF_BITSTREAM_READ);
+	if (!bs) goto exit;
+	
+	gf_bs_read_u16(bs);
+
+	vps_id = gf_bs_read_int(bs, 4);
+
+	if (vps_id>=16) goto exit;
+
+	vps = &hevc->vps[vps_id];   
+	if (!vps->state) {
+		vps->id = vps_id;
+		vps->state = 1;
+	}
+
+	/*vps_temporal_id_nesting_flag = */ gf_bs_read_int(bs, 1);
+	gf_bs_read_int(bs, 2);
+	gf_bs_read_int(bs, 6);
+	vps->max_sub_layer = gf_bs_read_int(bs, 3) + 1;
+	gf_bs_read_int(bs, 16);
+	profile_tier_level(bs, 1, vps->max_sub_layer-1, &vps->ptl);
+	bit_rate_pic_rate_info(bs, 0, vps->max_sub_layer-1, vps);
+
+
+	//and we don't care about the rest for now
+exit:
+	gf_bs_del(bs);
+	gf_free(data_without_emulation_bytes);
+	return vps_id;
+}
+
+
+static Bool parse_short_term_ref_pic_set(GF_BitStream *bs, HEVC_SPS *sps, u32 idx_rps) 
+{
+	u32 i;
+	Bool inter_ref_pic_set_prediction_flag = 0;
+	if (idx_rps != 0)
+		inter_ref_pic_set_prediction_flag = gf_bs_read_int(bs, 1);
+
+	if (inter_ref_pic_set_prediction_flag ) {
+		HEVC_ReferencePictureSets *ref_ps, *rps;
+		u32 delta_idx_minus1 = 0;
+		u32 ref_idx;
+		u32 delta_rps_sign;
+		u32 abs_delta_rps_minus1, nb_ref_pics;
+		s32 deltaRPS;
+	    u32 k = 0, k0 = 0, k1 = 0;
+		if (idx_rps == sps->num_short_term_ref_pic_sets)
+			delta_idx_minus1 = bs_get_ue(bs);
+
+		assert(delta_idx_minus1 <= idx_rps - 1);
+		ref_idx = idx_rps - 1 - delta_idx_minus1;
+		delta_rps_sign = gf_bs_read_int(bs, 1);
+		abs_delta_rps_minus1 = bs_get_ue(bs);
+		deltaRPS = (1 - (delta_rps_sign<<1)) * (abs_delta_rps_minus1 + 1);
+
+		rps = &sps->rps[idx_rps];
+		ref_ps = &sps->rps[ref_idx];
+		nb_ref_pics = ref_ps->num_negative_pics + ref_ps->num_positive_pics;
+		for (i=0; i<=nb_ref_pics; i++) {
+			s32 ref_idc;
+			s32 used_by_curr_pic_flag = gf_bs_read_int(bs, 1);
+			ref_idc = used_by_curr_pic_flag ? 1 : 0;
+			if ( !used_by_curr_pic_flag ) {
+				used_by_curr_pic_flag = gf_bs_read_int(bs, 1);
+				ref_idc = used_by_curr_pic_flag << 1;
+			}
+			if ((ref_idc==1) || (ref_idc== 2)) {
+				s32 deltaPOC = deltaRPS;
+				if (i < nb_ref_pics) 
+					deltaPOC += ref_ps->delta_poc[i];
+				
+				rps->delta_poc[k] = deltaPOC;
+
+				if (deltaPOC < 0)  k0++;
+				else k1++;
+				
+				k++;
+			}
+		}
+		rps->num_negative_pics = k0;
+		rps->num_positive_pics = k1;
+	} else {
+		s32 prev = 0, poc = 0;
+		sps->rps[idx_rps].num_negative_pics = bs_get_ue(bs);
+		sps->rps[idx_rps].num_positive_pics = bs_get_ue(bs);
+		for (i=0; i<sps->rps[idx_rps].num_negative_pics; i++) {
+			u32 delta_poc_s0_minus1 = bs_get_ue(bs);
+			poc = prev - delta_poc_s0_minus1 - 1;
+			prev = poc;
+			sps->rps[idx_rps].delta_poc[i] = poc;
+			/*used_by_curr_pic_s1_flag[ i ] = */gf_bs_read_int(bs, 1);
+		}
+		for (i=0; i<sps->rps[idx_rps].num_positive_pics; i++) {
+			u32 delta_poc_s1_minus1 = bs_get_ue(bs);
+			poc = prev + delta_poc_s1_minus1 + 1;
+			prev = poc;
+			sps->rps[idx_rps].delta_poc[i] = poc;
+			/*used_by_curr_pic_s1_flag[ i ] = */gf_bs_read_int(bs, 1);
+		}
+	}
+	return 1;
+}
+
+s32 gf_media_hevc_read_sps(char *data, u32 size, HEVCState *hevc)
+{
+	GF_BitStream *bs;
+	char *data_without_emulation_bytes = NULL;
+	u32 data_without_emulation_bytes_size = 0;
+	s32 vps_id, sps_id = -1;
+	u8 max_sub_layers_minus1;
+	u32 i, nb_CTUs, depth;
+	u32 log2_diff_max_min_luma_coding_block_size;
+	u32 log2_min_transform_block_size, log2_min_luma_coding_block_size;
+
+	Bool sps_sub_layer_ordering_info_present_flag;
+	HEVC_SPS *sps;
+	HEVC_ProfileTierLevel ptl;
+
+	/*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);
+	bs = gf_bs_new(data_without_emulation_bytes, data_without_emulation_bytes_size, GF_BITSTREAM_READ);
+	if (!bs) goto exit;
+	
+	gf_bs_read_u16(bs);
+
+	vps_id = gf_bs_read_int(bs, 4);
+	if (vps_id>=16) goto exit;
+
+	max_sub_layers_minus1 = gf_bs_read_int(bs, 3);
+	/*temporal_id_nesting_flag = */gf_bs_read_int(bs, 1);
+	memset(&ptl, 0, sizeof(ptl));
+	profile_tier_level(bs, 1, max_sub_layers_minus1, &ptl);
+
+	sps_id = bs_get_ue(bs);
+	if (sps_id>=16) goto exit;
+	sps = &hevc->sps[sps_id];
+	if (!sps->state) {
+		sps->state = 1;
+		sps->id = sps_id;
+		sps->vps_id = vps_id;
+	}
+	sps->ptl = ptl;
+
+	sps->chroma_format_idc = bs_get_ue(bs);
+	if (sps->chroma_format_idc==3)
+		sps->separate_colour_plane_flag = gf_bs_read_int(bs, 1);
+	sps->width = bs_get_ue(bs);
+	sps->height = bs_get_ue(bs);
+	if (gf_bs_read_int(bs, 1)) {
+		sps->cw_left = bs_get_ue(bs);
+		sps->cw_right = bs_get_ue(bs);
+		sps->cw_top = bs_get_ue(bs);
+		sps->cw_bottom = bs_get_ue(bs);
+	}
+	sps->bit_depth_luma = 8 + bs_get_ue(bs);
+	sps->bit_depth_chroma = 8 + bs_get_ue(bs);
+
+	sps->log2_max_pic_order_cnt_lsb = 4 + bs_get_ue(bs);
+
+	sps_sub_layer_ordering_info_present_flag = gf_bs_read_int(bs, 1);
+	for(i= sps_sub_layer_ordering_info_present_flag ? 0 : max_sub_layers_minus1; i<=max_sub_layers_minus1; i++) {
+		/*max_dec_pic_buffering = */ bs_get_ue(bs);
+		/*num_reorder_pics = */ bs_get_ue(bs);
+		/*max_latency_increase = */ bs_get_ue(bs);
+	}
+
+	log2_min_luma_coding_block_size = 3 + bs_get_ue(bs);
+	log2_diff_max_min_luma_coding_block_size = bs_get_ue(bs);
+	sps->max_CU_width = ( 1<<(log2_min_luma_coding_block_size + log2_diff_max_min_luma_coding_block_size) );
+	sps->max_CU_height = ( 1<<(log2_min_luma_coding_block_size + log2_diff_max_min_luma_coding_block_size) );
+
+	log2_min_transform_block_size = 2 + bs_get_ue(bs);
+	/*log2_max_transform_block_size = log2_min_transform_block_size  + */bs_get_ue(bs);
+
+	depth = 0;
+	/*u32 max_transform_hierarchy_depth_inter = */bs_get_ue(bs);
+	/*u32 max_transform_hierarchy_depth_intra = */bs_get_ue(bs);
+	while( (u32) ( sps->max_CU_width >> log2_diff_max_min_luma_coding_block_size ) > (u32) ( 1 << ( log2_min_transform_block_size + depth )  ) )
+	{
+		depth++;
+	}
+	sps->max_CU_depth = log2_diff_max_min_luma_coding_block_size + depth; 
+
+	nb_CTUs = ((sps->width + sps->max_CU_width -1) / sps->max_CU_width) * ((sps->height + sps->max_CU_height-1) / sps->max_CU_height);
+	sps->bitsSliceSegmentAddress = 0;
+	while (nb_CTUs > (u32) (1 << sps->bitsSliceSegmentAddress)) {
+		sps->bitsSliceSegmentAddress++;
+	}
+
+	if (/*scaling_list_enable_flag = */ gf_bs_read_int(bs, 1)) { 
+		if (/*sps_scaling_list_data_present_flag=*/gf_bs_read_int(bs, 1) ) {
+			//scaling_list_data( )
+		}
+	}
+	/*asymmetric_motion_partitions_enabled_flag= */ gf_bs_read_int(bs, 1);
+	/*sample_adaptive_offset_enabled_flag= */ gf_bs_read_int(bs, 1);
+	if (/*pcm_enabled_flag= */ gf_bs_read_int(bs, 1) ) {
+		/*pcm_sample_bit_depth_luma_minus1=*/gf_bs_read_int(bs, 4);
+		/*pcm_sample_bit_depth_chroma_minus1=*/gf_bs_read_int(bs, 4);
+		/*log2_min_pcm_luma_coding_block_size_minus3= */ bs_get_ue(bs);
+		/*log2_diff_max_min_pcm_luma_coding_block_size = */ bs_get_ue(bs);
+		/*pcm_loop_filter_disable_flag=*/gf_bs_read_int(bs, 1);
+	}
+	sps->num_short_term_ref_pic_sets = bs_get_ue(bs);
+	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*/
+		if (!ret) goto exit;
+	}
+	if (/*long_term_ref_pics_present_flag */ gf_bs_read_int(bs, 1) ) {
+		sps->num_long_term_ref_pic_sps = bs_get_ue(bs);
+		for (i=0; i<sps->num_long_term_ref_pic_sps; i++) {
+			/*lt_ref_pic_poc_lsb_sps=*/gf_bs_read_int(bs, sps->log2_max_pic_order_cnt_lsb);
+			/*used_by_curr_pic_lt_sps_flag*/gf_bs_read_int(bs, 1);
+		}
+	}
+	/*sps_temporal_mvp_enable_flag*/gf_bs_read_int(bs, 1);
+	/*strong_intra_smoothing_enable_flag*/gf_bs_read_int(bs, 1);
+	if (/*vui_parameters_present_flag*/gf_bs_read_int(bs, 1)) {
+		//vui param
+	}
+	if (/*sps_extension_flag*/gf_bs_read_int(bs, 1)) {
+		while (gf_bs_available(bs)) {
+		}
+	}
+
+exit:
+	gf_bs_del(bs);
+	gf_free(data_without_emulation_bytes);
+	return sps_id;
+}
+
+s32 gf_media_hevc_read_pps(char *data, u32 size, HEVCState *hevc)
+{
+	u32 i;
+	GF_BitStream *bs;
+	char *data_without_emulation_bytes = NULL;
+	u32 data_without_emulation_bytes_size = 0;
+	s32 pps_id = -1;
+	HEVC_PPS *pps;
+
+	/*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);
+	bs = gf_bs_new(data_without_emulation_bytes, data_without_emulation_bytes_size, GF_BITSTREAM_READ);
+	if (!bs) goto exit;
+	
+	gf_bs_read_u16(bs);
+
+	pps_id = bs_get_ue(bs);
+
+	if (pps_id>=64) goto exit;
+	pps = &hevc->pps[pps_id];
+   
+	if (!pps->state) {
+		pps->id = pps_id;
+		pps->state = 1;
+	}
+	pps->sps_id = bs_get_ue(bs);
+	hevc->sps_active_idx = pps->sps_id; /*set active sps*/
+	pps->dependent_slice_segments_enabled_flag = gf_bs_read_int(bs, 1);
+
+	/*sign_data_hiding_flag = */gf_bs_read_int(bs, 1);
+	/*cabac_init_present_flag = */gf_bs_read_int(bs, 1);
+	/*num_ref_idx_l0_default_active_minus1 = */bs_get_ue(bs);
+	/*num_ref_idx_l1_default_active_minus1 = */bs_get_ue(bs);
+	/*pic_init_qp_minus26 = */bs_get_se(bs);
+	/*constrained_intra_pred_flag = */gf_bs_read_int(bs, 1);
+	/*transform_skip_enabled_flag = */gf_bs_read_int(bs, 1);
+	if (/*cu_qp_delta_enabled_flag = */gf_bs_read_int(bs, 1) )
+		/*diff_cu_qp_delta_depth = */bs_get_ue(bs);
+
+	/*pic_cb_qp_offset = */bs_get_se(bs);
+	/*pic_cr_qp_offset = */bs_get_se(bs);
+	/*pic_slice_chroma_qp_offsets_present_flag = */gf_bs_read_int(bs, 1);
+	/*weighted_pred_flag = */gf_bs_read_int(bs, 1);
+	/*weighted_bipred_flag = */gf_bs_read_int(bs, 1);
+	pps->output_flag_present_flag = gf_bs_read_int(bs, 1);
+	/*transquant_bypass_enable_flag = */gf_bs_read_int(bs, 1);
+	pps->tiles_enabled_flag = gf_bs_read_int(bs, 1);
+	/*entropy_coding_sync_enabled_flag = */gf_bs_read_int(bs, 1);
+	if (pps->tiles_enabled_flag) {
+		u32 num_tile_columns_minus1 = bs_get_ue(bs);
+		u32 num_tile_rows_minus1 = bs_get_ue(bs);
+		pps->uniform_spacing_flag = gf_bs_read_int(bs, 1);
+		if (!pps->uniform_spacing_flag ) {
+			for( i = 0; i < num_tile_columns_minus1; i++ ) {
+				/*column_width_minus1[ i ] = */bs_get_ue(bs);
+			}
+			for( i = 0; i < num_tile_rows_minus1; i++ ) {
+				/*row_height_minus1[ i ] = */bs_get_ue(bs);
+			}
+		}
+		/*loop_filter_across_tiles_enabled_flag	 = */gf_bs_read_int(bs, 1);
+	}
+	/*loop_filter_across_slices_enabled_flag = */gf_bs_read_int(bs, 1);
+	if( /*deblocking_filter_control_present_flag = */gf_bs_read_int(bs, 1)  ) {
+		/*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);
+			/*tc_offset_div2 = */bs_get_se(bs);
+		}
+	}
+	if (/*pic_scaling_list_data_present_flag	= */gf_bs_read_int(bs, 1) ) {
+		//scaling_list_data( )
+		assert(0 && "not implemented");
+	}
+	/*lists_modification_present_flag	= */gf_bs_read_int(bs, 1);
+	/*log2_parallel_merge_level_minus2 = */bs_get_ue(bs);
+	pps->num_extra_slice_header_bits = gf_bs_read_int(bs, 3);
+	pps->slice_segment_header_extension_present_flag = gf_bs_read_int(bs, 1);
+	if ( /*pps_extension_flag= */gf_bs_read_int(bs, 1) ) {
+		while (gf_bs_available(bs) ) {
+			//pps_extension_data_flag	u(1)
+		}
+	}
+
+exit:
+	gf_bs_del(bs);
+	gf_free(data_without_emulation_bytes);
+	return pps_id;
+}
+
+
+s32 gf_media_hevc_parse_nalu(GF_BitStream *bs, HEVCState *hevc, u8 *nal_unit_type, u8 *temporal_id)
+{
+	u32 reserved;
+	s32 slice, ret;
+	HEVCSliceInfo n_state;
+
+	slice = 0;
+	memcpy(&n_state, &hevc->s_info, sizeof(HEVCSliceInfo));
+
+	reserved = gf_bs_read_int(bs, 1);
+	if (reserved) return -1;
+
+	*nal_unit_type = n_state.nal_unit_type = gf_bs_read_int(bs, 6);
+	reserved = gf_bs_read_int(bs, 6);
+//	if (reserved) return -1;
+
+	*temporal_id = n_state.temporal_id = gf_bs_read_int(bs, 3);
+
+	ret = 0;
+	switch (n_state.nal_unit_type) {
+	case GF_HEVC_NALU_ACCESS_UNIT:
+	case GF_HEVC_NALU_END_OF_SEQ:
+	case GF_HEVC_NALU_END_OF_STREAM:
+		ret = 1;
+		break;
+
+
+	/*slice_layer_rbsp*/
+//	case GF_HEVC_NALU_SLICE_STSA_N:
+//	case GF_HEVC_NALU_SLICE_STSA_R:
+	case GF_HEVC_NALU_SLICE_RADL_N:
+//	case GF_HEVC_NALU_SLICE_RADL_R:
+	case GF_HEVC_NALU_SLICE_RASL_N:
+//	case GF_HEVC_NALU_SLICE_RASL_R:
+		break;
+
+	/*slice_segment_layer_rbsp*/
+	case GF_HEVC_NALU_SLICE_TRAIL_N:
+	case GF_HEVC_NALU_SLICE_TRAIL_R:
+	case GF_HEVC_NALU_SLICE_TSA_N:
+	case GF_HEVC_NALU_SLICE_TSA_R:
+	case GF_HEVC_NALU_SLICE_STSA_N:
+	case GF_HEVC_NALU_SLICE_STSA_R:
+
+	case GF_HEVC_NALU_SLICE_BLA_W_LP:
+	case GF_HEVC_NALU_SLICE_BLA_W_DLP:
+	case GF_HEVC_NALU_SLICE_BLA_N_LP:
+	case GF_HEVC_NALU_SLICE_IDR_W_DLP:
+	case GF_HEVC_NALU_SLICE_IDR_N_LP:
+	case GF_HEVC_NALU_SLICE_CRA:
+	case GF_HEVC_NALU_SLICE_RADL_R:
+	case GF_HEVC_NALU_SLICE_RASL_R:
+		slice = 1;
+		/* slice - read the info and compare.*/
+		ret = hevc_parse_slice_segment(bs, hevc, &n_state);
+		if (ret<0) return ret;
+
+		hevc_compute_poc(&n_state);
+		
+		ret = 0;
+
+		if (hevc->s_info.poc != n_state.poc) {
+			ret=1;
+			break;
+		}
+		break;
+	case GF_HEVC_NALU_SEQ_PARAM:
+	case GF_HEVC_NALU_PIC_PARAM:
+	case GF_HEVC_NALU_VID_PARAM:
+		return 0;
+	default:
+		break;
+	} 
+
+	/* save _prev values */
+	if (ret && hevc->s_info.sps) {
+		n_state.frame_num_offset_prev = hevc->s_info.frame_num_offset;
+		n_state.frame_num_prev = hevc->s_info.frame_num;
+
+		n_state.poc_lsb_prev = hevc->s_info.poc_lsb;
+		n_state.poc_msb_prev = hevc->s_info.poc_msb;
+
+	}
+	if (slice) hevc_compute_poc(&n_state);
+	memcpy(&hevc->s_info, &n_state, sizeof(HEVCSliceInfo));
+	return ret;
+}
 
-#ifndef GPAC_DISABLE_AV_PARSERS
 
 static u32 AC3_FindSyncCode(u8 *buf, u32 buflen)
 {

gpac-0.5.0.svn4192.tar.bz2/src/media_tools/dash_client.c -> gpac-0.5.0.svn4296.tar.bz2/src/media_tools/dash_client.c Changed

@@ -28,13 +28,20 @@
 #include <gpac/dash.h>
 #include <gpac/internal/mpd.h>
 #include <gpac/internal/m3u8.h>
+#include <gpac/internal/isomedia_dev.h>
 #include <string.h>
 
+#ifndef _WIN32_WCE
+#include <time.h>
+#endif
+
 #ifndef GPAC_DISABLE_DASH_CLIENT
 
 /*set to 1 if you want MPD to use SegmentTemplate if possible instead of SegmentList*/
 #define M3U8_TO_MPD_USE_TEMPLATE	0
 
+/*uncomment to only play the first representation set*/
+//#define DEBUG_FIRST_SET_ONLY
 
 typedef enum {
 	GF_DASH_STATE_STOPPED = 0,
@@ -59,8 +66,10 @@
 
 	u32 max_cache_duration;
 	u32 auto_switch_count;
-	Bool keep_files, disable_switching;
+	Bool keep_files, disable_switching, allow_local_mpd_update, enable_buffering;
+	Bool is_m3u8;
 
+	u64 mpd_fetch_time;
 	GF_DASHInitialSelectionMode first_select_mode;
 
 	/* MPD downloader*/
@@ -80,6 +89,8 @@
 
 	u64 start_time_in_active_period;
 
+	Bool ignore_mpd_duration;
+
 	/*list of groups in the active period*/
 	GF_List *groups;
 
@@ -93,6 +104,7 @@
 	Bool mpd_stop_request;
 	Bool in_period_setup;
 
+	u32 nb_buffering;
 
 	/* TODO - handle playback status for SPEED/SEEK through SIDX */
 	Double playback_start_range;
@@ -110,6 +122,7 @@
 	/*representation index in adaptation_set->representations*/
 	u32 representation_index;
 	Bool do_not_delete;
+	u32 duration;
 } segment_cache_entry;
 
 typedef enum
@@ -135,6 +148,8 @@
 
 	u32 prev_active_rep_index;
 
+	Bool timeline_setup;
+
 	GF_DASHGroupSelection selection;
 
 
@@ -148,6 +163,10 @@
 	u32 nb_segments_in_rep;
 	Double segment_duration;
 
+	/*for debug purpose of templates only*/
+	u32 start_number;
+
+	Bool was_segment_base;
 	/*local file playback, do not delete them*/
 	Bool local_files;
 	/*next segment to download for this group*/
@@ -155,6 +174,8 @@
 	/*number of segments pruged since the start of the period*/
 	u32 nb_segments_purged;
 
+	u32 nb_retry_on_last_segment;
+
 	/*next file (cached) to delete at next GF_NET_SERVICE_QUERY_NEXT for this group*/
 	char * urlToDeleteNext;
 	volatile u32 max_cached_segments, nb_cached_segments;
@@ -167,8 +188,13 @@
 	u64 local_url_start_range, local_url_end_range;
 
 	u32 nb_segments_done;
+	u32 last_segment_time;
 
 	Bool segment_must_be_streamed;
+	Bool broken_timing;
+	Bool buffering;
+	Bool maybe_end_of_stream;
+	u32 cache_duration;
 
 	u32 force_representation_idx_plus_one;
 
@@ -190,6 +216,68 @@
 	return NULL;
 }
 
+static void gf_dash_buffer_off(GF_DASH_Group *group, GF_DashClient *dash) 
+{
+	if (!dash->enable_buffering) return;
+	if (group->buffering) { 
+		assert(dash->nb_buffering); 
+		dash->nb_buffering--;	
+		if (!dash->nb_buffering) {
+			dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_BUFFER_DONE, GF_OK); 
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Session buffering done\n"));
+		}
+		group->buffering = 0;
+	} 
+}
+
+static void gf_dash_buffer_on(GF_DASH_Group *group, GF_DashClient *dash) 
+{
+	if (!dash->enable_buffering) return;
+	if ((group->selection==GF_DASH_GROUP_SELECTED) && !group->buffering) {
+		if (!dash->nb_buffering) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Starting session buffering\n"));
+		}
+		dash->nb_buffering++; 
+		group->buffering = 1;
+	}
+}
+
+GF_EXPORT
+void gf_dash_get_buffer_info_buffering(GF_DashClient *dash, u32 *total_buffer, u32 *media_buffered)
+{
+	if (dash->nb_buffering) {
+		u32 i, j, nb_groups;
+		*total_buffer = 0;
+		*media_buffered = 0;
+		nb_groups = gf_list_count(dash->groups);
+		for (i=0; i<nb_groups; i++) {
+			GF_DASH_Group *group = gf_list_get(dash->groups, i);
+			if (group->buffering) {
+				u32 buffer = 0;
+				*total_buffer += group->cache_duration;
+				for (j=0; j<group->nb_cached_segments; j++) {
+					buffer += group->cached[i].duration;
+				}
+				if (buffer>group->cache_duration) buffer = group->cache_duration;
+				*media_buffered += buffer;
+			}
+		}
+		*total_buffer /= dash->nb_buffering;
+		*media_buffered /= dash->nb_buffering;
+	}
+}
+
+static void gf_dash_update_buffering(GF_DASH_Group *group, GF_DashClient *dash)
+{
+	if (dash->nb_buffering) {
+		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_BUFFERING, GF_OK);
+
+		if (group->nb_cached_segments>=group->max_cached_segments) 
+			gf_dash_buffer_off(group, dash);
+	}
+}
+
+
 GF_EXPORT
 Bool gf_dash_check_mpd_root_type(const char *local_url)
 {
@@ -207,11 +295,192 @@
 	return 0;
 }
 
+static u64 gf_dash_get_utc_clock()
+{
+	u64 current_time;
+	u32 sec, frac;
+
+#ifndef _WIN32_WCE
+	time_t gtime;
+	struct tm _t;
+#endif
+
+	gf_net_get_ntp(&sec, &frac);
+
+#ifndef _WIN32_WCE
+	gtime = sec - GF_NTP_SEC_1900_TO_1970;
+	_t = * gmtime(&gtime);
+
+#ifdef GPAC_ANDROID
+	{
+	/*FIXME - finad a safe way to estimate timezone this does not work !!*/
+	s32 t_timezone;
+	struct tm t_gmt, t_local;
+	time_t t_time;
+	t_time = time(NULL);
+	t_gmt = *gmtime(&t_time);
+	t_local = *localtime(&t_time);
+	
+	t_timezone = (t_gmt.tm_hour - t_local.tm_hour) * 3600;
+	current_time = mktime(&_t) - t_timezone;
+	}
+#else
+	{
+		s32 val = timezone;
+		current_time = mktime(&_t) - val;
+	}
+#endif
+
+#else
+	current_time = sec - GF_NTP_SEC_1900_TO_1970;
+#endif
+
+	return current_time;
+}
+
+static void gf_dash_group_timeline_setup(GF_MPD *mpd, GF_DASH_Group *group)
+{
+	GF_MPD_SegmentTimeline *timeline = NULL;
+	GF_MPD_Representation *rep = NULL;
+	u32 shift, timescale;
+	u64 current_time;
+	
+	if (mpd->type==GF_MPD_TYPE_STATIC) 
+		return;
+	
+	/*M3U8 does not use NTP sync */
+	if (group->dash->is_m3u8)
+		return;
+	
+	/*if no AST, do not use NTP sync */
+	if (! group->dash->mpd->availabilityStartTime) {
+		group->broken_timing = 1;
+		return;
+	}
+
+	current_time = group->dash->mpd_fetch_time;
+
+#if 0
+	{
+		struct tm t1, t2;
+		t1 = * gmtime(&current_time);
+		t2 = * gmtime(&mpd->availabilityStartTime);
+		t1.tm_year = t2.tm_year;
+	}
+#endif
+
+	if (current_time < mpd->availabilityStartTime) current_time = 0;
+	else current_time -= mpd->availabilityStartTime;	
+
+	if (current_time < group->period->start/1000) current_time = 0;
+	else current_time -= group->period->start/1000;
+
+#if 0
+	{
+		s32 diff = (s32) current_time - (s32) (mpd->media_presentation_duration/1000);
+		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"));
+				
+		}
+		current_time = mpd->media_presentation_duration/1000;
+	}
+#endif
+
+	if (0 && ((s32) mpd->time_shift_buffer_depth>=0)) {
+		shift = mpd->time_shift_buffer_depth/1000;
+		if (current_time < shift) current_time = 0;
+		else current_time -= shift;
+	}
+
+	timeline = NULL;
+	timescale=1;
+	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+
+	if (group->period->segment_list) {
+		if (group->period->segment_list->segment_timeline) timeline = group->period->segment_list->segment_timeline;
+		if (group->period->segment_list->timescale) timescale = group->period->segment_list->timescale;
+	}
+	if (group->adaptation_set->segment_list) {
+		if (group->adaptation_set->segment_list->segment_timeline) timeline = group->adaptation_set->segment_list->segment_timeline;
+		if (group->adaptation_set->segment_list->timescale) timescale = group->adaptation_set->segment_list->timescale;
+	}
+	if (rep->segment_list) {
+		if (rep->segment_list->segment_timeline) timeline = rep->segment_list->segment_timeline;
+		if (rep->segment_list->timescale) timescale = rep->segment_list->timescale;
+	}
+
+	if (group->period->segment_template) {
+		if (group->period->segment_template->segment_timeline) timeline = group->period->segment_template->segment_timeline;
+		if (group->period->segment_template->timescale) timescale = group->period->segment_template->timescale;
+	}
+	if (group->adaptation_set->segment_template) {
+		if (group->adaptation_set->segment_template->segment_timeline) timeline = group->adaptation_set->segment_template->segment_timeline;
+		if (group->adaptation_set->segment_template->timescale) timescale = group->adaptation_set->segment_template->timescale;
+	}
+	if (rep->segment_template) {
+		if (rep->segment_template->segment_timeline) timeline = rep->segment_template->segment_timeline;
+		if (rep->segment_template->timescale) timescale = rep->segment_template->timescale;
+	}
+
+	if (timeline) {
+		u64 start_segtime = 0;
+		u64 segtime = 0;
+		u32 i, seg_idx = 0;
+		current_time *= timescale;
+		for (i=0; i<gf_list_count(timeline->entries); i++) {
+			u32 repeat;
+			GF_MPD_SegmentTimelineEntry *ent = gf_list_get(timeline->entries, i);
+			if (!segtime) start_segtime = segtime = ent->start_time;
+
+			repeat = 1+ent->repeat_count;
+			while (repeat) {
+				if ((current_time >= segtime) && (current_time < segtime + ent->duration)) {
+					group->download_segment_index = seg_idx;
+					group->nb_segments_in_rep = seg_idx + 10;
+					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Found segment %d for current time "LLU" is in SegmentTimeline ["LLU"-"LLU"] - cannot estimate current startNumber, default to 0 ...\n", current_time, segtime, segtime + ent->duration));
+					return;
+				}
+				segtime += ent->duration;
+				repeat--;
+				seg_idx++;
+			}
+		}
+		//NOT FOUND !!
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] current time "LLU" is NOT in SegmentTimeline ["LLU"-"LLU"] - cannot estimate current startNumber, default to 0 ...\n", current_time, start_segtime, segtime));
+		group->download_segment_index = 0;
+		group->nb_segments_in_rep = 10;
+		group->broken_timing = 1;
+		return;
+	}
+
+	if (group->segment_duration) {
+		u32 nb_segs_in_update = (u32) (mpd->minimum_update_period / (1000*group->segment_duration) );
+		Double nb_seg = (Double) current_time;
+		nb_seg /= group->segment_duration;
+		shift = (u32) nb_seg;
+		group->download_segment_index = shift;
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] UTC time indicates first segment in period is %d, MPD indicates %d segments are available ...\n", group->download_segment_index , group->nb_segments_in_rep));
+
+		if (group->nb_segments_in_rep && (group->download_segment_index + nb_segs_in_update > group->nb_segments_in_rep)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Not enough segments (%d needed vs %d indicated) to reach period endTime indicated in MPD - ignoring MPD duration\n", nb_segs_in_update, group->nb_segments_in_rep - group->download_segment_index ));
+			group->nb_segments_in_rep = shift + nb_segs_in_update;
+			group->dash->ignore_mpd_duration = 1;
+		}
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Segment duration unknown - cannot estimate current startNumber\n"));
+	}
+}
+
 void gf_dash_group_check_switch(GF_DASHFileIO *dash_io, GF_DASH_Group *group, Bool download_active)
 {
 	u32 download_rate;
 
 	if (group->dash->disable_switching) return;
+
+/*	if (group->min_bandwidth_selected && group->buffering)
+		return;
+*/
 	download_rate = dash_io->get_bytes_per_sec(dash_io, group->segment_download);
 	if (!download_rate) return;
 
@@ -279,7 +548,7 @@
 * Parameters are identical to the ones of gf_term_download_new.
 * \see gf_term_download_new()
 */
-GF_Err gf_dash_download_resource(GF_DASHFileIO *dash_io, GF_DASHFileIOSession *sess, const char *url, u64 start_range, u64 end_range, Bool persistent, GF_DASH_Group *group)
+GF_Err gf_dash_download_resource(GF_DASHFileIO *dash_io, GF_DASHFileIOSession *sess, const char *url, u64 start_range, u64 end_range, u32 persistent_mode, GF_DASH_Group *group)
 {
 	Bool had_sess = 0;
 	Bool retry = 1;
@@ -288,7 +557,7 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading %s...\n", url));
 
 	if (! *sess) {
-		*sess = dash_io->create(dash_io, persistent, url);
+		*sess = dash_io->create(dash_io, persistent_mode ? 1 : 0, url);
 		if (!(*sess)){
 			assert(0);
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot try to download %s... OUT of memory ?\n", url));
@@ -296,22 +565,24 @@
 		}
 	} else {
 		had_sess = 1;
-		e = dash_io->setup_from_url(dash_io, *sess, url);
-		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) ));
-			return e;
+		if (persistent_mode!=2) {
+			e = dash_io->setup_from_url(dash_io, *sess, url);
+			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) ));
+				return e;
+			}
 		}
 	}
 
 retry:
 
 	if (end_range) {
-		e = dash_io->set_range(dash_io, *sess, start_range, end_range);
+		e = dash_io->set_range(dash_io, *sess, start_range, end_range, (persistent_mode==2) ? 0 : 1);
 		if (e) {
 			if (had_sess) {
 				dash_io->del(dash_io, *sess);
 				*sess = NULL;
-				return gf_dash_download_resource(dash_io, sess, url, start_range, end_range, persistent, group);
+				return gf_dash_download_resource(dash_io, sess, url, start_range, end_range, persistent_mode ? 1 : 0, group);
 			}
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot setup byte-range download for %s: %s\n", url, gf_error_to_string(e) ));
 			return e;
@@ -411,13 +682,6 @@
 	*nb_segments = timescale = 0;
 	duration = 0;
 
-	/*single segment*/
-	if (rep->segment_base || set->segment_base || period->segment_base) {
-		*max_seg_duration = mpd->media_presentation_duration;
-		*max_seg_duration /= 1000;
-		*nb_segments = 1;
-		return;
-	}
 	if (rep->segment_list || set->segment_list || period->segment_list) {
 		GF_List *segments = NULL;
 		if (period->segment_list) {
@@ -454,6 +718,14 @@
 		return;
 	}
 
+	/*single segment*/
+	if (rep->segment_base || set->segment_base || period->segment_base) {
+		*max_seg_duration = mpd->media_presentation_duration;
+		*max_seg_duration /= 1000;
+		*nb_segments = 1;
+		return;
+	}
+
 	single_segment = 1;
 	if (period->segment_template) {
 		single_segment = 0;
@@ -505,7 +777,7 @@
 	}
 }
 
-static u64 gf_dash_segment_timeline_start(GF_MPD_SegmentTimeline *timeline, u32 segment_index)
+static u64 gf_dash_segment_timeline_start(GF_MPD_SegmentTimeline *timeline, u32 segment_index, u64 *segment_duration)
 {
 	u64 start_time = 0;
 	u32 i, idx, k;
@@ -514,8 +786,11 @@
 		GF_MPD_SegmentTimelineEntry *ent = gf_list_get(timeline->entries, i);
 		if (ent->start_time) start_time = ent->start_time;		
 		for (k=0; k<ent->repeat_count+1; k++) {
-			if (idx==segment_index) 
+			if (idx==segment_index) {
+				if (segment_duration) 
+					*segment_duration = ent->duration;
 				return start_time;
+			}
 			idx ++;
 			start_time += ent->duration;
 		}
@@ -523,7 +798,7 @@
 	return start_time;
 }
 
-static Double gf_dash_get_segment_start_time(GF_DASH_Group *group)
+static Double gf_dash_get_segment_start_time(GF_DASH_Group *group, Double *segment_duration)
 {
 	GF_MPD_Representation *rep;
 	GF_MPD_AdaptationSet *set;
@@ -539,7 +814,11 @@
 	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
 	set = group->adaptation_set;
 	period = group->period;
-	segment_index = group->download_segment_index - group->nb_cached_segments;
+	segment_index = 0;
+	if (group->download_segment_index >= group->nb_cached_segments) {
+//		segment_index = group->download_segment_index - group->nb_cached_segments;
+		segment_index = group->download_segment_index;
+	}
 
 	/*single segment: return nothing*/
 	if (rep->segment_base || set->segment_base || period->segment_base) {
@@ -564,11 +843,15 @@
 		if (! timescale) timescale=1;
 
 		if (timeline) {
-			start_time = (Double) gf_dash_segment_timeline_start(timeline, segment_index);
+			start_time = (Double) gf_dash_segment_timeline_start(timeline, segment_index, &duration);
 		} else {
 			start_time = segment_index * (Double) duration;
 		}
 		start_time /= timescale;
+		if (segment_duration) {
+			*segment_duration = (Double) duration; 
+			*segment_duration /= timescale; 
+		}
 		return start_time;
 	}
 
@@ -576,28 +859,48 @@
 		if (period->segment_template->duration) duration = period->segment_template->duration;
 		if (period->segment_template->timescale) timescale = period->segment_template->timescale;
 		if (period->segment_template->segment_timeline) timeline = period->segment_template->segment_timeline;
+		if (period->segment_template->start_number) group->start_number = period->segment_template->start_number;
 	}
 	if (set->segment_template) {
 		if (set->segment_template->duration) duration = set->segment_template->duration;
 		if (set->segment_template->timescale) timescale = set->segment_template->timescale;
 		if (set->segment_template->segment_timeline) timeline = set->segment_template->segment_timeline;
+		if (set->segment_template->start_number) group->start_number = set->segment_template->start_number;
 	}
 	if (rep->segment_template) {
 		if (rep->segment_template->duration) duration = rep->segment_template->duration;
 		if (rep->segment_template->timescale) timescale = rep->segment_template->timescale;
 		if (rep->segment_template->segment_timeline) timeline = rep->segment_template->segment_timeline;
+		if (rep->segment_template->start_number) group->start_number = rep->segment_template->start_number;
 	}
 	if (!timescale) timescale=1;
 
 	if (timeline) {
-		start_time = (Double) gf_dash_segment_timeline_start(timeline, segment_index);
+		start_time = (Double) gf_dash_segment_timeline_start(timeline, segment_index, &duration);
 	} else {
 		start_time = segment_index * (Double) duration;
 	}
 	start_time /= timescale;
+	if (segment_duration) {
+		*segment_duration = (Double) duration; 
+		*segment_duration /= timescale; 
+	}
+
 	return start_time;
 }
 
+u64 gf_dash_get_segment_availability_start_time(GF_MPD *mpd, GF_DASH_Group *group, u32 segment_index, u32 *seg_dur_ms)
+{
+	Double seg_ast, seg_dur;
+	seg_ast = gf_dash_get_segment_start_time(group, &seg_dur);
+	if (seg_dur_ms) *seg_dur_ms = (u32) (seg_dur * 1000);
+
+	seg_ast += seg_dur;
+	seg_ast += group->period->start/1000;
+	seg_ast += mpd->availabilityStartTime;
+	return (u64) seg_ast;
+}
+
 static void gf_dash_resolve_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)
 {
 	u32 timescale = 0;
@@ -657,6 +960,10 @@
 		GF_MPD_SegmentTimelineEntry *ent = gf_list_get(segment_timeline->entries, 0);
 		if (ent) *out_duration = ent->duration;
 	}
+	else if (rep->segment_list) {
+		GF_MPD_SegmentURL *url = gf_list_get(rep->segment_list->segment_URLs, 0);
+		if (url && url->duration) *out_duration = url->duration;
+	}
 }
 
 static GF_Err gf_dash_merge_segment_timeline(GF_MPD_SegmentList *old_list, GF_MPD_SegmentTemplate *old_template, GF_MPD_SegmentList *new_list, GF_MPD_SegmentTemplate *new_template, Double min_start_time)
@@ -776,26 +1083,40 @@
 {
 	GF_Err e;
 	u32 group_idx, rep_idx, i, j;
+	u64 fetch_time=0;
 	GF_DOMParser *mpd_parser;
+	u8 signature[sizeof(dash->lastMPDSignature)];
 	GF_MPD_Period *period, *new_period;
 	const char *local_url;
 	char mime[128];
 	char * purl;
+	Double timeline_start_time;
+	GF_MPD *new_mpd;
 
 	if (!dash->mpd_dnload) {
+		local_url = purl = NULL;
 		if (!gf_list_count(dash->mpd->locations)) {
-			/*we will no longer attempt to update the MPD ...*/
-			dash->mpd->minimum_update_period = 0;
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: no HTTP source for MPD could be found\n"));
-			return GF_BAD_PARAM;
+			FILE *t = fopen(dash->base_url, "rt");
+			if (t) {
+				local_url = dash->base_url;
+				fclose(t);
+			}
+			if (!local_url) {
+				/*we will no longer attempt to update the MPD ...*/
+				dash->mpd->minimum_update_period = 0;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: no HTTP source for MPD could be found\n"));
+				return GF_BAD_PARAM;
+			}
 		}
-		purl = gf_strdup(gf_list_get(dash->mpd->locations, 0));
+		if (!local_url) {
+			purl = gf_strdup(gf_list_get(dash->mpd->locations, 0));
 
-		/*if no absolute URL, use <Location> to get MPD in case baseURL is relative...*/
-		if (!strstr(dash->base_url, "://")) {
-			gf_free(dash->base_url);
-			dash->base_url = gf_strdup(purl);
-		} 
+			/*if no absolute URL, use <Location> to get MPD in case baseURL is relative...*/
+			if (!strstr(dash->base_url, "://")) {
+				gf_free(dash->base_url);
+				dash->base_url = gf_strdup(purl);
+			} 
+		}
 	} else {
 		local_url = dash->dash_io->get_cache_name(dash->dash_io, dash->mpd_dnload);
 		if (!local_url) {
@@ -816,267 +1137,322 @@
 		}
 	}
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updating Playlist %s...\n", purl));
-	/*use non-persistent connection for MPD*/
-	e = gf_dash_download_resource(dash->dash_io, &(dash->mpd_dnload), purl, 0, 0, 0, NULL);
-	if (e!=GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: download problem %s for MPD file\n", gf_error_to_string(e)));
-		gf_free(purl);
-		return e;
-	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playlist %s updated with success\n", purl));
-	}
-	strcpy(mime, dash->dash_io->get_mime(dash->dash_io, dash->mpd_dnload) );
-	strlwr(mime);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updating Playlist %s...\n", purl ? purl : local_url));
+	if (purl) {
+		/*use non-persistent connection for MPD*/
+		e = gf_dash_download_resource(dash->dash_io, &(dash->mpd_dnload), purl, 0, 0, 0, NULL);
+		if (e!=GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: download problem %s for MPD file\n", gf_error_to_string(e)));
+			gf_free(purl);
+			return e;
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playlist %s updated with success\n", purl));
+		}
+		strcpy(mime, dash->dash_io->get_mime(dash->dash_io, dash->mpd_dnload) );
+		strlwr(mime);
 
-	/*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);
+		/*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);
 
-	/* Some servers, for instance http://tv.freebox.fr, serve m3u8 as text/plain */
-	if (gf_dash_is_m3u8_mime(mime) || strstr(purl, ".m3u8")) {
-		gf_m3u8_to_mpd(local_url, purl, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter);
-	} else if (!gf_dash_is_dash_mime(mime)) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] mime '%s' should be m3u8 or mpd\n", mime));
-	}
+		/* Some servers, for instance http://tv.freebox.fr, serve m3u8 as text/plain */
+		if (gf_dash_is_m3u8_mime(mime) || strstr(purl, ".m3u8")) {
+			gf_m3u8_to_mpd(local_url, purl, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter);
+		} else if (!gf_dash_is_dash_mime(mime)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] mime '%s' should be m3u8 or mpd\n", mime));
+		}
 
-	gf_free(purl);
-	purl = NULL;
+		gf_free(purl);
+		purl = NULL;
+	}
+	fetch_time = gf_dash_get_utc_clock();
 
 	if (!gf_dash_check_mpd_root_type(local_url)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: MPD file type is not correct %s\n", local_url));
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
-	{
-		u8 signature[sizeof(dash->lastMPDSignature)];
-		if (gf_sha1_file( local_url, signature)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] : cannot SHA1 file %s\n", local_url));
+
+	if (gf_sha1_file( local_url, signature)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] : cannot SHA1 file %s\n", local_url));
+		return GF_IO_ERR;
+	} 
+
+	if (! memcmp( signature, dash->lastMPDSignature, sizeof(dash->lastMPDSignature))) {
+
+		dash->reload_count++;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] MPD file did not change for %d consecutive reloads\n", dash->reload_count));
+		/*if the MPD did not change, we should refresh "soon" but cannot wait a full refresh cycle in case of 
+		low latencies as we could miss a segment*/
+
+		if (dash->is_m3u8) {
+			dash->last_update_time += dash->mpd->minimum_update_period/2;
 		} else {
-			if (! memcmp( signature, dash->lastMPDSignature, sizeof(dash->lastMPDSignature))) {
-				dash->reload_count++;
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] MPD file did not change for %d consecutive reloads\n", dash->reload_count));
-				/*if the MPD did not change, we should refresh "soon" but cannot wait a full refresh cycle in case of 
-				low latencies as we could miss a segment*/
-				dash->last_update_time += dash->mpd->minimum_update_period/2;
-			} else {
-				Double timeline_start_time;
-				GF_MPD *new_mpd;
-				dash->reload_count = 0;
-				memccpy(dash->lastMPDSignature, signature, sizeof(char), sizeof(dash->lastMPDSignature));
-
-				/* It means we have to reparse the file ... */
-				/* parse the MPD */
-				mpd_parser = gf_xml_dom_new();
-				e = gf_xml_dom_parse(mpd_parser, local_url, NULL, NULL);
-				if (e != GF_OK) {
-					gf_xml_dom_del(mpd_parser);
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: error in XML parsing %s\n", gf_error_to_string(e)));
-					return GF_NON_COMPLIANT_BITSTREAM;
-				}
-				new_mpd = gf_mpd_new();
-				e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), new_mpd, purl);
-				gf_xml_dom_del(mpd_parser);
-				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);
-					return GF_NON_COMPLIANT_BITSTREAM;
-				}
+			dash->last_update_time = gf_sys_clock();
+		}
+		return GF_OK;
+	} 
+
+	dash->reload_count = 0;
+	memccpy(dash->lastMPDSignature, signature, sizeof(char), sizeof(dash->lastMPDSignature));
+
+	/* It means we have to reparse the file ... */
+	/* parse the MPD */
+	mpd_parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse(mpd_parser, local_url, NULL, NULL);
+	if (e != GF_OK) {
+		gf_xml_dom_del(mpd_parser);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: error in XML parsing %s\n", gf_error_to_string(e)));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	new_mpd = gf_mpd_new();
+	e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), new_mpd, purl);
+	gf_xml_dom_del(mpd_parser);
+	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);
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	/*TODO - check periods are the same !!*/
+	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
+	new_period = gf_list_get(new_mpd->periods, dash->active_period_index);
+	if (!new_period) {
+		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;
+	}
+
+	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"));
+		gf_mpd_del(new_mpd);
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	timeline_start_time = 0;
+	/*if not infinity for timeShift, compute min media time before merge and adjust it*/
+	if (dash->mpd->time_shift_buffer_depth != (u32) -1) {
+		Double timeshift = dash->mpd->time_shift_buffer_depth;
+		timeshift /= 1000;
+
+		for (group_idx=0; group_idx<gf_list_count(dash->groups); group_idx++) {
+			GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
+			Double group_start = gf_dash_get_segment_start_time(group, NULL);
+			if (!group_idx || (timeline_start_time > group_start) ) timeline_start_time = group_start;
+		}
+		/*we can rewind our segments from timeshift*/
+		if (timeline_start_time > timeshift) timeline_start_time -= timeshift;
+		/*we can rewind all segments*/
+		else timeline_start_time = 0;
+	}
 
-				/*TODO - check periods are the same !!*/
-				period = gf_list_get(dash->mpd->periods, dash->active_period_index);
-				new_period = gf_list_get(new_mpd->periods, dash->active_period_index);
-				if (!new_period) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: missing period\n"));
+	/*update segmentTimeline at Period level*/
+	e = gf_dash_merge_segment_timeline(period->segment_list, period->segment_template, new_period->segment_list, new_period->segment_template, timeline_start_time);
+	if (e) {
+		gf_mpd_del(new_mpd);
+		return e;
+	}
+
+	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;
+		GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
+
+		/*update info even if the group is not selected !*/
+
+
+		set = group->adaptation_set;
+		new_set = gf_list_get(new_period->adaptation_sets, group_idx);
+
+		if (gf_list_count(new_set->representations) != gf_list_count(group->adaptation_set->representations)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: missing representation in adaptation set\n"));
+			gf_mpd_del(new_mpd);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
+		/*get all representations in both periods*/
+		for (rep_idx = 0; rep_idx <gf_list_count(group->adaptation_set->representations); rep_idx++) {
+			GF_List *segments, *new_segments;
+			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, rep_idx);
+			GF_MPD_Representation *new_rep = gf_list_get(new_set->representations, rep_idx);
+
+			if (rep->segment_base || group->adaptation_set->segment_base || period->segment_base) {
+				if (!new_rep->segment_base && !new_set->segment_base && !new_period->segment_base) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment base as previous version\n"));
 					gf_mpd_del(new_mpd);
 					return GF_NON_COMPLIANT_BITSTREAM;
 				}
+				/*what else should we check ??*/
+
+				/*OK, this rep is fine*/
+			}
 
-				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"));
+			else if (rep->segment_template || group->adaptation_set->segment_template || period->segment_template) {
+				u32 start;
+				if (!new_rep->segment_template && !new_set->segment_template && !new_period->segment_template) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment template as previous version\n"));
 					gf_mpd_del(new_mpd);
 					return GF_NON_COMPLIANT_BITSTREAM;
 				}
+				start = 0;
+				/*override new startNum with old one - otherwise we would need to get rid of the entries before the start number in the MPD ...*/
+				if (period->segment_template && (period->segment_template->start_number != (u32) -1) ) start = period->segment_template->start_number;
+				if (set->segment_template && (set->segment_template->start_number != (u32) -1) ) start = set->segment_template->start_number;
+				if (rep->segment_template && (rep->segment_template->start_number != (u32) -1) ) start = rep->segment_template->start_number;
+
+				if (new_period->segment_template && (new_period->segment_template->start_number != (u32) -1) ) new_period->segment_template->start_number = start;
+				if (new_set->segment_template && (new_set->segment_template->start_number != (u32) -1) ) new_set->segment_template->start_number = start;
+				if (new_rep->segment_template && (new_rep->segment_template->start_number != (u32) -1) ) new_rep->segment_template->start_number = start;
+
+				/*OK, this rep is fine*/
+			}
+			else {
+				/*we're using segment list*/
+				assert(rep->segment_list || group->adaptation_set->segment_list || period->segment_list);
 
-				timeline_start_time = 0;
-				/*if not infinity for timeShift, compute min media time before merge and adjust it*/
-				if (dash->mpd->time_shift_buffer_depth != (u32) -1) {
-					Double timeshift = dash->mpd->time_shift_buffer_depth;
-					timeshift /= 1000;
-
-					for (group_idx=0; group_idx<gf_list_count(dash->groups); group_idx++) {
-						GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
-						Double group_start = gf_dash_get_segment_start_time(group);
-						if (!group_idx || (timeline_start_time > group_start) ) timeline_start_time = group_start;
-					}
-					/*we can rewind our segments from timeshift*/
-					if (timeline_start_time > timeshift) timeline_start_time -= timeshift;
-					/*we can rewind all segments*/
-					else timeline_start_time = 0;
-				}
-
-				/*update segmentTimeline at Period level*/
-				e = gf_dash_merge_segment_timeline(period->segment_list, period->segment_template, new_period->segment_list, new_period->segment_template, timeline_start_time);
-				if (e) {
+				if (!new_rep->segment_list && !new_set->segment_list && !new_period->segment_list) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment list as previous version\n"));
 					gf_mpd_del(new_mpd);
-					return e;
+					return GF_NON_COMPLIANT_BITSTREAM;
 				}
-
-				for (group_idx=0; group_idx<gf_list_count(dash->groups); group_idx++) {
-					GF_MPD_AdaptationSet *set, *new_set;
-					GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
-					if (group->selection != GF_DASH_GROUP_SELECTED) continue;
-					set = group->adaptation_set;
-					new_set = gf_list_get(new_period->adaptation_sets, group_idx);
-
-					if (gf_list_count(new_set->representations) != gf_list_count(group->adaptation_set->representations)) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: missing representation in adaptation set\n"));
-						gf_mpd_del(new_mpd);
-						return GF_NON_COMPLIANT_BITSTREAM;
-					}
-
-					/*get all representations in both periods*/
-					for (rep_idx = 0; rep_idx <gf_list_count(group->adaptation_set->representations); rep_idx++) {
-						GF_List *segments, *new_segments;
-						GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, rep_idx);
-						GF_MPD_Representation *new_rep = gf_list_get(new_set->representations, rep_idx);
-
-						if (rep->segment_base || group->adaptation_set->segment_base || period->segment_base) {
-							if (!new_rep->segment_base && !new_set->segment_base && !new_period->segment_base) {
-								GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment base as previous version\n"));
-								gf_mpd_del(new_mpd);
-								return GF_NON_COMPLIANT_BITSTREAM;
-							}
-							/*what else should we check ??*/
-
-							/*OK, this rep is fine*/
+				/*get the segment list*/
+				segments = new_segments = NULL;
+				if (period->segment_list && period->segment_list->segment_URLs) segments = period->segment_list->segment_URLs;
+				if (set->segment_list && set->segment_list->segment_URLs) segments = set->segment_list->segment_URLs;
+				if (rep->segment_list && rep->segment_list->segment_URLs) segments = rep->segment_list->segment_URLs;
+
+				if (new_period->segment_list && new_period->segment_list->segment_URLs) new_segments = new_period->segment_list->segment_URLs;
+				if (new_set->segment_list && new_set->segment_list->segment_URLs) new_segments = new_set->segment_list->segment_URLs;
+				if (new_rep->segment_list && new_rep->segment_list->segment_URLs) new_segments = new_rep->segment_list->segment_URLs;
+
+
+				for (i=0; i<gf_list_count(new_segments); i++) {
+					GF_MPD_SegmentURL *new_seg = gf_list_get(new_segments, i);
+					Bool found = 0;
+					for (j=0; j<gf_list_count(segments); j++) {
+						GF_MPD_SegmentURL *seg = gf_list_get(segments, j);
+						if (seg->media && new_seg->media && !strcmp(seg->media, new_seg->media)) {
+							found=1;
+							break;
 						}
+						if (seg->media_range && new_seg->media_range && (seg->media_range->start_range==new_seg->media_range->start_range) && (seg->media_range->end_range==new_seg->media_range->end_range) ) {
+							found=1;
+							break;
+						}
+					}
+					/*this is a new segment, merge it: we remove from new list and push to old one, before doing a final swap
+					this ensures that indexing in the segment_list is still correct after merging*/
+					if (!found) {
+						gf_list_rem(new_segments, i);
+						i--;
+						gf_list_add(segments, new_seg);
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Representation #%d: Adding new segment %s\n", rep_idx+1, new_seg->media));
+					}
+				}
 
-						else if (rep->segment_template || group->adaptation_set->segment_template || period->segment_template) {
-							u32 start;
-							if (!new_rep->segment_template && !new_set->segment_template && !new_period->segment_template) {
-								GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment template as previous version\n"));
-								gf_mpd_del(new_mpd);
-								return GF_NON_COMPLIANT_BITSTREAM;
-							}
-							start = 0;
-							/*override new startNum with old one - otherwise we would need to get rid of the entries before the start number in the MPD ...*/
-							if (period->segment_template && (period->segment_template->start_number != (u32) -1) ) start = period->segment_template->start_number;
-							if (set->segment_template && (set->segment_template->start_number != (u32) -1) ) start = set->segment_template->start_number;
-							if (rep->segment_template && (rep->segment_template->start_number != (u32) -1) ) start = rep->segment_template->start_number;
-
-							if (new_period->segment_template && (new_period->segment_template->start_number != (u32) -1) ) new_period->segment_template->start_number = start;
-							if (new_set->segment_template && (new_set->segment_template->start_number != (u32) -1) ) new_set->segment_template->start_number = start;
-							if (new_rep->segment_template && (new_rep->segment_template->start_number != (u32) -1) ) new_rep->segment_template->start_number = start;
+				/*what else should we check ?*/
 
-							/*OK, this rep is fine*/
-						}
-						else {
-							/*we're using segment list*/
-							assert(rep->segment_list || group->adaptation_set->segment_list || period->segment_list);
-
-							if (!new_rep->segment_list && !new_set->segment_list && !new_period->segment_list) {
-								GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment list as previous version\n"));
-								gf_mpd_del(new_mpd);
-								return GF_NON_COMPLIANT_BITSTREAM;
-							}
-							/*get the segment list*/
-							segments = new_segments = NULL;
-							if (period->segment_list && period->segment_list->segment_URLs) segments = period->segment_list->segment_URLs;
-							if (set->segment_list && set->segment_list->segment_URLs) segments = set->segment_list->segment_URLs;
-							if (rep->segment_list && rep->segment_list->segment_URLs) segments = rep->segment_list->segment_URLs;
-
-							if (new_period->segment_list && new_period->segment_list->segment_URLs) new_segments = new_period->segment_list->segment_URLs;
-							if (new_set->segment_list && new_set->segment_list->segment_URLs) new_segments = new_set->segment_list->segment_URLs;
-							if (new_rep->segment_list && new_rep->segment_list->segment_URLs) new_segments = new_rep->segment_list->segment_URLs;
-
-
-							for (i=0; i<gf_list_count(new_segments); i++) {
-								GF_MPD_SegmentURL *new_seg = gf_list_get(new_segments, i);
-								Bool found = 0;
-								for (j=0; j<gf_list_count(segments); j++) {
-									GF_MPD_SegmentURL *seg = gf_list_get(segments, j);
-									if (seg->media && new_seg->media && !strcmp(seg->media, new_seg->media)) {
-										found=1;
-										break;
-									}
-									if (seg->media_range && new_seg->media_range && (seg->media_range->start_range==new_seg->media_range->start_range) && (seg->media_range->end_range==new_seg->media_range->end_range) ) {
-										found=1;
-										break;
-									}
-								}
-								/*this is a new segment, merge it: we remove from new list and push to old one, before doing a final swap
-								this ensures that indexing in the segment_list is still correct after merging*/
-								if (!found) {
-									gf_list_rem(new_segments, i);
-									i--;
-									gf_list_add(segments, new_seg);
-									GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Representation #%d: Adding new segment %s\n", rep_idx+1, new_seg->media));
-								}
-							}
+				/*swap segment list content*/
+				gf_list_swap(new_segments, segments);
 
-							/*what else should we check ?*/
+				/*current representation is the active one in the group - update the number of segments*/
+				if (group->active_rep_index==rep_idx) {
+					group->nb_segments_in_rep = gf_list_count(new_segments);
+				}
+			}
 
-							/*swap segment list content*/
-							gf_list_swap(new_segments, segments);
+			e = gf_dash_merge_segment_timeline(rep->segment_list, rep->segment_template, new_rep->segment_list, new_rep->segment_template, timeline_start_time);
+			if (e) {
+				gf_mpd_del(new_mpd);
+				return e;
+			}
 
-							/*current representation is the active one in the group - update the number of segments*/
-							if (group->active_rep_index==rep_idx) {
-								group->nb_segments_in_rep = gf_list_count(new_segments);
-							}
-						}
+			/*what else should we check ??*/
 
-						e = gf_dash_merge_segment_timeline(rep->segment_list, rep->segment_template, new_rep->segment_list, new_rep->segment_template, timeline_start_time);
-						if (e) {
-							gf_mpd_del(new_mpd);
-							return e;
-						}
 
-						/*what else should we check ??*/
+			/*switch all intertnal GPAC stuff*/
+			memcpy(&new_rep->playback, &rep->playback, sizeof(GF_DASH_RepresentationPlayback));
+			if (rep->playback.cached_init_segment_url) rep->playback.cached_init_segment_url = NULL;
 
+			if (!new_rep->mime_type) {
+				new_rep->mime_type = rep->mime_type;
+				rep->mime_type = NULL;
+			}
+		}
+		/*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;
 
-						/*switch all intertnal GPAC stuff*/
-						memcpy(&new_rep->playback, &rep->playback, sizeof(GF_DASH_RepresentationPlayback));
-						if (rep->playback.cached_init_segment_url) rep->playback.cached_init_segment_url = NULL;
+		j = gf_list_count(group->adaptation_set->representations);
+		assert(j);
 
-						if (!new_rep->mime_type) {
-							new_rep->mime_type = rep->mime_type;
-							rep->mime_type = NULL;
-						}
-					}
-					/*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;
+		/*update segmentTimeline at AdaptationSet level*/
+		e = gf_dash_merge_segment_timeline(set->segment_list, set->segment_template, new_set->segment_list, new_set->segment_template, timeline_start_time);
+		if (e) {
+			gf_mpd_del(new_mpd);
+			return e;
+		}
 
-					/*update segmentTimeline at AdaptationSet level*/
-					e = gf_dash_merge_segment_timeline(set->segment_list, set->segment_template, new_set->segment_list, new_set->segment_template, timeline_start_time);
-					if (e) {
-						gf_mpd_del(new_mpd);
-						return e;
-					}
+		/*now that all possible SegmentXXX have been updated, purge them if needed: all segments ending before timeline_start_time
+		will be removed from MPD*/
+		if (timeline_start_time) {
+			u32 nb_segments_removed = gf_dash_purge_segment_timeline(group, timeline_start_time);
+			if (nb_segments_removed) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AdaptationSet %d - removed %d segments from timeline (%d since start of the period)\n", group_idx+1, nb_segments_removed, group->nb_segments_purged));
+			}
+		}
 
-					/*now that all possible SegmentXXX have been updated, purge them if needed: all segments ending before timeline_start_time
-					will be removed from MPD*/
-					if (timeline_start_time) {
-						u32 nb_segments_removed = gf_dash_purge_segment_timeline(group, timeline_start_time);
-						if (nb_segments_removed) {
-							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AdaptationSet %d - removed %d segments from timeline (%d since start of the period)\n", group_idx+1, nb_segments_removed, group->nb_segments_purged));
-						}
-					}
+		if (new_mpd->availabilityStartTime != dash->mpd->availabilityStartTime) {
+			gf_dash_group_timeline_setup(new_mpd, group);
+		}
+
+		group->maybe_end_of_stream = 0;
+		reset_segment_count = 0;
+		/*compute fetchTime + minUpdatePeriod and check period end time*/
+		if (new_mpd->minimum_update_period && new_mpd->media_presentation_duration) {
+			u32 endTime = (u32) (fetch_time - new_mpd->availabilityStartTime - period->start);
+			if (endTime > new_mpd->media_presentation_duration) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Period EndTime is signaled to %d, less than fetch time %d ! Ignoring mediaPresentationDuration\n", new_mpd->media_presentation_duration, endTime));
+				new_mpd->media_presentation_duration = 0;
+				reset_segment_count = 1;
+			} else {
+				endTime += new_mpd->minimum_update_period/1000;
+				if (endTime > new_mpd->media_presentation_duration) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Period EndTime is signaled to %d, less than fetch time + next update - maybe end of stream ?\n", new_mpd->availabilityStartTime, endTime));
+					group->maybe_end_of_stream = 1;
+				}
+			}
+		}
 
-					/*update number of segments in active rep*/
-					gf_dash_get_segment_duration(gf_list_get(group->adaptation_set->representations, group->active_rep_index), group->adaptation_set, group->period, new_mpd, &group->nb_segments_in_rep, NULL);
+		/*update number of segments in active rep*/
+		gf_dash_get_segment_duration(gf_list_get(group->adaptation_set->representations, group->active_rep_index), group->adaptation_set, group->period, new_mpd, &group->nb_segments_in_rep, &seg_dur);
 
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updated AdaptationSet %d - %d segments\n", group_idx+1, group->nb_segments_in_rep));
+		if (reset_segment_count) {
+			u32 nb_segs_in_mpd_period = (u32) (dash->mpd->minimum_update_period / (1000*seg_dur) );
+			group->nb_segments_in_rep = group->download_segment_index + nb_segs_in_mpd_period;
+		} 
+		/*check if number of segments are coherent ...*/
+		else if (!group->maybe_end_of_stream && new_mpd->minimum_update_period && new_mpd->media_presentation_duration) {
+			u32 nb_segs_in_mpd_period = (u32) (dash->mpd->minimum_update_period / (1000*seg_dur) );
 
-				}
-				/*swap representations - we don't need to update download_segment_index as it still points to the right entry in the merged list*/
-				if (dash->mpd)
-					gf_mpd_del(dash->mpd);
-				dash->mpd = new_mpd;
-				dash->last_update_time = gf_sys_clock();
+			if (group->download_segment_index + nb_segs_in_mpd_period >= group->nb_segments_in_rep) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Period has %d segments but %d are needed until next refresh. Maybe end of stream is near ?\n", group->nb_segments_in_rep, group->download_segment_index + nb_segs_in_mpd_period));
+				group->maybe_end_of_stream = 1;
 			}
 		}
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updated AdaptationSet %d - %d segments\n", group_idx+1, group->nb_segments_in_rep));
+
 	}
+	/*swap representations - we don't need to update download_segment_index as it still points to the right entry in the merged list*/
+	if (dash->mpd)
+		gf_mpd_del(dash->mpd);
+	dash->mpd = new_mpd;
+	dash->last_update_time = gf_sys_clock();
+	dash->mpd_fetch_time = fetch_time;
+
+//	dash->mpd->minimum_update_period = 3000;
+
 	return GF_OK;
 }
 
@@ -1090,12 +1466,13 @@
 	u32 k;
 	GF_MPD_AdaptationSet *set;
 	GF_MPD_Period *period;
+	u32 nb_segs;
 	u32 i = gf_list_find(group->adaptation_set->representations, rep);
 	assert((s32) i >= 0);
 
 	group->active_rep_index = i;
 	group->active_bitrate = rep->bandwidth;
-	group->nb_segments_in_rep = 1;
+	nb_segs = group->nb_segments_in_rep;
 
 	group->min_bandwidth_selected = 1;
 	for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
@@ -1122,15 +1499,18 @@
 	if (group->max_bitrate) GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tmax download bandwidth: %d kbps\n", group->max_bitrate/1024));
 	if (width&&height) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tWidth %d Height %d", width, height));
-		if (framerate) GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("framerate %d/%d", framerate->num, framerate->den));
+		if (framerate) GF_LOG(GF_LOG_INFO, GF_LOG_DASH, (" framerate %d/%d", framerate->num, framerate->den));
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\n"));
 	} else if (samplerate) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tsamplerate %d\n", samplerate));
 	}
 #endif
 
-
 	gf_dash_get_segment_duration(rep, set, period, group->dash->mpd, &group->nb_segments_in_rep, &group->segment_duration);
+
+	/*if broken indication in duration restore previous seg count*/
+	if (group->dash->ignore_mpd_duration)
+		group->nb_segments_in_rep = nb_segs;
 }
 
 static void gf_dash_switch_group_representation(GF_DashClient *mpd, GF_DASH_Group *group)
@@ -1198,7 +1578,8 @@
 } GF_DASHURLResolveType;
 
 
-GF_Err gf_dash_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_DASH_Group *group, char *mpd_url, GF_DASHURLResolveType resolve_type, u32 item_index, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration)
+
+GF_Err gf_dash_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_DASH_Group *group, const char *mpd_url, GF_DASHURLResolveType resolve_type, u32 item_index, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url)
 {
 	GF_MPD_BaseURL *url_child;
 	GF_MPD_SegmentTimeline *timeline = NULL;
@@ -1213,6 +1594,15 @@
 	*out_range_start = *out_range_end = 0;
 	*out_url = NULL;
 
+
+	if (!group->timeline_setup) {
+		gf_dash_group_timeline_setup(mpd, group);
+		group->timeline_setup = 1;
+	}
+
+
+
+
 	/*resolve base URLs from document base (download location) to representation (media)*/
 	url = gf_strdup(mpd_url);
 
@@ -1245,11 +1635,13 @@
 	}
 
 	gf_dash_resolve_duration(rep, set, period, segment_duration, &timescale, NULL, NULL);
-	*segment_duration = (u32) ((Double) (*segment_duration) * 1000.0 / timescale);
+	*segment_duration = (resolve_type==GF_DASH_RESOLVE_URL_MEDIA) ? (u32) ((Double) (*segment_duration) * 1000.0 / timescale) : 0;
 
 	/*single URL*/
-	if (rep->segment_base || set->segment_base || period->segment_base) {
+//	if (rep->segment_base || set->segment_base || period->segment_base) {
+	if (!rep->segment_list && !set->segment_list && !period->segment_list && !rep->segment_template && !set->segment_template && !period->segment_template) {	
 		GF_MPD_URL *res_url;
+		GF_MPD_SegmentBase *base_seg = NULL;
 		if (item_index>0) return GF_EOS;
 		switch (resolve_type) {
 		case GF_DASH_RESOLVE_URL_MEDIA:
@@ -1259,29 +1651,32 @@
 		case GF_DASH_RESOLVE_URL_INIT:
 		case GF_DASH_RESOLVE_URL_INDEX:
 			res_url = NULL;
-			if (resolve_type == GF_DASH_RESOLVE_URL_INDEX) {
-				if (period->segment_base) res_url = period->segment_base->representation_index;
-				if (set->segment_base) res_url = set->segment_base->representation_index;
-				if (rep->segment_base) res_url = rep->segment_base->representation_index;
-			} else {
-				if (period->segment_base) res_url = period->segment_base->initialization_segment;
-				if (set->segment_base) res_url = set->segment_base->initialization_segment;
-				if (rep->segment_base) res_url = rep->segment_base->initialization_segment;
-			}
-			/*no initialization segment / index*/
-			if (!res_url) {
-				gf_free(url);
-				return GF_OK;
+			base_seg = rep->segment_base;
+			if (!base_seg) base_seg = set->segment_base;
+			if (!base_seg) base_seg = period->segment_base;
+
+			if (base_seg) {
+				if (resolve_type == GF_DASH_RESOLVE_URL_INDEX) {
+					res_url = base_seg->representation_index;
+				} else {
+					res_url = base_seg->initialization_segment;
+				}
 			}
-			if (res_url->sourceURL) {
+			if (is_in_base_url) *is_in_base_url = 0;
+			/*no initialization segment / index, use base URL*/
+			if (res_url && res_url->sourceURL) {
 				*out_url = gf_url_concatenate(url, res_url->sourceURL);
 				gf_free(url);
 			} else {
 				*out_url = url;
+				if (is_in_base_url) *is_in_base_url = 1;
 			}
-			if (res_url->byte_range) {
+			if (res_url && res_url->byte_range) {
 				*out_range_start = res_url->byte_range->start_range;
 				*out_range_end = res_url->byte_range->end_range;
+			} else if (base_seg && base_seg->index_range && (resolve_type == GF_DASH_RESOLVE_URL_INDEX)) {
+				*out_range_start = base_seg->index_range->start_range;
+				*out_range_end = base_seg->index_range->end_range;
 			}
 			return GF_OK;
 		default:
@@ -1362,6 +1757,9 @@
 				*out_range_start = segment->media_range->start_range;
 				*out_range_end = segment->media_range->end_range;
 			}
+			if (segment->duration) {
+				*segment_duration = (u32) ((Double) (segment->duration) * 1000.0 / timescale);
+			}
 			return GF_OK;
 		case GF_DASH_RESOLVE_URL_INDEX:
 			if (item_index >= segment_count) {
@@ -1562,7 +1960,7 @@
 	}
 	start_range = end_range = 0;
 
-	e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration);
+	e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
 	if (e) {
 		gf_mx_v(dash->dl_mutex);
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve initialization URL: %s\n", gf_error_to_string(e) ));
@@ -1571,7 +1969,7 @@
 
 	/*no error and no init segment, go for media segment*/
 	if (!base_init_url) {
-		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_MEDIA, group->download_segment_index, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration);
+		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_MEDIA, group->download_segment_index, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
 		if (e) {
 			gf_mx_v(dash->dl_mutex);
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve media URL: %s\n", gf_error_to_string(e) ));
@@ -1582,7 +1980,7 @@
 		group->dont_delete_first_segment = 1;
 	}
 
-	if (!strstr(base_init_url, "://") || !strnicmp(base_init_url, "file://", 7) || !strnicmp(base_init_url, "views://", 8)) {
+	if (!strstr(base_init_url, "://") || !strnicmp(base_init_url, "file://", 7) || !strnicmp(base_init_url, "gmem://", 7) || !strnicmp(base_init_url, "views://", 8)) {
 		assert(!group->nb_cached_segments);
 		group->cached[0].cache = gf_strdup(base_init_url);
 		group->cached[0].url = gf_strdup(base_init_url);
@@ -1591,7 +1989,11 @@
 
 		group->nb_cached_segments = 1;
 		/*do not erase local files*/
-		group->local_files = 1;
+		group->local_files = group->was_segment_base ? 0 : 1;
+		if (group->local_files) {
+			gf_dash_buffer_off(group, dash);
+		}
+
 		group->download_segment_index += nb_segment_read;
 		group->segment_local_url = group->cached[0].cache;
 		group->local_url_start_range = start_range;
@@ -1611,11 +2013,11 @@
 				if (a_rep==rep) continue;
 				if (a_rep->playback.disabled) continue;
 
-				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur);
+				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL);
 				if (!e && a_base_init_url) {
 					a_rep->playback.cached_init_segment_url = a_base_init_url;
-					rep->playback.init_start_range = a_start;
-					rep->playback.init_end_range =a_end ;
+					a_rep->playback.init_start_range = a_start;
+					a_rep->playback.init_end_range =a_end ;
 				} else if (e) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot solve initialization segment for representation: %s - discarding representation\n", gf_error_to_string(e) ));
 					a_rep->playback.disabled = 1;
@@ -1646,7 +2048,7 @@
 
 		gf_free(base_init_url);
 
-		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_MEDIA, group->download_segment_index + 1, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration);
+		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_MEDIA, group->download_segment_index + 1, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
 		if (!e) {
 			gf_mx_v(dash->dl_mutex);
 			return e;
@@ -1729,12 +2131,15 @@
 		group->cached[0].cache = gf_strdup(group->segment_local_url);
 		group->cached[0].url = gf_strdup( dash->dash_io->get_url(dash->dash_io, group->segment_download) );
 		group->cached[0].representation_index = group->active_rep_index;
+		group->cached[0].duration = (u32) group->current_downloaded_segment_duration;
 		rep->playback.cached_init_segment_url = gf_strdup(group->segment_local_url);
 		rep->playback.init_start_range = 0;
 		rep->playback.init_end_range = 0;
 
 		group->nb_cached_segments = 1;
 		group->download_segment_index += nb_segment_read;
+		gf_dash_update_buffering(group, dash);
+
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Adding initialization segment %s to cache: %s\n", group->segment_local_url, group->cached[0].url ));
 		gf_mx_v(dash->dl_mutex);
 		gf_free(base_init_url);
@@ -1749,7 +2154,7 @@
 				if (a_rep==rep) continue;
 				if (a_rep->playback.disabled) continue;
 
-				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur);
+				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL);
 				if (!e && a_base_init_url) {
 					e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), a_base_init_url, a_start, a_end, 1, group);
 					if (e) {
@@ -1757,8 +2162,8 @@
 						a_rep->playback.disabled = 1;
 					} else {
 						a_rep->playback.cached_init_segment_url = gf_strdup( dash->dash_io->get_cache_name(dash->dash_io, group->segment_download) );
-						rep->playback.init_start_range = 0;
-						rep->playback.init_end_range = 0;
+						a_rep->playback.init_start_range = 0;
+						a_rep->playback.init_end_range = 0;
 					}
 					gf_free(a_base_init_url);
 				} else if (e) {
@@ -1825,7 +2230,7 @@
 }
 
 
-/* create groups (implemntation of adaptations set) */
+/* create groups (implementation of adaptations set) */
 GF_Err gf_dash_setup_groups(GF_DashClient *dash)
 {
 	GF_Err e;
@@ -1842,7 +2247,6 @@
 
 	count = gf_list_count(period->adaptation_sets);
 	for (i=0; i<count; i++) {
-		u32 cache_duration;
 		Double seg_dur;
 		GF_DASH_Group *group;
 		Bool found = 0;
@@ -1870,20 +2274,26 @@
 		for (j=0; j<gf_list_count(set->representations); j++) {
 			Double dur;
 			u32 nb_seg;
-			gf_dash_get_segment_duration(gf_list_get(set->representations, j), set, period, dash->mpd, &nb_seg, &dur);
+			GF_MPD_Representation *rep = gf_list_get(set->representations, j);
+			gf_dash_get_segment_duration(rep, set, period, dash->mpd, &nb_seg, &dur);
 			if (dur>seg_dur) seg_dur = dur;
+
+			if (rep->width>set->max_width) {
+				set->max_width = rep->width;
+				set->max_height = rep->height;
+			}
 		}
 
 		if (!seg_dur) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Cannot compute default segment duration\n"));
 		}
 
-		cache_duration = dash->max_cache_duration * 1000;
+		group->cache_duration = dash->max_cache_duration * 1000;
 		if (dash->mpd->min_buffer_time)
-			cache_duration = dash->mpd->min_buffer_time;
+			group->cache_duration = dash->mpd->min_buffer_time;
 		group->max_cached_segments = 1;
 		if (seg_dur) {
-			while (group->max_cached_segments * seg_dur * 1000 < cache_duration)
+			while (group->max_cached_segments * seg_dur * 1000 < group->cache_duration)
 				group->max_cached_segments ++;
 
 			/*we need one more entry in cache for segment being currently played*/
@@ -1906,10 +2316,278 @@
 	return GF_OK;
 }
 
+static GF_Err gf_dash_load_sidx(GF_BitStream *bs, GF_MPD_Representation *rep, Bool seperate_index, u64 sidx_offset)
+{
+#ifdef GPAC_DISABLE_ISOM
+	return GF_NOT_SUPPORTED;
+#else
+	u64 anchor_position, prev_pos;
+	GF_SegmentIndexBox *sidx = NULL;
+	u32 i, size, type;
+	GF_Err e;
+	u64 offset;
+	
+	prev_pos = gf_bs_get_position(bs);
+	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')) {
+		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;
+	}
+
+	gf_bs_seek(bs, sidx_offset);
+
+	anchor_position = sidx_offset + size;
+	if (seperate_index) 
+		anchor_position = 0;
+
+	e = gf_isom_parse_box((GF_Box **) &sidx, bs);
+	if (e) return e;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Loading SIDX - %d entries - Earliest Presentation Time "LLD"\n", sidx->nb_refs, sidx->earliest_presentation_time));
+
+	offset = sidx->first_offset + anchor_position;
+	rep->segment_list->timescale = sidx->timescale;
+	for (i=0; i<sidx->nb_refs; i++) {
+		GF_MPD_SegmentURL *seg;
+		if (sidx->refs[i].reference_type) {
+			e = gf_dash_load_sidx(bs, rep, seperate_index, offset);
+			if (e) {
+				break;
+			}
+		} else {
+			GF_SAFEALLOC(seg, GF_MPD_SegmentURL);
+			GF_SAFEALLOC(seg->media_range, GF_MPD_ByteRange);
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Found media segment size %d - duration %d - start with SAP: %d - SAP type %d - SAP Deltat Time %d\n",
+				sidx->refs[i].reference_size, sidx->refs[i].subsegment_duration, sidx->refs[i].starts_with_SAP, sidx->refs[i].SAP_type, sidx->refs[i].SAP_delta_time));
+
+			seg->media_range->start_range = offset;
+			offset += sidx->refs[i].reference_size;
+			seg->media_range->end_range = offset - 1;
+			seg->duration = sidx->refs[i].subsegment_duration;
+			gf_list_add(rep->segment_list->segment_URLs, seg);
+		}
+	}
+	gf_isom_box_del((GF_Box*)sidx);
+	gf_bs_seek(bs, prev_pos);
+	return e;
+#endif
+}
+
+static GF_Err gf_dash_load_representation_sidx(GF_DASH_Group *group, GF_MPD_Representation *rep, const char *cache_name, Bool seperate_index, Bool needs_mov_range)
+{
+	GF_Err e;
+	GF_BitStream *bs;
+	FILE *f=NULL;
+	if (!strncmp(cache_name, "gmem://", 7)) {
+		u32 size;
+		u8 *mem_address;
+		if (sscanf(cache_name, "gmem://%d@%p", &size, &mem_address) != 2) {
+			return GF_IO_ERR;
+		} 
+		bs = gf_bs_new(mem_address, size, GF_BITSTREAM_READ);
+	} else {
+		FILE *f = gf_f64_open(cache_name, "rb");
+		if (!f) return GF_IO_ERR;
+		bs = gf_bs_from_file(f, GF_BITSTREAM_READ);
+	}
+	e = GF_OK;
+	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')) {
+			gf_bs_skip_bytes(bs, size-8);
+
+			if (needs_mov_range && (type==GF_4CC('m','o','o','v') )) {
+				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);
+			}
+			continue;
+		}
+		gf_bs_seek(bs, gf_bs_get_position(bs)-8);
+		e = gf_dash_load_sidx(bs, rep, seperate_index, gf_bs_get_position(bs) );
+
+		/*we could also parse the sub sidx*/
+		break;
+	}
+	gf_bs_del(bs);
+	if (f) fclose(f);
+	return e;
+}
+
+static GF_Err dash_load_box_type(const char *cache_name, u32 offset, u32 *box_type, u32 *box_size)
+{
+	*box_type = *box_size = 0;
+	if (!strncmp(cache_name, "gmem://", 7)) {
+		u32 size;
+		u8 *mem_address;
+		if (sscanf(cache_name, "gmem://%d@%p", &size, &mem_address) != 2) {
+			return GF_IO_ERR;
+		} 
+		if (offset+8 > size) 
+			return GF_IO_ERR;
+		mem_address+=offset;
+		*box_size = GF_4CC(mem_address[0], mem_address[1], mem_address[2], mem_address[3]);
+		*box_type = GF_4CC(mem_address[4], mem_address[5], mem_address[6], mem_address[7]);
+	} else {
+		unsigned char data[4];
+		FILE *f = gf_f64_open(cache_name, "rb");
+		if (!f) return GF_IO_ERR;
+		if (gf_f64_seek(f, offset, SEEK_SET))
+			return GF_IO_ERR;
+		if (fread(data, 1, 4, f) == 4) {
+			*box_size = GF_4CC(data[0], data[1], data[2], data[3]);
+			if (fread(data, 1, 4, f) == 4) {
+				*box_type = GF_4CC(data[0], data[1], data[2], data[3]);
+			}
+		}
+		fclose(f);
+	}
+	return GF_OK;
+}
+
+static GF_Err gf_dash_setup_single_index_mode(GF_DASH_Group *group)
+{
+	u32 i;
+	GF_Err e;
+	char *init_url = NULL;
+	char *index_url = NULL;
+	GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, 0);
+	
+	if (rep->segment_template || group->adaptation_set->segment_template || group->period->segment_template) return GF_OK;
+	if (rep->segment_list || group->adaptation_set->segment_list || group->period->segment_list) return GF_OK;
+
+	/*OK we are in single-file mode, download all required indexes & co*/
+	for (i=0; i<gf_list_count(group->adaptation_set->representations); i++) {
+		char *sidx_file = NULL;
+		u64 duration, index_start_range, index_end_range, init_start_range, init_end_range;
+		Bool index_in_base, init_in_base;
+		Bool init_needs_byte_range = 0;
+		Bool has_seen_sidx = 0;
+		Bool is_isom = 1;
+		rep = gf_list_get(group->adaptation_set->representations, i);
+
+		index_in_base = init_in_base = 0;
+		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &init_url, &init_start_range, &init_end_range, &duration, &init_in_base);
+		if (e) goto exit;
+
+		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_DASH_RESOLVE_URL_INDEX, 0, &index_url, &index_start_range, &index_end_range, &duration, &index_in_base);
+		if (e) goto exit;
+
+
+		if (is_isom && (init_in_base || index_in_base)) {	
+			if (!strstr(init_url, "://") || (!strnicmp(init_url, "file://", 7) || !strnicmp(init_url, "views://", 7)) ) {
+				GF_SAFEALLOC(rep->segment_list, GF_MPD_SegmentList);
+				rep->segment_list->segment_URLs  =gf_list_new();
+
+				if (init_in_base) {
+					GF_SAFEALLOC(rep->segment_list->initialization_segment, GF_MPD_URL);
+					rep->segment_list->initialization_segment->sourceURL = gf_strdup(init_url);
+					/*we don't want to load the entire movie */
+					init_needs_byte_range = 1;
+				}
+				if (index_in_base) {
+					sidx_file = (char *)init_url;
+				}
+			}
+			/*we need to download the init segement, at least partially*/
+			else {
+				u32 offset = 0;
+				u32 box_type=0;
+				u32 box_size=0;
+				const char *cache_name;
+
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Downloading init segment and SIDX for representation %s\n", init_url));
+
+				/*download first 8 bytes and check if we do have a box starting there*/
+				e = gf_dash_download_resource(group->dash->dash_io, &(group->segment_download), init_url, offset, 7, 1, group);
+				if (e) goto exit;
+				cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
+				e = dash_load_box_type(cache_name, offset, &box_type, &box_size);
+				offset=8;
+				while (box_type) {
+					/*we got the moov , stop here */
+					if (!index_in_base && (box_type==GF_4CC('m','o','o','v'))) {
+						e = gf_dash_download_resource(group->dash->dash_io, &(group->segment_download), init_url, offset, offset+box_size-8, 2, group);
+						break;
+					} else {
+						e = gf_dash_download_resource(group->dash->dash_io, &(group->segment_download), init_url, offset, offset+box_size-1, 2, group);
+						offset += box_size;
+						/*we need to refresh the cache name because of our memory astorage thing ...*/
+						cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
+						e = dash_load_box_type(cache_name, offset-8, &box_type, &box_size);
+
+						if (box_type==GF_4CC('s','i','d','x'))
+							has_seen_sidx = 1;
+						else if (has_seen_sidx)
+							break;
+	
+	
+					}
+				}
+				if (e<0) goto exit;
+
+				if (box_type==0) {
+					e = GF_ISOM_INVALID_FILE;
+					goto exit;
+				}
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Done downloading init segment and SIDX\n"));
+
+				GF_SAFEALLOC(rep->segment_list, GF_MPD_SegmentList);
+				rep->segment_list->segment_URLs  =gf_list_new();
+
+				cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
+				if (init_in_base) {
+					GF_SAFEALLOC(rep->segment_list->initialization_segment, GF_MPD_URL);
+					rep->segment_list->initialization_segment->sourceURL = gf_strdup(cache_name);
+				}
+				if (index_in_base) {
+					sidx_file = (char *)cache_name;
+				}
+			}
+		}
+		/*we have index url, download it*/
+		if (! index_in_base) {
+			e = gf_dash_download_resource(group->dash->dash_io, &(group->segment_download), index_url, index_start_range, index_end_range, 1, group);
+			if (e) goto exit;
+			sidx_file = (char *)group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
+		}
+
+		/*load sidx*/
+		e = gf_dash_load_representation_sidx(group, rep, sidx_file, !index_in_base, init_needs_byte_range);
+		if (e) {
+			rep->playback.disabled = 1;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to load segment index for this representation - disabling\n"));
+		}
+
+		/*reset all seg based stuff*/
+		if (rep->segment_base) { 
+			gf_mpd_segment_base_free(rep->segment_base);
+			rep->segment_base = NULL;
+		}
+
+		gf_free(index_url);
+		index_url = NULL;
+		gf_free(init_url);
+		init_url = NULL;
+	}
+	if (group->adaptation_set->segment_base) { 
+		gf_mpd_segment_base_free(group->adaptation_set->segment_base);
+		group->adaptation_set->segment_base = NULL;
+	}
+	group->was_segment_base = 1;
+
+exit:
+	if (init_url) gf_free(init_url);
+	if (index_url) gf_free(index_url);
+	return e;
+}
+
 static GF_Err gf_dash_setup_period(GF_DashClient *dash)
 {
+	GF_MPD_Period *period;
 	u32 rep_i, group_i, nb_groups_ok;
-
 	/*setup all groups*/
 	gf_dash_setup_groups(dash);
 
@@ -1918,6 +2596,7 @@
 		GF_MPD_Representation *rep_sel;
 		u32 active_rep, nb_rep;
 		const char *mime_type;
+		u32 nb_rep_ok = 0;
 		GF_DASH_Group *group = gf_list_get(dash->groups, group_i);
 
 		nb_rep = gf_list_count(group->adaptation_set->representations);
@@ -1931,6 +2610,9 @@
 			continue;
 		}
 
+		/*translate from single-indexed file to SegmentList*/
+		gf_dash_setup_single_index_mode(group);
+
 		/* Select the appropriate representation in the given period */
 		active_rep = 0;
 		for (rep_i = 0; rep_i < nb_rep; rep_i++) {
@@ -1940,20 +2622,27 @@
 			if (rep_i) {
 				Bool ok;
 				char *sep;
-				if ( !rep->codecs || !rep_sel->codecs ) continue;
-				sep = strchr(rep_sel->codecs, '.');
-				if (sep) sep[0] = 0;
-				ok = !strnicmp(rep->codecs, rep_sel->codecs, strlen(rep_sel->codecs) );
-				if (sep) sep[0] = '.';
-				if (!ok) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Different codec types (%s vs %s) in same AdaptationSet - disabling %s\n", rep_sel->codecs, rep->codecs, rep->codecs));
-					rep->playback.disabled = 1;
-					continue;
-				}
-				if (rep->segment_list && rep->segment_list->xlink_href) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Representation SegmentList uses xlink:href to %s - disabling because not supported\n", rep->segment_list->xlink_href));
-					rep->playback.disabled = 1;
-					continue;
+				if (rep->codecs && rep_sel->codecs) {
+
+					sep = strchr(rep_sel->codecs, '.');
+					if (sep) sep[0] = 0;
+					ok = !strnicmp(rep->codecs, rep_sel->codecs, strlen(rep_sel->codecs) );
+					if (sep) sep[0] = '.';
+					if (!ok) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Different codec types (%s vs %s) in same AdaptationSet - disabling %s\n", rep_sel->codecs, rep->codecs, rep->codecs));
+						rep->playback.disabled = 1;
+						continue;
+					}
+					if (rep->dependency_id) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Representation dependent on representation %d - not supported\n", rep->dependency_id));
+						rep->playback.disabled = 1;
+						continue;
+					}
+					if (rep->segment_list && rep->segment_list->xlink_href) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Representation SegmentList uses xlink:href to %s - disabling because not supported\n", rep->segment_list->xlink_href));
+						rep->playback.disabled = 1;
+						continue;
+					}
 				}
 			}
 
@@ -1969,10 +2658,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;
@@ -1982,8 +2672,20 @@
 				break;
 			}
 		}
+		for (rep_i = 0; rep_i < nb_rep; rep_i++) {
+			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, rep_i);
+			if (!rep->playback.disabled) 
+				nb_rep_ok++;
+		}
+
+		if (! nb_rep_ok) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] No valid representation in this group - disabling\n"));
+			group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
+			continue;
+		}
 
 		rep_sel = gf_list_get(group->adaptation_set->representations, active_rep);
+
 		gf_dash_set_group_representation(group, rep_sel);
 
 		if (dash->playback_start_range>=0) 
@@ -2008,7 +2710,19 @@
 
 		group->selection = GF_DASH_GROUP_NOT_SELECTED;
 		nb_groups_ok++;
+
+#ifdef DEBUG_FIRST_SET_ONLY
+		break;
+#endif
 	}
+
+	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
+	
+	if (period->segment_base) { 
+		gf_mpd_segment_base_free(period->segment_base);
+		period->segment_base = NULL;
+	}
+
 	if (!nb_groups_ok) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] No AdaptationSet could be selected in the MPD - Cannot play\n"));
 		return GF_NON_COMPLIANT_BITSTREAM;
@@ -2026,6 +2740,8 @@
 	GF_MPD_Representation *rep;
 	u32 i, group_count, ret = 0;
 	Bool go_on = 1;
+	u32 min_wait = 0;
+	Bool first_period_in_mpd = 1;
 	char *new_base_seg_url;
 	assert(dash);
 	if (!dash->mpd) {
@@ -2042,6 +2758,13 @@
 
 	dash->in_period_setup = 1;
 
+	/*setup period*/
+	e = gf_dash_setup_period(dash);
+	if (e) {
+		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_PERIOD_SETUP_ERROR, e);
+		ret = 1;
+		goto exit;
+	}
 	dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SELECT_GROUPS, GF_OK);
 
 	e = GF_OK;
@@ -2049,10 +2772,14 @@
 	for (i=0; i<group_count; i++) {
 		GF_DASH_Group *group = gf_list_get(dash->groups, i);
 		if (group->selection != GF_DASH_GROUP_SELECTED) continue;
+		if (first_period_in_mpd) {
+			gf_dash_buffer_on(group, dash);
+		}
 		e = gf_dash_download_init_segment(dash, group);
 		if (e) break;
 	}
 	dash->mpd_stop_request=0;
+	first_period_in_mpd = 0;
 
 	/*if error signal to the user*/
 	if (e != GF_OK) {
@@ -2085,24 +2812,39 @@
 	dash->dash_state = GF_DASH_STATE_RUNNING;
 	gf_mx_v(dash->dl_mutex);
 
+	min_wait = 0;
 	while (go_on) {
 		const char *local_file_name = NULL;
 		const char *resource_name = NULL;
+
 		/*wait until next segment is needed*/
 		while (!dash->mpd_stop_request) {
 			u32 timer = gf_sys_clock() - dash->last_update_time;
-			Bool shouldParsePlaylist = dash->mpd->minimum_update_period && (timer > dash->mpd->minimum_update_period); 
 
-			if (shouldParsePlaylist) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Time to update the playlist (%u ms ellapsed since last refresh and min reoad rate is %u)\n", timer, dash->mpd->minimum_update_period));
+			/*refresh MPD*/
+			if (dash->mpd->minimum_update_period && (timer > dash->mpd->minimum_update_period)) {
+				u32 diff = gf_sys_clock();
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] At %d Time to update the playlist (%u ms ellapsed since last refresh and min reoad rate is %u)\n", gf_sys_clock() , timer, dash->mpd->minimum_update_period));
 				e = gf_dash_update_manifest(dash);
 				group_count = gf_list_count(dash->groups);
+				diff = gf_sys_clock() - diff;
 				if (e) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error updating MPD %s\n", gf_error_to_string(e)));
+				} else {
+					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Updated MPD in %d ms\n", diff));
 				}
 			} else {
 				Bool all_groups_done = 1;
 				Bool cache_full = 1;
+
+				/*wait if nothing is ready to be downloaded*/
+				if (min_wait) {
+					u32 sleep_for = min_wait/2;
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] No segments available on the server until %d ms - going to sleep\n", sleep_for));
+					gf_sleep(sleep_for);
+				}
+
+				/*check if cache is not full*/
 				gf_mx_p(dash->dl_mutex);
 				for (i=0; i<group_count; i++) {
 					GF_DASH_Group *group = gf_list_get(dash->groups, i);
@@ -2114,6 +2856,7 @@
 					}
 				}
 				gf_mx_v(dash->dl_mutex);
+
 				if (!cache_full) break;
 
 				if (dash->request_period_switch==2) all_groups_done = 1;
@@ -2123,13 +2866,11 @@
 					if (dash->request_period_switch == 1) 
 						dash->active_period_index++;
 
-					gf_dash_setup_period(dash);
 					dash->request_period_switch = 0;
 
 					goto restart_period;
 				}
-
-				gf_sleep(16);
+				gf_sleep(30);
 			}
 		}
 
@@ -2139,8 +2880,11 @@
 			break;
 		}
 
+		min_wait = 0;
+
 		/*for each selected groups*/
 		for (i=0; i<group_count; i++) {		
+			Bool in_segment_avail_time;
 			u64 start_range, end_range;
 			Bool use_byterange;
 			u32 representation_index;
@@ -2150,6 +2894,7 @@
 
 
 			if (group->nb_cached_segments>=group->max_cached_segments) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] At %d Cache is full for this group - skipping\n", gf_sys_clock() ));
 				continue;
 			}
 
@@ -2161,8 +2906,17 @@
 			we need to check if a new playlist is ready */
 			if (group->nb_segments_in_rep && (group->download_segment_index>=group->nb_segments_in_rep)) {
 				u32 timer = gf_sys_clock() - dash->last_update_time;
+				Bool update_playlist = 0;
 				/* update of the playlist, only if indicated */
-				if (dash->mpd->minimum_update_period && timer > dash->mpd->minimum_update_period) {
+				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) {
+					if (group->segment_duration && (timer > group->segment_duration*1000))
+						update_playlist = 1;
+				}
+				if (update_playlist) {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Last segment in current playlist downloaded, checking updates after %u ms\n", timer));
 					e = gf_dash_update_manifest(dash);
 					if (e) {
@@ -2175,9 +2929,12 @@
 				}
 				/* Now that the playlist is up to date, we can check again */
 				if (group->download_segment_index >= group->nb_segments_in_rep) {
-					if (dash->mpd->minimum_update_period) {
-						/* if there is a specified update period, we redo the whole process */
-						continue;
+					/* 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 (! group->maybe_end_of_stream) {
+							GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] End of segment list reached (%d segments but idx is %d), waiting for next MPD update\n", group->nb_segments_in_rep, group->download_segment_index));
+							continue;
+						}
 					} else {
 						/* if not, we are really at the end of the playlist, we can quit */
 						GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] End of playlist reached... downloading remaining elements..."));
@@ -2188,8 +2945,51 @@
 			}
 			gf_mx_p(dash->dl_mutex);
 
+			if (group->force_switch_bandwidth && !dash->auto_switch_count) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Forcing representation switch, retesting group"));
+				gf_dash_switch_group_representation(dash, group);
+				/*restart*/
+				i--;
+				gf_mx_v(dash->dl_mutex);
+				continue;
+			}
+
+			in_segment_avail_time = 0;
+
+			/*check availablity start time of segment in Live !!*/
+			if (!group->broken_timing && (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && !dash->is_m3u8) {
+				u32 clock_time = gf_sys_clock();
+				s32 to_wait = 0;
+				u32 seg_dur_ms=0;
+				s64 segment_ast = (s64) gf_dash_get_segment_availability_start_time(dash->mpd, group, group->download_segment_index, &seg_dur_ms);
+				s64 now = (s64) gf_dash_get_utc_clock();
+				
+				to_wait = (s32) (segment_ast - now);
+
+				/*if segment AST is greater than now, it is not yet available ...*/
+				if (to_wait > 0) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Set #%d At %d Next segment %d (AST "LLD") is not yet available on server - requesting later in %d s\n", i+1, gf_sys_clock(), group->download_segment_index + group->start_number, segment_ast, to_wait));
+					if (group->last_segment_time) {
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] %d ms ellapsed since previous segment download\n", clock_time - group->last_segment_time));
+					}
+					gf_mx_v(dash->dl_mutex);
+					if (!min_wait || ((u32) 1000*to_wait < min_wait))
+						min_wait = 1000*to_wait;
+					continue;
+				} else {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Set #%d At %d Next segment %d (AST "LLD") should now be available on server since %d sec - requesting it\n", i+1, gf_sys_clock(), group->download_segment_index + group->start_number, segment_ast, -to_wait));
+					if (group->last_segment_time) {
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] %d ms ellapsed since previous segment download\n", clock_time - group->last_segment_time));
+					}
+					/*check if we are in the segment availability end time*/
+					if (now < segment_ast + (seg_dur_ms + group->dash->mpd->time_shift_buffer_depth) /1000 )
+						in_segment_avail_time = 1;
+				}
+			}
+			min_wait = 0;
+
 			/* At this stage, there are some segments left to be downloaded */
-			e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_MEDIA, group->download_segment_index, &new_base_seg_url, &start_range, &end_range, &group->current_downloaded_segment_duration);
+			e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_MEDIA, group->download_segment_index, &new_base_seg_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
 			gf_mx_v(dash->dl_mutex);
 			if (e) {
 				/*do something!!*/
@@ -2202,11 +3002,12 @@
 			}
 
 			/*local file*/
-			if (!strstr(new_base_seg_url, "://") || !strnicmp(new_base_seg_url, "file://", 7)) {
+			if (!strstr(new_base_seg_url, "://") || (!strnicmp(new_base_seg_url, "file://", 7) || !strnicmp(new_base_seg_url, "gmem://", 7)) ) {
 				resource_name = local_file_name = (char *) new_base_seg_url; 
 				e = GF_OK;
 				/*do not erase local files*/
 				group->local_files = 1;
+				gf_dash_buffer_off(group, dash);
 				if (group->force_switch_bandwidth && !dash->auto_switch_count) {
 					gf_dash_switch_group_representation(dash, group);
 					/*restart*/
@@ -2226,10 +3027,22 @@
 					e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), new_base_seg_url, 0, 0, 1, group);
 				}
 
-				/*TODO decide what is te best, fetch from another representation or ignore ...*/
+				/*TODO decide what is the best, fetch from another representation or ignore ...*/
 				if (e != GF_OK) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s\n", new_base_seg_url, gf_error_to_string(e)));
-					group->download_segment_index++;
+					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 - stoping playback\n", new_base_seg_url, gf_error_to_string(e)));
+							group->maybe_end_of_stream = 0;
+							group->done = 1;
+						}
+						group->maybe_end_of_stream++;
+					} else if (in_segment_avail_time) {
+						GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Couldn't get segment %s during its availability period (%s) - retrying\n", new_base_seg_url, gf_error_to_string(e)));
+						min_wait = 30;
+					} else {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s\n", new_base_seg_url, gf_error_to_string(e)));
+						group->download_segment_index++;
+					}
 					continue;
 				}
 
@@ -2255,17 +3068,17 @@
 
 				total_size = dash->dash_io->get_total_size(dash->dash_io, group->segment_download);
 				bytes_per_sec = dash->dash_io->get_bytes_per_sec(dash->dash_io, group->segment_download);
+				
+				group->last_segment_time = gf_sys_clock();
 
-				if (total_size && bytes_per_sec && group->current_downloaded_segment_duration) {
+				if (/*(!group->buffering || !group->min_bandwidth_selected) && */ total_size && bytes_per_sec && group->current_downloaded_segment_duration) {
 					Double bitrate, time;
 					bitrate = 8*total_size;
-					bitrate *= 1000;
 					bitrate /= group->current_downloaded_segment_duration;
-					bitrate /= 1024;
 					time = total_size;
 					time /= bytes_per_sec;
 
-					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Downloaded segment %d bytes in %g seconds - duration %g sec - Bandwidth (kbps): indicated %d - computed %d - download %d\n", total_size, time, group->current_downloaded_segment_duration/1000.0, rep->bandwidth/1024, (u32) bitrate, 8*bytes_per_sec/1024));
+					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Downloaded segment %d bytes in %g seconds - duration %g sec - Bandwidth (kbps): indicated %d - computed %d - download %d\n", total_size, time, group->current_downloaded_segment_duration/1000.0, rep->bandwidth/1000, (u32) bitrate, 8*bytes_per_sec/1000));
 
 					if (rep->bandwidth < 8*bytes_per_sec) {
 						u32 k;
@@ -2296,6 +3109,8 @@
 				group->cached[group->nb_cached_segments].start_range = 0;
 				group->cached[group->nb_cached_segments].end_range = 0;
 				group->cached[group->nb_cached_segments].representation_index = representation_index;
+				group->cached[group->nb_cached_segments].duration = (u32) group->current_downloaded_segment_duration;
+
 				if (group->local_files && use_byterange) {
 					group->cached[group->nb_cached_segments].start_range = start_range;
 					group->cached[group->nb_cached_segments].end_range = end_range;
@@ -2304,6 +3119,7 @@
 					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Added file to cache (%u/%u in cache): %s\n", group->nb_cached_segments+1, group->max_cached_segments, group->cached[group->nb_cached_segments].url));
 				}
 				group->nb_cached_segments++;
+				gf_dash_update_buffering(group, dash);
 				group->download_segment_index++;
 				if (dash->auto_switch_count) {
 					group->nb_segments_done++;
@@ -2463,7 +3279,7 @@
 
 	group->force_segment_switch = 1;
 	group->download_segment_index = segment_idx;
-
+	
 	if (group->segment_download) 
 		dash->dash_io->abort(dash->dash_io, group->segment_download);
 
@@ -2546,7 +3362,6 @@
 	GF_Err e;
 	GF_MPD_Period *period;
 	GF_DOMParser *mpd_parser;
-	Bool is_m3u8 = 0;
 	Bool is_local = 0;
 
 	if (!dash || !manifest_url) return GF_BAD_PARAM;
@@ -2573,7 +3388,7 @@
 		local_url = manifest_url + 7;
 		is_local = 1;
 		if (strstr(manifest_url, ".m3u8")) {
-			is_m3u8 = 1;
+			dash->is_m3u8 = 1;
 		}
 	} else if (strstr(manifest_url, "://")) {
 		const char *reloc_url, *mtype;
@@ -2593,7 +3408,7 @@
 		reloc_url = dash->dash_io->get_url(dash->dash_io, dash->mpd_dnload);
 		/* Some servers, for instance http://tv.freebox.fr, serve m3u8 as text/plain */
 		if (gf_dash_is_m3u8_mime(mime) || strstr(reloc_url, ".m3u8") || strstr(reloc_url, ".M3U8")) {
-			is_m3u8 = 1;
+			dash->is_m3u8 = 1;
 		} else if (!gf_dash_is_dash_mime(mime) && !strstr(reloc_url, ".mpd") && !strstr(reloc_url, ".MPD")) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] mime '%s' for '%s' should be m3u8 or mpd\n", mime, reloc_url));
 			dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
@@ -2612,7 +3427,7 @@
 		local_url = manifest_url;
 		is_local = 1;
 		if (strstr(manifest_url, ".m3u8"))
-			is_m3u8 = 1;
+			dash->is_m3u8 = 1;
 	}
 
 	if (is_local) {
@@ -2620,8 +3435,9 @@
 		if (!f) return GF_URL_ERROR;
 		fclose(f);
 	}
+	dash->mpd_fetch_time = gf_dash_get_utc_clock();
 
-	if (is_m3u8) {
+	if (dash->is_m3u8) {
 		if (is_local) {
 			char *sep;
 			strcpy(local_path, local_url);
@@ -2688,11 +3504,8 @@
 		goto exit;
 	}
 
-	e = gf_dash_setup_period(dash);
-	if (e) goto exit;
-
 	e = gf_th_run(dash->dash_thread, dash_main_thread_proc, dash);
-	gf_sleep(0);
+
 	return e;
 exit:
 	dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
@@ -2727,7 +3540,7 @@
 }
 
 GF_EXPORT
-GF_DashClient *gf_dash_new(GF_DASHFileIO *dash_io, u32 max_cache_duration_sec, u32 auto_switch_count, Bool keep_files, Bool disable_switching, GF_DASHInitialSelectionMode first_select_mode)
+GF_DashClient *gf_dash_new(GF_DASHFileIO *dash_io, u32 max_cache_duration_sec, u32 auto_switch_count, Bool keep_files, Bool disable_switching, GF_DASHInitialSelectionMode first_select_mode, Bool enable_buffering)
 {
 	GF_DashClient *dash;
 	GF_SAFEALLOC(dash, GF_DashClient);
@@ -2735,9 +3548,10 @@
 
 	dash->dash_thread = gf_th_new("MPD Segment Downloader Thread");
 	dash->dl_mutex = gf_mx_new("MPD Segment Downloader Mutex");
-	dash->mimeTypeForM3U8Segments = gf_strdup( M3U8_UNKOWN_MIME_TYPE );
+	dash->mimeTypeForM3U8Segments = gf_strdup( "video/mp2t" );
 
 	dash->max_cache_duration = max_cache_duration_sec;
+	dash->enable_buffering = enable_buffering;
 
 	dash->auto_switch_count = auto_switch_count;
 	dash->keep_files = keep_files;
@@ -2804,46 +3618,70 @@
 }
 
 GF_EXPORT
-void gf_dash_switch_quality(GF_DashClient *dash, Bool switch_up)
+void gf_dash_switch_quality(GF_DashClient *dash, Bool switch_up, Bool immediate_switch)
 {
 	u32 i;
 	for (i=0; i<gf_list_count(dash->groups); i++) {
-		Bool do_switch = 0;
+		u32 switch_to_rep_idx = 0;
+		u32 bandwidth, quality, k;
+		GF_MPD_Representation *rep, *active_rep;
 		GF_DASH_Group *group = gf_list_get(dash->groups, i);
 		u32 current_idx = group->active_rep_index;
 		if (group->selection != GF_DASH_GROUP_SELECTED) continue;
 
 		if (group->force_representation_idx_plus_one) current_idx = group->force_representation_idx_plus_one - 1;
-		if (switch_up) {
-			if (current_idx + 1 < gf_list_count(group->adaptation_set->representations)) {
-				group->force_representation_idx_plus_one = 1 + current_idx+1;
-				do_switch = 1;
-			}
-		} else {
-			if (current_idx) {
-				group->force_representation_idx_plus_one = 1 + current_idx - 1;
-				do_switch = 1;
+
+		active_rep = gf_list_get(group->adaptation_set->representations, current_idx);
+		if (!active_rep) continue;
+		bandwidth = switch_up ? (u32) -1 : 0;
+		quality = switch_up ? (u32) -1 : 0;
+
+		for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
+			rep = gf_list_get(group->adaptation_set->representations, k);
+			if (switch_up) {
+				if ((rep->quality_ranking>active_rep->quality_ranking) || (rep->bandwidth>active_rep->bandwidth)) {
+					if ((rep->quality_ranking < quality) || (rep->bandwidth < bandwidth)) {
+						bandwidth = rep->bandwidth;
+						quality = rep->quality_ranking;
+						switch_to_rep_idx = k+1;
+					}
+				}
+			} else {
+				if ((rep->quality_ranking < active_rep->quality_ranking) || (rep->bandwidth < active_rep->bandwidth)) {
+					if ((rep->quality_ranking > quality) || (rep->bandwidth > bandwidth)) {
+						bandwidth = rep->bandwidth;
+						quality = rep->quality_ranking;
+						switch_to_rep_idx = k+1;
+					}
+				}
 			}
 		}
-		if (do_switch) {
+		if (switch_to_rep_idx && (switch_to_rep_idx-1 != current_idx) ) {
 			gf_mx_p(dash->dl_mutex);
 			group->force_switch_bandwidth = 1;
-			/*in local playback just switch at the end of the current segment
-			for remote, we should let the user decide*/
-			while (group->nb_cached_segments>1) {
-				group->nb_cached_segments--;
-				gf_free(group->cached[group->nb_cached_segments].url);
-				group->cached[group->nb_cached_segments].url = NULL;
-				if (!group->local_files && group->cached[group->nb_cached_segments].cache) {
-					gf_delete_file( group->cached[group->nb_cached_segments].cache );
-					gf_free(group->cached[group->nb_cached_segments].cache);
-					group->cached[group->nb_cached_segments].cache = NULL;
+			group->force_representation_idx_plus_one = switch_to_rep_idx;
+
+			if (group->local_files || immediate_switch) {
+				/*in local playback just switch at the end of the current segment
+				for remote, we should let the user decide*/
+				while (group->nb_cached_segments>1) {
+					group->nb_cached_segments--;
+					gf_dash_update_buffering(group, dash);
+
+					gf_free(group->cached[group->nb_cached_segments].url);
+					group->cached[group->nb_cached_segments].url = NULL;
+					if (!group->local_files && group->cached[group->nb_cached_segments].cache) {
+						gf_delete_file( group->cached[group->nb_cached_segments].cache );
+						gf_free(group->cached[group->nb_cached_segments].cache);
+						group->cached[group->nb_cached_segments].cache = NULL;
+					}
+					group->cached[group->nb_cached_segments].representation_index = 0;
+					group->cached[group->nb_cached_segments].start_range = 0;
+					group->cached[group->nb_cached_segments].end_range = 0;
+					group->cached[group->nb_cached_segments].duration = (u32) group->current_downloaded_segment_duration;
+					if (group->download_segment_index>1)
+						group->download_segment_index--;
 				}
-				group->cached[group->nb_cached_segments].representation_index = 0;
-				group->cached[group->nb_cached_segments].start_range = 0;
-				group->cached[group->nb_cached_segments].end_range = 0;
-				assert(group->download_segment_index>1);
-				group->download_segment_index--;
 			}
 			gf_mx_v(dash->dl_mutex);
 		}
@@ -2969,6 +3807,7 @@
 	return group->max_cached_segments;
 }
 
+
 GF_EXPORT
 u32 gf_dash_group_get_num_segments_ready(GF_DashClient *dash, u32 idx, Bool *group_is_done)
 {
@@ -2984,6 +3823,10 @@
 	} else {
 		*group_is_done = group->done;
 		res = group->nb_cached_segments;
+
+		if (group->buffering) {
+			res = 0;
+		}
 	}
 	gf_mx_v(dash->dl_mutex);
 	return res;
@@ -3023,6 +3866,7 @@
 		group->cached[0].url = NULL;
 		group->cached[0].cache = NULL;
 		group->cached[0].representation_index = 0;
+		group->cached[0].duration = 0;
 	}
 	memmove(&group->cached[0], &group->cached[1], sizeof(segment_cache_entry)*(group->nb_cached_segments-1));
 	memset(&(group->cached[group->nb_cached_segments-1]), 0, sizeof(segment_cache_entry));
@@ -3055,7 +3899,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_dash_group_get_next_segment_location(GF_DashClient *dash, u32 idx, const char **url, u64 *start_range, u64 *end_range, const char **switching_url, u64 *switching_start_range, u64 *switching_end_range, const char **original_url)
+GF_Err gf_dash_group_get_next_segment_location(GF_DashClient *dash, u32 idx, const char **url, u64 *start_range, u64 *end_range, s32 *switching_index, const char **switching_url, u64 *switching_start_range, u64 *switching_end_range, const char **original_url)
 {
 	GF_DASH_Group *group;
 
@@ -3066,6 +3910,7 @@
 	if (switching_start_range) *switching_start_range = 0;
 	if (switching_end_range) *switching_end_range = 0;
 	if (original_url) *original_url = NULL;
+	if (switching_index) *switching_index = -1;
 
 	gf_mx_p(dash->dl_mutex);	
 	group = gf_list_get(dash->groups, idx);
@@ -3082,6 +3927,8 @@
 
 	if (group->cached[0].representation_index != group->prev_active_rep_index) {
 		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->cached[0].representation_index);
+		if (switching_index)
+			*switching_index = group->cached[0].representation_index;
 		if (switching_start_range)
 			*switching_start_range = rep->playback.init_start_range;
 		if (switching_end_range)
@@ -3126,8 +3973,38 @@
 Double gf_dash_group_current_segment_start_time(GF_DashClient *dash, u32 idx)
 {
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	return gf_dash_get_segment_start_time(group);
+	return gf_dash_get_segment_start_time(group, NULL);
+}
+
+GF_EXPORT
+GF_Err gf_dash_group_get_video_info(GF_DashClient *dash, u32 idx, u32 *max_width, u32 *max_height)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group || !max_width || !max_height) return GF_BAD_PARAM;
+
+	*max_width = group->adaptation_set->max_width;
+	*max_height = group->adaptation_set->max_height;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dash_group_get_representation_info(GF_DashClient *dash, u32 idx, u32 representation_idx, u32 *width, u32 *height, u32 *audio_samplerate, u32 *bandwidth, const char **codecs)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	GF_MPD_Representation *rep;
+	if (!group) return GF_BAD_PARAM;
+	rep = gf_list_get(group->adaptation_set->representations, representation_idx);
+	if (!rep) return GF_BAD_PARAM;
+
+	if (width) *width = rep->width ? rep->width : group->adaptation_set->width;
+	if (height) *width = rep->height ? rep->height : group->adaptation_set->height;
+	if (codecs) *codecs = rep->codecs ? rep->codecs : group->adaptation_set->codecs;
+	if (bandwidth) *bandwidth = rep->bandwidth;
+	if (audio_samplerate) *audio_samplerate = rep->samplerate ? rep->samplerate : group->adaptation_set->samplerate;
+
+	return GF_OK;
 }
 
+
 #endif //GPAC_DISABLE_DASH_CLIENT

gpac-0.5.0.svn4192.tar.bz2/src/media_tools/dash_segmenter.c -> gpac-0.5.0.svn4296.tar.bz2/src/media_tools/dash_segmenter.c Changed

@@ -25,7 +25,224 @@
 
 #include <gpac/internal/media_dev.h>
 #include <gpac/constants.h>
+#include <gpac/mpegts.h>
 #include <gpac/config_file.h>
+#include <gpac/network.h>
+#ifndef _WIN32_WCE
+#include <time.h>
+#endif
+#include <gpac/internal/isomedia_dev.h>
+
+#ifdef GPAC_DISABLE_ISOM
+/*we should need a better way to work with sidx when no isom is defined*/
+#define GPAC_DISABLE_MPEG2TS
+#endif
+
+
+typedef struct _dash_segment_input GF_DashSegInput;
+
+struct _dash_component
+{
+	u32 ID;/*audio/video/text/ ...*/
+	u32 media_type;/*audio/video/text/ ...*/
+	char szCodec[50];
+	/*for video */
+	u32 width, height, fps_num, fps_denum, sar_num, sar_denum, max_sap;
+
+	/*for audio*/
+	u32 sample_rate, channels;
+	/*for anything*/
+	char szLang[5];
+};	
+
+typedef struct
+{
+	Double segment_duration;
+	Bool segments_start_with_rap;
+	FILE *mpd;
+	const char *mpd_name, *seg_rad_name, *seg_ext;
+	s32 subsegs_per_sidx;
+	Bool daisy_chain_sidx;
+	Bool use_url_template;
+	Bool use_segment_timeline;
+	u32 single_file_mode;
+	s32 time_shift_depth;
+	Double subduration;
+	const char *bs_switch_segment_file;
+	Bool inband_param_set;
+
+	/*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;
+
+	Bool fragments_start_with_rap;
+	Double fragment_duration;
+
+	GF_Config *dash_ctx;
+
+	const char *tmpdir;
+} GF_DASHSegmenterOptions;
+
+struct _dash_segment_input
+{
+	char *file_name;
+	char representationID[100];
+	char periodID[100];
+	char role[100];
+	u32 bandwidth;
+
+	/*if 0, input is disabled*/
+	u32 adaptation_set;
+	/*if 0, input is disabled*/
+	u32 period;
+	u32 group_id;
+	/*only set for the first representation in the AdaptationSet*/
+	u32 nb_rep_in_adaptation_set;
+	Double period_duration;
+
+	/*media-format specific functions*/
+	/*assigns the different media to the same adaptation set or group than the input_idx one*/
+	GF_Err (* dasher_input_classify) (GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 input_idx, u32 *current_group_id, u32 *max_sap_type);
+	GF_Err ( *dasher_get_components_info) (GF_DashSegInput *dash_input, GF_DASHSegmenterOptions *opts);
+	GF_Err ( *dasher_create_init_segment) (GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 adaptation_set, char *szInitName, const char *tmpdir, Bool use_inband_param_set, Bool *disable_bs_switching);
+	GF_Err ( *dasher_segment_file) (GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenterOptions *opts, Bool first_in_set);
+
+	/*shall be set after call to dasher_input_classify*/
+	char szMime[50];
+
+	/*all these shall be set after call to dasher_get_components_info*/
+	Double duration;
+	struct _dash_component components[20];
+	u32 nb_components;
+};
+
+
+
+#define EXTRACT_FORMAT(_nb_chars)	\
+			strcpy(szFmt, "%d");	\
+			char_template+=_nb_chars;	\
+			if (seg_rad_name[char_template]=='%') {	\
+				char *sep = strchr(seg_rad_name+char_template, '$');	\
+				if (sep) {	\
+					sep[0] = 0;	\
+					strcpy(szFmt, seg_rad_name+char_template);	\
+					char_template += strlen(seg_rad_name+char_template);	\
+					sep[0] = '$';	\
+				}	\
+			}	\
+			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 *seg_rad_name, const char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number, Bool use_segment_timeline)
+{
+	char szFmt[20];
+	Bool has_number=0;
+	Bool is_index = (seg_type==GF_DASH_TEMPLATE_REPINDEX) ? 1 : 0;
+	Bool is_init = (seg_type==GF_DASH_TEMPLATE_INITIALIZATION) ? 1 : 0;
+	Bool is_template = (seg_type==GF_DASH_TEMPLATE_TEMPLATE) ? 1 : 0;
+	Bool is_init_template = (seg_type==GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE) ? 1 : 0;
+	Bool needs_init=((is_init || is_init_template) && !is_bs_switching) ? 1 : 0;
+	u32 char_template = 0;
+	char tmp[100];
+	strcpy(segment_name, "");
+
+	if (seg_rad_name && (strstr(seg_rad_name, "$RepresentationID$") || strstr(seg_rad_name, "$ID$") || strstr(seg_rad_name, "$Bandwidth$"))) 
+		needs_init = 0;
+	
+	if (!seg_rad_name) {
+		char *sep;
+		strcpy(segment_name, output_file_name);
+		sep = strrchr(segment_name, '.');
+		if (sep) sep[0] = 0;
+	} else {
+
+		while (1) {
+			char c = seg_rad_name[char_template];
+			if (!c) break;
+			
+			if (!is_template && !is_init_template && !strnicmp(& seg_rad_name[char_template], "$RepresentationID$", 18)) {
+				char_template+=18;
+				strcat(segment_name, rep_id);
+				needs_init=0;
+			}
+			else if (!is_template && !is_init_template && !strnicmp(& seg_rad_name[char_template], "$Bandwidth", 10)) {
+				EXTRACT_FORMAT(10);
+
+				sprintf(tmp, szFmt, bandwidth);
+				strcat(segment_name, tmp);
+				needs_init=0;
+			}
+			else if (!is_template && !strnicmp(& seg_rad_name[char_template], "$Time", 5)) {
+				EXTRACT_FORMAT(5);
+				if (is_init || is_init_template) continue;
+				/*replace %d to LLD*/
+				szFmt[strlen(szFmt)-1]=0;
+				strcat(szFmt, &LLD[1]);
+				sprintf(tmp, szFmt, start_time);
+				strcat(segment_name, tmp);
+				has_number=1;
+			}
+			else if (!is_template && !strnicmp(& seg_rad_name[char_template], "$Number", 7)) {
+				EXTRACT_FORMAT(7);
+
+				if (is_init || is_init_template) continue;
+				sprintf(tmp, szFmt, segment_number);
+				strcat(segment_name, tmp);
+				has_number=1;
+			}
+			else if (!strnicmp(& seg_rad_name[char_template], "$Init=", 6)) {
+				char *sep = strchr(seg_rad_name + char_template+6, '$');
+				if (sep) sep[0] = 0;
+				if (is_init || is_init_template) {
+					strcat(segment_name, seg_rad_name + char_template+6);
+					needs_init=0;
+				}
+				char_template += strlen(seg_rad_name + char_template)+1;
+				if (sep) sep[0] = '$';
+			}
+			else if (!strnicmp(& seg_rad_name[char_template], "$Index=", 7)) {
+				char *sep = strchr(seg_rad_name + char_template+7, '$');
+				if (sep) sep[0] = 0;
+				if (is_index) {
+					strcat(segment_name, seg_rad_name + char_template+6);
+					needs_init=0;
+				}
+				char_template += strlen(seg_rad_name + char_template)+1;
+				if (sep) sep[0] = '$';
+			}
+			
+			else {
+				char_template+=1;
+				sprintf(tmp, "%c", c);
+				strcat(segment_name, tmp);
+			}
+		}
+	}
+
+	if (is_template && ! use_segment_timeline && !strstr(seg_rad_name, "$Number"))
+		strcat(segment_name, "$Number$");
+
+	if (needs_init)
+		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 (seg_ext) {
+		strcat(segment_name, ".");
+		strcat(segment_name, seg_ext);
+	}
+	return GF_OK;
+}
+
+GF_Err gf_dasher_store_segment_info(GF_DASHSegmenterOptions *dash_cfg, const char *SegmentName, Double segStartTime)
+{
+	char szKey[512];
+	if (!dash_cfg->dash_ctx) return GF_OK;
+
+	sprintf(szKey, "%g", segStartTime);
+	return gf_cfg_set_key(dash_cfg->dash_ctx, "SegmentsStartTimes", SegmentName, szKey);
+}
 
 
 #ifndef GPAC_DISABLE_ISOM
@@ -72,10 +289,17 @@
 
 	case GF_ISOM_SUBTYPE_AVC_H264:
 	case GF_ISOM_SUBTYPE_AVC2_H264:
+	case GF_ISOM_SUBTYPE_AVC3_H264:
+	case GF_ISOM_SUBTYPE_AVC4_H264:
 	case GF_ISOM_SUBTYPE_SVC_H264:
 		avcc = gf_isom_avc_config_get(movie, track, 1);
 		sps = gf_list_get(avcc->sequenceParameterSets, 0);
-		sprintf(szCodec, "%s.%02x%02x%02x", gf_4cc_to_str(subtype), (u8) sps->data[1], (u8) sps->data[2], (u8) sps->data[3]);
+		if (sps)
+			sprintf(szCodec, "%s.%02x%02x%02x", gf_4cc_to_str(subtype), (u8) sps->data[1], (u8) sps->data[2], (u8) sps->data[3]);
+		else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISOM Tools] AVC/SVC SPS not known - setting codecs string to default value \"%s\"\n", gf_4cc_to_str(subtype) ));
+			sprintf(szCodec, "%s", gf_4cc_to_str(subtype));
+		}
 		gf_odf_avc_cfg_del(avcc);
 		return GF_OK;
 	default:
@@ -86,6 +310,10 @@
 	return GF_OK;
 }
 
+#endif //GPAC_DISABLE_ISOM
+
+
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 
 typedef struct
 {
@@ -93,16 +321,16 @@
 	Bool done;
 	u32 TrackID;
 	u32 SampleNum, SampleCount;
-	u32 FragmentLength;
+	u64 FragmentLength;
 	u32 OriginalTrack;
 	u32 finalSampleDescriptionIndex;
 	u32 TimeScale, MediaType, DefaultDuration, InitialTSOffset;
 	u64 last_sample_cts, next_sample_dts;
 	Bool all_sample_raps, splitable;
 	u32 split_sample_dts_shift;
-} TrackFragmenter;
+} GF_ISOMTrackFragmenter;
 
-static u64 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)
 {
 	GF_ISOSample *samp;
 	u64 time;
@@ -126,130 +354,7 @@
 	return time;
 }
 
-
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-
-#define EXTRACT_FORMAT(_nb_chars)	\
-			strcpy(szFmt, "%d");	\
-			char_template+=_nb_chars;	\
-			if (seg_rad_name[char_template]=='%') {	\
-				char *sep = strchr(seg_rad_name+char_template, '$');	\
-				if (sep) {	\
-					sep[0] = 0;	\
-					strcpy(szFmt, seg_rad_name+char_template);	\
-					char_template += strlen(seg_rad_name+char_template);	\
-					sep[0] = '$';	\
-				}	\
-			}	\
-			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 *seg_rad_name, char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number)
-{
-	char szFmt[20];
-	Bool has_number=0;
-	Bool is_index = (seg_type==GF_DASH_TEMPLATE_REPINDEX) ? 1 : 0;
-	Bool is_init = (seg_type==GF_DASH_TEMPLATE_INITIALIZATION) ? 1 : 0;
-	Bool is_template = (seg_type==GF_DASH_TEMPLATE_TEMPLATE) ? 1 : 0;
-	Bool is_init_template = (seg_type==GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE) ? 1 : 0;
-	Bool needs_init=((is_init || is_init_template) && !is_bs_switching) ? 1 : 0;
-	u32 char_template = 0;
-	char tmp[100];
-	strcpy(segment_name, "");
-
-	if (seg_rad_name && (strstr(seg_rad_name, "$RepresentationID$") || strstr(seg_rad_name, "$Bandwidth$"))) 
-		needs_init = 0;
-	
-	if (!seg_rad_name) {
-		sprintf(segment_name, "%s.%s", output_file_name, seg_ext);
-		return GF_OK;
-	}
-
-	while (1) {
-		char c = seg_rad_name[char_template];
-		if (!c) break;
-
-		
-		if (!is_template && !is_init_template && !strnicmp(& seg_rad_name[char_template], "$RepresentationID$", 18)) {
-			char_template+=18;
-			strcat(segment_name, rep_id);
-			needs_init=0;
-		}
-		else if (!is_template && !is_init_template && !strnicmp(& seg_rad_name[char_template], "$Bandwidth", 10)) {
-			EXTRACT_FORMAT(10);
-
-			sprintf(tmp, szFmt, bandwidth);
-			strcat(segment_name, tmp);
-			needs_init=0;
-		}
-		else if (!is_template && !strnicmp(& seg_rad_name[char_template], "$Time", 5)) {
-			EXTRACT_FORMAT(5);
-			if (is_init || is_init_template) continue;
-			/*replace %d to LLD*/
-			szFmt[strlen(szFmt)-1]=0;
-			strcat(szFmt, &LLD[1]);
-			sprintf(tmp, szFmt, start_time);
-			strcat(segment_name, tmp);
-		}
-		else if (!is_template && !strnicmp(& seg_rad_name[char_template], "$Number", 7)) {
-			EXTRACT_FORMAT(7);
-
-			if (is_init || is_init_template) continue;
-			sprintf(tmp, szFmt, segment_number);
-			strcat(segment_name, tmp);
-			has_number=1;
-		}
-		else if (!strnicmp(& seg_rad_name[char_template], "$Init=", 6)) {
-			char *sep = strchr(seg_rad_name + char_template+6, '$');
-			if (sep) sep[0] = 0;
-			if (is_init) {
-				strcat(segment_name, seg_rad_name + char_template+6);
-				needs_init=0;
-			}
-			char_template += strlen(seg_rad_name + char_template)+1;
-			if (sep) sep[0] = '$';
-		}
-		else if (!strnicmp(& seg_rad_name[char_template], "$Index=", 7)) {
-			char *sep = strchr(seg_rad_name + char_template+7, '$');
-			if (sep) sep[0] = 0;
-			if (is_index) {
-				strcat(segment_name, seg_rad_name + char_template+6);
-				needs_init=0;
-			}
-			char_template += strlen(seg_rad_name + char_template)+1;
-			if (sep) sep[0] = '$';
-		}
-		
-		else {
-			char_template+=1;
-			sprintf(tmp, "%c", c);
-			strcat(segment_name, tmp);
-		}
-	}
-
-	if (is_template && !strstr(seg_rad_name, "$Number"))
-		strcat(segment_name, "$Number$");
-
-	if (needs_init)
-		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 (seg_ext) {
-		strcat(segment_name, ".");
-		strcat(segment_name, seg_ext);
-	}
-	return GF_OK;
-}
-
-
-GF_EXPORT
-GF_Err gf_media_segment_file(GF_ISOFile *input, const char *output_file, Double max_duration_sec, 
-							  const char *mpd_name, u32 dash_mode, Double dash_duration_sec, char *seg_rad_name, char *seg_ext, 
-							  s32 subsegs_per_sidx, Bool daisy_chain_sidx, Bool use_url_template, u32 single_file_mode, 
-							  const char *dash_ctx_file, GF_ISOFile *bs_switch_segment, char *rep_id, Bool first_in_set, Bool variable_seg_rad_name, Bool fragments_start_with_rap)
+static GF_Err gf_media_isom_segment_file(GF_ISOFile *input, const char *output_file, Double max_duration_sec, GF_DASHSegmenterOptions *dash_cfg, GF_DashSegInput *dash_input, Bool first_in_set)
 {
 	u8 NbBits;
 	u32 i, TrackNum, descIndex, j, count, nb_sync, ref_track_id, nb_tracks_done;
@@ -261,34 +366,41 @@
 	char sOpt[100], sKey[100];
 	char szCodecs[200], szCodec[100];
 	u32 cur_seg, fragment_index, max_sap_type;
-	GF_ISOFile *output;
+	GF_ISOFile *output, *bs_switch_segment;
 	GF_ISOSample *sample, *next;
 	GF_List *fragmenters;
-	u32 MaxFragmentDuration, MaxSegmentDuration, SegmentDuration, maxFragDurationOverSegment;
+	u64 MaxFragmentDuration, MaxSegmentDuration, SegmentDuration, maxFragDurationOverSegment;
+	u32 presentationTimeOffset = 0;
 	Double segment_start_time, file_duration, period_duration, max_segment_duration;
-	u32 nb_segments, width, height, sample_rate, nb_channels, sar_w, sar_h, fps_num, fps_denum;
+	u32 nb_segments, width, height, sample_rate, nb_channels, sar_w, sar_h, fps_num, fps_denum, startNumber, startNumberRewind;
 	char langCode[5];
 	u32 index_start_range, index_end_range;
 	Bool force_switch_segment = 0;
 	Bool switch_segment = 0;
-	Bool split_seg_at_rap = (dash_mode==2) ? 1 : 0;
+	Bool split_seg_at_rap = dash_cfg ? dash_cfg->segments_start_with_rap : 0;
 	Bool split_at_rap = 0;
 	Bool has_rap = 0;
 	Bool next_sample_rap = 0;
 	Bool flush_all_samples = 0;
 	Bool simulation_pass = 0;
 	Bool init_segment_deleted = 0;
+	Bool first_segment_in_timeline = 1;
+	u64 previous_segment_duration = 0;
+	u32 segment_timeline_repeat_count = 0;
 	u64 last_ref_cts = 0;
 	u64 start_range, end_range, file_size, init_seg_size, ref_track_first_dts, ref_track_next_cts;
 	u32 tfref_timescale = 0;
 	u32 bandwidth = 0;
-	TrackFragmenter *tf, *tfref;
-	FILE *mpd = NULL;
-	FILE *mpd_segs = NULL;
+	GF_ISOMTrackFragmenter *tf, *tfref;
+	GF_BitStream *mpd_bs = NULL;
+	GF_BitStream *mpd_timeline_bs = NULL;
+	char szMPDTempLine[2048];
 	char SegmentName[GF_MAX_PATH];
+	char RepSecName[200];
+	char RepURLsSecName[200];
 	const char *opt;
 	Double max_track_duration = 0;
-	GF_Config *dash_ctx = NULL;
+	Bool bs_switching_is_output = 0;
 	Bool store_dash_params = 0;
 	Bool dash_moov_setup = 0;
 	Bool segments_start_with_sap = 1;
@@ -297,7 +409,10 @@
 	u32 nb_segments_info = 0;
 	u32 timeline_timescale=1000;
 	Bool audio_only = 1;
-	Bool is_bs_switching = (bs_switch_segment!=NULL) ? 1 : 0;
+	Bool is_bs_switching = 0;
+	Bool use_url_template = dash_cfg ? dash_cfg->use_url_template : 0;
+	const char *seg_rad_name = dash_cfg ? dash_cfg->seg_rad_name : NULL;
+	const char *seg_ext = dash_cfg ? dash_cfg->seg_ext : NULL;
 	const char *bs_switching_segment_name = NULL;
 
 	SegmentName[0] = 0;
@@ -306,43 +421,64 @@
 	fragmenters = NULL;
 	if (!seg_ext) seg_ext = "m4s";
 
-	if (bs_switch_segment) {
-		bs_switching_segment_name = gf_url_get_resource_name(gf_isom_get_filename(bs_switch_segment));
+	bs_switch_segment = NULL;
+	if (dash_cfg && dash_cfg->bs_switch_segment_file) {
+		bs_switch_segment = gf_isom_open(dash_cfg->bs_switch_segment_file, GF_ISOM_OPEN_READ, NULL);
+		if (bs_switch_segment) {
+			bs_switching_segment_name = gf_url_get_resource_name(dash_cfg->bs_switch_segment_file);
+			is_bs_switching = 1;
+		}
 	}
+	
+	sprintf(RepSecName, "Representation_%s", dash_input ? dash_input->representationID : "");
+	sprintf(RepURLsSecName, "URLs_%s", dash_input ? dash_input->representationID : "");
 
-	/*need to precompute bandwidth*/
-	bandwidth = 0;
+	bandwidth = dash_input ? dash_input->bandwidth : 0;
 	file_duration = 0;
-	if (seg_rad_name && strstr(seg_rad_name, "$Bandwidth$")) {
-		for (i=0; i<gf_isom_get_track_count(input); i++) {
-			Double tk_dur = (Double) gf_isom_get_media_duration(input, i+1);
-			tk_dur /= gf_isom_get_media_timescale(input, i+1);
-			if (file_duration < tk_dur ) {
-				file_duration = tk_dur;
+
+	startNumber = 1;
+	startNumberRewind = 0;
+
+	//create output file
+	if (dash_cfg) {
+
+		/*need to precompute bandwidth*/
+		if (!bandwidth && seg_rad_name && strstr(seg_rad_name, "$Bandwidth$")) {
+			for (i=0; i<gf_isom_get_track_count(input); i++) {
+				Double tk_dur = (Double) gf_isom_get_media_duration(input, i+1);
+				tk_dur /= gf_isom_get_media_timescale(input, i+1);
+				if (file_duration < tk_dur ) {
+					file_duration = tk_dur;
+				}
 			}
+			bandwidth = (u32) (gf_isom_get_file_size(input) / file_duration * 8);
 		}
-		bandwidth = (u32) (gf_isom_get_file_size(input) / file_duration * 8);
-	}
 
-	//create output file
-	if (dash_mode) {
-		if (dash_ctx_file) {
-			dash_ctx = gf_cfg_new(NULL, dash_ctx_file);
-			if (!dash_ctx) {
-				FILE *t = fopen(dash_ctx_file, "wt");
-				if (t) fclose(t);
-				dash_ctx = gf_cfg_new(NULL, dash_ctx_file);
-				
-				if (dash_ctx) store_dash_params=1;
+		if (dash_cfg->dash_ctx) {
+			opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "Setup");
+			if (!opt || stricmp(opt, "yes") ) {
+				store_dash_params=1;
+				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "ID", dash_input->representationID);
+			}
+			/*we are in time shift enabled mode so segments will get destroyed, set the start number to the current segment 
+			and restore presentationTimeOffset (cf below)*/
+			if (!store_dash_params && (dash_cfg->time_shift_depth >= 0)) {
+				opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "NextSegmentIndex");
+				sscanf(opt, "%u", &startNumber);
+
+				/*adjust the startNumber according to the timeShiftBuffer depth*/
+				if ((dash_cfg->time_shift_depth>0) && (startNumber>(u32)dash_cfg->time_shift_depth) ) {
+					startNumberRewind = dash_cfg->time_shift_depth;
+				}
 			}
 		}
 
-		opt = dash_ctx ? gf_cfg_get_key(dash_ctx, "DASH", "InitializationSegment") : NULL;
+		opt = dash_cfg->dash_ctx ? gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "InitializationSegment") : NULL;
 		if (opt) {
 			output = gf_isom_open(opt, GF_ISOM_OPEN_CAT_FRAGMENTS, NULL);
 			dash_moov_setup = 1;
 		} else {
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, rep_id, seg_rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, bandwidth, 0);
+			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, dash_input->representationID, 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, NULL);
 		}
 		if (!output) {
@@ -352,26 +488,46 @@
 		}
 
 		if (store_dash_params) {
-			const char *name = SegmentName;
-			if (bs_switch_segment) name = bs_switching_segment_name;
-			gf_cfg_set_key(dash_ctx, "DASH", "InitializationSegment", name);
-
-			if (is_bs_switching)
-				gf_cfg_set_key(dash_ctx, "DASH", "BitstreamSwitching", "yes");
-		} else if (dash_ctx) {
-			opt = gf_cfg_get_key(dash_ctx, "DASH", "BitstreamSwitching");
+			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) );
+
+			gf_cfg_set_key(dash_cfg->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);
+
+			/*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");
 			if (opt && !strcmp(opt, "yes")) {
 				is_bs_switching = 1;
+				if (bs_switch_segment) 
+					gf_isom_delete(bs_switch_segment);
 				bs_switch_segment = output;
+				bs_switching_is_output = 1;
+				bs_switching_segment_name = gf_url_get_resource_name(gf_isom_get_filename(bs_switch_segment));
 			}
+
+			opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "Bandwidth");
+			if (opt) sscanf(opt, "%u", &bandwidth);
 		}
-		mpd = gf_f64_open(mpd_name, "a+t");
-		mpd_segs = gf_temp_file_new();
+		mpd_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		if (first_in_set && dash_cfg->use_segment_timeline) {
+			mpd_timeline_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			sprintf(szMPDTempLine, "    <SegmentTimeline>\n");
+			gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, strlen(szMPDTempLine));
+		}
+		
 	} else {
 		output = gf_isom_open(output_file, GF_ISOM_OPEN_WRITE, NULL);
 		if (!output) return gf_isom_last_error(NULL);
 	}
-	
+
 	nb_sync = 0;
 	nb_samp = 0;
 	fragmenters = gf_list_new();
@@ -379,21 +535,32 @@
 	if (! dash_moov_setup) {
 		e = gf_isom_clone_movie(input, output, 0, 0);
 		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);
+		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_MP41, 0);
+		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_MP42, 0);
 	}
 
 	MaxFragmentDuration = (u32) (max_duration_sec * 1000);	
-	MaxSegmentDuration = (u32) (dash_duration_sec * 1000);
+	MaxSegmentDuration = (u32) (1000 * (dash_cfg ? dash_cfg->segment_duration : max_duration_sec));
 
-	/*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 (single_file_mode==1) {
-		simulation_pass = 1;
-		seg_rad_name = NULL;
-	}
-	/*if single file is requested, store all segments in the same file*/
-	else if (single_file_mode==2) {
-		seg_rad_name = NULL;
+	if (dash_cfg) {
+		/*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) {
+			simulation_pass = 1;
+			seg_rad_name = NULL;
+		}
+		/*if single file is requested, store all segments in the same file*/
+		else if (dash_cfg->single_file_mode==2) {
+			seg_rad_name = NULL;
+		}
 	}
 	index_start_range = index_end_range = 0;	
 
@@ -407,7 +574,7 @@
 	nb_video = 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;
+		u32 _w, _h, _sr, _nb_ch, avctype;
 
 		u32 mtype = gf_isom_get_media_type(input, i+1);
 		if (mtype == GF_ISOM_MEDIA_HINT) continue;
@@ -433,6 +600,18 @@
 			count = gf_isom_get_sample_count(input, i+1);
 		}
 
+		/*set extraction mode whether setup or not*/
+		avctype = gf_isom_get_avc_svc_type(input, i+1, 1);
+		if (avctype==GF_ISOM_AVCTYPE_AVC_ONLY) {
+			/*for AVC we concatenate SPS/PPS*/
+			if (dash_cfg->inband_param_set) 
+				gf_isom_set_nalu_extract_mode(input, i+1, GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
+		}
+		else if (avctype > 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 (mtype == GF_ISOM_MEDIA_VISUAL) nb_video++;
 		else if (mtype == GF_ISOM_MEDIA_AUDIO) nb_audio++;
 		else if (mtype == GF_ISOM_MEDIA_TEXT) nb_text++;
@@ -457,11 +636,11 @@
 									 &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
 		}
 
-		gf_media_get_rfc_6381_codec_name(output, TrackNum, szCodec);
+		gf_media_get_rfc_6381_codec_name(input, i+1, szCodec);
 		if (strlen(szCodecs)) strcat(szCodecs, ",");
 		strcat(szCodecs, szCodec);
 
-		GF_SAFEALLOC(tf, TrackFragmenter);
+		GF_SAFEALLOC(tf, GF_ISOMTrackFragmenter);
 		tf->TrackID = gf_isom_get_track_id(output, TrackNum);
 		tf->SampleCount = gf_isom_get_sample_count(input, i+1);
 		tf->OriginalTrack = i+1;
@@ -485,11 +664,11 @@
 		/*figure out if we have an initial TS*/
 		if (!dash_moov_setup) {
 			if (gf_isom_get_edit_segment_count(input, i+1)) {
-				u64 EditTime, SegmentDuration, MediaTime;
+				u64 EditTime, SegDuration, MediaTime;
 				u8 EditMode;
-				gf_isom_get_edit_segment(input, i+1, 1, &EditTime, &SegmentDuration, &MediaTime, &EditMode);
+				gf_isom_get_edit_segment(input, i+1, 1, &EditTime, &SegDuration, &MediaTime, &EditMode);
 				if (EditMode==GF_ISOM_EDIT_EMPTY) {
-					tf->InitialTSOffset = (u32) (SegmentDuration * tf->TimeScale / gf_isom_get_timescale(input));
+					tf->InitialTSOffset = (u32) (SegDuration * tf->TimeScale / gf_isom_get_timescale(input));
 				}
 				/*and remove edit segments*/
 				gf_isom_remove_edit_segments(output, TrackNum);
@@ -510,10 +689,7 @@
 
 				//the initialization segment is not yet setup for fragmentation
 				if (! gf_isom_is_track_fragmented(bs_switch_segment, tf->TrackID)) {
-					e = gf_isom_setup_track_fragment(bs_switch_segment, tf->TrackID,
-								defaultDescriptionIndex, defaultDuration,
-								defaultSize, (u8) defaultRandomAccess,
-								defaultPadding, defaultDegradationPriority);
+					e = GF_BAD_PARAM;
 					if (e) goto err_exit;
 				}
 				/*otherwise override the fragment defauls so that we are consistent with the shared init segment*/
@@ -553,9 +729,13 @@
 		/*restore track decode times*/
 		else {
 			char *opt, sKey[100];
-			sprintf(sKey, "TrackID_%d", tf->TrackID);
-			opt = (char *)gf_cfg_get_key(dash_ctx, sKey, "NextDecodingTime");
+			sprintf(sKey, "TKID_%d_NextDecodingTime", tf->TrackID);
+			opt = (char *)gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, sKey);
 			if (opt) tf->InitialTSOffset = atoi(opt);
+
+			/*in time shift enabled, restore presentationTimeOffset */
+			if (dash_cfg->time_shift_depth>=0)
+				presentationTimeOffset = tf->InitialTSOffset;
 		}
 
 		/*get language, width/height/layout info, audio info*/
@@ -615,22 +795,25 @@
 		gf_isom_set_movie_duration(output, (u64) max_track_duration);
 	}
 
+	//if single segment, add msix brand if we use indexes
+	gf_isom_modify_alternate_brand(output, GF_4CC('m','s','i','x'), (dash_cfg && (dash_cfg->single_file_mode==1) && (dash_cfg->subsegs_per_sidx>=0)) ? 1 : 0);
+
 	//flush movie
-	e = gf_isom_finalize_for_fragment(output, dash_mode ? 1 : 0);
+	e = gf_isom_finalize_for_fragment(output, dash_cfg ? 1 : 0);
 	if (e) goto err_exit;
 
 	start_range = 0;
-	file_size = gf_isom_get_file_size(output);
+	file_size = gf_isom_get_file_size(bs_switch_segment ? bs_switch_segment : output);
 	end_range = file_size - 1;
 	init_seg_size = file_size;
 
-	if (dash_ctx) {
+	if (dash_cfg->dash_ctx) {
 		if (store_dash_params) {
 			char szVal[1024];
 			sprintf(szVal, LLU, init_seg_size);
-			gf_cfg_set_key(dash_ctx, "DASH", "InitializationSegmentSize", szVal);
+			gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "InitializationSegmentSize", szVal);
 		} else {
-			const char *opt = gf_cfg_get_key(dash_ctx, "DASH", "InitializationSegmentSize");
+			const char *opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "InitializationSegmentSize");
 			if (opt) init_seg_size = atoi(opt);
 		}
 	}
@@ -638,7 +821,7 @@
 restart_fragmentation_pass:
 
 	for (i=0; i<gf_list_count(fragmenters); i++) {
-		tf = (TrackFragmenter *)gf_list_get(fragmenters, i);
+		tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
 		tf->split_sample_dts_shift = 0;
 	}
 	segment_start_time = 0;
@@ -649,7 +832,7 @@
 	nb_done = 0;
 
 	maxFragDurationOverSegment=0;
-	if (dash_mode) switch_segment=1;
+	if (dash_cfg) switch_segment=1;
 
 	if (!seg_rad_name) use_url_template = 0;
 
@@ -665,21 +848,40 @@
 	ref_track_next_cts = 0;
 
 	/*setup previous URL list*/
-	if (dash_ctx) {
+	if (dash_cfg->dash_ctx) {
 		const char *opt;
-		count = gf_cfg_get_key_count(dash_ctx, "URLs");
+		char sKey[100];
+		count = gf_cfg_get_key_count(dash_cfg->dash_ctx, RepURLsSecName);
 		for (i=0; i<count; i++) {
-			const char *key_name = gf_cfg_get_key_name(dash_ctx, "URLs", i);
-			opt = gf_cfg_get_key(dash_ctx, "URLs", key_name);
-			fprintf(mpd_segs, "    %s\n", opt);	
+			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);	
+			gf_bs_write_data(mpd_bs, szMPDTempLine, strlen(szMPDTempLine));
 		}
 
-		opt = gf_cfg_get_key(dash_ctx, "DASH", "NextSegmentIndex");
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "NextSegmentIndex");
 		if (opt) cur_seg = atoi(opt);
-		opt = gf_cfg_get_key(dash_ctx, "DASH", "NextFragmentIndex");
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "NextFragmentIndex");
 		if (opt) fragment_index = atoi(opt);
-		opt = gf_cfg_get_key(dash_ctx, "DASH", "PeriodDuration");
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "CumulatedDuration");
 		if (opt) period_duration = atof(opt);
+
+		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);
+			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);
+			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);
+			if (opt) {
+				sscanf(opt, LLU, &tf->next_sample_dts);
+			}
+		}
 	}
 	gf_isom_set_next_moof_number(output, fragment_index);
 
@@ -693,6 +895,11 @@
 			switch_segment = 0;
 			first_sample_in_segment = 1;
 
+			if (dash_cfg && dash_cfg->subduration && (segment_start_time + MaxSegmentDuration/2 >= 1000*dash_cfg->subduration)) {
+				/*done with file (next segment will exceppe of more than half the requested subduration : store all fragmenters state and abord*/
+				break;
+			}
+
 			if (simulation_pass) {
 				segments_info = gf_realloc(segments_info, sizeof(u32) * (nb_segments_info+1) );
 				segments_info[nb_segments_info] = 0;
@@ -701,9 +908,11 @@
 			} 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, rep_id, seg_rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, (u64) (segment_start_time * timeline_timescale), bandwidth, cur_seg);
+					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, is_bs_switching, SegmentName, output_file, dash_input->representationID, seg_rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, (u64) ( period_duration * timeline_timescale + segment_start_time), bandwidth, cur_seg, dash_cfg->use_segment_timeline);
 					e = gf_isom_start_segment(output, SegmentName);
 
+					gf_dasher_store_segment_info(dash_cfg, SegmentName, period_duration + segment_start_time / 1000.0);
+
 					/*we are in bitstream switching mode, delete init segment*/
 					if (is_bs_switching && !init_segment_deleted) {
 						init_segment_deleted = 1;
@@ -712,12 +921,13 @@
 
 					if (!use_url_template) {
 						const char *name = gf_url_get_resource_name(SegmentName);
-						fprintf(mpd_segs, "    <SegmentURL media=\"%s\"/>\n", name );	
-						if (dash_ctx) {
+						sprintf(szMPDTempLine, "     <SegmentURL media=\"%s\"/>\n", name );	
+						gf_bs_write_data(mpd_bs, szMPDTempLine, strlen(szMPDTempLine));
+						if (dash_cfg->dash_ctx) {
 							char szKey[100], szVal[4046];
-							sprintf(szKey, "UrlInfo%d", gf_cfg_get_key_count(dash_ctx, "URLs") + 1 );
+							sprintf(szKey, "UrlInfo%d", cur_seg );
 							sprintf(szVal, "<SegmentURL media=\"%s\"/>", name);
-							gf_cfg_set_key(dash_ctx, "URLs", szKey, szVal);
+							gf_cfg_set_key(dash_cfg->dash_ctx, RepURLsSecName, szKey, szVal);
 						}
 					}
 				} else {
@@ -742,7 +952,7 @@
 	
 
 			for (i=0; i<count; i++) {
-				tf = (TrackFragmenter *)gf_list_get(fragmenters, i);
+				tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
 				if (tf->done) continue;
 				/*FIXME - we need a way in the spec to specify "past" DTS for splitted sample*/
 				gf_isom_set_traf_base_media_decode_time(output, tf->TrackID, tf->InitialTSOffset + tf->next_sample_dts);
@@ -761,13 +971,13 @@
 					tf = tfref;
 					has_rap=0;
 				} else {
-					tf = (TrackFragmenter *)gf_list_get(fragmenters, i-1);
+					tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i-1);
 					if (tf == tfref) {
-						tf = (TrackFragmenter *)gf_list_get(fragmenters, i);
+						tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
 					}
 				}
 			} else {
-				tf = (TrackFragmenter *)gf_list_get(fragmenters, i);
+				tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
 				if (tf == tfref) 
 					has_rap=0;
 			} 
@@ -803,6 +1013,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);
@@ -814,11 +1025,11 @@
 
 				if (tf->splitable) {
 					if (tfref==tf) {
-						u32 frag_dur = (tf->FragmentLength + defaultDuration) * 1000 / tf->TimeScale;
+						u64 frag_dur = (tf->FragmentLength + defaultDuration) * 1000 / 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 = tf->TimeScale * (MaxSegmentDuration - SegmentDuration) / 1000 - tf->FragmentLength;
+							defaultDuration = (u32) (tf->TimeScale * (MaxSegmentDuration - SegmentDuration) / 1000 - tf->FragmentLength);
 							split_sample_duration -= defaultDuration;
 						}
 					} else if ((tf->last_sample_cts + defaultDuration) * tfref_timescale > tfref->next_sample_dts * tf->TimeScale) {
@@ -909,13 +1120,13 @@
 						}
 						else if (split_seg_at_rap) {
 							u64 next_sap_time;
-							u32 frag_dur, next_dur;
+							u64 frag_dur, next_dur;
 							next_dur = gf_isom_get_sample_duration(input, tf->OriginalTrack, tf->SampleNum + 1);
 							if (!next_dur) next_dur = defaultDuration;
 							/*duration of fragment if we add this rap*/
 							frag_dur = (tf->FragmentLength+next_dur)*1000/tf->TimeScale;
 							next_sample_rap = 1;
-							next_sap_time = 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);
 							/*if no more SAP after this one, do not switch segment*/
 							if (next_sap_time) {
 								u32 scaler;
@@ -926,6 +1137,7 @@
 									split_at_rap = 1;
 									/*force new segment*/
 									force_switch_segment = 1;
+									stop_frag = 1;
 								}
 
 								if (tf->all_sample_raps) {
@@ -950,7 +1162,7 @@
 					stop_frag = 1;
 				} else if (tf==tfref) {
 					/*fragmenting on "clock" track: no drift control*/
-					if (!fragments_start_with_rap || ( (next && next->IsRAP) || split_at_rap) ) {
+					if (!(dash_cfg ? dash_cfg->fragments_start_with_rap : 0) || ( (next && next->IsRAP) || split_at_rap) ) {
 						if (tf->FragmentLength*1000 >= MaxFragmentDuration*tf->TimeScale) {
 							stop_frag = 1;
 						}
@@ -989,7 +1201,7 @@
 			}
 		}
 
-		if (dash_mode) {
+		if (dash_cfg) {
 
 			SegmentDuration += maxFragDurationOverSegment;
 			maxFragDurationOverSegment=0;
@@ -1000,23 +1212,38 @@
 			}
 
 			if (force_switch_segment || ((SegmentDuration >= MaxSegmentDuration) && (!split_seg_at_rap || next_sample_rap))) {
+
+				if (mpd_timeline_bs) {
+
+					if (previous_segment_duration == SegmentDuration) {
+						segment_timeline_repeat_count ++;
+					} else {
+						if (previous_segment_duration) {
+							if (segment_timeline_repeat_count) {
+								sprintf(szMPDTempLine, " r=\"%d\"/>\n", segment_timeline_repeat_count);
+							} else {
+								sprintf(szMPDTempLine, "/>\n");
+							}
+							gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, strlen(szMPDTempLine));
+						}
+						previous_segment_duration = SegmentDuration;
+						if (first_segment_in_timeline) {
+							sprintf(szMPDTempLine, "     <S t=\""LLU"\" d=\""LLU"\"", (u64) (segment_start_time*timeline_timescale), (u64) SegmentDuration );
+							first_segment_in_timeline = 0;
+						} else {
+							sprintf(szMPDTempLine, "     <S d=\""LLU"\"", (u64) SegmentDuration);
+						}
+						gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, strlen(szMPDTempLine));
+						segment_timeline_repeat_count = 0;
+					}	
+				}
+
 				segment_start_time += SegmentDuration;
 				nb_segments++;
 				if (max_segment_duration * 1000 <= SegmentDuration) {
-					max_segment_duration = SegmentDuration;
+					max_segment_duration = (Double) (s64) SegmentDuration;
 					max_segment_duration /= 1000;
 				}
-
-
-#if 0
-				if (split_seg_at_rap) has_rap = 0;
-				fprintf(stderr, "Seg#%d: Duration %d%s - Track times (ms): ", nb_segments, SegmentDuration, (has_rap == 2) ? " - Starts with RAP" : ((has_rap == 1) ? " - Contains RAP" : "") );
-				for (i=0; i<count; i++) {
-					tf = (TrackFragmenter *)gf_list_get(fragmenters, i);
-					fprintf(stderr, "%d ", (u32) ( (tf->last_sample_cts*1000.0)/tf->TimeScale) );
-				}
-				fprintf(stderr, "\n ");
-#endif
 				force_switch_segment=0;
 				switch_segment=1;
 				SegmentDuration=0;
@@ -1028,23 +1255,26 @@
 				if (!simulation_pass) {
 					u64 idx_start_range, idx_end_range;
 					
-					gf_isom_close_segment(output, subsegs_per_sidx, ref_track_id, ref_track_first_dts, ref_track_next_cts, daisy_chain_sidx, flush_all_samples ? 1 : 0, &idx_start_range, &idx_end_range);
+					gf_isom_close_segment(output, dash_cfg->subsegs_per_sidx, ref_track_id, ref_track_first_dts, ref_track_next_cts, dash_cfg->daisy_chain_sidx, flush_all_samples ? 1 : 0, &idx_start_range, &idx_end_range);
 					ref_track_first_dts = (u64) -1;
 
 					if (!seg_rad_name) {
 						file_size = gf_isom_get_file_size(output);
 						end_range = file_size - 1;
-						if (single_file_mode!=1) {
-							fprintf(mpd_segs, "     <SegmentURL mediaRange=\""LLD"-"LLD"\"", start_range, end_range);	
+						if (dash_cfg->single_file_mode!=1) {
+							sprintf(szMPDTempLine, "      <SegmentURL mediaRange=\""LLD"-"LLD"\"", start_range, end_range);	
+							gf_bs_write_data(mpd_bs, szMPDTempLine, strlen(szMPDTempLine));
 							if (idx_start_range || idx_end_range) {
-								fprintf(mpd_segs, " indexRange=\""LLD"-"LLD"\"", idx_start_range, idx_end_range);	
+								sprintf(szMPDTempLine, " indexRange=\""LLD"-"LLD"\"", idx_start_range, idx_end_range);	
+								gf_bs_write_data(mpd_bs, szMPDTempLine, strlen(szMPDTempLine));
 							}
-							fprintf(mpd_segs, "/>\n");	
-							if (dash_ctx) {
+							gf_bs_write_data(mpd_bs, "/>\n", 3);
+
+							if (dash_cfg->dash_ctx) {
 								char szKey[100], szVal[4046];
-								sprintf(szKey, "UrlInfo%d", gf_cfg_get_key_count(dash_ctx, "URLs") + 1 );
+								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_ctx, "URLs", szKey, szVal);
+								gf_cfg_set_key(dash_cfg->dash_ctx, RepURLsSecName, szKey, szVal);
 							}
 						}
 					} else {
@@ -1056,17 +1286,15 @@
 			if (split_seg_at_rap && SegmentDuration && (SegmentDuration + MaxFragmentDuration >= MaxSegmentDuration)) {
 				if (!split_at_rap) {
 					split_at_rap = 1;
-					MaxFragmentDuration = MaxSegmentDuration - SegmentDuration;
 				}
 			}
 		}
-		
 		if (nb_tracks_done==count) break;
 	}
 
 	if (simulation_pass) {
 		/*OK, we have all segments and frags per segments*/
-		gf_isom_allocate_sidx(output, subsegs_per_sidx, daisy_chain_sidx, nb_segments_info, segments_info, &index_start_range, &index_end_range );
+		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_free(segments_info);
 		segments_info = NULL;
 		simulation_pass = 0;
@@ -1083,185 +1311,293 @@
 		goto restart_fragmentation_pass;
 	}
 
-	if (dash_mode) {
-		char buffer[1000];
-
+	if (dash_cfg) {
 		/*flush last segment*/
 		if (!switch_segment) {
 			u64 idx_start_range, idx_end_range;
 
 			if (max_segment_duration * 1000 <= SegmentDuration) {
-				max_segment_duration = SegmentDuration;
+				max_segment_duration = (Double) (s64) SegmentDuration;
 				max_segment_duration /= 1000;
 			}
 
-			gf_isom_close_segment(output, subsegs_per_sidx, ref_track_id, ref_track_first_dts, ref_track_next_cts, daisy_chain_sidx, 1, &idx_start_range, &idx_end_range);
+			segment_start_time += SegmentDuration;
+
+			gf_isom_close_segment(output, dash_cfg->subsegs_per_sidx, ref_track_id, ref_track_first_dts, ref_track_next_cts, dash_cfg->daisy_chain_sidx, 1, &idx_start_range, &idx_end_range);
 			nb_segments++;
 
 			if (!seg_rad_name) {
 				file_size = gf_isom_get_file_size(output);
 				end_range = file_size - 1;
-				if (single_file_mode!=1) {
-					fprintf(mpd_segs, "     <SegmentURL mediaRange=\""LLD"-"LLD"\" indexRange=\""LLD"-"LLD"\"/>\n", start_range, end_range, idx_start_range, idx_end_range);	
-					if (dash_ctx) {
+				if (dash_cfg->single_file_mode!=1) {
+					sprintf(szMPDTempLine, "     <SegmentURL mediaRange=\""LLD"-"LLD"\"", start_range, end_range);
+					gf_bs_write_data(mpd_bs, szMPDTempLine, strlen(szMPDTempLine));
+					if (idx_start_range || idx_end_range) {
+						sprintf(szMPDTempLine, " indexRange=\""LLD"-"LLD"\"", idx_start_range, idx_end_range);
+						gf_bs_write_data(mpd_bs, szMPDTempLine, strlen(szMPDTempLine));
+					}
+					gf_bs_write_data(mpd_bs, "/>\n", 3);
+
+					if (dash_cfg->dash_ctx) {
 						char szKey[100], szVal[4046];
-						sprintf(szKey, "UrlInfo%d", gf_cfg_get_key_count(dash_ctx, "URLs") + 1 );
+						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_ctx, "URLs", szKey, szVal);
+						gf_cfg_set_key(dash_cfg->dash_ctx, RepURLsSecName, szKey, szVal);
 					}
 				}
 			} else {
 				file_size += gf_isom_get_file_size(output);
 			}
 		}
+		if (mpd_timeline_bs) {
+			if (previous_segment_duration == SegmentDuration) {
+				segment_timeline_repeat_count ++;
+				sprintf(szMPDTempLine, " r=\"%d\"/>\n", segment_timeline_repeat_count);
+				gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, strlen(szMPDTempLine));
+			} else {
+				if (previous_segment_duration) {
+					if (segment_timeline_repeat_count) {
+						sprintf(szMPDTempLine, " r=\"%d\"/>\n", segment_timeline_repeat_count);
+					} else {
+						sprintf(szMPDTempLine, "/>\n");
+					}
+					gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, strlen(szMPDTempLine));
+				}
+				if (SegmentDuration) {
+					if (first_segment_in_timeline) {
+						sprintf(szMPDTempLine, "     <S t=\""LLU"\" d=\""LLU"\"/>\n", (u64) (segment_start_time*timeline_timescale), (u64) SegmentDuration );
+						first_segment_in_timeline = 0;
+					} else {
+						sprintf(szMPDTempLine, "     <S d=\""LLU"\"/>\n", (u64) SegmentDuration);
+					}
+					gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, strlen(szMPDTempLine));
+				}
+			}
+
+			sprintf(szMPDTempLine, "    </SegmentTimeline>\n");
+			gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, strlen(szMPDTempLine));
+		}
 
-		period_duration += file_duration;
-		//u32 h = (u32) (period_duration/3600);
-		//u32 m = (u32) (period_duration-h*60)/60;
 		if (!bandwidth)
 			bandwidth = (u32) (file_size * 8 / file_duration);
 
 		if (use_url_template) {
 			/*segment template does not depend on file name, write the template at the adaptationSet level*/
-			if (!variable_seg_rad_name && first_in_set) {
+			if (!dash_cfg->variable_seg_rad_name && first_in_set) {
 				const char *rad_name = gf_url_get_resource_name(seg_rad_name);
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switching, SegmentName, output_file, rep_id, rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, 0, 0, 0);
-				fprintf(mpd, "   <SegmentTemplate timescale=\"1000\" duration=\"%d\" media=\"%s\" startNumber=\"1\"", (u32) (max_segment_duration*1000), SegmentName);	
+				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, 0, 0, 0, dash_cfg->use_segment_timeline);
+				fprintf(dash_cfg->mpd, "   <SegmentTemplate timescale=\"1000\" duration=\"%d\" media=\"%s\" startNumber=\"%d\"", (u32) (max_segment_duration*1000), SegmentName, startNumber - startNumberRewind);	
 				/*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, rep_id, rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, 0, 0);
+					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, 0, 0, dash_cfg->use_segment_timeline);
+				}
+				fprintf(dash_cfg->mpd, " initialization=\"%s\"", SegmentName);
+				if (presentationTimeOffset) 
+					fprintf(dash_cfg->mpd, " presentationTimeOffset=\"%d\"", presentationTimeOffset);
+
+				if (mpd_timeline_bs) {
+					char *mpd_seg_info = NULL;
+					u32 size;
+					fprintf(dash_cfg->mpd, ">\n");
+
+					gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
+					gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
+					gf_free(mpd_seg_info);
+					fprintf(dash_cfg->mpd, "   </SegmentTemplate>\n");
+				} else {
+					fprintf(dash_cfg->mpd, "/>\n");
 				}
-				fprintf(mpd, " initialization=\"%s\"", SegmentName);
-				fprintf(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 && first_in_set) {
-				fprintf(mpd, "   <SegmentTemplate initialization=\"%s\"/>\n", bs_switching_segment_name);
+				fprintf(dash_cfg->mpd, "   <SegmentTemplate initialization=\"%s\"", bs_switching_segment_name);
+				if (presentationTimeOffset) 
+					fprintf(dash_cfg->mpd, " presentationTimeOffset=\"%d\"", presentationTimeOffset);
+
+				if (mpd_timeline_bs) {
+					char *mpd_seg_info = NULL;
+					u32 size;
+					fprintf(dash_cfg->mpd, ">\n");
+
+					gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
+					gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
+					gf_free(mpd_seg_info);
+					fprintf(dash_cfg->mpd, "   </SegmentTemplate>\n");
+				} else {
+					fprintf(dash_cfg->mpd, "/>\n");
+				}
 			}
 		}
+		else if ((dash_cfg->single_file_mode!=1) && mpd_timeline_bs) {
+			char *mpd_seg_info = NULL;
+			u32 size;
+
+			fprintf(dash_cfg->mpd, "   <SegmentList>\n");
+
+			gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
+			gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
+			gf_free(mpd_seg_info);
+			fprintf(dash_cfg->mpd, "   </SegmentList>\n");
+		}
 
 
-		fprintf(mpd, "   <Representation ");
-		if (rep_id) fprintf(mpd, "id=\"%s\"", rep_id);
-		else fprintf(mpd, "id=\"%p\"", output);
-		fprintf(mpd, " mimeType=\"%s/mp4\" codecs=\"%s\"", audio_only ? "audio" : "video", szCodecs);
+		fprintf(dash_cfg->mpd, "   <Representation ");
+		if (dash_input->representationID) fprintf(dash_cfg->mpd, "id=\"%s\"", dash_input->representationID);
+		else fprintf(dash_cfg->mpd, "id=\"%p\"", output);
+		
+		fprintf(dash_cfg->mpd, " mimeType=\"%s/mp4\" codecs=\"%s\"", audio_only ? "audio" : "video", szCodecs);
 		if (width && height) {
-			fprintf(mpd, " width=\"%d\" height=\"%d\"", width, height);
+			fprintf(dash_cfg->mpd, " width=\"%d\" height=\"%d\"", width, height);
 			gf_media_get_reduced_frame_rate(&fps_num, &fps_denum);
 			if (fps_denum>1)
-				fprintf(mpd, " frameRate=\"%d/%d\"", fps_num, fps_denum);
+				fprintf(dash_cfg->mpd, " frameRate=\"%d/%d\"", fps_num, fps_denum);
 			else
-				fprintf(mpd, " frameRate=\"%d\"", fps_num);
+				fprintf(dash_cfg->mpd, " frameRate=\"%d\"", fps_num);
 
 			if (!sar_w) sar_w = 1;
 			if (!sar_h) sar_h = 1;
-			fprintf(mpd, " sar=\"%d:%d\"", sar_w, sar_h);
+			fprintf(dash_cfg->mpd, " sar=\"%d:%d\"", sar_w, sar_h);
 
 		}
-		if (sample_rate) fprintf(mpd, " audioSamplingRate=\"%d\"", sample_rate);
-		if (langCode[0]) fprintf(mpd, " lang=\"%s\"", langCode);
+		if (sample_rate) fprintf(dash_cfg->mpd, " audioSamplingRate=\"%d\"", sample_rate);
 		if (segments_start_with_sap || split_seg_at_rap) {
-			fprintf(mpd, " startWithSAP=\"%d\"", max_sap_type);
+			fprintf(dash_cfg->mpd, " startWithSAP=\"%d\"", max_sap_type);
 		} else {
-			fprintf(mpd, " startWithSAP=\"false\"");
+			fprintf(dash_cfg->mpd, " startWithSAP=\"0\"");
 		}
-		if ((single_file_mode==1) && segments_start_with_sap) fprintf(mpd, " subsegmentStartsWithSAP=\"%d\"", max_sap_type);
+		//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);
 		
-		fprintf(mpd, " bandwidth=\"%d\"", bandwidth);		
-		fprintf(mpd, ">\n");
+		fprintf(dash_cfg->mpd, " bandwidth=\"%d\"", bandwidth);		
+		fprintf(dash_cfg->mpd, ">\n");
 
 		if (nb_channels && !is_bs_switching) 
-			fprintf(mpd, "    <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\"/>\n", nb_channels);
+			fprintf(dash_cfg->mpd, "    <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\"/>\n", nb_channels);
 
-		if (dash_ctx) {
+		if (dash_cfg->dash_ctx) {
 			Double seg_dur;
-			opt = gf_cfg_get_key(dash_ctx, "DASH", "MaxSegmentDuration");
+			opt = gf_cfg_get_key(dash_cfg->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_ctx, "DASH", "MaxSegmentDuration", sOpt);
+					gf_cfg_set_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
 					seg_dur = max_segment_duration;
 				} else {
 					max_segment_duration = seg_dur;
 				}
 			} else {
 				sprintf(sOpt, "%f", max_segment_duration);
-				gf_cfg_set_key(dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
+				gf_cfg_set_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
 			}
 		}
 
 		if (use_url_template) {
 			/*segment template depends on file name, but the template at the representation level*/
-			if (variable_seg_rad_name) {
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switching, SegmentName, output_file, rep_id, seg_rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, 0, bandwidth, 0);
-				fprintf(mpd, "    <SegmentTemplate timescale=\"1000\" duration=\"%d\" media=\"%s\" startNumber=\"1\"", (u32) (max_segment_duration*1000), SegmentName);	
+			if (dash_cfg->variable_seg_rad_name) {
+				const char *rad_name = gf_url_get_resource_name(seg_rad_name);
+				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, 0, bandwidth, 0, dash_cfg->use_segment_timeline);
+				fprintf(dash_cfg->mpd, "    <SegmentTemplate timescale=\"1000\" duration=\"%d\" media=\"%s\" startNumber=\"%d\"", (u32) (max_segment_duration*1000), SegmentName, startNumber - startNumberRewind);	
 				if (!is_bs_switching) {
-					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, rep_id, seg_rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, 0, 0);
-					fprintf(mpd, " initialization=\"%s\"", SegmentName);
+					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, rad_name, !stricmp(seg_ext, "null") ? NULL : "mp4", 0, 0, 0, dash_cfg->use_segment_timeline);
+					fprintf(dash_cfg->mpd, " initialization=\"%s\"", SegmentName);
 				}
-				fprintf(mpd, "/>\n");
-			}
-		} else if (single_file_mode==1) {
-			fprintf(mpd, "    <BaseURL>%s</BaseURL>\n", gf_url_get_resource_name( gf_isom_get_filename(output) ) );	
-			fprintf(mpd, "    <SegmentBase indexRangeExact=\"true\" indexRange=\"%d-%d\"/>\n", index_start_range, index_end_range);	
+				if (presentationTimeOffset) 
+					fprintf(dash_cfg->mpd, " presentationTimeOffset=\"%d\"", presentationTimeOffset);
+				fprintf(dash_cfg->mpd, "/>\n");
+			}
+		} else if (dash_cfg->single_file_mode==1) {
+			fprintf(dash_cfg->mpd, "    <BaseURL>%s</BaseURL>\n", gf_url_get_resource_name( gf_isom_get_filename(output) ) );	
+			fprintf(dash_cfg->mpd, "    <SegmentBase indexRangeExact=\"true\" indexRange=\"%d-%d\"", index_start_range, index_end_range);	
+			if (presentationTimeOffset) 
+				fprintf(dash_cfg->mpd, " presentationTimeOffset=\"%d\"", presentationTimeOffset);
+			fprintf(dash_cfg->mpd, "/>\n");	
 		} else {
 			if (!seg_rad_name) {
-				fprintf(mpd, "    <BaseURL>%s</BaseURL>\n", gf_url_get_resource_name( gf_isom_get_filename(output) ) );	
+				fprintf(dash_cfg->mpd, "    <BaseURL>%s</BaseURL>\n", gf_url_get_resource_name( gf_isom_get_filename(output) ) );	
 			}
-			fprintf(mpd, "    <SegmentList timescale=\"1000\" duration=\"%d\">\n", (u32) (max_segment_duration*1000));	
+			fprintf(dash_cfg->mpd, "    <SegmentList timescale=\"1000\" duration=\"%d\"", (u32) (max_segment_duration*1000));	
+			if (presentationTimeOffset) 
+				fprintf(dash_cfg->mpd, " presentationTimeOffset=\"%d\"", presentationTimeOffset);
+			fprintf(dash_cfg->mpd, ">\n");	
 			/*we are not in bitstreamSwitching mode*/
 			if (!is_bs_switching) {
-				fprintf(mpd, "     <Initialization");	
+				fprintf(dash_cfg->mpd, "     <Initialization");	
 				if (!seg_rad_name) {
-					fprintf(mpd, " range=\"0-"LLD"\"", init_seg_size-1);
+					fprintf(dash_cfg->mpd, " range=\"0-"LLD"\"", init_seg_size-1);
 				} else {
-					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, rep_id, gf_url_get_resource_name( seg_rad_name) , !stricmp(seg_ext, "null") ? NULL : "mp4", 0, bandwidth, 0);
-					fprintf(mpd, " sourceURL=\"%s\"", SegmentName);
+					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, dash_input->representationID, gf_url_get_resource_name( seg_rad_name) , !stricmp(seg_ext, "null") ? NULL : "mp4", 0, bandwidth, 0, dash_cfg->use_segment_timeline);
+					fprintf(dash_cfg->mpd, " sourceURL=\"%s\"", SegmentName);
 				}
-				fprintf(mpd, "/>\n");
+				fprintf(dash_cfg->mpd, "/>\n");
 			}
 		}
-
-
-		gf_f64_seek(mpd_segs, 0, SEEK_SET);
-		while (!feof(mpd_segs)) {
-			u32 r = fread(buffer, 1, 100, mpd_segs);
-			gf_fwrite(buffer, 1, r, mpd);
+		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_free(mpd_seg_info);
 		}
 
-		if (!use_url_template && (single_file_mode!=1)) {
-			fprintf(mpd, "    </SegmentList>\n");
+		if (!use_url_template && (dash_cfg->single_file_mode!=1)) {
+			fprintf(dash_cfg->mpd, "    </SegmentList>\n");
 		}
 
-		fprintf(mpd, "   </Representation>\n");
+		fprintf(dash_cfg->mpd, "   </Representation>\n");
 	}
 
 	/*store context*/
-	if (dash_ctx) {
+	if (dash_cfg && dash_cfg->dash_ctx) {
+		period_duration += (Double)segment_start_time / 1000;
+
 		for (i=0; i<gf_list_count(fragmenters); i++) {
-			tf = (TrackFragmenter *)gf_list_get(fragmenters, i);
-			
-			sprintf(sKey, "TrackID_%d", tf->TrackID);
-			sprintf(sOpt, LLU, tf->InitialTSOffset + tf->next_sample_dts);
-			gf_cfg_set_key(dash_ctx, sKey, "NextDecodingTime", sOpt);
+			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);
+			}
+
+			if (dash_cfg->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);
+
+				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);
+
+				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);
+			}
 		}
 		sprintf(sOpt, "%d", cur_seg);
-		gf_cfg_set_key(dash_ctx, "DASH", "NextSegmentIndex", sOpt);
+		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "NextSegmentIndex", sOpt);
 
 		fragment_index = gf_isom_get_next_moof_number(output);
 		sprintf(sOpt, "%d", fragment_index);
-		gf_cfg_set_key(dash_ctx, "DASH", "NextFragmentIndex", sOpt);
+		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "NextFragmentIndex", sOpt);
+
+
 		sprintf(sOpt, "%f", period_duration);
-		gf_cfg_set_key(dash_ctx, "DASH", "PeriodDuration", sOpt);
+		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "CumulatedDuration", sOpt);
+
+		if (store_dash_params) {
+			sprintf(sOpt, "%u", bandwidth);
+			gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "Bandwidth", sOpt);
+		}
 	}
 
 err_exit:
 	if (fragmenters){
 		while (gf_list_count(fragmenters)) {
-			tf = (TrackFragmenter *)gf_list_get(fragmenters, 0);
+			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, 0);
 			gf_free(tf);
 			gf_list_rem(fragmenters, 0);
 		}
@@ -1271,142 +1607,2337 @@
 		if (e) gf_isom_delete(output);
 		else gf_isom_close(output);
 	}
+	if (!bs_switching_is_output && bs_switch_segment) 
+		gf_isom_delete(bs_switch_segment);
 	gf_set_progress("ISO File Fragmenting", nb_samp, nb_samp);
-	if (mpd) fclose(mpd);
-	if (mpd_segs) fclose(mpd_segs);
-	if (dash_ctx) gf_cfg_del(dash_ctx);
+	if (mpd_bs) gf_bs_del(mpd_bs);
+	if (mpd_timeline_bs) gf_bs_del(mpd_timeline_bs);
+	return e;
+}
+
+
+static GF_Err dasher_isom_get_input_components_info(GF_DashSegInput *input, GF_DASHSegmenterOptions *opts)
+{
+	u32 i;
+	GF_ISOFile *in;
+	Double dur;
+
+	in = gf_isom_open(input->file_name, GF_ISOM_OPEN_READ, NULL);
+	input->duration = 0;
+	for (i=0; i<gf_isom_get_track_count(in); i++) {
+		u32 mtype = gf_isom_get_media_type(in, i+1);
+
+		if (mtype == GF_ISOM_MEDIA_HINT) 
+			continue;
+		
+		if (gf_isom_get_sample_count(in, i+1)<2)
+			continue;
+	
+		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].ID = gf_isom_get_track_id(in, i+1);
+		input->components[input->nb_components].media_type = mtype;
+		if (mtype == GF_ISOM_MEDIA_VISUAL) {
+			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 2nd sample*/
+			input->components[input->nb_components].fps_denum = gf_isom_get_sample_duration(in, i+1, 2);
+
+		}
+		/*non-video tracks, get lang*/
+		else if (mtype == GF_ISOM_MEDIA_AUDIO) {
+			u8 bps;
+			gf_isom_get_audio_info(in, i+1, 1, &input->components[input->nb_components].sample_rate, &input->components[input->nb_components].channels, &bps);
+		}
+		gf_isom_get_media_language(in, i+1, input->components[input->nb_components].szLang);
+
+		input->nb_components++;
+	}
+	return gf_isom_close(in);
+}
+
+static GF_Err dasher_isom_classify_input(GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 input_idx, u32 *current_group_id, u32 *max_sap_type)
+{
+	u32 i, j;
+	GF_ISOFile *set_file;
+	
+	if (input_idx+1>=nb_dash_inputs)
+		return GF_OK;
+
+	set_file = gf_isom_open(dash_inputs[input_idx].file_name, GF_ISOM_OPEN_READ, NULL);
+
+	for (i=input_idx+1; i<nb_dash_inputs; i++) {
+		Bool valid_in_adaptation_set = 1;
+		Bool assign_to_group = 1;
+		GF_ISOFile *in;
+
+		if (dash_inputs[input_idx].period != dash_inputs[i].period) 
+			continue;
+		
+		if (strcmp(dash_inputs[input_idx].szMime, dash_inputs[i].szMime))
+			continue;
+
+		if (strcmp(dash_inputs[input_idx].role, dash_inputs[i].role))
+			continue;
+
+		in = gf_isom_open(dash_inputs[i].file_name, GF_ISOM_OPEN_READ, NULL);
+
+		for (j=0; j<gf_isom_get_track_count(set_file); j++) {
+			u32 mtype, msub_type;
+			Bool same_codec = 1;
+			u32 track = gf_isom_get_track_by_id(in, gf_isom_get_track_id(set_file, j+1));
+
+			if (!track) {
+				valid_in_adaptation_set = 0;
+				assign_to_group = 0;
+				break;
+			}
+			mtype = gf_isom_get_media_type(set_file, j+1);
+			if (mtype != gf_isom_get_media_type(in, j+1)) {
+				valid_in_adaptation_set = 0;
+				assign_to_group = 0;
+				break;
+			}
+			msub_type = gf_isom_get_media_subtype(set_file, j+1, 1);
+			if (msub_type != gf_isom_get_media_subtype(in, j+1, 1)) same_codec = 0;
+			if ((msub_type==GF_ISOM_SUBTYPE_MPEG4) 
+				|| (msub_type==GF_ISOM_SUBTYPE_MPEG4_CRYP) 
+				|| (msub_type==GF_ISOM_SUBTYPE_AVC_H264)
+				|| (msub_type==GF_ISOM_SUBTYPE_AVC2_H264)
+				|| (msub_type==GF_ISOM_SUBTYPE_AVC3_H264)
+				|| (msub_type==GF_ISOM_SUBTYPE_AVC4_H264)
+				|| (msub_type==GF_ISOM_SUBTYPE_SVC_H264)
+				|| (msub_type==GF_ISOM_SUBTYPE_LSR1)
+				) {
+					GF_DecoderConfig *dcd1 = gf_isom_get_decoder_config(set_file, j+1, 1);
+					GF_DecoderConfig *dcd2 = gf_isom_get_decoder_config(in, j+1, 1);
+					if (dcd1 && dcd2 && (dcd1->streamType==dcd2->streamType) && (dcd1->objectTypeIndication==dcd2->objectTypeIndication)) {
+						same_codec = 1;
+					} else {
+						same_codec = 0;
+					}
+					if (dcd1) gf_odf_desc_del((GF_Descriptor *)dcd1);
+					if (dcd2) gf_odf_desc_del((GF_Descriptor *)dcd2);
+			}
+
+			if (!same_codec) {
+				valid_in_adaptation_set = 0;
+				break;
+			}
+
+			if ((mtype!=GF_ISOM_MEDIA_VISUAL) && (mtype!=GF_ISOM_MEDIA_HINT)) {
+				char szLang1[4], szLang2[4];
+				szLang1[3] = szLang2[3] = 0;
+				gf_isom_get_media_language(set_file, j+1, szLang1);
+				gf_isom_get_media_language(in, j+1, szLang2);
+				if (stricmp(szLang1, szLang2)) {
+					valid_in_adaptation_set = 0;
+					break;
+				}
+			}
+			if (mtype==GF_ISOM_MEDIA_VISUAL) {
+				u32 w1, h1, w2, h2;
+				Bool rap, roll;
+				u32 roll_dist, sap_type;
+
+				gf_isom_get_track_layout_info(set_file, j+1, &w1, &h1, NULL, NULL, NULL);
+				gf_isom_get_track_layout_info(in, j+1, &w2, &h2, NULL, NULL, NULL);
+
+				if (h1*w2 != h2*w1) {
+					valid_in_adaptation_set = 0;
+					break;
+				}
+
+				gf_isom_get_sample_rap_roll_info(in, j+1, 0, &rap, &roll, &roll_dist);
+				if (roll_dist>0) sap_type = 4;
+				else if (roll) sap_type = 3;
+				else if (rap) sap_type = 1;
+				else sap_type = 1;
+				if (*max_sap_type < sap_type) *max_sap_type = sap_type;
+			}
+		}
+		gf_isom_close(in);
+		if (valid_in_adaptation_set) {
+			dash_inputs[i].adaptation_set = dash_inputs[input_idx].adaptation_set;
+			dash_inputs[input_idx].nb_rep_in_adaptation_set ++;
+		} else if (assign_to_group) {
+			if (!dash_inputs[input_idx].group_id) {
+				(*current_group_id) ++;
+				dash_inputs[input_idx].group_id = (*current_group_id);
+			}
+			dash_inputs[i].group_id = (*current_group_id);
+		}
+	}
+	gf_isom_close(set_file);
+	return GF_OK;
+}
+
+static GF_Err dasher_isom_create_init_segment(GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 adaptation_set, char *szInitName, const char *tmpdir, Bool use_inband_param_set, Bool *disable_bs_switching)
+{
+	GF_Err e = GF_OK;
+	u32 i;
+	Bool sps_merge_failed = 0;
+	Bool use_avc3 = 0;
+	GF_ISOFile *init_seg = gf_isom_open(szInitName, GF_ISOM_OPEN_WRITE, tmpdir);
+
+	for (i=0; i<nb_dash_inputs; i++) {
+		u32 j;
+		GF_ISOFile *in;
+
+		if (dash_inputs[i].adaptation_set != adaptation_set)
+			continue;
+
+		in = gf_isom_open(dash_inputs[i].file_name, GF_ISOM_OPEN_READ, NULL);
+		if (!in) {
+			e = gf_isom_last_error(NULL);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Error while opening %s: %s\n", dash_inputs[i].file_name, gf_error_to_string( e ) ));
+			return e;
+		}
+
+		for (j=0; j<gf_isom_get_track_count(in); j++) {
+			u32 track = gf_isom_get_track_by_id(init_seg, gf_isom_get_track_id(in, j+1));
+			if (track) {
+				u32 outDescIndex;
+				if ( gf_isom_get_sample_description_count(in, j+1) != 1) {
+					e = GF_NOT_SUPPORTED;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot merge track with multiple sample descriptions (file %s) - try disabling bitstream switching\n", dash_inputs[i].file_name ));
+					gf_isom_delete(init_seg);
+					gf_isom_delete(in);
+					return e;
+				}
+
+				/*if not the same sample desc we might need to clone it*/
+				if (! gf_isom_is_same_sample_description(in, j+1, 1, init_seg, track, 1)) {
+					u32 merge_mode = 1;
+					u32 stype1, stype2;
+					stype1 = gf_isom_get_media_subtype(in, j+1, 1);
+					stype2 = gf_isom_get_media_subtype(init_seg, track, 1);
+					if (stype1 != stype2) merge_mode = 0;
+					switch (stype1) {
+						case GF_4CC( 'a', 'v', 'c', '1'):
+						case GF_4CC( 'a', 'v', 'c', '2'):
+						case GF_4CC( 's', 'v', 'c', '1'):
+							if (use_avc3) 
+								merge_mode = 2;
+							break;
+						case GF_4CC( 'a', 'v', 'c', '3'):
+						case GF_4CC( 'a', 'v', 'c', '4'):
+							/*we don't want to clone SPS/PPS since they are already inside the samples*/
+							merge_mode = 2;
+							break;
+						default:
+							merge_mode = 0;
+							break;
+					}
+					if (merge_mode==1) {
+						u32 k, l, sps_id1, sps_id2;
+						GF_AVCConfig *avccfg1 = gf_isom_avc_config_get(in, j+1, 1);
+						GF_AVCConfig *avccfg2 = gf_isom_avc_config_get(init_seg, track, 1);
+#ifndef GPAC_DISABLE_AV_PARSERS
+						for (k=0; k<gf_list_count(avccfg2->sequenceParameterSets); k++) {
+							GF_AVCConfigSlot *slc = gf_list_get(avccfg2->sequenceParameterSets, k);
+							gf_avc_get_sps_info(slc->data, slc->size, &sps_id1, NULL, NULL, NULL, NULL);
+							for (l=0; l<gf_list_count(avccfg1->sequenceParameterSets); l++) {
+								GF_AVCConfigSlot *slc_orig = gf_list_get(avccfg1->sequenceParameterSets, l);
+								gf_avc_get_sps_info(slc_orig->data, slc_orig->size, &sps_id2, NULL, NULL, NULL, NULL);
+								if (sps_id2==sps_id1) {
+									merge_mode = 0;
+									break;
+								}
+							}
+						}
+#endif
+						/*no conflicts in SPS ids, merge all SPS in a single sample desc*/
+						if (merge_mode==1) {
+							while (gf_list_count(avccfg1->sequenceParameterSets)) {
+								GF_AVCConfigSlot *slc = gf_list_get(avccfg1->sequenceParameterSets, 0);
+								gf_list_rem(avccfg1->sequenceParameterSets, 0);
+								gf_list_add(avccfg2->sequenceParameterSets, slc);
+							}
+							while (gf_list_count(avccfg1->pictureParameterSets)) {
+								GF_AVCConfigSlot *slc = gf_list_get(avccfg1->pictureParameterSets, 0);
+								gf_list_rem(avccfg1->pictureParameterSets, 0);
+								gf_list_add(avccfg2->pictureParameterSets, slc);
+							}
+							gf_isom_avc_config_update(init_seg, track, 1, avccfg2);
+						} else {
+							sps_merge_failed = 1;
+						}
+						gf_odf_avc_cfg_del(avccfg1);
+						gf_odf_avc_cfg_del(avccfg2);
+					}
+
+					/*cannot merge, clone*/
+					if (merge_mode==0)
+						gf_isom_clone_sample_description(init_seg, track, in, j+1, 1, NULL, NULL, &outDescIndex);
+				}
+			} else {
+				u32 defaultDuration, defaultSize, defaultDescriptionIndex, defaultRandomAccess;
+				u8 defaultPadding;
+				u16 defaultDegradationPriority;
+
+				gf_isom_clone_track(in, j+1, init_seg, 0, &track);
+
+				switch (gf_isom_get_media_subtype(in, j+1, 1)) {
+				case GF_4CC( 'a', 'v', 'c', '1'):
+				case GF_4CC( 'a', 'v', 'c', '2'):
+				case GF_4CC( 's', 'v', 'c', '1'):
+					if (use_inband_param_set) {
+						gf_isom_avc_set_inband_config(init_seg, track, 1);
+						use_avc3 = 1;
+					}
+					break;
+				}
+
+
+				gf_isom_get_fragment_defaults(in, j+1, &defaultDuration, &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,
+							defaultSize, (u8) defaultRandomAccess,
+							defaultPadding, defaultDegradationPriority);
+				if (e) break;
+
+			}
+		}
+		if (!i) {
+			if (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);
+			}
+			gf_isom_modify_alternate_brand(init_seg, GF_4CC('d','a','s','h'), 1);
+		}
+		gf_isom_close(in);
+	}
+	if (e) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Couldn't create initialization segment: error %s\n", gf_error_to_string(e) ));
+		*disable_bs_switching = 1;
+		gf_isom_delete(init_seg);
+		gf_delete_file(szInitName);
+		return GF_OK;
+	} else if (sps_merge_failed) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Couldnt merge AVC|H264 SPS from different files (same SPS ID used) - different sample descriptions will be used\n"));
+		*disable_bs_switching = 1;
+		gf_isom_delete(init_seg);
+		gf_delete_file(szInitName);
+		return GF_OK;
+	} else {
+		e = gf_isom_close(init_seg);
+	}
 	return e;
 }
 
+static GF_Err dasher_isom_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenterOptions *dash_cfg, Bool first_in_set)
+{
+	GF_ISOFile *in = gf_isom_open(dash_input->file_name, GF_ISOM_OPEN_READ, dash_cfg->tmpdir);
+	GF_Err e = gf_media_isom_segment_file(in, szOutName, dash_cfg->fragment_duration, dash_cfg, dash_input, first_in_set);
+	gf_isom_close(in);
+	return e;
+}
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
-GF_EXPORT
-GF_Err gf_media_mpd_start(char *mpd_name, GF_DashProfile profile, const char *title, const char *source, const char *copyright, const char *moreInfoURL, Bool use_url_template, u32 single_file_mode, char *dash_ctx, GF_ISOFile *init_segment, Bool bitstream_switching_mode, Double period_duration, Bool first_adaptation_set, u32 group_id, u32 max_width, u32 max_height, char *szMaxFPS, char *szLang)
+#ifndef GPAC_DISABLE_MPEG2TS
+
+static GF_Err dasher_generic_classify_input(GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 input_idx, u32 *current_group_id, u32 *max_sap_type)
 {
-	u32 h, m;
+#ifdef GPAC_DISABLE_MEDIA_IMPORT
+	return GF_NOT_SUPPORTED;
+#else
+	GF_Err e;
+	u32 i, j, k;
+	GF_MediaImporter in, probe;
+
+	memset(&in, 0, sizeof(GF_MediaImporter));
+	in.flags = GF_IMPORT_PROBE_ONLY;
+	in.in_name = (char *)dash_inputs[input_idx].file_name;
+	e = gf_media_import(&in);
+	if (e) return e;
+
+	for (i=input_idx+1; i<nb_dash_inputs; i++) {
+		Bool valid_in_adaptation_set = 1;
+		Bool assign_to_group = 1;
+
+		if (dash_inputs[input_idx].period != dash_inputs[i].period) 
+			continue;
+
+		if (strcmp(dash_inputs[input_idx].szMime, dash_inputs[i].szMime))
+			continue;
+
+		if (strcmp(dash_inputs[input_idx].role, dash_inputs[i].role))
+			continue;
+
+		memset(&probe, 0, sizeof(GF_MediaImporter));
+		probe.flags = GF_IMPORT_PROBE_ONLY;
+		probe.in_name = (char *)dash_inputs[i].file_name;
+		e = gf_media_import(&probe);
+		if (e) return e;
+
+		if (in.nb_progs != probe.nb_progs) valid_in_adaptation_set = 0;
+		if (in.nb_tracks != probe.nb_tracks) valid_in_adaptation_set = 0;
+
+		for (j=0; j<in.nb_tracks; j++) {
+			struct __track_import_info *src_tk, *probe_tk;
+			Bool found = 0;
+			/*make sure we have the same track*/
+			for (k=0; k<probe.nb_tracks;k++) {
+				if (in.tk_info[j].track_num==probe.tk_info[k].track_num) {
+					found = 1;
+					break;
+				}
+			}
+			if (!found) {
+				valid_in_adaptation_set = 0;
+				assign_to_group = 0;
+				break;
+			}
+			src_tk = &in.tk_info[j];
+			probe_tk = &probe.tk_info[k];
+
+			/*make sure we use the same media type*/
+			if (src_tk->type != probe_tk->type) {
+				valid_in_adaptation_set = 0;
+				assign_to_group = 0;
+				break;
+			}
+			/*make sure we use the same codec type*/
+			if (src_tk->media_type != probe_tk->media_type) {
+				valid_in_adaptation_set = 0;
+				break;
+			}
+			/*make sure we use the same aspect ratio*/
+			if (src_tk->type==GF_ISOM_MEDIA_VISUAL) {
+				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 = 0;
+					break;
+				}
+			} else if (src_tk->lang != probe_tk->lang) {
+				valid_in_adaptation_set = 0;
+				break;
+			}
+
+			if (!valid_in_adaptation_set) break;
+		}
+		if (valid_in_adaptation_set) {
+			dash_inputs[i].adaptation_set = dash_inputs[input_idx].adaptation_set;
+			dash_inputs[input_idx].nb_rep_in_adaptation_set ++;
+		} else if (assign_to_group) {
+			if (!dash_inputs[input_idx].group_id) {
+				(*current_group_id) ++;
+				dash_inputs[input_idx].group_id = (*current_group_id);
+			}
+			dash_inputs[i].group_id = (*current_group_id);
+		}
+	}
+#endif
+	return GF_OK;
+}
+
+#endif
+
+#ifndef GPAC_DISABLE_MPEG2TS
+
+static GF_Err dasher_generic_get_components_info(GF_DashSegInput *input, GF_DASHSegmenterOptions *opts)
+{
+#ifdef GPAC_DISABLE_MEDIA_IMPORT
+	return GF_NOT_SUPPORTED;
+#else
+	u32 i;
+	GF_Err e;
+	GF_MediaImporter in;
+	memset(&in, 0, sizeof(GF_MediaImporter));
+	in.flags = GF_IMPORT_PROBE_ONLY;
+	in.in_name = (char *)input->file_name;
+	e = gf_media_import(&in);
+	if (e) return e;
+
+	input->nb_components = in.nb_tracks;
+	for (i=0; i<in.nb_tracks; i++) {
+		input->components[i].width = in.tk_info[i].video_info.width;
+		input->components[i].height = in.tk_info[i].video_info.height;
+		input->components[i].media_type = in.tk_info[i].type;
+		input->components[i].channels = in.tk_info[i].audio_info.nb_channels;
+		input->components[i].sample_rate = in.tk_info[i].audio_info.sample_rate;
+		input->components[i].ID = in.tk_info[i].track_num;
+		if (in.tk_info[i].lang)
+			strcpy(input->components[i].szLang, gf_4cc_to_str(in.tk_info[i].lang) );
+		strcpy(input->components[i].szCodec, in.tk_info[i].szCodecProfile);
+		input->components[i].fps_denum = 1000;
+		input->components[i].fps_num = (u32) (in.tk_info[i].video_info.FPS*1000);
+	}
+#endif
+	return GF_OK;
+}
+#endif
+
+
+#ifndef GPAC_DISABLE_MPEG2TS
+
+typedef struct
+{
+	FILE *src;
+	GF_M2TS_Demuxer *ts;
+	u64 file_size;
+	u32 bandwidth;
+	Bool has_seen_pat;
+	
+	u64 suspend_indexing;
+
+	/* For indexing the TS*/
+	Double segment_duration;
+	Bool segment_at_rap;
+
+	FILE *index_file;
+	GF_BitStream *index_bs;
+
+	u32 subduration;
+	u32 skip_nb_segments;
+	u32 cumulated_duration;
+
+	GF_SegmentIndexBox *sidx;
+	GF_PcrInfoBox *pcrb;
+
+	u32 reference_pid;
+	GF_M2TS_PES *reference_stream;
+	
+	u32 nb_pes_in_segment;
+	/* earliest presentation time for the whole segment */
+	u64 first_PTS;
+	/* DTS-PCR diff for the first PES packet */
+	u64 PCR_DTS_initial_diff;
+
+	/* earliest presentation time for the subsegment being processed */
+	u64 base_PTS;
+	/* byte offset for the start of subsegment being processed */
+	u64 base_offset;
+	/* last presentation time for the subsegment being processed (before the next subsegment is started) */
+	u64 last_PTS;
+	/* last decoding time for the subsegment being processed */
+	u64 last_DTS;
+	/* byte offset for the last PES packet for the subsegment being processed */
+	u32 last_offset;
+	u32 last_frame_duration;
+
+	/* earliest presentation time for the previous subsegment */
+	u64 prev_base_PTS;
+	/* byte offset for the start of the previous subsegment */
+	u64 prev_base_offset;
+	/* last presentation time for the previous subsegment */
+	u64 prev_last_PTS;
+	/* byte offset for the last PES packet for the previous subsegment */
+	u32 prev_last_offset;
+
+	/* indicates if the current subsegment contains a SAP and its SAP type*/
+	u32 SAP_type;
+	/* indicates if the first PES in the current subsegment is a SAP*/
+	Bool first_pes_sap;
+	/* Presentation time for the first RAP encountered in the subsegment */
+	u64 first_SAP_PTS;
+	/* byte offset for the first RAP encountered in the subsegment */
+	u32 first_SAP_offset;
+	u64 prev_last_SAP_PTS;
+	u32 prev_last_SAP_offset;
+	u64 last_SAP_PTS;
+	u32 last_SAP_offset;
+
+	/*Interpolated PCR value for the pcrb*/
+	u64 interpolated_pcr_value;
+	u64 last_pcr_value;
+
+	/* information about the first PAT found in the subsegment */
+	u32 last_pat_position;
+	u32 first_pat_position;
+	u32 prev_last_pat_position;
+	Bool first_pat_position_valid;
+	u32 pat_version;
+
+	/* information about the first CAT found in the subsegment */
+	u32 last_cat_position;
+	u32 first_cat_position;
+	u32 prev_last_cat_position;
+	Bool first_cat_position_valid;
+	u32 cat_version;
+
+	/* information about the first PMT found in the subsegment */
+	u32 last_pmt_position;
+	u32 first_pmt_position;
+	u32 prev_last_pmt_position;
+	Bool first_pmt_position_valid;
+	u32 pmt_version;
+
+	/* information about the first PCR found in the subsegment */
+	u32 last_pcr_position;
+	u32 first_pcr_position;
+	Bool first_pcr_position_valid;
+	u32 prev_last_pcr_position;
+
+} GF_TSSegmenter;
+
+static void m2ts_sidx_add_entry(GF_SegmentIndexBox *sidx, Bool ref_type, 
+								u32 size, u32 duration, Bool first_is_SAP, u32 sap_type, u32 RAP_delta_time)
+{
+	GF_SIDXReference *ref;
+	sidx->nb_refs++;
+	sidx->refs = gf_realloc(sidx->refs, sidx->nb_refs*sizeof(GF_SIDXReference));
+	ref = &(sidx->refs[sidx->nb_refs-1]);
+	ref->reference_type = ref_type;
+	ref->reference_size = size;
+	ref->subsegment_duration = duration;
+	ref->starts_with_SAP = first_is_SAP;
+	ref->SAP_type = sap_type;
+	ref->SAP_delta_time = (sap_type ? RAP_delta_time: 0);
+}
+
+static void m2ts_sidx_finalize_size(GF_TSSegmenter *index_info, u64 file_size)
+{
+	GF_SIDXReference *ref;
+	if (index_info->suspend_indexing) return;
+	if (index_info->sidx->nb_refs == 0) return;
+	ref = &(index_info->sidx->refs[index_info->sidx->nb_refs-1]);
+	ref->reference_size = (u32)(file_size - index_info->prev_base_offset);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Subsegment: position-range ajdustment:%d-%d (%d bytes)\n", index_info->prev_base_offset, (u32)file_size, ref->reference_size));
+}
+
+static void m2ts_sidx_flush_entry(GF_TSSegmenter *index_info) 
+{
+	u32 end_offset, size, duration; 
+	Bool store_segment = 1;
+
+	if (index_info->suspend_indexing) 
+		return;
+
+	if (index_info->skip_nb_segments) {
+		index_info->skip_nb_segments --;
+		store_segment = 0;
+	}
+
+	/* determine the end of the current index */
+	if (index_info->segment_at_rap) {
+		/*split at PAT*/
+		end_offset = index_info->last_pat_position;
+	} else {
+		/* split at PES header */
+		end_offset = index_info->last_offset; 
+	}
+	size = (u32)(end_offset - index_info->base_offset);
+	duration = (u32)(index_info->last_PTS - index_info->base_PTS);
+
+	if (store_segment) {
+		u32 prev_duration, SAP_delta_time, SAP_offset;
+		if (!index_info->sidx) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Segment: Reference PID: %d, EPTime: "LLU", Start Offset: %d bytes\n", index_info->reference_pid, index_info->base_PTS, index_info->base_offset));
+			index_info->sidx = (GF_SegmentIndexBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SIDX);
+			index_info->sidx->reference_ID = index_info->reference_pid;
+			/* timestamps in MPEG-2 are expressed in 90 kHz timescale */
+			index_info->sidx->timescale = 90000;
+			/* first encountered PTS on the PID for this subsegment */
+			index_info->sidx->earliest_presentation_time = index_info->base_PTS;
+			index_info->sidx->first_offset = index_info->base_offset;
+					
+		}
+		
+		if (!index_info->pcrb) {
+			index_info->pcrb = (GF_PcrInfoBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_PCRB);
+		}
+
+		/* close the current index */ 
+		SAP_delta_time = (u32)(index_info->first_SAP_PTS - index_info->base_PTS);
+		SAP_offset = (u32)(index_info->first_SAP_offset - index_info->base_offset);
+		m2ts_sidx_add_entry(index_info->sidx, 0, size, duration, index_info->first_pes_sap, index_info->SAP_type, SAP_delta_time);
+
+		/*add pcrb entry*/
+		index_info->pcrb->subsegment_count++;
+		index_info->pcrb->pcr_values = gf_realloc(index_info->pcrb->pcr_values, index_info->pcrb->subsegment_count*sizeof(u64));
+		index_info->pcrb->pcr_values[index_info->pcrb->subsegment_count-1] = index_info->interpolated_pcr_value;
+
+		/* adjust the previous index duration */
+		if (index_info->sidx->nb_refs > 0 && (index_info->base_PTS < index_info->prev_last_PTS) ) {
+			prev_duration = (u32)(index_info->base_PTS-index_info->prev_base_PTS);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("           time-range adj.: %.03f-%.03f / %.03f sec.\n", 		
+				(index_info->prev_base_PTS - index_info->first_PTS)/90000.0, 
+				(index_info->base_PTS - index_info->first_PTS)/90000.0, prev_duration/90000.0));
+			
+			/*update previous duration*/
+			if (index_info->sidx->nb_refs) {
+				index_info->sidx->refs[index_info->sidx->nb_refs-1].subsegment_duration = prev_duration;
+			}
+
+		}
+
+		/* Printing result */
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Subsegment:"));
+		//time-range:position-range: 
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (" %.03f-%0.3f / %.03f sec., %d-%d / %d bytes, ",
+			(index_info->base_PTS - index_info->first_PTS)/90000.0, 
+			(index_info->last_PTS - index_info->first_PTS)/90000.0, duration/90000.0,
+			index_info->base_offset, end_offset, size));
+		if (index_info->SAP_type) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("RAP @ %.03f sec. / %d bytes", (index_info->first_SAP_PTS - index_info->first_PTS)/90000.0, 
+				SAP_offset));
+		}
+		if (index_info->first_pat_position_valid) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", PAT @ %d bytes", (u32)(index_info->first_pat_position - index_info->base_offset)));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No PAT"));
+		}
+		if (index_info->first_cat_position_valid) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", CAT @ %d bytes", (u32)(index_info->first_cat_position - index_info->base_offset)));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No CAT"));
+		}
+		if (index_info->first_pmt_position_valid) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", PMT @ %d bytes", (u32)(index_info->first_pmt_position - index_info->base_offset)));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No PMT"));
+		}
+		if (index_info->first_pcr_position_valid) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", PCR @ %d bytes", (u32)(index_info->first_pcr_position - index_info->base_offset)));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No PCR"));
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("\n"));
+
+	}
+
+	/* save the current values for later adjustments */
+	index_info->prev_last_SAP_PTS = index_info->last_SAP_PTS;
+	index_info->prev_last_SAP_offset = index_info->last_SAP_offset;
+	index_info->prev_last_PTS = index_info->last_PTS;
+	index_info->prev_last_offset = index_info->last_offset;
+	index_info->prev_base_PTS = index_info->base_PTS;
+	index_info->base_PTS = index_info->last_PTS;
+	index_info->prev_base_offset = index_info->base_offset;
+	index_info->prev_last_pat_position = index_info->last_pat_position;
+	index_info->prev_last_cat_position = index_info->last_cat_position;
+	index_info->prev_last_pmt_position = index_info->last_pmt_position;
+	index_info->prev_last_pcr_position = index_info->last_pcr_position;
+	
+	/* update the values for the new index*/
+	index_info->base_offset = end_offset;
+	index_info->SAP_type = 0;
+	index_info->first_SAP_PTS = 0;
+	index_info->first_SAP_offset = 0;
+	index_info->first_pes_sap = 0;
+	index_info->nb_pes_in_segment = 0;
+	index_info->last_DTS = 0;
+
+	if (index_info->last_pat_position >= index_info->base_offset) {
+		index_info->first_pat_position_valid = 1;
+		index_info->first_pat_position = index_info->last_pat_position;
+	} else {
+		index_info->first_pat_position_valid = 0;
+		index_info->first_pat_position = 0;
+	}
+	if (index_info->last_cat_position >= index_info->base_offset) {
+		index_info->first_cat_position_valid = 1;
+		index_info->first_cat_position = index_info->last_cat_position;
+	} else {
+		index_info->first_cat_position_valid = 0;
+		index_info->first_cat_position = 0;
+	}
+	if (index_info->last_pmt_position >= index_info->base_offset) {
+		index_info->first_pmt_position_valid = 1;
+		index_info->first_pmt_position = index_info->last_pmt_position;
+	} else {
+		index_info->first_pmt_position_valid = 0;
+		index_info->first_pmt_position = 0;
+	}
+	if (index_info->last_pcr_position >= index_info->base_offset) {
+		index_info->first_pcr_position_valid = 1;
+		index_info->first_pcr_position = index_info->last_pcr_position;
+	} else {
+		index_info->first_pcr_position_valid = 0;
+		index_info->first_pcr_position = 0;
+	}
+
+	index_info->cumulated_duration += duration;
+	if (index_info->subduration && (index_info->cumulated_duration >= index_info->subduration))
+		index_info->suspend_indexing = end_offset;
+}
+
+static void m2ts_check_indexing(GF_TSSegmenter *index_info)
+{
+	u32 delta_time = (u32)(index_info->last_PTS - index_info->base_PTS);
+	u32 segment_duration = (u32)(index_info->segment_duration*90000);
+	/* we exceed the segment duration flush sidx entry*/
+	if (delta_time >= segment_duration) {
+		m2ts_sidx_flush_entry(index_info);
+	} 
+}
+static void dash_m2ts_event_check_pat(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
+{
+	GF_TSSegmenter *ts_seg = (GF_TSSegmenter*)ts->user;
+	GF_M2TS_PES_PCK *pck;
+	switch (evt_type) {
+	case GF_M2TS_EVT_PAT_REPEAT:
+		ts_seg->has_seen_pat = 1;
+		break;
+	case GF_M2TS_EVT_PMT_FOUND:
+	{
+		u32 i, count;
+		GF_M2TS_Program *prog = (GF_M2TS_Program*)par;
+		count = gf_list_count(prog->streams);
+		for (i=0; i<count; i++) {
+			GF_M2TS_ES *es = gf_list_get(prog->streams, i);
+			gf_m2ts_set_pes_framing((GF_M2TS_PES *)es, GF_M2TS_PES_FRAMING_DEFAULT);
+		}
+	}
+		break;
+	case GF_M2TS_EVT_PES_PCK:
+		pck = par;
+		/* we process packets only for the given PID */
+		if (pck->stream->pid == pck->stream->program->pcr_pid) {
+			if (!ts_seg->nb_pes_in_segment || (ts_seg->first_PTS > pck->PTS)) {
+				ts_seg->first_PTS = pck->PTS;
+				ts_seg->nb_pes_in_segment++;
+			}
+			if (pck->PTS > ts_seg->last_PTS) {
+				ts_seg->last_PTS = pck->PTS;
+			}
+			if (ts_seg->last_DTS != pck->DTS) {
+				ts_seg->last_frame_duration = (u32) (pck->DTS - ts_seg->last_DTS);
+				ts_seg->last_DTS = pck->DTS;
+			}
+		}
+		break;
+	}
+}
+
+static void dash_m2ts_event(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
+{
+	GF_M2TS_Program *prog;
+	GF_M2TS_PES_PCK *pck;
+	GF_M2TS_PES *pes;
+	u64 interpolated_pcr_value;
+	u32 count, i;
+	GF_TSSegmenter *ts_seg = (GF_TSSegmenter*)ts->user;
+
+	switch (evt_type) {
+	case GF_M2TS_EVT_PAT_FOUND:
+		if (!ts_seg->first_pat_position_valid) {
+			ts_seg->first_pat_position_valid = 1;
+			ts_seg->first_pat_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_pat_position = (ts->pck_number-1)*188;
+		break;
+	case GF_M2TS_EVT_PAT_UPDATE:
+		if (!ts_seg->first_pat_position_valid) {
+			ts_seg->first_pat_position_valid = 1;
+			ts_seg->first_pat_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_pat_position = (ts->pck_number-1)*188;
+		break;
+	case GF_M2TS_EVT_PAT_REPEAT:
+		if (!ts_seg->first_pat_position_valid) {
+			ts_seg->first_pat_position_valid = 1;
+			ts_seg->first_pat_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_pat_position = (ts->pck_number-1)*188;
+		break;
+	case GF_M2TS_EVT_CAT_FOUND:
+		if (!ts_seg->first_cat_position_valid) {
+			ts_seg->first_cat_position_valid = 1;
+			ts_seg->first_cat_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_cat_position = (ts->pck_number-1)*188;
+		break;
+	case GF_M2TS_EVT_CAT_UPDATE:
+		if (!ts_seg->first_cat_position_valid) {
+			ts_seg->first_cat_position_valid = 1;
+			ts_seg->first_cat_position = (ts->pck_number-1)*188;
+		}
+		break;
+	case GF_M2TS_EVT_CAT_REPEAT:
+		if (!ts_seg->first_cat_position_valid) {
+			ts_seg->first_cat_position_valid = 1;
+			ts_seg->first_cat_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_cat_position = (ts->pck_number-1)*188;
+		break;
+	case GF_M2TS_EVT_PMT_FOUND:
+		ts_seg->has_seen_pat = 1;
+		prog = (GF_M2TS_Program*)par;
+		if (!ts_seg->first_pmt_position_valid) {
+			ts_seg->first_pmt_position_valid = 1;
+			ts_seg->first_pmt_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_pmt_position = (ts->pck_number-1)*188;
+		/* we create indexing information on the stream used for carrying the PCR */
+		ts_seg->reference_pid = prog->pcr_pid;
+		ts_seg->reference_stream = (GF_M2TS_PES *) ts_seg->ts->ess[prog->pcr_pid];
+		count = gf_list_count(prog->streams);
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Program number %d found - %d streams:\n", prog->number, count));
+		for (i=0; i<count; i++) {
+			GF_M2TS_ES *es = gf_list_get(prog->streams, i);
+			gf_m2ts_set_pes_framing((GF_M2TS_PES *)es, GF_M2TS_PES_FRAMING_DEFAULT);
+		}
+		break;
+	case GF_M2TS_EVT_PMT_UPDATE:
+		if (!ts_seg->first_pmt_position_valid) {
+			ts_seg->first_pmt_position_valid = 1;
+			ts_seg->first_pmt_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_pmt_position = (ts->pck_number-1)*188;
+		break;
+	case GF_M2TS_EVT_PMT_REPEAT:
+		if (!ts_seg->first_pmt_position_valid) {
+			ts_seg->first_pmt_position_valid = 1;
+			ts_seg->first_pmt_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_pmt_position = (ts->pck_number-1)*188;
+		break;
+	case GF_M2TS_EVT_PES_PCK:
+		pck = par;
+		/*We need the interpolated PCR for the pcrb, hence moved this calculus out, and saving the calculated value in ts_seg to put it in the pcrb*/
+		pes = pck->stream;
+		/* Interpolated PCR value for the TS packet containing the PES header start */
+		interpolated_pcr_value = 0;
+		if (pes->last_pcr_value && pes->before_last_pcr_value_pck_number && pes->last_pcr_value > pes->before_last_pcr_value) {
+			u32 delta_pcr_pck_num = pes->last_pcr_value_pck_number - pes->before_last_pcr_value_pck_number;
+			u32 delta_pts_pcr_pck_num = pes->pes_start_packet_number - pes->last_pcr_value_pck_number;
+			u64 delta_pcr_value = pes->last_pcr_value - pes->before_last_pcr_value; 
+			if ((pes->pes_start_packet_number > pes->last_pcr_value_pck_number)
+				&& (pes->last_pcr_value > pes->before_last_pcr_value)) {
+				
+					pes->last_pcr_value = pes->before_last_pcr_value;
+			}
+			/* we can compute the interpolated pcr value for the packet containing the PES header */
+			interpolated_pcr_value = pes->last_pcr_value + (u64)((delta_pcr_value*delta_pts_pcr_pck_num*1.0)/delta_pcr_pck_num);
+			ts_seg->interpolated_pcr_value = interpolated_pcr_value;
+			ts_seg->last_pcr_value = pes->last_pcr_value;
+		}
+		/* we process packets only for the given PID */
+		if (pck->stream->pid != ts_seg->reference_pid) {
+			break;
+		} else {
+			if (ts_seg->last_DTS != pck->DTS) {
+				if (ts_seg->last_DTS)
+					ts_seg->last_frame_duration = (u32) (pck->DTS - ts_seg->last_DTS);
+				ts_seg->last_DTS = pck->DTS;
+				ts_seg->nb_pes_in_segment++;
+			}
+
+			/* we store the fact that there is at least a RAP for the index
+			and we store the PTS of the first encountered RAP in the index*/
+			if (pck->flags & GF_M2TS_PES_PCK_RAP) {
+				ts_seg->SAP_type = 1;
+				if (!ts_seg->first_SAP_PTS || (ts_seg->first_SAP_PTS > pck->PTS)) {
+					ts_seg->first_SAP_PTS = pck->PTS;
+					ts_seg->first_SAP_offset = (pck->stream->pes_start_packet_number-1)*188;
+				}
+				ts_seg->last_SAP_PTS = pck->PTS;
+				ts_seg->last_SAP_offset = (pck->stream->pes_start_packet_number-1)*188;
+
+				if (ts_seg->nb_pes_in_segment==1) {
+					ts_seg->first_pes_sap = 1;
+				}
+			}
+			/* we need to know the earliest PTS value (RAP or not) in the index*/
+			if (!ts_seg->base_PTS || (ts_seg->base_PTS > pck->PTS)) {
+				ts_seg->base_PTS = pck->PTS;
+			}
+			/* we need to know the earliest PTS value for the whole file (segment) */
+			if (!ts_seg->first_PTS || (ts_seg->first_PTS > pck->PTS)) {
+				ts_seg->first_PTS = pck->PTS;
+			}
+			if (pck->PTS > ts_seg->last_PTS) {
+				/* we use the last PTS for first approximation of the duration */
+				ts_seg->last_PTS = pck->PTS;
+				ts_seg->last_offset = (ts_seg->reference_stream->pes_start_packet_number-1)*188;
+			}
+
+			if (ts_seg->PCR_DTS_initial_diff == (u64) -1) {
+				ts_seg->PCR_DTS_initial_diff = ts_seg->last_DTS - pes->last_pcr_value / 300;
+			}
+
+			m2ts_check_indexing(ts_seg);
+		}
+		break;
+	case GF_M2TS_EVT_PES_PCR:
+		pck = par;
+		if (!ts_seg->first_pcr_position_valid) {
+			ts_seg->first_pcr_position_valid = 1;
+			ts_seg->first_pcr_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_pcr_position = (ts->pck_number-1)*188;
+		break;
+	}
+}
+
+static GF_Err dasher_get_ts_demux(GF_TSSegmenter *ts_seg, const char *file, u32 probe_mode)
+{
+	memset(ts_seg, 0, sizeof(GF_TSSegmenter));
+	ts_seg->src = gf_f64_open(file, "rb");
+	if (!ts_seg->src) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot open input %s: no such file\n", file));
+		return GF_URL_ERROR;
+	}
+	ts_seg->ts = gf_m2ts_demux_new();
+	ts_seg->ts->on_event = dash_m2ts_event_check_pat;
+	ts_seg->ts->notify_pes_timing = 1;
+	ts_seg->ts->user = ts_seg;
+
+	gf_f64_seek(ts_seg->src, 0, SEEK_END);
+	ts_seg->file_size = gf_f64_tell(ts_seg->src);
+	gf_f64_seek(ts_seg->src, 0, SEEK_SET);
+
+	if (probe_mode) {
+		/* first loop to process all packets between two PAT, and assume all signaling was found between these 2 PATs */
+		while (!feof(ts_seg->src)) {
+			char data[188];
+			u32 size = fread(data, 1, 188, ts_seg->src);
+			if (size<188) break;
+
+			gf_m2ts_process_data(ts_seg->ts, data, size);
+			if ((probe_mode ==1) && ts_seg->has_seen_pat) break;
+		}
+		gf_m2ts_reset_parsers(ts_seg->ts);
+		gf_f64_seek(ts_seg->src, 0, SEEK_SET);
+	}
+	ts_seg->ts->on_event = dash_m2ts_event;
+	return GF_OK;
+}
+
+static void dasher_del_ts_demux(GF_TSSegmenter *ts_seg)
+{
+	if (ts_seg->ts) gf_m2ts_demux_del(ts_seg->ts);
+	if (ts_seg->src) fclose(ts_seg->src);
+	memset(ts_seg, 0, sizeof(GF_TSSegmenter));
+}
+
+static GF_Err dasher_mp2t_get_components_info(GF_DashSegInput *dash_input, GF_DASHSegmenterOptions *opts)
+{
+	GF_TSSegmenter ts_seg;
+	GF_Err e = dasher_generic_get_components_info(dash_input, opts);
+	if (e) return e;
+
+	e = dasher_get_ts_demux(&ts_seg, dash_input->file_name, 2);
+	if (e) return e;
+
+	dash_input->duration = (ts_seg.last_PTS + ts_seg.last_frame_duration - ts_seg.first_PTS)/90000.0;
+	dasher_del_ts_demux(&ts_seg);
+
+	return GF_OK;
+}
+
+#define NB_TSPCK_IO_BYTES 18800
+
+static GF_Err dasher_mp2t_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenterOptions *dash_cfg, Bool first_in_set)
+{	
+	GF_TSSegmenter ts_seg;
+	Bool rewrite_input = 0;
+	u8 is_pes[GF_M2TS_MAX_STREAMS];
+	char szOpt[100];
+	char SegName[GF_MAX_PATH], IdxName[GF_MAX_PATH];
+	char szSectionName[100], szRepURLsSecName[100];
+	char szCodecs[100];
+	const char *opt;
+	u32 i, startNumberRewind;
+	GF_Err e;
+	u64 start, pcr_shift, next_pcr_shift;
+	Double cumulated_duration = 0;
+	u32 bandwidth = 0;
+	u32 segment_index;
+	/*compute name for indexed segments*/
+	const char *basename = gf_url_get_resource_name(szOutName);
+
+	/*perform indexation of the file, this info will be destroyed at the end of the segment file routine*/
+	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.bandwidth = (u32) (ts_seg.file_size * 8 / dash_input->duration);	
+
+	/*create bitstreams*/
+
+	segment_index = 1;
+	startNumberRewind = 0;
+	ts_seg.index_file = NULL;
+	ts_seg.index_bs = NULL;
+	if (!dash_cfg->dash_ctx && (dash_cfg->use_url_template != 2)) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+		GF_SegmentTypeBox *styp;
+
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, 1, IdxName, szOutName, dash_input->representationID, dash_cfg->seg_rad_name, "six", 0, 0, 0, dash_cfg->use_segment_timeline);	
+
+		ts_seg.index_file = gf_f64_open(IdxName, "wb");
+		if (!ts_seg.index_file) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot create index file %s\n", IdxName));
+			e = GF_IO_ERR;
+			goto exit;
+		}
+		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->minorVersion = 0;
+		styp->altBrand = (u32*)gf_malloc(sizeof(u32));
+		styp->altBrand[0] = styp->majorBrand;
+		styp->altCount = 1;
+		gf_isom_box_size((GF_Box *)styp);
+		gf_isom_box_write((GF_Box *)styp, ts_seg.index_bs);
+		gf_isom_box_del((GF_Box *)styp);
+#endif
+	}
+
+	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, 1, IdxName, basename, dash_input->representationID, dash_cfg->seg_rad_name, "six", 0, 0, 0, dash_cfg->use_segment_timeline);	
+
+	ts_seg.PCR_DTS_initial_diff = (u64) -1;
+	ts_seg.subduration = (u32) (dash_cfg->subduration * 90000);
+
+	szSectionName[0] = 0;
+	if (dash_cfg->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");
+		if (opt) {
+			u64 offset;
+			sscanf(opt, LLU, &offset);
+
+			while (!feof(ts_seg.src) && !ts_seg.has_seen_pat) {
+				char data[NB_TSPCK_IO_BYTES];
+				u32 size = fread(data, 1, NB_TSPCK_IO_BYTES, ts_seg.src);
+				gf_m2ts_process_data(ts_seg.ts, data, size);
+
+				if (size<NB_TSPCK_IO_BYTES) break;
+			}
+			gf_m2ts_reset_parsers(ts_seg.ts);
+
+			gf_f64_seek(ts_seg.src, offset, SEEK_SET);
+			ts_seg.base_offset = offset;
+			ts_seg.ts->pck_number = (u32) (offset/188);
+		}
+
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "InitialDTSOffset");
+		if (opt) sscanf(opt, LLU, &ts_seg.PCR_DTS_initial_diff);
+	}
+
+	/*index the file*/
+	while (!feof(ts_seg.src) && !ts_seg.suspend_indexing) {
+		char data[NB_TSPCK_IO_BYTES];
+		u32 size = fread(data, 1, NB_TSPCK_IO_BYTES, ts_seg.src);
+		gf_m2ts_process_data(ts_seg.ts, data, size);
+		if (size<NB_TSPCK_IO_BYTES) break;
+	}
+	if (feof(ts_seg.src)) ts_seg.suspend_indexing = 0;
+
+	next_pcr_shift = 0;
+	if (!ts_seg.suspend_indexing) {
+		next_pcr_shift = ts_seg.last_DTS + ts_seg.last_frame_duration - ts_seg.PCR_DTS_initial_diff;
+	}
+
+	/* flush SIDX entry for the last packets */
+	m2ts_sidx_flush_entry(&ts_seg);
+	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, 1, IdxName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "six", 0, 0, 0, dash_cfg->use_segment_timeline);	
+
+
+	memset(is_pes, 0, sizeof(u8)*GF_M2TS_MAX_STREAMS);
+	for (i=0; i<dash_input->nb_components; i++) {
+		is_pes[ dash_input->components[i].ID ] = 1;
+	}
+	pcr_shift = 0;
+
+	bandwidth = dash_input->bandwidth;
+	if (!bandwidth) bandwidth = ts_seg.bandwidth;
+
+	if (dash_cfg->dash_ctx) {
+
+		opt = gf_cfg_get_key(dash_cfg->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);
+		} else {
+			if (!bandwidth) {
+				opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "Bandwidth");
+				if (opt) sscanf(opt, "%u", &bandwidth);
+			}
+
+			opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "StartIndex");
+			if (opt) sscanf(opt, "%u", &segment_index);
+
+			/*adjust the startNumber according to the timeShiftBuffer depth*/
+			if ((dash_cfg->time_shift_depth>0) && (segment_index > (u32)dash_cfg->time_shift_depth) ) {
+				startNumberRewind = dash_cfg->time_shift_depth;
+			}
+
+
+			opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "PCR90kOffset");
+			if (opt) sscanf(opt, LLU, &pcr_shift);
+
+			opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "CumulatedDuration");
+			if (opt) cumulated_duration = atof(opt);
+		}
+	}
+
+	/*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, 1, SegName, basename, dash_input->representationID, gf_url_get_resource_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 - startNumberRewind, SegName); 
+		if (!dash_cfg->dash_ctx) {
+			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, 1, IdxName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "six", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
+			fprintf(dash_cfg->mpd, " index=\"%s\"", IdxName); 
+		} 
+		fprintf(dash_cfg->mpd, "/>\n");
+	}
+
+
+	fprintf(dash_cfg->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)) 
+			if (strlen(szCodecs))
+				strcat(szCodecs, ",");
+		strcat(szCodecs, dash_input->components[i].szCodec);
+
+		if (dash_input->components[i].width && dash_input->components[i].height) 
+			fprintf(dash_cfg->mpd, " width=\"%d\" height=\"%d\"", 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);
+	}
+	if (strlen(szCodecs))
+		fprintf(dash_cfg->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");
+
+	if (dash_cfg->single_file_mode==1) {
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 1, SegName, basename, dash_input->representationID, gf_url_get_resource_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);
+
+		fprintf(dash_cfg->mpd, "    <SegmentBase>\n");
+		fprintf(dash_cfg->mpd, "     <RepresentationIndex sourceURL=\"%s\"/>\n", IdxName);
+		fprintf(dash_cfg->mpd, "    </SegmentBase>\n");
+
+		/*we rewrite the file*/
+		rewrite_input = 1;
+	} 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, 1, SegName, basename, dash_input->representationID, gf_url_get_resource_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) (9000*dash_cfg->segment_duration), segment_index, SegName); 
+				if (!dash_cfg->dash_ctx) {
+					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, 1, IdxName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "six", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
+					fprintf(dash_cfg->mpd, " index=\"%s\"", IdxName); 
+				}
+
+				if (dash_cfg->time_shift_depth>=0) 
+					fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", ts_seg.sidx->earliest_presentation_time + pcr_shift); 
+				fprintf(dash_cfg->mpd, "/>\n"); 
+			} else if (dash_cfg->time_shift_depth>=0) {
+				fprintf(dash_cfg->mpd, "    <SegmentTemplate presentationTimeOffset=\""LLD"\"/>\n", ts_seg.sidx->earliest_presentation_time + pcr_shift); 
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH]: PTSOffset "LLD" - startNumber %d - time %g\n", ts_seg.sidx->earliest_presentation_time + pcr_shift, 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, 1, SegName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "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)); 
+			if (dash_cfg->time_shift_depth>=0) 
+				fprintf(dash_cfg->mpd, " presentationTimeOffset=\""LLD"\"", ts_seg.sidx->earliest_presentation_time + pcr_shift); 
+			fprintf(dash_cfg->mpd, ">\n"); 
+
+			if (!dash_cfg->dash_ctx) {
+				fprintf(dash_cfg->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))) {
+			/*rewrite previous URLs*/
+			const char *opt;
+			u32 count, i;
+			count = gf_cfg_get_key_count(dash_cfg->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);	
+			}
+		}
+
+		if (dash_cfg->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);
+				start += ref->reference_size;
+			}
+			rewrite_input = 1;
+
+		} else {
+			FILE *src, *dst;
+			u64 pos, end;
+			Double current_time = cumulated_duration, dur;
+			src = gf_f64_open(dash_input->file_name, "rb");
+			start = ts_seg.sidx->first_offset;
+			for (i=0; i<ts_seg.sidx->nb_refs; i++) {
+				char buf[NB_TSPCK_IO_BYTES];
+				GF_SIDXReference *ref = &ts_seg.sidx->refs[i];
+
+				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 1, SegName, szOutName, dash_input->representationID, dash_cfg->seg_rad_name, "ts", 0, bandwidth, segment_index, dash_cfg->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) {
+					dst = gf_f64_open(SegName, "wb");
+					if (!dst) {
+						fclose(src);
+						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot create segment file %s\n", SegName));
+						e = GF_IO_ERR;
+						goto exit;
+					}
+
+					gf_dasher_store_segment_info(dash_cfg, SegName, current_time);
+					dur = ref->subsegment_duration;
+					dur /= 90000;
+					current_time += dur;
+
+					gf_f64_seek(src, start, SEEK_SET);
+					pos = start;
+					end = start+ref->reference_size;
+					while (pos<end) {
+						u32 res;
+						u32 to_read = NB_TSPCK_IO_BYTES;
+						if (pos+NB_TSPCK_IO_BYTES >= end) {
+							to_read = (u32) (end-pos);
+						}
+						res = fread(buf, 1, to_read, src);
+						if (res==to_read) {
+							gf_m2ts_restamp(buf, res, pcr_shift, is_pes);
+							res = fwrite(buf, 1, to_read, dst);
+						}
+						if (res!=to_read) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: IO error while Extracting segment %03d / %03d\r", i+1, ts_seg.sidx->nb_refs));
+							break;
+						}
+						pos += res;
+					}
+					fclose(dst);
+				}
+				start += ref->reference_size;
+
+				if (!dash_cfg->use_url_template) {
+					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 1, SegName, basename, dash_input->representationID, 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 (dash_cfg->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);
+					}
+				}
+
+				segment_index++;
+				gf_set_progress("Extracting segment ", i+1, ts_seg.sidx->nb_refs);
+			}
+			fclose(src);
+			cumulated_duration = current_time;
+		}	
+		if (!dash_cfg->seg_rad_name || !dash_cfg->use_url_template) {
+			fprintf(dash_cfg->mpd, "    </SegmentList>\n");
+		}
+	}
+
+	if (rewrite_input) {
+		FILE *in, *out;
+		u64 fsize, done;
+		char buf[NB_TSPCK_IO_BYTES];
+
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 1, SegName, dash_cfg->seg_rad_name ? basename : szOutName, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
+		out = gf_f64_open(SegName, "wb");
+		if (!out) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot create segment file %s\n", SegName));
+			e = GF_IO_ERR;
+			goto exit;
+		}
+		in = gf_f64_open(dash_input->file_name, "rb");
+		gf_f64_seek(in, 0, SEEK_END);
+		fsize = gf_f64_tell(in);
+		gf_f64_seek(in, 0, SEEK_SET);
+		done = 0;
+		while (1) {
+			u32 read = fread(buf, 1, NB_TSPCK_IO_BYTES, in);
+			gf_m2ts_restamp(buf, read, pcr_shift, is_pes);
+			fwrite(buf, 1, read, out);
+			done+=read;
+			gf_set_progress("Extracting segment ", done/188, fsize/188);
+			if (read<NB_TSPCK_IO_BYTES) break;
+		}
+		fclose(in);
+		fclose(out);
+	}
+
+	fprintf(dash_cfg->mpd, "   </Representation>\n");
+
+	if (dash_cfg->dash_ctx) {
+		sprintf(szOpt, "%u", bandwidth);
+		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "Bandwidth", szOpt);
+
+		sprintf(szOpt, "%u", segment_index);
+		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "StartIndex", szOpt);
+
+		sprintf(szOpt, "%g", ts_seg.segment_duration);
+		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "CumulatedDuration", szOpt);
+
+		sprintf(szOpt, LLU, next_pcr_shift + pcr_shift);
+		gf_cfg_set_key(dash_cfg->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);
+
+		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);
+
+		sprintf(szOpt, "%g", cumulated_duration);
+		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "CumulatedDuration", szOpt);
+	}
+
+	if (ts_seg.sidx && ts_seg.index_bs) {
+		gf_isom_box_size((GF_Box *)ts_seg.sidx);
+		gf_isom_box_write((GF_Box *)ts_seg.sidx, ts_seg.index_bs);
+	}
+	if (ts_seg.pcrb && ts_seg.index_bs) {
+		gf_isom_box_size((GF_Box *)ts_seg.pcrb);
+		gf_isom_box_write((GF_Box *)ts_seg.pcrb, ts_seg.index_bs);
+	}
+
+exit:
+	if (ts_seg.sidx) gf_isom_box_del((GF_Box *)ts_seg.sidx);
+	if (ts_seg.pcrb) gf_isom_box_del((GF_Box *)ts_seg.pcrb);
+	if (ts_seg.index_file) fclose(ts_seg.index_file);
+	if (ts_seg.index_bs) gf_bs_del(ts_seg.index_bs);
+	dasher_del_ts_demux(&ts_seg);
+	return e;
+}
+
+#endif //GPAC_DISABLE_MPEG2TS
+
+GF_Err gf_dash_segmenter_probe_input(GF_DashSegInput *dash_input)
+{
+	FILE *t = gf_f64_open(dash_input->file_name, "rb");
+	if (!t) return GF_URL_ERROR;
+	fclose(t);
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	if (gf_isom_probe_file(dash_input->file_name)) {
+		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_segment_file = dasher_isom_segment_file;
+		return GF_OK;
+	}
+#endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
+
+#ifndef GPAC_DISABLE_MPEG2TS
+	if (gf_m2ts_probe_file(dash_input->file_name)) {
+		GF_TSSegmenter ts_seg;
+		u32 count = 0;
+		GF_Err e = dasher_get_ts_demux(&ts_seg, dash_input->file_name, 1);
+		if (e) return e;
+		count = gf_list_count(ts_seg.ts->programs);
+		dasher_del_ts_demux(&ts_seg);
+		if (count>1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: MPEG-2 TS file %s has several programs - this is not supported in MPEG-DASH - skipping\n", dash_input->file_name));
+			return GF_NOT_SUPPORTED;
+		}
+
+		strcpy(dash_input->szMime, "video/mp2t");
+		/*we don't use init segments with MPEG-2 TS*/
+		dash_input->dasher_create_init_segment = NULL;
+		dash_input->dasher_input_classify = dasher_generic_classify_input;
+		dash_input->dasher_get_components_info = dasher_mp2t_get_components_info;
+		dash_input->dasher_segment_file = dasher_mp2t_segment_file;
+		return GF_OK;
+	}
+#endif
+
+	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: File %s not supported for dashing - skipping\n", dash_input->file_name));
+	return GF_NOT_SUPPORTED;
+}
+
+static GF_Err write_mpd_header(FILE *mpd, const char *mpd_name, GF_Config *dash_ctx, GF_DashProfile profile, Bool is_mpeg2, const char *title, const char *source, const char *copyright, const char *moreInfoURL, const char **mpd_base_urls, u32 nb_mpd_base_urls, Bool dash_dynamic, u32 time_shift_depth, Double mpd_duration, Double mpd_update_period, Double min_buffer, u32 ast_shift_sec)
+{
+#ifndef _WIN32_WCE
+		u32 sec, frac;
+		time_t gtime;
+		struct tm *t;
+#endif
+	u32 h, m, i;
 	Double s;
-	FILE *mpd = fopen(mpd_name, first_adaptation_set ? "wt" : "a+t");
-	if (!mpd) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[MPD] Cannot open MPD file %s for writing\n", mpd_name));
-		return GF_IO_ERR;
+
+	gf_net_get_ntp(&sec, &frac);
+	sec += ast_shift_sec;
+	
+	fprintf(mpd, "<?xml version=\"1.0\"?>\n");
+	fprintf(mpd, "\n");
+
+	/*TODO what should we put for minBufferTime */
+	fprintf(mpd, "<MPD xmlns=\"urn:mpeg:dash:schema:mpd:2011\" minBufferTime=\"PT%fS\" type=\"%s\"", min_buffer, dash_dynamic ? "dynamic" : "static"); 
+	if (dash_dynamic) {
+#ifndef _WIN32_WCE
+
+		/*otherwise timeshift is infinite, use original availability start time*/
+		if ((s32)time_shift_depth<0) {
+			const char *opt = gf_cfg_get_key(dash_ctx, "DASH", "GenerationNTP");
+			sscanf(opt, "%u", &sec);
+		}
+		gtime = sec - GF_NTP_SEC_1900_TO_1970;
+		t = gmtime(&gtime);
+		fprintf(mpd, " availabilityStartTime=\"%d-%02d-%02dT%02d:%02d:%02dZ\"", 1900+t->tm_year, t->tm_mon+1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
+		if (ast_shift_sec) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] MPD AvailabilityStartTime %d-%02d-%02dT%02d:%02d:%02dZ\n", 1900+t->tm_year, t->tm_mon+1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec) );
+		}
+#endif
+
+		if ((s32)time_shift_depth>=0) {
+			h = (u32) (time_shift_depth/3600);
+			m = (u32) (time_shift_depth-h*60)/60;
+			s = time_shift_depth - h*3600 - m*60;
+			fprintf(mpd, " timeShiftBufferDepth=\"PT%dH%dM%.2fS\"", h, m, s);
+		}
+		if (mpd_update_period) {
+			h = (u32) (mpd_update_period/3600);
+			m = (u32) (mpd_update_period-h*60)/60;
+			s = mpd_update_period - h*3600 - m*60;
+			fprintf(mpd, " minimumUpdatePeriod=\"PT%dH%dM%.2fS\"", h, m, s);
+		}
+		
+	} else {
+		h = (u32) (mpd_duration/3600);
+		m = (u32) (mpd_duration-h*60)/60;
+		s = mpd_duration - h*3600 - m*60;
+		fprintf(mpd, " mediaPresentationDuration=\"PT%dH%dM%.2fS\"", h, m, s);
 	}
 
-	h = (u32) (period_duration/3600);
-	m = (u32) (period_duration-h*60)/60;
-	s = period_duration - h*3600 - m*60;
-
-	if (first_adaptation_set) {
-		fprintf(mpd, "<?xml version=\"1.0\"?>\n");
-		fprintf(mpd, "\n");
-
-		/*TODO what should we put for minBufferTime */
-		fprintf(mpd, "<MPD type=\"static\" xmlns=\"urn:mpeg:DASH:schema:MPD:2011\" minBufferTime=\"PT1.5S\" mediaPresentationDuration=\"PT%dH%dM%.2fS\" ", 
-			h, m, s);
-
-		if (profile==GF_DASH_PROFILE_LIVE) 
-			fprintf(mpd, "profiles=\"urn:mpeg:dash:profile:isoff-live:2011\">\n");
-		else if (profile==GF_DASH_PROFILE_ONDEMAND) 
-			fprintf(mpd, "profiles=\"urn:mpeg:dash:profile:isoff-on-demand:2011\">\n");
-		else if (profile==GF_DASH_PROFILE_MAIN) 
-			fprintf(mpd, "profiles=\"urn:mpeg:dash:profile:isoff-main:2011\">\n");
-		else 
-			fprintf(mpd, "profiles=\"urn:mpeg:dash:profile:full:2011\">\n");	
-
-		fprintf(mpd, " <ProgramInformation moreInformationURL=\"%s\">\n", moreInfoURL ? moreInfoURL : "http://gpac.sourceforge.net");	
-		if (title) 
-			fprintf(mpd, "  <Title>%s</Title>\n", title);
-		else 
-			fprintf(mpd, "  <Title>%s generated by GPAC</Title>\n", mpd_name);
-
-		if (source) 
-			fprintf(mpd, "  <Source>%s</Source>\n", source);
-		if (copyright)
-			fprintf(mpd, "  <Copyright>%s</Copyright>\n", copyright);
-		fprintf(mpd, " </ProgramInformation>\n");
+	if (profile==GF_DASH_PROFILE_LIVE) {
+		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:%s:2011\"", is_mpeg2 ? "mp2t-simple" : "isoff-live");
+	} else if (profile==GF_DASH_PROFILE_ONDEMAND) 
+		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-on-demand:2011\"");
+	else if (profile==GF_DASH_PROFILE_MAIN) 
+		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:%s:2011\"", is_mpeg2 ? "mp2t-main" : "isoff-main");
+	else 
+		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:full:2011\"");	
 
-		fprintf(mpd, " <Period start=\"PT0S\" duration=\"PT%dH%dM%.2fS\">\n", h, m, s);	
+	fprintf(mpd, ">\n");
+
+	fprintf(mpd, " <ProgramInformation moreInformationURL=\"%s\">\n", moreInfoURL ? moreInfoURL : "http://gpac.sourceforge.net");	
+	if (title) 
+		fprintf(mpd, "  <Title>%s</Title>\n", title);
+	else 
+		fprintf(mpd, "  <Title>%s generated by GPAC</Title>\n", mpd_name);
+
+	if (source) 
+		fprintf(mpd, "  <Source>%s</Source>\n", source);
+	if (copyright)
+		fprintf(mpd, "  <Copyright>%s</Copyright>\n", copyright);
+	fprintf(mpd, " </ProgramInformation>\n");
+
+	for (i=0; i<nb_mpd_base_urls; i++) {
+		fprintf(mpd, " <BaseURL>%s</BaseURL>\n", mpd_base_urls[i]);
+	}
+	fprintf(mpd, "\n");
+	return GF_OK;
+}
+
+static GF_Err write_period_header(FILE *mpd, const char *szID, Double period_start, Double period_duration, Bool dash_dynamic)
+{
+	u32 h, m;
+	Double s;
+
+	fprintf(mpd, " <Period");
+	if (szID) 
+		fprintf(mpd, " id=\"%s\"", szID);
+	
+	if (period_start || dash_dynamic) {
+		h = (u32) (period_start/3600);
+		m = (u32) (period_start-h*60)/60;
+		s = period_start - h*3600 - m*60;
+		fprintf(mpd, " start=\"PT%dH%dM%.2fS\"", h, m, s);	
+	}
+	if (!dash_dynamic && period_duration) {
+		h = (u32) (period_duration/3600);
+		m = (u32) (period_duration-h*60)/60;
+		s = period_duration - h*3600 - m*60;
+		fprintf(mpd, " duration=\"PT%dH%dM%.2fS\"", h, m, s);	
 	}
+	fprintf(mpd, ">\n");	
+	return GF_OK;
+}
 
+static GF_Err write_adaptation_header(FILE *mpd, GF_DashProfile profile, Bool use_url_template, u32 single_file_mode, GF_DashSegInput *first_rep, Bool bitstream_switching_mode, u32 max_width, u32 max_height, char *szMaxFPS, char *szLang, const char *szInitSegment)
+{
 	fprintf(mpd, "  <AdaptationSet segmentAlignment=\"true\"");
 	if (bitstream_switching_mode) {
 		fprintf(mpd, " bitstreamSwitching=\"true\"");
 	}
-	if (group_id) {
-		fprintf(mpd, " group=\"%d\"", group_id);
+	if (first_rep->group_id) {
+		fprintf(mpd, " group=\"%d\"", first_rep->group_id);
 	}
 	if (max_width && max_height) {
-		fprintf(mpd, " maxWidth=\"%d\" maxHeight=\"%d\" maxFrameRate=\"%s\"", max_width, max_height, szMaxFPS);
+		fprintf(mpd, " maxWidth=\"%d\" maxHeight=\"%d\"", max_width, max_height);
+		if (strlen(szMaxFPS))
+			fprintf(mpd, " maxFrameRate=\"%s\"", szMaxFPS);
 		gf_media_reduce_aspect_ratio(&max_width, &max_height);
 		fprintf(mpd, " par=\"%d:%d\"", max_width, max_height);
 	}
 	if (szLang && szLang[0]) {
 		fprintf(mpd, " lang=\"%s\"", szLang);
 	}
+	/*this should be fixed to use info collected during segmentation process*/
+	if (profile==GF_DASH_PROFILE_ONDEMAND) 
+		fprintf(mpd, " subsegmentStartsWithSAP=\"1\"");
+
+	if (!strcmp(first_rep->szMime, "video/mp2t"))
+		fprintf(mpd, " subsegmentAlignment=\"true\"");
+
 	fprintf(mpd, ">\n");
 	
-	if (init_segment) {
+	if (first_rep) {
 		u32 i;
-		char langCode[4];
-		langCode[3] = 0;
 
-		for (i=0; i<gf_isom_get_track_count(init_segment); i++) {
-			u32 sr, nb_ch;
-			u32 trackID = gf_isom_get_track_id(init_segment, i+1);
-
-			gf_isom_get_media_language(init_segment, i+1, langCode);
-
-			switch (gf_isom_get_media_type(init_segment, i+1) ) {
-			case GF_ISOM_MEDIA_TEXT:
-				fprintf(mpd, "    <ContentComponent id=\"%d\" contentType=\"text\" lang=\"%s\"/>\n", trackID, langCode);
-				break;
-			case GF_ISOM_MEDIA_VISUAL:
-				fprintf(mpd, "   <ContentComponent id=\"%d\" contentType=\"video\"/>\n", trackID);
-				break;
-			case GF_ISOM_MEDIA_SCENE:
-			case GF_ISOM_MEDIA_DIMS:
-				fprintf(mpd, "   <ContentComponent id=\"%d\" contentType=\"application\" lang=\"%s\"/>\n", trackID, langCode);
-				break;
-			case GF_ISOM_MEDIA_AUDIO:
-				gf_isom_get_audio_info(init_segment, i+1, 1, &sr, &nb_ch, NULL);
-				fprintf(mpd, "   <ContentComponent id=\"%d\" contentType=\"audio\" lang=\"%s\"/>\n", trackID, langCode);
-				if (bitstream_switching_mode)
-					fprintf(mpd, "   <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\"/>\n", nb_ch);
-				break;
+		if (bitstream_switching_mode) {
+			for (i=0; i<first_rep->nb_components; i++) {
+				struct _dash_component *comp = &first_rep->components[i];
+				if (comp->media_type == GF_ISOM_MEDIA_AUDIO) {
+					fprintf(mpd, "   <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\"/>\n", comp->channels);
+				}
+			}
+		}
+
+		/*set role*/
+		if (strlen(first_rep->role)) {
+			if (!strcmp(first_rep->role, "caption") || !strcmp(first_rep->role, "subtitle") || !strcmp(first_rep->role, "main")
+				 || !strcmp(first_rep->role, "alternate") || !strcmp(first_rep->role, "supplementary") || !strcmp(first_rep->role, "commentary")
+				 || !strcmp(first_rep->role, "dub")
+			) {
+				fprintf(mpd, "   <Role schemeIdUri=\"urn:mpeg:dash:role:2011\" value=\"%s\"/>\n", first_rep->role);
 			}
 		}
 
-		if (bitstream_switching_mode && !use_url_template && (single_file_mode!=1) ) {
+
+		if (first_rep->nb_components>1) {
+			for (i=0; i<first_rep->nb_components; i++) {
+				struct _dash_component *comp = &first_rep->components[i];
+
+				fprintf(mpd, "   <ContentComponent id=\"%d\" ", comp->ID);
+				switch (comp->media_type ) {
+				case GF_ISOM_MEDIA_TEXT:
+					fprintf(mpd, "contentType=\"text\" ");
+					break;
+				case GF_ISOM_MEDIA_VISUAL:
+					fprintf(mpd, "contentType=\"video\" ");
+					break;
+				case GF_ISOM_MEDIA_AUDIO:
+					fprintf(mpd, "contentType=\"audio\" ");
+					break;
+				case GF_ISOM_MEDIA_SCENE:
+				case GF_ISOM_MEDIA_DIMS:
+				default:
+					fprintf(mpd, "contentType=\"application\" ");
+					break;
+				}
+				/*if lang not specified at adaptationSet level, put it here*/
+				if ((!szLang || !szLang[0]) && comp->szLang[0]) {
+					fprintf(mpd, " lang=\"%s\"", comp->szLang);
+				}
+				fprintf(mpd, "/>\n");
+			}
+		}
+
+		if (bitstream_switching_mode && !use_url_template && (single_file_mode!=1) && strlen(szInitSegment) ) {
 			fprintf(mpd, "   <SegmentList>\n");	
-			fprintf(mpd, "    <Initialization sourceURL=\"%s\"/>\n", gf_url_get_resource_name(gf_isom_get_filename(init_segment)));	
+			fprintf(mpd, "    <Initialization sourceURL=\"%s\"/>\n", gf_url_get_resource_name( szInitSegment ));	
 			fprintf(mpd, "   </SegmentList>\n");	
 		}
 	}
+	return GF_OK;
+}
+
+static GF_Err gf_dasher_init_context(GF_Config *dash_ctx, u32 *dynamic, u32 *timeShiftBufferDepth, const char *periodID)
+{
+	const char *opt;
+	char szVal[100];
+	Bool first_run = 0;
+	u32 sec, frac;
+#ifndef _WIN32_WCE
+	time_t gtime;
+#endif
+
+	if (!dash_ctx) return GF_BAD_PARAM;
+	
+	opt = gf_cfg_get_key(dash_ctx, "DASH", "SessionType");
+	/*first run, init all options*/
+	if (!opt) {
+		first_run = 1;
+		sprintf(szVal, "%d", *timeShiftBufferDepth);
+		gf_cfg_set_key(dash_ctx, "DASH", "SessionType", (*dynamic==2) ? "dynamic-debug" : ( *dynamic ? "dynamic" : "static" ) );
+		gf_cfg_set_key(dash_ctx, "DASH", "TimeShiftBufferDepth", szVal);
+		gf_cfg_set_key(dash_ctx, "DASH", "StoreParams", "yes");
+	} else {
+		*dynamic = 0;
+		if (!strcmp(opt, "dynamic")) *dynamic = 1;
+		else if (!strcmp(opt, "dynamic-debug")) *dynamic = 2;
+		opt = gf_cfg_get_key(dash_ctx, "DASH", "TimeShiftBufferDepth");
+		*timeShiftBufferDepth = atoi(opt);
+		gf_cfg_set_key(dash_ctx, "DASH", "StoreParams", "no");
+	}
+
+	gf_cfg_set_key(dash_ctx, "DASH", "PeriodSwitch", "no");
+	
+	gf_net_get_ntp(&sec, &frac);
+
+	if (first_run) {
+#ifndef _WIN32_WCE
+		gtime = sec - GF_NTP_SEC_1900_TO_1970;
+		gf_cfg_set_key(dash_ctx, "DASH", "GenerationTime", asctime(gmtime(&gtime)));
+#endif
+		sprintf(szVal, "%u", sec);
+		gf_cfg_set_key(dash_ctx, "DASH", "GenerationNTP", szVal);
+		sprintf(szVal, "%u", frac);
+		gf_cfg_set_key(dash_ctx, "DASH", "GenerationNTPFraction", szVal);
+	
+		if (periodID)
+			gf_cfg_set_key(dash_ctx, "DASH", "PeriodID", periodID);
+	} else {
+
+		/*check if we change period*/
+		if (periodID) {
+			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");
+			}
+		}
+	}
+
+	/*perform cleanup of previous representations*/
 
-	fclose(mpd);
 	return GF_OK;
 }
 
 GF_EXPORT
-GF_Err gf_media_mpd_end(char *mpd_name, Bool last_adaptation_set)
+u32 gf_dasher_next_update_time(GF_Config *dash_ctx, u32 mpd_update_time)
+{
+	Double max_dur = 0;
+	Double safety_dur;
+	Double ms_ellapsed;
+	u32 i, ntp_sec, frac, prev_sec, prev_frac;
+	const char *opt, *section;
+
+	opt = gf_cfg_get_key(dash_ctx, "DASH", "MaxSegmentDuration");
+	if (!opt) return 0;
+
+	safety_dur = atof(opt);
+	if (safety_dur > (Double) mpd_update_time)
+		safety_dur = (Double) mpd_update_time;
+
+
+	opt = gf_cfg_get_key(dash_ctx, "DASH", "GenerationNTP");
+	sscanf(opt, "%u", &prev_sec);
+	opt = gf_cfg_get_key(dash_ctx, "DASH", "GenerationNTPFraction");
+	sscanf(opt, "%u", &prev_frac);
+
+	/*compute cumulated duration*/
+	for (i=0; i<gf_cfg_get_section_count(dash_ctx); i++) {
+		Double dur = 0;
+		section = gf_cfg_get_section_name(dash_ctx, i);
+		if (section && !strncmp(section, "Representation_", 15)) {
+			opt = gf_cfg_get_key(dash_ctx, section, "CumulatedDuration");
+			if (opt) dur = atof(opt);
+			if (dur>max_dur) max_dur = dur;
+		}
+	}
+
+	if (!max_dur) return 0;
+	gf_net_get_ntp(&ntp_sec, &frac);
+
+	ms_ellapsed = frac;
+	ms_ellapsed -= prev_frac;
+	ms_ellapsed /= 0xFFFFFFFF;
+	ms_ellapsed *= 1000;
+	ms_ellapsed += (ntp_sec - prev_sec)*1000;
+
+	/*check if we need to generate */
+	if (ms_ellapsed < (max_dur - safety_dur)*1000 ) {
+		return (u32) (1000*max_dur - ms_ellapsed);
+	}
+	return 0;
+}
+
+/*peform all file cleanup*/
+static Bool gf_dasher_cleanup(GF_Config *dash_ctx, u32 dash_dynamic, u32 mpd_update_time, u32 time_shift_depth, Double dash_duration, u32 ast_shift_sec)
+{
+	Double max_dur = 0;
+	Double ellapsed = 0;
+	Double safety_dur = MAX(mpd_update_time, (u32) dash_duration);
+	u32 i, ntp_sec, frac, prev_sec;
+	const char *opt, *section;
+	GF_Err e;
+
+	opt = gf_cfg_get_key(dash_ctx, "DASH", "StoreParams");
+	if (opt && !strcmp(opt, "yes")) return 1;
+
+	opt = gf_cfg_get_key(dash_ctx, "DASH", "GenerationNTP");
+	if (!opt) return 1;
+	sscanf(opt, "%u", &prev_sec);
+
+	/*compute cumulated duration*/
+	for (i=0; i<gf_cfg_get_section_count(dash_ctx); i++) {
+		Double dur = 0;
+		section = gf_cfg_get_section_name(dash_ctx, i);
+		if (section && !strncmp(section, "Representation_", 15)) {
+			opt = gf_cfg_get_key(dash_ctx, section, "CumulatedDuration");
+			if (opt) dur = atof(opt);
+			if (dur>max_dur) max_dur = dur;
+		}
+	}
+	if (!max_dur) return 1;
+	gf_net_get_ntp(&ntp_sec, &frac);
+
+	if (dash_dynamic==2) {
+		ellapsed = (u32)-1;
+	} else {
+		ellapsed = ntp_sec;
+		ellapsed -= prev_sec;
+		/*check if we need to generate */
+		if (ellapsed < max_dur - safety_dur ) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Asked to regenerate segments before expiration of the current segment list, please wait %g seconds - ignoring\n", max_dur + prev_sec - ntp_sec ));
+			return 0;
+		}
+		if (ellapsed > max_dur) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Generating segments and MPD %g seconds too late\n", ellapsed - (u32) max_dur));
+		} else {
+			/*generate as if max_dur has been reached*/
+			ellapsed = max_dur;
+		}
+	}
+
+	/*cleanup old segments*/
+	if ((s32) time_shift_depth >= 0) {
+		for (i=0; i<gf_cfg_get_key_count(dash_ctx, "SegmentsStartTimes"); i++) {
+			Double seg_time;
+			Bool found=0;
+			u32 j;
+			const char *fileName = gf_cfg_get_key_name(dash_ctx, "SegmentsStartTimes", i);
+			const char *MPDTime = gf_cfg_get_key(dash_ctx, "SegmentsStartTimes", fileName);
+			if (!fileName) 
+				break;
+
+			seg_time = atof(MPDTime);
+			seg_time += ast_shift_sec;
+			seg_time += dash_duration + time_shift_depth;
+			seg_time -= ellapsed;
+			/*safety gard of one second*/
+			if (seg_time >= -1)
+				break;
+
+			if (dash_dynamic!=2) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Removing segment %s - %g sec too late\n", fileName, -seg_time));
+			}
+
+			e = gf_delete_file(fileName);
+			if (e) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Could not remove file %s: %s\n", fileName, gf_error_to_string(e) ));
+				break;
+			}
+
+			/*check all reps*/
+			for (j=0; j<gf_cfg_get_section_count(dash_ctx); j++) {
+				u32 k;
+				const char *secName = gf_cfg_get_section_name(dash_ctx, j);
+				if (!strstr(secName, "URLs_")) continue;
+				for (k=0; k<gf_cfg_get_key_count(dash_ctx, secName); k++) {
+					const char *entry = gf_cfg_get_key_name(dash_ctx, secName, k);
+					const char *name = gf_cfg_get_key(dash_ctx, secName, entry);
+					if (strstr(name, fileName)) {
+						gf_cfg_set_key(dash_ctx, secName, entry, NULL);
+						found=1;
+						break;
+					}
+				}
+				if (found) break;
+			}
+
+			gf_cfg_set_key(dash_ctx, "SegmentsStartTimes", fileName, NULL);
+			i--;
+		}
+	}
+	return 1;
+}
+
+
+/*dash segmenter*/
+GF_EXPORT
+GF_Err gf_dasher_segment_files(const char *mpdfile, GF_DashSegmenterInput *inputs, u32 nb_dash_inputs, GF_DashProfile dash_profile, 
+							   const char *mpd_title, const char *mpd_source, const char *mpd_copyright,
+							   const char *mpd_moreInfoURL, const char **mpd_base_urls, u32 nb_mpd_base_urls, 
+							   Bool use_url_template, Bool use_segment_timeline,  Bool single_segment, Bool single_file, GF_DashSwitchingMode bitstream_switching, 
+							   Bool seg_at_rap, Double dash_duration, char *seg_name, char *seg_ext,
+							   Double frag_duration, s32 subsegs_per_sidx, Bool daisy_chain_sidx, Bool frag_at_rap, const char *tmpdir,
+							   GF_Config *dash_ctx, u32 dash_dynamic, u32 mpd_update_time, u32 time_shift_depth, Double subduration, Double min_buffer, u32 ast_shift_sec)
 {
-	FILE *mpd = fopen(mpd_name, "a+t");
-	if (!mpd_name) return GF_IO_ERR;
+	u32 i, j, segment_mode;
+	char *sep, szSegName[GF_MAX_PATH], szSolvedSegName[GF_MAX_PATH], szTempMPD[GF_MAX_PATH];
+	u32 cur_adaptation_set;
+	u32 max_adaptation_set = 0;
+	u32 cur_period;
+	u32 max_period = 0;
+	u32 cur_group_id = 0;
+	u32 max_sap_type = 0;
+	Bool none_supported = 1;
+	Bool has_mpeg2 = 0;
+	Bool has_role = 0;
+	Double presentation_duration = 0;
+	GF_Err e = GF_OK;
+	FILE *mpd = NULL;
+	GF_DashSegInput *dash_inputs;
+	GF_DASHSegmenterOptions dash_opts;
+
+	/*init dash context if needed*/
+	if (dash_ctx) {
+
+		e = gf_dasher_init_context(dash_ctx, &dash_dynamic, &time_shift_depth, NULL);
+		if (e) return e;
+		if (dash_ctx) {
+			Bool regenerate;
+			const char *opt = gf_cfg_get_key(dash_ctx, "DASH", "MaxSegmentDuration");
+			if (opt) {
+				Double seg_dur = atof(opt);
+/*
+				if (seg_dur != dash_duration) {
+					return GF_NOT_SUPPORTED;
+				}
+*/
+				dash_duration = seg_dur;
+			} else {
+				char sOpt[100];
+				sprintf(sOpt, "%f", dash_duration);
+				gf_cfg_set_key(dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
+			}
+
+			/*peform all file cleanup*/
+			regenerate = gf_dasher_cleanup(dash_ctx, dash_dynamic, mpd_update_time, time_shift_depth, dash_duration, ast_shift_sec);
+			if (!regenerate) return GF_OK;
+		}
+	}
+
+	/*copy over input files to our internal structure*/
+	max_period = 0;
+	dash_inputs = gf_malloc(sizeof(GF_DashSegInput)*nb_dash_inputs);
+	memset(dash_inputs, 0, sizeof(GF_DashSegInput)*nb_dash_inputs);
+	for (i=0; i<nb_dash_inputs; i++) {
+		dash_inputs[i].file_name = inputs[i].file_name;
+		strcpy(dash_inputs[i].representationID, inputs[i].representationID);
+		strcpy(dash_inputs[i].periodID, inputs[i].periodID);
+		strcpy(dash_inputs[i].role, inputs[i].role);
+		dash_inputs[i].bandwidth = inputs[i].bandwidth;
+
+		if (strlen(inputs[i].role) && strcmp(inputs[i].role, "main"))
+			has_role = 1;
+
+		if (!strlen(dash_inputs[i].periodID)) {
+			max_period = 1;
+			dash_inputs[i].period = 1;
+			if (dash_dynamic) {
+				strcpy(dash_inputs[i].periodID, "GENID_DEF");
+			}
+		}
+		gf_dash_segmenter_probe_input(&dash_inputs[i]);
+
+		if (!strcmp(dash_inputs[i].szMime, "video/mp2t")) has_mpeg2 = 1;
+ 	}
+	memset(&dash_opts, 0, sizeof(GF_DASHSegmenterOptions));
+
+	/*set all default roles to main if needed*/
+	if (has_role) {
+		for (i=0; i<nb_dash_inputs; i++) {
+			if (!strlen(dash_inputs[i].role))
+				strcpy(dash_inputs[i].role, "main");
+		}
+	}
+
+	for (i=0; i<nb_dash_inputs; i++) {
+		if (dash_inputs[i].period) 
+			continue;
+		if (strlen(dash_inputs[i].periodID)) {
+			max_period++;
+			dash_inputs[i].period = max_period;
+
+			for (j=i+1; j<nb_dash_inputs; j++) {
+				if (!strcmp(dash_inputs[j].periodID, dash_inputs[i].periodID))
+					dash_inputs[j].period = dash_inputs[i].period;
+			}
+		}
+	}
+	if (dash_dynamic && max_period>1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Multiple periods in live mode not supported\n"));
+		e = GF_NOT_SUPPORTED;
+		goto exit;
+	}
+
+	for (cur_period=0; cur_period<max_period; cur_period++) {
+		/*classify all input in possible adaptation sets*/
+		for (i=0; i<nb_dash_inputs; i++) {
+			/*this file does not belong to our current period*/
+			if (dash_inputs[i].period != cur_period+1) continue;
+			
+			/*this file already belongs to an adaptation set*/
+			if (dash_inputs[i].adaptation_set) continue;
+
+			/*we cannot fragment the input file*/
+			if (!dash_inputs[i].dasher_input_classify || !dash_inputs[i].dasher_segment_file) {
+				continue;
+			}
+
+			max_adaptation_set ++;
+			dash_inputs[i].adaptation_set = max_adaptation_set;
+			dash_inputs[i].nb_rep_in_adaptation_set = 1;
+
+			e = dash_inputs[i].dasher_input_classify(dash_inputs, nb_dash_inputs, i, &cur_group_id, &max_sap_type);
+			if (e) goto exit;
+			none_supported = 0;
+		}
+		if (none_supported) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: None of the input types are supported for DASHing - nothing to do ...\n"));
+			e = GF_OK;
+			goto exit;
+		}
+	}
+
+	/*check requested profiles can be generated, or adjust them*/
+	if (max_sap_type>=3) {
+		if (dash_profile) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: WARNING! Max SAP type %d detected\n\tswitching to FULL profile\n", max_sap_type));
+		}
+		dash_profile = 0;
+	}
+	if ((dash_profile==GF_DASH_PROFILE_LIVE) && !seg_name) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: WARNING! DASH Live profile requested but no -segment-name\n\tusing \"%%s_dash\" by default\n\n"));
+		seg_name = "%s_dash";
+	}
+
+	/*if output id not in the current working dir, concatenate output path to segment name*/
+	szSegName[0] = 0;
+	if (seg_name) {
+		if (gf_url_get_resource_path(mpdfile, szSegName)) {
+			strcat(szSegName, seg_name);
+			seg_name = szSegName;
+		}
+	}
+
+	/*adjust params based on profiles*/
+	switch (dash_profile) {
+	case GF_DASH_PROFILE_LIVE:
+		seg_at_rap = 1;
+		use_url_template = 1;
+		single_segment = single_file = 0;
+		break;
+	case GF_DASH_PROFILE_ONDEMAND:
+		seg_at_rap = 1;
+		single_segment = 1;
+		/*BS switching is meaningless in onDemand profile*/
+		bitstream_switching = GF_DASH_BSMODE_NONE;
+		use_url_template = single_file = 0;
+		break;
+	case GF_DASH_PROFILE_MAIN:
+		seg_at_rap = 1;
+		single_segment = 0;
+		break;
+	default:
+		break;
+	}
+
+	segment_mode = single_segment ? 1 : (single_file ? 2 : 0);
+
+	if (single_segment) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH-ing file%s - single segment\nSubsegment duration %.3f - Fragment duration: %.3f secs\n", (nb_dash_inputs>1) ? "s" : "", dash_duration, frag_duration));
+		subsegs_per_sidx = 0;
+	} else {
+		if (!seg_ext) seg_ext = "m4s";
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH-ing file%s: %.2fs segments %.2fs fragments ", (nb_dash_inputs>1) ? "s" : "", dash_duration, frag_duration));
+		if (subsegs_per_sidx<0) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("no sidx used"));
+		} else if (subsegs_per_sidx) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("%d subsegments per sidx", subsegs_per_sidx));
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("single sidx per segment"));
+		}
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\n"));
+	}
+	if (frag_at_rap) seg_at_rap = 1;
+
+	if (seg_at_rap) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Spliting segments %sat GOP boundaries\n", frag_at_rap ? "and fragments " : ""));
+	}
+
+	dash_opts.mpd_name = mpdfile;
+	dash_opts.segments_start_with_rap = seg_at_rap;
+	dash_opts.segment_duration = dash_duration;
+	dash_opts.seg_ext = seg_ext;
+	dash_opts.daisy_chain_sidx = daisy_chain_sidx;
+	dash_opts.subsegs_per_sidx = subsegs_per_sidx;
+	dash_opts.use_url_template = use_url_template;
+	dash_opts.use_segment_timeline = use_segment_timeline;
+	dash_opts.single_file_mode = segment_mode;
+	dash_opts.fragments_start_with_rap = frag_at_rap;
+	dash_opts.fragment_duration = frag_duration;
+	dash_opts.tmpdir = tmpdir;
+	dash_opts.dash_ctx = dash_ctx;
+	dash_opts.time_shift_depth = (s32) time_shift_depth;
+	dash_opts.subduration = subduration;
+	dash_opts.inband_param_set = ((bitstream_switching == GF_DASH_BSMODE_INBAND) || (bitstream_switching == GF_DASH_BSMODE_SINGLE) ) ? 1 : 0;
+
+	for (cur_period=0; cur_period<max_period; cur_period++) {
+		u32 first_in_period = 0;
+		Double period_duration=0;
+		for (i=0; i<nb_dash_inputs; i++) {
+			/*this file does not belongs to any adaptation set*/
+			if (dash_inputs[i].period != cur_period+1) continue;
+
+			/*this file does not belongs to any adaptation set*/
+			if (!dash_inputs[i].adaptation_set) continue;
+
+			if (!first_in_period) {
+				first_in_period = i+1;
+			}
+
+			if (dash_inputs[i].dasher_get_components_info) {
+				e = dash_inputs[i].dasher_get_components_info(&dash_inputs[i], &dash_opts);
+				if (e) goto exit;
+			}
+			if (dash_inputs[i].duration > period_duration)
+				period_duration = dash_inputs[i].duration;
+		}
+		if (first_in_period)
+			dash_inputs[first_in_period-1].period_duration = period_duration;
+
+		presentation_duration += period_duration;
+	}
+
+	strcpy(szTempMPD, mpdfile);
+	if (dash_dynamic) strcat(szTempMPD, ".tmp");
+	
+	mpd = gf_f64_open(szTempMPD, "wt");
+	if (!mpd) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[MPD] Cannot open MPD file %s for writing\n", szTempMPD));
+		e = GF_IO_ERR;
+		goto exit;
+	}
+
+	dash_opts.mpd = mpd;
+
+	e = write_mpd_header(mpd, mpdfile, dash_ctx, dash_profile, has_mpeg2, mpd_title, mpd_source, mpd_copyright, mpd_moreInfoURL, (const char **) mpd_base_urls, nb_mpd_base_urls, dash_dynamic, time_shift_depth, presentation_duration, mpd_update_time, min_buffer, ast_shift_sec);
+	if (e) goto exit;
+
+	for (cur_period=0; cur_period<max_period; cur_period++) {
+		Double period_duration = 0;
+		const char *id=NULL;
+		/*for each identified adaptationSets, write MPD and perform segmentation of input files*/
+		for (i=0; i< nb_dash_inputs; i++) {
+			if (dash_inputs[i].adaptation_set && (dash_inputs[i].period==cur_period+1)) {
+				period_duration = dash_inputs[i].period_duration;
+				id = dash_inputs[i].periodID;
+				break;
+			}
+		}
+		e = write_period_header(mpd, id, 0.0, period_duration, dash_dynamic);
+		if (e) goto exit;
+
+		/*for each identified adaptationSets, write MPD and perform segmentation of input files*/
+		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 max_width = 0;
+			u32 max_height = 0;
+			u32 fps_num = 0;
+			u32 fps_denum = 0;
+			Bool use_bs_switching = bitstream_switching ? 1 : 0;
+			char szLang[4];
+			char szFPS[100];
+			Bool is_first_rep=0;
+			Bool skip_init_segment_creation = 0;
+
+			while (dash_inputs[first_rep_in_set].adaptation_set!=cur_adaptation_set+1)
+				first_rep_in_set++;
+
+			/*not in our period*/
+			if (dash_inputs[first_rep_in_set].period != cur_period+1)
+				continue;
+
+			strcpy(tmp, mpdfile);
+			sep = strrchr(tmp, '.');
+			if (sep) sep[0] = 0;
+
+			if (max_adaptation_set==1) {
+				strcpy(szInit, tmp);
+				strcat(szInit, "_init.mp4");
+			} else {
+				sprintf(szInit, "%s_set%d_init.mp4", tmp, cur_adaptation_set+1);
+			}
+			/*unless asked to do BS switching on single rep, don't do it ...*/
+			if ((bitstream_switching < GF_DASH_BSMODE_SINGLE) && dash_inputs[first_rep_in_set].nb_rep_in_adaptation_set==1)
+				use_bs_switching = 0;
+
+			if (! use_bs_switching) {
+				skip_init_segment_creation = 1;
+			}
+			else if (! dash_inputs[first_rep_in_set].dasher_create_init_segment) {
+				skip_init_segment_creation = 1;
+				strcpy(szInit, "");
+			}
+			/*if we already wrote the InitializationSegment, get rid of it (no overwrite) and let the dashing routine open it*/
+			else if (dash_ctx) {
+				char RepSecName[GF_MAX_PATH];
+				const char *init_seg_name;
+				sprintf(RepSecName, "Representation_%s", dash_inputs[first_rep_in_set].representationID);
+				if ((init_seg_name = gf_cfg_get_key(dash_ctx, RepSecName, "InitializationSegment")) != NULL) {
+					skip_init_segment_creation = 1;
+				}
+			}
+
+			if (!skip_init_segment_creation) {
+				Bool disable_bs_switching = 0;
+				e = dash_inputs[first_rep_in_set].dasher_create_init_segment(dash_inputs, nb_dash_inputs, cur_adaptation_set+1, szInit, tmpdir, dash_opts.inband_param_set, &disable_bs_switching);
+				if (e) goto exit;
+				if (disable_bs_switching)
+					use_bs_switching = 0;
+			}
+
+			dash_opts.bs_switch_segment_file = use_bs_switching ? szInit : NULL;
+			dash_opts.use_url_template = seg_name ? use_url_template : 0;
+
+			szFPS[0] = 0;
+			szLang[0] = 0;
+			/*compute some max defaults*/
+			for (i=0; i<nb_dash_inputs && !e; i++) {
+
+				if (dash_inputs[i].adaptation_set!=cur_adaptation_set+1)
+					continue;
+
+				for (j=0; j<dash_inputs[i].nb_components; j++) {
+					if (dash_inputs[i].components[j].width > max_width) 
+						max_width = dash_inputs[i].components[j].width;
+					if (dash_inputs[i].components[j].height > max_height) 
+						max_height = dash_inputs[i].components[j].height;
+
+					if (! fps_num || !fps_denum) {
+						fps_num = dash_inputs[i].components[j].fps_num;
+						fps_denum = dash_inputs[i].components[j].fps_denum;
+					}
+					else if (fps_num * dash_inputs[i].components[j].fps_denum < dash_inputs[i].components[j].fps_num * fps_denum) {
+						fps_num = dash_inputs[i].components[j].fps_num;
+						fps_denum = dash_inputs[i].components[j].fps_denum;
+					}
+				}
+			}
+
+			if (max_width && max_height) {
+				gf_media_get_reduced_frame_rate(&fps_num, &fps_denum);
+				if (fps_denum>1) 
+					sprintf(szFPS, "%d/%d", fps_num, fps_denum);
+				else if (fps_num)
+					sprintf(szFPS, "%d", fps_num);
+			}
+
+			e = write_adaptation_header(mpd, dash_profile, use_url_template, segment_mode, &dash_inputs[first_rep_in_set], use_bs_switching, max_width, max_height, szFPS, szLang, szInit);
+			if (e) goto exit;
+
+			is_first_rep = 1;
+			for (i=0; i<nb_dash_inputs && !e; i++) {
+				char szOutName[GF_MAX_PATH], *segment_name;
+
+				if (dash_inputs[i].adaptation_set!=cur_adaptation_set+1)
+					continue;
+
+				segment_name = seg_name;
+
+				strcpy(szOutName, gf_url_get_resource_name(dash_inputs[i].file_name));
+				sep = strrchr(szOutName, '.');
+				if (sep) sep[0] = 0;
+
+				dash_opts.variable_seg_rad_name = 0;
+				if (seg_name) {
+					if (strstr(seg_name, "%s")) {
+						sprintf(szSolvedSegName, seg_name, szOutName);
+						dash_opts.variable_seg_rad_name = 1;
+					} else {
+						strcpy(szSolvedSegName, seg_name);
+					}
+					segment_name = szSolvedSegName;
+				}
+				strcat(szOutName, "_dash");
+
+				if (gf_url_get_resource_path(mpdfile, tmp)) {
+					strcat(tmp, szOutName);
+					strcpy(szOutName, tmp);
+				}
+				dash_opts.seg_rad_name = segment_name;
+
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASHing file %s\n", dash_inputs[i].file_name));
+				e = dash_inputs[i].dasher_segment_file(&dash_inputs[i], szOutName, &dash_opts, is_first_rep);
+
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while DASH-ing file: %s\n", gf_error_to_string(e)));
+					goto exit;
+				}
+				is_first_rep = 0;
+			}
+			/*close adaptation set*/
+			fprintf(mpd, "  </AdaptationSet>\n");
+		}
 
-    fprintf(mpd, "  </AdaptationSet>\n");
-	if (last_adaptation_set) {
 		fprintf(mpd, " </Period>\n");
-		fprintf(mpd, "</MPD>");
 	}
-	fclose(mpd);
-	return GF_OK;
+	fprintf(mpd, "</MPD>");
+
+exit:
+	if (mpd) {
+		fclose(mpd);
+		if (!e && dash_dynamic)
+			gf_move_file(szTempMPD, mpdfile);
+	}
+	gf_free(dash_inputs);
+	return e;
 }
 
 
+
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 GF_EXPORT
 GF_Err gf_media_fragment_file(GF_ISOFile *input, const char *output_file, Double max_duration_sec)
 {
-	return gf_media_segment_file(input, output_file, max_duration_sec, NULL, 0, 0, NULL, NULL, 0, 0, 0, 0, NULL, NULL, 0, 0, 0, 0);	
+	return gf_media_isom_segment_file(input, output_file, max_duration_sec, NULL, NULL, 0);
 }
 
-#endif /*GPAC_DISABLE_ISOM*/
+#endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
+

gpac-0.5.0.svn4192.tar.bz2/src/media_tools/filestreamer.c -> gpac-0.5.0.svn4296.tar.bz2/src/media_tools/filestreamer.c Changed

@@ -82,6 +82,9 @@
 
 	/*to sync looping sessions with tracks of # length*/
 	u32 duration_ms;
+
+	/*base track if this stream contains a media decoding dependancy, 0 otherwise*/
+	u32 base_track;
 };
 
 
@@ -92,6 +95,8 @@
 	FILE *sdp_out;
 	char filename[GF_MAX_PATH];
 	char sdpLine[20000];
+	u32 t, count;
+	u8 *payload_type;
 
 	strcpy(filename, sdpfilename ? sdpfilename : "videosession.sdp");
 	sdp_out = gf_f64_open(filename, "wt");
@@ -114,10 +119,35 @@
 		fprintf(sdp_out, "%s\n", sdpLine);
 		sprintf(sdpLine, "t=0 0");
 		fprintf(sdp_out, "%s\n", sdpLine);
-		sprintf(sdpLine, "a=x-copyright: Streamed with GPAC (C)2000-200X - http://gpac.sourceforge.net\n");
+		sprintf(sdpLine, "a=x-copyright: Streamed with GPAC (C)2000-200X - http://gpac.sourceforge.net");
 		fprintf(sdp_out, "%s\n", sdpLine);
+		if (streamer->base_track)
+		{
+			sprintf(sdpLine, "a=group:DDP L%d", streamer->base_track);
+			fprintf(sdp_out, "%s", sdpLine);
+			count = gf_isom_get_track_count(streamer->isom);
+			for (t = 0; t < count; t++)
+			{
+				if (gf_isom_has_track_reference(streamer->isom, t+1, GF_ISOM_REF_BASE, gf_isom_get_track_id(streamer->isom, streamer->base_track)))
+				{
+					sprintf(sdpLine, " L%d", t+1);
+					fprintf(sdp_out, "%s", sdpLine);
+				}
+			}
+			fprintf(sdp_out, "\n");
+		}
 	}
 
+	/*prepare array of payload type*/
+	count = gf_isom_get_track_count(streamer->isom);
+	payload_type = (u8 *)gf_malloc(count * sizeof(u8));
+	track = streamer->stream;
+	while (track) {
+		payload_type[track->track_num-1] = gf_rtp_streamer_get_payload_type(track->rtp);
+		track = track->next;
+	}
+
+
 	track = streamer->stream;
 	while (track) {
 		char *sdp_media=NULL;
@@ -140,6 +170,8 @@
 
 	        /*TODO retrieve DIMS content encoding from track to set the flags */
 		gf_rtp_streamer_append_sdp_extended(track->rtp, gf_isom_get_track_id(streamer->isom, track->track_num), dsi, dsi_len, streamer->isom, track->track_num, (char *)KMS, w, h, &sdp_media);
+		if (streamer->base_track)
+			gf_rtp_streamer_append_sdp_decoding_dependency(streamer->isom, track->track_num, payload_type, &sdp_media);
 		if (sdp_media) {
 			fprintf(sdp_out, "%s", sdp_media);
 			gf_free(sdp_media);
@@ -165,6 +197,7 @@
 		(*out_sdp_buffer)[size]=0;
 	}
 
+	gf_free(payload_type);
 	return GF_OK;
 } 
 
@@ -347,6 +380,7 @@
 	u16 first_port;
 	u32 nb_tracks;
 	u32 sess_data_size;
+	u32 base_track;
 
 	if (!ip_dest) ip_dest = "127.0.0.1";
 	if (!port) port = 7000;
@@ -460,13 +494,28 @@
 			break;
 		case GF_ISOM_SUBTYPE_AVC_H264:
 		case GF_ISOM_SUBTYPE_AVC2_H264:
+		case GF_ISOM_SUBTYPE_AVC3_H264:
+		case GF_ISOM_SUBTYPE_AVC4_H264:
 		case GF_ISOM_SUBTYPE_SVC_H264:
 		{
-			GF_AVCConfig *avcc = gf_isom_avc_config_get(streamer->isom, track->track_num, 1);
-			track->avc_nalu_size = avcc->nal_unit_size;
-			gf_odf_avc_cfg_del(avcc);
-			streamType = GF_STREAM_VISUAL;
-			oti = GPAC_OTI_VIDEO_AVC;
+			GF_AVCConfig *avcc, *svcc;
+			avcc = gf_isom_avc_config_get(streamer->isom, track->track_num, 1);
+			if (avcc)
+			{
+				track->avc_nalu_size = avcc->nal_unit_size;
+				gf_odf_avc_cfg_del(avcc);
+				streamType = GF_STREAM_VISUAL;
+				oti = GPAC_OTI_VIDEO_AVC;
+			}
+			svcc = gf_isom_svc_config_get(streamer->isom, track->track_num, 1);
+			if (svcc)
+			{
+				track->avc_nalu_size = svcc->nal_unit_size;
+				gf_odf_avc_cfg_del(svcc);
+				streamType = GF_STREAM_VISUAL;
+				oti = GPAC_OTI_VIDEO_SVC;
+			}
+			break;
 		}
 			break;
 		default:
@@ -499,6 +548,11 @@
 		payt++;
 		track->microsec_ts_scale = 1000000;
 		track->microsec_ts_scale /= gf_isom_get_media_timescale(streamer->isom, track->track_num);
+
+		/*does this stream have the decoding dependency ?*/
+		gf_isom_get_reference(streamer->isom, track->track_num, GF_ISOM_REF_BASE, 1, &base_track);
+		if (base_track)
+			streamer->base_track = base_track;
 	}
 	return streamer;

gpac-0.5.0.svn4192.tar.bz2/src/media_tools/isom_hinter.c -> gpac-0.5.0.svn4296.tar.bz2/src/media_tools/isom_hinter.c Changed

@@ -444,16 +444,20 @@
 			break;
 		case GF_ISOM_SUBTYPE_AVC_H264:
 		case GF_ISOM_SUBTYPE_AVC2_H264:
+		case GF_ISOM_SUBTYPE_AVC3_H264:
+		case GF_ISOM_SUBTYPE_AVC4_H264:
 		case GF_ISOM_SUBTYPE_SVC_H264:
 		{
 			GF_AVCConfig *avcc = gf_isom_avc_config_get(file, TrackNum, 1);
+			GF_AVCConfig *svcc = gf_isom_svc_config_get(file, TrackNum, 1);
 			required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
 			hintType = GF_RTP_PAYT_H264_AVC;
 			streamType = GF_STREAM_VISUAL;
-			avc_nalu_size = avcc->nal_unit_size;
+			avc_nalu_size = avcc ? avcc->nal_unit_size : svcc->nal_unit_size;
 			oti = GPAC_OTI_VIDEO_AVC;
 			PL_ID = 0x0F;
 			gf_odf_avc_cfg_del(avcc);
+			gf_odf_avc_cfg_del(svcc);
 		}
 			break;
 		case GF_ISOM_SUBTYPE_3GP_QCELP:
@@ -755,7 +759,51 @@
 	return GF_OK;
 }
 
+static u32 write_nalu_config_array(char *sdpLine, GF_List *nalus)
+{
+	u32 i, count, b64s;
+	char b64[200];
+
+	count = gf_list_count(nalus);
+	for (i=0; i<count; i++) {
+		GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(nalus, i);
+		b64s = gf_base64_encode(sl->data, sl->size, b64, 200);
+		b64[b64s]=0;
+		strcat(sdpLine, b64);
+		if (i+1<count) strcat(sdpLine, ",");
+	}
+	return count;
+}
 
+static void write_avc_config(char *sdpLine, GF_AVCConfig *avcc, GF_AVCConfig *svcc)
+{
+	u32 count = 0;
+
+	if (avcc) count += gf_list_count(avcc->sequenceParameterSets) + gf_list_count(avcc->pictureParameterSets) + gf_list_count(avcc->sequenceParameterSetExtensions);
+	if (svcc) count += gf_list_count(svcc->sequenceParameterSets) + gf_list_count(svcc->pictureParameterSets);
+	if (!count) return;
+
+	strcat(sdpLine, "; sprop-parameter-sets=");
+
+	if (avcc) {
+		count = write_nalu_config_array(sdpLine, avcc->sequenceParameterSets);
+		if (count) strcat(sdpLine, ",");
+		count = write_nalu_config_array(sdpLine, avcc->sequenceParameterSetExtensions);
+		if (count) strcat(sdpLine, ",");
+		count = write_nalu_config_array(sdpLine, avcc->pictureParameterSets);
+		if (count) strcat(sdpLine, ",");
+	}
+		
+	if (svcc) {
+		count = write_nalu_config_array(sdpLine, svcc->sequenceParameterSets);
+		if (count) strcat(sdpLine, ",");
+		count = write_nalu_config_array(sdpLine, svcc->pictureParameterSets);
+		if (count) strcat(sdpLine, ",");
+	}
+	count = strlen(sdpLine);
+	if (sdpLine[count-1] == ',')
+		sdpLine[count-1] = 0;
+}
 
 GF_EXPORT
 GF_Err gf_hinter_track_finalize(GF_RTPHinter *tkHint, Bool AddSystemInfo)
@@ -817,31 +865,20 @@
 	/*H264/AVC*/
 	else if (tkHint->rtp_p->rtp_payt == GF_RTP_PAYT_H264_AVC) {
 		GF_AVCConfig *avcc = gf_isom_avc_config_get(tkHint->file, tkHint->TrackNum, 1);
-		sprintf(sdpLine, "a=fmtp:%d profile-level-id=%02X%02X%02X; packetization-mode=1", tkHint->rtp_p->PayloadType, avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
-		if (gf_list_count(avcc->pictureParameterSets) || gf_list_count(avcc->sequenceParameterSets)) {
-			u32 i, count, b64s;
-			char b64[200];
-			strcat(sdpLine, "; sprop-parameter-sets=");
-			count = gf_list_count(avcc->sequenceParameterSets);
-			for (i=0; i<count; i++) {
-				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(avcc->sequenceParameterSets, i);
-				b64s = gf_base64_encode(sl->data, sl->size, b64, 200);
-				b64[b64s]=0;
-				strcat(sdpLine, b64);
-				if (i+1<count) strcat(sdpLine, ",");
-			}
-			if (i) strcat(sdpLine, ",");
-			count = gf_list_count(avcc->pictureParameterSets);
-			for (i=0; i<count; i++) {
-				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(avcc->pictureParameterSets, i);
-				b64s = gf_base64_encode(sl->data, sl->size, b64, 200);
-				b64[b64s]=0;
-				strcat(sdpLine, b64);
-				if (i+1<count) strcat(sdpLine, ",");
-			}
+		GF_AVCConfig *svcc = gf_isom_svc_config_get(tkHint->file, tkHint->TrackNum, 1);
+		/*TODO - check syntax for SVC (might be some extra signaling)*/
+
+		if (avcc) {
+			sprintf(sdpLine, "a=fmtp:%d profile-level-id=%02X%02X%02X; packetization-mode=1", tkHint->rtp_p->PayloadType, avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
+		} else {
+			sprintf(sdpLine, "a=fmtp:%d profile-level-id=%02X%02X%02X; packetization-mode=1", tkHint->rtp_p->PayloadType, svcc->AVCProfileIndication, svcc->profile_compatibility, svcc->AVCLevelIndication);
 		}
+
+		write_avc_config(sdpLine, avcc, svcc);
+
 		gf_isom_sdp_add_track_line(tkHint->file, tkHint->HintTrack, sdpLine);
 		gf_odf_avc_cfg_del(avcc);
+		gf_odf_avc_cfg_del(svcc);
 	}
 	/*MPEG-4 decoder config*/
 	else if (tkHint->rtp_p->rtp_payt==GF_RTP_PAYT_MPEG4) {

gpac-0.5.0.svn4192.tar.bz2/src/media_tools/isom_tools.c -> gpac-0.5.0.svn4296.tar.bz2/src/media_tools/isom_tools.c Changed

@@ -40,10 +40,14 @@
 	if (e) return e;
 
 	stype = gf_isom_get_media_subtype(file, track, 1);
-	if ((stype==GF_ISOM_SUBTYPE_AVC_H264) || (stype==GF_ISOM_SUBTYPE_AVC2_H264) ) {
+	if ((stype==GF_ISOM_SUBTYPE_AVC_H264) 
+		|| (stype==GF_ISOM_SUBTYPE_AVC2_H264) 
+		|| (stype==GF_ISOM_SUBTYPE_AVC3_H264) 
+		|| (stype==GF_ISOM_SUBTYPE_AVC4_H264) 
+	) {
 #ifndef GPAC_DISABLE_AV_PARSERS
 		GF_AVCConfig *avcc = gf_isom_avc_config_get(file, track, 1);
-		AVC_ChangePAR(avcc, ar_num, ar_den);
+		gf_media_avc_change_par(avcc, ar_num, ar_den);
 		e = gf_isom_avc_config_update(file, track, 1, avcc);
 		gf_odf_avc_cfg_del(avcc);
 		if (e) return e;
@@ -543,6 +547,8 @@
 				break;
 			case GF_ISOM_SUBTYPE_AVC_H264:
 			case GF_ISOM_SUBTYPE_AVC2_H264:
+			case GF_ISOM_SUBTYPE_AVC3_H264:
+			case GF_ISOM_SUBTYPE_AVC4_H264:
 			case GF_ISOM_SUBTYPE_SVC_H264:
 				nb_vid++;
 				nb_avc++;
@@ -748,10 +754,14 @@
 	case GF_ISOM_SUBTYPE_MPEG4_CRYP:
 	case GF_ISOM_SUBTYPE_AVC_H264:
 	case GF_ISOM_SUBTYPE_AVC2_H264:
+	case GF_ISOM_SUBTYPE_AVC3_H264:
+	case GF_ISOM_SUBTYPE_AVC4_H264:
 	case GF_ISOM_SUBTYPE_SVC_H264:
 	case GF_ISOM_SUBTYPE_3GP_EVRC:
 	case GF_ISOM_SUBTYPE_3GP_QCELP:
 	case GF_ISOM_SUBTYPE_3GP_SMV:
+	case GF_ISOM_SUBTYPE_HVC1:
+	case GF_ISOM_SUBTYPE_HEV1:
 		return gf_isom_get_esd(mp4, track, 1);
 	}
 
@@ -879,3 +889,994 @@
 
 #endif /*GPAC_DISABLE_ISOM*/
 
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
+static s32 gf_get_DQId(GF_ISOFile *file, u32 track)
+{
+	GF_AVCConfig *svccfg;
+	GF_ISOSample *samp;
+	u32 di = 0, cur_extract_mode;
+	char *buffer;
+	GF_BitStream *bs;
+	u32 max_size = 4096;
+	u32 size, nalu_size_length;
+	u8 nal_type;
+	s32 DQId=0;
+
+	samp = NULL;
+	bs = NULL;
+	cur_extract_mode = gf_isom_get_nalu_extract_mode(file, track);
+	gf_isom_set_nalu_extract_mode(file, track, GF_ISOM_NALU_EXTRACT_INSPECT);
+	buffer = (char*)gf_malloc(sizeof(char) * max_size);
+	svccfg = gf_isom_svc_config_get(file, track, 1);
+	if (!svccfg)
+	{
+		DQId = 0;
+		goto exit;
+	}
+	samp = gf_isom_get_sample(file, track, 1, &di);
+	if (!samp)
+	{
+		DQId = -1;
+		goto exit;
+	}
+	bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
+	nalu_size_length = 8 * svccfg->nal_unit_size;
+	while (gf_bs_available(bs))
+	{
+		size = gf_bs_read_int(bs, nalu_size_length);
+		if (size>max_size) {
+			buffer = (char*)gf_realloc(buffer, sizeof(char)*size);
+			max_size = size;
+		}
+		gf_bs_read_data(bs, buffer, size);
+		nal_type = buffer[0] & 0x1F;
+		if (nal_type == GF_AVC_NALU_SVC_SLICE)
+		{
+			DQId = buffer[2] & 0x7F;
+			goto exit;
+		}
+	}
+exit:
+	if (svccfg) gf_odf_avc_cfg_del(svccfg);
+	if (samp) gf_isom_sample_del(&samp);
+	if (buffer) gf_free(buffer);
+	if (bs) gf_bs_del(bs);
+	gf_isom_set_nalu_extract_mode(file, track, cur_extract_mode);
+	return DQId;;
+}
+
+static Bool gf_isom_has_svc_explicit(GF_ISOFile *file, u32 track)
+{
+	GF_AVCConfig *svccfg;
+	GF_AVCConfigSlot *slc;
+	u32 i;
+	u8 type;
+	Bool ret = 0;
+
+	svccfg = gf_isom_svc_config_get(file, track, 1);
+	if (!svccfg)
+		return 0;
+
+	for (i = 0; i < gf_list_count(svccfg->sequenceParameterSets); i++)
+	{
+		slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->sequenceParameterSets, i);
+		type = slc->data[0] & 0x1F;
+		if (type == GF_AVC_NALU_SEQ_PARAM)
+		{
+			ret = 1;
+			break;
+		}
+	}
+
+	if (svccfg) gf_odf_avc_cfg_del(svccfg);
+	return ret;
+}
+
+
+static u32 gf_isom_get_track_id_max(GF_ISOFile *file)
+{
+	u32 num_track, i, trackID;
+	u32 max_id = 0;
+
+	num_track = gf_isom_get_track_count(file);
+	for (i = 1; i <= num_track; i++)
+	{
+		trackID = gf_isom_get_track_id(file, i);
+		if (max_id < trackID)
+			max_id = trackID;
+	}
+
+	return max_id;
+}
+
+/* Split SVC layers */
+GF_EXPORT
+GF_Err gf_media_split_svc(GF_ISOFile *file, u32 track, Bool splitAll)
+{
+	GF_AVCConfig *svccfg, *cfg;
+	u32 num_svc_track, num_sample, svc_track, dst_track, ref_trackID, ref_trackNum, max_id, di, width, height, size, nalu_size_length, i, j, t, max_size, num_pps, num_sps, num_subseq, NALUnitHeader, data_offset, data_length, count, timescale, cur_extract_mode;
+	GF_Err e; 
+	GF_AVCConfigSlot *slc, *sl;
+	AVCState avc;
+	s32 sps_id, pps_id;
+	GF_ISOSample *samp, *dst_samp;
+	GF_BitStream *bs, *dst_bs;
+	GF_BitStream ** sample_bs;
+	u8 nal_type, nal_hdr, track_ref_index;
+	char *buffer;
+	s32 *sps_track, *sps, *pps;
+	u64 offset;
+	Bool is_splited;
+	Bool *first_sample_track, *is_subseq_pps;
+	u64 *first_DTS_track;
+	s8 sample_offset;
+
+	max_size = 4096;
+	e = GF_OK;
+	samp = dst_samp = NULL;
+	bs = NULL;
+	sample_bs = NULL;
+	sps_track = sps = pps = NULL;
+	first_DTS_track = NULL;
+	first_sample_track = is_subseq_pps = NULL;
+	buffer = NULL;
+	cfg = NULL;
+	num_svc_track=0;
+	cur_extract_mode = gf_isom_get_nalu_extract_mode(file, track);
+	gf_isom_set_nalu_extract_mode(file, track, GF_ISOM_NALU_EXTRACT_INSPECT);
+	svccfg = gf_isom_svc_config_get(file, track, 1);
+	if (!svccfg)
+	{
+		e = GF_OK;
+		goto exit;
+	}
+	num_sps = gf_list_count(svccfg->sequenceParameterSets);
+	if (!num_sps)
+	{
+		e = GF_OK;
+		goto exit;
+	}
+	num_pps = gf_list_count(svccfg->pictureParameterSets);
+	if ((gf_isom_get_avc_svc_type(file, track, 1) == GF_ISOM_AVCTYPE_SVC_ONLY) && !gf_isom_has_svc_explicit(file, track))
+		is_splited = 1;
+	else
+		is_splited = 0;
+	num_subseq = gf_isom_has_svc_explicit(file, track) ? num_sps - 1 : num_sps;
+
+	if (is_splited)
+	{
+		/*this track has only one SVC ...*/
+		if (num_sps == 1)
+		{
+			/*use 'all' mode -> stop*/
+			if (splitAll)
+				goto exit;
+			/*use 'base' mode -> merge SVC tracks*/
+			else
+			{
+				e = gf_media_merge_svc(file, track, 0);
+				goto exit;
+			}
+		}
+		/*this file has been in 'splitbase' mode*/
+		else if (!splitAll)
+			goto exit;
+
+	}
+
+	timescale = gf_isom_get_media_timescale(file, track);
+	num_svc_track = splitAll ? num_subseq : 1;
+	max_id = gf_isom_get_track_id_max(file);
+	di = 0;
+	
+	memset(&avc, 0, sizeof(AVCState));
+	avc.sps_active_idx = -1;
+	nalu_size_length = 8 * svccfg->nal_unit_size;
+	/*read all sps, but we need only the subset sequence parameter sets*/
+	sps =  (s32 *) gf_malloc(num_subseq * sizeof(s32));
+	sps_track = (s32 *) gf_malloc(num_subseq * sizeof(s32));
+	count = 0;
+	for (i = 0; i < num_sps; i++)
+	{
+		slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->sequenceParameterSets, i);
+		nal_type = slc->data[0] & 0x1F;
+		sps_id = gf_media_avc_read_sps(slc->data, slc->size, &avc, 0, NULL);
+		if (sps_id < 0) {
+			e = GF_NON_COMPLIANT_BITSTREAM;
+			goto exit;
+		}
+		if (nal_type == GF_AVC_NALU_SVC_SUBSEQ_PARAM)
+		{
+			sps[count] = sps_id;
+			sps_track[count] = i;
+			count++;
+		}
+	}
+	/*for testing*/
+	assert(count == num_subseq);
+	/*read all pps*/
+	pps =  (s32 *) gf_malloc(num_pps * sizeof(s32));
+	for (j = 0; j < num_pps; j++)
+	{
+		slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->pictureParameterSets, j);
+		pps_id = gf_media_avc_read_pps(slc->data, slc->size, &avc);
+		if (pps_id < 0) {
+			e = GF_NON_COMPLIANT_BITSTREAM;
+			goto exit;
+		}
+		pps[j] = pps_id;
+	}
+	if (!is_splited)
+		ref_trackID = gf_isom_get_track_id(file, track);
+	else
+	{
+		gf_isom_get_reference(file, track, GF_ISOM_REF_BASE, 1, &ref_trackNum);
+		ref_trackID = gf_isom_get_track_id(file, ref_trackNum);
+	}
+
+	buffer = (char*)gf_malloc(sizeof(char) * max_size);
+	/*read first sample for determinating the order of SVC tracks*/
+	count = 0;
+	samp = gf_isom_get_sample(file, track, 1, &di);
+	if (!samp)
+	{
+		e = gf_isom_last_error(file);
+		goto exit;
+	}
+	bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
+	offset = 0;
+	is_subseq_pps = (Bool *) gf_malloc(num_pps*sizeof(Bool));
+	for (i = 0; i < num_pps; i++)
+		is_subseq_pps[i] = 0;
+	while (gf_bs_available(bs))
+	{
+		size = gf_bs_read_int(bs, nalu_size_length);
+		if (size>max_size) {
+			buffer = (char*)gf_realloc(buffer, sizeof(char)*size);
+			max_size = size;
+		}
+		nal_hdr = gf_bs_read_u8(bs);
+		nal_type = nal_hdr & 0x1F;
+		gf_media_avc_parse_nalu(bs, nal_hdr, &avc);
+		e = gf_bs_seek(bs, offset+nalu_size_length/8);
+		if (e)
+			goto exit;
+		gf_bs_read_data(bs, buffer, size);
+		offset += size + nalu_size_length/8;
+		if (nal_type == GF_AVC_NALU_SVC_SLICE)
+		{
+			for (i = 0; i < num_pps; i++)
+			{
+				if (avc.s_info.pps->id == pps[i])
+				{
+					is_subseq_pps[i] = 1;
+					break;
+				}
+			}
+			if ((count > 0) && (avc.s_info.pps->sps_id == sps[count-1]))
+				continue;
+			/*verify the order of SPS, reorder if necessary*/
+			if (avc.s_info.pps->sps_id != sps[count])
+			{
+				for (i = count+1; i < num_subseq; i++)
+				{
+					/*swap two SPS*/
+					if (avc.s_info.pps->sps_id == sps[i])
+					{
+						sps[i] = sps[count];
+						sps[count] = avc.s_info.pps->sps_id;
+						sps_track[count] = i;
+						break;
+					}
+				}
+			}
+			count++;
+		}
+	}
+	gf_bs_del(bs);
+	bs = NULL;
+
+	gf_isom_sample_del(&samp);
+	samp = NULL;
+	
+	for (t = 0; t < num_svc_track; t++)
+	{
+		e = GF_OK;
+		svc_track = gf_isom_new_track(file, t+1+max_id, GF_ISOM_MEDIA_VISUAL, timescale);
+		if (!svc_track) 
+		{
+			e = gf_isom_last_error(file);
+			goto exit;
+		}
+		gf_isom_set_track_enabled(file, svc_track, 1);
+		gf_isom_set_track_reference(file, svc_track, GF_ISOM_REF_BASE, ref_trackID);
+		cfg = gf_odf_avc_cfg_new();
+		cfg->complete_representation = 1; //SVC
+		/*this layer depends on the base layer and the lower layers*/
+		gf_isom_set_track_reference(file, svc_track, GF_ISOM_REF_SCAL, ref_trackID);
+		for (i = 0; i < t; i++)
+			gf_isom_set_track_reference(file, svc_track, GF_ISOM_REF_SCAL, i+1+max_id);
+
+		e = gf_isom_svc_config_new(file, svc_track, cfg, NULL, NULL, &di);
+		if (e)
+			goto exit;
+		if (splitAll)
+		{
+			sps_id = sps[t];
+			width = avc.sps[sps_id].width;
+			height = avc.sps[sps_id].height;
+			gf_isom_set_visual_info(file, svc_track, di, width, height);
+			cfg->configurationVersion = 1;
+			cfg->chroma_bit_depth = 8 + avc.sps[sps_id].chroma_bit_depth_m8;
+			cfg->chroma_format = avc.sps[sps_id].chroma_format;
+			cfg->luma_bit_depth = 8 + avc.sps[sps_id].luma_bit_depth_m8;
+			cfg->profile_compatibility = avc.sps[sps_id].prof_compat;
+			cfg->AVCLevelIndication = avc.sps[sps_id].level_idc;
+			cfg->AVCProfileIndication = avc.sps[sps_id].profile_idc;
+			cfg->nal_unit_size = svccfg->nal_unit_size;
+			slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->sequenceParameterSets, sps_track[t]);
+			sl = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+			sl->id = slc->id;
+			sl->size = slc->size;
+			sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
+			memcpy(sl->data, slc->data, sizeof(char)*sl->size);
+			gf_list_add(cfg->sequenceParameterSets, sl);
+			for (j = 0; j < num_pps; j++)
+			{
+				pps_id = pps[j];
+				if (is_subseq_pps[j] && (avc.pps[pps_id].sps_id == sps_id))
+				{
+					slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->pictureParameterSets, j);
+					sl = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+					sl->id = slc->id;
+					sl->size = slc->size;
+					sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
+					memcpy(sl->data, slc->data, sizeof(char)*sl->size);
+					gf_list_add(cfg->pictureParameterSets, sl);
+				}
+			}
+		}
+		else
+		{
+			for (i = 0; i < num_subseq; i++)
+			{
+				sps_id = sps[i];
+				width = avc.sps[sps_id].width;
+				height = avc.sps[sps_id].height;
+				gf_isom_set_visual_info(file, svc_track, di, width, height);
+				cfg->configurationVersion = 1;
+				cfg->chroma_bit_depth = 8 + avc.sps[sps_id].chroma_bit_depth_m8;
+				cfg->chroma_format = avc.sps[sps_id].chroma_format;
+				cfg->luma_bit_depth = 8 + avc.sps[sps_id].luma_bit_depth_m8;
+				cfg->profile_compatibility = avc.sps[sps_id].prof_compat;
+				cfg->AVCLevelIndication = avc.sps[sps_id].level_idc;
+				cfg->AVCProfileIndication = avc.sps[sps_id].profile_idc;
+				cfg->nal_unit_size = svccfg->nal_unit_size;
+				slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->sequenceParameterSets, sps_track[i]);
+				sl = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+				sl->id = slc->id;
+				sl->size = slc->size;
+				sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
+				memcpy(sl->data, slc->data, sizeof(char)*sl->size);
+				gf_list_add(cfg->sequenceParameterSets, sl);
+				for (j = 0; j < num_pps; j++)
+				{
+					pps_id = pps[j];
+					if (avc.pps[pps_id].sps_id == sps_id)
+					{
+						slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->pictureParameterSets, j);
+						sl = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+						sl->id = slc->id;
+						sl->size = slc->size;
+						sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
+						memcpy(sl->data, slc->data, sizeof(char)*sl->size);
+						gf_list_add(cfg->pictureParameterSets, sl);
+					}
+				}
+			}
+		}
+		e = gf_isom_svc_config_update(file, svc_track, 1, cfg, 0);
+		if (e)
+			goto exit;
+		gf_odf_avc_cfg_del(cfg);
+		cfg = NULL;
+	}
+
+	num_sample = gf_isom_get_sample_count(file, track);
+	first_sample_track = (Bool *) gf_malloc((num_svc_track+1) * sizeof(Bool));
+	for (t = 0; t <= num_svc_track; t++)
+		first_sample_track[t] = 1;
+	first_DTS_track = (u64 *) gf_malloc((num_svc_track+1) * sizeof(u64));
+	for (t = 0; t <= num_svc_track; t++)
+		first_DTS_track[t] = 0;
+	for (i = 1; i <= num_sample; i++)
+	{
+		/*reset*/
+		memset(buffer, 0, max_size);
+		
+		samp = gf_isom_get_sample(file, track, i, &di);
+		if (!samp)
+		{
+			e = GF_IO_ERR;
+			goto exit;
+		}
+
+		/* Create (num_svc_track) SVC bitstreams + 1 AVC bitstream*/
+		sample_bs = (GF_BitStream **) gf_malloc(sizeof(GF_BitStream *) * (num_svc_track+1));
+		for (j = 0; j <= num_svc_track; j++)
+			sample_bs[j] = (GF_BitStream *) gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+		/*write extractor*/
+		for (t = 0; t < num_svc_track; t++)
+		{
+			//reference to base layer
+			gf_bs_write_int(sample_bs[t+1], 14, nalu_size_length); // extractor 's size = 14
+			NALUnitHeader = 0; //reset
+			NALUnitHeader |= 0x1F000000; // NALU type = 31
+			gf_bs_write_u32(sample_bs[t+1], NALUnitHeader);
+			track_ref_index = (u8) gf_isom_has_track_reference(file, t+1+max_id, GF_ISOM_REF_SCAL, ref_trackID);
+			if (!track_ref_index)
+			{
+				e = GF_CORRUPTED_DATA;
+				goto exit;
+			}
+			gf_bs_write_u8(sample_bs[t+1], track_ref_index);
+			sample_offset = 0;
+			gf_bs_write_u8(sample_bs[t+1], sample_offset);
+			data_offset = 0;
+			gf_bs_write_u32(sample_bs[t+1], data_offset);
+			data_length = 0;
+			gf_bs_write_u32(sample_bs[t+1], data_length);
+			//reference to previous layer(s)
+			for (j = 0; j < t; j++)
+			{
+				gf_bs_write_int(sample_bs[t+1], 14, nalu_size_length);
+				NALUnitHeader = 0;
+				NALUnitHeader |= 0x1F000000;
+				gf_bs_write_u32(sample_bs[t+1], NALUnitHeader);
+				track_ref_index = (u8) gf_isom_has_track_reference(file, t+1+max_id, GF_ISOM_REF_SCAL, j+1+max_id);
+				if (!track_ref_index)
+				{
+					e = GF_CORRUPTED_DATA;
+					goto exit;
+				}
+				gf_bs_write_u8(sample_bs[t+1], track_ref_index);
+				sample_offset = 0;
+				gf_bs_write_u8(sample_bs[t+1], sample_offset);
+				data_offset = (j+1) * (nalu_size_length/8 + 14); // (nalu_size_length/8) bytes of NALU length field + 14 bytes of extractor per layer
+				gf_bs_write_u32(sample_bs[t+1], data_offset);
+				data_length = 0;
+				gf_bs_write_u32(sample_bs[t+1], data_length);
+			}
+		}
+
+		bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
+		offset = 0;
+		while (gf_bs_available(bs))
+		{
+			size = gf_bs_read_int(bs, nalu_size_length);
+			if (size>max_size) {
+				buffer = (char*)gf_realloc(buffer, sizeof(char)*size);
+				max_size = size;
+			}
+			nal_hdr = gf_bs_read_u8(bs);
+			nal_type = nal_hdr & 0x1F;
+			gf_media_avc_parse_nalu(bs, nal_hdr, &avc);
+			e = gf_bs_seek(bs, offset+nalu_size_length/8);
+			if (e)
+				goto exit;
+			gf_bs_read_data(bs, buffer, size);
+			offset += size + nalu_size_length/8;
+					
+			switch (nal_type) {
+				case GF_AVC_NALU_PIC_PARAM:
+					pps_id = gf_media_avc_read_pps(buffer, size, &avc);;
+					j = 0;
+					dst_track = 0;
+					while (j < num_pps)
+					{
+						if (pps_id == pps[j])
+							break;
+						j++;
+					}
+					if ((j < num_pps) && (is_subseq_pps[j]))
+					{
+						if (splitAll)
+						{
+							for (t = 0; t < num_svc_track; t++)
+							{
+								if (sps[t] == avc.pps[pps_id].sps_id)
+								{
+									dst_track = t + 1;
+									break;
+								}
+							}
+						}
+						else
+							dst_track = 1;
+					}
+					dst_bs = sample_bs[dst_track];
+					break;
+				case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
+					sps_id = gf_media_avc_read_sps(buffer, size, &avc, 0, NULL);
+					dst_track = 0;
+					if (splitAll)
+					{
+						for (t = 0; t < num_svc_track; t++)
+						{
+							if (sps[t] == sps_id)
+							{
+								dst_track = t + 1;
+								break;
+							}
+						}
+					}
+					else
+						dst_track = 1;
+					dst_bs = sample_bs[dst_track];
+					break;
+				case GF_AVC_NALU_SVC_SLICE:
+					dst_track = 0;
+					if (splitAll)
+					{
+						for (t = 0; t < num_svc_track; t++)
+						{
+							if (sps[t] == (avc.s_info.pps)->sps_id)
+							{
+								dst_track = t + 1;
+								break;
+							}
+						}
+					}
+					else
+						dst_track = 1;
+					dst_bs = sample_bs[dst_track];
+					break;
+				default:
+					dst_bs = sample_bs[0];
+			}
+
+			gf_bs_write_int(dst_bs, size, nalu_size_length);
+			gf_bs_write_data(dst_bs, buffer, size);
+		}
+
+		for (j = 0; j <= num_svc_track; j++)
+		{
+			if (gf_bs_get_position(sample_bs[j]))
+			{
+				if (first_sample_track[j])
+				{
+					first_sample_track[j] = 0;
+					first_DTS_track[j] = samp->DTS;
+				}
+				dst_samp = gf_isom_sample_new();
+				dst_samp->CTS_Offset = samp->CTS_Offset;
+				dst_samp->DTS = samp->DTS - first_DTS_track[j];
+				dst_samp->IsRAP = samp->IsRAP;
+				gf_bs_get_content(sample_bs[j], &dst_samp->data, &dst_samp->dataLength);
+				if (j) //SVC
+					e = gf_isom_add_sample(file, track+j, di, dst_samp);
+				else
+					e = gf_isom_update_sample(file, track, i, dst_samp, 1);
+				if (e)
+					goto exit;
+				gf_isom_sample_del(&dst_samp);
+				dst_samp = NULL;
+			}
+			gf_bs_del(sample_bs[j]);
+			sample_bs[j] = NULL;
+		}
+		gf_free(sample_bs);
+		sample_bs = NULL;
+		gf_bs_del(bs);
+		bs = NULL;
+		gf_isom_sample_del(&samp);
+		samp = NULL;
+	}
+
+	/*add Editlist entry if DTS of the first sample is not zero*/
+	for (t = 0; t <= num_svc_track; t++)
+	{
+		if (first_DTS_track[t])
+		{
+			u32 media_ts, moov_ts, offset;
+			u64 dur;
+			media_ts = gf_isom_get_media_timescale(file, t);
+			moov_ts = gf_isom_get_timescale(file);
+			offset = (u32)(first_DTS_track[t]) * moov_ts / media_ts;
+			dur = gf_isom_get_media_duration(file, t) * moov_ts / media_ts;
+			gf_isom_set_edit_segment(file, t, 0, offset, 0, GF_ISOM_EDIT_EMPTY);
+			gf_isom_set_edit_segment(file, t, offset, dur, 0, GF_ISOM_EDIT_NORMAL);
+		}
+	}
+	
+	/*if this is a merged file*/
+	if (!is_splited)
+	{
+		/*a normal stream: delete SVC config*/
+		if (!gf_isom_has_svc_explicit(file, track))
+		{
+			gf_isom_svc_config_del(file, track, 1);
+		}
+		else
+		{
+			s32 shift=0;
+			
+			for (i = 0; i < gf_list_count(svccfg->sequenceParameterSets); i++)
+			{
+				slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->sequenceParameterSets, i);
+				sps_id = gf_media_avc_read_sps(slc->data, slc->size, &avc, 0, NULL);
+				if (sps_id < 0) {
+					e = GF_NON_COMPLIANT_BITSTREAM;
+					goto exit;
+				}
+				nal_type = slc->data[0] & 0x1F;
+				if (nal_type == GF_AVC_NALU_SVC_SUBSEQ_PARAM)
+				{
+					gf_list_rem(svccfg->sequenceParameterSets, i);
+					gf_free(slc->data);
+					gf_free(slc);
+					i--;
+				}
+			}
+
+			for (j = 0; j < gf_list_count(svccfg->pictureParameterSets); j++)
+				{
+					slc = (GF_AVCConfigSlot *)gf_list_get(svccfg->pictureParameterSets, j);
+					pps_id = gf_media_avc_read_pps(slc->data, slc->size, &avc);
+					if (pps_id < 0) {
+						e = GF_NON_COMPLIANT_BITSTREAM;
+						goto exit;
+					}
+					if (is_subseq_pps[j+shift])
+					{
+						gf_list_rem(svccfg->pictureParameterSets, j);
+						gf_free(slc->data);
+						gf_free(slc);
+						j--;
+					}
+				}
+			e = gf_isom_svc_config_update(file, track, 1, svccfg, 0);
+			if (e)
+				goto exit;
+		}
+	}
+	/*if this is as splited file: delete this track*/
+	else
+	{
+		gf_isom_remove_track(file, track);
+	}
+
+exit:
+	if (svccfg) gf_odf_avc_cfg_del(svccfg);
+	if (cfg) gf_odf_avc_cfg_del(cfg);
+	if (samp) gf_isom_sample_del(&samp);
+	if (dst_samp) gf_isom_sample_del(&dst_samp);
+	if (bs) gf_bs_del(bs);
+	if (sample_bs)
+	{
+		for (i = 0; i <= num_svc_track; i++)
+			gf_bs_del(sample_bs[i]);
+		gf_free(sample_bs);
+	}
+	if (sps_track) gf_free(sps_track);
+	if (sps) gf_free(sps);
+	if (pps) gf_free(pps);
+	if (first_sample_track) gf_free(first_sample_track);
+	if (first_DTS_track) gf_free(first_DTS_track);
+	if (buffer) gf_free(buffer);
+	if (is_subseq_pps) gf_free(is_subseq_pps);
+	gf_isom_set_nalu_extract_mode(file, track, cur_extract_mode);
+	return e;
+}
+
+/* Merge SVC layers*/
+GF_EXPORT
+GF_Err gf_media_merge_svc(GF_ISOFile *file, u32 track, Bool mergeAll)
+{
+	GF_AVCConfig *svccfg, *cfg;
+	u32 merge_track,  num_track, num_sample, size, i, t, di, max_size, nalu_size_length, ref_trackNum, ref_trackID, count, width, height, nb_EditList, media_ts, moov_ts;
+	GF_ISOSample *avc_samp, *samp, *dst_samp;
+	GF_BitStream *bs, *dst_bs;
+	GF_Err e;
+	char *buffer;
+	s32 *DQId;
+	u32 *list_track_sorted, *cur_sample, *max_sample;
+	u64 *DTS_offset;
+	u64 EditTime, SegmentDuration, MediaTime;
+	u8 EditMode, nal_type;
+	Bool first_sample;
+	u64 first_DTS, offset, dur; 
+	GF_AVCConfigSlot *slc, *sl;
+
+	e = GF_OK;
+	di = 1;
+	max_size = 4096;
+	width = height = 0;
+	avc_samp = samp = dst_samp = NULL;
+	svccfg = cfg = NULL;
+	buffer = NULL;
+	bs = dst_bs = NULL;
+	DQId = NULL;
+	list_track_sorted = cur_sample = max_sample = NULL;
+	DTS_offset = NULL;
+	
+	if (gf_isom_get_avc_svc_type(file, track, 1) == GF_ISOM_AVCTYPE_AVC_SVC)
+		goto exit;
+
+	num_track = gf_isom_get_track_count(file);
+	if (num_track == 1) 
+		goto exit;
+	gf_isom_get_reference(file, track, GF_ISOM_REF_BASE, 1, &ref_trackNum);
+	ref_trackID = gf_isom_get_track_id(file, ref_trackNum);
+	if (!ref_trackID)
+	{
+		e = GF_ISOM_INVALID_MEDIA;
+		goto exit;
+	}
+	
+	list_track_sorted = (u32 *) gf_malloc(num_track * sizeof(u32));
+	DQId = (s32 *) gf_malloc(num_track * sizeof(s32));
+	count = 0;
+	for (t = 1; t <= num_track; t++) {
+		u32 pos = 0;
+		s32 track_DQId = gf_get_DQId(file, t);
+		if (track_DQId < 0) {
+			e = GF_ISOM_INVALID_MEDIA;
+			goto exit;
+		}
+
+		if (!gf_isom_has_track_reference(file, t, GF_ISOM_REF_BASE, ref_trackID))
+		{
+			if (t != ref_trackNum) continue;
+			else if (!mergeAll) continue;
+		}
+
+		while ((pos < count ) && (DQId[pos] <= track_DQId))
+			pos++;
+		for (i = count; i > pos; i--)
+		{
+			list_track_sorted[i] = list_track_sorted[i-1];
+			DQId[i] = DQId[i-1];
+		}
+		list_track_sorted[pos] = t;
+		DQId[pos] = track_DQId;
+		count++;
+	}
+
+	merge_track = list_track_sorted[0];
+	gf_isom_set_track_enabled(file, merge_track, 1);
+	/*rewrite svccfg*/
+	svccfg = gf_odf_avc_cfg_new();
+	svccfg->complete_representation = 1; 
+	e = gf_isom_svc_config_new(file, merge_track, svccfg, NULL, NULL, &di);
+	if (e) goto exit;
+	/*rewrite visual info*/
+	if (!mergeAll)
+	{
+		for (t = 0; t < count; t++)
+			gf_isom_get_visual_info(file, list_track_sorted[t], 1, &width, &height);
+		gf_isom_set_visual_info(file, merge_track, 1, width, height);
+	}
+
+	for (t = 0; t < count; t++)
+	{
+		cfg = gf_isom_svc_config_get(file, list_track_sorted[t], 1);
+		if (!cfg)
+			continue;
+		svccfg->configurationVersion = 1;
+		svccfg->chroma_bit_depth = cfg->chroma_bit_depth;
+		svccfg->chroma_format = cfg->chroma_format;
+		svccfg->luma_bit_depth = cfg->luma_bit_depth;
+		svccfg->profile_compatibility = cfg->profile_compatibility;
+		svccfg->AVCLevelIndication = cfg->AVCLevelIndication;
+		svccfg->AVCProfileIndication = cfg->AVCProfileIndication;
+		svccfg->nal_unit_size = cfg->nal_unit_size;
+		for (i = 0; i < gf_list_count(cfg->sequenceParameterSets); i++)
+		{
+			slc = (GF_AVCConfigSlot *)gf_list_get(cfg->sequenceParameterSets, i);
+			sl = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+			sl->id = slc->id;
+			sl->size = slc->size;
+			sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
+			memcpy(sl->data, slc->data, sizeof(char)*sl->size);
+			gf_list_add(svccfg->sequenceParameterSets, sl);
+		}
+		for (i = 0; i < gf_list_count(cfg->pictureParameterSets); i++)
+		{
+			slc = (GF_AVCConfigSlot *)gf_list_get(cfg->pictureParameterSets, i);
+			sl = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+			sl->id = slc->id;
+			sl->size = slc->size;
+			sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
+			memcpy(sl->data, slc->data, sizeof(char)*sl->size);
+			gf_list_add(svccfg->pictureParameterSets, sl);
+		}
+		if (mergeAll)
+			gf_isom_svc_config_update(file, merge_track, 1, svccfg, 1);
+		else
+			gf_isom_svc_config_update(file, merge_track, 1, svccfg, 0);
+		gf_odf_avc_cfg_del(cfg);
+		cfg = NULL;
+	}
+
+	cur_sample = (u32 *) gf_malloc(count * sizeof(u32));
+	max_sample = (u32 *) gf_malloc(count * sizeof(u32));
+	for (t = 0; t < count; t++)
+	{
+		cur_sample[t] = 1;
+		max_sample[t] = gf_isom_get_sample_count(file, list_track_sorted[t]);
+	}
+
+	DTS_offset = (u64 *) gf_malloc(count * sizeof(u64));
+	for (t = 0; t < count; t++)
+	{
+		nb_EditList = gf_isom_get_edit_segment_count(file, list_track_sorted[t]);
+		if (!nb_EditList)
+			DTS_offset[t] = 0;
+		else
+		{
+			media_ts = gf_isom_get_media_timescale(file, list_track_sorted[t]);
+			moov_ts = gf_isom_get_timescale(file);
+			for (i = 1; i <= nb_EditList; i++)
+			{
+				e = gf_isom_get_edit_segment(file, list_track_sorted[t], i, &EditTime, &SegmentDuration, &MediaTime, &EditMode);
+				if (e) goto exit;
+
+				if (!EditMode)
+				{
+					DTS_offset[t] = SegmentDuration * media_ts / moov_ts;
+				}
+			}
+		}
+	}
+
+	num_sample = gf_isom_get_sample_count(file, ref_trackNum);
+	nalu_size_length = 8 * svccfg->nal_unit_size;
+	first_sample = 1;
+	first_DTS = 0;
+	buffer = (char*)gf_malloc(sizeof(char) * max_size);
+	for (t = 1; t <= num_track; t++)
+		gf_isom_set_nalu_extract_mode(file, t, GF_ISOM_NALU_EXTRACT_INSPECT);
+	for (i = 1; i <= num_sample; i++)
+	{
+		dst_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		/*add extractor if nessassary*/
+		if (!mergeAll)
+		{
+			u32 NALUnitHeader = 0;
+			u8 track_ref_index;
+			s8 sample_offset;
+			u32 data_offset;
+			u32 data_length;
+
+			gf_bs_write_int(dst_bs, 14, nalu_size_length); // extractor 's size = 14
+			NALUnitHeader |= 0x1F000000; // NALU type = 31
+			gf_bs_write_u32(dst_bs, NALUnitHeader);
+			track_ref_index = (u8) gf_isom_has_track_reference(file, merge_track, GF_ISOM_REF_SCAL, ref_trackID);
+			if (!track_ref_index)
+			{
+				e = GF_CORRUPTED_DATA;
+				goto exit;
+			}
+			gf_bs_write_u8(dst_bs, track_ref_index);
+			sample_offset = 0;
+			gf_bs_write_u8(dst_bs, sample_offset);
+			data_offset = 0;
+			gf_bs_write_u32(dst_bs, data_offset);
+			data_length = 0;
+			gf_bs_write_u32(dst_bs, data_length);
+		}
+
+		avc_samp = gf_isom_get_sample(file, ref_trackNum, i, &di);
+		if (!avc_samp) {
+			e = gf_isom_last_error(file);
+			goto exit;
+		}
+
+		for (t = 0; t < count; t++)
+		{
+			if (cur_sample[t] > max_sample[t])
+				continue;
+			samp = gf_isom_get_sample(file, list_track_sorted[t], cur_sample[t], &di);
+			if (!samp) {
+				e = gf_isom_last_error(file);
+				goto exit;
+			}
+
+			if ((samp->DTS + DTS_offset[t]) != avc_samp->DTS)
+				continue;
+			bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
+			/*reset*/
+			memset(buffer, 0, sizeof(char) * max_size);
+			while (gf_bs_available(bs))
+			{
+				size = gf_bs_read_int(bs, nalu_size_length);
+				if (size>max_size) {
+					buffer = (char*)gf_realloc(buffer, sizeof(char)*size);
+					max_size = size;
+				}			
+				gf_bs_read_data(bs, buffer, size);
+				nal_type = buffer[0] & 0x1F;
+				/*skip extractor*/
+				if (nal_type == 31)
+					continue;			
+				/*copy to new bitstream*/
+				gf_bs_write_int(dst_bs, size, nalu_size_length);
+				gf_bs_write_data(dst_bs, buffer, size);
+			}
+			gf_bs_del(bs);
+			bs = NULL;
+			gf_isom_sample_del(&samp);
+			samp = NULL;
+			cur_sample[t]++;
+		}
+		
+		/*add sapmle to track*/
+		if (gf_bs_get_position(dst_bs))
+		{
+			if (first_sample)
+			{
+				first_DTS = avc_samp->DTS;
+				first_sample = 0;
+			}
+			dst_samp = gf_isom_sample_new();
+			dst_samp->CTS_Offset = avc_samp->CTS_Offset;
+			dst_samp->DTS = avc_samp->DTS - first_DTS;
+			dst_samp->IsRAP = avc_samp->IsRAP;
+			gf_bs_get_content(dst_bs, &dst_samp->data, &dst_samp->dataLength);
+			e = gf_isom_update_sample(file, merge_track, i, dst_samp, 1);
+			if (e)
+				goto exit;
+		}
+		gf_isom_sample_del(&avc_samp);
+		avc_samp = NULL;
+		gf_bs_del(dst_bs);
+		dst_bs = NULL;
+		gf_isom_sample_del(&dst_samp);
+		dst_samp = NULL;
+	}
+
+	/*Add EditList if nessessary*/
+	if (!first_DTS)
+	{
+		media_ts = gf_isom_get_media_timescale(file, merge_track);
+		moov_ts = gf_isom_get_timescale(file);
+		offset = (u32)(first_DTS) * moov_ts / media_ts;
+		dur = gf_isom_get_media_duration(file, merge_track) * moov_ts / media_ts;
+		gf_isom_set_edit_segment(file, merge_track, 0, offset, 0, GF_ISOM_EDIT_EMPTY);
+		gf_isom_set_edit_segment(file, merge_track, offset, dur, 0, GF_ISOM_EDIT_NORMAL);
+	}
+
+	/*Delete SVC track(s) that references to ref_track*/
+	for (t = 1; t <= num_track; t++)
+	{
+		if (gf_isom_has_track_reference(file, t, GF_ISOM_REF_BASE, ref_trackID) && (t != merge_track))
+		{
+			gf_isom_remove_track(file, t);
+			num_track--; //we removed one track from file
+			t--;
+		}
+	}
+
+exit:
+	if (avc_samp) gf_isom_sample_del(&avc_samp);
+	if (samp) gf_isom_sample_del(&samp);
+	if (dst_samp) gf_isom_sample_del(&dst_samp);
+	if (svccfg) gf_odf_avc_cfg_del(svccfg);
+	if (cfg) gf_odf_avc_cfg_del(cfg);
+	if (bs) gf_bs_del(bs);
+	if (dst_bs) gf_bs_del(dst_bs);
+	if (buffer) gf_free(buffer);
+	if (DQId) gf_free(DQId);
+	if (list_track_sorted) gf_free(list_track_sorted);
+	if (cur_sample) gf_free(cur_sample);
+	if (max_sample) gf_free(max_sample);
+	if (DTS_offset) gf_free(DTS_offset);
+	for (t = 1; t <= gf_isom_get_track_count(file); t++)
+		gf_isom_set_nalu_extract_mode(file, t, GF_ISOM_NALU_EXTRACT_DEFAULT);
+	return e;
+}
+
+#endif /*GPAC_DISABLE_MEDIA_IMPORT*/
+

gpac-0.5.0.svn4192.tar.bz2/src/media_tools/m2ts_mux.c -> gpac-0.5.0.svn4296.tar.bz2/src/media_tools/m2ts_mux.c Changed

@@ -401,7 +401,7 @@
 	/*MPEG-4 tables are input streams for the mux, the bitrate is updated when fetching AUs*/
 }
 
-static u32 gf_m2ts_add_adaptation(GF_BitStream *bs, u16 pid,  
+static u32 gf_m2ts_add_adaptation(GF_M2TS_Mux_Program *prog, GF_BitStream *bs, u16 pid,  
 				   Bool has_pcr, u64 pcr_time, 
 				   Bool is_rap, 
 				   u32 padding_length)
@@ -426,10 +426,13 @@
 		gf_bs_write_int(bs,	0, 6); // reserved
 		PCR_ext = pcr_time - PCR_base*300;
 		gf_bs_write_long_int(bs, PCR_ext, 9);
-
+		if (prog->last_pcr > pcr_time) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Sending PCR "LLD" earlier than previous PCR "LLD" - drift %f sec\n", pid, pcr_time, prog->last_pcr, (prog->last_pcr - pcr_time) /27000000.0 ));
+		}
+		prog->last_pcr = pcr_time;
 
 #ifndef GPAC_DISABLE_LOG
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Adding adaptation field size %d - RAP %d - Padding %d - PCR %d\n", pid, adaptation_length, is_rap, padding_length, pcr_time));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Adding adaptation field size %d - RAP %d - Padding %d - PCR "LLD"\n", pid, adaptation_length, is_rap, padding_length, pcr_time));
 	} else {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Adding adaptation field size %d - RAP %d - Padding %d\n", pid, adaptation_length, is_rap, padding_length));
 #endif
@@ -496,7 +499,7 @@
 	else stream->continuity_counter=0;
 
 	if (adaptation_field_control != GF_M2TS_ADAPTATION_NONE)
-		gf_m2ts_add_adaptation(bs, stream->pid, 0, 0, 0, padding_length);
+		gf_m2ts_add_adaptation(stream->program, bs, stream->pid, 0, 0, 0, padding_length);
 
 	/*pointer field*/
 	if (!stream->current_section_offset) {
@@ -703,6 +706,10 @@
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: DTS "LLD" is less than initial DTS "LLD" - adjusting\n", stream->pid, *dts, stream->program->initial_ts));
 		stream->program->initial_ts = *dts;
 	}
+	else if (*dts < stream->last_dts) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: DTS "LLD" is less than last sent DTS "LLD"\n", stream->pid, *dts, stream->last_dts));
+		stream->last_dts = *dts;
+	}
 
 	/*offset our timestamps*/
 	*cts += stream->program->pcr_offset;
@@ -787,7 +794,6 @@
 	if (!(stream->curr_pck.flags & GF_ESI_DATA_HAS_DTS))
 		stream->curr_pck.dts = stream->curr_pck.cts;
 
-
 	/*initializing the PCR*/
 	if (!stream->program->pcr_init_time) {
 		if (stream==stream->program->pcr) {
@@ -1174,7 +1180,7 @@
 	return 1;
 }
 
-
+u64 last_dts=0;
 static u32 gf_m2ts_stream_get_pes_header_length(GF_M2TS_Mux_Stream *stream)
 {
 	u32 hdr_len, flags;
@@ -1267,7 +1273,6 @@
 		gf_bs_write_long_int(bs, t, 15);
 		gf_bs_write_int(bs, 1, 1); // marker bit
 	}
-
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Adding PES header at PCR "LLD" - has PTS %d (%d) - has DTS %d (%d)\n", stream->pid, gf_m2ts_get_pcr(stream->program)/300, use_pts, cts, use_dts, dts));
 
 	return pes_len+4; // 4 = start code + stream_id
@@ -1393,11 +1398,10 @@
 			stream->program->last_sys_clock = now;
 			/*if stream does not use DTS, use CTS as base time for PCR*/
 			stream->program->last_dts = (stream->curr_pck.flags & GF_ESI_DATA_HAS_DTS) ? stream->curr_pck.dts : stream->curr_pck.cts;
-			stream->program->last_pcr = pcr;
 			stream->pcr_priority = 0;
 		}
 		is_rap = (hdr_len && (stream->curr_pck.flags & GF_ESI_DATA_AU_RAP) ) ? 1 : 0;
-		gf_m2ts_add_adaptation(bs, stream->pid, needs_pcr, pcr, is_rap, padding_length);
+		gf_m2ts_add_adaptation(stream->program, bs, stream->pid, needs_pcr, pcr, is_rap, padding_length);
 	
 		if (padding_length) 
 			stream->program->mux->tot_pes_pad_bytes += padding_length;
@@ -1615,9 +1619,17 @@
 			break;
 		case GPAC_OTI_VIDEO_AVC:
 			stream->mpeg2_stream_type = GF_M2TS_VIDEO_H264;
-			/*make sure we send AU delim NALU in same PES as first VCL NAL: 6 bytes (AU delim) + 4 byte start code + first nal header*/
+			/*make sure we send AU delim NALU in same PES as first VCL NAL: 6 bytes (start code + 1 nal hdr + AU delim) 
+			+ 4 byte start code + first nal header*/
 			stream->min_bytes_copy_from_next = 11;
 			break;
+		case GPAC_OTI_VIDEO_HEVC:
+			stream->mpeg2_stream_type = GF_M2TS_VIDEO_HEVC;
+			/*make sure we send AU delim NALU in same PES as first VCL NAL: 7 bytes (4 start code + 2 nal header + 1 AU delim)
+			+ 4 byte start code + first nal header*/
+			stream->min_bytes_copy_from_next = 12;
+			break;
+			
 		case GPAC_OTI_VIDEO_MPEG1:
 			stream->mpeg2_stream_type = GF_M2TS_VIDEO_MPEG1;
 			break;
@@ -1649,6 +1661,9 @@
 			stream->mpeg2_stream_type = GF_M2TS_AUDIO_MPEG2;
 			break;
 		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:
 			stream->mpeg2_stream_type = GF_M2TS_AUDIO_LATM_AAC;
 			stream->mpeg2_stream_type = GF_M2TS_AUDIO_AAC;
 			if (!ifce->repeat_rate) ifce->repeat_rate = 500;
@@ -1732,6 +1747,7 @@
 	}
 	program->pmt = gf_m2ts_stream_new(pmt_pid);
 	program->pmt->program = program;
+	program->pmt->table_needs_update = 1;
 	muxer->pat->table_needs_update = 1;
 	program->pmt->process = gf_m2ts_stream_process_pmt;
 	program->pmt->refresh_rate_ms = pmt_refresh_rate ? pmt_refresh_rate : (u32) -1;

gpac-0.5.0.svn4192.tar.bz2/src/media_tools/m3u8.c -> gpac-0.5.0.svn4296.tar.bz2/src/media_tools/m3u8.c Changed

@@ -315,6 +315,7 @@
 	char * title;
 	int durationInSeconds;
 	int bandwidth;
+	int width, height;
 	int programId;
 	char * codecs;
 	int targetDurationInSeconds;
@@ -432,7 +433,7 @@
 		/* Not Supported for now */
 		return ret;
 	}
-	ret = extractAttributes("#EXT-X-STREAM-INF:", line, 3);
+	ret = extractAttributes("#EXT-X-STREAM-INF:", line, 10);
 	if (ret) {
 		/* #EXT-X-STREAM-INF:[attribute=value][,attribute=value]* */
 		i = 0;
@@ -453,6 +454,13 @@
 				if (ret[i][intValue-1] == '"') {
 					attributes->codecs = gf_strdup(&(ret[i][7]));
 				}
+			} else if (safe_start_equals("RESOLUTION=", ret[i])) {
+				u32 w, h;
+				utility = &(ret[i][11]);
+				if ((sscanf(utility, "%dx%d", &w, &h)==2) || (sscanf(utility, "%dx%d,", &w, &h)==2)) {
+					attributes->width = w;
+					attributes->height = h;
+				}
 			}
 			i++;
 		}
@@ -487,20 +495,30 @@
 GF_Err parse_sub_playlist(const char * file, VariantPlaylist ** playlist, const char * baseURL, Program * in_program, PlaylistElement *sub_playlist)
 {
 	int len, i, currentLineNumber;
-	FILE * f;
+	FILE * f=NULL;
+	char *m3u8_payload;
+	u32 m3u8_size, m3u8pos;
 	VariantPlaylist * pl;
 	char currentLine[M3U8_BUF_SIZE];
 	char ** attributes = NULL;
 	s_accumulated_attributes attribs;
-	f = gf_f64_open(file, "rt");
-	if (!f) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] Cannot Open m3u8 file %s for reading\n", file));
-		return GF_SERVICE_ERROR;
+
+	if (!strncmp(file, "gmem://", 7)) {
+		if (sscanf(file, "gmem://%d@%p", &m3u8_size, &m3u8_payload) != 2) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] Cannot Open m3u8 source %s for reading\n", file));
+			return GF_SERVICE_ERROR;
+		}
+	} else {
+		f = gf_f64_open(file, "rt");
+		if (!f) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] Cannot Open m3u8 file %s for reading\n", file));
+			return GF_SERVICE_ERROR;
+		}
 	}
 	if (*playlist == NULL) {
 		*playlist = variant_playlist_new();
 		if (!(*playlist)) {
-			fclose(f);
+			if (f) fclose(f);
 			return GF_OUT_OF_MEM;
 		}
 	}
@@ -514,8 +532,26 @@
 	attribs.isPlaylistEnded = 0;
 	attribs.minMediaSequence = 0;
 	attribs.currentMediaSequence = 0;
-	while (fgets(currentLine, sizeof(currentLine), f)) {
+	m3u8pos=0;
+	while (1) {
 		char * eof;
+		if (f) {
+			if (!fgets(currentLine, sizeof(currentLine), f))
+				break;
+		} else {
+			u32 __idx=0;
+			if (m3u8pos>=m3u8_size)
+				break;
+			while (1) {
+				currentLine[__idx] = m3u8_payload[m3u8pos];
+				__idx++;
+				m3u8pos++;
+				if ((currentLine[__idx-1]=='\n') || (currentLine[__idx-1]=='\r')) {
+					currentLine[__idx]=0;
+					break;
+				}
+			}
+		}
 		currentLineNumber++;
 		eof = strchr(currentLine, '\r');
 		if (eof)
@@ -593,7 +629,7 @@
 					if (program == NULL) {
 						/* OUT of memory */
 						variant_playlist_del(*playlist);
-						fclose(f);
+						if (f) fclose(f);
 						playlist = NULL;
 						return GF_OUT_OF_MEM;
 					}
@@ -635,7 +671,7 @@
 						/* OUT of memory */
 						variant_playlist_del(*playlist);
 						playlist = NULL;
-						fclose(f);
+						if (f) fclose(f);
 						return GF_OUT_OF_MEM;
 					}
 					assert( fullURL);
@@ -643,6 +679,8 @@
 					currentPlayList->title = attribs.title ? gf_strdup(attribs.title):NULL;
 					currentPlayList->codecs = attribs.codecs ? gf_strdup(attribs.codecs):NULL;
 					gf_list_add(program->bitrates, currentPlayList);
+					currentPlayList->width = attribs.width;
+					currentPlayList->height = attribs.height;
 				} else {
 					/* Normal Playlist */
 					assert( pl->programs);
@@ -661,7 +699,7 @@
 							/* OUT of memory */
 							variant_playlist_del(*playlist);
 							playlist = NULL;
-							fclose(f);
+							if (f) fclose(f);
 							return GF_OUT_OF_MEM;
 						}
 						assert(currentPlayList->element.playlist.elements);
@@ -680,7 +718,7 @@
 							variant_playlist_del(*playlist);
 							playlist_element_del(currentPlayList);
 							playlist = NULL;
-							fclose(f);
+							if (f) fclose(f);
 							return GF_OUT_OF_MEM;
 						}
 						gf_list_add(currentPlayList->element.playlist.elements, subElement);
@@ -707,7 +745,7 @@
 							variant_playlist_del(*playlist);
 							playlist_element_del(currentPlayList);
 							playlist = NULL;
-							fclose(f);
+							if (f) fclose(f);
 							return GF_OUT_OF_MEM;
 						}
 						gf_list_add(currentPlayList->element.playlist.elements, subElement);
@@ -753,7 +791,7 @@
 			}
 		}
 	}
-	fclose(f);
+	if (f) fclose(f);
 
 	for (i=0; i < (int) gf_list_count(pl->programs); i++) {
 		u32 j;

gpac-0.5.0.svn4192.tar.bz2/src/media_tools/media_export.c -> gpac-0.5.0.svn4296.tar.bz2/src/media_tools/media_export.c Changed

@@ -42,8 +42,9 @@
 #include <gpac/internal/vobsub.h>
 #endif
 
-
+#ifndef GPAC_DISABLE_ZLIB
 #include <zlib.h>
+#endif
 
 GF_Err gf_media_export_nhml(GF_MediaExporter *dumper, Bool dims_doc);
 
@@ -287,9 +288,13 @@
 				gf_export_message(dumper, GF_OK, "Dumping MPEG-4 Visual sample%s", szNum);
 				break;
 			case GPAC_OTI_VIDEO_AVC:
-				strcpy(szEXT, ".h264");
+				strcpy(szEXT, ".264");
 				gf_export_message(dumper, GF_OK, "Dumping MPEG-4 AVC-H264 Visual sample%s", szNum);
 				break;
+			case GPAC_OTI_VIDEO_HEVC:
+				strcpy(szEXT, ".hvc");
+				gf_export_message(dumper, GF_OK, "Dumping MPEG-H HEVC Visual sample%s", szNum);
+				break;
 			case GPAC_OTI_IMAGE_JPEG:
 				strcpy(szEXT, ".jpg");
 				gf_export_message(dumper, GF_OK, "Dumping JPEG image%s", szNum);
@@ -374,9 +379,22 @@
 	} else if (m_stype==GF_ISOM_SUBTYPE_AC3) {
 		gf_export_message(dumper, GF_OK, "Extracting AC3 sample%s", szNum);
 		strcpy(szEXT, ".ac3");
-	} else if ((m_stype==GF_ISOM_SUBTYPE_AVC_H264) || (m_stype==GF_ISOM_SUBTYPE_AVC2_H264) || (m_stype==GF_ISOM_SUBTYPE_SVC_H264) ) {
+	} else if (m_stype==GF_4CC('x','d','v','b') ) {
+		gf_export_message(dumper, GF_OK, "Extracting MPEG-2 sample%s", szNum);
+		strcpy(szEXT, ".m2v");
+	} else if ((m_stype==GF_ISOM_SUBTYPE_AVC_H264) 
+			|| (m_stype==GF_ISOM_SUBTYPE_AVC2_H264)
+			|| (m_stype==GF_ISOM_SUBTYPE_AVC3_H264)
+			|| (m_stype==GF_ISOM_SUBTYPE_AVC4_H264)
+			|| (m_stype==GF_ISOM_SUBTYPE_SVC_H264)
+		) {
 		strcpy(szEXT, ".h264");
 		gf_export_message(dumper, GF_OK, "Dumping MPEG-4 AVC-H264 Visual sample%s", szNum);
+	} else if ((m_stype==GF_ISOM_SUBTYPE_HVC1) 
+			|| (m_stype==GF_ISOM_SUBTYPE_HEV1)
+		) {
+		strcpy(szEXT, ".hvc");
+		gf_export_message(dumper, GF_OK, "Dumping MPEG-H HEVC Visual sample%s", szNum);
 	} else if (m_type==GF_ISOM_MEDIA_FLASH) {
 		gf_export_message(dumper, GF_OK, "Extracting Macromedia Flash Movie sample%s", szNum);
 		strcpy(szEXT, ".swf");
@@ -617,7 +635,8 @@
 	char szName[1000], szEXT[5], GUID[16];
 	FILE *out;
 	unsigned int *qcp_rates, rt_cnt;	/*contains constants*/
-	GF_AVCConfig *avccfg;
+	GF_AVCConfig *avccfg, *svccfg;
+	GF_HEVCConfig *hevccfg;
 	GF_M4ADecSpecInfo a_cfg;
 	GF_BitStream *bs;
 	u32 track, i, di, count, m_type, m_stype, dsi_size, qcp_type;
@@ -629,8 +648,10 @@
 
 	dsi_size = 0;
 	dsi = NULL;
+	hevccfg = NULL;
 	avccfg = NULL;
-
+	svccfg = NULL;
+	
 	if (!(track = gf_isom_get_track_by_id(dumper->file, dumper->trackID))) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Wrong track ID %d for file %s \n", dumper->trackID, gf_isom_get_filename(dumper->file)));
 		return GF_BAD_PARAM;
@@ -667,10 +688,17 @@
 				break;
 			case GPAC_OTI_VIDEO_AVC:
 				avccfg = gf_isom_avc_config_get(dumper->file, track, 1);
+				svccfg = gf_isom_svc_config_get(dumper->file, track, 1);
 				if (add_ext) 
 					strcat(szName, ".h264");
 				gf_export_message(dumper, GF_OK, "Extracting MPEG-4 AVC-H264 stream to h264");
 				break;
+			case GPAC_OTI_VIDEO_HEVC:
+				hevccfg = gf_isom_hevc_config_get(dumper->file, track, 1);
+				if (add_ext) 
+					strcat(szName, ".hvc");
+				gf_export_message(dumper, GF_OK, "Extracting MPEG-H HEVC stream to hevc");
+				break;
 			case GPAC_OTI_VIDEO_MPEG1:
 				if (add_ext) 
 					strcat(szName, ".m1v");
@@ -825,13 +853,30 @@
 			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')) {
+			gf_export_message(dumper, GF_OK, "Extracting MPEG-2 Video");
+			if (add_ext) 
+				strcat(szName, ".m2v");
 		} else if (m_stype==GF_ISOM_SUBTYPE_3GP_DIMS) {
 			return gf_media_export_nhml(dumper, 1);
-		} else if ((m_stype==GF_ISOM_SUBTYPE_AVC_H264) || (m_stype==GF_ISOM_SUBTYPE_AVC2_H264) || (m_stype==GF_ISOM_SUBTYPE_SVC_H264) ) {
+		} else if ((m_stype==GF_ISOM_SUBTYPE_AVC_H264) 
+				|| (m_stype==GF_ISOM_SUBTYPE_AVC2_H264) 
+				|| (m_stype==GF_ISOM_SUBTYPE_AVC3_H264) 
+				|| (m_stype==GF_ISOM_SUBTYPE_AVC4_H264) 
+				|| (m_stype==GF_ISOM_SUBTYPE_SVC_H264)
+			) {
 			avccfg = gf_isom_avc_config_get(dumper->file, track, 1);
+			svccfg = gf_isom_svc_config_get(dumper->file, track, 1);
 			if (add_ext) 
 				strcat(szName, ".h264");
 			gf_export_message(dumper, GF_OK, "Extracting MPEG-4 AVC-H264 stream to h264");
+		} else if ((m_stype==GF_ISOM_SUBTYPE_HEV1) 
+				|| (m_stype==GF_ISOM_SUBTYPE_HVC1) 
+			) {
+			hevccfg = gf_isom_hevc_config_get(dumper->file, track, 1);
+			if (add_ext) 
+				strcat(szName, ".hvc");
+			gf_export_message(dumper, GF_OK, "Extracting MPEG-H HEVC stream to hevc");
 		} else if (m_type==GF_ISOM_MEDIA_FLASH) {
 			gf_export_message(dumper, GF_OK, "Extracting Macromedia Flash Movie");
 			if (add_ext) 
@@ -863,8 +908,12 @@
 	if (dumper->flags & GF_EXPORT_PROBE_ONLY) {
 		if (dsi) gf_free(dsi);
 		if (avccfg) gf_odf_avc_cfg_del(avccfg);
+		if (svccfg) gf_odf_avc_cfg_del(svccfg);
+		if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
 		return GF_OK;
 	}
+	if (dumper->flags & GF_EXPORT_SVC_LAYER)
+		gf_isom_set_nalu_extract_mode(dumper->file, track, GF_ISOM_NALU_EXTRACT_LAYER_ONLY);
 
 	if (is_ogg) return gf_dump_to_ogg(dumper, is_stdout ? NULL : szName, track);
 
@@ -897,6 +946,8 @@
 	if (!out) {
 		if (dsi) gf_free(dsi);
 		if (avccfg) gf_odf_avc_cfg_del(avccfg);
+		if (svccfg) gf_odf_avc_cfg_del(svccfg);
+		if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
 		return gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szName);
 	}
 	bs = gf_bs_from_file(out, GF_BITSTREAM_WRITE);
@@ -925,6 +976,92 @@
 			gf_bs_write_data(bs, sl->data, sl->size);
 		}
 	}
+	if (svccfg) {
+		if (!(dumper->flags & GF_EXPORT_SVC_LAYER))
+		{
+			GF_AVCConfig *cfg;
+			u32 ref_track = 0, t;
+			s32 countRef;
+
+			// copy avcC and svcC from base layer
+			gf_isom_get_reference(dumper->file, track, GF_ISOM_REF_BASE, 1, &ref_track);
+			cfg = gf_isom_avc_config_get(dumper->file, ref_track, 1);
+			if (cfg)
+			{
+				count = gf_list_count(cfg->sequenceParameterSets);
+				for (i  =0; i < count; i++) {
+					GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(cfg->sequenceParameterSets, i);
+					gf_bs_write_u32(bs, 1);
+					gf_bs_write_data(bs, sl->data, sl->size);
+				}
+				count = gf_list_count(cfg->pictureParameterSets);
+				for (i = 0; i < count; i++) {
+					GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(cfg->pictureParameterSets, i);
+					gf_bs_write_u32(bs, 1);
+					gf_bs_write_data(bs, sl->data, sl->size);
+				}
+				gf_odf_avc_cfg_del(cfg);
+				cfg = NULL;
+			}
+
+			// copy avcC and svcC from lower layer
+			countRef = gf_isom_get_reference_count(dumper->file, track, GF_ISOM_REF_SCAL);
+			if (countRef < 0)
+			{
+				e = gf_isom_last_error(dumper->file);
+				goto exit;
+			}
+			for (t = 2; t <= (u32) countRef; t++) // referenceIndex 1 is the base layer
+			{
+				gf_isom_get_reference(dumper->file, track, GF_ISOM_REF_SCAL, t, &ref_track);
+				cfg = gf_isom_svc_config_get(dumper->file, ref_track, 1);
+				if (cfg)
+				{
+					count = gf_list_count(cfg->sequenceParameterSets);
+					for (i  = 0; i < count; i++) {
+						GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(cfg->sequenceParameterSets, i);
+						gf_bs_write_u32(bs, 1);
+						gf_bs_write_data(bs, sl->data, sl->size);
+					}
+					count = gf_list_count(cfg->pictureParameterSets);
+					for (i = 0; i < count; i++) {
+						GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(cfg->pictureParameterSets, i);
+						gf_bs_write_u32(bs, 1);
+						gf_bs_write_data(bs, sl->data, sl->size);
+					}
+					gf_odf_avc_cfg_del(cfg);
+					cfg = NULL;
+				}
+			}
+		}
+
+		count = gf_list_count(svccfg->sequenceParameterSets);
+		for (i=0;i<count;i++) {
+			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(svccfg->sequenceParameterSets, i);
+			gf_bs_write_u32(bs, 1);
+			gf_bs_write_data(bs, sl->data, sl->size);
+		}
+		count = gf_list_count(svccfg->pictureParameterSets);
+		for (i=0;i<count;i++) {
+			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(svccfg->pictureParameterSets, i);
+			gf_bs_write_u32(bs, 1);
+			gf_bs_write_data(bs, sl->data, sl->size);
+		}
+	}
+
+
+	if (hevccfg) {
+		count = gf_list_count(hevccfg->param_array);
+		for (i=0;i<count;i++) {
+			u32 j;
+			GF_HEVCParamArray *ar = gf_list_get(hevccfg->param_array, i);
+			for (j=0; j<gf_list_count(ar->nalus); j++) {
+				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j);
+				gf_bs_write_u32(bs, 1);
+				gf_bs_write_data(bs, sl->data, sl->size);
+			}
+		}
+	}
 
 	qcp_rates = NULL;
 	count = gf_isom_get_sample_count(dumper->file, track);
@@ -1039,19 +1176,23 @@
 			break;
 		}
 		/*AVC sample to NALU*/
-		if (avccfg) {
-			u32 j, nal_size, remain;
+		if (avccfg || svccfg || hevccfg) {
+			u32 j, nal_size, remain, nal_unit_size;
 			char *ptr = samp->data;
+			nal_unit_size = 0;
+			if (avccfg) nal_unit_size= avccfg->nal_unit_size;
+			else if (svccfg) nal_unit_size = svccfg->nal_unit_size;
+			else if (hevccfg) nal_unit_size = hevccfg->nal_unit_size;
 			remain = samp->dataLength;
 			while (remain) {
 				nal_size = 0;
-				if (remain<avccfg->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, avccfg->nal_unit_size, remain) );
+				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) );
 					break;
 				}
-				for (j=0; j<avccfg->nal_unit_size; j++) {
+				for (j=0; j<nal_unit_size; j++) {
 					nal_size |= ((u8) *ptr);
-					if (j+1<avccfg->nal_unit_size) nal_size<<=8;
+					if (j+1<nal_unit_size) nal_size<<=8;
 					remain--;
 					ptr++;
 				}
@@ -1090,14 +1231,15 @@
 				}
 			}
 		}
-		if (!avccfg) gf_bs_write_data(bs, samp->data, samp->dataLength);
+		if (!avccfg && !svccfg && !hevccfg) gf_bs_write_data(bs, samp->data, samp->dataLength);
 		gf_isom_sample_del(&samp);
 		gf_set_progress("Media Export", i+1, count);
 		if (dumper->flags & GF_EXPORT_DO_ABORT) break;
 	}
 	if (has_qcp_pad) gf_bs_write_u8(bs, 0);
-
+exit:
 	if (avccfg) gf_odf_avc_cfg_del(avccfg);
+	if (svccfg) gf_odf_avc_cfg_del(svccfg);
 	gf_bs_del(bs);
 	if (!is_stdout) 
 		fclose(out);
@@ -1429,7 +1571,11 @@
 
 	if (msubtype == GF_ISOM_SUBTYPE_MPEG4_CRYP) {
 		esd = gf_isom_get_esd(infile, inTrackNum, 1);
-	} else if ((msubtype == GF_ISOM_SUBTYPE_AVC_H264) || (msubtype == GF_ISOM_SUBTYPE_AVC2_H264) ) {
+	} else if ((msubtype == GF_ISOM_SUBTYPE_AVC_H264) 
+		|| (msubtype == GF_ISOM_SUBTYPE_AVC2_H264) 
+		|| (msubtype == GF_ISOM_SUBTYPE_AVC3_H264) 
+		|| (msubtype == GF_ISOM_SUBTYPE_AVC4_H264) 
+	) {
 		return gf_isom_set_pl_indication(outfile, GF_ISOM_PL_VISUAL, 0x0F);
 	} 
 	/*likely 3gp or any non-MPEG-4 isomedia file*/
@@ -1848,6 +1994,7 @@
 				if (flags & GF_DIMS_UNIT_C) fprintf(nhml, " compressed=\"yes\"");
 				fprintf(nhml, ">");
 				if (uncompress && (flags & GF_DIMS_UNIT_C)) {
+#ifndef GPAC_DISABLE_ZLIB
 					char svg_data[2049];
 					int err;
 					u32 done = 0;
@@ -1874,6 +2021,14 @@
 						}
 						inflateEnd(&d_stream);
 					}
+#else
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Error: your version of GPAC was compile with no libz support."));
+					gf_bs_del(bs);
+					gf_isom_sample_del(&samp);
+					if (med) fclose(med);
+					fclose(nhml);
+					return GF_NOT_SUPPORTED;
+#endif
 				} else {
 					gf_fwrite(samp->data+pos+3, size-1, 1, nhml);
 				}
@@ -2028,6 +2183,7 @@
 void m2ts_export_check(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
 {
 	if (evt_type == GF_M2TS_EVT_PAT_REPEAT) ts->user = NULL;
+	else if (evt_type == GF_M2TS_EVT_PAT_FOUND) ts->segment_switch = 1;
 }
 void m2ts_export_dump(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
 {
@@ -2073,11 +2229,12 @@
 		gf_m2ts_process_data(ts, data, (u32)size);
 		if (!ts->user) break;
 	}
-	if (ts->user) {
+	if (!ts->segment_switch && ts->user) {
 		fclose(src);
 		gf_m2ts_demux_del(ts);
 		return gf_export_message(dumper, GF_URL_ERROR, "Cannot locate program association table");
 	}
+	ts->segment_switch = 0;
 
 	stream = NULL;
 	for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
@@ -2096,7 +2253,6 @@
 		gf_m2ts_demux_del(ts);
 		return gf_export_message(dumper, GF_URL_ERROR, "Cannot find PID %d in transport stream", dumper->trackID);
 	}
-	gf_m2ts_reset_parsers(ts);
 
 	sprintf(szFile, "%s_pid%d", dumper->out_name ? dumper->out_name : "", stream->pid);
 	switch (stream->stream_type) {
@@ -2128,6 +2284,10 @@
 		strcat(szFile, ".264");
 		gf_export_message(dumper, GF_OK, "Extracting MPEG-4 AVC/H264 Visual stream to h264");
 		break;
+	case GF_M2TS_VIDEO_HEVC:
+		strcat(szFile, ".hvc");
+		gf_export_message(dumper, GF_OK, "Extracting MPEG-H HEVC Visual stream to hvc");
+		break;
 	default:
 		strcat(szFile, ".raw");
 		gf_export_message(dumper, GF_OK, "Extracting Unknown stream to raw");

gpac-0.5.0.svn4192.tar.bz2/src/media_tools/media_import.c -> gpac-0.5.0.svn4296.tar.bz2/src/media_tools/media_import.c Changed

@@ -38,8 +38,6 @@
 #include <gpac/xml.h>
 #include <gpac/mpegts.h>
 #include <gpac/constants.h>
-/*since 0.2.2, we use zlib for xmt/x3d reading to handle gz files*/
-#include <zlib.h>
 
 
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
@@ -71,7 +69,9 @@
 	if (e) return e;
 
 	stype = gf_isom_get_media_subtype(file, track, 1);
-	if ((stype==GF_ISOM_SUBTYPE_AVC_H264) || (stype==GF_ISOM_SUBTYPE_AVC2_H264) ) {
+	if ((stype==GF_ISOM_SUBTYPE_AVC_H264) || (stype==GF_ISOM_SUBTYPE_AVC2_H264)
+		|| (stype==GF_ISOM_SUBTYPE_AVC3_H264) || (stype==GF_ISOM_SUBTYPE_AVC4_H264)
+	) {
 		s32 par_n, par_d;
 		GF_AVCConfig *avcc = gf_isom_avc_config_get(file, track, 1);
 		GF_AVCConfigSlot *slc = (GF_AVCConfigSlot *)gf_list_get(avcc->sequenceParameterSets, 0);
@@ -118,7 +118,7 @@
 	esd->decoderConfig->avgBitrate = 0;
 	esd->decoderConfig->maxBitrate = 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++) {
@@ -171,8 +171,6 @@
 	}
 }
 
-
-
 static GF_Err gf_import_still_image(GF_MediaImporter *import, Bool mult_desc_allowed)
 {
 	GF_BitStream *bs;
@@ -1039,8 +1037,6 @@
 	char *comp, *frame;
 	avi_t *in;
 
-	if (import->trackID>1) return GF_OK;
-
 	test = gf_f64_open(import->in_name, "rb");
 	if (!test) return gf_import_message(import, GF_URL_ERROR, "Opening %s failed", import->in_name);
 	fclose(test);
@@ -1070,7 +1066,10 @@
 		AVI_close(in);
 		return GF_OK;
 	}
-
+	if (import->trackID>1) {
+		AVI_close(in);
+		return GF_OK;
+	}
 	destroy_esd = 0;
 	frame = NULL;
 	AVI_seek_start(in);
@@ -1400,11 +1399,10 @@
 	unsigned char temp[4];
 	avi_t *in;
 
-	if (import->flags & GF_IMPORT_PROBE_ONLY) return GF_OK;
-
 	/*video only, ignore*/
 	if (import->trackID==1) return GF_OK;
 
+
 	test = gf_f64_open(import->in_name, "rb");
 	if (!test) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
 	fclose(test);
@@ -1544,13 +1542,13 @@
 {
 	GF_Err e;
 	u64 offset, sampDTS, duration;
-	u32 track, di, trackID, track_in, i, num_samples, mtype, stype, w, h, sr, sbr_sr, ch, mstype;
+	u32 track, di, trackID, track_in, i, num_samples, mtype, w, h, sr, sbr_sr, ch, mstype, cur_extract_mode;
 	s32 trans_x, trans_y;
 	s16 layer;
 	u8 bps;
 	char lang[4];
-	const char *url, *urn;
-	Bool sbr, ps, is_clone;
+	const char *orig_name = gf_url_get_resource_name(gf_isom_get_filename(import->orig));
+	Bool sbr, ps;
 	GF_ISOSample *samp;
 	GF_ESD *origin_esd;
 	GF_InitialObjectDescriptor *iod;
@@ -1591,6 +1589,7 @@
 	ps = 0;
 	sbr = 0;
 	sbr_sr = 0;
+	cur_extract_mode = gf_isom_get_nalu_extract_mode(import->orig, track_in);
 	iod = (GF_InitialObjectDescriptor *) gf_isom_get_root_od(import->orig);
 	if (iod && (iod->tag != GF_ODF_IOD_TAG)) {
 		gf_odf_desc_del((GF_Descriptor *) iod);
@@ -1645,72 +1644,16 @@
 
 	gf_odf_desc_del((GF_Descriptor *) iod);
 
-	/*check if MPEG-4 or not - if crypted use clone track */
-	is_clone = 0;
-	stype = gf_isom_get_media_subtype(import->orig, track_in, 1);
-	if ((stype==GF_ISOM_SUBTYPE_MPEG4) /*|| (stype==GF_ISOM_SUBTYPE_MPEG4_CRYP)*/) {
-		track = gf_isom_new_track(import->dest, import->esd ? import->esd->ESID : 0, gf_isom_get_media_type(import->orig, track_in), gf_isom_get_media_timescale(import->orig, track_in));
-		if (!track) {
-			e = gf_isom_last_error(import->dest);
-			goto exit;
-		}
-		gf_isom_set_track_enabled(import->dest, track, 1);
-		if (import->esd && !import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-		/*setup data ref*/
-		urn = url = NULL;
-		if (import->flags & GF_IMPORT_USE_DATAREF) {
-			url = gf_isom_get_filename(import->orig);
-			if (!gf_isom_is_self_contained(import->orig, track_in, 1)) {
-				e = gf_isom_get_data_reference(import->orig, track_in, 1, &url, &urn);
-				if (e) goto exit;
-			}
-		}
-		e = gf_isom_new_mpeg4_description(import->dest, track, origin_esd, (char *) url, (char *) urn, &di);
-		if (e) goto exit;
-		/*copy over language*/
-		lang[3] = 0;
-		gf_isom_get_media_language(import->orig, track_in, lang);
-		gf_isom_set_media_language(import->dest, track, lang);
+	e = gf_isom_clone_track(import->orig, track_in, import->dest, (import->flags & GF_IMPORT_USE_DATAREF), &track);
+	if (e) goto exit;
 
-	} else {
-		if (! (import->flags & GF_IMPORT_KEEP_ALL_TRACKS) ) {
-			mstype = gf_isom_get_media_subtype(import->orig, track_in, 1);
-			switch (mstype) {
-			case GF_ISOM_SUBTYPE_MPEG4:
-			case GF_ISOM_SUBTYPE_MPEG4_CRYP:
-			case GF_ISOM_SUBTYPE_AVC_H264:
-			case GF_ISOM_SUBTYPE_AVC2_H264:
-			case GF_ISOM_SUBTYPE_SVC_H264:
-			case GF_ISOM_SUBTYPE_3GP_H263:
-			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:
-				break;
-			default:
-				switch (mtype) {
-				case GF_ISOM_MEDIA_HINT:
-				case GF_ISOM_MEDIA_TEXT:
-				case GF_ISOM_MEDIA_SUBT:
-					break;
-				default:
-					return gf_import_message(import, GF_OK, "IsoMedia import - skipping track ID %d (unknown type \'%s\')", trackID, gf_4cc_to_str(mstype));
-				}
-			}
+	di = 1;
 
-		}
-		e = gf_isom_clone_track(import->orig, track_in, import->dest, (import->flags & GF_IMPORT_USE_DATAREF), &track);
-		is_clone = 1;
-		di = 1;
+	if (import->esd && import->esd->ESID) {
+		e = gf_isom_set_track_id(import->dest, track, import->esd->ESID);
 		if (e) goto exit;
-
-		if (import->esd && import->esd->ESID) {
-			e = gf_isom_set_track_id(import->dest, track, import->esd->ESID);
-			if (e) goto exit;
-		}
 	}
-	if (e) goto exit;
+
 	import->final_trackID = gf_isom_get_track_id(import->dest, track);
 	if (import->esd && import->esd->dependsOnESID) {
 		gf_isom_set_track_reference(import->dest, track, GF_ISOM_REF_DECODE, import->esd->dependsOnESID);
@@ -1718,29 +1661,21 @@
 
 	switch (mtype) {
 	case GF_ISOM_MEDIA_VISUAL:
-		if (!is_clone) {
-			gf_isom_set_visual_info(import->dest, track, di, w, h);
-			gf_media_update_par(import->dest, track);
-		}
-		gf_import_message(import, GF_OK, "IsoMedia import - track ID %d - Video (size %d x %d)", trackID, w, h);
+		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_AUDIO:
 	{
-		if (!is_clone) gf_isom_set_audio_info(import->dest, track, di, (sbr==2) ? sbr_sr : sr, (ch>1) ? 2 : 1, bps);
 		if (ps) {
-			gf_import_message(import, GF_OK, "IsoMedia import - track ID %d - HE-AACv2 (SR %d - SBR-SR %d - %d channels)", trackID, sr, sbr_sr, ch);
+			gf_import_message(import, GF_OK, "IsoMedia import %s - track ID %d - HE-AACv2 (SR %d - SBR-SR %d - %d channels)", orig_name, trackID, sr, sbr_sr, ch);
 		} else if (sbr) {
-			gf_import_message(import, GF_OK, "IsoMedia import - track ID %d - HE-AAC (SR %d - SBR-SR %d - %d channels)", trackID, sr, sbr_sr, ch);
+			gf_import_message(import, GF_OK, "IsoMedia import %s - track ID %d - HE-AAC (SR %d - SBR-SR %d - %d channels)", orig_name, trackID, sr, sbr_sr, ch);
 		} else {
-			gf_import_message(import, GF_OK, "IsoMedia import - track ID %d - Audio (SR %d - %d channels)", trackID, sr, ch);
+			gf_import_message(import, GF_OK, "IsoMedia import %s - track ID %d - Audio (SR %d - %d channels)", orig_name, trackID, sr, ch);
 		}
 	}
 		break;
 	case GF_ISOM_MEDIA_SUBPIC:
-		if (!is_clone) {
-			gf_isom_set_track_layout_info(import->dest, track, w << 16, h << 16, trans_x, trans_y, layer);
-		}
-		gf_import_message(import, GF_OK, "IsoMedia import - track ID %d - VobSub (size %d x %d)", trackID, w, h);
+		gf_import_message(import, GF_OK, "IsoMedia import %s - track ID %d - VobSub (size %d x %d)", orig_name, trackID, w, h);
 		break;
 	default:
 	{
@@ -1748,14 +1683,13 @@
 		mstype = gf_isom_get_mpeg4_subtype(import->orig, track_in, di);
 		if (!mstype) mstype = gf_isom_get_media_subtype(import->orig, track_in, di);
 		strcpy(szT, gf_4cc_to_str(mtype));
-		gf_import_message(import, GF_OK, "IsoMedia import - track ID %d - media type \"%s:%s\"",
-			trackID, szT, gf_4cc_to_str(mstype));
+		gf_import_message(import, GF_OK, "IsoMedia import %s - track ID %d - media type \"%s:%s\"", orig_name, trackID, szT, gf_4cc_to_str(mstype));
 	}
 		break;
 	}
 
 	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);
 	num_samples = gf_isom_get_sample_count(import->orig, track_in);
 	for (i=0; i<num_samples; i++) {
 		if (import->flags & GF_IMPORT_USE_DATAREF) {
@@ -1810,6 +1744,7 @@
 
 exit:
 	if (origin_esd) gf_odf_desc_del((GF_Descriptor *) origin_esd);
+	gf_isom_set_nalu_extract_mode(import->orig, track_in, cur_extract_mode);
 	return e;
 }
 
@@ -2480,6 +2415,12 @@
 	return e;
 }
 
+
+#ifndef GPAC_DISABLE_ZLIB
+
+/*since 0.2.2, we use zlib for xmt/x3d reading to handle gz files*/
+#include <zlib.h>
+
 #define ZLIB_COMPRESS_SAFE	4
 
 static GF_Err compress_sample_data(GF_ISOSample *samp, u32 *max_size, char **dict, u32 offset)
@@ -2536,6 +2477,8 @@
 	return GF_OK;
 }
 
+#endif /*GPAC_DISABLE_ZLIB*/
+
 static void nhml_on_progress(void *cbk, u64 done, u64 tot)
 {
 	gf_set_progress("NHML Loading", done, tot);
@@ -3005,6 +2948,7 @@
 		}
 
 		if (compress) {
+#ifndef GPAC_DISABLE_ZLIB
 			e = compress_sample_data(samp, &max_size, use_dict ? &dictionary : NULL, is_dims ? 3 : 0);
 			if (e) goto exit;
 			if (is_dims) {
@@ -3012,6 +2956,11 @@
 				gf_bs_write_u16(bs, samp->dataLength-2);
 				gf_bs_del(bs);
 			}
+#else
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: your version of GPAC was compile with no libz support. Abort."));
+			e = GF_NOT_SUPPORTED;
+			goto exit;
+#endif
 		}
 		if (is_dims && (samp->dataLength > 0xFFFF)) {
 			e = gf_import_message(import, GF_BAD_PARAM, "DIMS import failure: sample data is too long - maximum size allowed: 65532 bytes");
@@ -3770,7 +3719,7 @@
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 
-GF_Err gf_import_h264(GF_MediaImporter *import)
+static GF_Err gf_import_avc_h264(GF_MediaImporter *import)
 {
 	u64 nal_start, nal_end, total_size;
 	u32 nal_size, track, trackID, di, cur_samp, nb_i, nb_idr, nb_p, nb_b, nb_sp, nb_si, nb_sei, max_w, max_h, max_total_delay;
@@ -3839,7 +3788,7 @@
 	sei_recovery_frame_count = -1;
 
 	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
-	if (!AVC_IsStartCode(bs)) {
+	if (!gf_media_nalu_is_start_code(bs)) {
 		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Cannot find H264 start code");
 		goto exit;
 	}
@@ -3895,7 +3844,7 @@
 
 	while (gf_bs_available(bs)) {
 		u8 nal_hdr, skip_nal, is_subseq, add_sps;
-		nal_size = AVC_NextStartCode(bs);
+		nal_size = gf_media_nalu_next_start_code_bs(bs);
 
 		if (nal_size>max_size) {
 			buffer = (char*)gf_realloc(buffer, sizeof(char)*nal_size);
@@ -3917,7 +3866,7 @@
 			avc.is_svc = 1;
 		}
 
-		switch (AVC_ParseNALU(bs, nal_hdr, &avc)) {
+		switch (gf_media_avc_parse_nalu(bs, nal_hdr, &avc)) {
 		case 1:
 			flush_sample = 1;
 			break;
@@ -3933,10 +3882,9 @@
 		}
 		switch (nal_type) {
 		case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
-			if (import->flags & GF_IMPORT_SVC_NONE) break;
 			is_subseq = 1;
 		case GF_AVC_NALU_SEQ_PARAM:
-			idx = AVC_ReadSeqInfo(buffer+1/*skip NALU type*/, nal_size-1, &avc, is_subseq, NULL);
+			idx = gf_media_avc_read_sps(buffer, nal_size, &avc, is_subseq, NULL);
 			if (idx<0) {
 				if (avc.sps[0].profile_idc) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Error parsing SeqInfo"));
@@ -3953,6 +3901,10 @@
 					add_sps = 1;
 				}
 				dstcfg = svccfg;
+				if (import->flags & GF_IMPORT_SVC_NONE) {
+					add_sps = 0;
+					skip_nal = 1;
+				}
 			} else {
 				if ((avc.sps[idx].state & AVC_SPS_PARSED) && !(avc.sps[idx].state & AVC_SPS_DECLARED)) {
 					avc.sps[idx].state |= AVC_SPS_DECLARED;
@@ -3963,7 +3915,11 @@
 			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) {
-				copy_size = nal_size;
+				if (import->flags & GF_IMPORT_SVC_NONE) {
+					copy_size = 0;
+				} else {
+					copy_size = nal_size;
+				}
 			}
 
 			if (add_sps) {
@@ -4045,7 +4001,7 @@
 			}
 			break;
 		case GF_AVC_NALU_PIC_PARAM:
-			idx = AVC_ReadPictParamSet(buffer+1/*skip NALU type*/, nal_size-1, &avc);
+			idx = gf_media_avc_read_pps(buffer, nal_size, &avc);
 			if (idx<0) {
 				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing Picture Param");
 				goto exit;
@@ -4070,12 +4026,15 @@
 				  they will be moved to the SVC layer upon analysis of SVC slice. */
 				dstcfg = avccfg;
 
+				if (import->flags & GF_IMPORT_SVC_EXPLICIT)
+					dstcfg = svccfg;
+
 				gf_list_add(dstcfg->pictureParameterSets, slc);
 			}
 			break;
 		case GF_AVC_NALU_SEI:
 			if (avc.sps_active_idx != -1) {
-				copy_size = AVC_ReformatSEI_NALU(buffer, nal_size, &avc);
+				copy_size = gf_media_avc_reformat_sei(buffer, nal_size, &avc);
 				if (copy_size)
 					nb_sei++;
 			}
@@ -4108,7 +4067,10 @@
 			break;
 
 		case GF_AVC_NALU_SVC_PREFIX_NALU:
-			if (import->flags & GF_IMPORT_SVC_NONE) break;
+			if (import->flags & GF_IMPORT_SVC_NONE) {
+				copy_size = 0;
+				break;
+			}
 			assert(prev_nalu_prefix_size==0);
 			copy_size = nal_size;
 			break;
@@ -4125,7 +4087,11 @@
 					}
 				}				
 			}
-			if (import->flags & GF_IMPORT_SVC_NONE) break;
+			if (import->flags & GF_IMPORT_SVC_NONE) {
+				skip_nal = 0;
+				copy_size = 0;
+				break;
+			}
 			if (! skip_nal) {
 				copy_size = nal_size;
 				switch (avc.s_info.slice_type) {
@@ -4137,7 +4103,7 @@
 			break;
 
 		case GF_AVC_NALU_SEQ_PARAM_EXT:
-			idx = AVC_ReadSeqParamSetExtId(buffer+1/*skip NALU type*/, nal_size-1);
+			idx = gf_media_avc_read_sps_ext(buffer, nal_size);
 			if (idx<0) {
 				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing Sequence Param Extension");
 				goto exit;
@@ -4351,7 +4317,7 @@
 				if (first_nal) {
 					first_nal = 0;
 					if (avc.sei.recovery_point.valid || (import->flags & GF_IMPORT_FORCE_SYNC)) {
-						Bool bIntraSlice = AVC_SliceIsIntra(&avc);
+						Bool bIntraSlice = gf_media_avc_slice_is_intra(&avc);
 						assert(avc.s_info.nal_unit_type!=GF_AVC_NALU_IDR_SLICE || bIntraSlice);
 
 						sei_recovery_frame_count = avc.sei.recovery_point.frame_cnt;
@@ -4368,7 +4334,7 @@
 						if (bIntraSlice && (import->flags & GF_IMPORT_FORCE_SYNC) && (sei_recovery_frame_count==0)) 
 							slice_force_ref = 1;
 					}
-					sample_is_rap = AVC_SliceIsIDR(&avc);
+					sample_is_rap = gf_media_avc_slice_is_IDR(&avc);
 				}
 
 				if (avc.s_info.poc<poc_shift) {
@@ -4451,19 +4417,19 @@
 		if (import->flags & GF_IMPORT_DO_ABORT) break;
 
 		/*consume next start code*/
-		nal_start = AVC_NextStartCode(bs);
+		nal_start = gf_media_nalu_next_start_code_bs(bs);
 		if (nal_start) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[avc-h264] invalid nal_size (%u)? Skipping "LLU" bytes to reach next start code\n", nal_size, nal_start));
 			gf_bs_skip_bytes(bs, nal_start);
 		}
-		nal_start = AVC_IsStartCode(bs);
+		nal_start = gf_media_nalu_is_start_code(bs);
 		if (!nal_start) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[avc-h264] error: no start code found ("LLU" bytes read out of "LLU") - leaving\n", gf_bs_get_position(bs), gf_bs_get_size(bs)));
 			break;
 		}
 		nal_start = gf_bs_get_position(bs);
 	}
-
+	
 	/*final flush*/
 	if (sample_data) {
 		GF_ISOSample *samp = gf_isom_sample_new();
@@ -4570,7 +4536,7 @@
 	if (gf_list_count(avccfg->sequenceParameterSets) || !gf_list_count(svccfg->sequenceParameterSets) ) {
 		gf_isom_avc_config_update(import->dest, track, 1, avccfg);
 		if (gf_list_count(svccfg->sequenceParameterSets)) {
-			gf_isom_svc_config_update(import->dest, track, 1, svccfg, 1);
+				gf_isom_svc_config_update(import->dest, track, 1, svccfg, 1);
 		}
 	} else {
 		gf_isom_svc_config_update(import->dest, track, 1, svccfg, 0);
@@ -4632,6 +4598,750 @@
 	return e;
 }
 
+
+static GF_Err gf_import_hevc(GF_MediaImporter *import)
+{
+	u64 nal_start, nal_end, total_size;
+	u32 nal_size, track, trackID, di, cur_samp, nb_i, nb_idr, nb_p, nb_b, nb_sp, nb_si, nb_sei, max_w, max_h, max_total_delay;
+	s32 idx, sei_recovery_frame_count;
+	u64 duration;
+	GF_Err e;
+	FILE *mdia;
+	HEVCState hevc;
+	GF_AVCConfigSlot *slc;
+	GF_HEVCConfig *hevccfg;
+	GF_HEVCParamArray *spss, *ppss, *vpss;
+	GF_BitStream *bs;
+	GF_BitStream *sample_data;
+	Bool flush_sample, sample_is_rap, sample_has_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_avc;
+	Bool use_opengop_gdr = 0;
+
+	Double FPS;
+	char *buffer;
+	u32 max_size = 4096;
+
+	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;
+	}
+
+	set_subsamples = (import->flags & GF_IMPORT_SET_SUBSAMPLES) ? 1 : 0;
+
+	mdia = gf_f64_open(import->in_name, "rb");
+	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "Cannot find file %s", import->in_name);
+
+	//detect_fps = 1;
+	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 is h264*/
+		} else {
+			/*fps is forced by the caller*/
+			//detect_fps = 0;
+		}	
+	}
+	get_video_timing(FPS, &timescale, &dts_inc);
+
+	poc_diff = 0;
+
+
+//restart_import:
+
+	memset(&hevc, 0, sizeof(HEVCState));
+	hevc.sps_active_idx = -1;
+	hevccfg = gf_odf_hevc_cfg_new();
+	buffer = (char*)gf_malloc(sizeof(char) * max_size);
+	sample_data = NULL;
+	first_avc = 1;
+	sei_recovery_frame_count = -1;
+	spss = ppss = vpss = NULL;
+
+	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
+	if (!gf_media_nalu_is_start_code(bs)) {
+		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Cannot find H264 start code");
+		goto exit;
+	}
+
+	/*NALU size packing disabled*/
+	if (!(import->flags & GF_IMPORT_FORCE_PACKED)) size_length = 32;
+	/*if import in edit mode, use smallest NAL size and adjust on the fly*/
+	else if (gf_isom_get_mode(import->dest)!=GF_ISOM_OPEN_WRITE) size_length = 8;
+	else size_length = 32;
+
+	trackID = 0;
+	e = GF_OK;
+	if (import->esd) trackID = import->esd->ESID;
+
+	track = gf_isom_new_track(import->dest, trackID, GF_ISOM_MEDIA_VISUAL, timescale);
+	if (!track) {
+		e = gf_isom_last_error(import->dest);
+		goto exit;
+	}
+	gf_isom_set_track_enabled(import->dest, track, 1);
+	if (import->esd && !import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
+	import->final_trackID = gf_isom_get_track_id(import->dest, track);
+	if (import->esd && import->esd->dependsOnESID) {
+		gf_isom_set_track_reference(import->dest, track, GF_ISOM_REF_DECODE, import->esd->dependsOnESID);
+	}
+
+	e = gf_isom_hevc_config_new(import->dest, track, hevccfg, NULL, NULL, &di);
+	if (e) goto exit;
+
+	sample_data = NULL;
+	sample_is_rap = 0;
+	sample_has_islice = 0;
+	cur_samp = 0;
+	is_paff = 0;
+	total_size = gf_bs_get_size(bs);
+	nal_start = gf_bs_get_position(bs);
+	duration = (u64) ( ((Double)import->duration) * timescale / 1000.0);
+
+	nb_i = nb_idr = nb_p = nb_b = nb_sp = nb_si = nb_sei = 0;
+	max_w = max_h = 0;
+	first_nal = 1;
+	ref_frame = 0;
+	last_poc = max_last_poc = max_last_b_poc = prev_last_poc = 0;
+	max_total_delay = 0;
+
+	gf_isom_set_cts_packing(import->dest, track, 1);
+	has_cts_offset = 0;
+	min_poc = 0;
+	poc_shift = 0;
+
+	while (gf_bs_available(bs)) {
+		s32 res;
+		u8 nal_unit_type, temporal_id;
+		Bool skip_nal, add_sps, is_slice;
+		nal_size = gf_media_nalu_next_start_code_bs(bs);
+
+		if (nal_size>max_size) {
+			buffer = (char*)gf_realloc(buffer, sizeof(char)*nal_size);
+			max_size = nal_size;
+		}
+
+		/*read the file, and work on a memory buffer*/
+		gf_bs_read_data(bs, buffer, nal_size);
+
+		gf_bs_seek(bs, nal_start);
+
+		res = gf_media_hevc_parse_nalu(bs, &hevc, &nal_unit_type, &temporal_id);
+
+		skip_nal = 0;
+		copy_size = flush_sample = 0;
+		is_slice = 0;
+
+		switch (res) {
+		case 1:
+			flush_sample = 1;
+			break;
+		case -1:
+			gf_import_message(import, GF_OK, "Waring: Error parsing NAL unit");
+			skip_nal = 1;
+			break;
+		case -2:
+			skip_nal = 1;
+			break;
+		default:
+			break;
+		}
+		switch (nal_unit_type) {
+		case GF_HEVC_NALU_VID_PARAM:
+			idx = gf_media_hevc_read_vps(buffer, nal_size , &hevc);
+			if (idx<0) {
+				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing Picture Param");
+				goto exit;
+			}
+			/*if we get twice the same VPS put in the the bitstream and set array_completeness to 0 ...*/
+			if (hevc.vps[idx].state == 2) {
+				copy_size = nal_size;
+				assert(vpss);
+				vpss->array_completeness = 0;
+			}
+
+			if (hevc.vps[idx].state==1) {
+				hevc.vps[idx].state = 2;
+
+				hevccfg->avgFrameRate = hevc.vps[idx].rates[0].avg_pic_rate;
+				hevccfg->constantFrameRate = hevc.vps[idx].rates[0].constand_pic_rate_idc;
+				hevccfg->numTemporalLayers = hevc.vps[idx].max_sub_layer;
+
+				if (!vpss) {
+					GF_SAFEALLOC(vpss, GF_HEVCParamArray);
+					vpss->nalus = gf_list_new();
+					gf_list_add(hevccfg->param_array, vpss);
+					vpss->array_completeness = 1;
+					vpss->type = GF_HEVC_NALU_VID_PARAM;
+				}
+
+				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);
+			}
+			break;
+		case GF_HEVC_NALU_SEQ_PARAM:
+			idx = gf_media_hevc_read_sps(buffer, nal_size, &hevc);
+			if (idx<0) {
+				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing SeqInfo");
+				goto exit;
+			}
+			add_sps = 0;
+			if ((hevc.sps[idx].state & AVC_SPS_PARSED) && !(hevc.sps[idx].state & AVC_SPS_DECLARED)) {
+				hevc.sps[idx].state |= AVC_SPS_DECLARED;
+				add_sps = 1;
+			}
+
+			/*if we get twice the same VPS put in the the bitstream and set array_completeness to 0 ...*/
+			if (hevc.sps[idx].state & AVC_SUBSPS_DECLARED) {
+				if (import->flags & GF_IMPORT_SVC_NONE) {
+					copy_size = 0;
+				} else {
+					copy_size = nal_size;
+					assert(spss);
+					spss->array_completeness = 0;
+				}
+			}
+
+			if (add_sps) {
+				hevccfg->configurationVersion = 1;
+				hevccfg->profile_space = hevc.sps[idx].ptl.profile_space;
+				hevccfg->profile_idc = hevc.sps[idx].ptl.profile_idc;
+				hevccfg->constraint_indicator_flags = 0;
+				hevccfg->level_idc = hevc.sps[idx].ptl.level_idc;
+				hevccfg->profile_compatibility_indications = hevc.sps[idx].ptl.profile_compatibility_flag;
+				hevccfg->chromaFormat = hevc.sps[idx].chroma_format_idc;
+				hevccfg->luma_bit_depth = hevc.sps[idx].bit_depth_luma;
+				hevccfg->chroma_bit_depth = hevc.sps[idx].bit_depth_chroma;
+
+				/*
+				todo FPS detection
+					
+					timescale = 2 * avc.sps[idx].vui.time_scale;
+					dts_inc =   2 * avc.sps[idx].vui.num_units_in_tick * DeltaTfiDivisorIdx;
+					FPS = (Double)timescale / dts_inc;
+					detect_fps = 0;
+					gf_isom_remove_track(import->dest, track);
+					if (sample_data) gf_bs_del(sample_data);
+					gf_odf_avc_cfg_del(avccfg);
+					avccfg = NULL;
+					gf_free(buffer);
+					buffer = NULL;
+					gf_bs_del(bs);
+					bs = NULL;
+					gf_f64_seek(mdia, 0, SEEK_SET);
+					goto restart_import;
+				}
+			*/
+
+				if (!spss) {
+					GF_SAFEALLOC(spss, GF_HEVCParamArray);
+					spss->nalus = gf_list_new();
+					gf_list_add(hevccfg->param_array, spss);
+					spss->array_completeness = 1;
+					spss->type = GF_HEVC_NALU_SEQ_PARAM;
+				}
+
+				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_avc) {
+					first_avc = 0;
+					gf_import_message(import, GF_OK, "AVC-H264 import - frame size %d x %d at %02.3f FPS", hevc.sps[idx].width, hevc.sps[idx].height, FPS);
+				}
+
+				if ((max_w <= hevc.sps[idx].width) && (max_h <= hevc.sps[idx].height)) {
+					max_w = hevc.sps[idx].width;
+					max_h = hevc.sps[idx].height;
+				}
+			}
+			break;
+
+		case GF_HEVC_NALU_PIC_PARAM:
+			idx = gf_media_hevc_read_pps(buffer, nal_size, &hevc);
+			if (idx<0) {
+				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing Picture Param");
+				goto exit;
+			}
+			/*if we get twice the same VPS put in the the bitstream and set array_completeness to 0 ...*/
+			if (hevc.pps[idx].state == 2) {
+				copy_size = nal_size;
+				assert(ppss);
+				ppss->array_completeness = 0;
+			}
+
+			if (hevc.pps[idx].state==1) {
+				hevc.pps[idx].state = 2;
+
+				if (!ppss) {
+					GF_SAFEALLOC(ppss, GF_HEVCParamArray);
+					ppss->nalus = gf_list_new();
+					gf_list_add(hevccfg->param_array, ppss);
+					ppss->array_completeness = 1;
+					ppss->type = GF_HEVC_NALU_PIC_PARAM;
+				}
+
+				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);
+			}
+			break;
+		case GF_HEVC_NALU_SEI_PREFIX:
+			if (hevc.sps_active_idx != -1) {
+				/*TODO*/
+				//copy_size = gf_media_avc_reformat_sei(buffer, nal_size, &hevc);
+				copy_size = nal_size;
+				if (copy_size)
+					nb_sei++;
+			}
+			break;
+
+		/*slice_layer_rbsp*/
+//		case GF_HEVC_NALU_SLICE_STSA_N:
+//		case GF_HEVC_NALU_SLICE_STSA_R:
+		case GF_HEVC_NALU_SLICE_RADL_N:
+//		case GF_HEVC_NALU_SLICE_RADL_R:
+		case GF_HEVC_NALU_SLICE_RASL_N:
+//		case GF_HEVC_NALU_SLICE_RASL_R:		
+			is_slice = 1;
+			if (! skip_nal) {
+				copy_size = nal_size;
+			}
+			break;
+
+		/*slice_segment_layer_rbsp*/
+		case GF_HEVC_NALU_SLICE_STSA_N:
+		case GF_HEVC_NALU_SLICE_STSA_R:
+		case GF_HEVC_NALU_SLICE_RADL_R:
+		case GF_HEVC_NALU_SLICE_RASL_R:		
+		case GF_HEVC_NALU_SLICE_TRAIL_N:
+		case GF_HEVC_NALU_SLICE_TRAIL_R:
+		case GF_HEVC_NALU_SLICE_TSA_N:
+		case GF_HEVC_NALU_SLICE_TSA_R:
+		case GF_HEVC_NALU_SLICE_BLA_W_LP:
+		case GF_HEVC_NALU_SLICE_BLA_W_DLP:
+		case GF_HEVC_NALU_SLICE_BLA_N_LP:
+		case GF_HEVC_NALU_SLICE_IDR_W_DLP:
+		case GF_HEVC_NALU_SLICE_IDR_N_LP:
+		case GF_HEVC_NALU_SLICE_CRA:
+			is_slice = 1;
+			if (! skip_nal) {
+				copy_size = nal_size;
+				switch (hevc.s_info.slice_type) {
+				case GF_HEVC_TYPE_P: nb_p++; break;
+				case GF_HEVC_TYPE_I: nb_i++; 
+					sample_has_islice = 1;
+					break;
+				case GF_HEVC_TYPE_B: nb_b++; break;
+				}
+			}
+			break;
+
+		/*remove*/
+		case GF_HEVC_NALU_ACCESS_UNIT:
+		case GF_HEVC_NALU_FILLER_DATA:
+		case GF_HEVC_NALU_END_OF_SEQ:
+		case GF_HEVC_NALU_END_OF_STREAM:
+			break;
+
+		default:
+			gf_import_message(import, GF_OK, "WARNING: NAL Unit type %d not handled - adding", nal_unit_type);
+			copy_size = nal_size;
+			break;
+		}
+
+		if (!nal_size) break;
+
+		if (flush_sample && sample_data) {
+			GF_ISOSample *samp = gf_isom_sample_new();
+			samp->DTS = (u64)dts_inc*cur_samp;
+			samp->IsRAP = sample_is_rap;
+			if (!sample_is_rap) {
+				if (sample_has_islice && (import->flags & GF_IMPORT_FORCE_SYNC) && (sei_recovery_frame_count==0)) {
+					samp->IsRAP = 1;
+					if (!use_opengop_gdr) {
+						use_opengop_gdr = 1;
+						GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AVC Import] Forcing non-IDR samples with I slices to be marked as sync points - resulting file will not be ISO conformant\n"));
+					}
+				}
+			}
+			gf_bs_get_content(sample_data, &samp->data, &samp->dataLength);
+			gf_bs_del(sample_data);
+			sample_data = NULL;
+
+
+
+			/*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;
+			assert(last_poc >= poc_shift);
+			e = gf_isom_add_sample(import->dest, track, di, samp);
+			if (e) goto exit;
+
+			cur_samp++;
+
+			/*write sampleGroups info*/
+			if (!samp->IsRAP && (sei_recovery_frame_count>=0)) {
+				/*generic GDR*/
+				if (sei_recovery_frame_count) {
+					if (!use_opengop_gdr) use_opengop_gdr = 1;
+					e = gf_isom_set_sample_roll_group(import->dest, track, cur_samp, (s16) sei_recovery_frame_count);
+				} 
+				/*open-GOP*/
+				else if (sample_has_islice) {
+					if (!use_opengop_gdr) use_opengop_gdr = 2;
+					e = gf_isom_set_sample_rap_group(import->dest, track, cur_samp, 0);
+				}
+				if (e) goto exit;
+			}
+
+			gf_isom_sample_del(&samp);
+			gf_set_progress("Importing AVC-H264", (u32) (nal_start/1024), (u32) (total_size/1024) );
+			first_nal = 1;
+
+			if (min_poc > last_poc)
+				min_poc = last_poc;
+
+			sample_has_islice = 0;
+			sei_recovery_frame_count = -1;
+		}
+
+		if (copy_size) {
+			if ((size_length<32) && ( (u32) (1<<size_length)-1 < copy_size)) {
+				u32 diff_size = 8;
+				while ((size_length<32) && ( (u32) (1<<(size_length+diff_size))-1 < copy_size)) diff_size+=8;
+				/*only 8bits, 16bits and 32 bits*/
+				if (size_length+diff_size == 24) diff_size+=8;
+
+				gf_import_message(import, GF_OK, "Adjusting AVC SizeLength to %d bits", size_length+diff_size);
+				gf_media_avc_rewrite_samples(import->dest, track, size_length, size_length+diff_size);
+
+				/*rewrite current sample*/
+				if (sample_data) {
+					char *sd;
+					u32 sd_l;
+					GF_BitStream *prev_sd;
+					gf_bs_get_content(sample_data, &sd, &sd_l);
+					gf_bs_del(sample_data);
+					sample_data = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+					prev_sd = gf_bs_new(sd, sd_l, GF_BITSTREAM_READ);
+					while (gf_bs_available(prev_sd)) {
+						char *buf;
+						u32 s = gf_bs_read_int(prev_sd, size_length);
+						gf_bs_write_int(sample_data, s, size_length+diff_size);
+						buf = (char*)gf_malloc(sizeof(char)*s);
+						gf_bs_read_data(prev_sd, buf, s);
+						gf_bs_write_data(sample_data, buf, s);
+						gf_free(buf);
+					}
+					gf_bs_del(prev_sd);
+					gf_free(sd);
+				}
+				size_length+=diff_size;
+
+			}
+			if (!sample_data) sample_data = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			gf_bs_write_int(sample_data, copy_size, size_length);
+			gf_bs_write_data(sample_data, buffer, copy_size);
+
+			if (set_subsamples) {
+				/* use the res and priority value of last prefix NALU */
+				gf_isom_add_subsample(import->dest, track, cur_samp+1, copy_size+size_length/8, 0, 0, 0);
+			}
+
+			if (is_slice) {
+				slice_is_ref = gf_media_hevc_slice_is_IDR(&hevc);
+				if (slice_is_ref) 
+					nb_idr++;
+				slice_force_ref = 0;
+
+				/*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) {
+					first_nal = 0;
+					if (hevc.sei.recovery_point.valid || (import->flags & GF_IMPORT_FORCE_SYNC)) {
+						Bool bIntraSlice = gf_media_hevc_slice_is_intra(&hevc);
+						assert(hevc.s_info.nal_unit_type!=GF_AVC_NALU_IDR_SLICE || bIntraSlice);
+
+						sei_recovery_frame_count = hevc.sei.recovery_point.frame_cnt;
+
+						/*we allow to mark I-frames as sync on open-GOPs (with sei_recovery_frame_count=0) when forcing sync even when the SEI RP is not available*/
+						if (!hevc.sei.recovery_point.valid && bIntraSlice) {
+							sei_recovery_frame_count = 0;
+							if (use_opengop_gdr == 1) {
+								use_opengop_gdr = 2; /*avoid message flooding*/
+								GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AVC Import] No valid SEI Recovery Point found although needed - forcing\n"));
+							}
+						}
+						hevc.sei.recovery_point.valid = 0;
+						if (bIntraSlice && (import->flags & GF_IMPORT_FORCE_SYNC) && (sei_recovery_frame_count==0)) 
+							slice_force_ref = 1;
+					}
+					sample_is_rap = gf_media_hevc_slice_is_IDR(&hevc);
+				}
+
+				if (hevc.s_info.poc<poc_shift) {
+					u32 j;
+					if (ref_frame) {
+						for (j=ref_frame; j<=cur_samp; j++) {
+							GF_ISOSample *samp = gf_isom_get_sample_info(import->dest, track, j, NULL, NULL);
+							if (!samp) break;
+							samp->CTS_Offset += poc_shift;
+							samp->CTS_Offset -= hevc.s_info.poc;
+							gf_isom_modify_cts_offset(import->dest, track, j, samp->CTS_Offset);
+							gf_isom_sample_del(&samp);
+						}
+					}
+					poc_shift = hevc.s_info.poc;
+				}
+
+				/*if #pics, compute smallest POC increase*/
+				if (hevc.s_info.poc != last_poc) {
+					if (!poc_diff || (poc_diff > abs(hevc.s_info.poc-last_poc))) {
+						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;
+				}
+
+				/*ref slice, reset poc*/
+				if (slice_is_ref) {
+					ref_frame = cur_samp+1;
+					max_last_poc = last_poc = max_last_b_poc = 0;
+					poc_shift = 0;
+				}
+				/*forced ref slice*/
+				else if (slice_force_ref) {
+					ref_frame = cur_samp+1;	
+					/*adjust POC shift as sample will now be marked as sync, so wo must store poc as if IDR (eg POC=0) for our CTS offset computing to be correct*/
+					poc_shift = hevc.s_info.poc;
+				}
+				/*strictly less - this is a new P slice*/
+				else if (max_last_poc<last_poc) {
+					max_last_b_poc = 0;
+					prev_last_poc = max_last_poc;
+					max_last_poc = last_poc;
+				}
+				/*stricly greater*/
+				else if (max_last_poc>last_poc) {
+					/*need to store TS offsets*/
+					has_cts_offset = 1;
+					switch (hevc.s_info.slice_type) {
+					case GF_AVC_TYPE_B:
+					case GF_AVC_TYPE2_B:
+						if (!max_last_b_poc) {
+							max_last_b_poc = last_poc;
+						}
+						/*if same poc than last max, this is a B-slice*/
+						else if (last_poc>max_last_b_poc) {
+							max_last_b_poc = last_poc;
+						}
+						/*otherwise we had a B-slice reference: do nothing*/
+
+						break;
+					}
+				}
+
+				/*compute max delay (applicable when B slice are present)*/
+				if (ref_frame && poc_diff && (s32)(cur_samp-(ref_frame-1)-last_poc/poc_diff)>(s32)max_total_delay) {
+					max_total_delay = cur_samp - (ref_frame-1) - last_poc/poc_diff;
+				}
+			}
+		}
+
+		gf_bs_align(bs);
+		nal_end = gf_bs_get_position(bs);
+		assert(nal_start <= nal_end);
+		assert(nal_end <= nal_start + nal_size);
+		if (nal_end != nal_start + nal_size)
+			gf_bs_seek(bs, nal_start + nal_size);
+
+		if (!gf_bs_available(bs)) break;
+		if (duration && (dts_inc*cur_samp > duration)) break;
+		if (import->flags & GF_IMPORT_DO_ABORT) break;
+
+		/*consume next start code*/
+		nal_start = gf_media_nalu_next_start_code_bs(bs);
+		if (nal_start) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[avc-h264] invalid nal_size (%u)? Skipping "LLU" bytes to reach next start code\n", nal_size, nal_start));
+			gf_bs_skip_bytes(bs, nal_start);
+		}
+		nal_start = gf_media_nalu_is_start_code(bs);
+		if (!nal_start) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[avc-h264] error: no start code found ("LLU" bytes read out of "LLU") - leaving\n", gf_bs_get_position(bs), gf_bs_get_size(bs)));
+			break;
+		}
+		nal_start = gf_bs_get_position(bs);
+	}
+	
+	/*final flush*/
+	if (sample_data) {
+		GF_ISOSample *samp = gf_isom_sample_new();
+		samp->DTS = (u64)dts_inc*cur_samp;
+		samp->IsRAP = sample_is_rap;
+		if (!sample_is_rap && sample_has_islice && (import->flags & GF_IMPORT_FORCE_SYNC)) {
+			samp->IsRAP = 1;
+		}
+		/*we store the frame order (based on the POC) as the CTS offset and update the whole table at the end*/
+		samp->CTS_Offset = last_poc - poc_shift;
+		gf_bs_get_content(sample_data, &samp->data, &samp->dataLength);
+		gf_bs_del(sample_data);
+		sample_data = NULL;
+		e = gf_isom_add_sample(import->dest, track, di, samp);
+		if (e) goto exit;
+		gf_isom_sample_del(&samp);
+		gf_set_progress("Importing AVC-H264", (u32) cur_samp, cur_samp+1);
+		cur_samp++;
+	}
+
+
+	/*recompute all CTS offsets*/
+	if (has_cts_offset) {
+		u32 i, last_cts_samp;
+		u64 last_dts, max_cts;
+		if (!poc_diff) poc_diff = 1;
+		/*no b-frame references, no need to cope with negative poc*/
+		if (!max_total_delay) {
+			min_poc=0;
+			max_total_delay = 1;
+		}
+		cur_samp = gf_isom_get_sample_count(import->dest, track);
+		min_poc *= -1;
+		last_dts = 0;
+		max_cts = 0;
+		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*/
+			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;
+
+			/*if PAFF, 2 pictures (eg poc) <=> 1 aggregated frame (eg sample), divide by 2*/
+			if (is_paff) {
+				cts /= 2;
+				/*in some cases the poc is not on the top field - if that is the case, round up*/
+				if (cts%dts_inc) {
+					cts = ((cts/dts_inc)+1)*dts_inc;
+				}
+			}
+
+			/*B-frames offset*/
+			cts += (u32) (max_total_delay*dts_inc);
+
+			samp->CTS_Offset = (u32) (cts - samp->DTS);
+
+			if (max_cts < samp->DTS + samp->CTS_Offset) {
+				max_cts = samp->DTS + samp->CTS_Offset;
+				last_cts_samp = i;
+			}
+			/*this should never happen, however some streams seem to do weird POC increases (cf sorenson streams, last 2 frames),
+			this should hopefully take care of some bugs and ensure proper CTS...*/
+			if ((s32)samp->CTS_Offset<0) {
+				u32 j, k;
+				samp->CTS_Offset = 0;
+				gf_isom_modify_cts_offset(import->dest, track, i+1, samp->CTS_Offset);
+				for (j=last_cts_samp; j<i; j++) {
+					GF_ISOSample *asamp = gf_isom_get_sample_info(import->dest, track, j+1, NULL, NULL);
+					for (k=j+1; k<=i; k++) {
+						GF_ISOSample *bsamp = gf_isom_get_sample_info(import->dest, track, k+1, NULL, NULL);
+						if (asamp->CTS_Offset+asamp->DTS==bsamp->CTS_Offset+bsamp->DTS) {
+							max_cts += dts_inc;
+							bsamp->CTS_Offset = (u32) (max_cts - bsamp->DTS);
+							gf_isom_modify_cts_offset(import->dest, track, k+1, bsamp->CTS_Offset);
+						}
+						gf_isom_sample_del(&bsamp);
+					}
+					gf_isom_sample_del(&asamp);
+				}
+				max_cts = samp->DTS + samp->CTS_Offset;
+			} else {
+				gf_isom_modify_cts_offset(import->dest, track, i+1, samp->CTS_Offset);
+			}
+			gf_isom_sample_del(&samp);
+		}
+		/*and repack table*/
+		gf_isom_set_cts_packing(import->dest, track, 0);
+	} else {
+		gf_isom_remove_cts_info(import->dest, track);
+	}
+
+	gf_set_progress("Importing AVC-H264", (u32) cur_samp, cur_samp);
+
+	gf_isom_set_visual_info(import->dest, track, di, max_w, max_h);
+	hevccfg->nal_unit_size = size_length/8;
+
+	gf_isom_hevc_config_update(import->dest, track, 1, hevccfg);
+	gf_media_update_par(import->dest, track);
+	MP4T_RecomputeBitRate(import->dest, track);
+
+//	gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_VISUAL, 0x15);
+	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_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");
+	} else {
+		if (nb_sp || nb_si) {
+			gf_import_message(import, GF_OK, "AVC Import results: %d samples - Slices: %d I %d P %d B %d SP %d SI - %d SEI - %d IDR",
+				cur_samp, nb_i, nb_p, nb_b, nb_sp, nb_si, nb_sei, nb_idr);
+		} else {
+			gf_import_message(import, GF_OK, "AVC Import results: %d samples - Slices: %d I %d P %d B - %d SEI - %d IDR",
+				cur_samp, nb_i, nb_p, nb_b, nb_sei, nb_idr);
+		}
+
+		if (max_total_delay>1) {
+			gf_import_message(import, GF_OK, "Stream uses forward prediction - stream CTS offset: %d frames", max_total_delay);
+		}
+	}
+
+	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);
+	}
+
+	/*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, 1);
+		gf_isom_change_mpeg4_description(import->dest, track, 1, import->esd);
+	}
+
+exit:
+	if (sample_data) gf_bs_del(sample_data);
+	gf_odf_hevc_cfg_del(hevccfg);
+	gf_free(buffer);
+	gf_bs_del(bs);
+	fclose(mdia);
+	return e;
+}
+
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
 #ifndef GPAC_DISABLE_OGG
@@ -5383,6 +6093,9 @@
 #ifndef GPAC_DISABLE_AV_PARSERS
 	GF_AVCConfig *avccfg;
 	AVCState avc;
+
+	GF_HEVCConfig *hevccfg;
+	HEVCState hevc;
 #endif
 	Bool force_next_au_start;
 	Bool stream_setup;
@@ -5565,7 +6278,7 @@
 	start = 0;
 	bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_WRITE);
 	while (1) {
-		if (!samp->data[start+sc_pos] && !samp->data[start+sc_pos+1] && !samp->data[start+sc_pos+2] && (samp->data[start+sc_pos+3]==1)) {
+		if (!samp->data[sc_pos] && !samp->data[sc_pos+1] && !samp->data[sc_pos+2] && (samp->data[sc_pos+3]==1)) {
 			gf_bs_seek(bs, start);
 			gf_bs_write_u32(bs, (u32) sc_pos-start-4);
 			start = sc_pos;
@@ -5585,6 +6298,34 @@
 	gf_isom_sample_del(&samp);
 }
 
+static void hevc_cfg_add_nalu(GF_HEVCConfig *hevccfg, u8 nal_type, char *data, u32 data_len)
+{
+	u32 i, count;
+	GF_AVCConfigSlot *sl;
+	GF_HEVCParamArray *ar = NULL;
+	count = gf_list_count(hevccfg->param_array);
+	for (i=0; i<count; i++) {
+		ar = gf_list_get(hevccfg->param_array, i);
+		if (ar->type == nal_type) break;
+		ar = NULL;
+	}
+	if (!ar) {
+		GF_SAFEALLOC(ar, GF_HEVCParamArray);
+		ar->array_completeness = 1;
+		ar->type = nal_type;
+		ar->nalus = gf_list_new();
+	}
+	GF_SAFEALLOC(sl, GF_AVCConfigSlot);
+	if (data) {
+		sl->data = gf_malloc(sizeof(char)*data_len);
+		sl->size = data_len;
+		memcpy(sl->data, data, data_len);
+		gf_list_add(ar->nalus, ar);
+	} else {
+		ar->array_completeness = 0;
+	}
+}
+
 void on_m2ts_import_data(GF_M2TS_Demuxer *ts, u32 evt_type, void *par)
 {
 	GF_Err e;
@@ -5676,6 +6417,13 @@
 					import->nb_tracks++;
 					tsimp->nb_video++;
 					break;
+				case GF_M2TS_VIDEO_HEVC:
+					import->tk_info[idx].media_type = GF_4CC('h','e','v','c');
+					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_AUDIO_MPEG1:
 					import->tk_info[idx].media_type = GF_4CC('M','P','G','1');
 					import->tk_info[idx].type = GF_ISOM_MEDIA_AUDIO;
@@ -5801,6 +6549,12 @@
 				oti = GPAC_OTI_VIDEO_AVC;
 				tsimp->avccfg = gf_odf_avc_cfg_new();
 				break;
+			case GF_M2TS_VIDEO_HEVC:
+				mtype = GF_ISOM_MEDIA_VISUAL;
+				stype = GF_STREAM_VISUAL; 
+				oti = GPAC_OTI_VIDEO_HEVC;
+				tsimp->hevccfg = gf_odf_hevc_cfg_new();
+				break;
 			case GF_M2TS_AUDIO_MPEG1:
 				mtype = GF_ISOM_MEDIA_AUDIO;
 				stype = GF_STREAM_AUDIO; 
@@ -5917,7 +6671,7 @@
 				case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
 					is_subseq = 1;
 				case GF_AVC_NALU_SEQ_PARAM:
-					idx = AVC_ReadSeqInfo(pck->data+5, pck->data_len-5, &tsimp->avc, is_subseq, NULL);
+					idx = gf_media_avc_read_sps(pck->data+4, pck->data_len-4, &tsimp->avc, is_subseq, NULL);
 
 					add_sps = 0;
 					if (idx>=0) {
@@ -5953,7 +6707,7 @@
 					}
 					return;
 				case GF_AVC_NALU_PIC_PARAM:
-					idx = AVC_ReadPictParamSet(pck->data+5, pck->data_len-5, &tsimp->avc);
+					idx = gf_media_avc_read_pps(pck->data+4, pck->data_len-4, &tsimp->avc);
 					if ((idx>=0) && (tsimp->avc.pps[idx].status==1)) {
 						tsimp->avc.pps[idx].status = 2;
 						slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
@@ -5975,9 +6729,96 @@
 				case GF_AVC_NALU_SEI:
 					break;
 					if (tsimp->avc.sps_active_idx != -1) {
-						idx = AVC_ReformatSEI_NALU(pck->data+4, pck->data_len-4, &tsimp->avc);
+						idx = gf_media_avc_reformat_sei(pck->data+4, pck->data_len-4, &tsimp->avc);
+						if (idx>0) pck->data_len = idx+4;
+					}
+					break;
+				}
+
+				if (tsimp->force_next_au_start) {
+					is_au_start = 1;
+					tsimp->force_next_au_start = 0;
+				}
+			}
+
+			/*avc data for the current sample is stored in annex-B, as we don't know the size of each nal
+			when called back (depending on PES packetization, the end of the nal could be in following pes)*/
+			else if (tsimp->hevccfg && !pck->data[0] && !pck->data[1]) {
+				s32 idx;
+				Bool add_sps, is_subseq = 0;
+				u32 nal_type = (pck->data[4] & 0x7E) >> 1;
+
+				switch (nal_type) {
+				case GF_HEVC_NALU_SEQ_PARAM:
+					idx = gf_media_hevc_read_sps(pck->data+4, pck->data_len-4, &tsimp->hevc);
+					add_sps = 0;
+					if (idx>=0) {
+						if (is_subseq) {
+							if ((tsimp->hevc.sps[idx].state & AVC_SUBSPS_PARSED) && !(tsimp->hevc.sps[idx].state & AVC_SUBSPS_DECLARED)) {
+								tsimp->hevc.sps[idx].state |= AVC_SUBSPS_DECLARED;
+								add_sps = 1;
+							}
+						} else {
+							if ((tsimp->hevc.sps[idx].state & AVC_SPS_PARSED) && !(tsimp->hevc.sps[idx].state & AVC_SPS_DECLARED)) {
+								tsimp->hevc.sps[idx].state |= AVC_SPS_DECLARED;
+								add_sps = 1;
+							}
+						}
+						if (add_sps) {
+							/*always store nalu size on 4 bytes*/
+							tsimp->hevccfg->nal_unit_size = 4;
+							tsimp->hevccfg->configurationVersion = 1;
+
+							tsimp->hevccfg->configurationVersion = 1;
+							tsimp->hevccfg->profile_space = tsimp->hevc.sps[idx].ptl.profile_space;
+							tsimp->hevccfg->profile_idc = tsimp->hevc.sps[idx].ptl.profile_idc;
+							tsimp->hevccfg->constraint_indicator_flags = 0;
+							tsimp->hevccfg->level_idc = tsimp->hevc.sps[idx].ptl.level_idc;
+							tsimp->hevccfg->profile_compatibility_indications = tsimp->hevc.sps[idx].ptl.profile_compatibility_flag;
+							tsimp->hevccfg->chromaFormat = tsimp->hevc.sps[idx].chroma_format_idc;
+							tsimp->hevccfg->luma_bit_depth = tsimp->hevc.sps[idx].bit_depth_luma;
+							tsimp->hevccfg->chroma_bit_depth = tsimp->hevc.sps[idx].bit_depth_chroma;
+
+							hevc_cfg_add_nalu(tsimp->hevccfg, nal_type, pck->data+4, pck->data_len-4);
+
+							if (pck->stream->vid_w < tsimp->avc.sps[idx].width)
+								pck->stream->vid_w = tsimp->avc.sps[idx].width;
+							if (pck->stream->vid_h < tsimp->avc.sps[idx].height)
+								pck->stream->vid_h = tsimp->avc.sps[idx].height;
+						}
+					}
+					return;
+				case GF_HEVC_NALU_PIC_PARAM:
+					idx = gf_media_hevc_read_pps(pck->data+4, pck->data_len-4, &tsimp->hevc);
+					if ((idx>=0) && (tsimp->hevc.pps[idx].state==1)) {
+						tsimp->hevc.pps[idx].state = 2;
+						hevc_cfg_add_nalu(tsimp->hevccfg, nal_type, pck->data+4, pck->data_len-4);
+					}
+					return;
+				case GF_HEVC_NALU_VID_PARAM:
+					idx = gf_media_hevc_read_vps(pck->data+4, pck->data_len-4, &tsimp->hevc);
+					if ((idx>=0) && (tsimp->hevc.vps[idx].state==1)) {
+						tsimp->hevc.vps[idx].state = 2;
+						tsimp->hevccfg->avgFrameRate = tsimp->hevc.vps[idx].rates[0].avg_pic_rate;
+						tsimp->hevccfg->constantFrameRate = tsimp->hevc.vps[idx].rates[0].constand_pic_rate_idc;
+						tsimp->hevccfg->numTemporalLayers = tsimp->hevc.vps[idx].max_sub_layer;
+						hevc_cfg_add_nalu(tsimp->hevccfg, nal_type, pck->data+4, pck->data_len-4);
+					}
+					return;
+				/*remove*/
+				case GF_HEVC_NALU_ACCESS_UNIT:
+					tsimp->force_next_au_start = 1;
+					return;
+				case GF_HEVC_NALU_FILLER_DATA:
+				case GF_HEVC_NALU_END_OF_SEQ:
+				case GF_HEVC_NALU_END_OF_STREAM:
+					return;
+				case GF_HEVC_NALU_SEI_PREFIX:
+/*TODO					if (tsimp->avc.sps_active_idx != -1) {
+						idx = gf_media_avc_reformat_sei(pck->data+4, pck->data_len-4, &tsimp->avc);
 						if (idx>0) pck->data_len = idx+4;
 					}
+*/
 					break;
 				}
 
@@ -5986,6 +6827,7 @@
 					tsimp->force_next_au_start = 0;
 				}
 			}
+
 			if (!is_au_start) {
 				e = gf_isom_append_sample_data(import->dest, tsimp->track, (char*)pck->data, pck->data_len);
 				if (e) {
@@ -6016,6 +6858,7 @@
 				case GF_M2TS_VIDEO_MPEG2: gf_import_message(import, GF_OK, "MPEG-2 Video import (TS PID %d)", pck->stream->pid); break;
 				case GF_M2TS_VIDEO_MPEG4: gf_import_message(import, GF_OK, "MPEG-4 Video import (TS PID %d)", pck->stream->pid); break;
 				case GF_M2TS_VIDEO_H264: gf_import_message(import, GF_OK, "MPEG-4 AVC/H264 Video import (TS PID %d)", pck->stream->pid); break;
+				case GF_M2TS_VIDEO_HEVC: gf_import_message(import, GF_OK, "MPEG-H HEVC Video import (TS PID %d)", pck->stream->pid); break;
 				case GF_M2TS_AUDIO_MPEG1: gf_import_message(import, GF_OK, "MPEG-1 Audio import - SampleRate %d Channels %d Language %s (TS PID %d)", pck->stream->aud_sr, pck->stream->aud_nb_ch, gf_4cc_to_str(pck->stream->lang), pck->stream->pid); break;
 				case GF_M2TS_AUDIO_MPEG2: gf_import_message(import, GF_OK, "MPEG-2 Audio import - SampleRate %d Channels %d Language %s (TS PID %d)", pck->stream->aud_sr, pck->stream->aud_nb_ch, gf_4cc_to_str(pck->stream->lang), pck->stream->pid); break;
 				case GF_M2TS_AUDIO_AAC: gf_import_message(import, GF_OK, "MPEG-4 AAC Audio import - SampleRate %d Channels %d Language %s (TS PID %d)", pck->stream->aud_sr, pck->stream->aud_nb_ch, gf_4cc_to_str(pck->stream->lang), pck->stream->pid); break;
@@ -6311,7 +7154,7 @@
 		if (tsimp.track) {
 			MP4T_RecomputeBitRate(import->dest, tsimp.track);
 			/* creation of the edit lists */
-			if (es->first_dts != es->program->first_dts) {
+			if ((es->first_dts != es->program->first_dts) && gf_isom_get_sample_count(import->dest, tsimp.track) ){
 				u32 media_ts, moov_ts, offset;
 				u64 dur;
 				media_ts = gf_isom_get_media_timescale(import->dest, tsimp.track);
@@ -6785,6 +7628,7 @@
 				if (!strncmp(sep+1, "name", 4)) is_chap_or_sub = 1;
 				else if (!strncmp(sep+2, "name", 4)) is_chap_or_sub = 1;
 				else if (!strncmp(sep+3, "name", 4)) is_chap_or_sub = 1;
+				else if (strstr(line, "Zoom") || strstr(line, "zoom")) is_chap_or_sub = 1;
 			}
 		}
 		fclose(f);
@@ -7073,7 +7917,11 @@
 	if (!strnicmp(ext, ".h264", 5) || !strnicmp(ext, ".264", 4) || !strnicmp(ext, ".x264", 5)
 		|| !strnicmp(ext, ".h26L", 5) || !strnicmp(ext, ".26l", 4)
 		|| !stricmp(fmt, "AVC") || !stricmp(fmt, "H264") )
-		return gf_import_h264(importer);
+		return gf_import_avc_h264(importer);
+	/*HEVC video*/
+	if (!strnicmp(ext, ".hevc", 5) || !strnicmp(ext, ".hvc", 4) || !strnicmp(ext, ".265", 4)
+		|| !stricmp(fmt, "HEVC") || !stricmp(fmt, "H265") )
+		return gf_import_hevc(importer);
 	/*AC3*/
 	if (!strnicmp(ext, ".ac3", 4) || !stricmp(fmt, "AC3") )
 		return gf_import_ac3(importer);
@@ -7158,6 +8006,8 @@
 	switch (stype) {
 	case GF_ISOM_SUBTYPE_AVC_H264:
 	case GF_ISOM_SUBTYPE_AVC2_H264:
+	case GF_ISOM_SUBTYPE_AVC3_H264:
+	case GF_ISOM_SUBTYPE_AVC4_H264:
 		break;
 	default:
 		return GF_OK;

gpac-0.5.0.svn4192.tar.bz2/src/media_tools/mpd.c -> gpac-0.5.0.svn4296.tar.bz2/src/media_tools/mpd.c Changed

@@ -36,6 +36,7 @@
 static Bool gf_mpd_parse_bool(char *attr)
 {
 	if (!strcmp(attr, "true")) return 1;
+	if (!strcmp(attr, "1")) return 1;
 	return 0;
 }
 
@@ -119,13 +120,30 @@
 	if (ok) {
 		u64 res;
 		struct tm _t;
+		memset(&_t, 0, sizeof(struct tm));
 		_t.tm_year = (year > 1900) ? year - 1900 : 0;
 		_t.tm_mon = month ? month - 1 : 0;
 		_t.tm_mday = day;
 		_t.tm_hour = h;
 		_t.tm_min = m;
 		_t.tm_sec = (u32) s;
-		res = mktime(&_t);
+
+#ifdef GPAC_ANDROID
+		{
+		/*FIXME - finad a safe way to estimate timezone this does not work !!*/
+		s32 t_timezone;
+		struct tm t_gmt, t_local;
+		time_t t_time;
+		t_time = time(NULL);
+		t_gmt = *gmtime(&t_time);
+		t_local = *localtime(&t_time);
+		
+		t_timezone = (t_gmt.tm_hour - t_local.tm_hour) * 3600;
+		res = mktime(&_t) - t_timezone;
+		}
+#else
+		res = mktime(&_t) - timezone;
+#endif
 		if (om || oh) {
 			s32 diff = (60*oh + om)*60;
 			if (neg_time_zone) diff = -diff;
@@ -310,7 +328,7 @@
 	while ( (att = gf_list_enum(root->attributes, &i)) ) {
 		if (!strcmp(att->name, "timescale")) seg->timescale = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "presentationTimeOffset")) seg->presentation_time_offset = gf_mpd_parse_long_int(att->value);
-		else if (!strcmp(att->name, "indexRange")) seg->index_range = gf_mpd_parse_int(att->value);
+		else if (!strcmp(att->name, "indexRange")) seg->index_range = gf_mpd_parse_byte_range(att->value);
 		else if (!strcmp(att->name, "indexRangeExact")) seg->index_range_exact = gf_mpd_parse_bool(att->value);
 	}
 
@@ -783,6 +801,7 @@
 	GF_MPD_SegmentBase *ptr = (GF_MPD_SegmentBase *)_item;
 	if (ptr->initialization_segment) gf_mpd_url_free(ptr->initialization_segment);
 	if (ptr->representation_index) gf_mpd_url_free(ptr->representation_index);
+	if (ptr->index_range) gf_free(ptr->index_range);
 	gf_free(ptr);
 }
 
@@ -941,13 +960,13 @@
 		att = gf_list_get(root->attributes, att_index);
 		if (!att) continue;
 		if (!strcmp(att->name, "xmlns")) {
-			if (!root->ns && !strcmp(att->value, "urn:mpeg:DASH:schema:MPD:2011")) {
+			if (!root->ns && (!strcmp(att->value, "urn:mpeg:dash:schema:mpd:2011") || !strcmp(att->value, "urn:mpeg:DASH:schema:MPD:2011")) ) {
 				ns_ok = 1;
 				break;
 			}
 		}
 		else if (!strncmp(att->name, "xmlns:", 6)) {
-			if (root->ns && !strcmp(att->name+6, root->ns) && !strcmp(att->value, "urn:mpeg:DASH:schema:MPD:2011")) {
+			if (root->ns && !strcmp(att->name+6, root->ns) && (!strcmp(att->value, "urn:mpeg:dash:schema:mpd:2011") || !strcmp(att->value, "urn:mpeg:DASH:schema:MPD:2011")) ) {
 				ns_ok = 1;
 				mpd->xml_namespace = root->ns;
 				break;
@@ -956,7 +975,7 @@
 	}
 
 	if (!ns_ok) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD] Wrong namespacve found for DASH MPD - cannot parse\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Wrong namespace found for DASH MPD - cannot parse\n"));
 	}
 
 	att_index = 0;
@@ -1118,8 +1137,8 @@
 #endif
 				gf_free(suburl);
 			} else { /* for use in MP4Box */
-				if (strstr(suburl, "://") && !strstr(suburl, "://") ) {
-					e = gf_dm_wget(suburl, "tmp.m3u8");
+				if (strstr(suburl, "://") ) {
+					e = gf_dm_wget(suburl, "tmp.m3u8", 0, 0);
 					if (e==GF_OK) {
 						e = parse_sub_playlist("tmp.m3u8", &pl, suburl, prog, pe);
 					}
@@ -1269,7 +1288,7 @@
 		}
 	}
 
-	fprintf(fmpd, "  <AdaptationSet>\n");
+	fprintf(fmpd, "  <AdaptationSet segmentAlignment=\"true\">\n");
 
 	/*if we use templates, put the SegmentTemplate element at the adaptationSet level*/
 	if (use_template) {
@@ -1299,7 +1318,7 @@
 			tmp_file = strrchr(elt->url, '/');
 			if (!tmp_file) tmp_file = strrchr(elt->url, '\\');
 			if (tmp_file) {
-				e = gf_dm_wget(elt->url, tmp_file);
+				e = gf_dm_wget(elt->url, tmp_file, 0, 0);
 				if (e==GF_OK) {
 					import.in_name = tmp_file;
 					e = gf_media_import(&import);
@@ -1342,6 +1361,10 @@
 		count2 = gf_list_count(prog->bitrates);
 		for (j = 0; j<count2; j++) {
 			char *base_url;
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
+			Bool import_file = do_import;
+#endif
+			Bool is_aac = 0;
 			char *byte_range_media_file = NULL;
 			pe = gf_list_get(prog->bitrates, j);
 			
@@ -1362,10 +1385,25 @@
 				strncpy(pe->codecs, pe->codecs+1, len-1);
 				pe->codecs[len-2] = 0;
 			}
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
+			if (pe->bandwidth && pe->codecs && pe->width && pe->height) {
+				import_file = 0;
+			}
+#endif
 
-			width = height = samplerate = num_channels = 0;
+			/*get rid of level 0 aac*/
+			elt = gf_list_get(pe->element.playlist.elements, 0);
+			if (elt && strstr(elt->url, ".aac"))
+				is_aac = 1;
+
+			if (is_aac) 
+				fprintf(fmpd, "");
 				continue;
 			}
 
@@ -1501,6 +1542,9 @@
 			fprintf(fmpd, "    </SegmentList>\n");
 			fprintf(fmpd, "   </Representation>\n");
 			gf_free(base_url);
+
+			if (is_aac) 
+				fprintf(fmpd, " -->\n");
 		}
 	}

gpac-0.5.0.svn4192.tar.bz2/src/media_tools/mpegts.c -> gpac-0.5.0.svn4296.tar.bz2/src/media_tools/mpegts.c Changed

@@ -62,6 +62,7 @@
 	case GF_M2TS_AUDIO_AAC: return "AAC Audio";
 	case GF_M2TS_VIDEO_MPEG4: return "MPEG-4 Video";
 	case GF_M2TS_VIDEO_H264: return "MPEG-4/H264 Video";
+	case GF_M2TS_VIDEO_HEVC: return "MPEG-H HEVC Video";
 
 	case GF_M2TS_AUDIO_AC3: return "Dolby AC3 Audio";
 	case GF_M2TS_AUDIO_DTS: return "Dolby DTS Audio";
@@ -109,9 +110,10 @@
 	return 0;
 }
 
-static u32 gf_m2ts_reframe_avc_h264(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len)
+static u32 gf_m2ts_reframe_nalu_video(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, Bool is_hevc)
 {
 	Bool au_start_in_pes=0;
+	Bool prev_is_au_delim=0;
 	Bool force_new_au=0;
 	Bool start_code_found = 0;
 	Bool short_start_code = 0;
@@ -185,39 +187,95 @@
 			}
 			start_code_found = short_start_code ? 2 : 1;
 
-			nal_type = pck.data[4] & 0x1F;
+			if (is_hevc) {
+				nal_type = (pck.data[4] & 0x7E) >> 1;
 
-			/*check for SPS and update stream info*/
+				/*check for SPS and update stream info*/
 #ifndef GPAC_DISABLE_AV_PARSERS
-			if (!pes->vid_w && (nal_type==GF_AVC_NALU_SEQ_PARAM)) {
-				AVCState avc;
-				s32 idx;
-				memset(&avc, 0, sizeof(AVCState));
-				avc.sps_active_idx = -1;
-				idx = AVC_ReadSeqInfo(data+5, sc_pos-5, &avc, 0, NULL);
+				if (!pes->vid_w && (nal_type==GF_HEVC_NALU_SEQ_PARAM)) {
+					HEVCState hevc;
+					s32 idx;
+					memset(&hevc, 0, sizeof(HEVCState));
+					hevc.sps_active_idx = -1;
+					idx = gf_media_hevc_read_sps(data+4, sc_pos-4, &hevc);
+
+					if (idx>=0) {
+						pes->vid_w = hevc.sps[idx].width;
+						pes->vid_h = hevc.sps[idx].height;
+					}
+				}
+#endif
+				/*check AU start type*/
+				if (nal_type==GF_HEVC_NALU_ACCESS_UNIT) {
+					if (!prev_is_au_delim) {
+						if (au_start_in_pes) {
+							/*FIXME - we should check the AVC framerate to update the timing ...*/
+							pck.DTS += 3000;
+							pck.PTS += 3000;
+	//						GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID%d: Two AVC AUs start in this PES packet - cannot recompute non-first AU timing\n", pes->pid));
+						}
+						pck.flags = GF_M2TS_PES_PCK_AU_START;
+						force_new_au = 0;
+						au_start_in_pes = 1;
+						ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+						prev_is_au_delim=1;
+					}
+				} else if ((nal_type==GF_HEVC_NALU_SLICE_IDR_W_DLP)
+					|| (nal_type==GF_HEVC_NALU_SLICE_IDR_N_LP)
+				) {
+					pck.flags = GF_M2TS_PES_PCK_RAP;
+					ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+					prev_is_au_delim=0;
+				} 
+				else {
+					pck.flags = 0;
+					ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+					prev_is_au_delim=0;
+				}
+			} else {
+				nal_type = pck.data[4] & 0x1F;
 
-				if (idx>=0) {
-					pes->vid_w = avc.sps[idx].width;
-					pes->vid_h = avc.sps[idx].height;
+				/*check for SPS and update stream info*/
+#ifndef GPAC_DISABLE_AV_PARSERS
+				if (!pes->vid_w && (nal_type==GF_AVC_NALU_SEQ_PARAM)) {
+					AVCState avc;
+					s32 idx;
+					memset(&avc, 0, sizeof(AVCState));
+					avc.sps_active_idx = -1;
+					idx = gf_media_avc_read_sps(data+4, sc_pos-4, &avc, 0, NULL);
+
+					if (idx>=0) {
+						pes->vid_w = avc.sps[idx].width;
+						pes->vid_h = avc.sps[idx].height;
+					}
 				}
-			}
 #endif
-			/*check AU start type*/
-			if (nal_type==GF_AVC_NALU_ACCESS_UNIT) {
-				if (au_start_in_pes) {
-					/*FIXME - we should check the AVC framerate to update the timing ...*/
-					pck.DTS += 3000;
-					pck.PTS += 3000;
-//					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID%d: Two AVC AUs start in this PES packet - cannot recompute non-first AU timing\n", pes->pid));
+				/*check AU start type*/
+				if (nal_type==GF_AVC_NALU_ACCESS_UNIT) {
+					if (!prev_is_au_delim) {
+						if (au_start_in_pes) {
+							/*FIXME - we should check the AVC framerate to update the timing ...*/
+							pck.DTS += 3000;
+							pck.PTS += 3000;
+	//						GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID%d: Two AVC AUs start in this PES packet - cannot recompute non-first AU timing\n", pes->pid));
+						}
+						pck.flags = GF_M2TS_PES_PCK_AU_START;
+						force_new_au = 0;
+						au_start_in_pes = 1;
+						ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+						prev_is_au_delim=1;
+					}
+				} else if (nal_type==GF_AVC_NALU_IDR_SLICE) {
+					pck.flags = GF_M2TS_PES_PCK_RAP;
+					ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+					prev_is_au_delim=0;
+				} 
+				else {
+					pck.flags = 0;
+					ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+					prev_is_au_delim=0;
 				}
-				pck.flags = GF_M2TS_PES_PCK_AU_START;
-				force_new_au = 0;
-				au_start_in_pes = 1;
-			} else if (nal_type==GF_AVC_NALU_IDR_SLICE) {
-				pck.flags = GF_M2TS_PES_PCK_RAP;
-			} 
-			else pck.flags = 0;
-			ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+			}
 
 			data += sc_pos;
 			data_len -= sc_pos;
@@ -233,8 +291,10 @@
 	}
 	/*we did not consume all data*/
 	if (!start_code_found) {
+		u32 min_size = is_hevc ? 6 : 5;
 		/*if not enough data to locate start code, store it*/
-		if (data_len<5) return data_len;
+		if (data_len < min_size ) 
+			return data_len;
 		/*otherwise this is the middle of a frame, let's dispatch it*/
 	}
 
@@ -265,6 +325,16 @@
 	return 0;
 }
 
+static u32 gf_m2ts_reframe_avc_h264(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len)
+{
+	return gf_m2ts_reframe_nalu_video(ts, pes, same_pts, data, data_len, 0);
+}
+
+static u32 gf_m2ts_reframe_hevc(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len)
+{
+	return gf_m2ts_reframe_nalu_video(ts, pes, same_pts, data, data_len, 1);
+}
+
 static u32 gf_m2ts_reframe_mpeg_video(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len)
 {
 	u32 sc_pos = 0;
@@ -792,9 +862,12 @@
 	}
 }
 
-static void gf_m2ts_section_filter_del(GF_M2TS_SectionFilter *sf)
+static void gf_m2ts_section_filter_reset(GF_M2TS_SectionFilter *sf)
 {
-	if (sf->section) gf_free(sf->section);
+	if (sf->section) {
+		gf_free(sf->section);
+		sf->section = NULL;
+	}
 	while (sf->table) {
 		GF_M2TS_Table *t = sf->table;
 		sf->table = t->next;
@@ -802,6 +875,12 @@
 		gf_list_del(t->sections);
 		gf_free(t);
 	}
+	sf->cc = -1;
+	sf->length = sf->received = 0;
+}
+static void gf_m2ts_section_filter_del(GF_M2TS_SectionFilter *sf)
+{
+	gf_m2ts_section_filter_reset(sf);
 	gf_free(sf);
 }
 
@@ -1514,16 +1593,19 @@
 		case GF_M2TS_VIDEO_MPEG4:
 		case GF_M2TS_SYSTEMS_MPEG4_PES:
 		case GF_M2TS_VIDEO_H264:
+		case GF_M2TS_VIDEO_HEVC:
 		case GF_M2TS_AUDIO_AC3:
 		case GF_M2TS_AUDIO_DTS:
 		case GF_M2TS_SUBTITLE_DVB:
 			GF_SAFEALLOC(pes, GF_M2TS_PES);
 			pes->cc = -1;
+			pes->flags = GF_M2TS_ES_IS_PES;
 			es = (GF_M2TS_ES *)pes;
 			break;
 		case GF_M2TS_PRIVATE_DATA:
 			GF_SAFEALLOC(pes, GF_M2TS_PES);
 			pes->cc = -1;
+			pes->flags = GF_M2TS_ES_IS_PES;
 			es = (GF_M2TS_ES *)pes;
 			break;
 		/* Sections */
@@ -1836,7 +1918,7 @@
 	if (ts->on_event) ts->on_event(ts, evt_type, NULL);
 }
 
-static GFINLINE u64 gf_m2ts_get_pts(unsigned char *data)
+u64 gf_m2ts_get_pts(unsigned char *data)
 {
     u64 pts;
     u32 val;
@@ -1848,7 +1930,7 @@
     return pts;
 }
 
-static void gf_m2ts_pes_header(GF_M2TS_PES *pes, unsigned char *data, u32 data_size, GF_M2TS_PESHeader *pesh)
+void gf_m2ts_pes_header(GF_M2TS_PES *pes, unsigned char *data, u32 data_size, GF_M2TS_PESHeader *pesh)
 {
 	u32 has_pts, has_dts;
 	u32 len_check;
@@ -1891,6 +1973,8 @@
 		pesh->DTS = gf_m2ts_get_pts(data);
 		data+=5;
 		len_check += 5;
+	} else {
+		pesh->DTS = pesh->PTS;
 	}
 	if (len_check < pesh->hdr_data_len) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d Skipping %d bytes in pes header\n", pes->pid, pesh->hdr_data_len - len_check));
@@ -1899,7 +1983,7 @@
 	}
 }
 
-static void gf_m2ts_flush_pes(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, GF_M2TS_Header *hdr)
+static void gf_m2ts_flush_pes(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes)
 {
 	GF_M2TS_PESHeader pesh;
 
@@ -1919,7 +2003,7 @@
 			gf_m2ts_pes_header(pes, pes->data+3, pes->data_len-3, &pesh);
 			
 			/*send PES timing*/
-			{
+			if (ts->notify_pes_timing) {
 				GF_M2TS_PES_PCK pck;
 				memset(&pck, 0, sizeof(GF_M2TS_PES_PCK));
 				pck.PTS = pesh.PTS;
@@ -1946,12 +2030,9 @@
 #endif
 
 				pes->PTS = pesh.PTS;
-				if (!pesh.DTS) {
-					pesh.DTS = pesh.PTS;
-				}
 #ifndef GPAC_DISABLE_LOG
-				else {
-					if (pesh.DTS==pes->DTS) {
+				{
+					if (pes->DTS && (pesh.DTS==pes->DTS)) {
 						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d - same DTS "LLU" for two consecutive PES packets \n", pes->pid, pes->DTS) );
 					} if (pesh.DTS<pes->DTS) {
 						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d - DTS "LLU" less than previous DTS "LLU"\n", pes->pid, pesh.DTS, pes->DTS) );
@@ -2008,8 +2089,8 @@
 		} else {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PES %d: unknown stream ID %08X\n", pes->pid, stream_id));
 		}
-	} else {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PES %d: Bad PES Header, discarding packet (maybe stream is encrypted ?)\n", hdr->pid));
+	} else if (pes->data) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PES %d: Bad PES Header, discarding packet (maybe stream is encrypted ?)\n", pes->pid));
 	}
 	if (pes->data) gf_free(pes->data);
 	pes->data = NULL;
@@ -2021,14 +2102,17 @@
 static void gf_m2ts_process_pes(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, GF_M2TS_Header *hdr, unsigned char *data, u32 data_size, GF_M2TS_AdaptationField *paf)
 {
 	u8 expect_cc;
-	Bool disc;
+	Bool disc=0;
 	Bool flush_pes = 0;
 
-	/*duplicated packet, NOT A DISCONTINUITY, discard the packet*/
-	if (hdr->continuity_counter==pes->cc) return;
-
-	expect_cc = (pes->cc<0) ? hdr->continuity_counter : (pes->cc + 1) & 0xf;
-	disc = (expect_cc == hdr->continuity_counter) ? 0 : 1;
+	/*duplicated packet, NOT A DISCONTINUITY, we should discard the packet - however we may encounter this configuration in DASH at segment boundaries. 
+	If payload start is set, ignore duplication*/
+	if (hdr->continuity_counter==pes->cc) {
+		if (!hdr->payload_start || (hdr->adaptation_field!=3) ) return;
+	} else {
+		expect_cc = (pes->cc<0) ? hdr->continuity_counter : (pes->cc + 1) & 0xf;
+		if (expect_cc != hdr->continuity_counter) disc = 1;
+	}
 	pes->cc = hdr->continuity_counter;
 
 	if (disc) {
@@ -2037,15 +2121,21 @@
 			disc = 0;
 		}
 		if (disc) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PES %d: Packet discontinuity (%d expected - got %d- - trashing PES packet\n", pes->pid, expect_cc, hdr->continuity_counter));
-			if (pes->data) {
-				gf_free(pes->data);
-				pes->data = NULL;
+			if (hdr->payload_start) {
+				if (pes->data) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PES %d: Packet discontinuity (%d expected - got %d) - may have lost end of previous PES\n", pes->pid, expect_cc, hdr->continuity_counter));
+				}
+			} else {
+				if (pes->data) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PES %d: Packet discontinuity (%d expected - got %d) - trashing PES packet\n", pes->pid, expect_cc, hdr->continuity_counter));
+					gf_free(pes->data);
+					pes->data = NULL;
+				}
+				pes->data_len = 0;
+				pes->pes_len = 0;
+				pes->cc = -1;
+				return;
 			}
-			pes->data_len = 0;
-			pes->pes_len = 0;
-			pes->cc = -1;
-			return;
 		}
 	}
 
@@ -2058,7 +2148,7 @@
 		pes->before_last_pcr_value_pck_number = pes->program->before_last_pcr_value_pck_number;
 		pes->last_pcr_value = pes->program->last_pcr_value;
 		pes->last_pcr_value_pck_number = pes->program->last_pcr_value_pck_number;
-	} else if (pes->pes_len && (pes->data_len + data_size  == pes->pes_len + 6)) {
+	} else if (pes->pes_len && (pes->data_len + data_size == pes->pes_len + 6)) {
 		/* 6 = startcode+stream_id+length*/
 		/*reassemble pes*/
 		if (pes->data) pes->data = (char*)gf_realloc(pes->data, pes->data_len+data_size);
@@ -2072,7 +2162,7 @@
 
 	/*PES first fragment: flush previous packet*/
 	if (flush_pes && pes->data) {
-		gf_m2ts_flush_pes(ts, pes, hdr);
+		gf_m2ts_flush_pes(ts, pes);
 		if (!data_size) return;
 	}
 	/*we need to wait for first packet of PES*/
@@ -2096,7 +2186,7 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Got PES packet len %d\n", pes->pid, pes->pes_len));
 
 		if (pes->pes_len + 6 == pes->data_len) {
-			gf_m2ts_flush_pes(ts, pes, hdr);
+			gf_m2ts_flush_pes(ts, pes);
 		}
 	}
 }
@@ -2247,6 +2337,7 @@
 		es->program->before_last_pcr_value_pck_number = es->program->last_pcr_value_pck_number;
 		es->program->last_pcr_value_pck_number = ts->pck_number;
 		es->program->last_pcr_value = paf->PCR_base * 300 + paf->PCR_ext;
+		if (!es->program->last_pcr_value) es->program->last_pcr_value =  1;
 		pck.PTS = es->program->last_pcr_value;
 		pck.stream = (GF_M2TS_PES *)es;
 		if (paf->discontinuity_indicator) pck.flags = GF_M2TS_PES_PCK_DISCONTINUITY;
@@ -2364,18 +2455,7 @@
 
 		if (es->flags & GF_M2TS_ES_IS_SECTION) {
 			GF_M2TS_SECTION_ES *ses = (GF_M2TS_SECTION_ES *)es;
-			ses->sec->cc = -1;
-			ses->sec->length = 0;
-			ses->sec->received = 0;
-			gf_free(ses->sec->section);
-			ses->sec->section = NULL;
-			while (ses->sec->table) {
-				GF_M2TS_Table *t = ses->sec->table;
-				ses->sec->table = t->next;
-				gf_m2ts_reset_sections(t->sections);
-				gf_list_del(t->sections);
-				gf_free(t);
-			}
+			gf_m2ts_section_filter_reset(ses->sec);
 		} else {
 			GF_M2TS_PES *pes = (GF_M2TS_PES *)es;
 			if (!pes || (pes->pid==pes->program->pmt_pid)) continue;
@@ -2392,24 +2472,24 @@
 			if (pes->buf) gf_free(pes->buf);
 			pes->buf = NULL;
 			pes->buf_len = 0;
+			pes->before_last_pcr_value = pes->before_last_pcr_value_pck_number = 0;
+			pes->last_pcr_value = pes->last_pcr_value_pck_number = 0;
+			if (pes->program->pcr_pid==pes->pid) {
+				pes->program->last_pcr_value = pes->program->last_pcr_value_pck_number = 0;
+				pes->program->before_last_pcr_value = pes->program->before_last_pcr_value_pck_number = 0;
+			}
 		}
 //		gf_free(es);
 //		ts->ess[i] = NULL;
 	}
-/*
-	if (ts->pat) {
-		ts->pat->cc = -1;
-		ts->pat->length = 0;
-		ts->pat->received = 0;
-		gf_free(ts->pat->section);
-		while (ts->pat->table) {
-			GF_M2TS_Table *t = ts->pat->table;
-			ts->pat->table = t->next;
-			if (t->data) gf_free(t->data);
-			gf_free(t);
-		}
-	}
-*/
+
+	gf_m2ts_section_filter_reset(ts->cat);
+	gf_m2ts_section_filter_reset(ts->pat);
+	gf_m2ts_section_filter_reset(ts->sdt);
+	gf_m2ts_section_filter_reset(ts->nit);
+	gf_m2ts_section_filter_reset(ts->eit);
+	gf_m2ts_section_filter_reset(ts->tdt_tot);
+
 }
 
 static void gf_m2ts_process_section_discard(GF_M2TS_Demuxer *ts, GF_M2TS_SECTION_ES *es, GF_List *sections, u8 table_id, u16 ex_table_id, u8 version_number, u8 last_section_number, u32 status)
@@ -2459,6 +2539,9 @@
 		case GF_M2TS_VIDEO_H264:
 			pes->reframe = gf_m2ts_reframe_avc_h264;
 			break;
+		case GF_M2TS_VIDEO_HEVC:
+			pes->reframe = gf_m2ts_reframe_hevc;
+			break;
 		case GF_M2TS_AUDIO_AAC:
 			pes->reframe = gf_m2ts_reframe_aac_adts;
 			break;
@@ -2591,6 +2674,16 @@
 	}
 	gf_list_del(ts->ChannelAppList);
 
+	if (ts->requested_progs) {
+		assert(!gf_list_count(ts->requested_progs));
+		gf_list_del(ts->requested_progs);
+	}
+
+	if (ts->requested_pids) {
+		assert(!gf_list_count(ts->requested_pids));
+		gf_list_del(ts->requested_pids);
+	}
+
 	gf_free(ts);
 }
 
@@ -2657,8 +2750,9 @@
 			 gf_dm_sess_process(ts->dnload); 	 
 			 gf_sleep(1); 	 
 		 }
-	 } else if (ts->file) {
+	 } else if (ts->file || ts->ts_data_chunk) {
 		u32 pos = 0;
+		GF_BitStream *ts_bs = NULL;
 
 		if (ts->segment_switch) {
 			ts->segment_switch = 0;
@@ -2674,19 +2768,23 @@
 				pos = 0;
 			}
 		}
-		gf_f64_seek(ts->file, pos, SEEK_SET);
 
-restart_file:
-		gf_f64_seek(ts->file, ts->start_byterange, SEEK_SET);
+restart_stream:
+
+		if (ts->file)
+			ts_bs = gf_bs_from_file(ts->file, GF_BITSTREAM_READ);
+		else
+			ts_bs = gf_bs_new(ts->ts_data_chunk, ts->ts_data_chunk_size, GF_BITSTREAM_READ);
+
+		gf_bs_seek(ts_bs, ts->start_byterange);
 
-		while (ts->run_state && !feof(ts->file)) {
+		while (ts->run_state && gf_bs_available(ts_bs)) {
 			/*m2ts chunks by chunks*/
-			size = fread(data, 1, 188, ts->file);
+			size = gf_bs_read_data(ts_bs, data, 188);
 			if (!size && (ts->loop_demux == 1)) {
-				gf_f64_seek(ts->file, pos, SEEK_SET);
+				gf_bs_seek(ts_bs, pos);
 				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TSDemux] Loop \n"));
-                gf_sleep(500);
-				size = fread(data, 1, 188, ts->file);
+				size = gf_bs_read_data(ts_bs, data, 188);
 			}
 			if (!size) break;
 			if (size != 188) {
@@ -2696,9 +2794,7 @@
 			gf_m2ts_process_data(ts, data, size);
 
 			ts->nb_pck++;
-			//fprintf(stderr, "TS packet #%d\r", ts->nb_pck);
-
-			if (ts->end_byterange && (gf_f64_tell(ts->file)>=ts->end_byterange))
+			if (ts->end_byterange && (gf_bs_get_position(ts_bs) >= ts->end_byterange))
 				break;
 
 			//gf_sleep(0);
@@ -2708,25 +2804,50 @@
 				continue;
 			}
 
-            if(feof(ts->file) && ts->loop_demux == 1){
-                gf_f64_seek(ts->file, pos, SEEK_SET);
+            if (!gf_bs_available(ts_bs) && ts->loop_demux == 1){
+                gf_bs_seek(ts_bs, pos);
                 GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TSDemux] Loop \n"));
 				gf_sleep(3000);
             }
 		}
-		if (feof(ts->file)) GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TSDemux] EOS reached\n"));
+		if (!gf_bs_available(ts_bs)) {
+			u32 i;
+			for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
+				if (ts->ess[i]) {
+					if (ts->ess[i]->flags & GF_M2TS_ES_IS_PES) {
+						gf_m2ts_flush_pes(ts, (GF_M2TS_PES *) ts->ess[i]);
+						ts->on_event(ts, GF_M2TS_EVT_EOS, (GF_M2TS_PES *) ts->ess[i]);
+					} 
+				}
+			}
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TSDemux] EOS reached\n"));
+		}
 
 next_segment_setup:
+		gf_bs_del(ts_bs);
+		ts_bs = NULL;
 		if (ts->run_state && ts->query_next) {
 			const char *next_url = NULL;
 			ts->query_next(ts->query_udta, 0, &next_url, &ts->start_byterange, &ts->end_byterange);
 			if (next_url) {
-				fclose(ts->file);
-				ts->file = gf_f64_open(next_url, "rb");
 				gf_m2ts_set_segment_switch(ts);
 
-				if (ts->file) goto restart_file;
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Cannot open next file %s\n", next_url));
+				if (!strncmp(next_url, "gmem://", 7)) {
+					u32 size;
+					void *mem_address;
+					if (sscanf(next_url, "gmem://%d@%p", &size, &mem_address) != 2) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Cannot open next file %s\n", next_url));
+					} else {
+						ts->ts_data_chunk_size = size;
+						ts->ts_data_chunk = mem_address;
+						if (ts->ts_data_chunk_size) goto restart_stream;
+					}
+				} else {
+					if (ts->file) fclose(ts->file);
+					ts->file = gf_f64_open(next_url, "rb");
+					if (ts->file) goto restart_stream;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Cannot open next file %s\n", next_url));
+				}
 			}
 		}
 	}
@@ -3012,16 +3133,28 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[TSDemux] TS file already being processed: %s\n", url));
 		return GF_IO_ERR;
 	}
-
-	ts->file = gf_f64_open(url, "rb"); 
-	if (!ts->file) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[TSDemux] Could not open TS file: %s\n", url));		
-		return GF_IO_ERR;
-	}
 	strcpy(ts->filename, url);
 
-	gf_f64_seek(ts->file, 0, SEEK_END);
-	ts->file_size = gf_f64_tell(ts->file);
+	if (!strncmp(url, "gmem://", 7)) {
+		u32 size;
+		void *mem_address;
+		if (sscanf(url, "gmem://%d@%p", &size, &mem_address) != 2)
+			return GF_IO_ERR;
+		ts->ts_data_chunk_size = size;
+		ts->ts_data_chunk = mem_address;
+	} else {
+
+		ts->file = gf_f64_open(url, "rb"); 
+		if (!ts->file) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[TSDemux] Could not open TS file: %s\n", url));		
+			return GF_IO_ERR;
+		}
+		strcpy(ts->filename, url);
+
+		gf_f64_seek(ts->file, 0, SEEK_END);
+		ts->file_size = gf_f64_tell(ts->file);
+
+	}
 
 	/* reinitialization for seek */
 	ts->end_range = ts->start_range = 0;
@@ -3091,6 +3224,7 @@
 
 	if (ts->file) fclose(ts->file);
 	ts->file = NULL;
+	ts->ts_data_chunk = NULL;
 
 	return GF_OK;
 }
@@ -3111,6 +3245,152 @@
 }
 
 
+Bool gf_m2ts_probe_file(const char *fileName)
+{
+	char buf[188];
+	u32 count = 10;
+	FILE *t;
+
+	if (!strncmp(fileName, "gmem://", 7)) {
+		u32 size;
+		u8 *mem_address;
+		if (sscanf(fileName, "gmem://%d@%p", &size, &mem_address) != 2) {
+			return GF_URL_ERROR;
+		} 
+		while (size>188 && count) {
+			if (mem_address[0] != 0x47)
+				return 0;
+			mem_address+=188;
+			size-=188;
+			count--;
+		}
+		return 1;
+	}
+
+	t = gf_f64_open(fileName, "rb");
+	while (t && count) {
+		u32 read = fread(buf, 1, 188, t);
+		if (!read) {
+			count = 0;
+			break;
+		}
+		if (buf[0] != 0x47)
+			break;
+		if (read<188) 
+			count = 0;
+		else count--;
+	}
+	if (t) fclose(t);
+	return count ? 0 : 1;
+}
+
+static void rewrite_pts_dts(unsigned char *ptr, u64 TS)
+{
+	ptr[0] &= 0xf1;
+	ptr[0] |= (unsigned char)((TS&0x1c0000000ULL)>>29);
+	ptr[1]  = (unsigned char)((TS&0x03fc00000ULL)>>22);
+	ptr[2] &= 0x1;
+	ptr[2] |= (unsigned char)((TS&0x0003f8000ULL)>>14);
+	ptr[3]  = (unsigned char)((TS&0x000007f80ULL)>>7);
+	ptr[4] &= 0x1;
+	ptr[4] |= (unsigned char)((TS&0x00000007fULL)<<1);
+
+	assert(((u64)(ptr[0]&0xe)<<29) + ((u64)ptr[1]<<22) + ((u64)(ptr[2]&0xfe)<<14) + ((u64)ptr[3]<<7) + ((ptr[4]&0xfe)>>1) == TS);
+}
+
+#define ADJUST_TIMESTAMP(_TS) \
+	if (_TS < (u64) -ts_shift) _TS = pcr_mod + _TS + ts_shift; \
+	else _TS = _TS + ts_shift; \
+	while (_TS > pcr_mod) _TS -= pcr_mod; \
+
+
+GF_Err gf_m2ts_restamp(char *buffer, u32 size, s64 ts_shift, u8 *is_pes)
+{
+	u32 done = 0;
+	u64 pcr_mod;
+//	if (!ts_shift) return GF_OK;
+
+	pcr_mod = 0x80000000;
+	pcr_mod*=4;
+	while (done + 188 <= size) {
+		char *pesh;
+		u8 *pck;
+		u64 pcr_base=0, pcr_ext=0;
+		u16 pid;
+		u8 adaptation_field, adaptation_field_length;
+
+		pck = buffer+done;
+		if (pck[0]!=0x47) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TS Restamp] Invalid sync byte %X\n", pck[0]));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		pid = ((pck[1] & 0x1f) <<8 ) + pck[2];
+
+		adaptation_field_length = 0;
+		adaptation_field = (pck[3] >> 4) & 0x3;
+		if ((adaptation_field==2) || (adaptation_field==3)) {
+			adaptation_field_length = pck[4];
+			if ( pck[5]&0x10 /*PCR_flag*/) {
+				pcr_base = (((u64)pck[6])<<25) + (pck[7]<<17) + (pck[8]<<9) + (pck[9]<<1) + (pck[10]>>7);
+				pcr_ext  = ((pck[10]&1)<<8) + pck[11];
+
+				ADJUST_TIMESTAMP(pcr_base);
+
+				pck[6]  = (unsigned char)(0xff&(pcr_base>>25));
+				pck[7]  = (unsigned char)(0xff&(pcr_base>>17));
+				pck[8]  = (unsigned char)(0xff&(pcr_base>>9));
+				pck[9]  = (unsigned char)(0xff&(pcr_base>>1));
+				pck[10] = (unsigned char)(((0x1&pcr_base)<<7) | 0x7e | ((0x100&pcr_ext)>>8));
+				if (pcr_ext != ((pck[10]&1)<<8) + pck[11]) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TS Restamp] Sanity check failed for PCR restamping\n"));
+					return GF_IO_ERR;
+				}
+				pck[11] = (unsigned char)(0xff&pcr_ext);
+			}
+			/*add adaptation_field_length field*/
+			adaptation_field_length++;
+		}
+		if (!is_pes[pid] || !(pck[1]&0x40)) {
+			done+=188;
+			continue;
+		}
+
+		pesh = &pck[4+adaptation_field_length];
+
+		if ((pesh[0]==0x00) && (pesh[1]==0x00) && (pesh[2]==0x01)) {
+			Bool has_pts, has_dts;
+			if ((pesh[6]&0xc0)!=0x80) {
+				done+=188;
+				continue;
+			}
+			has_pts = (pesh[7]&0x80);
+			has_dts = has_pts ? (pesh[7]&0x40) : 0;
+
+			if (has_pts) {
+				u64 PTS;
+				if (((pesh[9]&0xe0)>>4)!=0x2) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[M2TS Restamp] PID %4d: Wrong PES header, PTS decoding: '0010' expected\n", pid));
+					done+=188;
+					continue;
+				}
+
+				PTS = gf_m2ts_get_pts(pesh + 9);
+				ADJUST_TIMESTAMP(PTS);
+				rewrite_pts_dts(pesh+9, PTS);
+			}
+
+			if (has_dts) {
+				u64 DTS = gf_m2ts_get_pts(pesh + 14);
+				ADJUST_TIMESTAMP(DTS);
+				rewrite_pts_dts(pesh+14, DTS);
+			}
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[M2TS Restamp] PID %4d: Wrong PES not beginning with start code\n", pid));
+		}
+		done+=188;	
+	}
+	return GF_OK;
+}
 
 #endif /*GPAC_DISABLE_MPEG2TS*/

gpac-0.5.0.svn4192.tar.bz2/src/media_tools/text_import.c -> gpac-0.5.0.svn4296.tar.bz2/src/media_tools/text_import.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/odf/descriptors.c -> gpac-0.5.0.svn4296.tar.bz2/src/odf/descriptors.c Changed

@@ -791,6 +791,154 @@
 	return e;
 }
 
+
+
+GF_EXPORT
+GF_HEVCConfig *gf_odf_hevc_cfg_new()
+{
+	GF_HEVCConfig *cfg;
+	GF_SAFEALLOC(cfg, GF_HEVCConfig);
+	if (!cfg) return NULL;
+	cfg->param_array = gf_list_new();
+	cfg->nal_unit_size = 4;
+	return cfg;
+}
+
+GF_EXPORT
+void gf_odf_hevc_cfg_del(GF_HEVCConfig *cfg)
+{
+	if (!cfg) return;
+	while (gf_list_count(cfg->param_array)) {
+		GF_HEVCParamArray *pa = (GF_HEVCParamArray*)gf_list_get(cfg->param_array, 0);
+		gf_list_rem(cfg->param_array, 0);
+
+		while (gf_list_count(pa->nalus)) {
+			GF_AVCConfigSlot *n = (GF_AVCConfigSlot*)gf_list_get(pa->nalus, 0);
+			gf_list_rem(pa->nalus, 0);
+			if (n->data) gf_free(n->data);
+			gf_free(n);
+		}
+		gf_free(pa);
+	}
+	gf_free(cfg);
+}
+
+GF_EXPORT
+GF_Err gf_odf_hevc_cfg_write_bs(GF_HEVCConfig *cfg, GF_BitStream *bs)
+{
+	u32 i, count;
+
+	gf_bs_write_int(bs, cfg->configurationVersion, 8);
+	gf_bs_write_int(bs, cfg->profile_space, 3);
+	gf_bs_write_int(bs, cfg->profile_idc, 5);
+	gf_bs_write_int(bs, cfg->constraint_indicator_flags, 16);
+	gf_bs_write_int(bs, cfg->level_idc, 8);
+	gf_bs_write_int(bs, cfg->profile_compatibility_indications, 32);
+	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->constantFrameRate, 2);
+	gf_bs_write_int(bs, cfg->numTemporalLayers, 3);
+	gf_bs_write_int(bs, 1, 1);
+	gf_bs_write_int(bs, cfg->nal_unit_size - 1, 2);
+
+	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_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);
+		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);
+			gf_bs_write_data(bs, sl->data, sl->size);
+		}
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_odf_hevc_cfg_write(GF_HEVCConfig *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_hevc_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_HEVCConfig *gf_odf_hevc_cfg_read_bs(GF_BitStream *bs)
+{
+	u32 i, count;
+	GF_HEVCConfig *cfg = gf_odf_hevc_cfg_new();
+
+	cfg->configurationVersion = gf_bs_read_int(bs, 8);
+	cfg->profile_space = gf_bs_read_int(bs, 3);
+	cfg->profile_idc = gf_bs_read_int(bs, 5);
+	cfg->constraint_indicator_flags = gf_bs_read_int(bs, 16);
+	cfg->level_idc = gf_bs_read_int(bs, 8);
+	cfg->profile_compatibility_indications = gf_bs_read_int(bs, 32);
+	gf_bs_read_int(bs, 6);
+	cfg->chromaFormat = gf_bs_read_int(bs, 2);
+	gf_bs_read_int(bs, 5);
+	cfg->luma_bit_depth = 8 + gf_bs_read_int(bs, 3);
+	gf_bs_read_int(bs, 5);
+	cfg->chroma_bit_depth = 8 + gf_bs_read_int(bs, 3);
+	cfg->avgFrameRate = gf_bs_read_int(bs, 16);
+	cfg->constantFrameRate = gf_bs_read_int(bs, 2);
+	cfg->numTemporalLayers = gf_bs_read_int(bs, 3);
+	gf_bs_read_int(bs, 1);
+	cfg->nal_unit_size = 1 + gf_bs_read_int(bs, 2);
+
+	count = gf_bs_read_int(bs, 8);
+	for (i=0; i<count; i++) {
+		u32 nalucount, j;
+		GF_HEVCParamArray *ar;
+		GF_SAFEALLOC(ar, GF_HEVCParamArray);
+		ar->nalus = gf_list_new();
+		gf_list_add(cfg->param_array, ar);
+		
+		ar->array_completeness = gf_bs_read_int(bs, 1);
+		gf_bs_read_int(bs, 1);
+		ar->type = gf_bs_read_int(bs, 6);
+		nalucount = gf_bs_read_int(bs, 16);
+		for (j=0; j<nalucount; j++) {
+			GF_AVCConfigSlot *sl;
+			GF_SAFEALLOC(sl, GF_AVCConfigSlot );
+
+			sl->size = gf_bs_read_int(bs, 16);
+
+			sl->data = (char *)gf_malloc(sizeof(char) * sl->size);
+			gf_bs_read_data(bs, sl->data, sl->size);
+			gf_list_add(ar->nalus, sl);
+		}
+	}
+	return cfg;
+}
+
+GF_EXPORT
+GF_HEVCConfig *gf_odf_hevc_cfg_read(char *dsi, u32 dsi_size)
+{
+	GF_BitStream *bs = gf_bs_new(dsi, dsi_size, GF_BITSTREAM_READ);
+	GF_HEVCConfig *cfg = gf_odf_hevc_cfg_read_bs(bs);
+	gf_bs_del(bs);
+	return cfg;
+}
+
 GF_EXPORT
 const char *gf_afx_get_type_description(u8 afx_code)
 {

gpac-0.5.0.svn4192.tar.bz2/src/scene_manager/loader_bt.c -> gpac-0.5.0.svn4296.tar.bz2/src/scene_manager/loader_bt.c Changed

@@ -32,10 +32,9 @@
 #include <gpac/nodes_x3d.h>
 /*for key codes...*/
 #include <gpac/user.h>
-#include <gpac/network.h>
 
 
-#ifndef GPAC_DISABLE_LOADER_BT
+#if !defined(GPAC_DISABLE_LOADER_BT) && !defined(GPAC_DISABLE_ZLIB)
 
 #include <gpac/mpeg4_odf.h>
 
@@ -1095,23 +1094,31 @@
 
 u32 gf_bt_get_def_id(GF_BTParser *parser, char *defName)
 {
-	GF_Node *n;
-	u32 ID;
+	GF_Node *n=NULL;
+	u32 ID=0;
 	if (sscanf(defName, "N%u", &ID) == 1) {
-		ID ++;
-		n = gf_sg_find_node(parser->load->scene_graph, ID);
-		/*if an existing node use*/
-		if (n) {
-			u32 id;
-			u32 nID = gf_bt_get_next_node_id(parser);
-			const char *name = gf_node_get_name_and_id(n, &id);
-			gf_bt_report(parser, GF_OK, "changing node \"%s\" Binary ID from %d to %d", name, id -1, nID-1);
-			gf_node_set_id(n, nID, name);
+		u32 k=1;
+		while (defName[k]) {
+			if (strchr("0123456789", defName[k])==0) {
+				ID = 0;
+				break;
+			}
+			k++;
 		}
-		if (parser->load->ctx && (parser->load->ctx->max_node_id<ID)) parser->load->ctx->max_node_id=ID;
-	} else {
-		ID = gf_bt_get_next_node_id(parser);
-	}
+		if (ID) {
+			ID ++;
+			n = gf_sg_find_node(parser->load->scene_graph, ID);
+			if (!n) {
+				if (parser->load->ctx && (parser->load->ctx->max_node_id<ID)) parser->load->ctx->max_node_id=ID;
+				return ID;
+			}
+		}
+	} 
+
+	ID = gf_bt_get_next_node_id(parser);
+	if (n) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[BT Parsing] (line %d) Binary ID %d already assigned to %s - keeping internal ID %d", parser->line, gf_node_get_name(n), ID));
+	} 
 	return ID;
 }

gpac-0.5.0.svn4192.tar.bz2/src/scene_manager/loader_xmt.c -> gpac-0.5.0.svn4296.tar.bz2/src/scene_manager/loader_xmt.c Changed

@@ -607,19 +607,29 @@
 }
 static u32 xmt_get_node_id(GF_XMTParser *parser, char *name)
 {
-	GF_Node *n;
-	u32 ID;
+	GF_Node *n = NULL;
+	u32 ID = 0;
 	if (sscanf(name, "N%u", &ID) == 1) {
-		ID ++;
-		n = gf_sg_find_node(parser->load->scene_graph, ID);
-		if (n) {
-			u32 nID = xmt_get_next_node_id(parser);
-			xmt_report(parser, GF_OK, "WARNING: changing node \"%s\" ID from %d to %d", gf_node_get_name(n), gf_node_get_id(n)-1, nID-1);
-			gf_node_set_id(n, nID, gf_node_get_name(n));
+		u32 k=1;
+		while (name[k]) {
+			if (strchr("0123456789", name[k])==0) {
+				ID = 0;
+				break;
+			}
+			k++;
 		}
-		if (parser->load->ctx && (parser->load->ctx->max_node_id<ID)) parser->load->ctx->max_node_id=ID;
-	} else {
-		ID = xmt_get_next_node_id(parser);
+		if (ID) {
+			ID ++;
+			n = gf_sg_find_node(parser->load->scene_graph, ID);
+			if (!n) {
+				if (parser->load->ctx && (parser->load->ctx->max_node_id<ID)) parser->load->ctx->max_node_id=ID;
+				return ID;
+			}
+		}
+	} 
+	ID = xmt_get_next_node_id(parser);
+	if (n) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[XMT Parsing] (line %d) Binary ID %s already assigned to %s - keeping internal ID %d\n", gf_xml_sax_get_line(parser->sax_parser), name, gf_node_get_name(n), ID));
 	}
 	return ID;
 }

gpac-0.5.0.svn4192.tar.bz2/src/scene_manager/scene_engine.c -> gpac-0.5.0.svn4296.tar.bz2/src/scene_manager/scene_engine.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/scene_manager/scene_manager.c -> gpac-0.5.0.svn4296.tar.bz2/src/scene_manager/scene_manager.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/scene_manager/swf_parse.c -> gpac-0.5.0.svn4296.tar.bz2/src/scene_manager/swf_parse.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/scenegraph/dom_smjs.c -> gpac-0.5.0.svn4296.tar.bz2/src/scenegraph/dom_smjs.c Changed

@@ -472,7 +472,7 @@
 	}
 	return JS_TRUE;
 }
-static SMJS_FUNC_PROP_SET( dom_nodelist_setProperty)
+static SMJS_FUNC_PROP_SET_NOVP( dom_nodelist_setProperty)
 
 	/*avoids gcc warning*/
 	if (!obj) obj=NULL;
@@ -1405,7 +1405,7 @@
 	return JS_TRUE;
 }
 
-static SMJS_FUNC_PROP_SET(dom_document_setProperty)
+static SMJS_FUNC_PROP_SET_NOVP(dom_document_setProperty)
 
 	u32 prop_id;
 	GF_SceneGraph *sg = dom_get_doc(c, obj);
@@ -3445,10 +3445,11 @@
 	/*avoids gcc warning*/
 	if (!id) id=0;
 	if (!GF_JS_InstanceOf(c, obj, &dom_rt->storageClass, NULL) ) return JS_TRUE;
+	*vp = JSVAL_VOID;
 	return JS_TRUE;
 }
 
-static SMJS_FUNC_PROP_SET( storage_setProperty)
+static SMJS_FUNC_PROP_SET_NOVP( storage_setProperty)
 
 	/*avoids gcc warning*/
 	if (!id) id=0;
@@ -3526,29 +3527,29 @@
 			SMJS_FUNCTION_SPEC(0, 0, 0)
 		};
 		JSPropertySpec nodeProps[] = {
-			{"nodeName",		0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"nodeValue",		1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"nodeType",		2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"parentNode",		3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"childNodes",		4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"firstChild",		5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"lastChild",		6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"previousSibling",	7,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"nextSibling",		8,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"attributes",		9,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"ownerDocument",	10,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"namespaceURI",	11,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"prefix",			12,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"localName",		13,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"baseURI",			14,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"textContent",		15,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
+			SMJS_PROPERTY_SPEC("nodeName",		0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("nodeValue",		1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("nodeType",		2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("parentNode",		3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("childNodes",		4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("firstChild",		5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("lastChild",		6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("previousSibling",	7,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("nextSibling",		8,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("attributes",		9,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("ownerDocument",	10,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("namespaceURI",	11,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("prefix",			12,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("localName",		13,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("baseURI",			14,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("textContent",		15,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
 			/*elementTraversal interface*/
-			{"firstElementChild",		16,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"lastElementChild",		17,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"previousElementSibling",	18,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"nextElementSibling",		19,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+			SMJS_PROPERTY_SPEC("firstElementChild",		16,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("lastElementChild",		17,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("previousElementSibling",	18,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("nextElementSibling",		19,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		GF_JS_InitClass(c, global, 0, &dom_rt->domNodeClass, 0, 0, nodeProps, nodeFuncs, 0, 0);
 		if (!dom_rt->domNodeClass._proto) {
@@ -3590,17 +3591,17 @@
 		};
 
 		JSPropertySpec documentProps[] = {
-			{"doctype",				1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"implementation",		2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"documentElement",		3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"inputEncoding",		4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"xmlEncoding",			5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"xmlStandalone",		6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"xmlVersion",			7,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"strictErrorChecking",	8,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"documentURI",			9,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"domConfig",			10,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{0, 0, 0, 0, 0},
+			SMJS_PROPERTY_SPEC("doctype",				1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("implementation",		2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("documentElement",		3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("inputEncoding",		4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("xmlEncoding",			5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("xmlStandalone",		6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("xmlVersion",			7,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("strictErrorChecking",	8,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("documentURI",			9,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("domConfig",			10,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0),
 		};
 
 		GF_JS_InitClass(c, global, dom_rt->domNodeClass._proto, &dom_rt->domDocumentClass, 0, 0, documentProps, documentFuncs, 0, 0);
@@ -3633,9 +3634,9 @@
 		};
 
 		JSPropertySpec elementProps[] = {
-			{"tagName",				1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"schemaTypeInfo",		2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{0, 0, 0, 0, 0},
+			SMJS_PROPERTY_SPEC("tagName",				1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("schemaTypeInfo",		2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0),
 		};
 		GF_JS_InitClass(c, global, dom_rt->domNodeClass._proto, &dom_rt->domElementClass, 0, 0, elementProps, elementFuncs, 0, 0);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] element class initialized\n"));
@@ -3656,12 +3657,12 @@
 			SMJS_FUNCTION_SPEC(0, 0, 0)
 		};
 		JSPropertySpec textProps[] = {
-			{"data",						1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"length",						2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+			SMJS_PROPERTY_SPEC("data",						1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("length",						2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 			/*text*/
-			{"isElementContentWhitespace",	3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"wholeText",					4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{0, 0, 0, 0, 0},
+			SMJS_PROPERTY_SPEC("isElementContentWhitespace",	3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("wholeText",					4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0),
 		};
 		GF_JS_InitClass(c, global, dom_rt->domNodeClass._proto, &dom_rt->domTextClass, 0, 0, textProps, textFuncs, 0, 0);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] text class initialized\n"));
@@ -3680,59 +3681,58 @@
 			SMJS_FUNCTION_SPEC(0, 0, 0)
 		};
 		JSPropertySpec eventProps[] = {
-			{"type",			 0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"target",			 1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"currentTarget",	 2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"eventPhase",		 3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"bubbles",			 4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"cancelable",		 5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"timeStamp",		 6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"namespaceURI",	 7,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"defaultPrevented", 8,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+			SMJS_PROPERTY_SPEC("type",			 0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("target",			 1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("currentTarget",	 2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("eventPhase",		 3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("bubbles",			 4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("cancelable",		 5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("timeStamp",		 6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("namespaceURI",	 7,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("defaultPrevented", 8,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 
 			/*UIEvent*/
-			{"detail",			20,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+			SMJS_PROPERTY_SPEC("detail",			20,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 			/*text, connectionEvent*/
-			{"data",			25,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+			SMJS_PROPERTY_SPEC("data",			25,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 			/*MouseEvent*/
-			{"screenX",			30,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"screenY",			31,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"clientX",			32,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"clientY",			33,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"button",			34,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"relatedTarget",	35,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+			SMJS_PROPERTY_SPEC("screenX",			30,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("screenY",			31,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("clientX",			32,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("clientY",			33,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("button",			34,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("relatedTarget",	35,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 			/*wheelEvent*/
-			{"wheelDelta",		36,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+			SMJS_PROPERTY_SPEC("wheelDelta",		36,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 
 			/*keyboard*/
-			{"keyIdentifier",	40,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"keyChar",			41,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"charCode",		42,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+			SMJS_PROPERTY_SPEC("keyIdentifier",	40,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("keyChar",			41,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("charCode",		42,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 
 			/*progress*/
-			{"lengthComputable",50,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"typeArg",			51,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"loaded",			52,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"total",			53,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"bufferLevelValid",	54,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"bufferLevel",			55,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"bufferRemainingTime",	56,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"status",				57,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+			SMJS_PROPERTY_SPEC("lengthComputable",50,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("typeArg",			51,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("loaded",			52,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("total",			53,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("bufferLevelValid",	54,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("bufferLevel",			55,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("bufferRemainingTime",	56,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("status",				57,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 
 			/*used by vrml*/
-			{"width",			60,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"height",			61,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"offset_x",		62,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"offset_y",		63,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"vp_width",		64,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"vp_height",		65,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"translation_x",	66,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"translation_y",	67,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"type3d",			68,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"error",			69,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+			SMJS_PROPERTY_SPEC("width",			60,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("height",			61,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("offset_x",		62,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("offset_y",		63,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("vp_width",		64,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("vp_height",		65,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("translation_x",	66,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("translation_y",	67,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("type3d",			68,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("error",			69,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 
-
-			{0, 0, 0, 0, 0},
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0),
 		};
 		GF_JS_InitClass(c, global, 0, &dom_rt->domEventClass, 0, 0, eventProps, eventFuncs, 0, 0);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] Event class initialized\n"));
@@ -3754,8 +3754,8 @@
 			SMJS_FUNCTION_SPEC(0, 0, 0)
 		};
 		JSPropertySpec nodeListProps[] = {
-			{"length",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC("length",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		GF_JS_InitClass(c, global, 0, &dom_rt->domNodeListClass, 0, 0, nodeListProps, nodeListFuncs, 0, 0);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] nodeList class initialized\n"));
@@ -3763,13 +3763,13 @@
 
 	{
 		JSPropertySpec xmlHTTPRequestClassProps[] = {
-			{"onreadystatechange",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"readyState",			1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"responseText",		2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"responseXML",			3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"status",				4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"statusText",			5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC("onreadystatechange",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("readyState",			1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("responseText",		2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("responseXML",			3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("status",				4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("statusText",			5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		JSFunctionSpec xmlHTTPRequestClassFuncs[] = {
 			SMJS_FUNCTION_SPEC("open",					xml_http_open, 2),
@@ -3787,7 +3787,7 @@
 
 	{
 		JSPropertySpec storageClassProps[] = {
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		JSFunctionSpec storageClassFuncs[] = {
 			SMJS_FUNCTION_SPEC(0, 0, 0)
@@ -3810,14 +3810,14 @@
 		if (dcci && dcci->RootNode) {
 
 			JSPropertySpec DCCIClassProps[] = {
-				{"value",							0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-				{"valueType",						1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"propertyType",					2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-				{"readOnly",						3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"DCCIMetadataInterfaceType",		4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"DCCIMetadataInterface",			5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"version",							6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{0, 0, 0, 0, 0}
+				SMJS_PROPERTY_SPEC("value",							0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+				SMJS_PROPERTY_SPEC("valueType",						1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+				SMJS_PROPERTY_SPEC("propertyType",					2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+				SMJS_PROPERTY_SPEC("readOnly",						3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+				SMJS_PROPERTY_SPEC("DCCIMetadataInterfaceType",		4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+				SMJS_PROPERTY_SPEC("DCCIMetadataInterface",			5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+				SMJS_PROPERTY_SPEC("version",							6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+				SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 			};
 			JSFunctionSpec DCCIClassFuncs[] = {
 				SMJS_FUNCTION_SPEC("hasProperty",			dcci_has_property, 3),

gpac-0.5.0.svn4192.tar.bz2/src/scenegraph/svg_smjs.c -> gpac-0.5.0.svn4296.tar.bz2/src/scenegraph/svg_smjs.c Changed

@@ -1523,8 +1523,8 @@
 }
 
 static JSPropertySpec connectionProps[] = {
-	{"connected",			0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-	{0, 0, 0, 0, 0}
+	SMJS_PROPERTY_SPEC("connected",			0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+	SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 };
 static JSFunctionSpec connectionFuncs[] = {
 	/*eventTarget interface*/
@@ -2149,9 +2149,9 @@
 	SMJS_SET_PRIVATE(scene->svg_js->js_ctx, scene->svg_js->global, scene);
 	{
 		JSPropertySpec globalClassProps[] = {
-			{"connected",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"parent",		1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC("connected",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("parent",		1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		JSFunctionSpec globalClassFuncs[] = {
 			SMJS_FUNCTION_SPEC("createConnection", svg_connection_create, 0),
@@ -2180,9 +2180,8 @@
 
 		JSPropertySpec svgDocumentProps[] = {
 			/*in our implementation, defaultView is just an alias to the global Window object*/
-			{"defaultView",			0,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC("defaultView",			0,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		JSObject *doc_proto = dom_js_get_document_proto(scene->svg_js->js_ctx);
 		GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, doc_proto, &svg_rt->svgDocument, 0, 0, svgDocumentProps, 0, 0, 0);
@@ -2248,21 +2247,21 @@
 
 		JSPropertySpec svgElementProps[] = {
 			/*svgElement interface*/
-			{"id",						0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
+			SMJS_PROPERTY_SPEC("id",						0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
 			/*svgSVGElement interface*/
-			{"currentScale",			5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"currentRotate",			6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"currentTranslate",		7,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"viewport",				8,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"currentTime",				9,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
+			SMJS_PROPERTY_SPEC("currentScale",			5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("currentRotate",			6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("currentTranslate",		7,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("viewport",				8,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("currentTime",				9,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
 			/*timeControl interface*/
-			{"isPaused",				10,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+			SMJS_PROPERTY_SPEC("isPaused",				10,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 			/*old SVG1.1 stuff*/
-			{"ownerSVGElement",			11,		JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+			SMJS_PROPERTY_SPEC("ownerSVGElement",			11,		JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 			/*SVGElementInstance*/
-			{"correspondingElement",	12, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{"correspondingUseElement",	13, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC("correspondingElement",	12, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("correspondingUseElement",	13, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		JSObject *elt_proto = dom_js_get_element_proto(scene->svg_js->js_ctx);
 		GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, elt_proto, &svg_rt->svgElement, 0, 0, svgElementProps, svgElementFuncs, 0, 0);
@@ -2272,30 +2271,30 @@
 	/*RGBColor class*/
 	{
 		JSPropertySpec rgbClassProps[] = {
-			{"red",		0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"green",	1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"blue",	2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC("red",		0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("green",	1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("blue",	2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &svg_rt->rgbClass, 0, 0, rgbClassProps, 0, 0, 0);
 	}
 	/*SVGRect class*/
 	{
 		JSPropertySpec rectClassProps[] = {
-			{"x",		0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"y",		1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"width",	2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"height",	3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC("x",		0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("y",		1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("width",	2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("height",	3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &svg_rt->rectClass, 0, 0, rectClassProps, 0, 0, 0);
 	}
 	/*SVGPoint class*/
 	{
 		JSPropertySpec pointClassProps[] = {
-			{"x",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"y",	1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC("x",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("y",	1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &svg_rt->pointClass, 0, 0, pointClassProps, 0, 0, 0);
 	}
@@ -2311,13 +2310,13 @@
 			SMJS_FUNCTION_SPEC(0, 0, 0)
 		};
 		JSPropertySpec matrixClassProps[] = {
-			{"a",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"b",	1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"c",	2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"d",	3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"e",	4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"f",	5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC("a",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("b",	1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("c",	2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("d",	3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("e",	4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("f",	5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &svg_rt->matrixClass, 0, 0, matrixClassProps, matrixClassFuncs, 0, 0);
 	}
@@ -2334,8 +2333,8 @@
 			SMJS_FUNCTION_SPEC(0, 0, 0)
 		};
 		JSPropertySpec pathClassProps[] = {
-			{"numberOfSegments",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC("numberOfSegments",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &svg_rt->pathClass, 0, 0, pathClassProps, pathClassFuncs, 0, 0);
 		JS_DefineProperty(scene->svg_js->js_ctx, svg_rt->pathClass._proto, "MOVE_TO", INT_TO_JSVAL(77), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);

gpac-0.5.0.svn4192.tar.bz2/src/scenegraph/vrml_smjs.c -> gpac-0.5.0.svn4296.tar.bz2/src/scenegraph/vrml_smjs.c Changed

@@ -291,6 +291,7 @@
 		if (!ext) continue;
 		gf_list_add(js_rt->extensions, ext);
 	}
+	GF_LOG(GF_LOG_INFO, GF_LOG_SCRIPT, ("[ECMAScript] found %d JS extensions for %d modules\n", gf_list_count(js_rt->extensions), count));
 }
 
 static void gf_sg_unload_script_modules()
@@ -386,7 +387,9 @@
 
 GF_EXPORT
 #if (JS_VERSION>=185)
-#ifdef USE_FFDEV_15
+#if defined(USE_FFDEV_18)
+JSBool gf_sg_js_has_instance(JSContext *c, JSHandleObject obj, JSMutableHandleValue __val, JSBool *vp)
+#elif defined(USE_FFDEV_15)
 JSBool gf_sg_js_has_instance(JSContext *c, JSHandleObject obj,const jsval *val, JSBool *vp)
 #else
 JSBool gf_sg_js_has_instance(JSContext *c, JSObject *obj,const jsval *val, JSBool *vp)
@@ -395,6 +398,9 @@
 JSBool gf_sg_js_has_instance(JSContext *c, JSObject *obj, jsval val, JSBool *vp)
 #endif
 {
+#ifdef USE_FFDEV_18
+	jsval       *val = __val._;
+#endif
 	*vp = JS_FALSE;
 #if (JS_VERSION>=185)
 	if (val && JSVAL_IS_OBJECT(*val)) {
@@ -3119,17 +3125,17 @@
 #else
 	/*only used to debug JS_SETUP_CLASS at each of the numerous changes of JSAPI ............ */
 	memset(&js_rt->SFNodeClass, 0, sizeof(js_rt->SFNodeClass));
-	js_rt->SFNodeClass.name = "SFNode";
-	js_rt->SFNodeClass.flags = JSCLASS_HAS_PRIVATE;
-	js_rt->SFNodeClass.addProperty = JS_PropertyStub;
-	js_rt->SFNodeClass.delProperty = JS_PropertyStub;
-	js_rt->SFNodeClass.getProperty = node_getProperty;
-	js_rt->SFNodeClass.setProperty = node_setProperty;
-	js_rt->SFNodeClass.enumerate = JS_EnumerateStub;
-	js_rt->SFNodeClass.resolve = JS_ResolveStub;
-	js_rt->SFNodeClass.convert = JS_ConvertStub;
-	js_rt->SFNodeClass.finalize = node_finalize;
-	js_rt->SFNodeClass.hasInstance = gf_sg_js_has_instance;
+	js_rt->SFNodeClass._class.name = "SFNode";
+	js_rt->SFNodeClass._class.flags = JSCLASS_HAS_PRIVATE;
+	js_rt->SFNodeClass._class.addProperty = JS_PropertyStub;
+	js_rt->SFNodeClass._class.delProperty = JS_PropertyStub;
+	js_rt->SFNodeClass._class.getProperty = node_getProperty;
+	js_rt->SFNodeClass._class.setProperty = node_setProperty;
+	js_rt->SFNodeClass._class.enumerate = JS_EnumerateStub;
+	js_rt->SFNodeClass._class.resolve = JS_ResolveStub;
+	js_rt->SFNodeClass._class.convert = JS_ConvertStub;
+	js_rt->SFNodeClass._class.finalize = node_finalize;
+	js_rt->SFNodeClass._class.hasInstance = gf_sg_js_has_instance;
 #endif
 
 	JS_SETUP_CLASS(js_rt->SFVec2fClass , "SFVec2f", JSCLASS_HAS_PRIVATE,
@@ -3244,16 +3250,16 @@
 			SMJS_FUNCTION_SPEC(0, 0, 0)
 		};
 		JSPropertySpec SFNodeProps[] = {
-			{"__dummy",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC("__dummy",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->SFNodeClass, SFNodeConstructor, 1, SFNodeProps, SFNodeMethods, 0, 0);
 	}
 	{
 		JSPropertySpec SFVec2fProps[] = {
-			{"x",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"y",       1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC("x",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("y",       1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		JSFunctionSpec SFVec2fMethods[] = {
 			SMJS_FUNCTION_SPEC("add",			vec2f_add,      1),
@@ -3271,10 +3277,10 @@
 	}
 	{
 		JSPropertySpec SFVec3fProps[] = {
-			{"x",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"y",       1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"z",       2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC("x",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("y",       1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("z",       2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		JSFunctionSpec SFVec3fMethods[] = {
 			SMJS_FUNCTION_SPEC("add",             vec3f_add,      1),
@@ -3293,11 +3299,11 @@
 	}
 	{
 		JSPropertySpec SFRotationProps[] = {
-			{"xAxis",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"yAxis",       1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"zAxis",       2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"angle",   3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC("xAxis",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("yAxis",       1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("zAxis",       2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("angle",   3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		JSFunctionSpec SFRotationMethods[] = {
 			SMJS_FUNCTION_SPEC("getAxis",         rot_getAxis,      1),
@@ -3313,10 +3319,10 @@
 	}
 	{
 		JSPropertySpec SFColorProps[] = {
-			{"r",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"g",       1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"b",       2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC("r",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("g",       1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("b",       2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		JSFunctionSpec SFColorMethods[] = {
 			SMJS_FUNCTION_SPEC("setHSV",          color_setHSV,   3),
@@ -3328,20 +3334,20 @@
 	}
 	{
 		JSPropertySpec SFImageProps[] = {
-			{"x",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"y",       1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"comp",    2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{"array",   3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-			{0, 0, 0, 0, 0}
+			SMJS_PROPERTY_SPEC("x",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("y",       1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("comp",    2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("array",   3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->SFImageClass, SFImageConstructor, 0, SFImageProps, 0, 0, 0);
 	}
 
 	{
 		JSPropertySpec MFArrayProp[] = {
-			{ "length", 0, JSPROP_PERMANENT | JSPROP_SHARED, array_getLength, array_setLength },
-			{ "assign", 1, JSPROP_PERMANENT | JSPROP_SHARED, array_getElement, array_setElement},
-			{ 0, 0, 0, 0, 0 }
+			SMJS_PROPERTY_SPEC( "length", 0, JSPROP_PERMANENT | JSPROP_SHARED, array_getLength, array_setLength ),
+			SMJS_PROPERTY_SPEC( "assign", 1, JSPROP_PERMANENT | JSPROP_SHARED, array_getElement, array_setElement),
+			SMJS_PROPERTY_SPEC( 0, 0, 0, 0, 0 )
 		};
 		JSFunctionSpec MFArrayMethods[] = {
 			SMJS_FUNCTION_SPEC("toString",        field_toString,       0),

gpac-0.5.0.svn4192.tar.bz2/src/terminal/channel.c -> gpac-0.5.0.svn4296.tar.bz2/src/terminal/channel.c Changed

@@ -692,9 +692,9 @@
 		if (ch->MinBuffer && (ch->is_raw_channel==2)) {
 			ch->clock->clock_init = 0;
 			gf_clock_set_time(ch->clock, cts);
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] Raw Frame dispatched at OTB %d but frame TS is %d ms - adjusting clock\n", ch->odm->OD->objectDescriptorID, now, cts));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] Raw Frame dispatched at OTB %u but frame TS is %u ms - adjusting clock\n", ch->odm->OD->objectDescriptorID, now, cts));
 		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] Raw Frame dispatched at OTB %d but frame TS is %d ms - DROPPING\n", ch->odm->OD->objectDescriptorID, now, cts));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] Raw Frame dispatched at OTB %u but frame TS is %u ms - DROPPING\n", ch->odm->OD->objectDescriptorID, now, cts));
 		}
 		return;
 	}
@@ -815,7 +815,7 @@
 			u32 ck;
 			u32 OCR_TS = (u32) ( hdr.objectClockReference / 27000);
 			ck = gf_clock_time(ch->clock);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %d - OCR Discontinuity OCR: adjusting to %d (original TS "LLD") - original clock %d\n", ch->esd->ESID, gf_clock_real_time(ch->clock), OCR_TS, hdr.objectClockReference, ck));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %u - OCR Discontinuity OCR: adjusting to %d (original TS "LLD") - original clock %d\n", ch->esd->ESID, gf_clock_real_time(ch->clock), OCR_TS, hdr.objectClockReference, ck));
 //			gf_clock_set_time(ch->clock, (u32) OCR_TS);
 		}
 		/*compute clock drift*/
@@ -828,7 +828,7 @@
 				OCR_TS = (u32) ( (s64) (hdr.objectClockReference) * ch->ocr_scale);
 			}
 			ck = gf_clock_time(ch->clock);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %d adjusting OCR to %d (original TS "LLD") - diff %d\n", ch->esd->ESID, gf_clock_real_time(ch->clock), OCR_TS, hdr.objectClockReference, (s32) OCR_TS - (s32) ck));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %u adjusting OCR to %d (original TS "LLD") - diff %d\n", ch->esd->ESID, gf_clock_real_time(ch->clock), OCR_TS, hdr.objectClockReference, (s32) OCR_TS - (s32) ck));
 //			gf_clock_set_time(ch->clock, (u32) OCR_TS);
 		}
 #else
@@ -841,7 +841,7 @@
 				OCR_TS = (u32) ( (s64) (hdr.objectClockReference) * ch->ocr_scale);
 			}
 			ck = gf_clock_time(ch->clock);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %d got OCR %d (original TS "LLD") - diff %d%s\n", ch->esd->ESID, gf_clock_real_time(ch->clock), OCR_TS, hdr.objectClockReference, (s32) OCR_TS - (s32) ck, (hdr.m2ts_pcr==2) ? " - PCR Discontinuity flag" : "" ));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %u got OCR %u (original TS "LLU") - diff %d%s\n", ch->esd->ESID, gf_clock_real_time(ch->clock), OCR_TS, hdr.objectClockReference, (s32) OCR_TS - (s32) ck, (hdr.m2ts_pcr==2) ? " - PCR Discontinuity flag" : "" ));
 		}
 #endif
 		if (!payload_size) return;
@@ -1209,6 +1209,8 @@
 	
 	/*flush buffer*/
 	ch_buffer_off(ch);
+	if (ch->len)
+		Channel_DispatchAU(ch, 0);
 
 	gf_odm_on_eos(ch->odm, ch);
 }

gpac-0.5.0.svn4192.tar.bz2/src/terminal/clock.c -> gpac-0.5.0.svn4296.tar.bz2/src/terminal/clock.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/terminal/decoder.c -> gpac-0.5.0.svn4296.tar.bz2/src/terminal/decoder.c Changed

@@ -669,8 +669,12 @@
 				if ( LockCompositionUnit(codec, codec->last_unit_cts+1, &CU, &unit_size) == GF_OUT_OF_MEM)
 					return GF_OK;
 				assert( CU );
+				unit_size = 0;
 				e = mdec->ProcessData(mdec, NULL, 0, 0, CU->data, &unit_size, 0, 0);
-				if (e==GF_OK) e = UnlockCompositionUnit(codec, CU, unit_size);
+				if (e==GF_OK) {
+					e = UnlockCompositionUnit(codec, CU, unit_size);
+					if (unit_size) return GF_OK;
+				}
 			}
 			gf_term_stop_codec(codec, 0);
 			if (codec->CB) gf_cm_set_eos(codec->CB);
@@ -929,17 +933,20 @@
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Exit decode loop because no more input data\n", codec->decio->module_name));
 			return GF_OK;
 		}
+		now = gf_term_get_time(codec->odm->term) - entryTime;
 		/*escape from decoding loop only if above critical limit - this is to avoid starvation on audio*/
 		if (!ch->esd->dependsOnESID && (codec->CB->UnitCount > codec->CB->Min)) {
-			now = gf_term_get_time(codec->odm->term);
-			if (now - entryTime >= TimeAvailable) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Exit decode loop because time is up: %d vs %d available\n", codec->decio->module_name, now - entryTime, TimeAvailable));
+			if (now >= TimeAvailable) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Exit decode loop because time is up: %d vs %d available\n", codec->decio->module_name, now, TimeAvailable));
 				return GF_OK;
 			}
+		} else if (now >= 10*TimeAvailable) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Exit decode loop because running for too long: %d vs %d available\n", codec->decio->module_name, now, TimeAvailable));
+			return GF_OK;
 		}
 		Decoder_GetNextAU(codec, &ch, &AU);
 		if (!ch || !AU) return GF_OK;
-		}
+	}
 	return GF_OK;
 }

gpac-0.5.0.svn4192.tar.bz2/src/terminal/media_manager.c -> gpac-0.5.0.svn4296.tar.bz2/src/terminal/media_manager.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/terminal/media_memory.c -> gpac-0.5.0.svn4296.tar.bz2/src/terminal/media_memory.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/terminal/media_object.c -> gpac-0.5.0.svn4296.tar.bz2/src/terminal/media_object.c Changed

@@ -430,7 +430,7 @@
 			}
 			nb_droped ++;
 			if (nb_droped>1) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] At OTB %d dropped frame TS %d\n", mo->odm->OD->objectDescriptorID, obj_time, CU->TS));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] At OTB %u dropped frame TS %u\n", mo->odm->OD->objectDescriptorID, obj_time, CU->TS));
 				mo->odm->codec->nb_droped++;
 			}
 			/*discard*/
@@ -454,7 +454,7 @@
 			mo->odm->parentscene->root_od->current_time = mo->odm->current_time;
 
 		mo->timestamp = CU->TS;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] At OTB %d fetch frame TS %d size %d - %d unit in CB\n", mo->odm->OD->objectDescriptorID, gf_clock_time(mo->odm->codec->ck), mo->timestamp, mo->framesize, mo->odm->codec->CB->UnitCount));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] At OTB %u fetch frame TS %u size %d - %d unit in CB\n", mo->odm->OD->objectDescriptorID, gf_clock_time(mo->odm->codec->ck), mo->timestamp, mo->framesize, mo->odm->codec->CB->UnitCount));
 		/*signal EOS after rendering last frame, not while rendering it*/
 		*eos = 0;
 	}

gpac-0.5.0.svn4192.tar.bz2/src/terminal/network_service.c -> gpac-0.5.0.svn4296.tar.bz2/src/terminal/network_service.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/terminal/object_manager.c -> gpac-0.5.0.svn4296.tar.bz2/src/terminal/object_manager.c Changed

@@ -314,9 +314,23 @@
 	}
 
 	desc = odm->net_service->ifce->GetServiceDescriptor(odm->net_service->ifce, od_type, sub_url); 
-	if (odm->OD) return;
+
+	/*entry point is already setup (bad design in GPAC, happens with BIFS TS and DASH*/
+	if (odm->OD) {
+		if (!desc) return;
+		if (gf_list_count(odm->OD->ESDescriptors)) {
+			gf_odf_desc_del(desc);
+			return;
+		}
+		gf_odf_desc_del((GF_Descriptor *) odm->OD);
+		odm->OD=NULL;
+		odm->subscene->is_dynamic_scene = 0;
+	}
 
 	if (!desc) {
+		if (odm->OD && !gf_list_count(odm->OD->ESDescriptors)) 
+			return;
+
 		/*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) {
 			return;
@@ -1337,7 +1351,7 @@
 			before one starts playing*/
 			while ( (ch = (GF_Channel*)gf_list_enum(odm->channels, &i)) ) {
 				gf_es_start(ch);
-				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] CH%d: At OTB %d starting channel\n", odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_time(ch->clock)));
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] CH%d: At OTB %u starting channel\n", odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_time(ch->clock)));
 			}
 			skip_register = 0;
 		}
@@ -1512,7 +1526,7 @@
 			}
 		} else {
 			gf_term_service_command(ch->service, &com);
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] CH%d: At OTB %d requesting PLAY from %g to %g (clock init %d)\n", odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_time(ch->clock), com.play.start_range, com.play.end_range, ch->clock->clock_init));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] CH%d: At OTB %u requesting PLAY from %g to %g (clock init %d)\n", odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_time(ch->clock), com.play.start_range, com.play.end_range, ch->clock->clock_init));
 		}
 	}
 //	odm->media_start_time = 0;
@@ -1658,7 +1672,7 @@
 		if (ch->service) {
 			com.base.on_channel = ch;
 			gf_term_service_command(ch->service, &com);
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] CH %d At OTB %d requesting STOP\n", odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_time(ch->clock)));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] CH %d At OTB %u requesting STOP\n", odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_time(ch->clock)));
 		}
 	}
 	gf_term_service_media_event(odm, GF_EVENT_ABORT);
@@ -1826,7 +1840,7 @@
 		gf_clock_pause(ch->clock);
 		com.base.on_channel = ch;
 		gf_term_service_command(ch->service, &com);
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] CH%d: At OTB %d requesting PAUSE (clock init %d)\n", odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_time(ch->clock), ch->clock->clock_init ));
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] CH%d: At OTB %u requesting PAUSE (clock init %d)\n", odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_time(ch->clock), ch->clock->clock_init ));
 	}
 
 #ifndef GPAC_DISABLE_VRML
@@ -1878,7 +1892,7 @@
 		gf_clock_resume(ch->clock);
 		com.base.on_channel = ch;
 		gf_term_service_command(ch->service, &com);
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] CH%d: At OTB %d requesting RESUME (clock init %d)\n", odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_time(ch->clock), ch->clock->clock_init ));
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] CH%d: At OTB %u requesting RESUME (clock init %d)\n", odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_time(ch->clock), ch->clock->clock_init ));
 
 		/*override speed with MC*/
 		if (ctrl) {

gpac-0.5.0.svn4192.tar.bz2/src/terminal/scene.c -> gpac-0.5.0.svn4296.tar.bz2/src/terminal/scene.c Changed

@@ -271,6 +271,7 @@
 	if (dec && dec->ReleaseScene) dec->ReleaseScene(dec);
 	gf_sg_reset(scene->graph);
 	scene->graph_attached = 0;
+	scene->simulation_time = 0;
 	
 
 	/*reset statc ressource flag since we destroyed scene objects*/
@@ -946,7 +947,6 @@
 }
 
 
-
 static void gf_scene_get_video_size(GF_MediaObject *mo, u32 *w, u32 *h)
 {
 	u32 pixel_ar;
@@ -993,7 +993,7 @@
 
 	if (scene->root_od->term->root_scene == scene) {
 		//if (scene->graph_attached) gf_sc_set_scene(scene->root_od->term->compositor, NULL);
-		gf_sc_set_scene(scene->root_od->term->compositor, scene->graph);
+		//gf_sc_set_scene(scene->root_od->term->compositor, scene->graph);
 	}
 }
 
@@ -1371,7 +1371,20 @@
 	gf_sg_set_scene_size_info(scene->graph, width, height, gf_sg_use_pixel_metrics(scene->graph));
 	
 	if (scene->root_od->term->root_scene == scene) {
-		gf_sc_set_scene(scene->root_od->term->compositor, scene->graph);
+		GF_NetworkCommand com;
+
+		gf_sc_set_scene_size(scene->root_od->term->compositor, width, height, 1);
+
+		memset(&com, 0, sizeof(GF_NetworkCommand));
+		com.base.command_type = GF_NET_SERVICE_HAS_FORCED_VIDEO_SIZE;
+		gf_term_service_command(scene->root_od->net_service, &com);
+		if (com.par.width && com.par.height) {
+			gf_sc_set_size(scene->root_od->term->compositor, com.par.width, com.par.height);
+		} else {
+			/*need output resize*/
+			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->root_od->parentscene && scene->root_od->parentscene->is_dynamic_scene) {
 		gf_sg_set_scene_size_info(scene->root_od->parentscene->graph, width, height, gf_sg_use_pixel_metrics(scene->root_od->parentscene->graph));

gpac-0.5.0.svn4192.tar.bz2/src/utils/base_encoding.c -> gpac-0.5.0.svn4296.tar.bz2/src/utils/base_encoding.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/utils/bitstream.c -> gpac-0.5.0.svn4296.tar.bz2/src/utils/bitstream.c Changed

@@ -57,6 +57,10 @@
 
 	void (*EndOfStream)(void *par);
 	void *par;
+
+
+	char *buffer_io;
+	u32 buffer_io_size, buffer_written;
 };
 
 
@@ -138,12 +142,47 @@
 	return tmp;
 }
 
+static void bs_flush_cache(GF_BitStream *bs)
+{
+	if (bs->buffer_written) {
+		u32 nb_write = fwrite(bs->buffer_io, 1, bs->buffer_written, bs->stream);
+		bs->size += nb_write;
+		bs->position += nb_write;
+		bs->buffer_written = 0;
+	}
+}
+
+
+GF_EXPORT
+GF_Err gf_bs_set_output_buffering(GF_BitStream *bs, u32 size)
+{
+	if (!bs->stream) return GF_OK;
+	if (bs->bsmode != GF_BITSTREAM_FILE_WRITE) {
+		return GF_OK;
+	}
+	bs_flush_cache(bs);
+	bs->buffer_io = gf_realloc(bs->buffer_io, size);
+	if (!bs->buffer_io) return GF_IO_ERR;
+	bs->buffer_io_size = size;
+	bs->buffer_written = 0;
+	return GF_OK;
+}
+
+
+GF_EXPORT
+u32 gf_bs_get_output_buffering(GF_BitStream *bs)
+{
+	return bs ? bs->buffer_io_size : 0;
+}
+
 GF_EXPORT
 void gf_bs_del(GF_BitStream *bs)
 {
 	if (!bs) return;
 	/*if we are in dynamic mode (alloc done by the bitstream), free the buffer if still present*/
 	if ((bs->bsmode == GF_BITSTREAM_WRITE_DYN) && bs->original) gf_free(bs->original);
+	if (bs->buffer_io)
+		bs_flush_cache(bs);
 	gf_free(bs);
 }
 
@@ -171,6 +210,9 @@
 		}
 		return (u32) bs->original[bs->position++];
 	}
+	if (bs->buffer_io) 
+		bs_flush_cache(bs);
+
 	/*we are in FILE mode, test for end of file*/
 	if (!feof(bs->stream)) {
 		bs->position++;
@@ -337,6 +379,8 @@
 			return nbBytes;
 		case GF_BITSTREAM_FILE_READ:
 		case GF_BITSTREAM_FILE_WRITE:
+			if (bs->buffer_io) 
+				bs_flush_cache(bs);
 			nbBytes = fread(data, 1, nbBytes, bs->stream);
 			bs->position += nbBytes;
 			return nbBytes;
@@ -375,6 +419,14 @@
 		bs->position++;
 		return;
 	}
+	if (bs->buffer_io && (bs->buffer_written<bs->buffer_io_size)) {
+		bs->buffer_io[bs->buffer_written] = val;
+		bs->buffer_written++;
+		if (bs->buffer_written == bs->buffer_io_size) {
+			bs_flush_cache(bs);
+		}
+		return;
+	}
 	/*we are in FILE mode, no pb for any gf_realloc...*/
 	fputc(val, bs->stream);
 	/*check we didn't rewind the stream*/
@@ -463,7 +515,7 @@
 GF_EXPORT
 u32 gf_bs_write_byte(GF_BitStream *bs, u8 byte, u32 repeat_count)
 {
-	if (!BS_IsAlign(bs)) {
+	if (!BS_IsAlign(bs) || bs->buffer_io) {
 		u32 count = 0;
 		while (count<repeat_count) {
 			gf_bs_write_int(bs, byte, 8);
@@ -494,6 +546,7 @@
 		return repeat_count;
 	case GF_BITSTREAM_FILE_READ:
 	case GF_BITSTREAM_FILE_WRITE:
+
 		if (gf_fwrite(&byte, 1, repeat_count, bs->stream) != repeat_count) return 0;
 		if (bs->size == bs->position) bs->size += repeat_count;
 		bs->position += repeat_count;
@@ -565,6 +618,18 @@
 			return nbBytes;
 		case GF_BITSTREAM_FILE_READ:
 		case GF_BITSTREAM_FILE_WRITE:
+			if (bs->buffer_io) {
+				if (bs->buffer_written + nbBytes > bs->buffer_io_size) {
+					bs_flush_cache(bs);
+					if (nbBytes>bs->buffer_io_size) {
+						bs->buffer_io = gf_realloc(bs->buffer_io, 2*nbBytes);
+						bs->buffer_io_size = 2*nbBytes;
+					}
+				}
+				memcpy(bs->buffer_io+bs->buffer_written, data, nbBytes);
+				bs->buffer_written+=nbBytes;
+				return nbBytes;
+			}
 			if (gf_fwrite(data, nbBytes, 1, bs->stream) != 1) return 0;
 			if (bs->size == bs->position) bs->size += nbBytes;
 			bs->position += nbBytes;
@@ -623,6 +688,9 @@
 	/*FILE READ: assume size hasn't changed, otherwise the user shall call gf_bs_get_refreshed_size*/
 	if (bs->bsmode==GF_BITSTREAM_FILE_READ) return (bs->size - bs->position);
 
+	if (bs->buffer_io)
+		bs_flush_cache(bs);
+
 	cur = gf_f64_tell(bs->stream);
 	gf_f64_seek(bs->stream, 0, SEEK_END);
 	end = gf_f64_tell(bs->stream);
@@ -687,6 +755,8 @@
 	
 	/*special case for file skipping...*/
 	if ((bs->bsmode == GF_BITSTREAM_FILE_WRITE) || (bs->bsmode == GF_BITSTREAM_FILE_READ)) {
+		if (bs->buffer_io)
+			bs_flush_cache(bs);
 		gf_f64_seek(bs->stream, nbBytes, SEEK_CUR);
 		bs->position += nbBytes;
 		return;
@@ -744,6 +814,9 @@
 		return GF_OK;
 	}
 
+	if (bs->buffer_io)
+		bs_flush_cache(bs);
+
 	gf_f64_seek(bs->stream, offset, SEEK_SET);
 
 	bs->position = offset;
@@ -801,6 +874,8 @@
 		return bs->size;
 
 	default:
+		if (bs->buffer_io)
+			bs_flush_cache(bs);
 		offset = gf_f64_tell(bs->stream);
 		gf_f64_seek(bs->stream, 0, SEEK_END);
 		bs->size = gf_f64_tell(bs->stream);
@@ -812,12 +887,16 @@
 GF_EXPORT
 u64 gf_bs_get_size(GF_BitStream *bs)
 {
+	if (bs->buffer_io)
+		return bs->size + bs->buffer_written;
 	return bs->size;
 }
 
 GF_EXPORT
 u64 gf_bs_get_position(GF_BitStream *bs)
 {
+	if (bs->buffer_io)
+		return bs->position + bs->buffer_written;
 	return bs->position;
 }

gpac-0.5.0.svn4192.tar.bz2/src/utils/cache.c -> gpac-0.5.0.svn4296.tar.bz2/src/utils/cache.c Changed

@@ -156,6 +156,17 @@
 	/*start and end range of the cache*/
 	u64 range_start, range_end;
 
+	Bool continue_file;
+	Bool file_exists;
+
+	u32 previousRangeContentLength;
+
+	/**
+	* Set to 1 if file is not stored on disk
+	*/
+	Bool memory_stored;
+	u32 mem_allocated;
+	u8 *mem_storage;
 };
 
 Bool delete_cache_files(void *cbck, char *item_name, char *item_path) {
@@ -362,7 +373,7 @@
 
 static const char * cache_file_info_suffix = ".txt";
 
-DownloadedCacheEntry gf_cache_create_entry ( GF_DownloadManager * dm, const char * cache_directory, const char * url , u64 start_range, u64 end_range)
+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];
 	u8 hash[_CACHE_HASH_SIZE];
@@ -408,14 +419,12 @@
 		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));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, entry=%p\n", __LINE__, entry));
 
 	entry->url = gf_strdup ( url );
 	entry->hash = gf_strdup ( tmp );
 
-	/* Sizeof cache directory + hash + possible extension */
-	entry->cache_filename = gf_malloc ( strlen ( cache_directory ) + strlen(cache_file_prefix) + strlen(tmp) + _CACHE_MAX_EXTENSION_SIZE + 1);
+	entry->memory_stored = mem_storage;
 
 	entry->cacheSize = 0;
 	entry->contentLength = 0;
@@ -429,17 +438,26 @@
 	entry->range_start = start_range;
 	entry->range_end = end_range;
 
+#ifdef ENABLE_WRITE_MX
 	{
 		char name[1024];
-		snprintf(name, 1024, "CachedEntryWriteMx=%p, url=%s", (void*) entry, url);
-#ifdef ENABLE_WRITE_MX
+		snprintf(name, sizeof(name)-1, "CachedEntryWriteMx=%p, url=%s", (void*) entry, url);
 		entry->write_mutex = gf_mx_new(name);
 		assert( entry->write_mutex);
-#endif
 	}
+#endif
+
 	entry->deletableFilesOnDelete = 0;
 	entry->write_session = NULL;
 	entry->sessions = gf_list_new();
+
+	if (entry->memory_stored) {
+		entry->cache_filename = gf_malloc ( strlen ("gmem://") + 8 + strlen("@") + 16 + 1);
+	} else {
+		/* Sizeof cache directory + hash + possible extension */
+		entry->cache_filename = gf_malloc ( strlen ( cache_directory ) + strlen(cache_file_prefix) + strlen(tmp) + _CACHE_MAX_EXTENSION_SIZE + 1);
+	}
+
 	if ( !entry->hash || !entry->url || !entry->cache_filename || !entry->sessions)
 	{
 		GF_Err err;
@@ -449,6 +467,13 @@
 		assert ( err == GF_OK );
 		return NULL;
 	}
+
+	if (entry->memory_stored) {
+		sprintf(entry->cache_filename, "gmem://%d@%p", entry->contentLength, entry->mem_storage);
+		return entry;	
+	}
+
+
 	tmp[0] = '\0';
 	strcpy ( entry->cache_filename, cache_directory );
 	strcat( entry->cache_filename, cache_file_prefix );
@@ -497,7 +522,13 @@
 			entry->flags |= CORRUPTED;
 
 		keyValue = gf_cfg_get_key(entry->properties, CACHE_SECTION_NAME, CACHE_SECTION_NAME_RANGE);
-		if (keyValue) sscanf(keyValue, LLD"-"LLD, &entry->range_start, &entry->range_end);
+		if (keyValue) {
+			u64 s, e;
+			sscanf(keyValue, LLD"-"LLD, &s, &e);
+			/*mark as corrupted if not same range (we don't support this for the time being ...*/
+			if ((s!=entry->range_start) || (e!=entry->range_end))
+				entry->flags |= CORRUPTED;
+		}
 	}
 	gf_cache_check_if_cache_file_is_corrupted(entry);
 
@@ -506,7 +537,11 @@
 
 GF_Err gf_cache_set_content_length( const DownloadedCacheEntry entry, u32 length ) {
 	CHECK_ENTRY;
-	entry->contentLength = length;
+	if (entry->continue_file) {
+		entry->contentLength = entry->previousRangeContentLength + length;
+	} else {
+		entry->contentLength = length;
+	}
 	return GF_OK;
 }
 
@@ -557,10 +592,31 @@
 	gf_mx_p(entry->write_mutex);
 #endif
 	entry->write_session = sess;
-	assert( ! entry->writeFilePtr);
-	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK,
-		("[CACHE] Opening cache file %s for write (%s)...\n", entry->cache_filename, entry->url));
-	entry->writeFilePtr = gf_f64_open(entry->cache_filename, "wb");
+	if (!entry->continue_file) {
+		assert( ! entry->writeFilePtr);
+
+		entry->written_in_cache = 0;
+	}
+	entry->flags &= ~CORRUPTED;
+
+
+	if (entry->memory_stored) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] Opening cache file %s for write (%s)...\n", entry->cache_filename, entry->url));
+		if (entry->mem_allocated <= entry->contentLength) {
+			if (entry->contentLength) entry->mem_allocated = entry->contentLength;
+			else if (!entry->mem_allocated) entry->mem_allocated = 1024;
+			entry->mem_storage = gf_realloc(entry->mem_storage, sizeof(char)* (entry->mem_allocated + 2) );
+		}
+		if (!entry->mem_allocated) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Failed to create memory storage for file %s\n", entry->url));
+			return GF_OUT_OF_MEM;
+		}
+		sprintf(entry->cache_filename, "gmem://%d@%p", entry->contentLength, entry->mem_storage);
+		return GF_OK;
+	}
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] Opening cache file %s for write (%s)...\n", entry->cache_filename, entry->url));
+	entry->writeFilePtr = gf_f64_open(entry->cache_filename, entry->continue_file ? "a+b" : "wb");
 	if (!entry->writeFilePtr) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK,
 			("[CACHE] Error while opening cache file %s for writting.\n", entry->cache_filename));
@@ -570,7 +626,9 @@
 #endif
 		return GF_IO_ERR;
 	}
-	entry->written_in_cache = 0;
+	entry->file_exists = 1;
+	if (entry->continue_file )
+		gf_f64_seek(entry->writeFilePtr, 0, SEEK_END);
 	return GF_OK;
 }
 
@@ -578,10 +636,24 @@
 	u32 readen;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] gf_cache_write_to_cache:%d\n", __LINE__));
 	CHECK_ENTRY;
-	if (!data || !entry->writeFilePtr || sess != entry->write_session) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("Incorrect parameter : data=%p, entry->writeFilePtr=%p at "__FILE__, data, entry->writeFilePtr));
+
+	if (!data || (!entry->writeFilePtr && !entry->mem_storage) || sess != entry->write_session) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("Incorrect parameter : data=%p, writeFilePtr=%p mem_storage=%p at "__FILE__, data, entry->writeFilePtr, entry->mem_storage));
 		return GF_BAD_PARAM;
 	}
+		
+	if (entry->memory_stored) {
+		if (entry->written_in_cache + size > entry->mem_allocated) {
+			entry->mem_storage = gf_realloc(entry->mem_storage, (entry->mem_allocated+size+2));
+			entry->mem_allocated += size;
+			sprintf(entry->cache_filename, "gmem://%d@%p", entry->contentLength, entry->mem_storage);
+		}
+		memcpy(entry->mem_storage + entry->written_in_cache, data, size);
+		entry->written_in_cache += size;
+		memset(entry->mem_storage + entry->written_in_cache, 0, 2);
+		return GF_OK;
+	}
+
 	readen = gf_fwrite(data, sizeof(char), size, entry->writeFilePtr);
 	if (readen > 0)
 		entry->written_in_cache+= readen;
@@ -671,7 +743,7 @@
 		gf_mx_del(entry->write_mutex);
 	}
 #endif
-	if (entry->deletableFilesOnDelete) {
+	if (entry->file_exists && entry->deletableFilesOnDelete) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] url %s cleanup, deleting %s...\n", entry->url, entry->cache_filename));
 		if (GF_OK != gf_delete_file(entry->cache_filename))
 			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[CACHE] gf_cache_delete_entry:%d, failed to delete file %s\n", __LINE__, entry->cache_filename));
@@ -738,6 +810,9 @@
 		gf_list_del(entry->sessions);
 		entry->sessions = NULL;
 	}
+
+	if (entry->mem_storage) 
+		gf_free(entry->mem_storage);
 	gf_free (entry);
 	return GF_OK;
 }
@@ -757,17 +832,15 @@
 			entry->contentLength = strtoul( keyValue, &endPtr, 10);
 			if (*endPtr!='\0' || entry->contentLength != entry->cacheSize) {
 				entry->flags |= CORRUPTED;
-				GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, cached file and cache info size mismatch.\n", __LINE__));
+				GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, Cache corrupted: file and cache info size mismatch.\n", __LINE__));
 			}
-		} else
+		} else {
 			entry->flags |= CORRUPTED;
-
+			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, CACHE is corrupted !\n", __LINE__));
+		}
 	} else {
 		entry->flags |= CORRUPTED;
 	}
-	if (entry->flags & CORRUPTED)
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, CACHE is corrupted !\n", __LINE__));
-
 	return entry->flags & CORRUPTED;
 }
 
@@ -832,3 +905,20 @@
 	if (entry) return entry->writeFilePtr;
 	return NULL;
 }
+
+
+void gf_cache_set_end_range(DownloadedCacheEntry entry, u64 range_end)
+{
+	entry->previousRangeContentLength = entry->contentLength;
+	entry->range_end = range_end;
+	entry->continue_file = 1;
+}
+
+Bool gf_cache_is_in_progress(const DownloadedCacheEntry entry)
+{
+	if (!entry) return 0;
+	if (entry->writeFilePtr) return 1;
+	if (entry->mem_storage && entry->written_in_cache && entry->contentLength && (entry->written_in_cache<entry->contentLength) ) 
+		return 1;
+	return 0;
+}

gpac-0.5.0.svn4192.tar.bz2/src/utils/configfile.c -> gpac-0.5.0.svn4296.tar.bz2/src/utils/configfile.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/utils/downloader.c -> gpac-0.5.0.svn4296.tar.bz2/src/utils/downloader.c Changed

@@ -50,7 +50,7 @@
 #define SESSION_RETRY_COUNT	20
 
 #define GF_DOWNLOAD_AGENT_NAME		"GPAC/" GPAC_FULL_VERSION
-#define GF_DOWNLOAD_BUFFER_SIZE		8192
+#define GF_DOWNLOAD_BUFFER_SIZE		8193
 #define GF_WAIT_REPLY_SLEEP	20
 
 
@@ -108,6 +108,7 @@
     gf_user_credentials_struct * creds;
     char cookie[GF_MAX_PATH];
     DownloadedCacheEntry cache_entry;
+	Bool reused_cache_entry;
 
     GF_Socket *sock;
     u32 num_retry, status;
@@ -117,6 +118,9 @@
     u32 total_size, bytes_done, start_time, icy_metaint, icy_count, icy_bytes;
     u32 bytes_per_sec;
 
+	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*/
+	u32 needs_cache_reconfig;
     /* Range information if needed for the download (cf flag) */
     Bool needs_range;
     u64 range_start, range_end;
@@ -145,6 +149,7 @@
     /*callback for data reception - may not be NULL*/
     gf_dm_user_io user_proc;
     void *usr_cbk;
+	Bool reassigned;
 
     /*private extension*/
     void *ext;
@@ -241,6 +246,12 @@
  */
 FILE *gf_cache_get_file_pointer(const DownloadedCacheEntry entry) ;
 
+/*modify end range when chaining byte-range requests*/
+void gf_cache_set_end_range(DownloadedCacheEntry entry, u64 range_end);
+
+/*returns 1 if cache is currently open for write*/
+Bool gf_cache_is_in_progress(const DownloadedCacheEntry entry);
+
 /**
  * Find a User's credentials for a given site
  */
@@ -455,8 +466,13 @@
         url = gf_cache_get_url(e);
         assert( url );
         if (strcmp(url, sess->orig_url)) continue;
-		if (sess->range_start != gf_cache_get_start_range(e)) continue;
-		if (sess->range_end != gf_cache_get_end_range(e)) continue;
+		if (sess->needs_cache_reconfig==2)
+			continue;
+
+		if (! sess->is_range_continuation) {
+			if (sess->range_start != gf_cache_get_start_range(e)) continue;
+			if (sess->range_end != gf_cache_get_end_range(e)) continue;
+		}
 		/*OK that's ours*/
 		gf_mx_v( sess->dm->cache_mx );
 		return e;
@@ -471,7 +487,7 @@
  * \param url The full URL
  * \return The DownloadedCacheEntry
  */
-DownloadedCacheEntry gf_cache_create_entry( GF_DownloadManager * dm, const char * cache_directory, const char * url, u64 start_range, u64 end_range);
+DownloadedCacheEntry gf_cache_create_entry( GF_DownloadManager * dm, const char * cache_directory, const char * url, u64 start_range, u64 end_range, Bool mem_storage);
 
 /*!
  * Removes a session for a DownloadedCacheEntry
@@ -528,13 +544,15 @@
     gf_dm_remove_cache_entry_from_session(sess);
     entry = gf_dm_find_cached_entry_by_url(sess);
     if (!entry) {
-		entry = gf_cache_create_entry(sess->dm, sess->dm->cache_directory, sess->orig_url, sess->range_start, sess->range_end);
+		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) ? 1 : 0);
         gf_mx_p( sess->dm->cache_mx );
         gf_list_add(sess->dm->cache_entries, entry);
         gf_mx_v( sess->dm->cache_mx );
+		sess->is_range_continuation = 0;
     }
     assert( entry );
     sess->cache_entry = entry;
+	sess->reused_cache_entry = 	gf_cache_is_in_progress(entry);
     gf_cache_add_session_to_cache_entry(sess->cache_entry, sess);
     GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] Cache setup to %p %s\n", sess, gf_cache_get_cache_filename(sess->cache_entry)));
 }
@@ -598,7 +616,7 @@
 {
     assert( sess );
     if (sess->status >= GF_NETIO_DISCONNECTED)
-	return;
+		return;
     GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Downloader] gf_dm_disconnect(%p)\n", sess ));
     if (sess->mx)
         gf_mx_p(sess->mx);
@@ -858,8 +876,8 @@
     /* builds orig_url */
     /* We dont't want orig_url to contain user/passwords for security reasons or mismatch in cache hit */
     {
-        char port[7];
-        snprintf(port, 7, ":%d", info->port);
+        char port[8];
+        snprintf(port, sizeof(port)-1, ":%d", info->port);
         info->canonicalRepresentation = 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);
@@ -878,13 +896,17 @@
 	Bool socket_changed = 0;
     GF_Err e;
     GF_URL_Info info;
+
+	if (!url) return GF_BAD_PARAM;
+
     gf_dm_url_info_init(&info);
-    e = gf_dm_get_url_info(url, &info, sess->remote_path);
-	if (e) return e;
     
 	if (!sess->sock) socket_changed = 1;
 	else if (sess->status>GF_NETIO_DISCONNECTED) socket_changed = 1;
 
+    e = gf_dm_get_url_info(url, &info, sess->remote_path);
+	if (e) return e;
+
 	if (sess->port != info.port) {
 		socket_changed = 1;
 		sess->port = info.port;
@@ -939,8 +961,7 @@
 	if (sess->sock && !socket_changed) {
 		sess->status = GF_NETIO_CONNECTED;
 	    sess->num_retry = SESSION_RETRY_COUNT;
-		/*this should be done when building HTTP GET request in case we have range directives*/
-		gf_dm_configure_cache(sess);
+		sess->needs_cache_reconfig = 1;
 	} else {
 		if (sess->sock) gf_sk_del(sess->sock);
 		sess->sock = NULL;
@@ -1039,56 +1060,73 @@
 
 static GF_Err gf_dm_read_data(GF_DownloadSession *sess, char *data, u32 data_size, u32 *out_read)
 {
+#ifdef GPAC_HAS_SSL
     GF_Err e;
-    if (!sess)
+#endif
+	if (!sess)
         return GF_BAD_PARAM;
 #ifdef GPAC_HAS_SSL
     if (sess->ssl) {
-        u32 size = SSL_read(sess->ssl, data, data_size);
-        e = GF_OK;
-        data[size] = 0;
-        if (!size) e = GF_IP_NETWORK_EMPTY;
-        *out_read = size;
-    } else
+        s32 size = SSL_read(sess->ssl, data, data_size);
+        if (size < 0) 
+			e = GF_IO_ERR;
+        else if (!size) 
+			e = GF_IP_NETWORK_EMPTY;
+		else {
+			e = GF_OK;
+	        data[size] = 0;
+		    *out_read = size;
+		}
+	    return e;
+    } 
 #endif
-        if (!sess->sock)
-            return GF_NETIO_DISCONNECTED;
-    e = gf_sk_receive(sess->sock, data, data_size, 0, out_read);
-
-    return e;
+    if (!sess->sock)
+        return GF_NETIO_DISCONNECTED;
+    return gf_sk_receive(sess->sock, data, data_size, 0, out_read);
 }
 
 
 #ifdef GPAC_HAS_SSL
-/*pattern comp taken from wget*/
-#define ASTERISK_EXCLUDES_DOT	/* mandated by rfc2818 */
 
-#define TOLOWER(x) ('A' <= (x) && (x) <= 'Z' ? (x) - 32 : (x))
+#define LWR(x) ('A' <= (x) && (x) <= 'Z' ? (x) - 32 : (x))
 
-static Bool pattern_match(const char *pattern, const char *string)
+static Bool rfc2818_match(const char *pattern, const char *string)
 {
-    const char *p = pattern, *n = string;
-    char c;
-    for (; (c = TOLOWER (*p++)) != '\0'; n++) {
-        if (c == '*') {
-            for (c = TOLOWER (*p); c == '*'; c = TOLOWER (*++p))
-                ;
-            for (; *n != '\0'; n++)
-                if (TOLOWER (*n) == c && pattern_match (p, n))
+    char c, d;
+	u32 i=0, k=0;
+	while (1) {
+		c = LWR(pattern[i]);
+		if (c == '\0') break;
+
+		if (c=='*') {
+			/*remove *** patterns*/
+			while (c == '*') {
+				i++;
+				c = LWR(pattern[i]);
+			}
+			/*look for same c character*/
+			while (1) {
+				d = LWR(string[k]);  
+				if (d == '\0') break;
+				/*matched c character, check following substrings*/
+                if ((d == c) && rfc2818_match (&pattern[i], &string[k]))
                     return 1;
-#ifdef ASTERISK_EXCLUDES_DOT
-                else if (*n == '.')
+                else if (d == '.')
                     return 0;
-#endif
-            return c == '\0';
-        } else {
-            if (c != TOLOWER (*n))
-                return 0;
-        }
-    }
-    return *n == '\0';
+
+				k++;
+			}
+			return (c == '\0') ? 1 : 0;
+		} else {
+			if (c != LWR(string[k]))
+				return 0;
+		}
+		i++;
+		k++;
+	}
+	return (string[k]=='\0') ? 1 : 0;
 }
-#undef TOLOWER
+#undef LWR
 
 #endif
 
@@ -1189,7 +1227,7 @@
             X509 *cert;
             Bool success = 1;
 
-            sess->ssl = SSL_new(sess->dm->ssl_ctx);
+			sess->ssl = SSL_new(sess->dm->ssl_ctx);
             SSL_set_fd(sess->ssl, gf_sk_get_handle(sess->sock));
             SSL_set_connect_state(sess->ssl);
             ret = SSL_connect(sess->ssl);
@@ -1198,13 +1236,27 @@
             cert = SSL_get_peer_certificate(sess->ssl);
             /*if we have a cert, check it*/
             if (cert) {
+					SSL_set_verify_result(sess->ssl, 0);
                 vresult = SSL_get_verify_result(sess->ssl);
-                if (vresult != X509_V_OK) success = 0;
-                else {
+				
+				if (vresult == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY) {
+                    GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[SSL] Cannot locate issuer's certificate on the local system, will not attempt to validate\n"));
+					SSL_set_verify_result(sess->ssl, 0);
+	                vresult = SSL_get_verify_result(sess->ssl);
+				}
+
+				if (vresult == X509_V_OK) {
                     common_name[0] = 0;
                     X509_NAME_get_text_by_NID(X509_get_subject_name(cert), NID_commonName, common_name, sizeof (common_name));
-                    if (!pattern_match(common_name, sess->server_name)) success = 0;
-                }
+					if (!rfc2818_match(common_name, sess->server_name)) {
+						success = 0;
+						GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SSL] Mismatch in certificate names: got %s expected %s\n", common_name, sess->server_name));
+					}
+				} else {
+					success = 0;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SSL] Error verifying certificate %x\n", vresult));
+				}
+
                 X509_free(cert);
 
                 if (!success) {
@@ -1296,11 +1348,34 @@
 }
 
 GF_EXPORT
-GF_Err gf_dm_sess_set_range(GF_DownloadSession *sess, u64 start_range, u64 end_range)
+GF_Err gf_dm_sess_set_range(GF_DownloadSession *sess, u64 start_range, u64 end_range, Bool discontinue_cache)
 {
 	if (!sess) return GF_BAD_PARAM;
-	if (sess->cache_entry) return GF_BAD_PARAM;
-	if (sess->status != GF_NETIO_SETUP) return GF_BAD_PARAM;
+	if (sess->cache_entry) {
+		if (!discontinue_cache) {
+			if (gf_cache_get_end_range(sess->cache_entry) + 1 != start_range) 
+				return GF_NOT_SUPPORTED;
+		}
+		if (!sess->sock)
+			return GF_BAD_PARAM;
+		if (sess->status != GF_NETIO_CONNECTED) {
+			if (sess->status != GF_NETIO_DISCONNECTED) {
+				return GF_BAD_PARAM;
+			}
+		}
+		sess->status = GF_NETIO_CONNECTED;
+	    sess->num_retry = SESSION_RETRY_COUNT;
+		if (!discontinue_cache) {
+			gf_cache_set_end_range(sess->cache_entry, end_range);
+			/*remember this in case we get disconnected*/
+			sess->is_range_continuation = 1;
+		} else {
+			sess->needs_cache_reconfig = 2;
+			sess->reused_cache_entry = 0;
+		}
+	} else {
+		if (sess->status != GF_NETIO_SETUP) return GF_BAD_PARAM;
+	}
 	sess->range_start = start_range;
 	sess->range_end = end_range;
     sess->needs_range = 1;
@@ -1364,7 +1439,8 @@
                 gf_sleep(16);
             break;
         case GF_NETIO_WAIT_FOR_REPLY:
-            gf_sleep(16);
+//            gf_sleep(16);
+              gf_sleep(1);
         case GF_NETIO_CONNECTED:
             sess->do_requests(sess);
             break;
@@ -1637,18 +1713,6 @@
         }
     }
 
-    if (sess->total_size && (sess->bytes_done == sess->total_size)) {
-        gf_dm_disconnect(sess, 0);
-        par.msg_type = GF_NETIO_DATA_TRANSFERED;
-        par.error = GF_OK;
-        gf_dm_sess_user_io(sess, &par);
-        if (sess->use_cache_file) {
-            gf_cache_close_write_cache(sess->cache_entry, sess, 1);
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK,
-                   ("[CACHE] url %s saved as %s\n", gf_cache_get_url(sess->cache_entry), gf_cache_get_cache_filename(sess->cache_entry)));
-        }
-        return;
-    }
     /*update state if not done*/
     if (rcv) {
         runtime = gf_sys_clock() - sess->start_time;
@@ -1658,6 +1722,21 @@
             sess->bytes_per_sec = (1000 * sess->bytes_done) / runtime;
         }
     }
+
+	if (sess->total_size && (sess->bytes_done == sess->total_size)) {
+        gf_dm_disconnect(sess, 0);
+        par.msg_type = GF_NETIO_DATA_TRANSFERED;
+        par.error = GF_OK;
+
+		
+		gf_dm_sess_user_io(sess, &par);
+        if (sess->use_cache_file) {
+            gf_cache_close_write_cache(sess->cache_entry, sess, 1);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK,
+                   ("[CACHE] url %s saved as %s\n", gf_cache_get_url(sess->cache_entry), gf_cache_get_cache_filename(sess->cache_entry)));
+        }
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] url %s downloaded in %d ms (%d kbps)\n", gf_cache_get_url(sess->cache_entry), gf_sys_clock() - sess->start_time, 8*sess->bytes_per_sec/1024 ));
+    }
 }
 
 
@@ -1794,6 +1873,13 @@
     const char *param_string;
     Bool has_accept, has_connection, has_range, has_agent, has_language, send_profile, has_mime;
     assert (sess->status == GF_NETIO_CONNECTED);
+
+
+	if (sess->needs_cache_reconfig) {
+		gf_dm_configure_cache(sess);
+		sess->needs_cache_reconfig = 0;
+	}
+
     /*setup authentification*/
     strcpy(pass_buf, "");
     sess->creds = gf_find_user_credentials_for_site( sess->dm, sess->server_name );
@@ -1983,8 +2069,10 @@
 
 #ifdef GPAC_HAS_SSL
         if (sess->ssl) {
-            e = GF_IP_NETWORK_FAILURE;
-            if (!SSL_write(sess->ssl, tmp_buf, len+par.size)) e = GF_OK;
+            u32 writelen = len+par.size;
+			e = GF_OK;
+			if (writelen != SSL_write(sess->ssl, tmp_buf, writelen))
+				e = GF_IP_NETWORK_FAILURE;
         } else
 #endif
             e = gf_sk_send(sess->sock, tmp_buf, len+par.size);
@@ -1995,9 +2083,11 @@
 
 #ifdef GPAC_HAS_SSL
         if (sess->ssl) {
-            e = GF_IP_NETWORK_FAILURE;
-            if (!SSL_write(sess->ssl, sHTTP, strlen(sHTTP))) e = GF_OK;
-        } else
+            u32 len = strlen(sHTTP);
+			e = GF_OK;
+			if (len != SSL_write(sess->ssl, sHTTP, len))
+				e = GF_IP_NETWORK_FAILURE;
+         } else
 #endif
             e = gf_sk_send(sess->sock, sHTTP, strlen(sHTTP));
 
@@ -2040,7 +2130,7 @@
             }
         }
 #endif
-        e = gf_dm_read_data(sess, sHTTP, GF_DOWNLOAD_BUFFER_SIZE, &size);
+        e = gf_dm_read_data(sess, sHTTP, GF_DOWNLOAD_BUFFER_SIZE-1, &size);
         if (e!= GF_IP_CONNECTION_CLOSED && (!size || e == GF_IP_NETWORK_EMPTY)) {
             if (e == GF_IP_CONNECTION_CLOSED || (!sess->total_size && (gf_sys_clock() - sess->start_time > 5000))) {
                 sess->total_size = sess->bytes_done;
@@ -2096,7 +2186,7 @@
     u32 res;
     s32 LinePos, Pos;
     u32 rsp_code, ContentLength, first_byte, last_byte, total_size, range, no_range;
-    char buf[1024];
+    char buf[1025];
     char comp[400];
     GF_Err e;
     char * new_location;
@@ -2105,7 +2195,7 @@
     new_location = NULL;
     sess->use_cache_file = 1;
     while (1) {
-        e = gf_dm_read_data(sess, sHTTP + bytesRead, GF_DOWNLOAD_BUFFER_SIZE - bytesRead, &res);
+        e = gf_dm_read_data(sess, sHTTP + bytesRead, GF_DOWNLOAD_BUFFER_SIZE - 1 - bytesRead, &res);
         switch (e) {
         case GF_IP_NETWORK_EMPTY:
             if (!bytesRead) return GF_OK;
@@ -2420,7 +2510,11 @@
     case 404:
         /* File not found */
         gf_dm_sess_user_io(sess, &par);
-        e = GF_URL_ERROR;
+		if ((BodyStart < (s32) bytesRead)) {
+			sHTTP[bytesRead] = 0;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] Failure: %s\n", sHTTP + BodyStart));
+		}
+		e = GF_URL_ERROR;
         goto exit;
         break;
     case 416:
@@ -2586,6 +2680,15 @@
 void http_do_requests(GF_DownloadSession *sess)
 {
     char sHTTP[GF_DOWNLOAD_BUFFER_SIZE];
+
+	if (sess->reused_cache_entry) {
+		if (!gf_cache_is_in_progress(sess->cache_entry)) {
+			sess->status = GF_NETIO_DISCONNECTED;
+			sess->reused_cache_entry = 0;
+		}
+		return;
+	}
+
     switch (sess->status) {
     case GF_NETIO_CONNECTED:
         http_send_headers(sess, sHTTP);
@@ -2594,6 +2697,21 @@
         wait_for_header_and_parse(sess, sHTTP);
         break;
     case GF_NETIO_DATA_EXCHANGE:
+		/*session has been reassigned, resend data retrieved in first GET reply to user but don't write to cache*/
+		if (sess->reassigned) {
+
+			if (sess->icy_metaint > 0) {
+				gf_icy_skip_data(sess, sess->icy_metaint, sess->init_data, sess->init_data_size);
+			} else {
+			    GF_NETIO_Parameter par;
+				par.msg_type = GF_NETIO_DATA_EXCHANGE;
+				par.error = GF_OK;
+				par.data = sess->init_data;
+				par.size = sess->init_data_size;
+				gf_dm_sess_user_io(sess, &par);
+			}
+			sess->reassigned = 0;
+		}
         http_parse_remaining_body(sess, sHTTP);
         break;
     }
@@ -2618,20 +2736,20 @@
 
 
 GF_EXPORT
-GF_Err gf_dm_wget(const char *url, const char *filename)
+GF_Err gf_dm_wget(const char *url, const char *filename, u64 start_range, u64 end_range)
 {
 	GF_Err e;
 	GF_DownloadManager * dm = NULL;
 	dm = gf_dm_new(NULL);
 	if (!dm)
 		return GF_OUT_OF_MEM;
-	e = gf_dm_wget_with_cache(dm, url, filename);
+	e = gf_dm_wget_with_cache(dm, url, filename, start_range, end_range);
 	gf_dm_del(dm);
 	return e;
 }
 
 GF_Err gf_dm_wget_with_cache(GF_DownloadManager * dm,
-				const char *url, const char *filename)
+				const char *url, const char *filename, u64 start_range, u64 end_range)
 {
 	GF_Err e;
 	FILE * f;
@@ -2649,6 +2767,11 @@
 	}
 	dnload->use_cache_file = 1;
 	dnload->force_data_write_callback = 1;
+	if (end_range) {
+		dnload->range_start = start_range;
+		dnload->range_end = end_range;
+	    dnload->needs_range = 1;
+	}
 	if (e == GF_OK) {
 		e = gf_dm_sess_process(dnload);
 	}
@@ -2890,10 +3013,11 @@
 	}
 #endif
 
+	if (sess->flags & GF_DOWNLOAD_SESSION_USE_SSL) flags |= GF_DOWNLOAD_SESSION_USE_SSL;
 	sess->flags = flags;
 	sess->user_proc = user_io;
 	sess->usr_cbk = cbk;
-
+	sess->reassigned = sess->init_data ? 1 : 0;
 	sess->num_retry = SESSION_RETRY_COUNT;
 
 	if (sess->status==GF_NETIO_DISCONNECTED)

gpac-0.5.0.svn4192.tar.bz2/src/utils/error.c -> gpac-0.5.0.svn4296.tar.bz2/src/utils/error.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/utils/os_divers.c -> gpac-0.5.0.svn4296.tar.bz2/src/utils/os_divers.c Changed

@@ -216,14 +216,107 @@
 #ifndef gettimeofday
 #ifdef _WIN32_WCE
 
+#include <time.h>
+//#include <wce_time.h>
+
+/*
+ * Author of first version (timeval.h): by Wu Yongwei
+ * Author of Windows CE version: Mateusz Loskot (mateusz@loskot.net)
+ *
+ * All code here is considered in the public domain though we do wish our names
+ * could be retained if anyone uses them.
+ */
+
+/*
+ * Constants used internally by time functions.
+ */
+
+#ifndef _TM_DEFINED
+struct tm
+{
+	int tm_sec;     /* seconds after the minute - [0,59] */
+	int tm_min;     /* minutes after the hour - [0,59] */
+	int tm_hour;	/* hours since midnight - [0,23] */
+	int tm_mday;	/* day of the month - [1,31] */
+	int tm_mon;     /* months since January - [0,11] */
+	int tm_year;	/* years since 1900 */
+	int tm_wday;	/* days since Sunday - [0,6] */
+	int tm_yday;	/* days since January 1 - [0,365] */
+	int tm_isdst;	/* daylight savings time flag */
+};
+#define _TM_DEFINED
+#endif /* _TM_DEFINED */
+
+#ifndef _TIMEZONE_DEFINED
+struct timezone
+{
+    int tz_minuteswest; /* minutes W of Greenwich */
+    int tz_dsttime;     /* type of dst correction */
+};
+#define _TIMEZONE_DEFINED
+#endif /* _TIMEZONE_DEFINED */
+
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+#define EPOCHFILETIME (116444736000000000i64)
+#else
+#define EPOCHFILETIME (116444736000000000LL)
+#endif
+
+int gettimeofday(struct timeval *tp, struct timezone *tzp)
+{
+    SYSTEMTIME      st;
+    FILETIME        ft;
+    LARGE_INTEGER   li;
+    TIME_ZONE_INFORMATION tzi;
+    __int64         t;
+    static int      tzflag;
+
+    if (NULL != tp)
+    {
+        GetSystemTime(&st);
+        SystemTimeToFileTime(&st, &ft);
+        li.LowPart  = ft.dwLowDateTime;
+        li.HighPart = ft.dwHighDateTime;
+        t  = li.QuadPart;       /* In 100-nanosecond intervals */
+        t -= EPOCHFILETIME;     /* Offset to the Epoch time */
+        t /= 10;                /* In microseconds */
+        tp->tv_sec  = (long)(t / 1000000);
+        tp->tv_usec = (long)(t % 1000000);
+    }
+
+    if (NULL != tzp)
+    {   
+        GetTimeZoneInformation(&tzi);
+
+        tzp->tz_minuteswest = tzi.Bias;
+        if (tzi.StandardDate.wMonth != 0)
+        {
+            tzp->tz_minuteswest += tzi.StandardBias * 60;
+        }
+
+        if (tzi.DaylightDate.wMonth != 0)
+        {
+            tzp->tz_dsttime = 1;
+        }
+        else
+        {
+            tzp->tz_dsttime = 0;
+        }
+    }
+
+    return 0;
+}
+
+
+#if _GPAC_UNUSED
 /*
-	Conversion code for WinCE from pthreads WinCE
-	(FILETIME in Win32 is from jan 1, 1601)
 	time between jan 1, 1601 and jan 1, 1970 in units of 100 nanoseconds 
+	FILETIME in Win32 is from jan 1, 1601
 */
 #define TIMESPEC_TO_FILETIME_OFFSET (((LONGLONG)27111902 << 32) + (LONGLONG)3577643008)
 
-s32 gettimeofday(struct timeval *tp, void *tz)
+s32 __gettimeofday(struct timeval *tp, void *tz)
 {
 	FILETIME ft;
 	SYSTEMTIME st;
@@ -238,6 +331,8 @@
 	tp->tv_usec = val;
 	return 0;
 }
+#endif
+
 
 #elif defined(WIN32)
 
@@ -311,7 +406,11 @@
 	return (MoveFile(fileName, newFileName) == 0 ) ? GF_IO_ERR : GF_OK;
 #else
 	/* success is == 0 */
-	return ( rename(fileName, newFileName) == 0) ? GF_OK : GF_IO_ERR;
+	char cmd[1024];
+	if (!fileName || !newFileName)
+		return GF_IO_ERR;
+	snprintf(cmd, sizeof(cmd)-1, "mv %s %s > /dev/null 2>&1", fileName, newFileName);
+	return ( system(cmd) == 0) ? GF_OK : GF_IO_ERR;
 #endif
 }
 
@@ -389,8 +488,13 @@
 	char tmp[MAX_PATH], t_file[100];
 	FILE *res = tmpfile();
 	if (res) return res;
+	{
+		u32 err = GetLastError();
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Win32] system failure for tmpfile(): %08x\n", err));
+	}
 	/*tmpfile() may fail under vista ...*/
-	if (!GetEnvironmentVariable("TEMP",tmp,MAX_PATH)) return NULL;
+	if (!GetEnvironmentVariable("TEMP",tmp,MAX_PATH)) 
+		return NULL;
 	sprintf(t_file, "\\gpac_%08x.tmp", (u32) tmp);
 	strcat(tmp, t_file);
 	return gf_f64_open(tmp, "w+b");
@@ -709,7 +813,13 @@
 FILE *gf_f64_open(const char *file_name, const char *mode)
 {
 #if defined(WIN32)
-	return fopen(file_name, mode);
+	FILE *res = fopen(file_name, mode);
+	if (res) return res;
+	if (strchr(mode, 'w') || strchr(mode, 'a')) {
+		u32 err = GetLastError();
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Win32] system failure for file opening of %s in mode %s: %08x\n", file_name, mode, err));
+	}
+	return NULL;
 #elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_ANDROID)
 	return fopen64(file_name, mode);
 #elif (defined(GPAC_CONFIG_FREEBSD) || defined(GPAC_CONFIG_DARWIN))
@@ -1827,7 +1937,7 @@
 	{
 		int sz = 100;
 		char * buf = gf_malloc( sz );
-		sz = snprintf(buf, sz, "%ld\n", (long) getpid());
+		sz = snprintf(buf, sz-1, "%ld\n", (long) getpid());
 		if (write(fd, buf, sz) != sz){
 			gf_free(buf);
 			goto exit;

gpac-0.5.0.svn4192.tar.bz2/src/utils/os_thread.c -> gpac-0.5.0.svn4296.tar.bz2/src/utils/os_thread.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/utils/sha1.c -> gpac-0.5.0.svn4296.tar.bz2/src/utils/sha1.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/utils/url.c -> gpac-0.5.0.svn4296.tar.bz2/src/utils/url.c Changed

gpac-0.5.0.svn4192.tar.bz2/src/utils/utf.c -> gpac-0.5.0.svn4296.tar.bz2/src/utils/utf.c Changed

@@ -25,14 +25,370 @@
 
 #include <gpac/utf.h>
 
- 
- /*
- * Original code from the GNU UTF-8 Library
+
+#if 1
+
+
+/*
+ * Copyright 2001-2004 Unicode, Inc.
+ * 
+ * Disclaimer
+ * 
+ * This source code is provided as is by Unicode, Inc. No claims are
+ * made as to fitness for any particular purpose. No warranties of any
+ * kind are expressed or implied. The recipient agrees to determine
+ * applicability of information provided. If this file has been
+ * purchased on magnetic or optical media from Unicode, Inc., the
+ * sole remedy for any claim will be exchange of defective media
+ * within 90 days of receipt.
+ * 
+ * Limitations on Rights to Redistribute This Code
+ * 
+ * Unicode, Inc. hereby grants the right to freely use the information
+ * supplied in this file in the creation of products supporting the
+ * Unicode Standard, and to make copies of this file in any form
+ * for internal or external distribution as long as this notice
+ * remains attached.
+ */
+
+/* ---------------------------------------------------------------------
+
+    Conversions between UTF32, UTF-16, and UTF-8. Source code file.
+    Author: Mark E. Davis, 1994.
+    Rev History: Rick McGowan, fixes & updates May 2001.
+    Sept 2001: fixed const & error conditions per
+	mods suggested by S. Parent & A. Lillich.
+    June 2002: Tim Dodd added detection and handling of incomplete
+	source sequences, enhanced error detection, added casts
+	to eliminate compiler warnings.
+    July 2003: slight mods to back out aggressive FFFE detection.
+    Jan 2004: updated switches in from-UTF8 conversions.
+    Oct 2004: updated to use UNI_MAX_LEGAL_UTF32 in UTF-32 conversions.
+
+    See the header file "ConvertUTF.h" for complete documentation.
+
+------------------------------------------------------------------------ */
+
+typedef u32 UTF32;	/* at least 32 bits */
+typedef u16 UTF16;	/* at least 16 bits */
+typedef u8 UTF8;	/* typically 8 bits */
+typedef u8 Boolean; /* 0 or 1 */
+
+/* Some fundamental constants */
+#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
+#define UNI_MAX_BMP (UTF32)0x0000FFFF
+#define UNI_MAX_UTF16 (UTF32)0x0010FFFF
+#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
+#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF
+
+typedef enum {
+	conversionOK, 		/* conversion successful */
+	sourceExhausted,	/* partial character in source, but hit end */
+	targetExhausted,	/* insuff. room in target for conversion */
+	sourceIllegal		/* source sequence is illegal/malformed */
+} ConversionResult;
+
+typedef enum {
+	strictConversion = 0,
+	lenientConversion
+} ConversionFlags;
+
+static const int halfShift  = 10; /* used for shifting by 10 bits */
+
+static const UTF32 halfBase = 0x0010000UL;
+static const UTF32 halfMask = 0x3FFUL;
+
+#define UNI_SUR_HIGH_START  (UTF32)0xD800
+#define UNI_SUR_HIGH_END    (UTF32)0xDBFF
+#define UNI_SUR_LOW_START   (UTF32)0xDC00
+#define UNI_SUR_LOW_END     (UTF32)0xDFFF
+#define false	   0
+#define true	    1
+
+/*
+ * Index into the table below with the first byte of a UTF-8 sequence to
+ * get the number of trailing bytes that are supposed to follow it.
+ * Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
+ * left as-is for anyone who may want to do such conversion, which was
+ * allowed in earlier algorithms.
+ */
+static const char trailingBytesForUTF8[256] = {
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
+};
+
+/*
+ * Magic values subtracted from a buffer value during UTF8 conversion.
+ * This table contains as many values as there might be trailing bytes
+ * in a UTF-8 sequence.
+ */
+static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL, 
+		     0x03C82080UL, 0xFA082080UL, 0x82082080UL };
+
+/*
+ * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
+ * into the first byte, depending on how many bytes follow.  There are
+ * as many entries in this table as there are UTF-8 sequence types.
+ * (I.e., one byte sequence, two byte... etc.). Remember that sequencs
+ * for *legal* UTF-8 will be 4 or fewer bytes total.
+ */
+static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
+
+/* --------------------------------------------------------------------- */
+
+/* The interface converts a whole buffer to avoid function-call overhead.
+ * Constants have been gathered. Loops & conditionals have been removed as
+ * much as possible for efficiency, in favor of drop-through switches.
+ * (See "Note A" at the bottom of the file for equivalent code.)
+ * If your compiler supports it, the "isLegalUTF8" call can be turned
+ * into an inline function.
+ */
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF16toUTF8 (
+	const UTF16** sourceStart, const UTF16* sourceEnd, 
+	UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
+    ConversionResult result = conversionOK;
+    const UTF16* source = *sourceStart;
+    UTF8* target = *targetStart;
+    while (source < sourceEnd) {
+	UTF32 ch;
+	unsigned short bytesToWrite = 0;
+	const UTF32 byteMask = 0xBF;
+	const UTF32 byteMark = 0x80; 
+	const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
+	ch = *source++;
+	/* If we have a surrogate pair, convert to UTF32 first. */
+	if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
+	    /* If the 16 bits following the high surrogate are in the source buffer... */
+	    if (source < sourceEnd) {
+		UTF32 ch2 = *source;
+		/* If it's a low surrogate, convert to UTF32. */
+		if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
+		    ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
+			+ (ch2 - UNI_SUR_LOW_START) + halfBase;
+		    ++source;
+		} else if (flags == strictConversion) { /* it's an unpaired high surrogate */
+		    --source; /* return to the illegal value itself */
+		    result = sourceIllegal;
+		    break;
+		}
+	    } else { /* We don't have the 16 bits following the high surrogate. */
+		--source; /* return to the high surrogate */
+		result = sourceExhausted;
+		break;
+	    }
+	} else if (flags == strictConversion) {
+	    /* UTF-16 surrogate values are illegal in UTF-32 */
+	    if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
+		--source; /* return to the illegal value itself */
+		result = sourceIllegal;
+		break;
+	    }
+	}
+	/* Figure out how many bytes the result will require */
+	if (ch < (UTF32)0x80) {	     bytesToWrite = 1;
+	} else if (ch < (UTF32)0x800) {     bytesToWrite = 2;
+	} else if (ch < (UTF32)0x10000) {   bytesToWrite = 3;
+	} else if (ch < (UTF32)0x110000) {  bytesToWrite = 4;
+	} else {			    bytesToWrite = 3;
+					    ch = UNI_REPLACEMENT_CHAR;
+	}
+
+	target += bytesToWrite;
+	if (target > targetEnd) {
+	    source = oldSource; /* Back up source pointer! */
+	    target -= bytesToWrite; result = targetExhausted; break;
+	}
+	switch (bytesToWrite) { /* note: everything falls through. */
+	    case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+	    case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+	    case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+	    case 1: *--target =  (UTF8)(ch | firstByteMark[bytesToWrite]);
+	}
+	target += bytesToWrite;
+    }
+    *sourceStart = source;
+    *targetStart = target;
+    return result;
+}
+
+/*
+ * Utility routine to tell whether a sequence of bytes is legal UTF-8.
+ * This must be called with the length pre-determined by the first byte.
+ * If not calling this from ConvertUTF8to*, then the length can be set by:
+ *  length = trailingBytesForUTF8[*source]+1;
+ * and the sequence is illegal right away if there aren't that many bytes
+ * available.
+ * If presented with a length > 4, this returns false.  The Unicode
+ * definition of UTF-8 goes up to 4-byte sequences.
  */
 
+static Boolean isLegalUTF8(const UTF8 *source, int length) {
+    UTF8 a;
+    const UTF8 *srcptr = source+length;
+    switch (length) {
+    default: return false;
+	/* Everything else falls through when "true"... */
+    case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
+    case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
+    case 2: if ((a = (*--srcptr)) > 0xBF) return false;
+
+	switch (*source) {
+	    /* no fall-through in this inner switch */
+	    case 0xE0: if (a < 0xA0) return false; break;
+	    case 0xED: if (a > 0x9F) return false; break;
+	    case 0xF0: if (a < 0x90) return false; break;
+	    case 0xF4: if (a > 0x8F) return false; break;
+	    default:   if (a < 0x80) return false;
+	}
+
+    case 1: if (*source >= 0x80 && *source < 0xC2) return false;
+    }
+    if (*source > 0xF4) return false;
+    return true;
+}
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF8toUTF16 (
+	const UTF8** sourceStart, const UTF8* sourceEnd, 
+	UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
+    ConversionResult result = conversionOK;
+    const UTF8* source = *sourceStart;
+    UTF16* target = *targetStart;
+    while (source < sourceEnd) {
+	UTF32 ch = 0;
+	unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
+	if (source + extraBytesToRead >= sourceEnd) {
+	    result = sourceExhausted; break;
+	}
+	/* Do this check whether lenient or strict */
+	if (! isLegalUTF8(source, extraBytesToRead+1)) {
+	    result = sourceIllegal;
+	    break;
+	}
+	/*
+	 * The cases all fall through. See "Note A" below.
+	 */
+	switch (extraBytesToRead) {
+	    case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
+	    case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
+	    case 3: ch += *source++; ch <<= 6;
+	    case 2: ch += *source++; ch <<= 6;
+	    case 1: ch += *source++; ch <<= 6;
+	    case 0: ch += *source++;
+	}
+	ch -= offsetsFromUTF8[extraBytesToRead];
+
+	if (target >= targetEnd) {
+	    source -= (extraBytesToRead+1); /* Back up source pointer! */
+	    result = targetExhausted; break;
+	}
+	if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
+	    /* UTF-16 surrogate values are illegal in UTF-32 */
+	    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
+		if (flags == strictConversion) {
+		    source -= (extraBytesToRead+1); /* return to the illegal value itself */
+		    result = sourceIllegal;
+		    break;
+		} else {
+		    *target++ = UNI_REPLACEMENT_CHAR;
+		}
+	    } else {
+		*target++ = (UTF16)ch; /* normal case */
+	    }
+	} else if (ch > UNI_MAX_UTF16) {
+	    if (flags == strictConversion) {
+		result = sourceIllegal;
+		source -= (extraBytesToRead+1); /* return to the start */
+		break; /* Bail out; shouldn't continue */
+	    } else {
+		*target++ = UNI_REPLACEMENT_CHAR;
+	    }
+	} else {
+	    /* target is a character in range 0xFFFF - 0x10FFFF. */
+	    if (target + 1 >= targetEnd) {
+		source -= (extraBytesToRead+1); /* Back up source pointer! */
+		result = targetExhausted; break;
+	    }
+	    ch -= halfBase;
+	    *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
+	    *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
+	}
+    }
+    *sourceStart = source;
+    *targetStart = target;
+    return result;
+}
+
+
+
+GF_EXPORT
+size_t gf_utf8_wcslen (const unsigned short *s)
+{
+  const unsigned short* ptr;
+  for (ptr = s; *ptr != (unsigned short)'\0'; ptr++) {
+  }
+  return ptr - s;
+}
+
 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 = dest;
+	UTF8* targetEnd = 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);
+}
+
+
+#else
+
+GF_EXPORT
+size_t gf_utf8_wcslen (const unsigned short *s)
+{
+  const unsigned short* ptr;
+  for (ptr = s; *ptr != (unsigned short)'\0'; ptr++) {
+  }
+  return ptr - s;
+}
+
+GF_EXPORT
+size_t gf_utf8_wcstombs(char* dest, size_t len, const unsigned short** srcp)
+{
+	/*
+	* Original code from the GNU UTF-8 Library
+	*/
 	size_t count;
 	const unsigned short * src = *srcp;
 
@@ -176,14 +532,4 @@
 	return (size_t)(-1);
 }
 
-
-GF_EXPORT
-size_t gf_utf8_wcslen (const unsigned short *s)
-{
-  const unsigned short* ptr;
-  for (ptr = s; *ptr != (unsigned short)'\0'; ptr++) {
-  }
-  return ptr - s;
-}
-
-
+#endif

gpac-0.5.0.svn4192.tar.bz2/src/utils/xml_parser.c -> gpac-0.5.0.svn4296.tar.bz2/src/utils/xml_parser.c Changed

@@ -26,12 +26,17 @@
 
 #include <gpac/xml.h>
 #include <gpac/utf.h>
+
+#ifndef GPAC_DISABLE_ZLIB
 /*since 0.2.2, we use zlib for xmt/x3d reading to handle gz files*/
 #include <zlib.h>
 
 #if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
 #pragma comment(lib, "zlib")
 #endif
+#else
+#define NO_GZIP
+#endif
 
 
 static GF_Err gf_xml_sax_parse_intern(GF_SAXParser *parser, char *current);
@@ -1178,6 +1183,40 @@
 #endif
 	unsigned char szLine[6];
 
+	parser->on_progress = OnProgress;
+
+	if (!strncmp(fileName, "gmem://", 7)) {
+		u32 size;
+		u8 *xml_mem_address;
+		if (sscanf(fileName, "gmem://%d@%p", &size, &xml_mem_address) != 2) {
+			return GF_URL_ERROR;
+		} 
+		parser->file_size = size;
+
+		memcpy(szLine, xml_mem_address, 3);
+		szLine[4] = szLine[5] = 0;
+		e = gf_xml_sax_init(parser, szLine);
+		if (e) return e;
+		parser->file_pos = 4;
+		parser->elt_start_pos = 0;
+		parser->current_pos = 0;
+
+
+		e = gf_xml_sax_parse(parser, xml_mem_address+3);
+		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;
+		parser->elt_name_start = parser->elt_name_end = 0;
+		parser->att_name_start = 0;
+		parser->current_pos = 0;
+		parser->line_size = 0;
+		parser->att_sep = 0;
+		parser->file_pos = 0;
+		parser->file_size = 0;
+		parser->line_size = 0;
+		return e;
+	} 
+
 	/*check file exists and gets its size (zlib doesn't support SEEK_END)*/
 	test = gf_f64_open(fileName, "rb");
 	if (!test) return GF_URL_ERROR;
@@ -1186,7 +1225,6 @@
 	parser->file_size = (u32) gf_f64_tell(test);
 	fclose(test);
 
-	parser->on_progress = OnProgress;
 
 #ifdef NO_GZIP
 	parser->f_in = gf_f64_open(fileName, "rt");
@@ -1294,7 +1332,11 @@
 char *gf_xml_sax_peek_node(GF_SAXParser *parser, char *att_name, char *att_value, char *substitute, char *get_attr, char *end_pattern, Bool *is_substitute)
 {
 	u32 state, att_len, alloc_size;
+#ifdef NO_GZIP
+	u64 pos;
+#else
 	z_off_t pos;
+#endif
 	Bool from_buffer;
 	Bool dobreak=0;
 	char szLine1[XML_INPUT_SIZE+2], szLine2[XML_INPUT_SIZE+2], *szLine, *cur_line, *sep, *start, first_c, *result;