From d0dbd31fee67b182d38312e64a32f5afa0524b9a Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Wed, 29 Apr 2026 12:29:00 -0400 Subject: [PATCH] MT#55283 fix rebase fail Change-Id: I89baa84ea7c0fc990a1131aa88aa532dbd2d467a (cherry picked from commit cad798ce75fa60bc1bb80a71d479f33ef0a99d1e) --- daemon/media_player.c | 2 -- lib/resample.c | 1 - 2 files changed, 3 deletions(-) diff --git a/daemon/media_player.c b/daemon/media_player.c index ef176bab8..7b023f26c 100644 --- a/daemon/media_player.c +++ b/daemon/media_player.c @@ -1037,7 +1037,6 @@ static int __ensure_codec_handler(struct media_player *mp, const rtp_payload_typ src_pt.encoding = src_pt.codec_def->rtpname_str; src_pt.channels = GET_CHANNELS(mp->coder.avstream->CODECPAR); src_pt.clock_rate = mp->coder.avstream->CODECPAR->sample_rate; - ilog(LOG_ERR, "XXXXXXXXXXXXXXXXXXXXXX %d %d", src_pt.channels, src_pt.clock_rate); codec_init_payload_type(&src_pt, MT_AUDIO); if (__media_player_setup_internal(mp, &src_pt, dst_pt, codec_set)) @@ -1231,7 +1230,6 @@ static bool media_player_play_start(struct media_player *mp, const rtp_payload_t if (!mp->coder.fmtctx->streams || !mp->coder.fmtctx->streams[0]) avformat_find_stream_info(mp->coder.fmtctx, NULL); - ilog(LOG_ERR, "XXXXXXXXXXXXXXXX %d %d", __LINE__, mp->coder.fmtctx->nb_streams); mp->coder.avstream = mp->coder.fmtctx->streams[0]; if (!mp->coder.avstream) { ilog(LOG_ERR, "No AVStream present in format context"); diff --git a/lib/resample.c b/lib/resample.c index c00ef9375..16f07378c 100644 --- a/lib/resample.c +++ b/lib/resample.c @@ -20,7 +20,6 @@ AVFrame *resample_frame(resample_t *resample, AVFrame *frame, const format_t *to const char *err; int errcode = 0; - ilog(LOG_ERR, "XXXXXXXXXXXXXX %d > %d", frame->sample_rate, to_format->clockrate); CH_LAYOUT_T to_channel_layout; DEF_CH_LAYOUT(&to_channel_layout, to_format->channels); fix_frame_channel_layout(frame);