Commit Graph
76 Commits
Author SHA1 Message Date
Robert Swain 7bbd2fb126 Remove redundant assignment. err is assigned in every switch case anyway. Issue
found by CSA.

Originally committed as revision 18641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-21 12:29:36 +00:00
Robert Swain 5967e1413e Remove unnecessary assignment, found by CSA.
Originally committed as revision 18617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-19 00:55:46 +00:00
Robert Swain 7b356d3951 Clarify which time_base the relevant members of AVPacket use
Originally committed as revision 18371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-08 01:45:44 +00:00
Robert Swain f0ed92df60 Fix second amr_nb_decode_frame() to also use the new AVPacket argument
Originally committed as revision 18354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 19:29:00 +00:00
Robert Swain 29e455081f Update apiexample.c to use the newer avcodec_decode_audio2() API. This also
fixes compilation.

Originally committed as revision 18176 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-24 02:26:10 +00:00
Robert Swain dbf9ddec33 The Ogg muxer will handle Theora as well
Originally committed as revision 17713 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-02 04:19:59 +00:00
Robert Swain 66d8229072 http://bytesex.org/xawtv/ permanently redirects to
http://linux.bytesex.org/xawtv/ so update the URL

Originally committed as revision 17592 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-25 20:18:01 +00:00
Robert Swain 72a8a69da2 Make myself maintainer of the website code
Originally committed as revision 17357 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 00:36:56 +00:00
Robert Swain b6b3bd9144 Relinquish maintainership of adtsenc.c from Måns grasp :)
Originally committed as revision 17189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-12 22:21:57 +00:00
Robert Swain 5f401ee03c AAC: Cosmetic alterations after the last commit
Originally committed as revision 17182 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-12 13:49:59 +00:00
Robert Swain b17f1a0764 Doxygen defgroups throw a warning if they don't have a title as well as a name
Originally committed as revision 16939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 10:31:51 +00:00
Robert Swain 1777168269 Make opt_preset() use FFMPEG_DATADIR from config.h rather than /usr and
/usr/local

Originally committed as revision 16795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-25 23:10:56 +00:00
Robert Swain a1a84f693f Add (un)installation targets for ffpresets using the new DATADIR variable
Originally committed as revision 16793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-25 22:44:57 +00:00
Robert Swain c79de5c07b The default subq value in the x264 CLI is now 6, not 5.
Originally committed as revision 16788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-25 21:28:56 +00:00
Robert Swain 76bd1cd8e1 Add maxrate and bufsize specifications for iPod presets. I omitted these
originally as I thought x264 set these automatically when specifying a level.

Originally committed as revision 16629 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 02:20:24 +00:00
Robert Swain 27ab726e1a Add presets for Apple iPod constraints
Originally committed as revision 16585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 19:46:42 +00:00
Robert Swain a6c2a5ef6c Add presets to use as constraints for H.264 Baseline and Main profiles
Originally committed as revision 16584 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 19:40:35 +00:00
Robert Swain 158b39126d Support ADTS AAC files in the ffaac decoder (limited to streams containing one
raw_data_block() per ADTS frame)

Patch by Alex Converse ( alex converse gmail com) based on a patch by Robert
Swain ( robert swain gmail com )

Originally committed as revision 16485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-07 22:09:21 +00:00
Robert Swain 4b82e3cedc Add some lossless h.264 encoding presets as suggested by Jason
Originally committed as revision 16478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-07 17:38:29 +00:00
Robert Swain 986a5e91f5 Add a slow first pass preset
Originally committed as revision 16477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-07 16:52:15 +00:00
Robert Swain ef4140690b Be consistent and use b-frames throughout the presets to avoid confusion about
whether they have to be specified in the first pass as well. Also use
b_strategy=2 in hq and max presets to further improve compression efficiency.

Originally committed as revision 16476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-07 16:51:55 +00:00
Robert Swain 199a8aa9f4 Change direct prediction for fast first pass to automatic as all other presets
use this mode and it has to be enabled in the first pass to be used in the
second

Originally committed as revision 16474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-07 15:44:41 +00:00
Robert Swain 897c1703d0 AAC: Reindent after last commit
Originally committed as revision 16251 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-21 05:32:55 +00:00
Robert Swain 8f5aaa6d2f AAC: Cosmetics after last commit
Originally committed as revision 15920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-24 00:14:33 +00:00
Robert Swain 69bf69c77e Synchronise presets with recent subme/brdo/bidir_refine -> subme changes in
libx264

Originally committed as revision 15572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-06 10:13:52 +00:00
Robert Swain 9e44998c63 Make myself maintainer of the preset files
Originally committed as revision 15446 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-28 19:05:34 +00:00
Robert Swain 341b28c0d2 Zero 'idx' for each iteration of the coupling gain loop and as it is only used
within this loop, we can move its declaration there too. This fixes bitstream
desync when decoding streams containing CCEs.

Based on a patch by Alex Converse (alex converse gmail com)

Originally committed as revision 15364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-18 16:02:51 +00:00
Robert Swain f80a8ca5cb Cosmetics: missing brackets
Originally committed as revision 15363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-18 15:48:37 +00:00
Robert Swain 4ee735fc54 libx264 ffpresets:
* default - x264 CLI default values
 * fastfirstpass - disables options unnecessary for first pass
 * normal - Dark Shikari’s Q55 preset
 * hq - Dark Shikari’s Q75 preset
 * max - all options maxed out (at time of writing)

Originally committed as revision 15348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-17 19:31:39 +00:00
Robert Swain 70735a3f9e Reindent after last commit
Originally committed as revision 15315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-13 20:52:57 +00:00
Robert Swain 408992bae2 Operands of '+' are not necessarily evaluated in order so r15311 was pointless.
Splitting the assignment onto two lines should resolve the order issue.

Originally committed as revision 15313 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-13 20:22:31 +00:00
Robert Swain 35445d29f5 Reindent after last commit
Originally committed as revision 15304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-12 14:33:35 +00:00
Robert Swain febcbd65fa Correct pulse amplitude application - a negative or 0 coefficient implies the
pulse is subtracted, else it is added. Also avoid a divide by 0.

Based on a patch by Alex Converse (alex converse gmail com)
Fixes part of issue632

Originally committed as revision 15294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-11 01:22:34 +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
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
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
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
Robert Swain 4b0044b750 Reindent
Originally committed as revision 14877 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 10:23:55 +00:00
Robert Swain c5377f575c Correct regex file name matching as per Måns' suggestion
Originally committed as revision 14876 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 10:15:05 +00:00
Robert Swain 4991f3ce3c Add me as maintainer of the AAC decoder code
Originally committed as revision 14874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 07:55:48 +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
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
Robert Swain cce540c5e7 Don't try to free shared ff_sine_* tables pointed to by s->windows[]
Originally committed as revision 14775 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 10:31:11 +00:00
Robert Swain 9ffd5c1cee More OKed AAC decoder hunks
Originally committed as revision 14774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 08:01:31 +00:00
Robert Swain 848a5815ce Synchronise AAC decoder code with that from SoC
Originally committed as revision 14772 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 00:19:14 +00:00
Robert Swain 62a57fae59 More OKed sections of AAC decoder code
Originally committed as revision 14770 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 00:05:09 +00:00
Robert Swain 47698b83fd The ff_sine_#[] should be aligned as they will commonly be used in dsputil
functions

Originally committed as revision 14767 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 22:12:19 +00:00
Robert Swain 69fc4da360 Add declarations for the sine tables used in wma.c (half window sizes: 128,
256, 512, 1024 and 2048) to mdct.c. Make them accessible via dsputil.h. Make
wma.c use these shared tables.

Originally committed as revision 14758 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 14:40:16 +00:00
Robert Swain ece6b83c3e Change wma.c to use the ff_sine_window_init() from mdct.c
Originally committed as revision 14757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 14:36:22 +00:00
Robert Swain 9edae4ad81 Synchronise code with AAC decoder in SoC
Originally committed as revision 14695 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-11 11:22:48 +00:00
Robert Swain 9cc04edff9 More OKed hunks of the AAC decoder from SoC
Originally committed as revision 14694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-11 11:16:06 +00:00
Robert Swain 697c7cd44b Bump minor version as av_log_missing_feature() was added to public API in
r14685

Originally committed as revision 14686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-10 22:18:46 +00:00
Robert Swain cc0591dab0 Sync already committed code with that in SoC and commit more OKed hunks of code
Originally committed as revision 14674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-09 10:46:27 +00:00
Robert Swain 71e9a1b8dd OKed sections of code from the SoC AAC decoder
Originally committed as revision 14626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 19:32:01 +00:00
Robert Swain fed3f06914 Move shared tables to aactab.c and add declarations to aactab.h. Also sync with
SoC code.

Originally committed as revision 14625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 19:31:05 +00:00
Robert Swain 589ce6e63d AAC definitions and structures that have been OKed from the SoC AAC decoder
code

Originally committed as revision 14624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 19:27:17 +00:00
Robert Swain f25c244f5f AAC tables and data that have been OKed by Michael
Originally committed as revision 14425 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 08:21:48 +00:00
Robert Swain f1b2f1bf50 Typo and grammar fix
Originally committed as revision 14177 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 10:56:12 +00:00
Robert Swain 848eab4e0a Correct a couple of typos
Originally committed as revision 14176 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 09:48:19 +00:00
Robert Swain f5048aaf69 Remove now unused variable
Originally committed as revision 13889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 15:26:00 +00:00
Robert Swain 9146e4d61c Add generic ff_sine_window_init function and implement in codecs appropriately
Originally committed as revision 13888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 15:12:27 +00:00
Robert Swain 34d71ebe94 Remove leading whitespace in long codec name that was committed in r13017
Originally committed as revision 13018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-29 08:37:40 +00:00
Robert Swain 80b1e6cc1f Grammar fixes and improvements for the new ACELP code
Originally committed as revision 13000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 15:20:06 +00:00
Robert Swain 3ed546fe52 Add variable alpha and size of half window for Kaiser-Bessel Derived window
generation. Hard code Bessel I0 approximation iterations to 50.

See thread for discussion:
[FFmpeg-devel] [PATCH] Move Kaiser-Bessel Derived window to mdct.c
Started on the 2008/01/10

Originally committed as revision 11520 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-13 11:02:08 +00:00
Robert SwainandAndreas Öman 4eb7a735cb Make the Kaiser-Bessel window generator a common function
Patch by Robert Swain, robert d swain a gmail d com

Originally committed as revision 11514 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-12 11:11:19 +00:00
Robert SwainandDiego Biurrun 2c48a21c4f Update specification and reference implementation links.
patch by Robert Swain, robert.swain gmail com

Originally committed as revision 8551 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-30 06:33:15 +00:00
Robert SwainandMåns Rullgård a5474d50c3 enable bidirectional me with x264
patch by Robert Swain <robert =dot= swain =at= gmail =dot= com>

Originally committed as revision 7422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-07 18:04:11 +00:00
Robert SwainandAurelien Jacobs c411e7f6fb alphabetic reordering of codec registration
patch by Robert Swain < robert.swain _at_ gmail.com >

Originally committed as revision 7176 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-27 13:04:56 +00:00
Robert SwainandMichael Niedermayer 2f5546ee68 update x264 wrapper.
patch by Robert Swain.

probably this change is caused by the flags2 default change
why ohh why does noone run the regression tests before cvs commit :(

Originally committed as revision 4845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-13 02:15:54 +00:00
Robert SwainandLoren Merritt 58f7833e8e update x264 wrapper.
patch by Robert Swain.

Originally committed as revision 4784 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-29 07:24:23 +00:00