virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
29,967 Commits 37 Branches 400 Tags 460 MiB
826c56d16e
Commit Graph

14064 Commits

Author SHA1 Message Date
Anton Khirnov
0cc06b9e23 snow: add 'memc_only' private option. 
Deprecate CODEC_FLAG2_MEMC_ONLY
 2011-08-31 13:24:16 +02:00
Anton Khirnov
0dc5e12f1e libx264: add 'mbtree' private option. 
Deprecate CODEC_FLAG2_MBTREE
 2011-08-31 13:24:02 +02:00
Anton Khirnov
38934f19fe libx264: add 'psy' private option. 
Deprecate CODEC_FLAG2_PSY
 2011-08-31 13:23:37 +02:00
Anton Khirnov
a7cec3a094 libmp3lame: add 'reservoir' private option. 
Deprecate CODEC_FLAG2_BIT_RESERVOIR
 2011-08-31 13:22:53 +02:00
Anton Khirnov
88262ca87d mpeg2enc: add 'non_linear_quant' private option 
Deprecate CODEC_FLAG2_NON_LINEAR_QUANT
 2011-08-31 13:21:59 +02:00
Anton Khirnov
2c5e1efc09 mpeg12enc: add drop_frame_timecode private option. 
Deprecate CODEC_FLAG2_DROP_FRAME_TIMECODE
 2011-08-31 13:21:05 +02:00
Anton Khirnov
297d9cb3dc mpeg12enc: add intra_vlc private option. 
Deprecate CODEC_FLAG2_INTRA_VLC.
 2011-08-31 13:19:14 +02:00
Alberto Delmás
d2f119a1f2 VC1: Support dynamic dimension changes 
Fixes SA00072, SA00073, SA10150, SA10151, Issue2076

Improves SA10153

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-31 13:11:23 +02:00
Dustin Brody
a18e04bcf9 mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-31 10:28:29 +02:00
Anton Khirnov
7485e54708 lavc: deprecate CODEC_FLAG2_BRDO 
It's been unused for the last 3 years.
 2011-08-31 10:26:21 +02:00
Anton Khirnov
cf90c5d0e0 libx264: add 'aud' private option. 
Deprecate CODEC_FLAG2_AUD.
 2011-08-31 10:26:11 +02:00
Anton Khirnov
3b82aeeec0 libx264: add 'fast-pskip' private option. 
Deprecate CODEC_FLAG2_FASTPSKIP.
 2011-08-31 10:25:54 +02:00
Anton Khirnov
373257fa79 libx264: add '8x8dct' private option. 
Deprecate CODEC_FLAG2_8X8DCT.
 2011-08-31 10:25:34 +02:00
Anton Khirnov
eab21c32e3 libx264: add 'mixed-refs' private option. 
Deprecate CODEC_FLAG2_MIXED_REFS.
 2011-08-31 10:25:06 +02:00
Anton Khirnov
0f29699db7 libx264: add 'weightb' private option. 
Deprecate CODEC_FLAG2_BPYRAMID.
 2011-08-31 10:24:56 +02:00
Anton Khirnov
34dda1251d libx264: add 'b-pyramid' private option. 
Deprecate CODEC_FLAG2_BPYRAMID.
 2011-08-31 10:24:17 +02:00
Anton Khirnov
5d4a1048ee libx264: add 'intra-refresh' private option. 
Deprecate CODEC_FLAG2_INTRA_REFRESH.
 2011-08-31 10:23:26 +02:00
Anton Khirnov
faaecd4708 libx264: add 'ssim' private option. 
Deprecate CODEC_FLAG2_SSIM.
 2011-08-31 10:23:03 +02:00
Anton Khirnov
3b81636f33 libx264: make options compatible with x264 
Replace '_' with '-', merge psy-trellis into psy-rd and rename cqp->qp
Also fix typo pdy-rd -> psy-rd
 2011-08-31 10:21:36 +02:00
Luca Barbato
dde372934a avcodec: remove misleading comment 
coded_width is the width before lowres scaling,
coded_height is the height before lowres scaling.
 2011-08-31 09:57:46 +02:00
Kostya Shishkov
a80852316e RV40: reuse some H.264 motion compensation functions in RV40. 
Since RV40 is based on H.264, it uses the same interpolation filters and
functions for halfpel interpolation in one direction can be reused.
Unfortunately other cases are implemented differently and produce slightly
different output because of rounding.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-08-30 12:04:46 +01:00
Luca Barbato
22141917a9 Revert "h264: Properly set coded_{width, height} when parsing H.264." 
This reverts commit b47904d158.

coded_{width, height} overwrites width and height in avcodec_open and
it currently just report the non-lowres size.
 2011-08-29 18:32:31 +02:00
Diego Biurrun
0249478756 doxygen: fix wrong comment syntax, //< vs. ///< 2011-08-26 18:34:28 +02:00
Diego Biurrun
0138a8dead doxygen: drop pointless star from pointer variable names 2011-08-26 18:08:38 +02:00
Dustin Brody
f913eeea43 vp6: partially propagate huffman tree building errors during coeff model parsing and fix misspelling 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-25 15:49:56 -07:00
Dustin Brody
09c274e067 mpeg12: propagate chunk decode errors and fix conditional indentation 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-25 15:49:28 -07:00
John Stebbins
0d802ac54e vc1: fix VC-1 Pulldown handling. 
Pulldown flags are being set incorrectly and AVFrame->repeat_pict is not
being set.  Also, skipped frames exit header parsing too early and do not
set pulldown flags appropriately. Ticks_per_frame needs to be set and
time_base adjusted so player can extend frame duration by a field time.

This fixes problems encountered when attempting to transcode HD-DVD EVOB
files with HandBrake. Also makes these files play smoothly in avplay.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-25 12:41:45 -07:00
Alberto Delmás
1cf82cab08 VC1: Fix first/last row checks with slices 
In some places 0/mb_height were used in place of start_mb_y/end_mb_y.

Fixes SA00049, SA00058, SA10091, SA10097, SA10131, SA20021, SA30030

Improves PSNR in SA00054, SA00059, SA00060, SA10096, SA10098, SA20022,
SA30031, SA30032, SA40012, SA40013

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-25 12:33:58 -07:00
Ronald S. Bultje
d4b9974465 vc1: properly zero coded_block[] edges on new slice entry. 
Previously, we would leave the left edge uninitialized, which led to
CBP prediction errors on slice edges, e.g. in SA10098.vc1.
 2011-08-24 22:06:06 -07:00
Anton Khirnov
4ae30cac22 libx264: add 'crf_max' private option. 
Deprecate corresponding global option.
 2011-08-24 14:33:40 +02:00
Anton Khirnov
c5dd0bc4ca libx264: add 'weightp' private option. 
Deprecate corresponding global option.
 2011-08-24 14:32:24 +02:00
Anton Khirnov
d4b9671318 libx264: add 'rc_lookahead' private option. 
Deprecate corresponding global option.
 2011-08-24 14:31:55 +02:00
Anton Khirnov
2a44a8f609 libx264: add 'psy_trellis' private option. 
Deprecate corresponding global option.
 2011-08-24 14:31:07 +02:00
Anton Khirnov
93e623c642 libx264: add 'psy_rd' private option. 
Deprecate corresponding global option.
 2011-08-24 14:30:25 +02:00
Anton Khirnov
5c75b2a0b7 libx264: add 'aq_strength' private option. 
Deprecate corresponding global option.
 2011-08-24 14:30:00 +02:00
Anton Khirnov
85254fcb46 libx264: add 'aq_mode' private option. 
Deprecate corresponding global option.
 2011-08-24 14:28:40 +02:00
Anton Khirnov
9d508e4914 libx264: add 'cqp' private option. 
Deprecate corresponding global option.
 2011-08-24 14:28:07 +02:00
Anton Khirnov
d5dc8cc297 libx264: add 'crf' private option. 
Deprecate corresponding global option.

Ideally all x264 private options should be generated automatically, but
x264 doesn't provide the API for this yet.
 2011-08-24 14:26:12 +02:00
Anton Khirnov
8ee18b4bee lavc: remove vbv_delay option 
It's broken and serves no purpose as it's a read-only field.
 2011-08-24 14:07:39 +02:00
Alberto Delmás
45ecda8554 Windows Media Image decoder (WMVP/WVP2) 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-23 11:18:35 +02:00
Justin Ruggles
3be5a94351 ac3enc: remove outdated TODO comment for apply_channel_coupling() 2011-08-22 12:14:57 -04:00
Anton Khirnov
ae60927aef libx264: only use ABR mode when the user explicitly set bitrate. 2011-08-22 07:17:39 +02:00
Anton Khirnov
03eff2bf43 libx264: use medium preset by default. 2011-08-22 07:17:38 +02:00
Anton Khirnov
0a593de38a mp2 encoder: make 128k the default bitrate. 2011-08-22 07:17:38 +02:00
Stefano Sabatini
143d6a3fa7 lavc: add A|E|D flags to "ac" and "ar" options 
Fix setting of the corresponding AVCodecContext fields via
cmdutils.c:filter_codec_opts().
In particular, fix ffplay -ac and -ar options.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-21 16:06:16 +02:00
Kostya Shishkov
4ba8c521b1 WavPack decoder: implement flush function 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-21 12:54:34 +02:00
Jeff Downs
6581e161c5 h264: fix PCM intra-coded blocks in monochrome case 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-08-19 16:02:33 +02:00
Jeff Downs
87cf70eb23 h264: correct implicit weight table computation for long ref pics 
Correct computation of implicit weight tables when referencing pictures
that are marked for long reference.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-08-19 14:36:52 +02:00
Jeff Downs
29a09eae9a h264: correct the check for invalid long term frame index in MMCO decode 
The current check on MMCO parameters prohibits a "max long term frame index
plus 1" of 16 (frame idx of 15) for the "set max long term frame index" MMCO.
Fix this off-by-one error to allow the full range of legal values.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-08-19 14:36:40 +02:00
Alex Converse
44920d04ba aac: Only set sample rate and object type from ADTS if output hasn't been configured. 
Long term it would be nice to support error resilient reconfiguration
but right now setting this every frame does more harm than help.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-18 22:29:41 +02:00
Alex Converse
06d37fede4 aac: Set SBR and PS to unsignalled during headerless and ADTS initialization. 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-18 22:29:41 +02:00
Alex Converse
d8425ed4af aac: Only output configure if audio was found. 
Audio found is not triggered on a CCE because a CCE alone has no output.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-18 22:29:41 +02:00
Dustin Brody
b490f0c2bc h264: hide reference frame errors unless requested 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-17 20:56:54 -07:00
Ronald S. Bultje
38e06c2969 Move clipd macros to x86util.asm. 
This allows sharing them between multiple .asm files.
 2011-08-17 20:56:06 -07:00
Kostya Shishkov
91e209d720 RV3/4 parser: remove unused variable 'off' 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-08-17 15:31:40 +02:00
Kostya Shishkov
48ce8b8da7 Use parsers for RealVideo 3/4 to determine correct PTS 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-17 15:00:42 +02:00
Kostya Shishkov
331971116d rv10/20: tell decoder to use edge emulation 
This removes out-of-edge motion compensation artifacts (easily spotted green
blocks in avplay, gray blocks in transcoding), for example here:
http://samples.libav.org/samples/real/tv_watching_t1.rm

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-08-17 14:53:34 +02:00
Anton Khirnov
bca06e77e1 lavc: add avcodec_get_type() for mapping codec_id -> type. 2011-08-16 20:24:20 +02:00
Anton Khirnov
64db1a82d6 lavc: add audio flag to the 'b' option, deprecate 'ab'. 
Its only reason for its existence was ffmpeg's inability to properly assign
AVOptions to streams. Now this is not a problem anymore, so 'ab' should
go.
 2011-08-16 06:20:43 +02:00
Dustin Brody
a3e215cdc9 svq3: propagate codec memory allocation failure in context init 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-15 21:26:34 +02:00
Dave Yeo
cc73511e8e Fix NASM include directive 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-15 11:24:35 -07:00
Alex Converse
48f7163f13 dsputil_mmx: Honor HAVE_AMD3DNOW 2011-08-15 11:20:08 -07:00
Reimar Döffinger
0e86965514 VC-1: fix reading of custom PAR. 
Custom PAR num/denum are in 1-256 range.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-08-15 16:36:58 +02:00
Dustin Brody
2bfdb34c8a mpeg12: remove repeat-field code disabled since May 2002 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-08-15 13:03:20 +02:00
Nathan Caldwell
24efdea7fd aacenc: Fix number of coefficients used in a LFE channel. 
The spec states:

 *  Only the lowest 12 spectral coefficients of any LFE may be non-zero

We were using the 12 lowest *bands*.
 2011-08-13 19:40:33 -07:00
Nathan Caldwell
51a1d4d94a aacenc: Fix a segfault with grouped psymodel. 
10l: Forgot about TYPE_LFE being after TYPE_CPE. Which causes a
segfault when encoding 5.1
 2011-08-13 19:37:38 -07:00
Kostya Shishkov
78622ef362 rv34: free+allocate buffer instead of reallocating it to preserve alignment 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-12 13:49:25 -07:00
Ronald S. Bultje
28ca701e0b h264: add missing brackets. 
This caused failure of a few fate tests.
 2011-08-12 12:32:31 -07:00
Ronald S. Bultje
b2c087871d Move x86util.asm from libavcodec/ to libavutil/. 
This allows using it in swscale also.
 2011-08-12 11:43:03 -07:00
Ronald S. Bultje
3a39195b1d Move x86inc.asm to libavutil/. 
This allows using it in libswscale/ also.
 2011-08-12 11:43:02 -07:00
Reinhard Tartler
69c4bee8fa libx264: Include hint for possible values for configuring libx264 
The output of the x264 commandline tool contains the most uptodate
description of the possible values for the -preset, -tune and -profile
options.
 2011-08-12 14:09:59 +02:00
Kostya Shishkov
b86ab38137 Add weighted motion compensation for RV40 B-frames 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 16:07:58 -07:00
Kostya Shishkov
e5ec68699e RV3/4: calculate B-frame motion weights once per frame 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 16:07:23 -07:00
Kostya Shishkov
d241f51e0f Move RV3/4-specific DSP functions into their own context 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 16:07:15 -07:00
Dustin Brody
21d7037234 mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 16:02:18 -07:00
Dustin Brody
bac3ab13ea h264: notice memory allocation failure 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 15:59:07 -07:00
Justin Ruggles
c766eb1ce1 ac3enc: add macros for option names to make them more understandable. 2011-08-11 11:33:32 -04:00
Justin Ruggles
9542ca9fb7 ac3enc: fix 'channel_coupling' option to actually allow 'auto'. 
Use 'auto' as the default value.
 2011-08-11 11:33:32 -04:00
Mans Rullgard
4a71da0f3a cavs: fix some crashes with invalid bitstreams 
This removes all valgrind-reported invalid writes with one
specific test file.

Fixes http://www.ocert.org/advisories/ocert-2011-002.html

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-08-10 22:35:20 +01:00
Justin Ruggles
069083a419 ac3enc: clip coupling coordinates during calculation 
This is faster than using the clip_coefficients() function. Also,
clipping the coordinates before determining reuse is better since it
will compare coordinates that are closer to their final encoded values.
 2011-08-10 17:09:24 -04:00
Justin Ruggles
d271d5b215 Remove incorrect info in documentation of AVCodecContext.bits_per_raw_sample. 
bits_per_raw_sample is used in video as well, where sample_fmt is not used.
 2011-08-10 15:40:52 -04:00
Baptiste Coudurier
1d36fb13b0 lavc: fix parentheses placement in avcodec_open2(). 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-10 16:57:33 +02:00
Anton Khirnov
7221139ba0 lavc: make avcodec_init() static on next bump. 
It's called from avcodec_register() anyway, so there's no reason for it
to be public.
 2011-08-10 12:49:57 +02:00
Justin Ruggles
d1d33e0763 ac3enc: remove unneeded #include 2011-08-09 16:44:34 -04:00
Justin Ruggles
fce33f9ead ac3enc: restructure coupling coordinate reuse calculation 2011-08-09 16:44:34 -04:00
Justin Ruggles
c3d63262fe ac3enc: allow new coupling coordinates to be sent independently for each 
channel.
 2011-08-09 16:44:34 -04:00
Justin Ruggles
d55ad59a8a ac3enc: separate exponent bit counting from exponent grouping. 
Move bit counting to the bit allocation function. Move exponent grouping to
after bit allocation. This will allow for adjustment of bandwidth parameters
during bit allocation without having to do exponent grouping multiple times.
 2011-08-09 16:28:18 -04:00
Dustin Brody
12fe759423 h264: propagate error return values for AV_LOG_ERROR-triggering events 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-09 12:29:13 -07:00
Alex Converse
94d47382e0 aac: Don't attempt to output configure an invalid channel configuration. 2011-08-09 12:16:40 -07:00
Kostya Shishkov
7351eb1415 Pretty-print RV3/4 decoder source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-08-09 12:06:38 +02:00
Kostya Shishkov
9791c02733 Saner RV1/2 initialisation and RV2 header parsing. 
Old version was based on lots of guesswork which had different hacks based on
32-bit version field instead of splitting it into major/minor/micro version.
RV2 picture header parser also had a few places where it deviated from binary
decoder.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-08 17:23:07 -07:00
Baptiste Coudurier
5caa2de19e libx264: do not set pic quality if no frame is output 
Avoids uninitialized reads.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-08 14:33:09 +02:00
Baptiste Coudurier
07a227b432 libx264: add preset, tune, profile and fastfirstpass private options 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-08 14:33:09 +02:00
Dustin Brody
b2700a5c7c lavc: fix misspelling in comment 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-05 18:18:38 -07:00
Dustin Brody
680b1852ab aac: propagate error return values for AV_LOG_ERROR-triggering events 2011-08-05 12:35:49 -07:00
Alex Converse
ad62507f32 h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME. 2011-08-03 17:56:47 -07:00
Diego Biurrun
fed6c90b68 cosmetics: remove some stray comments from AVCodec declarations 2011-08-03 23:31:45 +02:00
Diego Biurrun
933a6fd5a1 cosmetics: fix indentation/alignment in AVCodec declarations 2011-08-03 23:31:45 +02:00
Måns Rullgård
9a83adaf34 arm: Avoid using the movw instruction needlessly 
This fixes building for ARM11 without Thumb2.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-08-03 11:56:58 +03:00
Martin Storsjö
d0a2f0af9d Move an int64_t down in MpegEncContext 
This allows using the same arm assembler offsets for both EABI
and the mach-o ABI.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-08-03 11:56:56 +03:00