compress: Allow client to pass "don't care" for fragment size/number

Client cannot know what is a sensible fragment size and count
for the device unless it has prior knowledge of the precise
hardware. To allow for generic clients not hardcoded for particular
hardware, this change allows fragment_size and fragments to be
passed as 0, meaning "don't care" and tinycompress will choose
default values read from the driver.

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/compress.c b/compress.c
index 92d1a80a62d0ffec506aa0cff50e0e5beaf805a3..7174041aab5c1d9ad0f768fe9ecfeb281a41802c 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -123,19 +123,14 @@ int is_compress_ready(struct compress *compress)
        return (compress->fd > 0) ? 1 : 0;
 }
 
-static bool _is_codec_supported(struct compress *compress, struct compr_config *config)
+static bool _is_codec_supported(struct compress *compress, struct compr_config *config,
+                               const struct snd_compr_caps *caps)
 {
-       struct snd_compr_caps caps;
        bool codec = false;
        unsigned int i;
 
-       if (ioctl(compress->fd, SNDRV_COMPRESS_GET_CAPS, &caps)) {
-               oops(compress, errno, "cannot get device caps");
-               return false;
-       }
-
-       for (i = 0; i < caps.num_codecs; i++) {
-               if (caps.codecs[i] == config->codec->id) {
+       for (i = 0; i < caps->num_codecs; i++) {
+               if (caps->codecs[i] == config->codec->id) {
                        /* found the codec */
                        codec = true;
                        break;
@@ -146,24 +141,24 @@ static bool _is_codec_supported(struct compress *compress, struct compr_config *
                return false;
        }
 
-       if (config->fragment_size < caps.min_fragment_size) {
+       if (config->fragment_size < caps->min_fragment_size) {
                oops(compress, -EINVAL, "requested fragment size %d is below min supported %d",
-                               config->fragment_size, caps.min_fragment_size);
+                       config->fragment_size, caps->min_fragment_size);
                return false;
        }
-       if (config->fragment_size > caps.max_fragment_size) {
+       if (config->fragment_size > caps->max_fragment_size) {
                oops(compress, -EINVAL, "requested fragment size %d is above max supported %d",
-                               config->fragment_size, caps.max_fragment_size);
+                       config->fragment_size, caps->max_fragment_size);
                return false;
        }
-       if (config->fragments < caps.min_fragments) {
+       if (config->fragments < caps->min_fragments) {
                oops(compress, -EINVAL, "requested fragments %d are below min supported %d",
-                               config->fragments, caps.min_fragments);
+                       config->fragments, caps->min_fragments);
                return false;
        }
-       if (config->fragments > caps.max_fragments) {
+       if (config->fragments > caps->max_fragments) {
                oops(compress, -EINVAL, "requested fragments %d are above max supported %d",
-                               config->fragments, caps.max_fragments);
+                       config->fragments, caps->max_fragments);
                return false;
        }
 
@@ -206,6 +201,7 @@ struct compress *compress_open(unsigned int card, unsigned int device,
 {
        struct compress *compress;
        struct snd_compr_params params;
+       struct snd_compr_caps caps;
        char fn[256];
 
        compress = calloc(1, sizeof(struct compress));
@@ -239,12 +235,24 @@ struct compress *compress_open(unsigned int card, unsigned int device,
                oops(&bad_compress, errno, "cannot open device '%s'", fn);
                goto config_fail;
        }
+
+       if (ioctl(compress->fd, SNDRV_COMPRESS_GET_CAPS, &caps)) {
+               oops(compress, errno, "cannot get device caps");
+               goto codec_fail;
+       }
+
+       /* If caller passed "don't care" fill in default values */
+       if ((config->fragment_size == 0) || (config->fragments == 0)) {
+               config->fragment_size = caps.min_fragment_size;
+               config->fragments = caps.max_fragments;
+       }
+
 #if 0
        /* FIXME need to turn this On when DSP supports
         * and treat in no support case
         */
-       if (_is_codec_supported(compress, config) == false) {
-               oops(&bad_compress, errno, "codec not supported");
+       if (_is_codec_supported(compress, config, &caps) == false) {
+               oops(compress, errno, "codec not supported\n");
                goto codec_fail;
        }
 #endif

diff --git a/include/tinycompress/tinycompress.h b/include/tinycompress/tinycompress.h
index 982ff6b701bbbdeb694137593e2a803ec98126fe..7907c72584dde6dcb1e48be097de70a07dbca248 100644 (file)
--- a/include/tinycompress/tinycompress.h
+++ b/include/tinycompress/tinycompress.h
@@ -58,6 +58,8 @@ extern "C" {
 #endif
 /*
  * struct compr_config: config structure, needs to be filled by app
+ * If fragment_size or fragments are zero, this means "don't care"
+ * and tinycompress will choose values that the driver supports
  *
  * @fragment_size: size of fragment requested, in bytes
  * @fragments: number of fragments
@@ -78,11 +80,14 @@ struct snd_compr_tstamp;
 /*
  * compress_open: open a new compress stream
  * returns the valid struct compress on success, NULL on failure
+ * If config does not specify a requested fragment size, on return
+ * it will be updated with the size and number of fragments that
+ * were configured
  *
  * @card: sound card number
  * @device: device number
  * @flags: device flags can be COMPRESS_OUT or COMPRESS_IN
- * @config: stream config requested
+ * @config: stream config requested. Returns actual fragment config
  */
 struct compress *compress_open(unsigned int card, unsigned int device,
                unsigned int flags, struct compr_config *config);