From eafb70de50b3ff32d6f99c51b425a885377e1e16 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 22:01:35 +0000 Subject: libmpdemux: Mark functions not used outside of their files as static. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30612 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/aviheader.c | 3 ++- libmpdemux/demux_avi.c | 17 ++++++++++++----- libmpdemux/demux_avs.c | 2 +- libmpdemux/demux_gif.c | 3 ++- libmpdemux/demux_mpg.c | 10 +++++++--- libmpdemux/demux_ogg.c | 6 ++++-- libmpdemux/demux_pva.c | 2 +- libmpdemux/demuxer.c | 2 +- libmpdemux/parse_mp4.c | 3 ++- 9 files changed, 32 insertions(+), 16 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index 8435fa3c4f..003874bb2e 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -59,7 +59,8 @@ static int odml_get_vstream_id(int id, unsigned char res[]) return 0; } -int avi_idx_cmp(const void *elem1,const void *elem2) { +static int avi_idx_cmp(const void *elem1, const void *elem2) +{ register off_t a = AVI_IDX_OFFSET((AVIINDEXENTRY *)elem1); register off_t b = AVI_IDX_OFFSET((AVIINDEXENTRY *)elem2); return (a > b) - (b > a); diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 51a33ca6ae..e3f26d21d3 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -43,7 +43,9 @@ extern const demuxer_desc_t demuxer_desc_avi_nini; int pts_from_bps=1; // Select ds from ID -demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id){ +static demux_stream_t *demux_avi_select_stream(demuxer_t *demux, + unsigned int id) +{ int stream_id=avi_stream_id(id); @@ -306,7 +308,8 @@ do{ // return value: // 0 = EOF or no stream found // 1 = successfully read a packet -int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t* ds){ +static int demux_avi_fill_buffer_ni(demuxer_t *demux, demux_stream_t *ds) +{ avi_priv_t *priv=demux->priv; unsigned int id=0; unsigned int len; @@ -374,7 +377,8 @@ do{ // return value: // 0 = EOF or no stream found // 1 = successfully read a packet -int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t* ds){ +static int demux_avi_fill_buffer_nini(demuxer_t *demux, demux_stream_t *ds) +{ avi_priv_t *priv=demux->priv; unsigned int id=0; unsigned int len; @@ -586,7 +590,9 @@ static demuxer_t* demux_open_avi(demuxer_t* demuxer){ } -void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){ +static void demux_seek_avi(demuxer_t *demuxer, float rel_seek_secs, + float audio_delay, int flags) +{ avi_priv_t *priv=demuxer->priv; demux_stream_t *d_audio=demuxer->audio; demux_stream_t *d_video=demuxer->video; @@ -759,7 +765,8 @@ void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int } -void demux_close_avi(demuxer_t *demuxer) { +static void demux_close_avi(demuxer_t *demuxer) +{ avi_priv_t* priv=demuxer->priv; if(!priv) diff --git a/libmpdemux/demux_avs.c b/libmpdemux/demux_avs.c index e52afea4dd..d8bdad6676 100644 --- a/libmpdemux/demux_avs.c +++ b/libmpdemux/demux_avs.c @@ -85,7 +85,7 @@ typedef struct tagAVS imp_avs_get_audio avs_get_audio; } AVS_T; -AVS_T *initAVS(const char *filename) +static AVS_T *initAVS(const char *filename) { AVS_T *AVS = malloc (sizeof(AVS_T)); AVS_Value arg0 = avs_new_value_string(filename); diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c index a85963931a..f18c807626 100644 --- a/libmpdemux/demux_gif.c +++ b/libmpdemux/demux_gif.c @@ -47,7 +47,8 @@ typedef struct { #ifndef CONFIG_GIF_TVT_HACK // not supported by certain versions of the library -int my_read_gif(GifFileType *gif, uint8_t *buf, int len) { +static int my_read_gif(GifFileType *gif, uint8_t *buf, int len) +{ return stream_read(gif->UserData, buf, len); } #endif diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index 72ab2a9b27..d37971b44a 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -814,7 +814,8 @@ static int demux_mpg_gxf_fill_buffer(demuxer_t *demux, demux_stream_t *ds) { return 1; } -int demux_mpg_fill_buffer(demuxer_t *demux, demux_stream_t *ds){ +static int demux_mpg_fill_buffer(demuxer_t *demux, demux_stream_t *ds) +{ unsigned int head=0; int skipped=0; int max_packs=256; // 512kbyte @@ -901,7 +902,9 @@ do{ void skip_audio_frame(sh_audio_t *sh_audio); -void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,float audio_delay, int flags){ +static void demux_seek_mpg(demuxer_t *demuxer, float rel_seek_secs, + float audio_delay, int flags) +{ demux_stream_t *d_audio=demuxer->audio; demux_stream_t *d_video=demuxer->video; sh_audio_t *sh_audio=d_audio->sh; @@ -1007,7 +1010,8 @@ void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,float audio_delay, in } } -int demux_mpg_control(demuxer_t *demuxer,int cmd, void *arg){ +static int demux_mpg_control(demuxer_t *demuxer, int cmd, void *arg) +{ mpg_demuxer_t *mpg_d=(mpg_demuxer_t*)demuxer->priv; switch(cmd) { diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 3af4866926..d0a462347a 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -177,7 +177,8 @@ extern int dvdsub_id; static subtitle ogg_sub; //FILE* subout; -void demux_ogg_add_sub (ogg_stream_t* os,ogg_packet* pack) { +static void demux_ogg_add_sub(ogg_stream_t *os, ogg_packet *pack) +{ int lcv; char *packet = pack->packet; @@ -513,7 +514,8 @@ static int demux_ogg_add_packet(demux_stream_t* ds,ogg_stream_t* os,int id,ogg_p /// if -forceidx build a table of all syncpoints to make seeking easier /// otherwise try to get at least the final_granulepos -void demux_ogg_scan_stream(demuxer_t* demuxer) { +static void demux_ogg_scan_stream(demuxer_t *demuxer) +{ ogg_demuxer_t* ogg_d = demuxer->priv; stream_t *s = demuxer->stream; ogg_sync_state* sync = &ogg_d->sync; diff --git a/libmpdemux/demux_pva.c b/libmpdemux/demux_pva.c index 835fba2961..39fad12184 100644 --- a/libmpdemux/demux_pva.c +++ b/libmpdemux/demux_pva.c @@ -73,7 +73,7 @@ typedef struct { -int pva_sync(demuxer_t * demuxer) +static int pva_sync(demuxer_t * demuxer) { uint8_t buffer[5]={0,0,0,0,0}; int count; diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 5d4798470a..d30b11f97e 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -277,7 +277,7 @@ sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid) return demuxer->s_streams[id]; } -void free_sh_sub(sh_sub_t *sh) +static void free_sh_sub(sh_sub_t *sh) { mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_sub at %p\n", sh); free(sh->extradata); diff --git a/libmpdemux/parse_mp4.c b/libmpdemux/parse_mp4.c index bdae91a0fe..767dfc3ff9 100644 --- a/libmpdemux/parse_mp4.c +++ b/libmpdemux/parse_mp4.c @@ -33,7 +33,8 @@ #define MP4_DL MSGL_V #define freereturn(a,b) free(a); return b -int mp4_read_descr_len(stream_t *s) { +static int mp4_read_descr_len(stream_t *s) +{ uint8_t b; uint8_t numBytes = 0; uint32_t length = 0; -- cgit v1.2.3 From 8615d008344b47523ac6aae2e7bda66762119bd9 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 22:11:05 +0000 Subject: Mark mov_build_index() as static; it is not used outside of the file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30613 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index a1a250c05f..3848cf1903 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -165,7 +165,7 @@ typedef struct { void* desc; // image/sound/etc description (pointer to ImageDescription etc) } mov_track_t; -void mov_build_index(mov_track_t* trak,int timescale){ +static void mov_build_index(mov_track_t* trak,int timescale){ int i,j,s; int last=trak->chunks_size; unsigned int pts=0; -- cgit v1.2.3 From 69429048a21918a0e109ba106ad2161c4a413f03 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 22:14:04 +0000 Subject: Mark mp_mp3_get_lsf() as static; it is not used outside of the file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30614 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/mp3_hdr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpdemux') diff --git a/libmpdemux/mp3_hdr.c b/libmpdemux/mp3_hdr.c index 0266469cb9..ee7d8211df 100644 --- a/libmpdemux/mp3_hdr.c +++ b/libmpdemux/mp3_hdr.c @@ -38,7 +38,7 @@ static long freqs[9] = { 44100, 48000, 32000, // MPEG 1.0 22050, 24000, 16000, // MPEG 2.0 11025, 12000, 8000}; // MPEG 2.5 -int mp_mp3_get_lsf(unsigned char* hbuf){ +static int mp_mp3_get_lsf(unsigned char* hbuf){ unsigned long newhead = hbuf[0] << 24 | hbuf[1] << 16 | -- cgit v1.2.3 From 2df3416d32c3e1732bbf96a8b020792db40ad7a2 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 22:22:51 +0000 Subject: Add separate header for real_fix_timestamp(); avoids forward declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30615 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_mkv.c | 3 +-- libmpdemux/demux_real.c | 1 + libmpdemux/demux_real.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 libmpdemux/demux_real.h (limited to 'libmpdemux') diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index d2ee9be643..ecb171c551 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -33,6 +33,7 @@ #include "stheader.h" #include "ebml.h" #include "matroska.h" +#include "demux_real.h" #include "mp_msg.h" #include "help_mp.h" @@ -2393,8 +2394,6 @@ handle_subtitles(demuxer_t *demuxer, mkv_track_t *track, char *block, ds_add_packet(demuxer->sub, dp); } -double real_fix_timestamp(unsigned char *buf, unsigned int timestamp, unsigned int format, int64_t *kf_base, int *kf_pts, double *pts); - static void handle_realvideo (demuxer_t *demuxer, mkv_track_t *track, uint8_t *buffer, uint32_t size, int block_bref) diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index de6ff785ee..78a404b826 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -47,6 +47,7 @@ #include "stream/stream.h" #include "demuxer.h" #include "stheader.h" +#include "demux_real.h" //#define mp_dbg(mod,lev, args... ) mp_msg_c((mod<<8)|lev, ## args ) diff --git a/libmpdemux/demux_real.h b/libmpdemux/demux_real.h new file mode 100644 index 0000000000..9c58bbf89a --- /dev/null +++ b/libmpdemux/demux_real.h @@ -0,0 +1,28 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_DEMUX_REAL_H +#define MPLAYER_DEMUX_REAL_H + +#include + +double real_fix_timestamp(unsigned char *buf, unsigned int timestamp, + unsigned int format, int64_t *kf_base, + int *kf_pts, double *pts); + +#endif /* MPLAYER_DEMUX_REAL_H */ -- cgit v1.2.3 From 9905880267cacb259eb11cc7cdbdfbb4d7149325 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 22:28:24 +0000 Subject: Add separate header for aac_parse_frame(); avoids forward declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30616 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/aac_hdr.c | 1 + libmpdemux/aac_hdr.h | 26 ++++++++++++++++++++++++++ libmpdemux/demux_aac.c | 8 +------- libmpdemux/muxer_mpeg.c | 3 +-- 4 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 libmpdemux/aac_hdr.h (limited to 'libmpdemux') diff --git a/libmpdemux/aac_hdr.c b/libmpdemux/aac_hdr.c index 1866288349..aed06f0e28 100644 --- a/libmpdemux/aac_hdr.c +++ b/libmpdemux/aac_hdr.c @@ -19,6 +19,7 @@ */ #include +#include "aac_hdr.h" /// \param srate (out) sample rate /// \param num (out) number of audio frames in this ADTS frame diff --git a/libmpdemux/aac_hdr.h b/libmpdemux/aac_hdr.h new file mode 100644 index 0000000000..be56368925 --- /dev/null +++ b/libmpdemux/aac_hdr.h @@ -0,0 +1,26 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_AAC_HDR_H +#define MPLAYER_AAC_HDR_H + +#include + +int aac_parse_frame(uint8_t *buf, int *srate, int *num); + +#endif /* MPLAYER_AAC_HDR_H */ diff --git a/libmpdemux/demux_aac.c b/libmpdemux/demux_aac.c index 2ebbb2995e..cfbedfc8c1 100644 --- a/libmpdemux/demux_aac.c +++ b/libmpdemux/demux_aac.c @@ -28,7 +28,7 @@ #include "demuxer.h" #include "parse_es.h" #include "stheader.h" - +#include "aac_hdr.h" #include "ms_hdr.h" typedef struct { @@ -39,12 +39,6 @@ typedef struct { int bitrate; /// bitrate computed as size/time } aac_priv_t; -/// \param srate (out) sample rate -/// \param num (out) number of audio frames in this ADTS frame -/// \return size of the ADTS frame in bytes -/// aac_parse_frames needs a buffer at least 8 bytes long -int aac_parse_frame(uint8_t *buf, int *srate, int *num); - static int demux_aac_init(demuxer_t *demuxer) { aac_priv_t *priv; diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index 20b552a96e..faa5eb4bf5 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -34,6 +34,7 @@ #include "demuxer.h" #include "stheader.h" #include "m_option.h" +#include "aac_hdr.h" #include "mpeg_hdr.h" #include "mp3_hdr.h" #include "liba52/a52.h" @@ -2067,8 +2068,6 @@ static int analyze_mpa(muxer_stream_t *s) return layer; //actual layer with the highest score } -int aac_parse_frame(uint8_t *buf, int *srate, int *num); - static int parse_audio(muxer_stream_t *s, int finalize, unsigned int *nf, double *timer, double delay, int drop) { int i, j, len, chans, srate, spf, layer, dummy, tot, num, frm_idx; -- cgit v1.2.3 From e286b38529bf4ab782067049be63bf7dfab06462 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 22:33:21 +0000 Subject: Add config.h header #include; it is required for the HAVE_BIGENDIAN check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30617 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/ms_hdr.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libmpdemux') diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h index aaeffa6ef3..2bfefa9ca2 100644 --- a/libmpdemux/ms_hdr.h +++ b/libmpdemux/ms_hdr.h @@ -19,6 +19,8 @@ #ifndef MPLAYER_MS_HDR_H #define MPLAYER_MS_HDR_H +#include "config.h" + #ifndef _WAVEFORMATEX_ #define _WAVEFORMATEX_ typedef struct __attribute__((__packed__)) _WAVEFORMATEX { -- cgit v1.2.3 From 6f8c91b9a2094f8d52978359ac89841352ac9163 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 22:40:50 +0000 Subject: Add separate header for mp_a52_framesize(); avoids forward declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30618 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_ts.c | 2 +- libmpdemux/demux_ts.h | 26 ++++++++++++++++++++++++++ libmpdemux/muxer_mpeg.c | 3 +-- 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 libmpdemux/demux_ts.h (limited to 'libmpdemux') diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 6b56b55ffc..7ee6d5ea1c 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -34,9 +34,9 @@ #include "demuxer.h" #include "parse_es.h" #include "stheader.h" - #include "ms_hdr.h" #include "mpeg_hdr.h" +#include "demux_ts.h" #define TS_PH_PACKET_SIZE 192 #define TS_FEC_PACKET_SIZE 204 diff --git a/libmpdemux/demux_ts.h b/libmpdemux/demux_ts.h new file mode 100644 index 0000000000..e8db01716f --- /dev/null +++ b/libmpdemux/demux_ts.h @@ -0,0 +1,26 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_DEMUX_TS_H +#define MPLAYER_DEMUX_TS_H + +#include + +int mp_a52_framesize(uint8_t *buf, int *srate); + +#endif /* MPLAYER_DEMUX_TS_H */ diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index faa5eb4bf5..fc066d1eca 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -32,6 +32,7 @@ #include "stream/stream.h" #include "muxer.h" #include "demuxer.h" +#include "demux_ts.h" #include "stheader.h" #include "m_option.h" #include "aac_hdr.h" @@ -232,8 +233,6 @@ m_option_t mpegopts_conf[] = { {NULL, NULL, 0, 0, 0, 0, NULL} }; -int mp_a52_framesize(uint8_t *buf, int *srate); - static void fix_audio_sys_header(muxer_priv_t *priv, uint8_t id, uint8_t newid, uint32_t size) { uint8_t i; -- cgit v1.2.3 From c66aa21366043b81d263e453dda28ac50d573114 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 22:48:32 +0000 Subject: Add header for ty_ClearOSD(), ty_processuserdata(); avoids forward declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30619 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_ty.c | 2 +- libmpdemux/demux_ty_osd.c | 1 + libmpdemux/demux_ty_osd.h | 25 +++++++++++++++++++++++++ libmpdemux/video.c | 3 +-- 4 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 libmpdemux/demux_ty_osd.h (limited to 'libmpdemux') diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index b784715e2f..67ff4f114e 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -41,6 +41,7 @@ #include "stream/stream.h" #include "demuxer.h" +#include "demux_ty_osd.h" #include "parse_es.h" #include "stheader.h" #include "sub_cc.h" @@ -105,7 +106,6 @@ typedef struct } TiVoInfo; off_t vstream_streamsize( ); -void ty_ClearOSD( int start ); // =========================================================================== #define TMF_SIG "showing.xml" diff --git a/libmpdemux/demux_ty_osd.c b/libmpdemux/demux_ty_osd.c index 9ae04ece5d..a9429d79c8 100644 --- a/libmpdemux/demux_ty_osd.c +++ b/libmpdemux/demux_ty_osd.c @@ -26,6 +26,7 @@ //#include "subreader.h" #include "sub_cc.h" #include "libvo/sub.h" +#include "demux_ty_osd.h" //#include "dvdauth.h" diff --git a/libmpdemux/demux_ty_osd.h b/libmpdemux/demux_ty_osd.h new file mode 100644 index 0000000000..3b81933759 --- /dev/null +++ b/libmpdemux/demux_ty_osd.h @@ -0,0 +1,25 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_DEMUX_TY_OSD_H +#define MPLAYER_DEMUX_TY_OSD_H + +void ty_ClearOSD(int start); +void ty_processuserdata(unsigned char *buf, int len); + +#endif /* MPLAYER_DEMUX_TY_OSD_H */ diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 6b507b0d57..482c3d6a7a 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -33,6 +33,7 @@ #include "stream/stream.h" #include "demuxer.h" +#include "demux_ty_osd.h" #include "stheader.h" #include "parse_es.h" #include "mpeg_hdr.h" @@ -405,8 +406,6 @@ mpeg_header_parser: return 1; } -void ty_processuserdata( unsigned char* buf, int len ); - static void process_userdata(unsigned char* buf,int len){ int i; /* if the user data starts with "CC", assume it is a CC info packet */ -- cgit v1.2.3 From 2d776c8c768349798412a6121e581a3078fff4e6 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 22:52:31 +0000 Subject: libmpdemux: Remove pointless leftover '#if 1' preprocessor instructions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30620 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_mpg.c | 2 -- libmpdemux/demux_real.c | 2 -- libmpdemux/mp3_hdr.c | 2 -- 3 files changed, 6 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index d37971b44a..f6c7fc5169 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -824,11 +824,9 @@ int ret=0; // System stream do{ demux->filepos=stream_tell(demux->stream); -#if 1 //lame workaround: this is needed to show the progress bar when playing dvdnav:// //(ths poor guy doesn't know teh length of the stream at startup) demux->movi_end = demux->stream->end_pos; -#endif head=stream_read_dword(demux->stream); if((head&0xFFFFFF00)!=0x100){ // sync... diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index 78a404b826..45ee5efdd4 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -496,7 +496,6 @@ double real_fix_timestamp(unsigned char *buf, unsigned int timestamp, unsigned i int pict_type; unsigned int orig_kf; -#if 1 if(format==mmioFOURCC('R','V','3','0') || format==mmioFOURCC('R','V','4','0')){ if(format==mmioFOURCC('R','V','3','0')){ SKIP_BITS(3); @@ -531,7 +530,6 @@ double real_fix_timestamp(unsigned char *buf, unsigned int timestamp, unsigned i } mp_msg(MSGT_DEMUX, MSGL_DBG2,"\nTS: %08X -> %08X (%04X) %d %02X %02X %02X %02X %5u\n",timestamp,kf,orig_kf,pict_type,s[0],s[1],s[2],s[3],pts?kf-(unsigned int)(*pts*1000.0):0); } -#endif v_pts=kf*0.001f; // if(pts && (v_pts<*pts || !kf)) v_pts=*pts+frametime; if(pts) *pts=v_pts; diff --git a/libmpdemux/mp3_hdr.c b/libmpdemux/mp3_hdr.c index ee7d8211df..d2520f1d8d 100644 --- a/libmpdemux/mp3_hdr.c +++ b/libmpdemux/mp3_hdr.c @@ -65,13 +65,11 @@ int mp_get_mp3_header(unsigned char* hbuf,int* chans, int* srate, int* spf, int* // printf("head=0x%08X\n",newhead); -#if 1 // head_check: if( (newhead & 0xffe00000) != 0xffe00000 ){ mp_msg(MSGT_DEMUXER,MSGL_DBG2,"head_check failed\n"); return -1; } -#endif layer = 4-((newhead>>17)&3); if(layer==4){ -- cgit v1.2.3 From 4a9770c1c27b146bac553502cfacd11ae5ead0df Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 22:58:03 +0000 Subject: Add mp_getbits() to mpeg_hdr.h to avoid a forward declaration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30621 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_ts.c | 1 - libmpdemux/mpeg_hdr.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 7ee6d5ea1c..d27ae76596 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -1115,7 +1115,6 @@ static void demux_close_ts(demuxer_t * demuxer) } -unsigned char mp_getbits(unsigned char*, unsigned int, unsigned char); #define getbits mp_getbits static int mp4_parse_sl_packet(pmt_t *pmt, uint8_t *buf, uint16_t packet_len, int pid, ES_stream_t *pes_es) diff --git a/libmpdemux/mpeg_hdr.h b/libmpdemux/mpeg_hdr.h index cb9aef1625..d9922767b2 100644 --- a/libmpdemux/mpeg_hdr.h +++ b/libmpdemux/mpeg_hdr.h @@ -48,4 +48,6 @@ void mp4_header_process_vop(mp_mpeg_header_t * picture, unsigned char * buffer); int h264_parse_sps(mp_mpeg_header_t * picture, unsigned char * buf, int len); int mp_vc1_decode_sequence_header(mp_mpeg_header_t * picture, unsigned char * buf, int len); +unsigned char mp_getbits(unsigned char *buffer, unsigned int from, unsigned char len); + #endif /* MPLAYER_MPEG_HDR_H */ -- cgit v1.2.3 From d28c27df8d038c42c5da75946e6053daeb8031d9 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 23:02:13 +0000 Subject: Add header file for store_ughvlc(); avoids forward declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30622 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_mov.c | 1 + libmpdemux/demux_mov.h | 24 ++++++++++++++++++++++++ libmpdemux/demux_ogg.c | 4 +--- 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 libmpdemux/demux_mov.h (limited to 'libmpdemux') diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index 3848cf1903..a8ca20f211 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -67,6 +67,7 @@ #include "libvo/sub.h" +#include "demux_mov.h" #include "qtpalette.h" #include "parse_mp4.h" // .MP4 specific stuff diff --git a/libmpdemux/demux_mov.h b/libmpdemux/demux_mov.h new file mode 100644 index 0000000000..8aa515c349 --- /dev/null +++ b/libmpdemux/demux_mov.h @@ -0,0 +1,24 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_DEMUX_MOV_H +#define MPLAYER_DEMUX_MOV_H + +unsigned int store_ughvlc(unsigned char *s, unsigned int v); + +#endif /* MPLAYER_DEMUX_MOV_H */ diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index d0a462347a..a72600243f 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -31,6 +31,7 @@ #include "demuxer.h" #include "stheader.h" #include "libavutil/intreadwrite.h" +#include "demux_mov.h" #define FOURCC_VORBIS mmioFOURCC('v', 'r', 'b', 's') #define FOURCC_SPEEX mmioFOURCC('s', 'p', 'x', ' ') @@ -640,9 +641,6 @@ static void demux_ogg_scan_stream(demuxer_t *demuxer) void print_wave_header(WAVEFORMATEX *h, int verbose_level); void print_video_header(BITMAPINFOHEADER *h, int verbose_level); -/* defined in demux_mov.c */ -unsigned int store_ughvlc(unsigned char *s, unsigned int v); - /** \brief Change the current subtitle stream and return its ID. \param demuxer The demuxer whose subtitle stream will be changed. -- cgit v1.2.3 From 965f604636d3a3ee161dbdc818d6b323893bf2a1 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 23:10:56 +0000 Subject: Add read_avi_header() to aviheader.h; avoids forward declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30623 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/aviheader.h | 3 +++ libmpdemux/demux_avi.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h index 4074f6bb03..6740c249ce 100644 --- a/libmpdemux/aviheader.h +++ b/libmpdemux/aviheader.h @@ -24,6 +24,7 @@ #include "config.h" /* get correct definition of HAVE_BIGENDIAN */ #include "libavutil/common.h" #include "mpbswap.h" +#include "demuxer.h" #ifndef mmioFOURCC #define mmioFOURCC( ch0, ch1, ch2, ch3 ) \ @@ -374,4 +375,6 @@ typedef struct { #define AVI_IDX_OFFSET(x) ((((uint64_t)(x)->dwFlags&0xffff0000)<<16)+(x)->dwChunkOffset) +void read_avi_header(demuxer_t *demuxer, int index_mode); + #endif /* MPLAYER_AVIHEADER_H */ diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index e3f26d21d3..89ec44549e 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -434,8 +434,6 @@ int index_mode=-1; // -1=untouched 0=don't use index 1=use (generate) index char *index_file_save = NULL, *index_file_load = NULL; int force_ni=0; // force non-interleaved AVI parsing -void read_avi_header(demuxer_t *demuxer,int index_mode); - static demuxer_t* demux_open_avi(demuxer_t* demuxer){ demux_stream_t *d_audio=demuxer->audio; demux_stream_t *d_video=demuxer->video; -- cgit v1.2.3 From a37c279d27525ac28936d345f2c216da38e42e90 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 23:25:02 +0000 Subject: Move up demux_ogg_sub_id, demux_ogg_sub_reverse_id; avoids forward declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30624 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_ogg.c | 54 +++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 29 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index a72600243f..127bde5b48 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -367,7 +367,31 @@ static int demux_ogg_check_lang(const char *clang, const char *langlist) return 0; } -static int demux_ogg_sub_reverse_id(demuxer_t *demuxer, int id); +/** \brief Change the current subtitle stream and return its ID. + + \param demuxer The demuxer whose subtitle stream will be changed. + \param new_num The number of the new subtitle track. The number must be + between 0 and ogg_d->n_text - 1. + + \returns The Ogg stream number ( = page serial number) of the newly selected + track. +*/ +int demux_ogg_sub_id(demuxer_t *demuxer, int index) { + ogg_demuxer_t *ogg_d = demuxer->priv; + return (index < 0) ? index : (index >= ogg_d->n_text) ? -1 : ogg_d->text_ids[index]; +} + +/** \brief Translate the ogg track number into the subtitle number. + * \param demuxer The demuxer about whose subtitles we are inquiring. + * \param id The ogg track number of the subtitle track. + */ +static int demux_ogg_sub_reverse_id(demuxer_t *demuxer, int id) { + ogg_demuxer_t *ogg_d = demuxer->priv; + int i; + for (i = 0; i < ogg_d->n_text; i++) + if (ogg_d->text_ids[i] == id) return i; + return -1; +} /// Try to print out comments and also check for LANGUAGE= tag static void demux_ogg_check_comments(demuxer_t *d, ogg_stream_t *os, int id, vorbis_comment *vc) @@ -641,34 +665,6 @@ static void demux_ogg_scan_stream(demuxer_t *demuxer) void print_wave_header(WAVEFORMATEX *h, int verbose_level); void print_video_header(BITMAPINFOHEADER *h, int verbose_level); -/** \brief Change the current subtitle stream and return its ID. - - \param demuxer The demuxer whose subtitle stream will be changed. - \param new_num The number of the new subtitle track. The number must be - between 0 and ogg_d->n_text - 1. - - \returns The Ogg stream number ( = page serial number) of the newly selected - track. -*/ -int demux_ogg_sub_id(demuxer_t *demuxer, int index) { - ogg_demuxer_t *ogg_d = demuxer->priv; - return (index < 0) ? index : (index >= ogg_d->n_text) ? -1 : ogg_d->text_ids[index]; -} - -/** \brief Translate the ogg track number into the subtitle number. - * \param demuxer The demuxer about whose subtitles we are inquiring. - * \param id The ogg track number of the subtitle track. - */ -static int demux_ogg_sub_reverse_id(demuxer_t *demuxer, int id) { - ogg_demuxer_t *ogg_d = demuxer->priv; - int i; - for (i = 0; i < ogg_d->n_text; i++) - if (ogg_d->text_ids[i] == id) return i; - return -1; -} - -static void demux_close_ogg(demuxer_t* demuxer); - static void fixup_vorbis_wf(sh_audio_t *sh, ogg_demuxer_t *od) { int i, offset; -- cgit v1.2.3 From 2dbe8cf340253fb914e793be7282b82d032371a5 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 23:27:47 +0000 Subject: Mark demux_ogg_sub_id() as static; it is not used outside of the file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30625 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_ogg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 127bde5b48..cc8b65cd43 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -376,7 +376,8 @@ static int demux_ogg_check_lang(const char *clang, const char *langlist) \returns The Ogg stream number ( = page serial number) of the newly selected track. */ -int demux_ogg_sub_id(demuxer_t *demuxer, int index) { +static int demux_ogg_sub_id(demuxer_t *demuxer, int index) +{ ogg_demuxer_t *ogg_d = demuxer->priv; return (index < 0) ? index : (index >= ogg_d->n_text) ? -1 : ogg_d->text_ids[index]; } -- cgit v1.2.3 From e606c4652665b26b5560b3b28a13b8fd6c87c951 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 23:33:17 +0000 Subject: Remove demux_ogg-related declarations that are no longer necessary. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30626 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 28c4c951f1..09da39713d 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -414,12 +414,6 @@ char* demux_info_get(demuxer_t *demuxer, const char *opt); int demux_info_print(demuxer_t *demuxer); int demux_control(demuxer_t *demuxer, int cmd, void *arg); -#ifdef CONFIG_OGGVORBIS -/* Found in demux_ogg.c */ -int demux_ogg_num_subs(demuxer_t *demuxer); -int demux_ogg_sub_id(demuxer_t *demuxer, int index); -#endif - int demuxer_get_current_time(demuxer_t *demuxer); double demuxer_get_time_length(demuxer_t *demuxer); int demuxer_get_percent_pos(demuxer_t *demuxer); -- cgit v1.2.3 From e01e094438ad05c052b0694d99548498d1602b3d Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 23:36:44 +0000 Subject: Add header for demux_ogg_open, init_avi_with_ogg; avoids forward declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30627 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_avi.c | 5 +---- libmpdemux/demux_ogg.c | 1 + libmpdemux/demux_ogg.h | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 libmpdemux/demux_ogg.h (limited to 'libmpdemux') diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 89ec44549e..eb9b586706 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -30,12 +30,9 @@ #include "stream/stream.h" #include "demuxer.h" #include "stheader.h" - +#include "demux_ogg.h" #include "aviheader.h" -demuxer_t* init_avi_with_ogg(demuxer_t* demuxer); -int demux_ogg_open(demuxer_t* demuxer); - extern const demuxer_desc_t demuxer_desc_avi_ni; extern const demuxer_desc_t demuxer_desc_avi_nini; diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index cc8b65cd43..80bc1d248b 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -32,6 +32,7 @@ #include "stheader.h" #include "libavutil/intreadwrite.h" #include "demux_mov.h" +#include "demux_ogg.h" #define FOURCC_VORBIS mmioFOURCC('v', 'r', 'b', 's') #define FOURCC_SPEEX mmioFOURCC('s', 'p', 'x', ' ') diff --git a/libmpdemux/demux_ogg.h b/libmpdemux/demux_ogg.h new file mode 100644 index 0000000000..0bdc30b910 --- /dev/null +++ b/libmpdemux/demux_ogg.h @@ -0,0 +1,27 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_DEMUX_OGG_H +#define MPLAYER_DEMUX_OGG_H + +#include "demuxer.h" + +int demux_ogg_open(demuxer_t *demuxer); +demuxer_t *init_avi_with_ogg(demuxer_t *demuxer); + +#endif /* MPLAYER_DEMUX_OGG_H */ -- cgit v1.2.3 From e52d7ceb38bd6277e17b5e3fabe6d6e59c16e032 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 23:40:48 +0000 Subject: #include proper header for skip_audio_frame() instead of forward declaring it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30628 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_asf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index 30856486b4..c880028af5 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -31,7 +31,7 @@ #include "stream/stream.h" #include "asf.h" #include "demuxer.h" - +#include "libmpcodecs/dec_audio.h" #include "libvo/fastmemcpy.h" #include "libavutil/intreadwrite.h" @@ -550,8 +550,6 @@ static int demux_asf_fill_buffer(demuxer_t *demux, demux_stream_t *ds){ #include "stheader.h" -void skip_audio_frame(sh_audio_t *sh_audio); - static void demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){ struct asf_priv* asf = demuxer->priv; demux_stream_t *d_audio=demuxer->audio; -- cgit v1.2.3 From 01df6700de05935c9fc1c595d406165f4b1008d4 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 23:45:01 +0000 Subject: Add header for asf_check_header, read_asf_header; avoids forward declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30629 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/asfheader.c | 2 +- libmpdemux/asfheader.h | 28 ++++++++++++++++++++++++++++ libmpdemux/demux_asf.c | 6 +----- 3 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 libmpdemux/asfheader.h (limited to 'libmpdemux') diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index d0532f1e3d..1040df540d 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -33,8 +33,8 @@ #include "stheader.h" #include "asf.h" - #include "asfguid.h" +#include "asfheader.h" typedef struct { // must be 0 for metadata record, might be non-zero for metadata lib record diff --git a/libmpdemux/asfheader.h b/libmpdemux/asfheader.h new file mode 100644 index 0000000000..9c239f7987 --- /dev/null +++ b/libmpdemux/asfheader.h @@ -0,0 +1,28 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_ASFHEADER_H +#define MPLAYER_ASFHEADER_H + +#include "asf.h" +#include "demuxer.h" + +int asf_check_header(demuxer_t *demuxer); +int read_asf_header(demuxer_t *demuxer, struct asf_priv *asf); + +#endif /* MPLAYER_ASFHEADER_H */ diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index c880028af5..32a2c5bda0 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -30,16 +30,12 @@ #include "stream/stream.h" #include "asf.h" +#include "asfheader.h" #include "demuxer.h" #include "libmpcodecs/dec_audio.h" #include "libvo/fastmemcpy.h" #include "libavutil/intreadwrite.h" -// defined at asfheader.c: - -int asf_check_header(demuxer_t *demuxer); -int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf); - // based on asf file-format doc by Eugene [http://divx.euro.ru] /** -- cgit v1.2.3 From 00554417742997c413ea611910065d0527b690ee Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 18 Feb 2010 00:18:50 +0000 Subject: Add header for AVI print functions; avoids many forward declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30631 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/asfheader.c | 5 +---- libmpdemux/aviheader.c | 12 +----------- libmpdemux/aviprint.c | 1 + libmpdemux/aviprint.h | 34 ++++++++++++++++++++++++++++++++++ libmpdemux/demux_audio.c | 3 +-- libmpdemux/demux_lavf.c | 4 +--- libmpdemux/demux_ogg.c | 4 +--- libmpdemux/demux_real.c | 3 +-- libmpdemux/demux_realaud.c | 5 +---- 9 files changed, 42 insertions(+), 29 deletions(-) create mode 100644 libmpdemux/aviprint.h (limited to 'libmpdemux') diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index 1040df540d..f31eda31fd 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -29,6 +29,7 @@ #include "help_mp.h" #include "stream/stream.h" +#include "aviprint.h" #include "demuxer.h" #include "stheader.h" @@ -135,10 +136,6 @@ int asf_check_header(demuxer_t *demuxer){ return DEMUXER_TYPE_ASF; } -void print_wave_header(WAVEFORMATEX *h, int verbose_level); -void print_video_header(BITMAPINFOHEADER *h, int verbose_level); - - static int get_ext_stream_properties(char *buf, int buf_len, int stream_num, struct asf_priv* asf, int is_video) { int pos=0; diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index 003874bb2e..25a4f6cef9 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -28,22 +28,12 @@ #include "stream/stream.h" #include "demuxer.h" #include "stheader.h" - +#include "aviprint.h" #include "aviheader.h" #include "libavutil/common.h" static MainAVIHeader avih; -void print_avih(MainAVIHeader *h, int verbose_level); -void print_avih_flags(MainAVIHeader *h, int verbose_level); -void print_strh(AVIStreamHeader *h, int verbose_level); -void print_wave_header(WAVEFORMATEX *h, int verbose_level); -void print_video_header(BITMAPINFOHEADER *h, int verbose_level); -void print_index(AVIINDEXENTRY *idx,int idx_size, int verbose_level); -void print_avistdindex_chunk(avistdindex_chunk *h, int verbose_level); -void print_avisuperindex_chunk(avisuperindex_chunk *h, int verbose_level); -void print_vprp(VideoPropHeader *vprp, int verbose_level); - static int odml_get_vstream_id(int id, unsigned char res[]) { unsigned char *p = (unsigned char *)&id; diff --git a/libmpdemux/aviprint.c b/libmpdemux/aviprint.c index f12451a6b4..aa432f54b2 100644 --- a/libmpdemux/aviprint.c +++ b/libmpdemux/aviprint.c @@ -29,6 +29,7 @@ #include "aviheader.h" #include "ms_hdr.h" +#include "aviprint.h" //#include "codec-cfg.h" //#include "stheader.h" diff --git a/libmpdemux/aviprint.h b/libmpdemux/aviprint.h new file mode 100644 index 0000000000..0f0f6c8e8d --- /dev/null +++ b/libmpdemux/aviprint.h @@ -0,0 +1,34 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_AVIPRINT_H +#define MPLAYER_AVIPRINT_H + +#include "ms_hdr.h" +#include "aviheader.h" + +void print_avih_flags(MainAVIHeader *h, int verbose_level); +void print_avih(MainAVIHeader *h, int verbose_level); +void print_strh(AVIStreamHeader *h, int verbose_level); +void print_wave_header(WAVEFORMATEX *h, int verbose_level); +void print_video_header(BITMAPINFOHEADER *h, int verbose_level); +void print_index(AVIINDEXENTRY *idx, int idx_size, int verbose_level); +void print_avistdindex_chunk(avistdindex_chunk *h, int verbose_level); +void print_avisuperindex_chunk(avisuperindex_chunk *h, int verbose_level); + +#endif /* MPLAYER_AVIPRINT_H */ diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index 5b38fae206..63b710427d 100644 --- a/libmpdemux/demux_audio.c +++ b/libmpdemux/demux_audio.c @@ -23,6 +23,7 @@ #include #include #include "stream/stream.h" +#include "aviprint.h" #include "demuxer.h" #include "stheader.h" #include "genres.h" @@ -62,8 +63,6 @@ typedef struct mp3_hdr { struct mp3_hdr *next; } mp3_hdr_t; -void print_wave_header(WAVEFORMATEX *h, int verbose_level); - int hr_mp3_seek = 0; /** diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 979064f079..f70a88146a 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -29,6 +29,7 @@ #include "av_opts.h" #include "stream/stream.h" +#include "aviprint.h" #include "demuxer.h" #include "stheader.h" #include "m_option.h" @@ -80,9 +81,6 @@ typedef struct lavf_priv_t{ int cur_program; }lavf_priv_t; -void print_wave_header(WAVEFORMATEX *h, int verbose_level); -void print_video_header(BITMAPINFOHEADER *h, int verbose_level); - static int mp_read(void *opaque, uint8_t *buf, int size) { stream_t *stream = opaque; int ret; diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 80bc1d248b..dd8f5e9aab 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -31,6 +31,7 @@ #include "demuxer.h" #include "stheader.h" #include "libavutil/intreadwrite.h" +#include "aviprint.h" #include "demux_mov.h" #include "demux_ogg.h" @@ -664,9 +665,6 @@ static void demux_ogg_scan_stream(demuxer_t *demuxer) } -void print_wave_header(WAVEFORMATEX *h, int verbose_level); -void print_video_header(BITMAPINFOHEADER *h, int verbose_level); - static void fixup_vorbis_wf(sh_audio_t *sh, ogg_demuxer_t *od) { int i, offset; diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index 45ee5efdd4..0ce2dfa859 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -45,6 +45,7 @@ #include "mpbswap.h" #include "stream/stream.h" +#include "aviprint.h" #include "demuxer.h" #include "stheader.h" #include "demux_real.h" @@ -1089,8 +1090,6 @@ discard: return 0; } -void print_wave_header(WAVEFORMATEX *h, int verbose_level); - static demuxer_t* demux_open_real(demuxer_t* demuxer) { real_priv_t* priv = demuxer->priv; diff --git a/libmpdemux/demux_realaud.c b/libmpdemux/demux_realaud.c index fab5672392..dbb1f73ce3 100644 --- a/libmpdemux/demux_realaud.c +++ b/libmpdemux/demux_realaud.c @@ -28,6 +28,7 @@ #include "help_mp.h" #include "stream/stream.h" +#include "aviprint.h" #include "demuxer.h" #include "stheader.h" @@ -157,10 +158,6 @@ static int demux_ra_fill_buffer(demuxer_t *demuxer, demux_stream_t *dsds) -void print_wave_header(WAVEFORMATEX *h, int verbose_level); - - - static demuxer_t* demux_open_ra(demuxer_t* demuxer) { ra_priv_t* ra_priv = demuxer->priv; -- cgit v1.2.3