Changeset e4f4f59ee368c4dc1c7ed6e344945fae36e63ef2

Timestamp:

07/03/05 14:05:06 (4 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1110200706 +0000

git-parent:

[509b4b9d1dcc4f8ee2c3fafb7fc226245ad54e79]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1110200706 +0000

Message:

- XA file demux
- EA ADPCM decoder (Maxis games)
(- corner case memleak in adpcm decoder)

Files:

• configure.ac (modified) (1 diff)
• modules/codec/adpcm.c (modified) (10 diffs)
• modules/demux/Modules.am (modified) (1 diff)

configure.ac

@@ -984 +984 @@
-VLC_ADD_PLUGINS([id3 playlist export sgimb m3u xtag])
-VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo])
-
+ xa
-VLC_ADD_PLUGINS([access_directory access_file access_udp access_tcp])
-VLC_ADD_PLUGINS([access_http access_mms access_ftp ipv4])

modules/codec/adpcm.c

@@ -6 +6 @@
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ *          Remi Denis-Courmont <courmisch # via.ecp.fr>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -55 +56 @@
-    ADPCM_MS,
-    ADPCM_DK3,
-
+
+
-};
-
@@ -73 +75 @@
-static void DecodeAdpcmDk4   ( decoder_t *, int16_t *, uint8_t * );
-static void DecodeAdpcmDk3   ( decoder_t *, int16_t *, uint8_t * );
+static void DecodeAdpcmEA    ( decoder_t *, int16_t *, uint8_t * );
-
-static int pi_channels_maps[6] =
@@ -136 +139 @@
-        case VLC_FOURCC('m','s',0x00,0x61): /* Duck DK4 ADPCM */
-        case VLC_FOURCC('m','s',0x00,0x62): /* Duck DK3 ADPCM */
+        case VLC_FOURCC('X','A','J', 0): /* EA ADPCM */
-            break;
-        default:
-            return VLC_EGENERIC;
+    }
+
+    if( p_dec->fmt_in.audio.i_channels <= 0 ||
+        p_dec->fmt_in.audio.i_channels > 5 )
+    {
+        msg_Err( p_dec, "bad channels count(1-5)" );
+        return VLC_EGENERIC;
+    }
+
+    if( p_dec->fmt_in.audio.i_rate <= 0 )
+    {
+        msg_Err( p_dec, "bad samplerate" );
+        return VLC_EGENERIC;
-    }
-
@@ -146 +163 @@
-    {
-        msg_Err( p_dec, "out of memory" );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-
@@ -178 +182 @@
-        case VLC_FOURCC('m','s',0x00,0x62): /* Duck DK3 ADPCM */
-            p_sys->codec = ADPCM_DK3;
+            break;
+        case VLC_FOURCC('X','A','J', 0): /* EA ADPCM */
+            p_sys->codec = ADPCM_EA;
+            p_dec->fmt_in.p_extra = calloc( 2 * p_dec->fmt_in.audio.i_channels,
+                                            sizeof( int16_t ) );
+            if( p_dec->fmt_in.p_extra == NULL )
+            {
+                free( p_sys );
+                return VLC_ENOMEM;
+            }
-            break;
-    }
@@ -217 +231 @@
-        p_sys->i_samplesperblock = ( 4 * ( p_sys->i_block - 16 ) + 2 )/ 3;
-        break;
+    case ADPCM_EA:
+        p_sys->i_samplesperblock =
+            2 * (p_sys->i_block - p_dec->fmt_in.audio.i_channels) /
+            p_dec->fmt_in.audio.i_channels;
-    }
-
@@ -304 +322 @@
-                            p_block->p_buffer );
-            break;
+        case ADPCM_EA:
+            DecodeAdpcmEA( p_dec, (int16_t*)p_out->p_buffer,
+                           p_block->p_buffer );
-        default:
-            break;
@@ -325 +346 @@
-    decoder_sys_t *p_sys = p_dec->p_sys;
-
+    if( p_sys->codec == ADPCM_EA )
+        free( p_dec->fmt_in.p_extra );
-    free( p_sys );
-}
@@ -694 +717 @@
-    }
-}
+
+
+/*
+ * EA ADPCM
+ */
+#define MAX_CHAN 5
+static void DecodeAdpcmEA( decoder_t *p_dec, int16_t *p_sample,
+                           uint8_t *p_buffer )
+{
+    static const uint32_t EATable[]=
+    {
+        0x00000000, 0x000000F0, 0x000001CC, 0x00000188,
+        0x00000000, 0x00000000, 0xFFFFFF30, 0xFFFFFF24,
+        0x00000000, 0x00000001, 0x00000003, 0x00000004,
+        0x00000007, 0x00000008, 0x0000000A, 0x0000000B,
+        0x00000000, 0xFFFFFFFF, 0xFFFFFFFD, 0xFFFFFFFC
+    };
+    decoder_sys_t *p_sys  = p_dec->p_sys;
+    uint8_t *p_end;
+    unsigned i_channels, c;
+    int16_t *prev, *cur;
+    int32_t c1[MAX_CHAN], c2[MAX_CHAN];
+    int8_t d[MAX_CHAN];
+
+    i_channels = p_dec->fmt_in.audio.i_channels;
+    p_end = &p_buffer[p_sys->i_block];
+
+    prev = (int16_t *)p_dec->fmt_in.p_extra;
+    cur = prev + i_channels;
+
+    for (c = 0; c < i_channels; c++)
+    {
+        uint8_t input;
+
+        input = p_buffer[c];
+        c1[c] = EATable[input >> 4];
+        c2[c] = EATable[(input >> 4) + 4];
+        d[c] = (input & 0xf) + 8;
+    }
+
+    for( p_buffer += i_channels; p_buffer < p_end ; p_buffer += i_channels)
+    {
+        for (c = 0; c < i_channels; c++)
+        {
+            int32_t spl;
+
+            spl = (p_buffer[c] >> 4) & 0xf;
+            spl = (spl << 0x1c) >> d[c];
+            spl = (spl + cur[c] * c1[c] + prev[c] * c2[c] + 0x80) >> 8;
+            CLAMP( spl, -32768, 32767 );
+            prev[c] = cur[c];
+            cur[c] = spl;
+
+            *(p_sample++) = spl;
+        }
+
+        for (c = 0; c < i_channels; c++)
+        {
+            int32_t spl;
+
+            spl = p_buffer[c] & 0xf;
+            spl = (spl << 0x1c) >> d[c];
+            spl = (spl + cur[c] * c1[c] + prev[c] * c2[c] + 0x80) >> 8;
+            CLAMP( spl, -32768, 32767 );
+            prev[c] = cur[c];
+            cur[c] = spl;
+
+            *(p_sample++) = spl;
+        }
+    }
+}

modules/demux/Modules.am

@@ -22 +22 @@
-SOURCES_subtitle = subtitle.c
-SOURCES_vobsub = vobsub.c
+SOURCES_xa = xa.c