[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[508] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[508] mplayerxp
|
From: <nic...@us...> - 2012-12-04 16:36:58
|
Revision: 508
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=508&view=rev
Author: nickols_k
Date: 2012-12-04 16:36:42 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
convert struct demuxer_t into Demuxer
Modified Paths:
--------------
mplayerxp/dump.cpp
mplayerxp/dump.h
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/demuxer_stream.cpp
mplayerxp/libmpdemux/demuxer_stream.h
mplayerxp/libmpdemux/mux_mpxp64.cpp
mplayerxp/libmpdemux/mux_raw.cpp
mplayerxp/libmpdemux/muxer.cpp
mplayerxp/libmpdemux/muxer.h
mplayerxp/libmpdemux/stheader.h
mplayerxp/libmpdemux/video.cpp
mplayerxp/libmpstream/network.cpp
mplayerxp/libmpstream/s_tv.cpp
mplayerxp/libmpstream/stream.h
mplayerxp/mp-opt-reg.cpp
mplayerxp/mplayerxp.cpp
mplayerxp/xmpcore/mp_aframe.cpp
mplayerxp/xmpcore/mp_aframe.h
mplayerxp/xmpcore/xmp_aplayer.cpp
mplayerxp/xmpcore/xmp_vdecoder.cpp
mplayerxp/xmpcore/xmp_vplayer.cpp
Modified: mplayerxp/dump.cpp
===================================================================
--- mplayerxp/dump.cpp 2012-12-04 13:56:44 UTC (rev 507)
+++ mplayerxp/dump.cpp 2012-12-04 16:36:42 UTC (rev 508)
@@ -119,7 +119,7 @@
return retval;
}
-void dump_mux_init(demuxer_t *demuxer,any_t* libinput)
+void dump_mux_init(Demuxer *demuxer,any_t* libinput)
{
sh_audio_t* sha=reinterpret_cast<sh_audio_t*>(demuxer->audio->sh);
sh_video_t* shv=reinterpret_cast<sh_video_t*>(demuxer->video->sh);
@@ -223,7 +223,7 @@
muxer_write_header(priv->muxer,demuxer);
}
-void dump_mux_close(demuxer_t *demuxer)
+void dump_mux_close(Demuxer *demuxer)
{
dump_priv_t* priv=static_cast<dump_priv_t*>(demuxer->priv);
Demuxer_Stream *d_audio=demuxer->audio;
@@ -283,7 +283,7 @@
}
-void dump_mux(demuxer_t *demuxer,int use_pts,const char *seek_to_sec,unsigned play_n_frames)
+void dump_mux(Demuxer *demuxer,int use_pts,const char *seek_to_sec,unsigned play_n_frames)
{
dump_priv_t* priv=static_cast<dump_priv_t*>(demuxer->priv);
Demuxer_Stream *d_audio=demuxer->audio;
Modified: mplayerxp/dump.h
===================================================================
--- mplayerxp/dump.h 2012-12-04 13:56:44 UTC (rev 507)
+++ mplayerxp/dump.h 2012-12-04 16:36:42 UTC (rev 508)
@@ -7,9 +7,9 @@
namespace mpxp {
int dump_parse(const char *param);
void dump_stream(stream_t *stream);
- void dump_mux_init(demuxer_t *demuxer,any_t*libinput);
- void dump_mux(demuxer_t *demuxer,int use_pts,const char *seek_to_sec,unsigned play_n_frames);
- void dump_mux_close(demuxer_t *demuxer);
+ void dump_mux_init(Demuxer *demuxer,any_t*libinput);
+ void dump_mux(Demuxer *demuxer,int use_pts,const char *seek_to_sec,unsigned play_n_frames);
+ void dump_mux_close(Demuxer *demuxer);
void __FASTCALL__ dump_stream_event_handler(stream_t *s,const stream_packet_t*sp);
} //namespace
#endif
Modified: mplayerxp/libmpdemux/demux_aiff.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_aiff.cpp 2012-12-04 13:56:44 UTC (rev 507)
+++ mplayerxp/libmpdemux/demux_aiff.cpp 2012-12-04 16:36:42 UTC (rev 508)
@@ -40,7 +40,7 @@
int verc;
};
-static MPXP_Rc aiff_probe(demuxer_t* demuxer)
+static MPXP_Rc aiff_probe(Demuxer* demuxer)
{
char buf[12];
stream_t *s;
@@ -51,7 +51,7 @@
return MPXP_False;
}
-static demuxer_t* aiff_open(demuxer_t* demuxer) {
+static Demuxer* aiff_open(Demuxer* demuxer) {
sh_audio_t* sh_audio;
WAVEFORMATEX* w;
stream_t *s;
@@ -59,9 +59,9 @@
char preamble[8];
s = demuxer->stream;
- sh_audio = new_sh_audio(demuxer,0);
+ sh_audio = demuxer->new_sh_audio();
demuxer->priv=priv=new(zeromem) priv_t;
- sh_audio->wf = w = (WAVEFORMATEX*)mp_malloc(sizeof(WAVEFORMATEX));
+ sh_audio->wf = w = new(zeromem) WAVEFORMATEX;
w->wFormatTag = 0x1; sh_audio->wtag = mmioFOURCC('r','a','w',' '); /* S16BE */
w->nChannels = sh_audio->nch =
w->nSamplesPerSec = sh_audio->rate =
@@ -184,7 +184,7 @@
return demuxer;
}
-static int aiff_demux(demuxer_t* demuxer, Demuxer_Stream *ds) {
+static int aiff_demux(Demuxer* 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);
@@ -204,7 +204,7 @@
return 1;
}
-static void aiff_seek(demuxer_t *demuxer,const seek_args_t* seeka){
+static void aiff_seek(Demuxer *demuxer,const seek_args_t* seeka){
stream_t* s = demuxer->stream;
sh_audio_t* sh_audio = reinterpret_cast<sh_audio_t*>(demuxer->audio->sh);
off_t base,pos;
@@ -215,12 +215,12 @@
stream_seek(s,pos);
}
-static void aiff_close(demuxer_t* demuxer)
+static void aiff_close(Demuxer* demuxer)
{
delete demuxer->priv;
}
-static MPXP_Rc aiff_control(const demuxer_t *demuxer,int cmd,any_t*args)
+static MPXP_Rc aiff_control(const Demuxer *demuxer,int cmd,any_t*args)
{
UNUSED(demuxer);
UNUSED(cmd);
Modified: mplayerxp/libmpdemux/demux_asf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_asf.cpp 2012-12-04 13:56:44 UTC (rev 507)
+++ mplayerxp/libmpdemux/demux_asf.cpp 2012-12-04 16:36:42 UTC (rev 508)
@@ -121,7 +121,7 @@
}
}
-static MPXP_Rc asf_probe(demuxer_t *demuxer){
+static MPXP_Rc asf_probe(Demuxer *demuxer){
const unsigned char asfhdrguid[16]= {0x30,0x26,0xB2,0x75,0x8E,0x66,0xCF,0x11,0xA6,0xD9,0x00,0xAA,0x00,0x62,0xCE,0x6C};
const unsigned char asf2hdrguid[16]={0xD1,0x29,0xE2,0xD6,0xDA,0x35,0xD1,0x11,0x90,0x34,0x00,0xA0,0xC9,0x03,0x49,0xBE};
asf_priv_t* apriv;
@@ -150,11 +150,11 @@
delete demuxer->priv;
return MPXP_False; // invalid header???
}
- demuxer->file_format=DEMUXER_TYPE_ASF;
+ demuxer->file_format=Demuxer::Type_ASF;
return MPXP_Ok;
}
-static demuxer_t* asf_open(demuxer_t *demuxer){
+static Demuxer* asf_open(Demuxer *demuxer){
static unsigned char buffer[2048];
uint32_t* streams = NULL;
int audio_streams=0;
@@ -189,7 +189,7 @@
stream_read(demuxer->stream,(char*) buffer,apriv->streamh.type_size);
switch(ASF_LOAD_GUID_PREFIX(apriv->streamh.type)){
case ASF_GUID_PREFIX_audio_stream: {
- sh_audio_t* sh_audio=new_sh_audio(demuxer,apriv->streamh.stream_no & 0x7F);
+ sh_audio_t* sh_audio=demuxer->new_sh_audio(apriv->streamh.stream_no & 0x7F);
++audio_streams;
sh_audio->wf=(WAVEFORMATEX*)mp_calloc((apriv->streamh.type_size<sizeof(WAVEFORMATEX))?sizeof(WAVEFORMATEX):apriv->streamh.type_size,1);
memcpy(sh_audio->wf,buffer,apriv->streamh.type_size);
@@ -208,7 +208,7 @@
break;
}
case ASF_GUID_PREFIX_video_stream: {
- sh_video_t* sh_video=new_sh_video(demuxer,apriv->streamh.stream_no & 0x7F);
+ sh_video_t* sh_video=demuxer->new_sh_video(apriv->streamh.stream_no & 0x7F);
unsigned int len=apriv->streamh.type_size-(4+4+1+2);
++video_streams;
sh_video->bih=(BITMAPINFOHEADER*)mp_mallocz(len<sizeof(BITMAPINFOHEADER)?sizeof(BITMAPINFOHEADER):len);
@@ -422,7 +422,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){
+static int demux_asf_read_packet(Demuxer *demux,off_t dataoff,int len,int id,int seq,unsigned long time,unsigned short dur,int offs,int keyframe){
Demuxer_Stream *ds=NULL;
asf_priv_t *apriv=static_cast<asf_priv_t*>(demux->priv);
@@ -501,7 +501,7 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int asf_demux(demuxer_t *demux,Demuxer_Stream *ds){
+static int asf_demux(Demuxer *demux,Demuxer_Stream *ds){
stream_t *stream=demux->stream;
asf_priv_t *apriv=static_cast<asf_priv_t*>(demux->priv);
int done=0;
@@ -690,7 +690,7 @@
}
-static void asf_seek(demuxer_t *demuxer,const seek_args_t* seeka){
+static void asf_seek(Demuxer *demuxer,const seek_args_t* seeka){
Demuxer_Stream *d_audio=demuxer->audio;
Demuxer_Stream *d_video=demuxer->video;
asf_priv_t *apriv=static_cast<asf_priv_t*>(demuxer->priv);
@@ -717,12 +717,12 @@
}
}
-static void asf_close(demuxer_t *demuxer)
+static void asf_close(Demuxer *demuxer)
{
delete demuxer->priv;
}
-static MPXP_Rc asf_control(const demuxer_t *demuxer,int cmd,any_t*args)
+static MPXP_Rc asf_control(const Demuxer *demuxer,int cmd,any_t*args)
{
UNUSED(demuxer);
UNUSED(cmd);
Modified: mplayerxp/libmpdemux/demux_audio.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_audio.cpp 2012-12-04 13:56:44 UTC (rev 507)
+++ mplayerxp/libmpdemux/demux_audio.cpp 2012-12-04 16:36:42 UTC (rev 508)
@@ -411,7 +411,7 @@
}
}
-static void find_next_mp3_hdr(demuxer_t *demuxer,uint8_t *hdr) {
+static void find_next_mp3_hdr(Demuxer *demuxer,uint8_t *hdr) {
int len;
off_t spos;
while(!stream_eof(demuxer->stream)) {
@@ -428,7 +428,7 @@
}
-static int read_mp3v1_tags(demuxer_t *demuxer,uint8_t *hdr, off_t pos )
+static int read_mp3v1_tags(Demuxer *demuxer,uint8_t *hdr, off_t pos )
{
unsigned n;
stream_t *s=demuxer->stream;
@@ -482,7 +482,7 @@
return 1;
}
-static int read_ac3_tags(demuxer_t *demuxer,uint8_t *hdr, off_t pos,unsigned *bitrate,unsigned *samplerate,unsigned *channels)
+static int read_ac3_tags(Demuxer *demuxer,uint8_t *hdr, off_t pos,unsigned *bitrate,unsigned *samplerate,unsigned *channels)
{
uint8_t b[8];
unsigned n;
@@ -506,7 +506,7 @@
return 1;
}
-static int read_ddca_tags(demuxer_t *demuxer,uint8_t *hdr, off_t pos,unsigned *bitrate,unsigned *samplerate,unsigned *channels)
+static int read_ddca_tags(Demuxer *demuxer,uint8_t *hdr, off_t pos,unsigned *bitrate,unsigned *samplerate,unsigned *channels)
{
uint8_t b[12];
unsigned n;
@@ -545,7 +545,7 @@
/* frame header */
#define ID3V22_FRAME_HEADER_SIZE 6
-static int read_id3v22_tags(demuxer_t *demuxer,unsigned flags,unsigned hsize)
+static int read_id3v22_tags(Demuxer *demuxer,unsigned flags,unsigned hsize)
{
off_t pos,epos;
stream_t *s=demuxer->stream;
@@ -610,7 +610,7 @@
#define ID3V23_FRAME_GROUP_ID_FLAG 0x0020
#define ID3V23_FRAME_ZERO_FLAG 0x1F1F
-static int read_id3v23_tags(demuxer_t *demuxer,unsigned flags,unsigned hsize)
+static int read_id3v23_tags(Demuxer *demuxer,unsigned flags,unsigned hsize)
{
off_t pos,epos;
stream_t *s=demuxer->stream;
@@ -686,7 +686,7 @@
#define ID3V24_FRAME_DATA_LEN_FLAG 0x0001
#define ID3V24_FRAME_ZERO_FLAG 0x8FB0
-static int read_id3v24_tags(demuxer_t *demuxer,unsigned flags,unsigned hsize)
+static int read_id3v24_tags(Demuxer *demuxer,unsigned flags,unsigned hsize)
{
off_t pos,epos;
stream_t *s=demuxer->stream;
@@ -741,7 +741,7 @@
return 1;
}
-static int read_id3v2_tags(demuxer_t *demuxer)
+static int read_id3v2_tags(Demuxer *demuxer)
{
char buf[4];
stream_t* s=demuxer->stream;
@@ -762,7 +762,7 @@
return 1;
}
-static int audio_get_raw_id(demuxer_t *demuxer,off_t fptr,unsigned *brate,unsigned *samplerate,unsigned *channels)
+static int audio_get_raw_id(Demuxer *demuxer,off_t fptr,unsigned *brate,unsigned *samplerate,unsigned *channels)
{
int retval=0;
uint32_t fcc,fcc1,fmt;
@@ -800,7 +800,7 @@
return retval;
}
-static MPXP_Rc audio_probe(demuxer_t* demuxer)
+static MPXP_Rc audio_probe(Demuxer* demuxer)
{
uint32_t fcc1,fcc2;
stream_t *s;
@@ -864,7 +864,7 @@
extern const demuxer_driver_t demux_audio;
-static demuxer_t* audio_open(demuxer_t* demuxer) {
+static Demuxer* audio_open(Demuxer* demuxer) {
stream_t *s;
sh_audio_t* sh_audio;
uint8_t hdr[HDR_SIZE];
@@ -1011,7 +1011,7 @@
MSG_ERR("Can't detect audio format\n");
return NULL;
}
- sh_audio = new_sh_audio(demuxer,0);
+ sh_audio = demuxer->new_sh_audio();
MSG_DBG2("mp3_header off: st_pos=%lu n=%lu HDR_SIZE=%u\n",st_pos,n,HDR_SIZE);
demuxer->movi_start = stream_tell(s);
demuxer->movi_end = s->end_pos;
@@ -1216,7 +1216,7 @@
MSG_DBG2("Found %u bytes WAVEFORMATEX\n",l);
if(l < 16) {
MSG_ERR("Bad wav header length : too short !!!\n");
- free_sh_audio(sh_audio);
+ delete sh_audio;
return NULL;
}
w->wFormatTag = sh_audio->wtag = stream_read_word_le(s);
@@ -1394,9 +1394,9 @@
return out & mask;
}
-static int audio_demux(demuxer_t *demuxer,Demuxer_Stream *ds) {
+static int audio_demux(Demuxer *demuxer,Demuxer_Stream *ds) {
sh_audio_t* sh_audio;
- demuxer_t* demux;
+ Demuxer* demux;
da_priv_t* priv;
stream_t* s;
int frmt,seof;
@@ -1577,7 +1577,7 @@
return 0;
}
-static void high_res_mp3_seek(demuxer_t *demuxer,float _time) {
+static void high_res_mp3_seek(Demuxer *demuxer,float _time) {
uint8_t hdr[4];
int len,nf;
da_priv_t* priv = static_cast<da_priv_t*>(demuxer->priv);
@@ -1598,7 +1598,7 @@
}
}
-static void high_res_ac3_seek(demuxer_t *demuxer,float _time) {
+static void high_res_ac3_seek(Demuxer *demuxer,float _time) {
uint8_t hdr[8];
int len,nf;
unsigned tmp;
@@ -1620,7 +1620,7 @@
}
}
-static void high_res_ddca_seek(demuxer_t *demuxer,float _time) {
+static void high_res_ddca_seek(Demuxer *demuxer,float _time) {
uint8_t hdr[12];
int len,nf;
unsigned tmp;
@@ -1642,7 +1642,7 @@
}
}
-static void audio_seek(demuxer_t *demuxer,const seek_args_t* seeka){
+static void audio_seek(Demuxer *demuxer,const seek_args_t* seeka){
sh_audio_t* sh_audio;
stream_t* s;
int base,pos,frmt;
@@ -1764,14 +1764,14 @@
stream_seek(s,pos);
}
-static void audio_close(demuxer_t* demuxer) {
+static void audio_close(Demuxer* demuxer) {
da_priv_t* priv = static_cast<da_priv_t*>(demuxer->priv);
if(!priv) return;
delete priv;
}
-static MPXP_Rc audio_control(const demuxer_t *demuxer,int cmd,any_t*args)
+static MPXP_Rc audio_control(const Demuxer *demuxer,int cmd,any_t*args)
{
UNUSED(demuxer);
UNUSED(cmd);
Modified: mplayerxp/libmpdemux/demux_avi.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_avi.cpp 2012-12-04 13:56:44 UTC (rev 507)
+++ mplayerxp/libmpdemux/demux_avi.cpp 2012-12-04 16:36:42 UTC (rev 508)
@@ -23,7 +23,7 @@
#include "aviprint.h"
#include "demux_msg.h"
-typedef int (*alt_demuxer_t)(demuxer_t *demux,Demuxer_Stream *__ds);
+typedef int (*alt_demuxer_t)(Demuxer *demux,Demuxer_Stream *__ds);
struct avi_priv_t : public Opaque {
public:
avi_priv_t() {}
@@ -119,7 +119,7 @@
extern const demuxer_driver_t demux_avi;
-static void read_avi_header(demuxer_t *demuxer,int index_mode){
+static void read_avi_header(Demuxer *demuxer,int index_mode){
MainAVIHeader avih;
sh_audio_t *sh_audio=NULL;
sh_video_t *sh_video=NULL;
@@ -266,13 +266,13 @@
MSG_FATAL("DVDS chunk found!!! Still is not suupported\n");
}
if(h.fccType==streamtypeVIDEO){
- sh_video=new_sh_video(demuxer,stream_id);
+ sh_video=demuxer->new_sh_video(stream_id);
memcpy(&sh_video->video,&h,sizeof(h));
// demuxer->video->sh=sh_video;
} else
if(h.fccType==streamtypeAUDIO){
MSG_V("avi: Found audio stream\n");
- sh_audio=new_sh_audio(demuxer,stream_id);
+ sh_audio=demuxer->new_sh_audio(stream_id);
memcpy(&sh_audio->audio,&h,sizeof(h));
// demuxer->audio->sh=sh_audio;
}
@@ -763,7 +763,7 @@
#undef MIN
// Select ds from ID
-static Demuxer_Stream* demux_avi_select_stream(demuxer_t *demux,unsigned int id){
+static Demuxer_Stream* demux_avi_select_stream(Demuxer *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,Demuxer_Stream *ds,unsigned int id,unsigned int len,int idxpos,dp_flags_e flags){
+static int demux_avi_read_packet(Demuxer *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;
@@ -903,10 +903,10 @@
return ds?1:0;
}
-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_read_ni(Demuxer *demux,Demuxer_Stream* ds);
+static int avi_read_nini(Demuxer *demux,Demuxer_Stream* ds);
-static int avi_demux(demuxer_t *demux,Demuxer_Stream *__ds){
+static int avi_demux(Demuxer *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;
@@ -934,7 +934,7 @@
}
pos = (off_t)priv->idx_offset+avi_idx_offset(idx);
- if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->flags & DEMUXF_SEEKABLE)){
+ if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->flags & Demuxer::Seekable)){
MSG_V("ChunkOffset out of range! idx=0x%X \n",pos);
continue;
}
@@ -966,7 +966,7 @@
if(!(idx->dwFlags&AVIIF_KEYFRAME)) flags=DP_NONKEYFRAME;
} else {
demux->filepos=stream_tell(demux->stream);
- if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start && (demux->flags & DEMUXF_SEEKABLE)){
+ if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start && (demux->flags & Demuxer::Seekable)){
stream_set_eof(demux->stream,1);
return 0;
}
@@ -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,Demuxer_Stream* ds){
+static int avi_read_ni(Demuxer *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,Demuxer_Stream* ds){
+static int avi_read_nini(Demuxer *demux,Demuxer_Stream* ds){
avi_priv_t *priv=static_cast<avi_priv_t*>(demux->priv);
unsigned int id=0;
unsigned int len;
@@ -1130,7 +1130,7 @@
int index_mode=-1; // -1=untouched 0=don't use index 1=use (geneate) index
extern demuxer_driver_t demux_ogg;
-static demuxer_t* avi_open(demuxer_t* demuxer){
+static Demuxer* avi_open(Demuxer* demuxer){
Demuxer_Stream *d_audio=demuxer->audio;
Demuxer_Stream *d_video=demuxer->video;
sh_audio_t *sh_audio=NULL;
@@ -1204,7 +1204,7 @@
MSG_ERR("AVI_NI: " MSGTR_MissingAudioStream);
sh_audio=NULL;
}
- } else demuxer->flags &= ~DEMUXF_SEEKABLE;
+ } else demuxer->flags &= ~Demuxer::Seekable;
if(!d_video->fill_buffer()){
MSG_ERR("AVI: " MSGTR_MissingVideoStreamBug);
return NULL;
@@ -1284,7 +1284,7 @@
return demuxer;
}
-static void avi_seek(demuxer_t *demuxer,const seek_args_t* seeka){
+static void avi_seek(Demuxer *demuxer,const seek_args_t* seeka){
avi_priv_t *priv=static_cast<avi_priv_t*>(demuxer->priv);
Demuxer_Stream *d_audio=demuxer->audio;
Demuxer_Stream *d_video=demuxer->video;
@@ -1469,20 +1469,20 @@
}
#define formtypeON2 mmioFOURCC('O', 'N', '2', 'f')
-static MPXP_Rc avi_probe(demuxer_t *demuxer)
+static MPXP_Rc avi_probe(Demuxer *demuxer)
{
uint32_t riff,id;
riff = stream_read_dword_le(demuxer->stream);
stream_read_dword_le(demuxer->stream); /*filesize */
id=stream_read_dword_le(demuxer->stream); /* "AVI " */
- demuxer->file_format=DEMUXER_TYPE_AVI;
+ demuxer->file_format=Demuxer::Type_AVI;
if(riff == mmioFOURCC('R','I','F','F') && id == formtypeAVI) return MPXP_Ok;
if(riff == mmioFOURCC('O','N','2',' ') && id == formtypeON2) return MPXP_Ok;
return MPXP_False;
}
-static void avi_close(demuxer_t *demuxer)
+static void avi_close(Demuxer *demuxer)
{
avi_priv_t* priv=static_cast<avi_priv_t*>(demuxer->priv);
@@ -1491,7 +1491,7 @@
delete priv;
}
-static MPXP_Rc avi_control(const demuxer_t *demuxer,int cmd,any_t*args)
+static MPXP_Rc avi_control(const Demuxer *demuxer,int cmd,any_t*args)
{
UNUSED(demuxer);
UNUSED(cmd);
Modified: mplayerxp/libmpdemux/demux_bmp.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_bmp.cpp 2012-12-04 13:56:44 UTC (rev 507)
+++ mplayerxp/libmpdemux/demux_bmp.cpp 2012-12-04 16:36:42 UTC (rev 508)
@@ -29,7 +29,7 @@
static int demux_rw_seek(struct SDL_RWops *context, int offset, int whence)
{
unsigned long newpos=-1;
- demuxer_t *demux = reinterpret_cast<demuxer_t*>(context->hidden.unknown.data1);
+ Demuxer *demux = reinterpret_cast<Demuxer*>(context->hidden.unknown.data1);
switch(whence)
{
case SEEK_SET:
@@ -51,7 +51,7 @@
static int demux_rw_read(struct SDL_RWops *context, any_t*ptr, int size, int maxnum)
{
int retval;
- demuxer_t *demux = reinterpret_cast<demuxer_t*>(context->hidden.unknown.data1);
+ Demuxer *demux = reinterpret_cast<Demuxer*>(context->hidden.unknown.data1);
retval = stream_read(demux->stream,ptr,size*maxnum);
return retval;
}
@@ -66,7 +66,7 @@
return 0;
}
-static void demux_dup_rw_stream(demuxer_t* demuxer, struct SDL_RWops*rwops)
+static void demux_dup_rw_stream(Demuxer* demuxer, struct SDL_RWops*rwops)
{
/* it's not a danger to mp_malloc 8 bytes */
rwops->hidden.unknown.data1=demuxer;
@@ -84,16 +84,16 @@
static SDL_RWops my_rw;
static SDL_Surface *img;
-static MPXP_Rc bmp_probe(demuxer_t *demuxer)
+static MPXP_Rc bmp_probe(Demuxer *demuxer)
{
demux_dup_rw_stream(demuxer,&my_rw);
stream_reset(demuxer->stream);
img = IMG_Load_RW(&my_rw,0);
- if(img) demuxer->file_format=DEMUXER_TYPE_BMP;
+ if(img) demuxer->file_format=Demuxer::Type_BMP;
return img ? MPXP_Ok : MPXP_False;
}
-static int bmp_demux(demuxer_t *demuxer,Demuxer_Stream *__ds)
+static int bmp_demux(Demuxer *demuxer,Demuxer_Stream *__ds)
{
UNUSED(__ds);
unsigned lsize=((img->format->BitsPerPixel+7)/8)*img->w;
@@ -142,12 +142,12 @@
return 1;
}
-static demuxer_t* bmp_open(demuxer_t* demuxer)
+static Demuxer* bmp_open(Demuxer* demuxer)
{
sh_video_t *sh_video = NULL;
unsigned npal_colors;
// create a new video stream header
- sh_video = new_sh_video(demuxer, 0);
+ sh_video = demuxer->new_sh_video();
// make sure the demuxer knows about the new video stream header
demuxer->video->sh = sh_video;
// make sure that the video demuxer stream header knows about its
@@ -191,7 +191,7 @@
return demuxer;
}
-static void bmp_close(demuxer_t* demuxer)
+static void bmp_close(Demuxer* demuxer)
{
UNUSED(demuxer);
if(img) SDL_FreeSurface(img);
@@ -210,7 +210,7 @@
};
// Check if a file is a BMP file depending on whether starts with 'BM'
-static MPXP_Rc bmp_probe(demuxer_t *demuxer)
+static MPXP_Rc bmp_probe(Demuxer *demuxer)
{
if (stream_read_word(demuxer->stream) == (('B' << 8) | 'M'))
return MPXP_Ok;
@@ -221,7 +221,7 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int bmp_demux(demuxer_t *demuxer,Demuxer_Stream *__ds)
+static int bmp_demux(Demuxer *demuxer,Demuxer_Stream *__ds)
{
bmp_image_t *bmp_image = static_cast<bmp_image_t*>(demuxer->priv);
@@ -232,7 +232,7 @@
return 1;
}
-static demuxer_t* bmp_open(demuxer_t* demuxer)
+static Demuxer* bmp_open(Demuxer* demuxer)
{
sh_video_t *sh_video = NULL;
unsigned int filesize;
@@ -248,7 +248,7 @@
stream_skip(demuxer->stream, 2);
// create a new video stream header
- sh_video = new_sh_video(demuxer, 0);
+ sh_video = demuxer->new_sh_video();
// make sure the demuxer knows about the new video stream header
demuxer->video->sh = sh_video;
@@ -295,7 +295,7 @@
return demuxer;
}
-static void bmp_close(demuxer_t* demuxer) {
+static void bmp_close(Demuxer* demuxer) {
bmp_image_t *bmp_image = static_cast<bmp_image_t*>(demuxer->priv);
if(!bmp_image)
@@ -304,7 +304,7 @@
}
#endif
-static MPXP_Rc bmp_control(const demuxer_t *demuxer,int cmd,any_t*args)
+static MPXP_Rc bmp_control(const Demuxer *demuxer,int cmd,any_t*args)
{
UNUSED(demuxer);
UNUSED(cmd);
Modified: mplayerxp/libmpdemux/demux_demuxers.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_demuxers.cpp 2012-12-04 13:56:44 UTC (rev 507)
+++ mplayerxp/libmpdemux/demux_demuxers.cpp 2012-12-04 16:36:42 UTC (rev 508)
@@ -9,27 +9,28 @@
#include "stheader.h"
#include "demux_msg.h"
+namespace mpxp {
struct dd_priv_t : public Opaque {
public:
dd_priv_t() {}
virtual ~dd_priv_t();
- demuxer_t* vd;
- demuxer_t* ad;
- demuxer_t* sd;
+ Demuxer* vd;
+ Demuxer* ad;
+ Demuxer* sd;
};
dd_priv_t::~dd_priv_t() {
- if(vd) { free_demuxer(vd); vd=NULL; }
- if(ad && ad != vd) { free_demuxer(ad); ad=NULL; }
- if(sd && sd != vd && sd != ad) { free_demuxer(sd); sd=NULL; }
+ if(vd) { delete vd; vd=NULL; }
+ if(ad && ad != vd) { delete ad; ad=NULL; }
+ if(sd && sd != vd && sd != ad) { delete sd; sd=NULL; }
}
-demuxer_t* new_demuxers_demuxer(demuxer_t* vd, demuxer_t* ad, demuxer_t* sd) {
- demuxer_t* ret;
+Demuxer* new_demuxers_demuxer(Demuxer* vd, Demuxer* ad, Demuxer* sd) {
+ Demuxer* ret;
dd_priv_t* priv;
- ret = new(zeromem) demuxer_t;
+ ret = new(zeromem) Demuxer;
priv = new(zeromem) dd_priv_t;
priv->vd = vd;
@@ -37,10 +38,10 @@
priv->sd = sd;
ret->priv = priv;
- ret->file_format = DEMUXER_TYPE_DEMUXERS;
+ ret->file_format = Demuxer::Type_DEMUXERS;
// Video is the most important :-)
ret->stream = vd->stream;
- ret->flags = (vd->flags&DEMUXF_SEEKABLE) && (ad->flags&DEMUXF_SEEKABLE) && (sd->flags&DEMUXF_SEEKABLE);
+ ret->flags = (vd->flags&Demuxer::Seekable) && (ad->flags&Demuxer::Seekable) && (sd->flags&Demuxer::Seekable)?Demuxer::Seekable:Demuxer::NonSeekable;
ret->video = vd->video;
ret->audio = ad->audio;
@@ -52,21 +53,21 @@
return ret;
}
-static int demux_demuxers_fill_buffer(demuxer_t *demux,Demuxer_Stream *ds) {
+static int demux_demuxers_fill_buffer(Demuxer *demux,Demuxer_Stream *ds) {
dd_priv_t* priv=static_cast<dd_priv_t*>(demux->priv);
if(ds->demuxer == priv->vd)
- return demux_fill_buffer(priv->vd,ds);
+ return priv->vd->fill_buffer(ds);
else if(ds->demuxer == priv->ad)
- return demux_fill_buffer(priv->ad,ds);
+ return priv->ad->fill_buffer(ds);
else if(ds->demuxer == priv->sd)
- return demux_fill_buffer(priv->sd,ds);
+ return priv->sd->fill_buffer(ds);
MSG_ERR("Demux demuxers fill_buffer error : bad demuxer : not vd, ad nor sd\n");
return 0;
}
-static void demux_demuxers_seek(demuxer_t *demuxer,const seek_args_t* seeka) {
+static void demux_demuxers_seek(Demuxer *demuxer,const seek_args_t* seeka) {
dd_priv_t* priv=static_cast<dd_priv_t*>(demuxer->priv);
float pos;
@@ -76,13 +77,13 @@
stream_set_eof(priv->sd->stream,0);
// Seek video
- demux_seek(priv->vd,seeka);
+ priv->vd->seek(seeka);
// Get the new pos
pos = demuxer->video->pts;
if(priv->ad != priv->vd) {
sh_audio_t* sh = (sh_audio_t*)demuxer->audio->sh;
- demux_seek(priv->ad,&seek_p);
+ priv->ad->seek(&seek_p);
// In case the demuxer don't set pts
if(!demuxer->audio->pts)
demuxer->audio->pts = pos-((demuxer->audio->tell_pts()-sh->a_in_buffer_len)/(float)sh->i_bps);
@@ -91,12 +92,13 @@
}
if(priv->sd != priv->vd)
- demux_seek(priv->sd,&seek_p);
+ priv->sd->seek(&seek_p);
}
-static void demux_close_demuxers(demuxer_t* demuxer) {
+static void demux_close_demuxers(Demuxer* demuxer) {
dd_priv_t* priv = static_cast<dd_priv_t*>(demuxer->priv);
delete priv;
delete demuxer;
}
+} // namespace mpxp
Modified: mplayerxp/libmpdemux/demux_dv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_dv.cpp 2012-12-04 13:56:44 UTC (rev 507)
+++ mplayerxp/libmpdemux/demux_dv.cpp 2012-12-04 16:36:42 UTC (rev 508)
@@ -53,7 +53,7 @@
dv_decoder_t *decoder;
};
-static void dv_seek(demuxer_t *demuxer,const seek_args_t* seeka)
+static void dv_seek(Demuxer *demuxer,const seek_args_t* seeka)
{
rawdv_frames_t *frames = reinterpret_cast<rawdv_frames_t*>(demuxer->priv);
sh_video_t *sh_video = reinterpret_cast<sh_video_t*>(demuxer->video->sh);
@@ -73,7 +73,7 @@
frames->current_filepos=newpos*frames->frame_size;
}
-static MPXP_Rc dv_probe(demuxer_t *demuxer)
+static MPXP_Rc dv_probe(Demuxer *demuxer)
{
unsigned char tmp_buffer[DV_PAL_FRAME_SIZE];
int bytes_read=0;
@@ -103,7 +103,7 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int dv_demux(demuxer_t *demuxer, Demuxer_Stream *ds)
+static int dv_demux(Demuxer *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);
@@ -135,7 +135,7 @@
return 1;
}
-static demuxer_t* dv_open(demuxer_t* demuxer)
+static Demuxer* dv_open(Demuxer* demuxer)
{
unsigned char dv_frame[DV_PAL_FRAME_SIZE];
sh_video_t *sh_video = NULL;
@@ -159,13 +159,13 @@
return NULL;
// create a new video stream header
- sh_video = new_sh_video(demuxer, 0);
+ sh_video = demuxer->new_sh_video();
if (!sh_video)
return NULL;
// make sure the demuxer knows about the new video stream header
// (even though new_sh_video() ought to take care of it)
- demuxer->flags |= DEMUXF_SEEKABLE;
+ demuxer->flags |= Demuxer::Seekable;
demuxer->video->sh = sh_video;
// make sure that the video demuxer stream header knows about its
@@ -201,7 +201,7 @@
MSG_V("demux_open_rawdv() seek to %qu, size: %d, dv_dec->frame_size: %d\n",frames->current_filepos,frames->frame_size, dv_decoder->frame_size);
if (dv_decoder->audio != NULL && demuxer->audio->id>=-1){
- sh_audio_t *sh_audio = new_sh_audio(demuxer, 0);
+ sh_audio_t *sh_audio = demuxer->new_sh_audio();
demuxer->audio->id = 0;
demuxer->audio->sh = sh_audio;
sh_audio->ds = demuxer->audio;
@@ -228,7 +228,7 @@
return demuxer;
}
-static void dv_close(demuxer_t* demuxer)
+static void dv_close(Demuxer* demuxer)
{
rawdv_frames_t *frames = static_cast<rawdv_frames_t*>(demuxer->priv);
@@ -236,7 +236,7 @@
delete frames;
}
-static MPXP_Rc dv_control(const demuxer_t *demuxer,int cmd, any_t*arg) {
+static MPXP_Rc dv_control(const Demuxer *demuxer,int cmd, any_t*arg) {
return MPXP_Unknown;
}
Modified: mplayerxp/libmpdemux/demux_film.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_film.cpp 2012-12-04 13:56:44 UTC (rev 507)
+++ mplayerxp/libmpdemux/demux_film.cpp 2012-12-04 16:36:42 UTC (rev 508)
@@ -58,7 +58,7 @@
if(chunks) delete chunks;
}
-static void film_seek(demuxer_t *demuxer, const seek_args_t* seeka)
+static void film_seek(Demuxer *demuxer, const seek_args_t* seeka)
{
film_data_t *film_data = static_cast<film_data_t*>(demuxer->priv);
int new_current_chunk=(seeka->flags&DEMUX_SEEK_SET)?0:film_data->current_chunk;
@@ -91,7 +91,7 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int film_demux(demuxer_t *demuxer,Demuxer_Stream *__ds)
+static int film_demux(Demuxer *demuxer,Demuxer_Stream *__ds)
{
UNUSED(__ds);
int i;
@@ -193,7 +193,7 @@
return 1;
}
-static MPXP_Rc film_probe(demuxer_t* demuxer)
+static MPXP_Rc film_probe(Demuxer* demuxer)
{
uint32_t chunk_type;
@@ -201,11 +201,11 @@
chunk_type = le2me_32(stream_read_fourcc(demuxer->stream));
// validate the chunk type
if (chunk_type != CHUNK_FILM) return MPXP_False;
- demuxer->file_format=DEMUXER_TYPE_FILM;
+ demuxer->file_format=Demuxer::Type_FILM;
return MPXP_Ok;
}
-static demuxer_t* film_open(demuxer_t* demuxer)
+static Demuxer* film_open(Demuxer* demuxer)
{
sh_video_t *sh_video = NULL;
sh_audio_t *sh_audio = NULL;
@@ -272,7 +272,7 @@
if (video_format)
{
// create and initialize the video stream header
- sh_video = new_sh_video(demuxer, 0);
+ sh_video = demuxer->new_sh_video();
demuxer->video->sh = sh_video;
sh_video->ds = demuxer->video;
@@ -305,7 +305,7 @@
if (audio_channels > 0)
{
// create and initialize the audio stream header
- sh_audio = new_sh_audio(demuxer, 0);
+ sh_audio = demuxer->new_sh_audio();
demuxer->audio->sh = sh_audio;
sh_audio->ds = demuxer->audio;
@@ -336,7 +336,7 @@
// otherwise, make some assumptions about the audio
// create and initialize the audio stream header
- sh_audio = new_sh_audio(demuxer, 0);
+ sh_audio = demuxer->new_sh_audio();
demuxer->audio->sh = sh_audio;
sh_audio->ds = demuxer->audio;
@@ -435,14 +435,14 @@
return demuxer;
}
-static void film_close(demuxer_t* demuxer) {
+static void film_close(Demuxer* demuxer) {
film_data_t *film_data = reinterpret_cast<film_data_t*>(demuxer->priv);
if(!film_data) return;
delete film_data;
}
-static MPXP_Rc film_control(const demuxer_t *demuxer,int cmd,any_t*args)
+static MPXP_Rc film_control(const Demuxer *demuxer,int cmd,any_t*args)
{
UNUSED(demuxer);
UNUSED(cmd);
Modified: mplayerxp/libmpdemux/demux_fli.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_fli.cpp 2012-12-04 13:56:44 UTC (rev 507)
+++ mplayerxp/libmpdemux/demux_fli.cpp 2012-12-04 16:36:42 UTC (rev 508)
@@ -37,7 +37,7 @@
if(frame_size) delete frame_size;
}
-static void fli_seek(demuxer_t *demuxer,const seek_args_t* seeka){
+static void fli_seek(Demuxer *demuxer,const seek_args_t* seeka){
fli_frames_t *frames = static_cast<fli_frames_t*>(demuxer->priv);
sh_video_t *sh_video = reinterpret_cast<sh_video_t*>(demuxer->video->sh);
int newpos=(seeka->flags&DEMUX_SEEK_SET)?0:frames->current_frame;
@@ -50,7 +50,7 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int fli_demux(demuxer_t *demuxer,Demuxer_Stream *__ds){
+static int fli_demux(Demuxer *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);
@@ -75,16 +75,16 @@
return 1;
}
-static MPXP_Rc fli_probe(demuxer_t* demuxer){
+static MPXP_Rc fli_probe(Demuxer* demuxer){
unsigned magic_number;
demuxer->movi_end = stream_skip(demuxer->stream,4);
magic_number = stream_read_word_le(demuxer->stream);
if ((magic_number != 0xAF11) && (magic_number != 0xAF12)) return MPXP_False;
- demuxer->file_format=DEMUXER_TYPE_FLI;
+ demuxer->file_format=Demuxer::Type_FLI;
return MPXP_Ok;
}
-static demuxer_t* fli_open(demuxer_t* demuxer){
+static Demuxer* fli_open(Demuxer* demuxer){
sh_video_t *sh_video = NULL;
fli_frames_t *frames = new(zeromem) fli_frames_t;
int frame_number;
@@ -124,7 +124,7 @@
frames->frame_size = new unsigned int [frames->num_frames];
// create a new video stream header
- sh_video = new_sh_video(demuxer, 0);
+ sh_video = demuxer->new_sh_video();
// make sure the demuxer knows about the new video stream header
// (even though new_sh_video() ought to take care of it)
@@ -187,7 +187,7 @@
return demuxer;
}
-static void fli_close(demuxer_t* demuxer) {
+static void fli_close(Demuxer* demuxer) {
fli_frames_t *frames = static_cast<fli_frames_t*>(demuxer->priv);
if(!frames) return;
@@ -195,7 +195,7 @@
delete frames;
}
-static MPXP_Rc fli_control(const demuxer_t *demuxer,int cmd,any_t*args)
+static MPXP_Rc fli_control(const Demuxer *demuxer,int cmd,any_t*args)
{
UNUSED(demuxer);
UNUSED(cmd);
Modified: mplayerxp/libmpdemux/demux_lavf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_lavf.cpp 2012-12-04 13:56:44 UTC (rev 507)
+++ mplayerxp/libmpdemux/demux_lavf.cpp 2012-12-04 16:36:42 UTC (rev 508)
@@ -182,7 +182,7 @@
*key++ = (char2int(str[0]) << 4) | char2int(str[1]);
}
-static MPXP_Rc lavf_probe(demuxer_t *demuxer){
+static MPXP_Rc lavf_probe(Demuxer *demuxer){
AVProbeData avpd;
uint8_t buf[PROBE_BUF_SIZE];
lavf_priv_t *priv;
@@ -222,12 +222,12 @@
return MPXP_False;
}else
MSG_V("LAVF_check: %s\n", priv->avif->long_name);
- demuxer->file_format=DEMUXER_TYPE_ASF;
+ demuxer->file_format=Demuxer::Type_ASF;
return MPXP_Ok;
}
-static demuxer_t* lavf_open(demuxer_t *demuxer){
+static Demuxer* lavf_open(Demuxer *demuxer){
AVFormatContext *avfc;
lavf_priv_t *priv= static_cast<lavf_priv_t*>(demuxer->priv);
unsigned j;
@@ -279,7 +279,7 @@
switch(codec->codec_type){
case AVMEDIA_TYPE_AUDIO:{
WAVEFORMATEX *wf= (WAVEFORMATEX*)mp_calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1);
- sh_audio_t* sh_audio=new_sh_audio(demuxer, i);
+ sh_audio_t* sh_audio=demuxer->new_sh_audio(i);
priv->audio_streams++;
if(!codec->codec_tag)
codec->codec_tag= ff_codec_get_tag(ff_codec_wav_tags,codec->codec_id);
@@ -346,7 +346,7 @@
break;}
case AVMEDIA_TYPE_VIDEO:{
BITMAPINFOHEADER *bih=(BITMAPINFOHEADER*)mp_calloc(sizeof(BITMAPINFOHEADER) + codec->extradata_size,1);
- sh_video_t* sh_video=new_sh_video(demuxer, i);
+ sh_video_t* sh_video=demuxer->new_sh_video(i);
priv->video_streams++;
if(!codec->codec_tag)
@@ -413,7 +413,7 @@
return demuxer;
}
-static int lavf_demux(demuxer_t *demux, Demuxer_Stream *dsds){
+static int lavf_demux(Demuxer *demux, Demuxer_Stream *dsds){
UNUSED(dsds);
lavf_priv_t *priv= static_cast<lavf_priv_t*>(demux->priv);
AVPacket pkt;
@@ -468,14 +468,14 @@
return 1;
}
-static void lavf_seek(demuxer_t *demuxer,const seek_args_t* seeka){
+static void lavf_seek(Demuxer *demuxer,const seek_args_t* seeka){
lavf_priv_t *priv = static_cast<lavf_priv_t*>(demuxer->priv);
MSG_DBG2("lavf_demux(%p, %f, %d)\n", demuxer, seeka->secs, seeka->flags);
av_seek_frame(priv->avfc, -1, priv->last_pts + seeka->secs*AV_TIME_BASE, seeka->secs < 0 ? AVSEEK_FLAG_BACKWARD : 0);
}
-static MPXP_Rc lavf_control(const demuxer_t *demuxer, int cmd, any_t*arg)
+static MPXP_Rc lavf_control(const Demuxer *demuxer, int cmd, any_t*arg)
{
UNUSED(demuxer);
UNUSED(cmd);
@@ -483,7 +483,7 @@
return MPXP_Unknown;
}
-static void lavf_close(demuxer_t *demuxer)
+static void lavf_close(Demuxer *demuxer)
{
lavf_priv_t* priv = static_cast<lavf_priv_t*>(demuxer->priv);
if (priv){
Modified: mplayerxp/libmpdemux/demux_mkv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.cpp 2012-12-04 13:56:44 UTC (rev 507)
+++ mplayerxp/libmpdemux/demux_mkv.cpp 2012-12-04 16:36:42 UTC (rev 508)
@@ -1052,7 +1052,7 @@
}
static int
-demux_mkv_read_info (demuxer_t *demuxer)
+demux_mkv_read_info (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
stream_t *s = demuxer->stream;
@@ -1112,7 +1112,7 @@
}
static int
-demux_mkv_read_trackencodings (demuxer_t *demuxer, mkv_track_t *track)
+demux_mkv_read_trackencodings (Demuxer *demuxer, mkv_track_t *track)
{
stream_t *s = demuxer->stream;
mkv_content_encoding_t *ce, e;
@@ -1264,7 +1264,7 @@
}
static int
-demux_mkv_read_trackaudio (demuxer_t *demuxer, mkv_track_t *track)
+demux_mkv_read_trackaudio (Demuxer *demuxer, mkv_track_t *track)
{
stream_t *s = demuxer->stream;
uint64_t len, length, l;
@@ -1322,7 +1322,7 @@
}
static int
-demux_mkv_read_trackvideo (demuxer_t *demuxer, mkv_track_t *track)
+demux_mkv_read_trackvideo (Demuxer *demuxer, mkv_track_t *track)
{
stream_t *s = demuxer->stream;
uint64_t len, length, l;
@@ -1401,7 +1401,7 @@
}
static int
-demux_mkv_read_trackentry (demuxer_t *demuxer)
+demux_mkv_read_trackentry (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
stream_t *s = demuxer->stream;
@@ -1582,7 +1582,7 @@
}
static int
-demux_mkv_read_tracks (demuxer_t *demuxer)
+demux_mkv_read_tracks (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
stream_t *s = demuxer->stream;
@@ -1617,7 +1617,7 @@
}
static int
-demux_mkv_read_cues (demuxer_t *demuxer)
+demux_mkv_read_cues (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
stream_t *s = demuxer->stream;
@@ -1733,7 +1733,7 @@
}
static int
-demux_mkv_read_chapters (demuxer_t *demuxer)
+demux_mkv_read_chapters (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
stream_t *s = demuxer->stream;
@@ -1870,14 +1870,14 @@
}
static int
-demux_mkv_read_tags (demuxer_t *demuxer)
+demux_mkv_read_tags (Demuxer *demuxer)
{
ebml_read_skip (demuxer->stream, NULL);
return 0;
}
static int
-demux_mkv_read_attachments (demuxer_t *demuxer)
+demux_mkv_read_attachments (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
stream_t *s = demuxer->stream;
@@ -1992,7 +1992,7 @@
}
static int
-demux_mkv_read_seekhead (demuxer_t *demuxer)
+demux_mkv_read_seekhead (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
stream_t *s = demuxer->stream;
@@ -2118,14 +2118,14 @@
}
static int
-demux_mkv_open_video (demuxer_t *demuxer, mkv_track_t *track, int vid);
+demux_mkv_open_video (Demuxer *demuxer, mkv_track_t *track, int vid);
static int
-demux_mkv_open_audio (demuxer_t *demuxer, mkv_track_t *track, int aid);
+demux_mkv_open_audio (Demuxer *demuxer, mkv_track_t *track, int aid);
static int
-demux_mkv_open_sub (demuxer_t *demuxer, mkv_track_t *track, int sid);
+demux_mkv_open_sub (Demuxer *demuxer, mkv_track_t *track, int sid);
static void
-display_create_tracks (demuxer_t *demuxer)
+display_create_tracks (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
int i, vid=0, aid=0, sid=0;
@@ -2188,7 +2188,7 @@
};
static int
-demux_mkv_open_video (demuxer_t *demuxer, mkv_track_t *track, int vid)
+demux_mkv_open_video (Demuxer *demuxer, mkv_track_t *track, int vid)
{
BITMAPINFOHEADER* bih;
ImageDescription* ImageDesc = NULL;
@@ -2314,7 +2314,7 @@
}
}
- sh_v = new_sh_video_vid (demuxer, track->tnum, vid);
+ sh_v = demuxer->new_sh_video_vid (track->tnum, vid);
sh_v->bih = bih;
sh_v->fourcc = sh_v->bih->biCompression;
if (track->v_frate == 0.0)
@@ -2346,10 +2346,10 @@
}
static int
-demux_mkv_open_audio (demuxer_t *demuxer, mkv_track_t *track, int aid)
+demux_mkv_open_audio (Demuxer *demuxer, mkv_track_t *track, int aid)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
- sh_audio_t *sh_a = new_sh_audio_aid(demuxer, track->tnum, aid);
+ sh_audio_t *sh_a = demuxer->new_sh_audio_aid(track->tnum, aid);
Demuxer_Packet *dp;
if(!sh_a) return 1;
mkv_d->audio_tracks[mkv_d->last_aid] = track->tnum;
@@ -2438,7 +2438,7 @@
MSG_WARN("[mkv] Unknown/unsupported audio codec ID '%s' for track %u or missing/faulty\n[mkv] private codec data.\n",
track->codec_id, track->tnum);
- free_sh_audio(reinterpret_cast<sh_audio_t*>(demuxer->a_streams[track->tnum]));
+ delete demuxer->a_streams[track->tnum];
demuxer->a_streams[track->tnum]=0;
return 1;
}
@@ -2655,7 +2655,7 @@
{ /* do nothing, still works */ }
else if (!track->ms_compat || (track->private_size < sizeof(WAVEFORMATEX)))
{
- free_sh_audio(reinterpret_cast<sh_audio_t*>(demuxer->a_streams[track->tnum]));
+ delete demuxer->a_streams[track->tnum];
demuxer->a_streams[track->tnum]=0;
return 1;
}
@@ -2673,7 +2673,7 @@
\param demuxer The generic demuxer.
*/
static void
-demux_mkv_parse_vobsub_data (demuxer_t *demuxer)
+demux_mkv_parse_vobsub_data (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
mkv_track_t *track;
@@ -2715,7 +2715,7 @@
*/
#ifdef USE_ASS
static void
-demux_mkv_parse_ass_data (demuxer_t *demuxer)
+demux_mkv_parse_ass_data (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
mkv_track_t *track;
@@ -2747,7 +2747,7 @@
#endif
static int
-demux_mkv_open_sub (demuxer_t *demuxer, mkv_track_t *track, int sid)
+demux_mkv_open_sub (Demuxer *demuxer, mkv_track_t *track, int sid)
{
UNUSED(demuxer);
UNUSED(sid);
@@ -2770,7 +2770,7 @@
return 0;
}
-static void mkv_seek (demuxer_t *demuxer,const seek_args_t* seeka);
+static void mkv_seek (Demuxer *demuxer,const seek_args_t* seeka);
/** \brief Given a matroska track number and type, find the id that mplayer would ask for.
* \param d The demuxer for which the subtitle id should be returned.
@@ -2791,7 +2791,7 @@
return -1;
}
-static MPXP_Rc mkv_probe(demuxer_t *demuxer)
+static MPXP_Rc mkv_probe(Demuxer *demuxer)
{
stream_t *s = demuxer->stream;
int version;
@@ -2806,7 +2806,7 @@
return MPXP_Ok;
}
-static demuxer_t* mkv_open (demuxer_t *demuxer)
+static Demuxer* mkv_open (Demuxer *demuxer)
{
stream_t *s = demuxer->stream;
mkv_demuxer_t *mkv_d;
@@ -3051,12 +3051,12 @@
}
if (s->end_pos == 0 || (mkv_d->indexes == NULL && index_mode < 0))
- demuxer->flags &= ~(DEMUXF_SEEKABLE);
+ demuxer->flags &= ~(Demuxer::Seekable);
else
{
demuxer->movi_start = s->start_pos;
demuxer->movi_end = s->end_pos;
- demuxer->flags |= DEMUXF_SEEKABLE;
+ demuxer->flags |= Demuxer::Seekable;
if (mkv_d->chapters && dvd_chapter>1 && dvd_chapter<=mkv_d->num_chapters)
{
seek_args_t seeka;
@@ -3074,7 +3074,7 @@
return demuxer;
}
-static void mkv_close (demuxer_t *demuxer)
+static void mkv_close (Demuxer *demuxer)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
@@ -3168,7 +3168,7 @@
}
static void
-handle_subtitles(demuxer_t *demuxer, mkv_track_t *track, char *block,
+handle_subtitles(Demuxer *demuxer, mkv_track_t *track, char *block,
int64_t size, uint64_t block_duration, uint64_t timecode)
{
Demuxer_Packet *dp;
@@ -3267,7 +3267,7 @@
}
static void
-handle_realvideo (demuxer_t *demuxer, mkv_track_t *track, uint8_t *buffer,
+handle_realvideo (Demuxer *demuxer, mkv_track_t *track, uint8_t *buffer,
uint32_t size, int block_bref)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
@@ -3319,7 +3319,7 @@
}
static void
-handle_realaudio (demuxer_t *demuxer, mkv_track_t *track, uint8_t *buffer,
+handle_realaudio (Demuxer *demuxer, mkv_track_t *track, uint8_t *buffer,
uint32_t size, int block_bref)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
@@ -3433,7 +3433,7 @@
* \param track The track structure whose cache should be handled.
*/
static void
-flush_cached_dps (demuxer_t *demuxer, mkv_track_t *track)
+flush_cached_dps (Demuxer *demuxer, mkv_track_t *track)
{
int i, ok;
@@ -3477,7 +3477,7 @@
* of \a block_bref. Otherwise it's a B frame.
*/
static void
-handle_video_bframes (demuxer_t *demuxer, mkv_track_t *track, uint8_t *buffer,
+handle_video_bframes (Demuxer *demuxer, mkv_track_t *track, uint8_t *buffer,
uint32_t size, int block_bref, int block_fref)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
@@ -3507,7 +3507,7 @@
}
static int
-handle_block (demuxer_t *demuxer, uint8_t *block, uint64_t length,
+handle_block (Demuxer *demuxer, uint8_t *block, uint64_t length,
uint64_t block_duration, int64_t block_bref, int64_t block_fref, uint8_t simpleblock)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
@@ -3672,7 +3672,7 @@
return 0;
}
-static int mkv_demux (demuxer_t *demuxer, Demuxer_Stream *ds)
+static int mkv_demux (Demuxer *demuxer, Demuxer_Stream *ds)
{
UNUSED(ds);
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
@@ -3820,7 +3820,7 @@
return 0;
}
-static void mkv_seek (demuxer_t *demuxer,const seek_args_t* seeka)
+static void mkv_seek (Demuxer *demuxer,const seek_args_t* seeka)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
mkv_d->free_cached_dps ();
@@ -3982,7 +3982,7 @@
}
}
-static MPXP_Rc mkv_control (const demuxer_t *demuxer, int cmd, any_t*arg)
+static MPXP_Rc mkv_control (const Demuxer *demuxer, int cmd, any_t*arg)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
switch (cmd) {
@@ -3997,7 +3997,7 @@
*((int *) arg) = (int) (100 * mkv_d->last_pts / mkv_d->duration);
return MPXP_Ok;
#endif
- case DEMUX_CMD_SWITCH_AUDIO:
+ case Demuxer::Switch_Audio:
if (demuxer->audio && demuxer->audio->sh) {
sh_audio_t *sh = reinterpret_cast<sh_audio_t*>(demuxer->a_streams[demuxer->audio->id]);
int aid = *(int*)arg;
@@ -4028,7 +4028,7 @@
\param maxlen The maximum number of characters to copy into lang
*/
void
-demux_mkv_get_sub_lang(demuxer_t *demuxer, int track_num, char *lang,
+demux_mkv_get_sub_lang(Demuxer *demuxer, int track_num, char *lang,
int maxlen)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
@@ -4048,7 +4048,7 @@
\param maxlen The maximum number of characters to copy into lang
*/
void
-demux_mkv_get_audio_lang(demuxer_t *demuxer, int track_num, char *lang,
+demux_mkv_get_audio_lang(Demuxer *demuxer, int track_num, char *lang,
int maxlen)
{
mkv_demuxer_t *mkv_d = static_cast<mkv_demuxer_t*>(demuxer->priv);
Modified: mplayerxp/libmpdemux/demux_mov.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mov.cpp 2012-12-04 13:56:44 UTC (rev 507)
+++ mplayerxp/libmpdemux/demux_mov.cpp 2012-12-04 16:36:42 UTC (rev 508)
@@ -326,7 +326,7 @@
#define MOV_FOURCC(a,b,c,d) ((a<<24)|(b<<16)|(c<<8)|(d))
-static MPXP_Rc mov_probe(demuxer_t* demuxer){
+static MPXP_Rc mov_probe(Demuxer* demuxer){
int flags=0;
int no=0;
unsigned ver;
@@ -495,7 +495,7 @@
if(flags==3){
// if we're over the headers, then we can stop parsing here!
demuxer->priv=priv;
- demuxer->file_format=DEMUXER_TYPE_MOV;
+ demuxer->file_format=Demuxer::Type_MOV;
return MPXP_Ok;
}
break;
@@ -521,14 +521,14 @@
if(flags==3){
demuxer->priv=priv;
- demuxer->file_format=DEMUXER_TYPE_MOV;
+ demuxer->file_format=Demuxer::Type_MOV;
return MPXP_Ok;
}
delete priv;
if ((flags==5) || (flags==7)) // reference & header sent
{
- demuxer->file_format=DEMUXER_TYPE_MOV;
+ demuxer->file_format=Demuxer::Type_MOV;
return MPXP_Ok;
}
if(flags==1)
@@ -594,10 +594,10 @@
return n;
}
-static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id,
+static int lschunks_intrak(Demuxer* demuxer, int level, unsigned int id,
off_t pos, off_t len, mov_track_t* trak);
-static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak){
+static void lschunks(Demuxer* demuxer,int level,off_t endpos,mov_track_t* trak){
mov_priv_t* priv=static_cast<mov_priv_t*>(demuxer->priv);
while(1){
off_t pos;
@@ -671,7 +671,7 @@
#endif
int version=0, adjust;
int is_vorbis = 0;
- sh_audio_t* sh=new_sh_audio(demuxer,priv->track_db);
+ sh_audio_t* sh=demuxer->new_sh_audio(priv->track_db);
sh->wtag=trak->fourcc;
/* crude audio delay from editlist0 hack ::atm */
@@ -976,7 +976,7 @@
int entry,flag, start, count_flag, end, palette_count, gray;
int hdr_ptr = 76; // the byte just after depth
unsigned char *palette_map;
- sh_video_t* sh=new_sh_video(demuxer,priv->track_db);
+ sh_video_t* sh=demuxer->new_sh_video(priv->track_db);
int depth;
sh->fourcc=trak->fourcc;
@@ -1491,7 +1491,7 @@
}
}
-static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id,
+static int lschunks_intrak(Demuxer* demuxer, int level, unsigned int id,
off_t pos, off_t len, mov_track_t* trak)
{
switch(id) {
@@ -1794,7 +1794,7 @@
return 0;
}
-static demuxer_t* mov_open(demuxer_t* demuxer){
+static Demuxer* mov_open(Demuxer* demuxer){
mov_priv_t* priv=static_cast<mov_priv_t*>(demuxer->priv);
int t_no;
int best_a_id=-1, best_a_len=0;
@@ -1930,7 +1930,7 @@
// return value:
// 0 = EOF or no stream found
// 1 = successfully read a packet
-static int mov_demux(demuxer_t *demuxer,Demuxer_Stream* ds){
+static int mov_demux(Demuxer *demuxer,Demuxer_Stream* ds){
mov_priv_t* priv=static_cast<mov_priv_t*>(demuxer->priv);
mov_track_t* trak=NULL;
float pts;
@@ -2061,7 +2061,7 @@
return pts;
}
-static void mov_seek(demuxer_t *demuxer,const seek_args_t* seeka){
+static void mov_seek(Demuxer *demuxer,const seek_args_t* seeka){
mov_priv_t* priv=static_cast<mov_priv_t*>(demuxer->priv);
Demuxer_Stream* ds;
mov_track_t* trak;
@@ -2087,14 +2087,14 @@
}
}
-static void mov_close(demuxer_t *demuxer)
+static void mov_close(Demuxer *demuxer)
{
mov_priv_t* priv = static_cast<mov_priv_t*>(demuxer->priv);
if (!priv) return;
delete priv;
}
-static MPXP_Rc mov_control(const demuxer_t *demuxer,int cmd,any_t*args)
+static MPXP_Rc mov_control(const Demuxer *demuxer,int cmd,any_t*args)
{
UNUSED(demuxer);
UNUSED(cmd);
Modified: mplayerxp/libmpdemux/demux_mpg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpg.cpp 2012-12-04 13:56:44 UTC (rev 507)
+++ mplayerxp/libmpdemux/demux_mpg.cpp 2012-12-04 16:36:42 UTC (rev 508)
@@ -44,7 +44,7 @@
#define MPGPES_BAD_PTS -1
-typedef int (*alt_demuxer_t)(demuxer_t *demux,Demuxer_Stream *__ds);
+typedef int (*alt_demuxer_t)(Demuxer *demux,Demuxer_Stream *__ds);
struct mpg_demuxer_t : public Opaque {
public:
mpg_demuxer_t() {}
@@ -95,7 +95,7 @@
return pts;
}
-static int parse_psm(demuxer_t *demux, int len) {
+static int parse_psm(Demuxer *demux, int len) {
unsigned char c, id, type;
unsigned int plen, prog_len, es_map_len;
mpg_demuxer_t *priv = static_cast<mpg_demuxer_t*>(demux->priv);
@@ -155,11 +155,11 @@
return 1;
}
-static void new_audio_stream(demuxer_t *demux, int aid){
+static void new_audio_stream(Demuxer *demux, int aid){
if(!demux->a_streams[aid]){
mpg_demuxer_t *mpg_d=static_cast<mpg_demuxer_t*>(demux->priv);
sh_audio_t* sh_a;
- new_sh_audio(demux,aid);
+ demux->new_sh_audio(aid);
sh_a = (sh_audio_t*)demux->a_streams[aid];
switch(aid & 0xE0){ // 1110 0000 b (high 3 bit: type low 5: id)
case 0x00: sh_a->wtag=AUDIO_MP2;break;
@@ -191,7 +191,7 @@
return rval;
}
-static int demux_mpg_read_packet(demuxer_t *demux,int id){
+static int demux_mpg_read_packet(Demuxer *demux,int id){
int d;
int len;
unsigned char c=0;
@@ -374,7 +374,7 @@
if(id>=0x1E0 && id<=0x1EF){
// mpeg video
int aid=id-0x1E0;
- if(!demux->v_streams[aid]) new_sh_video(demux,aid);
+ if(!demux->v_streams[aid]) demux->new_sh_video(aid);
if(demux->video->id==-1) demux->video->id=aid;
if(demux->video->id==aid){
ds=demux->video;
@@ -432,7 +432,7 @@
return 0;
}
-static int mpges_demux(demuxer_t *demux,Demuxer_Stream *__ds){
+static int mpges_demux(Demuxer *demux,Demuxer_Stream *__ds){
/* Elementary video stream */
if(stream_eof(demux->stream)) return 0;
demux->filepos=stream_tell(demux->stream);
@@ -440,7 +440,7 @@
return 1;
}
-static int mpgps_demux(demuxer_t *demux,Demuxer_Stream *__ds){
+static int mpgps_demux(Demuxer *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;
@@ -543,7 +543,7 @@
return 1;
}
-static void mpgps_seek(demuxer_t *demuxer,const seek_args_t* seeka){
+static void mpgps_seek(Demuxer *demuxer,const seek_args_t* seeka){
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);
@@ -636,7 +636,7 @@
0x000001FF - prog_stream_dir
*/
extern const demuxer_driver_t demux_mpgps;
-static MPXP_Rc mpgps_probe(demuxer_t*demuxer)
+static MPXP_Rc mpgps_probe(Demuxer*demuxer)
{
uint32_t code,id;
int pes=2,rval;
@@ -716,7 +716,7 @@
mpg_stat.num_elementary_v_packets);
if(rval){
- demuxer->file_format=DEMUXER_TYPE_MPEG_PS;
+ demuxer->file_format=Demuxer::Type_MPEG_PS;
} else {
/*MPEG packet stats: p100: 458 p101: 458 PES: 0 MP3: 1103 (.m2v)*/
@@ -733,18 +733,18 @@
--pes;
continue; /* tricky... */
}
- demuxer->file_format=DEMUXER_TYPE_MPEG_ES; /* <-- hack is here :) */
+ demuxer->file_format=Demuxer::Type_MPEG_ES; /* <-- hack is here :) */
} else if(mpg_stat.num_elementary_packets1B6>3 && mpg_stat.num_elementary_packets12x>=1 &&
mpg_stat.num_elementary_packetsPES==0 && mpg_stat.num_elementary_packets100<=mpg_stat.num_elementary_packets12x &&
demuxer->synced<2) {
/* fuzzy mpeg4-es detection. do NOT enable without heavy testing of mpeg formats detection! */
- demuxer->file_format=DEMUXER_TYPE_MPEG4_ES;
+ demuxer->file_format=Demuxer::Type_MPEG4_ES;
} else if((mpg_stat.num_h264_slice>3 || (mpg_stat.num_h264_dpa>3 && mpg_stat.num_h264_dpb>3 && mpg_stat.num_h264_dpc>3)) &&
/* FIXME mpg_stat.num_h264_sps>=1 && */ mpg_stat.num_h264_pps>=1 && mpg_stat.num_h264_idr>=1 &&
mpg_stat.num_elementary_packets1B6==0 && mpg_stat.num_elementary_packetsPES==0 &&
demuxer->synced<2) {
/* fuzzy h264-es detection. do NOT enable without heavy testing of mpeg formats detection!*/
- demuxer->file_format=DEMUXER_TYPE_H264_ES;
+ demuxer->file_format=Demuxer::Type_H264_ES;
} else {
if(demuxer->synced==2)
MSG_ERR("MPEG: " MSGTR_MissingVideoStreamBug);
@@ -756,11 +756,11 @@
}
break;
}
- if( demuxer->file_format==DEMUXER_TYPE_MPEG_ES ||
- demuxer->file_format==DEMUXER_TYPE_MPEG4_ES ||
- demuxer->file_format==DEMUXER_TYPE_H264_ES){ /* little hack, see above! */
+ if( demuxer->file_format==Demuxer::Type_MPEG_ES ||
+ demuxer->file_format==Demuxer::Type_MPEG4_ES ||
+ demuxer->file_format==Demuxer::Type_H264_ES){ /* little hack, see above! */
mpg_d->alt_demuxer=mpges_demux;
- if(!demuxer->v_streams[0]) new_sh_video(demuxer,0);
+ if(!demuxer->v_streams[0]) demuxer->new_sh_video();
if(demuxer->video->id==-1) demuxer->video->id=0;
demuxer->video->sh=demuxer->v_streams[0];
stream_seek(demuxer->stream,demuxer->stream->start_pos);
@@ -785,7 +785,7 @@
return MPXP_False;
}
-static demuxer_t* mpgps_open(demuxer_t*demuxer)
+static Demuxer* mpgps_open(Demuxer*demuxer)
{
sh_video_t *sh_video=reinterpret_cast<sh_video_t*>(demuxer->video->sh);
mpg_demuxer_t* mpg_d=static_cast<mpg_demuxer_t*>(demuxer->priv);
@@ -809,17 +809,17 @@
return demuxer;
}
-static void mpgps_close(demuxer_t*demuxer)
+static void mpgps_close(Demuxer*demuxer)
{
mpg_demuxer_t* mpg_d = static_cast<mpg_demuxer_t*>(demuxer->priv);
if (mpg_d) delete mpg_d;
}
-static MPXP_Rc mpgps...
[truncated message content] |
