summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* avformat: add Sample Dump eXchange demuxerPaul B Mahol2017-01-25
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavf/mov: Unscramble dref debug output.Carl Eugen Hoyos2017-01-25
|
* isom: map xalg and avlg to h264, fixes ticket #6099compn2017-01-24
|
* lavf/rtmpproto: Make bytes_read variables 64bit.Carl Eugen Hoyos2017-01-25
| | | | | | | | | When bytes_read overflowed, last_bytes_read did not yet overflow and no bytes-read report was created leading to a timeout. Analyzed-by: Thomas Bernhard Fixes ticket #5836.
* avformat/hlsenc: improve to write m3u8 head blockSteven Liu2017-01-24
| | | | Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/flvenc: refine the flvenc shift_data codeSteven Liu2017-01-24
| | | | | | refine the flvenc shift_data move data option Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/hlsenc: refine the code readable for time unitSteven Liu2017-01-24
| | | | | | Reviewed-by: Bodecs Bela <bodecsb@vivanet.hu> Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* libavformat/tee: tee was passing a wrong option name for fifo's format_optionsFelipe Astroza2017-01-24
| | | | | | | | If fifo is enabled on tee muxer, ffmpeg exits because of an unknown option passed to fifo muxer. Option name "format_options" was replaced by "format_opts" on tee muxer. Signed-off-by: Felipe Astroza <felipe@astroza.cl> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/segment: fix crash when failing to open segment listRodger Combs2017-01-23
| | | | | | | | | | | | | | | This happens because segment_end() returns an error, so seg_write_packet never proceeds to segment_start(), and seg->avf->pb is never re-set, so we crash with a null pb when av_write_trailer flushes the packet queue. This doesn't seem to be clearly recoverable, so I'm just failing more gracefully. Repro: ffmpeg -i input.ts -f segment -c copy -segment_list /noaxx.m3u8 test-%05d.ts (assuming you don't have write access to /)
* avformat: add MIDI Sample Dump Standard demuxerPaul B Mahol2017-01-22
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/wavdec: enable seeking with XMA2Paul B Mahol2017-01-20
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/hlsenc: fix too many open files bugSteven Liu2017-01-20
| | | | | | | | When use http method to delete the old segments, there is only io_open, hove not io_close yet, this patch is used to fix it Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/caf: add 'aacl' codec tagPiotr Bandurski2017-01-19
| | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: pass output stream duration as a hint to the muxerTobias Rapp2017-01-19
| | | | | Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/wmaprodec: >2 channel support for XMAPaul B Mahol2017-01-19
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/hlsenc: fix bug of hlsenc http delete old segmentsSteven Liu2017-01-19
| | | | | | | | when push hls to http server, the old segemnts can not delete by hls formats. so add the http option into hls_delete_old_segments Reported-by: Yin Jiaoyuan <yinjiaoyuan@163.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/hlsenc: remove debug message used error level logSteven Liu2017-01-18
| | | | Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* libavformat/mpegtsenc: support hevc with missing in stream headers like h.264Michael Niedermayer2017-01-17
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* configure: Fix standalone compilation of aiff and caf muxers.Carl Eugen Hoyos2017-01-16
|
* avformat/aadec: use avio_get_str()Paul B Mahol2017-01-16
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/aadec: stop ignoring file metadataPaul B Mahol2017-01-16
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec: add SIPR parserPaul B Mahol2017-01-16
| | | | | | Fixes #2056. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* libopenmpt: add missing avio_read return value checkAndreas Cadhalpun2017-01-16
| | | | | | | | | This fixes heap-buffer-overflows in libopenmpt caused by interpreting the negative size value as unsigned size_t. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Reviewed-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* matroskaenc: remove unofficial compliance on color informationRostislav Pehlivanov2017-01-15
| | | | | | | | | | When support for this was added the details weren't yet finalized. This is no longer the case. Fixes writing of mkv/webm files with HDR. Reported-by: Kagami Hiiragi <kagami@genshiken.org> Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com> Reviewed-by: James Almer <jamrial@gmail.com>
* Cosmetics: Reindent after last commit.Carl Eugen Hoyos2017-01-14
|
* lavf/matroskaenc: Do not write two CodecID elements for rawvideo.Carl Eugen Hoyos2017-01-14
| | | | Fixes ticket #6068.
* avformat/hlsenc: refine the hlsenc codeSteven Liu2017-01-13
| | | | | | | because the oc have been potint to hls->avf or hls->vtt_avf here is not needed point once again Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/hlsenc: fix hlsenc bug at windows systemSteven Liu2017-01-13
| | | | | | | | | | | | when hlsenc use flag second_level_segment_index, second_level_segment_size and second_level_segment_duration, the rename is ok but the output filename always use the old filename so move the rename operation after the close the ts file and before open new segment Reported-by: Christian Johannesen <chrisjohannesen@gmail.com> Reviewed-by: Bodecs Bela <bodecsb@vivanet.hu> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* lavf/mxf: Add a universal label for ProRes used in FCP.Carl Eugen Hoyos2017-01-12
| | | | Fixes ticket #6075.
* lavf/dss: Do not fail randomly if dss_sp input contains 0xff.Carl Eugen Hoyos2017-01-12
| | | | Fixes decoding the sample from ticket #6072 with ffmpeg.
* lavf/hlsenc: fix typo in last commit.Nicolas George2017-01-12
|
* avformat/hlsenc: hls_start_number_source and start_numberBodecs Bela2017-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | start_number option starts the playlist sequence number (#EXT-X-MEDIA-SEQUENCE) from the specified number. Unless hls_flags single_file is set, it also specifies starting sequence numbers of segment and subtitle filenames. Sometimes it is usefull to have unique starting numbers at each run, but currently it is only achiveable by setting this parameter manually. This patch enables to specify start_number source parameter by introducing hls_start_number_source with 3 possible values: generic/epoch/datetime. This ensures to set start sequence number automatically for practically unique numbers. Generic option is the default and this is the curent behaviour: start_number option value specifies the start sequence number. (start_number default value is 0) If hls_start_number_source is set to epoch, then the start number will be the seconds since epoch (1970-01-01 00:00:00). If set to datetime, then the start sequence number will be based on the current date/time value as YYYYmmddHHMMSS. e.g. 20161231235659. Hls speficication allows 64 bit integers as sequence numbers. This patch also changes some code where only 32 bit integer values were handled correctly. Reviewed-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* lavf/dss: Support version 3 files / files with larger header.Carl Eugen Hoyos2017-01-11
| | | | Fixes ticket #6072.
* avcodec: add Newtek SpeedHQ decoderSteinar H. Gunderson2017-01-11
| | | | | | | | | | | | | | This decoder can decode all existing SpeedHQ formats (SHQ0–5, 7, and 9), including correct decoding of the alpha channel. 1080p is decoded in 142 fps on one core of my i7-4600U (2.1 GHz Haswell), about evenly split between bitstream reader and IDCT. There is currently no attempt at slice or frame threading, even though the format trivially supports both. NewTek very helpfully provided a full set of SHQ samples, as well as source code for an SHQ2 encoder (not included) and assistance with understanding some details of the format.
* avformat/hlsenc: fix the bug when the largest segment duration pointer right ↵Steven Liu2017-01-11
| | | | | | | | | | value is 0 when the segments largest duration value is look like 4.000000, the EXT-X-TARGETDURATION value should equ 4. it's wrong when hlsenc use ceil, so fix it. Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/hlsenc: fix hls start and tail segment durationSteven Liu2017-01-11
| | | | | | | | | problem fix ticket: #6067 Tested-by: Pero Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/riff: extend MagicYUV fourcc listPaul B Mahol2017-01-07
| | | | | | Newer version of encoder can create such files. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/matroskaenc: Regression fix for invalid MKV headerssoftworkz2017-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following three commits created a regression by writing initially invalid mkv headers: 650e17d88b63b5aca6e0a43483e89e64b0f7d2dd avformat/matroskaenc: write a CRC32 element on Tags 3bcadf822711720ff0f8d14db71ae47cdf97e652 avformat/matroskaenc: write a CRC32 element on Info ee888cfbe777cd2916a3548c750e433ab8f8e6a5 avformat/matroskaenc: postpone writing the Tracks master Symptoms: - You can no longer playback a file that is still processed by ffmpeg, e.g. VLC fails playback - You can no longer stream a file to a client while if is still being processed - Various diagnosing tools show header errors or incomplete headers (e.g. ffprobe, mediainfo, mkvalidator) Note: The symptoms do not apply to completed files or ffmpeg runs that were interrupted with 'q' Cause: The mentioned commits made changes in a way that some header elements are only partially written in mkv_write_header, leaving the header in an invalid state. Only in mkv_write_trailer, these elements are finished correctly, but that does only occur at the end of the process. Regression: Before these commits were applied, mkv headers have always been valid, even before completion of ffmpeg. This has worked reliably over many versions of ffmpeg, to it was an obvious regression. Bugtracker: This issue has been recorded as #5977 which is resolved by this patch Patch: The patch adds a new function 'end_ebml_master_crc32_preliminary' that preliminarily finishes the ebml element without destroying the buffer. The buffer can be used to update the ebml element later during mkv_write_trailer. But most important: mkv_write_header finishes with a valid mkv header again. Signed-off-by: James Almer <jamrial@gmail.com>
* libavformat/avio: Add avio_get_dyn_buf functionsoftworkz2017-01-07
| | | | | | | | | | | | | This commit adds the avio_get_dyn_buf function which allows accessing the content of a DynBuffer without destroying it. This is required in matroskaenc for preliminary writing (correct) mkv headers. Context for this change is fixing regression bug #5977. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* omadec: fix overflows during bit rate calculationAndreas Cadhalpun2017-01-06
| | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* avformat/test/fifo_muxer: add check for FailingMuxerPacketData allocSteven Liu2017-01-06
| | | | | | | CID: 1396257 Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/hlsenc: fix Explicit null dereferenced in hlsencSteven Liu2017-01-06
| | | | | | | | CID: 1398228 Passing null pointer dirname to strlen, which dereferences it. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* vformat/hlsenc: typo in default localtime patternBela Bodecs2017-01-05
| | | | | | | | in get_default_pattern_localtime_fmt the default pattern contains %Y%m%d%H%I%S but the original intention was %Y%m%d%H%M%S Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/hlsenc: fix memleak in hlsencSteven Liu2017-01-05
| | | | | | | | fix CID: 1398364 Resource leak refine the code of the new options Reviewed-by: Bodecs Bela <bodecsb@vivanet.hu> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/hlsenc: bugfix in duplicate filename detectionBela Bodecs2017-01-05
| | | | | | | | A wrong, unitialized variable is used for testing. This patch fixes this typo. Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* lavf/matroska: Fix the codec_id for mkv tag A_MPEG/L1.Carl Eugen Hoyos2017-01-04
| | | | When the mapping was originally added AV_CODEC_ID_MP1 did not exist.
* avformat/hlsenc: size and duration in segment filenamesBela Bodecs2017-01-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1st: This patch makes it possible to put actual segment file size (measured in bytes) and/or duration (calculated in microseconds) into segment filenames. This feature is useful when post-processing live streaming access log files. New behaviour works only when -use_localtime option is set and second_level_segment_size or/and second_level_segment_duration new hls_flags are specified. %%s is the placeholder for size and %%t for duration in hls_segment_filename option. Fix sized trailing zeropadding also works eg. %%09s or %%023t. A command to test new features: ./ffmpeg -loglevel info -y -f lavfi -i color=c=red:size=640x480:r=25 -f lavfi -i sine=f=440:b=4:r=44100 -c:v mpeg2video -g 25 -acodec aac -cutoff 20000 -ac 2 -ar 44100 -ab 192k -f hls -hls_time 3 -hls_list_size 5 -hls_flags second_level_segment_index+second_level_segment_size+second_level_segment_duration -use_localtime 1 -use_localtime_mkdir 1 -hls_segment_filename "segment_%Y%m%d%H%M%S_%%04d_%%08s_%%013t.ts" stream.m3u8 2nd: doc/muxers: beside second_level_segment_duration and second_level_segment_size, added some more details and example to hls_segment_filename, use_localtime, use_localtime_mkdir, hls_flags. hls_flags option list reformatted to table Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/avidec: clean-up identifier namesTobias Rapp2017-01-03
| | | | | Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/flvenc: Check for extradata allocation failureMichael Niedermayer2017-01-03
| | | | | | Fixes CID1396539 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/rtmphttp: fix bug for rtmphttpSteven Liu2017-01-02
| | | | | | | | | if the http server don't response the http command, then the thread will be blocked and never be interrupted. Reported-by: yinyunjiang <yinyunjiang1991@qq.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>