generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
43,312 Commits 24 Branches 241 Tags 173 MiB
2da5a5ce00
Commit Graph

361 Commits

Author SHA1 Message Date
Mans Rullgard
dede36bd02 mpegaudio: sanitise compute_antialias_* names 
This makes the compute_antialias functions use the same naming
convention as everything else.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-18 13:16:59 +01:00
Michael Niedermayer
b4bcd1e2f1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Fix compilation of iirfilter-test.
  libx264: handle closed GOP codec flag
  lavf: remove duplicate assignment in avformat_alloc_context.
  lavf: use designated initializers for AVClasses.
  flvdec: clenup debug code
  asfdec: fix possible overread on broken files.
  asfdec: do not fall back to binary/generic search
  asfdec: reindent after previous commit c7bd5ed
  asfdec: fallback to binary search internally
  mpegaudio: add _fixed suffix to some names
  Modify x86util.asm to ease transitioning to 10-bit H.264 assembly.
  dct: build dct32 as separate object files
  qdm2: include correct header for rdft

Conflicts:
	ffpresets/libx264-fast.ffpreset
	ffpresets/libx264-fast_firstpass.ffpreset
	ffpresets/libx264-faster.ffpreset
	ffpresets/libx264-faster_firstpass.ffpreset
	ffpresets/libx264-medium.ffpreset
	ffpresets/libx264-medium_firstpass.ffpreset
	ffpresets/libx264-placebo.ffpreset
	ffpresets/libx264-placebo_firstpass.ffpreset
	ffpresets/libx264-slow.ffpreset
	ffpresets/libx264-slow_firstpass.ffpreset
	ffpresets/libx264-slower.ffpreset
	ffpresets/libx264-slower_firstpass.ffpreset
	ffpresets/libx264-superfast.ffpreset
	ffpresets/libx264-superfast_firstpass.ffpreset
	ffpresets/libx264-ultrafast.ffpreset
	ffpresets/libx264-ultrafast_firstpass.ffpreset
	ffpresets/libx264-veryfast.ffpreset
	ffpresets/libx264-veryfast_firstpass.ffpreset
	ffpresets/libx264-veryslow.ffpreset
	ffpresets/libx264-veryslow_firstpass.ffpreset
	libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-18 05:42:42 +02:00
Mans Rullgard
4bac1bbc3b mpegaudio: add _fixed suffix to some names 
This adds a _fixed suffix to the fixed-point versions of things
with both float and fixed-point variants.  This makes it more
consistent with other dual-implementation things, e.g. fft.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-17 20:17:36 +01:00
Mans Rullgard
6f2309ed2e dct: build dct32 as separate object files 
This builds the float and fixed-point versions of dct32 separately
instead of #including the file in dct.c and mpegaudiodec.c.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-17 13:57:23 +01:00
Michael Niedermayer
f8ae3a2108 Merge remote branch 'qatar/master' 
12 files changed, 36 insertions(+), 81 deletions(-)
yes thats 36 new lines in 14 commits

* qatar/master:
  ffmpeg: fix -aspect cli option
  Restructure video filter implementation in ffmpeg.c.
  ffplay: remove audio_write_get_buf_size() forward declaration
  lavfi: print key-frame and picture type information in ff_dlog_ref()
  mathops: remove ancient confusing comment
  cws2fws: Improve error message wording.
  tools: Check the return value of write().
  mpegaudio: move OUT_FMT macro to mpegaudiodec.c
  mpegaudio: remove OUT_MIN/MAX macros
  Add missing #includes to mp3_header_(de)compress bsf
  dct: fix indentation
  dct: bypass table allocation for DCT_II of size 32
  h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.
  Remove unused header mpegaudio3.h.

Conflicts:
	ffmpeg.c
	libavcodec/mpegaudio.h
	libavcodec/mpegaudio3.h
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-17 04:51:33 +02:00
Mans Rullgard
bdefbf3e88 mpegaudio: move OUT_FMT macro to mpegaudiodec.c 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-16 17:49:25 +01:00
Mans Rullgard
92ea249d7d mpegaudio: remove OUT_MIN/MAX macros 
These macros are no longer needed after the s32 output was removed.
Change the relevant code to use av_clip_int16() instead of using
explicit limits.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-16 17:49:25 +01:00
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
a88ef93b4a mpegaudiodec: group #includes more sanely 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-09 22:27:16 +01:00
Mans Rullgard
0d849074a4 mpegaudio: remove #if 0 blocks 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-09 22:22:12 +01: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
Michael Niedermayer
f35439699f Merge remote branch 'qatar/master' 
* qatar/master:
  Fixed-point MDCT with 32-bit unscaled output
  lavc: deprecate rate_emu
  lavc: mark hurry_up for removal on next major bump
  parser: mark av_parser_parse() for removal on next major bump
  lavc: add missing audioconvert includes
  jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-03 02:28:01 +02:00
Anton Khirnov
6f3d3eacf6 lavc: add missing audioconvert includes 2011-04-02 16:17:01 +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
Kieran Kunhya
e10976eb77 Set channel_layout for mpegaudio 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit f4a86bc981)
 2011-02-06 20:31:46 +01:00
Kieran Kunhya
f4a86bc981 Set channel_layout for mpegaudio 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-05 20:25:02 -05:00
Clément Bœsch
e31a744155 Remove a few if (p) av_free(p) forms 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 437fb1c87d)
 2011-02-04 03:10:10 +01:00
Clément Bœsch
437fb1c87d Remove a few if (p) av_free(p) forms 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-03 01:37:55 +00:00
Luca Barbato
9ef5a9deaf Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb)
 2011-01-30 03:41:48 +01:00
Luca Barbato
dfd2a005eb Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
 2011-01-29 23:55:37 +01:00
Diego Elio Pettenò
e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:45 +00:00
Clément Bœsch
204a18151c Move ID3v1 skip from decoder to demuxer 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 045b80e52d)
 2011-01-23 19:32:07 +01:00
Clément Bœsch
045b80e52d Move ID3v1 skip from decoder to demuxer 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-22 01:31:57 +01:00
Clément Bœsch
c19a216af3 Handle ID3v1 tag while decoding mp[123] frames 
patch by Clément Bœsch (ubitux at gmail)

Originally committed as revision 26297 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-10 11:36:11 +00:00
Alexander Kojevnikov
49d7ef282d Show correct bitrate for VBR MP3 files. 
Patch by Alexander Kojevnikov, alexander kojevnikov com

Originally committed as revision 24539 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 10:08:34 +00:00
Michael Niedermayer
69b56ed7a6 Move ff_dct_init(context) out of if(one time init) 
fixes calling a null pointer in issue658

Originally committed as revision 24081 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-07 10:36:26 +00:00
Måns Rullgård
59bebb11e0 mpegaudio: move compute_antialias_float() to mpegaudiodec_float.c 
Also put compute_antialias_integer() under !CONFIG_FLOAT and change
forward declarations to declare only the relevant one of these.

Fixes warnings about unused functions and pointer type mismatches.

Originally committed as revision 23950 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-01 23:21:20 +00:00
Måns Rullgård
35d597d556 mpegaudio: call ff_mpegaudiodec_init_mmx() only from float decoder 
The mmx code is floating-point only, and this function does not know
from which decoder it is called.  Without this change, the integer
decoder only "works" because the size of the context struct is smaller
in this case, and the mmx init function writes the function pointer
outside the allocated context.

Fixes issue 2054.

Originally committed as revision 23949 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-01 23:21:17 +00:00
Aurelien Jacobs
956dae9e77 adu and mp3on4 functions are also needed by their respective float decoders 
Originally committed as revision 23944 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-01 21:08:20 +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
186d02150e Use lookup table to avoid division in mp2 decoder 
Originally committed as revision 23840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-28 04:55:36 +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
47ba787442 Move float-specific function to mpegaudiodec_float.c 
Originally committed as revision 23743 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-23 20:45:36 +00:00
Vitor Sessak
9dac6dbb22 Remove pointless condition in #if 
Originally committed as revision 23742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-23 20:43:37 +00:00
Vitor Sessak
4233ce315c Fix breakage in compilation with --disable-mpegaudio-hp introduced in 
r23646.

Originally committed as revision 23656 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-20 13:00:24 +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
Vitor Sessak
525ac37fd2 Optimize 1D DCT transform used in MP{1,2,3}. Makes also this function suitable 
for being moved to the shared DCT framework in the future.

Originally committed as revision 23514 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-07 11:43:12 +00:00
Michael Niedermayer
40914d97cc 1.0 and the resulting exactly representable value must be marked as float as well, 
gcc is hopelessly trash.

Originally committed as revision 23119 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 18:06:44 +00:00
Michael Niedermayer
0628f3e8cf Cast constants to float to avoid gcc converting to and from 
float<->double in every operation.

Originally committed as revision 23118 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 17:58:17 +00:00
Michael Niedermayer
bfbdc58e52 Fix compilation with low precission mpeg audio decoding. 
Originally committed as revision 23107 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 10:04:31 +00:00
Michael Niedermayer
3b7117b73a Do the same sign flip optimization to the low freq decoder. 
as with the high freq 10-20 cycles faster

Originally committed as revision 23099 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 21:31:54 +00:00
Michael Niedermayer
4b070a7a61 Factorize READ_FLIP_SIGN() optimization out 
Originally committed as revision 23098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 21:20:33 +00:00
Michael Niedermayer
0c0d88aed5 Optimize decoding high freqs. 
this is 10-20cpu cycles faster on duron (whole is about 50-60 cpu cylses)
I wonder why gcc isnt doing this on its own ...

Originally committed as revision 23097 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 21:10:55 +00:00
Michael Niedermayer
fd9451c68f Make lsf_sf_expand() 4 times faster. 
Originally committed as revision 23096 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 20:33:48 +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
Michael Niedermayer
86433cc6f5 Remove unused FRAC_RND() macro from mpegaudiodec.c. 
Originally committed as revision 23086 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 14:49:48 +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
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Måns Rullgård
da0ac0ee64 Make some functions static 
These functions are not used outside their respective files, and they
lack a prototype in a header.

Originally committed as revision 22259 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 22:36:41 +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
Ronald S. Bultje
6e44ba1550 Use get_bits_left() instead of size_in_bits - get_bits_count(). 
Originally committed as revision 20543 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-16 17:42:43 +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
eadaa00c6f Add support for hardcoding the mpegaudiodec tables. 
Reduces .bss size by about 194 kB.

Originally committed as revision 20400 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-28 18:42:52 +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
Reimar Döffinger
a57afd2943 Partially revert r20233, exp2f is not available on some BSDs, DOS and AVR32. 
Originally committed as revision 20240 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-15 17:10:07 +00:00
Reimar Döffinger
686884da9d Use cbrtf and exp2f instead of pow to calculate tables for MPEG audio decoding. 
This hopefully is fast enough so that it is reasonable to use the same formula
directly instead of the table for CONFIG_SMALL.

Originally committed as revision 20233 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-15 06:59:23 +00:00
Michael Niedermayer
45a014d75e Set data_size to 0 to avoid having it uninitialized. 
based on 31_mp3_outlen.patch by chrome.

Originally committed as revision 19988 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 11:44:30 +00:00
Michael Niedermayer
f7304e99d4 Check data_size in decode_frame_mp3on4(). 
Originally committed as revision 19987 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 11:33:44 +00:00
Michael Niedermayer
0d31833d04 check data_size in decode_frame() 
Originally committed as revision 19986 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 11:29:38 +00:00
Diego Biurrun
83614f2df9 Reduce pointless verbosity after seeks in the MP3 decoder. 
Originally committed as revision 19759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-04 19:04:12 +00:00
Michael Niedermayer
822d0a6e0c Drop code that attempts to decode frames that are prefixed by junk. 
Too often it ends up decoding random data into noise without detecting
it (for example after seeking of some MP3 data with oddly often occurring
startcode emulation).
Fixes issue1154.

Originally committed as revision 19302 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 03:57:27 +00:00
Måns Rullgård
1e24f1b25d mpegaudio: enclose SUM8() macro args in parens when used 
Originally committed as revision 18746 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-05 18:44:13 +00:00
Måns Rullgård
bf030c887f mpegaudio: avoid unnecessary copy in high-precision mode 
Originally committed as revision 18745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-05 18:44:10 +00:00
Måns Rullgård
adb206c238 mpegaudio: use av_clip() 
Originally committed as revision 18744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-05 18:44:07 +00:00
Zdenek Kabelac
e2fa5cf4c9 Do not scan for MP3 header after the given buffer and return skipped 
bytes along with consumed bytes on successful decoding.
patch by Zdenek Kabelac, zdenek.kabelac gmail com

Originally committed as revision 18736 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-04 14:23:48 +00:00
Michael Niedermayer
b52b6ae489 Remove unused variable from decode_init() found by CSA. 
Originally committed as revision 18550 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 13:57:22 +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
Thilo Borgmann
7a00bbad21 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an 
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.

Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 15:59:50 +00:00
Daniel Verkamp
5ef251e504 Add missing av_cold in static init/close functions. 
Patch by Daniel Verkamp daniel at drv dot nu.

Originally committed as revision 17526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 13:48:55 +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
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +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
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Michael Niedermayer
cb595b7f02 Add dummy mp1_decoder to complement the existing dummy mp2/mp3 decoders. 
Originally committed as revision 16581 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 19:32:08 +00:00
Andreas Öman
11c23b64ac Revert r16257: 
Include "libavutil/common.h" where we use llrint() in case ffmpeg's
own llrint() is to be used.

Originally committed as revision 16282 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 22:39:55 +00:00
Andreas Öman
1af34f094e Include "libavutil/common.h" where we use llrint() in case ffmpeg's 
own llrint() is to be used.

Originally committed as revision 16257 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-21 21:53:42 +00:00
Måns Rullgård
4deaa94639 Add shift argument to MULL() macro 
This replaces use of FRAC_BITS in the MULL() definition with a third
argument specifying the shift amount.  All uses of this macro are
updated to pass FRAC_BITS as third argument.

Originally committed as revision 15921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-24 09:28:55 +00:00
Aurelien Jacobs
37d3e0667a uses FF_ARRAY_ELEMS() where appropriate 
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-21 21:40:24 +00:00
Michael Niedermayer
1d4113d053 Only print "invalid new backstep" when it is really invalid. 
Fixes issue541.

Originally committed as revision 15339 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-16 01:49:32 +00:00
Michael Niedermayer
bf3a971c12 Make decoder more robust by default against broken encoders. 
Fixes issue540.

Originally committed as revision 15336 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-16 00:31:32 +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
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
Art Clarke
bbdf87285a Use static vlc structure to decode layer 3 huffman tables. 
Patch by Art Clarke aclarke vlideshow com

Originally committed as revision 14483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-31 12:09:11 +00:00
Andreas Öman
b000c604f2 Decrease severity of 'invalid new backstep' log message to warning 
in mpeg audio decoder.

Originally committed as revision 14313 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-20 15:01:20 +00:00
Andreas Öman
11f63a221b Supply context argument to av_log() in mpeg audio decoder. 
Originally committed as revision 14312 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-20 14:58:49 +00:00
Måns Rullgård
9ea583e1f6 mpegaudio: use MAC/MLS macros in ff_mpa_synth_filter 
Originally committed as revision 14199 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 12:23:02 +00:00
Stefano Sabatini
fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL. 
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 21:50:13 +00:00
Stefano Sabatini
162d4fc99d Add long names to AVCodec declarations. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-27 22:39:51 +00:00
Baptiste Coudurier
169203c1d9 break if error in header so it can output already decoded frames 
Originally committed as revision 12999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:41:29 +00:00
Baptiste Coudurier
41b8800f88 merge init with declaration 
Originally committed as revision 12998 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:36:34 +00:00
Baptiste Coudurier
f91c089812 cosmetics: merge decls 
Originally committed as revision 12997 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:34:01 +00:00
Baptiste Coudurier
5fd7a9fcdf simplify: merge loops 
Originally committed as revision 12996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:33:09 +00:00
Baptiste Coudurier
8da8970d01 simplify 
Originally committed as revision 12995 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:30:06 +00:00
Baptiste Coudurier
0d5b2eb445 simplify: remove useless fields and vars 
Originally committed as revision 12994 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:28:18 +00:00
Baptiste Coudurier
676e26ab6d move MP3On4DecodeContext def near the code and under ifdef 
Originally committed as revision 12993 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:22:43 +00:00
Baptiste Coudurier
9f95bfe2b9 correctly patch syncword for samples rates < 16000, decoder now fully support all iso ref files 
Originally committed as revision 12992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:18:29 +00:00
Baptiste Coudurier
f0f53c83ba fix 1 frame config decoding 
Originally committed as revision 12991 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:10:31 +00:00
Baptiste Coudurier
60dfa0b8d4 remove old draft last case not present anymore in iso specs 
Originally committed as revision 12990 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:08:34 +00:00
Baptiste Coudurier
b61d2782f3 use mpeg4audio common code 
Originally committed as revision 12988 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 13:56:52 +00:00
Baptiste Coudurier
ec39f7d855 simplify 
Originally committed as revision 12986 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 13:08:16 +00:00
Baptiste Coudurier
9708d52ee8 correctly compute out_size and samples number 
Originally committed as revision 12985 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 13:03:41 +00:00
Baptiste Coudurier
cd3289650a fsize is 12 bits according to specs 
Originally committed as revision 12984 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 12:59:46 +00:00
Baptiste Coudurier
5be25fc133 simplify using FFMIN3 
Originally committed as revision 12983 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 12:51:52 +00:00
Baptiste Coudurier
a82dcdffb2 return error if buf_size is too small 
Originally committed as revision 12981 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 12:39:45 +00:00
Baptiste Coudurier
dfcd6d91fe values can fit uint8_t 
Originally committed as revision 12980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 12:34:37 +00:00
Baptiste Coudurier
183fceaafd add const 
Originally committed as revision 12979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 12:33:02 +00:00
Baptiste Coudurier
6122b733e9 omg, fix compilation 
Originally committed as revision 12509 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-20 09:38:55 +00:00
Baptiste Coudurier
d0ed455f19 correctly set avctx->frame_size for mp3on4 and mp3adu 
Originally committed as revision 12508 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-20 09:36:04 +00:00
Diego Biurrun
5e53486545 typo fix: inited --> initialized 
Originally committed as revision 11920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-13 09:26:10 +00:00
Michael Niedermayer
7993df6527 consts 
I have underestimated this a little, and these are just some ...

Originally committed as revision 11708 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 03:26:31 +00:00
Michael Niedermayer
9f7458b285 Factorize some code into functions, had this in my tree and will be 
needed for mp3 encoding.

Originally committed as revision 11509 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-11 21:34:05 +00:00
Brian Brice
812f29ffb8 Clear synth_buf on flush(). Part of a patch by Brian Brice bbrice gmail com. 
Originally committed as revision 11507 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-11 18:20:42 +00:00
Brian Brice
4a69055bad Flush mp2 as well on seeking. Part of a patch by Brian Brice bbrice gmail com. 
Originally committed as revision 11506 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-11 18:18:45 +00:00
Martin Lindhe
3240941b25 Move 2 defines from mpegaudiodec.c to mpegaudiodata.h to allow compilation 
when DEBUG is defined.
Patch by Martin Lindhe: martin startwars org

Originally committed as revision 10955 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-08 10:53:32 +00:00
Aurelien Jacobs
aee481cebe use av_clip_int16() where it makes sense 
Originally committed as revision 10078 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-11 22:48:55 +00:00
Alex Beregszaszi
7ae7300ee3 use skip_bits where appropriate 
Originally committed as revision 10004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 00:57:36 +00:00
Alex Beregszaszi
5fc32c275e use get_bits1(..) instead get_bits(.., 1) 
Originally committed as revision 9999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 00:13:31 +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
Ramiro Polla
2c124cb65c Use AV_xx throughout libavcodec 
Originally committed as revision 9169 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-02 01:41:07 +00:00
Michael Niedermayer
d5aa01cd30 make decoder decode the first frame properly if theres more than just one 
frame input

Originally committed as revision 9144 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-27 22:34:49 +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
677fe2e226 add proper prefix to extern mpeg audio data tables 
Originally committed as revision 9061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-19 00:13:35 +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
Reimar Döffinger
c6bcbb2cd3 Use DECLARE_ALIGNED to ease porting 
Originally committed as revision 9031 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-15 20:47:55 +00:00
Diego Biurrun
5a6a6cc7dc Fix multiple "‘inline/static’ is not at beginning of declaration" warnings. 
Originally committed as revision 8894 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-05 12:18:14 +00:00
Diego Biurrun
fe0372296a typos 
Originally committed as revision 8642 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-07 14:10:02 +00:00
Michael Niedermayer
9608652dc1 kill another 2 av_mallocz_static() 
Originally committed as revision 8396 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-14 00:19:56 +00:00
Michel Bardiaux
318c5e0524 Give context to dprintf 
Originally committed as revision 8338 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-12 12:36:41 +00:00
Michael Niedermayer
5773d46009 factorize switch_buffer() 
Originally committed as revision 7813 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-03 13:15:55 +00:00
Michael Niedermayer
e0cf92048a fix decoding of takethat.mp3 
Originally committed as revision 7812 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-03 12:42:12 +00:00
Michael Niedermayer
2f5560ee49 fix playback of mp3_bits_left.avi 
Originally committed as revision 7279 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-11 13:01:20 +00:00
Måns Rullgård
8da9266cea use the standard INT64_C() macro for 64-bit constants 
Originally committed as revision 7240 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-06 23:46:11 +00:00
Michael Niedermayer
8e5606bfcd detect a few more errors (fixes libmp3-bug.avi again) 
make pickyness of the decoder user selectable through error_resilience param like for video decoders

Originally committed as revision 7089 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-15 17:58:35 +00:00
Michael Niedermayer
ee50a7c1e5 making decoding more error robust 
Originally committed as revision 7073 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 22:06:28 +00:00
Michael Niedermayer
9bb328d397 reset internal buffer during seeking 
Originally committed as revision 7070 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 20:39:20 +00:00
Michael Niedermayer
bd60e11bf4 more checks and error messages 
Originally committed as revision 7069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 20:35:15 +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
Michael Niedermayer
c0d8052b50 avoid random noise on damaged frames 
Originally committed as revision 6836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-30 01:29:56 +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
e1931c59f6 message typo fixes 
Originally committed as revision 6564 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-05 18:15:17 +00:00
Måns Rullgård
62bb489b13 add some #ifdef CONFIG_ENCODERS/DECODERS 
Originally committed as revision 6356 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-27 19:54:07 +00:00