RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
26,881 Commits 36 Branches 398 Tags 232 MiB
Commit Graph

26881 Commits

Author SHA1 Message Date
Justin Ruggles 7786c384f6 cosmetics: pretty-printing after last commit 
Originally committed as revision 26031 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-16 03:44:35 +00:00
Justin Ruggles 89bedc4d2e Add a goto for init failure instead of duplicate calls to ac3_encode_close(). 
Originally committed as revision 26030 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-16 03:44:32 +00:00
Justin Ruggles c41ac4f82e Use pre-allocated temp buffers in mdct512(). 
5% faster in function.

Originally committed as revision 26029 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-16 03:44:29 +00:00
Justin Ruggles e29065f7bf Write results of post-rotation complex multiply directly to output. 
2% faster in function mdct512().

Originally committed as revision 26028 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-16 03:13:45 +00:00
Justin Ruggles 9d8533368f Use memcpy() instead of a for loop in mdct512(). 
8% faster in function.

Originally committed as revision 26027 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-16 03:13:41 +00:00
Justin Ruggles b6f6204db9 Allocate all large per-channel arrays using av_malloc(). 
Decreases memory usage for less than 6 channels.

Originally committed as revision 26026 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-16 02:33:02 +00:00
Justin Ruggles aa645b9888 Make windowed_samples 16-byte aligned. 
This will allow future SIMD optimization of the window function.

Originally committed as revision 26025 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-16 02:32:59 +00:00
Justin Ruggles e8d21fba3f Allocate planar_samples using av_mallocz(). 
Lowers memory usage when encoding less than 6 channels.

Originally committed as revision 26024 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-16 02:32:55 +00:00
Justin Ruggles 171bc51c9b Allocate bap and bap1 buffers using av_malloc(). 
This reduces the memory footprint when using less than 6 channels.
Modify bit allocation to swap the 2 buffers instead of using memcpy() and use
per-block pointers for bap. This is slightly faster (0.3%) in function
cbr_bit_allocation().

Originally committed as revision 26023 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-15 21:12:28 +00:00
Martin Storsjö bbd8f5477d rtsp: Don't set the RTP time base from the sample rate if no sample rate is set 
This also reverts SVN rev 26016, which incorrectly overwrote the time base
with 90 kHz for all streams, regardless of what was set by the SDP parsing.

The stream that triggered the fix in 26016 still works after this commit.

Originally committed as revision 26022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-15 21:06:25 +00:00
Justin Ruggles 1c3e117e0b Remove last_samples[] and copy directly from planar_samples[]. 
Avoids memcpy that was used to store last samples for next frame.
Approx. 3% faster in function deinterleave_input_samples() and reduces memory
usage by 3kB.

Originally committed as revision 26021 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-15 17:28:52 +00:00
Justin Ruggles 7eeca961e3 Remove unneeded line. key_frame is already set to 1 in avcodec_alloc_frame(). 
Originally committed as revision 26020 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-15 17:28:49 +00:00
Justin Ruggles 2d82d9b1df cosmetics: comment clean-up and misc cosmetics 
Originally committed as revision 26019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-15 17:28:44 +00:00
Justin Ruggles 5901cebecd Separate most of the per-block arrays into a separate per-block struct. 
Originally committed as revision 26018 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-15 17:28:41 +00:00
Justin Ruggles cb6247cb30 Split bit allocation search into a separate function. 
Originally committed as revision 26017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-15 17:28:38 +00:00
Luca Barbato a4a3bade0a Reinstate default time_base for rtp streams 
The generic default is 0/0 and that obviously triggers once the value is used.

Originally committed as revision 26016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-15 17:16:37 +00:00
Alexander Strange 0f01602362 SVQ3: Allow decoding if thread_count is > 1 
svq3 still doesn't support multithreading, but it's simpler for clients if
they can enable threading for all codecs by default.

Originally committed as revision 26015 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-15 00:22:47 +00:00
Thomas Guillem 1aa58c6405 tcp: Check url_interrupt_cb if connect was interrupted by a signal 
This makes it possible to abort a blocking connect call.

Patch by Thomas Guillem, thomas dot guillem at gmail

Originally committed as revision 26014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 23:03:05 +00:00
Justin Ruggles 06f6f78578 10l: fix typo in compute_exp_strategy() 
Originally committed as revision 26013 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 22:45:35 +00:00
Justin Ruggles 266d24be4a Move large arrays to AC3EncodeContext rather than passing them around. 
Originally committed as revision 26012 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 22:45:31 +00:00
Justin Ruggles 7da4dc17d9 cosmetics: line wrap and spacing 
Originally committed as revision 26011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 22:45:28 +00:00
Justin Ruggles a0d763fc88 Use a single value for SNR offset in the bit allocation search rather than 
the separate coarse and fine values.

Originally committed as revision 26010 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 22:45:22 +00:00
Justin Ruggles 70fcd7ea80 Change bit_alloc() to return the mantissa bit count. 
Originally committed as revision 26009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 22:45:19 +00:00
Justin Ruggles 937cd1467c cosmetics: alignment and line wrap after last commit 
Originally committed as revision 26008 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 22:45:15 +00:00
Justin Ruggles 359c1d1926 Move bit counts to AC3EncodeContext. 
Originally committed as revision 26007 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 22:45:12 +00:00
Stefano Sabatini 82ccbe6b27 Simplify texi files naming: ff*-doc.texi -> ff*.texi. 
Originally committed as revision 26006 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 18:38:37 +00:00
Justin Ruggles 80575c0e55 Add missing dependency for matroska muxer. 
Originally committed as revision 26005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 17:14:40 +00:00
Justin Ruggles 8c634b707b Update the test references for lavf-rm and seek-ac3_rm. 
The references changed due to r25956.

Originally committed as revision 26004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 16:14:52 +00:00
Justin Ruggles 793bbf9544 Split out setting of bit allocation parameters to a separate function. 
Th new function only needs to be called at initialization because bit
allocation parameters currently do not change during encoding.

Originally committed as revision 26003 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:53:43 +00:00
Justin Ruggles 8999944ecb Split out counting of frame bits into a separate function. 
Originally committed as revision 26002 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:53:40 +00:00
Justin Ruggles 33a7d549e8 cosmetics: vertical alignment 
Originally committed as revision 26001 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:53:36 +00:00
Justin Ruggles d3325d555b Only calculate num_exp_groups once. 
Originally committed as revision 26000 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:53:33 +00:00
Justin Ruggles dc0bc0f84e Check for bit allocation error in ac3_encode_frame(). 
Move error log printout to ac3_encode_frame().

Originally committed as revision 25999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:53:30 +00:00
Justin Ruggles f94bacc538 Split out grouping of exponents into a separate function. 
Originally committed as revision 25998 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:53:26 +00:00
Justin Ruggles b6a1e5236e Split out mantissa quantization into separate functions. 
Originally committed as revision 25997 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:53:23 +00:00
Justin Ruggles 5b44ede0ba cosmetics: rearrange some functions 
Originally committed as revision 25996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:53:20 +00:00
Justin Ruggles d7da80806c Reverse the exponent & exponent strategy array arrangement to simplify the 
per-channel exponent strategy decision.  This will also make it easier to
plug-in other exponent strategy algorithms.

Originally committed as revision 25995 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:53:17 +00:00
Justin Ruggles 67d979fede Move writing of frame to the output bitstream to a separate function. 
Originally committed as revision 25994 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:53:13 +00:00
Justin Ruggles 084f5c5afe cosmetics: remove a comment and just spacing 
Originally committed as revision 25993 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:53:10 +00:00
Justin Ruggles 160d85f5b0 Split frame size adjustment into a separate function. 
Originally committed as revision 25992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:53:06 +00:00
Justin Ruggles dfdf73eb1a Split exponent processing into separate functions. 
Originally committed as revision 25991 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:53:02 +00:00
Justin Ruggles 0a0a8500fb Split applying of MDCT into several separate functions. 
Originally committed as revision 25990 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:59 +00:00
Justin Ruggles 4acc790f3c Split input sample deinterleaving into a separate function. 
Originally committed as revision 25989 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:56 +00:00
Justin Ruggles 152cc52803 Separate functionally different calculations in ac3_encode_frame(). 
Originally committed as revision 25988 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:53 +00:00
Justin Ruggles 98f6ee4453 cosmetics: rename 2 variables 
Originally committed as revision 25987 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:49 +00:00
Justin Ruggles 12ed622699 Deinterleave whole frame at once instead of per-block. 
This reduces the amount of memcpy() by using pointers to overlap samples for
successive blocks rather than copying.

Originally committed as revision 25986 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:46 +00:00
Justin Ruggles e0685bc98f cosmetics: add & alter some comments 
Originally committed as revision 25985 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:43 +00:00
Justin Ruggles 282255bbd2 Split setting of bandwidth into a separate function. 
Originally committed as revision 25984 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:40 +00:00
Justin Ruggles e35c984a5d Move setting of bitstream_id and bitstream_mode to ac3_encode_init(). 
Originally committed as revision 25983 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:37 +00:00
Justin Ruggles ddf63d37b8 Improve ac3_encode_init() error reporting. 
Return AVERROR(EINVAL) instead of -1. Propogate errors from called functions.
Add some error log printouts.

Originally committed as revision 25982 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:34 +00:00