[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[493] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[493] mplayerxp
|
From: <nic...@us...> - 2012-11-30 15:24:22
|
Revision: 493
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=493&view=rev
Author: nickols_k
Date: 2012-11-30 15:24:08 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
convert struct demux_stream_t into class Demuxer_Stream
Modified Paths:
--------------
mplayerxp/dump.cpp
mplayerxp/libmpcodecs/dec_audio.cpp
mplayerxp/libmpcodecs/dec_video.cpp
mplayerxp/libmpdemux/Makefile
mplayerxp/libmpdemux/demux_aiff.cpp
mplayerxp/libmpdemux/demux_asf.cpp
mplayerxp/libmpdemux/demux_audio.cpp
mplayerxp/libmpdemux/demux_avi.cpp
mplayerxp/libmpdemux/demux_bmp.cpp
mplayerxp/libmpdemux/demux_demuxers.cpp
mplayerxp/libmpdemux/demux_dv.cpp
mplayerxp/libmpdemux/demux_film.cpp
mplayerxp/libmpdemux/demux_fli.cpp
mplayerxp/libmpdemux/demux_lavf.cpp
mplayerxp/libmpdemux/demux_mkv.cpp
mplayerxp/libmpdemux/demux_mov.cpp
mplayerxp/libmpdemux/demux_mpg.cpp
mplayerxp/libmpdemux/demux_mpxp64.cpp
mplayerxp/libmpdemux/demux_nsv.cpp
mplayerxp/libmpdemux/demux_null.cpp
mplayerxp/libmpdemux/demux_nuv.cpp
mplayerxp/libmpdemux/demux_ogg.cpp
mplayerxp/libmpdemux/demux_pva.cpp
mplayerxp/libmpdemux/demux_rawaudio.cpp
mplayerxp/libmpdemux/demux_rawvideo.cpp
mplayerxp/libmpdemux/demux_real.cpp
mplayerxp/libmpdemux/demux_realaud.cpp
mplayerxp/libmpdemux/demux_roq.cpp
mplayerxp/libmpdemux/demux_smjpeg.cpp
mplayerxp/libmpdemux/demux_ts.cpp
mplayerxp/libmpdemux/demux_ty.cpp
mplayerxp/libmpdemux/demux_viv.cpp
mplayerxp/libmpdemux/demux_vqf.cpp
mplayerxp/libmpdemux/demux_y4m.cpp
mplayerxp/libmpdemux/demuxer.cpp
mplayerxp/libmpdemux/demuxer.h
mplayerxp/libmpdemux/demuxer_internal.h
mplayerxp/libmpdemux/demuxer_r.cpp
mplayerxp/libmpdemux/demuxer_r.h
mplayerxp/libmpdemux/parse_es.cpp
mplayerxp/libmpdemux/parse_es.h
mplayerxp/libmpdemux/stheader.h
mplayerxp/libmpdemux/video.cpp
mplayerxp/libmpstream/s_dvdnav.cpp
mplayerxp/libmpstream/s_tv.cpp
mplayerxp/libmpstream/stream.cpp
mplayerxp/mplayerxp.cpp
mplayerxp/xmpcore/xmp_adecoder.cpp
mplayerxp/xmpcore/xmp_adecoder.h
mplayerxp/xmpcore/xmp_aplayer.cpp
mplayerxp/xmpcore/xmp_vdecoder.cpp
mplayerxp/xmpcore/xmp_vplayer.cpp
Added Paths:
-----------
mplayerxp/libmpdemux/demuxer_stream.cpp
mplayerxp/libmpdemux/demuxer_stream.h
Modified: mplayerxp/dump.cpp
===================================================================
--- mplayerxp/dump.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/dump.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -226,8 +226,8 @@
void dump_mux_close(demuxer_t *demuxer)
{
dump_priv_t* priv=static_cast<dump_priv_t*>(demuxer->priv);
- demux_stream_t *d_audio=demuxer->audio;
- demux_stream_t *d_video=demuxer->video;
+ Demuxer_Stream *d_audio=demuxer->audio;
+ Demuxer_Stream *d_video=demuxer->video;
sh_audio_t* sha=reinterpret_cast<sh_audio_t*>(d_audio->sh);
sh_video_t* shv=reinterpret_cast<sh_video_t*>(d_video->sh);
if(priv) {
@@ -286,8 +286,8 @@
void dump_mux(demuxer_t *demuxer,int use_pts,const char *seek_to_sec,unsigned play_n_frames)
{
dump_priv_t* priv=static_cast<dump_priv_t*>(demuxer->priv);
- demux_stream_t *d_audio=demuxer->audio;
- demux_stream_t *d_video=demuxer->video;
+ Demuxer_Stream *d_audio=demuxer->audio;
+ Demuxer_Stream *d_video=demuxer->video;
sh_audio_t* sha=reinterpret_cast<sh_audio_t*>(d_audio->sh);
sh_video_t* shv=reinterpret_cast<sh_video_t*>(d_video->sh);
float frame_time,a_duration;
@@ -452,7 +452,7 @@
{
if(sha) priv->timer_corr+=d_audio->pts;
if(priv->m_audio->wf->nAvgBytesPerSec)
- priv->timer_corr+=((float)ds_tell_pts(d_audio))/((float)priv->m_audio->wf->nAvgBytesPerSec);
+ priv->timer_corr+=((float)d_audio->tell_pts())/((float)priv->m_audio->wf->nAvgBytesPerSec);
}
MSG_STATUS("Done %u frames (video(%X-%ix%i): %llu bytes audio(%X-%ix%ix%i): %llu bytes)\n"
,priv->decoded_frameno
Modified: mplayerxp/libmpcodecs/dec_audio.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpcodecs/dec_audio.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -382,5 +382,5 @@
MPXP_Rc rc=MPXP_True;
if(sh_audio)
if(sh_audio->inited && priv->mpadec) rc=priv->mpadec->control_ad(sh_audio,ADCTRL_SKIP_FRAME,NULL);
- if(rc!=MPXP_True) ds_fill_buffer(sh_audio->ds);
+ if(rc!=MPXP_True) sh_audio->ds->fill_buffer();
}
Modified: mplayerxp/libmpcodecs/dec_video.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_video.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpcodecs/dec_video.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -342,7 +342,7 @@
#endif
static void update_subtitle(sh_video_t *sh_video,float v_pts,unsigned xp_idx)
{
- demux_stream_t *d_dvdsub=sh_video->ds->demuxer->sub;
+ Demuxer_Stream *d_dvdsub=sh_video->ds->demuxer->sub;
#ifdef USE_SUB
// find sub
if(MPXPCtx->subtitles && v_pts>0){
Modified: mplayerxp/libmpdemux/Makefile
===================================================================
--- mplayerxp/libmpdemux/Makefile 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/Makefile 2012-11-30 15:24:08 UTC (rev 493)
@@ -49,8 +49,8 @@
CXXSRCS += mux_mpxp64.cpp mux_raw.cpp
#SRCS+= mux_lavf.c
-CXXSRCS+= demuxer.cpp demuxer_packet.cpp demuxer_r.cpp mpdemux.cpp
-CXXSRCS+= muxer.cpp
+CXXSRCS+= demuxer.cpp demuxer_packet.cpp demuxer_stream.cpp demuxer_r.cpp
+CXXSRCS+= muxer.cpp mpdemux.cpp
OBJS = $(SRCS:.c=.o)
CXXOBJS = $(CXXSRCS:.cpp=.o)
Modified: mplayerxp/libmpdemux/demux_aiff.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_aiff.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_aiff.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -184,7 +184,7 @@
return demuxer;
}
-static int aiff_demux(demuxer_t* demuxer, demux_stream_t *ds) {
+static int aiff_demux(demuxer_t* demuxer, Demuxer_Stream *ds) {
sh_audio_t* sh_audio = reinterpret_cast<sh_audio_t*>(demuxer->audio->sh);
int l = sh_audio->wf->nAvgBytesPerSec;
off_t spos = stream_tell(demuxer->stream);
@@ -199,7 +199,7 @@
l=stream_read(demuxer->stream,dp->buffer(),l);
dp->resize(l);
- ds_add_packet(ds,dp);
+ ds->add_packet(dp);
return 1;
}
Modified: mplayerxp/libmpdemux/demux_asf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_asf.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_asf.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -364,12 +364,12 @@
} else if (best_video > 0 && demuxer->video->id == -1) demuxer->video->id = best_video;
{
- demux_stream_t *d_video=demuxer->video;
- demux_stream_t *d_audio=demuxer->audio;
+ Demuxer_Stream *d_video=demuxer->video;
+ Demuxer_Stream *d_audio=demuxer->audio;
stream_reset(demuxer->stream);
stream_seek(demuxer->stream,demuxer->movi_start);
if(d_video->id != -2) {
- if(!ds_fill_buffer(d_video)){
+ if(!d_video->fill_buffer()){
MSG_WARN("ASF: " MSGTR_MissingVideoStream);
demuxer->video->sh=NULL;
} else {
@@ -385,7 +385,7 @@
}
if(d_audio->id!=-2){
MSG_V("ASF: Searching for audio stream (id:%d)\n",d_audio->id);
- if(!ds_fill_buffer(d_audio)){
+ if(!d_audio->fill_buffer()){
MSG_WARN("ASF: " MSGTR_MissingAudioStream);
demuxer->audio->sh=NULL;
} else {
@@ -419,7 +419,7 @@
static int demux_asf_read_packet(demuxer_t *demux,off_t dataoff,int len,int id,int seq,unsigned long time,unsigned short dur,int offs,int keyframe){
- demux_stream_t *ds=NULL;
+ Demuxer_Stream *ds=NULL;
asf_priv_t *apriv=static_cast<asf_priv_t*>(demux->priv);
MSG_DBG3("demux_asf.read_packet: id=%d seq=%d len=%d time=%u dur=%u offs=%i key=%i\n",id,seq,len,time,dur,offs,keyframe);
@@ -456,7 +456,7 @@
if(ds==demux->audio)
if(apriv->asf_scrambling_h>1 && apriv->asf_scrambling_w>1)
asf_descrambling(apriv,ds->asf_packet->buffer(),ds->asf_packet->length());
- ds_add_packet(ds,ds->asf_packet);
+ ds->add_packet(ds->asf_packet);
ds->asf_packet=NULL;
} else {
// append data to it!
@@ -497,7 +497,7 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int asf_demux(demuxer_t *demux,demux_stream_t *ds){
+static int asf_demux(demuxer_t *demux,Demuxer_Stream *ds){
stream_t *stream=demux->stream;
asf_priv_t *apriv=static_cast<asf_priv_t*>(demux->priv);
int done=0;
@@ -687,8 +687,8 @@
static void asf_seek(demuxer_t *demuxer,const seek_args_t* seeka){
- demux_stream_t *d_audio=demuxer->audio;
- demux_stream_t *d_video=demuxer->video;
+ Demuxer_Stream *d_audio=demuxer->audio;
+ Demuxer_Stream *d_video=demuxer->video;
asf_priv_t *apriv=static_cast<asf_priv_t*>(demuxer->priv);
sh_audio_t *sh_audio=reinterpret_cast<sh_audio_t*>(d_audio->sh);
@@ -704,12 +704,12 @@
stream_seek(demuxer->stream,newpos);
/*!!! FIXME: this loop is too long sometime !!!*/
- while(ds_fill_buffer(d_video))
+ while(d_video->fill_buffer())
if(d_video->flags&1) break; /* found a keyframe! */
if(sh_audio && !d_audio->eof){
- ds_free_packs_until_pts(d_audio,d_video->pts);
- ds_fill_buffer(d_audio);
+ d_audio->free_packs_until_pts(d_video->pts);
+ d_audio->fill_buffer();
}
}
Modified: mplayerxp/libmpdemux/demux_audio.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_audio.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_audio.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -1394,7 +1394,7 @@
return out & mask;
}
-static int audio_demux(demuxer_t *demuxer,demux_stream_t *ds) {
+static int audio_demux(demuxer_t *demuxer,Demuxer_Stream *ds) {
sh_audio_t* sh_audio;
demuxer_t* demux;
da_priv_t* priv;
@@ -1456,9 +1456,9 @@
dp->resize(len+4);
len=stream_read(s,dp->buffer() + 4,len-4);
priv->last_pts = priv->last_pts < 0 ? 0 : priv->last_pts + len/(float)sh_audio->i_bps;
- dp->pts = priv->last_pts - (ds_tell_pts(demux->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
+ dp->pts = priv->last_pts - (demux->audio->tell_pts()-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
dp->flags=DP_NONKEYFRAME;
- ds_add_packet(ds,dp);
+ ds->add_packet(dp);
}
else stream_skip(s,len);
return 1;
@@ -1485,9 +1485,9 @@
dp->resize(len+8);
len=stream_read(s,dp->buffer()+8,len-8);
priv->last_pts = priv->last_pts < 0 ? 0 : priv->last_pts + len/(float)sh_audio->i_bps;
- dp->pts = priv->last_pts - (ds_tell_pts(demux->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
+ dp->pts = priv->last_pts - (demux->audio->tell_pts()-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
dp->flags=DP_NONKEYFRAME;
- ds_add_packet(ds,dp);
+ ds->add_packet(dp);
}
else stream_skip(s,len);
return 1;
@@ -1514,9 +1514,9 @@
memcpy(dp->buffer(),hdr,16);
len=stream_read(s,dp->buffer()+16,len-16);
priv->last_pts = priv->last_pts < 0 ? 0 : priv->last_pts + len/(float)sh_audio->i_bps;
- dp->pts = priv->last_pts - (ds_tell_pts(demux->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
+ dp->pts = priv->last_pts - (demux->audio->tell_pts()-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
dp->flags=DP_NONKEYFRAME;
- ds_add_packet(ds,dp);
+ ds->add_packet(dp);
}
else stream_skip(s,len);
return 1;
@@ -1530,9 +1530,9 @@
l=stream_read(s,dp->buffer(),l);
dp->resize(l);
priv->last_pts = priv->last_pts < 0 ? 0 : priv->last_pts + l/(float)sh_audio->i_bps;
- dp->pts = priv->last_pts - (ds_tell_pts(demux->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
+ dp->pts = priv->last_pts - (demux->audio->tell_pts()-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
dp->flags=DP_NONKEYFRAME;
- ds_add_packet(ds,dp);
+ ds->add_packet(dp);
return 1;
}
case RAW_VOC : {
@@ -1541,9 +1541,9 @@
l=stream_read(s,dp->buffer(),l);
dp->resize(l);
priv->last_pts = priv->last_pts < 0 ? 0 : priv->last_pts + l/(float)sh_audio->i_bps;
- dp->pts = priv->last_pts - (ds_tell_pts(demux->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
+ dp->pts = priv->last_pts - (demux->audio->tell_pts()-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
dp->flags=DP_NONKEYFRAME;
- ds_add_packet(ds,dp);
+ ds->add_packet(dp);
return 1;
}
case RAW_MUSEPACK: {
@@ -1565,10 +1565,10 @@
priv->last_pts = 0;
else
priv->last_pts += priv->pts_per_packet;
- dp->pts = priv->last_pts - (ds_tell_pts(demux->audio) -
+ dp->pts = priv->last_pts - (demux->audio->tell_pts() -
sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
dp->flags=DP_NONKEYFRAME;
- ds_add_packet(ds, dp);
+ ds->add_packet(dp);
return 1;
}
default:
@@ -1701,7 +1701,7 @@
}
if(len > 0)
high_res_mp3_seek(demuxer,len);
- sh_audio->timer = priv->last_pts - (ds_tell_pts(demuxer->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
+ sh_audio->timer = priv->last_pts - (demuxer->audio->tell_pts()-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
return;
}
@@ -1715,7 +1715,7 @@
pos = demuxer->movi_start;
priv->last_pts = (pos-demuxer->movi_start)/(float)sh_audio->i_bps;
- sh_audio->timer = priv->last_pts - (ds_tell_pts(demuxer->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
+ sh_audio->timer = priv->last_pts - (demuxer->audio->tell_pts()-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
frmt=priv->frmt;
if(frmt==RAW_WAV)
@@ -1737,7 +1737,7 @@
}
if(len > 0)
high_res_ac3_seek(demuxer,len);
- sh_audio->timer = priv->last_pts - (ds_tell_pts(demuxer->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
+ sh_audio->timer = priv->last_pts - (demuxer->audio->tell_pts()-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
return;
}
case RAW_DCA: {
@@ -1749,7 +1749,7 @@
}
if(len > 0)
high_res_ddca_seek(demuxer,len);
- sh_audio->timer = priv->last_pts - (ds_tell_pts(demuxer->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
+ sh_audio->timer = priv->last_pts - (demuxer->audio->tell_pts()-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
return;
}
case RAW_VOC:
Modified: mplayerxp/libmpdemux/demux_avi.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_avi.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_avi.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -23,7 +23,7 @@
#include "aviprint.h"
#include "demux_msg.h"
-typedef int (*alt_demuxer_t)(demuxer_t *demux,demux_stream_t *__ds);
+typedef int (*alt_demuxer_t)(demuxer_t *demux,Demuxer_Stream *__ds);
struct avi_priv_t : public Opaque {
public:
avi_priv_t() {}
@@ -763,7 +763,7 @@
#undef MIN
// Select ds from ID
-static demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id){
+static Demuxer_Stream* demux_avi_select_stream(demuxer_t *demux,unsigned int id){
int stream_id=avi_stream_id(id);
if(demux->video->id==-1)
@@ -840,7 +840,7 @@
return (len1<len2)? len1 : len2;
}
-static int demux_avi_read_packet(demuxer_t *demux,demux_stream_t *ds,unsigned int id,unsigned int len,int idxpos,dp_flags_e flags){
+static int demux_avi_read_packet(demuxer_t *demux,Demuxer_Stream *ds,unsigned int id,unsigned int len,int idxpos,dp_flags_e flags){
avi_priv_t *priv=static_cast<avi_priv_t*>(demux->priv);
int skip;
float pts=0;
@@ -893,7 +893,7 @@
if(ds){
MSG_DBG2("DEMUX_AVI: Read %d data bytes from packet %04X\n",len,id);
- ds_read_packet(ds,demux->stream,len,pts,idxpos,flags);
+ ds->read_packet(demux->stream,len,pts,idxpos,flags);
skip-=len;
}
if(skip){
@@ -903,16 +903,16 @@
return ds?1:0;
}
-static int avi_read_ni(demuxer_t *demux,demux_stream_t* ds);
-static int avi_read_nini(demuxer_t *demux,demux_stream_t* ds);
+static int avi_read_ni(demuxer_t *demux,Demuxer_Stream* ds);
+static int avi_read_nini(demuxer_t *demux,Demuxer_Stream* ds);
-static int avi_demux(demuxer_t *demux,demux_stream_t *__ds){
+static int avi_demux(demuxer_t *demux,Demuxer_Stream *__ds){
avi_priv_t *priv=static_cast<avi_priv_t*>(demux->priv);
if(priv->alt_demuxer) return priv->alt_demuxer(demux,__ds);
unsigned int id=0;
unsigned int len;
int ret=0;
- demux_stream_t *ds;
+ Demuxer_Stream *ds;
do{
dp_flags_e flags=DP_KEYFRAME;
@@ -1008,7 +1008,7 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int avi_read_ni(demuxer_t *demux,demux_stream_t* ds){
+static int avi_read_ni(demuxer_t *demux,Demuxer_Stream* ds){
avi_priv_t *priv=static_cast<avi_priv_t*>(demux->priv);
unsigned int id=0;
unsigned int len;
@@ -1078,7 +1078,7 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int avi_read_nini(demuxer_t *demux,demux_stream_t* ds){
+static int avi_read_nini(demuxer_t *demux,Demuxer_Stream* ds){
avi_priv_t *priv=static_cast<avi_priv_t*>(demux->priv);
unsigned int id=0;
unsigned int len;
@@ -1132,8 +1132,8 @@
extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer);
extern demuxer_driver_t demux_ogg;
static demuxer_t* avi_open(demuxer_t* demuxer){
- demux_stream_t *d_audio=demuxer->audio;
- demux_stream_t *d_video=demuxer->video;
+ Demuxer_Stream *d_audio=demuxer->audio;
+ Demuxer_Stream *d_video=demuxer->video;
sh_audio_t *sh_audio=NULL;
sh_video_t *sh_video=NULL;
avi_priv_t* priv=new(zeromem) avi_priv_t;
@@ -1186,7 +1186,7 @@
off_t v_pos=-1;
for(i=0;i<priv->idx_size;i++){
AVIINDEXENTRY* idx=&((AVIINDEXENTRY *)priv->idx)[i];
- demux_stream_t* ds=demux_avi_select_stream(demuxer,idx->ckid);
+ Demuxer_Stream* ds=demux_avi_select_stream(demuxer,idx->ckid);
off_t pos = priv->idx_offset + avi_idx_offset(idx);
if(a_pos==-1 && ds==demuxer->audio){
a_pos=pos;
@@ -1206,7 +1206,7 @@
sh_audio=NULL;
}
} else demuxer->flags &= ~DEMUXF_SEEKABLE;
- if(!ds_fill_buffer(d_video)){
+ if(!d_video->fill_buffer()){
MSG_ERR("AVI: " MSGTR_MissingVideoStreamBug);
return NULL;
}
@@ -1214,7 +1214,7 @@
sh_video->ds=d_video;
if(d_audio->id!=-2){
MSG_V("AVI: Searching for audio stream (id:%d)\n",d_audio->id);
- if(!priv->audio_streams || !ds_fill_buffer(d_audio)){
+ if(!priv->audio_streams || !d_audio->fill_buffer()){
MSG_V("AVI: " MSGTR_MissingAudioStream);
sh_audio=NULL;
} else {
@@ -1312,8 +1312,8 @@
static void avi_seek(demuxer_t *demuxer,const seek_args_t* seeka){
avi_priv_t *priv=static_cast<avi_priv_t*>(demuxer->priv);
- demux_stream_t *d_audio=demuxer->audio;
- demux_stream_t *d_video=demuxer->video;
+ Demuxer_Stream *d_audio=demuxer->audio;
+ Demuxer_Stream *d_video=demuxer->video;
sh_audio_t *sh_audio=reinterpret_cast<sh_audio_t*>(d_audio->sh);
sh_video_t *sh_video=reinterpret_cast<sh_video_t*>(d_video->sh);
float skip_audio_secs=0;
@@ -1487,7 +1487,7 @@
(int)priv->skip_video_frames,skip_audio_bytes,skip_audio_secs);
if(skip_audio_bytes){
- demux_read_data(d_audio,NULL,skip_audio_bytes);
+ d_audio->read_data(NULL,skip_audio_bytes);
//d_audio->pts=0; // PTS is outdated because of the raw data skipping
}
}
Modified: mplayerxp/libmpdemux/demux_bmp.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_bmp.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_bmp.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -93,8 +93,9 @@
return img ? MPXP_Ok : MPXP_False;
}
-static int bmp_demux(demuxer_t *demuxer,demux_stream_t *__ds)
+static int bmp_demux(demuxer_t *demuxer,Demuxer_Stream *__ds)
{
+ UNUSED(__ds);
unsigned lsize=((img->format->BitsPerPixel+7)/8)*img->w;
unsigned j,len=lsize*img->h;
unsigned npal_colors;
@@ -134,7 +135,7 @@
src+=img->pitch;
}
}
- ds_add_packet(demuxer->video,dp);
+ demuxer->video->add_packet(dp);
/* return value:
0 = EOF or no stream found
1 = successfully read a packet */
@@ -144,8 +145,6 @@
static demuxer_t* bmp_open(demuxer_t* demuxer)
{
sh_video_t *sh_video = NULL;
- unsigned int filesize;
- unsigned int data_offset;
unsigned npal_colors;
// create a new video stream header
sh_video = new_sh_video(demuxer, 0);
@@ -194,6 +193,7 @@
static void bmp_close(demuxer_t* demuxer)
{
+ UNUSED(demuxer);
if(img) SDL_FreeSurface(img);
demux_rw_close_stream(&my_rw);
}
@@ -221,7 +221,7 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int bmp_demux(demuxer_t *demuxer,demux_stream_t *__ds)
+static int bmp_demux(demuxer_t *demuxer,Demuxer_Stream *__ds)
{
bmp_image_t *bmp_image = static_cast<bmp_image_t*>(demuxer->priv);
Modified: mplayerxp/libmpdemux/demux_demuxers.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_demuxers.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_demuxers.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -52,7 +52,7 @@
return ret;
}
-static int demux_demuxers_fill_buffer(demuxer_t *demux,demux_stream_t *ds) {
+static int demux_demuxers_fill_buffer(demuxer_t *demux,Demuxer_Stream *ds) {
dd_priv_t* priv=static_cast<dd_priv_t*>(demux->priv);
if(ds->demuxer == priv->vd)
@@ -85,7 +85,7 @@
demux_seek(priv->ad,&seek_p);
// In case the demuxer don't set pts
if(!demuxer->audio->pts)
- demuxer->audio->pts = pos-((ds_tell_pts(demuxer->audio)-sh->a_in_buffer_len)/(float)sh->i_bps);
+ demuxer->audio->pts = pos-((demuxer->audio->tell_pts()-sh->a_in_buffer_len)/(float)sh->i_bps);
if(sh->timer)
sh->timer = 0;
}
Modified: mplayerxp/libmpdemux/demux_dv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_dv.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_dv.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -103,7 +103,7 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int dv_demux(demuxer_t *demuxer, demux_stream_t *ds)
+static int dv_demux(demuxer_t *demuxer, Demuxer_Stream *ds)
{
rawdv_frames_t *frames = static_cast<rawdv_frames_t*>(demuxer->priv);
sh_video_t *sh_video = reinterpret_cast<sh_video_t*>(demuxer->video->sh);
@@ -125,9 +125,9 @@
if (demuxer->audio && demuxer->audio->id>=-1)
{
Demuxer_Packet* dp_audio=dp_video->clone();
- ds_add_packet(demuxer->audio,dp_audio);
+ demuxer->audio->add_packet(dp_audio);
}
- ds_add_packet(demuxer->video,dp_video);
+ demuxer->video->add_packet(dp_video);
// get the next frame ready
frames->current_filepos+=frames->frame_size;
frames->current_frame++;
Modified: mplayerxp/libmpdemux/demux_film.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_film.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_film.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -91,8 +91,9 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int film_demux(demuxer_t *demuxer,demux_stream_t *__ds)
+static int film_demux(demuxer_t *demuxer,Demuxer_Stream *__ds)
{
+ UNUSED(__ds);
int i;
unsigned char byte_swap;
int cvid_size;
@@ -140,7 +141,7 @@
}
// append packet to DS stream
- ds_add_packet(demuxer->audio, dp);
+ demuxer->audio->add_packet(dp);
}
}
else
@@ -177,13 +178,14 @@
dp->buffer()[3] = (cvid_size >> 0) & 0xFF;
// append packet to DS stream
- ds_add_packet(demuxer->video, dp);
+ demuxer->video->add_packet(dp);
}
else
{
- ds_read_packet(demuxer->video, demuxer->stream, film_chunk.chunk_size,
- film_chunk.pts,
- film_chunk.chunk_offset, (film_chunk.syncinfo1 & 0x80000000) ? DP_KEYFRAME : DP_NONKEYFRAME);
+ demuxer->video->read_packet(demuxer->stream, film_chunk.chunk_size,
+ film_chunk.pts,
+ film_chunk.chunk_offset,
+ (film_chunk.syncinfo1 & 0x80000000) ? DP_KEYFRAME : DP_NONKEYFRAME);
}
}
film_data->current_chunk++;
Modified: mplayerxp/libmpdemux/demux_fli.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_fli.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_fli.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -50,7 +50,7 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int fli_demux(demuxer_t *demuxer,demux_stream_t *__ds){
+static int fli_demux(demuxer_t *demuxer,Demuxer_Stream *__ds){
fli_frames_t *frames = static_cast<fli_frames_t*>(demuxer->priv);
sh_video_t *sh_video = reinterpret_cast<sh_video_t*>(demuxer->video->sh);
@@ -62,12 +62,11 @@
// first, position the file properly since ds_read_packet() doesn't
// seem to do it, even though it takes a file offset as a parameter
stream_seek(demuxer->stream, frames->filepos[frames->current_frame]);
- ds_read_packet(demuxer->video,
- demuxer->stream,
- frames->frame_size[frames->current_frame],
- frames->current_frame/sh_video->fps,
- frames->filepos[frames->current_frame],
- DP_NONKEYFRAME /* what flags? -> demuxer.h (alex) */
+ demuxer->video->read_packet(demuxer->stream,
+ frames->frame_size[frames->current_frame],
+ frames->current_frame/sh_video->fps,
+ frames->filepos[frames->current_frame],
+ DP_NONKEYFRAME /* what flags? -> demuxer.h (alex) */
);
// get the next frame ready
@@ -198,6 +197,9 @@
static MPXP_Rc fli_control(const demuxer_t *demuxer,int cmd,any_t*args)
{
+ UNUSED(demuxer);
+ UNUSED(cmd);
+ UNUSED(args);
return MPXP_Unknown;
}
Modified: mplayerxp/libmpdemux/demux_lavf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_lavf.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_lavf.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -413,12 +413,12 @@
return demuxer;
}
-static int lavf_demux(demuxer_t *demux, demux_stream_t *dsds){
+static int lavf_demux(demuxer_t *demux, Demuxer_Stream *dsds){
UNUSED(dsds);
lavf_priv_t *priv= static_cast<lavf_priv_t*>(demux->priv);
AVPacket pkt;
Demuxer_Packet *dp;
- demux_stream_t *ds;
+ Demuxer_Stream *ds;
int id;
MSG_DBG2("lavf_demux()\n");
@@ -464,7 +464,7 @@
dp->pos=demux->filepos;
dp->flags= (pkt.flags&AV_PKT_FLAG_KEY)?DP_KEYFRAME:DP_NONKEYFRAME;
// append packet to DS stream:
- ds_add_packet(ds,dp);
+ ds->add_packet(dp);
return 1;
}
Modified: mplayerxp/libmpdemux/demux_mkv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_mkv.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -2649,7 +2649,7 @@
}
dp->pts = 0;
dp->flags = DP_NONKEYFRAME;
- ds_add_packet (demuxer->audio, dp);
+ demuxer->audio->add_packet(dp);
}
else if (track->a_formattag == mmioFOURCC('W', 'V', 'P', 'K'))
{ /* do nothing, still works */ }
@@ -3207,7 +3207,7 @@
#if 0
dp->endpts = (timecode + block_duration) / 1000.0f;
#endif
- ds_add_packet(demuxer->sub, dp);
+ demuxer->sub->add_packet(dp);
}
// Taken from demux_real.c. Thanks to the original developpers :)
@@ -3315,7 +3315,7 @@
dp->pos = demuxer->filepos;
dp->flags = block_bref ? DP_NONKEYFRAME : DP_KEYFRAME;
- ds_add_packet(demuxer->video, dp);
+ demuxer->video->add_packet(dp);
}
static void
@@ -3396,7 +3396,7 @@
dp->pts = (x * apk_usize % w) ? 0 : track->audio_timestamp[x * apk_usize / w];
dp->pos = track->audio_filepos; // all equal
dp->flags = x ? DP_NONKEYFRAME : DP_KEYFRAME; // Mark first packet as keyframe
- ds_add_packet(demuxer->audio, dp);
+ demuxer->audio->add_packet(dp);
}
}
} else { // Not a codec that require reordering
@@ -3410,7 +3410,7 @@
dp->pos = demuxer->filepos;
dp->flags = block_bref ? DP_NONKEYFRAME : DP_KEYFRAME;
- ds_add_packet (demuxer->audio, dp);
+ demuxer->audio->add_packet (dp);
}
}
@@ -3452,7 +3452,7 @@
} while (!ok);
for (i = 0; i < track->num_cached_dps; i++)
- ds_add_packet (demuxer->video, track->cached_dps[i]);
+ demuxer->video->add_packet (track->cached_dps[i]);
track->num_cached_dps = 0;
}
@@ -3512,7 +3512,7 @@
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
mkv_track_t *track = NULL;
- demux_stream_t *ds = NULL;
+ Demuxer_Stream *ds = NULL;
uint64_t old_length;
int64_t tc;
uint32_t *lace_size;
@@ -3650,7 +3650,7 @@
* values being the same) */
if (i == 0 || track->default_duration)
dp->pts = mkv_d->last_pts + i * track->default_duration;
- ds_add_packet (ds, dp);
+ ds->add_packet (dp);
}
}
block += lace_size[i];
@@ -3672,7 +3672,7 @@
return 0;
}
-static int mkv_demux (demuxer_t *demuxer, demux_stream_t *ds)
+static int mkv_demux (demuxer_t *demuxer, Demuxer_Stream *ds)
{
UNUSED(ds);
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
@@ -4007,7 +4007,7 @@
if (track) {
demuxer->audio->id = track->tnum;
sh = reinterpret_cast<sh_audio_t*>(demuxer->a_streams[demuxer->audio->id]);
- ds_free_packs(demuxer->audio);
+ demuxer->audio->free_packs();
}
}
*(int*)arg = sh->id;
Modified: mplayerxp/libmpdemux/demux_mov.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mov.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_mov.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -453,8 +453,7 @@
//stream_read(demuxer->stream,s,slen);
//FIXME: also store type & data_rate ?
- ds_read_packet(demuxer->video,
- demuxer->stream,
+ demuxer->video->read_packet(demuxer->stream,
slen,
0,
stream_tell(demuxer->stream),
@@ -1922,7 +1921,7 @@
* \return the mov track info structure belonging to the stream,
* NULL if not found
*/
-static mov_track_t *stream_track(mov_priv_t *priv, demux_stream_t *ds) {
+static mov_track_t *stream_track(mov_priv_t *priv, Demuxer_Stream *ds) {
if (ds && (ds->id >= 0) && (ds->id < priv->track_db))
return priv->tracks[ds->id];
return NULL;
@@ -1931,7 +1930,7 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int mov_demux(demuxer_t *demuxer,demux_stream_t* ds){
+static int mov_demux(demuxer_t *demuxer,Demuxer_Stream* ds){
mov_priv_t* priv=static_cast<mov_priv_t*>(demuxer->priv);
mov_track_t* trak=NULL;
float pts;
@@ -2016,9 +2015,9 @@
trak->stream_header_len = 0;
dp->pts=pts;
dp->flags=DP_NONKEYFRAME;
- ds_add_packet(ds,dp);
+ ds->add_packet(dp);
} else
- ds_read_packet(ds,demuxer->stream,x,pts,pos,DP_NONKEYFRAME);
+ ds->read_packet(demuxer->stream,x,pts,pos,DP_NONKEYFRAME);
++trak->pos;
return 1;
@@ -2064,7 +2063,7 @@
static void mov_seek(demuxer_t *demuxer,const seek_args_t* seeka){
mov_priv_t* priv=static_cast<mov_priv_t*>(demuxer->priv);
- demux_stream_t* ds;
+ Demuxer_Stream* ds;
mov_track_t* trak;
ds=demuxer->video;
Modified: mplayerxp/libmpdemux/demux_mpg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpg.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_mpg.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -44,7 +44,7 @@
#define MPGPES_BAD_PTS -1
-typedef int (*alt_demuxer_t)(demuxer_t *demux,demux_stream_t *__ds);
+typedef int (*alt_demuxer_t)(demuxer_t *demux,Demuxer_Stream *__ds);
struct mpg_demuxer_t : public Opaque {
public:
mpg_demuxer_t() {}
@@ -197,7 +197,7 @@
unsigned char c=0;
int pts=MPGPES_BAD_PTS;
unsigned int dts=0;
- demux_stream_t *ds=NULL;
+ Demuxer_Stream *ds=NULL;
mpg_demuxer_t *priv = static_cast<mpg_demuxer_t*>(demux->priv);
MSG_DBG3("demux_read_packet: %X\n",id);
@@ -407,7 +407,7 @@
else
{
sh_video_t *sh;
- if(ds->asf_packet) ds_add_packet(ds,ds->asf_packet);
+ if(ds->asf_packet) ds->add_packet(ds->asf_packet);
Demuxer_Packet* dp=new(zeromem) Demuxer_Packet(len);
len=stream_read(demux->stream,dp->buffer(),len);
dp->resize(len);
@@ -419,7 +419,7 @@
ds->asf_packet=dp;
if (ds==ds->demuxer->sub) {
// Add sub packets at ones
- ds_add_packet(ds,ds->asf_packet);
+ ds->add_packet(ds->asf_packet);
ds->asf_packet=NULL;
}
}
@@ -432,15 +432,15 @@
return 0;
}
-static int mpges_demux(demuxer_t *demux,demux_stream_t *__ds){
+static int mpges_demux(demuxer_t *demux,Demuxer_Stream *__ds){
/* Elementary video stream */
if(stream_eof(demux->stream)) return 0;
demux->filepos=stream_tell(demux->stream);
- ds_read_packet(demux->video,demux->stream,STREAM_BUFFER_SIZE,0,demux->filepos,DP_NONKEYFRAME);
+ demux->video->read_packet(demux->stream,STREAM_BUFFER_SIZE,0,demux->filepos,DP_NONKEYFRAME);
return 1;
}
-static int mpgps_demux(demuxer_t *demux,demux_stream_t *__ds){
+static int mpgps_demux(demuxer_t *demux,Demuxer_Stream *__ds){
mpg_demuxer_t* mpg_d = static_cast<mpg_demuxer_t*>(demux->priv);
if(mpg_d->alt_demuxer) return mpg_d->alt_demuxer(demux,__ds);
unsigned int head=0;
@@ -544,8 +544,8 @@
}
static void mpgps_seek(demuxer_t *demuxer,const seek_args_t* seeka){
- demux_stream_t *d_audio=demuxer->audio;
- demux_stream_t *d_video=demuxer->video;
+ Demuxer_Stream *d_audio=demuxer->audio;
+ Demuxer_Stream *d_video=demuxer->video;
sh_audio_t *sh_audio=reinterpret_cast<sh_audio_t*>(d_audio->sh);
sh_video_t *sh_video=reinterpret_cast<sh_video_t*>(d_video->sh);
@@ -575,9 +575,9 @@
// re-sync video:
videobuf_code_len=0; // reset ES stream buffer
- ds_fill_buffer(d_video);
+ d_video->fill_buffer();
if(sh_audio){
- ds_fill_buffer(d_audio);
+ d_audio->fill_buffer();
// mpca_resync_stream(sh_audio->decoder);
}
@@ -585,7 +585,7 @@
int i;
if(sh_audio && !d_audio->eof && d_video->pts && d_audio->pts){
float a_pts=d_audio->pts;
- a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
+ a_pts+=(d_audio->tell_pts()-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
if(d_video->pts>a_pts){
// mpca_skip_frame(sh_audio->decoder); // sync audio
continue;
@@ -797,7 +797,7 @@
mpg_d->num_a_streams = 0;
if(demuxer->audio->id!=-2) {
- if(!ds_fill_buffer(demuxer->audio)){
+ if(!demuxer->audio->fill_buffer()){
MSG_WARN("MPEG: " MSGTR_MissingAudioStream);
demuxer->audio->sh=NULL;
} else {
@@ -821,7 +821,7 @@
switch(cmd) {
case DEMUX_CMD_SWITCH_AUDIO:
if (mpg_d && mpg_d->num_a_streams > 1 && demuxer->audio && demuxer->audio->sh) {
- demux_stream_t *d_audio = demuxer->audio;
+ Demuxer_Stream *d_audio = demuxer->audio;
sh_audio_t *sh_audio = reinterpret_cast<sh_audio_t*>(d_audio->sh);
sh_audio_t *sh_a=NULL;
int i;
@@ -844,7 +844,7 @@
if (i < mpg_d->num_a_streams && d_audio->id != mpg_d->a_stream_ids[i]) {
d_audio->id = mpg_d->a_stream_ids[i];
d_audio->sh = sh_a;
- ds_free_packs(d_audio);
+ d_audio->free_packs();
}
}
*((int*)arg) = demuxer->audio->id;
Modified: mplayerxp/libmpdemux/demux_mpxp64.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_mpxp64.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -528,7 +528,7 @@
static int mpxpav64_read_packet(demuxer_t *demux,unsigned id,uint64_t len,float pts,int keyframe)
{
- demux_stream_t *ds=NULL;
+ Demuxer_Stream *ds=NULL;
stream_t* s=demux->stream;
if(demux->video->id==-1)
@@ -565,7 +565,7 @@
dp->flags=keyframe?DP_KEYFRAME:DP_NONKEYFRAME;
dp->pos=demux->filepos;
MSG_DBG2("MPXPAV64: reading %llu of %s PTS %f %skeyframe at %016llX\n",len,ds==demux->audio?"audio":"video",dp->pts,keyframe?"":"non",pos);
- ds_add_packet(ds,dp);
+ ds->add_packet(dp);
return 1;
}
else
@@ -577,7 +577,7 @@
}
/* DATx|stn|size|pts|stream data of size32 */
-static int mpxpav64_demux(demuxer_t *demux,demux_stream_t *__ds){
+static int mpxpav64_demux(demuxer_t *demux,Demuxer_Stream *__ds){
stream_t* s=demux->stream;
mpxpav64_priv_t *priv=static_cast<mpxpav64_priv_t*>(demux->priv);
uint8_t flg;
Modified: mplayerxp/libmpdemux/demux_nsv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_nsv.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_nsv.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -48,7 +48,7 @@
}
-static int nsv_demux ( demuxer_t *demuxer,demux_stream_t* __ds )
+static int nsv_demux ( demuxer_t *demuxer,Demuxer_Stream* __ds )
{
unsigned char hdr[17];
// for the extra data
@@ -119,9 +119,9 @@
// video frame is empty otherwise the stream will fasten up
if(sh_video) {
if( (hdr[2]&0x0f) != 0x0 )
- ds_read_packet(demuxer->video,demuxer->stream,videolen,priv->v_pts,demuxer->filepos-i_aux,DP_NONKEYFRAME);
+ demuxer->video->read_packet(demuxer->stream,videolen,priv->v_pts,demuxer->filepos-i_aux,DP_NONKEYFRAME);
else
- ds_read_packet(demuxer->video,demuxer->stream,videolen,priv->v_pts,demuxer->filepos,DP_NONKEYFRAME);
+ demuxer->video->read_packet(demuxer->stream,videolen,priv->v_pts,demuxer->filepos,DP_NONKEYFRAME);
}
else
stream_skip(demuxer->stream,videolen);
@@ -131,7 +131,7 @@
// we need to return an empty packet when the
// audio frame is empty otherwise the stream will fasten up
if(sh_audio) {
- ds_read_packet(demuxer->audio,demuxer->stream,audiolen,priv->v_pts,demuxer->filepos+videolen,DP_NONKEYFRAME);
+ demuxer->audio->read_packet(demuxer->stream,audiolen,priv->v_pts,demuxer->filepos+videolen,DP_NONKEYFRAME);
}
else
stream_skip(demuxer->stream,audiolen);
Modified: mplayerxp/libmpdemux/demux_null.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_null.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_null.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -28,7 +28,7 @@
return NULL;
}
-static int null_demux(demuxer_t* demuxer, demux_stream_t *ds) {
+static int null_demux(demuxer_t* demuxer, Demuxer_Stream *ds) {
return 0;
}
Modified: mplayerxp/libmpdemux/demux_nuv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_nuv.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_nuv.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -153,7 +153,7 @@
}
-static int nuv_demux( demuxer_t *demuxer, demux_stream_t *__ds )
+static int nuv_demux( demuxer_t *demuxer, Demuxer_Stream *__ds )
{
struct rtframeheader rtjpeg_frameheader;
off_t orig_pos;
@@ -187,7 +187,7 @@
}
/* put RTjpeg tables, Video info to video buffer */
stream_seek ( demuxer->stream, orig_pos );
- ds_read_packet ( demuxer->video, demuxer->stream, rtjpeg_frameheader.packetlength + 12,
+ demuxer->video->read_packet ( demuxer->stream, rtjpeg_frameheader.packetlength + 12,
rtjpeg_frameheader.timecode*0.001, orig_pos, DP_NONKEYFRAME);
@@ -199,7 +199,7 @@
priv->current_audio_frame++;
if (want_audio) {
/* put Audio to audio buffer */
- ds_read_packet ( demuxer->audio, demuxer->stream, rtjpeg_frameheader.packetlength,
+ demuxer->audio->read_packet ( demuxer->stream, rtjpeg_frameheader.packetlength,
rtjpeg_frameheader.timecode*0.001, orig_pos + 12, DP_NONKEYFRAME);
} else {
/* skip audio block */
Modified: mplayerxp/libmpdemux/demux_ogg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ogg.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_ogg.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -527,7 +527,7 @@
/// Calculate the timestamp and add the packet to the demux stream
// return 1 if the packet was added, 0 otherwise
-static int demux_ogg_add_packet(demux_stream_t* ds,ogg_stream_t* os,int id,ogg_packet* pack) {
+static int demux_ogg_add_packet(Demuxer_Stream* ds,ogg_stream_t* os,int id,ogg_packet* pack) {
demuxer_t* d = ds->demuxer;
Demuxer_Packet* dp;
unsigned char* data;
@@ -589,7 +589,7 @@
memcpy(dp->buffer(),data,pack->bytes-(data-pack->packet));
dp->pts = pts;
dp->flags = flags?DP_KEYFRAME:DP_NONKEYFRAME;
- ds_add_packet(ds,dp);
+ ds->add_packet(dp);
MSG_DBG2("New dp: %p ds=%p pts=%5.3f len=%d flag=%d \n",
dp, ds, pts, dp->length(), flags);
return 1;
@@ -1014,7 +1014,7 @@
MSG_ERR("Ogg stream %d is of an unknown type\n",ogg_d->num_sub);
if(sh_a || sh_v) {
- demux_stream_t* ds = NULL;
+ Demuxer_Stream* ds = NULL;
if(sh_a) {
// If the audio stream is not defined we took the first one
if(demuxer->audio->id == -1) {
@@ -1095,11 +1095,11 @@
}
-static int ogg_demux(demuxer_t *d,demux_stream_t *__ds) {
+static int ogg_demux(demuxer_t *d,Demuxer_Stream *__ds) {
UNUSED(__ds);
ogg_demuxer_t* ogg_d;
stream_t *s;
- demux_stream_t *ds;
+ Demuxer_Stream *ds;
ogg_sync_state* sync;
ogg_stream_state* os;
ogg_page* page;
@@ -1226,7 +1226,7 @@
goto fallback;
}
// Add some data
- plen = ds_get_packet(demuxer->audio,&p);
+ plen = demuxer->audio->get_packet(&p);
buf = (unsigned char *)ogg_sync_buffer(&ogg_d->sync,plen);
memcpy(buf,p,plen);
ogg_sync_wrote(&ogg_d->sync,plen);
@@ -1246,15 +1246,15 @@
// Initial header
dp = new(zeromem) Demuxer_Packet(hdrsizes[0]);
memcpy(dp->buffer(),((unsigned char*)sh_audio->wf)+22+sizeof(WAVEFORMATEX)+3*sizeof(uint32_t),hdrsizes[0]);
- ds_add_packet(od->audio,dp);
+ od->audio->add_packet(dp);
/// Comments
dp = new(zeromem) Demuxer_Packet(hdrsizes[1]);
memcpy(dp->buffer(),((unsigned char*)sh_audio->wf)+22+sizeof(WAVEFORMATEX)+3*sizeof(uint32_t)+hdrsizes[0],hdrsizes[1]);
- ds_add_packet(od->audio,dp);
+ od->audio->add_packet(dp);
/// Code book
dp = new(zeromem) Demuxer_Packet(hdrsizes[2]);
memcpy(dp->buffer(),((unsigned char*)sh_audio->wf)+22+sizeof(WAVEFORMATEX)+3*sizeof(uint32_t)+hdrsizes[0]+hdrsizes[1],hdrsizes[2]);
- ds_add_packet(od->audio,dp);
+ od->audio->add_packet(dp);
// Finish setting up the ogg demuxer
od->priv = ogg_d;
@@ -1280,7 +1280,7 @@
ogg_page* page= &ogg_d->page;
ogg_stream_state* oss;
ogg_stream_t* os;
- demux_stream_t* ds;
+ Demuxer_Stream* ds;
sh_audio_t* sh_audio = reinterpret_cast<sh_audio_t*>(demuxer->audio->sh);
ogg_packet op;
float rate;
Modified: mplayerxp/libmpdemux/demux_pva.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_pva.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_pva.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -186,7 +186,7 @@
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int pva_demux(demuxer_t * demux,demux_stream_t *__ds)
+static int pva_demux(demuxer_t * demux,Demuxer_Stream *__ds)
{
uint8_t done=0;
Demuxer_Packet * dp;
@@ -230,7 +230,7 @@
dp->flags=DP_NONKEYFRAME;
l=stream_read(demux->stream,dp->buffer(),current_payload.size);
dp->resize(l);
- ds_add_packet(demux->video,dp);
+ demux->video->add_packet(dp);
} else {
//printf("Skipping %u video bytes\n",current_payload.size);
stream_skip(demux->stream,current_payload.size);
@@ -260,7 +260,7 @@
stream_seek(demux->stream,current_payload.offset);
l=stream_read(demux->stream,dp->buffer(),current_payload.size);
dp->resize(l);
- ds_add_packet(demux->audio,dp);
+ demux->audio->add_packet(dp);
} else {
stream_skip(demux->stream,current_payload.size);
}
Modified: mplayerxp/libmpdemux/demux_rawaudio.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_rawaudio.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_rawaudio.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -76,7 +76,7 @@
return demuxer;
}
-static int rawaudio_demux(demuxer_t* demuxer, demux_stream_t *ds) {
+static int rawaudio_demux(demuxer_t* demuxer, Demuxer_Stream *ds) {
sh_audio_t* sh_audio = reinterpret_cast<sh_audio_t*>(demuxer->audio->sh);
int l = sh_audio->wf->nAvgBytesPerSec;
off_t spos = stream_tell(demuxer->stream);
@@ -90,7 +90,7 @@
l=stream_read(demuxer->stream,dp->buffer(),l);
dp->resize(l);
- ds_add_packet(ds,dp);
+ ds->add_packet(dp);
return 1;
}
Modified: mplayerxp/libmpdemux/demux_rawvideo.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_rawvideo.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_rawvideo.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -120,12 +120,12 @@
return demuxer;
}
-static int rawvideo_demux(demuxer_t* demuxer, demux_stream_t *ds) {
+static int rawvideo_demux(demuxer_t* demuxer, Demuxer_Stream *ds) {
if(stream_eof(demuxer->stream)) return 0;
if(ds!=demuxer->video) return 0;
- ds_read_packet(ds,demuxer->stream,priv.imgsize,0,stream_tell(demuxer->stream),DP_KEYFRAME);
+ ds->read_packet(demuxer->stream,priv.imgsize,0,stream_tell(demuxer->stream),DP_KEYFRAME);
return 1;
}
Modified: mplayerxp/libmpdemux/demux_real.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_real.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_real.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -405,10 +405,10 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int real_demux(demuxer_t *demuxer,demux_stream_t *__ds)
+static int real_demux(demuxer_t *demuxer,Demuxer_Stream *__ds)
{
real_priv_t *priv = static_cast<real_priv_t*>(demuxer->priv);
- demux_stream_t *ds = NULL;
+ Demuxer_Stream *ds = NULL;
float pts;
int len;
int timestamp;
@@ -522,7 +522,7 @@
priv->a_pts = pts;
dp->pos = demuxer->filepos;
dp->flags=DP_NONKEYFRAME;
- ds_add_packet(ds, dp);
+ ds->add_packet(dp);
}
delete sub_packet_lengths;
return 1;
@@ -538,7 +538,7 @@
priv->a_pts=pts;
dp->pos = demuxer->filepos;
dp->flags = (flags & 0x2) ? DP_KEYFRAME : DP_NONKEYFRAME;
- ds_add_packet(ds, dp);
+ ds->add_packet(dp);
}
// we will not use audio index if we use -idx and have a video
if(!demuxer->video->sh && index_mode == 2 && (unsigned)demuxer->audio->id < MAX_STREAMS)
@@ -656,7 +656,7 @@
} else
dp->pts=(dp_hdr->len<3)?0:
real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->fourcc);
- ds_add_packet(ds,dp);
+ ds->add_packet(dp);
ds->asf_packet=NULL;
} else {
// append data to it!
@@ -691,7 +691,7 @@
} else
dp->pts=(dp_hdr->len<3)?0:
real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->fourcc);
- ds_add_packet(ds,dp);
+ ds->add_packet(dp);
ds->asf_packet=NULL;
// continue parsing
continue;
@@ -748,7 +748,7 @@
} else
dp->pts=(dp_hdr->len<3)?0:
real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->fourcc);
- ds_add_packet(ds,dp);
+ ds->add_packet(dp);
} // while(len>0)
@@ -1470,13 +1470,13 @@
// detect streams:
if(demuxer->video->id==-1 && v_streams>0){
// find the valid video stream:
- if(!ds_fill_buffer(demuxer->video)){
+ if(!demuxer->video->fill_buffer()){
MSG_INFO("RM: " MSGTR_MissingVideoStream);
}
}
if(demuxer->audio->id==-1 && a_streams>0){
// find the valid audio stream:
- if(!ds_fill_buffer(demuxer->audio)){
+ if(!demuxer->audio->fill_buffer()){
MSG_INFO("RM: " MSGTR_MissingAudioStream);
}
}
@@ -1503,8 +1503,8 @@
static void real_seek(demuxer_t *demuxer,const seek_args_t* seeka)
{
real_priv_t *priv = static_cast<real_priv_t*>(demuxer->priv);
- demux_stream_t *d_audio = demuxer->audio;
- demux_stream_t *d_video = demuxer->video;
+ Demuxer_Stream *d_audio = demuxer->audio;
+ Demuxer_Stream *d_video = demuxer->video;
sh_audio_t *sh_audio = reinterpret_cast<sh_audio_t*>(d_audio->sh);
sh_video_t *sh_video = reinterpret_cast<sh_video_t*>(d_video->sh);
int vid = d_video->id, aid = d_audio->id;
Modified: mplayerxp/libmpdemux/demux_realaud.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_realaud.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_realaud.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -62,11 +62,11 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int realaud_demux(demuxer_t *demuxer,demux_stream_t *__ds)
+static int realaud_demux(demuxer_t *demuxer,Demuxer_Stream *__ds)
{
realaud_priv_t *realaud_priv = static_cast<realaud_priv_t*>(demuxer->priv);
int len;
- demux_stream_t *ds = demuxer->audio;
+ Demuxer_Stream *ds = demuxer->audio;
sh_audio_t *sh = reinterpret_cast<sh_audio_t*>(ds->sh);
WAVEFORMATEX *wf = sh->wf;
@@ -85,12 +85,12 @@
if(sh->i_bps)
{
realaud_priv->last_pts = realaud_priv->last_pts < 0 ? 0 : realaud_priv->last_pts + len/(float)sh->i_bps;
- ds->pts = realaud_priv->last_pts - (ds_tell_pts(demuxer->audio)-sh->a_in_buffer_len)/(float)sh->i_bps;
+ ds->pts = realaud_priv->last_pts - (demuxer->audio->tell_pts()-sh->a_in_buffer_len)/(float)sh->i_bps;
}
else dp->pts = demuxer->filepos / realaud_priv->data_size;
dp->pos = demuxer->filepos;
dp->flags = DP_NONKEYFRAME;
- ds_add_packet(ds, dp);
+ ds->add_packet(dp);
return 1;
}
@@ -268,7 +268,7 @@
/* disable seeking */
demuxer->flags &= ~DEMUXF_SEEKABLE;
- if(!ds_fill_buffer(demuxer->audio))
+ if(!demuxer->audio->fill_buffer())
MSG_WARN("[RealAudio] No data.\n");
check_pin("demuxer",demuxer->pin,DEMUX_PIN);
return demuxer;
@@ -290,7 +290,7 @@
int demux_seek_ra(demuxer_t *demuxer,const seek_args_t* seeka)
{
real_priv_t *priv = demuxer->priv;
- demux_stream_t *d_audio = demuxer->audio;
+ Demuxer_Stream *d_audio = demuxer->audio;
sh_audio_t *sh_audio = d_audio->sh;
int aid = d_audio->id;
int next_offset = 0;
Modified: mplayerxp/libmpdemux/demux_roq.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_roq.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_roq.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -72,7 +72,7 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int roq_demux(demuxer_t *demuxer,demux_stream_t *__ds)
+static int roq_demux(demuxer_t *demuxer,Demuxer_Stream *__ds)
{
sh_video_t *sh_video = reinterpret_cast<sh_video_t*>(demuxer->video->sh);
roq_data_t *roq_data = static_cast<roq_data_t*>(demuxer->priv);
@@ -87,11 +87,11 @@
stream_seek(demuxer->stream, roq_chunk.chunk_offset);
if (roq_chunk.chunk_type == CHUNK_TYPE_AUDIO)
- ds_read_packet(demuxer->audio, demuxer->stream, roq_chunk.chunk_size,
+ demuxer->audio->read_packet(demuxer->stream, roq_chunk.chunk_size,
0,
roq_chunk.chunk_offset, DP_NONKEYFRAME);
else
- ds_read_packet(demuxer->video, demuxer->stream, roq_chunk.chunk_size,
+ demuxer->video->read_packet(demuxer->stream, roq_chunk.chunk_size,
roq_chunk.video_chunk_number / sh_video->fps,
roq_chunk.chunk_offset, DP_NONKEYFRAME);
Modified: mplayerxp/libmpdemux/demux_smjpeg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_smjpeg.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_smjpeg.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -63,7 +63,7 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int smjpeg_demux(demuxer_t *demux,demux_stream_t *__ds)
+static int smjpeg_demux(demuxer_t *demux,Demuxer_Stream *__ds)
{
int dtype, dsize, dpts;
@@ -77,11 +77,11 @@
{
case mmioFOURCC('s','n','d','D'):
/* fixme, but no decoder implemented yet */
- ds_read_packet(demux->audio, demux->stream, dsize,
+ demux->audio->read_packet(demux->stream, dsize,
(float)dpts/1000.0, demux->filepos, DP_NONKEYFRAME);
break;
case mmioFOURCC('v','i','d','D'):
- ds_read_packet(demux->video, demux->stream, dsize,
+ demux->video->read_packet(demux->stream, dsize,
(float)dpts/1000.0, demux->filepos, DP_NONKEYFRAME);
break;
case mmioFOURCC('D','O','N','E'):
Modified: mplayerxp/libmpdemux/demux_ts.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ts.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_ts.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -122,7 +122,7 @@
typedef struct {
- demux_stream_t *ds;
+ Demuxer_Stream *ds;
Demuxer_Packet *pack;
int offset, buffer_size;
} av_fifo_t;
@@ -1508,7 +1508,7 @@
if((priv->fifo[i].pack != NULL) && (priv->fifo[i].offset != 0))
{
priv->fifo[i].pack->resize(priv->fifo[i].offset);
- ds_add_packet(priv->fifo[i].ds, priv->fifo[i].pack);
+ priv->fifo[i].ds->add_packet(priv->fifo[i].pack);
priv->fifo[i].offset = 0;
priv->fifo[i].pack = NULL;
}
@@ -2516,7 +2516,7 @@
}
-static int fill_packet(demuxer_t *demuxer, demux_stream_t *ds, Demuxer_Packet **dp, int *dp_offset, TS_stream_info *si)
+static int fill_packet(demuxer_t *demuxer, Demuxer_Stream *ds, Demuxer_Packet **dp, int *dp_offset, TS_stream_info *si)
{
int ret = 0;
@@ -2524,7 +2524,7 @@
{
ret = *dp_offset;
(*dp)->resize(ret); //shrinked to the right size
- ds_add_packet(ds, *dp);
+ ds->add_packet(*dp);
MSG_DBG2( "ADDED %d bytes to %s fifo, PTS=%f\n", ret, (ds == demuxer->audio ? "audio" : (ds == demuxer->video ? "video" : "sub")), (*dp)->pts);
if(si)
{
@@ -2590,7 +2590,7 @@
ts_priv_t * priv = static_cast<ts_priv_t*>(demuxer->priv);
stream_t *stream = demuxer->stream;
unsigned char *p;
- demux_stream_t *ds = NULL;
+ Demuxer_Stream *ds = NULL;
Demuxer_Packet **dp = NULL;
int *dp_offset = 0, *buffer_size = 0;
int32_t progid=0, pid_type, bad, ts_error;
@@ -2603,7 +2603,7 @@
while(! done)
{
bad = ts_error = 0;
- ds = (demux_stream_t*) NULL;
+ ds = (Demuxer_Stream*) NULL;
dp = (Demuxer_Packet **) NULL;
dp_offset = buffer_size = NULL;
rap_flag = 0;
@@ -3046,14 +3046,14 @@
}
}
extern int videobuf_code_len;
-extern int sync_video_packet(demux_stream_t *);
-extern int skip_video_packet(demux_stream_t *);
+extern int sync_video_packet(Demuxer_Stream *);
+extern int skip_video_packet(Demuxer_Stream *);
static void ts_seek(demuxer_t *demuxer,const seek_args_t* seeka)
{
- demux_stream_t *d_audio=demuxer->audio;
- demux_stream_t *d_video=demuxer->video;
- demux_stream_t *d_sub=demuxer->sub;
+ Demuxer_Stream *d_audio=demuxer->audio;
+ Demuxer_Stream *d_video=demuxer->video;
+ Demuxer_Stream *d_sub=demuxer->sub;
sh_audio_t *sh_audio=reinterpret_cast<sh_audio_t*>(d_audio->sh);
sh_video_t *sh_video=reinterpret_cast<sh_video_t*>(d_video->sh);
ts_priv_t * priv = static_cast<ts_priv_t*>(demuxer->priv);
@@ -3067,11 +3067,11 @@
if(sh_audio != NULL)
- ds_free_packs(d_audio);
+ d_audio->free_packs();
if(sh_video != NULL)
- ds_free_packs(d_video);
+ d_video->free_packs();
if(demuxer->sub->id > 0)
- ds_free_packs(d_sub);
+ d_sub->free_packs();
video_stats = (sh_video != NULL);
@@ -3109,17 +3109,17 @@
videobuf_code_len = 0;
if(sh_video != NULL)
- ds_fill_buffer(d_video);
+ d_video->fill_buffer();
if(sh_audio != NULL)
{
- ds_fill_buffer(d_audio);
+ d_audio->fill_buffer();
}
while(sh_video != NULL) {
if(sh_audio && !d_audio->eof && d_video->pts && d_audio->pts) {
float a_pts=d_audio->pts;
- a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
+ a_pts+=(d_audio->tell_pts()-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
if(d_video->pts > a_pts) {
// mpca_skip_frame( sh_audio->decoder); // sync audio
continue;
@@ -3144,7 +3144,7 @@
}
}
-static int ts_demux(demuxer_t * demuxer,demux_stream_t *__ds)
+static int ts_demux(demuxer_t * demuxer,Demuxer_Stream *__ds)
{
ES_stream_t es;
ts_priv_t *priv = static_cast<ts_priv_t*>(demuxer->priv);
@@ -3186,7 +3186,7 @@
any_t*sh = NULL;
int i, n;
int reftype, areset = 0, vreset = 0;
- demux_stream_t *ds;
+ Demuxer_Stream *ds;
if(cmd == DEMUX_CMD_SWITCH_VIDEO) {
reftype = TYPE_VIDEO;
ds = demuxer->video;
@@ -3201,7 +3201,7 @@
reset_fifos(priv, areset, vreset, 0);
ds->id = -2;
ds->sh = NULL;
- ds_free_packs(ds);
+ ds->free_packs();
*((int*)args) = ds->id;
return MPXP_Ok;
}
@@ -3231,7 +3231,7 @@
reset_fifos(priv, areset, vreset, 0);
ds->id = priv->ts.streams[i].id;
ds->sh = sh;
- ds_free_packs(ds);
+ ds->free_packs();
MSG_V("\r\ndemux_ts, switched to audio pid %d, id: %d, sh: %p\r\n", i, ds->id, sh);
}
*((int*)args) = ds->id;
Modified: mplayerxp/libmpdemux/demux_ty.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ty.cpp 2012-11-30 13:31:41 UTC (rev 492)
+++ mplayerxp/libmpdemux/demux_ty.cpp 2012-11-30 15:24:08 UTC (rev 493)
@@ -289,7 +289,7 @@
MSG_ERR("ty:WARNING - Would have blown my audio buffer\n" );
}
-static void demux_ty_CopyToDemuxPacket( demux_stream_t *ds,
+static void demux_ty_CopyToDemuxPacket( Demuxer_Stream *ds,
unsigned char *buffer, int size, off_t pos, int64_t pts )
{
Demuxer_Packet *dp = new(zeromem) Demuxer_Packet( size );
@@ -298,7 +298,7 @@
dp->pts = pts / 90000.0;
dp->pos = pos;
dp->flags = DP_NONKEYFRAME;
- ds_add_packet( ds, dp );
+ ds->add_packet(dp);
}
static int demux_ty_FindESHeader( uint8_t nal,
@@ -336,7 +336,7 @@
#define AUDIO_NAL 0xc0
#define AC3_NAL 0xbd
-static int ty_demux( demuxer_t *demux, demux_stream_t *dsds )
+static int ty_demux( demuxer_t *demux, Demuxer_Stream *dsds )
{
int invalidType = 0;
int errorHeader = 0;
@@ -509,7 +509,7 @@
if( demux->video->id == -1 ) demux->video->id = aid;
if( demux->video->id == aid )
{
- demux_stream_t *ds = demux->video;
+ Demuxer_Stream *ds = demux->video;
if( !ds->sh ) ds->sh = demux->v_streams[ aid ];
}
@@ -579,7 +579,7 @@
if( !demux->a_streams[ aid ] ) new_sh_audio( demux, aid );
if( demux->audio->id == aid )
{
- demux_stream_t *ds = demux->audio;
+ Demuxer_Stream *ds = demux->audio;
if( !ds->sh ) {
sh_audio_t* sh_a;
ds->sh = demux->a_streams[ aid ];
@@ -747,8 +747,8 @@
static void ty_seek( demuxer_t *demuxer, const seek_args_t* seeka )
{
- demux_stream_t *d_audio = demuxer->audio;
- demux_stream_t *d_video = demuxer->video;
+ Demuxer_Stream *d_audio = demuxer->audio;
+ Demuxer_Stream *d_video = demuxer->video;
sh_audio_t *sh_audio = reinterpret_cast<sh_audio_t*>(d_audio->sh);
off_t newpos;
off_t res;
@@ -791,9 +791,9 @@
// re-sync video:
videobuf_code_len = 0; // reset ES stream buffer
- ds_fill_buffer( d_video );
+ d_video->fill_buffer();
if( sh_audio )
- ds_fill_buffer( d_audio );
+ d_audio->fill_buffer();
while( 1 )
{
@@ -801,7 +801,7 @@
if( sh_audio && !d_audio->eof && d_video->pts && d_audio->pts )
{
float a_pts = d_audio->pts;
- a_pts += ( ds_tell_pts( d_audio ) - sh_audio->a_in_buffer_len ) /
+ a_pts += ( d_audio->tell_pts() - sh_audio->a_in_buffer_len ) /
(float)sh_audio->i_bps;
if( d_video->pts > a_pts )
{
@@ -823,7 +823,7 @@
UNUSED(cmd);
UNUSED(arg);
#if 0
- demux_stream_t *d_video = demuxer->video;
+ Demuxer_Stream *d_video = demuxer->video;
sh_video_t *sh_video = d_video->sh;
switch(cmd) {
case DEMUX_CMD_GET_TIME_LENGTH: return MPXP_NA;
@@ -847,7 +847,7 @@
{
TiVoInfo *tivo...
[truncated message content] |
