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