Skip to content

Commit

Permalink
libmythtv: constify part 3
Browse files Browse the repository at this point in the history 
Trying to satisfy -fpermissive.
  • Loading branch information
@ulmus-scott @bennettpeter
ulmus-scott authored and bennettpeter committed Sep 6, 2022
1 parent cc1d6c5 commit 3fdac1b
Show file tree
Hide file tree
Showing 22 changed files with 33 additions and 35 deletions.
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/AirPlay/mythraopconnection.h
View file
Expand Up @@ -143,7 +143,7 @@ class MTV_PUBLIC MythRAOPConnection : public QObject
static QString g_rsaLastError;
// audio out
AudioOutput *m_audio {nullptr};
AVCodec *m_codec {nullptr};
const AVCodec *m_codec {nullptr};
AVCodecContext *m_codecContext {nullptr};
QList<int> m_audioFormat;
int m_channels {2};
Expand Down
8 changes: 3 additions & 5 deletions mythtv/libs/libmythtv/decoders/avformatdecoder.cpp
View file
Expand Up @@ -1001,7 +1001,7 @@ int AvFormatDecoder::OpenFile(MythMediaBuffer *Buffer, bool novideo,
delete m_avfRingBuffer;
m_avfRingBuffer = new MythAVFormatBuffer(Buffer);

AVInputFormat *fmt = nullptr;
const AVInputFormat *fmt = nullptr;
QString fnames = m_ringBuffer->GetFilename();
QByteArray fnamea = fnames.toLatin1();
const char *filename = fnamea.constData();
Expand All @@ -1026,7 +1026,7 @@ int AvFormatDecoder::OpenFile(MythMediaBuffer *Buffer, bool novideo,
if (strcmp(fmt->name, "mpegts") == 0 &&
gCoreContext->GetBoolSetting("FFMPEGTS", false))
{
AVInputFormat *fmt2 = av_find_input_format("mpegts-ffmpeg");
const AVInputFormat *fmt2 = av_find_input_format("mpegts-ffmpeg");
if (fmt2)
{
fmt = fmt2;
Expand Down Expand Up @@ -1148,8 +1148,6 @@ int AvFormatDecoder::OpenFile(MythMediaBuffer *Buffer, bool novideo,
m_ic->streams_changed = HandleStreamChange;
m_ic->stream_change_data = this;

fmt->flags &= ~AVFMT_NOFILE;

if (!m_livetv && !m_ringBuffer->IsDisc())
{
// generate timings based on the video stream to avoid bogus ffmpeg
Expand Down Expand Up @@ -2308,7 +2306,7 @@ int AvFormatDecoder::ScanStreams(bool novideo)
{
for(;;)
{
AVCodec *codec = nullptr;
const AVCodec *codec = nullptr;
LOG(VB_PLAYBACK, LOG_INFO, LOC + "Trying to select best video track");

/*
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/decoders/mythcodeccontext.cpp
View file
Expand Up @@ -244,7 +244,7 @@ void MythCodecContext::GetDecoders(RenderOptions &Opts, bool Reinit /*=false*/)
}

MythCodecID MythCodecContext::FindDecoder(const QString &Decoder, AVStream *Stream,
AVCodecContext **Context, AVCodec **Codec)
AVCodecContext **Context, const AVCodec **Codec)
{
MythCodecID result = kCodec_NONE;
uint streamtype = mpeg_version((*Context)->codec_id);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/decoders/mythcodeccontext.h
View file
Expand Up @@ -130,7 +130,7 @@ class MTV_PUBLIC MythCodecContext
static void GetDecoders (RenderOptions &Opts, bool Reinit = false);
static QStringList GetDecoderDescription(void);
static MythCodecID FindDecoder (const QString &Decoder, AVStream *Stream,
AVCodecContext **Context, AVCodec **Codec);
AVCodecContext **Context, const AVCodec **Codec);
static int GetBuffer (struct AVCodecContext *Context, AVFrame *Frame, int Flags);
static bool GetBuffer2 (struct AVCodecContext *Context, MythVideoFrame *Frame,
AVFrame *AvFrame, int Flags);
Expand All @@ -156,7 +156,7 @@ class MTV_PUBLIC MythCodecContext
virtual void SetDeinterlacing (AVCodecContext */*Context*/, MythVideoProfile */*Profile*/, bool /*DoubleRate*/) {}
virtual void PostProcessFrame (AVCodecContext */*Context*/, MythVideoFrame */*Frame*/) {}
virtual bool IsDeinterlacing (bool &/*DoubleRate*/, bool /*StreamChange*/ = false) { return false; }
virtual void SetDecoderOptions (AVCodecContext */*Context*/, AVCodec */*Codec*/) { }
virtual void SetDecoderOptions (AVCodecContext */*Context*/, const AVCodec */*Codec*/) { }
virtual bool DecoderWillResetOnFlush (void) { return false; }
virtual bool DecoderWillResetOnAspect(void) { return false; }
virtual bool DecoderNeedsReset (AVCodecContext */*Context*/) { return m_resetRequired; }
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/decoders/mythdrmprimecontext.cpp
View file
Expand Up @@ -43,7 +43,7 @@ MythDRMPRIMEContext::~MythDRMPRIMEContext()
}

MythCodecID MythDRMPRIMEContext::GetPrimeCodec(AVCodecContext **Context,
AVCodec **Codec,
const AVCodec **Codec,
AVStream *Stream,
MythCodecID Successs,
MythCodecID Failure,
Expand All @@ -54,7 +54,7 @@ MythCodecID MythDRMPRIMEContext::GetPrimeCodec(AVCodecContext **Context,
QString name = QString((*Codec)->name) + "_" + CodecName;
if (name.startsWith("mpeg2video"))
name = "mpeg2_" + CodecName;
AVCodec *codec = avcodec_find_decoder_by_name(name.toLocal8Bit());
const AVCodec *codec = avcodec_find_decoder_by_name(name.toLocal8Bit());
auto *decoder = dynamic_cast<AvFormatDecoder*>(reinterpret_cast<DecoderBase*>((*Context)->opaque));
if (!codec || !decoder)
{
Expand All @@ -72,7 +72,7 @@ MythCodecID MythDRMPRIMEContext::GetPrimeCodec(AVCodecContext **Context,
}

MythCodecID MythDRMPRIMEContext::GetSupportedCodec(AVCodecContext **Context,
AVCodec **Codec,
const AVCodec **Codec,
const QString &Decoder,
AVStream *Stream,
uint StreamType)
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/decoders/mythdrmprimecontext.h
View file
Expand Up @@ -18,7 +18,7 @@ class MythDRMPRIMEContext : public MythCodecContext
~MythDRMPRIMEContext() override;

static MythCodecID GetSupportedCodec (AVCodecContext **Context,
AVCodec **Codec,
const AVCodec **Codec,
const QString &Decoder,
AVStream *Stream,
uint StreamType);
Expand All @@ -32,7 +32,7 @@ class MythDRMPRIMEContext : public MythCodecContext

protected:
static MythCodecID GetPrimeCodec (AVCodecContext **Context,
AVCodec **Codec,
const AVCodec **Codec,
AVStream *Stream,
MythCodecID Successs, // Xlib conflict
MythCodecID Failure,
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/decoders/mythmediacodeccontext.cpp
View file
Expand Up @@ -209,7 +209,7 @@ int MythMediaCodecContext::InitialiseDecoder(AVCodecContext *Context)
}

MythCodecID MythMediaCodecContext::GetBestSupportedCodec(AVCodecContext **Context,
AVCodec **Codec,
const AVCodec **Codec,
const QString &Decoder,
AVStream *Stream,
uint StreamType)
Expand Down Expand Up @@ -250,7 +250,7 @@ MythCodecID MythMediaCodecContext::GetBestSupportedCodec(AVCodecContext **Contex
QString decodername = QString((*Codec)->name) + "_mediacodec";
if (decodername == "mpeg2video_mediacodec")
decodername = "mpeg2_mediacodec";
AVCodec *newCodec = avcodec_find_decoder_by_name (decodername.toLocal8Bit());
const AVCodec *newCodec = avcodec_find_decoder_by_name (decodername.toLocal8Bit());
if (newCodec)
{
*Codec = newCodec;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/decoders/mythmediacodeccontext.h
View file
Expand Up @@ -23,7 +23,7 @@ class MythMediaCodecContext : public MythCodecContext
bool RetrieveFrame(AVCodecContext *Context, MythVideoFrame *Frame, AVFrame *AvFrame) override;

static MythCodecID GetBestSupportedCodec(AVCodecContext **Context,
AVCodec **Codec,
const AVCodec **Codec,
const QString &Decoder,
AVStream *Stream,
uint StreamType);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/decoders/mythmmalcontext.cpp
View file
Expand Up @@ -38,7 +38,7 @@ bool MythMMALContext::CheckCodecSize(int Width, int Height, MythCodecContext::Co
}

MythCodecID MythMMALContext::GetSupportedCodec(AVCodecContext **Context,
AVCodec **Codec,
const AVCodec **Codec,
const QString &Decoder,
AVStream *Stream,
uint StreamType)
Expand Down Expand Up @@ -87,7 +87,7 @@ MythCodecID MythMMALContext::GetSupportedCodec(AVCodecContext **Context,
QString name = QString((*Codec)->name) + "_mmal";
if (name == "mpeg2video_mmal")
name = "mpeg2_mmal";
AVCodec *codec = avcodec_find_decoder_by_name(name.toLocal8Bit());
const AVCodec *codec = avcodec_find_decoder_by_name(name.toLocal8Bit());
AvFormatDecoder *decoder = dynamic_cast<AvFormatDecoder*>(reinterpret_cast<DecoderBase*>((*Context)->opaque));
if (!codec || !decoder)
{
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/decoders/mythmmalcontext.h
View file
Expand Up @@ -13,7 +13,7 @@ class MythMMALContext : public MythCodecContext
MythMMALContext(DecoderBase *Parent, MythCodecID Codec);
~MythMMALContext() override;
static MythCodecID GetSupportedCodec(AVCodecContext **Context,
AVCodec **Codec,
const AVCodec **Codec,
const QString &Decoder,
AVStream *Stream,
uint StreamType);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/decoders/mythnvdeccontext.cpp
View file
Expand Up @@ -31,7 +31,7 @@ MythNVDECContext::~MythNVDECContext()
* to another decoder as soon as possible if necessary.
*/
MythCodecID MythNVDECContext::GetSupportedCodec(AVCodecContext **Context,
AVCodec **Codec,
const AVCodec **Codec,
const QString &Decoder,
AVStream *Stream,
uint StreamType)
Expand Down Expand Up @@ -114,7 +114,7 @@ MythCodecID MythNVDECContext::GetSupportedCodec(AVCodecContext **Context,
if ((config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX) &&
(config->device_type == AV_HWDEVICE_TYPE_CUDA))
{
AVCodec *codec = avcodec_find_decoder_by_name(name.toLocal8Bit());
const AVCodec *codec = avcodec_find_decoder_by_name(name.toLocal8Bit());
if (codec)
{
LOG(VB_PLAYBACK, LOG_INFO, LOC + QString("NVDEC supports decoding %1").arg(desc));
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/decoders/mythnvdeccontext.h
View file
Expand Up @@ -35,7 +35,7 @@ class MythNVDECContext : public MythCodecContext
bool IsDeinterlacing (bool &DoubleRate, bool StreamChange = false) override;
bool DecoderWillResetOnFlush (void) override;
static MythCodecID GetSupportedCodec (AVCodecContext **CodecContext,
AVCodec **Codec,
const AVCodec **Codec,
const QString &Decoder,
AVStream *Stream,
uint StreamType);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/decoders/mythv4l2m2mcontext.cpp
View file
Expand Up @@ -52,7 +52,7 @@ bool MythV4L2M2MContext::DecoderWillResetOnFlush()
}

MythCodecID MythV4L2M2MContext::GetSupportedCodec(AVCodecContext **Context,
AVCodec **Codec,
const AVCodec **Codec,
const QString &Decoder,
AVStream *Stream,
uint StreamType)
Expand Down Expand Up @@ -187,7 +187,7 @@ bool MythV4L2M2MContext::RetrieveFrame(AVCodecContext *Context, MythVideoFrame *
* Testing on Pi 3, the default of 20 is too high and leads to memory allocation
* failures in the the kernel driver.
*/
void MythV4L2M2MContext::SetDecoderOptions(AVCodecContext* Context, AVCodec* Codec)
void MythV4L2M2MContext::SetDecoderOptions(AVCodecContext* Context, const AVCodec* Codec)
{
if (m_request)
return;
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/decoders/mythv4l2m2mcontext.h
View file
Expand Up @@ -13,13 +13,13 @@ class MythV4L2M2MContext : public MythDRMPRIMEContext
MythV4L2M2MContext(DecoderBase *Parent, MythCodecID CodecID);
~MythV4L2M2MContext() override = default;
static MythCodecID GetSupportedCodec (AVCodecContext **Context,
AVCodec **Codec,
const AVCodec **Codec,
const QString &Decoder,
AVStream *Stream,
uint StreamType);
void InitVideoCodec (AVCodecContext *Context, bool SelectedStream, bool &DirectRendering) override;
bool RetrieveFrame (AVCodecContext *Context, MythVideoFrame *Frame, AVFrame *AvFrame) override;
void SetDecoderOptions (AVCodecContext* Context, AVCodec* Codec) override;
void SetDecoderOptions (AVCodecContext* Context, const AVCodec* Codec) override;
int HwDecoderInit (AVCodecContext *Context) override;
bool DecoderWillResetOnFlush () override;
static bool GetBuffer (AVCodecContext *Context, MythVideoFrame *Frame, AVFrame *AvFrame, int/*Flags*/);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/decoders/mythvaapicontext.cpp
View file
Expand Up @@ -130,7 +130,7 @@ inline AVPixelFormat MythVAAPIContext::FramesFormat(AVPixelFormat Format)
/*! \brief Confirm whether VAAPI support is available given Decoder and Context
*/
MythCodecID MythVAAPIContext::GetSupportedCodec(AVCodecContext** Context,
AVCodec** /*Codec*/,
const AVCodec** /*Codec*/,
const QString& Decoder,
uint StreamType)
{
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/decoders/mythvaapicontext.h
View file
Expand Up @@ -34,7 +34,7 @@ class MTV_PUBLIC MythVAAPIContext : public MythCodecContext
bool DecoderWillResetOnFlush () override;
bool DecoderWillResetOnAspect () override;

static MythCodecID GetSupportedCodec (AVCodecContext** Context, AVCodec** Codec,
static MythCodecID GetSupportedCodec (AVCodecContext** Context, const AVCodec** Codec,
const QString& Decoder, uint StreamType);
static enum AVPixelFormat GetFormat (AVCodecContext* Context, const AVPixelFormat* PixFmt);
static enum AVPixelFormat GetFormat2 (AVCodecContext* Context, const AVPixelFormat* PixFmt);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/decoders/mythvdpaucontext.cpp
View file
Expand Up @@ -118,7 +118,7 @@ int MythVDPAUContext::InitialiseContext(AVCodecContext* Context)
}

MythCodecID MythVDPAUContext::GetSupportedCodec(AVCodecContext **Context,
AVCodec ** /*Codec*/,
const AVCodec ** /*Codec*/,
const QString &Decoder,
uint StreamType)
{
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/decoders/mythvdpaucontext.h
View file
Expand Up @@ -16,7 +16,7 @@ class MythVDPAUContext : public MythCodecContext
bool DecoderNeedsReset (AVCodecContext *Context) override;

static MythCodecID GetSupportedCodec (AVCodecContext **CodecContext,
AVCodec **Codec,
const AVCodec **Codec,
const QString &Decoder,
uint StreamType);
static enum AVPixelFormat GetFormat (AVCodecContext *Context,
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/decoders/mythvtbcontext.cpp
View file
Expand Up @@ -74,7 +74,7 @@ int MythVTBContext::HwDecoderInit(AVCodecContext *Context)
}

MythCodecID MythVTBContext::GetSupportedCodec(AVCodecContext **Context,
AVCodec ** Codec,
const AVCodec ** Codec,
const QString &Decoder,
uint StreamType)
{
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/decoders/mythvtbcontext.h
View file
Expand Up @@ -27,7 +27,7 @@ class MythVTBContext : public MythCodecContext
AVFrame* AvFrame) override;
int HwDecoderInit (AVCodecContext *Context) override;
static MythCodecID GetSupportedCodec (AVCodecContext **Context,
AVCodec **Codec,
const AVCodec **Codec,
const QString &Decoder,
uint StreamType);
static enum AVPixelFormat GetFormat (AVCodecContext *Context,
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/mheg/mhi.cpp
View file
Expand Up @@ -1884,7 +1884,7 @@ void MHIBitmap::CreateFromMPEG(const unsigned char *data, int length)
m_image = QImage();

// Find the mpeg2 video decoder.
AVCodec *codec = avcodec_find_decoder(AV_CODEC_ID_MPEG2VIDEO);
const AVCodec *codec = avcodec_find_decoder(AV_CODEC_ID_MPEG2VIDEO);
if (!codec)
return;
if (!picture)
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.h
View file
Expand Up @@ -245,7 +245,7 @@ class MTV_PUBLIC NuppelVideoRecorder : public V4LRecorder, public CC608Input

bool m_useAvCodec {false};

AVCodec *m_mpaVidCodec {nullptr};
const AVCodec *m_mpaVidCodec {nullptr};
AVCodecContext *m_mpaVidCtx {nullptr};

int m_targetBitRate {2200};
Expand Down

0 comments on commit 3fdac1b

Please sign in to comment.