Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tools/ismindex.c
AgeCommit message (Collapse)Author
2016-10-09tools: fix grammar errorMoritz Barsnick
Signed-off-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-23Merge commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8'Clément Bœsch
* commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8': tools: Port to codec parameters API Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-05-17tools: Port to codec parameters APIDiego Biurrun
2015-09-07Merge commit '87e5d8d78cf08b54b4a9e7cbaeff89f8c1d91b78'Hendrik Leppkes
* commit '87e5d8d78cf08b54b4a9e7cbaeff89f8c1d91b78': ismindex: Use the correct abs() version Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-31ismindex: Use the correct abs() versionVittorio Giovara
2015-03-19Merge commit '30a041887f89cd97c372ad6a516da6e012f2c88b'Michael Niedermayer
* commit '30a041887f89cd97c372ad6a516da6e012f2c88b': ismindex: Calculate the pts duration of trun atoms, not the dts duration Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-19ismindex: Calculate the pts duration of trun atoms, not the dts durationMartin Storsjö
Since the duration is compared to the tfra durations/intervals which are expressed in pts, calculate that here as well. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-06tools/ismindex.c: Use av_realloc_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06tools/ismindex: Keep count fields consistent with arrays in case of errorsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16Merge commit '979932378ae3fbf452e312eb759cc7ce175f78de'Michael Niedermayer
* commit '979932378ae3fbf452e312eb759cc7ce175f78de': ismindex: use tfhd default duration if no sample duration Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16ismindex: use tfhd default duration if no sample durationMika Raento
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-09Merge commit '2bc220958c7570020d87ee353db65460b518998a'Michael Niedermayer
* commit '2bc220958c7570020d87ee353db65460b518998a': ismindex: handle discontinuous streams better Conflicts: tools/ismindex.c See: d3834f290138cb8c48fd404081ac5b9a2ca14564 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09ismindex: handle discontinuous streams betterMika Raento
Reads the fragment duration from the trun sample data, rather than assuming that there are no gaps. Creates much better playlists for our inputs. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09ismindex: handle discontinuous streams betterMika Raento
Read the fragment duration from the trun sample data, rather than assuming that there are no gaps. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-16Merge commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc'Michael Niedermayer
* commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc': ismindex: handle time discontinuities and nonzero start time Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-15ismindex: handle time discontinuities and nonzero start timeMika Raento
The input file may not have consistent start times, stream durations and chunk durations. This patch at least removes negative durations that make chromecast unhappy, and correctly sets starting time on chunks so that the split (or .ismf) outputs match the manifest. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-08Merge commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0'Michael Niedermayer
* commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0': ismindex: Avoid writing ismf files if no base name has been specified Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-08ismindex: Avoid writing ismf files if no base name has been specifiedMartin Storsjö
Previously, this could create files named "(null).ismf", if the -ismf parameter is specified (before an input file name), but without specifying any base name. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-05Merge commit 'b21e989a3c076d94cfdde0303724db841dd60cad'Michael Niedermayer
* commit 'b21e989a3c076d94cfdde0303724db841dd60cad': ismindex: produce .ismf file Conflicts: tools/ismindex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05ismindex: produce .ismf fileMika Raento
This is a non-standard file that maps the MSS segment names to offsets in the ISMV file. This can be used to build a custom MSS streaming server without splitting the ISMV into separate files. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-03Merge commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c'Michael Niedermayer
* commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c': ismindex: recover from completely empty streams Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03ismindex: recover from completely empty streamsMika Raento
This creates best-effort results from input that is missing stream contents, there are warnings printed when this happens. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-02Merge commit 'e48d1ea541be4592ebac89875557407ca958b7a9'Michael Niedermayer
* commit 'e48d1ea541be4592ebac89875557407ca958b7a9': ismindex: improve diagnostics Conflicts: tools/ismindex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-02ismindex: improve diagnosticsMika Raento
This improves error messages for completely and somewhat broken inputs. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-08-15Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'Michael Niedermayer
* commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867': cosmetics: Write NULL pointer inequality checks more compactly Conflicts: libavcodec/dvdsubdec.c libavcodec/h263dec.c libavcodec/libxvid.c libavcodec/rv10.c libavcodec/utils.c libavformat/format.c libavformat/matroskadec.c libavformat/segment.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-03Merge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0'Michael Niedermayer
* commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0': ismindex: Add an option for outputting files elsewhere than in the current directory Conflicts: tools/ismindex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'Michael Niedermayer
* commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e': ismindex: Allow adding a path prefix to the generated .ism file Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03ismindex: Add an option for outputting files elsewhere than in the current ↵Martin Storsjö
directory Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-03ismindex: Allow adding a path prefix to the generated .ism fileMartin Storsjö
This allows storing the .ismv/.isma/.ismc files separately from the .ism file on a server, without having to manually edit the .ism file after generating it with the ismindex tool. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-05-05tools/ismindex: use av_mallocz_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: ismindex: Change the duration field to int64_t Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05Merge commit '583a287f6f48f263859df142e6f90993e4217c72'Michael Niedermayer
* commit '583a287f6f48f263859df142e6f90993e4217c72': ismindex: Calculate the file duration among the included tracks Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05Merge commit 'd347a7b248d4ffdc278373fecf033b0ade030343'Michael Niedermayer
* commit 'd347a7b248d4ffdc278373fecf033b0ade030343': ismindex: Use the individual stream duration instead of the global one Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05ismindex: Change the duration field to int64_tMartin Storsjö
This reduces the risk for overflow in pathlogical cases. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-05ismindex: Calculate the file duration among the included tracksMartin Storsjö
If the input file contains other tracks (non video/audio) that aren't included in ismindex, the global file duration as returned by libavformat might not be equal to the maximum of the duration of the actual included tracks. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-05ismindex: Use the individual stream duration instead of the global oneMartin Storsjö
The stream duration is used for calculating the duration of the last fragment easily without manually parsing anything else than the mfra/tfra atoms. When the global file duration was used previously, the duration of the last fragment could end up wrong if the streams weren't equally long. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-30Reinstate proper FFmpeg license for all files.Thilo Borgmann
2013-08-06Merge commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc'Michael Niedermayer
* commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc': ismindex: Replace mkdir ifdeffery by os_support.h #include Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-05ismindex: Replace mkdir ifdeffery by os_support.h #includeDiego Biurrun
os_support.h contains more precise workarounds for non-POSIX mkdir().
2013-04-21ismindex: check mkdir()s return codeMichael Niedermayer
Fixes CID733724 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-21tools/ismindex: dont ignore return code of write_fragments()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14Merge commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8'Michael Niedermayer
* commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8': Add av_log_{ask_for_sample|missing_feature} replacements to libavutil ismindex: Check the return value of allocations Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14Merge commit '7c147900b86c0f1cf030b7b844c670649c80c191'Michael Niedermayer
* commit '7c147900b86c0f1cf030b7b844c670649c80c191': ismindex: Factorize code for printing chunk duration lists Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14Merge commit 'f05e9beb4ab5fb8b9d5ba81405e9fca901832591'Michael Niedermayer
* commit 'f05e9beb4ab5fb8b9d5ba81405e9fca901832591': ismindex: Rename structs and fields from "file" to "track" avpacket: copy side data type and size in av_dup_packet Conflicts: libavcodec/avpacket.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13ismindex: Check the return value of allocationsMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-13ismindex: Factorize code for printing chunk duration listsMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-13ismindex: Rename structs and fields from "file" to "track"Martin Storsjö
The tool nowadays supports more than one track per file, this makes reading the code slightly less confusing. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-02-27Include fix for building ismindex under MinGWFrederic Jean
Include cmdutils.h so we can build under windows. Based on fix for https://ffmpeg.org/trac/ffmpeg/ticket/256
2012-10-29ismindex: check return value of avio_open_dyn_buf()Michael Niedermayer
Fixes CID733723 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-31 06:53:11 +0300