RTP/MPA: the standard frequency is 90kHz (MPEG PCR), oops

diff --git a/modules/demux/rtp.c b/modules/demux/rtp.c
index 3ea499ab7f7ee765d6381cbe7674cfd412129c35..c05cb210b33562ca8562e2c9035fd65b22c579e8 100644 (file)
--- a/modules/demux/rtp.c
+++ b/modules/demux/rtp.c
@@ -674,7 +674,7 @@ static int Demux (demux_t *demux)
             msg_Dbg (demux, "detected MPEG Audio");
             pt.init = mpa_init;
             pt.decode = mpa_decode;
-            pt.frequency = 44100;
+            pt.frequency = 90000;
             break;
 
           case 32:

diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index c31a4bda9333448ac44fe4d946403c1987ec2688..463af330ecf45c82a94890530ebec33361569d6f 100644 (file)
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -524,7 +524,7 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
         case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
         case VLC_FOURCC( 'm', 'p', '3', ' ' ):
             p_es->i_payload_type = 14;
-            asprintf( &p_es->psz_rtpmap, "MPA/%d", p_fmt->audio.i_rate );
+            p_es->psz_rtpmap = strdup( "MPA/90000" );
             break;
         case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
             p_es->i_payload_type = 32;

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index d09419372e2e8967db0765a896660d12af84cea5..61b4d3ab5a69a1b6371d0f6dc5eb17f2ea624758 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -1055,6 +1055,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
         case VLC_FOURCC( 'm', 'p', '3', ' ' ):
             id->i_payload_type = 14;
             id->psz_enc = "MPA";
+            id->i_clock_rate = 90000; /* not 44100 */
             id->pf_packetize = rtp_packetize_mpa;
             break;
         case VLC_FOURCC( 'm', 'p', 'g', 'v' ):