1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Commit Graph

7811 Commits

Author SHA1 Message Date
Diego Biurrun
f544a5fc84 Replace generic CONFIG_ENCODERS preprocessor conditionals by more specific
CONFIG_FOO_ENCODER conditionals where appropriate.

Originally committed as revision 15174 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 12:33:21 +00:00
Vladimir Voroshilov
063ad8205a gain codebook (first stage), 8k mode for G.729
Originally committed as revision 15171 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 04:45:01 +00:00
Vladimir Voroshilov
bc165ee392 Another set of approved G.729 chunks (from decoder core)
Originally committed as revision 15168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 01:07:03 +00:00
Aurelien Jacobs
4834eb191c theoradec: cosmetics: indentation
Originally committed as revision 15167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 00:19:08 +00:00
Aurelien Jacobs
feaf1a7393 theoradec: skip decoding of uncoded MV in 4MV code
Thusnelda, the new experimental Theora encoder is using this Theora feature
that was previously not exploited.
fixes issue579

Originally committed as revision 15166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 00:17:11 +00:00
Aurelien Jacobs
e32e2d56d4 theoradec: small 4MV code reorganization to ease future improvements
no functional changes

Originally committed as revision 15165 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 00:10:30 +00:00
Diego Biurrun
2a43a093ed Replace generic CONFIG_DECODERS preprocessor conditionals by more specific
CONFIG_FOO_DECODER conditionals where appropriate.

Originally committed as revision 15162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 23:25:57 +00:00
Diego Biurrun
ab21090869 Silence a couple of 'defined but not used' warnings by adding an av_unused
attribute to the relevant function declarations.

Originally committed as revision 15161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 23:14:11 +00:00
Laurent Aimar
bd10f6e149 Prevent a division by 0 in the g726 decoder when the configured samplerate is 0.
patch by Laurent Aimar, fenrir via.ecp fr

Originally committed as revision 15160 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 23:09:14 +00:00
Vladimir Voroshilov
d3bb8ad7af Parity bit calculation routine for G.729
Originally committed as revision 15154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 17:15:28 +00:00
Michael Niedermayer
d0b41d8931 Try to support invalid h264 that does not mark IDR with POC=0.
Fixes issue576.

Originally committed as revision 15153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 16:31:18 +00:00
Justin Ruggles
406ab5cc97 add a separate line in Makefile for E-AC-3 decoder and only compile it when
GPL is enabled. fixes building without GPL or with liba52.

Originally committed as revision 15151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 04:04:26 +00:00
Baptiste Coudurier
7cabcf7d37 make pcm encoder setting bits_per_sample field
Originally committed as revision 15150 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 21:13:05 +00:00
Justin Ruggles
2988c93d94 create a separate codec_id for E-AC-3
Originally committed as revision 15143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 14:33:54 +00:00
Bartlomiej Wolowiec
755ba88640 Remaining parts of Nellymoser encoder
Originally committed as revision 15138 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 11:19:26 +00:00
Michael Niedermayer
719f37026a Check ff_init_me()s return value.
Originally committed as revision 15137 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 00:28:51 +00:00
Michael Niedermayer
6f55b11ec6 1000l Fix snow regression test that i broke in r15135.
Originally committed as revision 15136 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 00:22:00 +00:00
Michael Niedermayer
b74ec69366 Warn the user about me_method values that are not supported.
Fixes issue503

Originally committed as revision 15135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 23:55:47 +00:00
Michael Niedermayer
c541e668f6 Optimize vorbis_residue_decode() so that vr->type is a constant.
Based on a patch by Siarhei Siamashka.

Originally committed as revision 15134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 22:49:42 +00:00
Michael Niedermayer
969c163f1f Remove debuging junk that probably hasnt been used by anyone since years.
Originally committed as revision 15133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 20:26:28 +00:00
Bartlomiej Wolowiec
748384a186 Okayed parts of nellymoserenc.c
Originally committed as revision 15126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 19:26:33 +00:00
Stefan Gehrer
03f7e56896 reduce code duplication by moving common header parsing
from the bpp-specific parts to the frame decode

Originally committed as revision 15121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 08:09:54 +00:00
Stefano Sabatini
987903826b Globally rename the header inclusion guard names.
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:39:47 +00:00
David Conrad
b4c3d83584 Use ff_vp3_idct_data in vp3dsp_mmx.c rather than duplicating it
Originally committed as revision 15118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:05:55 +00:00
David Conrad
43410eaf7c Declare ff_vp3_idct_data to be uint16_t
Originally committed as revision 15117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:05:29 +00:00
David Conrad
587ae47aa7 Don't declare SSE vp3 idct data static, so it can be used in the mmx version
Originally committed as revision 15116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:05:08 +00:00
Justin Ruggles
1f6a594de4 turn on E-AC-3 decoding support and update the Changelog
Originally committed as revision 15103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:08:18 +00:00
Justin Ruggles
f07fe6e78a simplify code and comment regarding determination whether or not AHT is used.
Originally committed as revision 15101 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:01:56 +00:00
Justin Ruggles
9cf8ebe38a use correct table name
Originally committed as revision 15099 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:58:21 +00:00
Vitor Sessak
f6a1ca1dad Misc cosmetics in compute_lpc_coefs(): braces removal and empty lines
Originally committed as revision 15093 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:39:55 +00:00
Justin Ruggles
1ffbafa02b skip converter exponent strategy for all channels at once
Originally committed as revision 15092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:38:38 +00:00
Vitor Sessak
fc324cd523 Remove useless var in compute_lpc_coefs()
Originally committed as revision 15091 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:37:04 +00:00
Justin Ruggles
e1747bfa4e merge declaration and init. variable is not used outside the loop.
Originally committed as revision 15090 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:35:58 +00:00
Justin Ruggles
f2e4eb62dc cosmetics: indentation
Originally committed as revision 15089 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:32:08 +00:00
Vitor Sessak
5d2dd90848 Merge declaration and initialization of a few vars in compute_lpc_coefs()
Originally committed as revision 15088 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:31:05 +00:00
Justin Ruggles
8dfc56ec32 commit more OKed parts of the E-AC-3 decoder
Originally committed as revision 15087 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:30:09 +00:00
Justin Ruggles
225c30429d commit more OKed parts of the E-AC-3 decoder
Originally committed as revision 15068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:19:23 +00:00
Justin Ruggles
d82bdf684b commit more OKed parts of the E-AC-3 decoder
Originally committed as revision 15067 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:13:10 +00:00
Michael Niedermayer
d3b4b74c32 Fix lossless jpeg encoder to comply to spec and store full redundant
residuals, Note this does not change RGB32 as we need to check this
against some decoder that supports it.

Originally committed as revision 15055 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 20:39:12 +00:00
David Conrad
c979fa030f Remove unused dequantization code from SSE VP3 IDCT
Originally committed as revision 15054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 19:47:47 +00:00
David Conrad
167029a73a Use ff_pw_8 in MMX/SSE VP3 IDCT
Originally committed as revision 15053 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 19:41:42 +00:00
David Conrad
21383da8c4 Let ff_pw_8 be used as an SSE constant
Originally committed as revision 15052 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 19:40:21 +00:00
Justin Ruggles
ea364c74a0 cosmetics: update comment about dithering
Originally committed as revision 15051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 17:51:03 +00:00
Michael Niedermayer
1d8370aad9 Remove the cos_mod table that has become unused after replacing the imdct
by ff_imdct_half().

Originally committed as revision 15050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 11:01:58 +00:00
Michael Niedermayer
89df5e95bb Replace obfuscated mdct in qmf_32_subbands() by ff_imdct_half().
Originally committed as revision 15049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 10:47:13 +00:00
Michael Niedermayer
47f0e05295 Get rid of the 512 sample memmove().
Originally committed as revision 15048 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 10:41:53 +00:00
Peter Ross
43a38a7c3e Remove 'currently unused' warning about SAMPLE_FMT_xxx.
Originally committed as revision 15046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 04:26:45 +00:00
Bartlomiej Wolowiec
53440c621b Okayed parts of nellymoserenc.c
Originally committed as revision 15039 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 21:35:57 +00:00
Vitor Sessak
f991d423d2 Remove useless zeroing of a buffer
Originally committed as revision 15038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 21:12:30 +00:00
Robert Swain
93b63b1a67 Fix typo in element type
Originally committed as revision 15037 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 20:19:23 +00:00
Robert Swain
f4fae46e67 Remove unnecessary portion of a condition. This fixes issue607 and avoids
another unintended bug where channel coupling could have been run on an SCE.

Originally committed as revision 15036 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 20:18:34 +00:00
Stefano Sabatini
7a7c4a7bf7 Fix typo.
Originally committed as revision 15034 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 18:43:20 +00:00
Michael Niedermayer
b854197919 Half the size of subband_fir_noidea and get rid of memmove & memset of it.
Originally committed as revision 15033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 18:37:40 +00:00
Stefano Sabatini
d4be08e0c9 Make X264_init() no longer assign avctx->rc_eq to libx264's context.
Fix a crash due to X264_init() setting the libx264 rc_eq field to NULL
when rc_eq was not defined. As a consequence rc_eq can no longer be
manually specified and passed to libx264, but this option is going to
be removed from the libx264 public API anyway.

See the thread: "Fix crash in libx264 when rc_eq is not set".

Originally committed as revision 15029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 17:37:32 +00:00
Michael Niedermayer
ef8676276d Move t1 and t2 declaration from the QMF code closer to where they are used.
Originally committed as revision 15024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 14:53:07 +00:00
Michael Niedermayer
addafb0e0a Simplify (drop useless intermediate sum and diff arrays).
Originally committed as revision 15023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 14:44:47 +00:00
Andreas Öman
c55ecb9c27 5,1l: samples_chanptr[] should be (const float *)
Originally committed as revision 15022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 10:14:01 +00:00
Andreas Öman
a7bc9d1b71 dca: Set data_size outside block loop.
Originally committed as revision 15021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 10:12:44 +00:00
Andreas Öman
8ed96a5eba dca: Do float -> int16 interleaving in-place using s->dsp.float_to_int16_interleave()
Originally committed as revision 15020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 10:09:51 +00:00
Kostya Shishkov
eca0bcb66e While APE changed container format in 3.98, frequency tables for range coding
were changed only in 3.99.
This fixes decoding of v3.98 APE file I have.

Eternal curses to the creator of such unstable format.

Originally committed as revision 15019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 06:14:53 +00:00
Peter Ross
2bfd8855fb Bump libavcodec minor version number for r15017.
Originally committed as revision 15018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 04:02:04 +00:00
Peter Ross
312420f3fa Add AVCodecContext.bits_per_raw_sample field.
Originally committed as revision 15017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 03:59:48 +00:00
Peter Ross
46a73068a6 Change AVCodecContext.bits_per_sample to bits_per_coded_sample.
Nb: This change will become active on the next libavcodec major version bump.

Originally committed as revision 15016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 03:52:10 +00:00
Justin Ruggles
e522bd49c8 cosmetics: change another "get" to "decode"
Originally committed as revision 15014 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 00:09:47 +00:00
Justin Ruggles
164e169fef cosmetics: change "get" to "decode"
Originally committed as revision 15013 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 00:06:43 +00:00
Justin Ruggles
86662b1c89 cosmetics: indentation
Originally committed as revision 15012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-28 23:16:21 +00:00
Justin Ruggles
260e09305b remove unneeded variable, dither_all
Originally committed as revision 15011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-28 23:04:15 +00:00
Roman Shaposhnik
f8007a1473 Intial implementation of the DV100 (AKA DVCPRO HD) decoder and demuxer as
specified in SMPTE 370M

Originally committed as revision 15010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-28 22:41:00 +00:00
Roman Shaposhnik
b4e0102c5c Introducing video_stype for holding the value of VAUX source pack
and simplifying dv_frame_profile

Originally committed as revision 15007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-28 19:21:59 +00:00
Kostya Shishkov
a169f49881 Add generic IIR filter interface with Butterworth lowpass filter implementation
and remove obsoleted old lowpass filter.

Originally committed as revision 15005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-28 04:53:57 +00:00
Michael Niedermayer
29ca668f0a Fix mid/side stereo buggy output zeroing, fixes issue264 part 2.
Originally committed as revision 15004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-28 00:46:09 +00:00
Justin Ruggles
53e6fbb4c5 cosmetics: rename a table
Originally committed as revision 15003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 23:44:34 +00:00
Justin Ruggles
aec0407faf cosmetics: indent after last commit
Originally committed as revision 15001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 23:23:54 +00:00
Justin Ruggles
6b4bfed965 do not read exponent strategies from each block for E-AC-3 since they are in the header
Originally committed as revision 15000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 23:11:05 +00:00
Roman Shaposhnik
f4acfa3887 Cosmetic change aimed at making it easier to see how bits are consumed
Originally committed as revision 14998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 20:25:47 +00:00
Roman Shaposhnik
b1e3628e8c Factoring out chan_slice / 27 into seq variable
Originally committed as revision 14997 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 20:21:17 +00:00
Roman Shaposhnik
7ae6dcb595 Simplification of how dct_mode affects decoding.
Originally committed as revision 14996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 20:17:01 +00:00
Michael Niedermayer
2f7c21b717 Cosmetics (format ff_nelly_dequantization_table nicer)
Originally committed as revision 14993 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 18:56:50 +00:00
Justin Ruggles
8649e9332c add definitions and documentation for shared functions for E-AC-3 decoding
Originally committed as revision 14991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 01:47:03 +00:00
Justin Ruggles
0ffea2439b copy default coupling band structure from table to decoding context (used for E-AC-3)
Originally committed as revision 14990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 01:40:46 +00:00
Justin Ruggles
e43b29ab26 add more OKed parts of the E-AC-3 decoder: structural changes to support AHT mode mantissa decoding
Originally committed as revision 14989 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 01:36:20 +00:00
Justin Ruggles
6a68105e2b cosmetics: rename some functions from *get_* to *decode_*
Originally committed as revision 14988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 01:24:43 +00:00
Baptiste Coudurier
8ee552f69c simplify mpeg12 avctx->pix_fmt set
Originally committed as revision 14986 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 23:25:29 +00:00
Aurelien Jacobs
67f718bd11 Add a temp variable to ff_sine_window_init() to match the way wma.c computed
window before r14757. This fixes a regression introduced by r14757 on amd64.

Originally committed as revision 14982 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 19:40:53 +00:00
Vladimir Voroshilov
2ccddc0211 Add explicit (int) cast to i386 optimized MUL* macros.
Wrong result is returned when 16-bit value is passed as value.
Also fixes "Warning: using `%edx' instead of `%dx' due to `l' suffix".

Originally committed as revision 14981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 19:38:17 +00:00
Vladimir Voroshilov
51f2a119cb (cosmetics) Remove incorrect comment.
Originally committed as revision 14980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 18:06:07 +00:00
Vladimir Voroshilov
f5e177f852 (cosmetics) Describe for which tests clipping is required.
Originally committed as revision 14979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 16:47:31 +00:00
Vladimir Voroshilov
1b8a36d728 (cosmetics) Remove wrong comments.
Originally committed as revision 14977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 16:41:23 +00:00
Vladimir Voroshilov
ef1bc972dd (cosmetics) Align comments consistently.
Originally committed as revision 14974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 07:13:43 +00:00
Vladimir Voroshilov
7ad909bd59 Another set of definitions for G.729
Originally committed as revision 14973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 07:10:38 +00:00
Michael Niedermayer
2ad0d96a24 Replace cliping in ff_acelp_interpolate() by a check&av_log, this should be the
quickest way to find out if it is needed.

Originally committed as revision 14970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 22:51:47 +00:00
Luca Barbato
9ac78726b8 Missing static in float_to_int16_altivec declaration
Originally committed as revision 14967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 16:32:03 +00:00
Bartlomiej Wolowiec
8580314463 Little-endian bitstream writer
Originally committed as revision 14965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 08:53:14 +00:00
Alexander E. Patrakov
3fc45bdcf0 fir_32bands_perfect[] contents were mixed, restore original order
Patch by Alexander Patrakov ($lastname <whirlpool> gmail.com)
Thread: dcadata.h: fir_32bands_perfect[] is wrong

Originally committed as revision 14964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 06:28:52 +00:00
Måns Rullgård
94cdcece91 ARM: add prefetch function using ARMv5 PLD instruction
Originally committed as revision 14962 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 02:29:04 +00:00
Måns Rullgård
f1424cfd6d ARM: set STRIDE_ALIGN and DECLARE_ALIGNED_8 to 16 for NEON
Originally committed as revision 14961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 01:59:06 +00:00
Justin Ruggles
ffc2b3412c right shift the values by 8 in GAQ remap "B" table. data now fits in int8_t.
Originally committed as revision 14958 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 00:15:29 +00:00
Justin Ruggles
c5b930e674 1000l to me. committed to wrong repo. revert last commit.
Originally committed as revision 14953 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 22:57:25 +00:00
Justin Ruggles
e23e4de3ae cosmetics: rename some functions from *get_* to *decode_*
Originally committed as revision 14952 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 22:55:08 +00:00
Alexis Ballier
dad6afb4cb stricter constraints of asm() blocks
All these variables are used as left operands of a movd instruction,
which does accept only memory or register operands while the "g"
constraint also allows immediates. Use "rm" instead.
Patch by Alexis Ballier %alexis P ballier A gmail P com%

Originally committed as revision 14941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 08:41:20 +00:00
Robert Swain
cbcbf439b9 Fix index to ff_sine_windows[]. Previously the index was usually in reverse
order.

Originally committed as revision 14940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 08:31:19 +00:00
Kostya Shishkov
e43b0a7316 okayed chunks of AAC encoder
Originally committed as revision 14939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 05:56:23 +00:00
Alexander E. Patrakov
cc09e77e2a Correct scaling factor in DCA decoder synthesis.
Patch by Alexander Patrakov ($lastname at gmail.com)
Thread: dca.c: output scale is a bit off

Originally committed as revision 14937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 05:47:45 +00:00
Justin Ruggles
0c3021eade change eac3dec.c license to LGPL
Originally committed as revision 14936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 04:55:32 +00:00
Loren Merritt
7fadc32de4 document some dsp alignments
Originally committed as revision 14935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 04:03:02 +00:00
Peter Ross
0cdc6ec941 Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
Originally committed as revision 14931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 22:45:03 +00:00
Luca Barbato
0a3650c9f0 Remove unused variables
Originally committed as revision 14929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 21:10:38 +00:00
Luca Barbato
e1f27dc22b Introduce float_to_int16_interleave_altivec, tested with vorbis
Originally committed as revision 14928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 21:09:46 +00:00
Luca Barbato
8d3d51005a Introduce float_to_int16_one_altivec
Originally committed as revision 14927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 21:02:30 +00:00
Kostya Shishkov
2e0b635a57 Simple lowpass filter implementation.
Originally committed as revision 14921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 15:49:58 +00:00
Kostya Shishkov
cda00def4b Do not pass unnecessary arguments to AAC encoder functions
Originally committed as revision 14920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 15:25:57 +00:00
Michael Niedermayer
56523713e5 Remove redundant FFMIN().
Originally committed as revision 14918 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 13:35:12 +00:00
Alexander E. Patrakov
4df7beb368 Increase buffer size to 16384 patch by Alexander E. Patrakov" patrakov gmail
This fixes a (probably not exploitable) buffer overflow (apparently unknown to its author).

Originally committed as revision 14917 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 13:29:13 +00:00
Vladimir Voroshilov
6bf8b3ef03 Remove unnecessary header inclusion from g729.h
Originally committed as revision 14916 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 12:49:13 +00:00
Vladimir Voroshilov
fe3a80d6fa Move from g729.h all definitions which are used only in g729dec.c
Originally committed as revision 14915 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 12:38:45 +00:00
Justin Ruggles
63d72fb167 fix decoding of coupling leak info for normal AC-3
Originally committed as revision 14913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 03:30:08 +00:00
Justin Ruggles
602031305c add more OKed parts of the E-AC-3 decoder
Originally committed as revision 14912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 02:04:36 +00:00
Justin Ruggles
0569993ea4 cosmetics: indentation
Originally committed as revision 14911 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 01:55:52 +00:00
Justin Ruggles
6fafb0202a add some approved parts of the E-AC-3 decoder
Originally committed as revision 14910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 01:51:42 +00:00
Robert Swain
b0f5852a13 Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
buffer sizes accordingly. This produces a ~10% overall decoding perfomance
improvement.

Originally committed as revision 14908 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 18:21:22 +00:00
Robert Swain
db38c38624 Whitespace cosmetics after the last commit
Originally committed as revision 14907 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 18:19:18 +00:00
Robert Swain
f49905588a Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
buffer update sections

Originally committed as revision 14906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 18:18:50 +00:00
Matthieu Castet
95801b6a07 alac : check readsamplesize to ensure get_bits() doesn't
fail. Patch by Matthieu Castet <castet.matthieu AT free fr>

Originally committed as revision 14905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 15:09:20 +00:00
Jai Menon
ec6cda8c6e alacenc : perform decorrelation only for stereo samples
Originally committed as revision 14904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 14:57:35 +00:00
Michael Niedermayer
474efc1889 Make equation in doxy of ff_acelp_weighted_vector_sum() more readable by
adding spaces.

Originally committed as revision 14902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 23:52:48 +00:00
Michael Niedermayer
27b71e4b24 doxygen consistency
Originally committed as revision 14901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 23:51:25 +00:00
Michael Niedermayer
6caabab8cd Make comments doxygen compatible.
Originally committed as revision 14900 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 23:49:58 +00:00
Michael Niedermayer
ec5bd476ac Doxygen syntax consistency.
Originally committed as revision 14899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 23:45:20 +00:00
Michael Niedermayer
8c5da74bc1 Mention cut-off freq of ff_acelp_high_pass_filter() instead of some
meaningless input dependent value.

Originally committed as revision 14898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 23:39:52 +00:00
Michael Niedermayer
70d3ba4194 Remove mathops.h dependancy.
Originally committed as revision 14897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 23:25:41 +00:00
Michael Niedermayer
1f08308249 vertical align
Originally committed as revision 14896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 23:23:01 +00:00
Michael Niedermayer
cd523888f3 Remove ff_acelp_weighted_filter() which is just a function wrapping a 1
line loop.

Originally committed as revision 14895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 23:22:11 +00:00
Michael Niedermayer
5038ecb1f1 Rename subframe_size to a name that is not specific to some specific use
of ff_acelp_convolve_circ()

Originally committed as revision 14894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 22:41:20 +00:00
Michael Niedermayer
2bbd3434bc rename pitch_delay_frac in ff_acelp_interpolate()
Originally committed as revision 14893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 22:36:32 +00:00
Michael Niedermayer
badcd8d719 Try to improve parameter doxy of ff_acelp_interpolate().
Originally committed as revision 14892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 22:34:13 +00:00
Michael Niedermayer
03a4da6f69 Clarify how generic ff_acelp_interpolate() is.
Originally committed as revision 14891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 22:05:14 +00:00
Michael Niedermayer
ba5a14fc5d Correct incorrect length parameter doxy for ff_acelp_interpolate().
Originally committed as revision 14890 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 22:02:04 +00:00
Michael Niedermayer
ef119cc837 Right half is clearer than positive half for specifying which part of
the filter coeffs is used.

Originally committed as revision 14889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 21:59:42 +00:00
Michael Niedermayer
7dd3e95a04 Mention the fixed-point scale of the FIR filter coefficients.
Originally committed as revision 14888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 21:56:48 +00:00
Michael Niedermayer
ba05497de5 Cleanup comment for ff_acelp_interp_filter.
Originally committed as revision 14887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 21:52:56 +00:00
Michael Niedermayer
2398930fe0 Make doxygen comments consistent with the rest of FFmpeg.
Originally committed as revision 14886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 21:37:53 +00:00
Michael Niedermayer
fee37a4985 Document code, do not document difference to a irrelevant reference implementation.
Originally committed as revision 14885 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 21:33:31 +00:00
Michael Niedermayer
012fd207a3 Remove some irrelevant comments.
Originally committed as revision 14884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 21:31:03 +00:00
Vladimir Voroshilov
da7e59b4ab first and second stage LSP codebooks for G.729
Originally committed as revision 14883 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 13:35:23 +00:00
Robert Swain
65b20b2485 Reindent after last commit
Originally committed as revision 14882 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 12:13:22 +00:00
Robert Swain
fbd91d7cad Work around GCC variable may be used uninitialised warning
Originally committed as revision 14881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 12:12:03 +00:00
Robert Swain
1098e8d236 Remove unused variable
Originally committed as revision 14880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 11:29:28 +00:00
Diego Biurrun
8e84913db4 cosmetics: Fix incorrect indentation.
Originally committed as revision 14878 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 10:31:08 +00:00
Robert Swain
4b0044b750 Reindent
Originally committed as revision 14877 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 10:23:55 +00:00
Andreas Öman
f339908843 The comment about channel order for AAC 5.1 audio was not correct, fix it.
Originally committed as revision 14875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 07:57:51 +00:00
Robert Swain
7d8f3de4a8 Last hunk of the AAC decoder code to be OKed and build system and documentation
alterations as appropriate

Originally committed as revision 14873 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 07:21:26 +00:00
Michael Niedermayer
79de84f263 Provide a simpler way for the user to reorder her timestamps.
Originally committed as revision 14871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 23:11:26 +00:00
Diego Biurrun
071083b4a5 Rename ff_init_vlcs function to the more descriptive name ff_mpeg12_init_vlcs.
Now that it is exported, this should avoid confusion and name clashes.

Originally committed as revision 14867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 17:05:14 +00:00
Diego Biurrun
054480a57b cosmetics: comment spelling/grammar fixes
Originally committed as revision 14866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 16:59:26 +00:00
Peter Ross
2cd04cf919 Fix PCM DVD divide by zero bug introduced in r14659. Patch supplied by lars dot taeuber at gmx dot net.
Originally committed as revision 14864 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 11:05:15 +00:00
Justin Ruggles
ab2a942ad8 cosmetics: indentation
Originally committed as revision 14863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:02:32 +00:00
Justin Ruggles
bf09b550e6 commit the OKed parts of the E-AC-3 decoder
Originally committed as revision 14860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:32:17 +00:00
Justin Ruggles
e630027686 get data size based on the actual data array instead of coding-in the calculation
Originally committed as revision 14859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:15:27 +00:00
Justin Ruggles
8e33132bab rename AC3_MAX_FRAME_SIZE to AC3_FRAME_BUFFER_SIZE and increase the size
Originally committed as revision 14858 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:08:59 +00:00
Diego Biurrun
0da49fca79 Untangle mpeg12.c and mdec.c so that mdec.c can be compiled separately.
Originally committed as revision 14851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 20:52:26 +00:00
Mathieu Malaterre
7942269b71 cosmetics: s/const static/static const/g
patch by Mathieu Malaterre, mathieu.malaterre gmail com

Originally committed as revision 14850 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 20:04:46 +00:00
Jai Menon
833e90ddf5 Update changelog and general.texi to reflect
addition of the alac encoder, add Jai Menon
to MAINTAINERS and bump LIBAVCODEC_VERSION_MINOR.

Originally committed as revision 14849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 19:25:00 +00:00
Jai Menon
a1ab56c5a8 alacenc: compare against ALAC_MAX_LPC_ORDER instead of MAX_LPC_ORDER
Originally committed as revision 14847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 18:45:00 +00:00
Jai Menon
e13894e80e alacenc: last few hunks approved by michael
Originally committed as revision 14845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 17:20:41 +00:00
Ramiro Polla
cc940caf4d alacenc: Use user-specified min and max prediction order.
Originally committed as revision 14844 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 16:12:05 +00:00
Ramiro Polla
0d962ecb70 Import more OKed parts of ALAC encoder from GSoC repo.
Originally committed as revision 14843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 16:07:58 +00:00
Roman Shaposhnik
c89cb5894e Making block size in bits variable and dependent on the DV spec
Originally committed as revision 14842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 16:02:43 +00:00
Roman Shaposhnik
713c1aa9a6 Making the number of blocks per macroblock dependent on the DV stream
specification

Originally committed as revision 14841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 16:01:41 +00:00
Roman Shaposhnik
cb879ec2fb Introducing DV_MAX_BPM macro instead of a hardcoded value for the
highest number of blocks per macroblock

Originally committed as revision 14840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 16:00:26 +00:00
Peter Ross
143a5d6f1f Add F64BE, F64LE and F64BE PCM codecs.
Originally committed as revision 14833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 10:43:47 +00:00
Peter Ross
e06b00f3b6 Add SAMPLE_FMT_DBL.
Originally committed as revision 14832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 10:36:30 +00:00
Peter Ross
4efbd75583 Fix PCM_S16LE_PLANAR channel-address calculation bug introduced in r14659.
Originally committed as revision 14831 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 10:17:29 +00:00
Diego Biurrun
6ec87fbd92 Mark init_vlcs function as av_cold.
Originally committed as revision 14830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 08:55:40 +00:00
Robert Swain
1dece0d2cd More OKed AAC decoder code hunks
Originally committed as revision 14829 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 21:36:58 +00:00
Robert Swain
c7f4d983a4 More OKed AAC decoder code hunks
Originally committed as revision 14828 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 19:39:08 +00:00
Peter Ross
97ceb75218 Mark SAMPLE_FMT_S24 as deprecated.
Originally committed as revision 14823 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 12:03:59 +00:00
Kostya Shishkov
bf689db069 Add okayed chunks of AAC encoder psychoacoustic model
Originally committed as revision 14822 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 05:39:44 +00:00
Kostya Shishkov
b54bf2d6eb Add okayed parts for AAC encoder
Originally committed as revision 14821 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 05:38:26 +00:00
Ramiro Polla
ca04826627 Import more ok'd parts of ALAC encoder from GSoC repo.
Originally committed as revision 14820 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 22:47:40 +00:00
Justin Ruggles
46dd2738ae remove some unneeded header includes
Originally committed as revision 14819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 19:56:28 +00:00
Diego Biurrun
ee8cc834ae Add missing header includes to fix 'make checkheaders'.
Originally committed as revision 14817 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 19:26:13 +00:00
Justin Ruggles
ec0350c983 use LFG instead of Mersenne Twister for AC-3 PRNG
Originally committed as revision 14815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 17:41:48 +00:00
Diego Biurrun
defa0cd6f5 Mark adx_decode_init() as type int instead of void, the function returns
a value.  Fixes the warning:
adxdec.c:36: warning: 'return' with a value, in function returning void

Originally committed as revision 14814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 17:08:25 +00:00
Justin Ruggles
f1f373c220 fix and simplify frame size check and reencoding in verbatim mode
Originally committed as revision 14811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 16:10:46 +00:00
Ramiro Polla
83e92ab6b8 alacenc: NULL_IF_CONFIG_SMALL long_name.
Originally committed as revision 14801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 12:25:01 +00:00
Vladimir Voroshilov
5209846850 G.729 decoder main code
(just skeleton, contains only parts, explicitly ok'ed by Michael)

Originally committed as revision 14800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 08:43:37 +00:00
Kostya Shishkov
720d52c678 More okayed chunks of AAC encoder
Originally committed as revision 14799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 07:04:11 +00:00
Ramiro Polla
6b93147684 Import ok'd parts of ALAC encoder from GSoC repo.
Originally committed as revision 14798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 04:36:06 +00:00
Justin Ruggles
38c1a5c4d9 update my email address to one which does not depend on my service provider
Originally committed as revision 14797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 22:42:59 +00:00
Justin Ruggles
81fc8a63c5 use range of lpc orders in ORDER_METHOD_EST
Originally committed as revision 14796 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 21:39:09 +00:00
Justin Ruggles
9045f5e72d cosmetics: adjust line breaks and vertical alignment
Originally committed as revision 14795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 21:32:03 +00:00
Justin Ruggles
56c07e2989 use limited range of lpc orders when quantizing coefficients
Originally committed as revision 14794 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 21:24:06 +00:00
Ramiro Polla
e9e3c9801e lpc: cosmetics: vertically align declarations and definitions.
Originally committed as revision 14792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 17:28:29 +00:00
Ramiro Polla
c50da3ad6c flacenc, lpc: Move LPC code from flacenc.c to new lpc.[ch] files.
Originally committed as revision 14790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 17:18:20 +00:00
Ramiro Polla
51c796d012 flacenc: Allow more flexible shift calculation in LPC.
Originally committed as revision 14789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 17:03:57 +00:00
Michael Niedermayer
3cffbe090a Fix rc_eq mem leak.
Originally committed as revision 14788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 14:46:31 +00:00
Michael Niedermayer
847d05360b Revert r14260
Log:
	Free in avcodec_close() avctx->rc_eq. Fix a memory leak.

Reason running free() on random pointers.

Originally committed as revision 14787 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 14:13:49 +00:00
Kostya Shishkov
f5c3eae3cb Synchronize AAC encoder with renamings in aac.h
Originally committed as revision 14786 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 11:59:36 +00:00
Kostya Shishkov
817015e4e2 Add approved chunks to AAC encoder
Originally committed as revision 14785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 05:47:18 +00:00
Peter Ross
38a1c7f2be Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
Originally committed as revision 14784 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 01:25:12 +00:00