diff options
| author | bertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-18 14:22:30 +0000 |
|---|---|---|
| committer | bertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-18 14:22:30 +0000 |
| commit | 1991d31057f02564adfe48cf79d5a65cb0070fc6 (patch) | |
| tree | fe7f72417dbdfaaba0900abe6df9cf69d6b2b66c /libmpdemux | |
| parent | 7afbfd749f7686e42e7a2cee9e9ad0da2122aaf5 (diff) | |
| download | mpv-1991d31057f02564adfe48cf79d5a65cb0070fc6.tar.bz2 mpv-1991d31057f02564adfe48cf79d5a65cb0070fc6.tar.xz | |
Support for MPEG-4 (AAC) audio RTSP/RTP
Patch by Ross Finlayson <finlayson@live.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8988 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_rtp.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp index 4e837fe484..1b8a8057b6 100644 --- a/libmpdemux/demux_rtp.cpp +++ b/libmpdemux/demux_rtp.cpp @@ -247,6 +247,23 @@ extern "C" void demux_open_rtp(demuxer_t* demuxer) { wf->nBlockAlign = 33; wf->wBitsPerSample = 16; wf->cbSize = 0; + } else if (strcmp(subsession->codecName(), "MP4A-LATM") == 0) { + wf->wFormatTag = sh_audio->format = mmioFOURCC('m','p','4','a'); +#ifndef HAVE_FAAD + fprintf(stderr, "WARNING: Playing MPEG-4 (AAC) Audio requires the \"faad\" library!\n"); +#endif +#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1042761600) + fprintf(stderr, "WARNING: This audio stream might not play correctly. Please upgrade to version \"2003.01.17\" or later of the \"LIVE.COM Streaming Media\" libraries.\n"); +#else + // For the codec to work correctly, it needs "AudioSpecificConfig" + // data, which is parsed from the "StreamMuxConfig" string that + // was present (hopefully) in the SDP description: + unsigned codecdata_len; + sh_audio->codecdata + = parseStreamMuxConfigStr(subsession->fmtp_config(), + codecdata_len); + sh_audio->codecdata_len = codecdata_len; +#endif } else { fprintf(stderr, "Unknown mplayer format code for MIME type \"audio/%s\"\n", |