annotate mplayer.c @ 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
author lgb
date Tue, 05 Jun 2001 02:13:31 +0000
parents 9744b50fe87f
children 72cacd3b8f30
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1 // AVI & MPEG Player v0.11 (C) 2000-2001. by A'rpi/ESP-team
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
4 #include <stdlib.h>
109
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
5 #include <string.h>
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
6
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
7 #include <signal.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
8
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
9 #include <sys/ioctl.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
10 #include <unistd.h>
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
11 #include <time.h>
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
12 #include <sys/mman.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
13
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
14 #include <sys/types.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
15 #include <sys/wait.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
16 #include <sys/time.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
17 #include <sys/stat.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
18 #include <fcntl.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
19 #include <sys/soundcard.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
21 #include "version.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22 #include "config.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
24 #ifndef MAX_OUTBURST
591
d4e467a0b942 error message if ./configure wasn't ran
arpi_esp
parents: 587
diff changeset
25 #error "============================================="
d4e467a0b942 error message if ./configure wasn't ran
arpi_esp
parents: 587
diff changeset
26 #error "Please re-run ./configure and then try again!"
d4e467a0b942 error message if ./configure wasn't ran
arpi_esp
parents: 587
diff changeset
27 #error "============================================="
d4e467a0b942 error message if ./configure wasn't ran
arpi_esp
parents: 587
diff changeset
28 #endif
d4e467a0b942 error message if ./configure wasn't ran
arpi_esp
parents: 587
diff changeset
29
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
30 #include "cfgparser.h"
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
31 #include "cfg-mplayer-def.h"
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
32
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
33 #include "subreader.h"
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
34
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
35 #include "libvo/video_out.h"
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
36 #include "libvo/sub.h"
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
37
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
38 #include "libao2/audio_out.h"
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
39
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
40 // CODECS:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
41 #include "mp3lib/mp3.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
42 #include "libac3/ac3.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
43 #include "libmpeg2/mpeg2.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
44 #include "libmpeg2/mpeg2_internal.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
45
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
46 #include "loader.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
47 #include "wine/avifmt.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
48
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
49 #include "codec-cfg.h"
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
50
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
51 #include "dvdauth.h"
560
28ae99036574 Separated dvdsub code to be able to work with it easier
lgb
parents: 557
diff changeset
52 #include "spudec.h"
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
53
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
54 #ifdef USE_DIRECTSHOW
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
55 #include "DirectShow/DS_VideoDec.h"
190
a8552ad553e0 DirectShow audio support
arpi_esp
parents: 178
diff changeset
56 #include "DirectShow/DS_AudioDec.h"
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
57 #endif
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
58
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
59 #include "opendivx/decore.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61
1015
9744b50fe87f some cleanup, old unused stuff removed
arpi_esp
parents: 1014
diff changeset
62 //extern int vo_screenwidth;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
64 extern char* win32_codec_name; // must be set before calling DrvOpen() !!!
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
65
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66 extern int errno;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
67
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
68 #include "linux/getch2.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
69 #include "linux/keycodes.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
70 #include "linux/timer.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
71 #include "linux/shmem.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
72
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
73 #ifdef HAVE_LIRC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
74 #include "lirc_mp.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
75 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
76
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
77 #include "help_mp.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
78
842
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
79 #ifdef STREAMING
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
80 #include "url.h"
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
81 #include "network.h"
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
82 static URL_t* url;
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
83 #endif
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
84
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
85 #define DEBUG if(0)
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
86 #ifdef HAVE_GUI
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
87 int nogui=1;
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
88 #endif
362
463699f15eb4 static removed from verbose definition
szabii
parents: 360
diff changeset
89 int verbose=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
90
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
91 #define ABS(x) (((x)>=0)?(x):(-(x)))
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
92
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
93 static subtitle* subtitles=NULL;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
94 void find_sub(subtitle* subtitles,int key);
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
95
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
96 //**************************************************************************//
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
97 // Config file
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
98 //**************************************************************************//
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
99
153
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 151
diff changeset
100 static int cfg_inc_verbose(struct config *conf){
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 151
diff changeset
101 ++verbose;
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 151
diff changeset
102 return 0;
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 151
diff changeset
103 }
8e55121885b2 new configfile/cmdline parser
arpi_esp
parents: 151
diff changeset
104
162
effc62af528c new option: -include
szabii
parents: 154
diff changeset
105 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
106 return parse_config_file(conf, filename);
162
effc62af528c new option: -include
szabii
parents: 154
diff changeset
107 }
effc62af528c new option: -include
szabii
parents: 154
diff changeset
108
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
109 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
110 char *homedir;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
111 char *buff;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
112 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
113 int len;
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
114
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
115 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
116 return NULL;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
117 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
118 if (filename == NULL) {
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
119 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
120 return NULL;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
121 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
122 } else {
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
123 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
124 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
125 return NULL;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
126 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
127 }
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
128 return buff;
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
129 }
55206b791586 get_path()
szabii
parents: 175
diff changeset
130
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
131 static int max_framesize=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
132
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
133 //static int show_packets=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
134
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
135 //**************************************************************************//
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
136 //**************************************************************************//
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
137 // Input media streaming & demultiplexer:
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
138 //**************************************************************************//
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
139
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 577
diff changeset
140 #include "stream.h"
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
141 #include "demuxer.h"
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
142
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
143 #include "stheader.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
144
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
145 int avi_bitrate=0;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
146
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
147 demuxer_t *demuxer=NULL;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
148
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
149 //#include "aviprint.c"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
150
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
151 sh_audio_t* new_sh_audio(int id){
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
152 if(demuxer->a_streams[id]){
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
153 printf("Warning! Audio stream header %d redefined!\n",id);
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
154 } else {
500
c2b3a1f340c8 MPEG-ES segfault fixed, stream list printfs moved v 1->0
arpi_esp
parents: 495
diff changeset
155 printf("==> Found audio stream: %d\n",id);
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
156 demuxer->a_streams[id]=malloc(sizeof(sh_audio_t));
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
157 memset(demuxer->a_streams[id],0,sizeof(sh_audio_t));
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
158 }
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
159 return demuxer->a_streams[id];
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
160 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
161
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
162 sh_video_t* new_sh_video(int id){
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
163 if(demuxer->v_streams[id]){
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
164 printf("Warning! video stream header %d redefined!\n",id);
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
165 } else {
500
c2b3a1f340c8 MPEG-ES segfault fixed, stream list printfs moved v 1->0
arpi_esp
parents: 495
diff changeset
166 printf("==> Found video stream: %d\n",id);
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
167 demuxer->v_streams[id]=malloc(sizeof(sh_video_t));
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
168 memset(demuxer->v_streams[id],0,sizeof(sh_video_t));
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
169 }
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
170 return demuxer->v_streams[id];
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
171 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
172
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
173 demux_stream_t *d_audio=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
174 demux_stream_t *d_video=NULL;
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
175 demux_stream_t *d_dvdsub=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
176
1015
9744b50fe87f some cleanup, old unused stuff removed
arpi_esp
parents: 1014
diff changeset
177 sh_audio_t *sh_audio=NULL;
9744b50fe87f some cleanup, old unused stuff removed
arpi_esp
parents: 1014
diff changeset
178 sh_video_t *sh_video=NULL;
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
179
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
180 char* encode_name=NULL;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
181 char* encode_index_name=NULL;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
182 int encode_bitrate=0;
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
183
1015
9744b50fe87f some cleanup, old unused stuff removed
arpi_esp
parents: 1014
diff changeset
184 extern int asf_packetsize; // for seeking
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
185
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
186 extern float avi_audio_pts;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
187 extern float avi_video_pts;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
188 extern float avi_video_ftime;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
189 extern int skip_video_frames;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
190
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
191 void read_avi_header(demuxer_t *demuxer,int index_mode);
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
192 demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id);
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
193
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
194 int asf_check_header(demuxer_t *demuxer);
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
195 int read_asf_header(demuxer_t *demuxer);
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
196
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
197 // MPEG video stream parser:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
198 #include "parse_es.c"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
199
1015
9744b50fe87f some cleanup, old unused stuff removed
arpi_esp
parents: 1014
diff changeset
200 extern int num_elementary_packets100; // for MPEG-ES fileformat detection
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
201 extern int num_elementary_packets101;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
202
1015
9744b50fe87f some cleanup, old unused stuff removed
arpi_esp
parents: 1014
diff changeset
203 extern picture_t *picture; // exported from libmpeg2/decode.c
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
204
112
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
205 static const int frameratecode2framerate[16] = {
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
206 0,
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
207 // Official mpeg1/2 framerates:
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
208 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
209 // libmpeg3's "Unofficial economy rates":
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
210 1*10000,5*10000,10*10000,12*10000,15*10000,0,0
112
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
211 };
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
212
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
213 //**************************************************************************//
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
214 // Audio codecs:
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
215 //**************************************************************************//
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
216
296
c3d7a28a0d1a audio init moved to dec_audio.c
arpi_esp
parents: 291
diff changeset
217 // MP3 decoder buffer callback:
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
218 int mplayer_audio_read(char *buf,int size){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
219 int len;
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
220 len=demux_read_data(sh_audio->ds,buf,size);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
221 return len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
222 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
223
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
224 //#include "dec_audio.c"
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
225
851
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
226 #ifndef NEW_DECORE
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
227 //**************************************************************************//
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
228 // The OpenDivX stuff:
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
229 //**************************************************************************//
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
230
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
231 unsigned char *opendivx_src[3];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
232 int opendivx_stride[3];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
233
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
234 // callback, the opendivx decoder calls this for each frame:
80
74064c2929a1 updated to opendivx 0.48
arpi_esp
parents: 71
diff changeset
235 void convert_linux(unsigned char *puc_y, int stride_y,
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
236 unsigned char *puc_u, unsigned char *puc_v, int stride_uv,
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
237 unsigned char *bmp, int width_y, int height_y){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
238
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
239 // printf("convert_yuv called %dx%d stride: %d,%d\n",width_y,height_y,stride_y,stride_uv);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
240
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
241 opendivx_src[0]=puc_y;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
242 opendivx_src[1]=puc_u;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
243 opendivx_src[2]=puc_v;
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
244
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
245 opendivx_stride[0]=stride_y;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
246 opendivx_stride[1]=stride_uv;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
247 opendivx_stride[2]=stride_uv;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
248 }
851
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
249 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
250
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
251 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
252 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
253
112
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
254 // Common FIFO functions, and keyboard/event FIFO code
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
255 #include "fifo.c"
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
256
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
257 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
258
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
259 static vo_functions_t *video_out=NULL;
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
260 static ao_functions_t *audio_out=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
261
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
262 static int play_in_bg=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
263
606
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
264 extern void avi_fixate();
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
265
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
266 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
267 #include "../Gui/mplayer/psignal.h"
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
268 #define GUI_MSG(x) if ( !nogui ) { mplSendMessage( x ); usleep( 10000 ); }
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
269 #else
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
270 #define GUI_MSG(x)
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
271 #endif
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
272
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
273 void exit_player(char* how){
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
274
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
275 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
276 if ( !nogui )
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
277 {
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
278 if ( how != NULL )
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
279 {
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
280 if ( !strcmp( how,"Quit" ) ) mplSendMessage( mplEndOfFile );
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
281 if ( !strcmp( how,"End of file" ) ) mplSendMessage( mplEndOfFile );
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
282 if ( !strcmp( how,"audio_init" ) ) mplSendMessage( mplAudioError );
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
283 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
284 else mplSendMessage( mplUnknowError );
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
285 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
286 #endif
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
287
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
288 if(how) printf("\nExiting... (%s)\n",how);
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
289 if(verbose) printf("max framesize was %d bytes\n",max_framesize);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
290 // restore terminal:
1005
90682d6f84f5 terminal reset bug with gui fixed
pontscho
parents: 1002
diff changeset
291 #ifdef HAVE_GUI
90682d6f84f5 terminal reset bug with gui fixed
pontscho
parents: 1002
diff changeset
292 if ( nogui )
90682d6f84f5 terminal reset bug with gui fixed
pontscho
parents: 1002
diff changeset
293 #endif
90682d6f84f5 terminal reset bug with gui fixed
pontscho
parents: 1002
diff changeset
294 getch2_disable();
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
295 video_out->uninit();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
296 if(encode_name) avi_fixate();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
297 #ifdef HAVE_LIRC
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
298 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
299 if ( nogui )
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
300 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
301 lirc_mp_cleanup();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
302 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
303 //if(play_in_bg) system("xsetroot -solid \\#000000");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
304 exit(1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
305 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
306
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
307 static char* current_module=NULL; // for debugging
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
308
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
309 void exit_sighandler(int x){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
310 static int sig_count=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
311 ++sig_count;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
312 if(sig_count==2) exit(1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
313 if(sig_count>2){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
314 // can't stop :(
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
315 kill(getpid(),SIGKILL);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
316 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
317 printf("\nMPlayer interrupted by signal %d in module: %s \n",x,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
318 current_module?current_module:"unknown"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
319 );
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
320 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
321 if ( !nogui )
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
322 {
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
323 mplShMem->items.error.signal=x;
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
324 strcpy( mplShMem->items.error.module,current_module?current_module:"unknown" );
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
325 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
326 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
327 exit_player(NULL);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
328 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
329
606
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
330 extern int vcd_get_track_end(int fd,int track);
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
331 extern int init_audio(sh_audio_t *sh_audio);
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
332 extern int init_video_codec(sh_video_t *sh_video);
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
333 extern void mpeg2_allocate_image_buffers(picture_t * picture);
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
334 extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height);
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
335 extern int vo_init(void);
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
336 extern int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen);
606
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
337
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
338 // options:
1015
9744b50fe87f some cleanup, old unused stuff removed
arpi_esp
parents: 1014
diff changeset
339 int osd_level=2;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
340 int divx_quality=0;
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
341 char *seek_to_sec=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
342 int seek_to_byte=0;
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
343 int has_audio=1;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
344 //int has_video=1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
345 int audio_format=0; // override
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
346
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
347 #ifdef USE_DIRECTSHOW
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
348 int allow_dshow=1;
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
349 #else
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
350 int allow_dshow=0;
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
351 #endif
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
352
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
353 //#ifdef ALSA_TIMER
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
354 //int alsa=1;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
355 //#else
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
356 //int alsa=0;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
357 //#endif
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
358
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
359 // streaming:
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
360 int audio_id=-1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
361 int video_id=-1;
552
c2a449f90087 dvd sub support reading
arpi_esp
parents: 549
diff changeset
362 int dvdsub_id=-1;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
363 int vcd_track=0;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
364 char *stream_dump_name=NULL;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
365 int stream_dump_type=0;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
366 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
367 int force_ni=0;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
368
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
369 float default_max_pts_correction=-1;//0.01f;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
370 #ifdef AVI_SYNC_BPS
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
371 int pts_from_bps=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
372 #else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
373 int pts_from_bps=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
374 #endif
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
375
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
376 float force_fps=0;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
377 int force_srate=0;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
378 float audio_delay=0;
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
379 int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
380
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
381 // screen info:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
382 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
383 char* audio_driver=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
384 int fullscreen=0;
208
ae0f909ccc7c Adds code to deal with vidmode selection. -- mgraffam
mgraffam
parents: 190
diff changeset
385 int vidmode=0;
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
386 int softzoom=0;
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
387 int flip=-1;
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
388 int screen_size_x=0;//SCREEN_SIZE_X;
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
389 int screen_size_y=0;//SCREEN_SIZE_Y;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
390 int screen_size_xy=0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
391
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
392 // sub:
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
393 char *font_name=NULL;
215
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 212
diff changeset
394 float font_factor=0.75;
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
395 char *sub_name=NULL;
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
396 float sub_delay=0;
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
397 float sub_fps=0;
510
2951d138ddaf add sub autoread & remove 'c' key
pontscho
parents: 500
diff changeset
398 int sub_auto = 1;
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
399
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
400 char *dsp=NULL;
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
401
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
402 #include "mixer.h"
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
403 #include "cfg-mplayer.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
404
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
405 void parse_cfgfiles( void )
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
406 {
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
407 char *conffile;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
408 int conffile_fd;
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
409 if (parse_config_file(conf, "/etc/mplayer.conf") < 0)
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
410 exit(1);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
411 if ((conffile = get_path("")) == NULL) {
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
412 printf("Can't find HOME dir\n");
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
413 } else {
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
414 mkdir(conffile, 0777);
55206b791586 get_path()
szabii
parents: 175
diff changeset
415 free(conffile);
55206b791586 get_path()
szabii
parents: 175
diff changeset
416 if ((conffile = get_path("config")) == NULL) {
55206b791586 get_path()
szabii
parents: 175
diff changeset
417 printf("get_path(\"config\") sziiiivas\n");
55206b791586 get_path()
szabii
parents: 175
diff changeset
418 } else {
55206b791586 get_path()
szabii
parents: 175
diff changeset
419 if ((conffile_fd = open(conffile, O_CREAT | O_EXCL | O_WRONLY, 0666)) != -1) {
55206b791586 get_path()
szabii
parents: 175
diff changeset
420 printf("Creating config file: %s\n", conffile);
55206b791586 get_path()
szabii
parents: 175
diff changeset
421 write(conffile_fd, default_config, strlen(default_config));
55206b791586 get_path()
szabii
parents: 175
diff changeset
422 close(conffile_fd);
55206b791586 get_path()
szabii
parents: 175
diff changeset
423 }
55206b791586 get_path()
szabii
parents: 175
diff changeset
424 if (parse_config_file(conf, conffile) < 0)
55206b791586 get_path()
szabii
parents: 175
diff changeset
425 exit(1);
55206b791586 get_path()
szabii
parents: 175
diff changeset
426 free(conffile);
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
427 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
428 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
429 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
430
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
431 #ifndef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
432 int main(int argc,char* argv[], char *envp[]){
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
433 #else
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
434 int mplayer(int argc,char* argv[], char *envp[]){
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
435 #endif
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
436
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
437 char* filename=NULL; //"MI2-Trailer.avi";
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
438 stream_t* stream=NULL;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
439 int file_format=DEMUXER_TYPE_UNKNOWN;
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 int delay_corrected=1;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
442 float initial_pts_delay=0;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
443 #ifdef VCD_CACHE
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
444 int vcd_cache_size=128;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
445 #endif
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
446 char* title="MPlayer";
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
447
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
448 // movie info:
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
449 int out_fmt=0;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
450 //int user_bpp=0;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
451
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
452 int osd_visible=100;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
453 int osd_function=OSD_PLAY;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
454 int osd_last_pts=-303;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
455
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
456 float a_frame=0; // Audio
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 float rel_seek_secs=0;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
459
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
460 int i;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
461 int f; // filedes
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
462
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
463 printf("%s",banner_text);
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
464
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
465 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
466 if ( nogui )
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
467 {
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
468 #endif
751
1417d8a4a96c *** empty log message ***
pontscho
parents: 750
diff changeset
469 parse_cfgfiles();
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
470 if (parse_command_line(conf, argc, argv, envp, &filename) < 0) exit(1);
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
471
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
472 // Many users forget to include command line in bugreports...
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
473 if(verbose){
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
474 printf("CommandLine:");
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
475 for(i=1;i<argc;i++)printf(" '%s'",argv[i]);
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
476 printf("\n");
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
477 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
478
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
479 if(video_driver && strcmp(video_driver,"help")==0){
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
480 printf("Available video output drivers:\n");
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
481 i=0;
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
482 while (video_out_drivers[i]) {
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
483 const vo_info_t *info = video_out_drivers[i++]->get_info ();
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
484 printf("\t%s\t%s\n", info->short_name, info->name);
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
485 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
486 printf("\n");
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
487 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
488 }
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
489 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
490 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
491 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
492 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
493 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
494 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
495 }
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 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
497 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
498 }
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
499 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
500 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
501 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
502
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
503 if(!filename){
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
504 if(vcd_track) filename="/dev/cdrom";
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
505 else {
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
506 printf("%s",help_text); exit(0);
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
507 }
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
508 }
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
509
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
510 // check video_out driver name:
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
511 if(!video_driver)
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
512 video_out=video_out_drivers[0];
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
513 else
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
514 for (i=0; video_out_drivers[i] != NULL; i++){
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
515 const vo_info_t *info = video_out_drivers[i]->get_info ();
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
516 if(strcmp(info->short_name,video_driver) == 0){
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
517 video_out = video_out_drivers[i];break;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
518 }
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
519 }
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
520 if(!video_out){
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
521 printf("Invalid video output driver name: %s\nUse '-vo help' to get a list of available video drivers.\n",video_driver);
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
522 return 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
523 }
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
524
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
525 // check audio_out driver 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
526 if(!audio_driver)
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
527 audio_out=audio_out_drivers[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
528 else
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
529 for (i=0; audio_out_drivers[i] != NULL; 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
530 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
531 if(strcmp(info->short_name,audio_driver) == 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
532 audio_out = audio_out_drivers[i];break;
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
533 }
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
534 }
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
535 if (!audio_out){
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
536 printf("Invalid audio output driver name: %s\nUse '-ao help' to get a list of available audio drivers.\n",audio_driver);
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
537 return 0;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
538 }
984
e73777bc679f Fix missing cast.
atmosfear
parents: 980
diff changeset
539 if(dsp) audio_out->control(AOCONTROL_SET_DEVICE,(int)dsp);
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
540
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
541 // check codec.conf
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
542 if(!parse_codec_cfg(get_path("codecs.conf"))){
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
543 printf("(copy/link DOCS/codecs.conf to ~/.mplayer/codecs.conf)\n");
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
544 GUI_MSG( mplCodecConfNotFound )
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
545 exit(1);
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
546 }
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
547
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
548 // check font
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
549 if(font_name){
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
550 vo_font=read_font_desc(font_name,font_factor,verbose>1);
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
551 if(!vo_font) printf("Can't load font: %s\n",font_name);
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
552 } else {
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
553 // try default:
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
554 vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
555 }
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
556
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
557 // check .sub
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
558 if(sub_name){
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
559 subtitles=sub_read_file(sub_name);
924
c18f0a1bee08 bugfix: font_name -> sub_name (when error)
laaz
parents: 919
diff changeset
560 if(!subtitles) printf("Can't load subtitles: %s\n",sub_name);
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
561 } else {
510
2951d138ddaf add sub autoread & remove 'c' key
pontscho
parents: 500
diff changeset
562 if ( sub_auto )
2951d138ddaf add sub autoread & remove 'c' key
pontscho
parents: 500
diff changeset
563 {
2951d138ddaf add sub autoread & remove 'c' key
pontscho
parents: 500
diff changeset
564 // auto load sub file ...
892
bad858a47870 implemented ~/.mplayer/sub/filename.sub stuff
arpi_esp
parents: 889
diff changeset
565 subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ) );
bad858a47870 implemented ~/.mplayer/sub/filename.sub stuff
arpi_esp
parents: 889
diff changeset
566 }
bad858a47870 implemented ~/.mplayer/sub/filename.sub stuff
arpi_esp
parents: 889
diff changeset
567 if ( subtitles == NULL ) subtitles=sub_read_file(get_path("default.sub")); // try default:
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
568 }
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
569
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
570
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
571 if(vcd_track){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
572 //============ Open VideoCD track ==============
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
573 int ret,ret2;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
574 f=open(filename,O_RDONLY);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
575 if(f<0){ printf("CD-ROM Device '%s' not found!\n",filename);return 1; }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
576 vcd_read_toc(f);
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
577 ret2=vcd_get_track_end(f,vcd_track);
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
578 if(ret2<0){ printf("Error selecting VCD track!\n");return 1;}
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 577
diff changeset
579 ret=vcd_seek_to_track(f,vcd_track);
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
580 if(ret<0){ printf("Error selecting VCD track!\n");return 1;}
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 577
diff changeset
581 seek_to_byte+=ret;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
582 if(verbose) printf("VCD start byte position: 0x%X end: 0x%X\n",seek_to_byte,ret2);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
583 #ifdef VCD_CACHE
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
584 vcd_cache_init(vcd_cache_size);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
585 #endif
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
586 stream=new_stream(f,STREAMTYPE_VCD);
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
587 stream->start_pos=ret;
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
588 stream->end_pos=ret2;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
589 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
590 //============ Open plain FILE ============
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
591 int len;
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 651
diff changeset
592 if(!strcmp(filename,"-")){
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 651
diff changeset
593 // read from stdin
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 651
diff changeset
594 printf("Reading from stdin...\n");
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 651
diff changeset
595 f=0; // 0=stdin
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 651
diff changeset
596 stream=new_stream(f,STREAMTYPE_STREAM);
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 651
diff changeset
597 } else {
842
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
598 #ifdef STREAMING
906
8eca9b7aafae Changed streaming functions call.
bertrand
parents: 894
diff changeset
599 url = url_new(filename);
842
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
600 if(url==NULL) {
906
8eca9b7aafae Changed streaming functions call.
bertrand
parents: 894
diff changeset
601 // failed to create a new URL, so it's not an URL (or a malformed URL)
842
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
602 #endif
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
603 f=open(filename,O_RDONLY);
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
604 if(f<0){ printf("File not found: '%s'\n",filename);return 1; }
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
605 len=lseek(f,0,SEEK_END); lseek(f,0,SEEK_SET);
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
606 stream=new_stream(f,STREAMTYPE_FILE);
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
607 stream->end_pos=len;
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
608 #ifdef STREAMING
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
609 } else {
1002
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
610 file_format=autodetectProtocol( url, &f );
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
611 if( file_format==DEMUXER_TYPE_UNKNOWN ) {
842
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
612 printf("Unable to open URL: %s\n", filename);
906
8eca9b7aafae Changed streaming functions call.
bertrand
parents: 894
diff changeset
613 url_free(url);
842
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
614 return 1;
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
615 } else {
1002
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
616 f=streaming_start( &url, f, file_format );
906
8eca9b7aafae Changed streaming functions call.
bertrand
parents: 894
diff changeset
617 if(f<0){ printf("Unable to open URL: %s\n", url->url); return 1; }
842
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
618 printf("Connected to server: %s\n", url->hostname );
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
619 }
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
620 stream=new_stream(f,STREAMTYPE_STREAM);
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
621 }
80698f8030b9 Now Check if the 'filename' is an URL and connect to the server.
bertrand
parents: 815
diff changeset
622 #endif
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 651
diff changeset
623 }
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
624 }
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
625
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
626 #ifdef HAVE_LIBCSS
546
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
627 if (dvdimportkey) {
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
628 if (dvd_import_key(dvdimportkey)) {
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
629 fprintf(stderr,"Error processing DVD KEY.\n");
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
630 GUI_MSG( mplErrorDVDKeyProcess )
546
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
631 exit(1);
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
632 }
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
633 printf("DVD command line requested key is stored for descrambling.\n");
22ed5f5821e2 command line requested DVD key support for Arpi :)
lgb
parents: 535
diff changeset
634 }
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
635 if (dvd_auth_device) {
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
636 if (dvd_auth(dvd_auth_device,f)) {
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
637 GUI_MSG( mplErrorDVDAuth )
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
638 exit(0);
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
639 }
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
640 printf("DVD auth sequence seems to be OK.\n");
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
641 }
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
642 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
643
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
644 //============ Open & Sync stream and detect file format ===============
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
645
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
646 if(!has_audio) audio_id=-2; // do NOT read audio packets...
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
647
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
648 //=============== Try to open as AVI file: =================
1002
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
649 #ifdef STREAMING
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
650 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
651 stream_reset(stream);
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
652 demuxer=new_demuxer(stream,DEMUXER_TYPE_AVI,audio_id,video_id,dvdsub_id);
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
653 stream_seek(demuxer->stream,seek_to_byte);
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
654 //printf("stream3=0x%X vs. 0x%X\n",demuxer->stream,stream);
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
655 { //---- RIFF header:
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
656 int id=stream_read_dword_le(demuxer->stream); // "RIFF"
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
657 if(id==mmioFOURCC('R','I','F','F')){
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
658 stream_read_dword_le(demuxer->stream); //filesize
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
659 id=stream_read_dword_le(demuxer->stream); // "AVI "
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
660 if(id==formtypeAVI){
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
661 printf("Detected AVI file format!\n");
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
662 file_format=DEMUXER_TYPE_AVI;
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
663 }
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
664 }
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
665 }
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
666 }
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
667 #else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
668 stream_reset(stream);
552
c2a449f90087 dvd sub support reading
arpi_esp
parents: 549
diff changeset
669 demuxer=new_demuxer(stream,DEMUXER_TYPE_AVI,audio_id,video_id,dvdsub_id);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
670 stream_seek(demuxer->stream,seek_to_byte);
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
671 //printf("stream3=0x%X vs. 0x%X\n",demuxer->stream,stream);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
672 { //---- RIFF header:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
673 int id=stream_read_dword_le(demuxer->stream); // "RIFF"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
674 if(id==mmioFOURCC('R','I','F','F')){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
675 stream_read_dword_le(demuxer->stream); //filesize
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
676 id=stream_read_dword_le(demuxer->stream); // "AVI "
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
677 if(id==formtypeAVI){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
678 printf("Detected AVI file format!\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
679 file_format=DEMUXER_TYPE_AVI;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
680 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
681 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
682 }
1002
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
683 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
684 //=============== Try to open as ASF file: =================
1002
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
685 #ifdef STREAMING
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
686 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ASF){
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
687 #else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
688 if(file_format==DEMUXER_TYPE_UNKNOWN){
1002
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
689 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
690 stream_reset(stream);
552
c2a449f90087 dvd sub support reading
arpi_esp
parents: 549
diff changeset
691 demuxer=new_demuxer(stream,DEMUXER_TYPE_ASF,audio_id,video_id,dvdsub_id);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
692 stream_seek(demuxer->stream,seek_to_byte);
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
693 if(asf_check_header(demuxer)){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
694 printf("Detected ASF file format!\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
695 file_format=DEMUXER_TYPE_ASF;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
696 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
697 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
698 //=============== Try to open as MPEG-PS file: =================
1002
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
699 #ifdef STREAMING
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
700 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
701 #else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
702 if(file_format==DEMUXER_TYPE_UNKNOWN){
1002
f035bd1f2749 Streaming function return the file_format and should be tested.
bertrand
parents: 984
diff changeset
703 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
704 stream_reset(stream);
552
c2a449f90087 dvd sub support reading
arpi_esp
parents: 549
diff changeset
705 demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_PS,audio_id,video_id,dvdsub_id);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
706 stream_seek(demuxer->stream,seek_to_byte);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
707 if(audio_format) demuxer->audio->type=audio_format; // override audio format
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
708 if(ds_fill_buffer(demuxer->video)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
709 printf("Detected MPEG-PS file format!\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
710 file_format=DEMUXER_TYPE_MPEG_PS;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
711 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
712 // some hack to get meaningfull error messages to our unhappy users:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
713 // if(num_elementary_packets100>16 &&
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
714 // abs(num_elementary_packets101-num_elementary_packets100)<8){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
715 if(num_elementary_packets100>=2 && num_elementary_packets101>=2 &&
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
716 abs(num_elementary_packets101-num_elementary_packets100)<8){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
717 file_format=DEMUXER_TYPE_MPEG_ES; // <-- hack is here :)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
718 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
719 if(demuxer->synced==2)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
720 printf("Missing MPEG video stream!? contact the author, it may be a bug :(\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
721 else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
722 printf("Not MPEG System Stream format... (maybe Transport Stream?)\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
723 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
724 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
725 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
726 //=============== Try to open as MPEG-ES file: =================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
727 if(file_format==DEMUXER_TYPE_MPEG_ES){ // little hack, see above!
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
728 stream_reset(stream);
552
c2a449f90087 dvd sub support reading
arpi_esp
parents: 549
diff changeset
729 demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_ES,audio_id,video_id,dvdsub_id);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
730 stream_seek(demuxer->stream,seek_to_byte);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
731 if(!ds_fill_buffer(demuxer->video)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
732 printf("Invalid MPEG-ES stream??? contact the author, it may be a bug :(\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
733 file_format=DEMUXER_TYPE_UNKNOWN;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
734 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
735 printf("Detected MPEG-ES file format!\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
736 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
737 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
738 //=============== Unknown, exiting... ===========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
739 if(file_format==DEMUXER_TYPE_UNKNOWN){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
740 printf("============= Sorry, this file format not recognized/supported ===============\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
741 printf("=== If this file is an AVI, ASF or MPEG stream, please contact the author! ===\n");
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
742 GUI_MSG( mplUnknowFileType )
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
743 exit(1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
744 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
745 //====== File format recognized, set up these for compatibility: =========
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
746 d_audio=demuxer->audio;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
747 d_video=demuxer->video;
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
748 d_dvdsub=demuxer->sub;
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
749 //d_audio->sh=sh_audio;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
750 //d_video->sh=sh_video;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
751 //sh_audio=d_audio->sh;sh_audio->ds=d_audio;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
752 //sh_video=d_video->sh;sh_video->ds=d_video;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
753
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
754 sh_audio=NULL;
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
755 sh_video=NULL;
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
756
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
757 switch(file_format){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
758 case DEMUXER_TYPE_AVI: {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
759 //---- AVI header:
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 651
diff changeset
760 read_avi_header(demuxer,f?index_mode:-2);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
761 stream_reset(demuxer->stream);
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
762 stream_seek(demuxer->stream,demuxer->movi_start);
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
763 demuxer->idx_pos=0;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
764 demuxer->idx_pos_a=0;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
765 demuxer->idx_pos_v=0;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
766 if(demuxer->idx_size>0){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
767 // decide index format:
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
768 if(((AVIINDEXENTRY *)demuxer->idx)[0].dwChunkOffset<demuxer->movi_start)
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
769 demuxer->idx_offset=demuxer->movi_start-4;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
770 else
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
771 demuxer->idx_offset=0;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
772 if(verbose) printf("AVI index offset: %d\n",demuxer->idx_offset);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
773 }
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
774 // demuxer->endpos=avi_header.movi_end;
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
775
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
776 if(demuxer->idx_size>0){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
777 // check that file is non-interleaved:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
778 int i;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
779 int a_pos=-1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
780 int v_pos=-1;
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
781 for(i=0;i<demuxer->idx_size;i++){
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
782 AVIINDEXENTRY* idx=&((AVIINDEXENTRY *)demuxer->idx)[i];
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
783 demux_stream_t* ds=demux_avi_select_stream(demuxer,idx->ckid);
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
784 int pos=idx->dwChunkOffset+demuxer->idx_offset;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
785 if(a_pos==-1 && ds==demuxer->audio){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
786 a_pos=pos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
787 if(v_pos!=-1) break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
788 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
789 if(v_pos==-1 && ds==demuxer->video){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
790 v_pos=pos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
791 if(a_pos!=-1) break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
792 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
793 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
794 if(v_pos==-1){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
795 printf("AVI_NI: missing video stream!? contact the author, it may be a bug :(\n");
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
796 GUI_MSG( mplErrorAVINI )
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
797 exit(1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
798 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
799 if(a_pos==-1){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
800 printf("AVI_NI: No audio stream found -> nosound\n");
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
801 has_audio=0;sh_audio=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
802 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
803 if(force_ni || abs(a_pos-v_pos)>0x100000){ // distance > 1MB
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
804 printf("Detected NON-INTERLEAVED AVI file-format!\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
805 demuxer->type=DEMUXER_TYPE_AVI_NI; // HACK!!!!
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
806 pts_from_bps=1; // force BPS sync!
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
807 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
808 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
809 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
810 // no index
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
811 if(force_ni){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
812 printf("Using NON-INTERLEAVED Broken AVI file-format!\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
813 demuxer->type=DEMUXER_TYPE_AVI_NINI; // HACK!!!!
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
814 demuxer->idx_pos_a=
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
815 demuxer->idx_pos_v=demuxer->movi_start;
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
816 pts_from_bps=1; // force BPS sync!
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
817 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
818 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
819 if(!ds_fill_buffer(d_video)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
820 printf("AVI: missing video stream!? contact the author, it may be a bug :(\n");
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
821 GUI_MSG( mplAVIErrorMissingVideoStream )
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
822 exit(1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
823 }
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
824 sh_video=d_video->sh;sh_video->ds=d_video;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
825 if(has_audio){
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
826 if(verbose) printf("AVI: Searching for audio stream (id:%d)\n",d_audio->id);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
827 if(!ds_fill_buffer(d_audio)){
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
828 printf("AVI: No Audio stream found... ->nosound\n");
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
829 has_audio=0;sh_audio=NULL;
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
830 } else {
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
831 sh_audio=d_audio->sh;sh_audio->ds=d_audio;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
832 sh_audio->format=sh_audio->wf->wFormatTag;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
833 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
834 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
835 // calc. FPS:
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
836 sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
837 sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
838 // calculating video bitrate:
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
839 avi_bitrate=demuxer->movi_end-demuxer->movi_start-demuxer->idx_size*8;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
840 if(sh_audio) avi_bitrate-=sh_audio->audio.dwLength;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
841 if(verbose) printf("AVI video length=%d\n",avi_bitrate);
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
842 avi_bitrate=((float)avi_bitrate/(float)sh_video->video.dwLength)*sh_video->fps;
606
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
843 printf("VIDEO: [%.4s] %ldx%ld %dbpp %4.2f fps %5.1f kbps (%4.1f kbyte/s)\n",
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
844 (char *)&sh_video->bih->biCompression,
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
845 sh_video->bih->biWidth,
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
846 sh_video->bih->biHeight,
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
847 sh_video->bih->biBitCount,
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
848 sh_video->fps,
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
849 avi_bitrate*0.008f,
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
850 avi_bitrate/1024.0f );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
851 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
852 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
853 case DEMUXER_TYPE_ASF: {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
854 //---- ASF header:
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
855 read_asf_header(demuxer);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
856 stream_reset(demuxer->stream);
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
857 stream_seek(demuxer->stream,demuxer->movi_start);
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
858 demuxer->idx_pos=0;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
859 // demuxer->endpos=avi_header.movi_end;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
860 if(!ds_fill_buffer(d_video)){
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
861 printf("ASF: no video stream found!\n");
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
862 sh_video=NULL;
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
863 //printf("ASF: missing video stream!? contact the author, it may be a bug :(\n");
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
864 //GUI_MSG( mplASFErrorMissingVideoStream )
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
865 //exit(1);
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
866 } else {
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
867 sh_video=d_video->sh;sh_video->ds=d_video;
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
868 sh_video->fps=1000.0f; sh_video->frametime=0.001f; // 1ms
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
869 printf("VIDEO: [%.4s] %ldx%ld %dbpp\n",
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
870 (char *)&sh_video->bih->biCompression,
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
871 sh_video->bih->biWidth,
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
872 sh_video->bih->biHeight,
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
873 sh_video->bih->biBitCount);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
874 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
875 if(has_audio){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
876 if(verbose) printf("ASF: Searching for audio stream (id:%d)\n",d_audio->id);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
877 if(!ds_fill_buffer(d_audio)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
878 printf("ASF: No Audio stream found... ->nosound\n");
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
879 has_audio=0;sh_audio=NULL;
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
880 } else {
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
881 sh_audio=d_audio->sh;sh_audio->ds=d_audio;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
882 sh_audio->format=sh_audio->wf->wFormatTag;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
883 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
884 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
885 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
886 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
887 case DEMUXER_TYPE_MPEG_ES: {
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
888 d_audio->type=0;
500
c2b3a1f340c8 MPEG-ES segfault fixed, stream list printfs moved v 1->0
arpi_esp
parents: 495
diff changeset
889 has_audio=0;sh_audio=NULL; // ES streams has no audio channel
c2b3a1f340c8 MPEG-ES segfault fixed, stream list printfs moved v 1->0
arpi_esp
parents: 495
diff changeset
890 d_video->sh=new_sh_video(0); // create dummy video stream header, id=0
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
891 break;
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
892 }
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
893 case DEMUXER_TYPE_MPEG_PS: {
606
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
894 if(has_audio) {
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
895 if(!ds_fill_buffer(d_audio)){
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
896 printf("MPEG: No Audio stream found... ->nosound\n");
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
897 has_audio=0;sh_audio=NULL;
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
898 } else {
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
899 sh_audio=d_audio->sh;sh_audio->ds=d_audio;
382
a894e005bb56 moved printf out of switch()
arpi_esp
parents: 378
diff changeset
900 if(verbose) printf("detected MPG-PS audio format: %d\n",d_audio->type);
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
901 switch(d_audio->type){
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
902 case 1: sh_audio->format=0x50;break; // mpeg
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
903 case 2: sh_audio->format=0x10001;break; // dvd pcm
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
904 case 3: sh_audio->format=0x2000;break; // ac3
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
905 default: has_audio=0;sh_audio=NULL; // unknown type
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
906 }
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
907 }
606
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
908 }
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
909 break;
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
910 }
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
911 } // switch(file_format)
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
912
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
913 // DUMP STREAMS:
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
914 if(stream_dump_type){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
915 FILE *f;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
916 demux_stream_t *ds=NULL;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
917 // select stream to dump
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
918 switch(stream_dump_type){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
919 case 1: ds=d_audio;break;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
920 case 2: ds=d_video;break;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
921 case 3: ds=d_dvdsub;break;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
922 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
923 if(!ds){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
924 printf("dump: FATAL: selected stream missing!\n");
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
925 exit(1);
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
926 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
927 // disable other streams:
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
928 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
929 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
930 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
931 // let's dump it!
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
932 f=fopen(stream_dump_name?stream_dump_name:"stream.dump","wb");
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
933 if(!f){ printf("Can't open dump file!!!\n");exit(1); }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
934 while(!ds->eof){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
935 unsigned char* start;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
936 int in_size=ds_get_packet(ds,&start);
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
937 if(in_size>0) fwrite(start,in_size,1,f);
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
938 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
939 fclose(f);
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
940 printf("core dumped :)\n");
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
941 exit(1);
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
942 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
943
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
944
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
945 // Determine image properties:
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
946 switch(file_format){
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
947 case DEMUXER_TYPE_AVI:
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
948 case DEMUXER_TYPE_ASF: {
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
949 // display info:
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
950 if(sh_video){
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
951 sh_video->format=sh_video->bih->biCompression;
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
952 sh_video->disp_w=sh_video->bih->biWidth;
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
953 sh_video->disp_h=abs(sh_video->bih->biHeight);
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
954 }
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
955 break;
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
956 }
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
957 case DEMUXER_TYPE_MPEG_ES:
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
958 case DEMUXER_TYPE_MPEG_PS: {
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
959 // Find sequence_header first:
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
960 if(verbose) printf("Searching for sequence header... ");fflush(stdout);
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
961 while(1){
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
962 int i=sync_video_packet(d_video);
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
963 if(i==0x1B3) break; // found it!
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
964 if(!i || !skip_video_packet(d_video)){
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
965 if(verbose) printf("NONE :(\n");
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
966 printf("MPEG: FATAL: EOF while searching for sequence header\n");
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
967 GUI_MSG( mplMPEGErrorSeqHeaderSearch )
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
968 exit(1);
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
969 }
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
970 }
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
971 if(verbose) printf("OK!\n");
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
972 sh_video=d_video->sh;sh_video->ds=d_video;
894
11bcf34c0a3e mpeg fourcc changed
arpi_esp
parents: 892
diff changeset
973 sh_video->format=0x10000001; // mpeg video
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
974 mpeg2_init();
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
975 // ========= Read & process sequence header & extension ============
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
976 videobuffer=shmem_alloc(VIDEOBUFFER_SIZE);
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
977 if(!videobuffer){
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
978 printf("Cannot allocate shared memory\n");
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
979 GUI_MSG( mplErrorShMemAlloc )
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
980 exit(0);
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
981 }
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
982 videobuf_len=0;
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
983 if(!read_video_packet(d_video)){
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
984 printf("FATAL: Cannot read sequence header!\n");
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
985 GUI_MSG( mplMPEGErrorCannotReadSeqHeader )
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
986 exit(1);
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
987 }
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
988 if(header_process_sequence_header (picture, &videobuffer[4])) {
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
989 printf ("bad sequence header!\n");
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
990 GUI_MSG( mplMPEGErrorBadSeqHeader )
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
991 exit(1);
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
992 }
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
993 if(sync_video_packet(d_video)==0x1B5){ // next packet is seq. ext.
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
994 videobuf_len=0;
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
995 if(!read_video_packet(d_video)){
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
996 printf("FATAL: Cannot read sequence header extension!\n");
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
997 GUI_MSG( mplMPEGErrorCannotReadSeqHeaderExt )
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
998 exit(1);
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
999 }
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
1000 if(header_process_extension (picture, &videobuffer[4])) {
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1001 printf ("bad sequence header extension!\n");
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
1002 GUI_MSG( mplMPEGErrorBadSeqHeaderExt )
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1003 exit(1);
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1004 }
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1005 }
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
1006 // display info:
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1007 sh_video->fps=frameratecode2framerate[picture->frame_rate_code]*0.0001f;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1008 if(!sh_video->fps){
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1009 if(!force_fps){
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1010 printf("FPS not specified (or invalid) in the header! Use the -fps option!\n");
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1011 exit(1);
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1012 }
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1013 sh_video->frametime=0;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1014 } else {
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1015 sh_video->frametime=10000.0f/(float)frameratecode2framerate[picture->frame_rate_code];
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1016 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1017 sh_video->disp_w=picture->display_picture_width;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1018 sh_video->disp_h=picture->display_picture_height;
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
1019 // info:
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
1020 if(verbose) printf("mpeg bitrate: %d (%X)\n",picture->bitrate,picture->bitrate);
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
1021 printf("VIDEO: %s %dx%d (aspect %d) %4.2f fps %5.1f kbps (%4.1f kbyte/s)\n",
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
1022 picture->mpeg1?"MPEG1":"MPEG2",
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1023 sh_video->disp_w,sh_video->disp_h,
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
1024 picture->aspect_ratio_information,
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1025 sh_video->fps,
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
1026 picture->bitrate*0.5f,
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
1027 picture->bitrate/16.0f );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1028 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1029 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1030 } // switch(file_format)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1031
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1032 //if(verbose) printf("file successfully opened (has_audio=%d)\n",has_audio);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1033
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1034 if(sh_video)
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1035 printf("[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n",
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1036 file_format,sh_video->format,sh_video->disp_w,sh_video->disp_h,
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1037 sh_video->fps,sh_video->frametime
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1038 );
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1039
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1040 fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1041
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1042 if(!sh_video){
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1043 printf("Sorry, no video stream... it's unplayable yet\n");
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1044 exit(1);
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1045 }
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1046
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1047 //================== Init AUDIO (codec) ==========================
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1048 if(has_audio){
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1049 // 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
1050 sh_audio->codec=NULL;
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1051 while(1){
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1052 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
1053 if(!sh_audio->codec){
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1054 printf("Can't find codec for audio format 0x%X !\n",sh_audio->format);
919
da072473937a Extended message for misisng codecs
arpi_esp
parents: 906
diff changeset
1055 printf("*** Try to upgrade %s from DOCS/codecs.conf\n",get_path("codecs.conf"));
da072473937a Extended message for misisng codecs
arpi_esp
parents: 906
diff changeset
1056 printf("*** If it's still not OK, then read DOCS/CODECS!\n");
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1057 has_audio=0;
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1058 break;
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1059 }
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1060 if(audio_format>0 && sh_audio->codec->driver!=audio_format) continue;
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1061 printf("Found audio codec: [%s] drv:%d (%s)\n",sh_audio->codec->name,sh_audio->codec->driver,sh_audio->codec->info);
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1062 //has_audio=sh_audio->codec->driver;
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1063 break;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1064 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1065 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1066
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1067 if(has_audio){
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1068 if(verbose) printf("Initializing audio codec...\n");
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1069 if(!init_audio(sh_audio)){
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1070 printf("Couldn't initialize audio codec! -> nosound\n");
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1071 has_audio=0;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1072 } else {
758
5a92a5601666 better audio out buffering & sample_format added
arpi_esp
parents: 751
diff changeset
1073 printf("AUDIO: srate=%d chans=%d bps=%d sfmt=0x%X ratio: %d->%d\n",sh_audio->samplerate,sh_audio->channels,sh_audio->samplesize,
5a92a5601666 better audio out buffering & sample_format added
arpi_esp
parents: 751
diff changeset
1074 sh_audio->sample_format,sh_audio->i_bps,sh_audio->o_bps);
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1075 }
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1076 }
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1077
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1078 //================== Init VIDEO (codec & libvo) ==========================
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1079
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1080 // 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
1081 sh_video->codec=NULL;
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1082 while(1){
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1083 sh_video->codec=find_codec(sh_video->format,
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1084 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
1085 if(!sh_video->codec){
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1086 printf("Can't find codec for video format 0x%X !\n",sh_video->format);
919
da072473937a Extended message for misisng codecs
arpi_esp
parents: 906
diff changeset
1087 printf("*** Try to upgrade %s from DOCS/codecs.conf\n",get_path("codecs.conf"));
da072473937a Extended message for misisng codecs
arpi_esp
parents: 906
diff changeset
1088 printf("*** If it's still not OK, then read DOCS/CODECS!\n");
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1089 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1090 if ( !nogui )
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1091 {
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1092 mplShMem->items.videodata.format=sh_video->format;
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1093 mplSendMessage( mplCantFindCodecForVideoFormat );
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1094 usleep( 10000 );
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1095 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1096 #endif
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1097 exit(1);
626
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1098 }
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1099 if(!allow_dshow && sh_video->codec->driver==4) continue; // skip DShow
550ea1eba1a1 -nodshow/-dshow added, -afm is working again
arpi_esp
parents: 606
diff changeset
1100 break;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1101 }
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1102 //has_video=sh_video->codec->driver;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1103
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1104 printf("Found video codec: [%s] drv:%d (%s)\n",sh_video->codec->name,sh_video->codec->driver,sh_video->codec->info);
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1105
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1106 for(i=0;i<CODECS_MAX_OUTFMT;i++){
487
5dd417ed3a21 vo_debug printfs...
arpi_esp
parents: 482
diff changeset
1107 int ret;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1108 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
1109 if(out_fmt==0xFFFFFFFF) continue;
487
5dd417ed3a21 vo_debug printfs...
arpi_esp
parents: 482
diff changeset
1110 ret=video_out->query_format(out_fmt);
5dd417ed3a21 vo_debug printfs...
arpi_esp
parents: 482
diff changeset
1111 if(verbose) printf("vo_debug: query(0x%X) returned 0x%X\n",out_fmt,ret);
5dd417ed3a21 vo_debug printfs...
arpi_esp
parents: 482
diff changeset
1112 if(ret) break;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1113 }
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1114 if(i>=CODECS_MAX_OUTFMT){
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1115 printf("Sorry, selected video_out device is incompatible with this codec.\n");
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
1116 GUI_MSG( mplIncompatibleVideoOutDevice )
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1117 exit(1);
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1118 }
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1119 sh_video->outfmtidx=i;
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1120
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1121 if(flip==-1){
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1122 // autodetect flipping
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1123 flip=0;
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1124 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
1125 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
1126 flip=1;
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1127 }
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1128
487
5dd417ed3a21 vo_debug printfs...
arpi_esp
parents: 482
diff changeset
1129 if(verbose) printf("vo_debug1: out_fmt=0x%08X\n",out_fmt);
5dd417ed3a21 vo_debug printfs...
arpi_esp
parents: 482
diff changeset
1130
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1131 switch(sh_video->codec->driver){
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1132 case 2: {
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1133 if(!init_video_codec(sh_video)) {
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
1134 GUI_MSG( mplUnknowError )
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1135 exit(1);
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1136 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1137 if(verbose) printf("INFO: Win32 video codec init OK!\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1138 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1139 }
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1140 case 4: { // Win32/DirectShow
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1141 #ifndef USE_DIRECTSHOW
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1142 printf("MPlayer was compiled WITHOUT directshow support!\n");
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
1143 GUI_MSG( mplCompileWithoutDSSupport )
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1144 exit(1);
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1145 #else
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
1146 sh_video->our_out_buffer=NULL;
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1147 if(DS_VideoDecoder_Open(sh_video->codec->dll,&sh_video->codec->guid, sh_video->bih, 0, &sh_video->our_out_buffer)){
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1148 // if(DS_VideoDecoder_Open(sh_video->codec->dll,&sh_video->codec->guid, sh_video->bih, 0, NULL)){
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1149 printf("ERROR: Couldn't open required DirectShow codec: %s\n",sh_video->codec->dll);
273
167356f35b8f lamer_protection++
arpi_esp
parents: 259
diff changeset
1150 printf("Maybe you forget to upgrade your win32 codecs?? It's time to download the new\n");
167356f35b8f lamer_protection++
arpi_esp
parents: 259
diff changeset
1151 printf("package from: ftp://thot.banki.hu/esp-team/linux/MPlayer/w32codec.zip !\n");
167356f35b8f lamer_protection++
arpi_esp
parents: 259
diff changeset
1152 printf("Or you should disable DShow support: make distclean;make -f Makefile.No-DS\n");
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1153 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1154 if ( !nogui )
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1155 {
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1156 strcpy( mplShMem->items.videodata.codecdll,sh_video->codec->dll );
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1157 mplSendMessage( mplDSCodecNotFound );
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1158 usleep( 10000 );
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1159 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1160 #endif
273
167356f35b8f lamer_protection++
arpi_esp
parents: 259
diff changeset
1161 exit(1);
167356f35b8f lamer_protection++
arpi_esp
parents: 259
diff changeset
1162 }
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1163
470
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1164 switch(out_fmt){
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1165 case IMGFMT_YUY2:
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1166 case IMGFMT_UYVY:
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1167 DS_VideoDecoder_SetDestFmt(16,out_fmt);break; // packed YUV
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1168 case IMGFMT_YV12:
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1169 case IMGFMT_I420:
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1170 case IMGFMT_IYUV:
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1171 DS_VideoDecoder_SetDestFmt(12,out_fmt);break; // planar YUV
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1172 default:
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1173 DS_VideoDecoder_SetDestFmt(out_fmt&255,0); // RGB/BGR
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1174 }
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1176 DS_VideoDecoder_Start();
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1177
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1178 printf("DivX setting result = %d\n", DS_SetAttr_DivX("Quality",divx_quality) );
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1179 // printf("DivX setting result = %d\n", DS_SetValue_DivX("Brightness",60) );
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1180
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1181 if(verbose) printf("INFO: Win32/DShow video codec init OK!\n");
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1182 break;
374
cc3f84df9baf Makefile.No-DS fixes
arpi_esp
parents: 371
diff changeset
1183 #endif
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1184 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1185 case 3: { // OpenDivX
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1186 if(verbose) printf("OpenDivX video codec\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1187 { DEC_PARAM dec_param;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1188 DEC_SET dec_set;
851
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1189 #ifdef NEW_DECORE
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1190 DEC_MEM_REQS dec_mem;
855
044cfdebe60c opendivx NEW_DECORE fixed
arpi_esp
parents: 851
diff changeset
1191 dec_param.output_format=DEC_USER;
044cfdebe60c opendivx NEW_DECORE fixed
arpi_esp
parents: 851
diff changeset
1192 #else
044cfdebe60c opendivx NEW_DECORE fixed
arpi_esp
parents: 851
diff changeset
1193 dec_param.color_depth = 32;
044cfdebe60c opendivx NEW_DECORE fixed
arpi_esp
parents: 851
diff changeset
1194 #endif
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1195 dec_param.x_dim = sh_video->bih->biWidth;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1196 dec_param.y_dim = sh_video->bih->biHeight;
851
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1197 #ifdef NEW_DECORE
855
044cfdebe60c opendivx NEW_DECORE fixed
arpi_esp
parents: 851
diff changeset
1198 // 0.50-CVS new malloc scheme
795
ec3accad050c opendivx 0.50cvs stuff added (disabled by default)
arpi_esp
parents: 792
diff changeset
1199 decore(0x123, DEC_OPT_MEMORY_REQS, &dec_param, &dec_mem);
ec3accad050c opendivx 0.50cvs stuff added (disabled by default)
arpi_esp
parents: 792
diff changeset
1200 dec_param.buffers.mp4_edged_ref_buffers=malloc(dec_mem.mp4_edged_ref_buffers_size);
ec3accad050c opendivx 0.50cvs stuff added (disabled by default)
arpi_esp
parents: 792
diff changeset
1201 dec_param.buffers.mp4_edged_for_buffers=malloc(dec_mem.mp4_edged_for_buffers_size);
ec3accad050c opendivx 0.50cvs stuff added (disabled by default)
arpi_esp
parents: 792
diff changeset
1202 dec_param.buffers.mp4_display_buffers=malloc(dec_mem.mp4_display_buffers_size);
ec3accad050c opendivx 0.50cvs stuff added (disabled by default)
arpi_esp
parents: 792
diff changeset
1203 dec_param.buffers.mp4_state=malloc(dec_mem.mp4_state_size);
ec3accad050c opendivx 0.50cvs stuff added (disabled by default)
arpi_esp
parents: 792
diff changeset
1204 dec_param.buffers.mp4_tables=malloc(dec_mem.mp4_tables_size);
ec3accad050c opendivx 0.50cvs stuff added (disabled by default)
arpi_esp
parents: 792
diff changeset
1205 dec_param.buffers.mp4_stream=malloc(dec_mem.mp4_stream_size);
ec3accad050c opendivx 0.50cvs stuff added (disabled by default)
arpi_esp
parents: 792
diff changeset
1206 #endif
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1207 decore(0x123, DEC_OPT_INIT, &dec_param, NULL);
855
044cfdebe60c opendivx NEW_DECORE fixed
arpi_esp
parents: 851
diff changeset
1208
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1209 dec_set.postproc_level = divx_quality;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1210 decore(0x123, DEC_OPT_SETPP, &dec_set, NULL);
795
ec3accad050c opendivx 0.50cvs stuff added (disabled by default)
arpi_esp
parents: 792
diff changeset
1211
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1212 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1213 if(verbose) printf("INFO: OpenDivX video codec init OK!\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1214 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1215 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1216 case 1: {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1217 // init libmpeg2:
41
0d76b2b962ad added mpeg 1/2 postprocessing
arpi_esp
parents: 36
diff changeset
1218 #ifdef MPEG12_POSTPROC
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1219 picture->pp_options=divx_quality;
41
0d76b2b962ad added mpeg 1/2 postprocessing
arpi_esp
parents: 36
diff changeset
1220 #else
0d76b2b962ad added mpeg 1/2 postprocessing
arpi_esp
parents: 36
diff changeset
1221 if(divx_quality){
0d76b2b962ad added mpeg 1/2 postprocessing
arpi_esp
parents: 36
diff changeset
1222 printf("WARNING! You requested image postprocessing for an MPEG 1/2 video,\n");
0d76b2b962ad added mpeg 1/2 postprocessing
arpi_esp
parents: 36
diff changeset
1223 printf(" but compiled MPlayer without MPEG 1/2 postprocessing support!\n");
0d76b2b962ad added mpeg 1/2 postprocessing
arpi_esp
parents: 36
diff changeset
1224 printf(" #define MPEG12_POSTPROC in config.h, and recompile libmpeg2!\n");
0d76b2b962ad added mpeg 1/2 postprocessing
arpi_esp
parents: 36
diff changeset
1225 }
0d76b2b962ad added mpeg 1/2 postprocessing
arpi_esp
parents: 36
diff changeset
1226 #endif
375
28cc43e013fd some cleanup of init_video
arpi_esp
parents: 374
diff changeset
1227 mpeg2_allocate_image_buffers (picture);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1228 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1229 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1230 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1231
487
5dd417ed3a21 vo_debug printfs...
arpi_esp
parents: 482
diff changeset
1232 if(verbose) printf("vo_debug2: out_fmt=0x%08X\n",out_fmt);
5dd417ed3a21 vo_debug printfs...
arpi_esp
parents: 482
diff changeset
1233
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1234 // ================== Init output files for encoding ===============
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1235 if(encode_name){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1236 // encode file!!!
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1237 FILE *encode_file=fopen(encode_name,"rb");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1238 if(encode_file){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1239 fclose(encode_file);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1240 printf("File already exists: %s (don't overwrite your favourite AVI!)\n",encode_name);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1241 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1242 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1243 encode_file=fopen(encode_name,"wb");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1244 if(!encode_file){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1245 printf("Cannot create file for encoding\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1246 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1247 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1248 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
1249 fclose(encode_file);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1250 encode_index_name=malloc(strlen(encode_name)+8);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1251 strcpy(encode_index_name,encode_name);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1252 strcat(encode_index_name,".index");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1253 if((encode_file=fopen(encode_index_name,"wb")))
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1254 fclose(encode_file);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1255 else encode_index_name=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1256 has_audio=0; // disable audio !!!!!
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1257 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1258
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1259 // ========== Init keyboard FIFO (connection to libvo) ============
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1260
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1261 make_pipe(&keyb_fifo_get,&keyb_fifo_put);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1262
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1263 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1264
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1265 #ifdef X11_FULLSCREEN
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1266 if(fullscreen){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1267 if(vo_init()){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1268 //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
1269 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1270 if(!screen_size_xy) screen_size_xy=vo_screenwidth; // scale with asp.ratio
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1271 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1272 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1273
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1274 if(screen_size_xy>0){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1275 if(screen_size_xy<=8){
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1276 screen_size_x=screen_size_xy*sh_video->disp_w;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1277 screen_size_y=screen_size_xy*sh_video->disp_h;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1278 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1279 screen_size_x=screen_size_xy;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1280 screen_size_y=screen_size_xy*sh_video->disp_h/sh_video->disp_w;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1281 }
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
1282 } else if(!vidmode){
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
1283 if(!screen_size_x) screen_size_x=SCREEN_SIZE_X;
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
1284 if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1285 if(screen_size_x<=8) screen_size_x*=sh_video->disp_w;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1286 if(screen_size_y<=8) screen_size_y*=sh_video->disp_h;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1287 }
208
ae0f909ccc7c Adds code to deal with vidmode selection. -- mgraffam
mgraffam
parents: 190
diff changeset
1288
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1289 { const vo_info_t *info = video_out->get_info();
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
1290 printf("VO: [%s] %dx%d => %dx%d %s%s%s%s ",info->short_name,
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1291 sh_video->disp_w,sh_video->disp_h,
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1292 screen_size_x,screen_size_y,
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1293 fullscreen?"fs ":"",
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1294 vidmode?"vm ":"",
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
1295 softzoom?"zoom ":"",
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1296 (flip==1)?"flip ":""
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
1297 // fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3)
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1298 );
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1299 if((out_fmt&IMGFMT_BGR_MASK)==IMGFMT_BGR)
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1300 printf("BGR%d\n",out_fmt&255); else
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
1301 if((out_fmt&IMGFMT_RGB_MASK)==IMGFMT_RGB)
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1302 printf("RGB%d\n",out_fmt&255); else
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1303 if(out_fmt==IMGFMT_YUY2) printf("YUY2\n"); else
470
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1304 if(out_fmt==IMGFMT_UYVY) printf("UYVY\n"); else
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
1305 if(out_fmt==IMGFMT_YVYU) printf("YVYU\n"); else
470
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1306 if(out_fmt==IMGFMT_I420) printf("I420\n"); else
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1307 if(out_fmt==IMGFMT_IYUV) printf("IYUV\n"); else
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1308 if(out_fmt==IMGFMT_YV12) printf("YV12\n");
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1309 }
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1310
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1311 // if(verbose) printf("Destination size: %d x %d out_fmt=%0X\n",
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1312 // screen_size_x,screen_size_y,out_fmt);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1313
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
1314 if(verbose) printf("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
1315 sh_video->disp_w,sh_video->disp_h,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1316 screen_size_x,screen_size_y,
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
1317 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
1318 title,out_fmt);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1319
487
5dd417ed3a21 vo_debug printfs...
arpi_esp
parents: 482
diff changeset
1320 if(verbose) printf("vo_debug3: out_fmt=0x%08X\n",out_fmt);
5dd417ed3a21 vo_debug printfs...
arpi_esp
parents: 482
diff changeset
1321
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1322 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1323 if ( !nogui )
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1324 {
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1325 mplShMem->items.videodata.width=sh_video->disp_w;
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1326 mplShMem->items.videodata.height=sh_video->disp_h;
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1327 mplSendMessage( mplSetVideoData );
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1328 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1329 #endif
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1330
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1331 if(video_out->init(sh_video->disp_w,sh_video->disp_h,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1332 screen_size_x,screen_size_y,
766
479f753a66ae Added -flip passing to init.
atmosfear
parents: 758
diff changeset
1333 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
1334 title,out_fmt)){
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1335 printf("FATAL: Cannot initialize video driver!\n");
748
717e4677d9ce stime compile bug fixed. and GUI_MSG macro defined.
pontscho
parents: 746
diff changeset
1336 GUI_MSG( mplCantInitVideoDriver )
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1337 exit(1);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1338 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1339 if(verbose) printf("INFO: Video OUT driver init OK!\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1340
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1341 fflush(stdout);
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1342
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1343 //================== MAIN: ==========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1344 {
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1345 //float audio_buffer_delay=0;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1346
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1347 //float buffer_delay=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1348 float frame_correction=0; // A-V timestamp kulonbseg atlagolas
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1349 int frame_corr_num=0; //
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1350 float v_frame=0; // Video
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1351 float time_frame=0; // Timer
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1352 float c_total=0;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1353 float max_pts_correction=0;//default_max_pts_correction;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1354 int eof=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1355 int force_redraw=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1356 float num_frames=0; // number of frames played
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1357 double video_time_usage=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1358 double vout_time_usage=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1359 double audio_time_usage=0;
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
1360 int grab_frames=0;
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
1361 char osd_text_buffer[64];
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1362 int drop_frame=0;
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1363 int drop_frame_cnt=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1364
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1365 #ifdef HAVE_LIRC
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1366 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1367 if ( nogui )
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1368 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1369 lirc_mp_setup();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1370 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1371
1005
90682d6f84f5 terminal reset bug with gui fixed
pontscho
parents: 1002
diff changeset
1372 #ifdef HAVE_GUI
90682d6f84f5 terminal reset bug with gui fixed
pontscho
parents: 1002
diff changeset
1373 if ( nogui )
90682d6f84f5 terminal reset bug with gui fixed
pontscho
parents: 1002
diff changeset
1374 {
90682d6f84f5 terminal reset bug with gui fixed
pontscho
parents: 1002
diff changeset
1375 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1376 #ifdef USE_TERMCAP
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1377 load_termcap(NULL); // load key-codes
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1378 #endif
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 651
diff changeset
1379 if(f) getch2_enable();
1005
90682d6f84f5 terminal reset bug with gui fixed
pontscho
parents: 1002
diff changeset
1380 #ifdef HAVE_GUI
90682d6f84f5 terminal reset bug with gui fixed
pontscho
parents: 1002
diff changeset
1381 }
90682d6f84f5 terminal reset bug with gui fixed
pontscho
parents: 1002
diff changeset
1382 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1383
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1384 //========= Catch terminate signals: ================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1385 // terminate requests:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1386 signal(SIGTERM,exit_sighandler); // kill
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1387 signal(SIGHUP,exit_sighandler); // kill -HUP / xterm closed
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1388
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1389 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1390 if ( nogui )
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1391 #endif
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1392 signal(SIGINT,exit_sighandler); // Interrupt from keyboard
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1393
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1394 signal(SIGQUIT,exit_sighandler); // Quit from keyboard
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1395 // fatal errors:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1396 signal(SIGBUS,exit_sighandler); // bus error
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1397 signal(SIGSEGV,exit_sighandler); // segfault
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1398 signal(SIGILL,exit_sighandler); // illegal instruction
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1399 signal(SIGFPE,exit_sighandler); // floating point exc.
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1400 signal(SIGABRT,exit_sighandler); // abort()
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1401
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1402 //================ SETUP AUDIO ==========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1403 current_module="setup_audio";
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1404
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1405 if(has_audio){
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1406
969
a2a296d46bff new option: -srate
arpi_esp
parents: 967
diff changeset
1407 if(!audio_out->init(force_srate?force_srate:sh_audio->samplerate,
a2a296d46bff new option: -srate
arpi_esp
parents: 967
diff changeset
1408 sh_audio->channels,sh_audio->sample_format,0)){
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1409 printf("couldn't open/init audio device -> NOSOUND\n");
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1410 has_audio=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1411 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1412
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1413 // 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
1414
758
5a92a5601666 better audio out buffering & sample_format added
arpi_esp
parents: 751
diff changeset
1415 // fixup audio buffer size:
782
14bac9d91e22 audio buffering fixed
arpi_esp
parents: 780
diff changeset
1416 // if(outburst<MAX_OUTBURST){
14bac9d91e22 audio buffering fixed
arpi_esp
parents: 780
diff changeset
1417 // sh_audio->a_buffer_size=sh_audio->audio_out_minsize+outburst;
14bac9d91e22 audio buffering fixed
arpi_esp
parents: 780
diff changeset
1418 // 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
1419 // }
758
5a92a5601666 better audio out buffering & sample_format added
arpi_esp
parents: 751
diff changeset
1420
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1421 // a_frame=-(audio_buffer_delay);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1422 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1423
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1424 a_frame=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1425
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1426 if(!has_audio){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1427 printf("Audio: no sound\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1428 if(verbose) printf("Freeing %d unused audio chunks\n",d_audio->packs);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1429 ds_free_packs(d_audio); // free buffered chunks
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1430 d_audio->id=-2; // do not read audio chunks
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1431 if(sh_audio) if(sh_audio->a_buffer) free(sh_audio->a_buffer);
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
1432 //alsa=1;
296
c3d7a28a0d1a audio init moved to dec_audio.c
arpi_esp
parents: 291
diff changeset
1433 // fake, required for timer:
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1434 #if 1
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1435 sh_audio=NULL;
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1436 #else
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1437 sh_audio=new_sh_audio(255); // FIXME!!!!!!!!!!
296
c3d7a28a0d1a audio init moved to dec_audio.c
arpi_esp
parents: 291
diff changeset
1438 sh_audio->samplerate=76800;
c3d7a28a0d1a audio init moved to dec_audio.c
arpi_esp
parents: 291
diff changeset
1439 sh_audio->samplesize=sh_audio->channels=2;
c3d7a28a0d1a audio init moved to dec_audio.c
arpi_esp
parents: 291
diff changeset
1440 sh_audio->o_bps=sh_audio->channels*sh_audio->samplerate*sh_audio->samplesize;
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1441 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1442 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1443
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1444 current_module=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1445
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1446 //==================== START PLAYING =======================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1447
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1448 if(file_format==DEMUXER_TYPE_AVI && has_audio){
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1449 //a_pts=d_audio->pts;
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1450 printf("Initial frame delay A: %d V: %d\n",(int)sh_audio->audio.dwInitialFrames,(int)sh_video->video.dwInitialFrames);
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1451 if(!pts_from_bps){
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1452 float x=(float)(sh_audio->audio.dwInitialFrames-sh_video->video.dwInitialFrames)*sh_video->frametime;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1453 audio_delay-=x;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1454 printf("AVI Initial frame delay: %5.3f\n",x);
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1455 }
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1456 if(verbose){
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1457 // printf("v: audio_delay=%5.3f buffer_delay=%5.3f a_pts=%5.3f a_frame=%5.3f\n",
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1458 // audio_delay,audio_buffer_delay,a_pts,a_frame);
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1459 printf("START: a_pts=%5.3f v_pts=%5.3f \n",d_audio->pts,d_video->pts);
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1460 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1461 delay_corrected=0; // has to correct PTS diffs
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1462 d_video->pts=0;d_audio->pts=0; // PTS is outdated now!
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1463 } else {
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1464 pts_from_bps=0; // it must be 0 for mpeg/asf !
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1465 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1466 if(force_fps){
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1467 sh_video->fps=force_fps;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1468 sh_video->frametime=1.0f/sh_video->fps;
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1469 printf("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
1470 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1471
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1472 printf("Start playing...\n");fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1473
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1474 InitTimer();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1475
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1476 while(!eof){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1477
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1478 /*========================== PLAY AUDIO ============================*/
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1479 //if(!has_audio){
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1480 // int playsize=512;
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1481 // a_frame+=playsize/(float)(sh_audio->o_bps);
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1482 // a_pts+=playsize/(float)(sh_audio->o_bps);
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1483 //time_frame+=playsize/(float)(sh_audio->o_bps);
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1484 //} else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1485 while(has_audio){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1486 unsigned int t;
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1487 int playsize=audio_out->get_space();
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1488
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1489 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
1490
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1491 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
1492 //if(playsize>outburst) playsize=outburst;
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
1493
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
1494 // Update buffer if needed
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1495 t=GetTimer();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1496 current_module="decode_audio"; // Enter AUDIO decoder module
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1497 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
1498 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
1499 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
1500 if(ret>0) sh_audio->a_buffer_len+=ret; else break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1501 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1502 current_module=NULL; // Leave AUDIO decoder module
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
1503 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
1504
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1505 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
1506
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1507 playsize=audio_out->play(sh_audio->a_buffer,playsize,0);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1508
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1509 if(playsize>0){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1510 sh_audio->a_buffer_len-=playsize;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1511 memcpy(sh_audio->a_buffer,&sh_audio->a_buffer[playsize],sh_audio->a_buffer_len);
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1512 a_frame+=playsize/(float)(sh_audio->o_bps);
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1513 //a_pts+=playsize/(float)(sh_audio->o_bps);
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1514 // time_frame+=playsize/(float)(sh_audio->o_bps);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1515 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1516
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1517 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1518 } // if(has_audio)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1519
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1520 /*========================== UPDATE TIMERS ============================*/
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1521 #if 0
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1522 if(alsa){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1523 // Use system timer for sync, not audio card/driver
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1524 time_frame-=GetRelativeTime();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1525 if(time_frame<-0.1 || time_frame>0.1){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1526 time_frame=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1527 } else {
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1528 while(time_frame>0.022){
535
1409f80a497d ugly bug at usleep() fixed
arpi_esp
parents: 534
diff changeset
1529 usleep(time_frame-0.022);
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1530 time_frame-=GetRelativeTime();
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1531 }
103
506d7560279c timer fixes
arpi_esp
parents: 92
diff changeset
1532 while(time_frame>0.007){
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1533 usleep(0);
103
506d7560279c timer fixes
arpi_esp
parents: 92
diff changeset
1534 time_frame-=GetRelativeTime();
506d7560279c timer fixes
arpi_esp
parents: 92
diff changeset
1535 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1536 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1537 }
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1538 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1539
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1540 /*========================== PLAY VIDEO ============================*/
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1541
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1542 if(1)
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1543 while(1){
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1544
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1545 float frame_time=1;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1546 float pts1=d_video->pts;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1547
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1548 current_module="decode_video";
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1549
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1550 // if(!force_redraw && v_frame+0.1<a_frame) drop_frame=1; else drop_frame=0;
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1551 // if(drop_frame) ++drop_frame_cnt;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1552
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1553 //-------------------- Decode a frame: -----------------------
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1554 switch(sh_video->codec->driver){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1555 case 3: {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1556 // OpenDivX
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1557 unsigned int t=GetTimer();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1558 unsigned int t2;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1559 DEC_FRAME dec_frame;
851
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1560 #ifdef NEW_DECORE
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1561 DEC_PICTURE dec_pic;
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1562 #endif
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
1563 unsigned char* start=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1564 int in_size=ds_get_packet(d_video,&start);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1565 if(in_size<0){ eof=1;break;}
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1566 if(in_size>max_framesize) max_framesize=in_size;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1567 // let's decode
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1568 dec_frame.length = in_size;
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1569 dec_frame.bitstream = start;
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1570 dec_frame.render_flag = 1;
851
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1571 #ifdef NEW_DECORE
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1572 dec_frame.bmp=&dec_pic;
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1573 dec_pic.y=dec_pic.u=dec_pic.v=NULL;
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1574 #endif
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1575 decore(0x123, 0, &dec_frame, NULL);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1576 t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1577
851
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1578 #ifdef NEW_DECORE
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1579 if(dec_pic.y){
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1580 void* src[3];
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1581 int stride[3];
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1582 src[0]=dec_pic.y;
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1583 src[1]=dec_pic.u;
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1584 src[2]=dec_pic.v;
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1585 stride[0]=dec_pic.stride_y;
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1586 stride[1]=stride[2]=dec_pic.stride_uv;
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1587 video_out->draw_slice(src,stride,
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1588 sh_video->disp_w,sh_video->disp_h,0,0);
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1589 }
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1590 #else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1591 if(opendivx_src[0]){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1592 video_out->draw_slice(opendivx_src,opendivx_stride,
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1593 sh_video->disp_w,sh_video->disp_h,0,0);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1594 opendivx_src[0]=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1595 }
851
8a99c95b0f56 support for new opendivx decore API
arpi_esp
parents: 842
diff changeset
1596 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1597 t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1598
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1599 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1600 }
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1601 #ifdef USE_DIRECTSHOW
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1602 case 4: { // W32/DirectShow
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
1603 unsigned char* start=NULL;
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1604 unsigned int t=GetTimer();
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1605 unsigned int t2;
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1606 int in_size=ds_get_packet(d_video,&start);
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1607 if(in_size<0){ eof=1;break;}
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1608 if(in_size>max_framesize) max_framesize=in_size;
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1609
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 969
diff changeset
1610 if(d_video->flags) if(verbose) printf("***keyframe***\n");
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 969
diff changeset
1611
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1612 if(drop_frame<2) DS_VideoDecoder_DecodeFrame(start, in_size, 0, !drop_frame);
470
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1613 current_module="draw_frame";
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1614
721
05c1bfc5d3ac audio_reset, dshow NULLptr fix
arpi_esp
parents: 715
diff changeset
1615 if(!drop_frame && sh_video->our_out_buffer){
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1616 t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f;
470
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1617 if(out_fmt==IMGFMT_YV12||out_fmt==IMGFMT_IYUV||out_fmt==IMGFMT_I420){
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1618 uint8_t* dst[3];
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1619 int stride[3];
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1620 stride[0]=sh_video->disp_w;
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1621 stride[1]=stride[2]=sh_video->disp_w/2;
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1622 dst[0]=sh_video->our_out_buffer;
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1623 dst[2]=dst[0]+sh_video->disp_w*sh_video->disp_h;
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1624 dst[1]=dst[2]+sh_video->disp_w*sh_video->disp_h/4;
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1625 video_out->draw_slice(dst,stride,sh_video->disp_w,sh_video->disp_h,0,0);
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1626 } else
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
1627 video_out->draw_frame((uint8_t **)&sh_video->our_out_buffer);
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1628 t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f;
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1629 }
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1630 break;
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1631 }
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1632 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1633 case 2: {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1634 HRESULT ret;
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
1635 unsigned char* start=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1636 unsigned int t=GetTimer();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1637 unsigned int t2;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1638 int in_size=ds_get_packet(d_video,&start);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1639 if(in_size<0){ eof=1;break;}
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1640 if(in_size>max_framesize) max_framesize=in_size;
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1641
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 969
diff changeset
1642 if(d_video->flags) if(verbose) printf("***keyframe***\n");
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 969
diff changeset
1643
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1644 if(in_size){
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1645 sh_video->bih->biSizeImage = in_size;
855
044cfdebe60c opendivx NEW_DECORE fixed
arpi_esp
parents: 851
diff changeset
1646
856
arpi_esp
parents: 855
diff changeset
1647 // sh_video->bih->biWidth = 1280;
arpi_esp
parents: 855
diff changeset
1648 // sh_video->o_bih.biWidth = 1280;
855
044cfdebe60c opendivx NEW_DECORE fixed
arpi_esp
parents: 851
diff changeset
1649 // ret = ICDecompress(avi_header.hic, ICDECOMPRESS_NOTKEYFRAME|(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL),
980
e9dedf1e544e -framedrop fixed for VfW (I hope :))
arpi_esp
parents: 979
diff changeset
1650 ret = ICDecompress(sh_video->hic,
e9dedf1e544e -framedrop fixed for VfW (I hope :))
arpi_esp
parents: 979
diff changeset
1651 ( (d_video->flags&1) ? 0 : ICDECOMPRESS_NOTKEYFRAME ) |
e9dedf1e544e -framedrop fixed for VfW (I hope :))
arpi_esp
parents: 979
diff changeset
1652 ( (drop_frame==2 && !(d_video->flags&1))?(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL):0 ) ,
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1653 sh_video->bih, start,
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1654 &sh_video->o_bih,
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1655 drop_frame ? 0 : sh_video->our_out_buffer);
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1656
606
0b1f9eda1ea6 warnings killed
szabii
parents: 598
diff changeset
1657 if(ret){ printf("Error decompressing frame, err=%d\n",(int)ret);break; }
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1658 }
470
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1659 current_module="draw_frame";
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1660 if(!drop_frame){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1661 t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f;
470
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1662 // if(out_fmt==IMGFMT_YV12){
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1663 if(out_fmt==IMGFMT_YV12||out_fmt==IMGFMT_IYUV||out_fmt==IMGFMT_I420){
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1664 uint8_t* dst[3];
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1665 int stride[3];
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1666 stride[0]=sh_video->disp_w;
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1667 stride[1]=stride[2]=sh_video->disp_w/2;
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1668 dst[0]=sh_video->our_out_buffer;
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1669 dst[2]=dst[0]+sh_video->disp_w*sh_video->disp_h;
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1670 dst[1]=dst[2]+sh_video->disp_w*sh_video->disp_h/4;
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1671 video_out->draw_slice(dst,stride,sh_video->disp_w,sh_video->disp_h,0,0);
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 459
diff changeset
1672 } else
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
1673 video_out->draw_frame((uint8_t **)&sh_video->our_out_buffer);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1674 t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f;
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1675 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1676 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1677 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1678 case 1: {
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1679 int in_frame=0;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1680 int t=0;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1681 float newfps;
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1682 videobuf_len=0;
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1683 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1684 int i=sync_video_packet(d_video);
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1685 if(in_frame){
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1686 if(i<0x101 || i>=0x1B0){ // not slice code -> end of frame
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1687 #if 1
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1688 // send END OF FRAME code:
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1689 videobuffer[videobuf_len+0]=0;
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1690 videobuffer[videobuf_len+1]=0;
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1691 videobuffer[videobuf_len+2]=1;
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1692 videobuffer[videobuf_len+3]=0xFF;
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1693 videobuf_len+=4;
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1694 #endif
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1695 if(!i) eof=1; // EOF
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1696 break;
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1697 }
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1698 } else {
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1699 //if(i==0x100) in_frame=1; // picture startcode
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1700 if(i>=0x101 && i<0x1B0) in_frame=1; // picture startcode
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1701 else if(!i){ eof=1; break;} // EOF
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1702 }
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1703 if(grab_frames==2 && (i==0x1B3 || i==0x1B8)) grab_frames=1;
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1704 if(!read_video_packet(d_video)){ eof=1; break;} // EOF
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1705 //printf("read packet 0x%X, len=%d\n",i,videobuf_len);
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1706 }
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1707
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1708 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
1709 //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
1710 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
1711 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
1712 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
1713 fclose(f);
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1714 }
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1715
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1716 t-=GetTimer();
967
5f07e67982d6 -framedrop worx fro mpeg files
arpi_esp
parents: 960
diff changeset
1717 mpeg2_decode_data(video_out, videobuffer, videobuffer+videobuf_len,drop_frame);
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1718 t+=GetTimer(); video_time_usage+=t*0.000001;
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
1719
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1720 newfps=frameratecode2framerate[picture->frame_rate_code]*0.0001f;
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1721 if(ABS(sh_video->fps-newfps)>0.01f) if(!force_fps){
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1722 printf("Warning! FPS changed %5.3f -> %5.3f (%f) [%d] \n",sh_video->fps,newfps,sh_video->fps-newfps,picture->frame_rate_code);
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1723 sh_video->fps=newfps;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1724 sh_video->frametime=10000.0f/(float)frameratecode2framerate[picture->frame_rate_code];
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1725 }
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
1726
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1727 frame_time=(100+picture->repeat_count)*0.01f;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1728 picture->repeat_count=0;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1729
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1730 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1731 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1732 } // switch
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1733 //------------------------ frame decoded. --------------------
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1734
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1735 // Increase video timers:
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1736 num_frames+=frame_time;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1737 frame_time*=sh_video->frametime;
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1738 if(file_format==DEMUXER_TYPE_ASF && !force_fps){
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1739 // .ASF files has no fixed FPS - just frame durations!
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1740 float d=d_video->pts-pts1;
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1741 if(d>=0 && d<5) frame_time=d;
595
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
1742 if(d>0){
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
1743 if(verbose)
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
1744 if((int)sh_video->fps==1000)
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
1745 printf("\rASF framerate: %d fps \n",(int)(1.0f/d));
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
1746 sh_video->frametime=d; // 1ms
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
1747 sh_video->fps=1.0f/d;
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
1748 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1749 }
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1750 v_frame+=frame_time;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1751 //v_pts+=frame_time;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1752 time_frame+=frame_time; // for nosound
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1753
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1754 if(file_format==DEMUXER_TYPE_MPEG_PS) d_video->pts+=frame_time;
940
108ac8795d19 -fps 1 fixed
arpi_esp
parents: 939
diff changeset
1755
108ac8795d19 -fps 1 fixed
arpi_esp
parents: 939
diff changeset
1756 if(verbose>1) printf("*** ftime=%5.3f ***\n",frame_time);
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1757
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1758 if(drop_frame){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1759
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1760 if(has_audio){
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1761 int delay=audio_out->get_delay();
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1762 if(verbose>1)printf("delay=%d\n",delay);
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1763 time_frame=v_frame;
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1764 time_frame-=a_frame-(float)delay/(float)sh_audio->o_bps;
940
108ac8795d19 -fps 1 fixed
arpi_esp
parents: 939
diff changeset
1765 if(time_frame>-2*frame_time) drop_frame=0; // stop dropping frames
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1766 }
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1767
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1768 } else {
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1769 // It's time to sleep...
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1770 current_module="sleep";
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1771
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1772 time_frame-=GetRelativeTime(); // reset timer
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1773
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1774 if(has_audio){
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1775 int delay=audio_out->get_delay();
758
5a92a5601666 better audio out buffering & sample_format added
arpi_esp
parents: 751
diff changeset
1776 if(verbose>1)printf("delay=%d\n",delay);
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1777 time_frame=v_frame;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1778 time_frame-=a_frame-(float)delay/(float)sh_audio->o_bps;
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1779 // we are out of time... drop next frame!
940
108ac8795d19 -fps 1 fixed
arpi_esp
parents: 939
diff changeset
1780 if(time_frame<-2*frame_time){
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1781 drop_frame=frame_dropping; // tricky!
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1782 ++drop_frame_cnt;
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1783 }
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1784 } else {
940
108ac8795d19 -fps 1 fixed
arpi_esp
parents: 939
diff changeset
1785 if(time_frame<-3*frame_time || time_frame>3*frame_time) time_frame=0;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1786 }
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1787
758
5a92a5601666 better audio out buffering & sample_format added
arpi_esp
parents: 751
diff changeset
1788 if(verbose>1)printf("sleep: %5.3f a:%6.3f v:%6.3f \n",time_frame,a_frame,v_frame);
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1789
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1790 while(time_frame>0.005){
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1791 if(time_frame<=0.020)
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1792 usleep(0); // sleep 10ms
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1793 else
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1794 usleep(1000000*(time_frame-0.002));
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1795 time_frame-=GetRelativeTime();
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1796 }
117
b21b7c2fa180 common vo->flip_page() call
arpi_esp
parents: 112
diff changeset
1797
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1798 current_module="flip_page";
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1799 video_out->flip_page();
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1800 // usleep(50000); // test only!
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1801
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1802 }
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1803
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1804 current_module=NULL;
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
1805
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1806 if(eof) break;
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1807 if(force_redraw){
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1808 --force_redraw;
577
feeb61dd92ea Fixed broken pause function.
atmosfear
parents: 564
diff changeset
1809 if(!force_redraw) osd_function=OSD_PLAY;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1810 continue;
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1811 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1812
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1813 // 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,a_frame);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1814 // fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1815
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1816 #if 1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1817 /*================ A-V TIMESTAMP CORRECTION: =========================*/
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1818 if(has_audio){
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1819 float a_pts=0;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1820 float v_pts=0;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1821
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1822 // unplayed bytes in our and soundcard/dma buffer:
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1823 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
1824 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
1825
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1826 if(pts_from_bps){
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1827 // PTS = (audio position)/(bytes per sec)
815
e34052fd9633 i_bps vs. nAvgBytesPerSec
arpi_esp
parents: 798
diff changeset
1828 // a_pts=(ds_tell(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
e34052fd9633 i_bps vs. nAvgBytesPerSec
arpi_esp
parents: 798
diff changeset
1829 a_pts=(ds_tell(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->wf->nAvgBytesPerSec;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1830 delay_corrected=1; // hack
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
1831 v_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
1832 if(verbose)printf("%5.3f|",v_pts-d_video->pts);
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1833 } else {
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1834 if(!delay_corrected && d_audio->pts){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1835 float x=d_audio->pts-d_video->pts-(delay+audio_delay);
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1836 float y=-(delay+audio_delay);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1837 printf("Initial PTS delay: %5.3f sec (calculated: %5.3f)\n",x,y);
933
f5dbe3470eae -nobps seeking fixed
arpi_esp
parents: 924
diff changeset
1838 initial_pts_delay+=x;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1839 audio_delay+=x;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1840 delay_corrected=1;
340
1f7c824033fb less, and more informal printfs
arpi_esp
parents: 337
diff changeset
1841 if(verbose)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1842 printf("v: audio_delay=%5.3f buffer_delay=%5.3f a.pts=%5.3f v.pts=%5.3f\n",
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1843 audio_delay,delay,d_audio->pts,d_video->pts);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1844 }
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1845 // 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
1846 a_pts=d_audio->pts;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1847 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
1848 v_pts=d_video->pts-frame_time;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1849 }
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1850
933
f5dbe3470eae -nobps seeking fixed
arpi_esp
parents: 924
diff changeset
1851 if(verbose>1)printf("### 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
1852
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1853 if(frame_corr_num==1){
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1854 float x=frame_correction;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1855 if(delay_corrected){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1856 // printf("A:%6.1f V:%6.1f A-V:%7.3f",a_pts-audio_delay-delay,v_pts,x);
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1857 printf("A:%6.1f (%6.1f) V:%6.1f A-V:%7.3f",a_pts,a_pts-audio_delay-delay,v_pts,x);
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1858 x*=0.1f;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1859 if(x<-max_pts_correction) x=-max_pts_correction; else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1860 if(x> max_pts_correction) x= max_pts_correction;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1861 if(default_max_pts_correction>=0)
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1862 max_pts_correction=default_max_pts_correction;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1863 else
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1864 max_pts_correction=sh_video->frametime*0.10; // +-10% of time
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1865 a_frame+=x; c_total+=x;
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1866 printf(" ct:%7.3f %3d %2d%% %2d%% %3.1f%% %d\r",c_total,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1867 (int)num_frames,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1868 (v_frame>0.5)?(int)(100.0*video_time_usage/(double)v_frame):0,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1869 (v_frame>0.5)?(int)(100.0*vout_time_usage/(double)v_frame):0,
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1870 (v_frame>0.5)?(100.0*audio_time_usage/(double)v_frame):0
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
1871 ,drop_frame_cnt
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1872 );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1873 fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1874 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1875 frame_corr_num=0; frame_correction=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1876 }
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1877
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1878 if(frame_corr_num>=0) frame_correction+=(a_pts-delay-audio_delay)-v_pts;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1879
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1880 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1881 // No audio:
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
1882 //if(d_video->pts)
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1883 float v_pts=d_video->pts;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1884 if(frame_corr_num==5){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1885 // printf("A: --- V:%6.1f \r",v_pts);
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1886 printf("V:%6.1f %3d %2d%% %2d%% %3.1f%% \r",v_pts,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1887 (int)num_frames,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1888 (v_frame>0.5)?(int)(100.0*video_time_usage/(double)v_frame):0,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1889 (v_frame>0.5)?(int)(100.0*vout_time_usage/(double)v_frame):0,
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1890 (v_frame>0.5)?(100.0*audio_time_usage/(double)v_frame):0
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
1891 );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1892
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1893 fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1894 frame_corr_num=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1895 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1896 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1897 ++frame_corr_num;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1898 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1899
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1900 if(osd_visible){
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1901 --osd_visible;
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1902 if(!osd_visible) vo_osd_progbar_type=-1; // disable
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1903 }
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1904
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1905 if(osd_function==OSD_PAUSE){
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1906 printf("\n------ PAUSED -------\r");fflush(stdout);
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1907 audio_out->reset(); // stop audio
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1908 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1909 if ( nogui )
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1910 {
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1911 #endif
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1912 while(
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1913 #ifdef HAVE_LIRC
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1914 lirc_mp_getinput()<=0 &&
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1915 #endif
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1916 (!f || getch2(20)<=0) && mplayer_get_key()<=0){
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1917 video_out->check_events();
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1918 if(!f) usleep(1000); // do not eat the CPU
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1919 }
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1920 osd_function=OSD_PLAY;
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1921 #ifdef HAVE_GUI
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1922 } else while( osd_function != OSD_PLAY ) usleep( 1000 );
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1923 #endif
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1924 }
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1925
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1926
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1927 if(!force_redraw) break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1928 } // while(v_frame<a_frame || force_redraw)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1929
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1930
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1931 //================= Keyboard events, SEEKing ====================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1932
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1933 { int c;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1934 while(
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1935 #ifdef HAVE_LIRC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1936 (c=lirc_mp_getinput())>0 ||
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1937 #endif
701
14c720e7b85c Fixed bug of mplayer freezing - better
arpi_esp
parents: 695
diff changeset
1938 (f && (c=getch2(0))>0) || (c=mplayer_get_key())>0) switch(c){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1939 // seek 10 sec
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1940 case KEY_RIGHT:
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1941 osd_function=OSD_FFW;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1942 rel_seek_secs+=10;break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1943 case KEY_LEFT:
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1944 osd_function=OSD_REW;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1945 rel_seek_secs-=10;break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1946 // seek 1 min
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1947 case KEY_UP:
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1948 osd_function=OSD_FFW;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1949 rel_seek_secs+=60;break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1950 case KEY_DOWN:
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1951 osd_function=OSD_REW;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1952 rel_seek_secs-=60;break;
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1953 // seek 10 min
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1954 case KEY_PAGE_UP:
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1955 rel_seek_secs+=600;break;
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1956 case KEY_PAGE_DOWN:
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
1957 rel_seek_secs-=600;break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1958 // delay correction:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1959 case '+':
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1960 audio_delay+=0.1; // increase audio buffer delay
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1961 a_frame-=0.1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1962 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1963 case '-':
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
1964 audio_delay-=0.1; // decrease audio buffer delay
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1965 a_frame+=0.1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1966 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1967 // quit
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1968 case KEY_ESC: // ESC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1969 case KEY_ENTER: // ESC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1970 case 'q': exit_player("Quit");
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
1971 case 'g': grab_frames=2;break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1972 // pause
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1973 case 'p':
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1974 case ' ':
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1975 osd_function=OSD_PAUSE;
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1976 break;
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1977 case 'o': // toggle OSD
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
1978 osd_level=(osd_level+1)%3;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1979 break;
939
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
1980 case 'z':
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
1981 sub_delay -= 0.1;
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
1982 break;
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
1983 case 'x':
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
1984 sub_delay += 0.1;
ac9237ee06e1 Subtitle sync with 'z' and 'x'
laaz
parents: 937
diff changeset
1985 break;
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
1986 case '*':
555
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1987 case '/': {
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1988 int mixer_l=0; int mixer_r=0;
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1989 mixer_getvolume( &mixer_l,&mixer_r );
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1990 if(c=='*'){
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1991 if ( mixer_l < 100 ) mixer_l++;
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1992 if ( mixer_r < 100 ) mixer_r++;
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1993 } else {
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1994 if ( mixer_l > 0 ) mixer_l--;
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1995 if ( mixer_r > 0 ) mixer_r--;
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1996 }
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1997 mixer_setvolume( mixer_l,mixer_r );
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1998
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
1999 if(osd_level){
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2000 osd_visible=sh_video->fps; // 1 sec
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2001 vo_osd_progbar_type=OSD_VOLUME;
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2002 vo_osd_progbar_value=(mixer_l+mixer_r)*5/4;
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2003 //printf("volume: %d\n",vo_osd_progbar_value);
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2004 }
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2005 }
5bfbe42747e5 OSD progress bar for volume
arpi_esp
parents: 554
diff changeset
2006 break;
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
2007 case 'm':
510
2951d138ddaf add sub autoread & remove 'c' key
pontscho
parents: 500
diff changeset
2008 mixer_usemaster=!mixer_usemaster;
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
2009 break;
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
2010 case 'd':
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
2011 frame_dropping=(frame_dropping+1)%3;
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
2012 printf("== drop: %d == \n",frame_dropping);
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
2013 break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2014 }
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
2015 if (seek_to_sec) {
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2016 int a,b; float d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2017
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2018 if (sscanf(seek_to_sec, "%d:%d:%f", &a,&b,&d)==3)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2019 rel_seek_secs += 3600*a +60*b +d ;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2020 else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2021 rel_seek_secs += 60*a +d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2022 else if (sscanf(seek_to_sec, "%f", &d)==1)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2023 rel_seek_secs += d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2024
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2025 seek_to_sec = NULL;
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
2026 }
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
2027
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2028 if(rel_seek_secs)
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
2029 if(file_format==DEMUXER_TYPE_AVI && demuxer->idx_size<=0){
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
2030 printf("Can't seek in raw .AVI streams! (index required, try with the -idx switch!) \n");
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2031 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2032 int skip_audio_bytes=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2033 float skip_audio_secs=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2034
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2035 // clear demux buffers:
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
2036 if(has_audio){ ds_free_packs(d_audio);sh_audio->a_buffer_len=0;}
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2037 ds_free_packs(d_video);
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
2038
296
c3d7a28a0d1a audio init moved to dec_audio.c
arpi_esp
parents: 291
diff changeset
2039 // printf("sh_audio->a_buffer_len=%d \n",sh_audio->a_buffer_len);
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
2040
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2041
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2042 switch(file_format){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2043
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2044 case DEMUXER_TYPE_AVI: {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2045 //================= seek in AVI ==========================
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
2046 int rel_seek_frames=rel_seek_secs*sh_video->fps;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2047 int curr_audio_pos=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2048 int audio_chunk_pos=-1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2049 int video_chunk_pos=d_video->pos;
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
2050
940
108ac8795d19 -fps 1 fixed
arpi_esp
parents: 939
diff changeset
2051 skip_video_frames=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2052 avi_audio_pts=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2053
940
108ac8795d19 -fps 1 fixed
arpi_esp
parents: 939
diff changeset
2054 // find nearest video keyframe chunk pos:
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2055 if(rel_seek_frames>0){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2056 // seek forward
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
2057 while(video_chunk_pos<demuxer->idx_size){
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
2058 int id=((AVIINDEXENTRY *)demuxer->idx)[video_chunk_pos].ckid;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2059 if(avi_stream_id(id)==d_video->id){ // video frame
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
2060 if((--rel_seek_frames)<0 && ((AVIINDEXENTRY *)demuxer->idx)[video_chunk_pos].dwFlags&AVIIF_KEYFRAME) break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2061 ++skip_audio_bytes;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2062 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2063 ++video_chunk_pos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2064 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2065 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2066 // seek backward
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2067 while(video_chunk_pos>=0){
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
2068 int id=((AVIINDEXENTRY *)demuxer->idx)[video_chunk_pos].ckid;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2069 if(avi_stream_id(id)==d_video->id){ // video frame
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
2070 if((++rel_seek_frames)>0 && ((AVIINDEXENTRY *)demuxer->idx)[video_chunk_pos].dwFlags&AVIIF_KEYFRAME) break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2071 --skip_audio_bytes;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2072 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2073 --video_chunk_pos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2074 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2075 }
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
2076 demuxer->idx_pos_a=demuxer->idx_pos_v=demuxer->idx_pos=video_chunk_pos;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2077 // printf("%d frames skipped\n",skip_audio_bytes);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2078
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2079 // re-calc video pts:
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
2080 d_video->pack_no=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2081 for(i=0;i<video_chunk_pos;i++){
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
2082 int id=((AVIINDEXENTRY *)demuxer->idx)[i].ckid;
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
2083 if(avi_stream_id(id)==d_video->id) ++d_video->pack_no;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2084 }
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
2085 num_frames=d_video->pack_no;
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
2086 avi_video_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
2087
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2088 if(has_audio){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2089 int i;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2090 int apos=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2091 int last=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2092 int len=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2093
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2094 // calc new audio position in audio stream: (using avg.bps value)
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
2095 curr_audio_pos=(avi_video_pts) * sh_audio->wf->nAvgBytesPerSec;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2096 if(curr_audio_pos<0)curr_audio_pos=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2097 #if 1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2098 curr_audio_pos&=~15; // requires for PCM formats!!!
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2099 #else
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
2100 curr_audio_pos/=sh_audio->wf->nBlockAlign;
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
2101 curr_audio_pos*=sh_audio->wf->nBlockAlign;
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
2102 demuxer->audio_seekable=1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2103 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2104
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2105 // find audio chunk pos:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2106 for(i=0;i<video_chunk_pos;i++){
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
2107 int id=((AVIINDEXENTRY *)demuxer->idx)[i].ckid;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2108 if(avi_stream_id(id)==d_audio->id){
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
2109 len=((AVIINDEXENTRY *)demuxer->idx)[i].dwChunkLength;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2110 last=i;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2111 if(apos<=curr_audio_pos && curr_audio_pos<(apos+len)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2112 if(verbose)printf("break;\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2113 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2114 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2115 apos+=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2116 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2117 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2118 if(verbose)printf("XXX i=%d last=%d apos=%d curr_audio_pos=%d \n",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2119 i,last,apos,curr_audio_pos);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2120 // audio_chunk_pos=last; // maybe wrong (if not break; )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2121 audio_chunk_pos=i; // maybe wrong (if not break; )
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2122 skip_audio_bytes=curr_audio_pos-apos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2123
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2124 // update stream position:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2125 d_audio->pos=audio_chunk_pos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2126 d_audio->dpos=apos;
933
f5dbe3470eae -nobps seeking fixed
arpi_esp
parents: 924
diff changeset
2127 d_audio->pts=initial_pts_delay+(float)apos/(float)sh_audio->wf->nAvgBytesPerSec;
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
2128 demuxer->idx_pos_a=demuxer->idx_pos_v=demuxer->idx_pos=audio_chunk_pos;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2129
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
2130 if(!(sh_audio->codec->flags&CODECS_FLAG_SEEKABLE)){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2131 #if 0
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2132 // curr_audio_pos=apos; // selected audio codec can't seek in chunk
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
2133 skip_audio_secs=(float)skip_audio_bytes/(float)sh_audio->wf->nAvgBytesPerSec;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2134 //printf("Seek_AUDIO: %d bytes --> %5.3f secs\n",skip_audio_bytes,skip_audio_secs);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2135 skip_audio_bytes=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2136 #else
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
2137 int d=skip_audio_bytes % sh_audio->wf->nBlockAlign;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2138 skip_audio_bytes-=d;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2139 // curr_audio_pos-=d;
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
2140 skip_audio_secs=(float)d/(float)sh_audio->wf->nAvgBytesPerSec;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2141 //printf("Seek_AUDIO: %d bytes --> %5.3f secs\n",d,skip_audio_secs);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2142 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2143 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2144 // now: audio_chunk_pos=pos in index
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2145 // skip_audio_bytes=bytes to skip from that chunk
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2146 // skip_audio_secs=time to play audio before video (if can't skip)
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
2147
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2148 // calc skip_video_frames & adjust video pts counter:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2149 // i=last;
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
2150 for(i=demuxer->idx_pos;i<video_chunk_pos;i++){
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
2151 int id=((AVIINDEXENTRY *)demuxer->idx)[i].ckid;
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
2152 if(avi_stream_id(id)==d_video->id) ++skip_video_frames;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2153 }
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
2154 // requires for correct audio pts calculation (demuxer):
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
2155 avi_video_pts-=skip_video_frames*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
2156
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2157 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2158
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2159 if(verbose) printf("SEEK: idx=%d (a:%d v:%d) v.skip=%d a.skip=%d/%4.3f \n",
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
2160 demuxer->idx_pos,audio_chunk_pos,video_chunk_pos,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2161 skip_video_frames,skip_audio_bytes,skip_audio_secs);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2162
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2163 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2164 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2165
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2166 case DEMUXER_TYPE_ASF: {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2167 //================= seek in ASF ==========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2168 float p_rate=10; // packets / sec
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2169 int rel_seek_packs=rel_seek_secs*p_rate;
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 578
diff changeset
2170 int rel_seek_bytes=rel_seek_packs*asf_packetsize;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2171 int newpos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2172 //printf("ASF: packs: %d duration: %d \n",(int)fileh.packets,*((int*)&fileh.duration));
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2173 // printf("ASF_seek: %d secs -> %d packs -> %d bytes \n",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2174 // rel_seek_secs,rel_seek_packs,rel_seek_bytes);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2175 newpos=demuxer->filepos+rel_seek_bytes;
638
db92248b5e78 'asf seeking before start' bug fixed
arpi_esp
parents: 626
diff changeset
2176 if(newpos<0 || newpos<demuxer->movi_start) newpos=demuxer->movi_start;
645
aae0cdcf6748 asf seek debug printf removed
arpi_esp
parents: 641
diff changeset
2177 // printf("\r -- asf: newpos=%d -- \n",newpos);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2178 stream_seek(demuxer->stream,newpos);
1009
c51d7e4853d6 finished .asf seeking
arpi_esp
parents: 1005
diff changeset
2179
c51d7e4853d6 finished .asf seeking
arpi_esp
parents: 1005
diff changeset
2180 ds_fill_buffer(d_video);
c51d7e4853d6 finished .asf seeking
arpi_esp
parents: 1005
diff changeset
2181 if(has_audio) ds_fill_buffer(d_audio);
c51d7e4853d6 finished .asf seeking
arpi_esp
parents: 1005
diff changeset
2182
c51d7e4853d6 finished .asf seeking
arpi_esp
parents: 1005
diff changeset
2183 while(1){
c51d7e4853d6 finished .asf seeking
arpi_esp
parents: 1005
diff changeset
2184 if(has_audio){
c51d7e4853d6 finished .asf seeking
arpi_esp
parents: 1005
diff changeset
2185 // sync audio:
c51d7e4853d6 finished .asf seeking
arpi_esp
parents: 1005
diff changeset
2186 if (d_video->pts > d_audio->pts){
c51d7e4853d6 finished .asf seeking
arpi_esp
parents: 1005
diff changeset
2187 if(!ds_fill_buffer(d_audio)) has_audio=0; // skip audio. EOF?
c51d7e4853d6 finished .asf seeking
arpi_esp
parents: 1005
diff changeset
2188 continue;
c51d7e4853d6 finished .asf seeking
arpi_esp
parents: 1005
diff changeset
2189 }
c51d7e4853d6 finished .asf seeking
arpi_esp
parents: 1005
diff changeset
2190 }
c51d7e4853d6 finished .asf seeking
arpi_esp
parents: 1005
diff changeset
2191 if(d_video->flags&1) break; // found a keyframe!
c51d7e4853d6 finished .asf seeking
arpi_esp
parents: 1005
diff changeset
2192 if(!ds_fill_buffer(d_video)) break; // skip frame. EOF?
c51d7e4853d6 finished .asf seeking
arpi_esp
parents: 1005
diff changeset
2193 }
c51d7e4853d6 finished .asf seeking
arpi_esp
parents: 1005
diff changeset
2194
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2195 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2196 break;
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
2197
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2198 case DEMUXER_TYPE_MPEG_ES:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2199 case DEMUXER_TYPE_MPEG_PS: {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2200 //================= seek in MPEG ==========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2201 int newpos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2202 if(picture->bitrate==0x3FFFF) // unspecified?
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2203 newpos=demuxer->filepos+2324*75*rel_seek_secs; // 174.3 kbyte/sec
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2204 else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2205 newpos=demuxer->filepos+(picture->bitrate*1000/16)*rel_seek_secs;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2206
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2207 if(newpos<seek_to_byte) newpos=seek_to_byte;
495
d4eb6bd44bbc Seeking to sector boundary (STREAM_BUFFER_SIZE) for MPEGs
lgb
parents: 492
diff changeset
2208 newpos&=~(STREAM_BUFFER_SIZE-1); /* sector boundary */
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2209 stream_seek(demuxer->stream,newpos);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2210 // re-sync video:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2211 videobuf_code_len=0; // reset ES stream buffer
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2212 while(1){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2213 int i=sync_video_packet(d_video);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2214 if(i==0x1B3 || i==0x1B8) break; // found it!
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2215 if(!i || !skip_video_packet(d_video)){ eof=1; break;} // EOF
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2216 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2217 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2218 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2219
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2220 } // switch(file_format)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2221
595
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
2222 // Set OSD:
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
2223 if(osd_level){
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
2224 int len=((demuxer->movi_end-demuxer->movi_start)>>8);
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
2225 if(len>0){
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
2226 osd_visible=sh_video->fps; // 1 sec
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
2227 vo_osd_progbar_type=0;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
2228 vo_osd_progbar_value=(demuxer->filepos-demuxer->movi_start)/len;
595
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
2229 }
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2230 //printf("avi filepos = %d (len=%d)\n",vo_osd_progbar_value,len);
595
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
2231 }
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
2232
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2233 //====================== re-sync audio: =====================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2234 if(has_audio){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2235
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2236 if(skip_audio_bytes){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2237 demux_read_data(d_audio,NULL,skip_audio_bytes);
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
2238 //d_audio->pts=0; // PTS is outdated because of the raw data skipping
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2239 }
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
2240
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2241 current_module="resync_audio";
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2242
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
2243 switch(sh_audio->codec->driver){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2244 case 1:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2245 MP3_DecodeFrame(NULL,-2); // resync
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2246 MP3_DecodeFrame(NULL,-2); // resync
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2247 MP3_DecodeFrame(NULL,-2); // resync
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2248 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2249 case 3:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2250 ac3_bitstream_reset(); // reset AC3 bitstream buffer
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2251 // if(verbose){ printf("Resyncing AC3 audio...");fflush(stdout);}
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
2252 sh_audio->ac3_frame=ac3_decode_frame(); // resync
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2253 // if(verbose) printf(" OK!\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2254 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2255 case 4:
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
2256 case 7:
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
2257 sh_audio->a_in_buffer_len=0; // reset ACM/DShow audio buffer
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2258 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2259 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2260
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2261 // re-sync PTS (MPEG-PS only!!!)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2262 if(file_format==DEMUXER_TYPE_MPEG_PS)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2263 if(d_video->pts && d_audio->pts){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2264 if (d_video->pts < d_audio->pts){
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
2265
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2266 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2267 while(d_video->pts > d_audio->pts){
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
2268 switch(sh_audio->codec->driver){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2269 case 1: MP3_DecodeFrame(NULL,-2);break; // skip MPEG frame
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 273
diff changeset
2270 case 3: sh_audio->ac3_frame=ac3_decode_frame();break; // skip AC3 frame
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2271 default: ds_fill_buffer(d_audio); // skip PCM frame
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2272 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2273 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2274 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2275 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2276
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
2277 current_module=NULL;
722
b570318ac2f4 audio_reset nosound fix
arpi_esp
parents: 721
diff changeset
2278
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
2279 audio_out->reset(); // stop audio
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2280
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2281 c_total=0; // kell ez?
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2282 printf("A:%6.1f V:%6.1f A-V:%7.3f",d_audio->pts,d_video->pts,0.0f);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2283 printf(" ct:%7.3f \r",c_total);fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2284 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2285 printf("A: --- V:%6.1f \r",d_video->pts);fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2286 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2287
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2288 max_pts_correction=0.1;
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
2289 frame_corr_num=0; // -5
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 856
diff changeset
2290 frame_correction=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2291 force_redraw=5;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2292 a_frame=-skip_audio_secs;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2293 v_frame=0; // !!!!!!
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2294 audio_time_usage=0; video_time_usage=0; vout_time_usage=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2295 // num_frames=real_num_frames=0;
721
05c1bfc5d3ac audio_reset, dshow NULLptr fix
arpi_esp
parents: 715
diff changeset
2296
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2297 }
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
2298 rel_seek_secs=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2299 } // keyboard event handler
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2300
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2301 //================= Update OSD ====================
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
2302 { if(osd_level>=2){
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2303 int pts=d_video->pts;
595
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
2304 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
2305 vo_osd_text=osd_text_buffer;
595
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
2306 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
2307 } else {
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2308 vo_osd_text=NULL;
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2309 }
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2310 // 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
2311 // vo_osd_text=osd_text_buffer;
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
2312
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
2313 // find sub
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
2314 if(subtitles){
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2315 int pts=d_video->pts;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
2316 if(sub_fps==0) sub_fps=sh_video->fps;
482
1a2c4f3e7a10 sub control optimized
arpi_esp
parents: 470
diff changeset
2317 current_module="find_sub";
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2318 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
2319 current_module=NULL;
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
2320 }
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2321
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2322 // DVD sub:
557
e4aca0d51268 some dvd sub parsing and check added
arpi_esp
parents: 555
diff changeset
2323 { unsigned char* packet=NULL;
e4aca0d51268 some dvd sub parsing and check added
arpi_esp
parents: 555
diff changeset
2324 int len=ds_get_packet_sub(d_dvdsub,&packet);
e4aca0d51268 some dvd sub parsing and check added
arpi_esp
parents: 555
diff changeset
2325 if(len>=2){
e4aca0d51268 some dvd sub parsing and check added
arpi_esp
parents: 555
diff changeset
2326 int len2;
e4aca0d51268 some dvd sub parsing and check added
arpi_esp
parents: 555
diff changeset
2327 len2=(packet[0]<<8)+packet[1];
561
36fd71db0d33 spudec_decode() moved from mplayer.c to spudec.c
arpi_esp
parents: 560
diff changeset
2328 if(verbose) printf("\rDVD sub: %d / %d \n",len,len2);
36fd71db0d33 spudec_decode() moved from mplayer.c to spudec.c
arpi_esp
parents: 560
diff changeset
2329 if(len==len2)
36fd71db0d33 spudec_decode() moved from mplayer.c to spudec.c
arpi_esp
parents: 560
diff changeset
2330 spudec_decode(packet,len);
36fd71db0d33 spudec_decode() moved from mplayer.c to spudec.c
arpi_esp
parents: 560
diff changeset
2331 else
36fd71db0d33 spudec_decode() moved from mplayer.c to spudec.c
arpi_esp
parents: 560
diff changeset
2332 printf("fragmented dvd-subs not yet supported!!!\n");
557
e4aca0d51268 some dvd sub parsing and check added
arpi_esp
parents: 555
diff changeset
2333 } else if(len>=0) {
e4aca0d51268 some dvd sub parsing and check added
arpi_esp
parents: 555
diff changeset
2334 printf("invalud dvd sub\n");
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2335 }
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2336 }
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2337
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2338 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2339
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2340 } // while(!eof)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2341
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2342 exit_player("End of file");
109
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
2343 }
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
2344 return 1;
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
2345 }