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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <56AA7768.2000109@osg.samsung.com>
Date:	Thu, 28 Jan 2016 13:17:44 -0700
From:	Shuah Khan <shuahkh@....samsung.com>
To:	Mauro Carvalho Chehab <mchehab@....samsung.com>
Cc:	tiwai@...e.com, clemens@...isch.de, hans.verkuil@...co.com,
	laurent.pinchart@...asonboard.com, sakari.ailus@...ux.intel.com,
	javier@....samsung.com, pawel@...iak.com, m.szyprowski@...sung.com,
	kyungmin.park@...sung.com, perex@...ex.cz, arnd@...db.de,
	dan.carpenter@...cle.com, tvboxspy@...il.com, crope@....fi,
	ruchandani.tina@...il.com, corbet@....net, chehabrafael@...il.com,
	k.kozlowski@...sung.com, stefanr@...6.in-berlin.de,
	inki.dae@...sung.com, jh1009.sung@...sung.com,
	elfring@...rs.sourceforge.net, prabhakar.csengg@...il.com,
	sw0312.kim@...sung.com, p.zabel@...gutronix.de,
	ricardo.ribalda@...il.com, labbott@...oraproject.org,
	pierre-louis.bossart@...ux.intel.com, ricard.wanderlof@...s.com,
	julian@...st.de, takamichiho@...il.com, dominic.sacre@....de,
	misterpib@...il.com, daniel@...que.org, gtmkramer@...all.nl,
	normalperson@...t.net, joe@...po.co.uk, linuxbugs@...tgam.net,
	johan@...ud.se, linux-kernel@...r.kernel.org,
	linux-media@...r.kernel.org, linux-api@...r.kernel.org,
	alsa-devel@...a-project.org, Shuah Khan <shuahkh@....samsung.com>
Subject: Re: [PATCH 28/31] media: au0828 create link between ALSA Mixer and
 decoder

On 01/28/2016 09:58 AM, Mauro Carvalho Chehab wrote:
> Em Wed,  6 Jan 2016 13:27:17 -0700
> Shuah Khan <shuahkh@....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@....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@....samsung.com | (970) 217-8978