Commit d17a6f2c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

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

parent d8df8ef3
...@@ -674,7 +674,7 @@ static int Demux (demux_t *demux) ...@@ -674,7 +674,7 @@ static int Demux (demux_t *demux)
msg_Dbg (demux, "detected MPEG Audio"); msg_Dbg (demux, "detected MPEG Audio");
pt.init = mpa_init; pt.init = mpa_init;
pt.decode = mpa_decode; pt.decode = mpa_decode;
pt.frequency = 44100; pt.frequency = 90000;
break; break;
case 32: case 32:
......
...@@ -524,7 +524,7 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt ) ...@@ -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', 'g', 'a' ):
case VLC_FOURCC( 'm', 'p', '3', ' ' ): case VLC_FOURCC( 'm', 'p', '3', ' ' ):
p_es->i_payload_type = 14; 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; break;
case VLC_FOURCC( 'm', 'p', 'g', 'v' ): case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
p_es->i_payload_type = 32; p_es->i_payload_type = 32;
......
...@@ -1055,6 +1055,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -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', ' ' ): case VLC_FOURCC( 'm', 'p', '3', ' ' ):
id->i_payload_type = 14; id->i_payload_type = 14;
id->psz_enc = "MPA"; id->psz_enc = "MPA";
id->i_clock_rate = 90000; /* not 44100 */
id->pf_packetize = rtp_packetize_mpa; id->pf_packetize = rtp_packetize_mpa;
break; break;
case VLC_FOURCC( 'm', 'p', 'g', 'v' ): case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment