Mercurial > mplayer.hg

comparison libmpdemux/demux_real.c @ 36811:92dd1764392a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
demuxers: remove pointless sh->ds assignments. The new_sh_* functions have been fixed a long time ago to do this.
author reimar
date Sun, 23 Feb 2014 18:14:44 +0000
parents e4eaa6407e24
children 91b00a4407cd
comparison
equal deleted inserted replaced
36810:576724706b75 36811:92dd1764392a
1075 1075
1076 if((unsigned)rm_stream_id<MAX_STREAMS){ 1076 if((unsigned)rm_stream_id<MAX_STREAMS){
1077 if(demuxer->audio->id==-1 && demuxer->a_streams[mp_stream_id]){ 1077 if(demuxer->audio->id==-1 && demuxer->a_streams[mp_stream_id]){
1078 sh_audio_t *sh = demuxer->a_streams[mp_stream_id]; 1078 sh_audio_t *sh = demuxer->a_streams[mp_stream_id];
1079 demuxer->audio->id=mp_stream_id; 1079 demuxer->audio->id=mp_stream_id;
1080 sh->ds=demuxer->audio;
1081 demuxer->audio->sh=sh; 1080 demuxer->audio->sh=sh;
1082 priv->audio_buf = calloc(priv->sub_packet_h[demuxer->audio->id], priv->audiopk_size[demuxer->audio->id]); 1081 priv->audio_buf = calloc(priv->sub_packet_h[demuxer->audio->id], priv->audiopk_size[demuxer->audio->id]);
1083 priv->audio_timestamp = calloc(priv->sub_packet_h[demuxer->audio->id], sizeof(double)); 1082 priv->audio_timestamp = calloc(priv->sub_packet_h[demuxer->audio->id], sizeof(double));
1084 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected RM audio ID = %d (rm id %d)\n",mp_stream_id, rm_stream_id); 1083 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected RM audio ID = %d (rm id %d)\n",mp_stream_id, rm_stream_id);
1085 goto got_audio; 1084 goto got_audio;
1086 } 1085 }
1087 1086
1088 if(demuxer->video->id==-1 && demuxer->v_streams[mp_stream_id]){ 1087 if(demuxer->video->id==-1 && demuxer->v_streams[mp_stream_id]){
1089 sh_video_t *sh = demuxer->v_streams[mp_stream_id]; 1088 sh_video_t *sh = demuxer->v_streams[mp_stream_id];
1090 demuxer->video->id=mp_stream_id; 1089 demuxer->video->id=mp_stream_id;
1091 sh->ds=demuxer->video;
1092 demuxer->video->sh=sh; 1090 demuxer->video->sh=sh;
1093 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected RM video ID = %d (rm id %d)\n",mp_stream_id, rm_stream_id); 1091 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected RM video ID = %d (rm id %d)\n",mp_stream_id, rm_stream_id);
1094 goto got_video; 1092 goto got_video;
1095 } 1093 }
1096 1094
1508 priv->a_bitrate = bitrate; 1506 priv->a_bitrate = bitrate;
1509 mp_msg(MSGT_DEMUX,MSGL_DBG2,"Multirate autoselected audio id %d with bitrate %d\n", stream_id, bitrate); 1507 mp_msg(MSGT_DEMUX,MSGL_DBG2,"Multirate autoselected audio id %d with bitrate %d\n", stream_id, bitrate);
1510 } 1508 }
1511 1509
1512 if(demuxer->audio->id==stream_id){ 1510 if(demuxer->audio->id==stream_id){
1513 sh->ds=demuxer->audio;
1514 demuxer->audio->sh=sh; 1511 demuxer->audio->sh=sh;
1515 priv->audio_buf = calloc(priv->sub_packet_h[demuxer->audio->id], priv->audiopk_size[demuxer->audio->id]); 1512 priv->audio_buf = calloc(priv->sub_packet_h[demuxer->audio->id], priv->audiopk_size[demuxer->audio->id]);
1516 priv->audio_timestamp = calloc(priv->sub_packet_h[demuxer->audio->id], sizeof(double)); 1513 priv->audio_timestamp = calloc(priv->sub_packet_h[demuxer->audio->id], sizeof(double));
1517 } 1514 }
1518 1515
1536 sh->wf->nBlockAlign = 0;//frame_size; 1533 sh->wf->nBlockAlign = 0;//frame_size;
1537 sh->wf->cbSize = 0; 1534 sh->wf->cbSize = 0;
1538 sh->wf->wFormatTag = sh->format = mmioFOURCC('a','d','u',0x55); 1535 sh->wf->wFormatTag = sh->format = mmioFOURCC('a','d','u',0x55);
1539 1536
1540 if(demuxer->audio->id==stream_id){ 1537 if(demuxer->audio->id==stream_id){
1541 sh->ds=demuxer->audio;
1542 demuxer->audio->sh=sh; 1538 demuxer->audio->sh=sh;
1543 } 1539 }
1544 1540
1545 ++a_streams; 1541 ++a_streams;
1546 } else if (strstr(mimet,"x-ralf-mpeg4")) { 1542 } else if (strstr(mimet,"x-ralf-mpeg4")) {
1682 priv->v_bitrate = bitrate; 1678 priv->v_bitrate = bitrate;
1683 mp_msg(MSGT_DEMUX,MSGL_DBG2,"Multirate autoselected video id %d with bitrate %d\n", stream_id, bitrate); 1679 mp_msg(MSGT_DEMUX,MSGL_DBG2,"Multirate autoselected video id %d with bitrate %d\n", stream_id, bitrate);
1684 } 1680 }
1685 1681
1686 if(demuxer->video->id==stream_id){ 1682 if(demuxer->video->id==stream_id){
1687 sh->ds=demuxer->video;
1688 demuxer->video->sh=sh; 1683 demuxer->video->sh=sh;
1689 } 1684 }
1690 1685
1691 ++v_streams; 1686 ++v_streams;
1692 1687