[FFmpeg-devel,v2,3/3] avcodec/aacdec: Translate PCE to avutil channel layouts

Submitted by Michael Niedermayer on Oct. 22, 2018, 9:46 p.m.

Details

Message ID 20181022214639.GN3743@michaelspb
State New
Headers show

Commit Message

Michael Niedermayer Oct. 22, 2018, 9:46 p.m.
On Mon, Oct 22, 2018 at 01:47:47AM +0200, pkv.stream wrote:
> (commit message changed to include number of trac tricket solved)
> 
> For context , search for the discussion: aacenc: remove unsupported PCE
> mappings
> 
> Additional details:
> 
> the aac decoder decodes PCE correctly but since avutil channel layouts are
> obviously not part of the spec there is no pre-defined one to one
> correspondance between ffmpeg channel layouts and any PCE.
> 
> At the moment the decoder makes educated guesses for translating PCE to
> avutil layouts.
> 
> In the case of PCE written by the native aac encoder, there exists a
> correspondence though of avutil channel layouts to PCE.
> 
> The patch adds that table to the decoder; for PCE which are not in the
> table, the patch adds an algo to assign a ffmpeg layout.
> 
> The patch was tested extensively for all channel layouts in PCE table which
> include all the channel layouts in channel-layout.h (ln 85 - 111),

breaks fate
TEST    audiomatch-afconvert-44100-stereo-he2-m4a
Test audiomatch-afconvert-44100-stereo-he2-m4a failed. Look at tests/data/fate/audiomatch-afconvert-44100-stereo-he2-m4a.err for details.
make: *** [fate-audiomatch-afconvert-44100-stereo-he2-m4a] Error 1

[...]

Patch hide | download patch | download mbox

--- ./tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a	2018-10-21 02:32:29.141768581 +0200
+++ tests/data/fate/audiomatch-afconvert-44100-stereo-he2-m4a	2018-10-22 23:45:49.033198329 +0200
@@ -1 +1 @@ 
-presig: 1924 postsig:1644 c: 0.9909 lenerr:3568
+presig: 4151 postsig:-583 c:-0.3995 lenerr:3568