diff options
| author | Bartlomiej Moskal <bartlomiej.moskal@qt.io> | 2024-03-08 11:44:21 +0100 |
|---|---|---|
| committer | Bartlomiej Moskal <bartlomiej.moskal@qt.io> | 2024-03-18 18:23:16 +0000 |
| commit | 1f03b1bde5d220837085dd01b5406f532ccba5ca (patch) | |
| tree | 9b0cebad6a0cb0cc37cf400d4c382e3c75f4d769 | |
| parent | e3f06db2f3bad0ce7d1255c92b4e6e460aee7874 (diff) | |
Android: Use String literal operator instead QStringLiteral
Instead of QStringLiteral start to use modern _L1 string literal
operator.
Pick-to: 6.5
Change-Id: Ib20a5ac5b6875242d066369684fe31a96a5c5eb1
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 1e2807b049ad7e4c7d79842a178c00f9efb44ecb)
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit d8204077ee4769e2b5de6e30c4ccd3e6ff124ed4)
| -rw-r--r-- | src/plugins/multimedia/ffmpeg/qffmpeg.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/multimedia/ffmpeg/qffmpeg.cpp b/src/plugins/multimedia/ffmpeg/qffmpeg.cpp index 81243b00b..0a15e44f6 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpeg.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpeg.cpp @@ -229,15 +229,16 @@ bool isCodecValid(const AVCodec *codec, const std::vector<AVHWDeviceType> &avail std::optional<std::unordered_set<AVCodecID>> availableHWCodecs(const CodecStorageType type) { #ifdef Q_OS_ANDROID + using namespace Qt::StringLiterals; std::unordered_set<AVCodecID> availabeCodecs; auto getCodecId = [] (const QString& codecName) { - if (codecName == QStringLiteral("3gpp")) return AV_CODEC_ID_H263; - if (codecName == QStringLiteral("avc")) return AV_CODEC_ID_H264; - if (codecName == QStringLiteral("hevc")) return AV_CODEC_ID_HEVC; - if (codecName == QStringLiteral("mp4v-es")) return AV_CODEC_ID_MPEG4; - if (codecName == QStringLiteral("x-vnd.on2.vp8")) return AV_CODEC_ID_VP8; - if (codecName == QStringLiteral("x-vnd.on2.vp9")) return AV_CODEC_ID_VP9; + if (codecName == "3gpp"_L1) return AV_CODEC_ID_H263; + if (codecName == "avc"_L1) return AV_CODEC_ID_H264; + if (codecName == "hevc"_L1) return AV_CODEC_ID_HEVC; + if (codecName == "mp4v-es"_L1) return AV_CODEC_ID_MPEG4; + if (codecName == "x-vnd.on2.vp8"_L1) return AV_CODEC_ID_VP8; + if (codecName == "x-vnd.on2.vp9"_L1) return AV_CODEC_ID_VP9; return AV_CODEC_ID_NONE; }; |