Mercurial > mplayer.hg
annotate mencoder.c @ 34697:ac6b38cd0d45
Rename sub window video window.
It was a bad idea to name the video window "sub window" at the time
the GUI was written. The term "sub window" does make sense from the
programmer's point of view, but it doesn't make any sense at all from
the user's point of view, because the sub window simply is the window
where the video will be displayed.
Moreover, since the term "sub" is generally short for "subtitles",
the renaming makes the code much easier to understand.
author | ib |
---|---|
date | Sat, 03 Mar 2012 16:45:15 +0000 |
parents | fede902a408c |
children | cc658103f214 |
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 |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
40 #ifdef __MINGW32__ |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
41 #define SIGHUP 1 |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
42 #define SIGQUIT 3 |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
43 #define SIGPIPE 13 |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
44 #endif |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
45 |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
46 #include "config.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
47 |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
48 #include <inttypes.h> |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
49 #include <signal.h> |
2531 | 50 #include <stdio.h> |
51 #include <stdlib.h> | |
52 #include <string.h> | |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
53 #include <sys/time.h> |
27727
48c1ae64255b
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents:
27393
diff
changeset
|
54 #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
|
55 #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
|
56 #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
|
57 |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
58 #include "input/input.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
59 #include "libaf/af_format.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
60 #include "libao2/audio_out.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
61 #include "libavcodec/avcodec.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
62 #include "libmpcodecs/ae.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
63 #include "libmpcodecs/dec_audio.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
64 #include "libmpcodecs/dec_video.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
65 #include "libmpcodecs/mp_image.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
66 #include "libmpcodecs/vd.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
67 #include "libmpcodecs/vf.h" |
30589
df6c41f16b40
Add header for AVI print functions; avoids many forward declarations.
diego
parents:
30429
diff
changeset
|
68 #include "libmpdemux/aviprint.h" |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
69 #include "libmpdemux/demuxer.h" |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
70 #include "libmpdemux/mp3_hdr.h" |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
71 #include "libmpdemux/ms_hdr.h" |
8585 | 72 #include "libmpdemux/muxer.h" |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
73 #include "libmpdemux/stheader.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
74 #include "libvo/fastmemcpy.h" |
32466
9e627a1793b1
Move font_load.[ch], font_load_ft.c and osd_font.h from libvo to sub.
cigaes
parents:
32461
diff
changeset
|
75 #include "sub/font_load.h" |
32467 | 76 #include "sub/sub.h" |
2531 | 77 #include "libvo/video_out.h" |
9380 | 78 #include "osdep/timer.h" |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
79 #include "stream/stream.h" |
31877
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31871
diff
changeset
|
80 #include "stream/stream_bd.h" |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27014
diff
changeset
|
81 #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
|
82 #include "stream/stream_dvd.h" |
18682
bee3186a06f7
include stream_dvd's interface from libmpdemux/stream_dvd.h
nicodvb
parents:
18417
diff
changeset
|
83 #endif |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
84 #include "stream/stream_dvdnav.h" |
32461 | 85 #include "sub/ass_mp.h" |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
86 #include "codec-cfg.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
87 #include "edl.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
88 #include "help_mp.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
89 #include "m_config.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
90 #include "m_option.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
91 #include "mp_fifo.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
92 #include "mp_msg.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
93 #include "mpcommon.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
94 #include "parser-cfg.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
95 #include "parser-mecmd.h" |
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
96 #include "path.h" |
32456 | 97 #include "sub/spudec.h" |
32459
1a605463f62b
Move vobsub.[ch] and unrar_exec.[ch] to the sub directory.
cigaes
parents:
32456
diff
changeset
|
98 #include "sub/vobsub.h" |
32460 | 99 #include "sub/eosd.h" |
32064
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
32036
diff
changeset
|
100 #include "mencoder.h" |
18682
bee3186a06f7
include stream_dvd's interface from libmpdemux/stream_dvd.h
nicodvb
parents:
18417
diff
changeset
|
101 |
11375 | 102 |
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; |
4388 | 106 |
2583 | 107 //-------------------------- |
108 | |
2531 | 109 // cache2: |
7881
aba9301ed3c4
allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents:
7867
diff
changeset
|
110 int stream_cache_size=-1; |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27014
diff
changeset
|
111 #ifdef CONFIG_STREAM_CACHE |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12546
diff
changeset
|
112 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
|
113 float stream_cache_seek_min_percent=50.0; |
2531 | 114 #endif |
115 | |
2618 | 116 int audio_id=-1; |
117 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
|
118 int dvdsub_id=-1; |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
119 int vobsub_id=-1; |
10167
531b00ad6f2d
Support for selecting the audio track in Matroska files via -alang.
mosu
parents:
9870
diff
changeset
|
120 char* audio_lang=NULL; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9772
diff
changeset
|
121 char* dvdsub_lang=NULL; |
2618 | 122 |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
123 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
|
124 static char** video_codec_list=NULL; // override video codec |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
125 static char** audio_fm_list=NULL; // override audio codec family |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
126 static char** video_fm_list=NULL; // override video codec family |
2531 | 127 |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
128 static int out_audio_codec=-1; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
129 static int out_video_codec=-1; |
4620 | 130 |
8585 | 131 int out_file_format=MUXER_TYPE_AVI; // default to AVI |
11875
6b28eb95c08b
* changes mencoder's exit code on explicit kill to 2
attila
parents:
11834
diff
changeset
|
132 int quiet=0; |
2531 | 133 double video_time_usage=0; |
134 double vout_time_usage=0; | |
4834 | 135 double max_video_time_usage=0; |
136 double max_vout_time_usage=0; | |
4838 | 137 double cur_video_time_usage=0; |
138 double cur_vout_time_usage=0; | |
4844
76acf5bbda78
exclude benchmark stuff execution from normal playback
nick
parents:
4838
diff
changeset
|
139 int benchmark=0; |
2531 | 140 |
2605 | 141 // A-V sync: |
142 static float default_max_pts_correction=-1;//0.01f; | |
143 static float max_pts_correction=0;//default_max_pts_correction; | |
144 static float c_total=0; | |
145 | |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
146 static float audio_preload=0.5; |
15992 | 147 static float audio_delay_fix=0.0; |
15997 | 148 static float audio_delay=0.0; |
17654 | 149 static int ignore_start=0; |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
150 static int audio_density=2; |
6861 | 151 |
25965 | 152 double force_fps=0; |
153 static double force_ofps=0; // set to 24 for inverse telecine | |
5629 | 154 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
|
155 float playback_speed=1.0; |
2531 | 156 |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
157 static int force_srate=0; |
33504
5a9d68a07ed1
Pass "native" filter chain sample format to audio encoder.
reimar
parents:
32976
diff
changeset
|
158 static int audio_output_format=AF_FORMAT_UNKNOWN; |
2618 | 159 |
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
|
160 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
|
161 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
|
162 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
|
163 |
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
|
164 char* out_filename=NULL; |
2626 | 165 |
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
|
166 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
|
167 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
|
168 |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
169 char* passtmpfile="divx2pass.log"; |
2643 | 170 |
171 static int play_n_frames=-1; | |
6590 | 172 static int play_n_frames_mf=-1; |
2643 | 173 |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
174 // sub: |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
175 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
|
176 char *sub_font_name=NULL; |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
177 float font_factor=0.75; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9772
diff
changeset
|
178 char **sub_name=NULL; |
32773 | 179 char **sub_paths = NULL; |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
180 float sub_delay=0; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
181 float sub_fps=0; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
182 int sub_auto = 0; |
32724
732cd2afae10
Replace hacky vobsub loading with a new clean one.
cboesch
parents:
32642
diff
changeset
|
183 char *vobsub_name = NULL; |
6784
b38e38b6f88f
DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
6765
diff
changeset
|
184 int subcc_enabled=0; |
8361
2202c00001e3
overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
arpi
parents:
8357
diff
changeset
|
185 int suboverlap_enabled = 1; |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
186 |
9076
92014b66ed3d
ability to disable the nonsense expand filter is a must! otherwise
rfelker
parents:
9014
diff
changeset
|
187 int auto_expand=1; |
12334
eeddcef4fb08
"hard" frame duplication for mencoder. this finally makes it possible
rfelker
parents:
12223
diff
changeset
|
188 int encode_duplicates=1; |
9076
92014b66ed3d
ability to disable the nonsense expand filter is a must! otherwise
rfelker
parents:
9014
diff
changeset
|
189 |
7145
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
190 // infos are empty by default |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
191 char *info_name=NULL; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
192 char *info_artist=NULL; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
193 char *info_genre=NULL; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
194 char *info_subject=NULL; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
195 char *info_copyright=NULL; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
196 char *info_sourceform=NULL; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
197 char *info_comment=NULL; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7124
diff
changeset
|
198 |
22232 | 199 // 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
|
200 int config_video_out(const vo_functions_t *vo, uint32_t width, uint32_t height, |
22232 | 201 uint32_t d_width, uint32_t d_height, uint32_t flags, |
202 char *title, uint32_t format) { | |
203 return 1; | |
204 } | |
18267 | 205 // Needed by libmpdemux. |
206 int mp_input_check_interrupt(int time) { | |
207 usec_sleep(time); | |
208 return 0; | |
209 } | |
24129 | 210 // Needed by getch2 |
211 void mplayer_put_key(int code) | |
212 { | |
213 } | |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
214 |
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
22232
diff
changeset
|
215 char *current_module; |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18888
diff
changeset
|
216 |
29670
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
217 // Needed by mpcommon.c |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
218 void set_osd_subtitle(subtitle *subs) { |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
219 vo_sub = subs; |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
220 vo_osd_changed(OSDTYPE_SUBTITLE); |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
221 } |
2e3751815a21
Add support for displaying subtitles on the command-line when playing
reimar
parents:
29668
diff
changeset
|
222 |
22312 | 223 static double seek_to_sec; |
4620 | 224 static off_t seek_to_byte=0; |
225 | |
19973
02a18c52a42a
after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents:
19519
diff
changeset
|
226 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
|
227 |
16528
c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents:
16175
diff
changeset
|
228 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
|
229 |
15993 | 230 typedef struct { |
231 unsigned char* start; | |
232 int in_size; | |
233 float frame_time; | |
234 int already_read; | |
235 } s_frame_data; | |
236 | |
14964 | 237 static edl_record_ptr edl_records = NULL; ///< EDL entries memory area |
238 static edl_record_ptr next_edl_record = NULL; ///< only for traversing edl_records | |
239 static short edl_muted; ///< Stores whether EDL is currently in muted mode. | |
240 static short edl_seeking; ///< When non-zero, stream is seekable. | |
34278
70ac8d21e6ca
edl_seek_type is used as CONF_TYPE_FLAG, which is a 32bit-Type (fixes possible memory corruption).
ranma
parents:
34172
diff
changeset
|
241 static int edl_seek_type; ///< When non-zero, frames are discarded instead of seeking. |
14964 | 242 |
31515
823f39ab650b
Clean up #include handling in mplayer.c and mencoder.c.
diego
parents:
31368
diff
changeset
|
243 /* This header requires all the global variable declarations. */ |
2618 | 244 #include "cfg-mencoder.h" |
245 | |
4088 | 246 |
4743 | 247 /* 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
|
248 static void mencoder_exit(int level, const char *how) |
4743 | 249 { |
250 if (how) | |
18002 | 251 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ExitingHow, how); |
4743 | 252 else |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
253 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_Exiting); |
4743 | 254 |
255 exit(level); | |
256 } | |
257 | |
18888
ab29b3c4f94e
parse_cfgfiles as static in mplayer.c/mencoder.c, patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents:
18682
diff
changeset
|
258 static void parse_cfgfiles( m_config_t* conf ) |
4488 | 259 { |
260 char *conffile; | |
26416 | 261 if (!disable_system_conf && |
34172 | 262 m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mencoder.conf", 1) < 0) |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
263 mencoder_exit(1,MSGTR_ConfigFileError); |
26415
cc7c52fa5eb1
Add support for system wide config file in mencoder.
albeu
parents:
26408
diff
changeset
|
264 |
26416 | 265 if (!disable_user_conf) { |
26418 | 266 if ((conffile = get_path("mencoder.conf")) == NULL) { |
267 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem); | |
268 } else { | |
34172 | 269 if (m_config_parse_config_file(conf, conffile, 1) < 0) |
26418 | 270 mencoder_exit(1,MSGTR_ConfigFileError); |
271 free(conffile); | |
272 } | |
26416 | 273 } |
4488 | 274 } |
275 | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
276 |
2591 | 277 //--------------------------------------------------------------------------- |
278 | |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
279 static int dec_audio(sh_audio_t *sh_audio,unsigned char* buffer,int total){ |
2591 | 280 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
|
281 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
|
282 while(size<total && !at_eof){ |
2591 | 283 int len=total-size; |
284 if(len>MAX_OUTBURST) len=MAX_OUTBURST; | |
31977 | 285 if (mp_decode_audio(sh_audio, len) < 0) |
286 at_eof = 1; | |
7604
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7559
diff
changeset
|
287 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
|
288 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
|
289 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
|
290 if(sh_audio->a_out_buffer_len>0) |
32976
baf42f6f5518
Use memmove when source and destination can overlap.
ranma
parents:
32863
diff
changeset
|
291 memmove(sh_audio->a_out_buffer,&sh_audio->a_out_buffer[len],sh_audio->a_out_buffer_len); |
2591 | 292 } |
293 return size; | |
294 } | |
295 | |
296 //--------------------------------------------------------------------------- | |
2531 | 297 |
26289
aa0c534db455
Better mark variables that are changed by the signal handler as volatile
reimar
parents:
26269
diff
changeset
|
298 static volatile int at_eof=0; |
aa0c534db455
Better mark variables that are changed by the signal handler as volatile
reimar
parents:
26269
diff
changeset
|
299 static volatile int interrupted=0; |
2531 | 300 |
301 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
|
302 at_eof=1; |
11875
6b28eb95c08b
* changes mencoder's exit code on explicit kill to 2
attila
parents:
11834
diff
changeset
|
303 interrupted=2; /* 1 means error */ |
2531 | 304 } |
305 | |
8585 | 306 static muxer_t* muxer=NULL; |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
307 |
30914
ce07076345c0
Mark add_subtitles() as static, it is not used outside the file, fixes:
diego
parents:
30902
diff
changeset
|
308 static void add_subtitles(char *filename, float fps, int silent) |
30807 | 309 { |
310 sub_data *subd; | |
311 #ifdef CONFIG_ASS | |
31792
55dacfca4a43
Rename libass types to match upstream libass >= 0.9.7
greg
parents:
31558
diff
changeset
|
312 ASS_Track *asst = 0; |
30807 | 313 #endif |
314 | |
315 if (!filename) return; | |
316 | |
317 subd = sub_read_file(filename, fps); | |
318 #ifdef CONFIG_ASS | |
319 if (ass_enabled) | |
320 #ifdef CONFIG_ICONV | |
321 asst = ass_read_file(ass_library, filename, sub_cp); | |
322 #else | |
323 asst = ass_read_file(ass_library, filename, 0); | |
324 #endif | |
325 if (ass_enabled && subd && !asst) | |
326 asst = ass_read_subdata(ass_library, subd, fps); | |
327 | |
328 if (!asst && !subd && !silent) | |
329 #else | |
330 if (!subd && !silent) | |
331 #endif | |
332 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantLoadSub, | |
333 filename_recode(filename)); | |
334 | |
335 #ifdef CONFIG_ASS | |
336 if (!asst && !subd) return; | |
337 ass_track = asst; | |
338 #else | |
339 if (!subd) return; | |
340 #endif | |
341 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILE_SUB_FILENAME=%s\n", | |
342 filename_recode(filename)); | |
343 subdata = subd; | |
344 } | |
345 | |
32434
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
346 /* Provide a timer value suitable for use in A/V sync calculations. |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
347 * mux->timer records the current position of the muxer stream. |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
348 * mux->encoder_delay is how many frames are currently buffered by the |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
349 * encoder. To mencoder core, encoder-buffered frames have been "dealt with"-- |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
350 * they'll get to the muxer eventually. So, for the purposes of A/V sync, |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
351 * we need to add the total time length of buffered frames to the muxer stream |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
352 * position. */ |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
353 static double adjusted_muxer_time(muxer_stream_t *mux) |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
354 { |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
355 if (! mux) return MP_NOPTS_VALUE; |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
356 return mux->timer + (double) mux->encoder_delay * mux->h.dwScale/mux->h.dwRate; |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
357 } |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
358 |
30867
fa02b224ed4a
Remove unnecessary forward declarations for a bunch of functions.
diego
parents:
30866
diff
changeset
|
359 /* This function returns the absolute time for which MEncoder will switch files |
fa02b224ed4a
Remove unnecessary forward declarations for a bunch of functions.
diego
parents:
30866
diff
changeset
|
360 * or move in the file so audio can be cut correctly. -1 if there is no limit. */ |
30866 | 361 static float stop_time(demuxer_t* demuxer, muxer_stream_t* mux_v) |
362 { | |
363 float timeleft = -1; | |
32435 | 364 if (play_n_frames >= 0) |
365 timeleft = adjusted_muxer_time(mux_v) + play_n_frames * (double)(mux_v->h.dwScale) / mux_v->h.dwRate; | |
366 if (end_at.type == END_AT_TIME && (timeleft > end_at.pos || timeleft == -1)) | |
367 timeleft = end_at.pos; | |
30866 | 368 if (next_edl_record && demuxer && demuxer->video) { // everything is OK to be checked |
32434
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
369 float tmp = adjusted_muxer_time(mux_v) + next_edl_record->start_sec - demuxer->video->pts; |
30866 | 370 if (timeleft == -1 || timeleft > tmp) { |
371 // There's less time in EDL than what we already know | |
372 if (next_edl_record->action == EDL_SKIP && edl_seeking) { | |
373 timeleft = tmp; | |
374 } else if (next_edl_record->action == EDL_MUTE) { | |
375 //timeleft = next_edl_record->start_sec - demuxer->video->pts; | |
376 // For the moment (and probably forever) EDL mute doesn't work in MEncoder | |
377 } | |
378 } | |
379 } | |
380 return timeleft; | |
381 } | |
382 | |
30867
fa02b224ed4a
Remove unnecessary forward declarations for a bunch of functions.
diego
parents:
30866
diff
changeset
|
383 /** \brief Seeks audio forward to pts by dumping audio packets |
fa02b224ed4a
Remove unnecessary forward declarations for a bunch of functions.
diego
parents:
30866
diff
changeset
|
384 * \return The current audio pts. */ |
30866 | 385 static float forward_audio(float pts, demux_stream_t *d_audio, muxer_stream_t* mux_a) |
386 { | |
387 sh_audio_t * sh_audio = d_audio ? d_audio->sh : NULL; | |
388 int samplesize, avg; | |
32863
674117ab7ce7
Move MPlayer's audio pts calculation code into mp_common.c and reuse it in
reimar
parents:
32795
diff
changeset
|
389 float a_pts = calc_a_pts(sh_audio, d_audio); |
30866 | 390 |
391 if (!sh_audio) return a_pts; | |
392 | |
393 if (sh_audio->audio.dwScale) samplesize = sh_audio->audio.dwSampleSize; | |
394 else samplesize = (sh_audio->wf ? sh_audio->wf->nBlockAlign : 1); | |
395 avg = (sh_audio->wf ? sh_audio->wf->nAvgBytesPerSec : sh_audio->i_bps); | |
396 | |
397 // after a demux_seek, a_pts will be zero until you read some audio. | |
398 // carefully checking if a_pts is truely correct by reading tiniest amount of data possible. | |
399 if (pts > a_pts && a_pts == 0.0 && samplesize) { | |
400 if (demux_read_data(sh_audio->ds,mux_a->buffer,samplesize) <= 0) return a_pts; // EOF | |
32863
674117ab7ce7
Move MPlayer's audio pts calculation code into mp_common.c and reuse it in
reimar
parents:
32795
diff
changeset
|
401 a_pts = calc_a_pts(sh_audio, d_audio); |
30866 | 402 } |
403 | |
404 while (pts > a_pts) { | |
405 int len; | |
406 if (samplesize) { | |
407 len = avg * (pts - a_pts > 0.5 ? 0.5 : pts - a_pts); | |
408 len/= samplesize; if(len<1) len=1; | |
409 len*= samplesize; | |
410 len = demux_read_data(sh_audio->ds,mux_a->buffer,len); | |
411 } else { | |
412 unsigned char * crap; | |
413 len = ds_get_packet(sh_audio->ds, &crap); | |
414 } | |
415 if (len <= 0) break; // EOF of audio. | |
32863
674117ab7ce7
Move MPlayer's audio pts calculation code into mp_common.c and reuse it in
reimar
parents:
32795
diff
changeset
|
416 a_pts = calc_a_pts(sh_audio, d_audio); |
30866 | 417 } |
418 return a_pts; | |
419 } | |
420 | |
30867
fa02b224ed4a
Remove unnecessary forward declarations for a bunch of functions.
diego
parents:
30866
diff
changeset
|
421 /** \brief Seeks slowly by dumping frames. |
fa02b224ed4a
Remove unnecessary forward declarations for a bunch of functions.
diego
parents:
30866
diff
changeset
|
422 * \return 1 for success, 2 for EOF. */ |
30866 | 423 static int slowseek(float end_pts, demux_stream_t *d_video, |
424 demux_stream_t *d_audio, muxer_stream_t *mux_a, | |
425 s_frame_data *frame_data, int framecopy, int print_info) | |
426 { | |
427 sh_video_t * sh_video = d_video->sh; | |
428 vf_instance_t * vfilter = sh_video ? sh_video->vfilter : NULL; | |
429 int done = 0; | |
430 | |
431 while (!interrupted) { | |
432 float a_pts = 0.; | |
433 | |
434 if (!frame_data->already_read) { // when called after fixdelay, a frame is already read | |
435 frame_data->in_size = video_read_frame(sh_video, &frame_data->frame_time, &frame_data->start, force_fps); | |
436 if(frame_data->in_size<0) return 2; | |
437 sh_video->timer += frame_data->frame_time; | |
438 } | |
439 frame_data->already_read = 0; | |
440 | |
441 a_pts = forward_audio(sh_video->pts - frame_data->frame_time + audio_delay, d_audio, mux_a); | |
442 | |
443 if (done) { | |
444 // wait for keyframe in case of -ovc copy | |
445 if (!framecopy || (sh_video->ds->flags & 1)) { | |
446 frame_data->already_read = 1; | |
447 return 1; | |
448 } | |
449 } | |
450 if (sh_video->pts >= end_pts) done = 1; | |
451 | |
452 if (vfilter) { | |
453 int softskip = (vfilter->control(vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) == CONTROL_TRUE); | |
31972 | 454 void *decoded_frame = decode_video(sh_video, frame_data->start, frame_data->in_size, !softskip, MP_NOPTS_VALUE, NULL); |
30866 | 455 if (decoded_frame) |
456 filter_video(sh_video, decoded_frame, MP_NOPTS_VALUE); | |
457 } | |
458 | |
459 if (print_info) mp_msg(MSGT_MENCODER, MSGL_STATUS, | |
460 MSGTR_EdlSkipStartEndCurrent, | |
461 next_edl_record->start_sec, next_edl_record->stop_sec, | |
462 sh_video->pts, a_pts); | |
463 } | |
464 if (interrupted) return 2; | |
465 return 1; | |
466 } | |
467 | |
30867
fa02b224ed4a
Remove unnecessary forward declarations for a bunch of functions.
diego
parents:
30866
diff
changeset
|
468 /// Deletes audio or video as told by -delay to sync |
30866 | 469 static void fixdelay(demux_stream_t *d_video, demux_stream_t *d_audio, |
470 muxer_stream_t *mux_a, s_frame_data *frame_data, | |
471 int framecopy) | |
472 { | |
473 // TODO: Find a way to encode silence instead of deleting video | |
474 sh_video_t * sh_video = d_video->sh; | |
475 float a_pts; | |
476 | |
477 // demux_seek has a weirdness that sh_video->pts is meaningless, | |
478 // until a single frame is read... Same for audio actually too. | |
479 // Reading one frame, and keeping it. | |
480 frame_data->in_size = video_read_frame(sh_video, &frame_data->frame_time, &frame_data->start, force_fps); | |
481 if(frame_data->in_size<0) return; | |
482 sh_video->timer += frame_data->frame_time; | |
483 frame_data->already_read = 1; | |
484 | |
485 a_pts = forward_audio(sh_video->pts - frame_data->frame_time + audio_delay, d_audio, mux_a); | |
486 | |
487 if (audio_delay > 0) return; | |
488 else if (sh_video->pts - frame_data->frame_time + audio_delay >= a_pts) return; | |
489 | |
490 slowseek(a_pts - audio_delay, d_video, d_audio, mux_a, frame_data, framecopy, 0); | |
491 } | |
492 | |
30867
fa02b224ed4a
Remove unnecessary forward declarations for a bunch of functions.
diego
parents:
30866
diff
changeset
|
493 /** \brief Seeks for EDL |
fa02b224ed4a
Remove unnecessary forward declarations for a bunch of functions.
diego
parents:
30866
diff
changeset
|
494 * \return 1 for success, 0 for failure, 2 for EOF. */ |
30866 | 495 static int edl_seek(edl_record_ptr next_edl_record, demuxer_t *demuxer, |
496 demux_stream_t *d_audio, muxer_stream_t *mux_a, | |
497 s_frame_data *frame_data, int framecopy) | |
498 { | |
499 sh_video_t * sh_video = demuxer->video ? demuxer->video->sh : NULL; | |
500 | |
501 if (!sh_video) return 0; | |
502 if (sh_video->pts >= next_edl_record->stop_sec) return 1; // nothing to do... | |
503 | |
504 if (!edl_seek_type) { | |
505 if(demux_seek(demuxer, next_edl_record->stop_sec - sh_video->pts, audio_delay, 0)){ | |
506 sh_video->pts = demuxer->video->pts; | |
507 //if (vo_vobsub) vobsub_seek(vo_vobsub,sh_video->pts); | |
508 //if(vo_spudec) spudec_reset(vo_spudec); | |
509 if (audio_delay != 0.0) fixdelay(demuxer->video, d_audio, mux_a, frame_data, framecopy); | |
510 return 1; | |
511 } | |
512 // non-seekable stream. | |
513 return 0; | |
514 } | |
515 | |
516 // slow seek, read every frame. | |
517 | |
518 return slowseek(next_edl_record->stop_sec, demuxer->video, d_audio, mux_a, frame_data, framecopy, 1); | |
519 } | |
520 | |
521 | |
7201
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7180
diff
changeset
|
522 int main(int argc,char* argv[]){ |
2531 | 523 |
524 stream_t* stream=NULL; | |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
525 stream_t* ostream=NULL; |
2531 | 526 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
|
527 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
|
528 demuxer_t* demuxer2=NULL; |
2531 | 529 demux_stream_t *d_audio=NULL; |
530 demux_stream_t *d_video=NULL; | |
531 demux_stream_t *d_dvdsub=NULL; | |
532 sh_audio_t *sh_audio=NULL; | |
533 sh_video_t *sh_video=NULL; | |
534 int file_format=DEMUXER_TYPE_UNKNOWN; | |
12223 | 535 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
|
536 void *vobsub_writer=NULL; |
15993 | 537 s_frame_data frame_data = { .start = NULL, .in_size = 0, .frame_time = 0., .already_read = 0 }; |
2531 | 538 |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
539 uint32_t ptimer_start; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
540 uint32_t audiorate=0; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
541 uint32_t videorate=0; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
542 uint32_t audiosamples=1; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
543 uint32_t videosamples=1; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
544 uint32_t skippedframes=0; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
545 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
|
546 uint32_t badframes=0; |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
547 |
8585 | 548 muxer_stream_t* mux_a=NULL; |
549 muxer_stream_t* mux_v=NULL; | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
550 off_t muxer_f_size=0; |
2531 | 551 |
2613 | 552 double v_pts_corr=0; |
553 double v_timer_corr=0; | |
33911
552f50c89163
Another attempt to make up timestamps for video filters.
reimar
parents:
33910
diff
changeset
|
554 double sub_offset=0; |
552f50c89163
Another attempt to make up timestamps for video filters.
reimar
parents:
33910
diff
changeset
|
555 int did_seek=0; |
2605 | 556 |
8164
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
557 m_entry_t* filelist = NULL; |
2618 | 558 char* filename=NULL; |
559 | |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
560 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
|
561 int next_frameno=-1; |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
562 int curfile=0; |
17121
119790c08d5c
compiler warning fixes, some of these were actual (printing) bugs.
ods15
parents:
17120
diff
changeset
|
563 int new_srate=0; |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
564 |
17121
119790c08d5c
compiler warning fixes, some of these were actual (printing) bugs.
ods15
parents:
17120
diff
changeset
|
565 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
|
566 ao_data_t ao_data = {0,0,0,0,OUTBURST,-1,0}; |
4387 | 567 |
15234 | 568 audio_encoding_params_t aparams; |
569 audio_encoder_t *aencoder = NULL; | |
570 | |
25922
afaf3ec733d3
It seems that mencoder can not handle correct-pts (lots of "No pts ..." messages),
reimar
parents:
25783
diff
changeset
|
571 user_correct_pts = 0; |
afaf3ec733d3
It seems that mencoder can not handle correct-pts (lots of "No pts ..." messages),
reimar
parents:
25783
diff
changeset
|
572 |
32383
f6e78eef2e1b
Avoid duplicating common init code between MPlayer and mencoder.
reimar
parents:
32209
diff
changeset
|
573 common_preinit(); |
23095
9561da3cdc3a
make -really-quiet hide the mencoder version tags. patch copied from michael
compn
parents:
23032
diff
changeset
|
574 |
26408
7a36d5941fd8
Replace the trivial command line preparser with a more robust version
albeu
parents:
26289
diff
changeset
|
575 // 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
|
576 mconfig = m_config_new(); |
7a36d5941fd8
Replace the trivial command line preparser with a more robust version
albeu
parents:
26289
diff
changeset
|
577 m_config_register_options(mconfig,mencoder_opts); |
31368
f73663d84979
Replace common options template by a common options array.
diego
parents:
30914
diff
changeset
|
578 m_config_register_options(mconfig, common_opts); |
26408
7a36d5941fd8
Replace the trivial command line preparser with a more robust version
albeu
parents:
26289
diff
changeset
|
579 |
7a36d5941fd8
Replace the trivial command line preparser with a more robust version
albeu
parents:
26289
diff
changeset
|
580 // Preparse the command line |
7a36d5941fd8
Replace the trivial command line preparser with a more robust version
albeu
parents:
26289
diff
changeset
|
581 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
|
582 |
28325 | 583 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
|
584 |
8164
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
585 parse_cfgfiles(mconfig); |
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
586 filelist = m_config_parse_me_command_line(mconfig, argc, argv); |
13122 | 587 if(!filelist) mencoder_exit(1, MSGTR_ErrorParsingCommandLine); |
32383
f6e78eef2e1b
Avoid duplicating common init code between MPlayer and mencoder.
reimar
parents:
32209
diff
changeset
|
588 if (!common_init()) |
f6e78eef2e1b
Avoid duplicating common init code between MPlayer and mencoder.
reimar
parents:
32209
diff
changeset
|
589 mencoder_exit(1,NULL); |
2618 | 590 |
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
|
591 { |
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
|
592 char *extension; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
593 |
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
|
594 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
|
595 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
|
596 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
|
597 { |
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
|
598 extension++; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
599 |
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
|
600 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
|
601 { |
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
|
602 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
|
603 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
|
604 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
|
605 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
|
606 |
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
|
607 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
|
608 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
|
609 strcasecmp(extension,"mpeg") && |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
610 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
|
611 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
|
612 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
|
613 } |
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
|
614 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
615 } |
21342
dc98645820b7
Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents:
21161
diff
changeset
|
616 /* Display what configure line was used */ |
dc98645820b7
Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents:
21161
diff
changeset
|
617 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
|
618 |
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
|
619 |
16528
c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents:
16175
diff
changeset
|
620 if (frameno_filename) { |
31871
c3775dbb8509
Simplify code: allow file_format argument to open_stream to be NULL.
reimar
parents:
31792
diff
changeset
|
621 stream2=open_stream(frameno_filename, NULL, NULL); |
16528
c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents:
16175
diff
changeset
|
622 if(stream2){ |
c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents:
16175
diff
changeset
|
623 demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2,NULL); |
18335 | 624 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
|
625 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
|
626 } |
c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents:
16175
diff
changeset
|
627 } |
c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents:
16175
diff
changeset
|
628 |
16814 | 629 /* HACK, for some weird reason, push() has to be called twice, |
630 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
|
631 m_config_push(mconfig); |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
632 play_next_file: |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
633 m_config_push(mconfig); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
634 m_entry_set_options(mconfig,&filelist[curfile]); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
635 filename = filelist[curfile].name; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
636 |
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
|
637 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
|
638 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
|
639 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
|
640 } |
34494 | 641 |
642 if (vobsub_name) | |
643 vo_vobsub = vobsub_open(vobsub_name, spudec_ifo, 1, &vo_spudec); | |
644 #ifdef CONFIG_ASS | |
645 // must be before demuxer open, since the settings are | |
646 // used in generating the ASSTrack | |
647 if (ass_enabled && ass_library) | |
648 ass_mp_reset_config(ass_library); | |
649 #endif | |
650 | |
9746 | 651 stream=open_stream(filename,0,&file_format); |
2531 | 652 |
653 if(!stream){ | |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
654 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_CannotOpenFile_Device); |
4743 | 655 mencoder_exit(1,NULL); |
2531 | 656 } |
657 | |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
658 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_OpenedStream, file_format, (int)(stream->start_pos), (int)(stream->end_pos)); |
2531 | 659 |
31877
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31871
diff
changeset
|
660 if(stream->type==STREAMTYPE_BD){ |
31882
ef30e1505969
Do not call *_aid_from_lang when audio_lang is NULL.
reimar
parents:
31877
diff
changeset
|
661 if(audio_lang && audio_id==-1) audio_id=bd_aid_from_lang(stream,audio_lang); |
31877
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31871
diff
changeset
|
662 if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=bd_sid_from_lang(stream,dvdsub_lang); |
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31871
diff
changeset
|
663 } |
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31871
diff
changeset
|
664 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27014
diff
changeset
|
665 #ifdef CONFIG_DVDREAD |
5436 | 666 if(stream->type==STREAMTYPE_DVD){ |
667 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
|
668 if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang); |
5436 | 669 } |
670 #endif | |
671 | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27014
diff
changeset
|
672 #ifdef CONFIG_DVDNAV |
23767
e9d6eda05f00
added support for -alang and -slang with dvdnav:// streams
nicodvb
parents:
23460
diff
changeset
|
673 if(stream->type==STREAMTYPE_DVDNAV){ |
27014 | 674 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
|
675 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
|
676 } |
e9d6eda05f00
added support for -alang and -slang with dvdnav:// streams
nicodvb
parents:
23460
diff
changeset
|
677 #endif |
e9d6eda05f00
added support for -alang and -slang with dvdnav:// streams
nicodvb
parents:
23460
diff
changeset
|
678 |
5626
b7b40e65c070
-sb option re-added (noticed by Alexandre Oliva <oliva@lsd.ic.unicamp.br>)
arpi
parents:
5607
diff
changeset
|
679 stream->start_pos+=seek_to_byte; |
2531 | 680 |
7881
aba9301ed3c4
allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents:
7867
diff
changeset
|
681 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
|
682 |
7529
c276bfb414fb
removed obsolete/unused audio|video_fm|codec, has_audio|video
arpi
parents:
7526
diff
changeset
|
683 if(demuxer2) audio_id=-2; /* do NOT read audio packets... */ |
4355 | 684 |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
9003
diff
changeset
|
685 demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id,filename); |
2531 | 686 if(!demuxer){ |
15056
6f949cafe480
Errors that cause MEncoder to exit should be MSGL_FATAL, not MSGL_ERR.
diego
parents:
15055
diff
changeset
|
687 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
|
688 mp_msg(MSGT_DEMUXER, MSGL_FATAL, MSGTR_CannotOpenDemuxer); |
4743 | 689 mencoder_exit(1,NULL); |
2531 | 690 } |
26090
c585e2ad8ebf
Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents:
26087
diff
changeset
|
691 |
29868
7ccde024713a
Add -tsprog support for lavf to mencoder, similar to what SVN r29846 did for mplayer.
reimar
parents:
29690
diff
changeset
|
692 if (ts_prog) { |
7ccde024713a
Add -tsprog support for lavf to mencoder, similar to what SVN r29846 did for mplayer.
reimar
parents:
29690
diff
changeset
|
693 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
|
694 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
|
695 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
|
696 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
|
697 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
|
698 } |
7ccde024713a
Add -tsprog support for lavf to mencoder, similar to what SVN r29846 did for mplayer.
reimar
parents:
29690
diff
changeset
|
699 } |
26090
c585e2ad8ebf
Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents:
26087
diff
changeset
|
700 select_audio(demuxer, audio_id, audio_lang); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
701 |
29688
94f1bca4f4b6
Add a -nosub option that allows disabling auto-selected subtitles as e.g. the
reimar
parents:
29670
diff
changeset
|
702 if (dvdsub_id == -1 && dvdsub_lang) |
26087 | 703 dvdsub_id = demuxer_sub_track_by_lang(demuxer, dvdsub_lang); |
704 | |
29688
94f1bca4f4b6
Add a -nosub option that allows disabling auto-selected subtitles as e.g. the
reimar
parents:
29670
diff
changeset
|
705 if (dvdsub_id == -1) |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26130
diff
changeset
|
706 dvdsub_id = demuxer_default_sub_track(demuxer); |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26130
diff
changeset
|
707 |
26087 | 708 for (i = 0; i < MAX_S_STREAMS; i++) { |
709 sh_sub_t *sh = demuxer->s_streams[i]; | |
710 if (sh && sh->sid == dvdsub_id) { | |
711 demuxer->sub->id = i; | |
712 demuxer->sub->sh = sh; | |
713 break; | |
714 } | |
715 } | |
716 | |
25955
eff9e1b25743
-chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents:
25922
diff
changeset
|
717 if(dvd_chapter>1) { |
eff9e1b25743
-chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents:
25922
diff
changeset
|
718 float pts; |
26081 | 719 if (demuxer_seek_chapter(demuxer, dvd_chapter-1, 1, &pts, NULL, NULL) >= 0 && pts > -1.0) |
720 seek_to_sec = pts; | |
25955
eff9e1b25743
-chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents:
25922
diff
changeset
|
721 } |
2531 | 722 |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
723 d_audio=demuxer2 ? demuxer2->audio : demuxer->audio; |
2531 | 724 d_video=demuxer->video; |
725 d_dvdsub=demuxer->sub; | |
726 sh_audio=d_audio->sh; | |
727 sh_video=d_video->sh; | |
728 | |
11513
552ddee604c9
workaround! exit if there's no video stream (hopefully it's a proper fix)
alex
parents:
11410
diff
changeset
|
729 if(!sh_video) |
552ddee604c9
workaround! exit if there's no video stream (hopefully it's a proper fix)
alex
parents:
11410
diff
changeset
|
730 { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
731 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
|
732 mencoder_exit(1,NULL); |
552ddee604c9
workaround! exit if there's no video stream (hopefully it's a proper fix)
alex
parents:
11410
diff
changeset
|
733 } |
552ddee604c9
workaround! exit if there's no video stream (hopefully it's a proper fix)
alex
parents:
11410
diff
changeset
|
734 |
2531 | 735 if(!video_read_properties(sh_video)){ |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
736 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_CannotReadVideoProperties); |
4743 | 737 mencoder_exit(1,NULL); |
2531 | 738 } |
739 | |
21146 | 740 mp_msg(MSGT_MENCODER,MSGL_INFO, MSGTR_FilefmtFourccSizeFpsFtime, |
2531 | 741 demuxer->file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h, |
742 sh_video->fps,sh_video->frametime | |
743 ); | |
2581 | 744 |
8357
ea3c66c6665f
fixed -fps with mencoder and fixed-rate files (avi etc)
arpi
parents:
8355
diff
changeset
|
745 if(force_fps){ |
ea3c66c6665f
fixed -fps with mencoder and fixed-rate files (avi etc)
arpi
parents:
8355
diff
changeset
|
746 sh_video->fps=force_fps; |
ea3c66c6665f
fixed -fps with mencoder and fixed-rate files (avi etc)
arpi
parents:
8355
diff
changeset
|
747 sh_video->frametime=1.0f/sh_video->fps; |
13122 | 748 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
|
749 } |
ea3c66c6665f
fixed -fps with mencoder and fixed-rate files (avi etc)
arpi
parents:
8355
diff
changeset
|
750 |
6923
60374fa581fc
no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents:
6871
diff
changeset
|
751 if(sh_audio && out_audio_codec<0){ |
8796 | 752 if(audio_id==-2) |
13122 | 753 mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_DemuxerDoesntSupportNosound); |
6947 | 754 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
|
755 mencoder_exit(1,NULL); |
60374fa581fc
no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents:
6871
diff
changeset
|
756 } |
60374fa581fc
no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents:
6871
diff
changeset
|
757 if(sh_video && out_video_codec<0){ |
6947 | 758 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
|
759 mencoder_exit(1,NULL); |
60374fa581fc
no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents:
6871
diff
changeset
|
760 } |
60374fa581fc
no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents:
6871
diff
changeset
|
761 |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
762 if(sh_audio && (out_audio_codec || seek_to_sec || !sh_audio->wf || playback_speed != 1.0)){ |
2581 | 763 // 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
|
764 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
7522 | 765 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
|
766 sh_audio=d_audio->sh=NULL; // failed to init :( |
2581 | 767 } |
7502
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7497
diff
changeset
|
768 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
2581 | 769 } |
770 | |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
771 if (sh_audio) { |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
772 new_srate = sh_audio->samplerate; |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
773 if (playback_speed != 1.0) { |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
774 new_srate *= playback_speed; |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
775 // 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
|
776 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
|
777 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
|
778 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
|
779 } |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
780 } |
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
781 |
2531 | 782 // set up video encoder: |
783 | |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
784 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
|
785 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
|
786 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
|
787 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
|
788 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
|
789 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
|
790 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
|
791 #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
|
792 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
|
793 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
|
794 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
|
795 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
|
796 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
|
797 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
|
798 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
|
799 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
|
800 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
|
801 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
|
802 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
|
803 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
|
804 } |
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
|
805 } |
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
|
806 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
|
807 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
|
808 } |
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
|
809 #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
|
810 } |
33701
09bdaa0c82b3
Make vobsub options available in mencoder, though with my test file
reimar
parents:
33577
diff
changeset
|
811 else if (!vo_spudec) { |
33577
c111d9e9cfb0
Move init_vo_spudec to mp_common.c and reuse it in mencoder.
reimar
parents:
33571
diff
changeset
|
812 init_vo_spudec(stream, sh_video, d_dvdsub ? d_dvdsub->sh : NULL); |
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
|
813 } |
4088 | 814 |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
815 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
|
816 if(!ostream) { |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
817 mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_CannotOpenOutputFile, out_filename); |
4743 | 818 mencoder_exit(1,NULL); |
2887
bc648c6a464a
fixes a segfault if file specified in -o can't be accessed
pl
parents:
2884
diff
changeset
|
819 } |
bc648c6a464a
fixes a segfault if file specified in -o can't be accessed
pl
parents:
2884
diff
changeset
|
820 |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
821 muxer=muxer_new_muxer(out_file_format,ostream); |
17078 | 822 if(!muxer) { |
21146 | 823 mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_CannotInitializeMuxer); |
17078 | 824 mencoder_exit(1,NULL); |
825 } | |
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
|
826 #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
|
827 //disabled: it horrybly distorts filtered sound |
17590 | 828 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
|
829 #endif |
2581 | 830 |
17648 | 831 muxer->audio_delay_fix = audio_delay_fix; |
832 | |
2581 | 833 // ============= VIDEO =============== |
834 | |
8585 | 835 mux_v=muxer_new_stream(muxer,MUXER_TYPE_VIDEO); |
2531 | 836 |
33707 | 837 mux_v->buffer_size=0x800000; // 8MB |
2531 | 838 mux_v->buffer=malloc(mux_v->buffer_size); |
839 | |
840 mux_v->source=sh_video; | |
841 | |
842 mux_v->h.dwSampleSize=0; // VBR | |
32142
4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents:
32114
diff
changeset
|
843 #ifdef CONFIG_FFMPEG |
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
|
844 { |
25966
28316f2f8d26
Try to make fps float -> AVRational conversion work better.
reimar
parents:
25965
diff
changeset
|
845 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
|
846 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
|
847 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
|
848 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
|
849 } |
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
|
850 #else |
2531 | 851 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
|
852 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
|
853 #endif |
2531 | 854 |
2661 | 855 mux_v->codec=out_video_codec; |
2574 | 856 |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
857 mux_v->bih=NULL; |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
858 } |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
859 sh_video->codec=NULL; |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
860 sh_video->vfilter=NULL; // fixme! |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
861 |
2531 | 862 switch(mux_v->codec){ |
3384 | 863 case VCODEC_COPY: |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
864 if (!curfile) { |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
865 if (sh_video->bih) { |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
866 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
|
867 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
|
868 } |
3384 | 869 else |
870 { | |
32114
9646c5ff0832
Replace sizeof(WAVEFORMATEX) and sizeof(BITMAPINFOHEADER) in mencoder.c
reimar
parents:
32064
diff
changeset
|
871 mux_v->bih=calloc(1,sizeof(*mux_v->bih)); |
9646c5ff0832
Replace sizeof(WAVEFORMATEX) and sizeof(BITMAPINFOHEADER) in mencoder.c
reimar
parents:
32064
diff
changeset
|
872 mux_v->bih->biSize=sizeof(*mux_v->bih); |
3384 | 873 mux_v->bih->biWidth=sh_video->disp_w; |
874 mux_v->bih->biHeight=sh_video->disp_h; | |
875 mux_v->bih->biCompression=sh_video->format; | |
876 mux_v->bih->biPlanes=1; | |
877 mux_v->bih->biBitCount=24; // FIXME!!! | |
878 mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8); | |
879 } | |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
880 } |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
881 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_VCodecFramecopy, |
3384 | 882 mux_v->bih->biWidth, mux_v->bih->biHeight, |
883 mux_v->bih->biBitCount, mux_v->bih->biCompression); | |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
884 |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
885 if (curfile) { |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
886 if (sh_video->bih) { |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
887 if ((mux_v->bih->biSize != sh_video->bih->biSize) || |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
888 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
|
889 { |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
890 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_VCodecFramecopy, |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
891 sh_video->bih->biWidth, sh_video->bih->biHeight, |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
892 sh_video->bih->biBitCount, sh_video->bih->biCompression); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
893 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_FrameCopyFileMismatch); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
894 mencoder_exit(1,NULL); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
895 } |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
896 } |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
897 else { |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
898 if ((mux_v->bih->biWidth != sh_video->disp_w) || |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
899 (mux_v->bih->biHeight != sh_video->disp_h) || |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
900 (mux_v->bih->biCompression != sh_video->format)) { |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
901 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_VCodecFramecopy, |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
902 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
|
903 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_FrameCopyFileMismatch); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
904 mencoder_exit(1,NULL); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
905 } |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
906 } |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
907 } |
2531 | 908 break; |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
909 case VCODEC_FRAMENO: |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
910 if (!curfile) { |
32114
9646c5ff0832
Replace sizeof(WAVEFORMATEX) and sizeof(BITMAPINFOHEADER) in mencoder.c
reimar
parents:
32064
diff
changeset
|
911 mux_v->bih=calloc(1,sizeof(*mux_v->bih)); |
9646c5ff0832
Replace sizeof(WAVEFORMATEX) and sizeof(BITMAPINFOHEADER) in mencoder.c
reimar
parents:
32064
diff
changeset
|
912 mux_v->bih->biSize=sizeof(*mux_v->bih); |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
913 mux_v->bih->biWidth=sh_video->disp_w; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
914 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
|
915 mux_v->bih->biPlanes=1; |
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
916 mux_v->bih->biBitCount=24; |
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
917 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
|
918 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
|
919 } |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
920 break; |
14878 | 921 default: { |
922 static vf_instance_t * ve = NULL; | |
923 if (!ve) { | |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
924 switch(mux_v->codec){ |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
925 case VCODEC_LIBAVCODEC: |
6581 | 926 sh_video->vfilter=vf_open_encoder(NULL,"lavc",(char *)mux_v); break; |
11966 | 927 case VCODEC_RAW: |
928 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
|
929 case VCODEC_VFW: |
6581 | 930 sh_video->vfilter=vf_open_encoder(NULL,"vfw",(char *)mux_v); break; |
5578 | 931 case VCODEC_LIBDV: |
6581 | 932 sh_video->vfilter=vf_open_encoder(NULL,"libdv",(char *)mux_v); break; |
7457 | 933 case VCODEC_XVID: |
934 sh_video->vfilter=vf_open_encoder(NULL,"xvid",(char *)mux_v); break; | |
8471 | 935 case VCODEC_QTVIDEO: |
936 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
|
937 case VCODEC_NUV: |
9520
2860f7c9d9ca
A new nuppel video encoder. Mainly for RT encoding on slow box.
albeu
parents:
9380
diff
changeset
|
938 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
|
939 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
|
940 sh_video->vfilter=vf_open_encoder(NULL,"x264",(char *)mux_v); break; |
4743 | 941 } |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
942 if(!mux_v->bih || !sh_video->vfilter){ |
6947 | 943 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
|
944 mencoder_exit(1,NULL); |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
945 } |
14878 | 946 ve = sh_video->vfilter; |
947 } else sh_video->vfilter = ve; | |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
948 // append 'expand' filter, it fixes stride problems and renders osd: |
30807 | 949 #ifdef CONFIG_ASS |
950 if (auto_expand && !ass_enabled) { /* we do not want both */ | |
951 #else | |
9595 | 952 if (auto_expand) { |
30807 | 953 #endif |
9595 | 954 char* vf_args[] = { "osd", "1", NULL }; |
955 sh_video->vfilter=vf_open_filter(sh_video->vfilter,"expand",vf_args); | |
956 } | |
30807 | 957 |
958 #ifdef CONFIG_ASS | |
959 if(ass_enabled) { | |
960 int i; | |
961 int insert = 1; | |
962 if (vf_settings) | |
963 for (i = 0; vf_settings[i].name; ++i) | |
964 if (strcmp(vf_settings[i].name, "ass") == 0) { | |
965 insert = 0; | |
966 break; | |
967 } | |
968 if (insert) { | |
969 char* vf_arg[] = {"auto", "1", NULL}; | |
31921
c406383caa61
Use vf_open_filter instead of vf_open_plugin+hacks.
reimar
parents:
31920
diff
changeset
|
970 vf_instance_t* vf_ass = vf_open_filter(sh_video->vfilter,"ass",vf_arg); |
30807 | 971 if (vf_ass) |
31923 | 972 sh_video->vfilter=vf_ass; |
30807 | 973 else |
974 mp_msg(MSGT_CPLAYER,MSGL_ERR, "ASS: cannot add video filter\n"); | |
975 } | |
976 | |
977 if (ass_library) { | |
978 for (i = 0; i < demuxer->num_attachments; ++i) { | |
979 demux_attachment_t* att = demuxer->attachments + i; | |
980 if (extract_embedded_fonts && | |
981 att->name && att->type && att->data && att->data_size && | |
982 (strcmp(att->type, "application/x-truetype-font") == 0 || | |
983 strcmp(att->type, "application/x-font") == 0)) | |
984 ass_add_font(ass_library, att->name, att->data, att->data_size); | |
985 } | |
986 } | |
987 } | |
988 #endif | |
989 | |
31935 | 990 sh_video->vfilter=append_filters(sh_video->vfilter); |
31927 | 991 eosd_init(sh_video->vfilter); |
3377
4723f6fd750a
do not fault if 2pass VbrControl can't open the logfile
alex
parents:
3363
diff
changeset
|
992 |
30807 | 993 #ifdef CONFIG_ASS |
994 if (ass_enabled) | |
31927 | 995 eosd_ass_init(ass_library); |
30807 | 996 #endif |
997 | |
998 // after reading video params we should load subtitles because | |
999 // we know fps so now we can adjust subtitles time to ~6 seconds AST | |
1000 // check .sub | |
32642
7b135236a44a
Factorize subtitles loading between mplayer and mencoder.
cboesch
parents:
32467
diff
changeset
|
1001 load_subtitles(filename, sh_video->fps, add_subtitles); |
30807 | 1002 |
7502
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7497
diff
changeset
|
1003 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
|
1004 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
|
1005 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
25962 | 1006 if(!sh_video->initialized) mencoder_exit(1,NULL); |
14878 | 1007 } |
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
|
1008 } |
af1f8e2d693a
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents:
3563
diff
changeset
|
1009 |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1010 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
|
1011 /* 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
|
1012 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
|
1013 { |
af1f8e2d693a
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents:
3563
diff
changeset
|
1014 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
|
1015 force_fourcc[2], force_fourcc[3]); |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1016 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
|
1017 mux_v->bih->biCompression, (char *)&mux_v->bih->biCompression); |
2531 | 1018 } |
1019 | |
17654 | 1020 if (! ignore_start) |
17648 | 1021 muxer->audio_delay_fix -= sh_video->stream_delay; |
1022 | |
8030
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
1023 //if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf! |
4370 | 1024 |
2581 | 1025 // ============= AUDIO =============== |
1026 if(sh_audio){ | |
1027 | |
15888
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
1028 if (force_audiofmttag != -1) { |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
1029 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
|
1030 if (sh_audio->wf) { |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
1031 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
|
1032 } |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
1033 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
|
1034 force_audiofmttag); |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
1035 } |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
1036 |
8585 | 1037 mux_a=muxer_new_stream(muxer,MUXER_TYPE_AUDIO); |
2581 | 1038 |
1039 mux_a->buffer_size=0x100000; //16384; | |
1040 mux_a->buffer=malloc(mux_a->buffer_size); | |
11974 | 1041 if (!mux_a->buffer) |
13122 | 1042 mencoder_exit(1,MSGTR_MemAllocFailed); |
2581 | 1043 |
1044 mux_a->source=sh_audio; | |
1045 | |
2661 | 1046 mux_a->codec=out_audio_codec; |
2581 | 1047 |
15811
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15603
diff
changeset
|
1048 ao_data.samplerate = force_srate; |
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15603
diff
changeset
|
1049 ao_data.channels = 0; |
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15603
diff
changeset
|
1050 ao_data.format = audio_output_format; |
24894 | 1051 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
|
1052 // 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
|
1053 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
|
1054 // 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
|
1055 &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
|
1056 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
|
1057 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
|
1058 } |
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
|
1059 |
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
|
1060 aparams.channels = ao_data.channels; |
15811
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15603
diff
changeset
|
1061 aparams.sample_rate = ao_data.samplerate; |
33504
5a9d68a07ed1
Pass "native" filter chain sample format to audio encoder.
reimar
parents:
32976
diff
changeset
|
1062 aparams.sample_format = ao_data.format; |
15234 | 1063 aparams.audio_preload = 1000 * audio_preload; |
1064 if(mux_a->codec != ACODEC_COPY) { | |
1065 aencoder = new_audio_encoder(mux_a, &aparams); | |
1066 if(!aencoder) | |
1067 mencoder_exit(1, NULL); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
1068 if(!init_audio_filters(sh_audio, |
24894 | 1069 new_srate, |
1070 &aparams.sample_rate, &aparams.channels, &aencoder->input_format)) { | |
15234 | 1071 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_NoMatchingFilter); |
1072 mencoder_exit(1,NULL); | |
1073 } | |
33504
5a9d68a07ed1
Pass "native" filter chain sample format to audio encoder.
reimar
parents:
32976
diff
changeset
|
1074 ao_data.format = aencoder->input_format; |
5a9d68a07ed1
Pass "native" filter chain sample format to audio encoder.
reimar
parents:
32976
diff
changeset
|
1075 ao_data.channels = aparams.channels; |
5a9d68a07ed1
Pass "native" filter chain sample format to audio encoder.
reimar
parents:
32976
diff
changeset
|
1076 ao_data.samplerate = aparams.sample_rate; |
15234 | 1077 } |
2581 | 1078 switch(mux_a->codec){ |
3385 | 1079 case ACODEC_COPY: |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
1080 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
|
1081 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
|
1082 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
|
1083 mencoder_exit(1,NULL); |
da752f91c5f2
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents:
15831
diff
changeset
|
1084 } |
4369 | 1085 if (sh_audio->wf){ |
32114
9646c5ff0832
Replace sizeof(WAVEFORMATEX) and sizeof(BITMAPINFOHEADER) in mencoder.c
reimar
parents:
32064
diff
changeset
|
1086 mux_a->wf=malloc(sizeof(*mux_a->wf) + sh_audio->wf->cbSize); |
9646c5ff0832
Replace sizeof(WAVEFORMATEX) and sizeof(BITMAPINFOHEADER) in mencoder.c
reimar
parents:
32064
diff
changeset
|
1087 memcpy(mux_a->wf, sh_audio->wf, sizeof(*mux_a->wf) + sh_audio->wf->cbSize); |
4370 | 1088 if(!sh_audio->i_bps) sh_audio->i_bps=mux_a->wf->nAvgBytesPerSec; |
4369 | 1089 } else { |
32114
9646c5ff0832
Replace sizeof(WAVEFORMATEX) and sizeof(BITMAPINFOHEADER) in mencoder.c
reimar
parents:
32064
diff
changeset
|
1090 mux_a->wf = malloc(sizeof(*mux_a->wf)); |
4370 | 1091 mux_a->wf->nBlockAlign = 1; //mux_a->h.dwSampleSize; |
7643 | 1092 mux_a->wf->wFormatTag = sh_audio->format; |
3385 | 1093 mux_a->wf->nChannels = sh_audio->channels; |
1094 mux_a->wf->nSamplesPerSec = sh_audio->samplerate; | |
4369 | 1095 mux_a->wf->nAvgBytesPerSec=sh_audio->i_bps; //mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec; |
3480 | 1096 mux_a->wf->wBitsPerSample = 16; // FIXME |
3385 | 1097 mux_a->wf->cbSize=0; // FIXME for l3codeca.acm |
1098 } | |
4370 | 1099 if(sh_audio->audio.dwScale){ |
1100 mux_a->h.dwSampleSize=sh_audio->audio.dwSampleSize; | |
1101 mux_a->h.dwScale=sh_audio->audio.dwScale; | |
1102 mux_a->h.dwRate=sh_audio->audio.dwRate; | |
1103 } else { | |
1104 mux_a->h.dwSampleSize=mux_a->wf->nBlockAlign; | |
1105 mux_a->h.dwScale=mux_a->h.dwSampleSize; | |
1106 mux_a->h.dwRate=mux_a->wf->nAvgBytesPerSec; | |
1107 } | |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
1108 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
|
1109 mux_a->wf->nSamplesPerSec *= playback_speed; |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1110 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, |
17366 | 1111 mux_a->wf->wFormatTag, mux_a->wf->nChannels, mux_a->wf->nSamplesPerSec, |
1112 mux_a->wf->wBitsPerSample, mux_a->wf->nAvgBytesPerSec, mux_a->h.dwSampleSize); | |
2581 | 1113 break; |
1114 } | |
6861 | 1115 |
17977
f70772d02eaa
Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents:
17932
diff
changeset
|
1116 if ( mp_msg_test(MSGT_MENCODER,MSGL_DBG2) ) print_wave_header(mux_a->wf, MSGL_DBG2); |
6861 | 1117 |
17654 | 1118 if (! ignore_start) |
17648 | 1119 muxer->audio_delay_fix += sh_audio->stream_delay; |
2581 | 1120 |
6861 | 1121 } // if(sh_audio) |
6530
f8d544dd22e9
mono mp3 encoding support by Paul Ortyl <ortylp at 3miasto.net>
alex
parents:
6419
diff
changeset
|
1122 |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
1123 decoded_frameno=0; |
2531 | 1124 |
1125 signal(SIGINT,exit_sighandler); // Interrupt from keyboard | |
1126 signal(SIGQUIT,exit_sighandler); // Quit from keyboard | |
1127 signal(SIGTERM,exit_sighandler); // kill | |
16002
433234c2a4aa
catch HUP and PIPE signals aswell. Patch by Sergey Khlutchin (@gmail.com)
alex
parents:
15997
diff
changeset
|
1128 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
|
1129 signal(SIGPIPE,exit_sighandler); // broken pipe |
2531 | 1130 |
4387 | 1131 timer_start=GetTimerMS(); |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1132 } // 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
|
1133 else { |
16756
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1134 if (!mux_a != !sh_audio) { |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1135 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
|
1136 mencoder_exit(1,NULL); |
15234 | 1137 } |
16756
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1138 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
|
1139 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
|
1140 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, |
17366 | 1141 mux_a->wf->wFormatTag, mux_a->wf->nChannels, mux_a->wf->nSamplesPerSec, |
1142 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
|
1143 if (sh_audio->wf) { |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1144 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
|
1145 (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
|
1146 (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
|
1147 { |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1148 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, |
17366 | 1149 sh_audio->wf->wFormatTag, sh_audio->wf->nChannels, (int)(sh_audio->wf->nSamplesPerSec * playback_speed), |
1150 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
|
1151 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
|
1152 mencoder_exit(1,NULL); |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1153 } |
16756
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1154 } else { |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1155 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
|
1156 (mux_a->wf->nChannels != sh_audio->channels) || |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1157 (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
|
1158 { |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1159 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, |
17366 | 1160 sh_audio->wf->wFormatTag, sh_audio->wf->nChannels, (int)(sh_audio->wf->nSamplesPerSec * playback_speed), |
1161 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
|
1162 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
|
1163 mencoder_exit(1,NULL); |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1164 } |
16756
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1165 } |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1166 } else if (sh_audio) { |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1167 int out_srate = mux_a->wf->nSamplesPerSec; |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1168 int out_channels = mux_a->wf->nChannels; |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1169 int out_format = aencoder->input_format; |
24894 | 1170 if (!init_audio_filters(sh_audio, new_srate, |
1171 &out_srate, &out_channels, | |
1172 &out_format)) { | |
16756
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1173 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
|
1174 mencoder_exit(1, NULL); |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1175 } |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1176 mux_a->wf->nSamplesPerSec = out_srate; |
bede9bedd45a
cosmetics. does not change functionality, but makes code easier to read
ods15
parents:
16753
diff
changeset
|
1177 mux_a->wf->nChannels = out_channels; |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1178 } |
16752
425863aab3df
fix mencoder multi-file with some files having audio but others dont
ods15
parents:
16708
diff
changeset
|
1179 } |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1180 |
4620 | 1181 if (seek_to_sec) { |
22312 | 1182 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
|
1183 // 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
|
1184 // > 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
|
1185 // > 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
|
1186 // this line enables behaviour 1. (and kills 2. at the same time): |
17636 | 1187 // if(demuxer2) demux_seek(demuxer2, d, audio_delay, 1); |
4620 | 1188 } |
1189 | |
8585 | 1190 if (out_file_format == MUXER_TYPE_MPEG) |
1191 { | |
1192 if (audio_preload > 0.4) { | |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1193 mp_msg(MSGT_MENCODER, MSGL_WARN, MSGTR_LimitingAudioPreload); |
8585 | 1194 audio_preload = 0.4; |
1195 } | |
1196 if (audio_density < 4) { | |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1197 mp_msg(MSGT_MENCODER, MSGL_WARN, MSGTR_IncreasingAudioDensity); |
8731 | 1198 audio_density = 4; |
8585 | 1199 } |
1200 } | |
1201 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
1202 if(file_format == DEMUXER_TYPE_TV) |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1203 { |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1204 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
|
1205 audio_preload = 0.0; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1206 default_max_pts_correction = 0; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1207 } |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1208 |
6590 | 1209 play_n_frames=play_n_frames_mf; |
32434
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1210 if (curfile && end_at.type == END_AT_TIME) end_at.pos += adjusted_muxer_time(mux_v); |
6590 | 1211 |
14996
576b810a034d
100l to oded.. edl was causing the decoder to get a first broken packet
rfelker
parents:
14964
diff
changeset
|
1212 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
|
1213 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
|
1214 edl_muted = 0; |
576b810a034d
100l to oded.. edl was causing the decoder to get a first broken packet
rfelker
parents:
14964
diff
changeset
|
1215 edl_seeking = 1; |
14964 | 1216 if (edl_filename) { |
1217 next_edl_record = edl_records = edl_parse_file(); | |
1218 } | |
1219 | |
15997 | 1220 if (sh_audio && audio_delay != 0.) fixdelay(d_video, d_audio, mux_a, &frame_data, mux_v->codec==VCODEC_COPY); |
1221 | |
33911
552f50c89163
Another attempt to make up timestamps for video filters.
reimar
parents:
33910
diff
changeset
|
1222 // Just assume a seek. Also works if time stamps do not start with 0 |
552f50c89163
Another attempt to make up timestamps for video filters.
reimar
parents:
33910
diff
changeset
|
1223 did_seek = 1; |
552f50c89163
Another attempt to make up timestamps for video filters.
reimar
parents:
33910
diff
changeset
|
1224 |
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
|
1225 while(!at_eof){ |
2531 | 1226 |
1227 int blit_frame=0; | |
1228 float a_pts=0; | |
1229 float v_pts=0; | |
2613 | 1230 int skip_flag=0; // 1=skip -1=duplicate |
32434
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1231 double a_muxer_time; |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1232 double v_muxer_time; |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1233 |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1234 a_muxer_time = adjusted_muxer_time(mux_a); |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1235 v_muxer_time = adjusted_muxer_time(mux_v); |
2531 | 1236 |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
1237 if((end_at.type == END_AT_SIZE && end_at.pos <= stream_tell(muxer->stream)) || |
32434
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1238 (end_at.type == END_AT_TIME && end_at.pos < v_muxer_time)) |
4159
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1239 break; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1240 |
2643 | 1241 if(play_n_frames>=0){ |
1242 --play_n_frames; | |
1243 if(play_n_frames<0) break; | |
1244 } | |
25955
eff9e1b25743
-chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents:
25922
diff
changeset
|
1245 if(dvd_last_chapter>0) { |
eff9e1b25743
-chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents:
25922
diff
changeset
|
1246 int cur_chapter = demuxer_get_current_chapter(demuxer); |
eff9e1b25743
-chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents:
25922
diff
changeset
|
1247 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
|
1248 break; |
eff9e1b25743
-chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents:
25922
diff
changeset
|
1249 } |
2643 | 1250 |
14964 | 1251 goto_redo_edl: |
1252 if (next_edl_record && sh_video && sh_video->pts >= next_edl_record->start_sec) { | |
1253 if (next_edl_record->action == EDL_SKIP && edl_seeking) { | |
1254 float last_pos = d_video->pts; | |
1255 int result; | |
1256 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: start [%f], stop [%f], length [%f]\n", | |
1257 next_edl_record->start_sec, next_edl_record->stop_sec, next_edl_record->length_sec); | |
1258 | |
15993 | 1259 result = edl_seek(next_edl_record, demuxer, d_audio, mux_a, &frame_data, mux_v->codec==VCODEC_COPY); |
14964 | 1260 |
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
|
1261 if (result == 2) { at_eof=1; break; } // EOF |
14964 | 1262 else if (result == 0) edl_seeking = 0; // no seeking |
1263 else { // sucess | |
33911
552f50c89163
Another attempt to make up timestamps for video filters.
reimar
parents:
33910
diff
changeset
|
1264 did_seek = 1; |
14964 | 1265 edl_muted = 0; |
1266 if (last_pos >= sh_video->pts) { | |
1267 // backwards seek detected!! Forget about this EDL skip altogether. | |
1268 next_edl_record = next_edl_record->next; | |
1269 } | |
1270 else for (next_edl_record = edl_records; next_edl_record; next_edl_record = next_edl_record->next) { | |
1271 /* note the use of stop_sec, | |
1272 meaning if by some magical way we landed in the MIDDLE of a censored area, | |
1273 in the next loop it will jump out of it. | |
1274 */ | |
1275 if (next_edl_record->stop_sec > sh_video->pts) break; // we got to the right place. | |
1276 if (next_edl_record->action == EDL_MUTE) edl_muted = !edl_muted; // toggle mute each time. | |
1277 } | |
1278 | |
1279 /* for a pedantic EDL, that doesn't show even a single | |
1280 frame from the "censored" area, uncomment next line. */ | |
1281 goto goto_redo_edl; | |
1282 } | |
1283 } else if (next_edl_record->action == EDL_MUTE) { | |
1284 edl_muted = !edl_muted; // This variable does nothing for now. | |
1285 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_MUTE: [%f]\n", next_edl_record->start_sec ); | |
1286 next_edl_record=next_edl_record->next; | |
1287 } | |
1288 } | |
1289 | |
1290 | |
2581 | 1291 if(sh_audio){ |
1292 // get audio: | |
32434
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1293 while(a_muxer_time-audio_preload<v_muxer_time){ |
15234 | 1294 float tottime; |
2653 | 1295 int len=0; |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1296 |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1297 ptimer_start = GetTimerMS(); |
15234 | 1298 // CBR - copy 0.5 sec of audio |
1299 // or until the end of video: | |
1300 tottime = stop_time(demuxer, mux_v); | |
1301 if (tottime != -1) { | |
32434
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1302 tottime -= a_muxer_time; |
15234 | 1303 if (tottime > 1./audio_density) tottime = 1./audio_density; |
1304 } | |
1305 else tottime = 1./audio_density; | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1306 |
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
|
1307 // 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
|
1308 if (tottime <= 0) break; |
11375 | 1309 |
15234 | 1310 if(aencoder) |
1311 { | |
1312 if(mux_a->h.dwSampleSize) /* CBR */ | |
1313 { | |
1314 if(aencoder->set_decoded_len) | |
1315 { | |
1316 len = mux_a->h.dwSampleSize*(int)(mux_a->h.dwRate*tottime); | |
1317 aencoder->set_decoded_len(aencoder, len); | |
1318 } | |
1319 else | |
1320 len = aencoder->decode_buffer_size; | |
11375 | 1321 |
15234 | 1322 len = dec_audio(sh_audio, aencoder->decode_buffer, len); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
1323 mux_a->buffer_len += aencoder->encode(aencoder, mux_a->buffer + mux_a->buffer_len, |
17122 | 1324 aencoder->decode_buffer, len, mux_a->buffer_size-mux_a->buffer_len); |
15234 | 1325 if(mux_a->buffer_len < mux_a->wf->nBlockAlign) |
1326 len = 0; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
1327 else |
15234 | 1328 len = mux_a->wf->nBlockAlign*(mux_a->buffer_len/mux_a->wf->nBlockAlign); |
11375 | 1329 } |
15234 | 1330 else /* VBR */ |
1331 { | |
1332 int sz = 0; | |
1333 while(1) | |
1334 { | |
1335 len = 0; | |
1336 if(! sz) | |
1337 sz = aencoder->get_frame_size(aencoder); | |
1338 if(sz > 0 && mux_a->buffer_len >= sz) | |
1339 { | |
1340 len = sz; | |
1341 break; | |
1342 } | |
1343 len = dec_audio(sh_audio,aencoder->decode_buffer, aencoder->decode_buffer_size); | |
1344 if(len <= 0) | |
1345 { | |
1346 len = 0; | |
1347 break; | |
1348 } | |
17122 | 1349 len = aencoder->encode(aencoder, mux_a->buffer + mux_a->buffer_len, aencoder->decode_buffer, len, mux_a->buffer_size-mux_a->buffer_len); |
15234 | 1350 mux_a->buffer_len += len; |
1351 } | |
11375 | 1352 } |
32434
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1353 if (v_muxer_time == 0) mux_a->h.dwInitialFrames++; |
11375 | 1354 } |
15234 | 1355 else { |
2581 | 1356 if(mux_a->h.dwSampleSize){ |
2583 | 1357 switch(mux_a->codec){ |
3385 | 1358 case ACODEC_COPY: // copy |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1359 len=mux_a->wf->nAvgBytesPerSec*tottime; |
2583 | 1360 len/=mux_a->h.dwSampleSize;if(len<1) len=1; |
1361 len*=mux_a->h.dwSampleSize; | |
1362 len=demux_read_data(sh_audio->ds,mux_a->buffer,len); | |
1363 break; | |
1364 } | |
2581 | 1365 } else { |
2605 | 1366 // VBR - encode/copy an audio frame |
1367 switch(mux_a->codec){ | |
3385 | 1368 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
|
1369 len=ds_get_packet(sh_audio->ds,(unsigned char**) &mux_a->buffer); |
2605 | 1370 break; |
2591 | 1371 } |
2605 | 1372 } |
2581 | 1373 } |
2583 | 1374 if(len<=0) break; // EOF? |
30747
7ac542b9ca24
Use the KEYFRAME define instead of some magic number.
reimar
parents:
30681
diff
changeset
|
1375 muxer_write_chunk(mux_a,len,AVIIF_KEYFRAME, MP_NOPTS_VALUE, MP_NOPTS_VALUE); |
32434
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1376 a_muxer_time = adjusted_muxer_time(mux_a); // update after muxing |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1377 if(!mux_a->h.dwSampleSize && a_muxer_time>0) |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1378 mux_a->wf->nAvgBytesPerSec=0.5f+(double)mux_a->size/a_muxer_time; // avg bps (VBR) |
2591 | 1379 if(mux_a->buffer_len>=len){ |
1380 mux_a->buffer_len-=len; | |
32976
baf42f6f5518
Use memmove when source and destination can overlap.
ranma
parents:
32863
diff
changeset
|
1381 memmove(mux_a->buffer,mux_a->buffer+len,mux_a->buffer_len); |
2591 | 1382 } |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1383 |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1384 |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1385 audiosamples++; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1386 audiorate+= (GetTimerMS() - ptimer_start); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
1387 |
2581 | 1388 } |
1389 } | |
1390 | |
1391 // get video frame! | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1392 |
15993 | 1393 if (!frame_data.already_read) { |
1394 frame_data.in_size=video_read_frame(sh_video,&frame_data.frame_time,&frame_data.start,force_fps); | |
1395 sh_video->timer+=frame_data.frame_time; | |
1396 } | |
1397 frame_data.frame_time /= playback_speed; | |
1398 if(frame_data.in_size<0){ at_eof=1; break; } | |
1399 ++decoded_frameno; | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1400 |
15993 | 1401 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
|
1402 |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
1403 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
|
1404 // find our frame: |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1405 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
|
1406 int* start; |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1407 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
|
1408 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
|
1409 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
|
1410 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
|
1411 } |
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
|
1412 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
|
1413 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
|
1414 // find next frame: |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1415 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
|
1416 int* start; |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1417 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
|
1418 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
|
1419 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
|
1420 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
|
1421 } |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1422 } else { |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1423 |
2613 | 1424 // check frame duplicate/drop: |
1425 | |
17647 | 1426 float mux_frametime = (float)mux_v->h.dwScale/mux_v->h.dwRate; |
6721 | 1427 |
17647 | 1428 if (v_timer_corr >= mux_frametime && (skip_limit<0 || skip_flag < skip_limit)) { |
1429 v_timer_corr-=mux_frametime; | |
2613 | 1430 ++skip_flag; // skip |
17647 | 1431 } |
1432 while (v_timer_corr <= -mux_frametime && (skip_limit<0 || -skip_flag < skip_limit)) { | |
1433 v_timer_corr+=mux_frametime; | |
2613 | 1434 --skip_flag; // dup |
1435 } | |
2531 | 1436 |
17647 | 1437 // either v_pts_corr is big, more than 2 times framerate, then we follow its advice, |
1438 // or, it cancels out v_timer_corr, in which case be happy and do nothing. | |
1439 | |
1440 while ((v_pts_corr <= -mux_frametime && skip_flag > 0) || (v_pts_corr <= -2*mux_frametime)) { | |
1441 v_pts_corr+=mux_frametime; | |
2613 | 1442 --skip_flag; // dup |
1443 } | |
17647 | 1444 if ((v_pts_corr >= mux_frametime && skip_flag < 0) || (v_pts_corr >= 2*mux_frametime)) { |
1445 if (skip_flag<=0) { // we can't skip more than 1 frame now | |
1446 v_pts_corr-=mux_frametime; | |
2613 | 1447 ++skip_flag; // skip |
1448 } | |
17647 | 1449 } |
2613 | 1450 |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1451 } // demuxer2 |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1452 |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1453 ptimer_start = GetTimerMS(); |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1454 |
2531 | 1455 switch(mux_v->codec){ |
3384 | 1456 case VCODEC_COPY: |
15993 | 1457 mux_v->buffer=frame_data.start; |
30747
7ac542b9ca24
Use the KEYFRAME define instead of some magic number.
reimar
parents:
30681
diff
changeset
|
1458 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 | 1459 break; |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
1460 case VCODEC_FRAMENO: |
6581 | 1461 mux_v->buffer=(unsigned char *)&decoded_frameno; // tricky |
30747
7ac542b9ca24
Use the KEYFRAME define instead of some magic number.
reimar
parents:
30681
diff
changeset
|
1462 if(skip_flag<=0) muxer_write_chunk(mux_v,sizeof(int),AVIIF_KEYFRAME, MP_NOPTS_VALUE, MP_NOPTS_VALUE); |
4575 | 1463 break; |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
1464 default: |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
1465 // decode_video will callback down to ve_*.c encoders, through the video filters |
31919 | 1466 { |
1467 int drop_frame = skip_flag > 0 && | |
1468 (!sh_video->vfilter || | |
1469 ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE); | |
1470 void *decoded_frame = decode_video(sh_video,frame_data.start,frame_data.in_size, | |
31972 | 1471 drop_frame, MP_NOPTS_VALUE, NULL); |
33911
552f50c89163
Another attempt to make up timestamps for video filters.
reimar
parents:
33910
diff
changeset
|
1472 if (did_seek && sh_video->pts != MP_NOPTS_VALUE) { |
552f50c89163
Another attempt to make up timestamps for video filters.
reimar
parents:
33910
diff
changeset
|
1473 did_seek = 0; |
552f50c89163
Another attempt to make up timestamps for video filters.
reimar
parents:
33910
diff
changeset
|
1474 sub_offset = sh_video->pts; |
552f50c89163
Another attempt to make up timestamps for video filters.
reimar
parents:
33910
diff
changeset
|
1475 } |
552f50c89163
Another attempt to make up timestamps for video filters.
reimar
parents:
33910
diff
changeset
|
1476 // NOTE: this is not really correct, but it allows -ass to work mostly |
33910
645a13a163a6
Try using sh_video->pts instead of v_muxer_time for filter timestamp.
reimar
parents:
33877
diff
changeset
|
1477 // v_muxer_time was tried before, but it is completely off when -ss is used |
645a13a163a6
Try using sh_video->pts instead of v_muxer_time for filter timestamp.
reimar
parents:
33877
diff
changeset
|
1478 // (see bug #1960). |
33911
552f50c89163
Another attempt to make up timestamps for video filters.
reimar
parents:
33910
diff
changeset
|
1479 // sh_video->pts causes flickering with subtitles and complaints from MPEG-4 |
552f50c89163
Another attempt to make up timestamps for video filters.
reimar
parents:
33910
diff
changeset
|
1480 // encoder due to not being monotonic. |
552f50c89163
Another attempt to make up timestamps for video filters.
reimar
parents:
33910
diff
changeset
|
1481 // If you change this please note the reason here! |
552f50c89163
Another attempt to make up timestamps for video filters.
reimar
parents:
33910
diff
changeset
|
1482 blit_frame = decoded_frame && filter_video(sh_video, decoded_frame, v_muxer_time + sub_offset);} |
32434
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1483 v_muxer_time = adjusted_muxer_time(mux_v); // update after muxing |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
1484 |
25962 | 1485 if (sh_video->vf_initialized < 0) mencoder_exit(1, NULL); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
1486 |
7370
8e07aeda7344
count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
arpi
parents:
7331
diff
changeset
|
1487 if(!blit_frame){ |
15895
7742302e793d
Do not count skipped/broken frames when using -frames
reimar
parents:
15888
diff
changeset
|
1488 if (play_n_frames >= 0) |
7742302e793d
Do not count skipped/broken frames when using -frames
reimar
parents:
15888
diff
changeset
|
1489 play_n_frames++; |
7370
8e07aeda7344
count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
arpi
parents:
7331
diff
changeset
|
1490 badframes++; |
8e07aeda7344
count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
arpi
parents:
7331
diff
changeset
|
1491 if(skip_flag<=0){ |
6721 | 1492 // 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
|
1493 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
|
1494 #if 0 |
16836 | 1495 // Old code apparently made under the assumption that !blit_frame means |
1496 // decoding failed due to corruption or something.. but duplication and | |
1497 // skipping of frames should be entirely disabled when skip_limit==0, | |
1498 // and must be in order for many filters to work with -noskip. | |
1499 // Eventually this entire block should probably be removed. | |
6721 | 1500 if(skip_limit==0){ |
1501 // skipping not allowed -> write empty frame: | |
12490 | 1502 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
|
1503 muxer_write_chunk(mux_v,0,0, MP_NOPTS_VALUE, MP_NOPTS_VALUE); |
6721 | 1504 } else { |
1505 // skipping allowed -> skip it and distriubute timer error: | |
1506 v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate; | |
1507 } | |
16829
c1aabebbe2e7
honor decoder's/filter's decision to remove frames when using -noskip.
rfelker
parents:
16828
diff
changeset
|
1508 #endif |
7370
8e07aeda7344
count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
arpi
parents:
7331
diff
changeset
|
1509 } |
6721 | 1510 } |
2531 | 1511 } |
2613 | 1512 |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1513 videosamples++; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1514 videorate+=(GetTimerMS() - ptimer_start); |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1515 |
2613 | 1516 if(skip_flag<0){ |
2605 | 1517 // duplicate frame |
14813
39f93fbc52dc
do not hide frame skips/dups! if they happen it's very bad!!
rfelker
parents:
14808
diff
changeset
|
1518 if(!quiet) mp_msg(MSGT_MENCODER, MSGL_WARN, MSGTR_DuplicateFrames,-skip_flag); |
2613 | 1519 while(skip_flag<0){ |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1520 duplicatedframes++; |
12490 | 1521 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
|
1522 muxer_write_chunk(mux_v,0,0, MP_NOPTS_VALUE, MP_NOPTS_VALUE); |
2613 | 1523 ++skip_flag; |
1524 } | |
2639 | 1525 } else |
1526 if(skip_flag>0){ | |
2605 | 1527 // skip frame |
14813
39f93fbc52dc
do not hide frame skips/dups! if they happen it's very bad!!
rfelker
parents:
14808
diff
changeset
|
1528 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
|
1529 skippedframes++; |
2613 | 1530 --skip_flag; |
2605 | 1531 } |
1532 | |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
1533 if(sh_audio && !demuxer2){ |
2605 | 1534 float AV_delay,x; |
1535 // A-V sync! | |
8030
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
1536 #if 0 |
2605 | 1537 if(pts_from_bps){ |
1538 unsigned int samples=(sh_audio->audio.dwSampleSize)? | |
1539 ((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
|
1540 (d_audio->block_no); // <- used for VBR audio |
2605 | 1541 a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
1542 } else |
8030
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
1543 #endif |
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
1544 { |
2605 | 1545 // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec) |
32863
674117ab7ce7
Move MPlayer's audio pts calculation code into mp_common.c and reuse it in
reimar
parents:
32795
diff
changeset
|
1546 a_pts=calc_a_pts(sh_audio, d_audio); |
2605 | 1547 } |
8966 | 1548 v_pts=sh_video ? sh_video->pts : d_video->pts; |
2605 | 1549 // 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
|
1550 AV_delay=(a_pts-v_pts); |
15997 | 1551 AV_delay-=audio_delay; |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
1552 AV_delay /= playback_speed; |
32434
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1553 AV_delay-=a_muxer_time-(v_muxer_time-(v_timer_corr+v_pts_corr)); |
2605 | 1554 // compensate input video timer by av: |
1555 x=AV_delay*0.1f; | |
1556 if(x<-max_pts_correction) x=-max_pts_correction; else | |
1557 if(x> max_pts_correction) x= max_pts_correction; | |
1558 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
|
1559 max_pts_correction=default_max_pts_correction*playback_speed; |
2605 | 1560 else |
14944
7e7b077b7a50
Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents:
14941
diff
changeset
|
1561 max_pts_correction=sh_video->frametime*0.10 *playback_speed; // +-10% of time |
2605 | 1562 // sh_video->timer-=x; |
1563 c_total+=x; | |
2613 | 1564 v_pts_corr+=x; |
4387 | 1565 } |
2605 | 1566 |
4387 | 1567 { float t=(GetTimerMS()-timer_start)*0.001f; |
1568 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
|
1569 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
|
1570 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
|
1571 (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
|
1572 #if 0 |
4393 | 1573 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
|
1574 p=(sh_audio->audio.dwSampleSize? ds_tell(sh_audio->ds)/sh_audio->audio.dwSampleSize : sh_audio->ds->block_no) |
4393 | 1575 / (float)(sh_audio->audio.dwLength); |
1576 } | |
8030
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
1577 #endif |
11875
6b28eb95c08b
* changes mencoder's exit code on explicit kill to 2
attila
parents:
11834
diff
changeset
|
1578 if(!quiet) { |
23460 | 1579 if( mp_msg_test(MSGT_STATUSLINE,MSGL_V) ) { |
1580 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", | |
32434
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1581 v_muxer_time, decoded_frameno, (int)(p*100), |
7058
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
6947
diff
changeset
|
1582 (t>1) ? (int)(decoded_frameno/t+0.5) : 0, |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
1583 (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
|
1584 (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
|
1585 v_pts_corr, |
32434
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1586 (v_muxer_time>1) ? (int)(mux_v->size/v_muxer_time/125) : 0, |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1587 (mux_a && a_muxer_time>1) ? (int)(mux_a->size/a_muxer_time/125) : 0, |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1588 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
|
1589 duplicatedframes, badframes, skippedframes |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1590 ); |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1591 } else |
23460 | 1592 mp_msg(MSGT_STATUSLINE,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %5.2ffps Trem:%4dmin %3dmb A-V:%5.3f [%d:%d]\r", |
32434
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1593 v_muxer_time, 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
|
1594 (t>1) ? (float)(decoded_frameno/t) : 0, |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29220
diff
changeset
|
1595 (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
|
1596 (p>0.001) ? (int)(stream_tell(muxer->stream)/p/1024/1024) : 0, |
4394 | 1597 v_pts_corr, |
32434
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1598 (v_muxer_time>1) ? (int)(mux_v->size/v_muxer_time/125) : 0, |
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1599 (mux_a && a_muxer_time>1) ? (int)(mux_a->size/a_muxer_time/125) : 0 |
4387 | 1600 ); |
11875
6b28eb95c08b
* changes mencoder's exit code on explicit kill to 2
attila
parents:
11834
diff
changeset
|
1601 } |
4387 | 1602 } |
2605 | 1603 fflush(stdout); |
1604 | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27014
diff
changeset
|
1605 #ifdef CONFIG_DVDREAD |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1606 // 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
|
1607 if(vobsub_writer){ |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1608 unsigned char* packet=NULL; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1609 int len; |
31558 | 1610 while((len=ds_get_packet_sub(d_dvdsub,&packet, NULL, NULL))>0){ |
8966 | 1611 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); |
32434
acb796d7ca50
Make mencoder account for encoder delay when considering the current
corey
parents:
32383
diff
changeset
|
1612 vobsub_out_output(vobsub_writer,packet,len,v_muxer_time + 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
|
1613 } |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1614 } |
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
22232
diff
changeset
|
1615 else |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1616 #endif |
29668
ecc719c6d7a9
Make update_subtitles work without sh_video for text subtitles.
reimar
parents:
29486
diff
changeset
|
1617 update_subtitles(sh_video, sh_video->pts, d_dvdsub, 0); |
2531 | 1618 |
15993 | 1619 frame_data = (s_frame_data){ .start = NULL, .in_size = 0, .frame_time = 0., .already_read = 0 }; |
1620 | |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
1621 #if 0 |
6333
69e14bf9e223
mencoder out-of-diskspace error handling, patch by Eric Lammerts <eric@lammerts.org>
arpi
parents:
6267
diff
changeset
|
1622 if(ferror(muxer_f)) { |
6947 | 1623 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
|
1624 mencoder_exit(1, NULL); |
69e14bf9e223
mencoder out-of-diskspace error handling, patch by Eric Lammerts <eric@lammerts.org>
arpi
parents:
6267
diff
changeset
|
1625 } |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
1626 #endif |
2531 | 1627 |
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
|
1628 } // while(!at_eof) |
2531 | 1629 |
14878 | 1630 if (!interrupted && filelist[++curfile].name != 0) { |
19391
5d6f4f9b6727
Cosmetics (nothing but spaces, tabs, and a comment changed here..)
ods15
parents:
19390
diff
changeset
|
1631 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
|
1632 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
|
1633 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
|
1634 |
5d6f4f9b6727
Cosmetics (nothing but spaces, tabs, and a comment changed here..)
ods15
parents:
19390
diff
changeset
|
1635 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
|
1636 else sh_video->vfilter = NULL; // There is no chain except the VE. |
14941 | 1637 } |
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
|
1638 |
17675
e735c3f740ba
Add uninit for audio before switching to next file and completing encode
ods15
parents:
17659
diff
changeset
|
1639 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
|
1640 if(sh_video){ uninit_video(sh_video);sh_video=NULL; } |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1641 if(demuxer) free_demuxer(demuxer); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1642 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
|
1643 |
14845 | 1644 at_eof = 0; |
19391
5d6f4f9b6727
Cosmetics (nothing but spaces, tabs, and a comment changed here..)
ods15
parents:
19390
diff
changeset
|
1645 |
14802
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1646 m_config_pop(mconfig); |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1647 goto play_next_file; |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1648 } |
63b1cc62fc9b
MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents:
14762
diff
changeset
|
1649 |
14878 | 1650 /* Emit the remaining frames in the video system */ |
1651 /*TODO emit frmaes delayed by decoder lag*/ | |
1652 if(sh_video && sh_video->vfilter){ | |
21146 | 1653 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
|
1654 if (!((vf_instance_t *)sh_video->vfilter)->fmt.have_configured) |
21146 | 1655 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
|
1656 else |
19390 | 1657 ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, |
14878 | 1658 VFCTRL_FLUSH_FRAMES, 0); |
1659 } | |
1660 | |
15234 | 1661 if(aencoder) |
1662 if(aencoder->fixup) | |
1663 aencoder->fixup(aencoder); | |
3354 | 1664 |
32795 | 1665 /* flush muxer just in case, this is a no-op unless |
1666 * we created a stream but never wrote frames to it... */ | |
1667 muxer_flush(muxer); | |
11222 | 1668 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
|
1669 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
|
1670 stream_seek(muxer->stream,0); |
11222 | 1671 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
|
1672 #if 0 |
6333
69e14bf9e223
mencoder out-of-diskspace error handling, patch by Eric Lammerts <eric@lammerts.org>
arpi
parents:
6267
diff
changeset
|
1673 if(ferror(muxer_f) || fclose(muxer_f) != 0) { |
6947 | 1674 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
|
1675 mencoder_exit(1, NULL); |
69e14bf9e223
mencoder out-of-diskspace error handling, patch by Eric Lammerts <eric@lammerts.org>
arpi
parents:
6267
diff
changeset
|
1676 } |
21660
ca9da45d13e9
muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents:
21412
diff
changeset
|
1677 #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
|
1678 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
|
1679 vobsub_out_close(vobsub_writer); |
4368 | 1680 |
1681 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
|
1682 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
|
1683 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
|
1684 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
|
1685 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
|
1686 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
|
1687 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_RecommendedVideoBitrate,"2 x 800MB",(int)((2*800*1024*1024-muxer_f_size)/mux_v->timer/125)); |
4368 | 1688 } |
1689 | |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1690 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_VideoStreamResult, |
18300 | 1691 (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
|
1692 if(sh_audio) |
15055
cec31d399b8a
Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents:
15042
diff
changeset
|
1693 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_AudioStreamResult, |
18300 | 1694 (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
|
1695 |
17675
e735c3f740ba
Add uninit for audio before switching to next file and completing encode
ods15
parents:
17659
diff
changeset
|
1696 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
|
1697 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
|
1698 if(demuxer) free_demuxer(demuxer); |
2618 | 1699 if(stream) free_stream(stream); // kill cache thread |
1700 | |
3320
ac8b70dd5e45
use return 1; if interrupted - patch by Artur Skawina <skawina@geocities.com>
arpi
parents:
3240
diff
changeset
|
1701 return interrupted; |
2531 | 1702 } |