[MPlayer-cvslog] r37559 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c

[rtogni]

Author: rtogni
Date: Tue Nov 24 23:56:40 2015
New Revision: 37559

Log:
Add support for video codecs:
apng
AVS
CPiA (untested)
EA TGQ and TQI
Cryo HNM4
Canopus HQ
RSCC/ISCC

Modified:
   trunk/etc/codecs.conf
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Sat Nov 21 21:29:12 2015	(r37558)
+++ trunk/etc/codecs.conf	Tue Nov 24 23:56:40 2015	(r37559)
@@ -25,6 +25,14 @@ videocodec ffansi
   dll ansi
   out BGR8
 
+videocodec ffavs
+  info "FFmpeg Audio Video Standard (game format)"
+  status working
+  fourcc "AVS "
+  driver ffmpeg
+  dll avs
+  out BGR8
+
 videocodec ffbinkvideo
   info "FFmpeg Bink Video"
   status working
@@ -61,6 +69,30 @@ videocodec ffeamad
   dll eamad
   out YV12
 
+videocodec ffeatgq
+  info "FFmpeg EA TGQ"
+  status working
+  fourcc pQGT ; internal MPlayer FourCC
+  driver ffmpeg
+  dll eatgq
+  out YV12
+
+videocodec ffeatqi
+  info "FFmpeg EA TQI"
+  status working
+  fourcc pIQT ; internal MPlayer FourCC
+  driver ffmpeg
+  dll eatqi
+  out YV12
+
+videocodec ffhnm4
+  info "FFmpeg Cryo Interactive Entertainment HMN4"
+  status working
+  fourcc HNM4 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll hnm4video
+  out BGR8
+
 videocodec ffmvi1
   info "FFmpeg Motion Pixels"
   status working
@@ -126,6 +158,14 @@ videocodec ffkmvc
   driver ffmpeg
   dll "kmvc"
 
+videocodec ffrscc
+  info "FFmpeg innoHeim/Rsupport Screen Capture Codec"
+  status working
+  fourcc RSCC,ISCC
+  driver ffmpeg
+  dll rscc
+  out BGRA
+
 videocodec ffzmbv
   info "FFmpeg Zip Motion-Block Video"
   status working
@@ -708,6 +748,15 @@ videocodec mpng
   driver mpng
   out BGR32,BGR24,BGR8,Y800
 
+videocodec ffapng
+  info "FFmpeg APNG"
+  status working
+  fourcc apng,APNG
+  driver ffmpeg
+  dll apng
+  out BGR32,BGR8,Y800,RGB64BE,RGB48BE,RGBA,RGB24,BGR8
+  out Y8A,Y16BE
+
 videocodec ffptx
   info "FFmpeg V.Flash PTX"
   status working
@@ -2219,7 +2268,7 @@ videocodec ffh263
   fourcc VX1K     ; Agora Labs VX1000S H263
   fourcc lsvm     ; lsv h263
   driver ffmpeg
-  dll h263
+  dll h263p
   out YV12,I420,IYUV
 
 videocodec ffzygo
@@ -2802,6 +2851,14 @@ videocodec canopushq
   dll "CUVCcodc.dll"
   out BGR24
 
+videocodec ffcanopushq
+  status working
+  info "FFmpeg Canopus HQ Codec"
+  fourcc CUVC
+  driver ffmpeg
+  dll hq_hqa
+  out 422P,422A
+
 videocodec canopusll
   status working
   info "Canopus Lossless Codec"
@@ -3073,6 +3130,15 @@ videocodec cjpg
   out UYVY
   out BGR24,BGR15
 
+videocodec ffcpia
+  info "CPiA webcam"
+  comment "decodes data from v4l2 source, untested"
+  status working
+  fourcc CPiA ; internal MPlayer FourCC
+  driver ffmpeg
+  dll cpia
+  out YV12
+
 videocodec kensington
   info "kensington webcam"
   status working

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Sat Nov 21 21:29:12 2015	(r37558)
+++ trunk/libmpdemux/mp_taglists.c	Tue Nov 24 23:56:40 2015	(r37559)
@@ -109,6 +109,7 @@ static const struct AVCodecTag mp_codeci
 #if LIBAVUTIL_VERSION_MICRO >= 100
     { AV_CODEC_ID_ATRAC3P,           0xE923AABF},
 #endif
+    { AV_CODEC_ID_CPIA,              MKTAG('C', 'P', 'i', 'A') },
     { AV_CODEC_ID_DTS,               0x2001 },
     { AV_CODEC_ID_DVVIDEO,           MKTAG('d', 'v', 's', 'd') },
     { AV_CODEC_ID_EAC3,              MKTAG('E', 'A', 'C', '3') },
@@ -170,6 +171,7 @@ static const struct AVCodecTag mp_bmp_ta
 #if LIBAVUTIL_VERSION_MICRO >= 100
     { AV_CODEC_ID_HEVC,              MKTAG('H', 'E', 'V', 'C') },
 #endif
+    { AV_CODEC_ID_HNM4_VIDEO,        MKTAG('H', 'N', 'M', '4') },
     { AV_CODEC_ID_IDCIN,             MKTAG('I', 'D', 'C', 'I') },
     { AV_CODEC_ID_INTERPLAY_VIDEO,   MKTAG('I', 'N', 'P', 'V') },
     { AV_CODEC_ID_JV,                MKTAG('F', 'F', 'J', 'V') },
@@ -183,6 +185,7 @@ static const struct AVCodecTag mp_bmp_ta
 #endif
     { AV_CODEC_ID_MXPEG,             MKTAG('M', 'X', 'P', 'G') },
     { AV_CODEC_ID_NUV,               MKTAG('N', 'U', 'V', '1') },
+    { AV_CODEC_ID_APNG,              MKTAG('a', 'p', 'n', 'g') },
     { AV_CODEC_ID_RL2,               MKTAG('R', 'L', '2', 'V') },
     { AV_CODEC_ID_ROQ,               MKTAG('R', 'o', 'Q', 'V') },
     { AV_CODEC_ID_RV10,              MKTAG('R', 'V', '1', '0') },
@@ -196,8 +199,10 @@ static const struct AVCodecTag mp_bmp_ta
     { AV_CODEC_ID_SVQ3,              MKTAG('S', 'V', 'Q', '3') },
     { AV_CODEC_ID_TMV,               MKTAG('t', 'm', 'v', '8') },
     { AV_CODEC_ID_TGV,               MKTAG('f', 'V', 'G', 'T') },
+    { AV_CODEC_ID_TGQ,               MKTAG('p', 'Q', 'G', 'T') },
     { AV_CODEC_ID_THP,               MKTAG('T', 'H', 'P', 'V') },
     { AV_CODEC_ID_TIERTEXSEQVIDEO,   MKTAG('T', 'S', 'E', 'Q') },
+    { AV_CODEC_ID_TQI,               MKTAG('p', 'I', 'Q', 'T') },
     { AV_CODEC_ID_TXD,               MKTAG('T', 'X', 'D', 'V') },
     { AV_CODEC_ID_VP6A,              MKTAG('V', 'P', '6', 'A') },
     { AV_CODEC_ID_VMDVIDEO,          MKTAG('V', 'M', 'D', 'V') },