qtmux: Adds new tags

Maps more tags that are already posted by qtdemux

Fixes #599759
This commit is contained in:
Thiago Santos 2009-12-21 12:05:37 -03:00 committed by Tim-Philipp Müller
parent c5f6e74db9
commit 9a6514e4a7
2 changed files with 26 additions and 0 deletions

View file

@ -112,11 +112,13 @@ G_BEGIN_DECLS
#define FOURCC_ilst GST_MAKE_FOURCC('i','l','s','t') #define FOURCC_ilst GST_MAKE_FOURCC('i','l','s','t')
#define FOURCC__nam GST_MAKE_FOURCC(0xa9,'n','a','m') #define FOURCC__nam GST_MAKE_FOURCC(0xa9,'n','a','m')
#define FOURCC__ART GST_MAKE_FOURCC(0xa9,'A','R','T') #define FOURCC__ART GST_MAKE_FOURCC(0xa9,'A','R','T')
#define FOURCC_aART GST_MAKE_FOURCC('a','A','R','T')
#define FOURCC__wrt GST_MAKE_FOURCC(0xa9,'w','r','t') #define FOURCC__wrt GST_MAKE_FOURCC(0xa9,'w','r','t')
#define FOURCC__grp GST_MAKE_FOURCC(0xa9,'g','r','p') #define FOURCC__grp GST_MAKE_FOURCC(0xa9,'g','r','p')
#define FOURCC__alb GST_MAKE_FOURCC(0xa9,'a','l','b') #define FOURCC__alb GST_MAKE_FOURCC(0xa9,'a','l','b')
#define FOURCC__day GST_MAKE_FOURCC(0xa9,'d','a','y') #define FOURCC__day GST_MAKE_FOURCC(0xa9,'d','a','y')
#define FOURCC__des GST_MAKE_FOURCC(0xa9,'d','e','s') #define FOURCC__des GST_MAKE_FOURCC(0xa9,'d','e','s')
#define FOURCC__lyr GST_MAKE_FOURCC(0xa9,'l','y','r')
#define FOURCC_gnre GST_MAKE_FOURCC('g','n','r','e') #define FOURCC_gnre GST_MAKE_FOURCC('g','n','r','e')
#define FOURCC_disc GST_MAKE_FOURCC('d','i','s','c') #define FOURCC_disc GST_MAKE_FOURCC('d','i','s','c')
#define FOURCC_disk GST_MAKE_FOURCC('d','i','s','k') #define FOURCC_disk GST_MAKE_FOURCC('d','i','s','k')
@ -172,6 +174,17 @@ G_BEGIN_DECLS
#define FOURCC_jp2h GST_MAKE_FOURCC('j','p','2','h') #define FOURCC_jp2h GST_MAKE_FOURCC('j','p','2','h')
#define FOURCC_jp2c GST_MAKE_FOURCC('j','p','2','c') #define FOURCC_jp2c GST_MAKE_FOURCC('j','p','2','c')
#define FOURCC_gama GST_MAKE_FOURCC('g','a','m','a') #define FOURCC_gama GST_MAKE_FOURCC('g','a','m','a')
#define FOURCC_tvsh GST_MAKE_FOURCC('t','v','s','h')
#define FOURCC_tven GST_MAKE_FOURCC('t','v','e','n')
#define FOURCC_tvsn GST_MAKE_FOURCC('t','v','s','n')
#define FOURCC_tves GST_MAKE_FOURCC('t','v','e','s')
#define FOURCC_sonm GST_MAKE_FOURCC('s','o','n','m')
#define FOURCC_soal GST_MAKE_FOURCC('s','o','a','l')
#define FOURCC_soar GST_MAKE_FOURCC('s','o','a','r')
#define FOURCC_soaa GST_MAKE_FOURCC('s','o','a','a')
#define FOURCC_soco GST_MAKE_FOURCC('s','o','c','o')
#define FOURCC_sosn GST_MAKE_FOURCC('s','o','s','n')
/* SVQ3 fourcc */ /* SVQ3 fourcc */
#define FOURCC_SEQH GST_MAKE_FOURCC('S','E','Q','H') #define FOURCC_SEQH GST_MAKE_FOURCC('S','E','Q','H')

View file

@ -797,12 +797,25 @@ typedef struct _GstTagToFourcc
/* tag list tags to fourcc matching */ /* tag list tags to fourcc matching */
static const GstTagToFourcc tag_matches_mp4[] = { static const GstTagToFourcc tag_matches_mp4[] = {
{FOURCC__alb, GST_TAG_ALBUM, NULL, gst_qt_mux_add_mp4_tag}, {FOURCC__alb, GST_TAG_ALBUM, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC_soal, GST_TAG_ALBUM_SORTNAME, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC__ART, GST_TAG_ARTIST, NULL, gst_qt_mux_add_mp4_tag}, {FOURCC__ART, GST_TAG_ARTIST, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC_soar, GST_TAG_ARTIST_SORTNAME, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC_aART, GST_TAG_ALBUM_ARTIST, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC_soaa, GST_TAG_ALBUM_ARTIST_SORTNAME, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC__cmt, GST_TAG_COMMENT, NULL, gst_qt_mux_add_mp4_tag}, {FOURCC__cmt, GST_TAG_COMMENT, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC__wrt, GST_TAG_COMPOSER, NULL, gst_qt_mux_add_mp4_tag}, {FOURCC__wrt, GST_TAG_COMPOSER, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC_soco, GST_TAG_COMPOSER_SORTNAME, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC_tvsh, GST_TAG_SHOW_NAME, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC_sosn, GST_TAG_SHOW_SORTNAME, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC_tvsn, GST_TAG_SHOW_SEASON_NUMBER, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC_tves, GST_TAG_SHOW_EPISODE_NUMBER, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC__gen, GST_TAG_GENRE, NULL, gst_qt_mux_add_mp4_tag}, {FOURCC__gen, GST_TAG_GENRE, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC__nam, GST_TAG_TITLE, NULL, gst_qt_mux_add_mp4_tag}, {FOURCC__nam, GST_TAG_TITLE, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC_sonm, GST_TAG_TITLE_SORTNAME, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC_perf, GST_TAG_PERFORMER, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC__grp, GST_TAG_GROUPING, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC__des, GST_TAG_DESCRIPTION, NULL, gst_qt_mux_add_mp4_tag}, {FOURCC__des, GST_TAG_DESCRIPTION, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC__lyr, GST_TAG_LYRICS, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC__too, GST_TAG_ENCODER, NULL, gst_qt_mux_add_mp4_tag}, {FOURCC__too, GST_TAG_ENCODER, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC_cprt, GST_TAG_COPYRIGHT, NULL, gst_qt_mux_add_mp4_tag}, {FOURCC_cprt, GST_TAG_COPYRIGHT, NULL, gst_qt_mux_add_mp4_tag},
{FOURCC_keyw, GST_TAG_KEYWORDS, NULL, gst_qt_mux_add_mp4_tag}, {FOURCC_keyw, GST_TAG_KEYWORDS, NULL, gst_qt_mux_add_mp4_tag},