annotate mencoder.c @ 35455:c9c79a011f6f

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