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