generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
67,226 Commits 24 Branches 241 Tags 173 MiB
526886e606
Commit Graph

102 Commits

Author SHA1 Message Date
Michael Niedermayer
ad51833a1a aacsbr: prevent multiple ff_aac_sbr_ctx_init() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-23 22:31:57 +02:00
Michael Niedermayer
abe0dbea2e aacsbr: add a assert0 to check for a inconsistency that 
occurd during debug. I dont know if this can happen normally but if so
it would be quite bad.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-23 22:30:27 +02:00
Michael Niedermayer
75a37b57a5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  APIchanges: fill in date and commit for request_sample_fmt
  Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders.
  Add support for request_sample_format in ffmpeg and ffplay.
  Add APIchanges entry for request_sample_fmt.
  Add request_sample_fmt field to AVCodecContext.
  Add float_interleave() to FmtConvertContext with x86-optimized versions.
  Remove unused make variable SEEK_REFFILE
  fate: remove redundant aref and vref references
  fate: remove do_ffmpeg_nocheck function
  fate: do not collect -benchmark output
  mpegaudiodec: remove decode_end() function
  fate: run aref and vref as regular tests
  mpegaudio: sanitise compute_antialias_* names
  mpeg12: add slice-threading checks to slice-threading initializers.
  h264: copy pixel_shift between slice threading contexts.
  mdec: enable frame-level multithreading.
  mdec.c: fix overread.

Conflicts:
	libavcodec/aacdec.c
	libavcodec/ac3dec.c
	libavcodec/avcodec.h
	libavcodec/dca.c
	libavcodec/h264.c
	libavcodec/mdec.c
	libavcodec/mpeg12.c
	libavcodec/options.c
	libavcodec/version.h
	libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-19 06:00:31 +02:00
Justin Ruggles
9aa8193a23 Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis 
decoders.

Based on patches by clsid2 in ffdshow-tryout.
 2011-05-18 17:27:06 -04:00
Michael Niedermayer
d7e5aebae7 Merge remote branch 'qatar/master' 
* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
	Changelog
	doc/filters.texi
	ffmpeg.c
	libavcodec/ac3dec.h
	libavcodec/dsputil.c
	libavfilter/avfilter.h
	libavfilter/vf_scale.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 03:51:04 +02:00
Michael Niedermayer
30fe971934 aac: add headers needed for log2f() 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-26 08:33:21 +02:00
Michael Niedermayer
3d462373f8 aac: add math.h needed for log2f() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-23 11:06:19 +02: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
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
Alex Converse
4a7d992437 aac: remove dead SBR input scaling 
It has been unused since 9d06d7bce3

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 916dee9f45)
 2011-02-14 23:58:21 +01:00
Alex Converse
916dee9f45 aac: remove dead SBR input scaling 
It has been unused since 9d06d7bce3

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-14 09:46:29 +00:00
Justin Ruggles
733dbe7d18 Remove the add bias hack for the C version of DSPContext.float_to_int16_*(). 
(cherry picked from commit 9d06d7bce3)
 2011-01-28 03:15:35 +01:00
Justin Ruggles
9d06d7bce3 Remove the add bias hack for the C version of DSPContext.float_to_int16_*(). 2011-01-28 00:07:35 +00:00
Alex Converse
afa4248e4e aacsbr: Eliminate double precision arithmetic. 
Originally committed as revision 24227 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-13 00:49:30 +00:00
Alex Converse
fd6eb4a06c Move Parametric Stereo related ps* files to aacps*. 
Originally committed as revision 23720 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-22 19:29:03 +00:00
Alex Converse
cf3b4d9a78 aacsbr: Make dk signed. There is no point in it being unsigned. 
Originally committed as revision 23671 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-20 23:03:32 +00:00
Alex Converse
bd9e0e2905 10l: aacsbr: Fix f_master[2] calculation when k2diff == -1. 
Originally committed as revision 23660 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-20 19:24:18 +00:00
Alex Converse
a20639017b Add HE-AAC v2 support to the AAC decoder. 
Originally committed as revision 23647 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-19 14:14:51 +00:00
Alex Converse
bc330b5f15 Cosmetics: Fold constants and re-indent after last commit. 
Originally committed as revision 23520 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-08 02:02:16 +00:00
Alex Converse
712209d567 Base downsampled SBR synthesis filterbank on a single IMDCT. 
Based on Han-Wen Hsu, et al. "Fast Complex Quadrature Mirror Filterbanks for
MPEG-4 HE-AAC"

Originally committed as revision 23519 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-08 01:57:06 +00:00
Alex Converse
388c795531 10l: Fix types and now unused variables after last commit. 
Originally committed as revision 23517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-07 22:55:58 +00:00
Alex Converse
932963b8e2 Rewrite the SBR decoder QMF analysis filter on top of the IMDCT instead of the RDFT. 
This is based on a procedure to implement the filterbank on the DCT-IV described in
Hsu, H.W. et al. "A Complex Quadrature Mirror Filterbanks for MPEG-4 HE-AAC"
http://sites.google.com/site/wenchiehlee1020/Papers/ComplexFB_AES_121paper144.pdf

Originally committed as revision 23516 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-07 21:52:08 +00:00
Alex Converse
dd8871a63b aacdec: Rename avccontext to avctx. 
Originally committed as revision 23488 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-05 15:22:19 +00:00
Alex Converse
17d5959998 10l: The SBR refactor requires the use of 2 independent output X buffers. 
Originally committed as revision 23014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-03 19:21:35 +00:00
Alex Converse
2d23fecd5d Enforce time border monotonicity. 
Thanks to Chromium.

Originally committed as revision 23000 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-30 23:32:42 +00:00
Alex Converse
a91d82b5cc Move the SBR patch count check to prevent overwrites. 
Thanks to Chromium.

Originally committed as revision 22999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-30 23:08:44 +00:00
Alex Converse
10678e5c72 Increase size of patch_borders[]. 
6 patches means there can be 7 borders. Found by Chromium.

Originally committed as revision 22998 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-30 22:42:52 +00:00
Alex Converse
d0dedce71d Reindent 
Originally committed as revision 22996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-30 21:43:29 +00:00
Alex Converse
ca6d3f234c Rewrite ff_sbr_apply in a manner more friendly to PS. 
This includes merging ff_sbr_dequant into ff_sbr_apply.

Originally committed as revision 22995 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-30 21:43:23 +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
ba659bedb8 Reindent read_sbr_extension. 
Originally committed as revision 22820 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-08 06:27:39 +00:00
Alex Converse
73c2704608 Print an error and skip PS when PS is found but explicitly found but 
signaled to be absent.

Originally committed as revision 22819 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-08 06:27:35 +00:00
Alex Converse
b3e5931d18 aacsbr: DSPUtilize analysis input scaling. 
Originally committed as revision 22516 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-13 21:12:45 +00:00
Alex Converse
f8a93a2036 aac: Don't bias output during the IMDCT if SBR will be used. 
Originally committed as revision 22515 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-13 21:12:10 +00:00
Alex Converse
6ebc724060 aacsbr: Check that bs_num_env is valid before writing arrays with it as an offset. 
Originally committed as revision 22413 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 21:50:10 +00:00
Alex Converse
134b8cbb9a aacsbr: Cleanup read_sbr_grid and copy_sbr_grid after the recent overhaul of those functions. 
Originally committed as revision 22412 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 21:46:46 +00:00
Alex Converse
f7e7888b2a aacsbr: Factor out the common end border case from t_q setup. 
Originally committed as revision 22411 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 21:35:55 +00:00
Alex Converse
ac8d655a79 aacsbr: read bs_rel_bord directly into t_env. 
Originally committed as revision 22410 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 21:29:43 +00:00
Alex Converse
ecc1f8c3c8 aacsbr: Make the previous value of bs_num_env local to read_sbr_data(). 
Originally committed as revision 22409 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 20:46:41 +00:00
Alex Converse
46751a65e3 aacsbr: Initialize e_a[1] to -1. 
This triggers lAPrev (e_a[0]) on the first SBR frame to be -1. The spec is
somewhat ambiguous to what this value should be but this increases the accuracy
of al_sbr_e_44_1 and similar streams from 14 bits to 15 bits.

Originally committed as revision 22408 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 20:16:14 +00:00
Alex Converse
5889172087 aacsbr: Dead code removal. 
Originally committed as revision 22387 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 11:14:14 +00:00
Alex Converse
afd96c345f aacsbr: Remove a slightly incorrect comment. 
The two conditions are equivalent.

Originally committed as revision 22386 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 11:13:45 +00:00
Alex Converse
7935078623 aacsbr: Cleanup the newly merged read_sbr_grid, eliminating several context 
and some duplicate local variables.

Originally committed as revision 22384 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 10:27:35 +00:00
Alex Converse
7333f849b1 aacsbr: Move the e_a calculation from sbr_mapping() to read_sbr_grid(). 
Originally committed as revision 22383 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 10:26:54 +00:00
Alex Converse
b9c3e3b6e7 aacsbr: Merge sbr_time_freq_grid into read_sbr_grid (and into copy_sbr_grid). 
Originally committed as revision 22382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 10:26:25 +00:00
Alex Converse
ed1d112931 aacsbr: Fail early on illegal envelope counts. 
Originally committed as revision 22381 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 10:25:42 +00:00
Alex Converse
8a9ee4b102 aacsbr: Check for illegal values of bs_pointer in sbr_read_grid(). 
Originally committed as revision 22380 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 09:27:11 +00:00
Alex Converse
bf3d904c3d 10l: Include missing return values in functions made non-void by the previous commit. 
Originally committed as revision 22376 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 06:21:41 +00:00
Alex Converse
58b1cba0c9 aacsbr: Propagate errors from read_sbr_grid to prevent crashes in malformatted streams. 
Originally committed as revision 22375 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 06:13:48 +00:00
Georgi Chorbadzhiyski
e0be763052 Add a missing fft.h include to the aacsbr decoder. 
Patch by Georgi Chorbadzhiyski gf at unixsol dot org

Originally committed as revision 22374 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 06:11:45 +00:00
Alex Converse
ed492b61db Add an HE-AAC v1 decoder. 
A large portion of this code was orignally authored by Robert Swain. The rest
was written by me. Full history is available at:
svn://svn.ffmpeg.org/soc/aac-sbr
http://github.com/aconverse/ffmpeg-heaac/tree/sbr_pub

Originally committed as revision 22316 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 04:33:02 +00:00