FCL/sf/mw/gstreamer: comparison gst_plugins_base/gst-libs/gst/pbutils/descriptions.c

equal deleted inserted replaced

-:9b2c3c7a1a9c
+:567bb019e3e3
 * and decoder/demuxer/depayloader/encoder/muxer/payloader elements for use
 * in error dialogs or other messages shown to users.
 * </para>
 * <para>
 * gst_pb_utils_add_codec_description_to_tag_list() is a utility function
-* for demuxer and decoder elements to add audio/
+* for demuxer and decoder elements to add audio/video codec tags from a
-#ifdef __SYMBIAN32__
-EXPORT_C
-#endif
-video codec tags from a
 * given (fixed) #GstCaps.
 * </para>
 * </refsect2>
 */
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 #ifdef __SYMBIAN32__
-#include <gst_global.h>
+#include <gst/gst_global.h>
 #endif
 #include "gst/gst-i18n-plugin.h"
 #include "pbutils.h"
 /* container/tag formats with static descriptions */
 {"application/ogg", "Ogg", FLAG_CONTAINER},
 {"application/vnd.rn-realmedia", "Realmedia", FLAG_CONTAINER},
 {"application/x-id3", N_("ID3 tag"), FLAG_CONTAINER},
 {"application/x-ape", N_("APE tag"), FLAG_CONTAINER},
+{"application/x-apetag", N_("APE tag"), FLAG_CONTAINER},
 {"application/x-icy", N_("ICY internet radio"), FLAG_CONTAINER},
+{"application/x-3gp", "3GP", FLAG_CONTAINER},
+{"multipart/x-mixed-replace", "Multipart", FLAG_CONTAINER},
 {"video/x-fli", "FLI/FLC/FLX Animation", FLAG_CONTAINER},
 {"video/x-flv", "Flash", FLAG_CONTAINER},
 {"video/x-matroska", "Matroska", FLAG_CONTAINER},
 {"video/x-ms-asf", "Advanced Streaming Format (ASF)", FLAG_CONTAINER},
 {"video/x-msvideo", "AVI", FLAG_CONTAINER},
 {"video/x-quicktime", "Quicktime", FLAG_CONTAINER},
 {"video/quicktime", "Quicktime", FLAG_CONTAINER},
+{"video/mj2", "Motion JPEG 2000", FLAG_CONTAINER},
 /* audio formats with static descriptions */
 {"audio/x-ac3", "AC-3 (ATSC A/52)", 0},
 {"audio/ac3", "AC-3 (ATSC A/52)", 0},
 {"audio/x-private-ac3", "DVD AC-3 (ATSC A/52)", 0},
 {"audio/x-musepack", "Musepack (MPC)", 0},
 {"audio/x-nellymoser", "Nellymoser Asao", 0},
 {"audio/x-nist", "Sphere NIST", 0},
 {"audio/x-nsf", "Nintendo NSF", 0},
 {"audio/x-paris", "Ensoniq PARIS", 0},
+{"audio/x-qdm", "QDesign Music (QDM)", 0},
 {"audio/x-qdm2", "QDesign Music (QDM) 2", 0},
 {"audio/x-ralf-mpeg4-generic", "Real Audio Lossless (RALF)", 0},
 {"audio/x-sds", "SDS", 0},
 {"audio/x-shorten", "Shorten Lossless", 0},
 {"audio/x-sid", "Sid", 0},
 {"audio/x-sipro", "Sipro/ACELP.NET Voice", 0},
+{"audio/x-siren", "Siren", 0},
 {"audio/x-spc", "SNES-SPC700 Sound File Data", 0},
 {"audio/x-speex", "Speex", 0},
 {"audio/x-svx", "Amiga IFF / SVX8 / SV16", 0},
 {"audio/x-tta", N_("Lossless True Audio (TTA)"), 0},
 {"audio/x-ttafile", N_("Lossless True Audio (TTA)"), 0},
 {"video/x-compressed-yuv", N_("CYUV Lossless"), 0},
 {"video/x-dirac", "Dirac", 0},
 {"video/x-dvd-subpicture", "DVD subpicture", 0},
 {"video/x-ffv", N_("FFMpeg v1"), 0},
 {"video/x-flash-screen", "Flash Screen Video", 0},
-{"video/x-flash-video", "Flash Video", 0},
+{"video/x-flash-video", "Sorenson Spark Video", 0},
 {"video/x-h261", "H.261", 0},
 {"video/x-huffyuv", "Huffyuv", 0},
 {"video/x-intel-h263", "Intel H.263", 0},
 {"video/x-jpeg", "Motion JPEG", 0},
 /* { "video/x-jpeg-b", "", 0 }, does this actually exist? */
 {"image/ppm", "PPM", 0},
 {"image/svg+xml", "Scalable Vector Graphics (SVG)", 0},
 {"image/tiff", "TIFF", 0},
 {"image/x-cmu-raster", "CMU Raster Format", 0},
 {"image/x-icon", "ICO", 0},
+{"image/x-j2c", "JPEG 2000", 0},
+{"image/x-jpc", "JPEG 2000", 0},
+{"image/jp2", "JPEG 2000", 0},
 {"image/x-xcf", "XFC", 0},
 {"image/x-pixmap", "XPM", 0},
 {"image/x-xpixmap", "XPM", 0},
 {"image/x-quicktime", "QuickTime Image Format (QTIF)", 0},
 {"image/x-sun-raster", "Sun Raster Format (RAS)", 0},
 {"image/x-tga", "TGA", 0},
 /* subtitle formats with static descriptions */
 {"application/x-subtitle-sami", N_("Sami subtitle format"), 0},
 {"application/x-subtitle-tmplayer", N_("TMPlayer subtitle format"), 0},
+{"application/x-kate", "Kate", 0},
+{"subtitle/x-kate", N_("Kate subtitle format"), 0},
 /* add variant field to typefinder? { "application/x-subtitle", N_("subtitle"), 0}, */
+/* non-audio/video/container formats */
+{"hdv/aux-v", "HDV AUX-V", 0},
+{"hdv/aux-a", "HDV AUX-A", 0},
 /* formats with dynamic descriptions */
 {"audio/mpeg", NULL, 0},
 {"audio/x-adpcm", NULL, 0},
 {"audio/x-mace", NULL, 0},
 ret = "H.264";
 else if (strcmp (variant, "itu") == 0)
 ret = "ITU H.264";
 else if (strcmp (variant, "videosoft") == 0)
 ret = "Videosoft H.264";
+else if (strcmp (variant, "lead") == 0)
+ret = "Lead H.264";
 else {
 GST_WARNING ("Unknown H264 variant '%s'", variant);
 ret = "H.264";
 }
 return g_strdup (ret);

branch	RCL_3
changeset 29	567bb019e3e3
parent 0	0e761a78d257
child 30	7e817e7e631c