From 24accefdba9b12f878b5a98430a15028344b17ad Mon Sep 17 00:00:00 2001 From: Vinod Koul Date: Fri, 29 Mar 2013 23:41:42 +0530 Subject: [PATCH] --- yaml --- r: 371867 b: refs/heads/master c: 0cd5751ab360573f607d1cbf97aa072667f888c8 h: refs/heads/master i: 371865: 4a4669c7dbccc8c04b0cc1564dd460a580447166 371863: 52a2eaed67adf0993f07bbbb63d294cc1b508d27 v: v3 --- [refs] | 2 +- trunk/sound/soc/mid-x86/sst_platform.c | 12 +++++++++++- trunk/sound/soc/mid-x86/sst_platform.h | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9655b845e12b..a4beea33aeed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36953d98149674d218420e29f3ea2af827a68e74 +refs/heads/master: 0cd5751ab360573f607d1cbf97aa072667f888c8 diff --git a/trunk/sound/soc/mid-x86/sst_platform.c b/trunk/sound/soc/mid-x86/sst_platform.c index a263cbed8624..968656ceb39e 100644 --- a/trunk/sound/soc/mid-x86/sst_platform.c +++ b/trunk/sound/soc/mid-x86/sst_platform.c @@ -1,7 +1,7 @@ /* * sst_platform.c - Intel MID Platform driver * - * Copyright (C) 2010-2012 Intel Corp + * Copyright (C) 2010-2013 Intel Corp * Author: Vinod Koul * Author: Harsha Priya * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -652,11 +652,21 @@ static int sst_platform_compr_get_codec_caps(struct snd_compr_stream *cstream, return stream->compr_ops->get_codec_caps(codec); } +static int sst_platform_compr_set_metadata(struct snd_compr_stream *cstream, + struct snd_compr_metadata *metadata) +{ + struct sst_runtime_stream *stream = + cstream->runtime->private_data; + + return stream->compr_ops->set_metadata(stream->id, metadata); +} + static struct snd_compr_ops sst_platform_compr_ops = { .open = sst_platform_compr_open, .free = sst_platform_compr_free, .set_params = sst_platform_compr_set_params, + .set_metadata = sst_platform_compr_set_metadata, .trigger = sst_platform_compr_trigger, .pointer = sst_platform_compr_pointer, .ack = sst_platform_compr_ack, diff --git a/trunk/sound/soc/mid-x86/sst_platform.h b/trunk/sound/soc/mid-x86/sst_platform.h index d61c5d514ffa..cacc9066ec52 100644 --- a/trunk/sound/soc/mid-x86/sst_platform.h +++ b/trunk/sound/soc/mid-x86/sst_platform.h @@ -124,6 +124,8 @@ struct compress_sst_ops { int (*close) (unsigned int str_id); int (*get_caps) (struct snd_compr_caps *caps); int (*get_codec_caps) (struct snd_compr_codec_caps *codec); + int (*set_metadata) (unsigned int str_id, + struct snd_compr_metadata *mdata); };