Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1303069

[PATCH 28/31] media: au0828 create link between ALSA Mixer and decoder

Show all headers | View raw

Change au0828_create_media_graph() to create pad link
between MEDIA_ENT_F_AUDIO_MIXER entity and decoder's
AU8522_PAD_AUDIO_OUT. With mixer entity now linked to
decoder, change to link MEDIA_ENT_F_AUDIO_CAPTURE to
mixer's source pad.

Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
---
 drivers/media/usb/au0828/au0828-core.c | 17 ++++++++++++++---
 drivers/media/usb/au0828/au0828.h      |  1 +
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c
index 722e073..886fb28 100644
--- a/drivers/media/usb/au0828/au0828-core.c
+++ b/drivers/media/usb/au0828/au0828-core.c
@@ -264,6 +264,7 @@ static int au0828_create_media_graph(struct au0828_dev *dev)
 	struct media_entity *entity;
 	struct media_entity *tuner = NULL, *decoder = NULL;
 	struct media_entity *audio_capture = NULL;
+	struct media_entity *mixer = NULL;
 	int i, ret;
 
 	if (!mdev)
@@ -284,6 +285,9 @@ static int au0828_create_media_graph(struct au0828_dev *dev)
 		case MEDIA_ENT_F_AUDIO_CAPTURE:
 			audio_capture = entity;
 			break;
+		case MEDIA_ENT_F_AUDIO_MIXER:
+			mixer = entity;
+			break;
 		}
 	}
 
@@ -356,14 +360,21 @@ static int au0828_create_media_graph(struct au0828_dev *dev)
 			}
 		}
 	}
-	if (audio_capture && !dev->audio_capture_linked) {
-		ret = media_create_pad_link(decoder, AU8522_PAD_AUDIO_OUT,
-					    audio_capture, 0,
+	if (mixer && audio_capture && !dev->audio_capture_linked) {
+		ret = media_create_pad_link(mixer, 1, audio_capture, 0,
 					    MEDIA_LNK_FL_ENABLED);
 		if (ret)
 			return ret;
 		dev->audio_capture_linked = 1;
 	}
+	if (mixer && !dev->mixer_linked) {
+		ret = media_create_pad_link(decoder, AU8522_PAD_AUDIO_OUT,
+					    mixer, 0,
+					    MEDIA_LNK_FL_ENABLED);
+		if (ret)
+			return ret;
+		dev->mixer_linked = 1;
+	}
 #endif
 	return 0;
 }
diff --git a/drivers/media/usb/au0828/au0828.h b/drivers/media/usb/au0828/au0828.h
index 3707664..b9aa74f 100644
--- a/drivers/media/usb/au0828/au0828.h
+++ b/drivers/media/usb/au0828/au0828.h
@@ -289,6 +289,7 @@ struct au0828_dev {
 	bool vdev_linked;
 	bool vbi_linked;
 	bool audio_capture_linked;
+	bool mixer_linked;
 	struct media_link *active_link;
 	struct media_entity *active_link_owner;
 #endif
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/31] Sharing media resources across ALSA and au0828 drivers  Shuah Khan <shuahkh@osg.samsung.com> - 2016-01-06 21:40 +0100
  [PATCH 05/31] media: Media Controller fix to not let stream_count go negative Shuah Khan <shuahkh@osg.samsung.com> - 2016-01-06 21:40 +0100
  [PATCH 01/31] uapi/media.h: Declare interface types for ALSA Shuah Khan <shuahkh@osg.samsung.com> - 2016-01-06 21:40 +0100
  [PATCH 30/31] sound/usb: Check media device unregister progress state Shuah Khan <shuahkh@osg.samsung.com> - 2016-01-06 22:00 +0100
  [PATCH 28/31] media: au0828 create link between ALSA Mixer and decoder Shuah Khan <shuahkh@osg.samsung.com> - 2016-01-06 22:00 +0100
  [PATCH 04/31] media: Media Controller enable/disable source handler API Shuah Khan <shuahkh@osg.samsung.com> - 2016-01-06 22:00 +0100
  [PATCH 31/31] media: au0828 change to check media device unregister progress state Shuah Khan <shuahkh@osg.samsung.com> - 2016-01-06 22:00 +0100
  [PATCH 11/31] media: au8522 change to create MC pad for ALSA Audio Out Shuah Khan <shuahkh@osg.samsung.com> - 2016-01-06 22:00 +0100
  [PATCH 29/31] media: track media device unregister in progress Shuah Khan <shuahkh@osg.samsung.com> - 2016-01-06 22:00 +0100
  [PATCH 25/31] media: au0828 fix to not call media_device_unregister_entity_notify() Shuah Khan <shuahkh@osg.samsung.com> - 2016-01-06 22:10 +0100
  [PATCH 26/31] sound/usb: Update ALSA driver to use Managed Media Controller API Shuah Khan <shuahkh@osg.samsung.com> - 2016-01-06 22:10 +0100
    Re: [PATCH 26/31] sound/usb: Update ALSA driver to use Managed Media Controller API Takashi Iwai <tiwai@suse.de> - 2016-01-07 16:50 +0100
      Re: [PATCH 26/31] sound/usb: Update ALSA driver to use Managed Media  Controller API Shuah Khan <shuahkh@osg.samsung.com> - 2016-01-07 21:30 +0100
  [PATCH 27/31] sound/usb: Create media mixer function and control interface entities Shuah Khan <shuahkh@osg.samsung.com> - 2016-01-06 22:10 +0100

csiph-web