generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
30,492 Commits 24 Branches 241 Tags 173 MiB
b8bb9c0267
Commit Graph

14367 Commits

Author SHA1 Message Date
Alex Converse
0872bb23b4 xan: Add some buffer checks 2011-09-12 11:18:57 -07:00
Alex Converse
350f57bd7b xan: Remove extra trailing newline 2011-09-12 11:18:57 -07:00
Laurent Aimar
393d5031c6 Fixed size given to init_get_bits() in xan decoder. 2011-09-12 11:18:57 -07:00
Justin Ruggles
826c56d16e adpcm: split ADPCM encoders and decoders into separate files. 
Move shared tables to a separate file as well.
 2011-09-12 11:26:11 -04:00
Kostya Shishkov
23a1f0c592 rv34: check that subsequent slices have the same type as first one. 
This prevents some crashes when corrupted bitstream reports e.g. P-type
slice in I-frame. Official RealVideo decoder demands all slices to be
of the same type too.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-12 15:51:30 +02:00
Anton Khirnov
af1e247038 libxavs: add private options corresponding to deprecated global options 
Code mostly copied from libx264 wrapper.
 2011-09-12 08:45:55 +02:00
Anton Khirnov
d242d80e36 avconv: remove me_threshold option. 
It's only shadowing the AVOption with the same name.
 2011-09-11 17:30:04 +02:00
Laurent Aimar
8bfea4ab4e Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-10 18:58:57 +03:00
Alex Converse
0c1f5b93d9 cljr: init_get_bits size in bits instead of bytes 2011-09-09 15:01:00 -07:00
Alex Converse
b7ce4f1d1c indeo2: fail if input buffer too small 2011-09-09 15:01:00 -07:00
Alex Converse
68ca330cbd indeo2: init_get_bits size in bits instead of bytes 2011-09-09 15:01:00 -07:00
Laurent Aimar
46b004959b ffv1: Fixed size given to init_get_bits() in decoder. 
init_get_bits() takes a number of bits and not a number of bytes as
its size argument.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-09-09 15:00:28 -07:00
Alex Converse
dba2b63a98 wavpack: Check error codes rather than working around error conditions. 2011-09-08 11:02:43 -07:00
Laurent Aimar
55354b7de2 Fixed invalid access in wavpack decoder on corrupted bitstream. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-08 12:04:06 +03:00
Laurent Aimar
0aedab0340 Fixed invalid writes in wavpack decoder on corrupted bitstreams. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-08 12:00:13 +03:00
Laurent Aimar
beefafda63 Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-08 11:57:13 +03:00
Kieran Kunhya
0ca36b4de7 Add LATM muxer 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-09-07 12:57:55 +02:00
Baptiste Coudurier
635bbecfc3 v210enc: clip values according to specifications 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-07 12:50:11 +02:00
Baptiste Coudurier
d239b83e2e v210enc: switch to PIX_FMT_422P10 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-07 12:16:21 +02:00
Baptiste Coudurier
08fa23d6c2 v210dec: switch to PIX_FMT_422P10 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-07 12:16:15 +02:00
Anton Khirnov
79eff91325 AVOptions: deprecate av_opt_set_defaults2 
It's a hack which was created to allow for multiple options with
different defaults to refer to same field (e.g. 'b' vs 'ab'). There is
no need for it anymore.
 2011-09-07 11:19:43 +02:00
Anton Khirnov
0962f23b35 libx264: fix setting some more parameters 
Specifically, trellis, nr, me_range, me_method, subq, b_strategy,
keyint_min, chroma_me and coder.
Change their defaults to -1 and apply them after
x264_param_default_preset() if the user explicitly set them.
 2011-09-07 10:36:15 +02:00
Andrej Peterka
2bb5d637fc libx264: fix setting the H.264 level 
Move setting it after x264_param_default_preset()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-07 09:16:06 +02:00
Anton Khirnov
9c684feadc libx264: add 'direct-pred' private option 
Deprecate AVCodecContext.directpred
 2011-09-07 07:27:55 +02:00
Anton Khirnov
0635a8aa21 libx264: add 'partitions' private option 
Deprecate AVCodecContext.partitions.
 2011-09-07 07:27:18 +02:00
Anton Khirnov
7042337673 libx264: add 'cplxblur' private option 
Deprecate AVCodecContext.complexityblur
 2011-09-06 21:03:41 +02:00
Anton Khirnov
71b5f4427b libx264: add 'deblock' private option 
Deprecate AVCodecContext.deblockalpha/deblockbeta
 2011-09-06 21:02:45 +02:00
Anton Khirnov
f83c45183e libx264: add 'b-bias' private option 
Deprecate AVCodecContext.bframebias.
 2011-09-06 20:14:35 +02:00
Anton Khirnov
bb73cda2f6 libx264: fix setting some options. 
Specifically: gop_size, max_b_frames, scenechange_threshold, qmin, qmax,
max_qdiff, qblur, qcompress and refs.

Change their default values to -1 and only use them if the user
explicitly set them. Otherwise x264 defaults are used.

Move setting those options after x264_param_default_preset(), so they
don't get overwritten by it.
 2011-09-06 20:13:28 +02:00
Anton Khirnov
d8dee0e7bd libx264: remove useless assignment 
priv_data is memset to 0.
 2011-09-06 20:13:11 +02:00
Reimar Döffinger
459fe331e9 ac3dec: avoid pointless alloc and indirection for input_buffer 
Since we now always allocate it, it can simply be made part of the context
instead.
 2011-09-06 12:43:16 -04:00
Diego Biurrun
6192b6f3e7 mpeg12: cosmetics: reformat as K&R 2011-09-06 11:46:57 +02:00
Justin Ruggles
ae264bb29b ac3enc: Add channel coupling support for the fixed-point AC-3 encoder. 
Update FATE references accordingly.
 2011-09-05 10:09:44 -04:00
Justin Ruggles
a0d17b6d45 ac3enc: scale floating-point coupling channel coefficients in 
scale_coefficients() rather than in apply_channel_coupling()
 2011-09-05 10:07:43 -04:00
Justin Ruggles
3e5722a8ca ac3enc: fix encoding of stereo ac3 files when rematrixing is disabled. 
The number of rematrixing bands still needs to be calculated.
 2011-09-05 09:24:59 -04:00
Kostya Shishkov
bcd4aa8bec wavpack: fix wrong return value in wavpack_decode_block() 
This function should return number of samples decoded, not number of bytes
decoded.
Spotted by Uoti Urpala.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-09-05 12:44:26 +02:00
Dustin Brody
ff17fc6353 mpeg12: propagate more real return values through chunk decode error return and fix some indentation 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-05 11:19:14 +02:00
Kostya Shishkov
9bc4e21a9b wavpack: use context reset in appropriate places 
This fixes improper flushing in the cases when the same frame is decoded in
several iterations (for being too large to fit into output buffer) and flush is
called mid-decoding and it also resets context in case of decoding errors.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-05 11:18:27 +02:00
Anton Khirnov
fb47997edb lavc: fix type for thread_type option 
It should be flags, not int.
 2011-09-04 13:15:36 +02:00
Anton Khirnov
fb4ca26bdb lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions. 2011-09-03 20:53:35 +02:00
Anton Khirnov
c11fb8288d AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find(). 
It allows to search for options only with AVClass, without allocating
the corresponding context.
 2011-09-03 20:52:21 +02:00
Anton Khirnov
9bc9188e58 libmp3lame: fix typo 
FF_API_LAME_GLOBAL_OPTIONS => FF_API_LAME_GLOBAL_OPTS

Thanks to Clément Bœsch for spotting.
 2011-09-01 10:37:19 +02:00
Anton Khirnov
1440037411 libx264: use X264_THREADS_AUTO constant instead of 0. 2011-09-01 10:12:30 +02:00
Anton Khirnov
5d06f15235 libx264: set default thread count to 0 (auto) 2011-08-31 17:39:13 +02:00
Anton Khirnov
f013cb8118 lavc: cosmetics, group deprecated codec flags 2011-08-31 13:28:54 +02:00
Anton Khirnov
aed7900704 mpeg12: add 'scan_offset' private option. 
Deprecate CODEC_FLAG_SVCD_SCAN_OFFSET
 2011-08-31 13:28:41 +02:00
Anton Khirnov
4bcee8e7f8 h263/p encoder: add 'structured_slices' private option. 
Deprecate CODEC_FLAG_H263P_SLICE_STRUCT
 2011-08-31 13:28:26 +02:00
Anton Khirnov
0d904de89d h263/p encoder: add 'obmc' private option. 
Deprecate CODEC_FLAG_OBMC
 2011-08-31 13:28:11 +02:00
Anton Khirnov
e3922d1110 h263p encoder: add 'aiv' private option. 
Deprecate CODEC_FLAG_H263P_AIV
 2011-08-31 13:27:59 +02:00
Anton Khirnov
9bb2d1a3f0 h263p encoder: add 'umv' private option. 
Deprecate CODEC_FLAG_H263P_UMV
 2011-08-31 13:27:36 +02:00
Anton Khirnov
0e5d37309f mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option. 
Deprecate CODEC_FLAG_ALT_SCAN
 2011-08-31 13:26:26 +02:00
Anton Khirnov
1f0c7020a1 mjpegdec: add 'extern_huff' private option. 
Deprecate CODEC_FLAG_EXTERN_HUFF
 2011-08-31 13:25:54 +02:00
Anton Khirnov
4623420d84 mpeg4enc: add 'data_partitioning' private option. 
Deprecate CODEC_FLAG_PART
 2011-08-31 13:25:18 +02:00
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
Vitor Sessak
18b131de04 dct32: Add SSE2 ASM optimizations 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-02 10:17:29 -07:00
Kostya Shishkov
6f7fe4723b Correct chroma vector calculation for RealVideo 3. 
Old version divided it wrong, which resulted in chroma drift (visible on FATE
sample too as dirty trails left by clouds).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-02 08:23:47 -07:00
Luca Barbato
9d39cbf6cf avpacket: signal possibly corrupted packets 
Use AV_PKT_FLAG_CORRUPT flag to mark packets that might be incomplete
or have errors. Formats that have a mean to validate their packets
should use this flag to deliver such information instead of silently
dropping the packets.
 2011-08-02 02:19:31 +02:00
Dustin Brody
4326f6f525 mpeg4videodec: remove dead code that would have detected erroneous encoding 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-08-01 21:06:48 +02:00
Alex Converse
a6c49f18ab aac: Remove some suspicious illegal memcpy()s from LTP. 2011-08-01 09:39:33 -07:00
Alex Converse
e11a5fccb2 bink: Eliminate unnecessary shadow declaration. 2011-08-01 09:39:33 -07:00
Dustin Brody
18cb40f074 lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-31 14:53:38 -07:00
Jason Garrett-Glaser
a3bf7b864a H.264: tweak some other x86 asm for Atom 2011-07-29 12:24:15 -07:00
Dustin Brody
8f9d3f6d9a s302m: use nondeprecated audio sample format API 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-07-29 08:47:34 +02:00
Anton Khirnov
ec6402b7c5 lavc: use designated initialisers for all codecs. 
It's more readable and less prone to breakage.
 2011-07-29 08:42:34 +02:00
Mans Rullgard
3ad1684126 x86: cabac: add operand size suffixes missing from 6c32576 
This fixes build with clang.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-28 18:59:23 -07:00
Dustin Brody
2a11952f45 h263dec: Propagate AV_LOG_ERRORs from slice decoding through frame decoding with sufficient error recognition 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-28 15:23:07 -07:00
Mans Rullgard
f5f004bc5a x86: cabac: don't load/store context values in asm 
Inspection of compiled code shows gcc handles these fine on its own.
Benchmarking also shows no measurable speed difference.

Removing the remaining cases in get_cabac_bypass_sign_x86() does
cause more substantial changes to the compiled code with uncertain
impact.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-28 22:25:21 +01:00
Jason Garrett-Glaser
6c32576548 H.264: optimize CABAC x86 asm for Atom 2011-07-28 13:06:13 -07:00
Ronald S. Bultje
8dcf518430 vp3/theora: flush after seek. 2011-07-28 12:17:26 -07:00
Mans Rullgard
ca6a904656 ppc: remove redundant setting of Altivec IDCT 
This is already set by dsputil_init_ppc() and is best done in only
one place.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-27 20:14:12 +01:00
Mans Rullgard
c3027b4d2f mpegvideo: initialise DSPContext in ff_dct_common_init() 
The functions and tables initialised in this function rely on an
initialised DSPContext.  Make sure they always have one.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-27 20:14:12 +01:00
Justin Ruggles
093ee8e199 cosmetics: reindent 2011-07-27 11:51:46 -04:00
Justin Ruggles
1bca72e1bd eac3enc: support writing of basic mixing and info metadata 2011-07-27 11:51:46 -04:00
Mans Rullgard
e72f3d10f6 dnxhdenc: fix declarations in for loops 
Apparently the gcc warning doesn't trigger on these.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-27 16:36:02 +01:00
Mans Rullgard
c358a0364e dsputil: remove stale bink prototypes and comments 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-27 16:05:49 +01:00
Mans Rullgard
1b3539d453 dsputil: move a bink-only function to binkdsp 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-27 16:05:49 +01:00
Mans Rullgard
cbd58a872d dsputil: remove some unused functions 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-27 16:05:49 +01:00
Kostya Shishkov
2968bedf12 bink: make IDCT take 32-bit input 
Since IDCT transforming 32-bit input to 8-bit output is unusual and unpractical
for most codecs, move Bink IDCT into separate context. Get rid of an additional
permutation table while at it since SIMD support for Bink IDCT is unlikely to
be implemented in foreseeable future.
Quantisation tables also have to change type to signed for proper
dequantisation of DCT coefficients.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-27 14:39:56 +01:00
Diego Biurrun
9b3139ebca dctref: make sure function declarations match between .c and .h file 2011-07-27 00:26:13 +02:00
Mans Rullgard
da4c7cce21 x86: fix build with gcc 4.7 
The upcoming gcc 4.7 has more advanced constant propagation
resulting some inline asm operands becoming constants and thus
emitted as literals, sometimes in contexts where this results
in invalid instructions.

This patch changes the constraints of the relevant operands
to "rm" thus forcing a valid type.  While obviously suboptimal,
this is what older gcc versions already did, and there is no
change to the code generated with these.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-26 22:17:43 +01:00
Michael Niedermayer
8c0fa61a97 jpegdec: actually search for and parse RSTn 
Fixes decoding of MJPEG files produced by some UVC Logitec web cameras,
such as "Notebook Pro" and "HD C910".

References:
http://trac.videolan.org/vlc/ticket/4215
http://ffmpeg.org/trac/ffmpeg/ticket/267

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Kostya <kostya.shishkov@gmail.com>
(cherry picked from commit 7b8ed831eb)
 2011-07-23 19:19:13 +02:00
Mans Rullgard
b4cfb8254e dnxhddec: avoid a branch in 10-bit decode_dct_block() 
The minimum weight value is 32 so this test can be skipped for the
10-bit case.  Overall speedup 3-4%.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-22 23:39:31 +01:00
Daniel Kang
406fbd24dc H.264: Add optimizations to predict x86 assembly. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-22 14:54:33 -07:00
Kostya Shishkov
c2d23309ef add Flash Screen Video 2 decoder 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-22 09:12:30 -07:00
Mans Rullgard
bb32fded36 dnxhddec: optimise dnxhd_decode_dct_block() 
Template the function for 8/10-bit and use lowlevel bitstream
macros.

6% faster overall on i7 gcc 4.5.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-21 23:14:37 +01:00
Justin Ruggles
be7bd626c4 eac3enc: use different numbers of blocks per frame to allow higher bitrates 2011-07-21 14:57:10 -04:00
Joseph Artsimovich
5ab21439fd dnxhd: 10-bit support 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-21 18:44:40 +01:00
Mans Rullgard
a617c6aaa3 dsputil: update per-arch init funcs for non-h264 high bit depth 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-21 18:10:58 +01:00
Mans Rullgard
874f1a901d dsputil: template get_pixels() for different bit depths 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-21 18:10:58 +01:00
Mans Rullgard
5cc2600964 dsputil: create 16/32-bit dctcoef versions of some functions 
High bitdepth H.264 needs 32-bit transform coefficients, whereas
dnxhd does not.  This creates a conflict with the templated
functions operating on DCTELEM data.  This patch adds a field
allowing the caller to choose the element size in dsputil_init()
and adds the required functions.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-21 18:10:58 +01:00
Mans Rullgard
0a72533e98 jfdctint: add 10-bit version 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-21 18:10:58 +01:00
Thierry Foucu
c4ab43ff3c mpeg4: add Mpeg4 Profiles names. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-21 09:34:11 -07:00
Thierry Foucu
0637e50579 mpeg4: decode Level Profile for MPEG4 Part 2. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-21 09:33:34 -07:00
Stefano Sabatini
09e8163625 imgconvert: remove unused glue and xglue macros 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-07-21 17:55:27 +02:00
Diego Biurrun
e5985185d2 rv30: return AVERROR(EINVAL) instead of EINVAL 
On some platforms EINVAL could be positive, ensure we return negative values.
 2011-07-21 14:26:06 +02:00
Mans Rullgard
2cc4f3b21f simple_idct: whitespace cosmetics 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-21 12:49:51 +01:00
Mans Rullgard
a402f10959 simple_idct: make repeated code a macro 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-21 12:49:51 +01:00
Mans Rullgard
7df701a192 dsputil: remove huge #if 0 block 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-21 11:04:56 +01:00
Mans Rullgard
e7bcc5baf7 simple_idct: change 10-bit add/put stride from pixels to bytes 
This matches other dsputil functions and simplifies calls.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-21 09:26:37 +01:00
Mans Rullgard
a82beafd64 dsputil: allow 9/10-bit functions for non-h264 codecs 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-21 09:26:26 +01:00
Joseph Artsimovich
42c27f2eca dnxhd: rename some data tables 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-21 03:30:29 +01:00
Mans Rullgard
b049978397 dnxhdenc: remove inline from function only called through pointer 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-21 02:13:03 +01:00
Mans Rullgard
1073823984 dnxhdenc: whitespace cosmetics 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-21 02:12:47 +01:00
Diego Biurrun
79a9aab56f Remove unused and non-compiling vestigial g729 decoder 2011-07-20 20:47:07 +02:00
Diego Biurrun
a005174b25 Remove unused code under G729_BITEXACT #ifdef. 
G729_BITEXACT is never set, so the code is all dead code.
 2011-07-20 20:47:07 +02:00
Ronald S. Bultje
80469eafb7 mpegvideo: fix invalid picture unreferencing. 
Mpegvideo would free frames as soon as they're not the next or prev
picture. This is fine for a single-threading model, but fails miserably
in a system where pictures can be referenced (as e.g. last/prev pic)
in other threads. Keeping track of ownership of pictures keeps image
references (e.g. motion vectors, or the reference of a motion vector)
alive as long as the picture data itself is alive.

This also happens to fix make THREADS=[3-16] fate-vsynth[12]-error.
 2011-07-20 10:26:49 -07:00
Alex Converse
e4b50572b7 dsputil: Remove extra blank line at end. 2011-07-20 10:15:57 -07:00
Alex Converse
d9a9f50a36 dsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT. 2011-07-20 10:15:57 -07:00
Mans Rullgard
e7a972e113 simple_idct: add 10-bit version 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-20 17:49:48 +01:00
Mans Rullgard
7b4ee3a21d Remove h264_lowres_idct_put/add functions 
Use of these has been broken ever since the h264 idct was changed
to always use transposed inputs.  Furthermore, they were only
ever used if some *other* non-default idct was requested.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-20 16:13:04 +01:00
Mans Rullgard
89cc8a316d Remove snow/dwt test program 
This test program so full of programming errors it is impossible
to make sense of it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-20 14:54:24 +01:00
Diego Biurrun
1b4a17094e h264: remove some disabled code 2011-07-20 15:04:51 +02:00
Mans Rullgard
e23a05ab06 Fix incorrect max_lowres values 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-20 10:19:36 +01:00
Justin Ruggles
953302656a cosmetics: indentation 2011-07-19 14:15:00 -04:00
Justin Ruggles
08a747afb9 eac3enc: use frame exponent strategy when applicable. 
This checks if the set of selected exponent strategies for all blocks in a
channel are in the frame exponent strategy table, and if so, writes the
table index instead of each strategy. This saves up to 7 bits per channel per
frame, so the overall effect on quality is small.
 2011-07-19 14:15:00 -04:00
Justin Ruggles
31b69928e5 cosmetics: rename eac3dec_data.c/h to eac3_data.c/h since the tables will also 
be used in the E-AC-3 encoder.
 2011-07-19 14:15:00 -04:00
Mans Rullgard
29b42c66f7 dsputil: fix ff_check_alignment() 
The change to LOCAL_ALIGNED means the declared object must be an
array and the subsequent test should not use the & operator.

Noticed by Uoti Urpala.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-19 17:44:35 +01:00
Mans Rullgard
3e9409b1d0 simple_idct: simplify some ifdeffery 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-18 20:57:27 +01:00
Mans Rullgard
dbb5ee8ea7 simple_idct: remove code for DCTELEM != int16 
DCTELEM can never be changed to anything else, too much code
depends on it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-18 20:57:22 +01:00
Mans Rullgard
3f5dcde7e6 Remove VLAs in ff_amrwb_lsp2lpc() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-18 18:48:13 +01:00
Diego Biurrun
e463f0e979 dsputil: restore mistakenly removed hunk of disabled code 
This particular part serves to document the optimized code variant.
 2011-07-18 18:04:56 +02:00
Diego Biurrun
65083b4911 dsputil: remove disabled code 2011-07-18 11:48:35 +02:00
Diego Biurrun
c99c0e2625 tta: remove disabled code 2011-07-18 01:47:50 +02:00
Martin Storsjö
8f62ef0f95 x86: Use LOCAL_ALIGNED in mpegvideo_mmx_template 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-07-18 00:10:45 +03:00
Diego Biurrun
e0ae2174db simple_idct: remove disabled code 2011-07-17 17:32:37 +02:00
Diego Biurrun
473e547e80 motion_est: remove disabled code 2011-07-17 17:32:37 +02:00
Diego Biurrun
9cab9421ce vc1: remove disabled code 2011-07-17 17:32:37 +02:00
Diego Biurrun
fd065d3e79 cabac: Move code only used in the cabac test program to cabac.c. 2011-07-17 12:56:42 +02:00
Mans Rullgard
2f07cb4d39 dct-test: remove write-only variable 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-16 19:39:19 +01:00
Mans Rullgard
58d7efdb29 Use LOCAL_ALIGNED in ff_check_alignment() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-16 19:39:19 +01:00
Diego Biurrun
8342a82680 arm: remove disabled function dct_unquantize_h263_inter_iwmmxt() 2011-07-16 19:15:01 +02:00
Diego Biurrun
4d4c7f8ef0 Remove commented-out call to non-existing function print_pow1(). 2011-07-16 19:13:45 +02:00
Rafaël Carré
289c60001f Do not decode RV30 files if the extradata is too small 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-07-16 18:17:43 +02:00
Diego Biurrun
b8783b98c5 flashsv: split flashsv_decode_block() off from flashsv_decode_frame(). 2011-07-16 09:08:51 +02:00
Diego Biurrun
21aed0ed92 ppc: remove disabled code 2011-07-16 02:56:52 +02:00
Diego Biurrun
0523dc57ff libspeexdec: Drop const qualifier to silence compiler warning. 
libavcodec/libspeexdec.c:108: warning: passing argument 2 of ‘speex_bits_read_from’ discards qualifiers from pointer target type
/usr/include/speex/speex_bits.h:80: note: expected ‘char *’ but argument is of type ‘const uint8_t *’
 2011-07-16 01:26:51 +02:00
Diego Biurrun
34e36f3a1c libopenjpeg: Drop const qualifier to silence compiler warning. 
libavcodec/libopenjpeg.c💯 warning: passing argument 2 of ‘opj_cio_open’ discards qualifiers from pointer target type
/usr/include/openjpeg.h:770: note: expected ‘unsigned char *’ but argument is of type ‘const uint8_t *’
 2011-07-16 01:26:51 +02:00
Diego Biurrun
8b587fa292 alac: Remove unused dummy code. 2011-07-16 01:21:17 +02:00
Diego Biurrun
356be9307c Remove unused structs and tables. 2011-07-16 01:08:31 +02:00
Diego Biurrun
f20418c349 vaapi: do not assert on value read from input bitstream 
User-provided data should never trigger an assert; return error instead.
Also fix an instance of get_bits where get_bits_long should have been used.

This eliminates the following warning:
libavcodec/vaapi_mpeg2.c:112:14: warning: variable 'start_code' set but not used
 2011-07-16 00:28:07 +02:00
Diego Biurrun
86e8272a23 flashsvenc: replace bitstream description by a link to the specification 
An official specification now exists and it is both more detailed and
easier to understand than the incomplete notes available here.
 2011-07-16 00:28:04 +02:00
Diego Biurrun
20a6f210cd flashsvenc: drop unnecessary cast 2011-07-16 00:27:15 +02:00
Diego Biurrun
0686515cb4 flashsvenc: improve some variable names and fix corresponding comments 2011-07-16 00:27:15 +02:00
Diego Biurrun
59ef6bded5 flashsvenc: merge two consecutive if-conditions 2011-07-16 00:27:12 +02:00
Diego Biurrun
12e9bf3e84 flashsvenc: merge variable declarations and initializations 2011-07-16 00:26:19 +02:00
Diego Biurrun
b88523c25d flashsvenc: convert some debug av_log() to av_dlog() 2011-07-16 00:26:18 +02:00
Diego Biurrun
3d5669c6e9 flashsvenc: whitespace cosmetics 2011-07-16 00:26:18 +02:00
Diego Biurrun
4877356d8f flashsvenc: drop some unnecessary parentheses 2011-07-16 00:26:17 +02:00
Diego Biurrun
36ba39d140 flashsvenc: fix some comment typos 2011-07-16 00:26:15 +02:00
Mans Rullgard
e5902d60ce aacps: skip some memcpy() if src and dst would be equal 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-15 22:41:52 +01:00
Diego Biurrun
bee6d2fd76 doxygen: replace @sa tag by the more readable but equivalent @see 2011-07-15 02:01:22 +02:00
Diego Biurrun
ad4cd0c2a4 doxygen: use Doxygen markup for authors and web links where appropriate 2011-07-15 02:01:21 +02:00
Diego Biurrun
6168781f70 doxygen: do not include license boilerplate in Doxygen documentation 2011-07-15 00:52:09 +02:00
Martin Storsjö
ca5d57ef8a ac3enc: Mark AVClasses const 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-07-15 00:26:23 +03:00
Diego Biurrun
99b9df5281 doxygen: misc consistency cosmetics 2011-07-14 20:51:15 +02:00
Diego Biurrun
f6f95d4e49 doxygen: consistently place brief description 2011-07-14 20:49:37 +02:00
Diego Biurrun
ec679eb453 doxygen: place empty line between brief description and detailed description 
Without it, Doxygen cannot separate them into different sections.
 2011-07-14 20:49:08 +02:00
Anton Khirnov
f2f523fffc Add an APIChanges entry and bump minor versions for recent changes. 2011-07-14 14:16:16 +02:00
Diego Biurrun
d0fcf39f0c doxygen: Move function documentation into the macro generating the function. 
This fixes a bunch of related warnings where Doxygen assumed that the
documentation belonged to the macro and not the function.
 2011-07-14 04:09:50 +02:00
Diego Biurrun
96c1e6d40d doxygen: Make sure parameter names match between .c and .h files. 2011-07-14 04:09:49 +02:00
Diego Biurrun
806212498a h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h 
This fixes a bunch of unused function warnings.
 2011-07-14 04:09:49 +02:00
Daniel Kang
ac4a85f476 H.264: Add more x86 assembly for 10-bit H.264 predict functions 
Mainly ported from 8-bit H.264 predict.

Some code ported from x264. LGPL ok by author.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-13 18:44:51 -07:00
Justin Ruggles
b5849f7709 ac3enc: merge AC3MDCTContext with AC3EncodeContext. 
Since both the fixed-point and floating-point encoders use the FFTContext,
this no longer needs to be in a separate context. Also, when a short-transform
context is added, the same MDCT window will be used.
 2011-07-13 16:55:28 -04:00
Justin Ruggles
82cea7cb6c ac3enc: prefer passing AC3EncodeContext rather than AVCodecContext 2011-07-13 16:55:28 -04:00
Justin Ruggles
f501157e53 ac3enc: fix memleak 2011-07-13 16:54:02 -04:00
Ronald S. Bultje
cdc5a3a194 mpeg1video: add CODEC_CAP_SLICE_THREADS. 2011-07-13 12:41:45 -07:00
Alex Converse
a58858d60d lavf: Cleanup try_decode_frame() logic. 
This fixes AAC playback in ffplay.
 2011-07-13 10:39:06 -07:00
Diego Biurrun
028216b2c2 h264: move decode_mb_skip() from h264.h to h.264_mvpred.h 
This resolves a circular dependency between the headers.
 2011-07-12 20:36:50 +02:00
Diego Biurrun
828e207337 dnxhdenc: Replace a forward declaration by the proper #include. 2011-07-12 19:24:53 +02:00
Ronald S. Bultje
c90a2538a0 h264: move h264_mvpred.h include. 
Fixes the following compile error with darwin/gcc-4.2.1:
In file included from libavcodec/error_resilience.c:33:
libavcodec/h264.h: In function ‘decode_mb_skip’:
libavcodec/h264.h:773: error: ‘always_inline’ function could not be inlined in call to ‘pred_pskip_motion’: the function body must appear before caller
libavcodec/h264.h:1334: error: called from here
 2011-07-12 08:15:55 -07:00
Jason Garrett-Glaser
b5bbc84fe2 H.264: add filter_mb_fast support for >8-bit decoding 
Much faster high bit depth deblocking.
 2011-07-11 14:58:50 -07:00
Jason Garrett-Glaser
f6b7f72461 H.264: avoid redundant alpha/beta calculations in loopfilter 2011-07-11 08:46:44 -07:00
Jason Garrett-Glaser
a4f6be86d6 H.264: optimize intra/inter loopfilter decision 2011-07-11 08:46:03 -07:00
Ronald S. Bultje
d1cf459119 vp8/mt: flush worker thread, not application thread context, on seek. 
This prevents a crash when seeking.
 2011-07-10 21:41:57 -07:00
Ronald S. Bultje
5eafc8b466 mt: proper locking around release_buffer calls. 
This fixes a crash when seeking in some webm files with many
threads (e.g. 8).
 2011-07-10 21:41:52 -07:00
Jean-Baptiste Kempf
58ef4ecff8 DxVA2: unbreak build after [657ccb5ac7] 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-10 16:16:19 -07:00
Mans Rullgard
1765aacb17 hwaccel: unbreak build 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-10 23:58:26 +01:00
Diego Biurrun
657ccb5ac7 Eliminate FF_COMMON_FRAME macro. 
FF_COMMON_FRAME holds the contents of the AVFrame structure and is also copied
to struct Picture.  Replace by an embedded AVFrame structure in struct Picture.
 2011-07-11 00:19:00 +02:00
Mans Rullgard
11043d80f6 ARM: use const macro to define constant data in asm 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-10 17:56:06 +01:00
Mans Rullgard
39c2a6bf44 bitdepth: simplify FUNC/FUNCC macros 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-10 17:56:06 +01:00
Mans Rullgard
710b8df949 dsputil: remove ff_emulated_edge_mc macro used in one place 
This macro can cause problems in conjunction with the bitdepth
template expansion.  It was presumably added to keep source
compatibility when high bitdepth support was added.  However,
emulated_edge_mc is a dsputil pointer and should not be called
directly, so there is little reason to keep such a macro.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-10 17:55:58 +01:00
Mans Rullgard
0f6fc8660e 9/10-bit: simplify clipping macros 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-10 17:54:41 +01:00
Anton Khirnov
84626b364b lavc: add support for codec-specific defaults. 2011-07-10 17:10:49 +02:00
Anton Khirnov
71a861cf40 lavc: make avcodec_alloc_context3 officially public. 
Deprecate avcodec_alloc_context/2.
 2011-07-10 17:09:28 +02:00
Anton Khirnov
18c007ba37 lavc: remove a half-working attempt at different defaults for audio/video codecs. 
It should be replaced with proper per-codec defaults.
 2011-07-10 17:08:58 +02:00
Anton Khirnov
9b83919f44 ac3dec: add a drc_scale private option 
Deprecate corresponding AVCodecContext option.

This is the first test of decoder private options.
 2011-07-10 17:07:12 +02:00
Anton Khirnov
0b950fe240 lavc: introduce avcodec_open2() as a replacement for avcodec_open(). 
Adds support for decoder-private options and makes setting other options
simpler.
 2011-07-10 17:06:22 +02:00
Jason Garrett-Glaser
7f7dc4fb55 H.264: fix filter_mb_fast with 4:4:4 + 8x8dct 2011-07-09 13:32:55 -07:00
Frank Barchard
f98c9fb27d mpeg1video: don't abort if thread_count is too high. 
Instead, just decrease it to a valid value and use that.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-09 10:13:57 -07:00
Diego Biurrun
d8dbe20241 libxvid: Add const qualifier to silence compiler warning. 
libavcodec/libxvidff.c:752: warning: initialization discards qualifiers from pointer target type
 2011-07-09 12:20:44 +02:00
Jason Garrett-Glaser
6a2176aac0 H.264: improve qp_thresh check 
Eliminate redundant check in filter_mb_fast, consider bit depth in calculating qp_thresh.
 2011-07-08 16:12:42 -07:00
Jason Garrett-Glaser
99b6d2c065 H.264: use fill_rectangle in CABAC decoding 2011-07-08 16:12:39 -07:00
Jason Garrett-Glaser
298e52c99c H.264: Remove redundant hl_motion_16/8 code 2011-07-08 16:12:36 -07:00
Jason Garrett-Glaser
ef0c594801 H.264: merge fill_rectangle into P-SKIP MV prediction, to match B-SKIP 2011-07-08 16:12:12 -07:00
Jason Garrett-Glaser
5136ba7c69 H.264: faster P-SKIP decoding 
Inline the relevant parts of fill_decode_caches into P-SKIP mv prediction to
avoid calling the whole thing.
 2011-07-08 16:11:15 -07:00
Jason Garrett-Glaser
bbdd52ed34 H.264: av_always_inline some more functions 
These weren't getting inlined all the time in all gcc versions.
 2011-07-08 16:09:35 -07:00
Daniel Kang
c0483d0c7a H.264: Add x86 assembly for 10-bit H.264 predict functions 
Mainly ported from 8-bit H.264 predict.

Some code ported from x264. LGPL ok by author.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-08 15:59:29 -07:00
Anton Khirnov
bda168d2b0 mp3enc: write a xing frame containing number of frames in the file 2011-07-08 22:47:24 +02:00
Mans Rullgard
ecf86e1a97 dnxhd: prettify tables 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-08 14:16:28 +01:00
Diego Biurrun
51915cfa47 flashsv: inline copy_region() into flashsv_decode_frame() 2011-07-08 00:35:17 +02:00
Diego Biurrun
91fe776913 flashsv: improve some variable names 2011-07-07 23:52:42 +02:00
Diego Biurrun
8886d75263 libschroedingerdec: Remove write-only variable. 
libavcodec/libschroedingerdec.c:211:23: warning: variable 'format' set but not used
 2011-07-07 22:56:03 +02:00
Diego Biurrun
357d0d8fc7 libgsm: Drop const qualifier to silence compiler warning. 
libavcodec/libgsm.c:148: warning: passing argument 2 of ‘gsm_decode’ discards qualifiers from pointer target type
/usr/include/gsm/gsm.h:68: note: expected ‘gsm_byte *’ but argument is of type ‘const uint8_t *’
 2011-07-07 15:21:22 +02:00
Diego Biurrun
b0058bda78 libvo-amrwbenc: Add braces to shut up gcc warning. 
libavcodec/libvo-amrwbenc.c:37:5: warning: missing braces around initializer
 2011-07-07 09:22:12 +02:00
Kostya
df64da3b1e bink: pass Bink version to audio decoder through extradata instead of codec_tag. 
This is needed because not all players (e.g. MPlayer) are able to distinguish
two different Bink audio decoders when codec_tag is set.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-07-06 14:52:02 +02:00
Diego Biurrun
dc90031038 flashsv: improve some comments and fix some wrong ones 2011-07-06 13:22:48 +02:00
Diego Biurrun
a082e68030 flashsv: Eliminate redundant variable indirection. 
As a positive side-effect, this gets rid of the following warning:
libavcodec/flashsv.c:190:38: warning: assignment discards ‘const’ qualifier from pointer target type
 2011-07-06 13:22:39 +02:00
Diego Biurrun
ecf026f1aa flashsv: set reference frame type to full frame 2011-07-06 13:21:27 +02:00
Diego Biurrun
bc35ab3f7d flashsv: replace bitstream description by a link to the specification 
An official specification now exists and it is both more detailed and easier to
understand than the incomplete notes available here.  Also remove ideas on how
to implement an encoder; these notes are already present in the encoder.
 2011-07-06 13:21:26 +02:00
Diego Biurrun
9b576e4d12 flashsv: convert a debug av_log into av_dlog 2011-07-06 13:21:26 +02:00
Diego Biurrun
39884ab035 flashsv: simplify condition 2011-07-06 13:21:26 +02:00
Diego Biurrun
dbf5b95d35 flashsv: return more meaningful error values 2011-07-06 13:21:25 +02:00
Diego Biurrun
940230202a flashsv: cosmetics: break some overly long lines 2011-07-06 13:21:25 +02:00
Diego Biurrun
cabc2938de flashsv: cosmetics: drop some unnecessary parentheses 2011-07-06 13:21:25 +02:00
Jason Garrett-Glaser
a625e13208 H.264: make loopfilter bS const where applicable 2011-07-05 16:28:37 -07:00
Diego Biurrun
8dd52d8202 opencore-amr: Add missing initializer braces to shut up gcc warning. 
This fixes the warning:
libavcodec/libopencore-amr.c:91: warning: missing braces around initializer
 2011-07-05 20:16:38 +02:00
Mans Rullgard
fce1e43410 ARM: workaround for bug in GNU assembler 
Some versions of the GNU assembler do not handle 64-bit
immediate operands containing arithmetic.  Writing the
value out in full works correctly.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-05 18:39:23 +01:00
Clément Bœsch
6d75fb01eb dv: fix comment wording mistake 2011-07-05 18:46:23 +02:00
Diego Biurrun
c45f629576 Rename libavcodec/high_bit_depth.h ---> libavcodec/bit_depth_template.c 
This naming scheme is used elsewhere, so it's sensible to be consistent.
 2011-07-05 17:38:37 +02:00
Reimar Döffinger
68e39d6efe dv: fix valgrind use of uninitialised value warnings. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-05 08:09:33 -07:00
Mans Rullgard
6cbf2420b9 PPC: use Altivec IMDCT only for supported sizes 
The Altivec IMDCT works with size 32 and higher only.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-05 16:01:56 +01:00
Clément Bœsch
65614321db dv: fix comment spelling 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-07-05 16:48:04 +02:00
Mans Rullgard
3824ef08e0 ARM: allow unaligned buffer in fixed-point NEON FFT4 
This function is called with only 8-byte alignment from
imdct for size 16.  The fft4 function is not called for
the larger FFT or MDCT sizes, so this has no impact on
typical uses.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-04 20:36:35 +01:00
John Stebbins
49c7006c7e dca: set AVCodecContext frame_size for DTS audio 
Set the frame size when decoding DTS audio.

This has the side effect of fixing the computation of timestamps for DTS-HD in compute_pkt_fields.  Since frame_size is
not currently set, the duration of a frame is being guessed based on the streams bitrate.  But for DTS-HD, the bitrate
currently used is the rate of the DTS core which is much different than the whole DTS-HD stream and leads to a wildly
inaccurate frame duration estimate.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-04 10:18:14 -07:00
Daniel Kang
3c7c16fde3 YASM: Shut up unused variable compiler warning with --disable-yasm. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-07-04 18:49:09 +02:00
Daniel Kang
567a32b5b2 x86_32: Fix build on x86_32 with --disable-yasm. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-04 08:47:09 -07:00
Mans Rullgard
75a24bef4a iirfilter: add fate test 
Change the test program to output text instead of binary files so
it can be compared easily in FATE.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-04 16:26:26 +01:00
Diego Biurrun
66e2dd1187 doxygen: Add qmul docs. 2011-07-04 16:20:34 +02:00
Jason Garrett-Glaser
5029a40633 H.264: fix overreads of qscale_table 
filter_mb_fast assumed that qscale_table was padded like many of the other tables.
 2011-07-04 06:39:20 -07:00
Diego Biurrun
e589e4b82d Remove unused static tables and static inline functions. 2011-07-04 14:59:35 +02:00
Mans Rullgard
74965f2644 dct-test: remove 'ref' function pointer from tables 
The reference function can be inferred from the direction of the
transform, no need for storing it with each entry.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-04 12:31:47 +01:00
Diego Biurrun
e3759c567d Add LGPL license boilerplate to files lacking it. 2011-07-04 12:54:26 +02:00
Diego Biurrun
3c432e1186 doxygen: Fix documentation for some VP8 functions. 2011-07-04 12:54:26 +02:00
Christian Schmidt
6c374bc0b4 libxvid: add missing include of libavutil/mathematics.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-04 10:55:38 +01:00
Mans Rullgard
dbf396d497 dct-test: exit with non-zero status if an IDCT fails 
IDCTs are partially evaluated according to IEEE 1180-1990 (more or
less).  An override is added to the table for implementations known
to not meet the spec requirements.  These variants are run but not
checked for accuracy.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-04 10:38:14 +01:00
Mans Rullgard
7fd2c13888 dct-test: make speed test optional 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-04 09:54:08 +01:00
Mans Rullgard
cf2b4f884d dct-test: remove is_idct field from tables 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-04 09:54:08 +01:00
Mans Rullgard
4b357756b1 dct-test: split table in two for idct and fdct 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-04 09:54:08 +01:00
Mans Rullgard
4f905a658b dct-test: simplify calling dct_error() 
Pass a pointer to the DCT descriptor instead of each field
individually.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-04 09:54:08 +01:00
Mans Rullgard
36fa9ef3e2 dct-test: whitespace cosmetics 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-04 09:54:08 +01:00
Mans Rullgard
412594ed0a dct-test: remove commented out code 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-04 09:54:08 +01:00
Robert Swain
954a653216 vorbis: vpxenc: Add missing include for av_rescale* 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-04 09:39:24 +01:00
Carl Eugen Hoyos
a4ab70f92e ffmpeg: Fix VDPAU decoding for some H264 samples. 2011-07-04 00:02:37 -07:00
Daniel Kang
58f7aad051 Fix build with --disable-yasm. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-03 22:56:09 -07:00
Jason Garrett-Glaser
556f8a066c H.264: template left MB handling 
Faster H.264 decoding with ALLOW_INTERLACE off.
 2011-07-03 15:06:00 -07:00
Jason Garrett-Glaser
ca80f11ec3 H.264: faster fill_decode_caches 
Aliasing avoidance and general cleanup.
 2011-07-03 15:05:57 -07:00
Jason Garrett-Glaser
3b7ebeb4d5 H.264: faster write_back_* 
Avoid aliasing, unroll loops, and inline more functions.
 2011-07-03 15:05:55 -07:00
Jason Garrett-Glaser
cb5469462d H.264: faster fill_filter_caches 
Reduce aliasing problems and unroll mv/ref loop.
 2011-07-03 15:05:52 -07:00
Jason Garrett-Glaser
4320a309ce H.264: make filter_mb_fast support the case of unavailable top mb 
Significantly faster deblocking in streams with lots of slices.
 2011-07-03 15:05:49 -07:00
Mans Rullgard
abc78a5a7c Do not include log.h in avutil.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:42:07 +01:00
Mans Rullgard
d49ea4afb4 Do not include pixfmt.h in avutil.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:42:07 +01:00