generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
29,770 Commits 24 Branches 241 Tags 173 MiB
687ff547fc
Commit Graph

61 Commits

Author SHA1 Message Date
Michael Niedermayer
be315a3232 Merge remote branch 'qatar/master' 
* qatar/master:
Duplicate  AMV: disable DR1 and don't override EMU_EDGE
Duplicate  lavf: inspect more frames for fps when container time base is coarse
Wrong and we have correct fix: Fix races in default av_log handler
  vorbis: Replace sized int_fast integer types with plain int/unsigned.
  Remove disabled non-optimized code variants.
NO  bswap.h: Remove disabled code.
  Remove some disabled printf debug cruft.
  Replace more disabled printf() calls by av_dlog().
NO  tests: Remove disabled code.
NO  Replace some commented-out debug printf() / av_log() messages with av_dlog().
  vorbisdec: Replace some sizeof(type) by sizeof(*variable).
NO  vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.

Conflicts:
	libavcodec/h264.c
	libavcodec/vorbisdec.c
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-30 01:58:26 +02:00
Diego Biurrun
cf3ac54339 vorbis: Replace sized int_fast integer types with plain int/unsigned. 
int/unsigned is the natural memory access type for CPUs, using sized types
for temporary variables, counters and similar just increases code size and
can possibly cause a slowdown.
 2011-04-29 20:28:40 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands. 
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:45:34 +00:00
Diego Biurrun
a7adcf29cf whitespace cosmetics, prettyprinting, K&R coding style 
Originally committed as revision 20080 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 11:43:58 +00:00
Diego Biurrun
0b8e7ab059 some more linebreak and brace placement cosmetics 
Originally committed as revision 20071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-28 21:46:22 +00:00
Diego Biurrun
5e56b30e1f brace placement and linebreak cosmetics 
Originally committed as revision 20070 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-28 21:13:47 +00:00
Reimar Döffinger
23638d8778 Remove unused variable. 
Originally committed as revision 19745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-30 08:29:11 +00:00
Loren Merritt
8fc9376c59 indent 
Originally committed as revision 19727 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-27 13:41:29 +00:00
Loren Merritt
2f17f9c10c 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2. 
1.3x and 3% on G4.
Though I think only part of this speedup is due to my optimizations per se;
some of it is that I got a better roll on the GCC random code generator.
Trivial reorderings of this function have a disproportionate effect on speed.

Originally committed as revision 19726 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-27 13:41:11 +00:00
Reimar Döffinger
5e039e1b4c Add extra validation checks to ff_vorbis_len2vlc. 
They should not be necessary, but it seems like a reasonable precaution.

Originally committed as revision 19374 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-08 19:39:23 +00:00
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h. 
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 16:20:26 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives. 
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 02:00:19 +00:00
Oded Shimon
05dee1b7df Rename all vorbis encoder related typedefs to not use _t for POSIX compatibility 
Originally committed as revision 16076 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-12 05:12:51 +00:00
Diego Biurrun
ccd425e799 Remove unnecessary parentheses from return calls. 
Originally committed as revision 13069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-06 09:16:36 +00:00
Loren Merritt
e1813a2f1e 30% faster ff_vorbis_floor1_render_list, 3% faster overall 
Originally committed as revision 11883 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-09 13:53:15 +00:00
Diego Biurrun
e5a389a1b7 license header consistency cosmetics 
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 10:40:25 +00:00
Aurelien Jacobs
07c55d8ea3 rename vorbis.c to vorbis_dec.c and vorbis_common.c to vorbis.c 
Originally committed as revision 8981 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-10 15:24:01 +00:00
Aurelien Jacobs
f6bd6eeffd loosen vorbis_enc.c dependencies by spliting vorbis.c 
Originally committed as revision 8980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-10 15:17:17 +00:00
Aurelien Jacobs
5bb127a98f extract vorbis header spliting code into a reusable function 
Original thread:
Date: Thu, 22 Mar 2007 20:23:08 -0400
Subject: [Ffmpeg-devel] [PATCH] Theora in MKV (GSoC '07 Qualification)

Originally committed as revision 8505 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-25 01:06:45 +00:00
Måns Rullgård
36cd306907 rename inverse -> ff_inverse 
Originally committed as revision 6990 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-12 18:49:36 +00:00
Diego Biurrun
c26abfa541 Rename ABS macro to FFABS. 
Originally committed as revision 6666 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-11 23:17:58 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Oded Shimon
7f09a56091 remove render_line from vorbis.h, add ff_vorbis_floor1_render_list instead 
Originally committed as revision 6409 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-01 17:38:07 +00:00
Oded Shimon
6c29d7c8f3 make some more functions global so they can be shared with vorbis_enc.c 
Originally committed as revision 6402 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-01 11:59:33 +00:00
Oded Shimon
9f963af5a0 make ready_floor1_list() shared for vorbis_enc.c 
Originally committed as revision 6401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-01 11:11:30 +00:00
Oded Shimon
cc0ba5a58f vorbis.h -> vorbis_data.c 
move tables from vorbis.h to a C file so they can be used later in
vorbis_enc.c

Originally committed as revision 6398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-30 18:47:15 +00:00
Reimar Döffinger
544c449d12 Get rid of get_bits_long_le, get_bits_long was fixed and now behaves the same way. 
Originally committed as revision 6334 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-25 22:54:19 +00:00
Oded Shimon
0e3cb7a1ff fix to vorbis decoder for book==0 
Originally committed as revision 6328 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-24 10:58:06 +00:00
Diego Biurrun
b7cff9ce7c Remove unused variable. 
Originally committed as revision 6223 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-10 18:16:19 +00:00
Loren Merritt
069720565c vorbis simd tweaks 
Originally committed as revision 5983 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-11 18:19:37 +00:00
Loren Merritt
0e0adae0ba vorbis cosmetics: mdct0,mdct1 => mdct[2] 
Originally committed as revision 5978 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-10 21:57:30 +00:00
Loren Merritt
88db1a15c5 misc tweaks in vorbis_residue_decode(). 
4% faster vorbis.

Originally committed as revision 5977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-10 21:55:31 +00:00
Loren Merritt
eb4825b5d4 sse and 3dnow implementations of float->int conversion and mdct windowing. 
15% faster vorbis.

Originally committed as revision 5975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-10 19:06:25 +00:00
Loren Merritt
bcfa3e58ee 3dnow2 implementation of imdct. 
6% faster vorbis and wma.

Originally committed as revision 5954 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-08 04:01:04 +00:00
Loren Merritt
32e8763103 another div -> fastdiv, another 2% faster vorbis. 
Originally committed as revision 5902 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-03 06:07:13 +00:00
Loren Merritt
2dac4acfc0 sse & sse2 implementations of vorbis channel coupling. 
9% faster vorbis (on a K8).

Originally committed as revision 5898 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-03 03:18:47 +00:00
Loren Merritt
7bf0049623 int16_t is faster than int_fast16_t for division. 
2% faster vorbis (on a K8).

Originally committed as revision 5897 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-03 02:18:07 +00:00
Benjamin Larsson
8dcf48a8c3 Cosmetics. Add the defines needed for debug output. 
Originally committed as revision 5361 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-11 00:28:30 +00:00
Loren Merritt
24efb5e51b fix a crash on x86_64 
Originally committed as revision 5360 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-11 00:06:50 +00:00
Denes Balatoni
8d39d67a78 vorbis 5:1 decoding fix, fix mi2_vorbis51.mp4, patch by Denes Balatoni <dbalatoni at programozo dot hu> 
Originally committed as revision 5349 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-07 17:30:00 +00:00
Uoti Urpala
f267587ece Vorbis specs requires blocksize_1 >= blocksize_0, error if it's false. 
Predict buffer size from blocksize_1 and number of channels and make
sure this does not exceed AVCODEC_MAX_AUDIO_FRAME_SIZE

Patch by Uoti Urpala >>> uoti |.| urpala |@| pp1 |.| inet |.| fi <<<

Originally committed as revision 5313 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-04-23 21:11:31 +00:00
Måns Rullgård
1bd8624697 kill some warnings 
Originally committed as revision 5063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-25 22:41:31 +00:00
Alexander Strasser
04c669ba98 Correct the relation between floors of type 0 and block sizes. 
Originally committed as revision 4941 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-05 10:16:20 +00:00
Alexander Strasser
536b48b258 10l (malloc check with the wrong pointer) 
Simplification: I have to reconsider this trees and forest thing...

Also readded and documented the check i had in the beginning and removed
before applying. It avoids a possible div by zero.

Originally committed as revision 4934 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-04 09:59:48 +00:00
Alexander Strasser
43eb59087b Added support for vorbis files containing floor type 0. 
Originally committed as revision 4933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-04 08:55:34 +00:00
Dieter
ceaf1909c1 add static keyword to some functions 
patch by Dieter <freebsd at sopwith solgatos com>

Originally committed as revision 4913 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-30 23:33:19 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
Måns Rullgård
4733abcbf3 use PRIxN, %zd, %td formats where needed 
Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-12 01:56:46 +00:00