virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
26,849 Commits 37 Branches 400 Tags 458 MiB
dc0bc0f84e
Commit Graph

146 Commits

Author SHA1 Message Date
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
Justin Ruggles
b64d842c1d cosmetics: indent after last commit 
Originally committed as revision 25981 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:30 +00:00
Justin Ruggles
99ca4f73f0 Don't use nested loops to iterate valid sample rates. 
Eliminates a goto and mirrors the bitrate validation.

Originally committed as revision 25980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:25 +00:00
Justin Ruggles
1607db0a95 Remove some duplicate local copies of avctx fields. 
This is an av_cold function, and we don't need to duplicate variables just to
save a few characters.

Originally committed as revision 25979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:21 +00:00
Justin Ruggles
8f60f70d44 Split validation of initial user options into a separate function. 
Originally committed as revision 25978 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:18 +00:00
Justin Ruggles
427e2293d3 Use bytes instead of 16-bit words for frame size. 
Originally committed as revision 25977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:14 +00:00
Justin Ruggles
eed00252c9 cosmetics: rename variable 'n' to 'pad_bytes' 
Originally committed as revision 25976 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:12 +00:00
Justin Ruggles
1971ab6ed6 Change output_frame_end() to return void. The frame size is already known. 
Originally committed as revision 25975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:08 +00:00
Justin Ruggles
e8b552a818 cosmetics: pretty-printing 
Originally committed as revision 25974 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:04 +00:00
Justin Ruggles
ce67b7cd38 cosmetics: rename some iterator variables to match what they represent 
Originally committed as revision 25973 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:52:00 +00:00
Justin Ruggles
777732756a cosmetics: rename a variable for consistency 
Originally committed as revision 25972 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:56 +00:00
Justin Ruggles
aab45ca3de cosmetics: rename exp_samples and global_exp to exp_shift. 
Originally committed as revision 25971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:53 +00:00
Justin Ruggles
23c5b361a6 cosmetics: rename 2 functions 
Originally committed as revision 25970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:50 +00:00
Justin Ruggles
47ae6e795b define AC3_CRITICAL_BANDS and use it in the AC-3 encoder and decoder. 
Originally committed as revision 25967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:40 +00:00
Justin Ruggles
0454b55801 Use sizeof(array value) instead of sizeof(int16_t). 
Originally committed as revision 25966 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:36 +00:00
Justin Ruggles
a0a9204e49 cosmetics: use lowercase letters for function names 
Originally committed as revision 25965 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:33 +00:00
Justin Ruggles
c36ce0f8df cosmetics: add new function documentation and clean up existing documentation 
Originally committed as revision 25964 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:30 +00:00
Justin Ruggles
2f8ae52228 cosmetics: add more space between functions 
Originally committed as revision 25963 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:26 +00:00
Justin Ruggles
e77fd066fb cosmetics: rearrange some functions/typedefs/macros 
Originally committed as revision 25962 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:23 +00:00
Justin Ruggles
02877def49 Simplify group size calculation in 2 places. 
Originally committed as revision 25961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:20 +00:00
Justin Ruggles
9816155337 cosmetics: make a switch/case more compact 
Originally committed as revision 25960 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:17 +00:00
Justin Ruggles
b84a211bc8 Clean up fft_init() and mdct_init() 
Originally committed as revision 25959 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:12 +00:00
Justin Ruggles
6a988808a4 cosmetics: pretty-printing, alignment, etc... 
Originally committed as revision 25958 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:09 +00:00
Justin Ruggles
a913b5cf60 Remove unneeded #include 
Originally committed as revision 25957 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:05 +00:00
Justin Ruggles
918cd2255c Simplify fix15(). 
Turn it into 2 macros, and use av_clip_int16() and lrintf().
This matches the int16 to float sample conversion in audioconvert.c.
The regression test output is different due to lrintf() rounding.

Originally committed as revision 25956 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:02 +00:00
Justin Ruggles
228315bbd3 Fix the fixed-point MDCT and FFT tests so that they actually compile and work. 
Also, use LFG from libavutil instead of random().

Originally committed as revision 25955 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:50:58 +00:00
Justin Ruggles
a8d2b06b7c Split out initialization of MDCT tables into a separate function. 
Originally committed as revision 25954 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:50:54 +00:00
Justin Ruggles
0796546370 cosmetics: Document AC3EncodeContext fields. 
Originally committed as revision 25953 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:50:49 +00:00
Justin Ruggles
22c0b03c8f Remove unneeded debugging messages. 
Originally committed as revision 25952 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:50:45 +00:00
Justin Ruggles
1fda2c10f6 cosmetics: Define AC3_WINDOW_SIZE and use it instead of AC3_BLOCK_SIZE*2. 
Originally committed as revision 25951 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:50:40 +00:00
Justin Ruggles
7066cc8f2b cosmetics: use better (and shared) macro names for some constant values 
Originally committed as revision 25950 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:50:34 +00:00
Justin Ruggles
a657899cf7 Remove duplicate AC3EncodeContext fields, sr_shift and sr_code. 
Originally committed as revision 25949 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:50:30 +00:00
Justin Ruggles
2d2692eb49 cosmetics: rename some fields in AC3EncodeContext 
Originally committed as revision 25948 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:50:27 +00:00