diff options
| author | Lucas Wei <lucaswei@google.com> | 2022-10-21 08:51:43 +0800 |
|---|---|---|
| committer | Lucas Wei <lucaswei@google.com> | 2022-10-21 08:52:15 +0800 |
| commit | 999b2f0fc342b5991fee6751766a50fd644355e6 (patch) | |
| tree | 7b33491fff9b06156a0102d1633946ea91fe9b4a | |
| parent | 81bc53c159c93f18fcc601a7217eb0f2c6b207dc (diff) | |
| parent | 2ea9e336d04fb34f9779bf84a3cb0b44bff88658 (diff) | |
| download | aoc-999b2f0fc342b5991fee6751766a50fd644355e6.tar.gz | |
Merge android13-gs-pixel-5.10-gs101-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr2
Conflicts:
alsa/aoc_alsa_compr.c
alsa/aoc_alsa_ctl.c
alsa/aoc_alsa_hw.c
alsa/aoc_alsa_path.c
alsa/google-aoc-enum.h
aoc-interface.h
aoc.c
aoc_ramdump_regions.h
Bug: 238399460
Change-Id: I0d65cbead4ab8ebc3ad36a61585d618ccee77052
Signed-off-by: Lucas Wei <lucaswei@google.com>
| -rw-r--r-- | alsa/aoc_alsa_compr.c | 2 | ||||
| -rwxr-xr-x | alsa/aoc_alsa_hw.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/alsa/aoc_alsa_compr.c b/alsa/aoc_alsa_compr.c index a66fb1e..864eba9 100644 --- a/alsa/aoc_alsa_compr.c +++ b/alsa/aoc_alsa_compr.c @@ -76,7 +76,7 @@ static void aoc_compr_reset_pointer(struct aoc_alsa_stream *alsa_stream) alsa_stream->n_overflow = 0; cstream->runtime->total_bytes_available = 0; - pr_debug("%s hw_ptr_base =%lu compr_pcm_io_sample_base = %llu\n", + pr_debug("%s hw_ptr_base = %lu compr_pcm_io_sample_base = %llu\n", __func__, alsa_stream->hw_ptr_base, alsa_stream->compr_pcm_io_sample_base); } diff --git a/alsa/aoc_alsa_hw.c b/alsa/aoc_alsa_hw.c index ed0e20b..712bd5c 100755 --- a/alsa/aoc_alsa_hw.c +++ b/alsa/aoc_alsa_hw.c @@ -3460,7 +3460,7 @@ int aoc_compr_offload_send_metadata(struct aoc_alsa_stream *alsa_stream) cmd.curr_track_padding_frames = alsa_stream->compr_padding; cmd.curr_track_delay_frames = alsa_stream->compr_delay; - pr_info("send metadata, padding %d , delay %d\n", cmd.curr_track_padding_frames, + pr_info("send metadata, padding %d, delay %d\n", cmd.curr_track_padding_frames, cmd.curr_track_delay_frames); err = aoc_audio_control(CMD_OUTPUT_CHANNEL, (uint8_t *)&cmd, sizeof(cmd), NULL, |