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