annotate mplayer.c @ 1311:e116beb1ac7b

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