Anton Khirnov
9f61abc811
lavf: allow custom IO for all files
...
Some (de)muxers open additional files beyond the main IO context.
Currently, they call avio_open() directly, which prevents the caller
from using custom IO for such streams.
This commit adds callbacks to AVFormatContext that default to
avio_open2()/avio_close(), but can be overridden by the caller. All
muxers and demuxers using AVIO are switched to using those callbacks
instead of calling avio_open()/avio_close() directly.
(de)muxers that use the URLProtocol layer directly instead of AVIO
remain unconverted for now. This should be fixed in later commits.
9 years ago
Michael Niedermayer
b750b67d13
avformat/img2dec: Use AVOpenCallback
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
7ccedc1c78
avformat/img2dec: do not interpret the filename by default if a IO context has been opened
...
With this, user applications which use custom IO and have set a IO context will not have
their already opened IO context ignored and glob/seq being interpreted
Comments and tests from maintainers of user apps are welcome!
Liked-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
e70d56b8ad
avformat/img2dec: Reuse main IO context instead of reopening a single file
...
Fixes part of Ticket4849
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
e9e8782202
avformat/img2dec: Skip checking the input files existence if it has already been opened
...
Avoids a unneeded open
Fixes part of Ticket4849
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Clément Bœsch
43ecec0f03
avformat: use AV_OPT_TYPE_BOOL in a bunch of places
9 years ago
Luca Barbato
ce70f28a17
avpacket: Replace av_free_packet with av_packet_unref
...
`av_packet_unref` matches the AVFrame ref-counted API and can be used as
a drop in replacement.
Deprecate `av_free_packet`.
9 years ago
Ganesh Ajjanagadde
26e8895b73
all: add _DEFAULT_SOURCE locally wherever needed
...
Glibc 2.20 onwards generates a deprecation warning for usage of _BSD_SOURCE and _SVID_SOURCE.
The solution from man feature_test_macros is to define both _DEFAULT_SOURCE and the old macros.
This solution is on the lines of the one in commit af1818276e
.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years ago
Przemysław Sobala
01dd7e025c
lavf/img2dec: Fix memory leak
...
Fixes #4886
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Carl Eugen Hoyos
e3e55758dc
lavf/img2dec: Improve jpeg auto-detection.
...
Fixes ticket #4841 .
9 years ago
Carl Eugen Hoyos
dee7943819
lavf/img2dec: Improve detection of valid Quickdraw images.
...
Detect Quickdraw images without application header with
lower score.
10 years ago
Carl Eugen Hoyos
a876a4da4a
lavf/img2dec: Autodetect dds frames.
10 years ago
Marton Balint
93cc5ca7ed
lavf/img2dec: add option to disable pattern matching
...
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Carl Eugen Hoyos
2279de6eca
lavf/img2dec: Autodetect qdraw images.
10 years ago
Michael Niedermayer
e6e8cc8ce9
avformat/img2dec: do not rewind custom io buffers
...
Fixes double free with some applications
Fixes vlc ticket14121
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Diego Biurrun
daf8cf358a
avformat: Don't anonymously typedef structs
10 years ago
Timothy Gu
e66a187638
img2dec: Remove dead code
...
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
e005dc621a
avformat: fix mode of img2dec.c and utils.c
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Liviu Oniciuc
b37858eae1
avformat/img2dec: remove the non-negative number requirement for start_number option
...
industrial cameras usually mark the trigger frame as frame number 0
all frames saved before trigger frame receive a negative sequence number
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Christophe Gisquet
9a9b088d9e
libavformat/img2dec: fix warning when !HAVE_GLOB
...
Variables are unused in this case.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Vittorio Giovara
456ffec35d
img2dec: correctly use the parsed value from -start_number
...
Previously the image sequence was always starting from the minimum
number rather than the requested one.
CC: libav-stable@libav.org
10 years ago
Carl Eugen Hoyos
cd3405282c
Skip Exif data when auto-detecting jpeg images.
10 years ago
Michael Niedermayer
26c72d2941
avformat/img2dec: Use avio_closep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
41ee459e88
avformat/img2dec: check w/h in dpx_probe
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Vittorio Giovara
f1ed83e23a
img2dec: check av_new_packet return value
...
CC: libav-stable@libav.org
Bug-Id: CID 1087077
10 years ago
Alexander Strasser
e079d43af8
avformat/img2dec: Attempt to detect non-escaped glob patterns too (-pattern_type glob)
...
Fixes ticket #3948
Based-on-patch-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
684508ba15
avformat/img2dec: Support -loop with pipes
...
Fixes Ticket3976
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
97cb9b6cbb
Revert "avformat/img2dec: reduce bmppipe probe score"
...
This seems not needed anymore
This reverts commit 321c3cd1a9
.
Found-by: carl
10 years ago
Carl Eugen Hoyos
88c937fdc8
Autodetect jpg images.
...
Based on 2d3842f5
by Michael Niedermayer.
Fixes ticket #2541 .
10 years ago
Michael Niedermayer
ce6e46be72
avformat/img2dec: enable generic seeking for image pipes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
6d35aba167
avformat/img2dec: initialize pkt->pos for image pipes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
2497914a18
avformat/img2dec: pass error code and signal EOF
...
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
1dbdcb4a8c
avformat/img2dec: fix error code at EOF for pipes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
b3fd2b175c
avformat/img2dec: Fail probing when no data is yet available and the filename contains no number/glob patterns either.
...
Fixes Ticket3901
the seek test error codes change due to a change in the failure path,
this could be avoided by changing the respective error codes to EINVAL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
321c3cd1a9
avformat/img2dec: reduce bmppipe probe score
...
bmp pipe needs the bmp parser which is not bug free and should thus not be favored
over the bmp image2 demuxer
that also means this change could be reverted in case bmp pipe is improved so it
handles all single bmp images correctly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
5303a644f5
avformat/img2: Make AVOptions available to img* demuxers defined in other files
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Reimar Döffinger
2c0454cd20
Add missing initialization for AVProbeData.
...
This has become necessary since the new mime field was added.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Carl Eugen Hoyos
273fc0139e
lavf/img2dec: Initialize a stack variable.
...
Fixes a valgrind warning about using unitialised memory.
Hopefully fixes crashes on several platforms reported through fate.
10 years ago
Carl Eugen Hoyos
4b63bcef90
Autodetect jpeg-ls files.
10 years ago
Carl Eugen Hoyos
f73d75384f
Autodetect webp files.
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
Carl Eugen Hoyos
050d79b6dd
Autodetect big-endian tiff files.
10 years ago
Andreas Cadhalpun
135ea609ce
libavformat/img2dec.c: Add a long_name to the piped image demuxers
...
This fixes segfaults in gst-libav1.0 compiled against FFmpeg 2.3.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
d1a8659efe
avformat/img2dec: remove functions from image pipe which are unneeded for image pipes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c277ab6b78
avformat/img2dec: improve bmp probe
...
fix probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d36fe733c1
avformat/img2dec: increase probe buffer to 2k
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0437445926
avformat/img2dec: set AVProbeData size correctly on corner cases of tiny files
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6691eee48c
avformat/img2dec: avoid seekback on probeing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
726e253b00
avformat/img2dec: allocate and clear padding area for probe correctly
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
4c145b692c
Autodetect JPEG2000 imagess.
...
Autodetection of jp2 files does not work yet, the files are detected
as mov.
11 years ago