diff options
Diffstat (limited to 'src/plugins/multimedia/android/qandroidformatsinfo.cpp')
| -rw-r--r-- | src/plugins/multimedia/android/qandroidformatsinfo.cpp | 52 |
1 files changed, 8 insertions, 44 deletions
diff --git a/src/plugins/multimedia/android/qandroidformatsinfo.cpp b/src/plugins/multimedia/android/qandroidformatsinfo.cpp index 584c7a122..3b23340ce 100644 --- a/src/plugins/multimedia/android/qandroidformatsinfo.cpp +++ b/src/plugins/multimedia/android/qandroidformatsinfo.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qandroidformatsinfo_p.h" @@ -108,7 +72,6 @@ QAndroidFormatInfo::QAndroidFormatInfo() { const QMediaFormat::AudioCodec aac = hasEncoder(QMediaFormat::AudioCodec::AAC); const QMediaFormat::AudioCodec mp3 = hasEncoder(QMediaFormat::AudioCodec::MP3); - const QMediaFormat::AudioCodec flac = hasEncoder(QMediaFormat::AudioCodec::FLAC); const QMediaFormat::AudioCodec opus = hasEncoder(QMediaFormat::AudioCodec::Opus); const QMediaFormat::AudioCodec vorbis = hasEncoder(QMediaFormat::AudioCodec::Vorbis); @@ -123,11 +86,12 @@ QAndroidFormatInfo::QAndroidFormatInfo() encoders = { { QMediaFormat::AAC, {aac}, {} }, { QMediaFormat::MP3, {mp3}, {} }, - { QMediaFormat::FLAC, {flac}, {} }, - { QMediaFormat::Mpeg4Audio, {mp3, aac, flac, vorbis}, {} }, - { QMediaFormat::MPEG4, {mp3, aac, flac, vorbis}, {h264, h265, av1} }, - { QMediaFormat::Ogg, {opus, vorbis, flac}, {} }, - { QMediaFormat::Matroska, {mp3, opus, flac}, {vp8, vp9, h264, h265, av1} }, + // FLAC encoder is not supported by the MediaRecorder used for recording + // { QMediaFormat::FLAC, {flac}, {} }, + { QMediaFormat::Mpeg4Audio, {mp3, aac, vorbis}, {} }, + { QMediaFormat::MPEG4, {mp3, aac, vorbis}, {h264, h265, av1} }, + { QMediaFormat::Ogg, {opus, vorbis}, {} }, + { QMediaFormat::Matroska, {mp3, opus}, {vp8, vp9, h264, h265, av1} }, // NOTE: WebM seems to be documented to supported with VP8 encoder, // but the Camera API doesn't work with it, keep it commented for now. // { QMediaFormat::WebM, {vorbis, opus}, {vp8, vp9} } |