On 01/28/2016 09:58 AM, Mauro Carvalho Chehab wrote:
> Em Wed, 6 Jan 2016 13:27:17 -0700
> Shuah Khan <shuahkh@xxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxx>
>> ---
>> 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@xxxxxxxxxxxxxxx | (970) 217-8978
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
