[MPlayer-dev-eng] [PATCH] Support FFmpeg EA ADPCM R1, R2, R3 audio decoders

[Paul B Mahol]

---
 etc/codecs.conf          |   21 +++++++++++++++++++++
 libmpdemux/mp_taglists.c |    3 +++
 2 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 43e89c9..db3b95c 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -4561,6 +4561,27 @@ audiocodec ffadpcmea
   driver ffmpeg
   dll adpcm_ea
 
+audiocodec ffadpcmear1
+  info "FFmpeg EA ADPCM R1 audio"
+  status working
+  fourcc EAR1 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll adpcm_ea_r1
+
+audiocodec ffadpcmear2
+  info "FFmpeg EA ADPCM R2 audio"
+  status working
+  fourcc EAR2 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll adpcm_ea_r2
+
+audiocodec ffadpcmear3
+  info "FFmpeg EA ADPCM R3 audio"
+  status working
+  fourcc EAR3 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll adpcm_ea_r3
+
 audiocodec ffadpcmeamaxis
   info "FFmpeg EA MAXIS XA ADPCM audio"
   status working
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 05f44e7..ac36057 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -30,6 +30,9 @@ static const struct AVCodecTag mp_wav_tags[] = {
     { CODEC_ID_ADPCM_4XM,         MKTAG('4', 'X', 'M', 'A')},
     { CODEC_ID_ADPCM_ADX,         MKTAG('S', 'a', 'd', 'x')},
     { CODEC_ID_ADPCM_EA,          MKTAG('A', 'D', 'E', 'A')},
+    { CODEC_ID_ADPCM_EA_R1,       MKTAG('E', 'A', 'R', '1')},
+    { CODEC_ID_ADPCM_EA_R2,       MKTAG('E', 'A', 'R', '2')},
+    { CODEC_ID_ADPCM_EA_R3,       MKTAG('E', 'A', 'R', '3')},
     { CODEC_ID_ADPCM_EA_MAXIS_XA, MKTAG('A', 'D', 'X', 'A')},
     { CODEC_ID_ADPCM_IMA_EA_EACS, MKTAG('E', 'A', 'C', 'S')},
     { CODEC_ID_ADPCM_IMA_ISS,     MKTAG('A', 'I', 'S', 'S')},
-- 
1.7.7