Commit Graph
79 Commits
Author SHA1 Message Date
Thilo BorgmannandMichael Niedermayer f2254e36c0 lavd/avfoundation: Use microseconds as common timebase.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 12:13:57 +02:00
Thilo BorgmannandMichael Niedermayer 1ea7a3e04e lavd/avfoundation: Simplify debug message generation.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 05:05:31 +02:00
Thilo BorgmannandMichael Niedermayer 92827e1869 lavd/avfoundation: Using the actual stream index instead of hardcoded value.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 05:05:11 +02:00
Thilo BorgmannandMichael Niedermayer a69c70e148 lavd/avfoundation: Split adding a device and getting the device configuration into separate functions.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 04:18:24 +02:00
Thilo BorgmannandMichael Niedermayer e113692c89 lavu/ffmpeg_opt: Check return value of avcodec_find_encoder().
Prevents a segfault if a stream featuring a known but unavailable codec (like external lib codec) should be opened.

Bug found by: Jonas Geistert <j.geistert@yahoo.de>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 18:03:09 +02:00
Thilo BorgmannandMichael Niedermayer 86b7821e29 lavd/avfoundation: Add device category.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 01:36:26 +02:00
Thilo BorgmannandMichael Niedermayer c740e083bc configure: Fail on missing prototypes in check_oc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 13:30:40 +02:00
Thilo BorgmannandMichael Niedermayer fdaf8372c2 configure: Check for generated output in check_header_oc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07 05:11:47 +02:00
Thilo BorgmannandMichael Niedermayer 33462542cf configure: Add workaround for qtkit detection using ICC compiler.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06 15:52:31 +02:00
Thilo BorgmannandMichael Niedermayer ec8789ac63 Reindent after last commit.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05 03:32:11 +02:00
Thilo BorgmannandMichael Niedermayer 2f08dad028 lavf/avidec: Read metadata EXIF tags from AVIF tag. Based on patch by Gregory Wolfe (Kodak Alaris) <gregory.wolfe@kodakalaris.com>.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05 03:32:06 +02:00
Thilo BorgmannandMichael Niedermayer 8c161d7884 lavc/exif: Make EXIF IFD decoding part of private API/ABI.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05 03:31:56 +02:00
Thilo BorgmannandMichael Niedermayer 4654774aaf lavd/qtkit: Support choosing the input device by index or by name.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02 22:40:32 +02:00
Thilo BorgmannandMichael Niedermayer d5c0036d4a lavd/qtkit: Fix non-constant initializer element for some clang compilers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 22:21:07 +02:00
Thilo BorgmannandMichael Niedermayer a9ccec5270 configure: Remove invalid option --disable-qtkit.
QTKit can/should be disabled by "--disable-indev=qtkit".

Found by Justin Derrick.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 13:14:39 +02:00
Thilo BorgmannandMichael Niedermayer 6d9bdd9d8b doc/indevs: Fix example for QTKit usage.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-30 21:29:25 +02:00
Thilo BorgmannandMichael Niedermayer d3a03d90a3 configure: fix logic for threads in case of OpenCL is enabled. Fixes ticket 3004.
Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-01 18:31:21 +02:00
Thilo BorgmannandPaul B Mahol d814a839ac Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
Thilo BorgmannandMichael Niedermayer ffa18de2e6 configure: Add exif to CONFIG_EXTRA.
Add exif as a common component in CONFIG_EXTRA in order to avoid many
dependencies to 'exif.o tiff_common.o' in lavc/Makefile.
2013-08-21 19:00:48 +02:00
Thilo BorgmannandMichael Niedermayer 78d2a781d0 fate: Add EXIF test. 2013-08-20 18:47:20 +02:00
Thilo Borgmann 6a64b23d93 Update my email address. 2013-08-13 15:45:08 +02:00
Thilo BorgmannandMichael Niedermayer bb4e1b4cf9 avcodec/mjpegdec: Read EXIF metadata in JPEG input.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-13 00:30:34 +02:00
Thilo BorgmannandMichael Niedermayer ad0f7574ef avcodec: Add EXIF metadata parser to libavcodec.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-13 00:30:20 +02:00
Thilo BorgmannandMichael Niedermayer b7ba7cbd6e avcodec/tiff: Refactor TIFF tag related functions to share the code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-13 00:30:02 +02:00
Thilo BorgmannandMichael Niedermayer f18ccb529f Fix wrong use of "an" in some comments. 2013-08-12 03:27:26 +02:00
Thilo BorgmannandMichael Niedermayer 4dcb2f7478 lavu: fix grammar in doxy for av_frame_ref.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-11 00:40:48 +02:00
Thilo BorgmannandPaul B Mahol 4a2c2a09a2 Fix compilation with --disable-everything --enable-muxer=vc1
Suggested-by: Reimar
2013-05-24 14:19:19 +00:00
Thilo BorgmannandMichael Niedermayer bfde6e5c02 alsdec: Introduce failsafe switch to keep ALSSpecificConfig consistent to the input.
Reveiwed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 13:55:58 +01:00
Thilo BorgmannandMichael Niedermayer 95f81159de alsdec: Consistently use a period at the end of error messages.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 13:52:53 +01:00
Thilo BorgmannandMichael Niedermayer 41bf943f70 bgmc: fix sizeof arguments (should fix CIDs: 700724 and 608084)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-14 20:37:43 +02:00
Thilo BorgmannandMichael Niedermayer feaff427c0 alsdec: fix clipping of weightings for MCC decoding
Fixes CID717905
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-14 00:18:46 +02:00
Thilo BorgmannandJustin Ruggles ac3f5a6879 alsdec: check return values.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2012-09-17 14:17:27 -04:00
Thilo BorgmannandJustin Ruggles 66197988b1 alsdec: fix number of decoded samples in first sub-block in BGMC mode.
Fixes CVE-2012-2790

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2012-09-17 14:17:27 -04:00
Thilo BorgmannandJustin Ruggles 97f0efbfb8 alsdec: Fix out of ltp_gain_values read.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2012-09-17 14:17:27 -04:00
Thilo BorgmannandMichael Niedermayer 2837d8dc27 alsdec: fix number of decoded samples in first sub-block in BGMC mode.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-15 20:20:37 +02:00
Thilo BorgmannandMichael Niedermayer 7ea948bac3 alsdec: check return values. 2012-03-27 18:06:54 +02:00
Thilo BorgmannandMichael Niedermayer 5afd9a80db als: consistent messages
"." for warnings, "!" for errors.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-26 16:21:21 +02:00
Thilo BorgmannandMichael Niedermayer 04dc7e7e5e ALS error message pretty print
One prettier message.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-26 16:16:57 +02:00
Thilo BorgmannandMichael Niedermayer 599881b028 alsdec: Fix out of ltp_gain_values read.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-11 16:56:23 +01:00
Thilo BorgmannandMichael Niedermayer daeffccd98 alsdec: pretty print for another log message
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-11 16:55:42 +01:00
Thilo Borgmann a29039aef3 Reindent after last commit.
Originally committed as revision 25711 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-08 15:24:11 +00:00
Thilo Borgmann 4051ae7617 Allow clean initialization of lut_status array by changing type to signed int.
Originally committed as revision 25710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-08 15:22:15 +00:00
Thilo BorgmannandDiego Biurrun bd7d08e27e Remove incomplete Doxygen for static decode_frame functions.
These functions are not documented for other decoders and
should be obvious enough even without Doxygen.
patch by Thilo Borgmann, thilo.borgmann googlemail com

Originally committed as revision 24237 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-14 13:12:24 +00:00
Thilo Borgmann cbb39648c1 Add CRC check to the ALS decoder.
Originally committed as revision 23889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-29 16:56:28 +00:00
Thilo Borgmann bbe8fa1f83 Fix last frame block size correction.
Originally committed as revision 22238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:13:31 +00:00
Thilo Borgmann 245d5a48ef Add the dependency for mpeg4audio.o of the ALS decoder.
Originally committed as revision 21893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 08:26:35 +00:00
Thilo Borgmann a8c09ff2d8 Do sequential bit reading outside of []-operators.
Originally committed as revision 21892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 08:07:02 +00:00
Thilo Borgmann dc9e57a878 Fix sizeof()-statement to use the actual pointer type.
Originally committed as revision 21872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-17 23:26:48 +00:00
Thilo Borgmann cd09284924 Fix wrong buffer allocation for MCC in ALS.
Originally committed as revision 21871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-17 22:53:25 +00:00
Thilo Borgmann 114315994b Limit the Rice parameter used for progressive decoding in ALS.
Originally committed as revision 21849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-16 14:48:01 +00:00
Thilo Borgmann d3037bbe6b Add myself as maintainer of bgmc.[ch].
Originally committed as revision 21820 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-14 10:17:58 +00:00
Thilo Borgmann 65760304bc Reindent a line.
Originally committed as revision 21810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-13 19:59:53 +00:00
Thilo Borgmann 09946fb109 Add myself as contributor.
Originally committed as revision 21808 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-13 19:24:32 +00:00
Thilo Borgmann 071cfdce4b Add myself as ALS maintainer.
Originally committed as revision 21807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-13 19:23:39 +00:00
Thilo Borgmann 25608328af Support arithmetic decoding in ALS.
Originally committed as revision 21799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-13 18:24:13 +00:00
Thilo Borgmann 8e14fbe89b Remove unnecessary fields in ALSSpecificConfig.
Originally committed as revision 21583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 09:53:37 +00:00
Thilo Borgmann 099809d19b Reindent after last commit.
Originally committed as revision 21171 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-12 20:37:56 +00:00
Thilo Borgmann ff9ea0b7cc Replace variable length array with an allocated buffer
in the context to increase compatibility.

Originally committed as revision 21170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-12 20:35:22 +00:00
Thilo Borgmann b2f4b04336 Change local variable type from unsigned int to int in order to
fix a fate test error for gcc 4.1.x introduced in revision 21069.

Originally committed as revision 21103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-08 19:53:42 +00:00
Thilo Borgmann e38215f2a4 Add multi-channel correlation support for ALS.
Originally committed as revision 21074 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 22:48:58 +00:00
Thilo Borgmann 99c5f5ccbe Optimize short-term prediction by reducing index arithmetic.
Originally committed as revision 21069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 22:23:28 +00:00
Thilo Borgmann 71fe4573bc Replace array operator [] with direct access via pointer.
Solves issue 1657.

Originally committed as revision 21029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-05 01:16:02 +00:00
Thilo Borgmann 1261b07f5f Read and decode block data in separate functions to prepare support for
multi-channel correlation mode.

Originally committed as revision 20825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 15:40:26 +00:00
Thilo Borgmann 25c4fddadc Merge data tables from als_data.h with the decoder source to reduce
code complexity.

Originally committed as revision 20536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-14 11:49:48 +00:00
Thilo Borgmann 93d38cf6b0 Add long-term prediction to the ALS decoder.
Originally committed as revision 20534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-14 06:29:19 +00:00
Thilo BorgmannandCarl Eugen Hoyos 99971952b0 Add MPEG-4 Audio Lossless Coding (ALS) decoder.
Patch by Thilo Borgmann, thilo D borgmann A googlemail

Originally committed as revision 20517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-11 22:36:17 +00:00
Thilo BorgmannandAlex Converse 24026a2d49 Add the ability to parse the ALSSpecificConfig from an MPEG-4 AudioSpecificConfig. Patch by Thilo Borgmann
<com googlemail borgmann thilo> as part of GSoC 2009.

Originally committed as revision 20516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-11 22:16:54 +00:00
Thilo BorgmannandJustin Ruggles c6dbbc4576 Add function to compute ceil(log2(x)).
Patch by Thilo Borgmann <thilo.borgmann _at_ googlemail.com>

Originally committed as revision 19747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-30 15:50:03 +00:00
Thilo BorgmannandStefano Sabatini 031e14ea79 Fix initialization of avpkt in output_packet().
Patch by Thilo Borgmann thilo.surname AT googlemaildotcom.

Originally committed as revision 18451 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-11 22:04:52 +00:00
Thilo BorgmannandStefano Sabatini ee30cdabad Add support to CorePNG P-frames.
Patch by Thilo Borgmann thilo DOT borgmann A googlemail com.

Originally committed as revision 18421 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 17:16:19 +00:00
Thilo BorgmannandStefano Sabatini ede0e47507 Use the new avcodec_decode_* API.
Patch by Thilo Borgmann th_lo.borgm_n_@goog_email.co_.

Originally committed as revision 18417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 12:53:22 +00:00
Thilo BorgmannandStefano Sabatini 0dccbba02c Add 'PNG1' to PNG fourcc codes.
Patch by Thilo Borgmann thilo DOT borgmann _AT_ gXXglemail.cXm.

Originally committed as revision 18415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 12:18:04 +00:00
Thilo BorgmannandStefano Sabatini bea183757b Use the new avcodec_decode_* API.
Patch by Thilo Borgmann thilo.borgmann * googlemail ! com.

Originally committed as revision 18414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 12:07:06 +00:00
Thilo BorgmannandStefano Sabatini 4f313925ec Use the new avcodec_decode_* API.
Patch by Thilo Borgmann name.surname AT googlemail.com.

Originally committed as revision 18409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 11:07:52 +00:00
Thilo BorgmannandStefano Sabatini 655d47c2cb Make try_decode_frame() use the new avcodec_decode_* API.
Patch by Thilo Borgmann thilo.borgmann AT g00glemail dot com.

Originally committed as revision 18408 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 11:03:06 +00:00
Thilo BorgmannandRonald S. Bultje cdd8930e6a Move av_packet_*() functions from libavformat/ to libavcodec/, where the
AVPacket structure now resides also.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see the mailinglist
thread "Google Summer of Code participation" for additional discussion.

Originally committed as revision 18353 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 18:31:14 +00:00
Thilo BorgmannandRonald S. Bultje 7a00bbad21 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.

Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 15:59:50 +00:00
Thilo BorgmannandRonald S. Bultje 18c915eef4 Move AVPacket up a bit, so that structs/functions that include AVPacket can
themselves be reasonably positioned.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see mailinglist thread
"[FFmpeg-devel] Google Summer of Code participation".

Originally committed as revision 18350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 15:37:26 +00:00
Thilo BorgmannandStefano Sabatini fabd2469f1 Move AVPacket declaration from avformat.h to avcodec.h.
Patch by Thilo Borgmann thilo dot borgmann at googlemail _dot_ com.

Originally committed as revision 18317 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-02 19:53:53 +00:00