Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1320867 > unrolled thread
| Started by | Mauro Carvalho Chehab <mchehab@osg.samsung.com> |
|---|---|
| First post | 2016-01-28 18:00 +0100 |
| Last post | 2016-01-28 21:20 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
Re: [PATCH 28/31] media: au0828 create link between ALSA Mixer and decoder Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2016-01-28 18:00 +0100
Re: [PATCH 28/31] media: au0828 create link between ALSA Mixer and decoder Shuah Khan <shuahkh@osg.samsung.com> - 2016-01-28 21:20 +0100
| From | Mauro Carvalho Chehab <mchehab@osg.samsung.com> |
|---|---|
| Date | 2016-01-28 18:00 +0100 |
| Subject | Re: [PATCH 28/31] media: au0828 create link between ALSA Mixer and decoder |
| Message-ID | <qVY5l-6dI-23@gated-at.bofh.it> |
Em Wed, 6 Jan 2016 13:27:17 -0700
Shuah Khan <shuahkh@osg.samsung.com> escreveu:
> 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.
See my comments about doing only this asynchronously on the previous
patches.
Regards,
Mauro
>
> 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
[toc] | [next] | [standalone]
| From | Shuah Khan <shuahkh@osg.samsung.com> |
|---|---|
| Date | 2016-01-28 21:20 +0100 |
| Message-ID | <qW1cS-dG-7@gated-at.bofh.it> |
| In reply to | #1320867 |
On 01/28/2016 09:58 AM, Mauro Carvalho Chehab wrote:
> Em Wed, 6 Jan 2016 13:27:17 -0700
> Shuah Khan <shuahkh@osg.samsung.com> escreveu:
>
>> 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.
>
> See my comments about doing only this asynchronously on the previous
> patches.
>
Yes. I responded to that one. I might collapse both ALSA
patch that adds capture and mixer into one. Might make
it lot easier and handle them at the same time.
thanks,
-- Shuah
>
>>
>> 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
--
Shuah Khan
Sr. Linux Kernel Developer
Open Source Innovation Group
Samsung Research America (Silicon Valley)
shuahkh@osg.samsung.com | (970) 217-8978
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web