From b157e76e61e36db3066bf8add7444117cc779b9b Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sat, 21 Jun 2003 16:06:28 +0000 Subject: [PATCH] Refinement of ADPCM codecs, added realaudio/dvaudio, added some x- prefixes where appropriate (see IANA) Original commit message from CVS: Refinement of ADPCM codecs, added realaudio/dvaudio, added some x- prefixes where appropriate (see IANA) --- docs/random/mimetypes | 75 +++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/docs/random/mimetypes b/docs/random/mimetypes index 42cba748b8..d826bae421 100644 --- a/docs/random/mimetypes +++ b/docs/random/mimetypes @@ -77,7 +77,7 @@ audio), but these are usually used in conjunction with each other. properties: 'systemstream' = TRUE (BOOLEAN) 4 - ASF (Microsoft) - mimetype: video/x-ms-asf + mimetype: video/x-asf 5 - WAV (PCM) mimetype: audio/x-wav @@ -88,9 +88,10 @@ audio), but these are usually used in conjunction with each other. 7 - DV (Digital Video) mimetype: video/dv properties: 'systemstream' = TRUE (BOOLEAN) + 'format' = "PAL"/"NTSC" (STRING) 8 - Ogg (Xiph) - mimetype: application/x-ogg + mimetype: application/ogg 9 - Matroska mimetype: video/x-mkv @@ -125,6 +126,7 @@ Preface - (optional) properties for all video formats: YUY2: packed, Y-U-Y-V order, U/V hor 2x subsampled (YUV-4:2:2, 16 bpp) YVYU: packed, Y-V-Y-U order, U/V hor 2x subsampled (YUV-4:2:2, 16 bpp) UYVY: packed, U-Y-V-Y order, U/V hor 2x subsampled (YUV-4:2:2, 16 bpp) + Y41P: packed, UYVYUYVYYYYY order, U/V hor 4x subsampled (YUV-4:1:1, 12 bpp) Y42B: planar, Y-U-V order, U/V hor 2x subsampled (YUV-4:2:2, 16 bpp) YV12: planar, Y-V-U order, U/V hor+ver 2x subsampled (YUV-4:2:0, 12 bpp) @@ -191,8 +193,8 @@ Preface - (optional) properties for all video formats: 'mpegversion' = 1/2/4 (INT) known fourccs: MPEG, MPGI -4 - DivX 3.x, 4.x and 5.x video - mimetype: video/divx +4 - DivX 3.x, 4.x and 5.x video (divx.com) + mimetype: video/x-divx optional properties: 'divxversion' = 3/4/5 (INT) known fourccs: DIV3, DIV4, DIV5, DIVX, DX50, DIVX, divx @@ -202,7 +204,7 @@ Preface - (optional) properties for all video formats: known fourccs: MPG4, MP42, MP43 6 - Motion-JPEG (official and extended) - mimetype: video/jpeg + mimetype: video/x-jpeg known fourccs: MJPG (YUY2 MJPEG), JPEG (any), PIXL (Pinnacle/Miro), VIXL 7 - Sorensen (Quicktime - SVQ1/SVQ3) @@ -210,11 +212,11 @@ Preface - (optional) properties for all video formats: properties: 'svqversion' = 1/3 (INT) 8 - H263 and related codecs - mimetype: video/h263 + mimetype: video/x-h263 known fourccs: H263, i263, M263, x263, VDOW, VIVO 9 - RealVideo (Real) - mimetype: video/realvideo + mimetype: video/x-real 10 - Digital Video (DV) mimetype: video/dv @@ -222,22 +224,22 @@ Preface - (optional) properties for all video formats: known fourccs: DVSD, dvsd 11 - Windows Media Video 1 and 2 (WMV) - mimetype: video/wmv + mimetype: video/x-wmv properties: 'wmvversion' = 1/2 (INT) -12 - XviD - mimetype: video/xvid +12 - XviD (xvid.org) + mimetype: video/x-xvid known fourccs: xvid, XVID -13 - 3IVX - mimetype: video/3ivx +13 - 3IVX (3ixv.org) + mimetype: video/x-3ivx known fourccs: 3IV0, 3IV1, 3IV2 14 - Ogg/Tarkin (Xiph) mimetype: video/x-tarkin 15 - VP3 - mimetype: video/vp3 + mimetype: video/x-vp3 16 - Ogg/Theora (Xiph, VP3-like) mimetype: video/x-theora @@ -246,10 +248,17 @@ Preface - (optional) properties for all video formats: mimetype: video/x-huffyuv known fourccs: HFYU -18 - FF Video 1 +18 - FF Video 1 (FFMPEG) mimetype: video/x-ffv properties: 'ffvversion' = 1 (INT) +19 - H264 + mimetype: video/x-h264 + +20 - Indeo 3 (Intel) + mimetype: video/x-indeo + properties: 'indeoversion' = 3 (INT) + TODO: colorspace identifications for MJPEG? How? Move MPEG4-compatible codecs over to video/mpeg with a subtype (xvid, divx3, divx4, divx5, iso, ...)? interlacing? @@ -267,7 +276,7 @@ Preface - (optional) properties for all audio formats: properties: 'width' = X (INT) <- memory bits per sample 'depth' = X (INT) <- used bits per sample 'signedness' = X (BOOLEAN) - 'endianness' = 1234/4321 <- endianness of audio stream + 'endianness' = 1234/4321 (INT) 2 - Raw Audio (floating point format) mimetype: audio/x-raw-float @@ -282,18 +291,19 @@ Preface - (optional) properties for all audio formats: mimetype: audio/x-mulaw 5 - MPEG-1 layer 1/2/3 audio - mimetype: audio/x-mp3 - properties: 'layer' = 1/2/3 (INT) + mimetype: audio/mpeg + properties: 'mpegversion' = 1 (INT) + 'layer' = 1/2/3 (INT) 6 - Ogg/Vorbis - mimetype: audio/vorbis + mimetype: audio/x-vorbis 7 - Windows Media Audio 1 and 2 (WMA) - mimetype: audio/wma + mimetype: audio/x-wma properties: 'wmaversion' = 1/2 (INT) 8 - AC3 - mimetype: audio/a52 + mimetype: audio/x-a52 9 - FLAC (Free Lossless Audio Codec) mimetype: audio/x-flac @@ -303,18 +313,27 @@ Preface - (optional) properties for all audio formats: properties: 'maceversion' = 3/6 (INT) 11 - MPEG-4 AAC - mimetype: audio/x-mpeg-aac + mimetype: audio/mpeg properties: 'mpegversion' = 4 (INT) - 'systemstream' = FALSE (BOOLEAN) -12 - IMA ADPCM Quicktime - mimetype: audio/x-ima-adpcm-quicktime +12 - (IMA) ADPCM (Quicktime/WAV/Microsoft/4XM) + mimetype: audio/x-adpcm + properties: 'layout' = "quicktime"/"wav"/"microsoft"/"4xm" (STRING) -13 - IMA ADPCM WAV - mimetype: audio/x-ima-adpcm-wav + Note: the difference between each of these is the number of + samples packaed together per channel. For WAV, for + example, each sample is 4 bit, and 8 samples are packed + together per channel in the bytestream. For the others, + refer to technical documentation. -14 - ADPCM MS (Microsoft?) - mimetype: audio/x-adpcm-ms +13 - RealAudio (Real) + mimetype: audio/x-real + properties: 'bitrate' = 14400/28800 (INT) + +14 - DV Audio + mimetype: audio/dv + +TODO: adpcm/dv needs confirmation from someone with knowledge... 4 - Status of this document ---------------------------