MT#55283 fix rebase fail

Change-Id: I89baa84ea7c0fc990a1131aa88aa532dbd2d467a
(cherry picked from commit cad798ce75)
mr14.1
Richard Fuchs 21 hours ago
parent 5f2acbb093
commit d0dbd31fee

@ -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");

@ -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);

Loading…
Cancel
Save