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