generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
70,483 Commits 24 Branches 241 Tags 173 MiB
eae13eae9d
Commit Graph

173 Commits

Author SHA1 Message Date
Carl Eugen Hoyos
dbf23d191a Reindent after last commit. 2011-06-15 10:58:25 +02:00
Carl Eugen Hoyos
b3452771c4 Fix multi-channel AAC encoding. 
Fixes ticket 55.
 2011-06-15 10:57:26 +02:00
Michael Niedermayer
99eb31e263 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (25 commits)
  Replace custom DEBUG preprocessor trickery by the standard one.
  vorbis: Remove non-compiling debug statement.
  vorbis: Remove pointless DEBUG #ifdef around debug output macros.
  cook: Remove non-compiling debug output.
  Remove pointless #ifdefs around function declarations in a header.
  Replace #ifdef + av_log() combinations by av_dlog().
  Replace custom debug output functions by av_dlog().
  cook: Remove unused debug functions.
  Remove stray extra arguments from av_dlog() invocations.
  targa: fix big-endian build
  v4l2: remove one forgotten use of AVFormatParameters.pix_fmt.
  vfwcap: add a framerate private option.
  v4l2: add a framerate private option.
  libdc1394: add a framerate private option.
  fbdev: add a framerate private option.
  bktr: add a framerate private option.
  oma: check avio_read() return value
  nutdec: remove unused variable
  Remove unused variables
  swscale: allocate larger buffer to handle altivec overreads.
  ...

Conflicts:
	ffmpeg.c
	libavcodec/dca.c
	libavcodec/dirac.c
	libavcodec/error_resilience.c
	libavcodec/h264.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pthread.c
	libavcodec/rv10.c
	libavcodec/s302m.c
	libavcodec/shorten.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavdevice/dv1394.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavformat/4xm.c
	libavformat/apetag.c
	libavformat/asfdec.c
	libavformat/avidec.c
	libavformat/mmf.c
	libavformat/mpeg.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/oggdec.c
	libavformat/oggparseogm.c
	libavformat/rl2.c
	libavformat/rmdec.c
	libavformat/rpl.c
	libavformat/rtpdec_latm.c
	libavformat/sauce.c
	libavformat/sol.c
	libswscale/utils.c
	tests/ref/vsynth1/error
	tests/ref/vsynth2/error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-03 05:19:30 +02:00
Nathan Caldwell
cc9947ffbe aacenc: Add stereo_mode option. 
ms_off is the default, until Mid/Side is no longer buggy.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-06-02 07:04:22 -07:00
Michael Niedermayer
6841c8c579 Merge remote branch 'qatar/master' 
* qatar/master:
  log: Fix an oob array read.
  cosmetics: trim trailing whitespace in postproc
  Ban strncpy() it's too easy to misuse.
  psymodel: Remove wrapper functions.
  aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'.
  regtest: remove redundant flags in jpg test
  regtest: use run_ffmpeg in do_image_formats
  regtest: simplify encoding functions
  ffmpeg.c: check for interlaced flag in the correct place.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-09 04:50:56 +02:00
Nathan Caldwell
b58e298572 psymodel: Remove wrapper functions. 
Instead use the function pointers directly.
 2011-05-08 12:43:04 -07:00
Nathan Caldwell
5b29af624f aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'. 2011-05-08 12:42:34 -07:00
Michael Niedermayer
7b376b398a Merge remote branch 'qatar/master' 
* qatar/master:
  Handle unicode file names on windows
  rtp: Rename the open/close functions to alloc/free
  Lowercase all ff* program names.
  Refer to ff* tools by their lowercase names.
NOT Pulled  Replace more FFmpeg instances by Libav or ffmpeg.
  Replace `` by $() syntax in shell scripts.
  patcheck: Allow overiding grep program(s) through environment variables.
NOT Pulled  Remove stray libavcore and _g binary references.
  vorbis: Rename decoder/encoder files to follow general file naming scheme.
  aacenc: Fix whitespace after last commit.
  cook: Fix small typo in av_log_ask_for_sample message.
  aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
  Remove RDFT dependency from AAC decoder.
  Add some debug log messages to AAC extradata
  Fix mov debug (u)int64_t format strings.
  bswap: use native types for av_bwap16().
  doc: FLV muxing is supported.
  applehttp: Handle AES-128 encrypted streams
  Add a protocol handler for AES CBC decryption with PKCS7 padding
  doc: Mention that DragonFly BSD requires __BSD_VISIBLE set

Conflicts:
	ffplay.c
	ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-24 03:41:22 +02:00
Nathan Caldwell
230c1a9075 aacenc: Finish 3GPP psymodel analysis for non mid/side cases. 
There is still are still a few sections missing relating to TNS (not present)
and mid/side (contains other bugs).

Overall this improves quality, and vastly improves rate-control.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-04-23 12:30:05 +03: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
4538729afe Move sine windows to a separate file 
These windows do not really belong in fft/mdct files and were
easily confused with the similarly named tables used by rdft.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-20 13:25:19 +00:00
Mans Rullgard
a45fbda994 Move ff_kbd_window_init() to a separate file 
This function is not tightly coupled to mdct, and it's in the way
of making a fixed-point mdct implementation.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 19:49:27 +00:00
Mans Rullgard
26f548bb59 fft: remove inline wrappers for function pointers 
This removes the rather pointless wrappers (one not even inline)
for calling the fft_calc and related function pointers.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 19:49:18 +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
Nathan Caldwell
31ff9bd7b8 aacenc: Fix a segfault in search_for_quantizers 
This reverts the removal of scoefs from AACEncContext.
It resulted in scoefs being a NULL pointer when
search_for_quantizers() is called.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-08 17:45:08 -05:00
Nathan Caldwell
f56c4850e7 aacenc: Fix a segfault in search_for_quantizers 
This reverts the removal of scoefs from AACEncContext.
It resulted in scoefs being a NULL pointer when
search_for_quantizers() is called.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-08 12:39:34 +01:00
Young Han Lee
5e06b02005 aacenc: remove the data arrays 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 2790d7a9ff)
 2011-03-08 02:09:33 +01:00
Young Han Lee
2790d7a9ff aacenc: remove the data arrays 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 12:25:36 -05: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
Janne Grunau
604eb152fc aacenc: fix typo in sync extension constant in 8ae0fa2 
(cherry picked from commit 2fd9035ddc)
 2011-01-26 03:43:27 +01:00
Justin Ruggles
015f9f1ad3 Change DSPContext.vector_fmul() from dst=dst*src to dest=src0*src1. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6eabb0d3ad)
 2011-01-23 19:32:08 +01:00
Alex Converse
d67a6aa59c aacenc: mark SBR absent 
Use backwards compatible explicit signalling to denote the absence of
SBR.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 8ae0fa243e)
 2011-01-23 19:32:08 +01:00
Janne Grunau
2fd9035ddc aacenc: fix typo in sync extension constant in 8ae0fa2 2011-01-23 18:57:24 +01:00
Justin Ruggles
6eabb0d3ad Change DSPContext.vector_fmul() from dst=dst*src to dest=src0*src1. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-22 17:53:27 +00:00
Alex Converse
8ae0fa243e aacenc: mark SBR absent 
Use backwards compatible explicit signalling to denote the absence of
SBR.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-22 15:55:38 +01: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
Alex Converse
99d7a3e862 aacenc: Remove an unused variable from adjust_frame_information(). 
Originally committed as revision 25002 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-31 00:33:56 +00:00
Alex Converse
1297f58132 aacenc: Don't set s->cur_channel before apply_window_and_mdct(). 
In general s->cur_channel should be phased out.

Originally committed as revision 25001 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-31 00:31:17 +00:00
Alex Converse
8e4c11e90a aacenc: Write tag.elem_id early. 
Originally committed as revision 25000 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-30 23:52:03 +00:00
Alex Converse
76dfe4ebc5 aacenc: Only apply M/S if common_window is set. 
Originally committed as revision 24998 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-30 23:43:03 +00:00
Nathan Caldwell
2bb1d0e77a aacenc: Adjust array offsets for the current channel before calling ff_psy_suggest_window(). 
Patch by Nathan Caldwell <saintdev@gmail.com>

Originally committed as revision 24332 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-19 18:22:44 +00:00
Nathan Caldwell
0045499dec aacenc: Refactor apply_window_and_mdct() so it no longer takes an offset channel. 
Patch by Nathan Caldwell <saintdev@gmail.com>

Originally committed as revision 24331 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-19 18:19:53 +00:00
Alex Converse
267843844c Cosmetics: whitespace 
Originally committed as revision 24100 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-07 21:50:50 +00:00
Alex Converse
03d5d9b900 aacenc: Enforce LFE bitstream restrictions. 
Originally committed as revision 24099 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-07 21:48:51 +00:00
Måns Rullgård
86e41bc300 aacenc: replace VLA with fixed size 
Number of channels is restricted to 6 so the size is acceptable
for the stack.

Originally committed as revision 24068 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-06 00:06:15 +00:00
Alex Converse
4e42debc8d aacenc: Start the lookahead pointer 1/4 of the way into the first short window. 
Short windows are of length 256 and begin at sample 448.

Originally committed as revision 23871 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-28 21:50:57 +00:00
Alex Converse
072c0d605f aacenc: Properly pad extradata. 
This fixes a valgrind error when encoding to ADTS.

Originally committed as revision 23866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-28 21:34:57 +00:00
Alex Converse
e29af81818 aactab: Tablegenify ff_aac_pow2sf_tab. 
Originally committed as revision 23740 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-23 19:30:01 +00:00
Alex Converse
614842a93d Cleanup apply_window_and_mdct(). 
Originally committed as revision 23495 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-05 19:41:52 +00:00
Alex Converse
e84c276f31 Mark AAC encoder as experimental. 
Originally committed as revision 23350 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-27 14:46:31 +00:00
Alex Converse
960323a230 aacenc: Select the TLS (two-loop search) as the default scalefactor coder. 
Originally committed as revision 23133 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-14 16:49:21 +00:00
Alex Converse
31184aac87 aacenc: Fix psy logic. 
Set band info before determining scalefactors. Use the look ahead for
windowing decision.

Originally committed as revision 23132 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-14 16:49:11 +00:00
Alex Converse
495af353db Set cur_channel in the AAC encoder context where needed. 
Most coder functions read it. Carting this around in the context may be
suboptimal; a refactor should be considered.

Originally committed as revision 23094 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 18:53:49 +00:00
Alex Converse
217b44ddc3 Error out when too many bits per frame are requested. 
Originally committed as revision 23036 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-06 20:35:10 +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
Alex Converse
523429220b aacenc: Error when an unsupported profile is requested 
Originally committed as revision 22784 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-02 16:26:10 +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
Reimar Döffinger
14b8607065 Add support for hard-coded MDCT-related ff_sine_windows tables. 
Originally committed as revision 21108 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-09 13:28:04 +00:00
Reimar Döffinger
b5f09d31c2 Make sample_fmts and channel_layouts compound literals const to reduce size of 
.data section.

Originally committed as revision 19787 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-06 09:15:07 +00:00
Alex Converse
04e257fa84 Revert unintended portion of last commit. (Setting the default coder to 
twoloop.)

Originally committed as revision 19481 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-22 03:56:08 +00:00
Alex Converse
a62d6cfeff Be sure to increment our position in the coefficient array when skipping a zero 
band in the twoloop scalefactor search.

Originally committed as revision 19480 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-22 03:53:30 +00:00
Alex Converse
988c170547 Change fminf/fmaxf to FFMIN/FFMAX to fix the build on broken operating systems. 
Originally committed as revision 19391 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-09 17:22:59 +00:00
Alex Converse
f11bfe3065 Reindent after last commit 
Originally committed as revision 19382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-08 23:14:47 +00:00
Alex Converse
48d20c11ba Prevent AAC frame size overflows. 
Originally committed as revision 19381 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-08 23:12:53 +00:00
Alex Converse
5962f6b0da Refactor windowing and early psy from bitstream writing parts of the AAC encoder. 
Originally committed as revision 19380 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-08 23:10:13 +00:00
Alex Converse
7a4eebcdce Turn on AAC rate control. 
Originally committed as revision 19379 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-08 23:04:22 +00:00
Diego Biurrun
c8f47d8b79 cosmetics: Remove unnecessary {} around if/for blocks; 
move statements after if/for to the next line.

Originally committed as revision 19378 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-08 21:36:33 +00:00
Diego Biurrun
99d61d340c cosmetics: prettyprinting, K&R style, break overly long lines 
Originally committed as revision 19377 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-08 21:16:06 +00:00
Alex Converse
fd257dc4c0 Cosmetics: Pretty print the AAC encoder. 
Originally committed as revision 19376 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-08 20:36:45 +00:00
Alex Converse
78e65cd772 Merge the AAC encoder from SoC svn. It is still considered experimental. 
Originally committed as revision 19375 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-08 20:01:31 +00:00
Siarhei Siamashka
7d485f165f Support for getting (i)MDCT output multiplied by a constant scaling factor. 
Scaling (i)MDCT output has no runtime overhead and can be used to improve
performance of audio codecs. All the changes are only needed in
'ff_mdct_init' function and slow down initialization a bit.

Originally committed as revision 18855 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-16 14:17:08 +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
Reimar Döffinger
9b5ede5b64 Add (additional) const to many global tables. 
Originally committed as revision 15515 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-02 15:52:04 +00:00
Kostya Shishkov
e43b0a7316 okayed chunks of AAC encoder 
Originally committed as revision 14939 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-24 05:56:23 +00:00
Kostya Shishkov
cda00def4b Do not pass unnecessary arguments to AAC encoder functions 
Originally committed as revision 14920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-23 15:25:57 +00:00
Kostya Shishkov
b54bf2d6eb Add okayed parts for AAC encoder 
Originally committed as revision 14821 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-18 05:38:26 +00:00
Kostya Shishkov
720d52c678 More okayed chunks of AAC encoder 
Originally committed as revision 14799 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-17 07:04:11 +00:00
Kostya Shishkov
f5c3eae3cb Synchronize AAC encoder with renamings in aac.h 
Originally committed as revision 14786 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-16 11:59:36 +00:00
Kostya Shishkov
817015e4e2 Add approved chunks to AAC encoder 
Originally committed as revision 14785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-16 05:47:18 +00:00
Kostya Shishkov
07be55dc8b Remove not OKed parts from AAC encoder 
Originally committed as revision 14762 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-14 16:07:17 +00:00
Kostya Shishkov
c03d9d058b Okayed parts of AAC encoder 
Originally committed as revision 14752 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-14 05:52:29 +00:00