annotate mplayer.c @ 1641:b7dae998505c

free stream/demuxer. continue playback with next file if error found
author arpi
date Wed, 22 Aug 2001 23:48:18 +0000
parents 9423cb98e63f
children 7502b16bce63
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1237
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1 // AVI & MPEG Player v0.18 (C) 2000-2001. by A'rpi/ESP-team
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
3 #include <stdio.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
4 #include <stdlib.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
5 #include <string.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
6 #include <unistd.h>
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
7
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
8 #include <sys/ioctl.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
9 #include <sys/mman.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
10 #include <sys/types.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
11 #include <sys/wait.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
12 #include <sys/time.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
13 #include <sys/stat.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
14
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
15 #include <signal.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
16
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
17 #include <time.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
18
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
19 #include <fcntl.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
20
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
21 #include "version.h"
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
22 #include "config.h"
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
23
1564
9fa2a290fa99 mp_msg init
arpi
parents: 1548
diff changeset
24 #include "mp_msg.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
25
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
26 #define HELP_MP_DEFINE_STATIC
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
27 #include "help_mp.h"
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
28
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
29 #include "cfgparser.h"
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
30 #include "cfg-mplayer-def.h"
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
31
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
32 #ifdef USE_SUB
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
33 #include "subreader.h"
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
34 #endif
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
35
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
36 #ifdef USE_LIBVO2
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
37 #include "libvo2/libvo2.h"
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
38 #else
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
39 #include "libvo/video_out.h"
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
40 #endif
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
41
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
42 //#ifdef USE_OSD
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
43 #include "libvo/sub.h"
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
44 //#endif
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
45
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
46 #include "libao2/audio_out.h"
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
47
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
48 #include "libmpeg2/mpeg2.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
49 #include "libmpeg2/mpeg2_internal.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
50
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
51 #include "loader.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
52 #include "wine/avifmt.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
53
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
54 #include "codec-cfg.h"
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
55
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
56 #include "dvdauth.h"
560
28ae99036574 Separated dvdsub code to be able to work with it easier
lgb
parents: 557
diff changeset
57 #include "spudec.h"
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
58
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
59 #include "linux/getch2.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60 #include "linux/keycodes.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61 #include "linux/timer.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62 #include "linux/shmem.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
64 #ifdef HAVE_LIRC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
65 #include "lirc_mp.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
67
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
68
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
69 #define DEBUG if(0)
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
70 #ifdef HAVE_GUI
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
71 int nogui=1;
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
72 #endif
362
463699f15eb4 static removed from verbose definition
szabii
parents: 360
diff changeset
73 int verbose=0;
1448
e795527de16a -quiet option patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents: 1439
diff changeset
74 int quiet=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
75
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
76 #define ABS(x) (((x)>=0)?(x):(-(x)))
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
77
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
78 #ifdef USE_SUB
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
79 void find_sub(subtitle* subtitles,int key);
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
80 #endif
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
81
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
82 static int
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
83 usec_sleep(int usec_delay)
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
84 {
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
85 #if 1
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
86 struct timespec ts;
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
87 ts.tv_sec = usec_delay / 1000000;
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
88 ts.tv_nsec = (usec_delay % 1000000) * 1000;
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
89 return nanosleep(&ts, NULL);
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
90 #else
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
91 return usleep(usec_delay);
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
92 #endif
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
93 }
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
94
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
95 //**************************************************************************//
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
96 // Config file
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
97 //**************************************************************************//
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
98
153
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 151
diff changeset
99 static int cfg_inc_verbose(struct config *conf){
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 151
diff changeset
100 ++verbose;
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 151
diff changeset
101 return 0;
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 151
diff changeset
102 }
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 151
diff changeset
103
162
effc62af528c new option: -include
szabii
parents: 154
diff changeset
104 static int cfg_include(struct config *conf, char *filename){
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
105 return parse_config_file(conf, filename);
162
effc62af528c new option: -include
szabii
parents: 154
diff changeset
106 }
effc62af528c new option: -include
szabii
parents: 154
diff changeset
107
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
108 char *get_path(char *filename){
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
109 char *homedir;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
110 char *buff;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
111 static char *config_dir = "/.mplayer";
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
112 int len;
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
113
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
114 if ((homedir = getenv("HOME")) == NULL)
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
115 return NULL;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
116 len = strlen(homedir) + strlen(config_dir) + 1;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
117 if (filename == NULL) {
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
118 if ((buff = (char *) malloc(len)) == NULL)
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
119 return NULL;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
120 sprintf(buff, "%s%s", homedir, config_dir);
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
121 } else {
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
122 len += strlen(filename) + 1;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
123 if ((buff = (char *) malloc(len)) == NULL)
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
124 return NULL;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
125 sprintf(buff, "%s%s/%s", homedir, config_dir, filename);
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
126 }
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
127 return buff;
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
128 }
55206b791586 get_path()
szabii
parents: 175
diff changeset
129
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
130 //**************************************************************************//
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
131 //**************************************************************************//
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
132 // Input media streaming & demultiplexer:
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
133 //**************************************************************************//
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
134
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
135 static int max_framesize=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
136
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 577
diff changeset
137 #include "stream.h"
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
138 #include "demuxer.h"
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
139
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
140 #include "stheader.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
141
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
142 char* encode_name=NULL;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
143 char* encode_index_name=NULL;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
144 int encode_bitrate=0;
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
145
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
146 int get_video_quality_max(sh_video_t *sh_video);
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
147 void set_video_quality(sh_video_t *sh_video,int quality);
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
148 int set_video_colors(sh_video_t *sh_video,char *item,int value);
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
149
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
150 // MPEG video stream parser:
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
151 #include "parse_es.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
152
1015
9744b50fe87f some cleanup, old unused stuff removed
arpi_esp
parents: 1014
diff changeset
153 extern picture_t *picture; // exported from libmpeg2/decode.c
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
154
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
155 int frameratecode2framerate[16] = {
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
156 0,
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
157 // Official mpeg1/2 framerates:
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
158 24000*10000/1001, 24*10000,25*10000, 30000*10000/1001, 30*10000,50*10000,60000*10000/1001, 60*10000,
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
159 // libmpeg3's "Unofficial economy rates":
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
160 1*10000,5*10000,10*10000,12*10000,15*10000,0,0
112
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
161 };
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
162
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
163 //**************************************************************************//
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
164 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
165
112
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
166 // Common FIFO functions, and keyboard/event FIFO code
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
167 #include "fifo.c"
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
168
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
169 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
170
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
171 #ifdef USE_LIBVO2
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
172 static vo2_handle_t *video_out=NULL;
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
173 #else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
174 static vo_functions_t *video_out=NULL;
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
175 #endif
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
176 static ao_functions_t *audio_out=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
177
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
178 static float c_total=0;
1400
2bf9c561b01d stage2 step 1
arpi
parents: 1382
diff changeset
179
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
180 double video_time_usage=0;
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
181 double vout_time_usage=0;
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
182 static double audio_time_usage=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
183 static int total_time_usage_start=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
184 static int benchmark=0;
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
185
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
186 static int play_in_bg=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
187
606
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
188 extern void avi_fixate();
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
189
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
190 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
191 #include "../Gui/mplayer/psignal.h"
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
192 #define GUI_MSG(x) if ( !nogui ) { mplSendMessage( x ); usec_sleep( 10000 ); }
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
193 #else
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
194 #define GUI_MSG(x)
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
195 #endif
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
196
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
197 // options:
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
198
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
199 int divx_quality=0;
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
200 static int auto_quality=0;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
201 static int output_quality=0;
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
202
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
203 int osd_level=2;
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
204 char *seek_to_sec=NULL;
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
205 off_t seek_to_byte=0;
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
206 int has_audio=1;
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
207
1286
543a94b241a2 Replaced LGBs video codec forcing change with mine for audio and video codecs, which is IMHO more convenient cause codecs are selected by name instead of number, one unclearity is left to me, that's why audio_format is used once before codecs selection for MPEG_PS files, that's why I left -afm in for that one.
atmos4
parents: 1285
diff changeset
208 char *audio_codec=NULL; // override audio codec
543a94b241a2 Replaced LGBs video codec forcing change with mine for audio and video codecs, which is IMHO more convenient cause codecs are selected by name instead of number, one unclearity is left to me, that's why audio_format is used once before codecs selection for MPEG_PS files, that's why I left -afm in for that one.
atmos4
parents: 1285
diff changeset
209 char *video_codec=NULL; // override video codec
1299
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
210 int audio_family=-1; // override audio codec family
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
211 int video_family=-1; // override video codec family
1285
202d9e2dc202 -vcodec option (maybe some other name would be better though) to select between driver types without editing codecs.conf. mplayer will default to normal codec search loop if it does not find codec for the specified driver type. config range checking for the parameter (an integer) should be cleaned, IMHO
lgb
parents: 1255
diff changeset
212
1299
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
213 // IMHO this stuff is no longer of use, or is there a special
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
214 // reason why dshow should be completely disabled? - atmos ::
1327
b12e1817bcc2 some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents: 1302
diff changeset
215 // yes, people without working c++ compiler can disable it - A'rpi
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
216 #ifdef USE_DIRECTSHOW
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
217 int allow_dshow=1;
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
218 #else
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
219 int allow_dshow=0;
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
220 #endif
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
221
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
222 //#ifdef ALSA_TIMER
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
223 //int alsa=1;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
224 //#else
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
225 //int alsa=0;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
226 //#endif
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
227
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
228 // streaming:
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
229 static int audio_id=-1;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
230 static int video_id=-1;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
231 static int dvdsub_id=-1;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
232 static int vcd_track=0;
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
233 static char *stream_dump_name=NULL;
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
234 static int stream_dump_type=0;
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
235
1596
fc0e9953bc2d libDVDread support
arpi
parents: 1584
diff changeset
236 extern int dvd_title;
fc0e9953bc2d libDVDread support
arpi
parents: 1584
diff changeset
237
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
238 int index_mode=-1; // -1=untouched 0=don't use index 1=use (geneate) index
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
239 int force_ni=0;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
240
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
241 static float default_max_pts_correction=-1;//0.01f;
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
242 static float max_pts_correction=0;//default_max_pts_correction;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
243 #ifdef AVI_SYNC_BPS
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
244 int pts_from_bps=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
245 #else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
246 int pts_from_bps=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
247 #endif
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
248
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
249 float force_fps=0;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
250 int force_srate=0;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
251 float audio_delay=0;
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
252 int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
253 int play_n_frames=-1;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
254
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
255 // screen info:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
256 char* video_driver=NULL; //"mga"; // default
956
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
257 char* audio_driver=NULL;
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
258 static int fullscreen=0;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
259 static int vidmode=0;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
260 static int softzoom=0;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
261 static int flip=-1;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
262 static int screen_size_x=0;//SCREEN_SIZE_X;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
263 static int screen_size_y=0;//SCREEN_SIZE_Y;
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
264 static int screen_size_xy=0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
265
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
266 // sub:
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
267 char *font_name=NULL;
215
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 212
diff changeset
268 float font_factor=0.75;
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
269 char *sub_name=NULL;
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
270 float sub_delay=0;
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
271 float sub_fps=0;
510
2951d138ddaf add sub autoread & remove 'c' key
pontscho
parents: 500
diff changeset
272 int sub_auto = 1;
1255
94f2853ec6f4 -dsp option removed, displaying help text (-ao oss:dsp_path)
alex
parents: 1250
diff changeset
273 /*DSP!!char *dsp=NULL;*/
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
274
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
275 //float rel_seek_secs=0;
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
276 //float initial_pts_delay=0;
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
277
1183
6fbcfe7f7f10 vo/ao_subdevice implemented
al3x
parents: 1177
diff changeset
278 extern char *vo_subdevice;
6fbcfe7f7f10 vo/ao_subdevice implemented
al3x
parents: 1177
diff changeset
279 extern char *ao_subdevice;
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
280
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
281 void exit_player(char* how){
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
282 total_time_usage_start=GetTimer()-total_time_usage_start;
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
283
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
284 #ifdef HAVE_GUI
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
285 if ( !nogui )
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
286 {
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
287 if ( how != NULL )
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
288 {
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
289 if ( !strcmp( how,"Quit" ) ) mplSendMessage( mplEndOfFile );
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
290 if ( !strcmp( how,"End of file" ) ) mplSendMessage( mplEndOfFile );
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
291 if ( !strcmp( how,"audio_init" ) ) mplSendMessage( mplAudioError );
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
292 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
293 else mplSendMessage( mplUnknowError );
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
294 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
295 #endif
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
296
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
297 if(how) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Exiting,how);
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
298 mp_msg(MSGT_CPLAYER,MSGL_V,"max framesize was %d bytes\n",max_framesize);
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
299 if(benchmark){
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
300 double tot=video_time_usage+vout_time_usage+audio_time_usage;
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
301 double total_time_usage=(float)total_time_usage_start*0.000001;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
302 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARKs: V:%8.3fs VO:%8.3fs A:%8.3fs Sys:%8.3fs = %8.3fs\n",
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
303 video_time_usage,vout_time_usage,audio_time_usage,
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
304 total_time_usage-tot,total_time_usage);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
305 if(total_time_usage>0.0)
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
306 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARK%%: V:%8.4f%% VO:%8.4f%% A:%8.4f%% Sys:%8.4f%% = %8.4f%%\n",
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
307 100.0*video_time_usage/total_time_usage,
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
308 100.0*vout_time_usage/total_time_usage,
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
309 100.0*audio_time_usage/total_time_usage,
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
310 100.0*(total_time_usage-tot)/total_time_usage,
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
311 100.0);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
312 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
313 // restore terminal:
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
314 #ifdef HAVE_GUI
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
315 if ( nogui )
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
316 #endif
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
317 getch2_disable();
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
318
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
319 #ifdef USE_LIBVO2
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
320 if(video_out) vo2_close(video_out);
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
321 #else
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
322 if(video_out) video_out->uninit();
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
323 #endif
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
324 if(audio_out) audio_out->uninit();
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
325 if(encode_name) avi_fixate();
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
326 #ifdef HAVE_LIRC
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
327 #ifdef HAVE_GUI
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
328 if ( nogui )
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
329 #endif
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
330 lirc_mp_cleanup();
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
331 #endif
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
332
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
333 exit(1);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
334 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
335
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
336 static char* current_module=NULL; // for debugging
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
337
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
338 void exit_sighandler(int x){
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
339 static int sig_count=0;
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
340 ++sig_count;
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
341 if(sig_count==2) exit(1);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
342 if(sig_count>2){
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
343 // can't stop :(
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
344 kill(getpid(),SIGKILL);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
345 }
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
346 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_IntBySignal,x,
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
347 current_module?current_module:"unknown"
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
348 );
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
349 #ifdef HAVE_GUI
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
350 if ( !nogui )
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
351 {
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
352 mplShMem->items.error.signal=x;
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
353 strcpy( mplShMem->items.error.module,current_module?current_module:"unknown" );
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
354 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
355 #endif
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
356 exit_player(NULL);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
357 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
358
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
359 extern stream_t* open_stream(char* filename,int vcd_track,int* file_format);
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
360
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
361 extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height);
1327
b12e1817bcc2 some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents: 1302
diff changeset
362
b12e1817bcc2 some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents: 1302
diff changeset
363 // dec_audio.c:
b12e1817bcc2 some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents: 1302
diff changeset
364 extern int init_audio(sh_audio_t *sh_audio);
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
365 extern int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen);
1327
b12e1817bcc2 some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents: 1302
diff changeset
366 extern void resync_audio_stream(sh_audio_t *sh_audio);
b12e1817bcc2 some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents: 1302
diff changeset
367 extern void skip_audio_frame(sh_audio_t *sh_audio);
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
368
1327
b12e1817bcc2 some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents: 1302
diff changeset
369 // dec_video.c:
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
370 extern int video_read_properties(sh_video_t *sh_video);
1327
b12e1817bcc2 some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents: 1302
diff changeset
371 extern int init_video(sh_video_t *sh_video);
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
372 #ifdef USE_LIBVO2
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
373 extern int decode_video(vo2_handle_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame);
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
374 #else
1327
b12e1817bcc2 some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents: 1302
diff changeset
375 extern int decode_video(vo_functions_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame);
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
376 #endif
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
377
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
378 extern int get_video_quality_max(sh_video_t *sh_video);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
379 extern void set_video_quality(sh_video_t *sh_video,int quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
380
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
381 #include "mixer.h"
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
382 #include "cfg-mplayer.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
383
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
384 void parse_cfgfiles( void )
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
385 {
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
386 char *conffile;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
387 int conffile_fd;
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
388 if (parse_config_file(conf, "/etc/mplayer.conf") < 0)
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
389 exit(1);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
390 if ((conffile = get_path("")) == NULL) {
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
391 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoHomeDir);
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
392 } else {
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
393 mkdir(conffile, 0777);
55206b791586 get_path()
szabii
parents: 175
diff changeset
394 free(conffile);
55206b791586 get_path()
szabii
parents: 175
diff changeset
395 if ((conffile = get_path("config")) == NULL) {
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
396 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
397 } else {
55206b791586 get_path()
szabii
parents: 175
diff changeset
398 if ((conffile_fd = open(conffile, O_CREAT | O_EXCL | O_WRONLY, 0666)) != -1) {
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
399 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CreatingCfgFile, conffile);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
400 write(conffile_fd, default_config, strlen(default_config));
55206b791586 get_path()
szabii
parents: 175
diff changeset
401 close(conffile_fd);
55206b791586 get_path()
szabii
parents: 175
diff changeset
402 }
55206b791586 get_path()
szabii
parents: 175
diff changeset
403 if (parse_config_file(conf, conffile) < 0)
55206b791586 get_path()
szabii
parents: 175
diff changeset
404 exit(1);
55206b791586 get_path()
szabii
parents: 175
diff changeset
405 free(conffile);
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
406 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
407 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
408 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
409
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
410 #ifndef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
411 int main(int argc,char* argv[], char *envp[]){
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
412 #else
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
413 int mplayer(int argc,char* argv[], char *envp[]){
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
414 #endif
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
415
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
416 #ifdef USE_SUB
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
417 static subtitle* subtitles=NULL;
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
418 #endif
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
419
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
420 static demuxer_t *demuxer=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
421
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
422 static demux_stream_t *d_audio=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
423 static demux_stream_t *d_video=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
424 static demux_stream_t *d_dvdsub=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
425
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
426 static sh_audio_t *sh_audio=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
427 static sh_video_t *sh_video=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
428
1629
13aeaa05ac5e multifile support in config parser
arpi
parents: 1627
diff changeset
429 // for multifile support:
13aeaa05ac5e multifile support in config parser
arpi
parents: 1627
diff changeset
430 char **filenames=NULL;
13aeaa05ac5e multifile support in config parser
arpi
parents: 1627
diff changeset
431 int num_filenames=0;
13aeaa05ac5e multifile support in config parser
arpi
parents: 1627
diff changeset
432 int curr_filename=0;
13aeaa05ac5e multifile support in config parser
arpi
parents: 1627
diff changeset
433
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
434 char* filename=NULL; //"MI2-Trailer.avi";
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
435 stream_t* stream=NULL;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
436 int file_format=DEMUXER_TYPE_UNKNOWN;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
437 //
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
438 int delay_corrected=1;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
439 char* title="MPlayer";
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
440
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
441 // movie info:
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
442 int out_fmt=0;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
443
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
444 int osd_visible=100;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
445 int osd_function=OSD_PLAY;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
446 int osd_last_pts=-303;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
447
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
448 int v_bright=50;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
449 int v_cont=50;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
450 int v_hue=50;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
451 int v_saturation=50;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
452
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
453 //float a_frame=0; // Audio
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
454
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
455 float rel_seek_secs=0;
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
456 int abs_seek_pos=0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
457
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
458 int i;
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
459 int use_stdin=0; //int f; // filedes
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
460
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
461 mp_msg_init(MSGL_STATUS);
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
462
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
463 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s",banner_text);
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
464
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
465 #ifdef HAVE_GUI
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
466 if ( nogui ) {
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
467 #endif
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
468
751
1417d8a4a96c *** empty log message ***
pontscho
parents: 750
diff changeset
469 parse_cfgfiles();
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
470 num_filenames=parse_command_line(conf, argc, argv, envp, &filenames);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
471 if(num_filenames<0) exit(1); // error parsing cmdline
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
472 if(!num_filenames && !vcd_track && !dvd_title){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
473 // no file/vcd/dvd -> show HELP:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
474 printf("%s",help_text);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
475 exit(0);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
476 }
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
477
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
478 // Many users forget to include command line in bugreports...
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
479 if(verbose){
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
480 printf("CommandLine:");
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
481 for(i=1;i<argc;i++)printf(" '%s'",argv[i]);
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
482 printf("\n");
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
483 printf("num_filenames: %d\n",num_filenames);
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
484 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
485
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
486 #ifndef USE_LIBVO2
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
487 if(video_driver && strcmp(video_driver,"help")==0){
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
488 printf("Available video output drivers:\n");
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
489 i=0;
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
490 while (video_out_drivers[i]) {
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
491 const vo_info_t *info = video_out_drivers[i++]->get_info ();
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
492 printf("\t%s\t%s\n", info->short_name, info->name);
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
493 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
494 printf("\n");
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
495 exit(0);
956
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
496 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
497 #endif
956
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
498 if(audio_driver && strcmp(audio_driver,"help")==0){
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
499 printf("Available audio output drivers:\n");
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
500 i=0;
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
501 while (audio_out_drivers[i]) {
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
502 const ao_info_t *info = audio_out_drivers[i++]->info;
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
503 printf("\t%s\t%s\n", info->short_name, info->name);
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
504 }
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
505 printf("\n");
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
506 exit(0);
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
507 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
508
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
509 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
510 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
511 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
512
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
513 mp_msg_init(verbose+MSGL_STATUS);
1183
6fbcfe7f7f10 vo/ao_subdevice implemented
al3x
parents: 1177
diff changeset
514
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
515 //------ load global data first ------
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
516
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
517 // check codec.conf
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
518 if(!parse_codec_cfg(get_path("codecs.conf"))){
1353
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 1338
diff changeset
519 if(!parse_codec_cfg(DATADIR"/codecs.conf")){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
520 mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
521 exit(1);
1353
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 1338
diff changeset
522 }
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
523 }
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
524
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
525 // check font
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
526 #ifdef USE_OSD
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
527 if(font_name){
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
528 vo_font=read_font_desc(font_name,font_factor,verbose>1);
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
529 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
530 } else {
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
531 // try default:
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
532 vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
1353
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 1338
diff changeset
533 if(!vo_font)
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 1338
diff changeset
534 vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
535 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
536 #endif
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
537
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
538 #ifdef USE_SUB
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
539 // check .sub
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
540 if(sub_name){
1604
c817a44598cd if option -sub filename.utf then switch sub_utf8 on
atlka
parents: 1596
diff changeset
541 int l=strlen(sub_name);
c817a44598cd if option -sub filename.utf then switch sub_utf8 on
atlka
parents: 1596
diff changeset
542 if ((l>4) && ((0==strcmp(&sub_name[l-4],".utf"))
c817a44598cd if option -sub filename.utf then switch sub_utf8 on
atlka
parents: 1596
diff changeset
543 ||(0==strcmp(&sub_name[l-4],".UTF"))))
c817a44598cd if option -sub filename.utf then switch sub_utf8 on
atlka
parents: 1596
diff changeset
544 sub_utf8=1;
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
545 subtitles=sub_read_file(sub_name);
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
546 if(!subtitles) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name);
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
547 } else {
1596
fc0e9953bc2d libDVDread support
arpi
parents: 1584
diff changeset
548 if(sub_auto && filename) // auto load sub file ...
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
549 subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ) );
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
550 if(!subtitles) subtitles=sub_read_file(get_path("default.sub")); // try default
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
551 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
552 #endif
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
553
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
554
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
555 #ifdef HAVE_LIRC
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
556 #ifdef HAVE_GUI
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
557 if ( nogui )
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
558 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
559 lirc_mp_setup();
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
560 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
561
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
562 #ifdef USE_TERMCAP
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
563 load_termcap(NULL); // load key-codes
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
564 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
565
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
566 //========= Catch terminate signals: ================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
567 // terminate requests:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
568 signal(SIGTERM,exit_sighandler); // kill
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
569 signal(SIGHUP,exit_sighandler); // kill -HUP / xterm closed
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
570
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
571 #ifdef HAVE_GUI
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
572 if ( nogui )
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
573 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
574 signal(SIGINT,exit_sighandler); // Interrupt from keyboard
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
575
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
576 signal(SIGQUIT,exit_sighandler); // Quit from keyboard
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
577 // fatal errors:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
578 signal(SIGBUS,exit_sighandler); // bus error
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
579 signal(SIGSEGV,exit_sighandler); // segfault
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
580 signal(SIGILL,exit_sighandler); // illegal instruction
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
581 signal(SIGFPE,exit_sighandler); // floating point exc.
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
582 signal(SIGABRT,exit_sighandler); // abort()
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
583
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
584
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
585 // ******************* Now, let's see the per-file stuff ********************
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
586
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
587 curr_filename=0;
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
588 play_next_file:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
589 filename=(num_filenames>0)?filenames[curr_filename]:NULL;
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
590 demuxer=NULL; stream=NULL;
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
591
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
592 #ifdef USE_LIBVO2
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
593 current_module="vo2_new";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
594 video_out=vo2_new(video_driver);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
595 current_module=NULL;
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
596 #else
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
597 // check video_out driver name:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
598 if (video_driver)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
599 if ((i = strcspn(video_driver, ":")) > 0)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
600 {
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
601 size_t i2 = strlen(video_driver);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
602
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
603 if (video_driver[i] == ':')
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
604 {
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
605 vo_subdevice = malloc(i2-i);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
606 if (vo_subdevice != NULL)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
607 strncpy(vo_subdevice, (char *)(video_driver+i+1), i2-i);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
608 video_driver[i] = '\0';
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
609 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
610 // printf("video_driver: %s, subdevice: %s\n", video_driver, vo_subdevice);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
611 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
612 if(!video_driver)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
613 video_out=video_out_drivers[0];
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
614 else
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
615 for (i=0; video_out_drivers[i] != NULL; i++){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
616 const vo_info_t *info = video_out_drivers[i]->get_info ();
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
617 if(strcmp(info->short_name,video_driver) == 0){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
618 video_out = video_out_drivers[i];break;
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
619 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
620 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
621 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
622 if(!video_out){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
623 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidVOdriver,video_driver?video_driver:"?");
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
624 exit_player(MSGTR_Exit_error);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
625 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
626
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
627 // check audio_out driver name:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
628 if (audio_driver)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
629 if ((i = strcspn(audio_driver, ":")) > 0)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
630 {
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
631 size_t i2 = strlen(audio_driver);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
632
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
633 if (audio_driver[i] == ':')
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
634 {
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
635 ao_subdevice = malloc(i2-i);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
636 if (ao_subdevice != NULL)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
637 strncpy(ao_subdevice, (char *)(audio_driver+i+1), i2-i);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
638 audio_driver[i] = '\0';
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
639 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
640 // printf("audio_driver: %s, subdevice: %s\n", audio_driver, ao_subdevice);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
641 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
642 if(!audio_driver)
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
643 audio_out=audio_out_drivers[0];
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
644 else
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
645 for (i=0; audio_out_drivers[i] != NULL; i++){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
646 const ao_info_t *info = audio_out_drivers[i]->info;
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
647 if(strcmp(info->short_name,audio_driver) == 0){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
648 audio_out = audio_out_drivers[i];break;
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
649 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
650 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
651 if (!audio_out){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
652 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidAOdriver,audio_driver);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
653 exit_player(MSGTR_Exit_error);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
654 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
655 /*DSP!! if(dsp) audio_out->control(AOCONTROL_SET_DEVICE,(int)dsp);*/
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
656
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
657
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
658 current_module="open_stream";
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
659 stream=open_stream(filename,vcd_track,&file_format);
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
660 if(!stream) goto goto_next_file;// exit_player(MSGTR_Exit_error); // error...
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
661 stream->start_pos+=seek_to_byte;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
662
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
663 use_stdin=filename && (!strcmp(filename,"-"));
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
664
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
665 #ifdef HAVE_LIBCSS
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
666 current_module="libcss";
546
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
667 if (dvdimportkey) {
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
668 if (dvd_import_key(dvdimportkey)) {
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
669 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorDVDkey);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
670 exit_player(MSGTR_Exit_error);
546
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
671 }
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
672 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CmdlineDVDkey);
546
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
673 }
1018
e5fc7ec51fa3 -dvd is renamed to -dvdauth, variable dvd_device is renamed to dvd_auth_device. These changes are needed for future DVD playback developmenting
lgb
parents: 1015
diff changeset
674 if (dvd_auth_device) {
1042
b333271f4e7c Solaris 8 DVD support and other fixes by Juergen Keil <jk@tools.de>
arpi_esp
parents: 1039
diff changeset
675 // if (dvd_auth(dvd_auth_device,f)) {
b333271f4e7c Solaris 8 DVD support and other fixes by Juergen Keil <jk@tools.de>
arpi_esp
parents: 1039
diff changeset
676 if (dvd_auth(dvd_auth_device,filename)) {
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
677 GUI_MSG( mplErrorDVDAuth )
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
678 exit_player(MSGTR_Exit_error);
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
679 }
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
680 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_DVDauthOk);
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
681 }
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
682 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
683
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
684 //============ Open & Sync stream and detect file format ===============
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
685
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
686 if(!has_audio) audio_id=-2; // do NOT read audio packets...
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
687
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
688 current_module="demux_open";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
689
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
690 demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id);
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
691 if(!demuxer) goto goto_next_file; // exit_player(MSGTR_Exit_error); // ERROR
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
692
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
693 file_format=demuxer->file_format;
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
694
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
695 d_audio=demuxer->audio;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
696 d_video=demuxer->video;
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
697 d_dvdsub=demuxer->sub;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
698
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
699 // DUMP STREAMS:
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
700 if(stream_dump_type){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
701 FILE *f;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
702 demux_stream_t *ds=NULL;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
703 current_module="dump";
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
704 // select stream to dump
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
705 switch(stream_dump_type){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
706 case 1: ds=d_audio;break;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
707 case 2: ds=d_video;break;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
708 case 3: ds=d_dvdsub;break;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
709 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
710 if(!ds){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
711 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpSelectedSteramMissing);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
712 exit_player(MSGTR_Exit_error);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
713 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
714 // disable other streams:
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
715 if(d_audio && d_audio!=ds) {ds_free_packs(d_audio); d_audio->id=-2; }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
716 if(d_video && d_video!=ds) {ds_free_packs(d_video); d_video->id=-2; }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
717 if(d_dvdsub && d_dvdsub!=ds) {ds_free_packs(d_dvdsub); d_dvdsub->id=-2; }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
718 // let's dump it!
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
719 f=fopen(stream_dump_name?stream_dump_name:"stream.dump","wb");
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
720 if(!f){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
721 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
722 exit_player(MSGTR_Exit_error);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
723 }
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
724 while(!ds->eof){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
725 unsigned char* start;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
726 int in_size=ds_get_packet(ds,&start);
1246
7f69c1dd1e91 -dumpvideo stores frame size for avi/asf video frames (for ffmpeg testing)
arpi
parents: 1237
diff changeset
727 if( (file_format==DEMUXER_TYPE_AVI || file_format==DEMUXER_TYPE_ASF)
7f69c1dd1e91 -dumpvideo stores frame size for avi/asf video frames (for ffmpeg testing)
arpi
parents: 1237
diff changeset
728 && stream_dump_type==2) fwrite(&in_size,1,4,f);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
729 if(in_size>0) fwrite(start,in_size,1,f);
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
730 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
731 fclose(f);
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
732 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
733 exit_player(MSGTR_Exit_eof);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
734 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
735
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
736 sh_audio=d_audio->sh;
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
737 sh_video=d_video->sh;
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
738
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
739 current_module="video_read_properties";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
740
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
741 if(sh_video){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
742
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
743 if(!video_read_properties(sh_video)) goto goto_next_file; // exit_player(MSGTR_Exit_error); // couldn't read header?
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
744
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
745 mp_msg(MSGT_CPLAYER,MSGL_INFO,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n",
1183
6fbcfe7f7f10 vo/ao_subdevice implemented
al3x
parents: 1177
diff changeset
746 file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h,
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
747 sh_video->fps,sh_video->frametime
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
748 );
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
749
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
750 if(!sh_video->fps && !force_fps){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
751 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_FPSnotspecified);
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
752 goto goto_next_file; // exit_player(MSGTR_Exit_error);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
753 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
754
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
755 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
756
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
757 fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
758
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
759 if(!sh_video){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
760 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_NoVideoStream);
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
761 goto goto_next_file; // exit_player(MSGTR_Exit_error);
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
762 }
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
763
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
764 //================== Init AUDIO (codec) ==========================
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
765
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
766 current_module="init_audio_codec";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
767
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
768 if(sh_audio){
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
769 // Go through the codec.conf and find the best codec...
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
770 sh_audio->codec=NULL;
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
771 if(audio_family!=-1) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceAudioFmt,audio_family);
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
772 while(1){
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
773 sh_audio->codec=find_codec(sh_audio->format,NULL,sh_audio->codec,1);
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
774 if(!sh_audio->codec){
1299
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
775 if(audio_family!=-1) {
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
776 sh_audio->codec=NULL; /* re-search */
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
777 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindAfmtFallback);
1299
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
778 audio_family=-1;
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
779 continue;
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
780 }
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
781 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindAudioCodec,sh_audio->format);
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
782 mp_msg(MSGT_CPLAYER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf"));
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
783 sh_audio=NULL;
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
784 break;
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
785 }
1286
543a94b241a2 Replaced LGBs video codec forcing change with mine for audio and video codecs, which is IMHO more convenient cause codecs are selected by name instead of number, one unclearity is left to me, that's why audio_format is used once before codecs selection for MPEG_PS files, that's why I left -afm in for that one.
atmos4
parents: 1285
diff changeset
786 if(audio_codec && strcmp(sh_audio->codec->name,audio_codec)) continue;
1299
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
787 else if(audio_family!=-1 && sh_audio->codec->driver!=audio_family) continue;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
788 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s audio codec: [%s] drv:%d (%s)\n",audio_codec?"Forcing":"Detected",sh_audio->codec->name,sh_audio->codec->driver,sh_audio->codec->info);
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
789 break;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
790 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
791 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
792
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
793 if(sh_audio){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
794 mp_msg(MSGT_CPLAYER,MSGL_V,"Initializing audio codec...\n");
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
795 if(!init_audio(sh_audio)){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
796 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CouldntInitAudioCodec);
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
797 sh_audio=0;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
798 } else {
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
799 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AUDIO: srate=%d chans=%d bps=%d sfmt=0x%X ratio: %d->%d\n",sh_audio->samplerate,sh_audio->channels,sh_audio->samplesize,
758
5a92a5601666 better audio out buffering & sample_format added
arpi_esp
parents: 751
diff changeset
800 sh_audio->sample_format,sh_audio->i_bps,sh_audio->o_bps);
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
801 }
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
802 }
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
803
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
804 //================== Init VIDEO (codec & libvo) ==========================
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
805
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
806 current_module="init_video_codec";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
807
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
808 // Go through the codec.conf and find the best codec...
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
809 sh_video->codec=NULL;
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
810 if(video_family!=-1) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceVideoFmt,video_family);
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
811 while(1){
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
812 sh_video->codec=find_codec(sh_video->format,
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
813 sh_video->bih?((unsigned int*) &sh_video->bih->biCompression):NULL,sh_video->codec,0);
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
814 if(!sh_video->codec){
1299
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
815 if(video_family!=-1) {
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
816 sh_video->codec=NULL; /* re-search */
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
817 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_CantFindVfmtFallback);
1299
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
818 video_family=-1;
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
819 continue;
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
820 }
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
821 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindVideoCodec,sh_video->format);
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
822 mp_msg(MSGT_CPLAYER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf"));
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
823 goto goto_next_file; // exit_player(MSGTR_Exit_error);
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
824 }
1286
543a94b241a2 Replaced LGBs video codec forcing change with mine for audio and video codecs, which is IMHO more convenient cause codecs are selected by name instead of number, one unclearity is left to me, that's why audio_format is used once before codecs selection for MPEG_PS files, that's why I left -afm in for that one.
atmos4
parents: 1285
diff changeset
825 // is next line needed anymore? - atmos ::
1410
eda16e490ae7 using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents: 1406
diff changeset
826 if(!allow_dshow && sh_video->codec->driver==VFM_DSHOW) continue; // skip DShow
1286
543a94b241a2 Replaced LGBs video codec forcing change with mine for audio and video codecs, which is IMHO more convenient cause codecs are selected by name instead of number, one unclearity is left to me, that's why audio_format is used once before codecs selection for MPEG_PS files, that's why I left -afm in for that one.
atmos4
parents: 1285
diff changeset
827 else if(video_codec && strcmp(sh_video->codec->name,video_codec)) continue;
1299
fa50e6bc6091 As promised, -afm and -vfm to prefer audio/video driver family, -ac and -vc have higher precedence, so they can override -afm/-vfm.
atmos4
parents: 1296
diff changeset
828 else if(video_family!=-1 && sh_video->codec->driver!=video_family) continue;
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
829 break;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
830 }
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
831
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
832 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s video codec: [%s] drv:%d (%s)\n",video_codec?"Forcing":"Detected",sh_video->codec->name,sh_video->codec->driver,sh_video->codec->info);
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
833
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
834 for(i=0;i<CODECS_MAX_OUTFMT;i++){
487
5dd417ed3a21 vo_debug printfs...
arpi_esp
parents: 482
diff changeset
835 int ret;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
836 out_fmt=sh_video->codec->outfmt[i];
534
2a45d5adcc88 do not query vo drivers for format 0xFFFFFFFF (thanx to szabi)
arpi_esp
parents: 510
diff changeset
837 if(out_fmt==0xFFFFFFFF) continue;
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
838 #ifdef USE_LIBVO2
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
839 ret=vo2_query_format(video_out);
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
840 #else
487
5dd417ed3a21 vo_debug printfs...
arpi_esp
parents: 482
diff changeset
841 ret=video_out->query_format(out_fmt);
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
842 #endif
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
843 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: query(%s) returned 0x%X\n",vo_format_name(out_fmt),ret);
487
5dd417ed3a21 vo_debug printfs...
arpi_esp
parents: 482
diff changeset
844 if(ret) break;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
845 }
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
846 if(i>=CODECS_MAX_OUTFMT){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
847 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_VOincompCodec);
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
848 goto goto_next_file; // exit_player(MSGTR_Exit_error);
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
849 }
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
850 sh_video->outfmtidx=i;
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
851
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
852 if(flip==-1){
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
853 // autodetect flipping
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
854 flip=0;
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
855 if(sh_video->codec->outflags[i]&CODECS_FLAG_FLIP)
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
856 if(!(sh_video->codec->outflags[i]&CODECS_FLAG_NOFLIP))
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
857 flip=1;
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
858 }
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
859
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
860 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug1: out_fmt=%s\n",vo_format_name(out_fmt));
487
5dd417ed3a21 vo_debug printfs...
arpi_esp
parents: 482
diff changeset
861
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
862 if(!init_video(sh_video)){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
863 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CouldntInitVideoCodec);
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
864 goto goto_next_file; // exit_player(MSGTR_Exit_error);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
865 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
866
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
867 if(auto_quality>0){
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
868 // Auto quality option enabled
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
869 output_quality=get_video_quality_max(sh_video);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
870 if(auto_quality>output_quality) auto_quality=output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
871 else output_quality=auto_quality;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
872 mp_msg(MSGT_CPLAYER,MSGL_V,"AutoQ: setting quality to %d\n",output_quality);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
873 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
874 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
875
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
876 // ================== Init output files for encoding ===============
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
877 if(encode_name){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
878 // encode file!!!
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
879 FILE *encode_file=fopen(encode_name,"rb");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
880 if(encode_file){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
881 fclose(encode_file);
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
882 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_EncodeFileExists,encode_name);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
883 exit_player(MSGTR_Exit_error);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
884 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
885 encode_file=fopen(encode_name,"wb");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
886 if(!encode_file){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
887 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantCreateEncodeFile);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
888 exit_player(MSGTR_Exit_error);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
889 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
890 write_avi_header_1(encode_file,mmioFOURCC('d', 'i', 'v', 'x'),sh_video->fps,sh_video->disp_w,sh_video->disp_h);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
891 fclose(encode_file);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
892 encode_index_name=malloc(strlen(encode_name)+8);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
893 strcpy(encode_index_name,encode_name);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
894 strcat(encode_index_name,".index");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
895 if((encode_file=fopen(encode_index_name,"wb")))
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
896 fclose(encode_file);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
897 else encode_index_name=NULL;
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
898 sh_audio=0; // disable audio !!!!!
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
899 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
900
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
901 // ========== Init keyboard FIFO (connection to libvo) ============
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
902
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
903 make_pipe(&keyb_fifo_get,&keyb_fifo_put);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
904
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
905 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
906
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
907 current_module="init_libvo";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
908
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
909 #ifdef X11_FULLSCREEN
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
910 if(fullscreen){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
911 if(vo_init()){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
912 //if(verbose) printf("X11 running at %dx%d depth: %d\n",vo_screenwidth,vo_screenheight,vo_depthonscreen);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
913 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
914 if(!screen_size_xy) screen_size_xy=vo_screenwidth; // scale with asp.ratio
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
915 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
916 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
917
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
918 if(screen_size_xy>0){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
919 if(screen_size_xy<=8){
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
920 screen_size_x=screen_size_xy*sh_video->disp_w;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
921 screen_size_y=screen_size_xy*sh_video->disp_h;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
922 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
923 screen_size_x=screen_size_xy;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
924 screen_size_y=screen_size_xy*sh_video->disp_h/sh_video->disp_w;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
925 }
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
926 } else if(!vidmode){
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
927 if(!screen_size_x) screen_size_x=SCREEN_SIZE_X;
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
928 if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
929 if(screen_size_x<=8) screen_size_x*=sh_video->disp_w;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
930 if(screen_size_y<=8) screen_size_y*=sh_video->disp_h;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
931 }
208
ae0f909ccc7c Adds code to deal with vidmode selection. -- mgraffam
mgraffam
parents: 190
diff changeset
932
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
933 #ifndef USE_LIBVO2
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
934 { const vo_info_t *info = video_out->get_info();
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
935 mp_msg(MSGT_CPLAYER,MSGL_INFO,"VO: [%s] %dx%d => %dx%d %s %s%s%s%s\n",info->short_name,
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
936 sh_video->disp_w,sh_video->disp_h,
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
937 screen_size_x,screen_size_y,
1183
6fbcfe7f7f10 vo/ao_subdevice implemented
al3x
parents: 1177
diff changeset
938 vo_format_name(out_fmt),
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
939 fullscreen?"fs ":"",
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
940 vidmode?"vm ":"",
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
941 softzoom?"zoom ":"",
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
942 (flip==1)?"flip ":""
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
943 // fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3)
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
944 );
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
945 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Description: %s\n",info->name);
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
946 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Author: %s\n", info->author);
1237
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
947 if(strlen(info->comment) > 0)
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
948 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Comment: %s\n", info->comment);
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
949 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
950 #endif
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
951
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
952 mp_msg(MSGT_CPLAYER,MSGL_V,"video_out->init(%dx%d->%dx%d,flags=%d,'%s',0x%X)\n",
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
953 sh_video->disp_w,sh_video->disp_h,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
954 screen_size_x,screen_size_y,
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
955 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
956 title,out_fmt);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
957
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
958 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
959 if ( !nogui )
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
960 {
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
961 mplShMem->items.videodata.width=sh_video->disp_w;
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
962 mplShMem->items.videodata.height=sh_video->disp_h;
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
963 mplSendMessage( mplSetVideoData );
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
964 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
965 #endif
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
966
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
967 #ifdef USE_LIBVO2
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
968 if(!vo2_start(video_out,
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
969 sh_video->disp_w,sh_video->disp_h,out_fmt,0,
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
970 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3) )){
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
971 #else
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
972 if(video_out->init(sh_video->disp_w,sh_video->disp_h,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
973 screen_size_x,screen_size_y,
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
974 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
975 title,out_fmt)){
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
976 #endif
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
977 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CannotInitVO);
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
978 goto goto_next_file; // exit_player(MSGTR_Exit_error);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
979 }
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
980 mp_msg(MSGT_CPLAYER,MSGL_V,"INFO: Video OUT driver init OK!\n");
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
981
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
982 fflush(stdout);
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
983
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
984 //================== MAIN: ==========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
985 {
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
986
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
987 //int frame_corr_num=0; //
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
988 //float v_frame=0; // Video
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
989 float time_frame=0; // Timer
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
990 int eof=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
991 int force_redraw=0;
1400
2bf9c561b01d stage2 step 1
arpi
parents: 1382
diff changeset
992 //float num_frames=0; // number of frames played
1382
9e8781a3eefc grab.mpg fixed
arpi
parents: 1375
diff changeset
993 int grab_frames=0;
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
994 char osd_text_buffer[64];
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
995 int drop_frame=0;
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
996 int drop_frame_cnt=0;
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
997 // for auto-quality:
1478
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
998 float AV_delay=0; // average of A-V timestamp differences
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
999 double cvideo_base_vtime;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1000 double cvideo_base_vframe;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1001 double vdecode_time;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1002
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1003
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1004 //================ SETUP AUDIO ==========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1005 current_module="setup_audio";
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1006
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1007 if(sh_audio){
1237
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1008
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1009 const ao_info_t *info=audio_out->info;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1010 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %iHz %s %s\n",
1237
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1011 info->short_name,
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1012 force_srate?force_srate:sh_audio->samplerate,
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1013 sh_audio->channels>1?"Stereo":"Mono",
1456
8c57a5a3c645 printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents: 1449
diff changeset
1014 audio_out_format_name(sh_audio->sample_format)
8c57a5a3c645 printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents: 1449
diff changeset
1015 );
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1016 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n",
1237
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1017 info->name,
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1018 info->author
53b23aee5aa7 Added some nice vo/ao info.
atmos4
parents: 1217
diff changeset
1019 );
1456
8c57a5a3c645 printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents: 1449
diff changeset
1020 if(strlen(info->comment) > 0)
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1021 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Comment: %s\n", info->comment);
969
a2a296d46bff new option: -srate
arpi_esp
parents: 967
diff changeset
1022 if(!audio_out->init(force_srate?force_srate:sh_audio->samplerate,
a2a296d46bff new option: -srate
arpi_esp
parents: 967
diff changeset
1023 sh_audio->channels,sh_audio->sample_format,0)){
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1024 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO);
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1025 sh_audio=0; audio_out=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1026 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1027
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1028 // printf("Audio buffer size: %d bytes, delay: %5.3fs\n",audio_buffer_size,audio_buffer_delay);
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1029
758
5a92a5601666 better audio out buffering & sample_format added
arpi_esp
parents: 751
diff changeset
1030 // fixup audio buffer size:
782
14bac9d91e22 audio buffering fixed
arpi_esp
parents: 780
diff changeset
1031 // if(outburst<MAX_OUTBURST){
14bac9d91e22 audio buffering fixed
arpi_esp
parents: 780
diff changeset
1032 // sh_audio->a_buffer_size=sh_audio->audio_out_minsize+outburst;
14bac9d91e22 audio buffering fixed
arpi_esp
parents: 780
diff changeset
1033 // printf("Audio out buffer size reduced to %d bytes\n",sh_audio->a_buffer_size);
14bac9d91e22 audio buffering fixed
arpi_esp
parents: 780
diff changeset
1034 // }
758
5a92a5601666 better audio out buffering & sample_format added
arpi_esp
parents: 751
diff changeset
1035
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1036 // sh_audio->timer=-(audio_buffer_delay);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1037 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1038
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1039 sh_video->timer=0;
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1040 if(sh_audio) sh_audio->timer=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1041
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1042 if(!sh_audio){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1043 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Audio: no sound\n");
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1044 if(verbose) mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused audio chunks\n",d_audio->packs);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1045 ds_free_packs(d_audio); // free buffered chunks
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1046 d_audio->id=-2; // do not read audio chunks
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1047 if(sh_audio) if(sh_audio->a_buffer) free(sh_audio->a_buffer);
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1048 if(audio_out){ audio_out->uninit(); audio_out=NULL;} // close device
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1049 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1050
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1051 current_module=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1052
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1053 if(file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf!
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1054 if(force_fps){
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1055 sh_video->fps=force_fps;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1056 sh_video->frametime=1.0f/sh_video->fps;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1057 mp_msg(MSGT_CPLAYER,MSGL_INFO,"FPS forced to be %5.3f (ftime: %5.3f)\n",sh_video->fps,sh_video->frametime);
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1058 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1059
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1060 //==================== START PLAYING =======================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1061
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1062 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_StartPlaying);fflush(stdout);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1063
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1064 if(!use_stdin) getch2_enable(); // prepare stdin for hotkeys...
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1065
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1066 InitTimer();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1067
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
1068 total_time_usage_start=GetTimer();
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
1069
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1070 while(!eof){
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1071 unsigned int aq_total_time=GetTimer();
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1072 float aq_sleep_time=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1073
1125
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
1074 if(play_n_frames>=0){
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
1075 --play_n_frames;
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1076 if(play_n_frames<0) exit_player(MSGTR_Exit_frames);
1125
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
1077 }
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
1078
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1079 /*========================== PLAY AUDIO ============================*/
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1080 while(sh_audio){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1081 unsigned int t;
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1082 int playsize=audio_out->get_space();
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1083
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1084 if(!playsize) break; // buffer is full, do not block here!!!
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1085
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1086 if(playsize>MAX_OUTBURST) playsize=MAX_OUTBURST; // we shouldn't exceed it!
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1087 //if(playsize>outburst) playsize=outburst;
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
1088
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
1089 // Update buffer if needed
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1090 current_module="decode_audio"; // Enter AUDIO decoder module
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1091 t=GetTimer();
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1092 while(sh_audio->a_buffer_len<playsize && !d_audio->eof){
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1093 int ret=decode_audio(sh_audio,&sh_audio->a_buffer[sh_audio->a_buffer_len],
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1094 playsize-sh_audio->a_buffer_len,sh_audio->a_buffer_size-sh_audio->a_buffer_len);
296
c3d7a28a0d1a audio init moved to dec_audio.c
arpi_esp
parents: 291
diff changeset
1095 if(ret>0) sh_audio->a_buffer_len+=ret; else break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1096 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1097 current_module=NULL; // Leave AUDIO decoder module
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
1098 t=GetTimer()-t;audio_time_usage+=t*0.000001;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1099
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1100 if(playsize>sh_audio->a_buffer_len) playsize=sh_audio->a_buffer_len;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1101
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1102 playsize=audio_out->play(sh_audio->a_buffer,playsize,0);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1103
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1104 if(playsize>0){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1105 sh_audio->a_buffer_len-=playsize;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1106 memcpy(sh_audio->a_buffer,&sh_audio->a_buffer[playsize],sh_audio->a_buffer_len);
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1107 sh_audio->timer+=playsize/(float)(sh_audio->o_bps);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1108 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1109
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1110 break;
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1111 } // if(sh_audio)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1112
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1113 /*========================== UPDATE TIMERS ============================*/
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1114 #if 0
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1115 if(alsa){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1116 // Use system timer for sync, not audio card/driver
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1117 time_frame-=GetRelativeTime();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1118 if(time_frame<-0.1 || time_frame>0.1){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1119 time_frame=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1120 } else {
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1121 while(time_frame>0.022){
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1122 usec_sleep(time_frame-0.022);
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1123 time_frame-=GetRelativeTime();
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1124 }
103
506d7560279c timer fixes
arpi_esp
parents: 92
diff changeset
1125 while(time_frame>0.007){
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1126 usec_sleep(1000); // sleeps 1 clock tick (10ms)!
103
506d7560279c timer fixes
arpi_esp
parents: 92
diff changeset
1127 time_frame-=GetRelativeTime();
506d7560279c timer fixes
arpi_esp
parents: 92
diff changeset
1128 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1129 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1130 }
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1131 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1132
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1133 /*========================== PLAY VIDEO ============================*/
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1134
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1135 cvideo_base_vframe=sh_video->timer;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1136 cvideo_base_vtime=video_time_usage;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1137
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1138 if(1)
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1139 while(1){
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1140
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1141 float frame_time=1;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1142 float pts1=d_video->pts;
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1143 int blit_frame=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1144
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1145 current_module="decode_video";
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1146
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1147 //-------------------- Decode a frame: -----------------------
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1148
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1149 vdecode_time=video_time_usage;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1150
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1151 if(file_format==DEMUXER_TYPE_MPEG_ES || file_format==DEMUXER_TYPE_MPEG_PS){
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1152 int in_frame=0;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1153 float newfps;
1462
a776747517c0 ffmpeg12 fix - now passing sequence header
arpi
parents: 1459
diff changeset
1154 //videobuf_len=0;
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1155 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1156 int i=sync_video_packet(d_video);
1295
f1199bd41d81 mpeg2 timing & fps fix for ffmpeg12 codec
arpi
parents: 1291
diff changeset
1157 void* buffer=&videobuffer[videobuf_len+4];
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1158 if(in_frame){
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1159 if(i<0x101 || i>=0x1B0){ // not slice code -> end of frame
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1160 #if 1
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1161 // send END OF FRAME code:
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1162 videobuffer[videobuf_len+0]=0;
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1163 videobuffer[videobuf_len+1]=0;
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1164 videobuffer[videobuf_len+2]=1;
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1165 videobuffer[videobuf_len+3]=0xFF;
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1166 videobuf_len+=4;
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1167 #endif
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1420
diff changeset
1168 if(!i) eof=2; // EOF
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1169 break;
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1170 }
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1171 } else {
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1172 //if(i==0x100) in_frame=1; // picture startcode
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1173 if(i>=0x101 && i<0x1B0) in_frame=1; // picture startcode
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1420
diff changeset
1174 else if(!i){ eof=3; break;} // EOF
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1175 }
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1176 if(grab_frames==2 && (i==0x1B3 || i==0x1B8)) grab_frames=1;
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1420
diff changeset
1177 if(!read_video_packet(d_video)){ eof=4; break;} // EOF
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1178 //printf("read packet 0x%X, len=%d\n",i,videobuf_len);
1410
eda16e490ae7 using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents: 1406
diff changeset
1179 if(sh_video->codec->driver!=VFM_MPEG){
1296
32f5d26baf86 mpeg2 timing & fps fix for ffmpeg12 codec
arpi
parents: 1295
diff changeset
1180 // if not libmpeg2:
1295
f1199bd41d81 mpeg2 timing & fps fix for ffmpeg12 codec
arpi
parents: 1291
diff changeset
1181 switch(i){
f1199bd41d81 mpeg2 timing & fps fix for ffmpeg12 codec
arpi
parents: 1291
diff changeset
1182 case 0x1B3: header_process_sequence_header (picture, buffer);break;
f1199bd41d81 mpeg2 timing & fps fix for ffmpeg12 codec
arpi
parents: 1291
diff changeset
1183 case 0x1B5: header_process_extension (picture, buffer);break;
f1199bd41d81 mpeg2 timing & fps fix for ffmpeg12 codec
arpi
parents: 1291
diff changeset
1184 }
f1199bd41d81 mpeg2 timing & fps fix for ffmpeg12 codec
arpi
parents: 1291
diff changeset
1185 }
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1186 }
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1187
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1188 if(videobuf_len>max_framesize) max_framesize=videobuf_len; // debug
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1189 //printf("--- SEND %d bytes\n",videobuf_len);
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1190 if(grab_frames==1){
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1191 FILE *f=fopen("grab.mpg","ab");
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1192 fwrite(videobuffer,videobuf_len-4,1,f);
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1193 fclose(f);
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1194 }
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1195
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1196 blit_frame=decode_video(video_out,sh_video,videobuffer,videobuf_len,drop_frame);
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1197
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1198 // get mpeg fps:
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1199 newfps=frameratecode2framerate[picture->frame_rate_code]*0.0001f;
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1200 if(ABS(sh_video->fps-newfps)>0.01f) if(!force_fps){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1201 mp_msg(MSGT_CPLAYER,MSGL_WARN,"Warning! FPS changed %5.3f -> %5.3f (%f) [%d] \n",sh_video->fps,newfps,sh_video->fps-newfps,picture->frame_rate_code);
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1202 sh_video->fps=newfps;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1203 sh_video->frametime=10000.0f/(float)frameratecode2framerate[picture->frame_rate_code];
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1204 }
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1205
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1206 // fix mpeg2 frametime:
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1207 frame_time=(100+picture->repeat_count)*0.01f;
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1208 picture->repeat_count=0;
1462
a776747517c0 ffmpeg12 fix - now passing sequence header
arpi
parents: 1459
diff changeset
1209 videobuf_len=0;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1210
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1211 } else {
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1212 // frame-based file formats: (AVI,ASF,MOV)
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1213 unsigned char* start=NULL;
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1214 int in_size=ds_get_packet(d_video,&start);
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1420
diff changeset
1215 if(in_size<0){ eof=5;break;}
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1216 if(in_size>max_framesize) max_framesize=in_size;
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1217 blit_frame=decode_video(video_out,sh_video,start,in_size,drop_frame);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1218 }
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
1219
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1220 vdecode_time=video_time_usage-vdecode_time;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1221
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1222 //------------------------ frame decoded. --------------------
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1223 //------------------------ add OSD to frame contents ---------
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1224 #ifndef USE_LIBVO2
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1225 video_out->draw_osd();
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1226 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1227
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1228 // Increase video timers:
1400
2bf9c561b01d stage2 step 1
arpi
parents: 1382
diff changeset
1229 sh_video->num_frames+=frame_time;
1546
d4cd08b06665 display number of decoded frames (for progr. mpeg2)
arpi
parents: 1504
diff changeset
1230 ++sh_video->num_frames_decoded;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1231 frame_time*=sh_video->frametime;
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1232 if(file_format==DEMUXER_TYPE_ASF && !force_fps){
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1233 // .ASF files has no fixed FPS - just frame durations!
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1234 float d=d_video->pts-pts1;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1235 if(d>=0 && d<5) frame_time=d;
595
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
1236 if(d>0){
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
1237 if(verbose)
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
1238 if((int)sh_video->fps==1000)
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
1239 printf("\rASF framerate: %d fps \n",(int)(1.0f/d));
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
1240 sh_video->frametime=d; // 1ms
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
1241 sh_video->fps=1.0f/d;
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
1242 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1243 }
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1244 sh_video->timer+=frame_time;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1245 time_frame+=frame_time; // for nosound
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1246
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1247 if(file_format==DEMUXER_TYPE_MPEG_PS) d_video->pts+=frame_time;
940
108ac8795d19 -fps 1 fixed
arpi_esp
parents: 939
diff changeset
1248
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1249 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"*** ftime=%5.3f ***\n",frame_time);
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1250
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1251 if(drop_frame){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1252
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1253 if(sh_audio && !d_audio->eof){
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1254 int delay=audio_out->get_delay();
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1255 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"delay=%d\n",delay);
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1256 time_frame=sh_video->timer;
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1257 time_frame-=sh_audio->timer-(float)delay/(float)sh_audio->o_bps;
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1258 if(time_frame>-2*frame_time) {
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1259 drop_frame=0; // stop dropping frames
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1260 mp_msg(MSGT_AVSYNC,MSGL_DBG2,"\nstop frame drop %.2f\n", time_frame);
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1261 }else{
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1262 ++drop_frame_cnt;
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1263 if (verbose > 0 && drop_frame_cnt%10 == 0)
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1264 mp_msg(MSGT_AVSYNC,MSGL_DBG2,"\nstill dropping, %.2f\n", time_frame);
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1265 }
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1266 }
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1267 video_out->check_events(); // check events AST
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1268 } else {
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1269 // It's time to sleep...
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1270 current_module="sleep";
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1271
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1272 time_frame-=GetRelativeTime(); // reset timer
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1273
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1274 if(sh_audio && !d_audio->eof){
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1275 int delay=audio_out->get_delay();
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1276 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"delay=%d\n",delay);
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1277 time_frame=sh_video->timer;
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1278 time_frame-=sh_audio->timer-(float)delay/(float)sh_audio->o_bps;
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1279 // we are out of time... drop next frame!
940
108ac8795d19 -fps 1 fixed
arpi_esp
parents: 939
diff changeset
1280 if(time_frame<-2*frame_time){
1478
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
1281 static int drop_message=0;
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1282 drop_frame=frame_dropping; // tricky!
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1283 ++drop_frame_cnt;
1478
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
1284 if(drop_frame_cnt>50 && AV_delay>0.5 && !drop_message){
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
1285 drop_message=1;
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1286 mp_msg(MSGT_AVSYNC,MSGL_WARN,MSGTR_SystemTooSlow);
1478
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
1287 }
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1288 mp_msg(MSGT_AVSYNC,MSGL_DBG2,"\nframe drop %d, %.2f\n", drop_frame, time_frame);
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1289 }
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1290 } else {
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
1291 if( (time_frame<-3*frame_time || time_frame>3*frame_time) || benchmark)
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
1292 time_frame=0;
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
1293
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1294 }
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1295
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1296 // if(verbose>1)printf("sleep: %5.3f a:%6.3f v:%6.3f \n",time_frame,sh_audio->timer,sh_video->timer);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1297
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1298 aq_sleep_time+=time_frame;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1299
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1300 while(time_frame>0.005){
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1301 if(time_frame<=0.020)
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1302 // usec_sleep(10000); // sleeps 1 clock tick (10ms)!
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1303 usec_sleep(0); // sleeps 1 clock tick (10ms)!
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1304 else
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1305 usec_sleep(1000000*(time_frame-0.002));
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1306 time_frame-=GetRelativeTime();
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1307 }
117
b21b7c2fa180 common vo->flip_page() call
arpi_esp
parents: 112
diff changeset
1308
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1309 current_module="flip_page";
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1310 #ifdef USE_LIBVO2
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1311 if(blit_frame) vo2_flip(video_out,0);
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1312 #else
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1313 video_out->check_events();
1250
76263a48a57b libavcodec zero frame DivX flickering fixed
arpi
parents: 1248
diff changeset
1314 if(blit_frame) video_out->flip_page();
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1315 #endif
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1316 // usec_sleep(50000); // test only!
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1317
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1318 }
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1319
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1320 current_module=NULL;
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1321
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1322 if(eof) break;
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1323 if(force_redraw){
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1324 --force_redraw;
577
feeb61dd92ea Fixed broken pause function.
atmosfear
parents: 564
diff changeset
1325 if(!force_redraw) osd_function=OSD_PLAY;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1326 continue;
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1327 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1328
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1329 // printf("A:%6.1f V:%6.1f A-V:%7.3f frame=%5.2f \r",d_audio->pts,d_video->pts,d_audio->pts-d_video->pts,sh_audio->timer);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1330 // fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1331
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1332 #if 1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1333 /*================ A-V TIMESTAMP CORRECTION: =========================*/
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1334 if(sh_audio){
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1335 float a_pts=0;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1336 float v_pts=0;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1337
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1338 // unplayed bytes in our and soundcard/dma buffer:
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1339 int delay_bytes=audio_out->get_delay()+sh_audio->a_buffer_len;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1340 float delay=(float)delay_bytes/(float)sh_audio->o_bps;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1341
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1342 if(pts_from_bps){
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1343 #if 1
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1344 unsigned int samples=(sh_audio->audio.dwSampleSize)?
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1345 ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) :
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1346 (d_audio->pack_no); // <- used for VBR audio
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1347 a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate;
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1348 #else
1481
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1478
diff changeset
1349 if(sh_audio->audio.dwSampleSize)
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1478
diff changeset
1350 a_pts=(ds_tell(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->wf->nAvgBytesPerSec;
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1478
diff changeset
1351 else // VBR:
db2a6ae7e296 AVI pts/seek fixes, VBR support, faster NI seek
arpi
parents: 1478
diff changeset
1352 a_pts=d_audio->pack_no*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate;
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1353 #endif
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1354 // v_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1355 // printf("V_PTS: PTS: %8.3f BPS: %8.3f \n",d_video->pts,v_pts);
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1356 delay_corrected=1;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1357 } else {
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1358 // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec)
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1359 a_pts=d_audio->pts;
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1360 if(!delay_corrected) if(a_pts) delay_corrected=1;
1478
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
1361 //printf("*** %5.3f ***\n",a_pts);
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1362 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
1456
8c57a5a3c645 printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents: 1449
diff changeset
1363 // v_pts=d_video->pts-frame_time;
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1364 // v_pts=d_video->pts;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1365 }
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1366 v_pts=d_video->pts;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1367
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1368 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"### A:%8.3f (%8.3f) V:%8.3f A-V:%7.4f \n",a_pts,a_pts-audio_delay-delay,v_pts,(a_pts-delay-audio_delay)-v_pts);
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1369
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1370 if(delay_corrected){
1478
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
1371 float x;
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
1372 AV_delay=(a_pts-delay-audio_delay)-v_pts;
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
1373 x=AV_delay*0.1f;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1374 if(x<-max_pts_correction) x=-max_pts_correction; else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1375 if(x> max_pts_correction) x= max_pts_correction;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1376 if(default_max_pts_correction>=0)
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1377 max_pts_correction=default_max_pts_correction;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1378 else
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1379 max_pts_correction=sh_video->frametime*0.10; // +-10% of time
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1380 sh_audio->timer+=x; c_total+=x;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1381 if(!quiet) mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A:%6.1f V:%6.1f A-V:%7.3f ct:%7.3f %3d/%3d %2d%% %2d%% %4.1f%% %d %d\r",
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1382 a_pts-audio_delay-delay,v_pts,AV_delay,c_total,
1546
d4cd08b06665 display number of decoded frames (for progr. mpeg2)
arpi
parents: 1504
diff changeset
1383 (int)sh_video->num_frames,(int)sh_video->num_frames_decoded,
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1384 (sh_video->timer>0.5)?(int)(100.0*video_time_usage/(double)sh_video->timer):0,
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1385 (sh_video->timer>0.5)?(int)(100.0*vout_time_usage/(double)sh_video->timer):0,
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1386 (sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1387 ,drop_frame_cnt
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
1388 ,output_quality
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1389 );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1390 fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1391 }
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1392
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1393 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1394 // No audio:
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
1395
1448
e795527de16a -quiet option patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents: 1439
diff changeset
1396 if(!quiet)
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1397 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"V:%6.1f %3d %2d%% %2d%% %3.1f%% \r",d_video->pts,
1400
2bf9c561b01d stage2 step 1
arpi
parents: 1382
diff changeset
1398 (int)sh_video->num_frames,
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1399 (sh_video->timer>0.5)?(int)(100.0*video_time_usage/(double)sh_video->timer):0,
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1400 (sh_video->timer>0.5)?(int)(100.0*vout_time_usage/(double)sh_video->timer):0,
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1401 (sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1402 );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1403
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1404 fflush(stdout);
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
1405
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1406 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1407 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1408
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1409 /*Output quality adjustments:*/
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1410 if(auto_quality>0){
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1411 #if 0
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1412 /*If we took a long time decoding this frame, downgrade the quality.*/
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1413 if(output_quality>0&&
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1414 (video_time_usage-cvideo_base_vtime)*sh_video->timer>=
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1415 (0.95*sh_video->timer-(vout_time_usage+audio_time_usage))*
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1416 (sh_video->timer-cvideo_base_vframe-frame_correction)){
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1417 output_quality>>=1;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1418 mp_msg(MSGT_AUTOQ,MSGL_DBG2,"Downgrading quality to %i.\n",output_quality);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1419 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1420 } else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1421 /*If we had plenty of extra time, upgrade the quality.*/
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1422 if(output_quality<auto_quality&&
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1423 vdecode_time<0.5*frame_time&&
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1424 (video_time_usage-cvideo_base_vtime)*sh_video->timer<
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1425 (0.67*sh_video->timer-(vout_time_usage+audio_time_usage))*
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1426 (sh_video->timer-cvideo_base_vframe-frame_correction)){
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1427 output_quality++;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1428 mp_msg(MSGT_AUTOQ,MSGL_DBG2,"Upgrading quality to %i.\n",output_quality);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1429 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1430 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1431 #else
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
1432 // float total=0.000001f * (GetTimer()-aq_total_time);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1433 // if(output_quality<auto_quality && aq_sleep_time>0.05f*total)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1434 if(output_quality<auto_quality && aq_sleep_time>0)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1435 ++output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1436 else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1437 // if(output_quality>0 && aq_sleep_time<-0.05f*total)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1438 if(output_quality>1 && aq_sleep_time<0)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1439 --output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1440 else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1441 if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1442 output_quality=0;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1443 // printf("total: %8.6f sleep: %8.6f q: %d\n",(0.000001f*aq_total_time),aq_sleep_time,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1444 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1445 #endif
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1446 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1447
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1448 #ifdef USE_OSD
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1449 if(osd_visible){
1504
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
1450 if (!--osd_visible){ vo_osd_progbar_type=-1; // disable
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
1451 if (osd_function != OSD_PAUSE)
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
1452 osd_function = OSD_PLAY;
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
1453 }
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1454 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1455 #endif
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1456
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1457 if(osd_function==OSD_PAUSE){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1458 mp_msg(MSGT_CPLAYER,MSGL_STATUS,"\n------ PAUSED -------\r");fflush(stdout);
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1459 if (audio_out && sh_audio)
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
1460 audio_out->pause(); // pause audio, keep data if possible
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1461 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1462 if ( nogui )
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1463 {
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1464 #endif
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1465 while(
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1466 #ifdef HAVE_LIRC
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1467 lirc_mp_getinput()<=0 &&
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1468 #endif
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
1469 (use_stdin || getch2(20)<=0) && mplayer_get_key()<=0){
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1470 #ifndef USE_LIBVO2
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1471 video_out->check_events();
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1472 #endif
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
1473 if(use_stdin) usec_sleep(1000); // do not eat the CPU
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1474 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1475 osd_function=OSD_PLAY;
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1476 #ifdef HAVE_GUI
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1477 } else while( osd_function != OSD_PLAY ) usec_sleep( 1000 );
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1478 #endif
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1479 if (audio_out && sh_audio)
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
1480 audio_out->resume(); // resume audio
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1481 }
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1482
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1483
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1484 if(!force_redraw) break;
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1485 } // while(sh_video->timer<sh_audio->timer || force_redraw)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1486
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1487
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1488 //================= Keyboard events, SEEKing ====================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1489
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1490 { int c;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1491 while(
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1492 #ifdef HAVE_LIRC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1493 (c=lirc_mp_getinput())>0 ||
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1494 #endif
1467
f352e1e951ba stream opening -> open.c, initialframes ignored
arpi
parents: 1466
diff changeset
1495 (!use_stdin && (c=getch2(0))>0) || (c=mplayer_get_key())>0) switch(c){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1496 // seek 10 sec
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1497 case KEY_RIGHT:
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1498 osd_function=OSD_FFW;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1499 rel_seek_secs+=10;break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1500 case KEY_LEFT:
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1501 osd_function=OSD_REW;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1502 rel_seek_secs-=10;break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1503 // seek 1 min
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1504 case KEY_UP:
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1505 osd_function=OSD_FFW;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1506 rel_seek_secs+=60;break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1507 case KEY_DOWN:
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1508 osd_function=OSD_REW;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1509 rel_seek_secs-=60;break;
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1510 // seek 10 min
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1511 case KEY_PAGE_UP:
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1512 rel_seek_secs+=600;break;
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1513 case KEY_PAGE_DOWN:
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1514 rel_seek_secs-=600;break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1515 // delay correction:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1516 case '+':
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1517 audio_delay+=0.1; // increase audio buffer delay
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1518 if(sh_audio) sh_audio->timer-=0.1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1519 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1520 case '-':
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1521 audio_delay-=0.1; // decrease audio buffer delay
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1522 if(sh_audio) sh_audio->timer+=0.1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1523 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1524 // quit
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1525 case KEY_ESC: // ESC
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1526 case 'q': exit_player(MSGTR_Exit_quit);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1527 case KEY_ENTER: // ESC
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1528 eof=1; // jump to next file
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1529 break;
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
1530 case 'g': grab_frames=2;break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1531 // pause
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1532 case 'p':
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1533 case ' ':
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1534 osd_function=OSD_PAUSE;
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1535 break;
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1536 case 'o': // toggle OSD
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1537 osd_level=(osd_level+1)%3;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1538 break;
939
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
1539 case 'z':
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
1540 sub_delay -= 0.1;
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
1541 break;
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
1542 case 'x':
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
1543 sub_delay += 0.1;
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
1544 break;
1626
5f5505e4bb2d removed ugly switch/goto hack
arpi
parents: 1604
diff changeset
1545 case '9':
5f5505e4bb2d removed ugly switch/goto hack
arpi
parents: 1604
diff changeset
1546 case '0':
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
1547 case '*':
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1548 case '/': {
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents: 1026
diff changeset
1549 float mixer_l, mixer_r;
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1550 mixer_getvolume( &mixer_l,&mixer_r );
1626
5f5505e4bb2d removed ugly switch/goto hack
arpi
parents: 1604
diff changeset
1551 if(c=='*' || c=='0'){
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1552 if ( ++mixer_l > 100 ) mixer_l = 100;
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1553 if ( ++mixer_r > 100 ) mixer_r = 100;
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1554 } else {
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1555 if ( --mixer_l < 0 ) mixer_l = 0;
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1556 if ( --mixer_r < 0 ) mixer_r = 0;
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1557 }
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1558 mixer_setvolume( mixer_l,mixer_r );
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1559
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1560 #ifdef USE_OSD
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1561 if(osd_level){
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1562 osd_visible=sh_video->fps; // 1 sec
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1563 vo_osd_progbar_type=OSD_VOLUME;
1548
eee7951a23af changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents: 1546
diff changeset
1564 vo_osd_progbar_value=(mixer_l+mixer_r)*255/200;
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1565 //printf("volume: %d\n",vo_osd_progbar_value);
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1566 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1567 #endif
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1568 }
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1569 break;
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
1570 case 'm':
510
2951d138ddaf add sub autoread & remove 'c' key
pontscho
parents: 500
diff changeset
1571 mixer_usemaster=!mixer_usemaster;
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
1572 break;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1573
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1574 #if 0 // change to 1 for absolute seeking tests
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1575 case '1':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1576 case '2':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1577 case '3':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1578 case '4':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1579 case '5':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1580 case '6':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1581 case '7':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1582 case '8':
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1583 rel_seek_secs=0.99*(float)(c-'1')/7.0;
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1584 abs_seek_pos=3;
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1585 printf("ABS seek to %5.3f \n",rel_seek_secs);
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1586 break;
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1587 #else
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1588 // Contrast:
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1589 case '1':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1590 case '2':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1591 if(c=='2'){
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1592 if ( ++v_cont > 100 ) v_cont = 100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1593 } else {
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1594 if ( --v_cont < 0 ) v_cont = 0;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1595 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1596 if(set_video_colors(sh_video,"Contrast",v_cont)){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1597 #ifdef USE_OSD
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1598 if(osd_level){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1599 osd_visible=sh_video->fps; // 1 sec
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1600 vo_osd_progbar_type=OSD_CONTRAST;
1548
eee7951a23af changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents: 1546
diff changeset
1601 vo_osd_progbar_value=(v_cont)*255/100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1602 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1603 #endif
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1604 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1605 break;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1606
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1607 // Brightness:
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1608 case '3':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1609 case '4':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1610 if(c=='4'){
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1611 if ( ++v_bright > 100 ) v_bright = 100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1612 } else {
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1613 if ( --v_bright < 0 ) v_bright = 0;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1614 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1615 if(set_video_colors(sh_video,"Brightness",v_bright)){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1616 #ifdef USE_OSD
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1617 if(osd_level){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1618 osd_visible=sh_video->fps; // 1 sec
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1619 vo_osd_progbar_type=OSD_BRIGHTNESS;
1548
eee7951a23af changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents: 1546
diff changeset
1620 vo_osd_progbar_value=(v_bright)*255/100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1621 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1622 #endif
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1623 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1624 break;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1625
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1626 // Hue:
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1627 case '5':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1628 case '6':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1629 if(c=='6'){
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1630 if ( ++v_hue > 100 ) v_hue = 100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1631 } else {
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1632 if ( --v_hue < 0 ) v_hue = 0;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1633 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1634 if(set_video_colors(sh_video,"Hue",v_hue)){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1635 #ifdef USE_OSD
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1636 if(osd_level){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1637 osd_visible=sh_video->fps; // 1 sec
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1638 vo_osd_progbar_type=OSD_HUE;
1548
eee7951a23af changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents: 1546
diff changeset
1639 vo_osd_progbar_value=(v_hue)*255/100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1640 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1641 #endif
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1642 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1643 break;
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1644
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1645 // Saturation:
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1646 case '7':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1647 case '8':
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1648 if(c=='8'){
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1649 if ( ++v_saturation > 100 ) v_saturation = 100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1650 } else {
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1498
diff changeset
1651 if ( --v_saturation < 0 ) v_saturation = 0;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1652 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1653 if(set_video_colors(sh_video,"Saturation",v_saturation)){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1654 #ifdef USE_OSD
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1655 if(osd_level){
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1656 osd_visible=sh_video->fps; // 1 sec
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1657 vo_osd_progbar_type=OSD_SATURATION;
1548
eee7951a23af changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents: 1546
diff changeset
1658 vo_osd_progbar_value=(v_saturation)*255/100;
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1659 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1660 #endif
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1661 }
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1662 break;
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1663 #endif
1429
8986d06b2816 contrast/brightness/etc patch (temporary)
arpi
parents: 1428
diff changeset
1664
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1665 case 'd':
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1666 frame_dropping=(frame_dropping+1)%3;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1667 mp_msg(MSGT_CPLAYER,MSGL_V,"== drop: %d == \n",frame_dropping);
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1668 break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1669 }
1406
bf9fcd656ee9 small cosmetics fix
arpi
parents: 1405
diff changeset
1670 } // keyboard event handler
bf9fcd656ee9 small cosmetics fix
arpi
parents: 1405
diff changeset
1671
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1672 if (seek_to_sec) {
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
1673 int a,b; float d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
1674
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
1675 if (sscanf(seek_to_sec, "%d:%d:%f", &a,&b,&d)==3)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
1676 rel_seek_secs += 3600*a +60*b +d ;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
1677 else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
1678 rel_seek_secs += 60*a +d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
1679 else if (sscanf(seek_to_sec, "%f", &d)==1)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
1680 rel_seek_secs += d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
1681
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
1682 seek_to_sec = NULL;
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1683 }
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
1684
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1685 if(rel_seek_secs || abs_seek_pos){
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
1686 current_module="seek";
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1687 if(demux_seek(demuxer,rel_seek_secs,abs_seek_pos)){
1405
8ecf18884ad8 seeking code moved out from mplayer.c -> seek.c
arpi
parents: 1402
diff changeset
1688 // success:
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
1689
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1690 if(sh_audio){
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
1691 if(verbose){
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
1692 float a_pts=d_audio->pts;
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
1693 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1694 mp_msg(MSGT_AVSYNC,MSGL_V,"SEEK: A: %5.3f V: %5.3f A-V: %5.3f \n",a_pts,d_video->pts,a_pts-d_video->pts);
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
1695 }
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1696 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A:%6.1f V:%6.1f A-V:%7.3f ct: ? \r",d_audio->pts,d_video->pts,0.0f);
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
1697 } else {
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1698 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A: --- V:%6.1f \r",d_video->pts);
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
1699 }
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
1700 fflush(stdout);
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
1701
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
1702 if(sh_audio){
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
1703 current_module="seek_audio_reset";
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
1704 audio_out->reset(); // stop audio, throwing away buffered data
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1705 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1706
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1707 #ifdef USE_OSD
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
1708 // Set OSD:
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
1709 if(osd_level){
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
1710 int len=((demuxer->movi_end-demuxer->movi_start)>>8);
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
1711 if(len>0){
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
1712 osd_visible=sh_video->fps; // 1 sec
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
1713 vo_osd_progbar_type=0;
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
1714 vo_osd_progbar_value=(demuxer->filepos-demuxer->movi_start)/len;
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
1715 }
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
1716 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1717 #endif
1405
8ecf18884ad8 seeking code moved out from mplayer.c -> seek.c
arpi
parents: 1402
diff changeset
1718
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
1719 c_total=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1720 max_pts_correction=0.1;
1504
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
1721 osd_visible=sh_video->fps; // to rewert to PLAY pointer after 1 sec
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1722 audio_time_usage=0; video_time_usage=0; vout_time_usage=0;
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
1723 drop_frame_cnt=0;
1405
8ecf18884ad8 seeking code moved out from mplayer.c -> seek.c
arpi
parents: 1402
diff changeset
1724
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1725 }
1405
8ecf18884ad8 seeking code moved out from mplayer.c -> seek.c
arpi
parents: 1402
diff changeset
1726 rel_seek_secs=0;
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
1727 abs_seek_pos=0;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
1728 current_module=NULL;
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
1729 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
1730
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1731 //================= Update OSD ====================
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1732 #ifdef USE_OSD
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1420
diff changeset
1733 if(osd_level>=2){
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1734 int pts=d_video->pts;
595
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
1735 if(pts==osd_last_pts-1) ++pts; else osd_last_pts=pts;
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1736 vo_osd_text=osd_text_buffer;
595
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
1737 sprintf(vo_osd_text,"%c %02d:%02d:%02d",osd_function,pts/3600,(pts/60)%60,pts%60);
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1738 } else {
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1739 vo_osd_text=NULL;
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1740 }
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1741 // for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0;
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1742 // vo_osd_text=osd_text_buffer;
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1743 #endif
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1744
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1745 #ifdef USE_SUB
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
1746 // find sub
1204
646ac6d78952 sub at key=0 fixed
arpi_esp
parents: 1190
diff changeset
1747 if(subtitles && d_video->pts>0){
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1748 int pts=d_video->pts;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1749 if(sub_fps==0) sub_fps=sh_video->fps;
482
1a2c4f3e7a10 sub control optimized
arpi_esp
parents: 470
diff changeset
1750 current_module="find_sub";
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1751 find_sub(subtitles,sub_uses_time?(100*(pts+sub_delay)):((pts+sub_delay)*sub_fps)); // FIXME! frame counter...
482
1a2c4f3e7a10 sub control optimized
arpi_esp
parents: 470
diff changeset
1752 current_module=NULL;
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
1753 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1754 #endif
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
1755
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
1756 // DVD sub:
557
e4aca0d51268 some dvd sub parsing and check added
arpi_esp
parents: 555
diff changeset
1757 { unsigned char* packet=NULL;
e4aca0d51268 some dvd sub parsing and check added
arpi_esp
parents: 555
diff changeset
1758 int len=ds_get_packet_sub(d_dvdsub,&packet);
e4aca0d51268 some dvd sub parsing and check added
arpi_esp
parents: 555
diff changeset
1759 if(len>=2){
e4aca0d51268 some dvd sub parsing and check added
arpi_esp
parents: 555
diff changeset
1760 int len2;
e4aca0d51268 some dvd sub parsing and check added
arpi_esp
parents: 555
diff changeset
1761 len2=(packet[0]<<8)+packet[1];
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1762 mp_msg(MSGT_CPLAYER,MSGL_V,"\rDVD sub: %d / %d \n",len,len2);
561
36fd71db0d33 spudec_decode() moved from mplayer.c to spudec.c
arpi_esp
parents: 560
diff changeset
1763 if(len==len2)
36fd71db0d33 spudec_decode() moved from mplayer.c to spudec.c
arpi_esp
parents: 560
diff changeset
1764 spudec_decode(packet,len);
36fd71db0d33 spudec_decode() moved from mplayer.c to spudec.c
arpi_esp
parents: 560
diff changeset
1765 else
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1766 mp_msg(MSGT_CPLAYER,MSGL_V,"fragmented dvd-subs not yet supported!!!\n");
557
e4aca0d51268 some dvd sub parsing and check added
arpi_esp
parents: 555
diff changeset
1767 } else if(len>=0) {
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1768 mp_msg(MSGT_CPLAYER,MSGL_V,"invalid dvd sub\n");
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
1769 }
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
1770 }
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
1771
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1420
diff changeset
1772 } // while(!eof)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1773
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1774 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",eof);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1775
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1776 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1777
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1778
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1779 if(curr_filename+1<num_filenames){
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1780 // partial uninit:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1781
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1782 // restore terminal:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1783 #ifdef HAVE_GUI
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1784 if ( nogui )
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1785 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1786 getch2_disable();
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1787
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1788 current_module="uninit_vo";
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1789
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1790 #ifdef USE_LIBVO2
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1791 if(video_out) vo2_close(video_out);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1792 #else
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1793 if(video_out) video_out->uninit();
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1794 #endif
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1795
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1796 current_module="uninit_ao";
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1797 if(audio_out) audio_out->uninit();
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1798 // if(encode_name) avi_fixate();
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1799 }
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1800
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1801 goto_next_file: // don't jump here after ao/vo/getch initialization!
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1802 ++curr_filename;
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1803 if(curr_filename<num_filenames){
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1804
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1805 current_module="free_demuxer";
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1806 if(demuxer) free_demuxer(demuxer);
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1807
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1808 current_module="free_stream";
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1809 if(stream) free_stream(stream);
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1810
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1811 video_out=NULL;
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1812 audio_out=NULL;
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1813
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1814 goto play_next_file;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1815 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1816
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1817 exit_player(MSGTR_Exit_eof);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1818
109
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
1819 return 1;
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
1820 }