virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
34,379 Commits 39 Branches 425 Tags
29d70274ecff6d39c96b3bcdd263102c4a4e6e06
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Ruggles be51e589cd af_asyncts: avoid overflow in out_size with large delta values 2012-07-29 14:31:54 -04:00
Justin Ruggles 70d71b5801 af_asyncts: add first_pts option 
This allows for padding/trimming at the start of stream. By default, no
assumption is made about the first frame's expected pts, so no padding or
trimming is done.
 2012-07-29 14:31:54 -04:00
Justin Ruggles e9da9a3111 lavr: x86: improve non-SSE4 version of S16_TO_S32_SX macro 
Removes a false dependency on existing contents of the 2nd dst register,
giving better performance for OOE.
 2012-07-27 14:21:32 -04:00
Justin Ruggles 743f07062a lavfi: better channel layout negotiation 
Allow substitution of channel pairs in the input for nearby channel pairs in
the output in order to get a closer match. Also weigh LFE channel mismatch
differently to favor matching the same layout without LFE over one less
channel with LFE.
 2012-07-27 14:15:33 -04:00
Justin Ruggles 81f548de57 alac: check for truncated packets 
This will give a clearer error message when the error is caused by a
truncated packet.
 2012-07-27 13:52:20 -04:00
Justin Ruggles fb57e913e1 alac: reverse lpc coeff order, simplify filter 
Reversing the lpc coefficient order simplifies indexing in the filter.
 2012-07-27 13:52:19 -04:00
Justin Ruggles 2f096bb10e lavr: add x86-optimized mixing functions 
Adds optimized functions for mixing 3 through 8 input channels to 1 and 2
output channels in fltp or s16p format with flt coeffs.
 2012-07-27 11:25:48 -04:00
Justin Ruggles 79687079a9 x86: add support for fmaddps fma4 instruction with abstraction to avx/sse 2012-07-27 11:25:48 -04:00
Justin Ruggles 0dadf9d1e9 lavr: x86: add missing vzeroupper in ff_mix_1_to_2_fltp_flt() 2012-07-25 15:41:25 -04:00
Justin Ruggles a35738f424 dsputil: ppc: cosmetics: pretty-print 2012-07-22 17:38:55 -04:00
Justin Ruggles 1749e12f45 cafdec: allow larger ALAC magic cookie 
It already skips any extra bytes at the end, and apparently there are some
samples in the wild with larger 'kuki' chunks.
 2012-07-19 20:14:29 -04:00
Justin Ruggles 4cd22b7738 alac: fix channel pointer assignment for 24 and 32-bit 
Needs to be done separately for each element.
 2012-07-19 20:14:29 -04:00
Justin Ruggles eeb55f5f2f alac: cosmetics: general pretty-printing and comment clean up 2012-07-19 13:26:48 -04:00
Justin Ruggles f3e5a7844b alac: calculate buffer size outside the loop in allocate_buffers() 2012-07-19 13:26:48 -04:00
Justin Ruggles bae83f2c74 alac: change some data types to plain int 2012-07-19 13:26:48 -04:00
Justin Ruggles 2aebac6918 alac: cosmetics: rename some variables and function names 2012-07-19 13:26:48 -04:00
Justin Ruggles 81c9e2e6d0 alac: split element parsing into a separate function 
This will make multi-channel implementation simpler.
Based partially on a patch by Andrew D'Addesio <modchipv12@gmail.com>.
 2012-07-19 13:26:48 -04:00
Justin Ruggles cd632619d9 alac: support a read sample size of up to 32 
Use get_bits_long() in decode_scalar().
Use unsigned int for decoded value.
 2012-07-19 13:26:48 -04:00
Justin Ruggles 73dc0db486 alac: output in planar sample format 
Avoids unneeded interleaving and allows for reusing the AVFrame output buffer
as the internal buffer for 24-bit and 32-bit sample size.
 2012-07-19 13:26:48 -04:00
Justin Ruggles 6482bd8831 alac: add 32-bit decoding support 2012-07-19 13:26:48 -04:00
Justin Ruggles 5138ff143f alac: use AVPacket fields directly in alac_decode_frame() 2012-07-19 13:26:47 -04:00
Justin Ruggles 7a206eb32f alac: fix check for valid max_samples_per_frame 2012-07-19 13:26:47 -04:00
Justin Ruggles 1193d3fedd alac: use get_sbits() to read LPC coefficients instead of casting 2012-07-19 13:26:47 -04:00
Justin Ruggles 7a50ec6799 alac: move the current samples per frame to the ALACContext 
This will simplify the multi-channel implementation.
 2012-07-19 13:26:47 -04:00
Justin Ruggles 46043962ea alac: avoid using a double-negative when checking if the frame is compressed 2012-07-19 13:26:47 -04:00
Justin Ruggles 9a6c528e08 alac: factor out output_size check in predictor_decompress_fir_adapt() 2012-07-19 13:26:47 -04:00
Justin Ruggles ebd4c3add1 alac: factor out loading of next decoded sample in LPC prediction 2012-07-19 13:26:47 -04:00
Justin Ruggles a4ecd41442 alac: use index into buffer_out instead of incrementing the pointer 2012-07-19 13:26:47 -04:00
Justin Ruggles f2515cd629 alac: simplify lpc coefficient adaptation 2012-07-19 13:26:47 -04:00
Justin Ruggles abc4376b31 alac: reduce the number of local variables needed in lpc prediction 2012-07-19 13:26:47 -04:00
Justin Ruggles 01880d287b alac: simplify 1st order prediction and reading of warm-up samples 2012-07-19 13:26:46 -04:00
Justin Ruggles d0c0bf0d3e alac: cosmetics: reindent after last commit 2012-07-19 13:26:46 -04:00
Justin Ruggles 79def4c523 alac: remove unneeded conditionals in predictor_decompress_fir_adapt() 2012-07-19 13:26:46 -04:00
Justin Ruggles 4bcd637dcb alac: use sizeof() instead of hardcoded data sizes 2012-07-19 13:26:46 -04:00
Justin Ruggles 91620a04f1 alac: make block_size signed 
It does not need to be unsigned.
 2012-07-19 13:26:46 -04:00
Justin Ruggles 2fc24b3273 alac: remove a duplicate local variable 2012-07-19 13:26:46 -04:00
Justin Ruggles 5177413d20 alac: conditionally set sign_modifier to 1 
It is already unconditionally set to 0 prior to this, so we can modify it
only when needed.
 2012-07-19 13:26:46 -04:00
Justin Ruggles 7e6593e977 alac: eliminate 2 unneeded local variables in bastardized_rice_decompress() 
x_modified is just unnecessary, and final_val can be removed by simplifying
the unsigned-to-signed conversion.
 2012-07-19 13:26:46 -04:00
Justin Ruggles 6fd8a28b59 alac: adjust conditions for updating entropy decoder history 
avoids some unnecessary arithmetic in certain situations
 2012-07-19 13:26:46 -04:00
Justin Ruggles a06fdadd97 alac: cosmetics: reindent after last commit 2012-07-19 13:26:46 -04:00
Justin Ruggles d9837434a9 alac: limit the rice param before passing to decode_scalar() 
reduces the number of parameters to decode_scalar() and slightly simplifies
the code
 2012-07-19 13:26:45 -04:00
Justin Ruggles 6e91f62256 alac: reduce the number of parameters to bastardized_rice_decompress() 
Use the ALACContext fields directly instead.
 2012-07-19 13:26:45 -04:00
Justin Ruggles 836e8b9ba0 alac: cosmetics: rename some ALACContext parameters 2012-07-19 13:26:45 -04:00
Justin Ruggles 2ac1737583 alac: clean up and update comments leftover from reverse-engineering 2012-07-19 13:26:45 -04:00
Justin Ruggles 3bab7cd128 avformat: move 'chan' tag parsing to mov_chan.c to share with the CAF demuxer 2012-07-19 13:26:45 -04:00
Justin Ruggles c0196a14b9 caf: use int64_t for num_packets 
It is used to store a value read by avio_rb64().
 2012-07-19 13:26:45 -04:00
Justin Ruggles f5a9c35f88 caf: fix 'pakt' chunk parsing 
according to the CAF specification:
"... the value for mChunkSize can be greater than the actual valid content
of the packet table chunk"
 2012-07-19 13:26:45 -04:00
Justin Ruggles b0b77b9ca5 caf: support either old or new style ALAC magic kuki chunk 2012-07-19 13:26:45 -04:00
Justin Ruggles 6410397600 lavr: resampling: add support for s32p, fltp, and dblp internal sample formats 
Based partially on implementation by Michael Niedermayer <michaelni@gmx.at> in
libswresample in FFmpeg. See commits:
7f1ae79d38
24ab1abfb6
 2012-07-08 15:22:11 -04:00
Justin Ruggles 372647aed0 lavr: resampling: add filter type and Kaiser window beta to AVOptions 2012-07-08 15:22:11 -04:00
Justin Ruggles 8ca08066fc lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format 
Also make this the default value.
 2012-07-08 15:22:11 -04:00
Justin Ruggles db0e7bd0bd lavr: mix: validate internal sample format in ff_audio_mix_init() 2012-07-08 15:22:11 -04:00
Justin Ruggles acd9948e74 lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes 
Changed to match the number of parameters in conv_func_interleave(), which is
how they are called. The change isn't strictly necessary because the 4th
parameter is not used, but the code is clearer if they match.
 2012-06-26 12:29:35 -04:00
Justin Ruggles 14a34d90ad lavr: x86: merge some branches 2012-06-25 13:49:18 -04:00
Justin Ruggles ae46fbee1d af_amix: allow float planar sample format as input 2012-06-18 18:01:14 -04:00
Justin Ruggles f0ece49e74 af_amix: use AVFloatDSPContext.vector_fmac_scalar() 2012-06-18 18:01:14 -04:00
Justin Ruggles 82b2df9790 float_dsp: add x86-optimized functions for vector_fmac_scalar() 2012-06-18 18:01:14 -04:00
Justin Ruggles cb5042d02c float_dsp: Move vector_fmac_scalar() from libavcodec to libavutil 2012-06-18 18:01:14 -04:00
Justin Ruggles 4e4dd71730 lavr: Add x86-optimized function for flt to s32 conversion 2012-06-18 16:16:59 -04:00
Justin Ruggles 6c63cbfe7a lavr: Add x86-optimized function for flt to s16 conversion 2012-06-18 16:16:59 -04:00
Justin Ruggles 97ce1ba867 lavr: Add x86-optimized functions for s32 to flt conversion 2012-06-18 16:16:59 -04:00
Justin Ruggles 5904f25b9f lavr: Add x86-optimized functions for s32 to s16 conversion 2012-06-18 16:16:59 -04:00
Justin Ruggles d721f67d0a lavr: Add x86-optimized functions for s16 to flt conversion 2012-06-18 16:16:59 -04:00
Justin Ruggles 1168e29df1 lavr: Add x86-optimized function for s16 to s32 conversion 2012-06-18 16:16:59 -04:00
Justin Ruggles f61ce90caa lavr: add x86-optimized functions for mixing 1-to-2 s16p with flt coeffs 2012-06-18 11:24:10 -04:00
Justin Ruggles 29f7490c46 lavr: add x86-optimized functions for mixing 1-to-2 fltp with flt coeffs 2012-06-18 11:24:10 -04:00
Justin Ruggles 4795362660 golomb: check remaining bits during unary decoding in get_ur_golomb_jpegls() 
Fixes infinite loop in FLAC decoding in case of a truncated bitstream due to
the safe bitstream reader returning 0's at the end.

Fixes Bug 310.

CC:libav-stable@libav.org
 2012-06-12 14:33:39 -04:00
Justin Ruggles 03e098e7a0 lavu: change versioning script to include all av* prefixed symbols 
Needed to properly export avpriv_* symbols.
 2012-06-08 15:47:59 -04:00
Justin Ruggles 3b81a18ba3 float_dsp: ppc: add a separate header for Altivec function prototypes 
Also include config.h so that HAVE_ALTIVEC will be defined.
Fixes compilation on PPC with Altivec enabled.
 2012-06-08 14:52:01 -04:00
Justin Ruggles d5a7229ba4 Add a float DSP framework to libavutil 
Move vector_fmul() from DSPContext to AVFloatDSPContext.
 2012-06-08 13:14:38 -04:00
Justin Ruggles 98db4e2a4e PPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil 
This will allow for easier implementation of Altivec functions in libraries
other than libavcodec.
 2012-06-08 13:14:38 -04:00
Justin Ruggles 94d2b0d2fd ARM: Move asm.S from libavcodec to libavutil 
This will allow for easier implementation of ARM-optimized functions in
libraries other than libavcodec.
 2012-06-08 13:14:38 -04:00
Justin Ruggles c7bd556d48 lavfi: amix: check active input count before calling request_samples 
fixes use of the amix filter with only 1 input
 2012-05-30 16:20:03 -04:00
Justin Ruggles b75726cb79 lavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs 2012-05-29 15:33:25 -04:00
Justin Ruggles c140fb2cbc lavr: add x86-optimized functions for mixing 2 to 1 s16p with float coeffs 2012-05-29 15:33:18 -04:00
Justin Ruggles 8dfc122719 lavr: add C functions for mixing 2 to 1 channels with s16p format 2012-05-29 15:16:20 -04:00
Justin Ruggles c7448c182a lavfi: add audio mix filter 2012-05-23 16:37:34 -04:00
Justin RugglesandDiego Biurrun 713548cbad x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code. 
This is needed for older versions of yasm/nasm that do not support AVX.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-05-22 20:46:02 +02:00
Justin Ruggles e0d8427dce af_resample: remove an extra space in the log output 2012-05-21 18:26:51 -04:00
Justin Ruggles afeb3590fc lavfi: add an audio split filter 
Based on current version of the asplit filter in FFmpeg written by
Stefano Sabatini and others.
 2012-05-21 14:49:52 -04:00
Justin Ruggles cc30080b3f lavfi: rename vf_split.c to split.c 
This is in preparation for adding an audio split filter.
 2012-05-21 14:49:52 -04:00
Justin Ruggles 95a98ab3f0 ac3dsp: simplify x86 versions of ac3_max_msb_abs_int16 
Simplifies the code by using cpuflags and a new macro.
Also fixes the invalid use of the MMX2 pshufw operation in the MMX-only
function.
 2012-05-15 15:23:59 -04:00
Justin Ruggles 5cc6d5244d lavr: replace the SSE version of ff_conv_fltp_to_flt_6ch() with SSE4 and AVX 
The current SSE version is slower than the MMX version on Athlon64 and Sandy
Bridge, but the SSE4 and AVX versions are faster on Sandy Bridge.
 2012-05-09 16:17:59 -04:00
Justin Ruggles 85e5b866dc avplay: properly close/reopen AVAudioResampleContext on channel layout change 
fixes Bug#280
 2012-05-07 12:42:32 -04:00
Justin Ruggles f132248028 avcodec: do not needlessly set packet size to 0 in avcodec_encode_audio2() 
It is already set to 0 by av_free_packet()
 2012-05-07 12:14:05 -04:00
Justin Ruggles 74e10b6204 avcodec: for audio encoding, reset output packet when it is not valid 2012-05-07 12:14:05 -04:00
Justin Ruggles fa0319b4fd avcodec: refactor avcodec_encode_audio2() to merge common branches 2012-05-07 12:14:05 -04:00
Justin Ruggles b461cd4deb avcodec: remove fallbacks for AVCodec.encode() in avcodec_encode_audio2() 
We no longer have any audio encoders using AVCodec.encode().
 2012-05-07 12:14:04 -04:00
Justin Ruggles e5356ebf22 cosmetics: indentation 2012-05-03 16:28:08 -04:00
Justin Ruggles 8916f1fbcb avformat: only fill-in interpolated timestamps if duration is non-zero 
This avoids returning duplicate timestamps for multiple packets when the
demuxer does not provide all timestamps and packet duration is not known.
 2012-05-03 16:28:08 -04:00
Justin Ruggles ff499157a1 avformat: remove a workaround for broken timestamps 
This modifies pts in situations other than what was intended, leading to
invalid timestamps.

Reverts commit 90bb394dcc
 2012-05-03 16:28:08 -04:00
Justin Ruggles 4010d724e1 lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type 2012-05-01 13:52:59 -04:00
Justin Ruggles f1ffb01ee9 avplay: use libavresample for sample format conversion and channel mixing 
SDL only supports s16 sample format and a limited number of channel layouts.
Some versions of SDL on some systems support 4-channel and 6-channel output,
but it's safer overall to downmix any layout with more than 2 channels to
stereo.
 2012-05-01 13:38:23 -04:00
Justin Ruggles f7ff099997 APIchanges: fill in some dates and commit hashes 2012-04-30 13:51:41 -04:00
Justin Ruggles 394dbde548 FATE: use updated reference for aac-latm_stereo_to_51 
This uses correct stereo to 5.1 upmixing via libavresample.
 2012-04-24 23:38:54 -04:00
Justin Ruggles bcb82fe1f4 avconv: use libavresample 2012-04-24 23:38:54 -04:00
Justin Ruggles c8af852b97 Add libavresample 
This is a new library for audio sample format, channel layout, and sample rate
conversion.
 2012-04-24 21:28:27 -04:00
Justin Ruggles c5671aeb77 FATE: avoid channel mixing in lavf-dv_fmt 
This partially reverts acb1730218
which would only have needed to change the checksums if channel mixing had
been properly avoided. This changes the output file size reference and the
seek test reference back to the previous values.
 2012-04-24 15:55:45 -04:00
Justin Ruggles 83b26046fc avutil: change default buffer size alignment for sample buffer functions 
Aligning nb_samples will give both correct plane pointer alignment and enough
padding for SIMD-optimized functions.
 2012-04-23 14:06:45 -04:00
Justin Ruggles b0e9edc44f avcodec: add a cook parser to get subpacket duration 
Fixes jittery video playback of rm files with cook audio.
 2012-04-20 12:11:20 -04:00