Changeset 7b087611c2486e4a76e3bb9f380a36880e713bc0

Timestamp:

12/30/07 05:25:04 (6 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1198988704 +0000

git-parent:

[1b26ff77b0fd9ea5d713c7acd52259e6c68efbf5]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1198988704 +0000

Message:

audio_filter/converter/dtstospdif.c: Fix odd frame sized DTS conversion to SPDIF. Patch by Julien Robert <jul at mac.com>. (Reported to fix most of the current DTS issues).

Files:

• THANKS (modified) (1 diff)
• modules/audio_filter/converter/dtstospdif.c (modified) (4 diffs)

THANKS

@@ -123 +123 @@
-Julien Blache <jb at technologeek.org> - disc ejection code
-Julien Plissonneau Duquène - JACK audio input module 
+Julien Robert <jul at mac.com> - DTS to SPDIF fixes.
-Kang Jeong-Hee <keizie at gmail dot com> - Korean translation
-Kenneth Ostby <kenneo -at- idi -dot- ntnu -dot- no> - Audioscrobbler plugin

modules/audio_filter/converter/dtstospdif.c

@@ -157 +157 @@
-    for( i_frame = 0; i_frame < 3; i_frame++ )
-    {
+        uint16_t i_length_padded = i_length;
-        byte_t * p_out = p_out_buf->p_buffer + (i_frame * i_fz);
-        byte_t * p_in = p_filter->p_sys->p_buf + (i_frame * i_length);
@@ -171 +172 @@
-        {
-            p_filter->p_libvlc->pf_memcpy( p_out, p_sync_be, 6 );
-5
+4
-            p_out[6] = (( i_length ) >> 5 ) & 0xFF;
-            p_out[7] = ( i_length << 3 ) & 0xFF;
@@ -203 +204 @@
-            }
-#endif
+            /* If i_length is odd, we have to adjust swapping a bit.. */
+            if( i_length & 1 )
+            {
+                p_out[8+i_length-1] = 0;
+                p_out[8+i_length] = p_in[i_length-1];
+                i_length_padded++;
+            }
-        }
-        else
@@ -211 +219 @@
-        if( i_fz > i_length + 8 )
-        {
-
-
+_padded
+_padded
-        }
-    }