added Opus
This commit is contained in:
parent
de104dee5a
commit
098a0bdef8
|
@ -61,7 +61,6 @@ set(HEADER_FILES
|
||||||
matroska/ebmlid.h
|
matroska/ebmlid.h
|
||||||
matroska/matroskaattachment.h
|
matroska/matroskaattachment.h
|
||||||
matroska/matroskachapter.h
|
matroska/matroskachapter.h
|
||||||
matroska/matroskacodecid.h
|
|
||||||
matroska/matroskacontainer.h
|
matroska/matroskacontainer.h
|
||||||
matroska/matroskacues.h
|
matroska/matroskacues.h
|
||||||
matroska/matroskaeditionentry.h
|
matroska/matroskaeditionentry.h
|
||||||
|
@ -121,7 +120,6 @@ set(SRC_FILES
|
||||||
matroska/ebmlelement.cpp
|
matroska/ebmlelement.cpp
|
||||||
matroska/matroskaattachment.cpp
|
matroska/matroskaattachment.cpp
|
||||||
matroska/matroskachapter.cpp
|
matroska/matroskachapter.cpp
|
||||||
matroska/matroskacodecid.cpp
|
|
||||||
matroska/matroskacontainer.cpp
|
matroska/matroskacontainer.cpp
|
||||||
matroska/matroskacues.cpp
|
matroska/matroskacues.cpp
|
||||||
matroska/matroskaeditionentry.cpp
|
matroska/matroskaeditionentry.cpp
|
||||||
|
@ -143,7 +141,7 @@ set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/${META_PROJECT_NAME}")
|
||||||
set(META_APP_DESCRIPTION "C++ library for reading and writing MP4 (iTunes), ID3, Vorbis and Matroska tags.")
|
set(META_APP_DESCRIPTION "C++ library for reading and writing MP4 (iTunes), ID3, Vorbis and Matroska tags.")
|
||||||
set(META_VERSION_MAJOR 4)
|
set(META_VERSION_MAJOR 4)
|
||||||
set(META_VERSION_MINOR 0)
|
set(META_VERSION_MINOR 0)
|
||||||
set(META_VERSION_PATCH 1)
|
set(META_VERSION_PATCH 2)
|
||||||
|
|
||||||
# stringification of meta data
|
# stringification of meta data
|
||||||
set(META_PROJECT_NAME_STR "\"${META_PROJECT_NAME}\"")
|
set(META_PROJECT_NAME_STR "\"${META_PROJECT_NAME}\"")
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
#include "./matroskacodecid.h"
|
|
||||||
|
|
||||||
namespace Media {
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* \class Media::MatroskaCodecId
|
|
||||||
* \brief Not implemented yet.
|
|
||||||
*/
|
|
||||||
|
|
||||||
MatroskaCodecId::MatroskaCodecId()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace Media
|
|
|
@ -1,14 +0,0 @@
|
||||||
#ifndef MEDIA_MATROSKACODECID_H
|
|
||||||
#define MEDIA_MATROSKACODECID_H
|
|
||||||
|
|
||||||
namespace Media {
|
|
||||||
|
|
||||||
class MatroskaCodecId
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
MatroskaCodecId();
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace Media
|
|
||||||
|
|
||||||
#endif // MEDIA_MATROSKACODECID_H
|
|
|
@ -126,6 +126,8 @@ MediaFormat MatroskaTrack::codecIdToMediaFormat(const string &codecId)
|
||||||
fmt.general = GeneralMediaFormat::Vorbis;
|
fmt.general = GeneralMediaFormat::Vorbis;
|
||||||
} else if(part1 == "A_FLAC") {
|
} else if(part1 == "A_FLAC") {
|
||||||
fmt.general = GeneralMediaFormat::Flac;
|
fmt.general = GeneralMediaFormat::Flac;
|
||||||
|
} else if(part1 == "A_OPUS") {
|
||||||
|
fmt.general = GeneralMediaFormat::Opus;
|
||||||
} else if(part1 == "A_REAL") {
|
} else if(part1 == "A_REAL") {
|
||||||
fmt.general = GeneralMediaFormat::RealAudio;
|
fmt.general = GeneralMediaFormat::RealAudio;
|
||||||
} else if(part1 == "A_MS" && part2 == "ACM") {
|
} else if(part1 == "A_MS" && part2 == "ACM") {
|
||||||
|
|
|
@ -84,6 +84,7 @@ const char *MediaFormat::name() const
|
||||||
case GeneralMediaFormat::InteractionStream: return "Interaction Stream";
|
case GeneralMediaFormat::InteractionStream: return "Interaction Stream";
|
||||||
case GeneralMediaFormat::Jpeg: return "JPEG";
|
case GeneralMediaFormat::Jpeg: return "JPEG";
|
||||||
case GeneralMediaFormat::OggKate: return "Karaoke And Text Encapsulation";
|
case GeneralMediaFormat::OggKate: return "Karaoke And Text Encapsulation";
|
||||||
|
case GeneralMediaFormat::Opus: return "Opus";
|
||||||
case GeneralMediaFormat::MicrosoftAudioCodecManager: return "Microsoft Audio Codec Manager";
|
case GeneralMediaFormat::MicrosoftAudioCodecManager: return "Microsoft Audio Codec Manager";
|
||||||
case GeneralMediaFormat::MicrosoftMpeg4:
|
case GeneralMediaFormat::MicrosoftMpeg4:
|
||||||
switch(sub) {
|
switch(sub) {
|
||||||
|
@ -300,6 +301,7 @@ const char *MediaFormat::abbreviation() const
|
||||||
case GeneralMediaFormat::InteractionStream: return "Interaction Stream";
|
case GeneralMediaFormat::InteractionStream: return "Interaction Stream";
|
||||||
case GeneralMediaFormat::Jpeg: return "JPEG";
|
case GeneralMediaFormat::Jpeg: return "JPEG";
|
||||||
case GeneralMediaFormat::OggKate: return "OggKate";
|
case GeneralMediaFormat::OggKate: return "OggKate";
|
||||||
|
case GeneralMediaFormat::Opus: return "Opus";
|
||||||
case GeneralMediaFormat::MicrosoftAudioCodecManager: return "MS ACM";
|
case GeneralMediaFormat::MicrosoftAudioCodecManager: return "MS ACM";
|
||||||
case GeneralMediaFormat::MicrosoftMpeg4:
|
case GeneralMediaFormat::MicrosoftMpeg4:
|
||||||
switch(sub) {
|
switch(sub) {
|
||||||
|
|
|
@ -50,7 +50,8 @@ enum class GeneralMediaFormat
|
||||||
InteractionStream, /**< Interaction Stream */
|
InteractionStream, /**< Interaction Stream */
|
||||||
Jpeg, /**< JPEG */
|
Jpeg, /**< JPEG */
|
||||||
OggKate, /**< Karaoke And Text Encapsulation */
|
OggKate, /**< Karaoke And Text Encapsulation */
|
||||||
MicrosoftAudioCodecManager, /**< Microsoft Audio Codec Manager (ACM) */
|
Opus = 64, /**< Opus */
|
||||||
|
MicrosoftAudioCodecManager = 26, /**< Microsoft Audio Codec Manager (ACM) */
|
||||||
MicrosoftMpeg4, /**< Microsoft MPEG-4 */
|
MicrosoftMpeg4, /**< Microsoft MPEG-4 */
|
||||||
MicrosoftVideoCodecManager, /**< Microsoft Video Codec Manager (VCM) */
|
MicrosoftVideoCodecManager, /**< Microsoft Video Codec Manager (VCM) */
|
||||||
DolbyMlp, /** < Dolby MLP */
|
DolbyMlp, /** < Dolby MLP */
|
||||||
|
|
|
@ -4,7 +4,7 @@ appname = "Tag Parser"
|
||||||
appauthor = Martchus
|
appauthor = Martchus
|
||||||
appurl = "https://github.com/$${appauthor}/$${projectname}"
|
appurl = "https://github.com/$${appauthor}/$${projectname}"
|
||||||
QMAKE_TARGET_DESCRIPTION = "C++ library for reading and writing MP4 (iTunes), ID3, Vorbis and Matroska tags."
|
QMAKE_TARGET_DESCRIPTION = "C++ library for reading and writing MP4 (iTunes), ID3, Vorbis and Matroska tags."
|
||||||
VERSION = 4.0.1
|
VERSION = 4.0.2
|
||||||
|
|
||||||
# include ../../common.pri when building as part of a subdirs project; otherwise include general.pri
|
# include ../../common.pri when building as part of a subdirs project; otherwise include general.pri
|
||||||
!include(../../common.pri) {
|
!include(../../common.pri) {
|
||||||
|
@ -44,7 +44,6 @@ HEADERS += \
|
||||||
margin.h \
|
margin.h \
|
||||||
matroska/ebmlelement.h \
|
matroska/ebmlelement.h \
|
||||||
matroska/ebmlid.h \
|
matroska/ebmlid.h \
|
||||||
matroska/matroskacodecid.h \
|
|
||||||
matroska/matroskacontainer.h \
|
matroska/matroskacontainer.h \
|
||||||
matroska/matroskaid.h \
|
matroska/matroskaid.h \
|
||||||
matroska/matroskatag.h \
|
matroska/matroskatag.h \
|
||||||
|
@ -107,7 +106,6 @@ SOURCES += \
|
||||||
id3/id3v2frameids.cpp \
|
id3/id3v2frameids.cpp \
|
||||||
id3/id3v2tag.cpp \
|
id3/id3v2tag.cpp \
|
||||||
matroska/ebmlelement.cpp \
|
matroska/ebmlelement.cpp \
|
||||||
matroska/matroskacodecid.cpp \
|
|
||||||
matroska/matroskacontainer.cpp \
|
matroska/matroskacontainer.cpp \
|
||||||
matroska/matroskaid.cpp \
|
matroska/matroskaid.cpp \
|
||||||
matroska/matroskatag.cpp \
|
matroska/matroskatag.cpp \
|
||||||
|
|
Loading…
Reference in New Issue