From 56172c60af9beec98bf9609ad953d8eeee7d2a36 Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Wed, 6 Jan 2010 11:53:23 +0100
Subject: [PATCH] gstffmpegcodecmap: Add mappings for new codecs

WMAPro
Dolby TrueHD
Atrac1
TwinVQ
---
 ext/ffmpeg/gstffmpegcodecmap.c | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index f380d8c..995874c 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -428,6 +428,10 @@ gst_ff_aud_caps_new (AVCodecContext * context, enum CodecID codec_id,
       case CODEC_ID_DTS:
         maxchannels = 6;
         break;
+      case CODEC_ID_WMAPRO:
+      case CODEC_ID_TRUEHD:
+        maxchannels = 8;
+        break;
       default:
         break;
     }
@@ -636,12 +640,22 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
       caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-eac3", NULL);
       break;
 
-    case CODEC_ID_ATRAC3:
+    case CODEC_ID_TRUEHD:
+      caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-true-hd", NULL);
+      break;
+
+    case CODEC_ID_ATRAC1:
       caps =
           gst_ff_aud_caps_new (context, codec_id, "audio/x-vnd.sony.atrac3",
           NULL);
       break;
 
+    case CODEC_ID_ATRAC3:
+      caps =
+          gst_ff_aud_caps_new (context, codec_id, "audio/x-vnd.sony.atrac1",
+          NULL);
+      break;
+
     case CODEC_ID_DTS:
       caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-dts", NULL);
       break;
@@ -825,6 +839,12 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
       }
     }
       break;
+    case CODEC_ID_WMAPRO:
+    {
+      caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-wma",
+          "wmaversion", G_TYPE_INT, 3, NULL);
+      break;
+    }
 
     case CODEC_ID_MACE3:
     case CODEC_ID_MACE6:
@@ -1442,6 +1462,9 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
             "samplesize", G_TYPE_INT, context->bits_per_coded_sample, NULL);
       }
       break;
+    case CODEC_ID_TWINVQ:
+      caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-twin-vq", NULL);
+      break;
     default:
       GST_DEBUG ("Unknown codec ID %d, please add mapping here", codec_id);
       break;
@@ -2425,7 +2448,7 @@ gst_ffmpeg_formatid_to_caps (const gchar * format_name)
   } else if (!strcmp (format_name, "mpc")) {
     caps = gst_caps_from_string ("audio/x-musepack, streamversion = (int) 7");
   } else if (!strcmp (format_name, "vqf")) {
-    caps = gst_caps_from_string ("audio/x-twinvq");
+    caps = gst_caps_from_string ("audio/x-vqf");
   } else {
     gchar *name;
 
@@ -2809,6 +2832,9 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
         case 2:
           id = CODEC_ID_WMAV2;
           break;
+        case 3:
+          id = CODEC_ID_WMAPRO;
+          break;
       }
     }
     if (id != CODEC_ID_NONE)
-- 
2.7.4