Commit Graph
100 Commits
Author SHA1 Message Date
Baptiste Coudurier 721719dd0c dnxhddec: handle cid change in bitstream. 2011-06-26 14:09:48 -07:00
Baptiste Coudurier 90a40b226a ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2. 2011-06-26 14:09:48 -07:00
Baptiste Coudurier be20528ced aac: fix adts frame size mask, fix demuxer probing for some files. 2011-06-08 13:12:18 -07:00
Baptiste CoudurierandAlex Converse 4f8da7e7dc s302m: fix resampling for 16 and 24bits. 2011-06-06 12:17:19 -07:00
Baptiste Coudurier e4e2db9c74 ffmpeg: use opt_acodec when setting audio codec in opt_target. 2011-06-03 19:52:59 -07:00
Baptiste CoudurierandDiego Biurrun 93d06bd1df svq3: Check negative mb_type to fix potential crash.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-06-03 13:55:55 +02:00
Baptiste CoudurierandDiego Biurrun 8dfc6d1f7c svq3: Move svq3-specific fields to their own context.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-06-03 13:55:54 +02:00
Baptiste CoudurierandMichael Niedermayer dd47107021 In print_report, print progression time in hours:mins:secs:us
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-03 03:46:13 +02:00
Baptiste CoudurierandMichael Niedermayer 1212d5b5e4 ffmpeg: In print_report, use int64_t for pts to check for 0 and avoid inf value for bitrate.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-03 03:46:13 +02:00
Baptiste CoudurierandMichael Niedermayer 5aa70309ad In libswscale, use all lines when converting from 422p to rgb with mmx, improve quality.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-03 03:46:13 +02:00
Baptiste CoudurierandAlex Converse 901ff51116 ffmpeg: fix -aspect cli option
Redesign the way -aspect option is handled. This is done by making
ffmpeg read the sample aspect ratio set in the corresponding input
stream by default, and overriding it using the value specified by
-aspect.

If the output display aspect ratio is specified with -aspect, it is
set at the end of the filterchain, thus overriding the value set by
filters in the filterchain.

This implementation is more robust, since does not modify the
filterchain description (which was creating potential syntax errors).

(Cherry-pick abf8342aa9)

Another aspect ratio fix try. This leaves the setdar addition at the end
(preferred by people).

(Cherry-pick e7c7b0d000)
2011-05-16 14:13:03 -07:00
Baptiste CoudurierandAnton Khirnov 7e19a6e868 movenc: always write esds descriptor length using 4 bytes.
ipod shuffle doesn't support anything else.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-13 07:38:54 +02:00
Baptiste CoudurierandAnton Khirnov 14cf9e698d dnxhdenc: add AVClass in private context.
Fixes private options.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-12 13:08:10 +02:00
Baptiste CoudurierandAnton Khirnov 304e983dc7 movenc: fix yuv range in avid atoms used by dnxhd.
yuv range: full 1 / normal 2

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-12 13:07:21 +02:00
Baptiste CoudurierandAnton Khirnov 6ae38aa3ce mpegts: do not output known sized packet if an unbounded packet is already queued.
Fix issue #2624.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-12 13:04:58 +02:00
Baptiste CoudurierandDiego Biurrun 9aa91043f3 Port SMPTE S302M audio decoder from FFmbc 0.3. 2011-05-11 17:25:06 +02:00
Baptiste CoudurierandReinhard Tartler 5c511ad4ce swscale: extend YUV422p support to 10bits depth
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-11 14:38:14 +02:00
Baptiste Coudurier 580fa76c5c Allocate per codec options, now that options are freed between inputs and outputs. 2011-05-10 16:42:52 -07:00
Baptiste CoudurierandMichael Niedermayer 74bf9d6231 v210enc:clip values according to specifications
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 19:53:39 +02:00
Baptiste CoudurierandMichael Niedermayer 3e002747d1 v210enc: switch to PIX_FMT_422P10
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 19:53:39 +02:00
Baptiste CoudurierandMichael Niedermayer 807a058e8b v210dec: switch to PIX_FMT_422P10
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 19:53:39 +02:00
Baptiste CoudurierandMichael Niedermayer b9e608492a swscale: 9,10 bits pixel format output support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 14:27:13 +02:00
Baptiste CoudurierandMichael Niedermayer 299cbe2c9b PIX_FMT_422P10 support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 14:06:04 +02:00
Baptiste CoudurierandMichael Niedermayer 35d3d44a84 adpcmenc: fix QT IMA ADPCM encoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 13:15:48 +02:00
Baptiste CoudurierandMichael Niedermayer b3d5a4b06e adpcmdec: Fix QT IMA ADPCM decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 13:13:17 +02:00
Baptiste CoudurierandMichael Niedermayer 0fa8d19987 In svq3 decoder, check negative mb_type, fix potential crash.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-06 00:30:03 +02:00
Baptiste CoudurierandMichael Niedermayer 2264c11081 SVQ3: do not modify const input buffer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-05 15:43:58 +02:00
Baptiste CoudurierandMichael Niedermayer b0e7a932e6 SVQ3: Check that things match up after a frame.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-05 15:43:58 +02:00
Baptiste CoudurierandMichael Niedermayer 8811679c8e SVQ3: Move svq3 specific fields to their own context.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-05 15:43:46 +02:00
Baptiste Coudurier 97dc86b793 In libx264 wrapper, change wpredp to a codec specific option. 2011-04-29 18:44:59 -07:00
Baptiste Coudurier 045cc36fe7 100l, change #ifdef to #if 2011-04-27 14:24:36 -07:00
Baptiste Coudurier 46394d39e3 In png decoder, only call png_init_mmx if HAVE_MMX is defined. 2011-04-27 13:59:30 -07:00
Baptiste CoudurierandMichael Niedermayer 624a7e005c Correctly support pal8 with alpha in libswscale, fix png pal8 with alpha.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-27 21:52:09 +02:00
Baptiste CoudurierandMichael Niedermayer dbfdb288c1 Set alpha of palettes to 0xff.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-27 21:49:45 +02:00
Baptiste CoudurierandMichael Niedermayer e91946ed23 Rename y400a to gray8a.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-27 21:36:30 +02:00
Baptiste CoudurierandMichael Niedermayer 6d4c49a2af Move png mmx functions into x86/png_mmx.c, remove them from DSPContext.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-27 20:08:09 +02:00
Baptiste Coudurier c225615bf2 In libx264 wrapper, fix side effect with has_b_frames, bframe_pyramid can be set
when bframe is not.
2011-04-23 12:41:17 -07:00
Baptiste Coudurier 20a160484f In libx264 wrapper, detect default settings and use medium profile to avoid failure. 2011-04-21 09:01:35 -07:00
Baptiste Coudurier 2c18893a91 In libx264 wrapper, correctly support 2pass log filename option. 2011-04-20 15:46:40 -07:00
Baptiste Coudurier f92b0084c0 In libx264 wrapper, add -level specific option. 2011-04-19 16:12:13 -07:00
Baptiste Coudurier 37c0a443f9 Fix libx264 fastfirstpass, move apply_fastfirstpass after user customized options. 2011-04-19 15:25:07 -07:00
Baptiste Coudurier 46f83e5b3c In libx264 wrapper, do not set pic quality if no frame is output, avoids
uninitialized reads.
2011-04-19 13:31:27 -07:00
Baptiste Coudurier d319064465 Prefer codec specific options over global ones, allowing codec
to override global options.
2011-04-19 13:12:24 -07:00
Baptiste Coudurier c22f2527ed In mov and flv muxer, check aac bitstream validity. 2011-04-18 14:30:14 -07:00
Baptiste Coudurier 14360e0783 Remove now useless ffpresets for x264, use -preset 2011-04-16 16:59:39 -07:00
Baptiste Coudurier 0140d3f092 In libx264 wrapper, add -preset and -tune options 2011-04-16 16:51:54 -07:00
Baptiste Coudurier abf8342aa9 ffmpeg: fix -aspect cli option
Redesign the way -aspect option is handled. This is done by making
ffmpeg read the sample aspect ratio set in the corresponding input
stream by default, and overriding it using the value specified by
-aspect.

If the output display aspect ratio is specified with -aspect, it is
set at the end of the filterchain, thus overriding the value set by
filters in the filterchain.

This implementation is more robust, since does not modify the
filterchain description (which was creating potential syntax errors).
2011-04-16 16:47:26 -07:00
Baptiste Coudurier 0ba8485666 In mov muxer, compute avg bitrate in esds 2011-04-16 16:19:10 -07:00
Baptiste Coudurier 93dfda8896 In ipod/mov/mp4 muxer, always write esds descriptor length using 4 bytes,
ipod shuffle doesn't support anything else.
2011-03-30 14:09:09 -07:00
Baptiste Coudurier d9699ea825 Fix dnxhd custom options, add AVClass in private context 2011-03-30 08:48:08 -07:00
Baptiste Coudurier efdad9fbc7 In mov muxer, fix yuv range in avid atoms used by dnxhd. 2011-03-30 08:48:08 -07:00
Baptiste Coudurier 69aab68037 Use av_strdup instead of strdup, fixes mingw build 2011-03-16 14:26:25 -07:00
Baptiste CoudurierandMichael Niedermayer aa612fbb99 In retry_transfer_wrapper, do not check url_interrupt_cb, causes problems
when writing and pressing q during encoding. Instead, check url_interrupt_cb
at the end.

Note that when a protocol is interrupted by url_interrupt_cb, some data may
be silently discarded: the protocol context is not suitable for anything
anymore.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 688c22e033)
2011-03-08 02:09:44 +01:00
Baptiste CoudurierandRonald S. Bultje 688c22e033 In retry_transfer_wrapper, do not check url_interrupt_cb, causes problems
when writing and pressing q during encoding. Instead, check url_interrupt_cb
at the end.

Note that when a protocol is interrupted by url_interrupt_cb, some data may
be silently discarded: the protocol context is not suitable for anything
anymore.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-07 14:56:25 -05:00
Baptiste Coudurier 08c866345c In retry_transfer_wrapper, do not check url_interrupt_cb,
causes problems when writing and pressing q during encoding.
2011-03-03 19:34:59 -08:00
Baptiste CoudurierandMichael Niedermayer 4778b4dd77 vc1: fix decoding when end sequence is present
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit fb98507126)
2011-03-03 14:15:11 +01:00
Baptiste CoudurierandMichael Niedermayer cd37308b77 movenc: use correct tag for dvcpro hd
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 06ed4873e6)
2011-03-03 14:15:09 +01:00
Baptiste CoudurierandMichael Niedermayer 176e176288 dnxhd: allow encoding with Avid Nitris compatibility.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 99bbc781e9)
2011-03-03 14:15:09 +01:00
Baptiste CoudurierandMichael Niedermayer 5bb50c71a3 movenc: fix tkhd height for imx
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit fffdee89cc)
2011-03-03 14:15:09 +01:00
Baptiste CoudurierandMans Rullgard fb98507126 vc1: fix decoding when end sequence is present
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-02 13:32:58 +00:00
Baptiste CoudurierandMans Rullgard 06ed4873e6 movenc: use correct tag for dvcpro hd
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-02 00:23:08 +00:00
Baptiste CoudurierandMans Rullgard 99bbc781e9 dnxhd: allow encoding with Avid Nitris compatibility.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-01 23:55:55 +00:00
Baptiste CoudurierandMans Rullgard fffdee89cc movenc: fix tkhd height for imx
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-01 23:45:03 +00:00
Baptiste Coudurier 65ad2c618f In mov muxer, fix adpcm mono muxing, patch by Alex Converse 2011-02-27 16:29:21 -08:00
Baptiste Coudurier 4ea02a9a71 In mpegts demuxer, do not output known sized packet if an unbounded packet
is already queued. Fix issue #2624.
2011-02-27 16:20:00 -08:00
Baptiste CoudurierandMichael Niedermayer 31df5cb66d Fix qtrle regression test, actually test qtrle.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 646739a0a8)
2011-02-13 00:54:05 +01:00
Baptiste CoudurierandMans Rullgard 646739a0a8 Fix qtrle regression test, actually test qtrle.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-11 23:47:09 +00:00
Baptiste CoudurierandJanne Grunau f258964217 In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it
In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-28 01:06:57 +01:00
Baptiste Coudurier d4e0130e46 In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it.
In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.
2011-01-24 14:20:48 -08:00
Baptiste Coudurier ecea47a6ed Remove useless free, fix warning:
libavfilter/defaults.c: In function 'avfilter_default_get_audio_buffer':
libavfilter/defaults.c:129: warning: 'buf' is used uninitialized in this function

Originally committed as revision 26382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-16 02:47:25 +00:00
Baptiste Coudurier a51c71bb54 In yadif filter, default to top field first if interlacing is unknown
Originally committed as revision 26347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-15 00:32:36 +00:00
Baptiste Coudurier 6dc7dc08ed In mxf muxer, check the return value of gmtime, fix #2494
Originally committed as revision 26343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-14 22:36:23 +00:00
Baptiste Coudurier 90603f7c93 Update smc fate ref due to r26310
Originally committed as revision 26342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-14 22:32:26 +00:00
Baptiste Coudurier 0f27e6b4c2 New "copytb" ffmpeg cli option to copy input stream time base when stream copying.
This should avoid non monotone timestamps for video streams with vfr.

Originally committed as revision 26340 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-14 22:01:49 +00:00
Baptiste Coudurier 8a774d3deb Do not allocate unused swscale context when libavfilter is compiled in
Originally committed as revision 26317 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-12 00:52:47 +00:00
Baptiste Coudurier 4618637aca Fix warnings:
ffmpeg.c: In function ‘new_video_stream’:
ffmpeg.c:3701:18: warning: ‘codec_id’ may be used uninitialized in this function
ffmpeg.c: In function ‘new_audio_stream’:
ffmpeg.c:3848:18: warning: ‘codec_id’ may be used uninitialized in this function
ffmpeg.c: In function ‘new_subtitle_stream’:
ffmpeg.c:3926:18: warning: ‘codec_id’ may be used uninitialized in this function

Originally committed as revision 26313 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-11 21:16:00 +00:00
Baptiste Coudurier c961fb3cbb Change 'arg' type in parse_meta_type, fix warning:
ffmpeg.c: In function ‘parse_meta_type’:
ffmpeg.c:3323:13: warning: assignment discards qualifiers from pointer target type

Originally committed as revision 26312 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-11 21:14:11 +00:00
Baptiste Coudurier c3024f9e7e In mov demuxer, handle better wrong time scale, fix issue #2528
Originally committed as revision 26311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-11 21:06:37 +00:00
Baptiste Coudurier f6253caf8b In mov demuxer, set r_frame_rate for cfr files
Originally committed as revision 26310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-11 19:58:00 +00:00
Baptiste Coudurier 82dadb90a7 Fix bmp encoder with 8 bits format and correctly set bits_per_coded_sample
Originally committed as revision 26263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-07 23:56:47 +00:00
Baptiste Coudurier a2b7ed3274 In mov muxer, override codec tag for dv in mov, fix remuxing from avi
Originally committed as revision 26257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-07 19:56:31 +00:00
Baptiste Coudurier 10d8eac98d In mov muxer, override codec tag for h263 in mov, fix remuxing from 3gp
Originally committed as revision 26255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-07 19:55:08 +00:00
Baptiste Coudurier 35ca5c0b6b In dnxhd decoder, set key_frame on decoded frame
Originally committed as revision 26247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-06 20:17:51 +00:00
Baptiste Coudurier ab04337464 In ogg muxer, correctly mux VFR streams, fix issue #2398
Originally committed as revision 26229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-05 19:32:45 +00:00
Baptiste Coudurier 5e2202d6f3 In mov demuxer, check that gmtime returns a valid value, fix crash, issue #2490
Originally committed as revision 26228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-05 19:21:04 +00:00
Baptiste Coudurier 4af7166fb4 In mov demuxer, check that stts data exists, fix crash, issue #2479
Originally committed as revision 26227 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-05 19:14:44 +00:00
Baptiste Coudurier 69057b70f7 In pad filter, update new ref w/h in start_frame, fix chaining
Originally committed as revision 26217 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-05 01:14:14 +00:00
Baptiste Coudurier d34a77fb09 In crop filter, update new ref w/h instead of old one, fix chaining
Originally committed as revision 26216 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-05 01:00:53 +00:00
Baptiste Coudurier c6f1e29a15 In mov demuxer, read alac sample from extradata, fix #2406
Originally committed as revision 25901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-07 01:38:26 +00:00
Baptiste Coudurier 90f1f3bf00 In yadif filter, declare asm constants directly to avoid dependency on libavcodec
Originally committed as revision 25895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-06 00:14:15 +00:00
Baptiste Coudurier 9e95999e2a 10l, add ff_pw_1 to dsputil_mmx for yadif sse2
Originally committed as revision 25881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-04 13:06:06 +00:00
Baptiste Coudurier bf799f686f Declare sse2 and ssse2 function in yadif header
Originally committed as revision 25877 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-04 05:50:28 +00:00
Baptiste Coudurier 1ef64490e1 yadif sse2/ssse3 optimizations
Originally committed as revision 25874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-04 05:23:44 +00:00
Baptiste Coudurier 74f726209f In ts demuxer, if pes packet size is < ts packet, honor pes packet and skip padded data.
Fixes issue #2392.

Originally committed as revision 25841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-29 03:43:56 +00:00
Baptiste Coudurier 79561f0ed4 Update fate h264 test due to r25824, this file has 2 frames delay
Originally committed as revision 25840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-28 23:09:30 +00:00
Baptiste Coudurier adc7305424 In mov demuxer, if multiple h264 stsd are present, do not concatenate streams, fix #2069
Originally committed as revision 25825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-25 05:03:29 +00:00
Baptiste Coudurier 581ba2cee1 In av_find_stream_info, decode more h264 to get correct delay, issue #2020
Originally committed as revision 25824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-25 02:19:03 +00:00
Baptiste Coudurier b795ff97e5 In TS demuxer, keep the pmt filter open to parse all pmt sections,
based on patch by Stephen D'Angelo, SDAngelo at evertz dot com.

Originally committed as revision 25822 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-25 00:29:44 +00:00
Baptiste Coudurier 6fd2b8bd0a In aspect filter, fix display for input resolution
Originally committed as revision 25819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-24 02:38:55 +00:00
Baptiste Coudurier 3ff9995350 In crop filter, reference picref after updating w/h, fix issue #2377
Originally committed as revision 25818 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-24 01:32:49 +00:00