mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 12:02:23 +02:00
Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
558f53de4b
commit
3a406e94d7
@ -764,9 +764,11 @@ Leads to image distortion!
|
|||||||
.
|
.
|
||||||
.TP
|
.TP
|
||||||
.B \-identify
|
.B \-identify
|
||||||
|
Shorthand for \-msglevel identify=4.
|
||||||
Show file parameters in an easily parseable format.
|
Show file parameters in an easily parseable format.
|
||||||
Also prints more detailed information about subtitle and audio
|
Also prints more detailed information about subtitle and audio
|
||||||
track languages and IDs.
|
track languages and IDs. If you want even more information
|
||||||
|
use -msglevel identify=5.
|
||||||
The wrapper script TOOLS/\:midentify suppresses the other MPlayer output and
|
The wrapper script TOOLS/\:midentify suppresses the other MPlayer output and
|
||||||
(hopefully) shellescapes the filenames.
|
(hopefully) shellescapes the filenames.
|
||||||
.
|
.
|
||||||
|
@ -543,6 +543,7 @@ m_option_t msgl_config[]={
|
|||||||
{ "netst", &mp_msg_levels[MSGT_NETST], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL },
|
{ "netst", &mp_msg_levels[MSGT_NETST], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL },
|
||||||
{ "muxer", &mp_msg_levels[MSGT_MUXER], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL },
|
{ "muxer", &mp_msg_levels[MSGT_MUXER], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL },
|
||||||
{ "osd-menu", &mp_msg_levels[MSGT_OSD_MENU], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL },
|
{ "osd-menu", &mp_msg_levels[MSGT_OSD_MENU], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL },
|
||||||
|
{ "identify", &mp_msg_levels[MSGT_IDENTIFY], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL },
|
||||||
{"help", "Available msg modules:\n"
|
{"help", "Available msg modules:\n"
|
||||||
" global - common player errors/information\n"
|
" global - common player errors/information\n"
|
||||||
" cplayer - console player (mplayer.c)\n"
|
" cplayer - console player (mplayer.c)\n"
|
||||||
@ -585,6 +586,7 @@ m_option_t msgl_config[]={
|
|||||||
" afilter - Audio filter messages\n"
|
" afilter - Audio filter messages\n"
|
||||||
" netst - Netstream\n"
|
" netst - Netstream\n"
|
||||||
" muxer - muxer layer\n"
|
" muxer - muxer layer\n"
|
||||||
|
" identify - identify output\n"
|
||||||
"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
|
"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -383,7 +383,7 @@ m_option_t mplayer_opts[]={
|
|||||||
#undef MAIN_CONF
|
#undef MAIN_CONF
|
||||||
|
|
||||||
{"list-properties", &list_properties, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
|
{"list-properties", &list_properties, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
|
||||||
{"identify", &identify, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
|
{"identify", &mp_msg_levels[MSGT_IDENTIFY], CONF_TYPE_FLAG, CONF_GLOBAL, 0, MSGL_INFO, NULL},
|
||||||
{"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
|
{"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
|
||||||
{"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
|
{"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
|
||||||
{"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
|
{"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
|
||||||
|
@ -698,8 +698,6 @@ void af_frac_mul(frac_t *out, const frac_t *in) {
|
|||||||
void af_help (void) {
|
void af_help (void) {
|
||||||
int i = 0;
|
int i = 0;
|
||||||
af_msg(AF_MSG_INFO, "Available audio filters:\n");
|
af_msg(AF_MSG_INFO, "Available audio filters:\n");
|
||||||
if (identify)
|
|
||||||
af_msg(AF_MSG_INFO, "ID_AUDIO_FILTERS\n");
|
|
||||||
while (filter_list[i]) {
|
while (filter_list[i]) {
|
||||||
if (filter_list[i]->comment && filter_list[i]->comment[0])
|
if (filter_list[i]->comment && filter_list[i]->comment[0])
|
||||||
af_msg(AF_MSG_INFO, " %-15s: %s (%s)\n", filter_list[i]->name, filter_list[i]->info, filter_list[i]->comment);
|
af_msg(AF_MSG_INFO, " %-15s: %s (%s)\n", filter_list[i]->name, filter_list[i]->info, filter_list[i]->comment);
|
||||||
|
@ -135,8 +135,7 @@ ao_functions_t* audio_out_drivers[] =
|
|||||||
void list_audio_out(void){
|
void list_audio_out(void){
|
||||||
int i=0;
|
int i=0;
|
||||||
mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AvailableAudioOutputDrivers);
|
mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AvailableAudioOutputDrivers);
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_OUTPUTS\n");
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_OUTPUTS\n");
|
|
||||||
while (audio_out_drivers[i]) {
|
while (audio_out_drivers[i]) {
|
||||||
const ao_info_t *info = audio_out_drivers[i++]->info;
|
const ao_info_t *info = audio_out_drivers[i++]->info;
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO,"\t%s\t%s\n", info->short_name, info->name);
|
mp_msg(MSGT_GLOBAL, MSGL_INFO,"\t%s\t%s\n", info->short_name, info->name);
|
||||||
|
@ -36,8 +36,7 @@ af_cfg_t af_cfg = {1, NULL}; // Configuration for audio filters
|
|||||||
void afm_help(void){
|
void afm_help(void){
|
||||||
int i;
|
int i;
|
||||||
mp_msg(MSGT_DECAUDIO,MSGL_INFO,MSGTR_AvailableAudioFm);
|
mp_msg(MSGT_DECAUDIO,MSGL_INFO,MSGTR_AvailableAudioFm);
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_DRIVERS\n");
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_DRIVERS\n");
|
|
||||||
mp_msg(MSGT_DECAUDIO,MSGL_INFO," afm: info: (comment)\n");
|
mp_msg(MSGT_DECAUDIO,MSGL_INFO," afm: info: (comment)\n");
|
||||||
for (i=0; mpcodecs_ad_drivers[i] != NULL; i++)
|
for (i=0; mpcodecs_ad_drivers[i] != NULL; i++)
|
||||||
if(mpcodecs_ad_drivers[i]->info->comment && mpcodecs_ad_drivers[i]->info->comment[0])
|
if(mpcodecs_ad_drivers[i]->info->comment && mpcodecs_ad_drivers[i]->info->comment[0])
|
||||||
|
@ -152,8 +152,7 @@ void uninit_video(sh_video_t *sh_video){
|
|||||||
void vfm_help(void){
|
void vfm_help(void){
|
||||||
int i;
|
int i;
|
||||||
mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_AvailableVideoFm);
|
mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_AvailableVideoFm);
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_DRIVERS\n");
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_DRIVERS\n");
|
|
||||||
mp_msg(MSGT_DECVIDEO,MSGL_INFO," vfm: info: (comment)\n");
|
mp_msg(MSGT_DECVIDEO,MSGL_INFO," vfm: info: (comment)\n");
|
||||||
for (i=0; mpcodecs_vd_drivers[i] != NULL; i++)
|
for (i=0; mpcodecs_vd_drivers[i] != NULL; i++)
|
||||||
mp_msg(MSGT_DECVIDEO,MSGL_INFO,"%8s %s (%s)\n",
|
mp_msg(MSGT_DECVIDEO,MSGL_INFO,"%8s %s (%s)\n",
|
||||||
|
@ -312,8 +312,7 @@ static int fill_buffer(stream_t* s, char* buffer, int max_len) {
|
|||||||
//printf("Track %d, sector=%d\n", i, p->sector-1);
|
//printf("Track %d, sector=%d\n", i, p->sector-1);
|
||||||
if( cd_track!=NULL ) {
|
if( cd_track!=NULL ) {
|
||||||
mp_msg(MSGT_SEEK, MSGL_INFO, "\n%s\n", cd_track->name);
|
mp_msg(MSGT_SEEK, MSGL_INFO, "\n%s\n", cd_track->name);
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDA_TRACK=%d\n", cd_track->track_nb);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_CDDA_TRACK=%d\n", cd_track->track_nb);
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -355,8 +354,7 @@ static int seek(stream_t* s,off_t newpos) {
|
|||||||
cd_track = cd_info_get_track(p->cd_info, seeked_track+1);
|
cd_track = cd_info_get_track(p->cd_info, seeked_track+1);
|
||||||
if( cd_track!=NULL ) {
|
if( cd_track!=NULL ) {
|
||||||
mp_msg(MSGT_SEEK, MSGL_INFO, "\n%s\n", cd_track->name);
|
mp_msg(MSGT_SEEK, MSGL_INFO, "\n%s\n", cd_track->name);
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDA_TRACK=%d\n", cd_track->track_nb);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_CDDA_TRACK=%d\n", cd_track->track_nb);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -222,7 +222,7 @@ read_toc(const char *dev) {
|
|||||||
int cdd_identify(const char *dev)
|
int cdd_identify(const char *dev)
|
||||||
{
|
{
|
||||||
cdtoc_last_track = 0;
|
cdtoc_last_track = 0;
|
||||||
if (identify)
|
if (mp_msg_test(MSGT_IDENTIFY, MSGL_INFO))
|
||||||
{
|
{
|
||||||
int i, min, sec, frame;
|
int i, min, sec, frame;
|
||||||
cdtoc_last_track = read_toc(dev);
|
cdtoc_last_track = read_toc(dev);
|
||||||
@ -238,7 +238,7 @@ int cdd_identify(const char *dev)
|
|||||||
frame -= sec * 75;
|
frame -= sec * 75;
|
||||||
min = sec / 60;
|
min = sec / 60;
|
||||||
sec -= min * 60;
|
sec -= min * 60;
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_CDDA_TRACK_%d_MSF=%02d:%02d:%02d\n", i, min, sec, frame);
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDA_TRACK_%d_MSF=%02d:%02d:%02d\n", i, min, sec, frame);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return cdtoc_last_track;
|
return cdtoc_last_track;
|
||||||
|
@ -1548,26 +1548,19 @@ display_tracks (mkv_demuxer_t *mkv_d)
|
|||||||
{
|
{
|
||||||
case MATROSKA_TRACK_VIDEO:
|
case MATROSKA_TRACK_VIDEO:
|
||||||
type = "video";
|
type = "video";
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", vid);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_ID=%d\n", vid);
|
|
||||||
sprintf (str, "-vid %u", vid++);
|
sprintf (str, "-vid %u", vid++);
|
||||||
break;
|
break;
|
||||||
case MATROSKA_TRACK_AUDIO:
|
case MATROSKA_TRACK_AUDIO:
|
||||||
type = "audio";
|
type = "audio";
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", aid);
|
||||||
{
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", aid, mkv_d->tracks[i]->language);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", aid);
|
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AID_%d_LANG=%s\n", aid, mkv_d->tracks[i]->language);
|
|
||||||
}
|
|
||||||
sprintf (str, "-aid %u, -alang %.5s",aid++,mkv_d->tracks[i]->language);
|
sprintf (str, "-aid %u, -alang %.5s",aid++,mkv_d->tracks[i]->language);
|
||||||
break;
|
break;
|
||||||
case MATROSKA_TRACK_SUBTITLE:
|
case MATROSKA_TRACK_SUBTITLE:
|
||||||
type = "subtitles";
|
type = "subtitles";
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sid);
|
||||||
{
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", sid, mkv_d->tracks[i]->language);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sid);
|
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_SID_%d_LANG=%s\n", sid, mkv_d->tracks[i]->language);
|
|
||||||
}
|
|
||||||
sprintf (str, "-sid %u, -slang %.5s",sid++,mkv_d->tracks[i]->language);
|
sprintf (str, "-sid %u, -slang %.5s",sid++,mkv_d->tracks[i]->language);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -465,13 +465,10 @@ static void demux_ogg_check_comments(demuxer_t *d, ogg_stream_t *os, int id, vor
|
|||||||
if (!strncasecmp(*cmt, "LANGUAGE=", 9))
|
if (!strncasecmp(*cmt, "LANGUAGE=", 9))
|
||||||
{
|
{
|
||||||
val = *cmt + 9;
|
val = *cmt + 9;
|
||||||
if (identify)
|
if (ogg_d->subs[id].text)
|
||||||
{
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", ogg_d->subs[id].id, val);
|
||||||
if (ogg_d->subs[id].text)
|
else if (id != d->video->id)
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_SID_%d_LANG=%s\n", ogg_d->subs[id].id, val);
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", ogg_d->subs[id].id, val);
|
||||||
else if (id != d->video->id)
|
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AID_%d_LANG=%s\n", ogg_d->subs[id].id, val);
|
|
||||||
}
|
|
||||||
if (ogg_d->subs[id].text)
|
if (ogg_d->subs[id].text)
|
||||||
mp_msg(MSGT_DEMUX, MSGL_INFO, "[Ogg] Language for -sid %d is '-slang \"%s\"'\n", ogg_d->subs[id].id, val);
|
mp_msg(MSGT_DEMUX, MSGL_INFO, "[Ogg] Language for -sid %d is '-slang \"%s\"'\n", ogg_d->subs[id].id, val);
|
||||||
// copy this language name into the array
|
// copy this language name into the array
|
||||||
@ -921,8 +918,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
|
|||||||
sh_a = new_sh_audio(demuxer,ogg_d->num_sub);
|
sh_a = new_sh_audio(demuxer,ogg_d->num_sub);
|
||||||
sh_a->format = FOURCC_VORBIS;
|
sh_a->format = FOURCC_VORBIS;
|
||||||
ogg_d->subs[ogg_d->num_sub].vorbis = 1;
|
ogg_d->subs[ogg_d->num_sub].vorbis = 1;
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio);
|
|
||||||
ogg_d->subs[ogg_d->num_sub].id = n_audio;
|
ogg_d->subs[ogg_d->num_sub].id = n_audio;
|
||||||
n_audio++;
|
n_audio++;
|
||||||
mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (Vorbis), -aid %d\n",ogg_d->num_sub,n_audio-1);
|
mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (Vorbis), -aid %d\n",ogg_d->num_sub,n_audio-1);
|
||||||
@ -942,8 +938,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
|
|||||||
|
|
||||||
ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate;
|
ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate;
|
||||||
ogg_d->subs[ogg_d->num_sub].speex = 1;
|
ogg_d->subs[ogg_d->num_sub].speex = 1;
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio);
|
|
||||||
ogg_d->subs[ogg_d->num_sub].id = n_audio;
|
ogg_d->subs[ogg_d->num_sub].id = n_audio;
|
||||||
n_audio++;
|
n_audio++;
|
||||||
mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (Speex), -aid %d\n",ogg_d->num_sub,n_audio-1);
|
mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (Speex), -aid %d\n",ogg_d->num_sub,n_audio-1);
|
||||||
@ -982,8 +977,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
|
|||||||
sh_v->bih->biWidth*sh_v->bih->biHeight);
|
sh_v->bih->biWidth*sh_v->bih->biHeight);
|
||||||
ogg_d->subs[ogg_d->num_sub].samplerate = sh_v->fps;
|
ogg_d->subs[ogg_d->num_sub].samplerate = sh_v->fps;
|
||||||
ogg_d->subs[ogg_d->num_sub].theora = 1;
|
ogg_d->subs[ogg_d->num_sub].theora = 1;
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", n_video);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_ID=%d\n", n_video);
|
|
||||||
ogg_d->subs[ogg_d->num_sub].id = n_video;
|
ogg_d->subs[ogg_d->num_sub].id = n_video;
|
||||||
n_video++;
|
n_video++;
|
||||||
mp_msg(MSGT_DEMUX,MSGL_INFO,
|
mp_msg(MSGT_DEMUX,MSGL_INFO,
|
||||||
@ -1000,8 +994,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
|
|||||||
} else if (pack.bytes >= 4 && !strncmp (&pack.packet[0], "fLaC", 4)) {
|
} else if (pack.bytes >= 4 && !strncmp (&pack.packet[0], "fLaC", 4)) {
|
||||||
sh_a = new_sh_audio(demuxer,ogg_d->num_sub);
|
sh_a = new_sh_audio(demuxer,ogg_d->num_sub);
|
||||||
sh_a->format = mmioFOURCC('f', 'L', 'a', 'C');
|
sh_a->format = mmioFOURCC('f', 'L', 'a', 'C');
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio);
|
|
||||||
ogg_d->subs[ogg_d->num_sub].id = n_audio;
|
ogg_d->subs[ogg_d->num_sub].id = n_audio;
|
||||||
n_audio++;
|
n_audio++;
|
||||||
ogg_d->subs[ogg_d->num_sub].flac = 1;
|
ogg_d->subs[ogg_d->num_sub].flac = 1;
|
||||||
@ -1030,8 +1023,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
|
|||||||
sh_v->bih->biSizeImage=(sh_v->bih->biBitCount>>3)*sh_v->bih->biWidth*sh_v->bih->biHeight;
|
sh_v->bih->biSizeImage=(sh_v->bih->biBitCount>>3)*sh_v->bih->biWidth*sh_v->bih->biHeight;
|
||||||
|
|
||||||
ogg_d->subs[ogg_d->num_sub].samplerate = sh_v->fps;
|
ogg_d->subs[ogg_d->num_sub].samplerate = sh_v->fps;
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", n_video);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_ID=%d\n", n_video);
|
|
||||||
ogg_d->subs[ogg_d->num_sub].id = n_video;
|
ogg_d->subs[ogg_d->num_sub].id = n_video;
|
||||||
n_video++;
|
n_video++;
|
||||||
mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: video (FOURCC %c%c%c%c), -vid %d\n",
|
mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: video (FOURCC %c%c%c%c), -vid %d\n",
|
||||||
@ -1055,8 +1047,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
|
|||||||
memcpy(((char *)sh_a->wf)+sizeof(WAVEFORMATEX),pack.packet+142,extra_size);
|
memcpy(((char *)sh_a->wf)+sizeof(WAVEFORMATEX),pack.packet+142,extra_size);
|
||||||
|
|
||||||
ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels;
|
ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels;
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio);
|
|
||||||
ogg_d->subs[ogg_d->num_sub].id = n_audio;
|
ogg_d->subs[ogg_d->num_sub].id = n_audio;
|
||||||
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);
|
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);
|
||||||
@ -1086,8 +1077,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
|
|||||||
sh_v->bih->biSizeImage=(sh_v->bih->biBitCount>>3)*sh_v->bih->biWidth*sh_v->bih->biHeight;
|
sh_v->bih->biSizeImage=(sh_v->bih->biBitCount>>3)*sh_v->bih->biWidth*sh_v->bih->biHeight;
|
||||||
|
|
||||||
ogg_d->subs[ogg_d->num_sub].samplerate= sh_v->fps;
|
ogg_d->subs[ogg_d->num_sub].samplerate= sh_v->fps;
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", n_video);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_ID=%d\n", n_video);
|
|
||||||
ogg_d->subs[ogg_d->num_sub].id = n_video;
|
ogg_d->subs[ogg_d->num_sub].id = n_video;
|
||||||
n_video++;
|
n_video++;
|
||||||
mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: video (FOURCC %c%c%c%c), -vid %d\n",
|
mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: video (FOURCC %c%c%c%c), -vid %d\n",
|
||||||
@ -1126,8 +1116,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
|
|||||||
memcpy(((char *)sh_a->wf)+sizeof(WAVEFORMATEX),((char *)(st+1))+extra_offset,extra_size);
|
memcpy(((char *)sh_a->wf)+sizeof(WAVEFORMATEX),((char *)(st+1))+extra_offset,extra_size);
|
||||||
|
|
||||||
ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels;
|
ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels;
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio);
|
|
||||||
ogg_d->subs[ogg_d->num_sub].id = n_audio;
|
ogg_d->subs[ogg_d->num_sub].id = n_audio;
|
||||||
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);
|
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);
|
||||||
@ -1138,8 +1127,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
|
|||||||
mp_msg(MSGT_DEMUX, MSGL_INFO, "[Ogg] stream %d: subtitles (SRT-like text subtitles), -sid %d\n", ogg_d->num_sub, ogg_d->n_text);
|
mp_msg(MSGT_DEMUX, MSGL_INFO, "[Ogg] stream %d: subtitles (SRT-like text subtitles), -sid %d\n", ogg_d->num_sub, ogg_d->n_text);
|
||||||
ogg_d->subs[ogg_d->num_sub].samplerate= get_uint64(&st->time_unit)/10;
|
ogg_d->subs[ogg_d->num_sub].samplerate= get_uint64(&st->time_unit)/10;
|
||||||
ogg_d->subs[ogg_d->num_sub].text = 1;
|
ogg_d->subs[ogg_d->num_sub].text = 1;
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", ogg_d->n_text);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", ogg_d->n_text);
|
|
||||||
ogg_d->subs[ogg_d->num_sub].id = ogg_d->n_text;
|
ogg_d->subs[ogg_d->num_sub].id = ogg_d->n_text;
|
||||||
if (demuxer->sub->id == ogg_d->n_text)
|
if (demuxer->sub->id == ogg_d->n_text)
|
||||||
text_id = ogg_d->num_sub;
|
text_id = ogg_d->num_sub;
|
||||||
|
@ -594,20 +594,16 @@ static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param)
|
|||||||
|
|
||||||
if(is_video)
|
if(is_video)
|
||||||
{
|
{
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", es.pid);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_ID=%d\n", es.pid);
|
|
||||||
chosen_pid = (req_vpid == es.pid);
|
chosen_pid = (req_vpid == es.pid);
|
||||||
if((! chosen_pid) && (req_vpid > 0))
|
if((! chosen_pid) && (req_vpid > 0))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
else if(is_audio)
|
else if(is_audio)
|
||||||
{
|
{
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", es.pid);
|
||||||
{
|
if (es.lang[0] > 0)
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", es.pid);
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", es.pid, es.lang);
|
||||||
if (es.lang[0] > 0)
|
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AID_%d_LANG=%s\n", es.pid, es.lang);
|
|
||||||
}
|
|
||||||
if(req_apid > 0)
|
if(req_apid > 0)
|
||||||
{
|
{
|
||||||
chosen_pid = (req_apid == es.pid);
|
chosen_pid = (req_apid == es.pid);
|
||||||
@ -625,12 +621,9 @@ static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param)
|
|||||||
}
|
}
|
||||||
else if(is_sub)
|
else if(is_sub)
|
||||||
{
|
{
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", es.pid);
|
||||||
{
|
if (es.lang[0] > 0)
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", es.pid);
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", es.pid, es.lang);
|
||||||
if (es.lang[0] > 0)
|
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_SID_%d_LANG=%s\n", es.pid, es.lang);
|
|
||||||
}
|
|
||||||
chosen_pid = (req_spid == es.pid);
|
chosen_pid = (req_spid == es.pid);
|
||||||
if((! chosen_pid) && (req_spid > 0))
|
if((! chosen_pid) && (req_spid > 0))
|
||||||
continue;
|
continue;
|
||||||
|
@ -224,8 +224,8 @@ sh_audio_t* new_sh_audio(demuxer_t *demuxer,int id){
|
|||||||
sh->samplesize=2;
|
sh->samplesize=2;
|
||||||
sh->sample_format=AF_FORMAT_S16_NE;
|
sh->sample_format=AF_FORMAT_S16_NE;
|
||||||
sh->audio_out_minsize=8192;/* default size, maybe not enough for Win32/ACM*/
|
sh->audio_out_minsize=8192;/* default size, maybe not enough for Win32/ACM*/
|
||||||
if (identify && !demux_aid_vid_mismatch)
|
if (!demux_aid_vid_mismatch)
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", id);
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", id);
|
||||||
}
|
}
|
||||||
return demuxer->a_streams[id];
|
return demuxer->a_streams[id];
|
||||||
}
|
}
|
||||||
@ -249,8 +249,8 @@ sh_video_t* new_sh_video(demuxer_t *demuxer,int id){
|
|||||||
mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_FoundVideoStream,id);
|
mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_FoundVideoStream,id);
|
||||||
demuxer->v_streams[id]=malloc(sizeof(sh_video_t));
|
demuxer->v_streams[id]=malloc(sizeof(sh_video_t));
|
||||||
memset(demuxer->v_streams[id],0,sizeof(sh_video_t));
|
memset(demuxer->v_streams[id],0,sizeof(sh_video_t));
|
||||||
if (identify && !demux_aid_vid_mismatch)
|
if (!demux_aid_vid_mismatch)
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_ID=%d\n", id);
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", id);
|
||||||
}
|
}
|
||||||
return demuxer->v_streams[id];
|
return demuxer->v_streams[id];
|
||||||
}
|
}
|
||||||
@ -552,8 +552,7 @@ void demuxer_help(void)
|
|||||||
|
|
||||||
mp_msg(MSGT_DEMUXER, MSGL_INFO, "Available demuxers:\n");
|
mp_msg(MSGT_DEMUXER, MSGL_INFO, "Available demuxers:\n");
|
||||||
mp_msg(MSGT_DEMUXER, MSGL_INFO, " demuxer: type info: (comment)\n");
|
mp_msg(MSGT_DEMUXER, MSGL_INFO, " demuxer: type info: (comment)\n");
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DEMUXERS\n");
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_DEMUXERS\n");
|
|
||||||
for (i = 0; demuxer_list[i]; i++) {
|
for (i = 0; demuxer_list[i]; i++) {
|
||||||
if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Don't display special demuxers
|
if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Don't display special demuxers
|
||||||
continue;
|
continue;
|
||||||
@ -935,13 +934,10 @@ int demux_info_print(demuxer_t *demuxer)
|
|||||||
for(n = 0; info[2*n] != NULL ; n++)
|
for(n = 0; info[2*n] != NULL ; n++)
|
||||||
{
|
{
|
||||||
mp_msg(MSGT_DEMUX, MSGL_INFO, " %s: %s\n",info[2*n],info[2*n+1]);
|
mp_msg(MSGT_DEMUX, MSGL_INFO, " %s: %s\n",info[2*n],info[2*n+1]);
|
||||||
if (identify) {
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_NAME%d=%s\n", n, info[2*n]);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_CLIP_INFO_NAME%d=%s\n", n, info[2*n]);
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_VALUE%d=%s\n", n, info[2*n+1]);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_CLIP_INFO_VALUE%d=%s\n", n, info[2*n+1]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_N=%d\n", n);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_CLIP_INFO_N=%d\n", n);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -472,7 +472,7 @@ static int mp_describe_titleset(dvd_reader_t *dvd, tt_srpt_t *tt_srpt, int vts_n
|
|||||||
if (tt_srpt->title[title_no].title_set_nr != vts_no)
|
if (tt_srpt->title[title_no].title_set_nr != vts_no)
|
||||||
continue;
|
continue;
|
||||||
msec = mp_get_titleset_length(vts_file, tt_srpt, title_no);
|
msec = mp_get_titleset_length(vts_file, tt_srpt, title_no);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_DVD_TITLE_%d_LENGTH=%d.%03d\n", title_no + 1, msec / 1000, msec % 1000);
|
mp_msg(MSGT_IDENTIFY, MSGL_V, "ID_DVD_TITLE_%d_LENGTH=%d.%03d\n", title_no + 1, msec / 1000, msec % 1000);
|
||||||
}
|
}
|
||||||
ifoClose(vts_file);
|
ifoClose(vts_file);
|
||||||
return 1;
|
return 1;
|
||||||
@ -569,17 +569,20 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
|
|||||||
return STREAM_UNSUPORTED;
|
return STREAM_UNSUPORTED;
|
||||||
}
|
}
|
||||||
tt_srpt = vmg_file->tt_srpt;
|
tt_srpt = vmg_file->tt_srpt;
|
||||||
if (identify)
|
if (mp_msg_test(MSGT_IDENTIFY, MSGL_INFO))
|
||||||
|
{
|
||||||
|
int title_no; ///< title number
|
||||||
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DVD_TITLES=%d\n", tt_srpt->nr_of_srpts);
|
||||||
|
for (title_no = 0; title_no < tt_srpt->nr_of_srpts; title_no++)
|
||||||
|
{
|
||||||
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DVD_TITLE_%d_CHAPTERS=%d\n", title_no + 1, tt_srpt->title[title_no].nr_of_ptts);
|
||||||
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DVD_TITLE_%d_ANGLES=%d\n", title_no + 1, tt_srpt->title[title_no].nr_of_angles);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (mp_msg_test(MSGT_IDENTIFY, MSGL_V))
|
||||||
{
|
{
|
||||||
unsigned char discid [16]; ///< disk ID, a 128 bit MD5 sum
|
unsigned char discid [16]; ///< disk ID, a 128 bit MD5 sum
|
||||||
int vts_no; ///< video title set number
|
int vts_no; ///< video title set number
|
||||||
int title_no; ///< title number
|
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_DVD_TITLES=%d\n", tt_srpt->nr_of_srpts);
|
|
||||||
for (title_no = 0; title_no < tt_srpt->nr_of_srpts; title_no++)
|
|
||||||
{
|
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_DVD_TITLE_%d_CHAPTERS=%d\n", title_no + 1, tt_srpt->title[title_no].nr_of_ptts);
|
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_DVD_TITLE_%d_ANGLES=%d\n", title_no + 1, tt_srpt->title[title_no].nr_of_angles);
|
|
||||||
}
|
|
||||||
for (vts_no = 1; vts_no <= vmg_file->vts_atrt->nr_of_vtss; vts_no++)
|
for (vts_no = 1; vts_no <= vmg_file->vts_atrt->nr_of_vtss; vts_no++)
|
||||||
mp_describe_titleset(dvd, tt_srpt, vts_no);
|
mp_describe_titleset(dvd, tt_srpt, vts_no);
|
||||||
if (DVDDiscID(dvd, discid) >= 0)
|
if (DVDDiscID(dvd, discid) >= 0)
|
||||||
@ -588,7 +591,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
|
|||||||
char buf[33];
|
char buf[33];
|
||||||
for (i = 0; i < 16; i ++)
|
for (i = 0; i < 16; i ++)
|
||||||
sprintf(buf+2*i, "%02X", discid[i]);
|
sprintf(buf+2*i, "%02X", discid[i]);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_DVD_DISC_ID=%s\n", buf);
|
mp_msg(MSGT_IDENTIFY, MSGL_V, "ID_DVD_DISC_ID=%s\n", buf);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
@ -731,11 +734,9 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
|
|||||||
tmp,
|
tmp,
|
||||||
d->audio_streams[d->nr_of_channels].id
|
d->audio_streams[d->nr_of_channels].id
|
||||||
);
|
);
|
||||||
if(identify) {
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", d->audio_streams[d->nr_of_channels].id);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", d->audio_streams[d->nr_of_channels].id);
|
if(language && tmp[0])
|
||||||
if(language && tmp[0])
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", d->audio_streams[d->nr_of_channels].id, tmp);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AID_%d_LANG=%s\n", d->audio_streams[d->nr_of_channels].id, tmp);
|
|
||||||
}
|
|
||||||
|
|
||||||
d->nr_of_channels++;
|
d->nr_of_channels++;
|
||||||
}
|
}
|
||||||
@ -784,11 +785,9 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
mp_msg(MSGT_OPEN,MSGL_V,"[open] subtitle ( sid ): %d language: %s\n", d->nr_of_subtitles, tmp);
|
mp_msg(MSGT_OPEN,MSGL_V,"[open] subtitle ( sid ): %d language: %s\n", d->nr_of_subtitles, tmp);
|
||||||
if(identify) {
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", d->subtitles[d->nr_of_subtitles].id);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", d->subtitles[d->nr_of_subtitles].id);
|
if(language && tmp[0])
|
||||||
if(language && tmp[0])
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", d->nr_of_subtitles, tmp);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_SID_%d_LANG=%s\n", d->nr_of_subtitles, tmp);
|
|
||||||
}
|
|
||||||
d->nr_of_subtitles++;
|
d->nr_of_subtitles++;
|
||||||
}
|
}
|
||||||
mp_msg(MSGT_OPEN,MSGL_V,"[open] number of subtitles on disk: %d\n",d->nr_of_subtitles );
|
mp_msg(MSGT_OPEN,MSGL_V,"[open] number of subtitles on disk: %d\n",d->nr_of_subtitles );
|
||||||
|
@ -65,11 +65,8 @@ mp_vcd_priv_t* vcd_read_toc(int fd){
|
|||||||
mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno));
|
mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno));
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_START_TRACK=%d\n", tochdr.cdth_trk0);
|
||||||
{
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_END_TRACK=%d\n", tochdr.cdth_trk1);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_START_TRACK=%d\n", tochdr.cdth_trk0);
|
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_END_TRACK=%d\n", tochdr.cdth_trk1);
|
|
||||||
}
|
|
||||||
for (i=tochdr.cdth_trk0 ; i<=tochdr.cdth_trk1 + 1; i++){
|
for (i=tochdr.cdth_trk0 ; i<=tochdr.cdth_trk1 + 1; i++){
|
||||||
struct cdrom_tocentry tocentry;
|
struct cdrom_tocentry tocentry;
|
||||||
|
|
||||||
@ -93,7 +90,7 @@ mp_vcd_priv_t* vcd_read_toc(int fd){
|
|||||||
(int)tocentry.cdte_datamode
|
(int)tocentry.cdte_datamode
|
||||||
);
|
);
|
||||||
|
|
||||||
if (identify)
|
if (mp_msg_test(MSGT_IDENTIFY, MSGL_INFO))
|
||||||
{
|
{
|
||||||
if (i > tochdr.cdth_trk0)
|
if (i > tochdr.cdth_trk0)
|
||||||
{
|
{
|
||||||
@ -110,7 +107,7 @@ mp_vcd_priv_t* vcd_read_toc(int fd){
|
|||||||
sec += 60;
|
sec += 60;
|
||||||
min --;
|
min --;
|
||||||
}
|
}
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_TRACK_%d_MSF=%02d:%02d:%02d\n", i - 1, min, sec, frame);
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_TRACK_%d_MSF=%02d:%02d:%02d\n", i - 1, min, sec, frame);
|
||||||
}
|
}
|
||||||
min = tocentry.cdte_addr.msf.minute;
|
min = tocentry.cdte_addr.msf.minute;
|
||||||
sec = tocentry.cdte_addr.msf.second;
|
sec = tocentry.cdte_addr.msf.second;
|
||||||
|
@ -124,11 +124,8 @@ mp_vcd_priv_t* vcd_read_toc(int fd)
|
|||||||
}
|
}
|
||||||
|
|
||||||
//print all track info
|
//print all track info
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_START_TRACK=%d\n", hdr.firstTrackNumberInLastSessionLSB);
|
||||||
{
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_END_TRACK=%d\n", hdr.lastTrackNumberInLastSessionLSB);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_START_TRACK=%d\n", hdr.firstTrackNumberInLastSessionLSB);
|
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_END_TRACK=%d\n", hdr.lastTrackNumberInLastSessionLSB);
|
|
||||||
}
|
|
||||||
for (i=hdr.firstTrackNumberInLastSessionLSB ; i<=hdr.lastTrackNumberInLastSessionLSB + 1; i++)
|
for (i=hdr.firstTrackNumberInLastSessionLSB ; i<=hdr.lastTrackNumberInLastSessionLSB + 1; i++)
|
||||||
{
|
{
|
||||||
memset( &tocentry, 0, sizeof(tocentry));
|
memset( &tocentry, 0, sizeof(tocentry));
|
||||||
@ -157,7 +154,7 @@ mp_vcd_priv_t* vcd_read_toc(int fd)
|
|||||||
(int)trackMSF.frame
|
(int)trackMSF.frame
|
||||||
);
|
);
|
||||||
|
|
||||||
if (identify)
|
if (mp_msg_test(MSGT_IDENTIFY, MSGL_INFO))
|
||||||
{
|
{
|
||||||
if (i > hdr.firstTrackNumberInLastSessionLSB)
|
if (i > hdr.firstTrackNumberInLastSessionLSB)
|
||||||
{
|
{
|
||||||
@ -174,7 +171,7 @@ mp_vcd_priv_t* vcd_read_toc(int fd)
|
|||||||
sec += 60;
|
sec += 60;
|
||||||
min --;
|
min --;
|
||||||
}
|
}
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_TRACK_%d_MSF=%02d:%02d:%02d\n", i - 1, min, sec, frame);
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_TRACK_%d_MSF=%02d:%02d:%02d\n", i - 1, min, sec, frame);
|
||||||
}
|
}
|
||||||
min = trackMSF.minute;
|
min = trackMSF.minute;
|
||||||
sec = trackMSF.second;
|
sec = trackMSF.second;
|
||||||
|
@ -65,11 +65,8 @@ mp_vcd_priv_t* vcd_read_toc(int fd){
|
|||||||
mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno));
|
mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno));
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_START_TRACK=%d\n", tochdr.starting_track);
|
||||||
{
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_END_TRACK=%d\n", tochdr.ending_track);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_START_TRACK=%d\n", tochdr.starting_track);
|
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_END_TRACK=%d\n", tochdr.ending_track);
|
|
||||||
}
|
|
||||||
for (i=tochdr.starting_track ; i<=tochdr.ending_track + 1; i++){
|
for (i=tochdr.starting_track ; i<=tochdr.ending_track + 1; i++){
|
||||||
struct ioc_read_toc_single_entry tocentry;
|
struct ioc_read_toc_single_entry tocentry;
|
||||||
|
|
||||||
@ -92,7 +89,7 @@ mp_vcd_priv_t* vcd_read_toc(int fd){
|
|||||||
(int)tocentry.entry.addr.msf.frame
|
(int)tocentry.entry.addr.msf.frame
|
||||||
);
|
);
|
||||||
|
|
||||||
if (identify)
|
if (mp_msg_test(MSGT_IDENTIFY, MSGL_INFO))
|
||||||
{
|
{
|
||||||
if (i > tochdr.starting_track)
|
if (i > tochdr.starting_track)
|
||||||
{
|
{
|
||||||
@ -109,7 +106,7 @@ mp_vcd_priv_t* vcd_read_toc(int fd){
|
|||||||
sec += 60;
|
sec += 60;
|
||||||
min --;
|
min --;
|
||||||
}
|
}
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_TRACK_%d_MSF=%02d:%02d:%02d\n", i - 1, min, sec, frame);
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_TRACK_%d_MSF=%02d:%02d:%02d\n", i - 1, min, sec, frame);
|
||||||
}
|
}
|
||||||
min = tocentry.entry.addr.msf.minute;
|
min = tocentry.entry.addr.msf.minute;
|
||||||
sec = tocentry.entry.addr.msf.second;
|
sec = tocentry.entry.addr.msf.second;
|
||||||
|
@ -89,11 +89,8 @@ vcd_read_toc(int fd)
|
|||||||
mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno));
|
mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_START_TRACK=%d\n", tochdr.starting_track);
|
||||||
{
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_END_TRACK=%d\n", tochdr.ending_track);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_START_TRACK=%d\n", tochdr.starting_track);
|
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_END_TRACK=%d\n", tochdr.ending_track);
|
|
||||||
}
|
|
||||||
for (i = tochdr.starting_track; i <= tochdr.ending_track + 1; i++) {
|
for (i = tochdr.starting_track; i <= tochdr.ending_track + 1; i++) {
|
||||||
struct ioc_read_toc_entry tocentry;
|
struct ioc_read_toc_entry tocentry;
|
||||||
struct cd_toc_entry tocentry_data;
|
struct cd_toc_entry tocentry_data;
|
||||||
@ -118,7 +115,7 @@ vcd_read_toc(int fd)
|
|||||||
(int) tocentry.data->addr.msf.frame
|
(int) tocentry.data->addr.msf.frame
|
||||||
);
|
);
|
||||||
|
|
||||||
if (identify)
|
if (mp_msg_test(MSGT_IDENTIFY, MSGL_INFO))
|
||||||
{
|
{
|
||||||
if (i > tochdr.starting_track)
|
if (i > tochdr.starting_track)
|
||||||
{
|
{
|
||||||
@ -135,7 +132,7 @@ vcd_read_toc(int fd)
|
|||||||
sec += 60;
|
sec += 60;
|
||||||
min --;
|
min --;
|
||||||
}
|
}
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_TRACK_%d_MSF=%02d:%02d:%02d\n", i - 1, min, sec, frame);
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_TRACK_%d_MSF=%02d:%02d:%02d\n", i - 1, min, sec, frame);
|
||||||
}
|
}
|
||||||
min = tocentry.data->addr.msf.minute;
|
min = tocentry.data->addr.msf.minute;
|
||||||
sec = tocentry.data->addr.msf.second;
|
sec = tocentry.data->addr.msf.second;
|
||||||
|
@ -263,8 +263,7 @@ vo_functions_t* video_out_drivers[] =
|
|||||||
void list_video_out(void){
|
void list_video_out(void){
|
||||||
int i=0;
|
int i=0;
|
||||||
mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoOutputDrivers);
|
mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoOutputDrivers);
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_OUTPUTS\n");
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_OUTPUTS\n");
|
|
||||||
while (video_out_drivers[i]) {
|
while (video_out_drivers[i]) {
|
||||||
const vo_info_t *info = video_out_drivers[i++]->info;
|
const vo_info_t *info = video_out_drivers[i++]->info;
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO,"\t%s\t%s\n", info->short_name, info->name);
|
mp_msg(MSGT_GLOBAL, MSGL_INFO,"\t%s\t%s\n", info->short_name, info->name);
|
||||||
|
@ -216,8 +216,7 @@ static int x11_errorhandler(Display * display, XErrorEvent * event)
|
|||||||
void fstype_help(void)
|
void fstype_help(void)
|
||||||
{
|
{
|
||||||
mp_msg(MSGT_VO, MSGL_INFO, MSGTR_AvailableFsType);
|
mp_msg(MSGT_VO, MSGL_INFO, MSGTR_AvailableFsType);
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FULL_SCREEN_TYPES\n");
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_FULL_SCREEN_TYPES\n");
|
|
||||||
|
|
||||||
mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "none",
|
mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "none",
|
||||||
"don't set fullscreen window layer");
|
"don't set fullscreen window layer");
|
||||||
|
@ -1584,8 +1584,7 @@ static int parse_obj_settings_list(m_option_t* opt,char *name,
|
|||||||
if(!strcmp(param,"help")) {
|
if(!strcmp(param,"help")) {
|
||||||
m_obj_list_t* ol = opt->priv;
|
m_obj_list_t* ol = opt->priv;
|
||||||
mp_msg(MSGT_VFILTER,MSGL_INFO,"Available video filters:\n");
|
mp_msg(MSGT_VFILTER,MSGL_INFO,"Available video filters:\n");
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_FILTERS\n");
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_FILTERS\n");
|
|
||||||
for(n = 0 ; ol->list[n] ; n++)
|
for(n = 0 ; ol->list[n] ; n++)
|
||||||
mp_msg(MSGT_VFILTER,MSGL_INFO," %-15s: %s\n",
|
mp_msg(MSGT_VFILTER,MSGL_INFO," %-15s: %s\n",
|
||||||
M_ST_MB(char*,ol->list[n],ol->name_off),
|
M_ST_MB(char*,ol->list[n],ol->name_off),
|
||||||
|
@ -130,7 +130,6 @@ int out_file_format=MUXER_TYPE_AVI; // default to AVI
|
|||||||
//void resync_audio_stream(sh_audio_t *sh_audio){}
|
//void resync_audio_stream(sh_audio_t *sh_audio){}
|
||||||
|
|
||||||
extern int verbose; // must be global!
|
extern int verbose; // must be global!
|
||||||
int identify=0;
|
|
||||||
int quiet=0;
|
int quiet=0;
|
||||||
double video_time_usage=0;
|
double video_time_usage=0;
|
||||||
double vout_time_usage=0;
|
double vout_time_usage=0;
|
||||||
|
1
mp_msg.c
1
mp_msg.c
@ -44,6 +44,7 @@ void mp_msg_init(void){
|
|||||||
if (env)
|
if (env)
|
||||||
verbose = atoi(env);
|
verbose = atoi(env);
|
||||||
for(i=0;i<MSGT_MAX;i++) mp_msg_levels[i] = -2;
|
for(i=0;i<MSGT_MAX;i++) mp_msg_levels[i] = -2;
|
||||||
|
mp_msg_levels[MSGT_IDENTIFY] = -1; // no -identify output by default
|
||||||
#ifdef USE_ICONV
|
#ifdef USE_ICONV
|
||||||
mp_msg_charset = getenv("MPLAYER_CHARSET");
|
mp_msg_charset = getenv("MPLAYER_CHARSET");
|
||||||
#ifdef USE_LANGINFO
|
#ifdef USE_LANGINFO
|
||||||
|
3
mp_msg.h
3
mp_msg.h
@ -4,7 +4,6 @@
|
|||||||
|
|
||||||
// defined in mplayer.c and mencoder.c
|
// defined in mplayer.c and mencoder.c
|
||||||
extern int verbose;
|
extern int verbose;
|
||||||
extern int identify;
|
|
||||||
|
|
||||||
// verbosity elevel:
|
// verbosity elevel:
|
||||||
|
|
||||||
@ -96,6 +95,8 @@ extern int identify;
|
|||||||
|
|
||||||
#define MSGT_OSD_MENU 40
|
#define MSGT_OSD_MENU 40
|
||||||
|
|
||||||
|
#define MSGT_IDENTIFY 41 // -identify output
|
||||||
|
|
||||||
#define MSGT_MAX 64
|
#define MSGT_MAX 64
|
||||||
|
|
||||||
void mp_msg_init(void);
|
void mp_msg_init(void);
|
||||||
|
61
mplayer.c
61
mplayer.c
@ -88,7 +88,6 @@ extern int mp_input_win32_slave_cmd_func(int fd,char* dest,int size);
|
|||||||
int slave_mode=0;
|
int slave_mode=0;
|
||||||
int player_idle_mode=0;
|
int player_idle_mode=0;
|
||||||
extern int verbose;
|
extern int verbose;
|
||||||
int identify=0;
|
|
||||||
int quiet=0;
|
int quiet=0;
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
@ -588,8 +587,7 @@ static void exit_sighandler(int x){
|
|||||||
mp_msg(MSGT_CPLAYER,MSGL_FATAL,"\n" MSGTR_IntBySignal,x,
|
mp_msg(MSGT_CPLAYER,MSGL_FATAL,"\n" MSGTR_IntBySignal,x,
|
||||||
current_module?current_module:"unknown"
|
current_module?current_module:"unknown"
|
||||||
);
|
);
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SIGNAL=%d\n", x);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_SIGNAL=%d\n", x);
|
|
||||||
if(sig_count<=1)
|
if(sig_count<=1)
|
||||||
switch(x){
|
switch(x){
|
||||||
case SIGINT:
|
case SIGINT:
|
||||||
@ -804,11 +802,8 @@ void add_subtitles(char *filename, float fps, int silent)
|
|||||||
mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantLoadSub, filename);
|
mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantLoadSub, filename);
|
||||||
if (subd == NULL || set_of_sub_size >= MAX_SUBTITLE_FILES) return;
|
if (subd == NULL || set_of_sub_size >= MAX_SUBTITLE_FILES) return;
|
||||||
set_of_subtitles[set_of_sub_size] = subd;
|
set_of_subtitles[set_of_sub_size] = subd;
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILE_SUB_ID=%d\n", set_of_sub_size);
|
||||||
{
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILE_SUB_FILENAME=%s\n", filename);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_FILE_SUB_ID=%d\n", set_of_sub_size);
|
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_FILE_SUB_FILENAME=%s\n", filename);
|
|
||||||
}
|
|
||||||
++set_of_sub_size;
|
++set_of_sub_size;
|
||||||
mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AddedSubtitleFile, set_of_sub_size, filename);
|
mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AddedSubtitleFile, set_of_sub_size, filename);
|
||||||
}
|
}
|
||||||
@ -2450,16 +2445,14 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
|
|||||||
#endif
|
#endif
|
||||||
if(audio_codec_list && strcmp(audio_codec_list[0],"help")==0){
|
if(audio_codec_list && strcmp(audio_codec_list[0],"help")==0){
|
||||||
mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs);
|
mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs);
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_CODECS\n");
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_CODECS\n");
|
|
||||||
list_codecs(1);
|
list_codecs(1);
|
||||||
mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
|
mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
|
||||||
opt_exit = 1;
|
opt_exit = 1;
|
||||||
}
|
}
|
||||||
if(video_codec_list && strcmp(video_codec_list[0],"help")==0){
|
if(video_codec_list && strcmp(video_codec_list[0],"help")==0){
|
||||||
mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs);
|
mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs);
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_CODECS\n");
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_CODECS\n");
|
|
||||||
list_codecs(0);
|
list_codecs(0);
|
||||||
mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
|
mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
|
||||||
opt_exit = 1;
|
opt_exit = 1;
|
||||||
@ -3284,35 +3277,33 @@ if(sh_audio){
|
|||||||
mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
|
mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
if(identify) {
|
mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_FILENAME=%s\n", filename);
|
||||||
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_FILENAME=%s\n", filename);
|
mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_DEMUXER=%s\n", demuxer->desc->name);
|
||||||
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_DEMUXER=%s\n", demuxer->desc->name);
|
|
||||||
if (sh_video) {
|
if (sh_video) {
|
||||||
/* Assume FOURCC if all bytes >= 0x20 (' ') */
|
/* Assume FOURCC if all bytes >= 0x20 (' ') */
|
||||||
if (sh_video->format >= 0x20202020)
|
if (sh_video->format >= 0x20202020)
|
||||||
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_FORMAT=%.4s\n", (char *)&sh_video->format);
|
mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_FORMAT=%.4s\n", (char *)&sh_video->format);
|
||||||
else
|
else
|
||||||
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_FORMAT=0x%08X\n", sh_video->format);
|
mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_FORMAT=0x%08X\n", sh_video->format);
|
||||||
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_BITRATE=%d\n", sh_video->i_bps*8);
|
mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_BITRATE=%d\n", sh_video->i_bps*8);
|
||||||
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_WIDTH=%d\n", sh_video->disp_w);
|
mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_WIDTH=%d\n", sh_video->disp_w);
|
||||||
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_HEIGHT=%d\n", sh_video->disp_h);
|
mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_HEIGHT=%d\n", sh_video->disp_h);
|
||||||
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_FPS=%5.3f\n", sh_video->fps);
|
mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_FPS=%5.3f\n", sh_video->fps);
|
||||||
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_ASPECT=%1.4f\n", sh_video->aspect);
|
mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_ASPECT=%1.4f\n", sh_video->aspect);
|
||||||
}
|
}
|
||||||
if (sh_audio) {
|
if (sh_audio) {
|
||||||
if (sh_audio->codec)
|
if (sh_audio->codec)
|
||||||
mp_msg(MSGT_GLOBAL,MSGL_INFO, "ID_AUDIO_CODEC=%s\n", sh_audio->codec->name);
|
mp_msg(MSGT_IDENTIFY,MSGL_INFO, "ID_AUDIO_CODEC=%s\n", sh_audio->codec->name);
|
||||||
/* Assume FOURCC if all bytes >= 0x20 (' ') */
|
/* Assume FOURCC if all bytes >= 0x20 (' ') */
|
||||||
if (sh_audio->format >= 0x20202020)
|
if (sh_audio->format >= 0x20202020)
|
||||||
mp_msg(MSGT_GLOBAL,MSGL_INFO, "ID_AUDIO_FORMAT=%.4s\n", (char *)&sh_audio->format);
|
mp_msg(MSGT_IDENTIFY,MSGL_INFO, "ID_AUDIO_FORMAT=%.4s\n", (char *)&sh_audio->format);
|
||||||
else
|
else
|
||||||
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_FORMAT=%d\n", sh_audio->format);
|
mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_AUDIO_FORMAT=%d\n", sh_audio->format);
|
||||||
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_BITRATE=%d\n", sh_audio->i_bps*8);
|
mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_AUDIO_BITRATE=%d\n", sh_audio->i_bps*8);
|
||||||
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_RATE=%d\n", sh_audio->samplerate);
|
mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_AUDIO_RATE=%d\n", sh_audio->samplerate);
|
||||||
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_NCH=%d\n", sh_audio->channels);
|
mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_AUDIO_NCH=%d\n", sh_audio->channels);
|
||||||
}
|
}
|
||||||
mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_LENGTH=%.2lf\n", demuxer_get_time_length(demuxer));
|
mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_LENGTH=%.2lf\n", demuxer_get_time_length(demuxer));
|
||||||
}
|
|
||||||
|
|
||||||
if(!sh_video) goto main; // audio-only
|
if(!sh_video) goto main; // audio-only
|
||||||
|
|
||||||
@ -3365,8 +3356,8 @@ if(!sh_video->inited){
|
|||||||
|
|
||||||
inited_flags|=INITED_VCODEC;
|
inited_flags|=INITED_VCODEC;
|
||||||
|
|
||||||
if (identify && sh_video->codec)
|
if (sh_video->codec)
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_CODEC=%s\n", sh_video->codec->name);
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_CODEC=%s\n", sh_video->codec->name);
|
||||||
|
|
||||||
if(auto_quality>0){
|
if(auto_quality>0){
|
||||||
// Auto quality option enabled
|
// Auto quality option enabled
|
||||||
@ -4000,8 +3991,7 @@ if(auto_quality>0){
|
|||||||
update_osd_msg();
|
update_osd_msg();
|
||||||
} else
|
} else
|
||||||
mp_msg(MSGT_CPLAYER,MSGL_STATUS,MSGTR_Paused);
|
mp_msg(MSGT_CPLAYER,MSGL_STATUS,MSGTR_Paused);
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_PAUSED\n");
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_PAUSED\n");
|
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
}
|
}
|
||||||
#ifdef HAVE_NEW_GUI
|
#ifdef HAVE_NEW_GUI
|
||||||
@ -4538,8 +4528,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
|
|||||||
} break;
|
} break;
|
||||||
case MP_CMD_SWITCH_AUDIO : {
|
case MP_CMD_SWITCH_AUDIO : {
|
||||||
int v = demuxer_switch_audio(demuxer, cmd->args[0].v.i);
|
int v = demuxer_switch_audio(demuxer, cmd->args[0].v.i);
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_TRACK=%d\n", v);
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_TRACK=%d\n", v);
|
|
||||||
} break;
|
} break;
|
||||||
case MP_CMD_RUN : {
|
case MP_CMD_RUN : {
|
||||||
#ifndef __MINGW32__
|
#ifndef __MINGW32__
|
||||||
|
9
vobsub.c
9
vobsub.c
@ -656,12 +656,9 @@ vobsub_add_id(vobsub_t *vob, const char *id, size_t idlen, const unsigned int in
|
|||||||
memcpy(vob->spu_streams[index].id, id, idlen);
|
memcpy(vob->spu_streams[index].id, id, idlen);
|
||||||
}
|
}
|
||||||
vob->spu_streams_current = index;
|
vob->spu_streams_current = index;
|
||||||
if (identify)
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VOBSUB_ID=%d\n", index);
|
||||||
{
|
if (id && idlen)
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VOBSUB_ID=%d\n", index);
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VSID_%d_LANG=%s\n", index, vob->spu_streams[index].id);
|
||||||
if (id && idlen)
|
|
||||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VSID_%d_LANG=%s\n", index, vob->spu_streams[index].id);
|
|
||||||
}
|
|
||||||
mp_msg(MSGT_VOBSUB,MSGL_V,"[vobsub] subtitle (vobsubid): %d language %s\n",
|
mp_msg(MSGT_VOBSUB,MSGL_V,"[vobsub] subtitle (vobsubid): %d language %s\n",
|
||||||
index, vob->spu_streams[index].id);
|
index, vob->spu_streams[index].id);
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user