FFmpeg

Commit Graph

Author	SHA1	Message	Date
Martin Storsjö	5bcd3ae5b1	matroskadec: Check that .lang was allocated and set before reading it Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>	12 years ago
Matthew Heaney	818ebe930f	avformat/matroskadec: add WebVTT support WebM files now support inband text tracks, as described in the following specification: http://wiki.webmproject.org/webm-metadata/temporal-metadata/webvtt-in-webm The Matroska demuxer now detects the presence of WebVTT tracks, synthesizing WebVTT packets (having codec id AV_CODEC_ID_WEBVTT) and pushing them downstream in the normal way. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	338f8b2eaf	avformat/matroskadec: check out_samplerate before using it in av_rescale() Prevent assertion failure with damaged input Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
James Almer	af248fa117	matroskadec: Improve TTA duration calculation Calculate the duration as accurately as possible to improve decoding of samples where the last frame is smaller than the rest. Example: Take lossless-audio/luckynight-partial.tak from the FATE suit and convert it to TTA muxed into matroska: ffmpeg -i $(SAMPLES)/lossless-audio/luckynight-partial.tak -c:a tta lucky.mka The framemd5 output for lucky.mka without this patch: 0, 0, 0, 46080, 184320, 7c3751ddd571d2903c3cf0ab4b3e3d0a 0, 46080, 46080, 46080, 184320, 6b70c782ba1da3f933fde2daa4f96b73 0, 92160, 92160, 46080, 184320, dcf70d89c54b9a4f0b302d4ec4fb302d 0, 138240, 138240, 46080, 184320, 48713ca38b388d2ea4abf5b86ed1226f 0, 184320, 184320, 46080, 184320, 12188a23648e7ebfb07cd6fe9197b2ea 0, 230400, 230400, 46080, 184320, 49653ab8186a5d4a044ed284671a26e0 0, 276480, 276480, 46080, 184320, 5e82c6a7fe58c7ea612c03a0a2927dd4 0, 322560, 322560, 46080, 184320, 83dc449dbd9eab5f2e8ad2b4403d6a21 0, 368640, 368640, 46080, 184320, bdd6b92c23d30978d4e802d305b0fc49 With this patch: 0, 0, 0, 46080, 184320, 7c3751ddd571d2903c3cf0ab4b3e3d0a 0, 46080, 46080, 46080, 184320, 6b70c782ba1da3f933fde2daa4f96b73 0, 92160, 92160, 46080, 184320, dcf70d89c54b9a4f0b302d4ec4fb302d 0, 138240, 138240, 46080, 184320, 48713ca38b388d2ea4abf5b86ed1226f 0, 184320, 184320, 46080, 184320, 12188a23648e7ebfb07cd6fe9197b2ea 0, 230400, 230400, 46080, 184320, 49653ab8186a5d4a044ed284671a26e0 0, 276480, 276480, 46080, 184320, 5e82c6a7fe58c7ea612c03a0a2927dd4 0, 322560, 322560, 46080, 184320, 83dc449dbd9eab5f2e8ad2b4403d6a21 0, 368640, 368640, 46080, 184320, bdd6b92c23d30978d4e802d305b0fc49 0, 414720, 414720, 4230, 16920, b50b440c5bbcecb8e9fbece643447593 The duration without this patch was calculated as 418950000000, which is bigger than uint32_t and as such stored as 2338172288. With this patch the duration is correctly calculated as 418950. Signed-off-by: James Almer <jamrial@gmail.com> Approved-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	62cf5c114a	avformat/matroskadec: make sipr_bit_rate static const Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	6158a3bcdf	avformat/matroskadec: Detect conflicting sample rate/default_duration Fixes Ticket2508 Thanks-to: Moritz Bunkus Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Sean McGovern	8835c554ff	matroskadec: introduce resync function. This allows handling matroska files with errors. Fixes test4.mkv and test7.mkv from the official Matroska test suite, and by extension Bugzilla #62. Based on a patch by Reimar Doffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Anton Khirnov <anton@khirnov.net>	12 years ago
Paul B Mahol	9644fc95be	matroskadec: move ALAC extradata creation bellow AAC one Signed-off-by: Paul B Mahol <onemda@gmail.com>	12 years ago
Michael Niedermayer	2fe4b6210c	matroskadec: fix memleak of pkt_data Fixes: CID1026767 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	0722b4d08c	matroskadec: favor av_freep() av_freep() is safer as it zeros the pointer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Anton Khirnov	9b6f47c448	matroskadec: export full wavpack blocks. This allows us to get rid of demuxer-specific hacks in the decoder and will allow streamcopy from matroska once we have a wavpack muxer.	12 years ago
Anton Khirnov	564b7e0c00	matroskadec: silently skip CodecState element. mkvmerge apparrently uses it for mpeg1/2 video, but it contains the same information as CodecPrivate, so it can be ignored.	12 years ago
Michael Niedermayer	4758e32a6c	matroska_read_seek: Fix used streams for subtitle index compensation Might fix Ticket1907 (I have no testcase so i cant test) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	729fa55b8f	avformat/matroskadec: fix integer overflow Fixes fate-mkv with ekopath 4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Reimar Döffinger	762d4335ae	matroska: set "done" only during resync fail. Fixes playback of test7.mkv validation test file. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	12 years ago
Diego Biurrun	e0f8be6413	avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate	12 years ago
Clément Bœsch	7c1a002c78	subtitles: introduce ASS codec id and use it. Currently, we have a AV_CODEC_ID_SSA, which matches the way the ASS/SSA markup is muxed in a standalone .ass/.ssa file. This means the AVPacket data starts with a "Dialogue:" string, followed by a timing information (start and end of the event as string) and a trailing CRLF after each line. One packet can contain several lines. We'll refer to this layout as "SSA" or "SSA lines". In matroska, this markup is not stored as such: it has no "Dialogue:" prefix, it contains a ReadOrder field, the timing information is not in the payload, and it doesn't contain the trailing CRLF. See [1] for more info. We'll refer to this layout as "ASS". Since we have only one common codec for both formats, the matroska demuxer is constructing an AVPacket following the "SSA lines" format. This causes several problems, so it was decided to change this into clean ASS packets. Some insight about what is changed or unchanged in this commit: CODECS ------ - the decoding process still writes "SSA lines" markup inside the ass fields of the subtitles rectangles (sub->rects[n]->ass), which is still the current common way of representing decoded subtitles markup. It is meant to change later. - new ASS codec id: AV_CODEC_ID_ASS (which is different from the legacy AV_CODEC_ID_SSA) - lavc/assdec: the "ass" decoder is renamed into "ssa" (instead of "ass") for consistency with the codec id and allows to add a real ass decoder. This ass decoder receives clean ASS lines (so it starts with a ReadOrder, is followed by the Layer, etc). We make sure this is decoded properly in a new ass-line rectangle of the decoded subtitles (the ssa decoder OTOH is doing a simple straightforward copy). Using the packet timing instead of data string makes sure the ass-line now contains the appropriate timing. - lavc/assenc: just like the ass decoder, the "ssa" encoder is renamed into "ssa" (instead of "ass") for consistency with the codec id, and allows to add a real "ass" encoder. One important thing about this encoder is that it only supports one ass rectangle: we could have put several dialogue events in the AVPacket (separated by a \0 for instance) but this would have cause trouble for the muxer which needs not only the start time, but also the duration: typically, you have merged events with the same start time (stored in the AVPacket->pts) but a different duration. At the moment, only the matroska do the merge with the SSA-line codec. We will need to make sure all the decoders in the future can't add more than one rectangle (and only one Dialogue line in it obviously). FORMATS ------- - lavf/assenc: the .ass/.ssa muxer can take both SSA and ASS packets. In the case of ASS packets as input, it adds the timing based on the AVPacket pts and duration, and mux it with "Dialogue:", trailing CRLF, etc. - lavf/assdec: unchanged; it currently still only outputs SSA-lines packets. - lavf/mkv: the demuxer can now output ASS packets without the need of any "SSA-lines" reconstruction hack. It will become the default at next libavformat bump, and the SSA support will be dropped from the demuxer. The muxer can take ASS packets since it's muxed normally, and still supports the old SSA packets. All the SSA support and hacks in Matroska code will be dropped at next lavf bump. [1]: http://www.matroska.org/technical/specs/subtitles/ssa.html	12 years ago
Michael Niedermayer	3b93bea9e3	matroskadec: Check EBML lace sizes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	115c3bc41f	matroskadec: Check for overflows in xiph lace decoding This also detects errors earlier Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	14de77d677	matroskadec: fix return code for too long xiph laces Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	f51ce34e5e	matroskadec: fix display_width/height = 0 handling Fixes Ticket2424 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Luca Barbato	25a80a931a	matroska: pass the lace size to the matroska_parse_rm_audio Each lace must be independent according to the specification. Fix heap-buffer-overflow in matroska_parse_block for corrupted real media in mkv files. Stricter check than `fc43c19a56` CC: libav-stable@libav.org	12 years ago
Luca Barbato	8a96df7b70	matroska: fix a corner case in ebml-lace parsing Make sure we notice when the lace_size[n] is a negative value. CC: libav-stable@libav.org	12 years ago
Dale Curtis	fc43c19a56	matroska: Update the available size after lace parsing Fix heap-buffer-overflow in matroska_parse_block for corrupted real media in mkv files. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	12 years ago
Dale Curtis	81e85bc95c	Fix heap-buffer-overflow in matroska_parse_block Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	ac75e0c755	matroskadec: switch to av_assert Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Frank Galligan	b853103fe0	matroskadec: Add support for parsing Matroska ContentEncKeyID This patch adds the enums for the ContentEncryption elements. This patch also adds support for parsing the ContentEncKeyID. The ContentEncKeyID is then base64 encoded and stored in the stream's metadata. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	fdda9b440c	matroska_parse_frame: fix memleak Fixes CID991856 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	70c0ae915d	matroskadec: avoid integer overflow Found-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Luca Barbato	37cb3b180a	matroskadec: request a read buffer for the wav header Solve an infiniloop. CC: libav-stable@libav.org	12 years ago
Anton Khirnov	85a5bc054c	lavf: remove disabled FF_API_R_FRAME_RATE cruft	12 years ago
Anton Khirnov	1afddbe59e	avpacket: use AVBuffer to allow refcounting the packets. This will allow us to avoid copying the packets in many cases. This breaks ABI.	12 years ago
Vignesh Venkatasubramanian	003be0a9c3	Removing network.h from matroskadec.c Removing accidentally added include file. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Vignesh Venkatasubramanian	ce6a8e5947	Adding AlphaMode element to Matroska Parser Adding support for parsing AlphaMode element in the Track header and export that information as a metadata tag. This flag indicates presence of alpha channel data in BlockAdditional element. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	a08ebf04b1	matroskadec: simplify additional_id writing code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Vignesh Venkatasubramanian	30c5c45b12	Adding support for parsing BlockAdditional Matroska specification lists support for BlockAdditional element which is not supported by ffmpeg's matroska parser. This patch adds grammar definitions for parsing that element (and few other related elements) and then puts the data in AVPacket.side_data with new AVPacketSideDataType AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	7c00d853a6	matroskadec: support seek to non keyframes Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Paul B Mahol	dd5689a3bd	matroskadec: export codec bits_per_coded_sample Fixes -codec copy with TTA from matroska to matroska. Signed-off-by: Paul B Mahol <onemda@gmail.com>	12 years ago
Dale Curtis	ae3d416369	matroska: Fix use after free Signed-off-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	12 years ago
Michael Niedermayer	d0b450457b	matroskadec: fix ffio_init_context() usage Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	5e1bacf2d4	matroskadec: reset size when freeing data. Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	0efcf16a3e	replace av_log(0, by av_log(NULL, The first parameter is a pointer and NULL is more correct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	c2ca0163af	matroskadec: check h in generic rm packet shuffler Fixes crash Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	c63e76ba35	ebml_read_binary: use fast_padded_malloc() Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Anton Khirnov	34871beb5e	matroskadec: do not use avpacket internals	12 years ago
Diego Biurrun	2a91ada828	avutil: Make LZO decoder code configure-time selectable	12 years ago
Michael Niedermayer	2c5b92fe90	matroskadec: fix double negation typo Fixes CID602563 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	1116491c53	matroska_parse_rm_audio: check for malloc failure Fixes CID733712 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Diego Biurrun	7e68c91e24	rmdec: Move SIPR code shared with Matroska demuxer to a separate file	12 years ago
Anton Khirnov	87b017a298	matroskadec: fix a sanity check.	13 years ago

1 2 3 4 5 ...

489 Commits (cd6241b5dfb137178b16ceec2adc225f5a30eec8)