Mercurial > mplayer.hg
annotate mencoder.c @ 23102:cad9ebe1516c
Merge checks for static and shared libavutil.
author | diego |
---|---|
date | Thu, 26 Apr 2007 11:37:24 +0000 |
parents | 9561da3cdc3a |
children | f35f14c39023 |
rev | line source |
---|---|
3384 | 1 #define VCODEC_COPY 0 |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
2 #define VCODEC_FRAMENO 1 |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
3 // real codecs: |
3504
21fc87d76300
support for RGB/BGR modes (tested with raw and divx4)
alex
parents:
3480
diff
changeset
|
4 #define VCODEC_LIBAVCODEC 4 |
4575 | 5 #define VCODEC_VFW 7 |
5578 | 6 #define VCODEC_LIBDV 8 |
7457 | 7 #define VCODEC_XVID 9 |
8471 | 8 #define VCODEC_QTVIDEO 10 |
9520
2860f7c9d9ca
A new nuppel video encoder. Mainly for RT encoding on slow box.
albeu
parents:
9380
diff
changeset
|
9 #define VCODEC_NUV 11 |
11966 | 10 #define VCODEC_RAW 12 |
13166
d198f255bee9
x264 encoder support. Original patch send by Bernhard Rosenkraenzer <bero at arklinux dot org>, modifications by Loren Merritt <lorenm at u.washington dot edu>, Jeff Clagg <snacky at ikaruga.co dot uk> and me
iive
parents:
13122
diff
changeset
|
11 #define VCODEC_X264 13 |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
12 |
3385 | 13 #define ACODEC_COPY 0 |
2583 | 14 #define ACODEC_PCM 1 |
15 #define ACODEC_VBRMP3 2 | |
4368 | 16 #define ACODEC_NULL 3 |
11375 | 17 #define ACODEC_LAVC 4 |
13426 | 18 #define ACODEC_TOOLAME 5 |
15259 | 19 #define ACODEC_FAAC 6 |
15359 | 20 #define ACODEC_TWOLAME 7 |
2531 | 21 |
22 #include <stdio.h> | |
23 #include <stdlib.h> | |
24 #include <string.h> | |
25 #include <signal.h> | |
12360 | 26 #include "config.h" |
27 | |
9772 | 28 #ifdef __MINGW32__ |
16049
0ccf19820216
define SIGHUP and SIGPIPE for MinGW and catch SIGPIPE also in mplayer
reimar
parents:
16002
diff
changeset
|
29 #define SIGHUP 1 |
9772 | 30 #define SIGQUIT 3 |
16049
0ccf19820216
define SIGHUP and SIGPIPE for MinGW and catch SIGPIPE also in mplayer
reimar
parents:
16002
diff
changeset
|
31 #define SIGPIPE 13 |
9772 | 32 #endif |
12358
133e0ebde74d
Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
faust3
parents:
12354
diff
changeset
|
33 #ifdef WIN32 |
133e0ebde74d
Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
faust3
parents:
12354
diff
changeset
|
34 #include <windows.h> |
133e0ebde74d
Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
faust3
parents:
12354
diff
changeset
|
35 #endif |
133e0ebde74d
Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
faust3
parents:
12354
diff
changeset
|
36 |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
37 #include <sys/time.h> |
2531 | 38 |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
39 |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
40 #include "version.h" |
2531 | 41 #include "mp_msg.h" |
42 #include "help_mp.h" | |
43 | |
3323 | 44 #include "cpudetect.h" |
45 | |
2531 | 46 #include "codec-cfg.h" |
8164
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
47 #include "m_option.h" |
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
48 #include "m_config.h" |
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
49 #include "parser-mecmd.h" |
2531 | 50 |
21412 | 51 #include "get_path.c" |
52 | |
19271
64d82a45a05d
introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents:
19082
diff
changeset
|
53 #include "stream/stream.h" |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
54 #include "libmpdemux/demuxer.h" |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
55 #include "libmpdemux/stheader.h" |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
56 #include "libmpdemux/mp3_hdr.h" |
8585 | 57 #include "libmpdemux/muxer.h" |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
58 |
2531 | 59 |
60 #include "libvo/video_out.h" | |
61 | |
14245 | 62 #include "libaf/af_format.h" |
7604
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7559
diff
changeset
|
63 |
7471 | 64 #include "libmpcodecs/mp_image.h" |
5607 | 65 #include "libmpcodecs/dec_audio.h" |
66 #include "libmpcodecs/dec_video.h" | |
6581 | 67 #include "libmpcodecs/vf.h" |
2574 | 68 |
7471 | 69 // for MPEGLAYER3WAVEFORMAT: |
12341
0db4a3a5b01d
removed loader/ dependancy, imported some files from g2, also used patches from Dominik Mierzejewski
alex
parents:
12337
diff
changeset
|
70 #include "libmpdemux/ms_hdr.h" |
7471 | 71 |
3236 | 72 #include <inttypes.h> |
73 | |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
74 #include "libvo/fastmemcpy.h" |
3385 | 75 |
9380 | 76 #include "osdep/timer.h" |
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7471
diff
changeset
|
77 |
18682
bee3186a06f7
include stream_dvd's interface from libmpdemux/stream_dvd.h
nicodvb
parents:
18417
diff
changeset
|
78 #ifdef USE_DVDREAD |
19271
64d82a45a05d
introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents:
19082
diff
changeset
|
79 #include "stream/stream_dvd.h" |
18682
bee3186a06f7
include stream_dvd's interface from libmpdemux/stream_dvd.h
nicodvb
parents:
18417
diff
changeset
|
80 #endif |
bee3186a06f7
include stream_dvd's interface from libmpdemux/stream_dvd.h
nicodvb
parents:
18417
diff
changeset
|
81 |
11375 | 82 #ifdef USE_LIBAVCODEC |
11410 | 83 #ifdef USE_LIBAVCODEC_SO |
84 #include <ffmpeg/avcodec.h> | |
85 #else | |
16165 | 86 #include "avcodec.h" |
11410 | 87 #endif |
11375 | 88 #endif |
89 | |
15234 | 90 #include "libmpcodecs/ae.h" |
5511 | 91 int vo_doublebuffering=0; |
92 int vo_directrendering=0; | |
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
22232
diff
changeset
|
93 int vo_config_count=1; |
11573 | 94 int forced_subs_only=0; |
4388 | 95 |
2583 | 96 //-------------------------- |
97 | |
2531 | 98 // cache2: |
7881
aba9301ed3c4
allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents:
7867
diff
changeset
|
99 int stream_cache_size=-1; |
2531 | 100 #ifdef USE_STREAM_CACHE |
101 extern int cache_fill_status; | |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12546
diff
changeset
|
102 |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12546
diff
changeset
|
103 float stream_cache_min_percent=20.0; |
16152
10a69a812eff
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents:
16065
diff
changeset
|
104 float stream_cache_seek_min_percent=50.0; |
2531 | 105 #else |
106 #define cache_fill_status 0 | |
107 #endif | |
108 | |
2618 | 109 int audio_id=-1; |
110 int video_id=-1; | |
17297 | 111 int dvdsub_id=-2; |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
112 int vobsub_id=-1; |
10167
531b00ad6f2d
Support for selecting the audio track in Matroska files via -alang.
mosu
parents:
9870
diff
changeset
|
113 char* audio_lang=NULL; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9772
diff
changeset
|
114 char* dvdsub_lang=NULL; |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
115 static char* spudec_ifo=NULL; |
2618 | 116 |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
117 static char** audio_codec_list=NULL; // override audio codec |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
118 static char** video_codec_list=NULL; // override video codec |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
119 static char** audio_fm_list=NULL; // override audio codec family |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
120 static char** video_fm_list=NULL; // override video codec family |
16175 | 121 extern char *demuxer_name; // override demuxer |
122 extern char *audio_demuxer_name; // override audio demuxer | |
123 extern char *sub_demuxer_name; // override sub demuxer | |
2531 | 124 |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
125 static int out_audio_codec=-1; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
126 static int out_video_codec=-1; |
4620 | 127 |
8585 | 128 int out_file_format=MUXER_TYPE_AVI; // default to AVI |
129 | |
2531 | 130 // audio stream skip/resync functions requires only for seeking. |
131 // (they should be implemented in the audio codec layer) | |
132 //void skip_audio_frame(sh_audio_t *sh_audio){} | |
133 //void resync_audio_stream(sh_audio_t *sh_audio){} | |
134 | |
17120
637a2f4ff216
Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'll
ods15
parents:
17106
diff
changeset
|
135 extern int verbose; // must be global! |
11875
6b28eb95c08b
* changes mencoder's exit code on explicit kill to 2
attila
parents:
11834
diff
changeset
|
136 int quiet=0; |
2531 | 137 double video_time_usage=0; |
138 double vout_time_usage=0; | |
4834 | 139 double max_video_time_usage=0; |
140 double max_vout_time_usage=0; | |
4838 | 141 double cur_video_time_usage=0; |
142 double cur_vout_time_usage=0; | |
4844
76acf5bbda78
exclude benchmark stuff execution from normal playback
nick
parents:
4838
diff
changeset
|
143 int benchmark=0; |
2531 | 144 |
17120
637a2f4ff216
Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'll
ods15
parents:
17106
diff
changeset
|
145 extern int mp_msg_levels[MSGT_MAX]; |
637a2f4ff216
Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'll
ods15
parents:
17106
diff
changeset
|
146 extern int mp_msg_level_all; |
17106
05af35012e4f
new -msglevel option, constrols msg level for every msg module
ods15
parents:
17078
diff
changeset
|
147 |
15042
265d8b8adbbe
windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents:
14996
diff
changeset
|
148 #ifdef WIN32 |
265d8b8adbbe
windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents:
14996
diff
changeset
|
149 char * proc_priority=NULL; |
265d8b8adbbe
windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents:
14996
diff
changeset
|
150 #endif |
265d8b8adbbe
windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents:
14996
diff
changeset
|
151 |
2605 | 152 // A-V sync: |
153 int delay_corrected=1; | |
154 static float default_max_pts_correction=-1;//0.01f; | |
155 static float max_pts_correction=0;//default_max_pts_correction; | |
156 static float c_total=0; | |
157 | |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
158 static float audio_preload=0.5; |
15992 | 159 static float audio_delay_fix=0.0; |
15997 | 160 static float audio_delay=0.0; |
17654 | 161 static int ignore_start=0; |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
162 static int audio_density=2; |
6861 | 163 |
9564
898e3692ca0d
Made "force_fps" non-static, because code in "libmpdemux" refers to it.
rsf
parents:
9520
diff
changeset
|
164 float force_fps=0; |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
165 static float force_ofps=0; // set to 24 for inverse telecine |
5629 | 166 static int skip_limit=-1; |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
167 float playback_speed=1.0; |
2531 | 168 |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
169 static int force_srate=0; |
7614 | 170 static int audio_output_format=0; |
2618 | 171 |
6674
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
172 char *vobsub_out=NULL; |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
173 unsigned int vobsub_out_index=0; |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
174 char *vobsub_out_id=NULL; |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
175 |
17196
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
176 char* out_filename=NULL; |
2626 | 177 |
3657
af1f8e2d693a
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents:
3563
diff
changeset
|
178 char *force_fourcc=NULL; |
15888
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
179 int force_audiofmttag=-1; |
3657
af1f8e2d693a
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents:
3563
diff
changeset
|
180 |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
181 char* passtmpfile="divx2pass.log"; |
2643 | 182 |
183 static int play_n_frames=-1; | |
6590 | 184 static int play_n_frames_mf=-1; |
2643 | 185 |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
186 #include "libvo/font_load.h" |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
187 #include "libvo/sub.h" |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
188 |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
189 // sub: |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
190 char *font_name=NULL; |
11580
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11573
diff
changeset
|
191 #ifdef HAVE_FONTCONFIG |
11584 | 192 extern int font_fontconfig; |
11580
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11573
diff
changeset
|
193 #endif |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
194 float font_factor=0.75; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9772
diff
changeset
|
195 char **sub_name=NULL; |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
196 float sub_delay=0; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
197 float sub_fps=0; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
198 int sub_auto = 0; |
6784
b38e38b6f88f
DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
6765
diff
changeset
|
199 int subcc_enabled=0; |
8361
2202c00001e3
overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
arpi
parents:
8357
diff
changeset
|
200 int suboverlap_enabled = 1; |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
201 |
9076
92014b66ed3d
ability to disable the nonsense expand filter is a must! otherwise
rfelker
parents:
9014
diff
changeset
|
202 int auto_expand=1; |
12334
eeddcef4fb08
"hard" frame duplication for mencoder. this finally makes it possible
rfelker
parents:
12223
diff
changeset
|
203 int encode_duplicates=1; |
9076
92014b66ed3d
ability to disable the nonsense expand filter is a must! otherwise
rfelker
parents:
9014
diff
changeset
|
204 |
7145
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
205 // infos are empty by default |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
206 char *info_name=NULL; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
207 char *info_artist=NULL; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
208 char *info_genre=NULL; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
209 char *info_subject=NULL; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
210 char *info_copyright=NULL; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
211 char *info_sourceform=NULL; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
212 char *info_comment=NULL; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
213 |
22232 | 214 // Needed by libmpcodecs vf_vo.c |
215 int config_video_out(vo_functions_t *vo, uint32_t width, uint32_t height, | |
216 uint32_t d_width, uint32_t d_height, uint32_t flags, | |
217 char *title, uint32_t format) { | |
218 return 1; | |
219 } | |
18267 | 220 // Needed by libmpdemux. |
221 int mp_input_check_interrupt(int time) { | |
222 usec_sleep(time); | |
223 return 0; | |
224 } | |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
225 |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18888
diff
changeset
|
226 #ifdef USE_ASS |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18888
diff
changeset
|
227 #include "libass/ass.h" |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18888
diff
changeset
|
228 #include "libass/ass_mp.h" |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18888
diff
changeset
|
229 #endif |
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
22232
diff
changeset
|
230 char *current_module; |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
22232
diff
changeset
|
231 #include "mpcommon.h" |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18888
diff
changeset
|
232 |
2661 | 233 //char *out_audio_codec=NULL; // override audio codec |
234 //char *out_video_codec=NULL; // override video codec | |
2626 | 235 |
2591 | 236 //#include "libmpeg2/mpeg2.h" |
237 //#include "libmpeg2/mpeg2_internal.h" | |
238 | |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
239 //static int vo_w=0, vo_h=0; |
5270 | 240 |
2618 | 241 //-------------------------- config stuff: |
242 | |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
243 m_config_t* mconfig; |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
244 |
10594
57bdcdb061d7
Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents:
10453
diff
changeset
|
245 extern int m_config_parse_config_file(m_config_t* config, char *conffile); |
8164
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
246 |
10594
57bdcdb061d7
Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents:
10453
diff
changeset
|
247 static int cfg_inc_verbose(m_option_t *conf){ ++verbose; return 0;} |
8164
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
248 |
10594
57bdcdb061d7
Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents:
10453
diff
changeset
|
249 static int cfg_include(m_option_t *conf, char *filename){ |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
250 return m_config_parse_config_file(mconfig, filename); |
2618 | 251 } |
252 | |
22312 | 253 static double seek_to_sec; |
4620 | 254 static off_t seek_to_byte=0; |
255 | |
19973
02a18c52a42a
after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents:
19519
diff
changeset
|
256 static m_time_size_t end_at = { .type = END_AT_NONE, .pos = 0 }; |
02a18c52a42a
after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents:
19519
diff
changeset
|
257 |
16528
c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents:
16175
diff
changeset
|
258 static char * frameno_filename=NULL; |
c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents:
16175
diff
changeset
|
259 |
7451
8669e56d2d98
some mpcodecs option declaration moved to cfg-*, as aren;t used by
arpi
parents:
7394
diff
changeset
|
260 //static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, int height); |
4159
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
261 |
15993 | 262 typedef struct { |
263 unsigned char* start; | |
264 int in_size; | |
265 float frame_time; | |
266 int already_read; | |
267 } s_frame_data; | |
268 | |
15994 | 269 /// Returns a_pts |
270 static float calc_a_pts(demux_stream_t *d_audio); | |
15995 | 271 /** \brief Seeks audio forward to pts by dumping audio packets |
272 \return The current audio pts. | |
273 */ | |
274 static float forward_audio(float pts, demux_stream_t *d_audio, muxer_stream_t* mux_a); | |
15996 | 275 /** \brief Seeks slowly by dumping frames. |
276 \return 1 for success, 2 for EOF. | |
277 */ | |
278 static int slowseek(float end_pts, demux_stream_t *d_video, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy, int print_info); | |
15997 | 279 /// Deletes audio or video as told by -delay to sync |
280 static void fixdelay(demux_stream_t *d_video, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy); | |
15994 | 281 |
14964 | 282 #include "edl.h" |
283 static edl_record_ptr edl_records = NULL; ///< EDL entries memory area | |
284 static edl_record_ptr next_edl_record = NULL; ///< only for traversing edl_records | |
285 static short edl_muted; ///< Stores whether EDL is currently in muted mode. | |
286 static short edl_seeking; ///< When non-zero, stream is seekable. | |
287 static short edl_seek_type; ///< When non-zero, frames are discarded instead of seeking. | |
288 /** \brief Seeks for EDL | |
289 \return 1 for success, 0 for failure, 2 for EOF. | |
290 */ | |
15993 | 291 static int edl_seek(edl_record_ptr next_edl_record, demuxer_t* demuxer, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy); |
14964 | 292 |
2618 | 293 #include "cfg-mencoder.h" |
294 | |
4088 | 295 #ifdef USE_DVDREAD |
296 #include "spudec.h" | |
297 #endif | |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
298 #include "vobsub.h" |
4088 | 299 |
15546
4ac9c227d758
preinit audio filters in order to determine the final samplerate and number of channels, or audio encoders will be initialized with the wrong parameters
nicodvb
parents:
15507
diff
changeset
|
300 #include "libao2/audio_out.h" |
4743 | 301 /* FIXME */ |
18980
ed69754aa58d
Marks several string parameters as const when they are not modified in the function, Patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents:
18937
diff
changeset
|
302 static void mencoder_exit(int level, const char *how) |
4743 | 303 { |
304 if (how) | |
18002 | 305 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ExitingHow, how); |
4743 | 306 else |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
307 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_Exiting); |
4743 | 308 |
309 exit(level); | |
310 } | |
311 | |
18888
ab29b3c4f94e
parse_cfgfiles as static in mplayer.c/mencoder.c, patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents:
18682
diff
changeset
|
312 static void parse_cfgfiles( m_config_t* conf ) |
4488 | 313 { |
314 char *conffile; | |
17869
9e1b5526b0da
The system-wide and the user-specific MEncoder configuration file should both
diego
parents:
17675
diff
changeset
|
315 if ((conffile = get_path("mencoder.conf")) == NULL) { |
4488 | 316 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem); |
317 } else { | |
318 if (m_config_parse_config_file(conf, conffile) < 0) | |
18335 | 319 mencoder_exit(1,MSGTR_ConfigFileError); |
4488 | 320 free(conffile); |
321 } | |
322 } | |
323 | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
324 |
2591 | 325 //--------------------------------------------------------------------------- |
326 | |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
327 static int dec_audio(sh_audio_t *sh_audio,unsigned char* buffer,int total){ |
2591 | 328 int size=0; |
6419
773d71059d8a
On QNX eof szmbol clashes with system headers, workaround by renaming to at_eof. Fell free to reverse if zou don't like this waz.
atmos4
parents:
6333
diff
changeset
|
329 int at_eof=0; |
773d71059d8a
On QNX eof szmbol clashes with system headers, workaround by renaming to at_eof. Fell free to reverse if zou don't like this waz.
atmos4
parents:
6333
diff
changeset
|
330 while(size<total && !at_eof){ |
2591 | 331 int len=total-size; |
332 if(len>MAX_OUTBURST) len=MAX_OUTBURST; | |
7604
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7559
diff
changeset
|
333 if(len>sh_audio->a_out_buffer_size) len=sh_audio->a_out_buffer_size; |
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7559
diff
changeset
|
334 if(len>sh_audio->a_out_buffer_len){ |
2591 | 335 int ret=decode_audio(sh_audio, |
7604
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7559
diff
changeset
|
336 &sh_audio->a_out_buffer[sh_audio->a_out_buffer_len], |
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7559
diff
changeset
|
337 len-sh_audio->a_out_buffer_len, |
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7559
diff
changeset
|
338 sh_audio->a_out_buffer_size-sh_audio->a_out_buffer_len); |
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7559
diff
changeset
|
339 if(ret>0) sh_audio->a_out_buffer_len+=ret; else at_eof=1; |
2591 | 340 } |
7604
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7559
diff
changeset
|
341 if(len>sh_audio->a_out_buffer_len) len=sh_audio->a_out_buffer_len; |
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7559
diff
changeset
|
342 memcpy(buffer+size,sh_audio->a_out_buffer,len); |
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7559
diff
changeset
|
343 sh_audio->a_out_buffer_len-=len; size+=len; |
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7559
diff
changeset
|
344 if(sh_audio->a_out_buffer_len>0) |
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7559
diff
changeset
|
345 memcpy(sh_audio->a_out_buffer,&sh_audio->a_out_buffer[len],sh_audio->a_out_buffer_len); |
2591 | 346 } |
347 return size; | |
348 } | |
349 | |
350 //--------------------------------------------------------------------------- | |
2531 | 351 |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
352 // this function returns the absoloute time for which MEncoder will switch files or move in the file. |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
353 // so audio can be cut correctly. -1 if there is no limit. |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
354 static float stop_time(demuxer_t* demuxer, muxer_stream_t* mux_v); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
355 |
6419
773d71059d8a
On QNX eof szmbol clashes with system headers, workaround by renaming to at_eof. Fell free to reverse if zou don't like this waz.
atmos4
parents:
6333
diff
changeset
|
356 static int at_eof=0; |
3320
ac8b70dd5e45
use return 1; if interrupted - patch by Artur Skawina <skawina@geocities.com>
arpi
parents:
3240
diff
changeset
|
357 static int interrupted=0; |
2531 | 358 |
359 static void exit_sighandler(int x){ | |
6419
773d71059d8a
On QNX eof szmbol clashes with system headers, workaround by renaming to at_eof. Fell free to reverse if zou don't like this waz.
atmos4
parents:
6333
diff
changeset
|
360 at_eof=1; |
11875
6b28eb95c08b
* changes mencoder's exit code on explicit kill to 2
attila
parents:
11834
diff
changeset
|
361 interrupted=2; /* 1 means error */ |
2531 | 362 } |
363 | |
8585 | 364 static muxer_t* muxer=NULL; |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
365 |
17977
f70772d02eaa
Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents:
17932
diff
changeset
|
366 extern void print_wave_header(WAVEFORMATEX *h, int verbose_level); |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
367 |
7201
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7180
diff
changeset
|
368 int main(int argc,char* argv[]){ |
2531 | 369 |
370 stream_t* stream=NULL; | |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
371 stream_t* ostream=NULL; |
2531 | 372 demuxer_t* demuxer=NULL; |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
373 stream_t* stream2=NULL; |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
374 demuxer_t* demuxer2=NULL; |
2531 | 375 demux_stream_t *d_audio=NULL; |
376 demux_stream_t *d_video=NULL; | |
377 demux_stream_t *d_dvdsub=NULL; | |
378 sh_audio_t *sh_audio=NULL; | |
379 sh_video_t *sh_video=NULL; | |
380 int file_format=DEMUXER_TYPE_UNKNOWN; | |
12223 | 381 int i=DEMUXER_TYPE_UNKNOWN; |
6674
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
382 void *vobsub_writer=NULL; |
15993 | 383 s_frame_data frame_data = { .start = NULL, .in_size = 0, .frame_time = 0., .already_read = 0 }; |
2531 | 384 |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
385 uint32_t ptimer_start; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
386 uint32_t audiorate=0; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
387 uint32_t videorate=0; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
388 uint32_t audiosamples=1; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
389 uint32_t videosamples=1; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
390 uint32_t skippedframes=0; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
391 uint32_t duplicatedframes=0; |
7370
8e07aeda7344
count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
arpi
parents:
7331
diff
changeset
|
392 uint32_t badframes=0; |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
393 |
8585 | 394 muxer_stream_t* mux_a=NULL; |
395 muxer_stream_t* mux_v=NULL; | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
396 off_t muxer_f_size=0; |
2531 | 397 |
2613 | 398 double v_pts_corr=0; |
399 double v_timer_corr=0; | |
2605 | 400 |
8164
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
401 m_entry_t* filelist = NULL; |
2618 | 402 char* filename=NULL; |
403 | |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
404 int decoded_frameno=0; |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
405 int next_frameno=-1; |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
406 int curfile=0; |
17121
119790c08d5c
compiler warning fixes, some of these were actual (printing) bugs.
ods15
parents:
17120
diff
changeset
|
407 int new_srate=0; |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
408 |
17121
119790c08d5c
compiler warning fixes, some of these were actual (printing) bugs.
ods15
parents:
17120
diff
changeset
|
409 unsigned int timer_start=0; |
15546
4ac9c227d758
preinit audio filters in order to determine the final samplerate and number of channels, or audio encoders will be initialized with the wrong parameters
nicodvb
parents:
15507
diff
changeset
|
410 ao_data_t ao_data = {0,0,0,0,OUTBURST,-1,0}; |
4387 | 411 |
15234 | 412 audio_encoding_params_t aparams; |
413 audio_encoder_t *aencoder = NULL; | |
414 | |
5223 | 415 mp_msg_init(); |
23095
9561da3cdc3a
make -really-quiet hide the mencoder version tags. patch copied from michael
compn
parents:
23032
diff
changeset
|
416 |
9561da3cdc3a
make -really-quiet hide the mencoder version tags. patch copied from michael
compn
parents:
23032
diff
changeset
|
417 for(i=1; i<argc; i++) |
9561da3cdc3a
make -really-quiet hide the mencoder version tags. patch copied from michael
compn
parents:
23032
diff
changeset
|
418 if(!strcmp(argv[i], "-really-quiet")) |
9561da3cdc3a
make -really-quiet hide the mencoder version tags. patch copied from michael
compn
parents:
23032
diff
changeset
|
419 verbose= -10; |
9561da3cdc3a
make -really-quiet hide the mencoder version tags. patch copied from michael
compn
parents:
23032
diff
changeset
|
420 |
23032 | 421 mp_msg(MSGT_CPLAYER,MSGL_INFO, "MEncoder " VERSION " (C) 2000-2007 MPlayer Team\n"); |
2622 | 422 |
3323 | 423 /* Test for cpu capabilities (and corresponding OS support) for optimizing */ |
9003 | 424 GetCpuCaps(&gCpuCaps); |
20577 | 425 #ifdef ARCH_X86 |
3323 | 426 mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: Type: %d MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n", |
427 gCpuCaps.cpuType,gCpuCaps.hasMMX,gCpuCaps.hasMMX2, | |
428 gCpuCaps.has3DNow, gCpuCaps.has3DNowExt, | |
429 gCpuCaps.hasSSE, gCpuCaps.hasSSE2); | |
10453 | 430 #ifdef RUNTIME_CPUDETECT |
431 mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithRuntimeDetection); | |
432 #else | |
433 mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithCPUExtensions); | |
434 #ifdef HAVE_MMX | |
435 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX"); | |
3323 | 436 #endif |
10453 | 437 #ifdef HAVE_MMX2 |
438 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX2"); | |
439 #endif | |
440 #ifdef HAVE_3DNOW | |
441 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNow"); | |
442 #endif | |
443 #ifdef HAVE_3DNOWEX | |
444 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNowEx"); | |
445 #endif | |
446 #ifdef HAVE_SSE | |
447 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE"); | |
448 #endif | |
449 #ifdef HAVE_SSE2 | |
450 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE2"); | |
451 #endif | |
452 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n\n"); | |
453 #endif | |
454 #endif | |
16781
6809ca5dd307
allow mencoder to load win32 codecs properly patch by Zuxy <zuxy.meng at gmail.com>
faust3
parents:
16756
diff
changeset
|
455 |
6809ca5dd307
allow mencoder to load win32 codecs properly patch by Zuxy <zuxy.meng at gmail.com>
faust3
parents:
16756
diff
changeset
|
456 #if defined(WIN32) && defined(USE_WIN32DLL) |
6809ca5dd307
allow mencoder to load win32 codecs properly patch by Zuxy <zuxy.meng at gmail.com>
faust3
parents:
16756
diff
changeset
|
457 set_path_env(); |
6809ca5dd307
allow mencoder to load win32 codecs properly patch by Zuxy <zuxy.meng at gmail.com>
faust3
parents:
16756
diff
changeset
|
458 #endif /*WIN32 && USE_WIN32DLL*/ |
10453 | 459 |
11550
18d3b3a1101b
InitTimer has to be called before *Timer-Functions can be used.
ranma
parents:
11513
diff
changeset
|
460 InitTimer(); |
18d3b3a1101b
InitTimer has to be called before *Timer-Functions can be used.
ranma
parents:
11513
diff
changeset
|
461 |
5889 | 462 // check codec.conf |
11759
29eea271490e
add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents:
11592
diff
changeset
|
463 if(!codecs_file || !parse_codec_cfg(codecs_file)){ |
29eea271490e
add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents:
11592
diff
changeset
|
464 if(!parse_codec_cfg(get_path("codecs.conf"))){ |
29eea271490e
add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents:
11592
diff
changeset
|
465 if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){ |
29eea271490e
add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents:
11592
diff
changeset
|
466 if(!parse_codec_cfg(NULL)){ |
29eea271490e
add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents:
11592
diff
changeset
|
467 mencoder_exit(1,NULL); |
29eea271490e
add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents:
11592
diff
changeset
|
468 } |
13946 | 469 mp_msg(MSGT_MENCODER,MSGL_V,MSGTR_BuiltinCodecsConf); |
8467
3ca9cc46df5c
Fallback to builtin (generated from etc/codecs.conf at compile time)
arpi
parents:
8465
diff
changeset
|
470 } |
5889 | 471 } |
472 } | |
473 | |
8164
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
474 mconfig = m_config_new(); |
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
475 m_config_register_options(mconfig,mencoder_opts); |
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
476 parse_cfgfiles(mconfig); |
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
477 filelist = m_config_parse_me_command_line(mconfig, argc, argv); |
13122 | 478 if(!filelist) mencoder_exit(1, MSGTR_ErrorParsingCommandLine); |
2618 | 479 |
17196
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
480 { |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
481 char *extension; |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
482 |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
483 if (!out_filename) mencoder_exit(1,MSGTR_MissingOutputFilename); |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
484 extension=strrchr(out_filename,'.'); |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
485 if (extension != NULL && strlen(extension) > 3 && strlen(extension) < 6) |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
486 { |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
487 extension++; |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
488 |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
489 switch (out_file_format) |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
490 { |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
491 case MUXER_TYPE_AVI: |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
492 if (strcasecmp(extension,"avi")) |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
493 mp_msg(MSGT_MENCODER, MSGL_WARN, MSGTR_MencoderWrongFormatAVI); |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
494 break; |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
495 |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
496 case MUXER_TYPE_MPEG: |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
497 if (strcasecmp(extension,"mpg") && |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
498 strcasecmp(extension,"mpeg") && |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
499 strcasecmp(extension,"vob")) |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
500 mp_msg(MSGT_MENCODER, MSGL_WARN, MSGTR_MencoderWrongFormatMPG); |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
501 break; |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
502 } |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
503 } |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
504 } |
21342
dc98645820b7
Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents:
21161
diff
changeset
|
505 /* Display what configure line was used */ |
dc98645820b7
Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents:
21161
diff
changeset
|
506 mp_msg(MSGT_MENCODER, MSGL_V, "Configuration: " CONFIGURATION "\n"); |
17196
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
507 |
8e6cf7bbe18a
make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents:
17122
diff
changeset
|
508 |
16528
c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents:
16175
diff
changeset
|
509 if (frameno_filename) { |
c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents:
16175
diff
changeset
|
510 stream2=open_stream(frameno_filename,0,&i); |
c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents:
16175
diff
changeset
|
511 if(stream2){ |
c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents:
16175
diff
changeset
|
512 demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2,NULL); |
18335 | 513 if(demuxer2) mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_UsingPass3ControlFile, frameno_filename); |
16528
c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents:
16175
diff
changeset
|
514 else mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); |
c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents:
16175
diff
changeset
|
515 } |
c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents:
16175
diff
changeset
|
516 } |
c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents:
16175
diff
changeset
|
517 |
15042
265d8b8adbbe
windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents:
14996
diff
changeset
|
518 #ifdef WIN32 |
265d8b8adbbe
windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents:
14996
diff
changeset
|
519 if(proc_priority){ |
265d8b8adbbe
windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents:
14996
diff
changeset
|
520 int i; |
265d8b8adbbe
windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents:
14996
diff
changeset
|
521 for(i=0; priority_presets_defs[i].name; i++){ |
265d8b8adbbe
windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents:
14996
diff
changeset
|
522 if(strcasecmp(priority_presets_defs[i].name, proc_priority) == 0) |
265d8b8adbbe
windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents:
14996
diff
changeset
|
523 break; |
265d8b8adbbe
windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents:
14996
diff
changeset
|
524 } |
21146 | 525 mp_msg(MSGT_CPLAYER,MSGL_STATUS,MSGTR_SettingProcessPriority, |
15042
265d8b8adbbe
windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents:
14996
diff
changeset
|
526 priority_presets_defs[i].name); |
265d8b8adbbe
windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents:
14996
diff
changeset
|
527 SetPriorityClass(GetCurrentProcess(), priority_presets_defs[i].prio); |
265d8b8adbbe
windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents:
14996
diff
changeset
|
528 } |
265d8b8adbbe
windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents:
14996
diff
changeset
|
529 #endif |
265d8b8adbbe
windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents:
14996
diff
changeset
|
530 |
6267
2e117fd620a0
font init needs to be after config parsing, otherwise -font won't
rfelker
parents:
6138
diff
changeset
|
531 // check font |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7058
diff
changeset
|
532 #ifdef HAVE_FREETYPE |
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7058
diff
changeset
|
533 init_freetype(); |
11580
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11573
diff
changeset
|
534 #endif |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11573
diff
changeset
|
535 #ifdef HAVE_FONTCONFIG |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11573
diff
changeset
|
536 if(!font_fontconfig) |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11573
diff
changeset
|
537 { |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11573
diff
changeset
|
538 #endif |
19519 | 539 #ifdef HAVE_BITMAP_FONT |
6267
2e117fd620a0
font init needs to be after config parsing, otherwise -font won't
rfelker
parents:
6138
diff
changeset
|
540 if(font_name){ |
2e117fd620a0
font init needs to be after config parsing, otherwise -font won't
rfelker
parents:
6138
diff
changeset
|
541 vo_font=read_font_desc(font_name,font_factor,verbose>1); |
2e117fd620a0
font init needs to be after config parsing, otherwise -font won't
rfelker
parents:
6138
diff
changeset
|
542 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name); |
2e117fd620a0
font init needs to be after config parsing, otherwise -font won't
rfelker
parents:
6138
diff
changeset
|
543 } else { |
2e117fd620a0
font init needs to be after config parsing, otherwise -font won't
rfelker
parents:
6138
diff
changeset
|
544 // try default: |
2e117fd620a0
font init needs to be after config parsing, otherwise -font won't
rfelker
parents:
6138
diff
changeset
|
545 vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1); |
2e117fd620a0
font init needs to be after config parsing, otherwise -font won't
rfelker
parents:
6138
diff
changeset
|
546 if(!vo_font) |
10272
7b0bc557987b
renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
arpi
parents:
10167
diff
changeset
|
547 vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1); |
6267
2e117fd620a0
font init needs to be after config parsing, otherwise -font won't
rfelker
parents:
6138
diff
changeset
|
548 } |
19519 | 549 #endif |
11580
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11573
diff
changeset
|
550 #ifdef HAVE_FONTCONFIG |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11573
diff
changeset
|
551 } |
6267
2e117fd620a0
font init needs to be after config parsing, otherwise -font won't
rfelker
parents:
6138
diff
changeset
|
552 #endif |
2e117fd620a0
font init needs to be after config parsing, otherwise -font won't
rfelker
parents:
6138
diff
changeset
|
553 |
2e117fd620a0
font init needs to be after config parsing, otherwise -font won't
rfelker
parents:
6138
diff
changeset
|
554 vo_init_osd(); |
2e117fd620a0
font init needs to be after config parsing, otherwise -font won't
rfelker
parents:
6138
diff
changeset
|
555 |
16814 | 556 /* HACK, for some weird reason, push() has to be called twice, |
557 otherwise options are not saved correctly */ | |
16753
5f23a3beddfd
weirdness, flags aren't restored right unless you add this second push
ods15
parents:
16752
diff
changeset
|
558 m_config_push(mconfig); |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
559 play_next_file: |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
560 m_config_push(mconfig); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
561 m_entry_set_options(mconfig,&filelist[curfile]); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
562 filename = filelist[curfile].name; |
14685
4b02f759f529
small reordering to make future 'multiple files' changes more modular, puts single file loading separate from global option loading in the begginning. patch by Oded Shimon
reynaldo
parents:
14610
diff
changeset
|
563 |
4b02f759f529
small reordering to make future 'multiple files' changes more modular, puts single file loading separate from global option loading in the begginning. patch by Oded Shimon
reynaldo
parents:
14610
diff
changeset
|
564 if(!filename){ |
4b02f759f529
small reordering to make future 'multiple files' changes more modular, puts single file loading separate from global option loading in the begginning. patch by Oded Shimon
reynaldo
parents:
14610
diff
changeset
|
565 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_MissingFilename); |
4b02f759f529
small reordering to make future 'multiple files' changes more modular, puts single file loading separate from global option loading in the begginning. patch by Oded Shimon
reynaldo
parents:
14610
diff
changeset
|
566 mencoder_exit(1,NULL); |
4b02f759f529
small reordering to make future 'multiple files' changes more modular, puts single file loading separate from global option loading in the begginning. patch by Oded Shimon
reynaldo
parents:
14610
diff
changeset
|
567 } |
9746 | 568 stream=open_stream(filename,0,&file_format); |
2531 | 569 |
570 if(!stream){ | |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
571 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_CannotOpenFile_Device); |
4743 | 572 mencoder_exit(1,NULL); |
2531 | 573 } |
574 | |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
575 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_OpenedStream, file_format, (int)(stream->start_pos), (int)(stream->end_pos)); |
2531 | 576 |
5436 | 577 #ifdef USE_DVDREAD |
578 if(stream->type==STREAMTYPE_DVD){ | |
579 if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang); | |
17297 | 580 if(dvdsub_lang && dvdsub_id==-2) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang); |
5436 | 581 } |
582 #endif | |
583 | |
5626
b7b40e65c070
-sb option re-added (noticed by Alexandre Oliva <oliva@lsd.ic.unicamp.br>)
arpi
parents:
5607
diff
changeset
|
584 stream->start_pos+=seek_to_byte; |
2531 | 585 |
7881
aba9301ed3c4
allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents:
7867
diff
changeset
|
586 if(stream_cache_size>0) stream_enable_cache(stream,stream_cache_size*1024,0,0); |
5626
b7b40e65c070
-sb option re-added (noticed by Alexandre Oliva <oliva@lsd.ic.unicamp.br>)
arpi
parents:
5607
diff
changeset
|
587 |
7529
c276bfb414fb
removed obsolete/unused audio|video_fm|codec, has_audio|video
arpi
parents:
7526
diff
changeset
|
588 if(demuxer2) audio_id=-2; /* do NOT read audio packets... */ |
4355 | 589 |
2882 | 590 //demuxer=demux_open(stream,file_format,video_id,audio_id,dvdsub_id); |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
9003
diff
changeset
|
591 demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id,filename); |
2531 | 592 if(!demuxer){ |
15056
6f949cafe480
Errors that cause MEncoder to exit should be MSGL_FATAL, not MSGL_ERR.
diego
parents:
15055
diff
changeset
|
593 mp_msg(MSGT_DEMUXER, MSGL_FATAL, MSGTR_FormatNotRecognized); |
6f949cafe480
Errors that cause MEncoder to exit should be MSGL_FATAL, not MSGL_ERR.
diego
parents:
15055
diff
changeset
|
594 mp_msg(MSGT_DEMUXER, MSGL_FATAL, MSGTR_CannotOpenDemuxer); |
4743 | 595 mencoder_exit(1,NULL); |
2531 | 596 } |
597 | |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
598 d_audio=demuxer2 ? demuxer2->audio : demuxer->audio; |
2531 | 599 d_video=demuxer->video; |
600 d_dvdsub=demuxer->sub; | |
601 sh_audio=d_audio->sh; | |
602 sh_video=d_video->sh; | |
603 | |
11513
552ddee604c9
workaround! exit if there's no video stream (hopefully it's a proper fix)
alex
parents:
11410
diff
changeset
|
604 if(!sh_video) |
552ddee604c9
workaround! exit if there's no video stream (hopefully it's a proper fix)
alex
parents:
11410
diff
changeset
|
605 { |
13122 | 606 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_VideoStreamRequired); |
11513
552ddee604c9
workaround! exit if there's no video stream (hopefully it's a proper fix)
alex
parents:
11410
diff
changeset
|
607 mencoder_exit(1,NULL); |
552ddee604c9
workaround! exit if there's no video stream (hopefully it's a proper fix)
alex
parents:
11410
diff
changeset
|
608 } |
552ddee604c9
workaround! exit if there's no video stream (hopefully it's a proper fix)
alex
parents:
11410
diff
changeset
|
609 |
2531 | 610 if(!video_read_properties(sh_video)){ |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
611 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_CannotReadVideoProperties); |
4743 | 612 mencoder_exit(1,NULL); |
2531 | 613 } |
614 | |
21146 | 615 mp_msg(MSGT_MENCODER,MSGL_INFO, MSGTR_FilefmtFourccSizeFpsFtime, |
2531 | 616 demuxer->file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h, |
617 sh_video->fps,sh_video->frametime | |
618 ); | |
2581 | 619 |
8357
ea3c66c6665f
fixed -fps with mencoder and fixed-rate files (avi etc)
arpi
parents:
8355
diff
changeset
|
620 if(force_fps){ |
ea3c66c6665f
fixed -fps with mencoder and fixed-rate files (avi etc)
arpi
parents:
8355
diff
changeset
|
621 sh_video->fps=force_fps; |
ea3c66c6665f
fixed -fps with mencoder and fixed-rate files (avi etc)
arpi
parents:
8355
diff
changeset
|
622 sh_video->frametime=1.0f/sh_video->fps; |
13122 | 623 mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_ForcingInputFPS, sh_video->fps); |
8357
ea3c66c6665f
fixed -fps with mencoder and fixed-rate files (avi etc)
arpi
parents:
8355
diff
changeset
|
624 } |
ea3c66c6665f
fixed -fps with mencoder and fixed-rate files (avi etc)
arpi
parents:
8355
diff
changeset
|
625 |
6923
60374fa581fc
no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents:
6871
diff
changeset
|
626 if(sh_audio && out_audio_codec<0){ |
8796 | 627 if(audio_id==-2) |
13122 | 628 mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_DemuxerDoesntSupportNosound); |
6947 | 629 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_NoAudioEncoderSelected); |
6923
60374fa581fc
no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents:
6871
diff
changeset
|
630 mencoder_exit(1,NULL); |
60374fa581fc
no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents:
6871
diff
changeset
|
631 } |
60374fa581fc
no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents:
6871
diff
changeset
|
632 if(sh_video && out_video_codec<0){ |
6947 | 633 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_NoVideoEncoderSelected); |
6923
60374fa581fc
no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents:
6871
diff
changeset
|
634 mencoder_exit(1,NULL); |
60374fa581fc
no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents:
6871
diff
changeset
|
635 } |
60374fa581fc
no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents:
6871
diff
changeset
|
636 |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
637 if(sh_audio && (out_audio_codec || seek_to_sec || !sh_audio->wf || playback_speed != 1.0)){ |
2581 | 638 // Go through the codec.conf and find the best codec... |
7502
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7497
diff
changeset
|
639 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
7522 | 640 if(!init_best_audio_codec(sh_audio,audio_codec_list,audio_fm_list)){ |
7502
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7497
diff
changeset
|
641 sh_audio=d_audio->sh=NULL; // failed to init :( |
2581 | 642 } |
7502
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7497
diff
changeset
|
643 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
2581 | 644 } |
645 | |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
646 if (sh_audio) { |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
647 new_srate = sh_audio->samplerate; |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
648 if (playback_speed != 1.0) { |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
649 new_srate *= playback_speed; |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
650 // limits are taken from libaf/af_resample.c |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
651 if (new_srate < 8000) new_srate = 8000; |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
652 if (new_srate > 192000) new_srate = 192000; |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
653 playback_speed = (float)new_srate / (float)sh_audio->samplerate; |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
654 } |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
655 } |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
656 |
14685
4b02f759f529
small reordering to make future 'multiple files' changes more modular, puts single file loading separate from global option loading in the begginning. patch by Oded Shimon
reynaldo
parents:
14610
diff
changeset
|
657 // after reading video params we should load subtitles because |
4b02f759f529
small reordering to make future 'multiple files' changes more modular, puts single file loading separate from global option loading in the begginning. patch by Oded Shimon
reynaldo
parents:
14610
diff
changeset
|
658 // we know fps so now we can adjust subtitles time to ~6 seconds AST |
4b02f759f529
small reordering to make future 'multiple files' changes more modular, puts single file loading separate from global option loading in the begginning. patch by Oded Shimon
reynaldo
parents:
14610
diff
changeset
|
659 // check .sub |
4b02f759f529
small reordering to make future 'multiple files' changes more modular, puts single file loading separate from global option loading in the begginning. patch by Oded Shimon
reynaldo
parents:
14610
diff
changeset
|
660 // current_module="read_subtitles_file"; |
4b02f759f529
small reordering to make future 'multiple files' changes more modular, puts single file loading separate from global option loading in the begginning. patch by Oded Shimon
reynaldo
parents:
14610
diff
changeset
|
661 if(sub_name && sub_name[0]){ |
4b02f759f529
small reordering to make future 'multiple files' changes more modular, puts single file loading separate from global option loading in the begginning. patch by Oded Shimon
reynaldo
parents:
14610
diff
changeset
|
662 subdata=sub_read_file(sub_name[0], sh_video->fps); |
4b02f759f529
small reordering to make future 'multiple files' changes more modular, puts single file loading separate from global option loading in the begginning. patch by Oded Shimon
reynaldo
parents:
14610
diff
changeset
|
663 if(!subdata) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name[0]); |
4b02f759f529
small reordering to make future 'multiple files' changes more modular, puts single file loading separate from global option loading in the begginning. patch by Oded Shimon
reynaldo
parents:
14610
diff
changeset
|
664 } else |
18232 | 665 if(sub_auto && filename) { // auto load sub file ... |
15603
2d1ad16b6021
strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents:
15565
diff
changeset
|
666 char **tmp = NULL; |
2d1ad16b6021
strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents:
15565
diff
changeset
|
667 int i = 0; |
18232 | 668 char *psub = get_path( "sub/" ); |
669 tmp = sub_filenames((psub ? psub : ""), filename); | |
670 free(psub); | |
671 subdata=sub_read_file(tmp[0], sh_video->fps); | |
672 while (tmp[i]) | |
15603
2d1ad16b6021
strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents:
15565
diff
changeset
|
673 free(tmp[i++]); |
2d1ad16b6021
strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents:
15565
diff
changeset
|
674 free(tmp); |
14685
4b02f759f529
small reordering to make future 'multiple files' changes more modular, puts single file loading separate from global option loading in the begginning. patch by Oded Shimon
reynaldo
parents:
14610
diff
changeset
|
675 } |
4b02f759f529
small reordering to make future 'multiple files' changes more modular, puts single file loading separate from global option loading in the begginning. patch by Oded Shimon
reynaldo
parents:
14610
diff
changeset
|
676 |
2531 | 677 // set up video encoder: |
678 | |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
679 if (!curfile) { // curfile is non zero when a second file is opened |
6674
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
680 if (vobsub_out) { |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
681 unsigned int palette[16], width, height; |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
682 unsigned char tmp[3] = { 0, 0, 0 }; |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
683 if (spudec_ifo && vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, dvdsub_id, tmp) >= 0) |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
684 vobsub_writer = vobsub_out_open(vobsub_out, palette, sh_video->disp_w, sh_video->disp_h, |
7220
e3ecccc7e505
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents:
7212
diff
changeset
|
685 vobsub_out_id?vobsub_out_id:(char *)tmp, vobsub_out_index); |
6674
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
686 #ifdef USE_DVDREAD |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
687 if (vobsub_writer == NULL) { |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
688 char tmp[3]; |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
689 if (vobsub_out_id == NULL && stream->type == STREAMTYPE_DVD) { |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
690 int i; |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
691 dvd_priv_t *dvd = (dvd_priv_t*)stream->priv; |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
692 for (i = 0; i < dvd->nr_of_subtitles; ++i) |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
693 if (dvd->subtitles[i].id == dvdsub_id) { |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
694 tmp[0] = (dvd->subtitles[i].language >> 8) & 0xff; |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
695 tmp[1] = dvd->subtitles[i].language & 0xff; |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
696 tmp[2] = 0; |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
697 vobsub_out_id = tmp; |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
698 break; |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
699 } |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
700 } |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
701 vobsub_writer=vobsub_out_open(vobsub_out, stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL, |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
702 sh_video->disp_w, sh_video->disp_h, vobsub_out_id, vobsub_out_index); |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
703 } |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
704 #endif |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
705 } |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
706 else { |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
707 if (spudec_ifo) { |
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
708 unsigned int palette[16], width, height; |
6674
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
709 if (vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, -1, NULL) >= 0) |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
710 vo_spudec=spudec_new_scaled(palette, sh_video->disp_w, sh_video->disp_h); |
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
711 } |
5392
d7c586ebbacf
Fix bug noticed by Hajba Szilard in message <20020329151644.A23301@revai.hu>
kmkaplan
parents:
5390
diff
changeset
|
712 #ifdef USE_DVDREAD |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
713 if (vo_spudec==NULL) { |
4557 | 714 vo_spudec=spudec_new_scaled(stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL, |
4088 | 715 sh_video->disp_w, sh_video->disp_h); |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
716 } |
4088 | 717 #endif |
6674
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
718 } |
4088 | 719 |
11573 | 720 // Apply current settings for forced subs |
721 spudec_set_forced_subs_only(vo_spudec,forced_subs_only); | |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
722 |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
723 ostream = open_output_stream(out_filename, 0); |
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
724 if(!ostream) { |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
725 mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_CannotOpenOutputFile, out_filename); |
4743 | 726 mencoder_exit(1,NULL); |
2887
bc648c6a464a
fixes a segfault if file specified in -o can't be accessed
pl
parents:
2884
diff
changeset
|
727 } |
bc648c6a464a
fixes a segfault if file specified in -o can't be accessed
pl
parents:
2884
diff
changeset
|
728 |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
729 muxer=muxer_new_muxer(out_file_format,ostream); |
17078 | 730 if(!muxer) { |
21146 | 731 mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_CannotInitializeMuxer); |
17078 | 732 mencoder_exit(1,NULL); |
733 } | |
17895
155fa4f8b32a
temporarily disabled the coercion of audio_preload=0 for -of mpeg until I find a proper fix: it horribly distorts filtered sound
nicodvb
parents:
17869
diff
changeset
|
734 #if 0 |
155fa4f8b32a
temporarily disabled the coercion of audio_preload=0 for -of mpeg until I find a proper fix: it horribly distorts filtered sound
nicodvb
parents:
17869
diff
changeset
|
735 //disabled: it horrybly distorts filtered sound |
17590 | 736 if(out_file_format == MUXER_TYPE_MPEG) audio_preload = 0; |
17895
155fa4f8b32a
temporarily disabled the coercion of audio_preload=0 for -of mpeg until I find a proper fix: it horribly distorts filtered sound
nicodvb
parents:
17869
diff
changeset
|
737 #endif |
2581 | 738 |
17648 | 739 muxer->audio_delay_fix = audio_delay_fix; |
740 | |
2581 | 741 // ============= VIDEO =============== |
742 | |
8585 | 743 mux_v=muxer_new_stream(muxer,MUXER_TYPE_VIDEO); |
2531 | 744 |
4575 | 745 mux_v->buffer_size=0x200000; // 2MB |
2531 | 746 mux_v->buffer=malloc(mux_v->buffer_size); |
747 | |
748 mux_v->source=sh_video; | |
749 | |
750 mux_v->h.dwSampleSize=0; // VBR | |
11946
73b7ddcf4cbe
use libavcodecs float -> fraction conversation if available for -ofps, that way exact framerates like 24000/1001 are possible instead of ending up with x/10000
michael
parents:
11875
diff
changeset
|
751 #ifdef USE_LIBAVCODEC |
73b7ddcf4cbe
use libavcodecs float -> fraction conversation if available for -ofps, that way exact framerates like 24000/1001 are possible instead of ending up with x/10000
michael
parents:
11875
diff
changeset
|
752 { |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
753 AVRational q= av_d2q(force_ofps?force_ofps:sh_video->fps*playback_speed, 30000); |
11946
73b7ddcf4cbe
use libavcodecs float -> fraction conversation if available for -ofps, that way exact framerates like 24000/1001 are possible instead of ending up with x/10000
michael
parents:
11875
diff
changeset
|
754 mux_v->h.dwScale= q.den; |
73b7ddcf4cbe
use libavcodecs float -> fraction conversation if available for -ofps, that way exact framerates like 24000/1001 are possible instead of ending up with x/10000
michael
parents:
11875
diff
changeset
|
755 mux_v->h.dwRate = q.num; |
73b7ddcf4cbe
use libavcodecs float -> fraction conversation if available for -ofps, that way exact framerates like 24000/1001 are possible instead of ending up with x/10000
michael
parents:
11875
diff
changeset
|
756 } |
73b7ddcf4cbe
use libavcodecs float -> fraction conversation if available for -ofps, that way exact framerates like 24000/1001 are possible instead of ending up with x/10000
michael
parents:
11875
diff
changeset
|
757 #else |
2531 | 758 mux_v->h.dwScale=10000; |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
759 mux_v->h.dwRate=mux_v->h.dwScale*(force_ofps?force_ofps:sh_video->fps*playback_speed); |
11946
73b7ddcf4cbe
use libavcodecs float -> fraction conversation if available for -ofps, that way exact framerates like 24000/1001 are possible instead of ending up with x/10000
michael
parents:
11875
diff
changeset
|
760 #endif |
2531 | 761 |
2661 | 762 mux_v->codec=out_video_codec; |
2574 | 763 |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
764 mux_v->bih=NULL; |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
765 } |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
766 sh_video->codec=NULL; |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
767 sh_video->video_out=NULL; |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
768 sh_video->vfilter=NULL; // fixme! |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
769 |
2531 | 770 switch(mux_v->codec){ |
3384 | 771 case VCODEC_COPY: |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
772 if (!curfile) { |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
773 if (sh_video->bih) { |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
774 mux_v->bih=malloc(sh_video->bih->biSize); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
775 memcpy(mux_v->bih, sh_video->bih, sh_video->bih->biSize); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
776 } |
3384 | 777 else |
778 { | |
12546
7f8ae1376d6c
We don't want junk in unused parts of the BITMAPINFOHEADER
ranma
parents:
12490
diff
changeset
|
779 mux_v->bih=calloc(1,sizeof(BITMAPINFOHEADER)); |
3384 | 780 mux_v->bih->biSize=sizeof(BITMAPINFOHEADER); |
781 mux_v->bih->biWidth=sh_video->disp_w; | |
782 mux_v->bih->biHeight=sh_video->disp_h; | |
783 mux_v->bih->biCompression=sh_video->format; | |
784 mux_v->bih->biPlanes=1; | |
785 mux_v->bih->biBitCount=24; // FIXME!!! | |
786 mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8); | |
787 } | |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
788 } |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
789 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_VCodecFramecopy, |
3384 | 790 mux_v->bih->biWidth, mux_v->bih->biHeight, |
791 mux_v->bih->biBitCount, mux_v->bih->biCompression); | |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
792 |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
793 if (curfile) { |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
794 if (sh_video->bih) { |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
795 if ((mux_v->bih->biSize != sh_video->bih->biSize) || |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
796 memcmp(mux_v->bih, sh_video->bih, sh_video->bih->biSize)) |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
797 { |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
798 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_VCodecFramecopy, |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
799 sh_video->bih->biWidth, sh_video->bih->biHeight, |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
800 sh_video->bih->biBitCount, sh_video->bih->biCompression); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
801 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_FrameCopyFileMismatch); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
802 mencoder_exit(1,NULL); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
803 } |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
804 } |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
805 else { |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
806 if ((mux_v->bih->biWidth != sh_video->disp_w) || |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
807 (mux_v->bih->biHeight != sh_video->disp_h) || |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
808 (mux_v->bih->biCompression != sh_video->format)) { |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
809 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_VCodecFramecopy, |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
810 sh_video->disp_w, sh_video->disp_w, 24, sh_video->format); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
811 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_FrameCopyFileMismatch); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
812 mencoder_exit(1,NULL); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
813 } |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
814 } |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
815 } |
2531 | 816 break; |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
817 case VCODEC_FRAMENO: |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
818 if (!curfile) { |
12546
7f8ae1376d6c
We don't want junk in unused parts of the BITMAPINFOHEADER
ranma
parents:
12490
diff
changeset
|
819 mux_v->bih=calloc(1,sizeof(BITMAPINFOHEADER)); |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
820 mux_v->bih->biSize=sizeof(BITMAPINFOHEADER); |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
821 mux_v->bih->biWidth=sh_video->disp_w; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
822 mux_v->bih->biHeight=sh_video->disp_h; |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
823 mux_v->bih->biPlanes=1; |
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
824 mux_v->bih->biBitCount=24; |
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
825 mux_v->bih->biCompression=mmioFOURCC('F','r','N','o'); |
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
826 mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8); |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
827 } |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
828 break; |
14878 | 829 default: { |
830 static vf_instance_t * ve = NULL; | |
831 if (!ve) { | |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
832 switch(mux_v->codec){ |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
833 case VCODEC_LIBAVCODEC: |
6581 | 834 sh_video->vfilter=vf_open_encoder(NULL,"lavc",(char *)mux_v); break; |
11966 | 835 case VCODEC_RAW: |
836 sh_video->vfilter=vf_open_encoder(NULL,"raw",(char *)mux_v); break; | |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
837 case VCODEC_VFW: |
6581 | 838 sh_video->vfilter=vf_open_encoder(NULL,"vfw",(char *)mux_v); break; |
5578 | 839 case VCODEC_LIBDV: |
6581 | 840 sh_video->vfilter=vf_open_encoder(NULL,"libdv",(char *)mux_v); break; |
7457 | 841 case VCODEC_XVID: |
842 sh_video->vfilter=vf_open_encoder(NULL,"xvid",(char *)mux_v); break; | |
8471 | 843 case VCODEC_QTVIDEO: |
844 sh_video->vfilter=vf_open_encoder(NULL,"qtvideo",(char *)mux_v); break; | |
9520
2860f7c9d9ca
A new nuppel video encoder. Mainly for RT encoding on slow box.
albeu
parents:
9380
diff
changeset
|
845 case VCODEC_NUV: |
2860f7c9d9ca
A new nuppel video encoder. Mainly for RT encoding on slow box.
albeu
parents:
9380
diff
changeset
|
846 sh_video->vfilter=vf_open_encoder(NULL,"nuv",(char *)mux_v); break; |
13166
d198f255bee9
x264 encoder support. Original patch send by Bernhard Rosenkraenzer <bero at arklinux dot org>, modifications by Loren Merritt <lorenm at u.washington dot edu>, Jeff Clagg <snacky at ikaruga.co dot uk> and me
iive
parents:
13122
diff
changeset
|
847 case VCODEC_X264: |
d198f255bee9
x264 encoder support. Original patch send by Bernhard Rosenkraenzer <bero at arklinux dot org>, modifications by Loren Merritt <lorenm at u.washington dot edu>, Jeff Clagg <snacky at ikaruga.co dot uk> and me
iive
parents:
13122
diff
changeset
|
848 sh_video->vfilter=vf_open_encoder(NULL,"x264",(char *)mux_v); break; |
4743 | 849 } |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
850 if(!mux_v->bih || !sh_video->vfilter){ |
6947 | 851 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_EncoderOpenFailed); |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
852 mencoder_exit(1,NULL); |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
853 } |
14878 | 854 ve = sh_video->vfilter; |
855 } else sh_video->vfilter = ve; | |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
856 // append 'expand' filter, it fixes stride problems and renders osd: |
9595 | 857 if (auto_expand) { |
858 char* vf_args[] = { "osd", "1", NULL }; | |
859 sh_video->vfilter=vf_open_filter(sh_video->vfilter,"expand",vf_args); | |
860 } | |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
861 sh_video->vfilter=append_filters(sh_video->vfilter); |
3377
4723f6fd750a
do not fault if 2pass VbrControl can't open the logfile
alex
parents:
3363
diff
changeset
|
862 |
7502
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7497
diff
changeset
|
863 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
7506
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
864 init_best_video_codec(sh_video,video_codec_list,video_fm_list); |
7502
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7497
diff
changeset
|
865 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7497
diff
changeset
|
866 if(!sh_video->inited) mencoder_exit(1,NULL); |
14878 | 867 } |
3657
af1f8e2d693a
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents:
3563
diff
changeset
|
868 } |
af1f8e2d693a
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents:
3563
diff
changeset
|
869 |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
870 if (!curfile) { |
3657
af1f8e2d693a
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents:
3563
diff
changeset
|
871 /* force output fourcc to .. */ |
4365
9e20866c3250
added better fourcc handling for lavc, exiting if no lavc video codec name specified
alex
parents:
4355
diff
changeset
|
872 if ((force_fourcc != NULL) && (strlen(force_fourcc) >= 4)) |
3657
af1f8e2d693a
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents:
3563
diff
changeset
|
873 { |
af1f8e2d693a
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents:
3563
diff
changeset
|
874 mux_v->bih->biCompression = mmioFOURCC(force_fourcc[0], force_fourcc[1], |
af1f8e2d693a
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents:
3563
diff
changeset
|
875 force_fourcc[2], force_fourcc[3]); |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
876 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ForcingOutputFourcc, |
4365
9e20866c3250
added better fourcc handling for lavc, exiting if no lavc video codec name specified
alex
parents:
4355
diff
changeset
|
877 mux_v->bih->biCompression, (char *)&mux_v->bih->biCompression); |
2531 | 878 } |
879 | |
17654 | 880 if (! ignore_start) |
17648 | 881 muxer->audio_delay_fix -= sh_video->stream_delay; |
882 | |
8030
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
883 //if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf! |
4370 | 884 |
2581 | 885 // ============= AUDIO =============== |
886 if(sh_audio){ | |
887 | |
15888
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
888 if (force_audiofmttag != -1) { |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
889 sh_audio->format = force_audiofmttag; |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
890 if (sh_audio->wf) { |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
891 sh_audio->wf->wFormatTag = sh_audio->format; |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
892 } |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
893 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ForcingOutputAudiofmtTag, |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
894 force_audiofmttag); |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
895 } |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
896 |
8585 | 897 mux_a=muxer_new_stream(muxer,MUXER_TYPE_AUDIO); |
2581 | 898 |
899 mux_a->buffer_size=0x100000; //16384; | |
900 mux_a->buffer=malloc(mux_a->buffer_size); | |
11974 | 901 if (!mux_a->buffer) |
13122 | 902 mencoder_exit(1,MSGTR_MemAllocFailed); |
2581 | 903 |
904 mux_a->source=sh_audio; | |
905 | |
2661 | 906 mux_a->codec=out_audio_codec; |
2581 | 907 |
15811
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15603
diff
changeset
|
908 ao_data.samplerate = force_srate; |
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15603
diff
changeset
|
909 ao_data.channels = 0; |
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15603
diff
changeset
|
910 ao_data.format = audio_output_format; |
15546
4ac9c227d758
preinit audio filters in order to determine the final samplerate and number of channels, or audio encoders will be initialized with the wrong parameters
nicodvb
parents:
15507
diff
changeset
|
911 if(!preinit_audio_filters(sh_audio, |
4ac9c227d758
preinit audio filters in order to determine the final samplerate and number of channels, or audio encoders will be initialized with the wrong parameters
nicodvb
parents:
15507
diff
changeset
|
912 // input: |
4ac9c227d758
preinit audio filters in order to determine the final samplerate and number of channels, or audio encoders will be initialized with the wrong parameters
nicodvb
parents:
15507
diff
changeset
|
913 new_srate, |
4ac9c227d758
preinit audio filters in order to determine the final samplerate and number of channels, or audio encoders will be initialized with the wrong parameters
nicodvb
parents:
15507
diff
changeset
|
914 sh_audio->channels, sh_audio->sample_format, |
4ac9c227d758
preinit audio filters in order to determine the final samplerate and number of channels, or audio encoders will be initialized with the wrong parameters
nicodvb
parents:
15507
diff
changeset
|
915 // output: |
4ac9c227d758
preinit audio filters in order to determine the final samplerate and number of channels, or audio encoders will be initialized with the wrong parameters
nicodvb
parents:
15507
diff
changeset
|
916 &ao_data.samplerate, &ao_data.channels, &ao_data.format)) { |
4ac9c227d758
preinit audio filters in order to determine the final samplerate and number of channels, or audio encoders will be initialized with the wrong parameters
nicodvb
parents:
15507
diff
changeset
|
917 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_AudioFilterChainPreinitError); |
4ac9c227d758
preinit audio filters in order to determine the final samplerate and number of channels, or audio encoders will be initialized with the wrong parameters
nicodvb
parents:
15507
diff
changeset
|
918 mencoder_exit(1, NULL); |
4ac9c227d758
preinit audio filters in order to determine the final samplerate and number of channels, or audio encoders will be initialized with the wrong parameters
nicodvb
parents:
15507
diff
changeset
|
919 } |
4ac9c227d758
preinit audio filters in order to determine the final samplerate and number of channels, or audio encoders will be initialized with the wrong parameters
nicodvb
parents:
15507
diff
changeset
|
920 |
4ac9c227d758
preinit audio filters in order to determine the final samplerate and number of channels, or audio encoders will be initialized with the wrong parameters
nicodvb
parents:
15507
diff
changeset
|
921 aparams.channels = ao_data.channels; |
15811
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15603
diff
changeset
|
922 aparams.sample_rate = ao_data.samplerate; |
15234 | 923 aparams.audio_preload = 1000 * audio_preload; |
924 if(mux_a->codec != ACODEC_COPY) { | |
925 aencoder = new_audio_encoder(mux_a, &aparams); | |
926 if(!aencoder) | |
927 mencoder_exit(1, NULL); | |
928 if(!init_audio_filters(sh_audio, | |
929 new_srate, sh_audio->channels, sh_audio->sample_format, | |
15811
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15603
diff
changeset
|
930 &aparams.sample_rate, &aparams.channels, &aencoder->input_format, |
15234 | 931 aencoder->min_buffer_size, aencoder->max_buffer_size)) { |
932 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_NoMatchingFilter); | |
933 mencoder_exit(1,NULL); | |
934 } | |
935 } | |
2581 | 936 switch(mux_a->codec){ |
3385 | 937 case ACODEC_COPY: |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
938 if (playback_speed != 1.0) mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_NoSpeedWithFrameCopy); |
15888
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
939 if (sh_audio->format >= 0x10000) { |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
940 mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CantCopyAudioFormat, sh_audio->format); |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
941 mencoder_exit(1,NULL); |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
942 } |
4369 | 943 if (sh_audio->wf){ |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
944 mux_a->wf=malloc(sizeof(WAVEFORMATEX) + sh_audio->wf->cbSize); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
945 memcpy(mux_a->wf, sh_audio->wf, sizeof(WAVEFORMATEX) + sh_audio->wf->cbSize); |
4370 | 946 if(!sh_audio->i_bps) sh_audio->i_bps=mux_a->wf->nAvgBytesPerSec; |
4369 | 947 } else { |
3385 | 948 mux_a->wf = malloc(sizeof(WAVEFORMATEX)); |
4370 | 949 mux_a->wf->nBlockAlign = 1; //mux_a->h.dwSampleSize; |
7643 | 950 mux_a->wf->wFormatTag = sh_audio->format; |
3385 | 951 mux_a->wf->nChannels = sh_audio->channels; |
952 mux_a->wf->nSamplesPerSec = sh_audio->samplerate; | |
4369 | 953 mux_a->wf->nAvgBytesPerSec=sh_audio->i_bps; //mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec; |
3480 | 954 mux_a->wf->wBitsPerSample = 16; // FIXME |
3385 | 955 mux_a->wf->cbSize=0; // FIXME for l3codeca.acm |
956 } | |
4370 | 957 if(sh_audio->audio.dwScale){ |
958 mux_a->h.dwSampleSize=sh_audio->audio.dwSampleSize; | |
959 mux_a->h.dwScale=sh_audio->audio.dwScale; | |
960 mux_a->h.dwRate=sh_audio->audio.dwRate; | |
961 } else { | |
962 mux_a->h.dwSampleSize=mux_a->wf->nBlockAlign; | |
963 mux_a->h.dwScale=mux_a->h.dwSampleSize; | |
964 mux_a->h.dwRate=mux_a->wf->nAvgBytesPerSec; | |
965 } | |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
966 mux_a->h.dwRate *= playback_speed; |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
967 mux_a->wf->nSamplesPerSec *= playback_speed; |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
968 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, |
17366 | 969 mux_a->wf->wFormatTag, mux_a->wf->nChannels, mux_a->wf->nSamplesPerSec, |
970 mux_a->wf->wBitsPerSample, mux_a->wf->nAvgBytesPerSec, mux_a->h.dwSampleSize); | |
2581 | 971 break; |
972 } | |
6861 | 973 |
17977
f70772d02eaa
Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents:
17932
diff
changeset
|
974 if ( mp_msg_test(MSGT_MENCODER,MSGL_DBG2) ) print_wave_header(mux_a->wf, MSGL_DBG2); |
6861 | 975 |
17654 | 976 if (! ignore_start) |
17648 | 977 muxer->audio_delay_fix += sh_audio->stream_delay; |
2581 | 978 |
6861 | 979 } // if(sh_audio) |
6530
f8d544dd22e9
mono mp3 encoding support by Paul Ortyl <ortylp at 3miasto.net>
alex
parents:
6419
diff
changeset
|
980 |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
981 decoded_frameno=0; |
2531 | 982 |
983 signal(SIGINT,exit_sighandler); // Interrupt from keyboard | |
984 signal(SIGQUIT,exit_sighandler); // Quit from keyboard | |
985 signal(SIGTERM,exit_sighandler); // kill | |
16002
433234c2a4aa
catch HUP and PIPE signals aswell. Patch by Sergey Khlutchin (@gmail.com)
alex
parents:
15997
diff
changeset
|
986 signal(SIGHUP,exit_sighandler); // broken terminal line |
433234c2a4aa
catch HUP and PIPE signals aswell. Patch by Sergey Khlutchin (@gmail.com)
alex
parents:
15997
diff
changeset
|
987 signal(SIGPIPE,exit_sighandler); // broken pipe |
2531 | 988 |
4387 | 989 timer_start=GetTimerMS(); |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
990 } // if (!curfile) // if this was the first file. |
16752
425863aab3df
fix mencoder multi-file with some files having audio but others dont
ods15
parents:
16708
diff
changeset
|
991 else { |
16756
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
992 if (!mux_a != !sh_audio) { |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
993 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_NoAudioFileMismatch); |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
994 mencoder_exit(1,NULL); |
15234 | 995 } |
16756
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
996 if (sh_audio && mux_a->codec == ACODEC_COPY) { |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
997 if (playback_speed != 1.0) mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_NoSpeedWithFrameCopy); |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
998 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, |
17366 | 999 mux_a->wf->wFormatTag, mux_a->wf->nChannels, mux_a->wf->nSamplesPerSec, |
1000 mux_a->wf->wBitsPerSample, mux_a->wf->nAvgBytesPerSec, mux_a->h.dwSampleSize); | |
16756
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1001 if (sh_audio->wf) { |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1002 if ((mux_a->wf->wFormatTag != sh_audio->wf->wFormatTag) || |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1003 (mux_a->wf->nChannels != sh_audio->wf->nChannels) || |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1004 (mux_a->wf->nSamplesPerSec != sh_audio->wf->nSamplesPerSec * playback_speed)) |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1005 { |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1006 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, |
17366 | 1007 sh_audio->wf->wFormatTag, sh_audio->wf->nChannels, (int)(sh_audio->wf->nSamplesPerSec * playback_speed), |
1008 sh_audio->wf->wBitsPerSample, sh_audio->wf->nAvgBytesPerSec, 0); | |
16756
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1009 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_AudioCopyFileMismatch); |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1010 mencoder_exit(1,NULL); |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1011 } |
16756
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1012 } else { |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1013 if ((mux_a->wf->wFormatTag != sh_audio->format) || |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1014 (mux_a->wf->nChannels != sh_audio->channels) || |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1015 (mux_a->wf->nSamplesPerSec != sh_audio->samplerate * playback_speed)) |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1016 { |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1017 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, |
17366 | 1018 sh_audio->wf->wFormatTag, sh_audio->wf->nChannels, (int)(sh_audio->wf->nSamplesPerSec * playback_speed), |
1019 sh_audio->wf->wBitsPerSample, sh_audio->wf->nAvgBytesPerSec, 0); | |
16756
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1020 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_AudioCopyFileMismatch); |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1021 mencoder_exit(1,NULL); |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1022 } |
16756
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1023 } |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1024 } else if (sh_audio) { |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1025 int out_srate = mux_a->wf->nSamplesPerSec; |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1026 int out_channels = mux_a->wf->nChannels; |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1027 int out_format = aencoder->input_format; |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1028 int out_minsize = aencoder->min_buffer_size; |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1029 int out_maxsize = aencoder->max_buffer_size; |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1030 if (!init_audio_filters(sh_audio, new_srate, sh_audio->channels, |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1031 sh_audio->sample_format, &out_srate, &out_channels, |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1032 &out_format, out_minsize, out_maxsize)) { |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1033 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoMatchingFilter); |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1034 mencoder_exit(1, NULL); |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1035 } |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1036 mux_a->wf->nSamplesPerSec = out_srate; |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1037 mux_a->wf->nChannels = out_channels; |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1038 } |
16752
425863aab3df
fix mencoder multi-file with some files having audio but others dont
ods15
parents:
16708
diff
changeset
|
1039 } |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1040 |
4620 | 1041 if (seek_to_sec) { |
22312 | 1042 demux_seek(demuxer, seek_to_sec, audio_delay, 1); |
7394
e5e2243a3adb
reversed -ss behaviour (you have to use teh same -ss for all passes)
arpi
parents:
7370
diff
changeset
|
1043 // there is 2 way to handle the -ss option in 3-pass mode: |
e5e2243a3adb
reversed -ss behaviour (you have to use teh same -ss for all passes)
arpi
parents:
7370
diff
changeset
|
1044 // > 1. do the first pass for the whole file, and use -ss for 2nd/3rd pases only |
e5e2243a3adb
reversed -ss behaviour (you have to use teh same -ss for all passes)
arpi
parents:
7370
diff
changeset
|
1045 // > 2. do all the 3 passes with the same -ss value |
e5e2243a3adb
reversed -ss behaviour (you have to use teh same -ss for all passes)
arpi
parents:
7370
diff
changeset
|
1046 // this line enables behaviour 1. (and kills 2. at the same time): |
17636 | 1047 // if(demuxer2) demux_seek(demuxer2, d, audio_delay, 1); |
4620 | 1048 } |
1049 | |
8585 | 1050 if (out_file_format == MUXER_TYPE_MPEG) |
1051 { | |
1052 if (audio_preload > 0.4) { | |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1053 mp_msg(MSGT_MENCODER, MSGL_WARN, MSGTR_LimitingAudioPreload); |
8585 | 1054 audio_preload = 0.4; |
1055 } | |
1056 if (audio_density < 4) { | |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1057 mp_msg(MSGT_MENCODER, MSGL_WARN, MSGTR_IncreasingAudioDensity); |
8731 | 1058 audio_density = 4; |
8585 | 1059 } |
1060 } | |
1061 | |
9746 | 1062 if(file_format == DEMUXER_TYPE_TV) |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1063 { |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1064 mp_msg(MSGT_MENCODER, MSGL_WARN, MSGTR_ZeroingAudioPreloadAndMaxPtsCorrection); |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1065 audio_preload = 0.0; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1066 default_max_pts_correction = 0; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1067 } |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1068 |
6590 | 1069 play_n_frames=play_n_frames_mf; |
19973
02a18c52a42a
after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents:
19519
diff
changeset
|
1070 if (curfile && end_at.type == END_AT_TIME) end_at.pos += mux_v->timer; |
6590 | 1071 |
14996
576b810a034d
100l to oded.. edl was causing the decoder to get a first broken packet
rfelker
parents:
14964
diff
changeset
|
1072 if (edl_records) free_edl(edl_records); |
576b810a034d
100l to oded.. edl was causing the decoder to get a first broken packet
rfelker
parents:
14964
diff
changeset
|
1073 next_edl_record = edl_records = NULL; |
576b810a034d
100l to oded.. edl was causing the decoder to get a first broken packet
rfelker
parents:
14964
diff
changeset
|
1074 edl_muted = 0; |
576b810a034d
100l to oded.. edl was causing the decoder to get a first broken packet
rfelker
parents:
14964
diff
changeset
|
1075 edl_seeking = 1; |
14964 | 1076 if (edl_filename) { |
1077 next_edl_record = edl_records = edl_parse_file(); | |
1078 } | |
1079 | |
15997 | 1080 if (sh_audio && audio_delay != 0.) fixdelay(d_video, d_audio, mux_a, &frame_data, mux_v->codec==VCODEC_COPY); |
1081 | |
6419
773d71059d8a
On QNX eof szmbol clashes with system headers, workaround by renaming to at_eof. Fell free to reverse if zou don't like this waz.
atmos4
parents:
6333
diff
changeset
|
1082 while(!at_eof){ |
2531 | 1083 |
1084 int blit_frame=0; | |
1085 float a_pts=0; | |
1086 float v_pts=0; | |
2613 | 1087 int skip_flag=0; // 1=skip -1=duplicate |
2531 | 1088 |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
1089 if((end_at.type == END_AT_SIZE && end_at.pos <= stream_tell(muxer->stream)) || |
19973
02a18c52a42a
after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents:
19519
diff
changeset
|
1090 (end_at.type == END_AT_TIME && end_at.pos < mux_v->timer)) |
4159
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1091 break; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1092 |
2643 | 1093 if(play_n_frames>=0){ |
1094 --play_n_frames; | |
1095 if(play_n_frames<0) break; | |
1096 } | |
1097 | |
14964 | 1098 goto_redo_edl: |
1099 if (next_edl_record && sh_video && sh_video->pts >= next_edl_record->start_sec) { | |
1100 if (next_edl_record->action == EDL_SKIP && edl_seeking) { | |
1101 float last_pos = d_video->pts; | |
1102 int result; | |
1103 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: start [%f], stop [%f], length [%f]\n", | |
1104 next_edl_record->start_sec, next_edl_record->stop_sec, next_edl_record->length_sec); | |
1105 | |
15993 | 1106 result = edl_seek(next_edl_record, demuxer, d_audio, mux_a, &frame_data, mux_v->codec==VCODEC_COPY); |
14964 | 1107 |
15831
1d2b2c0d7e89
-don't encode more audio than needed; -edl_skip is int, not short; -don't read audio_data to skip in mux_a->buffer; -edl_seek works on input streams, not output; -one-frame accuracy fix ; patch by Oded Shimon
nicodvb
parents:
15811
diff
changeset
|
1108 if (result == 2) { at_eof=1; break; } // EOF |
14964 | 1109 else if (result == 0) edl_seeking = 0; // no seeking |
1110 else { // sucess | |
1111 edl_muted = 0; | |
1112 if (last_pos >= sh_video->pts) { | |
1113 // backwards seek detected!! Forget about this EDL skip altogether. | |
1114 next_edl_record = next_edl_record->next; | |
1115 } | |
1116 else for (next_edl_record = edl_records; next_edl_record; next_edl_record = next_edl_record->next) { | |
1117 /* note the use of stop_sec, | |
1118 meaning if by some magical way we landed in the MIDDLE of a censored area, | |
1119 in the next loop it will jump out of it. | |
1120 */ | |
1121 if (next_edl_record->stop_sec > sh_video->pts) break; // we got to the right place. | |
1122 if (next_edl_record->action == EDL_MUTE) edl_muted = !edl_muted; // toggle mute each time. | |
1123 } | |
1124 | |
1125 /* for a pedantic EDL, that doesn't show even a single | |
1126 frame from the "censored" area, uncomment next line. */ | |
1127 goto goto_redo_edl; | |
1128 } | |
1129 } else if (next_edl_record->action == EDL_MUTE) { | |
1130 edl_muted = !edl_muted; // This variable does nothing for now. | |
1131 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_MUTE: [%f]\n", next_edl_record->start_sec ); | |
1132 next_edl_record=next_edl_record->next; | |
1133 } | |
1134 } | |
1135 | |
1136 | |
2581 | 1137 if(sh_audio){ |
1138 // get audio: | |
2583 | 1139 while(mux_a->timer-audio_preload<mux_v->timer){ |
15234 | 1140 float tottime; |
2653 | 1141 int len=0; |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1142 |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1143 ptimer_start = GetTimerMS(); |
15234 | 1144 // CBR - copy 0.5 sec of audio |
1145 // or until the end of video: | |
1146 tottime = stop_time(demuxer, mux_v); | |
1147 if (tottime != -1) { | |
1148 tottime -= mux_a->timer; | |
1149 if (tottime > 1./audio_density) tottime = 1./audio_density; | |
1150 } | |
1151 else tottime = 1./audio_density; | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1152 |
15831
1d2b2c0d7e89
-don't encode more audio than needed; -edl_skip is int, not short; -don't read audio_data to skip in mux_a->buffer; -edl_seek works on input streams, not output; -one-frame accuracy fix ; patch by Oded Shimon
nicodvb
parents:
15811
diff
changeset
|
1153 // let's not output more audio than necessary |
1d2b2c0d7e89
-don't encode more audio than needed; -edl_skip is int, not short; -don't read audio_data to skip in mux_a->buffer; -edl_seek works on input streams, not output; -one-frame accuracy fix ; patch by Oded Shimon
nicodvb
parents:
15811
diff
changeset
|
1154 if (tottime <= 0) break; |
11375 | 1155 |
15234 | 1156 if(aencoder) |
1157 { | |
1158 if(mux_a->h.dwSampleSize) /* CBR */ | |
1159 { | |
1160 if(aencoder->set_decoded_len) | |
1161 { | |
1162 len = mux_a->h.dwSampleSize*(int)(mux_a->h.dwRate*tottime); | |
1163 aencoder->set_decoded_len(aencoder, len); | |
1164 } | |
1165 else | |
1166 len = aencoder->decode_buffer_size; | |
11375 | 1167 |
15234 | 1168 len = dec_audio(sh_audio, aencoder->decode_buffer, len); |
1169 mux_a->buffer_len += aencoder->encode(aencoder, mux_a->buffer + mux_a->buffer_len, | |
17122 | 1170 aencoder->decode_buffer, len, mux_a->buffer_size-mux_a->buffer_len); |
15234 | 1171 if(mux_a->buffer_len < mux_a->wf->nBlockAlign) |
1172 len = 0; | |
1173 else | |
1174 len = mux_a->wf->nBlockAlign*(mux_a->buffer_len/mux_a->wf->nBlockAlign); | |
11375 | 1175 } |
15234 | 1176 else /* VBR */ |
1177 { | |
1178 int sz = 0; | |
1179 while(1) | |
1180 { | |
1181 len = 0; | |
1182 if(! sz) | |
1183 sz = aencoder->get_frame_size(aencoder); | |
1184 if(sz > 0 && mux_a->buffer_len >= sz) | |
1185 { | |
1186 len = sz; | |
1187 break; | |
1188 } | |
1189 len = dec_audio(sh_audio,aencoder->decode_buffer, aencoder->decode_buffer_size); | |
1190 if(len <= 0) | |
1191 { | |
1192 len = 0; | |
1193 break; | |
1194 } | |
17122 | 1195 len = aencoder->encode(aencoder, mux_a->buffer + mux_a->buffer_len, aencoder->decode_buffer, len, mux_a->buffer_size-mux_a->buffer_len); |
15234 | 1196 mux_a->buffer_len += len; |
1197 } | |
11375 | 1198 } |
1199 if (mux_v->timer == 0) mux_a->h.dwInitialFrames++; | |
1200 } | |
15234 | 1201 else { |
2581 | 1202 if(mux_a->h.dwSampleSize){ |
2583 | 1203 switch(mux_a->codec){ |
3385 | 1204 case ACODEC_COPY: // copy |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1205 len=mux_a->wf->nAvgBytesPerSec*tottime; |
2583 | 1206 len/=mux_a->h.dwSampleSize;if(len<1) len=1; |
1207 len*=mux_a->h.dwSampleSize; | |
1208 len=demux_read_data(sh_audio->ds,mux_a->buffer,len); | |
1209 break; | |
1210 } | |
2581 | 1211 } else { |
2605 | 1212 // VBR - encode/copy an audio frame |
1213 switch(mux_a->codec){ | |
3385 | 1214 case ACODEC_COPY: // copy |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1215 len=ds_get_packet(sh_audio->ds,(unsigned char**) &mux_a->buffer); |
2605 | 1216 break; |
2591 | 1217 } |
2605 | 1218 } |
2581 | 1219 } |
2583 | 1220 if(len<=0) break; // EOF? |
17487
fa17424b4c7b
change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
michael
parents:
17366
diff
changeset
|
1221 muxer_write_chunk(mux_a,len,0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE); |
2655 | 1222 if(!mux_a->h.dwSampleSize && mux_a->timer>0) |
3354 | 1223 mux_a->wf->nAvgBytesPerSec=0.5f+(double)mux_a->size/mux_a->timer; // avg bps (VBR) |
2591 | 1224 if(mux_a->buffer_len>=len){ |
1225 mux_a->buffer_len-=len; | |
1226 memcpy(mux_a->buffer,mux_a->buffer+len,mux_a->buffer_len); | |
1227 } | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1228 |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1229 |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1230 audiosamples++; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1231 audiorate+= (GetTimerMS() - ptimer_start); |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1232 |
2581 | 1233 } |
1234 } | |
1235 | |
1236 // get video frame! | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1237 |
15993 | 1238 if (!frame_data.already_read) { |
1239 frame_data.in_size=video_read_frame(sh_video,&frame_data.frame_time,&frame_data.start,force_fps); | |
1240 sh_video->timer+=frame_data.frame_time; | |
1241 } | |
1242 frame_data.frame_time /= playback_speed; | |
1243 if(frame_data.in_size<0){ at_eof=1; break; } | |
1244 ++decoded_frameno; | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1245 |
15993 | 1246 v_timer_corr-=frame_data.frame_time-(float)mux_v->h.dwScale/mux_v->h.dwRate; |
8598
824481376632
"MPlayer does the right thing, presents frame 9 for 1.1 seconds, and continues
arpi
parents:
8585
diff
changeset
|
1247 |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
1248 if(demuxer2){ // 3-pass encoding, read control file (frameno.avi) |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1249 // find our frame: |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1250 while(next_frameno<decoded_frameno){ |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1251 int* start; |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1252 int len=ds_get_packet(demuxer2->video,(unsigned char**) &start); |
6419
773d71059d8a
On QNX eof szmbol clashes with system headers, workaround by renaming to at_eof. Fell free to reverse if zou don't like this waz.
atmos4
parents:
6333
diff
changeset
|
1253 if(len<0){ at_eof=1;break;} |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1254 if(len==0) --skip_flag; else // duplicate |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1255 if(len==4) next_frameno=start[0]; |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1256 } |
6419
773d71059d8a
On QNX eof szmbol clashes with system headers, workaround by renaming to at_eof. Fell free to reverse if zou don't like this waz.
atmos4
parents:
6333
diff
changeset
|
1257 if(at_eof) break; |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1258 // if(skip_flag) printf("!!!!!!!!!!!!\n"); |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1259 skip_flag=next_frameno-decoded_frameno; |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1260 // find next frame: |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1261 while(next_frameno<=decoded_frameno){ |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1262 int* start; |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1263 int len=ds_get_packet(demuxer2->video,(unsigned char**) &start); |
6419
773d71059d8a
On QNX eof szmbol clashes with system headers, workaround by renaming to at_eof. Fell free to reverse if zou don't like this waz.
atmos4
parents:
6333
diff
changeset
|
1264 if(len<0){ at_eof=1;break;} |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1265 if(len==0) --skip_flag; else // duplicate |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1266 if(len==4) next_frameno=start[0]; |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1267 } |
6419
773d71059d8a
On QNX eof szmbol clashes with system headers, workaround by renaming to at_eof. Fell free to reverse if zou don't like this waz.
atmos4
parents:
6333
diff
changeset
|
1268 // if(at_eof) break; |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1269 // printf("Current fno=%d requested=%d skip=%d \n",decoded_frameno,fno,skip_flag); |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1270 } else { |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1271 |
2613 | 1272 // check frame duplicate/drop: |
1273 | |
6721 | 1274 //printf("\r### %5.3f ###\n",v_timer_corr); |
17647 | 1275 float mux_frametime = (float)mux_v->h.dwScale/mux_v->h.dwRate; |
6721 | 1276 |
17647 | 1277 if (v_timer_corr >= mux_frametime && (skip_limit<0 || skip_flag < skip_limit)) { |
1278 v_timer_corr-=mux_frametime; | |
2613 | 1279 ++skip_flag; // skip |
17647 | 1280 } |
1281 while (v_timer_corr <= -mux_frametime && (skip_limit<0 || -skip_flag < skip_limit)) { | |
1282 v_timer_corr+=mux_frametime; | |
2613 | 1283 --skip_flag; // dup |
1284 } | |
2531 | 1285 |
17647 | 1286 // either v_pts_corr is big, more than 2 times framerate, then we follow its advice, |
1287 // or, it cancels out v_timer_corr, in which case be happy and do nothing. | |
1288 | |
1289 while ((v_pts_corr <= -mux_frametime && skip_flag > 0) || (v_pts_corr <= -2*mux_frametime)) { | |
1290 v_pts_corr+=mux_frametime; | |
2613 | 1291 --skip_flag; // dup |
1292 } | |
17647 | 1293 if ((v_pts_corr >= mux_frametime && skip_flag < 0) || (v_pts_corr >= 2*mux_frametime)) { |
1294 if (skip_flag<=0) { // we can't skip more than 1 frame now | |
1295 v_pts_corr-=mux_frametime; | |
2613 | 1296 ++skip_flag; // skip |
1297 } | |
17647 | 1298 } |
2613 | 1299 |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1300 } // demuxer2 |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1301 |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1302 ptimer_start = GetTimerMS(); |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1303 |
2531 | 1304 switch(mux_v->codec){ |
3384 | 1305 case VCODEC_COPY: |
15993 | 1306 mux_v->buffer=frame_data.start; |
17487
fa17424b4c7b
change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
michael
parents:
17366
diff
changeset
|
1307 if(skip_flag<=0) muxer_write_chunk(mux_v,frame_data.in_size,(sh_video->ds->flags&1)?0x10:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE); |
2574 | 1308 break; |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
1309 case VCODEC_FRAMENO: |
6581 | 1310 mux_v->buffer=(unsigned char *)&decoded_frameno; // tricky |
17487
fa17424b4c7b
change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
michael
parents:
17366
diff
changeset
|
1311 if(skip_flag<=0) muxer_write_chunk(mux_v,sizeof(int),0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE); |
4575 | 1312 break; |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
1313 default: |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
1314 // decode_video will callback down to ve_*.c encoders, through the video filters |
20902
bfb6eacd9c4a
Update OSD contents only after the correct values for the frame are known.
uau
parents:
20577
diff
changeset
|
1315 {void *decoded_frame = decode_video(sh_video,frame_data.start,frame_data.in_size, |
18417
31e8947b7b87
Temporary workaround for libavcodec issues with B-frames
rtognimp
parents:
18335
diff
changeset
|
1316 skip_flag>0 && (!sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE), MP_NOPTS_VALUE); |
20902
bfb6eacd9c4a
Update OSD contents only after the correct values for the frame are known.
uau
parents:
20577
diff
changeset
|
1317 blit_frame = decoded_frame && filter_video(sh_video, decoded_frame, MP_NOPTS_VALUE);} |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1318 |
14878 | 1319 if (sh_video->vf_inited < 0) mencoder_exit(1, NULL); |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1320 |
7370
8e07aeda7344
count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
arpi
parents:
7331
diff
changeset
|
1321 if(!blit_frame){ |
15895
7742302e793d
Do not count skipped/broken frames when using -frames
reimar
parents:
15888
diff
changeset
|
1322 if (play_n_frames >= 0) |
7742302e793d
Do not count skipped/broken frames when using -frames
reimar
parents:
15888
diff
changeset
|
1323 play_n_frames++; |
7370
8e07aeda7344
count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
arpi
parents:
7331
diff
changeset
|
1324 badframes++; |
8e07aeda7344
count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
arpi
parents:
7331
diff
changeset
|
1325 if(skip_flag<=0){ |
6721 | 1326 // unwanted skipping of a frame, what to do? |
16829
c1aabebbe2e7
honor decoder's/filter's decision to remove frames when using -noskip.
rfelker
parents:
16828
diff
changeset
|
1327 v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate; |
c1aabebbe2e7
honor decoder's/filter's decision to remove frames when using -noskip.
rfelker
parents:
16828
diff
changeset
|
1328 #if 0 |
16836 | 1329 // Old code apparently made under the assumption that !blit_frame means |
1330 // decoding failed due to corruption or something.. but duplication and | |
1331 // skipping of frames should be entirely disabled when skip_limit==0, | |
1332 // and must be in order for many filters to work with -noskip. | |
1333 // Eventually this entire block should probably be removed. | |
6721 | 1334 if(skip_limit==0){ |
1335 // skipping not allowed -> write empty frame: | |
12490 | 1336 if (!encode_duplicates || !sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_DUPLICATE_FRAME, 0) != CONTROL_TRUE) |
17487
fa17424b4c7b
change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
michael
parents:
17366
diff
changeset
|
1337 muxer_write_chunk(mux_v,0,0, MP_NOPTS_VALUE, MP_NOPTS_VALUE); |
6721 | 1338 } else { |
1339 // skipping allowed -> skip it and distriubute timer error: | |
1340 v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate; | |
1341 } | |
16829
c1aabebbe2e7
honor decoder's/filter's decision to remove frames when using -noskip.
rfelker
parents:
16828
diff
changeset
|
1342 #endif |
7370
8e07aeda7344
count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
arpi
parents:
7331
diff
changeset
|
1343 } |
6721 | 1344 } |
2531 | 1345 } |
2613 | 1346 |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1347 videosamples++; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1348 videorate+=(GetTimerMS() - ptimer_start); |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1349 |
2613 | 1350 if(skip_flag<0){ |
2605 | 1351 // duplicate frame |
14813
39f93fbc52dc
do not hide frame skips/dups! if they happen it's very bad!!
rfelker
parents:
14808
diff
changeset
|
1352 if(!quiet) mp_msg(MSGT_MENCODER, MSGL_WARN, MSGTR_DuplicateFrames,-skip_flag); |
2613 | 1353 while(skip_flag<0){ |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1354 duplicatedframes++; |
12490 | 1355 if (!encode_duplicates || !sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_DUPLICATE_FRAME, 0) != CONTROL_TRUE) |
17487
fa17424b4c7b
change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
michael
parents:
17366
diff
changeset
|
1356 muxer_write_chunk(mux_v,0,0, MP_NOPTS_VALUE, MP_NOPTS_VALUE); |
2613 | 1357 ++skip_flag; |
1358 } | |
2639 | 1359 } else |
1360 if(skip_flag>0){ | |
2605 | 1361 // skip frame |
14813
39f93fbc52dc
do not hide frame skips/dups! if they happen it's very bad!!
rfelker
parents:
14808
diff
changeset
|
1362 if(!quiet) mp_msg(MSGT_MENCODER, MSGL_WARN, MSGTR_SkipFrame); |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1363 skippedframes++; |
2613 | 1364 --skip_flag; |
2605 | 1365 } |
1366 | |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1367 if(sh_audio && !demuxer2){ |
2605 | 1368 float AV_delay,x; |
1369 // A-V sync! | |
8030
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
1370 #if 0 |
2605 | 1371 if(pts_from_bps){ |
1372 unsigned int samples=(sh_audio->audio.dwSampleSize)? | |
1373 ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) : | |
6871
88953ff93743
count blocks by rounded-up chunksizes instead of chunks -
arpi
parents:
6861
diff
changeset
|
1374 (d_audio->block_no); // <- used for VBR audio |
4378 | 1375 // printf("samples=%d \n",samples); |
2605 | 1376 a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate; |
1377 delay_corrected=1; | |
8030
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
1378 } else |
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
1379 #endif |
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
1380 { |
2605 | 1381 // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec) |
1382 a_pts=d_audio->pts; | |
1383 if(!delay_corrected) if(a_pts) delay_corrected=1; | |
1384 //printf("*** %5.3f ***\n",a_pts); | |
1385 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; | |
1386 } | |
8966 | 1387 v_pts=sh_video ? sh_video->pts : d_video->pts; |
2605 | 1388 // av = compensated (with out buffering delay) A-V diff |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
1389 AV_delay=(a_pts-v_pts); |
15997 | 1390 AV_delay-=audio_delay; |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
1391 AV_delay /= playback_speed; |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
1392 AV_delay-=mux_a->timer-(mux_v->timer-(v_timer_corr+v_pts_corr)); |
17659 | 1393 // adjust for encoder delays |
1394 AV_delay -= (float) mux_a->encoder_delay * mux_a->h.dwScale/mux_a->h.dwRate; | |
1395 AV_delay += (float) mux_v->encoder_delay * mux_v->h.dwScale/mux_v->h.dwRate; | |
2605 | 1396 // compensate input video timer by av: |
1397 x=AV_delay*0.1f; | |
1398 if(x<-max_pts_correction) x=-max_pts_correction; else | |
1399 if(x> max_pts_correction) x= max_pts_correction; | |
1400 if(default_max_pts_correction>=0) | |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
1401 max_pts_correction=default_max_pts_correction*playback_speed; |
2605 | 1402 else |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
1403 max_pts_correction=sh_video->frametime*0.10 *playback_speed; // +-10% of time |
2605 | 1404 // sh_video->timer-=x; |
1405 c_total+=x; | |
2613 | 1406 v_pts_corr+=x; |
4387 | 1407 } |
2605 | 1408 |
4387 | 1409 // printf("A:%6.1f V:%6.1f A-V:%7.3f oAV:%7.3f diff:%7.3f ct:%7.3f vpc:%7.3f \r", |
1410 // a_pts,v_pts,a_pts-v_pts, | |
1411 // (float)(mux_a->timer-mux_v->timer), | |
1412 // AV_delay, c_total, v_pts_corr ); | |
1413 // printf("V:%6.1f \r", d_video->pts ); | |
2605 | 1414 |
1415 #if 0 | |
1416 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A:%6.1f V:%6.1f A-V:%7.3f ct:%7.3f %3d/%3d %2d%% %2d%% %4.1f%% %d%%\r", | |
1417 a_pts,v_pts,a_pts-v_pts,c_total, | |
1418 (int)sh_video->num_frames,(int)sh_video->num_frames_decoded, | |
1419 (sh_video->timer>0.5)?(int)(100.0*video_time_usage/(double)sh_video->timer):0, | |
1420 (sh_video->timer>0.5)?(int)(100.0*vout_time_usage/(double)sh_video->timer):0, | |
1421 (sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0 | |
1422 ,cache_fill_status | |
1423 ); | |
1424 #endif | |
1425 | |
4387 | 1426 { float t=(GetTimerMS()-timer_start)*0.001f; |
1427 float len=(demuxer->movi_end-demuxer->movi_start); | |
16875
4951a3abcd1a
Provide percentage even when demuxer->movi_start and movi_end are not available
reimar
parents:
16836
diff
changeset
|
1428 float p=len>1000 ? (float)(demuxer->filepos-demuxer->movi_start) / len : |
4951a3abcd1a
Provide percentage even when demuxer->movi_start and movi_end are not available
reimar
parents:
16836
diff
changeset
|
1429 (demuxer_get_percent_pos(demuxer) / 100.0); |
8030
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
1430 #if 0 |
4393 | 1431 if(!len && sh_audio && sh_audio->audio.dwLength>100){ |
6871
88953ff93743
count blocks by rounded-up chunksizes instead of chunks -
arpi
parents:
6861
diff
changeset
|
1432 p=(sh_audio->audio.dwSampleSize? ds_tell(sh_audio->ds)/sh_audio->audio.dwSampleSize : sh_audio->ds->block_no) |
4393 | 1433 / (float)(sh_audio->audio.dwLength); |
1434 } | |
8030
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
1435 #endif |
4392
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1436 #if 0 |
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1437 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"%d < %d < %d \r", |
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1438 (int)demuxer->movi_start, |
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1439 (int)demuxer->filepos, |
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1440 (int)demuxer->movi_end); |
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1441 #else |
11875
6b28eb95c08b
* changes mencoder's exit code on explicit kill to 2
attila
parents:
11834
diff
changeset
|
1442 if(!quiet) { |
17932 | 1443 if( mp_msg_test(MSGT_AVSYNC,MSGL_V) ) { |
7370
8e07aeda7344
count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
arpi
parents:
7331
diff
changeset
|
1444 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %3dfps Trem:%4dmin %3dmb A-V:%5.3f [%d:%d] A/Vms %d/%d D/B/S %d/%d/%d \r", |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1445 mux_v->timer, decoded_frameno, (int)(p*100), |
7058
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
6947
diff
changeset
|
1446 (t>1) ? (int)(decoded_frameno/t+0.5) : 0, |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1447 (p>0.001) ? (int)((t/p-t)/60) : 0, |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
1448 (p>0.001) ? (int)(stream_tell(muxer->stream)/p/1024/1024) : 0, |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1449 v_pts_corr, |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1450 (mux_v->timer>1) ? (int)(mux_v->size/mux_v->timer/125) : 0, |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1451 (mux_a && mux_a->timer>1) ? (int)(mux_a->size/mux_a->timer/125) : 0, |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1452 audiorate/audiosamples, videorate/videosamples, |
7370
8e07aeda7344
count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
arpi
parents:
7331
diff
changeset
|
1453 duplicatedframes, badframes, skippedframes |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1454 ); |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1455 } else |
17005
3047b92e8402
print the number of encoded frames per seconds (fps) with a greater precision
gpoirier
parents:
16875
diff
changeset
|
1456 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %5.2ffps Trem:%4dmin %3dmb A-V:%5.3f [%d:%d]\r", |
4387 | 1457 mux_v->timer, decoded_frameno, (int)(p*100), |
17005
3047b92e8402
print the number of encoded frames per seconds (fps) with a greater precision
gpoirier
parents:
16875
diff
changeset
|
1458 (t>1) ? (float)(decoded_frameno/t) : 0, |
4392
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1459 (p>0.001) ? (int)((t/p-t)/60) : 0, |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
1460 (p>0.001) ? (int)(stream_tell(muxer->stream)/p/1024/1024) : 0, |
4394 | 1461 v_pts_corr, |
1462 (mux_v->timer>1) ? (int)(mux_v->size/mux_v->timer/125) : 0, | |
4427
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1463 (mux_a && mux_a->timer>1) ? (int)(mux_a->size/mux_a->timer/125) : 0 |
4387 | 1464 ); |
11875
6b28eb95c08b
* changes mencoder's exit code on explicit kill to 2
attila
parents:
11834
diff
changeset
|
1465 } |
4392
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1466 #endif |
4387 | 1467 } |
2605 | 1468 fflush(stdout); |
1469 | |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1470 #ifdef USE_DVDREAD |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1471 // DVD sub: |
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
22232
diff
changeset
|
1472 if(vobsub_writer){ |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1473 unsigned char* packet=NULL; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1474 int len; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1475 while((len=ds_get_packet_sub(d_dvdsub,&packet))>0){ |
8966 | 1476 mp_msg(MSGT_MENCODER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f \n",len,sh_video->pts,d_dvdsub->pts); |
1477 vobsub_out_output(vobsub_writer,packet,len,mux_v->timer + d_dvdsub->pts - sh_video->pts); | |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1478 } |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1479 } |
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
22232
diff
changeset
|
1480 else |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1481 #endif |
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
22232
diff
changeset
|
1482 update_subtitles(sh_video, d_dvdsub, 0); |
2531 | 1483 |
15993 | 1484 frame_data = (s_frame_data){ .start = NULL, .in_size = 0, .frame_time = 0., .already_read = 0 }; |
1485 | |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
1486 #if 0 |
6333
69e14bf9e223
mencoder out-of-diskspace error handling, patch by Eric Lammerts <eric@lammerts.org>
arpi
parents:
6267
diff
changeset
|
1487 if(ferror(muxer_f)) { |
6947 | 1488 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_ErrorWritingFile, out_filename); |
6333
69e14bf9e223
mencoder out-of-diskspace error handling, patch by Eric Lammerts <eric@lammerts.org>
arpi
parents:
6267
diff
changeset
|
1489 mencoder_exit(1, NULL); |
69e14bf9e223
mencoder out-of-diskspace error handling, patch by Eric Lammerts <eric@lammerts.org>
arpi
parents:
6267
diff
changeset
|
1490 } |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
1491 #endif |
2531 | 1492 |
6419
773d71059d8a
On QNX eof szmbol clashes with system headers, workaround by renaming to at_eof. Fell free to reverse if zou don't like this waz.
atmos4
parents:
6333
diff
changeset
|
1493 } // while(!at_eof) |
2531 | 1494 |
14878 | 1495 if (!interrupted && filelist[++curfile].name != 0) { |
19391
5d6f4f9b6727
Cosmetics (nothing but spaces, tabs, and a comment changed here..)
ods15
parents:
19390
diff
changeset
|
1496 if (sh_video && sh_video->vfilter) { // Before uniniting sh_video and the filter chain, break apart the VE. |
5d6f4f9b6727
Cosmetics (nothing but spaces, tabs, and a comment changed here..)
ods15
parents:
19390
diff
changeset
|
1497 vf_instance_t * ve; // this will be the filter right before the ve. |
5d6f4f9b6727
Cosmetics (nothing but spaces, tabs, and a comment changed here..)
ods15
parents:
19390
diff
changeset
|
1498 for (ve = sh_video->vfilter; ve->next && ve->next->next; ve = ve->next); |
5d6f4f9b6727
Cosmetics (nothing but spaces, tabs, and a comment changed here..)
ods15
parents:
19390
diff
changeset
|
1499 |
5d6f4f9b6727
Cosmetics (nothing but spaces, tabs, and a comment changed here..)
ods15
parents:
19390
diff
changeset
|
1500 if (ve->next) ve->next = NULL; // I'm telling the last filter, before the VE, there is nothing after it |
5d6f4f9b6727
Cosmetics (nothing but spaces, tabs, and a comment changed here..)
ods15
parents:
19390
diff
changeset
|
1501 else sh_video->vfilter = NULL; // There is no chain except the VE. |
14941 | 1502 } |
13593
e2dca00374f2
add new control message, that is send after end of stream, to flush all remaining frames in the video system
iive
parents:
13577
diff
changeset
|
1503 |
17675
e735c3f740ba
Add uninit for audio before switching to next file and completing encode
ods15
parents:
17659
diff
changeset
|
1504 if(sh_audio){ uninit_audio(sh_audio);sh_audio=NULL; } |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1505 if(sh_video){ uninit_video(sh_video);sh_video=NULL; } |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1506 if(demuxer) free_demuxer(demuxer); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1507 if(stream) free_stream(stream); // kill cache thread |
19391
5d6f4f9b6727
Cosmetics (nothing but spaces, tabs, and a comment changed here..)
ods15
parents:
19390
diff
changeset
|
1508 |
14845 | 1509 at_eof = 0; |
19391
5d6f4f9b6727
Cosmetics (nothing but spaces, tabs, and a comment changed here..)
ods15
parents:
19390
diff
changeset
|
1510 |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1511 m_config_pop(mconfig); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1512 goto play_next_file; |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1513 } |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1514 |
14878 | 1515 /* Emit the remaining frames in the video system */ |
1516 /*TODO emit frmaes delayed by decoder lag*/ | |
1517 if(sh_video && sh_video->vfilter){ | |
21146 | 1518 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_FlushingVideoFrames); |
19389
99ab8f53de3b
10l in last commit, move configured-check inside sh_video and sh_video->vfilter check.
reimar
parents:
19387
diff
changeset
|
1519 if (!((vf_instance_t *)sh_video->vfilter)->fmt.have_configured) |
21146 | 1520 mp_msg(MSGT_MENCODER, MSGL_WARN, MSGTR_FiltersHaveNotBeenConfiguredEmptyFile); |
19389
99ab8f53de3b
10l in last commit, move configured-check inside sh_video and sh_video->vfilter check.
reimar
parents:
19387
diff
changeset
|
1521 else |
19390 | 1522 ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, |
14878 | 1523 VFCTRL_FLUSH_FRAMES, 0); |
1524 } | |
1525 | |
15234 | 1526 if(aencoder) |
1527 if(aencoder->fixup) | |
1528 aencoder->fixup(aencoder); | |
3354 | 1529 |
11222 | 1530 if (muxer->cont_write_index) muxer_write_index(muxer); |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
1531 muxer_f_size=stream_tell(muxer->stream); |
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
1532 stream_seek(muxer->stream,0); |
11222 | 1533 if (muxer->cont_write_header) muxer_write_header(muxer); // update header |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
1534 #if 0 |
6333
69e14bf9e223
mencoder out-of-diskspace error handling, patch by Eric Lammerts <eric@lammerts.org>
arpi
parents:
6267
diff
changeset
|
1535 if(ferror(muxer_f) || fclose(muxer_f) != 0) { |
6947 | 1536 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_ErrorWritingFile, out_filename); |
6333
69e14bf9e223
mencoder out-of-diskspace error handling, patch by Eric Lammerts <eric@lammerts.org>
arpi
parents:
6267
diff
changeset
|
1537 mencoder_exit(1, NULL); |
69e14bf9e223
mencoder out-of-diskspace error handling, patch by Eric Lammerts <eric@lammerts.org>
arpi
parents:
6267
diff
changeset
|
1538 } |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
1539 #endif |
6674
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
1540 if(vobsub_writer) |
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6590
diff
changeset
|
1541 vobsub_out_close(vobsub_writer); |
4368 | 1542 |
1543 if(out_video_codec==VCODEC_FRAMENO && mux_v->timer>100){ | |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1544 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_RecommendedVideoBitrate,"650MB",(int)((650*1024*1024-muxer_f_size)/mux_v->timer/125)); |
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1545 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_RecommendedVideoBitrate,"700MB",(int)((700*1024*1024-muxer_f_size)/mux_v->timer/125)); |
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1546 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_RecommendedVideoBitrate,"800MB",(int)((800*1024*1024-muxer_f_size)/mux_v->timer/125)); |
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1547 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_RecommendedVideoBitrate,"2 x 650MB",(int)((2*650*1024*1024-muxer_f_size)/mux_v->timer/125)); |
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1548 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_RecommendedVideoBitrate,"2 x 700MB",(int)((2*700*1024*1024-muxer_f_size)/mux_v->timer/125)); |
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1549 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_RecommendedVideoBitrate,"2 x 800MB",(int)((2*800*1024*1024-muxer_f_size)/mux_v->timer/125)); |
4368 | 1550 } |
1551 | |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1552 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_VideoStreamResult, |
18300 | 1553 (float)(mux_v->size/mux_v->timer*8.0f/1000.0f), (int)(mux_v->size/mux_v->timer), (uint64_t)mux_v->size, (float)mux_v->timer, decoded_frameno); |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
1554 if(sh_audio) |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1555 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_AudioStreamResult, |
18300 | 1556 (float)(mux_a->size/mux_a->timer*8.0f/1000.0f), (int)(mux_a->size/mux_a->timer), (uint64_t)mux_a->size, (float)mux_a->timer); |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
1557 |
17675
e735c3f740ba
Add uninit for audio before switching to next file and completing encode
ods15
parents:
17659
diff
changeset
|
1558 if(sh_audio){ uninit_audio(sh_audio);sh_audio=NULL; } |
7497
10d4eec40938
fixed order of uninit (codec, demuxer, stream) - found by Jindrich Makovicka
arpi
parents:
7480
diff
changeset
|
1559 if(sh_video){ uninit_video(sh_video);sh_video=NULL; } |
10d4eec40938
fixed order of uninit (codec, demuxer, stream) - found by Jindrich Makovicka
arpi
parents:
7480
diff
changeset
|
1560 if(demuxer) free_demuxer(demuxer); |
2618 | 1561 if(stream) free_stream(stream); // kill cache thread |
1562 | |
3320
ac8b70dd5e45
use return 1; if interrupted - patch by Artur Skawina <skawina@geocities.com>
arpi
parents:
3240
diff
changeset
|
1563 return interrupted; |
2531 | 1564 } |
4159
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1565 |
4427
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1566 |
7451
8669e56d2d98
some mpcodecs option declaration moved to cfg-*, as aren;t used by
arpi
parents:
7394
diff
changeset
|
1567 #if 0 |
4427
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1568 /* Flip the image in src and store the result in dst. src and dst may overlap. |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1569 width is the size of each line in bytes. */ |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1570 static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1571 int height) |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1572 { |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1573 uint8_t* tmp = malloc(width); |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1574 int i; |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1575 |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1576 for(i = 0; i < height/2; i++) { |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1577 memcpy(tmp, &src[i*width], width); |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1578 memcpy(&dst[i * width], &src[(height - i) * width], width); |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1579 memcpy(&dst[(height - i) * width], tmp, width); |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1580 } |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1581 |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1582 free(tmp); |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1583 return dst; |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1584 } |
7451
8669e56d2d98
some mpcodecs option declaration moved to cfg-*, as aren;t used by
arpi
parents:
7394
diff
changeset
|
1585 #endif |
8517
bcf1b010bf14
Presets are an easy way, to use hard to access lame options and to give
arpi
parents:
8471
diff
changeset
|
1586 |
11375 | 1587 |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1588 static float stop_time(demuxer_t* demuxer, muxer_stream_t* mux_v) { |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1589 float timeleft = -1; |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1590 if (play_n_frames >= 0) timeleft = mux_v->timer + play_n_frames * (double)(mux_v->h.dwScale) / mux_v->h.dwRate; |
19973
02a18c52a42a
after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents:
19519
diff
changeset
|
1591 if (end_at.type == END_AT_TIME && (timeleft > end_at.pos || timeleft == -1)) timeleft = end_at.pos; |
14964 | 1592 if (next_edl_record && demuxer && demuxer->video) { // everything is OK to be checked |
1593 float tmp = mux_v->timer + next_edl_record->start_sec - demuxer->video->pts; | |
1594 if (timeleft == -1 || timeleft > tmp) { | |
1595 // There's less time in EDL than what we already know | |
1596 if (next_edl_record->action == EDL_SKIP && edl_seeking) { | |
1597 timeleft = tmp; | |
1598 } else if (next_edl_record->action == EDL_MUTE) { | |
1599 //timeleft = next_edl_record->start_sec - demuxer->video->pts; | |
1600 // For the moment (and probably forever) EDL mute doesn't work in MEncoder | |
1601 } | |
1602 } | |
1603 } | |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1604 return timeleft; |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1605 } |
14964 | 1606 |
15994 | 1607 static float calc_a_pts(demux_stream_t *d_audio) { |
1608 sh_audio_t * sh_audio = d_audio ? d_audio->sh : NULL; | |
1609 float a_pts = 0.; | |
1610 if (sh_audio) | |
1611 a_pts = d_audio->pts + (ds_tell_pts(d_audio) - sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; | |
1612 return a_pts; | |
1613 } | |
1614 | |
15995 | 1615 static float forward_audio(float pts, demux_stream_t *d_audio, muxer_stream_t* mux_a) { |
1616 sh_audio_t * sh_audio = d_audio ? d_audio->sh : NULL; | |
1617 int samplesize, avg; | |
1618 float a_pts = calc_a_pts(d_audio); | |
1619 | |
1620 if (!sh_audio) return a_pts; | |
1621 | |
1622 if (sh_audio->audio.dwScale) samplesize = sh_audio->audio.dwSampleSize; | |
1623 else samplesize = (sh_audio->wf ? sh_audio->wf->nBlockAlign : 1); | |
1624 avg = (sh_audio->wf ? sh_audio->wf->nAvgBytesPerSec : sh_audio->i_bps); | |
1625 | |
15997 | 1626 // after a demux_seek, a_pts will be zero until you read some audio. |
1627 // carefully checking if a_pts is truely correct by reading tiniest amount of data possible. | |
1628 if (pts > a_pts && a_pts == 0.0 && samplesize) { | |
1629 if (demux_read_data(sh_audio->ds,mux_a->buffer,samplesize) <= 0) return a_pts; // EOF | |
1630 a_pts = calc_a_pts(d_audio); | |
1631 } | |
1632 | |
15995 | 1633 while (pts > a_pts) { |
1634 int len; | |
1635 if (samplesize) { | |
1636 len = avg * (pts - a_pts > 0.5 ? 0.5 : pts - a_pts); | |
1637 len/= samplesize; if(len<1) len=1; | |
1638 len*= samplesize; | |
1639 len = demux_read_data(sh_audio->ds,mux_a->buffer,len); | |
1640 } else { | |
1641 unsigned char * crap; | |
1642 len = ds_get_packet(sh_audio->ds, &crap); | |
1643 } | |
1644 if (len <= 0) break; // EOF of audio. | |
1645 a_pts = calc_a_pts(d_audio); | |
1646 } | |
1647 return a_pts; | |
1648 } | |
1649 | |
15996 | 1650 static int slowseek(float end_pts, demux_stream_t *d_video, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy, int print_info) { |
1651 sh_video_t * sh_video = d_video->sh; | |
1652 vf_instance_t * vfilter = sh_video ? sh_video->vfilter : NULL; | |
1653 int done = 0; | |
1654 | |
1655 while (!interrupted) { | |
1656 float a_pts = 0.; | |
1657 | |
16708 | 1658 if (!frame_data->already_read) { // when called after fixdelay, a frame is already read |
1659 frame_data->in_size = video_read_frame(sh_video, &frame_data->frame_time, &frame_data->start, force_fps); | |
1660 if(frame_data->in_size<0) return 2; | |
1661 sh_video->timer += frame_data->frame_time; | |
1662 } | |
1663 frame_data->already_read = 0; | |
15996 | 1664 |
15997 | 1665 a_pts = forward_audio(sh_video->pts - frame_data->frame_time + audio_delay, d_audio, mux_a); |
15996 | 1666 |
1667 if (done) { | |
22230
d655ce625259
1000l fix for mencoder -hr-edl-seek with -ovc copy, waiting for keyframe
ods15
parents:
21888
diff
changeset
|
1668 // wait for keyframe in case of -ovc copy |
d655ce625259
1000l fix for mencoder -hr-edl-seek with -ovc copy, waiting for keyframe
ods15
parents:
21888
diff
changeset
|
1669 if (!framecopy || (sh_video->ds->flags & 1)) { |
d655ce625259
1000l fix for mencoder -hr-edl-seek with -ovc copy, waiting for keyframe
ods15
parents:
21888
diff
changeset
|
1670 frame_data->already_read = 1; |
d655ce625259
1000l fix for mencoder -hr-edl-seek with -ovc copy, waiting for keyframe
ods15
parents:
21888
diff
changeset
|
1671 return 1; |
d655ce625259
1000l fix for mencoder -hr-edl-seek with -ovc copy, waiting for keyframe
ods15
parents:
21888
diff
changeset
|
1672 } |
15996 | 1673 } |
1674 if (sh_video->pts >= end_pts) done = 1; | |
1675 | |
1676 if (vfilter) { | |
1677 int softskip = (vfilter->control(vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) == CONTROL_TRUE); | |
20902
bfb6eacd9c4a
Update OSD contents only after the correct values for the frame are known.
uau
parents:
20577
diff
changeset
|
1678 void *decoded_frame = decode_video(sh_video, frame_data->start, frame_data->in_size, !softskip, MP_NOPTS_VALUE); |
bfb6eacd9c4a
Update OSD contents only after the correct values for the frame are known.
uau
parents:
20577
diff
changeset
|
1679 if (decoded_frame) |
bfb6eacd9c4a
Update OSD contents only after the correct values for the frame are known.
uau
parents:
20577
diff
changeset
|
1680 filter_video(sh_video, decoded_frame, MP_NOPTS_VALUE); |
15996 | 1681 } |
1682 | |
1683 if (print_info) mp_msg(MSGT_MENCODER, MSGL_STATUS, | |
21146 | 1684 MSGTR_EdlSkipStartEndCurrent, |
15996 | 1685 next_edl_record->start_sec, next_edl_record->stop_sec, |
1686 sh_video->pts, a_pts); | |
1687 } | |
1688 if (interrupted) return 2; | |
1689 return 1; | |
1690 } | |
1691 | |
15997 | 1692 static void fixdelay(demux_stream_t *d_video, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy) { |
1693 // TODO: Find a way to encode silence instead of deleting video | |
1694 sh_video_t * sh_video = d_video->sh; | |
1695 float a_pts; | |
1696 | |
1697 // demux_seek has a weirdness that sh_video->pts is meaningless, | |
1698 // until a single frame is read... Same for audio actually too. | |
1699 // Reading one frame, and keeping it. | |
1700 frame_data->in_size = video_read_frame(sh_video, &frame_data->frame_time, &frame_data->start, force_fps); | |
1701 if(frame_data->in_size<0) return; | |
1702 sh_video->timer += frame_data->frame_time; | |
1703 frame_data->already_read = 1; | |
1704 | |
1705 a_pts = forward_audio(sh_video->pts - frame_data->frame_time + audio_delay, d_audio, mux_a); | |
1706 | |
1707 if (audio_delay > 0) return; | |
1708 else if (sh_video->pts - frame_data->frame_time + audio_delay >= a_pts) return; | |
1709 | |
1710 slowseek(a_pts - audio_delay, d_video, d_audio, mux_a, frame_data, framecopy, 0); | |
1711 } | |
1712 | |
15993 | 1713 static int edl_seek(edl_record_ptr next_edl_record, demuxer_t* demuxer, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy) { |
14964 | 1714 sh_video_t * sh_video = demuxer->video ? demuxer->video->sh : NULL; |
1715 | |
1716 if (!sh_video) return 0; | |
1717 if (sh_video->pts >= next_edl_record->stop_sec) return 1; // nothing to do... | |
1718 | |
1719 if (!edl_seek_type) { | |
17636 | 1720 if(demux_seek(demuxer, next_edl_record->stop_sec - sh_video->pts, audio_delay, 0)){ |
14964 | 1721 sh_video->pts = demuxer->video->pts; |
1722 //if (vo_vobsub) vobsub_seek(vo_vobsub,sh_video->pts); | |
1723 resync_video_stream(sh_video); | |
1724 //if(vo_spudec) spudec_reset(vo_spudec); | |
15997 | 1725 if (audio_delay != 0.0) fixdelay(demuxer->video, d_audio, mux_a, frame_data, framecopy); |
14964 | 1726 return 1; |
1727 } | |
1728 // non-seekable stream. | |
1729 return 0; | |
1730 } | |
1731 | |
1732 // slow seek, read every frame. | |
1733 | |
15996 | 1734 return slowseek(next_edl_record->stop_sec, demuxer->video, d_audio, mux_a, frame_data, framecopy, 1); |
14964 | 1735 } |