summaryrefslogtreecommitdiff
path: root/cras/src/server/cras_rstream.c
diff options
context:
space:
mode:
Diffstat (limited to 'cras/src/server/cras_rstream.c')
-rw-r--r--cras/src/server/cras_rstream.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/cras/src/server/cras_rstream.c b/cras/src/server/cras_rstream.c
index 94adcead..b5a64901 100644
--- a/cras/src/server/cras_rstream.c
+++ b/cras/src/server/cras_rstream.c
@@ -292,7 +292,6 @@ int cras_rstream_create(struct cras_rstream_config *config,
stream->num_missed_cb = 0;
stream->is_pinned = (config->dev_idx != NO_DEVICE);
stream->pinned_dev_idx = config->dev_idx;
- ewma_power_init(&stream->ewma, stream->format.frame_rate);
rc = setup_shm_area(stream, config);
if (rc < 0) {
@@ -313,7 +312,7 @@ int cras_rstream_create(struct cras_rstream_config *config,
config->stream_id, config->buffer_frames, config->cb_threshold);
*stream_out = stream;
- cras_system_state_stream_added(stream->direction, stream->client_type);
+ cras_system_state_stream_added(stream->direction);
clock_gettime(CLOCK_MONOTONIC_RAW, &stream->start_ts);
@@ -325,8 +324,7 @@ int cras_rstream_create(struct cras_rstream_config *config,
void cras_rstream_destroy(struct cras_rstream *stream)
{
cras_server_metrics_stream_destroy(stream);
- cras_system_state_stream_removed(stream->direction,
- stream->client_type);
+ cras_system_state_stream_removed(stream->direction);
close(stream->fd);
cras_audio_shm_destroy(stream->shm);
cras_audio_area_destroy(stream->audio_area);
@@ -474,16 +472,9 @@ void cras_rstream_update_input_write_pointer(struct cras_rstream *rstream)
void cras_rstream_update_output_read_pointer(struct cras_rstream *rstream)
{
- size_t nfr = 0;
- uint8_t *src;
unsigned int nwritten =
buffer_share_get_new_write_point(rstream->buf_state);
- /* Retrieve the read pointer |src| start from which to calculate
- * the EWMA power. */
- src = cras_shm_get_readable_frames(rstream->shm, 0, &nfr);
- ewma_power_calculate(&rstream->ewma, (int16_t *)src,
- rstream->format.num_channels, nwritten);
cras_shm_buffer_read(rstream->shm, nwritten);
}