diff --git a/src/AudioFrame.cpp b/src/AudioFrame.cpp index 18e108ee..0dbde45e 100644 --- a/src/AudioFrame.cpp +++ b/src/AudioFrame.cpp @@ -48,7 +48,7 @@ public: conv->setInAudioFormat(format); conv->setOutAudioFormat(other); conv->setInSampesPerChannel(samples_per_ch); //TODO - if (!conv->convert((const quint8**)planes.data())) { + if (!conv->convert((const quint8**)planes.constData())) { format = AudioFormat(); //invalid format return false; } @@ -119,7 +119,7 @@ AudioFrame AudioFrame::clone() const for (int i = 0; i < nb_planes; ++i) { dst[i] = f.bits(i); } - av_samples_copy(dst.data(), d->planes.data(), 0, 0, samplesPerChannel(), d->format.channels(), (AVSampleFormat)d->format.sampleFormatFFmpeg()); + av_samples_copy(dst.data(), d->planes.constData(), 0, 0, samplesPerChannel(), d->format.channels(), (AVSampleFormat)d->format.sampleFormatFFmpeg()); return f; } diff --git a/src/AudioOutputPortAudio.cpp b/src/AudioOutputPortAudio.cpp index 0ea7ae7b..b645fe9f 100644 --- a/src/AudioOutputPortAudio.cpp +++ b/src/AudioOutputPortAudio.cpp @@ -121,7 +121,7 @@ bool AudioOutputPortAudio::write() } #endif #endif //KNOW_WHY - PaError err = Pa_WriteStream(d.stream, d.data.data(), d.data.size()/audioFormat().channels()/audioFormat().bytesPerSample()); + PaError err = Pa_WriteStream(d.stream, d.data.constData(), d.data.size()/audioFormat().channels()/audioFormat().bytesPerSample()); if (err == paUnanticipatedHostError) { qWarning("Write portaudio stream error: %s", Pa_GetErrorText(err)); return false; diff --git a/src/AudioResamplerFF.cpp b/src/AudioResamplerFF.cpp index a5dd018a..6f878f6b 100644 --- a/src/AudioResamplerFF.cpp +++ b/src/AudioResamplerFF.cpp @@ -68,7 +68,7 @@ bool AudioResamplerFF::convert(const quint8 **data) int out_size = d.out_samples_per_channel*size_per_sample_with_channels; if (out_size > d.data_out.size()) d.data_out.resize(out_size); - uint8_t *out[] = {(uint8_t*)d.data_out.data()}; + uint8_t *out[] = {(uint8_t*)d.data_out.constData()}; //number of input/output samples available in one channel int converted_samplers_per_channel = swr_convert(d.context, out, d.out_samples_per_channel, data, d.in_samples_per_channel); d.out_samples_per_channel = converted_samplers_per_channel; diff --git a/src/AudioResamplerLibav.cpp b/src/AudioResamplerLibav.cpp index f24bd49a..fa595313 100644 --- a/src/AudioResamplerLibav.cpp +++ b/src/AudioResamplerLibav.cpp @@ -64,7 +64,7 @@ bool AudioResamplerLibav::convert(const quint8 **data) int out_size = d.out_samples_per_channel*size_per_sample_with_channels; if (out_size > d.data_out.size()) d.data_out.resize(out_size); - uint8_t *out[] = {(uint8_t*)d.data_out.data()}; + uint8_t *out[] = {(uint8_t*)d.data_out.constData()}; //number of input/output samples available in one channel int converted_samplers_per_channel = swr_convert(d.context, out, d.out_samples_per_channel, const_cast(data), d.in_samples_per_channel); d.out_samples_per_channel = converted_samplers_per_channel; diff --git a/src/ImageConverter.cpp b/src/ImageConverter.cpp index 58a51301..ef7446d1 100644 --- a/src/ImageConverter.cpp +++ b/src/ImageConverter.cpp @@ -211,7 +211,7 @@ bool ImageConverter::prepareData() //picture的数据按PIX_FMT格式自动"关联"到 data avpicture_fill( &d.picture, - reinterpret_cast(d.data_out.data()), + (const uint8_t*)d.data_out.constData(), (AVPixelFormat)d.fmt_out, d.w_out, d.h_out diff --git a/src/VideoDecoderCUDA.cpp b/src/VideoDecoderCUDA.cpp index ccd28af3..b1f98c98 100644 --- a/src/VideoDecoderCUDA.cpp +++ b/src/VideoDecoderCUDA.cpp @@ -386,7 +386,7 @@ bool VideoDecoderCUDA::decode(const QByteArray &encoded) } CUVIDSOURCEDATAPACKET cuvid_pkt; memset(&cuvid_pkt, 0, sizeof(CUVIDSOURCEDATAPACKET)); - cuvid_pkt.payload = (unsigned char *)encoded.data(); + cuvid_pkt.payload = (unsigned char *)encoded.constData(); cuvid_pkt.payload_size = encoded.size(); cuvid_pkt.flags = CUVID_PKT_TIMESTAMP; cuvid_pkt.timestamp = 0;// ? diff --git a/src/VideoFrame.cpp b/src/VideoFrame.cpp index af159686..870f10aa 100644 --- a/src/VideoFrame.cpp +++ b/src/VideoFrame.cpp @@ -75,7 +75,7 @@ public: conv->setOutFormat(fffmt); conv->setInSize(width, height); conv->setOutSize(width, height); - if (!conv->convert(planes.data(), line_sizes.data())) { + if (!conv->convert(planes.constData(), line_sizes.constData())) { format.setPixelFormat(VideoFormat::Format_Invalid); return false; } @@ -349,7 +349,7 @@ void VideoFrame::init() AVPixelFormat fff = (AVPixelFormat)d->format.pixelFormatFFmpeg(); //int bytes = avpicture_get_size(fff, width(), height()); //d->data.resize(bytes); - avpicture_fill(&picture, reinterpret_cast(d->data.data()), fff, width(), height()); + avpicture_fill(&picture, (const uint8_t*)d->data.constData(), fff, width(), height()); setBits(picture.data); setBytesPerLine(picture.linesize); }