RTP: set audio channels directly rather than channels count

[vlc] / modules / access / rtp / input.c

diff --git a/modules/access/rtp/input.c b/modules/access/rtp/input.c
index 732252883ee9954f236b197b1f477be6b4540630..230014301181ea0b49ad49f3b8192373eb645cc0 100644 (file)
--- a/modules/access/rtp/input.c
+++ b/modules/access/rtp/input.c
@@ -13,7 +13,7 @@
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
@@ -69,8 +69,7 @@ static void rtp_process (demux_t *demux, block_t *block)
     /* TODO: use SDP and get rid of this hack */
     if (unlikely(sys->autodetect))
     {   /* Autodetect payload type, _before_ rtp_queue() */
-        if (rtp_autodetect (demux, sys->session, block))
-            goto drop;
+        rtp_autodetect (demux, sys->session, block);
         sys->autodetect = false;
     }
 
@@ -163,7 +162,6 @@ void *rtp_stream_thread (void *opaque)
     for (;;)
     {
         /* There is no reordering on stream sockets, so no timeout. */
-        /* FIXME: hack rtp_dequeue() to skip the reordering/timer */
         ssize_t val;
 
         uint16_t frame_len;
@@ -186,6 +184,7 @@ void *rtp_stream_thread (void *opaque)
 
         int canc = vlc_savecancel ();
         rtp_process (demux, block);
+        rtp_dequeue_force (demux, sys->session);
         vlc_restorecancel (canc);
     }
 #else