Mercurial > mplayer.hg
changeset 25011:39b7d358106a
support extradata for audio streams
| author | lu_zero |
|---|---|
| date | Tue, 13 Nov 2007 23:01:25 +0000 |
| parents | 9a4d15a28d12 |
| children | e800e0905050 |
| files | libmpdemux/demux_nemesi.c |
| diffstat | 1 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_nemesi.c Tue Nov 13 23:00:12 2007 +0000 +++ b/libmpdemux/demux_nemesi.c Tue Nov 13 23:01:25 2007 +0000 @@ -156,11 +156,14 @@ for (; media; media=media->next) { sdp_medium_info * info = media->medium_info; rtp_session * sess = media->rtp_sess; + rtp_buff buff; int media_format = atoi(info->fmts); rtp_pt * ptinfo = rtp_get_pt_info(sess, media_format); char const * format_name = ptinfo ? ptinfo->name : NULL; + memset(&buff, 0, sizeof(rtp_buff)); + if (sess->parsers[media_format] == NULL) { mp_msg(MSGT_DEMUX, MSGL_ERR, "libNemesi unsupported media format: %s\n", @@ -176,13 +179,21 @@ if (ptinfo->type == AU) { if (ndsd->session[NEMESI_SESSION_AUDIO] == NULL) { sh_audio_t* sh_audio = new_sh_audio(demuxer,0); - WAVEFORMATEX* wf = calloc(1,sizeof(WAVEFORMATEX)); + WAVEFORMATEX* wf; demux_stream_t* d_audio = demuxer->audio; mp_msg(MSGT_DEMUX, MSGL_INFO, "Detected as AUDIO stream...\n"); link_session_and_fetch_conf(ndsd, NEMESI_SESSION_AUDIO, - sess, NULL, NULL); + sess, &buff, NULL); + + if (buff.len) { + wf = calloc(1,sizeof(WAVEFORMATEX)+buff.len); + wf->cbSize = buff.len; + memcpy(wf+1, buff.data, buff.len); + } else { + wf = calloc(1,sizeof(WAVEFORMATEX)); + } sh_audio->wf = wf; d_audio->sh = sh_audio; @@ -211,8 +222,6 @@ BITMAPINFOHEADER* bih; demux_stream_t* d_video; int fps = 0; - rtp_buff buff; - memset(&buff, 0, sizeof(rtp_buff)); mp_msg(MSGT_DEMUX, MSGL_INFO, "Detected as VIDEO stream...\n");