virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
100,228 Commits 37 Branches 400 Tags 465 MiB
e127af3c2b
Commit Graph

40 Commits

Author SHA1 Message Date
Anton Khirnov
af1f1e8665 ac3enc: drop a global variable 
Log the warning message once per encoder instance instead.

Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2020-02-07 13:36:57 -03:00
Michael Niedermayer
cae851c789 avcodec/ac3enc: Use avpriv_float_dsp_alloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-29 18:54:27 +01:00
Michael Niedermayer
c895fa7f66 Merge commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc' 
* commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc':
  ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-26 22:18:12 +02:00
Michael Niedermayer
15fda8bcf1 Merge commit '4c2fd4b262347273afe97865ba451a1abde43ae6' 
* commit '4c2fd4b262347273afe97865ba451a1abde43ae6':
  ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-26 22:07:35 +02:00
Tim Walker
cc4992aaf3 ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode. 
This is actually defined in the A/52 specification.
 2014-09-26 17:09:14 +02:00
Tim Walker
4c2fd4b262 ac3enc: allow Dolby Pro Logic II as a preferred downmix mode. 
Some encoders already use this value even
though it's reserved in the A/52 specification.
 2014-09-26 17:09:13 +02:00
Michael Niedermayer
3a2d1465c8 Merge commit '2d60444331fca1910510038dd3817bea885c2367' 
* commit '2d60444331fca1910510038dd3817bea885c2367':
  dsputil: Split motion estimation compare bits off into their own context

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/arm/Makefile
	libavcodec/dvenc.c
	libavcodec/error_resilience.c
	libavcodec/h264.h
	libavcodec/h264_slice.c
	libavcodec/me_cmp.c
	libavcodec/me_cmp.h
	libavcodec/motion_est.c
	libavcodec/motion_est_template.c
	libavcodec/mpeg4videoenc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/me_cmp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-17 23:27:40 +02:00
Diego Biurrun
2d60444331 dsputil: Split motion estimation compare bits off into their own context 2014-07-17 09:07:10 -07:00
Michael Niedermayer
99497b4683 Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2' 
* commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2':
  dsputil: Split audio operations off into a separate context

Conflicts:
	configure
	libavcodec/takdec.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil.asm
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-22 17:58:28 +02:00
Diego Biurrun
9a9e2f1c8a dsputil: Split audio operations off into a separate context 2014-06-22 06:20:15 -07:00
Michael Niedermayer
97c285e61b Merge commit '27631796c9d1b8146ad4a16e6539ecc08afa7565' 
* commit '27631796c9d1b8146ad4a16e6539ecc08afa7565':
  ac3: Only initialize float_dsp for the float encoder variant

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-13 19:51:35 +02:00
Diego Biurrun
27631796c9 ac3: Only initialize float_dsp for the float encoder variant 2014-06-13 05:21:34 -07:00
Michael Niedermayer
efc4439c89 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  put_bits: Remove unused includes

Conflicts:
	libavcodec/put_bits.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-04 15:09:58 +01:00
Vittorio Giovara
973dc4e8d4 put_bits: Remove unused includes 
This requires adding includes to other files that relied on these being
included implicitly.
 2014-03-04 11:45:32 +01:00
Thilo Borgmann
d814a839ac Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00: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
aa872af5e3 ac3enc: update to AVCodec.encode2() 
Update FATE references due to encoder delay.
 2012-03-20 18:46:56 -04:00
Mans Rullgard
cc276c85d1 Make channel layout masks unsigned 
It makes more sense for a bit mask to use an unsigned type.
The change should be source and binary compatible on all
supported systems, hence micro version bump.

Fixes a few invalid shifts.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-11-25 13:19:54 +00:00
John Stebbins
5f3fb59953 fix AC3ENC_OPT_MODE_ON/OFF 
The values were reversed.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-10-11 14:57:58 -04:00
Justin Ruggles
ae264bb29b ac3enc: Add channel coupling support for the fixed-point AC-3 encoder. 
Update FATE references accordingly.
 2011-09-05 10:09:44 -04:00
Justin Ruggles
c766eb1ce1 ac3enc: add macros for option names to make them more understandable. 2011-08-11 11:33:32 -04:00
Justin Ruggles
c3d63262fe ac3enc: allow new coupling coordinates to be sent independently for each 
channel.
 2011-08-09 16:44:34 -04:00
Justin Ruggles
d55ad59a8a ac3enc: separate exponent bit counting from exponent grouping. 
Move bit counting to the bit allocation function. Move exponent grouping to
after bit allocation. This will allow for adjustment of bandwidth parameters
during bit allocation without having to do exponent grouping multiple times.
 2011-08-09 16:28:18 -04:00
Justin Ruggles
1bca72e1bd eac3enc: support writing of basic mixing and info metadata 2011-07-27 11:51:46 -04:00
Justin Ruggles
be7bd626c4 eac3enc: use different numbers of blocks per frame to allow higher bitrates 2011-07-21 14:57:10 -04:00
Justin Ruggles
08a747afb9 eac3enc: use frame exponent strategy when applicable. 
This checks if the set of selected exponent strategies for all blocks in a
channel are in the frame exponent strategy table, and if so, writes the
table index instead of each strategy. This saves up to 7 bits per channel per
frame, so the overall effect on quality is small.
 2011-07-19 14:15:00 -04:00
Justin Ruggles
b5849f7709 ac3enc: merge AC3MDCTContext with AC3EncodeContext. 
Since both the fixed-point and floating-point encoders use the FFTContext,
this no longer needs to be in a separate context. Also, when a short-transform
context is added, the same MDCT window will be used.
 2011-07-13 16:55:28 -04:00
Justin Ruggles
82cea7cb6c ac3enc: prefer passing AC3EncodeContext rather than AVCodecContext 2011-07-13 16:55:28 -04:00
Justin Ruggles
523b7eba19 ac3enc: clip coefficients after MDCT. 
This ensures that any processing between the MDCT and exponent extraction will
be using clipped coefficients.
 2011-07-01 13:02:11 -04:00
Justin Ruggles
8683c6a638 ac3enc: move ff_ac3_encode_frame() to ac3enc_template.c 
This avoids using function pointers for quite a few small functions, most of
which just call DSP functions.
 2011-06-27 12:59:39 -04:00
Justin Ruggles
0e4dbe2996 ac3enc: avoid masking output in asym_quant() by using signed values for 
quantized mantissas.
 2011-06-22 12:18:10 -04:00
Justin Ruggles
99477adc31 ac3enc: fix allocation of floating point samples. 
sizeof(SampleType) is different for fixed and float encoders.
 2011-06-13 17:49:37 -04:00
Justin Ruggles
38c304addd ac3enc: remove empty ac3_float function that is never called 2011-06-13 16:49:35 -04:00
Justin Ruggles
e0cc66df61 ac3enc: split templated float vs. fixed functions into a separate file. 
Function pointers are used for templated functions instead of needlessly
duplicating many functions.
 2011-06-13 16:49:35 -04:00
Justin Ruggles
e754dfc0bb ac3enc: dynamically allocate AC3EncodeContext fields windowed_samples and mdct 
This will allow the same struct to be used for both the fixed and float ac3
encoders.
 2011-06-13 16:49:35 -04:00
Justin Ruggles
36151b3e31 ac3enc: use function pointer to choose between AC-3 and E-AC-3 header output 
functions.
 2011-06-13 16:49:35 -04:00
Justin Ruggles
c8e9ea43d0 Move E-AC-3 encoder functions to a separate eac3enc.c file. 2011-06-07 15:16:41 -04:00
Fabrice Bellard
6107fa87b4 preparing integration of new AC3 decoder 
Originally committed as revision 1089 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-10-28 00:39:05 +00:00
Zdenek Kabelac
30b68f33aa * encoding of AC3 with more than 2 channels 
by Takashi Iwai <tiwai@suse.de>

Originally committed as revision 383 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-04-08 12:08:03 +00:00
Fabrice Bellard
de6d9b6404 Initial revision 
Originally committed as revision 5 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2001-07-22 14:18:56 +00:00