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
58,685 Commits 39 Branches 425 Tags
f068aed7b8d7eac31da22d88f359e9b844c04b47
Commit Graph
34 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim WalkerandLuca Barbato 7dc827b709 dcadec: Add some logging before returning on error 
Based on a patch by Michael Niedermayer.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-11-30 13:01:35 +01:00
Tim WalkerandAnton Khirnov 3c8507a845 dcadec: add disable_xch private option. 
This supplements the deprecated request_channels-based control of XCh decoding.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-28 22:02:53 +01:00
Tim WalkerandAnton Khirnov 220494ad0b dcadec: treat all 2-channel modes as Stereo in dca_downmix. 
The check for (prim_channels > 2) before calling dca_downmix made these
cases unreachable, but now 2.1 layouts will go through the downmix code.
Having dual mono, Lt/Rt and sum-difference layouts print errors when
regular Stereo doesn't seems pointless.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-28 22:02:53 +01:00
Tim WalkerandAnton Khirnov aaa44d0299 dca: support mixing LFE in dca_downmix. 
Embedded downmix coefficients can use this.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-28 22:02:53 +01:00
Tim WalkerandAnton Khirnov 149438cfe5 dca: improve default stereo downmix coefficients. 
Previous coefficients were producing a non-normalized, incorrect Lt/Rt downmix.

The new coefficients produce a standard Lo/Ro downmix with 3dB attenuation.

This should match the typical default coefficients used by DTS encoders.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-28 22:02:53 +01:00
Tim WalkerandAnton Khirnov 44b17d794a dca: extract core substream's embedded downmix coeffcient codes, if present. 
As per ETSI TS 102 114 V1.4.1 specification.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-28 22:02:53 +01:00
Tim WalkerandAnton Khirnov 27245b4e1b dca: remove embedded downmix coefficient extraction. 
It was based on an old, seemingly incorrect specification, so default
coefficients were always used anyway.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-28 22:02:50 +01:00
Tim WalkerandAnton Khirnov b6d5e6aa10 dca: convert dca_default_coeffs to float. 
Easier to read, modify, and avoids relying on an outdated table.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-28 21:38:22 +01:00
Tim WalkerandAnton Khirnov 25609b63d2 dcadec: store the stereo downmix coefficients as float in the DCAContext. 
The 7-bit codes previously used are absent from the ETSI 102 114 V1.4.1 spec.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-28 21:35:22 +01:00
Tim WalkerandAnton Khirnov 89de5157b1 dcadec: implement request_channel_layout. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-28 21:10:29 +01:00
Tim WalkerandDiego Biurrun 48b24bd2d2 ac3dec: Fix out-of-array read 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-23 21:36:49 +01:00
Tim WalkerandDiego Biurrun d4df02131b ac3dec: Remove write-only channel_layout field from AC3DecodeContext 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-22 23:27:34 +01:00
Tim WalkerandDiego Biurrun b532854622 ac3: implement request_channel_layout. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-22 23:27:33 +01:00
Tim WalkerandDiego Biurrun ffb0af7f17 ac3dec: simplify an expression 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-19 18:52:17 +01:00
Tim WalkerandDiego Biurrun 69d4dbfd1f aac_ac3_parser: simplify an expression 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-19 02:02:53 +01:00
Tim WalkerandDiego Biurrun 37a3cac78c dcadec: simplify an expression 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-19 02:02:49 +01:00
Tim WalkerandLuca Barbato 5f5ada3dbf shorten: Fix out-of-array read 
pred_order == FF_ARRAY_ELEMS(fixed_coeffs) is invalid too.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-10-10 17:52:14 +02:00
Tim WalkerandPaul B Mahol 08797c599d flac: don't check the number of channels before setting the channel layout 
This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels.
 2013-02-07 09:36:21 +00:00
Tim WalkerandAnton Khirnov 9d083d6417 flac: add channel layout masks for streams with 7 or 8 channels. 
They were added to the latest FLAC specification:
https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-02-06 21:44:06 +01:00
Tim WalkerandAnton Khirnov 41244e13d5 flac: don't check the number of channels before setting the channel layout. 
This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-02-06 21:43:05 +01:00
Tim WalkerandPaul B Mahol 7af876a93f flac: add channel layout masks for streams with 7 or 8 channels 
They were added to the latest FLAC specification:
https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2
 2013-02-06 12:53:15 +00:00
Tim WalkerandJustin Ruggles ed1b01131e mlp: implement support for AVCodecContext.request_channel_layout. 
Also wrap usage of AVCodecContext.request_channels in FF_API_REQUEST_CHANNELS directives.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2013-01-22 16:10:02 -05:00
Tim WalkerandJustin Ruggles b0c7e3ffd0 mlp_parser: account for AVCodecContext.request_channels when setting the channel layout. 
Allows users to configure the output based on what's actually decoded, rather than the full native layout.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2013-01-22 16:10:02 -05:00
Tim WalkerandJustin Ruggles 1fd2deedcc mlpdec: set the channel layout. 
Fixes bug 401.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

CC:libav-stable@libav.org
 2013-01-22 16:10:02 -05:00
Tim WalkerandJustin Ruggles 3ffcccb4fb mlpdec: TrueHD: use Libav channel order. 
Fixes bug 208.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

CC:libav-stable@libav.org
 2013-01-22 16:10:02 -05:00
Tim WalkerandJustin Ruggles 99ccd2ba10 mlp: store the channel layout for each substream. 
Also stop storing the channel arrangement in the header info, as it's unused outside of ff_mlp_read_major_sync.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

CC:libav-stable@libav.org
 2013-01-22 16:10:02 -05:00
Tim WalkerandJustin Ruggles 40cf1add12 mlp_parser: cosmetics: re-indent. 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2013-01-22 16:10:02 -05:00
Tim WalkerandJustin Ruggles b901c30da6 lavr/audio_mix_matrix: acknowledge the existence of LFE2. 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-09-12 18:26:53 -04:00
Tim WalkerandJustin Ruggles 3844572887 mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel. 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-09-12 18:26:53 -04:00
Tim WalkerandJustin Ruggles 8919fee7d2 lavu/audioconvert: add a second low frequency channel. 
Can be used by DTS-HD, TrueHD and E-AC-3, among others.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-09-12 18:26:53 -04:00
Tim WalkerandJustin Ruggles 0a9efe4c6e mlp_parser: fix the channel mask value used for the top surround channel 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-25 17:24:43 -05:00
Tim WalkerandJustin Ruggles 6bbaf6e0dd mlpdec_parser: fix a few channel layouts. 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-22 10:50:22 -05:00
Tim WalkerandJustin Ruggles 147715ca10 Add channel names to channel_names[] array for channels added in b2890f5 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-22 10:50:06 -05:00
Tim WandJustin Ruggles b38b6d56ca Add names for more channel layouts to the channel layout map. 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-21 16:10:05 -05:00