diff options
-rw-r--r-- | libao2/ao_sun.c | 15 | ||||
-rw-r--r-- | libmpcodecs/ad_acm.c | 4 | ||||
-rw-r--r-- | libmpcodecs/ad_twin.c | 6 | ||||
-rw-r--r-- | libmpcodecs/ae_lame.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vd.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 6 | ||||
-rw-r--r-- | libmpcodecs/vd_vfw.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_scale.c | 2 | ||||
-rw-r--r-- | libmpdemux/asf_streaming.c | 3 | ||||
-rw-r--r-- | libmpdemux/asfheader.c | 18 | ||||
-rw-r--r-- | libmpdemux/aviheader.c | 16 | ||||
-rw-r--r-- | libmpdemux/demux_asf.c | 4 | ||||
-rw-r--r-- | libmpdemux/demux_audio.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_lavf.c | 4 | ||||
-rw-r--r-- | libmpdemux/demux_mov.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_ogg.c | 10 | ||||
-rw-r--r-- | libmpdemux/demux_real.c | 4 | ||||
-rw-r--r-- | libmpdemux/demuxer.c | 2 | ||||
-rw-r--r-- | libmpdemux/http.c | 2 | ||||
-rw-r--r-- | libmpdemux/stream.c | 5 | ||||
-rw-r--r-- | libmpdemux/video.c | 2 | ||||
-rw-r--r-- | libvo/vesa_lvo.c | 26 | ||||
-rw-r--r-- | libvo/vo_png.c | 35 | ||||
-rw-r--r-- | libvo/vo_sdl.c | 90 | ||||
-rw-r--r-- | libvo/vo_svga.c | 39 | ||||
-rw-r--r-- | libvo/vo_vesa.c | 53 | ||||
-rw-r--r-- | libvo/vo_xvmc.c | 69 | ||||
-rw-r--r-- | libvo/vosub_vidix.c | 25 | ||||
-rw-r--r-- | loader/win32.c | 2 | ||||
-rw-r--r-- | mencoder.c | 4 | ||||
-rw-r--r-- | mplayer.c | 6 |
31 files changed, 261 insertions, 204 deletions
diff --git a/libao2/ao_sun.c b/libao2/ao_sun.c index da2d4e9e7c..ea3f5f3e37 100644 --- a/libao2/ao_sun.c +++ b/libao2/ao_sun.c @@ -64,7 +64,6 @@ static enum { RTSC_DISABLED } enable_sample_timing; -extern int verbose; // convert an OSS audio format specification into a sun audio encoding @@ -127,19 +126,19 @@ static int realtime_samplecounter_available(char *dev) info.play.encoding = AUDIO_ENCODING_LINEAR; info.play.samples = 0; if (ioctl(fd, AUDIO_SETINFO, &info)) { - if (verbose>0) + if ( mp_msg_test(MSGT_AO,MSGL_V) ) mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SUN_RtscSetinfoFailed); goto error; } if (write(fd, silence, len) != len) { - if (verbose>0) + if ( mp_msg_test(MSGT_AO,MSGL_V) ) mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SUN_RtscWriteFailed); goto error; } if (ioctl(fd, AUDIO_GETINFO, &info)) { - if (verbose>0) + if ( mp_msg_test(MSGT_AO,MSGL_V) ) perror("rtsc: GETINFO1"); goto error; } @@ -161,18 +160,18 @@ static int realtime_samplecounter_available(char *dev) break; if (ioctl(fd, AUDIO_GETINFO, &info)) { - if (verbose>0) + if ( mp_msg_test(MSGT_AO,MSGL_V) ) perror("rtsc: GETINFO2 failed"); goto error; } if (info.play.samples < last_samplecnt) { - if (verbose>0) + if ( mp_msg_test(MSGT_AO,MSGL_V) ) printf("rtsc: %d > %d?\n", last_samplecnt, info.play.samples); goto error; } if ((increment = info.play.samples - last_samplecnt) > 0) { - if (verbose>0) + if ( mp_msg_test(MSGT_AO,MSGL_V) ) printf("ao_sun: sample counter increment: %d\n", increment); if (increment < min_increment) { min_increment = increment; @@ -195,7 +194,7 @@ static int realtime_samplecounter_available(char *dev) if (min_increment < 2000) rtsc_ok = RTSC_ENABLED; - if (verbose>0) + if ( mp_msg_test(MSGT_AO,MSGL_V) ) printf("ao_sun: minimum sample counter increment per 10msec interval: %d\n" "\t%susing sample counter based timing code\n", min_increment, rtsc_ok == RTSC_ENABLED ? "" : "not "); diff --git a/libmpcodecs/ad_acm.c b/libmpcodecs/ad_acm.c index 6b670d6760..7e60805fb2 100644 --- a/libmpcodecs/ad_acm.c +++ b/libmpcodecs/ad_acm.c @@ -74,7 +74,7 @@ static int preinit(sh_audio_t *sh_audio) // priv->o_wf->wBitsPerSample = inf_fmt->wBitsPerSample; priv->o_wf->cbSize = 0; - if (verbose>0) + if ( mp_msg_test(MSGT_DECAUDIO,MSGL_V) ) { mp_msg(MSGT_DECAUDIO, MSGL_V, "Input format:\n"); print_wave_header(in_fmt); @@ -98,7 +98,7 @@ static int preinit(sh_audio_t *sh_audio) mp_msg(MSGT_WIN32, MSGL_V, "Audio codec opened OK! ;-)\n"); acmStreamSize(priv->handle, in_fmt->nBlockAlign, &srcsize, ACM_STREAMSIZEF_SOURCE); - //if (verbose) printf("Audio ACM output buffer min. size: %ld (reported by codec)\n", srcsize); + //if ( mp_msg_test(MSGT_DECAUDIO,MSGL_V) ) printf("Audio ACM output buffer min. size: %ld (reported by codec)\n", srcsize); srcsize *= 2; //if (srcsize < MAX_OUTBURST) srcsize = MAX_OUTBURST; if (!srcsize) diff --git a/libmpcodecs/ad_twin.c b/libmpcodecs/ad_twin.c index 8059106ced..c01d90cd27 100644 --- a/libmpcodecs/ad_twin.c +++ b/libmpcodecs/ad_twin.c @@ -110,11 +110,11 @@ static int init_vqf_audio_codec(sh_audio_t *sh_audio){ priv->o_wf.wBitsPerSample=in_fmt->wBitsPerSample; priv->o_wf.cbSize=0; - if(verbose) + if( mp_msg_test(MSGT_DECAUDIO,MSGL_V) ) { - mp_msg(MSGT_DECAUDIO, MSGL_INFO, "Input format:\n"); + mp_msg(MSGT_DECAUDIO, MSGL_V, "Input format:\n"); print_wave_header(in_fmt); - mp_msg(MSGT_DECAUDIO, MSGL_INFO, "Output fmt:\n"); + mp_msg(MSGT_DECAUDIO, MSGL_V, "Output fmt:\n"); print_wave_header(&priv->o_wf); } memcpy(&priv->hi,&in_fmt[1],sizeof(headerInfo)); diff --git a/libmpcodecs/ae_lame.c b/libmpcodecs/ae_lame.c index d47e91dc0f..d0f4b051ad 100644 --- a/libmpcodecs/ae_lame.c +++ b/libmpcodecs/ae_lame.c @@ -70,7 +70,6 @@ m_option_t lameopts_conf[]={ static int pass; -extern int verbose; static int bind_lame(audio_encoder_t *encoder, muxer_stream_t *mux_a) { @@ -192,7 +191,7 @@ int mpae_init_lame(audio_encoder_t *encoder) mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_LameCantInit); return 0; } - if(verbose>0) { + if( mp_msg_test(MSGT_MENCODER,MSGL_V) ) { lame_print_config(lame); lame_print_internals(lame); } diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 42b0697f2a..426fd05b09 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -174,7 +174,7 @@ int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outf // check if libvo and codec has common outfmt (no conversion): csp_again: - if(verbose>0){ + if( mp_msg_test(MSGT_DECVIDEO,MSGL_V) ){ vf_instance_t* f=vf; mp_msg(MSGT_DECVIDEO,MSGL_V,"Trying filter chain:"); for(f = vf ; f ; f = f->next) diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index b96973d45e..3818c3f0ae 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -1001,7 +1001,7 @@ static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic){ } assert(avctx->draw_horiz_band == mc_render_slice); assert(avctx->release_buffer == mc_release_buffer); - if(verbose > 4) + if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) ) printf("vd_ffmpeg::mc_get_buffer\n"); if(init_vo(sh,avctx->pix_fmt) < 0){ @@ -1068,7 +1068,7 @@ static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic){ pic->type= FF_BUFFER_TYPE_USER; render=(xvmc_render_state_t*)mpi->priv;//same as data[2] - if(verbose > 4) + if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) ) printf("vd_ffmpeg::mc_get_buffer (render=%p)\n",render); assert(render != 0); assert(render->magic == MP_XVMC_RENDER_MAGIC); @@ -1095,7 +1095,7 @@ static void mc_release_buffer(AVCodecContext *avctx, AVFrame *pic){ //printf("R%X %X\n", pic->linesize[0], pic->data[0]); //mark the surface as not requared for prediction render=(xvmc_render_state_t*)pic->data[2];//same as mpi->priv - if(verbose > 4) + if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) ) printf("vd_ffmpeg::mc_release_buffer (render=%p)\n",render); assert(render!=NULL); assert(render->magic==MP_XVMC_RENDER_MAGIC); diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c index e13097d67e..eb8d304a29 100644 --- a/libmpcodecs/vd_vfw.c +++ b/libmpcodecs/vd_vfw.c @@ -241,9 +241,9 @@ static int init(sh_video_t *sh){ set_csp(priv->o_bih,sh->codec->outfmt[sh->outfmtidx]); mp_msg(MSGT_WIN32, MSGL_V, "Input format:\n"); - if(verbose>0) print_video_header(sh->bih); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh->bih); mp_msg(MSGT_WIN32, MSGL_V, "Output format:\n"); - if(verbose>0) print_video_header(priv->o_bih); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(priv->o_bih); // set postprocessing level in xvid/divx4 .dll ICSendMessage(priv->handle, ICM_USER+80, (long)(&divx_quality), 0); diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index fc4ce1c48a..6dd093251a 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -522,7 +522,7 @@ void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, Sw firstTime=0; *flags= SWS_PRINT_INFO; } - else if(verbose>1) *flags= SWS_PRINT_INFO; + else if( mp_msg_test(MSGT_VFILTER,MSGL_DBG2) ) *flags= SWS_PRINT_INFO; if(src_filter) sws_freeFilter(src_filter); diff --git a/libmpdemux/asf_streaming.c b/libmpdemux/asf_streaming.c index 30ebc29dc7..2ddfbecc14 100644 --- a/libmpdemux/asf_streaming.c +++ b/libmpdemux/asf_streaming.c @@ -31,7 +31,6 @@ ((guid)[3] << 24 | (guid)[2] << 16 | (guid)[1] << 8 | (guid)[0]) #endif -extern int verbose; extern int network_bandwidth; int asf_mmst_streaming_start( stream_t *stream ); @@ -759,7 +758,7 @@ static int asf_http_streaming_start( stream_t *stream, int *demuxer_type ) { } http_response_append( http_hdr, buffer, i ); } while( !http_is_header_entire( http_hdr ) ); - if( verbose>0 ) { + if( mp_msg_test(MSGT_NETWORK,MSGL_V) ) { http_hdr->buffer[http_hdr->buffer_size]='\0'; mp_msg(MSGT_NETWORK,MSGL_DBG2,"Response [%s]\n", http_hdr->buffer ); } diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index e69d94608d..72179bd445 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -5,8 +5,6 @@ #include <stdlib.h> #include <unistd.h> -extern int verbose; // defined in mplayer.c - #include "config.h" #include "mp_msg.h" #include "help_mp.h" @@ -212,7 +210,7 @@ int read_asf_header(demuxer_t *demuxer){ sh_audio->wf=calloc((streamh->type_size<sizeof(WAVEFORMATEX))?sizeof(WAVEFORMATEX):streamh->type_size,1); memcpy(sh_audio->wf,buffer,streamh->type_size); le2me_WAVEFORMATEX(sh_audio->wf); - if(verbose>=1) print_wave_header(sh_audio->wf); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf); if(ASF_LOAD_GUID_PREFIX(streamh->concealment)==ASF_GUID_PREFIX_audio_conceal_interleave){ buffer = &hdr[pos]; pos += streamh->stream_size; @@ -240,7 +238,7 @@ int read_asf_header(demuxer_t *demuxer){ mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_MPDEMUX_ASFHDR_DVRWantsLibavformat); //sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; //sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; - if(verbose>=1) print_video_header(sh_video->bih); + if( mp_msg_test(MSGT_DEMUX,MSGL_V) ) print_video_header(sh_video->bih); //asf_video_id=streamh.stream_no & 0x7F; //if(demuxer->video->id==-1) demuxer->video->id=streamh.stream_no & 0x7F; break; @@ -283,7 +281,7 @@ int read_asf_header(demuxer_t *demuxer){ string = &hdr[pos]; pos += contenth->title_size; if (pos > hdr_len) goto len_err_out; - if(verbose>0) + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_asf_string(" Title: ", string, contenth->title_size); else pack_asf_string(string, contenth->title_size); @@ -294,7 +292,7 @@ int read_asf_header(demuxer_t *demuxer){ string = &hdr[pos]; pos += contenth->author_size; if (pos > hdr_len) goto len_err_out; - if(verbose>0) + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_asf_string(" Author: ", string, contenth->author_size); else pack_asf_string(string, contenth->author_size); @@ -305,7 +303,7 @@ int read_asf_header(demuxer_t *demuxer){ string = &hdr[pos]; pos += contenth->copyright_size; if (pos > hdr_len) goto len_err_out; - if(verbose>0) + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_asf_string(" Copyright: ", string, contenth->copyright_size); else pack_asf_string(string, contenth->copyright_size); @@ -316,7 +314,7 @@ int read_asf_header(demuxer_t *demuxer){ string = &hdr[pos]; pos += contenth->comment_size; if (pos > hdr_len) goto len_err_out; - if(verbose>0) + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_asf_string(" Comment: ", string, contenth->comment_size); else pack_asf_string(string, contenth->comment_size); @@ -327,7 +325,7 @@ int read_asf_header(demuxer_t *demuxer){ string = &hdr[pos]; pos += contenth->rating_size; if (pos > hdr_len) goto len_err_out; - if(verbose>0) + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_asf_string(" Rating: ", string, contenth->rating_size); } mp_msg(MSGT_HEADER,MSGL_V,"\n"); @@ -418,7 +416,7 @@ if(!video_streams){ } else if (best_video > 0 && demuxer->video->id == -1) demuxer->video->id = best_video; #if 0 -if(verbose){ +if( mp_msg_test(MSGT_HEADER,MSGL_V) ){ printf("ASF duration: %d\n",(int)fileh.duration); printf("ASF start pts: %d\n",(int)fileh.start_timestamp); printf("ASF end pts: %d\n",(int)fileh.end_timestamp); diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index 19ec696bef..e360149dfe 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -185,7 +185,7 @@ while(1){ stream_read(demuxer->stream,(char*) &avih,MIN(size2,sizeof(avih))); le2me_MainAVIHeader(&avih); // swap to machine endian chunksize-=MIN(size2,sizeof(avih)); - if(verbose>0) print_avih(&avih); // else print_avih_flags(&avih); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_avih(&avih); // else print_avih_flags(&avih); break; case ckidSTREAMHEADER: { // read 'strh' AVIStreamHeader h; @@ -202,7 +202,7 @@ while(1){ memcpy(&sh_audio->audio,&h,sizeof(h)); } last_fccType=h.fccType; - if(verbose>=1) print_strh(&h); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_strh(&h); break; } case mmioFOURCC('i', 'n', 'd', 'x'): { uint32_t i; @@ -254,7 +254,7 @@ while(1){ // fixup MS-RLE header (seems to be broken for <256 color files) if(sh_video->bih->biCompression<=1 && sh_video->bih->biSize==40) sh_video->bih->biSize=chunksize; - if(verbose>=1) print_video_header(sh_video->bih); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_video->bih); chunksize=0; // sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; // sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; @@ -309,7 +309,7 @@ while(1){ sh_audio->wf=realloc(sh_audio->wf, sizeof(WAVEFORMATEX)+sh_audio->wf->cbSize); } chunksize=0; - if(verbose>=1) print_wave_header(sh_audio->wf); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf); ++priv->audio_streams; // if(demuxer->audio->id==-1) demuxer->audio->id=stream_id; } @@ -332,7 +332,7 @@ while(1){ if (sh_video) { sh_video->aspect = GET_AVI_ASPECT(vprp->dwFrameAspectRatio); } - if(verbose>=1) print_vprp(vprp); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_vprp(vprp); free(vprp); break; } @@ -368,7 +368,7 @@ while(1){ entry->dwFlags&=0xffff; } chunksize-=priv->idx_size<<4; - if(verbose>=2) print_index(priv->idx,priv->idx_size); + if( mp_msg_test(MSGT_HEADER,MSGL_DBG2) ) print_index(priv->idx,priv->idx_size); } break; /* added May 2002 */ @@ -539,7 +539,7 @@ if (priv->isodml && (index_mode==-1 || index_mode==0 || index_mode==1)) { } } - if (verbose>=2) print_index(priv->idx, priv->idx_size); + if ( mp_msg_test(MSGT_HEADER,MSGL_DBG2) ) print_index(priv->idx, priv->idx_size); demuxer->movi_end=demuxer->stream->end_pos; @@ -677,7 +677,7 @@ skip_chunk: } priv->idx_size=priv->idx_pos; mp_msg(MSGT_HEADER,MSGL_INFO,MSGTR_MPDEMUX_AVIHDR_IdxGeneratedForHowManyChunks,priv->idx_size); - if(verbose>=2) print_index(priv->idx,priv->idx_size); + if( mp_msg_test(MSGT_HEADER,MSGL_DBG2) ) print_index(priv->idx,priv->idx_size); /* Write generated index to a file */ if (index_file_save) { diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index c21ed166f6..343752e070 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -178,7 +178,7 @@ static int demux_asf_fill_buffer(demuxer_t *demux, demux_stream_t *ds){ unsigned char segsizetype=0x80; int seg=-1; - if(verbose>1){ + if( mp_msg_test(MSGT_DEMUX,MSGL_DBG2) ){ int i; for(i=0;i<16;i++) printf(" %02X",asf_packet[i]); printf("\n"); @@ -260,7 +260,7 @@ static int demux_asf_fill_buffer(demuxer_t *demux, demux_stream_t *ds){ if(p>=p_end) mp_msg(MSGT_DEMUX,MSGL_V,"Warning! invalid packet 1, sig11 coming soon...\n"); - if(verbose>1){ + if( mp_msg_test(MSGT_DEMUX,MSGL_DBG2) ){ int i; printf("seg %d:",seg); for(i=0;i<16;i++) printf(" %02X",p[i]); diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index 1681110c8b..880677bf5f 100644 --- a/libmpdemux/demux_audio.c +++ b/libmpdemux/demux_audio.c @@ -438,7 +438,7 @@ static int demux_audio_open(demuxer_t* demuxer) { } } - if(verbose>0) print_wave_header(w); + if( mp_msg_test(MSGT_DEMUX,MSGL_V) ) print_wave_header(w); if(l) stream_skip(s,l); do diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index e2aaa64de7..057f4e315d 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -237,7 +237,7 @@ static demuxer_t* demux_open_lavf(demuxer_t *demuxer){ sh_audio->format = 0x7; break; } - if(verbose>=1) print_wave_header(sh_audio->wf); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf); if(demuxer->audio->id != i && demuxer->audio->id != -1) st->discard= AVDISCARD_ALL; else{ @@ -286,7 +286,7 @@ static demuxer_t* demux_open_lavf(demuxer_t *demuxer){ sh_video->ds= demuxer->video; if(codec->extradata_size) memcpy(sh_video->bih + 1, codec->extradata, codec->extradata_size); - if(verbose>=1) print_video_header(sh_video->bih); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_video->bih); /* short biPlanes; int biXPelsPerMeter; int biYPelsPerMeter; diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index bef99cccbd..eaffa1f963 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -1802,7 +1802,7 @@ static demuxer_t* mov_read_header(demuxer_t* demuxer){ } #if 1 - if(verbose>2){ + if( mp_msg_test(MSGT_DEMUX,MSGL_DBG3) ){ for(t_no=0;t_no<priv->track_db;t_no++){ mov_track_t* trak=priv->tracks[t_no]; if(trak->type==MOV_TRAK_GENERIC){ diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 459d4a4461..76f97b41f0 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -993,7 +993,7 @@ int demux_ogg_open(demuxer_t* demuxer) { (int)inf.version_minor, (int)inf.version_subminor, n_video - 1); - if(verbose>0) print_video_header(sh_v->bih); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_v->bih); } # endif /* HAVE_OGGTHEORA */ # ifdef HAVE_FLAC @@ -1036,7 +1036,7 @@ int demux_ogg_open(demuxer_t* demuxer) { n_video++; mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: video (FOURCC %c%c%c%c), -vid %d\n", ogg_d->num_sub,pack.packet[68],pack.packet[69],pack.packet[70],pack.packet[71],n_video-1); - if(verbose>0) print_video_header(sh_v->bih); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_v->bih); // Old audio header } else if(get_uint32(pack.packet+96) == 0x05589F81) { unsigned int extra_size; @@ -1060,7 +1060,7 @@ int demux_ogg_open(demuxer_t* demuxer) { ogg_d->subs[ogg_d->num_sub].id = n_audio; n_audio++; mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (format 0x%04x), -aid %d\n",ogg_d->num_sub,sh_a->format,n_audio-1); - if(verbose>0) print_wave_header(sh_a->wf); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_a->wf); } else mp_msg(MSGT_DEMUX,MSGL_WARN,"Ogg stream %d contains an old header but the header type is unknown\n",ogg_d->num_sub); @@ -1092,7 +1092,7 @@ int demux_ogg_open(demuxer_t* demuxer) { n_video++; mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: video (FOURCC %c%c%c%c), -vid %d\n", ogg_d->num_sub,st->subtype[0],st->subtype[1],st->subtype[2],st->subtype[3],n_video-1); - if(verbose>0) print_video_header(sh_v->bih); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_v->bih); /// New audio header } else if(strncmp(st->streamtype,"audio",5) == 0) { char buffer[5]; @@ -1131,7 +1131,7 @@ int demux_ogg_open(demuxer_t* demuxer) { ogg_d->subs[ogg_d->num_sub].id = n_audio; n_audio++; mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (format 0x%04x), -aid %d\n",ogg_d->num_sub,sh_a->format,n_audio-1); - if(verbose>0) print_wave_header(sh_a->wf); + if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_a->wf); /// Check for text (subtitles) header } else if (strncmp(st->streamtype, "text", 4) == 0) { diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index 39dd5fb75c..6aae5c5f39 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -159,7 +159,7 @@ static void dump_index(demuxer_t *demuxer, int stream_id) real_index_table_t *index; int i, entries; - if (verbose<=1) + if ( mp_msg_test(MSGT_DEMUX,MSGL_V) ) return; if (stream_id >= MAX_STREAMS) @@ -1448,7 +1448,7 @@ static demuxer_t* demux_open_real(demuxer_t* demuxer) sh->wf->wFormatTag = sh->format; mp_msg(MSGT_DEMUX,MSGL_V,"audio fourcc: %.4s (%x)\n", (char *)&sh->format, sh->format); - if (verbose > 0) + if ( mp_msg_test(MSGT_DEMUX,MSGL_V) ) print_wave_header(sh->wf); /* Select audio stream with highest bitrate if multirate file*/ diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index b8b0a14ae9..282c6e97cf 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -340,7 +340,7 @@ int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ int ds_fill_buffer(demux_stream_t *ds){ demuxer_t *demux=ds->demuxer; if(ds->current) free_demux_packet(ds->current); - if(verbose>2){ + if( mp_msg_test(MSGT_DEMUXER,MSGL_DBG3) ){ if(ds==demux->audio) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_audio) called\n");else if(ds==demux->video) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_video) called\n");else if(ds==demux->sub) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_sub) called\n");else diff --git a/libmpdemux/http.c b/libmpdemux/http.c index 3476db30d0..f5eb844312 100644 --- a/libmpdemux/http.c +++ b/libmpdemux/http.c @@ -735,7 +735,7 @@ static int http_streaming_start(stream_t *stream, int* file_format) { } stream->fd=fd; - if( verbose>0 ) { + if( mp_msg_test(MSGT_NETWORK,MSGL_V) ) { http_debug_hdr( http_hdr ); } diff --git a/libmpdemux/stream.c b/libmpdemux/stream.c index 869b3e1f62..0ea628a008 100644 --- a/libmpdemux/stream.c +++ b/libmpdemux/stream.c @@ -32,7 +32,6 @@ #include "m_struct.h" -extern int verbose; // defined in mplayer.c void cache_uninit(stream_t *s); // defined in cache2.c //#include "vcd_read_bincue.h" @@ -246,7 +245,7 @@ int stream_fill_buffer(stream_t *s){ int stream_seek_long(stream_t *s,off_t pos){ off_t newpos=0; -// if(verbose>=3) printf("seek_long to 0x%X\n",(unsigned int)pos); +// if( mp_msg_test(MSGT_STREAM,MSGL_DBG3) ) printf("seek_long to 0x%X\n",(unsigned int)pos); s->buf_pos=s->buf_len=0; @@ -271,7 +270,7 @@ off_t newpos=0; break; } -if(verbose>=3){ +if( mp_msg_test(MSGT_STREAM,MSGL_DBG3) ){ printf("s->pos=%"PRIX64" newpos=%"PRIX64" new_bufpos=%"PRIX64" buflen=%X \n", (int64_t)s->pos,(int64_t)newpos,(int64_t)pos,s->buf_len); } diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 89415fe944..499bf4ab9a 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -285,7 +285,7 @@ mpeg_header_parser: int i=sync_video_packet(d_video); if(i==0x1B3) break; // found it! if(!i || !skip_video_packet(d_video)){ - if(verbose>0) mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); + if( mp_msg_test(MSGT_DECVIDEO,MSGL_V) ) mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MpegNoSequHdr); return 0; } diff --git a/libvo/vesa_lvo.c b/libvo/vesa_lvo.c index 2ab2c0d798..b108bfbfac 100644 --- a/libvo/vesa_lvo.c +++ b/libvo/vesa_lvo.c @@ -20,6 +20,7 @@ #include <string.h> #include "config.h" +#include "mp_msg.h" #include "vesa_lvo.h" #include "img_format.h" @@ -40,7 +41,6 @@ static uint8_t *lvo_mem = NULL; static uint8_t next_frame; static mga_vid_config_t mga_vid_config; static unsigned image_bpp,image_height,image_width,src_format; -extern int verbose; uint32_t vlvo_control(uint32_t request, void *data, ...); #define PIXEL_SIZE() ((video_mode_info.BitsPerPixel+7)/8) @@ -54,7 +54,8 @@ int vlvo_preinit(const char *drvname) printf("vesa_lvo: This branch is no longer supported.\n" "vesa_lvo: Please use -vo vesa:vidix instead\n"); return -1; - if(verbose > 1) printf("vesa_lvo: vlvo_preinit(%s) was called\n",drvname); + if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { + printf("vesa_lvo: vlvo_preinit(%s) was called\n",drvname); } lvo_handler = open(drvname,O_RDWR); if(lvo_handler == -1) { @@ -78,7 +79,8 @@ int vlvo_init(unsigned src_width,unsigned src_height, printf("vesa_lvo: This branch is no longer supported.\n" "vesa_lvo: Please use -vo vesa:vidix instead\n"); return -1; - if(verbose > 1) printf("vesa_lvo: vlvo_init() was called\n"); + if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { + printf("vesa_lvo: vlvo_init() was called\n"); } image_width = src_width; image_height = src_height; mga_vid_config.version=MGA_VID_VERSION; @@ -146,7 +148,8 @@ int vlvo_init(unsigned src_width,unsigned src_height, void vlvo_term( void ) { - if(verbose > 1) printf("vesa_lvo: vlvo_term() was called\n"); + if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { + printf("vesa_lvo: vlvo_term() was called\n"); } ioctl( lvo_handler,MGA_VID_OFF,0 ); munmap(frames[0],mga_vid_config.frame_size*mga_vid_config.num_frames); if(lvo_handler != -1) close(lvo_handler); @@ -194,7 +197,8 @@ uint32_t vlvo_draw_slice_420(uint8_t *image[], int stride[], int w,int h,int x,i uint32_t vlvo_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) { - if(verbose > 1) printf("vesa_lvo: vlvo_draw_slice() was called\n"); + if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { + printf("vesa_lvo: vlvo_draw_slice() was called\n"); } if(src_format == IMGFMT_YV12 || src_format == IMGFMT_I420 || src_format == IMGFMT_IYUV) vlvo_draw_slice_420(image,stride,w,h,x,y); else @@ -213,13 +217,15 @@ uint32_t vlvo_draw_frame(uint8_t *image[]) { /* Note it's very strange but sometime for YUY2 draw_frame is called */ memcpy(lvo_mem,image[0],mga_vid_config.frame_size); - if(verbose > 1) printf("vesa_lvo: vlvo_draw_frame() was called\n"); + if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { + printf("vesa_lvo: vlvo_draw_frame() was called\n"); } return 0; } void vlvo_flip_page(void) { - if(verbose > 1) printf("vesa_lvo: vlvo_flip_page() was called\n"); + if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { + printf("vesa_lvo: vlvo_flip_page() was called\n"); } if(vo_doublebuffering) { ioctl(lvo_handler,MGA_VID_FSEL,&next_frame); @@ -277,7 +283,8 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned void vlvo_draw_osd(void) { - if(verbose > 1) printf("vesa_lvo: |