Merge commit '98b37fea' into staged

This commit is contained in:
Xiao YiFang 2022-11-05 10:00:44 +08:00
commit cbf62a4dbe

View file

@ -240,7 +240,7 @@ bool DecoderContext::openCodec( QString & errorString )
return false; return false;
} }
av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name, gdDebug( "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) ); codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
if ( codecContext_->sample_fmt == AV_SAMPLE_FMT_S32 || if ( codecContext_->sample_fmt == AV_SAMPLE_FMT_S32 ||
@ -341,7 +341,7 @@ bool DecoderContext::openOutputDevice( QString & errorString )
return false; return false;
} }
av_log( NULL, AV_LOG_INFO, "ao_open_live(): %s: channels: %d, rate: %d, bits: %d\n", gdDebug( "ao_open_live(): %s: channels: %d, rate: %d, bits: %d\n",
aoDrvInfo->name, aoSampleFormat.channels, aoSampleFormat.rate, aoSampleFormat.bits ); aoDrvInfo->name, aoSampleFormat.channels, aoSampleFormat.rate, aoSampleFormat.bits );
aoDevice_ = ao_open_live( aoDriverId, &aoSampleFormat, NULL ); aoDevice_ = ao_open_live( aoDriverId, &aoSampleFormat, NULL );