Mercurial > mplayer.hg
changeset 27101:2b2ee1d4a62a
add ffmdec and ffadpcmxa
force lavf demuxer on .str files
works on /game-formats/psx-str/
| author | compn |
|---|---|
| date | Tue, 24 Jun 2008 12:15:31 +0000 |
| parents | 7d34f6036301 |
| children | 7acfd8c9c3bb |
| files | Changelog etc/codecs.conf libmpdemux/extension.c libmpdemux/mp_taglists.c |
| diffstat | 4 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Changelog Tue Jun 24 09:30:52 2008 +0000 +++ b/Changelog Tue Jun 24 12:15:31 2008 +0000 @@ -7,7 +7,7 @@ * support for DTS WAV/DTS-CD passthrough by ad_hwac3 * Apple's raw YUV2 in MOV * LATM over LOAS AAC decoding via internal libfaad2 - * video game codecs: BFI video + * video game codecs: BFI video, PSX STR files * AVOption support for libavcodec-based decoders Demuxers:
--- a/etc/codecs.conf Tue Jun 24 09:30:52 2008 +0000 +++ b/etc/codecs.conf Tue Jun 24 12:15:31 2008 +0000 @@ -9,6 +9,14 @@ ; VIDEO CODECS ;============================================================================= +videocodec ffmdec + info "FFmpeg Sony PlayStation MDEC (Motion DECoder)" + status working + fourcc MDEC ; internal MPlayer FourCC + driver ffmpeg + dll mdec + out YV12 + videocodec ffsiff info "FFmpeg Beam Software SIFF decoder" status working @@ -2813,6 +2821,13 @@ driver ffmpeg dll adpcm_ea_maxis_xa +audiocodec ffadpcmxa + info "FFmpeg XA ADPCM audio" + status working + fourcc PSXA ; internal MPlayer FourCC + driver ffmpeg + dll adpcm_xa + audiocodec ffxandpcm info "FFmpeg XAN DPCM audio" comment "only works with libavformat demuxer"
--- a/libmpdemux/extension.c Tue Jun 24 09:30:52 2008 +0000 +++ b/libmpdemux/extension.c Tue Jun 24 12:15:31 2008 +0000 @@ -62,6 +62,7 @@ { "ape", DEMUXER_TYPE_LAVF }, { "apl", DEMUXER_TYPE_LAVF }, { "mac", DEMUXER_TYPE_LAVF }, + { "str", DEMUXER_TYPE_LAVF }, // At least the following are hacks against broken autodetection // that should not be there
--- a/libmpdemux/mp_taglists.c Tue Jun 24 09:30:52 2008 +0000 +++ b/libmpdemux/mp_taglists.c Tue Jun 24 12:15:31 2008 +0000 @@ -27,6 +27,7 @@ { CODEC_ID_ADPCM_EA_MAXIS_XA, MKTAG('A', 'D', 'X', 'A')}, { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')}, { CODEC_ID_ADPCM_THP, MKTAG('T', 'H', 'P', 'A')}, + { CODEC_ID_ADPCM_XA, MKTAG('P', 'S', 'X', 'A')}, { CODEC_ID_AMR_NB, MKTAG('n', 'b', 0, 0)}, { CODEC_ID_COOK, MKTAG('c', 'o', 'o', 'k')}, { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')}, @@ -69,6 +70,7 @@ { CODEC_ID_FLIC, MKTAG('F', 'L', 'I', 'C')}, { CODEC_ID_IDCIN, MKTAG('I', 'D', 'C', 'I')}, { CODEC_ID_INTERPLAY_VIDEO, MKTAG('I', 'N', 'P', 'V')}, + { CODEC_ID_MDEC, MKTAG('M', 'D', 'E', 'C')}, { CODEC_ID_RL2, MKTAG('R', 'L', '2', 'V')}, { CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')}, { CODEC_ID_THP, MKTAG('T', 'H', 'P', 'V')},