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

254 Commits

Author SHA1 Message Date
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