Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 06:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Windows) Fixed some MinGW and MSVC compiler errors and warnings for VideoFFmpegComponent.

Browse source
This commit is contained in:
Leon Styhre 2021-05-13 11:05:23 +02:00
parent 0b14a463c3
commit 4a42f929b3
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
es-core/src/components/VideoFFmpegComponent.cpp
View file

@ -311,8 +311,8 @@ void VideoFFmpegComponent::readFrames()
// want to resample twice. And for some files there may not be any // want to resample twice. And for some files there may not be any
// resampling needed at all if the format is the same as the output // resampling needed at all if the format is the same as the output
// format for the application. // format for the application.
int outNumSamples = av_rescale_rnd(mAudioFrame->nb_samples, int outNumSamples = static_cast<int>(av_rescale_rnd(mAudioFrame->nb_samples,
outSampleRate, mAudioCodecContext->sample_rate, AV_ROUND_UP); outSampleRate, mAudioCodecContext->sample_rate, AV_ROUND_UP));
resampleContext = swr_alloc(); resampleContext = swr_alloc();
if (!resampleContext) { if (!resampleContext) {
@ -351,8 +351,9 @@ void VideoFFmpegComponent::readFrames()
"initialize the resampling context"; "initialize the resampling context";
} }
outMaxNumSamples = outNumSamples = av_rescale_rnd(inNumSamples, outMaxNumSamples = outNumSamples =
outSampleRate, mAudioCodecContext->sample_rate, AV_ROUND_UP); static_cast<int>(av_rescale_rnd(inNumSamples, outSampleRate,
mAudioCodecContext->sample_rate, AV_ROUND_UP));
outNumChannels = av_get_channel_layout_nb_channels(outChannelLayout); outNumChannels = av_get_channel_layout_nb_channels(outChannelLayout);
@ -364,9 +365,9 @@ void VideoFFmpegComponent::readFrames()
outSampleFormat, outSampleFormat,
1); 1);
outNumSamples = av_rescale_rnd(swr_get_delay(resampleContext, outNumSamples = static_cast<int>(av_rescale_rnd(swr_get_delay(
mAudioCodecContext->sample_rate) + inNumSamples, resampleContext, mAudioCodecContext->sample_rate) + inNumSamples,
outSampleRate, mAudioCodecContext->sample_rate, AV_ROUND_UP); outSampleRate, mAudioCodecContext->sample_rate, AV_ROUND_UP));
if (outNumSamples > outMaxNumSamples) { if (outNumSamples > outMaxNumSamples) {
av_freep(&convertedData[0]); av_freep(&convertedData[0]);
@ -581,10 +582,6 @@ void VideoFFmpegComponent::startVideo()
std::queue<VideoFrame>().swap(mVideoFrameQueue); std::queue<VideoFrame>().swap(mVideoFrameQueue);
std::queue<AudioFrame>().swap(mAudioFrameQueue); std::queue<AudioFrame>().swap(mAudioFrameQueue);
#if defined(_WIN64)
mVideoPath = path(Utils::String::replace(mVideoPath, "/", "\\"));
#endif
std::string filePath = "file:" + mVideoPath; std::string filePath = "file:" + mVideoPath;
// This will disable the FFmpeg logging, so comment this out if debug info is needed. // This will disable the FFmpeg logging, so comment this out if debug info is needed.
@ -622,7 +619,7 @@ void VideoFFmpegComponent::startVideo()
mVideoWidth = mFormatContext->streams[mVideoStreamIndex]->codecpar->width; mVideoWidth = mFormatContext->streams[mVideoStreamIndex]->codecpar->width;
mVideoHeight = mFormatContext->streams[mVideoStreamIndex]->codecpar->height; mVideoHeight = mFormatContext->streams[mVideoStreamIndex]->codecpar->height;
mVideoCodec = avcodec_find_decoder(mVideoStream->codecpar->codec_id); mVideoCodec = const_cast<AVCodec*>(avcodec_find_decoder(mVideoStream->codecpar->codec_id));
if (!mVideoCodec) { if (!mVideoCodec) {
LOG(LogError) << "VideoFFmpegComponent::startVideo(): Couldn't find a suitable video " LOG(LogError) << "VideoFFmpegComponent::startVideo(): Couldn't find a suitable video "
@ -665,7 +662,8 @@ void VideoFFmpegComponent::startVideo()
if (mAudioStreamIndex >= 0) { if (mAudioStreamIndex >= 0) {
mAudioStream = mFormatContext->streams[mAudioStreamIndex]; mAudioStream = mFormatContext->streams[mAudioStreamIndex];
mAudioCodec = avcodec_find_decoder(mAudioStream->codecpar->codec_id); mAudioCodec = const_cast<AVCodec*>(
avcodec_find_decoder(mAudioStream->codecpar->codec_id));
if (!mAudioCodec) { if (!mAudioCodec) {
LOG(LogError) << "Couldn't find a suitable audio codec for file \"" << LOG(LogError) << "Couldn't find a suitable audio codec for file \"" <<