Vittorio Giovara
3c1199c3c4
matroskadec: fix leak on error
...
CC: libav-stable@libav.org
Bug-Id: CID 1026767
10 years ago
Michael Niedermayer
a39201818f
avformat/matroskadec: Fix cluster parsing loop which gathers seek information
...
Fixes Ticket2263
Fixes Ticket3934
Reviewed-by: Rodger Combs <rodger.combs@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Vignesh Venkatasubramanian
233f3ad869
lavf/webm_dash: Allow filenames without directories
...
Fix basename computation code to allow just file names without any
directories in the path.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
be695ee389
avformat/matroskadec: do not trust the default duration to be the real 1/timebase if its less than 5fps
...
Fixes Ticket3980
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Vignesh Venkatasubramanian
b1071db3df
lavf/webm_dash: Fix incorrect bandwidth computation
...
Fix incorrect bandwidth computation in some cases. When the cue end
descriptor is null (i.e.) start_time_ns == -1, existing bandwidth
computed (if any) should be returned rather than returning 0.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Vignesh Venkatasubramanian
8acb76567a
lavf/webm_dash: fix hardcode in cues_end computation
...
Fix an incorrect hard code in cues_end computation. Updating the fate
test reference files related to the fix as well. The earlier computation
was clearly wrong as the cues_end field was greater than the file size
itself in some cases.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Clément Bœsch
c7d8dbad14
avformat: remove FF_API_ASS_SSA dead code
10 years ago
Michael Niedermayer
37520a91ac
avformat: drop redundant MATROSKA_VIDEO_STEREO_MODE_COUNT identifier
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Vittorio Giovara
d4ae8ac92f
matroskadec: parse stereo mode on decoding
...
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
10 years ago
Vittorio Giovara
f2583bc86e
matroska: list supported extensions
10 years ago
Vignesh Venkatasubramanian
080acf7771
lavf/matroskadec: Ensure cues_end is initialized
...
Ensure that cues_start and cues_end are always initialized and
the webm_dash_manifest_cues function returns appropriate error if
they are not computed correctly.
This fixes coverity defect CID1231991.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Reimar Döffinger
a0941c8a2b
Use new av_dict_set_int helper function.
...
Get rid of the many, slightly differing, implementations
of basically the same thing.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Michael Niedermayer
81a663f49e
Drop remaining unneeded != NULL
...
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Gabriel Dume
4b1f5e5090
cosmetics: Write NULL pointer inequality checks more compactly
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
10 years ago
Gabriel Dume
f929ab0569
cosmetics: Write NULL pointer equality checks more compactly
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
10 years ago
Justin Jacobs
87dc8b3af9
avformat/matroskadec: Check avpriv_new_chapter() for failure
...
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
James Almer
d34ec64a22
replace calls to url_feof() with avio_feof()
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Luca Barbato
fa38573cd9
matroska: Register mime types
10 years ago
Michael Niedermayer
e240d01c12
avformat/matroskadec: fix declaration after statement
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Vignesh Venkatasubramanian
5a20656946
lavf/matroska: Add functions for WebM DASH Manifest
...
Add functions and logic to matroskadec for use by the WebM DASH Manifest
XML Muxer. The actual muxer is added in a future patch.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
98569d8963
matroskadec: Fix a double negation typo
...
This typo has existed since this code was added in c16582579
.
Newer versions of clang pointed out that this comparison always
was true (since the result of the negation is either 0 or 1, while
AVDISCARD_ALL has the value 48).
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Diego Biurrun
73953df71a
Replace av_malloc() and memset(0) by av_mallocz()
11 years ago
Michael Niedermayer
b3dfebd641
avformat/matroskadec: fix off by 1 error in matroska_read_seek()
...
Fixes out of array read
Fixes: vp9-opus-crash.webm
Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anton Khirnov
23f741f793
matroskadec: parse the channel layout mask for FLAC
...
It is commonly stored in a vorbiscomment block in codec private data.
11 years ago
Anton Khirnov
4efdadc8ec
matroskadec: export just the STREAMINFO block as FLAC extradata
...
It contains all information that is used by the decoder and the other
FLAC-capable demuxers (flacdec, ogg) export only STREAMINFO as well.
11 years ago
Anton Khirnov
6df478bf89
matroskadec: split parsing tracks into a separate function
11 years ago
Anton Khirnov
eb3b5501e8
matroskadec: read the CodecDelay element
11 years ago
Carl Eugen Hoyos
ade5851be0
Try mov tags if the fourcc in V_MS/VFW mkv files cannot be found in bmp tags.
...
Fixes decoding of broken mkv files containing ProRes video from ticket #3434 .
11 years ago
Carl Eugen Hoyos
6c18200c2f
Only insert the icpf atom in ProRes mkv packets if it isn't already present.
...
The patch allows to read broken mkv files containing ProRes as written by
the Haali muxer.
Fixes a part of ticket #3434 .
11 years ago
Carl Eugen Hoyos
3d5c859fa6
Set Matroska private data when muxing Prores.
...
The specification requires the mov code point to be written as "fourcc".
11 years ago
Diego Biurrun
d92024f18f
lavf: more correct printf format specifiers
11 years ago
Diego Biurrun
f69befe5ee
matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo
11 years ago
Keiji Costantini
84cfce9f99
matroskadec: K&R formatting cosmetics
...
Also sort #includes into canonical order.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
11 years ago
Carl Eugen Hoyos
96fc2908f0
Read bits_per_coded_sample from V_MS/VFW/FOURCC mkv files.
...
Fixes ticket #3425 .
11 years ago
Michael Niedermayer
9d13432a90
avformat/matroskadec: identify SMI as SVQ3
...
Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
48218580e1
avformat/matroskadec: support QDM2 as generated by mkvtoolnix-6.7.0
...
Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5800b08572
avformat/matroskadec: support SVQ3 as generated by mkvtoolnix-6.6.0
...
Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
1132937077
Do not read mkv audio bit_depth if bits_per_coded_sample is already set.
...
This allows decoding broken mkv files containing G.726 audio.
11 years ago
Michael Niedermayer
a1ed1c2193
avformat/matroskadec: check generic audio deinterleaver sub_packet_size against frame_size
...
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f67d052a530_7517_nosound.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
2c759d7018
matroskadec: Export the MuxingApp element value as metadata
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
0d944ee343
matroskadec: Fix bug when parsing realaudio codec parameters
...
flavor can be 0.
This fixes tract ticket #3214
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Alex Sukhanov
251c96a70b
avformat/matroskadec: Fix start_time
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Aurelien Jacobs
8b516f154a
matroskadec: use correct compression parameters for current track CodecPrivate
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Anton Khirnov
30be1ea33e
matroskadec: pad EBML_BIN data.
...
It might be passed to code requiring padding, such as lzo decompression.
Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
11 years ago
Jan Gerber
8cc59ec881
lavf/matroskadec ReferenceBlock is a signed integer
...
according to the Matroska Specification
ReferenceBlock is a signed integer too.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Jan Gerber
f4b1ca99ff
lavf/matroska*: DiscardPadding is a signed integer
...
according to the Matriska Specification
http://matroska.org/technical/specs/index.html
DiscardPadding is a signed integer.
Tested-by: Jan Gerber <j@v2v.cc>
Tested-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cddd15ba5c
avformat/matroska: simplify signed int access code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Jan Gerber
d03eea36b2
lavf/matroska*: add support for signed integers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Yusuke Nakamura
959bea13ce
matroskadec: Support HEVC demuxing
11 years ago
Yusuke Nakamura
16b6839de6
lavf/matroskadec: Support HEVC demuxing.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago