Reimar Döffinger
3d929a607a
mpegaudio: remove frame_count variable and its only usage, it is always 0.
2011-05-10 20:25:53 +02:00
Michael Niedermayer
b97b4b58a6
Merge remote branch 'qatar/master'
...
* qatar/master:
mpegaudiodec: group #includes more sanely
mpegaudio: remove #if 0 blocks
ffmpeg.c: reset avoptions after each input/output file.
ffmpeg.c: store per-output stream sws flags.
mpegaudio: remove CONFIG_MPEGAUDIO_HP option
mpegtsenc: Clear st->priv_data when freeing it
udp: Fix receiving RTP data over multicast
rtpproto: Remove an unused variable
regtest: fix wma tests
NOT pulled: mpegaudio: remove CONFIG_AUDIO_NONSHORT
regtest: separate flags for encoding and decoding
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-10 04:03:17 +02:00
Mans Rullgard
6bb6fb05ba
mpegaudio: remove CONFIG_MPEGAUDIO_HP option
...
The low quality mode is off by default and never tested. The high
quality mode is also plenty fast enough.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-09 17:30:12 +01:00
Mans Rullgard
3a2e80ecbc
mpegaudio: remove CONFIG_AUDIO_NONSHORT
...
This fake option cannot be enabled by normal means, and the
floating-point decoder should provide the higher quality this
option presumably was intended for.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-09 10:12:47 +01:00
Michael Niedermayer
d4a50a2100
Merge remote-tracking branch 'newdev/master'
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-21 03:33:28 +01:00
Mans Rullgard
0aded9484d
Move dct and rdft definitions to separate files
...
This leaves fft.h with only the core FFT and MDCT definitions
thus making it more managable.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-20 17:15:33 +00: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
Stefano Sabatini
5d6e4c160a
Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum
...
SampleFormat with AVSampleFormat.
Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-12 11:04:40 +00:00
Vitor Sessak
060dd93000
Altivec-optimized mp{1,2,3} windowing
...
Originally committed as revision 23943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 21:04:12 +00:00
Vitor Sessak
06d01188e9
More mp{1,2,3} 32-point DCT transform to our common DCT framework.
...
Should allow for future SIMD optimizations.
Originally committed as revision 23912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 20:11:27 +00:00
Vitor Sessak
bc2b368215
SSE-optimized MP3 floating point windowing functions
...
Originally committed as revision 23750 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-24 07:44:50 +00:00
Vitor Sessak
4d49a5a785
Factorize the mpegaudio windowing code in a function and call it by a
...
function pointer. Should allow for ASM optimizations.
Originally committed as revision 23646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-19 09:56:05 +00:00
Michael Niedermayer
b91d46614d
float based mp1/mp2/mp3 decoders.
...
Originally committed as revision 23095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 19:52:42 +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
Måns Rullgård
84dc2d8afa
Remove DECLARE_ALIGNED_{8,16} macros
...
These macros are redundant. All uses are replaced with the generic
DECLARE_ALIGNED macro instead.
Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 14:24:59 +00:00
Måns Rullgård
c67278098d
Move array specifiers outside DECLARE_ALIGNED() invocations
...
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 03:25:11 +00:00
Vitor Sessak
c902340599
Reduce stack memory allocation in MP3 decoder
...
Originally committed as revision 20451 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-04 23:33:08 +00:00
Reimar Döffinger
9adcccde0c
mpegaudiodec, mpc and qdm2 all use the same mpa_synth window, so make
...
them use the same variable/global storage.
Saves 4 kB in .bss.
Originally committed as revision 20314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 17:21:02 +00:00
Måns Rullgård
20e7c8ae0a
Remove some unnecessary alignment specifiers
...
None of these arrays are used in ways requiring extra alignment.
Originally committed as revision 19715 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-26 12:12:40 +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
Andreas Öman
cf92cec7d8
Avoid allocating MPADecodeContext on stack.
...
Instead move relevant fields into MPADecodeHeader and use it
where appropriate.
Originally committed as revision 16728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 12:09:32 +00:00
Aurelien Jacobs
8b192330d5
explicitly disable CONFIG_AUDIO_NONSHORT
...
Originally committed as revision 16620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 00:03:51 +00:00
Aurelien Jacobs
49cdad8d78
simplify: group all the AUDIO_NONSHORT parameters in the same place
...
Originally committed as revision 16602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-14 21:41:05 +00:00
Diego Biurrun
0f6a659ddf
Replace #ifdef CONFIG_ preprocessor check by #if CONFIG_.
...
CONFIG_ changed semantics and is always defined now.
Originally committed as revision 16598 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-14 07:57:12 +00:00
Diego Biurrun
ad1eebe360
Use CONFIG_MPEGAUDIO_HP directly instead of USE_HIGHPRECISION indirection.
...
Originally committed as revision 16594 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-14 00:48:17 +00:00
Michael Niedermayer
c96bd21227
Change mpeg audio parser so it only sets frame_size, channels and bit_rate
...
after it has a few valid frames.
Fixes issue762
Originally committed as revision 16259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-21 23:50:16 +00:00
Michael Niedermayer
047599a4ba
Rename error_resilience to error_recognition.
...
Originally committed as revision 15270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 18:18:49 +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
Diego Biurrun
5b21bdabe4
Add FFMPEG_ prefix to all multiple inclusion guards.
...
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-17 09:37:46 +00:00
Måns Rullgård
c2d08dc0d7
move a couple of macros and structs to mpegaudio.h
...
Originally committed as revision 9343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-16 22:58:43 +00:00
Aurelien Jacobs
08aa2c9bd2
remove dependency of mpeg audio encoder over mpeg audio decoder
...
Originally committed as revision 9082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-20 22:50:29 +00:00
Aurelien Jacobs
ca6e50afc1
add a ff_ prefix to some mpegaudio funcs
...
Originally committed as revision 9081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-20 15:11:55 +00:00
Aurelien Jacobs
4bd8e17c8d
loosen dependencies over mpegaudiodec
...
Originally committed as revision 9080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-20 13:40:07 +00:00
Aurelien Jacobs
b57eed12da
move mp3_header_decompress bitstream filter in its own file
...
Originally committed as revision 9062 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:24:34 +00:00
Aurelien Jacobs
4991c0516d
move some common mpeg audio tables from mpegaudiodectab.h to mpegaudiodata.c
...
Originally committed as revision 9060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:06:02 +00:00
Michael Niedermayer
498c544ad2
dont set the sampling rate just because 1 mp3 packet header says so (fixes playback speed on some old mencoder generated avis which where then dumped to mp3)
...
Originally committed as revision 6837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-30 02:19:55 +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
Diego Biurrun
04d7f60143
Add official LGPL license headers to the files that were missing them.
...
Originally committed as revision 6219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-10 14:02:42 +00:00
Diego Biurrun
bb270c0896
COSMETICS: tabs --> spaces, some prettyprinting
...
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-22 01:10:11 +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
Roberto Togni
d9b1c197e5
QDM2 compatible decoder
...
Originally committed as revision 4649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-10-18 20:16:43 +00:00
Michael Niedermayer
a7a858996f
dithering for the mpeg audio decoder
...
Originally committed as revision 3903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-30 14:04:56 +00:00
Fabrice Bellard
962d6ae6c5
exported mpa_decode_header for new parser API
...
Originally committed as revision 2491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-10 15:21:16 +00:00
Michael Niedermayer
983e3246b7
per file doxy
...
Originally committed as revision 1634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-06 11:32:04 +00:00
Zdenek Kabelac
0c1a9edad4
* UINTX -> uintx_t INTX -> intx_t
...
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-11 16:35:48 +00:00
Fabrice Bellard
6d5bf5343c
added missing externs
...
Originally committed as revision 658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-06-04 12:53:11 +00:00
Fabrice Bellard
2456e28d91
merged code and tables between encoder and decoder
...
Originally committed as revision 119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2001-09-15 22:42:25 +00:00
Fabrice Bellard
1a56543279
win32 fixes
...
Originally committed as revision 84 to svn://svn.ffmpeg.org/ffmpeg/trunk
2001-08-13 21:48:05 +00:00
Fabrice Bellard
de6d9b6404
Initial revision
...
Originally committed as revision 5 to svn://svn.ffmpeg.org/ffmpeg/trunk
2001-07-22 14:18:56 +00:00