- 08 Apr, 2015 1 commit
-
-
wm4 authored
Generally, libavformat exports cover art pictures as video streams with 1 packet and AV_DISPOSITION_ATTACHED_PIC set. Only matroskadec exported it as attachment with codec_id set to AV_CODEC_ID_MJPEG. Obviously, this should be consistent, so change the Matroska demuxer to export a AV_DISPOSITION_ATTACHED_PIC pseudo video stream. Matroska muxing is probably incorrect too. I know that it can create broken files with an audio track and just 1 video frame when e.g. remuxing mp3 with APIC to mkv. But for now this commit does not change anything about muxing, and also continues to write attachments with AV_CODEC_ID_MJPEG should the muxer application have special knowledge that the Matroska is broken in this way. Signed-off-by: Anton Khirnov <anton@khirnov.net>
-
- 04 Apr, 2015 1 commit
-
-
wm4 authored
Generally, libavformat exports cover art pictures as video streams with 1 packet and AV_DISPOSITION_ATTACHED_PIC set. Only matroskadec exported it as attachment with codec_id set to AV_CODEC_ID_MJPEG. Obviously, this should be consistent, so change the Matroska demuxer to export a AV_DISPOSITION_ATTACHED_PIC pseudo video stream. Matroska muxing is probably incorrect too. I know that it can create broken files with an audio track and just 1 video frame when e.g. remuxing mp3 with APIC to mkv. But for now this commit does not change anything about muxing, and also continues to write attachments with AV_CODEC_ID_MJPEG should the muxer application have special knowledge that the Matroska is broken in this way. Fixes trac #4423. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
- 15 Mar, 2015 1 commit
-
-
Luca Barbato authored
Bug-Id: 833
-
- 30 Sep, 2014 1 commit
-
-
Clément Bœsch authored
-
- 09 Sep, 2014 1 commit
-
-
Clément Bœsch authored
-
- 28 Aug, 2014 2 commits
-
-
Michael Niedermayer authored
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Vittorio Giovara authored
Convert the Matroska stereo format to the Stereo3D format, and add a Stereo3D side data to the stream. Bump the doctype version supported. Bug-Id: 728 / https://bugs.debian.org/757185
-
- 24 Aug, 2014 1 commit
-
-
Paul B Mahol authored
Signed-off-by: Paul B Mahol <onemda@gmail.com>
-
- 01 May, 2014 1 commit
-
-
Anton Khirnov authored
-
- 29 Apr, 2014 1 commit
-
-
Nicolas George authored
Avoid long scan and "Could not find codec parameters for stream" error when an attachment has this type.
-
- 31 Oct, 2013 1 commit
-
-
Yusuke Nakamura authored
-
- 15 Oct, 2013 1 commit
-
-
Yusuke Nakamura authored
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
- 12 Sep, 2013 1 commit
-
-
Vignesh Venkatasubramanian authored
Removing the /EXPERIMENTAL suffix for codec id field for Opus. Doing this as the implementation of embedding Opus in Matroska is complete. Signed-Off By: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
- 19 Aug, 2013 1 commit
-
-
Matthew Heaney authored
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>
-
- 18 Apr, 2013 1 commit
-
-
Clément Bœsch authored
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
-
- 21 Feb, 2013 1 commit
-
-
Andrea3000 authored
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
- 01 Feb, 2013 1 commit
-
-
Allan Kristensen authored
-
- 24 Jan, 2013 1 commit
-
-
Carl Eugen Hoyos authored
This reverts 312645e0 : "Do not set codec_tag property for matroska muxers." Also adds dummy codec_tag lists with codecs supported in mkv but not in wav / avi. Fixes ticket #2169.
-
- 16 Jan, 2013 1 commit
-
-
Nicolas George authored
The exact packing of Opus inside Matroska is not finalized. Use A_OPUS/EXPERIMENTAL as codec name, like mkvtoolnix. The A_OPUS name stays to let ffmpeg open files it has produced until now, but newly produced file use the EXPERIMENTAL version. Once the spec is stabilized it will be possible to consider options to ensure compatibility with these files.
-
- 14 Jan, 2013 1 commit
-
-
Tom Finegan authored
-
- 06 Jan, 2013 1 commit
-
-
Diego Biurrun authored
Snow is a toy codec with no real-world use and horrible code.
-
- 19 Sep, 2012 2 commits
-
-
Luca Barbato authored
Support Matroska native formatting. On demuxing prepend a Frame container atom (32bit big endian encoded frame size and 'icpf' string). On muxing remove it.
-
Moritz Bunkus authored
Support Matroska native formatting. On demuxing reconstruct the 36-bytes QuickTime atom that the ALAC decoder expects by prepending the "atom size", "tag" and "tag version" fields missing from the Matroska's CodecPrivate element. On muxing remove the initial 12 bytes Sample files are available: http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska.mka and the CoreAudio file it was created from with today's mkvmerge: http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska-source.cafSigned-off-by: Luca Barbato <lu_zero@gentoo.org>
-
- 16 Sep, 2012 1 commit
-
-
Clément Bœsch authored
-
- 10 Sep, 2012 1 commit
-
-
Sébastien Brochet authored
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
- 25 Aug, 2012 1 commit
-
-
Philip Langdale authored
While not explicitly stated in the specs, the original author has stated that S_TEXT/UTF-8 is expected to be text using Subrip markup, but without Subrip in-band timing. So, now that we have a decoder that conforms to this expectation, let's use it. Note that this change will impact tools that use libavformat. If they expect srt subtitles to have CODEC_ID_TEXT, they must be adjusted to expect CODEC_ID_SUBRIP. The actual content is, obviously, unchanged. Signed-off-by: Philip Langdale <philipl@overt.org>
-
- 07 Aug, 2012 1 commit
-
-
Anton Khirnov authored
-
- 05 Aug, 2012 1 commit
-
-
Moritz Bunkus authored
This patch implements support reading ALAC from Matroska files. The only non-trivial thing about it is that only the ALAC magic cookie is stored in Matroska's CodecPrivate element but not the "atom size", "tag" and "tag version" fields that FFMPEG's ALAC decoder expects. However, those are trivial to re-create. Sample files are available: http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska.mka and the CoreAudio file it was created from with today's mkvmerge: http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska-source.cafSigned-off-by: Michael Niedermayer <michaelni@gmx.at>
-
- 20 Jul, 2012 1 commit
-
-
Nicolas George authored
Opus in Matroska is still a draft.
-
- 24 May, 2011 1 commit
-
-
Aurelien Jacobs authored
-
- 23 May, 2011 1 commit
-
-
Aurelien Jacobs authored
-
- 19 Mar, 2011 1 commit
-
-
Mans Rullgard authored
Signed-off-by: Mans Rullgard <mans@mansr.com>
-
- 25 Jul, 2010 1 commit
-
-
Aurelien Jacobs authored
Originally committed as revision 24503 to svn://svn.ffmpeg.org/ffmpeg/trunk
-
- 19 May, 2010 1 commit
-
-
Google authored
Patch by Google Originally committed as revision 23192 to svn://svn.ffmpeg.org/ffmpeg/trunk
-
- 12 Mar, 2010 1 commit
-
-
Aurelien Jacobs authored
Originally committed as revision 22492 to svn://svn.ffmpeg.org/ffmpeg/trunk
-
- 01 Feb, 2010 1 commit
-
-
Anton Khirnov authored
Patch by Anton Khirnov, wyskas at gmail dot com Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
-
- 27 Jan, 2010 1 commit
-
-
Carl Eugen Hoyos authored
Patch sent to mailing list by Taylor Ralph, taylor D ralph A gmail Originally committed as revision 21491 to svn://svn.ffmpeg.org/ffmpeg/trunk
-
- 30 Mar, 2009 1 commit
-
-
Aurelien Jacobs authored
Originally committed as revision 18254 to svn://svn.ffmpeg.org/ffmpeg/trunk
-
- 01 Mar, 2009 1 commit
-
-
Aurelien Jacobs authored
Add missing const qualifiers for metadata_conv in AV{In|Out}putFormat. Originally committed as revision 17671 to svn://svn.ffmpeg.org/ffmpeg/trunk
-
- 12 Dec, 2008 1 commit
-
-
Aurelien Jacobs authored
Originally committed as revision 16081 to svn://svn.ffmpeg.org/ffmpeg/trunk
-