codec map: Add a mapping for the OKI ADPCM variant.
authorJan Schmidt <jan@centricular.com>
Mon, 14 Dec 2020 04:33:16 +0000 (15:33 +1100)
committerSebastian Dröge <sebastian@centricular.com>
Mon, 14 Dec 2020 09:09:35 +0000 (11:09 +0200)
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-libav/-/merge_requests/111>

docs/gst_plugins_cache.json
ext/libav/gstavcodecmap.c

index 016fbca..784d7dd 100644 (file)
                 "long-name": "libav ADPCM IMA Dialogic OKI decoder",
                 "pad-templates": {
                     "sink": {
-                        "caps": "unknown/unknown:\n",
+                        "caps": "audio/x-adpcm:\n         layout: oki\n",
                         "direction": "sink",
                         "presence": "always"
                     },
index 4688530..b5be4bb 100644 (file)
@@ -1983,6 +1983,7 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id,
     case AV_CODEC_ID_ADPCM_IMA_WAV:
     case AV_CODEC_ID_ADPCM_IMA_DK3:
     case AV_CODEC_ID_ADPCM_IMA_DK4:
+    case AV_CODEC_ID_ADPCM_IMA_OKI:
     case AV_CODEC_ID_ADPCM_IMA_WS:
     case AV_CODEC_ID_ADPCM_IMA_SMJPEG:
     case AV_CODEC_ID_ADPCM_IMA_AMV:
@@ -2022,6 +2023,9 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id,
         case AV_CODEC_ID_ADPCM_IMA_DK4:
           layout = "dk4";
           break;
+        case AV_CODEC_ID_ADPCM_IMA_OKI:
+          layout = "oki";
+          break;
         case AV_CODEC_ID_ADPCM_IMA_WS:
           layout = "westwood";
           break;
@@ -4167,6 +4171,8 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
       id = AV_CODEC_ID_ADPCM_IMA_DK3;
     } else if (!strcmp (layout, "dk4")) {
       id = AV_CODEC_ID_ADPCM_IMA_DK4;
+    } else if (!strcmp (layout, "oki")) {
+      id = AV_CODEC_ID_ADPCM_IMA_OKI;
     } else if (!strcmp (layout, "westwood")) {
       id = AV_CODEC_ID_ADPCM_IMA_WS;
     } else if (!strcmp (layout, "iss")) {