Merge pull request #35 from zhigang-wu/topic/capture-resume-failure

capture pause/release failure when play/capture work at same time

Author: lgirdwood

src/audio/dai.c

@@ -559,6 +559,17 @@ static int dai_comp_trigger(struct comp_dev *dev, int cmd)
 		platform_dai_wallclock(dev, &dd->wallclock);
 		break;
 	case COMP_TRIGGER_RELEASE:
+		/* before release, we clear the buffer data to 0s,
+		 * then there is no history data sent out after release.
+		 * this is only supported at capture mode.
+		 */
+		if (dev->params.direction == SOF_IPC_STREAM_CAPTURE) {
+			struct comp_buffer *dma_buffer =
+			list_first_item(&dev->bsink_list,
+					struct comp_buffer, source_list);
+			buffer_zero(dma_buffer);
+		}
+
 		/* only start the DAI if we are not XRUN handling */
 		if (dd->xrun == 0) {
 			/* recover the dma status */

src/audio/pipeline.c

@@ -206,7 +206,6 @@ static void pipeline_trigger_sched_comp(struct pipeline *p,
 		pipeline_schedule_cancel(p);
 		break;
 	case COMP_TRIGGER_START:
-	case COMP_TRIGGER_RELEASE:
 		p->xrun_bytes = 0;
 
 		/* playback pipelines need scheduled now, capture pipelines are
@@ -223,6 +222,22 @@ static void pipeline_trigger_sched_comp(struct pipeline *p,
 			}
 		}
 		break;
+	case COMP_TRIGGER_RELEASE:
+		p->xrun_bytes = 0;
+
+		/* in resume process, capture must be
+		 * scheduled to to avoid the xrun in DAI component
+		 */
+		if (p->ipc_pipe.timer) {
+			/* timer - schedule initial copy */
+			pipeline_schedule_copy(p, 0);
+		} else {
+			/* DAI - schedule initial
+			 * pipeline fill when next idle
+			 */
+			pipeline_schedule_copy_idle(p);
+		}
+		break;
 	case COMP_TRIGGER_SUSPEND:
 	case COMP_TRIGGER_RESUME:
 	case COMP_TRIGGER_XRUN:

src/include/sof/audio/buffer.h

@@ -139,4 +139,11 @@ static inline int buffer_set_size(struct comp_buffer *buffer, uint32_t size)
 	return 0;
 }
 
+static inline void buffer_zero(struct comp_buffer *buffer)
+{
+	tracev_buffer("BZr");
+
+	bzero(buffer->addr, buffer->size);
+}
+
 #endif