summaryrefslogtreecommitdiffstats
path: root/tools/ismindex.c
Commit message (Collapse)AuthorAgeFilesLines
* lav*,tests: remove several register_all callsJosh de Kock2018-04-021-2/+0
| | | | | | | avdevice_register_all() is still required to register devices into lavf (this is required due to lavd being somewhat of a hack). Signed-off-by: Josh de Kock <josh@itanimul.li>
* tools/ismindex: remove unused headerJames Almer2017-10-011-2/+0
|
* tools: fix grammar errorMoritz Barsnick2016-10-091-1/+1
| | | | | Signed-off-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8'Clément Bœsch2016-06-231-30/+30
|\ | | | | | | | | | | | | * commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8': tools: Port to codec parameters API Merged-by: Clément Bœsch <clement@stupeflix.com>
| * tools: Port to codec parameters APIDiego Biurrun2016-05-171-30/+30
| |
* | Merge commit '87e5d8d78cf08b54b4a9e7cbaeff89f8c1d91b78'Hendrik Leppkes2015-09-071-1/+1
|\ \ | |/ | | | | | | | | | | * commit '87e5d8d78cf08b54b4a9e7cbaeff89f8c1d91b78': ismindex: Use the correct abs() version Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * ismindex: Use the correct abs() versionVittorio Giovara2015-08-311-1/+1
| |
* | Merge commit '30a041887f89cd97c372ad6a516da6e012f2c88b'Michael Niedermayer2015-03-191-4/+10
|\ \ | |/ | | | | | | | | | | * commit '30a041887f89cd97c372ad6a516da6e012f2c88b': ismindex: Calculate the pts duration of trun atoms, not the dts duration Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Calculate the pts duration of trun atoms, not the dts durationMartin Storsjö2015-03-191-4/+10
| | | | | | | | | | | | | | 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>
* | tools/ismindex.c: Use av_realloc_array()Michael Niedermayer2015-01-061-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tools/ismindex: Keep count fields consistent with arrays in case of errorsMichael Niedermayer2015-01-061-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '979932378ae3fbf452e312eb759cc7ce175f78de'Michael Niedermayer2014-10-161-4/+19
|\ \ | |/ | | | | | | | | | | * commit '979932378ae3fbf452e312eb759cc7ce175f78de': ismindex: use tfhd default duration if no sample duration Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: use tfhd default duration if no sample durationMika Raento2014-10-161-4/+19
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2bc220958c7570020d87ee353db65460b518998a'Michael Niedermayer2014-10-091-10/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '2bc220958c7570020d87ee353db65460b518998a': ismindex: handle discontinuous streams better Conflicts: tools/ismindex.c See: d3834f290138cb8c48fd404081ac5b9a2ca14564 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: handle discontinuous streams betterMika Raento2014-10-091-10/+86
| | | | | | | | | | | | | | 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>
* | ismindex: handle discontinuous streams betterMika Raento2014-10-091-10/+85
| | | | | | | | | | | | | | | | 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>
* | Merge commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc'Michael Niedermayer2014-09-151-3/+42
|\ \ | |/ | | | | | | | | | | * commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc': ismindex: handle time discontinuities and nonzero start time Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: handle time discontinuities and nonzero start timeMika Raento2014-09-151-3/+42
| | | | | | | | | | | | | | | | | | 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>
* | Merge commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0'Michael Niedermayer2014-09-081-0/+2
|\ \ | |/ | | | | | | | | | | * commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0': ismindex: Avoid writing ismf files if no base name has been specified Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Avoid writing ismf files if no base name has been specifiedMartin Storsjö2014-09-071-0/+2
| | | | | | | | | | | | | | | | 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>
* | Merge commit 'b21e989a3c076d94cfdde0303724db841dd60cad'Michael Niedermayer2014-09-051-23/+95
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'b21e989a3c076d94cfdde0303724db841dd60cad': ismindex: produce .ismf file Conflicts: tools/ismindex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: produce .ismf fileMika Raento2014-09-051-22/+95
| | | | | | | | | | | | | | | | 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>
* | Merge commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c'Michael Niedermayer2014-09-031-0/+6
|\ \ | |/ | | | | | | | | | | * commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c': ismindex: recover from completely empty streams Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: recover from completely empty streamsMika Raento2014-09-031-0/+6
| | | | | | | | | | | | | | 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>
* | Merge commit 'e48d1ea541be4592ebac89875557407ca958b7a9'Michael Niedermayer2014-09-021-16/+42
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'e48d1ea541be4592ebac89875557407ca958b7a9': ismindex: improve diagnostics Conflicts: tools/ismindex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: improve diagnosticsMika Raento2014-09-021-14/+43
| | | | | | | | | | | | This improves error messages for completely and somewhat broken inputs. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'Michael Niedermayer2014-08-151-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume2014-08-151-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0'Michael Niedermayer2014-07-031-18/+36
|\ \ | |/ | | | | | | | | | | | | | | | | * 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>
| * ismindex: Add an option for outputting files elsewhere than in the current ↵Martin Storsjö2014-07-031-18/+36
| | | | | | | | | | | | directory Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'Michael Niedermayer2014-07-031-6/+19
|\ \ | |/ | | | | | | | | | | * commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e': ismindex: Allow adding a path prefix to the generated .ism file Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Allow adding a path prefix to the generated .ism fileMartin Storsjö2014-07-031-6/+19
| | | | | | | | | | | | | | | | 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>
* | tools/ismindex: use av_mallocz_array()Michael Niedermayer2014-05-051-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-051-2/+2
|\ \ | |/ | | | | | | | | | | * qatar/master: ismindex: Change the duration field to int64_t Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Change the duration field to int64_tMartin Storsjö2013-10-051-2/+2
| | | | | | | | | | | | This reduces the risk for overflow in pathlogical cases. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '583a287f6f48f263859df142e6f90993e4217c72'Michael Niedermayer2013-10-051-2/+4
|\ \ | |/ | | | | | | | | | | * commit '583a287f6f48f263859df142e6f90993e4217c72': ismindex: Calculate the file duration among the included tracks Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Calculate the file duration among the included tracksMartin Storsjö2013-10-051-2/+4
| | | | | | | | | | | | | | | | | | 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>
* | Merge commit 'd347a7b248d4ffdc278373fecf033b0ade030343'Michael Niedermayer2013-10-051-2/+1
|\ \ | |/ | | | | | | | | | | * commit 'd347a7b248d4ffdc278373fecf033b0ade030343': ismindex: Use the individual stream duration instead of the global one Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Use the individual stream duration instead of the global oneMartin Storsjö2013-10-051-2/+1
| | | | | | | | | | | | | | | | | | | | 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>
* | Reinstate proper FFmpeg license for all files.Thilo Borgmann2013-08-301-4/+4
| |
* | Merge commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc'Michael Niedermayer2013-08-061-5/+1
|\ \ | |/ | | | | | | | | | | * commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc': ismindex: Replace mkdir ifdeffery by os_support.h #include Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Replace mkdir ifdeffery by os_support.h #includeDiego Biurrun2013-08-051-5/+1
| | | | | | | | os_support.h contains more precise workarounds for non-POSIX mkdir().
* | ismindex: check mkdir()s return codeMichael Niedermayer2013-04-211-1/+2
| | | | | | | | | | Fixes CID733724 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tools/ismindex: dont ignore return code of write_fragments()Michael Niedermayer2013-04-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8'Michael Niedermayer2013-03-141-2/+13
|\ \ | |/ | | | | | | | | | | | | * 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>
| * ismindex: Check the return value of allocationsMartin Storsjö2013-03-131-2/+13
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7c147900b86c0f1cf030b7b844c670649c80c191'Michael Niedermayer2013-03-141-22/+19
|\ \ | |/ | | | | | | | | | | * commit '7c147900b86c0f1cf030b7b844c670649c80c191': ismindex: Factorize code for printing chunk duration lists Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Factorize code for printing chunk duration listsMartin Storsjö2013-03-131-22/+19
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f05e9beb4ab5fb8b9d5ba81405e9fca901832591'Michael Niedermayer2013-03-141-149/+149
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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>
| * ismindex: Rename structs and fields from "file" to "track"Martin Storsjö2013-03-131-149/+149
| | | | | | | | | | | | | | 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>
OpenPOWER on IntegriCloud