From cb0b0d99a4ab04905f59ec1a9fcbf90635105d11 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Sat, 3 Nov 2012 14:06:53 +0100
Subject: ad_lavc: use fmt-conversion to map sample formats

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6cd62d1bf3..978332852f 100644
--- a/Makefile
+++ b/Makefile
@@ -122,6 +122,7 @@ ifeq ($(HAVE_AVUTIL_REFCOUNTING),no)
 endif
 
 SOURCES = talloc.c \
+          audio/fmt-conversion.c \
           audio/format.c \
           audio/mixer.c \
           audio/reorder_ch.c \
-- 
cgit v1.2.3


From 0042735d7aefb2f05a79ba2eae741a63f22ea0c9 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 5 Apr 2013 15:25:09 +0200
Subject: audio: add channel map API

Unused, will be used in the following commits.

Let chmap.h define the number of maximum channels, because that is most
convenient.
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 978332852f..566768db60 100644
--- a/Makefile
+++ b/Makefile
@@ -122,6 +122,7 @@ ifeq ($(HAVE_AVUTIL_REFCOUNTING),no)
 endif
 
 SOURCES = talloc.c \
+          audio/chmap.c \
           audio/fmt-conversion.c \
           audio/format.c \
           audio/mixer.c \
-- 
cgit v1.2.3


From f7a427676c0fe3c12509e3d9a243301f93626b0a Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 5 Apr 2013 19:47:51 +0200
Subject: audio: add some setters for mp_audio, and require filters to use them

mp_audio has some redundant fields. Setters like mp_audio_set_format()
initialize these properly.

Also move the mp_audio struct to a the file audio.c.

We can remove a mysterious line of code from af.c:

    in.format |= af_bits2fmt(in.bps * 8);

I'm not sure if this was ever actually needed, or if it was some kind of
"make it work" quick-fix that works against the way things were supposed
to work. All filters etc. now set the format correctly, so if there ever
was a need for this code, it's definitely gone.
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 566768db60..c7dbe2b113 100644
--- a/Makefile
+++ b/Makefile
@@ -122,6 +122,7 @@ ifeq ($(HAVE_AVUTIL_REFCOUNTING),no)
 endif
 
 SOURCES = talloc.c \
+          audio/audio.c \
           audio/chmap.c \
           audio/fmt-conversion.c \
           audio/format.c \
-- 
cgit v1.2.3


From d9582ad0a41ed5452ad29bf8511e8c6a3bdbe6f8 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 9 May 2013 12:09:23 +0200
Subject: audio/filters: add af_force

Its main purpose is for testing in case channel layout stuff breaks, in
particular in connection with old audio filters.
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c7dbe2b113..160d180188 100644
--- a/Makefile
+++ b/Makefile
@@ -139,6 +139,7 @@ SOURCES = talloc.c \
           audio/filter/af_dummy.c \
           audio/filter/af_equalizer.c \
           audio/filter/af_extrastereo.c \
+          audio/filter/af_force.c \
           audio/filter/af_format.c \
           audio/filter/af_hrtf.c \
           audio/filter/af_karaoke.c \
-- 
cgit v1.2.3


From ab8f28a672fbd8d21a98c265976068e80be082a7 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 9 May 2013 15:12:16 +0200
Subject: audio: add channel map selection function

The point is selecting a minimal fallback. The AOs will call this
through the AO API, so it will be possible to add options affecting
the general channel layout selection.

It provides the following mechanism to AOs:
- forcing the correct channel order
- downmixing to stereo if no layout is available
- allow 5.1 <-> 5.1(side) fallback
- handling "unknown" channel layouts

This is quite weak and lots of code/complexity for little gain. All AOs
already made sure the channel order was correct, and the fallback is of
little value, and could perhaps be done in the frontend instead, like
stereo downmixing with --channels=2 is handled. But I'm not really sure
how this stuff should _really_ work, and the new code will hopefully
provides enough flexibility to make radical changes to channel layout
negotiation easier.
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 160d180188..34d79d638b 100644
--- a/Makefile
+++ b/Makefile
@@ -124,6 +124,7 @@ endif
 SOURCES = talloc.c \
           audio/audio.c \
           audio/chmap.c \
+          audio/chmap_sel.c \
           audio/fmt-conversion.c \
           audio/format.c \
           audio/mixer.c \
-- 
cgit v1.2.3