summaryrefslogtreecommitdiff
path: root/libavformat/smoothstreamingenc.c
Commit message (Collapse)AuthorAge
* avformat/smoothstreamingenc: fix memleakMichael Niedermayer2014-07-06
| | | | | Fixes CID1224285 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/smoothstreamingenc: Use av_mallocz_array()Michael Niedermayer2014-06-15
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9'Michael Niedermayer2014-05-25
|\ | | | | | | | | | | | | * commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9': smoothstream: check malloc calls Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstream: check malloc callsNidhi Makhijani2014-05-24
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'Michael Niedermayer2013-09-27
|\| | | | | | | | | | | | | | | | | | | * commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9': lavf: Reset the entry count and allocation size variables on av_reallocp failures Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Reset the entry count and allocation size variables on av_reallocp ↵Martin Storsjö2013-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | failures When av_reallocp fails, the associated variables that keep track of the number of elements in the array (and in some cases, the separate number of allocated elements) need to be reset. Not all of these might technically be needed, but it's better to reset them if in doubt, to make sure variables don't end up conflicting. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5626f994f273af80fb100d4743b963304de9e05c'Michael Niedermayer2013-09-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5626f994f273af80fb100d4743b963304de9e05c': avformat: Use av_reallocp() where suitable Conflicts: libavformat/avidec.c libavformat/avienc.c libavformat/aviobuf.c libavformat/oggparsevorbis.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Use av_reallocp() where suitableAlexandra Khirnova2013-09-18
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd'Michael Niedermayer2013-08-28
|\| | | | | | | | | | | | | * commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd': smoothstreamingenc: Write to a temp file while updating the manifest Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreamingenc: Write to a temp file while updating the manifestMartin Storsjö2013-08-27
| | | | | | | | | | | | | | | | If a client tries to read the file while it's being updated, the client would get an incomplete manifest. Instead write to a separate temp file and atomically rename it to replace the previous one. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/smoothstreamingenc: Make const tables static constMichael Niedermayer2013-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'Michael Niedermayer2012-12-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '511cf612ac979f536fd65e14603a87ca5ad435f3': miscellaneous typo fixes Conflicts: libavcodec/4xm.c libavcodec/lagarith.c libavcodec/parser.c libavcodec/ratecontrol.c libavcodec/shorten.c libavcodec/vda_h264.c libavformat/dvenc.c libavformat/wtv.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * miscellaneous typo fixesDiego Biurrun2012-12-21
| |
* | smoothstreamingenc: check return value of mkdir()Michael Niedermayer2012-10-29
| | | | | | | | | | Fixes CID732188 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | smoothstreamingenc: fix integer overflowMichael Niedermayer2012-10-29
| | | | | | | | | | Fixes CID732248 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avutil: Make LZO decoder code configure-time selectable avutil: Move memcpy_backptr() to mem.c configure: detect parisc64 automatically configure: detect ppc64 automatically configure: detect mips64 automatically configure: generalise 64-bit test smoothstreamingenc: Don't assume streams start from timestamp 0 Conflicts: configure libavutil/Makefile libavutil/lzo.c libavutil/lzo.h libavutil/mem.c libavutil/mem.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreamingenc: Don't assume streams start from timestamp 0Martin Storsjö2012-10-24
| | | | | | | | | | | | Also use dts instead of pts for deciding where to split fragments. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: wmaenc: use float planar sample format (e)ac3enc: use planar sample format aacenc: use planar sample format adpcmenc: use planar sample format for adpcm_ima_wav and adpcm_ima_qt adpcmenc: move 'ch' variable to higher scope adpcmenc: fix 3 instances of variable shadowing adpcm_ima_wav: simplify encoding libvorbis: use planar sample format libmp3lame: use planar sample formats vorbisenc: use float planar sample format ffm: do not write or read the audio sample format parseutils: fix parsing of invalid alpha values doc/RELEASE_NOTES: update for the 9 release. smoothstreamingenc: Add a more verbose error message smoothstreamingenc: Ignore the return value from mkdir smoothstreamingenc: Try writing a manifest when opening the muxer smoothstreamingenc: Move the output_chunk_list and write_manifest functions up smoothstreamingenc: Properly return errors from ism_flush to the caller smoothstreamingenc: Check the output UrlContext before accessing it Conflicts: doc/RELEASE_NOTES libavcodec/aacenc.c libavcodec/ac3enc_template.c libavcodec/wmaenc.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreamingenc: Add a more verbose error messageMartin Storsjö2012-10-06
| | | | | | | | | | | | This helps tracking down the cause if this happens to be an issue. Signed-off-by: Martin Storsjö <martin@martin.st>
| * smoothstreamingenc: Ignore the return value from mkdirMartin Storsjö2012-10-06
| | | | | | | | | | | | | | | | We don't need to return an error if the directory already existed. We make sure that the directory actually is properly writeable later within ism_write_header by writing a manifest anyway. Signed-off-by: Martin Storsjö <martin@martin.st>
| * smoothstreamingenc: Try writing a manifest when opening the muxerMartin Storsjö2012-10-06
| | | | | | | | | | | | | | This allows failing cleaner and earlier if unable to write to the output directory. Signed-off-by: Martin Storsjö <martin@martin.st>
| * smoothstreamingenc: Move the output_chunk_list and write_manifest functions upMartin Storsjö2012-10-06
| | | | | | | | | | | | | | This allows calling write_manifest from ism_write_header without a forward declaration. Signed-off-by: Martin Storsjö <martin@martin.st>
| * smoothstreamingenc: Properly return errors from ism_flush to the callerMartin Storsjö2012-10-06
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * smoothstreamingenc: Check the output UrlContext before accessing itMartin Storsjö2012-10-06
| | | | | | | | | | | | | | This code can be called with a NULL UrlContext if writing of the trailer involves seeking. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtp: Packetization of JPEG (RFC 2435) smoothstreamingenc: Copy the SAR on the AVStreams as well Conflicts: Changelog libavformat/rtpenc.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreamingenc: Copy the SAR on the AVStreams as wellMartin Storsjö2012-09-23
| | | | | | | | | | | | This is required in chained muxers, if the SAR happens to be set. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c'Michael Niedermayer2012-09-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c': mpegvideo: move frame size dependent memory management to separate functions configure: add --toolchain option configure: Make the smoothstreaming muxer enable the ismv muxer smoothstreaming: Export the mp4 codec tags mov: check for EOF in long lasting loops avcodec: cleanup utils.c binkaudio: remove unneeded GET_BITS_SAFE macro binkaudio: use float sample format binkaudio: use a different value for the coefficient scale for the DCT codec Conflicts: configure libavcodec/mpegvideo.c libavcodec/utils.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreaming: Export the mp4 codec tagsMartin Storsjö2012-09-18
| | | | | | | | | | | | | | | | | | This fixes stream copy from a format that already has incompatible codec tags set. The chained ismv muxer exports this same codec tag list, so set it on this one as well, to allow the caller (and lavf common code) to set them correctly. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b'Michael Niedermayer2012-09-13
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '07584eaf4a95db3f11d3bc411f9786932829e82b': mpegts: check substreams before discarding Add a smooth streaming segmenter muxer file: Add an avoption for disabling truncating existing files on open img2dec: always close AVIOContexts rtpdec_jpeg: Error out on other unsupported type values as well rtpdec_jpeg: Disallow using the reserved q values rtpdec_jpeg: Fold the default qtables case into an existing if statement rtpdec_jpeg: Store and reuse old qtables for q values 128-254 rtpdec_jpeg: Simplify the calculation of the number of qtables rtpdec_jpeg: Add more comments about the fields in the SOF0 section rtpdec_jpeg: Clarify where the subsampling magic numbers come from rtpdec_jpeg: Don't use a bitstream writer for the EOI marker rtpdec_jpeg: Don't needlessly use a bitstream writer for the header rtpdec_jpeg: Simplify writing of the jpeg header rtpdec_jpeg: Merge two if statements rtpdec_jpeg: Write the DHT section properly Conflicts: libavformat/Makefile libavformat/allformats.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Add a smooth streaming segmenter muxerMartin Storsjö2012-09-12
This muxer splits the output from the ismv muxer into individual files, in realtime. The same can also be done by the standalone tool ismindex, but this muxer is needed for doing it in realtime (especially for live streams that need extra handling for updating the lookahead fields in the fragment headers). Using this muxer, one can deliver live smooth streaming from a normal static file web server. (Using ismindex, one can deliver premade smooth streaming files from a static file web server, or prepare files for serving with IIS.) Signed-off-by: Martin Storsjö <martin@martin.st>