summaryrefslogtreecommitdiff
path: root/tools/ismindex.c
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Include fix for building ismindex under MinGWFrederic Jean2013-02-271-0/+2
| | | | | | | | | | Include cmdutils.h so we can build under windows. Based on fix for https://ffmpeg.org/trac/ffmpeg/ticket/256
* | ismindex: check return value of avio_open_dyn_buf()Michael Niedermayer2012-10-291-1/+4
| | | | | | | | | | Fixes CID733723 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'Michael Niedermayer2012-08-291-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112': configure: support Bitrig OS yuv2rgb: handle line widths that are not a multiple of 4. graph2dot: Use the fallback getopt implementation if needed tools: Include io.h for open/read/write/close if unistd.h doesn't exist testprogs: Remove unused includes qt-faststart: Use other seek/tell functions on MSVC than on mingw ismindex: Include direct.h for _mkdir on windows sdp: Use static const char arrays instead of pointers to strings x86: avcodec: Drop silly "_mmx" suffixes from filenames x86: avcodec: Drop silly "_sse" suffixes from filenames sdp: Include profile-level-id for H264 utvideoenc: use ff_huff_gen_len_table huffman: add ff_huff_gen_len_table cllc: simplify/fix swapped data buffer allocation. rtpdec_h264: Don't set the pixel format h264: Check that the codec isn't null before accessing it audio_frame_queue: Define af_queue_log_state before using it Conflicts: libavcodec/audio_frame_queue.c libavcodec/h264.c libavcodec/huffman.h libavcodec/huffyuv.c libavcodec/utvideoenc.c libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Include direct.h for _mkdir on windowsMartin Storsjö2012-08-291-2/+2
| | | | | | | | | | | | | | The Windows SDK in MSVC doesn't have mkdir, only _mkdir, and MSDN says one should include direct.h to use it. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-071-5/+5
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-041-8/+37
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) lavfi: reclassify showfiltfmts as a TESTPROG graph2dot: fix printf format specifier swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32. vp8: loopfilter >=sse2 functions need aligned stack on x86-32. amr: remove shift out of the AMR_BIT() macro. dsputilenc: group yasm and inline asm function pointer assignment. mov: use forward declaration of a function instead of a table. Clarify Doxygen comment for FF_API_* #defines. configure: simplify get_version() Create version.h headers for libraries that lack them gitignore: Use full path instead of relative path to specify patterns mpegvideo: remove VLAs Add XTEA encryption support in libavutil Add Blowfish encryption support in libavutil eval: Add the isinf() function and tests for it flacdec: move lpc filter to flacdsp flacdec: split off channel decorrelation as flacdsp avplay: Add an option for not limiting the input buffer size FATE: add a test for WMA cover art. FATE: add a test for apetag cover art ... Conflicts: .gitignore configure ffplay.c libavcodec/Makefile libavcodec/error_resilience.c libavcodec/mpegvideo.c libavcodec/ratecontrol.c libavdevice/avdevice.h libavfilter/Makefile libavfilter/filtfmts.c libavfilter/version.h libavformat/mov.c libavformat/version.h libavutil/Makefile libavutil/avutil.h libavutil/version.h libswscale/swscale.h libswscale/x86/swscale_mmx.c tests/fate/libavutil.mak tests/lavfi-regression.sh tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Verify that all bitrate variants matchMartin Storsjö2012-07-031-4/+26
| | | | | | | | | | | | | | | | | | | | In Smooth Streaming, the fragments are addressed by time, and the manifest only stores one list of time offests for all streams, so all streams need to have identical fragment offsets. Warn if this isn't the case, so that the user can fix the files instead of getting failures at runtime when the fragments can't be found. Signed-off-by: Martin Storsjö <martin@martin.st>
| * ismindex: Properly report errors reading the MFRA atomMartin Storsjö2012-07-031-4/+11
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * ismindex: Fix build on mingwMartin Storsjö2012-01-261-0/+4
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | tests and tools: cleanup ffmpeg referenceMichael Niedermayer2012-05-271-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status