annotate mencoder.c @ 19771:6f84399fb197

mention that 'h' and 'k' work with dvb input, too
author nicodvb
date Sat, 09 Sep 2006 22:04:29 +0000
parents 1dc1c55328e2
children 02a18c52a42a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3384
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
1 #define VCODEC_COPY 0
3361
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
2 #define VCODEC_FRAMENO 1
5553
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
3 // real codecs:
3504
21fc87d76300 support for RGB/BGR modes (tested with raw and divx4)
alex
parents: 3480
diff changeset
4 #define VCODEC_LIBAVCODEC 4
4575
0245a06f9efd VfW encoding support (very alpha yet)
arpi
parents: 4557
diff changeset
5 #define VCODEC_VFW 7
5578
acfcb903b778 -ovc libdv support
arpi
parents: 5572
diff changeset
6 #define VCODEC_LIBDV 8
7457
c65cb0d256c3 Support for XviD encoding
kmkaplan
parents: 7451
diff changeset
7 #define VCODEC_XVID 9
8471
0b7839c27be9 Sorenson 1/3 encoding just for fun :)
arpi
parents: 8467
diff changeset
8 #define VCODEC_QTVIDEO 10
9520
2860f7c9d9ca A new nuppel video encoder. Mainly for RT encoding on slow box.
albeu
parents: 9380
diff changeset
9 #define VCODEC_NUV 11
11966
b58fdd5d8e8d remove raw nonsense and replace it by one ovc
attila
parents: 11946
diff changeset
10 #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
11 #define VCODEC_X264 13
3361
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
12
3385
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
13 #define ACODEC_COPY 0
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
14 #define ACODEC_PCM 1
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
15 #define ACODEC_VBRMP3 2
4368
fae96d93c662 bitrate calculator for 650/700 mb cdrom
arpi
parents: 4367
diff changeset
16 #define ACODEC_NULL 3
11375
3544f1823f6b mencoder lavc audio encoding support
ranma
parents: 11222
diff changeset
17 #define ACODEC_LAVC 4
13426
0f92ad66bbb5 encoding to mp2 with libtoolame
nicodvb
parents: 13166
diff changeset
18 #define ACODEC_TOOLAME 5
15259
854990f357ee added faac audio encoder
nicodvb
parents: 15234
diff changeset
19 #define ACODEC_FAAC 6
15359
af245d15f502 added twolame mp2 audio encoder
nicodvb
parents: 15259
diff changeset
20 #define ACODEC_TWOLAME 7
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
21
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
22 #include <stdio.h>
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
23 #include <stdlib.h>
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
24 #include <string.h>
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
25 #include <signal.h>
12360
85f18227756f 10l on cygwin WIN32 gets defined in config.h
faust3
parents: 12358
diff changeset
26 #include "config.h"
85f18227756f 10l on cygwin WIN32 gets defined in config.h
faust3
parents: 12358
diff changeset
27
9772
6586ec1f6ee4 MINGW32 port
faust3
parents: 9746
diff changeset
28 #ifdef __MINGW32__
16049
0ccf19820216 define SIGHUP and SIGPIPE for MinGW and catch SIGPIPE also in mplayer
reimar
parents: 16002
diff changeset
29 #define SIGHUP 1
9772
6586ec1f6ee4 MINGW32 port
faust3
parents: 9746
diff changeset
30 #define SIGQUIT 3
16049
0ccf19820216 define SIGHUP and SIGPIPE for MinGW and catch SIGPIPE also in mplayer
reimar
parents: 16002
diff changeset
31 #define SIGPIPE 13
9772
6586ec1f6ee4 MINGW32 port
faust3
parents: 9746
diff changeset
32 #endif
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
33 #ifdef WIN32
133e0ebde74d Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
faust3
parents: 12354
diff changeset
34 #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
35 #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
36
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
37 #include <sys/time.h>
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
38
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
39
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
40 #include "version.h"
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
41 #include "mp_msg.h"
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
42 #include "help_mp.h"
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
43
3323
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
44 #include "cpudetect.h"
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
45
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
46 #include "codec-cfg.h"
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
47 #include "m_option.h"
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
48 #include "m_config.h"
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
49 #include "parser-mecmd.h"
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
50
19271
64d82a45a05d introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents: 19082
diff changeset
51 #include "stream/stream.h"
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
52 #include "libmpdemux/demuxer.h"
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
53 #include "libmpdemux/stheader.h"
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
54 #include "libmpdemux/mp3_hdr.h"
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8517
diff changeset
55 #include "libmpdemux/muxer.h"
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
56
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
57
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
58 #include "libvo/video_out.h"
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
59
14245
815f03b7cee5 removing AFMT_ dependancy
alex
parents: 14046
diff changeset
60 #include "libaf/af_format.h"
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7559
diff changeset
61
7471
5e56ce70b551 wine headers cleanup
arpi
parents: 7457
diff changeset
62 #include "libmpcodecs/mp_image.h"
5607
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5578
diff changeset
63 #include "libmpcodecs/dec_audio.h"
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5578
diff changeset
64 #include "libmpcodecs/dec_video.h"
6581
896c062e85ec clean up warnings in mencoder.
rfelker
parents: 6534
diff changeset
65 #include "libmpcodecs/vf.h"
2574
arpi
parents: 2571
diff changeset
66
7471
5e56ce70b551 wine headers cleanup
arpi
parents: 7457
diff changeset
67 // for MPEGLAYER3WAVEFORMAT:
12341
0db4a3a5b01d removed loader/ dependancy, imported some files from g2, also used patches from Dominik Mierzejewski
alex
parents: 12337
diff changeset
68 #include "libmpdemux/ms_hdr.h"
7471
5e56ce70b551 wine headers cleanup
arpi
parents: 7457
diff changeset
69
3236
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
70 #include <inttypes.h>
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
71
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
72 #include "libvo/fastmemcpy.h"
3385
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
73
9380
edfe34c5405d linux->osdep
arpi
parents: 9076
diff changeset
74 #include "osdep/timer.h"
7472
c4434bdf6e51 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents: 7471
diff changeset
75
15507
2f4125e4025e include get_path.c before avcodec.h, fix error on osx + gcc4 where defined macro always_inline in libavcodec/common.h already exist in math.h and used for something else.
nplourde
parents: 15359
diff changeset
76 #include "get_path.c"
2f4125e4025e include get_path.c before avcodec.h, fix error on osx + gcc4 where defined macro always_inline in libavcodec/common.h already exist in math.h and used for something else.
nplourde
parents: 15359
diff changeset
77
18682
bee3186a06f7 include stream_dvd's interface from libmpdemux/stream_dvd.h
nicodvb
parents: 18417
diff changeset
78 #ifdef USE_DVDREAD
19271
64d82a45a05d introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents: 19082
diff changeset
79 #include "stream/stream_dvd.h"
18682
bee3186a06f7 include stream_dvd's interface from libmpdemux/stream_dvd.h
nicodvb
parents: 18417
diff changeset
80 #endif
bee3186a06f7 include stream_dvd's interface from libmpdemux/stream_dvd.h
nicodvb
parents: 18417
diff changeset
81
11375
3544f1823f6b mencoder lavc audio encoding support
ranma
parents: 11222
diff changeset
82 #ifdef USE_LIBAVCODEC
11410
719d696267a8 wrong include on shared lavc
iive
parents: 11375
diff changeset
83 #ifdef USE_LIBAVCODEC_SO
719d696267a8 wrong include on shared lavc
iive
parents: 11375
diff changeset
84 #include <ffmpeg/avcodec.h>
719d696267a8 wrong include on shared lavc
iive
parents: 11375
diff changeset
85 #else
16165
a9f7eff9e437 Support new static libavcodec (depends on libavutil).
al
parents: 16152
diff changeset
86 #include "avcodec.h"
11410
719d696267a8 wrong include on shared lavc
iive
parents: 11375
diff changeset
87 #endif
11375
3544f1823f6b mencoder lavc audio encoding support
ranma
parents: 11222
diff changeset
88 #endif
3544f1823f6b mencoder lavc audio encoding support
ranma
parents: 11222
diff changeset
89
15234
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
90 #include "libmpcodecs/ae.h"
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
91 int vo_doublebuffering=0;
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
92 int vo_directrendering=0;
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
93 int vo_config_count=0;
11573
b293b4eb2c8c Forced subs support for mencoder
attila
parents: 11550
diff changeset
94 int forced_subs_only=0;
4388
b6b429d10296 Support for HW equalizing
nick
parents: 4387
diff changeset
95
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
96 //--------------------------
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
97
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
98 // cache2:
7881
aba9301ed3c4 allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents: 7867
diff changeset
99 int stream_cache_size=-1;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
100 #ifdef USE_STREAM_CACHE
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
101 extern int cache_fill_status;
12835
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 12546
diff changeset
102
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 12546
diff changeset
103 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
104 float stream_cache_seek_min_percent=50.0;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
105 #else
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
106 #define cache_fill_status 0
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
107 #endif
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
108
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
109 int audio_id=-1;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
110 int video_id=-1;
17297
6607f0123a96 disable dvd subtitles by default
nicodvb
parents: 17213
diff changeset
111 int dvdsub_id=-2;
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5386
diff changeset
112 int vobsub_id=-1;
10167
531b00ad6f2d Support for selecting the audio track in Matroska files via -alang.
mosu
parents: 9870
diff changeset
113 char* audio_lang=NULL;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9772
diff changeset
114 char* dvdsub_lang=NULL;
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5386
diff changeset
115 static char* spudec_ifo=NULL;
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
116
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
117 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
118 static char** video_codec_list=NULL; // override video codec
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
119 static char** audio_fm_list=NULL; // override audio codec family
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
120 static char** video_fm_list=NULL; // override video codec family
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16165
diff changeset
121 extern char *demuxer_name; // override demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 16165
diff changeset
122 extern char *audio_demuxer_name; // override audio demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 16165
diff changeset
123 extern char *sub_demuxer_name; // override sub demuxer
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
124
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
125 static int out_audio_codec=-1;
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
126 static int out_video_codec=-1;
4620
9ad42931f595 initial seeking (-ss) support in mencoder
rfelker
parents: 4575
diff changeset
127
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8517
diff changeset
128 int out_file_format=MUXER_TYPE_AVI; // default to AVI
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8517
diff changeset
129
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
130 // audio stream skip/resync functions requires only for seeking.
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
131 // (they should be implemented in the audio codec layer)
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
132 //void skip_audio_frame(sh_audio_t *sh_audio){}
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
133 //void resync_audio_stream(sh_audio_t *sh_audio){}
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
134
17120
637a2f4ff216 Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'll
ods15
parents: 17106
diff changeset
135 extern int verbose; // must be global!
11875
6b28eb95c08b * changes mencoder's exit code on explicit kill to 2
attila
parents: 11834
diff changeset
136 int quiet=0;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
137 double video_time_usage=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
138 double vout_time_usage=0;
4834
fdb92826250c max & average benchmarks
nick
parents: 4767
diff changeset
139 double max_video_time_usage=0;
fdb92826250c max & average benchmarks
nick
parents: 4767
diff changeset
140 double max_vout_time_usage=0;
4838
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4834
diff changeset
141 double cur_video_time_usage=0;
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4834
diff changeset
142 double cur_vout_time_usage=0;
4844
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4838
diff changeset
143 int benchmark=0;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
144
17120
637a2f4ff216 Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'll
ods15
parents: 17106
diff changeset
145 extern int mp_msg_levels[MSGT_MAX];
637a2f4ff216 Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'll
ods15
parents: 17106
diff changeset
146 extern int mp_msg_level_all;
17106
05af35012e4f new -msglevel option, constrols msg level for every msg module
ods15
parents: 17078
diff changeset
147
15042
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
148 #ifdef WIN32
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
149 char * proc_priority=NULL;
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
150 #endif
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
151
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
152 // A-V sync:
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
153 int delay_corrected=1;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
154 static float default_max_pts_correction=-1;//0.01f;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
155 static float max_pts_correction=0;//default_max_pts_correction;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
156 static float c_total=0;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
157
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
158 static float audio_preload=0.5;
15992
11966749d065 -delay for MEncoder, step 1.
ods15
parents: 15895
diff changeset
159 static float audio_delay_fix=0.0;
15997
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
160 static float audio_delay=0.0;
17654
16633b9c0953 New option: -ignore-start
corey
parents: 17648
diff changeset
161 static int ignore_start=0;
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
162 static int audio_density=2;
6861
79f54159ca15 audio preload/density/delay configurable
arpi
parents: 6784
diff changeset
163
9564
898e3692ca0d Made "force_fps" non-static, because code in "libmpdemux" refers to it.
rsf
parents: 9520
diff changeset
164 float force_fps=0;
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
165 static float force_ofps=0; // set to 24 for inverse telecine
5629
9b422f216fb5 -skiplimit/-noskip options to disable fps correction
arpi
parents: 5626
diff changeset
166 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
167 float playback_speed=1.0;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
168
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
169 static int force_srate=0;
7614
ce6a938aa6d3 Adding -format and -af switches
anders
parents: 7613
diff changeset
170 static int audio_output_format=0;
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
171
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
172 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
173 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
174 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
175
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
176 char* out_filename=NULL;
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
177
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
178 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
179 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
180
5553
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
181 char* passtmpfile="divx2pass.log";
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
182
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
183 static int play_n_frames=-1;
6590
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6581
diff changeset
184 static int play_n_frames_mf=-1;
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
185
5669
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
186 #include "libvo/font_load.h"
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
187 #include "libvo/sub.h"
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
188
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
189 // sub:
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
190 char *font_name=NULL;
11580
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11573
diff changeset
191 #ifdef HAVE_FONTCONFIG
11584
alex
parents: 11581
diff changeset
192 extern int font_fontconfig;
11580
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11573
diff changeset
193 #endif
5669
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
194 float font_factor=0.75;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9772
diff changeset
195 char **sub_name=NULL;
5669
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
196 float sub_delay=0;
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
197 float sub_fps=0;
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
198 int sub_auto = 0;
6784
b38e38b6f88f DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents: 6765
diff changeset
199 int subcc_enabled=0;
8361
2202c00001e3 overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
arpi
parents: 8357
diff changeset
200 int suboverlap_enabled = 1;
5669
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
201
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
202 #ifdef USE_SUB
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9772
diff changeset
203 static sub_data* subdata=NULL;
5669
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
204 float sub_last_pts = -303;
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
205 #endif
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
206
9076
92014b66ed3d ability to disable the nonsense expand filter is a must! otherwise
rfelker
parents: 9014
diff changeset
207 int auto_expand=1;
12334
eeddcef4fb08 "hard" frame duplication for mencoder. this finally makes it possible
rfelker
parents: 12223
diff changeset
208 int encode_duplicates=1;
9076
92014b66ed3d ability to disable the nonsense expand filter is a must! otherwise
rfelker
parents: 9014
diff changeset
209
7145
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7124
diff changeset
210 // infos are empty by default
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7124
diff changeset
211 char *info_name=NULL;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7124
diff changeset
212 char *info_artist=NULL;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7124
diff changeset
213 char *info_genre=NULL;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7124
diff changeset
214 char *info_subject=NULL;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7124
diff changeset
215 char *info_copyright=NULL;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7124
diff changeset
216 char *info_sourceform=NULL;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7124
diff changeset
217 char *info_comment=NULL;
3854945aefbb new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents: 7124
diff changeset
218
18267
89bd33b746b9 No need to include the whole libinput in mencoder
albeu
parents: 18237
diff changeset
219 // Needed by libmpdemux.
89bd33b746b9 No need to include the whole libinput in mencoder
albeu
parents: 18237
diff changeset
220 int mp_input_check_interrupt(int time) {
89bd33b746b9 No need to include the whole libinput in mencoder
albeu
parents: 18237
diff changeset
221 usec_sleep(time);
89bd33b746b9 No need to include the whole libinput in mencoder
albeu
parents: 18237
diff changeset
222 return 0;
89bd33b746b9 No need to include the whole libinput in mencoder
albeu
parents: 18237
diff changeset
223 }
5669
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
224
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18888
diff changeset
225 #ifdef USE_ASS
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18888
diff changeset
226 #include "libass/ass.h"
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18888
diff changeset
227 #include "libass/ass_mp.h"
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18888
diff changeset
228
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18888
diff changeset
229 ass_track_t* ass_track = 0; // current track to render
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18888
diff changeset
230 #endif
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18888
diff changeset
231
2661
11f4c2b2b70f -oac/-ovc (fake:))
arpi
parents: 2655
diff changeset
232 //char *out_audio_codec=NULL; // override audio codec
11f4c2b2b70f -oac/-ovc (fake:))
arpi
parents: 2655
diff changeset
233 //char *out_video_codec=NULL; // override video codec
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
234
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
235 //#include "libmpeg2/mpeg2.h"
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
236 //#include "libmpeg2/mpeg2_internal.h"
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
237
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
238 //static int vo_w=0, vo_h=0;
5270
870e932096ff Support for cropping in mencoder. New options:
ksorim
parents: 5223
diff changeset
239
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
240 //-------------------------- config stuff:
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
241
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
242 m_config_t* mconfig;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
243
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10453
diff changeset
244 extern int m_config_parse_config_file(m_config_t* config, char *conffile);
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
245
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10453
diff changeset
246 static int cfg_inc_verbose(m_option_t *conf){ ++verbose; return 0;}
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
247
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10453
diff changeset
248 static int cfg_include(m_option_t *conf, char *filename){
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
249 return m_config_parse_config_file(mconfig, filename);
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
250 }
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
251
4620
9ad42931f595 initial seeking (-ss) support in mencoder
rfelker
parents: 4575
diff changeset
252 static char *seek_to_sec=NULL;
9ad42931f595 initial seeking (-ss) support in mencoder
rfelker
parents: 4575
diff changeset
253 static off_t seek_to_byte=0;
9ad42931f595 initial seeking (-ss) support in mencoder
rfelker
parents: 4575
diff changeset
254
16528
c1267de1d7d9 Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents: 16175
diff changeset
255 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
256
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17553
diff changeset
257 static void parse_end_at(void);
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
258 static char * end_at_string=0;
7451
8669e56d2d98 some mpcodecs option declaration moved to cfg-*, as aren;t used by
arpi
parents: 7394
diff changeset
259 //static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, int height);
4159
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
260
15993
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
261 typedef struct {
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
262 unsigned char* start;
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
263 int in_size;
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
264 float frame_time;
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
265 int already_read;
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
266 } s_frame_data;
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
267
15994
13ae8ec083f6 -delay for MEncoder, step 3.
ods15
parents: 15993
diff changeset
268 /// Returns a_pts
13ae8ec083f6 -delay for MEncoder, step 3.
ods15
parents: 15993
diff changeset
269 static float calc_a_pts(demux_stream_t *d_audio);
15995
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
270 /** \brief Seeks audio forward to pts by dumping audio packets
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
271 \return The current audio pts.
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
272 */
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
273 static float forward_audio(float pts, demux_stream_t *d_audio, muxer_stream_t* mux_a);
15996
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
274 /** \brief Seeks slowly by dumping frames.
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
275 \return 1 for success, 2 for EOF.
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
276 */
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
277 static int slowseek(float end_pts, demux_stream_t *d_video, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy, int print_info);
15997
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
278 /// Deletes audio or video as told by -delay to sync
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
279 static void fixdelay(demux_stream_t *d_video, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy);
15994
13ae8ec083f6 -delay for MEncoder, step 3.
ods15
parents: 15993
diff changeset
280
14964
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
281 #include "edl.h"
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
282 static edl_record_ptr edl_records = NULL; ///< EDL entries memory area
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
283 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
284 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
285 static short edl_seeking; ///< When non-zero, stream is seekable.
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
286 static short edl_seek_type; ///< When non-zero, frames are discarded instead of seeking.
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
287 /** \brief Seeks for EDL
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
288 \return 1 for success, 0 for failure, 2 for EOF.
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
289 */
15993
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
290 static int edl_seek(edl_record_ptr next_edl_record, demuxer_t* demuxer, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy);
14964
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
291
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
292 #include "cfg-mencoder.h"
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
293
4088
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
294 #ifdef USE_DVDREAD
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
295 #include "spudec.h"
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
296 #endif
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5386
diff changeset
297 #include "vobsub.h"
4088
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
298
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
299 #include "libao2/audio_out.h"
4743
171dcc22b607 using mencoder_exit instead exit and return
alex
parents: 4703
diff changeset
300 /* 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
301 static void mencoder_exit(int level, const char *how)
4743
171dcc22b607 using mencoder_exit instead exit and return
alex
parents: 4703
diff changeset
302 {
171dcc22b607 using mencoder_exit instead exit and return
alex
parents: 4703
diff changeset
303 if (how)
18002
3ef9d2209e34 arrg more of this stupid cruft
rfelker
parents: 17977
diff changeset
304 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ExitingHow, how);
4743
171dcc22b607 using mencoder_exit instead exit and return
alex
parents: 4703
diff changeset
305 else
15055
cec31d399b8a Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents: 15042
diff changeset
306 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_Exiting);
4743
171dcc22b607 using mencoder_exit instead exit and return
alex
parents: 4703
diff changeset
307
171dcc22b607 using mencoder_exit instead exit and return
alex
parents: 4703
diff changeset
308 exit(level);
171dcc22b607 using mencoder_exit instead exit and return
alex
parents: 4703
diff changeset
309 }
171dcc22b607 using mencoder_exit instead exit and return
alex
parents: 4703
diff changeset
310
18888
ab29b3c4f94e parse_cfgfiles as static in mplayer.c/mencoder.c, patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents: 18682
diff changeset
311 static void parse_cfgfiles( m_config_t* conf )
4488
7e8910727e7a config file support for mencoder
rfelker
parents: 4462
diff changeset
312 {
7e8910727e7a config file support for mencoder
rfelker
parents: 4462
diff changeset
313 char *conffile;
17869
9e1b5526b0da The system-wide and the user-specific MEncoder configuration file should both
diego
parents: 17675
diff changeset
314 if ((conffile = get_path("mencoder.conf")) == NULL) {
4488
7e8910727e7a config file support for mencoder
rfelker
parents: 4462
diff changeset
315 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem);
7e8910727e7a config file support for mencoder
rfelker
parents: 4462
diff changeset
316 } else {
7e8910727e7a config file support for mencoder
rfelker
parents: 4462
diff changeset
317 if (m_config_parse_config_file(conf, conffile) < 0)
18335
5766a9d21992 Rename some misspelled and misnamed messages.
diego
parents: 18312
diff changeset
318 mencoder_exit(1,MSGTR_ConfigFileError);
4488
7e8910727e7a config file support for mencoder
rfelker
parents: 4462
diff changeset
319 free(conffile);
7e8910727e7a config file support for mencoder
rfelker
parents: 4462
diff changeset
320 }
7e8910727e7a config file support for mencoder
rfelker
parents: 4462
diff changeset
321 }
7e8910727e7a config file support for mencoder
rfelker
parents: 4462
diff changeset
322
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
323
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
324 //---------------------------------------------------------------------------
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
325
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
326 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
327 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
328 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
329 while(size<total && !at_eof){
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
330 int len=total-size;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
331 if(len>MAX_OUTBURST) len=MAX_OUTBURST;
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7559
diff changeset
332 if(len>sh_audio->a_out_buffer_size) len=sh_audio->a_out_buffer_size;
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7559
diff changeset
333 if(len>sh_audio->a_out_buffer_len){
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
334 int ret=decode_audio(sh_audio,
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7559
diff changeset
335 &sh_audio->a_out_buffer[sh_audio->a_out_buffer_len],
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7559
diff changeset
336 len-sh_audio->a_out_buffer_len,
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7559
diff changeset
337 sh_audio->a_out_buffer_size-sh_audio->a_out_buffer_len);
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7559
diff changeset
338 if(ret>0) sh_audio->a_out_buffer_len+=ret; else at_eof=1;
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
339 }
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7559
diff changeset
340 if(len>sh_audio->a_out_buffer_len) len=sh_audio->a_out_buffer_len;
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7559
diff changeset
341 memcpy(buffer+size,sh_audio->a_out_buffer,len);
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7559
diff changeset
342 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
343 if(sh_audio->a_out_buffer_len>0)
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7559
diff changeset
344 memcpy(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
345 }
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
346 return size;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
347 }
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
348
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
349 //---------------------------------------------------------------------------
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
350
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
351 // this function returns the absoloute time for which MEncoder will switch files or move in the file.
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
352 // so audio can be cut correctly. -1 if there is no limit.
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
353 static float stop_time(demuxer_t* demuxer, muxer_stream_t* mux_v);
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
354
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
355 static int at_eof=0;
3320
ac8b70dd5e45 use return 1; if interrupted - patch by Artur Skawina <skawina@geocities.com>
arpi
parents: 3240
diff changeset
356 static int interrupted=0;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
357
4159
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
358 enum end_at_type_t {END_AT_NONE, END_AT_TIME, END_AT_SIZE};
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
359 static enum end_at_type_t end_at_type = END_AT_NONE;
8355
3be7b22b6713 end_at int->double, as option -endpos accepts float seconds too
arpi
parents: 8164
diff changeset
360 static double end_at;
4159
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
361
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
362 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
363 at_eof=1;
11875
6b28eb95c08b * changes mencoder's exit code on explicit kill to 2
attila
parents: 11834
diff changeset
364 interrupted=2; /* 1 means error */
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
365 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
366
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8517
diff changeset
367 static muxer_t* muxer=NULL;
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
368 static FILE* muxer_f=NULL;
5553
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
369
17977
f70772d02eaa Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents: 17932
diff changeset
370 extern void print_wave_header(WAVEFORMATEX *h, int verbose_level);
5553
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
371
7201
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7180
diff changeset
372 int main(int argc,char* argv[]){
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
373
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
374 stream_t* stream=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
375 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
376 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
377 demuxer_t* demuxer2=NULL;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
378 demux_stream_t *d_audio=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
379 demux_stream_t *d_video=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
380 demux_stream_t *d_dvdsub=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
381 sh_audio_t *sh_audio=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
382 sh_video_t *sh_video=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
383 int file_format=DEMUXER_TYPE_UNKNOWN;
12223
e7c8200ffdc5 Respect -playlist for asx streams
rtognimp
parents: 12149
diff changeset
384 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
385 void *vobsub_writer=NULL;
15993
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
386 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
387
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
388 uint32_t ptimer_start;
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
389 uint32_t audiorate=0;
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
390 uint32_t videorate=0;
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
391 uint32_t audiosamples=1;
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
392 uint32_t videosamples=1;
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
393 uint32_t skippedframes=0;
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
394 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
395 uint32_t badframes=0;
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
396
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8517
diff changeset
397 muxer_stream_t* mux_a=NULL;
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8517
diff changeset
398 muxer_stream_t* mux_v=NULL;
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
399 off_t muxer_f_size=0;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
400
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
401 double v_pts_corr=0;
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
402 double v_timer_corr=0;
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
403
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
404 m_entry_t* filelist = NULL;
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
405 char* filename=NULL;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
406
3361
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
407 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
408 int next_frameno=-1;
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
409 int curfile=0;
17121
119790c08d5c compiler warning fixes, some of these were actual (printing) bugs.
ods15
parents: 17120
diff changeset
410 int new_srate=0;
3361
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
411
17121
119790c08d5c compiler warning fixes, some of these were actual (printing) bugs.
ods15
parents: 17120
diff changeset
412 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
413 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
414
15234
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
415 audio_encoding_params_t aparams;
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
416 audio_encoder_t *aencoder = NULL;
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
417
5223
8c7b6ba2b5e9 splitted mp_msg_init and mp_msg_set_level
alex
parents: 5176
diff changeset
418 mp_msg_init();
17312
25fdd83982a4 Update copyright date to 2006
gpoirier
parents: 17297
diff changeset
419 mp_msg(MSGT_CPLAYER,MSGL_INFO, "MEncoder " VERSION " (C) 2000-2006 MPlayer Team\n");
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
420
3323
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
421 /* Test for cpu capabilities (and corresponding OS support) for optimizing */
9003
c428933c7e54 AltiVec detection code ("borrowed" from FFmpeg and
arpi
parents: 8966
diff changeset
422 GetCpuCaps(&gCpuCaps);
14610
9e81b41838e6 Print CPUflags and extension support on x86_64, too
reimar
parents: 14296
diff changeset
423 #if defined(ARCH_X86) || defined(ARCH_X86_64)
3323
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
424 mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: Type: %d MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n",
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
425 gCpuCaps.cpuType,gCpuCaps.hasMMX,gCpuCaps.hasMMX2,
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
426 gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
427 gCpuCaps.hasSSE, gCpuCaps.hasSSE2);
10453
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
428 #ifdef RUNTIME_CPUDETECT
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
429 mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithRuntimeDetection);
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
430 #else
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
431 mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithCPUExtensions);
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
432 #ifdef HAVE_MMX
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
433 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX");
3323
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
434 #endif
10453
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
435 #ifdef HAVE_MMX2
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
436 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX2");
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
437 #endif
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
438 #ifdef HAVE_3DNOW
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
439 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNow");
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
440 #endif
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
441 #ifdef HAVE_3DNOWEX
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
442 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNowEx");
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
443 #endif
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
444 #ifdef HAVE_SSE
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
445 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE");
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
446 #endif
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
447 #ifdef HAVE_SSE2
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
448 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE2");
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
449 #endif
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
450 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n\n");
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
451 #endif
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
452 #endif
16781
6809ca5dd307 allow mencoder to load win32 codecs properly patch by Zuxy <zuxy.meng at gmail.com>
faust3
parents: 16756
diff changeset
453
6809ca5dd307 allow mencoder to load win32 codecs properly patch by Zuxy <zuxy.meng at gmail.com>
faust3
parents: 16756
diff changeset
454 #if defined(WIN32) && defined(USE_WIN32DLL)
6809ca5dd307 allow mencoder to load win32 codecs properly patch by Zuxy <zuxy.meng at gmail.com>
faust3
parents: 16756
diff changeset
455 set_path_env();
6809ca5dd307 allow mencoder to load win32 codecs properly patch by Zuxy <zuxy.meng at gmail.com>
faust3
parents: 16756
diff changeset
456 #endif /*WIN32 && USE_WIN32DLL*/
10453
b411916cb86a sync the basic mplayer and mencoder outputs
alex
parents: 10417
diff changeset
457
11550
18d3b3a1101b InitTimer has to be called before *Timer-Functions can be used.
ranma
parents: 11513
diff changeset
458 InitTimer();
18d3b3a1101b InitTimer has to be called before *Timer-Functions can be used.
ranma
parents: 11513
diff changeset
459
5889
111d2406a87a do cpudetect before anything else
arpi
parents: 5848
diff changeset
460 // check codec.conf
11759
29eea271490e add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents: 11592
diff changeset
461 if(!codecs_file || !parse_codec_cfg(codecs_file)){
29eea271490e add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents: 11592
diff changeset
462 if(!parse_codec_cfg(get_path("codecs.conf"))){
29eea271490e add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents: 11592
diff changeset
463 if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){
29eea271490e add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents: 11592
diff changeset
464 if(!parse_codec_cfg(NULL)){
29eea271490e add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents: 11592
diff changeset
465 mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf);
29eea271490e add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents: 11592
diff changeset
466 mencoder_exit(1,NULL);
29eea271490e add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents: 11592
diff changeset
467 }
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 13593
diff changeset
468 mp_msg(MSGT_MENCODER,MSGL_V,MSGTR_BuiltinCodecsConf);
8467
3ca9cc46df5c Fallback to builtin (generated from etc/codecs.conf at compile time)
arpi
parents: 8465
diff changeset
469 }
5889
111d2406a87a do cpudetect before anything else
arpi
parents: 5848
diff changeset
470 }
111d2406a87a do cpudetect before anything else
arpi
parents: 5848
diff changeset
471 }
111d2406a87a do cpudetect before anything else
arpi
parents: 5848
diff changeset
472
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
473 mconfig = m_config_new();
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
474 m_config_register_options(mconfig,mencoder_opts);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
475 parse_cfgfiles(mconfig);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
476 filelist = m_config_parse_me_command_line(mconfig, argc, argv);
13122
fcce0023bf55 printf -> mp_msg conversion, first steps
diego
parents: 12835
diff changeset
477 if(!filelist) mencoder_exit(1, MSGTR_ErrorParsingCommandLine);
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
478
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
479 {
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
480 char *extension;
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
481
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
482 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
483 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
484 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
485 {
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
486 extension++;
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
487
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
488 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
489 {
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
490 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
491 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
492 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
493 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
494
8e6cf7bbe18a make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents: 17122
diff changeset
495 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
496 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
497 strcasecmp(extension,"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
498 strcasecmp(extension,"vob"))
8e6cf7bbe18a make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents: 17122
diff changeset
499 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
500 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
501 }
8e6cf7bbe18a make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents: 17122
diff changeset
502 }
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
503 }
8e6cf7bbe18a make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents: 17122
diff changeset
504
8e6cf7bbe18a make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
wanderer
parents: 17122
diff changeset
505
16528
c1267de1d7d9 Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents: 16175
diff changeset
506 if (frameno_filename) {
c1267de1d7d9 Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents: 16175
diff changeset
507 stream2=open_stream(frameno_filename,0,&i);
c1267de1d7d9 Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents: 16175
diff changeset
508 if(stream2){
c1267de1d7d9 Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents: 16175
diff changeset
509 demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2,NULL);
18335
5766a9d21992 Rename some misspelled and misnamed messages.
diego
parents: 18312
diff changeset
510 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
511 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
512 }
c1267de1d7d9 Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents: 16175
diff changeset
513 }
c1267de1d7d9 Make frameno.avi not turn on by default. this is deprecated and this entire
ods15
parents: 16175
diff changeset
514
15042
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
515 #ifdef WIN32
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
516 if(proc_priority){
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
517 int i;
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
518 for(i=0; priority_presets_defs[i].name; i++){
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
519 if(strcasecmp(priority_presets_defs[i].name, proc_priority) == 0)
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
520 break;
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
521 }
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
522 mp_msg(MSGT_CPLAYER,MSGL_STATUS,"Setting process priority: %s\n",
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
523 priority_presets_defs[i].name);
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
524 SetPriorityClass(GetCurrentProcess(), priority_presets_defs[i].prio);
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
525 }
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
526 #endif
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14996
diff changeset
527
6267
2e117fd620a0 font init needs to be after config parsing, otherwise -font won't
rfelker
parents: 6138
diff changeset
528 // check font
2e117fd620a0 font init needs to be after config parsing, otherwise -font won't
rfelker
parents: 6138
diff changeset
529 #ifdef USE_OSD
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7058
diff changeset
530 #ifdef HAVE_FREETYPE
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7058
diff changeset
531 init_freetype();
11580
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11573
diff changeset
532 #endif
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11573
diff changeset
533 #ifdef HAVE_FONTCONFIG
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11573
diff changeset
534 if(!font_fontconfig)
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11573
diff changeset
535 {
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11573
diff changeset
536 #endif
19519
1dc1c55328e2 Fix MEncoder build when bitmap fonts are disabled.
diego
parents: 19391
diff changeset
537 #ifdef HAVE_BITMAP_FONT
6267
2e117fd620a0 font init needs to be after config parsing, otherwise -font won't
rfelker
parents: 6138
diff changeset
538 if(font_name){
2e117fd620a0 font init needs to be after config parsing, otherwise -font won't
rfelker
parents: 6138
diff changeset
539 vo_font=read_font_desc(font_name,font_factor,verbose>1);
2e117fd620a0 font init needs to be after config parsing, otherwise -font won't
rfelker
parents: 6138
diff changeset
540 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
2e117fd620a0 font init needs to be after config parsing, otherwise -font won't
rfelker
parents: 6138
diff changeset
541 } else {
2e117fd620a0 font init needs to be after config parsing, otherwise -font won't
rfelker
parents: 6138
diff changeset
542 // try default:
2e117fd620a0 font init needs to be after config parsing, otherwise -font won't
rfelker
parents: 6138
diff changeset
543 vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
2e117fd620a0 font init needs to be after config parsing, otherwise -font won't
rfelker
parents: 6138
diff changeset
544 if(!vo_font)
10272
7b0bc557987b renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
arpi
parents: 10167
diff changeset
545 vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
6267
2e117fd620a0 font init needs to be after config parsing, otherwise -font won't
rfelker
parents: 6138
diff changeset
546 }
19519
1dc1c55328e2 Fix MEncoder build when bitmap fonts are disabled.
diego
parents: 19391
diff changeset
547 #endif
11580
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11573
diff changeset
548 #ifdef HAVE_FONTCONFIG
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11573
diff changeset
549 }
6267
2e117fd620a0 font init needs to be after config parsing, otherwise -font won't
rfelker
parents: 6138
diff changeset
550 #endif
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7058
diff changeset
551 #endif
6267
2e117fd620a0 font init needs to be after config parsing, otherwise -font won't
rfelker
parents: 6138
diff changeset
552
2e117fd620a0 font init needs to be after config parsing, otherwise -font won't
rfelker
parents: 6138
diff changeset
553 vo_init_osd();
2e117fd620a0 font init needs to be after config parsing, otherwise -font won't
rfelker
parents: 6138
diff changeset
554
16814
0c6f6ef27f3f document hack
ods15
parents: 16805
diff changeset
555 /* HACK, for some weird reason, push() has to be called twice,
0c6f6ef27f3f document hack
ods15
parents: 16805
diff changeset
556 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
557 m_config_push(mconfig);
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
558 play_next_file:
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
559 m_config_push(mconfig);
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
560 m_entry_set_options(mconfig,&filelist[curfile]);
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
561 filename = filelist[curfile].name;
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
562
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
563 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
564 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
565 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
566 }
9746
27fff718ede6 Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9725
diff changeset
567 stream=open_stream(filename,0,&file_format);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
568
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
569 if(!stream){
15055
cec31d399b8a Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents: 15042
diff changeset
570 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_CannotOpenFile_Device);
4743
171dcc22b607 using mencoder_exit instead exit and return
alex
parents: 4703
diff changeset
571 mencoder_exit(1,NULL);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
572 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
573
15055
cec31d399b8a Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents: 15042
diff changeset
574 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
575
5436
6f6082d9c8ba -alang/-slang support in mencoder too
arpi
parents: 5392
diff changeset
576 #ifdef USE_DVDREAD
6f6082d9c8ba -alang/-slang support in mencoder too
arpi
parents: 5392
diff changeset
577 if(stream->type==STREAMTYPE_DVD){
6f6082d9c8ba -alang/-slang support in mencoder too
arpi
parents: 5392
diff changeset
578 if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang);
17297
6607f0123a96 disable dvd subtitles by default
nicodvb
parents: 17213
diff changeset
579 if(dvdsub_lang && dvdsub_id==-2) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang);
5436
6f6082d9c8ba -alang/-slang support in mencoder too
arpi
parents: 5392
diff changeset
580 }
6f6082d9c8ba -alang/-slang support in mencoder too
arpi
parents: 5392
diff changeset
581 #endif
6f6082d9c8ba -alang/-slang support in mencoder too
arpi
parents: 5392
diff changeset
582
5626
b7b40e65c070 -sb option re-added (noticed by Alexandre Oliva <oliva@lsd.ic.unicamp.br>)
arpi
parents: 5607
diff changeset
583 stream->start_pos+=seek_to_byte;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
584
7881
aba9301ed3c4 allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents: 7867
diff changeset
585 if(stream_cache_size>0) stream_enable_cache(stream,stream_cache_size*1024,0,0);
5626
b7b40e65c070 -sb option re-added (noticed by Alexandre Oliva <oliva@lsd.ic.unicamp.br>)
arpi
parents: 5607
diff changeset
586
7529
c276bfb414fb removed obsolete/unused audio|video_fm|codec, has_audio|video
arpi
parents: 7526
diff changeset
587 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
588
2882
2fd108f6bc68 -aid fixed
arpi
parents: 2840
diff changeset
589 //demuxer=demux_open(stream,file_format,video_id,audio_id,dvdsub_id);
9006
d00997f12257 extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents: 9003
diff changeset
590 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
591 if(!demuxer){
15056
6f949cafe480 Errors that cause MEncoder to exit should be MSGL_FATAL, not MSGL_ERR.
diego
parents: 15055
diff changeset
592 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
593 mp_msg(MSGT_DEMUXER, MSGL_FATAL, MSGTR_CannotOpenDemuxer);
4743
171dcc22b607 using mencoder_exit instead exit and return
alex
parents: 4703
diff changeset
594 mencoder_exit(1,NULL);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
595 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
596
4367
c2be4fb65cee 3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents: 4365
diff changeset
597 d_audio=demuxer2 ? demuxer2->audio : demuxer->audio;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
598 d_video=demuxer->video;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
599 d_dvdsub=demuxer->sub;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
600 sh_audio=d_audio->sh;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
601 sh_video=d_video->sh;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
602
11513
552ddee604c9 workaround! exit if there's no video stream (hopefully it's a proper fix)
alex
parents: 11410
diff changeset
603 if(!sh_video)
552ddee604c9 workaround! exit if there's no video stream (hopefully it's a proper fix)
alex
parents: 11410
diff changeset
604 {
13122
fcce0023bf55 printf -> mp_msg conversion, first steps
diego
parents: 12835
diff changeset
605 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
606 mencoder_exit(1,NULL);
552ddee604c9 workaround! exit if there's no video stream (hopefully it's a proper fix)
alex
parents: 11410
diff changeset
607 }
552ddee604c9 workaround! exit if there's no video stream (hopefully it's a proper fix)
alex
parents: 11410
diff changeset
608
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
609 if(!video_read_properties(sh_video)){
15055
cec31d399b8a Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents: 15042
diff changeset
610 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_CannotReadVideoProperties);
4743
171dcc22b607 using mencoder_exit instead exit and return
alex
parents: 4703
diff changeset
611 mencoder_exit(1,NULL);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
612 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
613
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
614 mp_msg(MSGT_MENCODER,MSGL_INFO,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n",
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
615 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
616 sh_video->fps,sh_video->frametime
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
617 );
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
618
8357
ea3c66c6665f fixed -fps with mencoder and fixed-rate files (avi etc)
arpi
parents: 8355
diff changeset
619 if(force_fps){
ea3c66c6665f fixed -fps with mencoder and fixed-rate files (avi etc)
arpi
parents: 8355
diff changeset
620 sh_video->fps=force_fps;
ea3c66c6665f fixed -fps with mencoder and fixed-rate files (avi etc)
arpi
parents: 8355
diff changeset
621 sh_video->frametime=1.0f/sh_video->fps;
13122
fcce0023bf55 printf -> mp_msg conversion, first steps
diego
parents: 12835
diff changeset
622 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
623 }
ea3c66c6665f fixed -fps with mencoder and fixed-rate files (avi etc)
arpi
parents: 8355
diff changeset
624
6923
60374fa581fc no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents: 6871
diff changeset
625 if(sh_audio && out_audio_codec<0){
8796
7785c0cf0492 -nosound warning
arpi
parents: 8731
diff changeset
626 if(audio_id==-2)
13122
fcce0023bf55 printf -> mp_msg conversion, first steps
diego
parents: 12835
diff changeset
627 mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_DemuxerDoesntSupportNosound);
6947
ab1bf337d8b0 messages moved from mencoder.c to helpmp??.h
jaf
parents: 6946
diff changeset
628 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
629 mencoder_exit(1,NULL);
60374fa581fc no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents: 6871
diff changeset
630 }
60374fa581fc no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents: 6871
diff changeset
631 if(sh_video && out_video_codec<0){
6947
ab1bf337d8b0 messages moved from mencoder.c to helpmp??.h
jaf
parents: 6946
diff changeset
632 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
633 mencoder_exit(1,NULL);
60374fa581fc no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents: 6871
diff changeset
634 }
60374fa581fc no default oac/ovc (it just confuses users), more detailed -oac/-ovc help
arpi
parents: 6871
diff changeset
635
14944
7e7b077b7a50 Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents: 14941
diff changeset
636 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
637 // 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
638 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
639 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
640 sh_audio=d_audio->sh=NULL; // failed to init :(
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
641 }
7502
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7497
diff changeset
642 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
643 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
644
14944
7e7b077b7a50 Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents: 14941
diff changeset
645 if (sh_audio) {
7e7b077b7a50 Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents: 14941
diff changeset
646 new_srate = sh_audio->samplerate;
7e7b077b7a50 Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents: 14941
diff changeset
647 if (playback_speed != 1.0) {
7e7b077b7a50 Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents: 14941
diff changeset
648 new_srate *= playback_speed;
7e7b077b7a50 Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents: 14941
diff changeset
649 // 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
650 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
651 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
652 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
653 }
7e7b077b7a50 Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents: 14941
diff changeset
654 }
7e7b077b7a50 Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents: 14941
diff changeset
655
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
656 #ifdef USE_SUB
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
657 // after reading video params we should load subtitles because
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
658 // we know fps so now we can adjust subtitles time to ~6 seconds AST
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
659 // check .sub
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
660 // current_module="read_subtitles_file";
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
661 if(sub_name && sub_name[0]){
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
662 subdata=sub_read_file(sub_name[0], sh_video->fps);
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
663 if(!subdata) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name[0]);
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
664 } else
18232
6ce77dda13a5 Remove support for default.sub.
diego
parents: 18002
diff changeset
665 if(sub_auto && filename) { // auto load sub file ...
15603
2d1ad16b6021 strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents: 15565
diff changeset
666 char **tmp = NULL;
2d1ad16b6021 strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents: 15565
diff changeset
667 int i = 0;
18232
6ce77dda13a5 Remove support for default.sub.
diego
parents: 18002
diff changeset
668 char *psub = get_path( "sub/" );
6ce77dda13a5 Remove support for default.sub.
diego
parents: 18002
diff changeset
669 tmp = sub_filenames((psub ? psub : ""), filename);
6ce77dda13a5 Remove support for default.sub.
diego
parents: 18002
diff changeset
670 free(psub);
6ce77dda13a5 Remove support for default.sub.
diego
parents: 18002
diff changeset
671 subdata=sub_read_file(tmp[0], sh_video->fps);
6ce77dda13a5 Remove support for default.sub.
diego
parents: 18002
diff changeset
672 while (tmp[i])
15603
2d1ad16b6021 strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents: 15565
diff changeset
673 free(tmp[i++]);
2d1ad16b6021 strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents: 15565
diff changeset
674 free(tmp);
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
675 }
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
676 #endif
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
677
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
678 // set up video encoder:
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
679
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
680 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
681 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
682 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
683 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
684 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
685 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
686 vobsub_out_id?vobsub_out_id:(char *)tmp, vobsub_out_index);
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
687 #ifdef USE_DVDREAD
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
688 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
689 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
690 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
691 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
692 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
693 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
694 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
695 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
696 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
697 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
698 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
699 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
700 }
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
701 }
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
702 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
703 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
704 }
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
705 #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
706 }
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
707 else {
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5386
diff changeset
708 if (spudec_ifo) {
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5386
diff changeset
709 unsigned int palette[16], width, height;
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6590
diff changeset
710 if (vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, -1, NULL) >= 0)
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5386
diff changeset
711 vo_spudec=spudec_new_scaled(palette, sh_video->disp_w, sh_video->disp_h);
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5386
diff changeset
712 }
5392
d7c586ebbacf Fix bug noticed by Hajba Szilard in message <20020329151644.A23301@revai.hu>
kmkaplan
parents: 5390
diff changeset
713 #ifdef USE_DVDREAD
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5386
diff changeset
714 if (vo_spudec==NULL) {
4557
1fac3562fda5 fix spudec, faszom (C#)
pontscho
parents: 4494
diff changeset
715 vo_spudec=spudec_new_scaled(stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL,
4088
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
716 sh_video->disp_w, sh_video->disp_h);
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5386
diff changeset
717 }
4088
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
718 #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
719 }
4088
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
720
11573
b293b4eb2c8c Forced subs support for mencoder
attila
parents: 11550
diff changeset
721 // Apply current settings for forced subs
b293b4eb2c8c Forced subs support for mencoder
attila
parents: 11550
diff changeset
722 spudec_set_forced_subs_only(vo_spudec,forced_subs_only);
5669
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
723
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
724 // set up output file:
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
725 muxer_f=fopen(out_filename,"wb");
2887
bc648c6a464a fixes a segfault if file specified in -o can't be accessed
pl
parents: 2884
diff changeset
726 if(!muxer_f) {
15055
cec31d399b8a Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents: 15042
diff changeset
727 mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_CannotOpenOutputFile, out_filename);
4743
171dcc22b607 using mencoder_exit instead exit and return
alex
parents: 4703
diff changeset
728 mencoder_exit(1,NULL);
2887
bc648c6a464a fixes a segfault if file specified in -o can't be accessed
pl
parents: 2884
diff changeset
729 }
bc648c6a464a fixes a segfault if file specified in -o can't be accessed
pl
parents: 2884
diff changeset
730
9014
c671e9adbe22 Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
arpi
parents: 9006
diff changeset
731 muxer=muxer_new_muxer(out_file_format,muxer_f);
17078
9c94272f5eb7 fatal error when muxer cannot initialize
rfelker
parents: 17065
diff changeset
732 if(!muxer) {
9c94272f5eb7 fatal error when muxer cannot initialize
rfelker
parents: 17065
diff changeset
733 mp_msg(MSGT_MENCODER, MSGL_FATAL, "Cannot initialize muxer.");
9c94272f5eb7 fatal error when muxer cannot initialize
rfelker
parents: 17065
diff changeset
734 mencoder_exit(1,NULL);
9c94272f5eb7 fatal error when muxer cannot initialize
rfelker
parents: 17065
diff changeset
735 }
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
736 #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
737 //disabled: it horrybly distorts filtered sound
17590
2fd66535616a muxer_mpeg MUST be used with audio_preload=0
nicodvb
parents: 17569
diff changeset
738 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
739 #endif
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
740
17648
5963b50c2178 dwStart support for mencoder.
corey
parents: 17647
diff changeset
741 muxer->audio_delay_fix = audio_delay_fix;
5963b50c2178 dwStart support for mencoder.
corey
parents: 17647
diff changeset
742
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
743 // ============= VIDEO ===============
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
744
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8517
diff changeset
745 mux_v=muxer_new_stream(muxer,MUXER_TYPE_VIDEO);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
746
4575
0245a06f9efd VfW encoding support (very alpha yet)
arpi
parents: 4557
diff changeset
747 mux_v->buffer_size=0x200000; // 2MB
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
748 mux_v->buffer=malloc(mux_v->buffer_size);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
749
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
750 mux_v->source=sh_video;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
751
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
752 mux_v->h.dwSampleSize=0; // VBR
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
753 #ifdef USE_LIBAVCODEC
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
754 {
14944
7e7b077b7a50 Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents: 14941
diff changeset
755 AVRational q= av_d2q(force_ofps?force_ofps:sh_video->fps*playback_speed, 30000);
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
756 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
757 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
758 }
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
759 #else
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
760 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
761 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
762 #endif
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
763
2661
11f4c2b2b70f -oac/-ovc (fake:))
arpi
parents: 2655
diff changeset
764 mux_v->codec=out_video_codec;
2574
arpi
parents: 2571
diff changeset
765
5553
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
766 mux_v->bih=NULL;
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
767 }
5553
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
768 sh_video->codec=NULL;
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
769 sh_video->video_out=NULL;
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
770 sh_video->vfilter=NULL; // fixme!
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
771
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
772 switch(mux_v->codec){
3384
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
773 case VCODEC_COPY:
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
774 if (!curfile) {
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
775 if (sh_video->bih) {
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
776 mux_v->bih=malloc(sh_video->bih->biSize);
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
777 memcpy(mux_v->bih, sh_video->bih, sh_video->bih->biSize);
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
778 }
3384
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
779 else
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
780 {
12546
7f8ae1376d6c We don't want junk in unused parts of the BITMAPINFOHEADER
ranma
parents: 12490
diff changeset
781 mux_v->bih=calloc(1,sizeof(BITMAPINFOHEADER));
3384
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
782 mux_v->bih->biSize=sizeof(BITMAPINFOHEADER);
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
783 mux_v->bih->biWidth=sh_video->disp_w;
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
784 mux_v->bih->biHeight=sh_video->disp_h;
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
785 mux_v->bih->biCompression=sh_video->format;
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
786 mux_v->bih->biPlanes=1;
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
787 mux_v->bih->biBitCount=24; // FIXME!!!
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
788 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
789 }
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
790 }
15055
cec31d399b8a Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents: 15042
diff changeset
791 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_VCodecFramecopy,
3384
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
792 mux_v->bih->biWidth, mux_v->bih->biHeight,
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
793 mux_v->bih->biBitCount, mux_v->bih->biCompression);
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
794
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
795 if (curfile) {
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
796 if (sh_video->bih) {
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
797 if ((mux_v->bih->biSize != sh_video->bih->biSize) ||
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
798 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
799 {
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
800 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_VCodecFramecopy,
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
801 sh_video->bih->biWidth, sh_video->bih->biHeight,
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
802 sh_video->bih->biBitCount, sh_video->bih->biCompression);
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
803 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_FrameCopyFileMismatch);
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
804 mencoder_exit(1,NULL);
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
805 }
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
806 }
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
807 else {
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
808 if ((mux_v->bih->biWidth != sh_video->disp_w) ||
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
809 (mux_v->bih->biHeight != sh_video->disp_h) ||
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
810 (mux_v->bih->biCompression != sh_video->format)) {
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
811 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_VCodecFramecopy,
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
812 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
813 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_FrameCopyFileMismatch);
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
814 mencoder_exit(1,NULL);
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
815 }
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
816 }
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
817 }
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
818 break;
3361
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
819 case VCODEC_FRAMENO:
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
820 if (!curfile) {
12546
7f8ae1376d6c We don't want junk in unused parts of the BITMAPINFOHEADER
ranma
parents: 12490
diff changeset
821 mux_v->bih=calloc(1,sizeof(BITMAPINFOHEADER));
3361
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
822 mux_v->bih->biSize=sizeof(BITMAPINFOHEADER);
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
823 mux_v->bih->biWidth=sh_video->disp_w;
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
824 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
825 mux_v->bih->biPlanes=1;
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
826 mux_v->bih->biBitCount=24;
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
827 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
828 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
829 }
3361
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
830 break;
14878
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14845
diff changeset
831 default: {
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14845
diff changeset
832 static vf_instance_t * ve = NULL;
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14845
diff changeset
833 if (!ve) {
5553
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
834 switch(mux_v->codec){
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
835 case VCODEC_LIBAVCODEC:
6581
896c062e85ec clean up warnings in mencoder.
rfelker
parents: 6534
diff changeset
836 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
837 case VCODEC_RAW:
b58fdd5d8e8d remove raw nonsense and replace it by one ovc
attila
parents: 11946
diff changeset
838 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
839 case VCODEC_VFW:
6581
896c062e85ec clean up warnings in mencoder.
rfelker
parents: 6534
diff changeset
840 sh_video->vfilter=vf_open_encoder(NULL,"vfw",(char *)mux_v); break;
5578
acfcb903b778 -ovc libdv support
arpi
parents: 5572
diff changeset
841 case VCODEC_LIBDV:
6581
896c062e85ec clean up warnings in mencoder.
rfelker
parents: 6534
diff changeset
842 sh_video->vfilter=vf_open_encoder(NULL,"libdv",(char *)mux_v); break;
7457
c65cb0d256c3 Support for XviD encoding
kmkaplan
parents: 7451
diff changeset
843 case VCODEC_XVID:
c65cb0d256c3 Support for XviD encoding
kmkaplan
parents: 7451
diff changeset
844 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
845 case VCODEC_QTVIDEO:
0b7839c27be9 Sorenson 1/3 encoding just for fun :)
arpi
parents: 8467
diff changeset
846 sh_video->vfilter=vf_open_encoder(NULL,"qtvideo",(char *)mux_v); break;
9520
2860f7c9d9ca A new nuppel video encoder. Mainly for RT encoding on slow box.
albeu
parents: 9380
diff changeset
847 case VCODEC_NUV:
2860f7c9d9ca A new nuppel video encoder. Mainly for RT encoding on slow box.
albeu
parents: 9380
diff changeset
848 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
849 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
850 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
851 }
5553
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
852 if(!mux_v->bih || !sh_video->vfilter){
6947
ab1bf337d8b0 messages moved from mencoder.c to helpmp??.h
jaf
parents: 6946
diff changeset
853 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
854 mencoder_exit(1,NULL);
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
855 }
14878
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14845
diff changeset
856 ve = sh_video->vfilter;
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14845
diff changeset
857 } else sh_video->vfilter = ve;
5669
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
858 // append 'expand' filter, it fixes stride problems and renders osd:
9595
6bf482d797b1 1000L i forgot mencoder
albeu
parents: 9564
diff changeset
859 if (auto_expand) {
6bf482d797b1 1000L i forgot mencoder
albeu
parents: 9564
diff changeset
860 char* vf_args[] = { "osd", "1", NULL };
6bf482d797b1 1000L i forgot mencoder
albeu
parents: 9564
diff changeset
861 sh_video->vfilter=vf_open_filter(sh_video->vfilter,"expand",vf_args);
6bf482d797b1 1000L i forgot mencoder
albeu
parents: 9564
diff changeset
862 }
5553
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
863 sh_video->vfilter=append_filters(sh_video->vfilter);
3377
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
864
7502
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7497
diff changeset
865 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
866 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
867 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7497
diff changeset
868 if(!sh_video->inited) mencoder_exit(1,NULL);
14878
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14845
diff changeset
869 }
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
870 }
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
871
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
872 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
873 /* 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
874 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
875 {
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
876 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
877 force_fourcc[2], force_fourcc[3]);
15055
cec31d399b8a Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents: 15042
diff changeset
878 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
879 mux_v->bih->biCompression, (char *)&mux_v->bih->biCompression);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
880 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
881
17654
16633b9c0953 New option: -ignore-start
corey
parents: 17648
diff changeset
882 if (! ignore_start)
17648
5963b50c2178 dwStart support for mencoder.
corey
parents: 17647
diff changeset
883 muxer->audio_delay_fix -= sh_video->stream_delay;
5963b50c2178 dwStart support for mencoder.
corey
parents: 17647
diff changeset
884
8030
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
885 //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
886
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
887 // ============= AUDIO ===============
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
888 if(sh_audio){
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
889
15888
da752f91c5f2 Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents: 15831
diff changeset
890 if (force_audiofmttag != -1) {
da752f91c5f2 Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents: 15831
diff changeset
891 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
892 if (sh_audio->wf) {
da752f91c5f2 Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents: 15831
diff changeset
893 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
894 }
da752f91c5f2 Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents: 15831
diff changeset
895 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
896 force_audiofmttag);
da752f91c5f2 Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents: 15831
diff changeset
897 }
da752f91c5f2 Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents: 15831
diff changeset
898
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8517
diff changeset
899 mux_a=muxer_new_stream(muxer,MUXER_TYPE_AUDIO);
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
900
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
901 mux_a->buffer_size=0x100000; //16384;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
902 mux_a->buffer=malloc(mux_a->buffer_size);
11974
9134c957116a write out extraheaders from lavc
alex
parents: 11966
diff changeset
903 if (!mux_a->buffer)
13122
fcce0023bf55 printf -> mp_msg conversion, first steps
diego
parents: 12835
diff changeset
904 mencoder_exit(1,MSGTR_MemAllocFailed);
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
905
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
906 mux_a->source=sh_audio;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
907
2661
11f4c2b2b70f -oac/-ovc (fake:))
arpi
parents: 2655
diff changeset
908 mux_a->codec=out_audio_codec;
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
909
15811
9b4bbb6098f6 make -srate work again, unify audio filter init and preinit.
reimar
parents: 15603
diff changeset
910 ao_data.samplerate = force_srate;
9b4bbb6098f6 make -srate work again, unify audio filter init and preinit.
reimar
parents: 15603
diff changeset
911 ao_data.channels = 0;
9b4bbb6098f6 make -srate work again, unify audio filter init and preinit.
reimar
parents: 15603
diff changeset
912 ao_data.format = audio_output_format;
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
913 if(!preinit_audio_filters(sh_audio,
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
914 // 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
915 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
916 sh_audio->channels, sh_audio->sample_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
917 // 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
918 &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
919 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
920 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
921 }
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
922
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
923 aparams.channels = ao_data.channels;
15811
9b4bbb6098f6 make -srate work again, unify audio filter init and preinit.
reimar
parents: 15603
diff changeset
924 aparams.sample_rate = ao_data.samplerate;
15234
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
925 aparams.audio_preload = 1000 * audio_preload;
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
926 if(mux_a->codec != ACODEC_COPY) {
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
927 aencoder = new_audio_encoder(mux_a, &aparams);
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
928 if(!aencoder)
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
929 mencoder_exit(1, NULL);
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
930 if(!init_audio_filters(sh_audio,
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
931 new_srate, sh_audio->channels, sh_audio->sample_format,
15811
9b4bbb6098f6 make -srate work again, unify audio filter init and preinit.
reimar
parents: 15603
diff changeset
932 &aparams.sample_rate, &aparams.channels, &aencoder->input_format,
15234
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
933 aencoder->min_buffer_size, aencoder->max_buffer_size)) {
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
934 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_NoMatchingFilter);
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
935 mencoder_exit(1,NULL);
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
936 }
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
937 }
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
938 switch(mux_a->codec){
3385
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
939 case ACODEC_COPY:
14944
7e7b077b7a50 Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents: 14941
diff changeset
940 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
941 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
942 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
943 mencoder_exit(1,NULL);
da752f91c5f2 Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
ranma
parents: 15831
diff changeset
944 }
4369
b768f17c6d36 audio copy fix
arpi
parents: 4368
diff changeset
945 if (sh_audio->wf){
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
946 mux_a->wf=malloc(sizeof(WAVEFORMATEX) + sh_audio->wf->cbSize);
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
947 memcpy(mux_a->wf, sh_audio->wf, sizeof(WAVEFORMATEX) + sh_audio->wf->cbSize);
4370
18f73fb0380e more audiocopy fixes (especially for .asf)
arpi
parents: 4369
diff changeset
948 if(!sh_audio->i_bps) sh_audio->i_bps=mux_a->wf->nAvgBytesPerSec;
4369
b768f17c6d36 audio copy fix
arpi
parents: 4368
diff changeset
949 } else {
3385
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
950 mux_a->wf = malloc(sizeof(WAVEFORMATEX));
4370
18f73fb0380e more audiocopy fixes (especially for .asf)
arpi
parents: 4369
diff changeset
951 mux_a->wf->nBlockAlign = 1; //mux_a->h.dwSampleSize;
7643
55f894f3e09d reversed Anders' nonsense change
arpi
parents: 7614
diff changeset
952 mux_a->wf->wFormatTag = sh_audio->format;
3385
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
953 mux_a->wf->nChannels = sh_audio->channels;
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
954 mux_a->wf->nSamplesPerSec = sh_audio->samplerate;
4369
b768f17c6d36 audio copy fix
arpi
parents: 4368
diff changeset
955 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
956 mux_a->wf->wBitsPerSample = 16; // FIXME
3385
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
957 mux_a->wf->cbSize=0; // FIXME for l3codeca.acm
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
958 }
4370
18f73fb0380e more audiocopy fixes (especially for .asf)
arpi
parents: 4369
diff changeset
959 if(sh_audio->audio.dwScale){
18f73fb0380e more audiocopy fixes (especially for .asf)
arpi
parents: 4369
diff changeset
960 mux_a->h.dwSampleSize=sh_audio->audio.dwSampleSize;
18f73fb0380e more audiocopy fixes (especially for .asf)
arpi
parents: 4369
diff changeset
961 mux_a->h.dwScale=sh_audio->audio.dwScale;
18f73fb0380e more audiocopy fixes (especially for .asf)
arpi
parents: 4369
diff changeset
962 mux_a->h.dwRate=sh_audio->audio.dwRate;
18f73fb0380e more audiocopy fixes (especially for .asf)
arpi
parents: 4369
diff changeset
963 } else {
18f73fb0380e more audiocopy fixes (especially for .asf)
arpi
parents: 4369
diff changeset
964 mux_a->h.dwSampleSize=mux_a->wf->nBlockAlign;
18f73fb0380e more audiocopy fixes (especially for .asf)
arpi
parents: 4369
diff changeset
965 mux_a->h.dwScale=mux_a->h.dwSampleSize;
18f73fb0380e more audiocopy fixes (especially for .asf)
arpi
parents: 4369
diff changeset
966 mux_a->h.dwRate=mux_a->wf->nAvgBytesPerSec;
18f73fb0380e more audiocopy fixes (especially for .asf)
arpi
parents: 4369
diff changeset
967 }
14944
7e7b077b7a50 Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents: 14941
diff changeset
968 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
969 mux_a->wf->nSamplesPerSec *= playback_speed;
15055
cec31d399b8a Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents: 15042
diff changeset
970 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy,
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17312
diff changeset
971 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
972 mux_a->wf->wBitsPerSample, mux_a->wf->nAvgBytesPerSec, mux_a->h.dwSampleSize);
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
973 break;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
974 }
6861
79f54159ca15 audio preload/density/delay configurable
arpi
parents: 6784
diff changeset
975
17977
f70772d02eaa Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents: 17932
diff changeset
976 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
977
17654
16633b9c0953 New option: -ignore-start
corey
parents: 17648
diff changeset
978 if (! ignore_start)
17648
5963b50c2178 dwStart support for mencoder.
corey
parents: 17647
diff changeset
979 muxer->audio_delay_fix += sh_audio->stream_delay;
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
980
6861
79f54159ca15 audio preload/density/delay configurable
arpi
parents: 6784
diff changeset
981 } // if(sh_audio)
6530
f8d544dd22e9 mono mp3 encoding support by Paul Ortyl <ortylp at 3miasto.net>
alex
parents: 6419
diff changeset
982
5553
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
983 decoded_frameno=0;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
984
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
985 signal(SIGINT,exit_sighandler); // Interrupt from keyboard
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
986 signal(SIGQUIT,exit_sighandler); // Quit from keyboard
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
987 signal(SIGTERM,exit_sighandler); // kill
16002
433234c2a4aa catch HUP and PIPE signals aswell. Patch by Sergey Khlutchin (@gmail.com)
alex
parents: 15997
diff changeset
988 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
989 signal(SIGPIPE,exit_sighandler); // broken pipe
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
990
4387
df705351885a ETA/Esize/fps and some more... - new statusline
arpi
parents: 4378
diff changeset
991 timer_start=GetTimerMS();
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
992 } // 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
993 else {
16756
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
994 if (!mux_a != !sh_audio) {
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
995 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
996 mencoder_exit(1,NULL);
15234
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
997 }
16756
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
998 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
999 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
1000 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy,
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17312
diff changeset
1001 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
1002 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
1003 if (sh_audio->wf) {
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1004 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
1005 (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
1006 (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
1007 {
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1008 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy,
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17312
diff changeset
1009 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
1010 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
1011 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
1012 mencoder_exit(1,NULL);
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1013 }
16756
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1014 } else {
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1015 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
1016 (mux_a->wf->nChannels != sh_audio->channels) ||
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1017 (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
1018 {
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1019 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy,
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17312
diff changeset
1020 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
1021 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
1022 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
1023 mencoder_exit(1,NULL);
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1024 }
16756
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1025 }
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1026 } else if (sh_audio) {
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1027 int out_srate = mux_a->wf->nSamplesPerSec;
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1028 int out_channels = mux_a->wf->nChannels;
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1029 int out_format = aencoder->input_format;
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1030 int out_minsize = aencoder->min_buffer_size;
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1031 int out_maxsize = aencoder->max_buffer_size;
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1032 if (!init_audio_filters(sh_audio, new_srate, sh_audio->channels,
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1033 sh_audio->sample_format, &out_srate, &out_channels,
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1034 &out_format, out_minsize, out_maxsize)) {
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1035 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
1036 mencoder_exit(1, NULL);
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1037 }
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1038 mux_a->wf->nSamplesPerSec = out_srate;
bede9bedd45a cosmetics. does not change functionality, but makes code easier to read
ods15
parents: 16753
diff changeset
1039 mux_a->wf->nChannels = out_channels;
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1040 }
16752
425863aab3df fix mencoder multi-file with some files having audio but others dont
ods15
parents: 16708
diff changeset
1041 }
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1042
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1043 parse_end_at();
4387
df705351885a ETA/Esize/fps and some more... - new statusline
arpi
parents: 4378
diff changeset
1044
4620
9ad42931f595 initial seeking (-ss) support in mencoder
rfelker
parents: 4575
diff changeset
1045 if (seek_to_sec) {
9ad42931f595 initial seeking (-ss) support in mencoder
rfelker
parents: 4575
diff changeset
1046 int a,b; float d;
9ad42931f595 initial seeking (-ss) support in mencoder
rfelker
parents: 4575
diff changeset
1047
9ad42931f595 initial seeking (-ss) support in mencoder
rfelker
parents: 4575
diff changeset
1048 if (sscanf(seek_to_sec, "%d:%d:%f", &a,&b,&d)==3)
9ad42931f595 initial seeking (-ss) support in mencoder
rfelker
parents: 4575
diff changeset
1049 d += 3600*a + 60*b;
9ad42931f595 initial seeking (-ss) support in mencoder
rfelker
parents: 4575
diff changeset
1050 else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2)
9ad42931f595 initial seeking (-ss) support in mencoder
rfelker
parents: 4575
diff changeset
1051 d += 60*a;
9ad42931f595 initial seeking (-ss) support in mencoder
rfelker
parents: 4575
diff changeset
1052 else
9ad42931f595 initial seeking (-ss) support in mencoder
rfelker
parents: 4575
diff changeset
1053 sscanf(seek_to_sec, "%f", &d);
9ad42931f595 initial seeking (-ss) support in mencoder
rfelker
parents: 4575
diff changeset
1054
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17590
diff changeset
1055 demux_seek(demuxer, d, audio_delay, 1);
7394
e5e2243a3adb reversed -ss behaviour (you have to use teh same -ss for all passes)
arpi
parents: 7370
diff changeset
1056 // 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
1057 // > 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
1058 // > 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
1059 // 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
1060 // if(demuxer2) demux_seek(demuxer2, d, audio_delay, 1);
4620
9ad42931f595 initial seeking (-ss) support in mencoder
rfelker
parents: 4575
diff changeset
1061 }
9ad42931f595 initial seeking (-ss) support in mencoder
rfelker
parents: 4575
diff changeset
1062
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8517
diff changeset
1063 if (out_file_format == MUXER_TYPE_MPEG)
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8517
diff changeset
1064 {
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8517
diff changeset
1065 if (audio_preload > 0.4) {
15055
cec31d399b8a Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents: 15042
diff changeset
1066 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
1067 audio_preload = 0.4;
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8517
diff changeset
1068 }
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8517
diff changeset
1069 if (audio_density < 4) {
15055
cec31d399b8a Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents: 15042
diff changeset
1070 mp_msg(MSGT_MENCODER, MSGL_WARN, MSGTR_IncreasingAudioDensity);
8731
1f303279c940 10l :-))
filon
parents: 8598
diff changeset
1071 audio_density = 4;
8585
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8517
diff changeset
1072 }
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8517
diff changeset
1073 }
27da710563c2 the long-waited MUXER layer, and new MPEG-PS muxer
arpi
parents: 8517
diff changeset
1074
9746
27fff718ede6 Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9725
diff changeset
1075 if(file_format == DEMUXER_TYPE_TV)
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1076 {
15055
cec31d399b8a Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents: 15042
diff changeset
1077 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
1078 audio_preload = 0.0;
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1079 default_max_pts_correction = 0;
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1080 }
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1081
6590
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6581
diff changeset
1082 play_n_frames=play_n_frames_mf;
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1083 if (curfile && end_at_type == END_AT_TIME) end_at += mux_v->timer;
6590
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6581
diff changeset
1084
14996
576b810a034d 100l to oded.. edl was causing the decoder to get a first broken packet
rfelker
parents: 14964
diff changeset
1085 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
1086 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
1087 edl_muted = 0;
576b810a034d 100l to oded.. edl was causing the decoder to get a first broken packet
rfelker
parents: 14964
diff changeset
1088 edl_seeking = 1;
14964
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1089 if (edl_filename) {
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1090 next_edl_record = edl_records = edl_parse_file();
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1091 }
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1092
15997
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1093 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
1094
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
1095 while(!at_eof){
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1096
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1097 int blit_frame=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1098 float a_pts=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1099 float v_pts=0;
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1100 int skip_flag=0; // 1=skip -1=duplicate
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1101
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1102 if((end_at_type == END_AT_SIZE && end_at <= ftello(muxer_f)) ||
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1103 (end_at_type == END_AT_TIME && end_at < mux_v->timer))
4159
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1104 break;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1105
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1106 if(play_n_frames>=0){
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1107 --play_n_frames;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1108 if(play_n_frames<0) break;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1109 }
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1110
14964
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1111 goto_redo_edl:
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1112 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
1113 if (next_edl_record->action == EDL_SKIP && edl_seeking) {
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1114 float last_pos = d_video->pts;
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1115 int result;
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1116 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
1117 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
1118
15993
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
1119 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
1120
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
1121 if (result == 2) { at_eof=1; break; } // EOF
14964
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1122 else if (result == 0) edl_seeking = 0; // no seeking
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1123 else { // sucess
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1124 edl_muted = 0;
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1125 if (last_pos >= sh_video->pts) {
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1126 // backwards seek detected!! Forget about this EDL skip altogether.
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1127 next_edl_record = next_edl_record->next;
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1128 }
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1129 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
1130 /* note the use of stop_sec,
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1131 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
1132 in the next loop it will jump out of it.
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1133 */
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1134 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
1135 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
1136 }
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1137
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1138 /* for a pedantic EDL, that doesn't show even a single
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1139 frame from the "censored" area, uncomment next line. */
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1140 goto goto_redo_edl;
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1141 }
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1142 } else if (next_edl_record->action == EDL_MUTE) {
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1143 edl_muted = !edl_muted; // This variable does nothing for now.
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1144 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
1145 next_edl_record=next_edl_record->next;
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1146 }
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1147 }
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1148
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1149
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1150 if(sh_audio){
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1151 // get audio:
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1152 while(mux_a->timer-audio_preload<mux_v->timer){
15234
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1153 float tottime;
2653
a863a97f3a1c WMP compatibility fixed
arpi
parents: 2643
diff changeset
1154 int len=0;
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1155
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1156 ptimer_start = GetTimerMS();
15234
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1157 // CBR - copy 0.5 sec of audio
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1158 // or until the end of video:
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1159 tottime = stop_time(demuxer, mux_v);
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1160 if (tottime != -1) {
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1161 tottime -= mux_a->timer;
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1162 if (tottime > 1./audio_density) tottime = 1./audio_density;
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1163 }
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1164 else tottime = 1./audio_density;
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1165
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
1166 // 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
1167 if (tottime <= 0) break;
11375
3544f1823f6b mencoder lavc audio encoding support
ranma
parents: 11222
diff changeset
1168
15234
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1169 if(aencoder)
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1170 {
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1171 if(mux_a->h.dwSampleSize) /* CBR */
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1172 {
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1173 if(aencoder->set_decoded_len)
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1174 {
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1175 len = mux_a->h.dwSampleSize*(int)(mux_a->h.dwRate*tottime);
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1176 aencoder->set_decoded_len(aencoder, len);
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1177 }
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1178 else
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1179 len = aencoder->decode_buffer_size;
11375
3544f1823f6b mencoder lavc audio encoding support
ranma
parents: 11222
diff changeset
1180
15234
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1181 len = dec_audio(sh_audio, aencoder->decode_buffer, len);
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1182 mux_a->buffer_len += aencoder->encode(aencoder, mux_a->buffer + mux_a->buffer_len,
17122
c23ca41ad996 more warning fixes
ods15
parents: 17121
diff changeset
1183 aencoder->decode_buffer, len, mux_a->buffer_size-mux_a->buffer_len);
15234
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1184 if(mux_a->buffer_len < mux_a->wf->nBlockAlign)
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1185 len = 0;
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1186 else
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1187 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
1188 }
15234
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1189 else /* VBR */
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1190 {
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1191 int sz = 0;
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1192 while(1)
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1193 {
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1194 len = 0;
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1195 if(! sz)
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1196 sz = aencoder->get_frame_size(aencoder);
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1197 if(sz > 0 && mux_a->buffer_len >= sz)
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1198 {
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1199 len = sz;
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1200 break;
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1201 }
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1202 len = dec_audio(sh_audio,aencoder->decode_buffer, aencoder->decode_buffer_size);
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1203 if(len <= 0)
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1204 {
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1205 len = 0;
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1206 break;
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1207 }
17122
c23ca41ad996 more warning fixes
ods15
parents: 17121
diff changeset
1208 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
1209 mux_a->buffer_len += len;
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1210 }
11375
3544f1823f6b mencoder lavc audio encoding support
ranma
parents: 11222
diff changeset
1211 }
3544f1823f6b mencoder lavc audio encoding support
ranma
parents: 11222
diff changeset
1212 if (mux_v->timer == 0) mux_a->h.dwInitialFrames++;
3544f1823f6b mencoder lavc audio encoding support
ranma
parents: 11222
diff changeset
1213 }
15234
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1214 else {
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1215 if(mux_a->h.dwSampleSize){
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1216 switch(mux_a->codec){
3385
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
1217 case ACODEC_COPY: // copy
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1218 len=mux_a->wf->nAvgBytesPerSec*tottime;
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1219 len/=mux_a->h.dwSampleSize;if(len<1) len=1;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1220 len*=mux_a->h.dwSampleSize;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1221 len=demux_read_data(sh_audio->ds,mux_a->buffer,len);
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1222 break;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1223 }
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1224 } else {
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1225 // VBR - encode/copy an audio frame
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1226 switch(mux_a->codec){
3385
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
1227 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
1228 len=ds_get_packet(sh_audio->ds,(unsigned char**) &mux_a->buffer);
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1229 break;
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1230 }
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1231 }
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1232 }
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1233 if(len<=0) break; // EOF?
17487
fa17424b4c7b change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
michael
parents: 17366
diff changeset
1234 muxer_write_chunk(mux_a,len,0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
2655
40fbed77bbb8 avg bps calc fixed
arpi
parents: 2653
diff changeset
1235 if(!mux_a->h.dwSampleSize && mux_a->timer>0)
3354
c68f5da1c61c Using CBR stream format for CBR mp3 audio
arpi
parents: 3323
diff changeset
1236 mux_a->wf->nAvgBytesPerSec=0.5f+(double)mux_a->size/mux_a->timer; // avg bps (VBR)
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1237 if(mux_a->buffer_len>=len){
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1238 mux_a->buffer_len-=len;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1239 memcpy(mux_a->buffer,mux_a->buffer+len,mux_a->buffer_len);
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1240 }
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1241
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1242
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1243 audiosamples++;
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1244 audiorate+= (GetTimerMS() - ptimer_start);
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1245
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1246 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1247 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1248
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1249 // get video frame!
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1250
15993
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
1251 if (!frame_data.already_read) {
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
1252 frame_data.in_size=video_read_frame(sh_video,&frame_data.frame_time,&frame_data.start,force_fps);
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
1253 sh_video->timer+=frame_data.frame_time;
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
1254 }
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
1255 frame_data.frame_time /= playback_speed;
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
1256 if(frame_data.in_size<0){ at_eof=1; break; }
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
1257 ++decoded_frameno;
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1258
15993
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
1259 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
1260
5553
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
1261 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
1262 // find our frame:
c2be4fb65cee 3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents: 4365
diff changeset
1263 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
1264 int* start;
c2be4fb65cee 3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents: 4365
diff changeset
1265 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
1266 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
1267 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
1268 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
1269 }
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
1270 if(at_eof) break;
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1271 // if(skip_flag) printf("!!!!!!!!!!!!\n");
4367
c2be4fb65cee 3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents: 4365
diff changeset
1272 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
1273 // find next frame:
c2be4fb65cee 3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents: 4365
diff changeset
1274 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
1275 int* start;
c2be4fb65cee 3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents: 4365
diff changeset
1276 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
1277 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
1278 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
1279 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
1280 }
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
1281 // 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
1282 // printf("Current fno=%d requested=%d skip=%d \n",decoded_frameno,fno,skip_flag);
c2be4fb65cee 3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents: 4365
diff changeset
1283 } else {
c2be4fb65cee 3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents: 4365
diff changeset
1284
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1285 // check frame duplicate/drop:
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1286
6721
1cd03b5da35d fix for interlaced (2 fields) mpeg2 streams:
arpi
parents: 6705
diff changeset
1287 //printf("\r### %5.3f ###\n",v_timer_corr);
17647
1b74cb09e9c1 deobfuscate some a/v sync code
ods15
parents: 17636
diff changeset
1288 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
1289
17647
1b74cb09e9c1 deobfuscate some a/v sync code
ods15
parents: 17636
diff changeset
1290 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
1291 v_timer_corr-=mux_frametime;
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1292 ++skip_flag; // skip
17647
1b74cb09e9c1 deobfuscate some a/v sync code
ods15
parents: 17636
diff changeset
1293 }
1b74cb09e9c1 deobfuscate some a/v sync code
ods15
parents: 17636
diff changeset
1294 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
1295 v_timer_corr+=mux_frametime;
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1296 --skip_flag; // dup
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1297 }
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1298
17647
1b74cb09e9c1 deobfuscate some a/v sync code
ods15
parents: 17636
diff changeset
1299 // 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
1300 // 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
1301
1b74cb09e9c1 deobfuscate some a/v sync code
ods15
parents: 17636
diff changeset
1302 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
1303 v_pts_corr+=mux_frametime;
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1304 --skip_flag; // dup
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1305 }
17647
1b74cb09e9c1 deobfuscate some a/v sync code
ods15
parents: 17636
diff changeset
1306 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
1307 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
1308 v_pts_corr-=mux_frametime;
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1309 ++skip_flag; // skip
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1310 }
17647
1b74cb09e9c1 deobfuscate some a/v sync code
ods15
parents: 17636
diff changeset
1311 }
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1312
4367
c2be4fb65cee 3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents: 4365
diff changeset
1313 } // demuxer2
c2be4fb65cee 3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents: 4365
diff changeset
1314
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1315 ptimer_start = GetTimerMS();
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1316
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1317 switch(mux_v->codec){
3384
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
1318 case VCODEC_COPY:
15993
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
1319 mux_v->buffer=frame_data.start;
17487
fa17424b4c7b change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
michael
parents: 17366
diff changeset
1320 if(skip_flag<=0) muxer_write_chunk(mux_v,frame_data.in_size,(sh_video->ds->flags&1)?0x10:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
2574
arpi
parents: 2571
diff changeset
1321 break;
5553
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
1322 case VCODEC_FRAMENO:
6581
896c062e85ec clean up warnings in mencoder.
rfelker
parents: 6534
diff changeset
1323 mux_v->buffer=(unsigned char *)&decoded_frameno; // tricky
17487
fa17424b4c7b change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
michael
parents: 17366
diff changeset
1324 if(skip_flag<=0) muxer_write_chunk(mux_v,sizeof(int),0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
4575
0245a06f9efd VfW encoding support (very alpha yet)
arpi
parents: 4557
diff changeset
1325 break;
5553
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
1326 default:
38697931adf4 video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents: 5546
diff changeset
1327 // decode_video will callback down to ve_*.c encoders, through the video filters
15993
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
1328 blit_frame=decode_video(sh_video,frame_data.start,frame_data.in_size,
18417
31e8947b7b87 Temporary workaround for libavcodec issues with B-frames
rtognimp
parents: 18335
diff changeset
1329 skip_flag>0 && (!sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE), MP_NOPTS_VALUE);
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1330
14878
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14845
diff changeset
1331 if (sh_video->vf_inited < 0) mencoder_exit(1, NULL);
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1332
7370
8e07aeda7344 count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
arpi
parents: 7331
diff changeset
1333 if(!blit_frame){
15895
7742302e793d Do not count skipped/broken frames when using -frames
reimar
parents: 15888
diff changeset
1334 if (play_n_frames >= 0)
7742302e793d Do not count skipped/broken frames when using -frames
reimar
parents: 15888
diff changeset
1335 play_n_frames++;
7370
8e07aeda7344 count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
arpi
parents: 7331
diff changeset
1336 badframes++;
8e07aeda7344 count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
arpi
parents: 7331
diff changeset
1337 if(skip_flag<=0){
6721
1cd03b5da35d fix for interlaced (2 fields) mpeg2 streams:
arpi
parents: 6705
diff changeset
1338 // 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
1339 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
1340 #if 0
16836
a5ff3d90f16d comment on -noskip patch
rfelker
parents: 16829
diff changeset
1341 // Old code apparently made under the assumption that !blit_frame means
a5ff3d90f16d comment on -noskip patch
rfelker
parents: 16829
diff changeset
1342 // decoding failed due to corruption or something.. but duplication and
a5ff3d90f16d comment on -noskip patch
rfelker
parents: 16829
diff changeset
1343 // skipping of frames should be entirely disabled when skip_limit==0,
a5ff3d90f16d comment on -noskip patch
rfelker
parents: 16829
diff changeset
1344 // and must be in order for many filters to work with -noskip.
a5ff3d90f16d comment on -noskip patch
rfelker
parents: 16829
diff changeset
1345 // Eventually this entire block should probably be removed.
6721
1cd03b5da35d fix for interlaced (2 fields) mpeg2 streams:
arpi
parents: 6705
diff changeset
1346 if(skip_limit==0){
1cd03b5da35d fix for interlaced (2 fields) mpeg2 streams:
arpi
parents: 6705
diff changeset
1347 // skipping not allowed -> write empty frame:
12490
09c30d0d0d55 1000l....of pepsi :(broke -ovc copy!)
rfelker
parents: 12489
diff changeset
1348 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
1349 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
1350 } else {
1cd03b5da35d fix for interlaced (2 fields) mpeg2 streams:
arpi
parents: 6705
diff changeset
1351 // skipping allowed -> skip it and distriubute timer error:
1cd03b5da35d fix for interlaced (2 fields) mpeg2 streams:
arpi
parents: 6705
diff changeset
1352 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
1353 }
16829
c1aabebbe2e7 honor decoder's/filter's decision to remove frames when using -noskip.
rfelker
parents: 16828
diff changeset
1354 #endif
7370
8e07aeda7344 count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
arpi
parents: 7331
diff changeset
1355 }
6721
1cd03b5da35d fix for interlaced (2 fields) mpeg2 streams:
arpi
parents: 6705
diff changeset
1356 }
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1357 }
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1358
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1359 videosamples++;
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1360 videorate+=(GetTimerMS() - ptimer_start);
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1361
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1362 if(skip_flag<0){
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1363 // duplicate frame
14813
39f93fbc52dc do not hide frame skips/dups! if they happen it's very bad!!
rfelker
parents: 14808
diff changeset
1364 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
1365 while(skip_flag<0){
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1366 duplicatedframes++;
12490
09c30d0d0d55 1000l....of pepsi :(broke -ovc copy!)
rfelker
parents: 12489
diff changeset
1367 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
1368 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
1369 ++skip_flag;
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1370 }
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
1371 } else
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
1372 if(skip_flag>0){
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1373 // skip frame
14813
39f93fbc52dc do not hide frame skips/dups! if they happen it's very bad!!
rfelker
parents: 14808
diff changeset
1374 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
1375 skippedframes++;
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1376 --skip_flag;
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1377 }
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1378
4367
c2be4fb65cee 3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents: 4365
diff changeset
1379 if(sh_audio && !demuxer2){
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1380 float AV_delay,x;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1381 // A-V sync!
8030
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
1382 #if 0
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1383 if(pts_from_bps){
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1384 unsigned int samples=(sh_audio->audio.dwSampleSize)?
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1385 ((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
1386 (d_audio->block_no); // <- used for VBR audio
4378
9cf9516e74cb debug printfs... - 10l
arpi
parents: 4377
diff changeset
1387 // printf("samples=%d \n",samples);
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1388 a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1389 delay_corrected=1;
8030
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
1390 } else
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
1391 #endif
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
1392 {
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1393 // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec)
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1394 a_pts=d_audio->pts;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1395 if(!delay_corrected) if(a_pts) delay_corrected=1;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1396 //printf("*** %5.3f ***\n",a_pts);
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1397 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1398 }
8966
arpi
parents: 8925
diff changeset
1399 v_pts=sh_video ? sh_video->pts : d_video->pts;
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1400 // 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
1401 AV_delay=(a_pts-v_pts);
15997
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1402 AV_delay-=audio_delay;
14944
7e7b077b7a50 Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents: 14941
diff changeset
1403 AV_delay /= playback_speed;
7e7b077b7a50 Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents: 14941
diff changeset
1404 AV_delay-=mux_a->timer-(mux_v->timer-(v_timer_corr+v_pts_corr));
17659
92ac78a93625 Fix video delay when encoding with B-frames.
corey
parents: 17654
diff changeset
1405 // adjust for encoder delays
92ac78a93625 Fix video delay when encoding with B-frames.
corey
parents: 17654
diff changeset
1406 AV_delay -= (float) mux_a->encoder_delay * mux_a->h.dwScale/mux_a->h.dwRate;
92ac78a93625 Fix video delay when encoding with B-frames.
corey
parents: 17654
diff changeset
1407 AV_delay += (float) mux_v->encoder_delay * mux_v->h.dwScale/mux_v->h.dwRate;
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1408 // compensate input video timer by av:
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1409 x=AV_delay*0.1f;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1410 if(x<-max_pts_correction) x=-max_pts_correction; else
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1411 if(x> max_pts_correction) x= max_pts_correction;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1412 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
1413 max_pts_correction=default_max_pts_correction*playback_speed;
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1414 else
14944
7e7b077b7a50 Oded's patch for -speed in mencoder. This can be used for purposes
rfelker
parents: 14941
diff changeset
1415 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
1416 // sh_video->timer-=x;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1417 c_total+=x;
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1418 v_pts_corr+=x;
4387
df705351885a ETA/Esize/fps and some more... - new statusline
arpi
parents: 4378
diff changeset
1419 }
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1420
4387
df705351885a ETA/Esize/fps and some more... - new statusline
arpi
parents: 4378
diff changeset
1421 // printf("A:%6.1f V:%6.1f A-V:%7.3f oAV:%7.3f diff:%7.3f ct:%7.3f vpc:%7.3f \r",
df705351885a ETA/Esize/fps and some more... - new statusline
arpi
parents: 4378
diff changeset
1422 // a_pts,v_pts,a_pts-v_pts,
df705351885a ETA/Esize/fps and some more... - new statusline
arpi
parents: 4378
diff changeset
1423 // (float)(mux_a->timer-mux_v->timer),
df705351885a ETA/Esize/fps and some more... - new statusline
arpi
parents: 4378
diff changeset
1424 // AV_delay, c_total, v_pts_corr );
df705351885a ETA/Esize/fps and some more... - new statusline
arpi
parents: 4378
diff changeset
1425 // printf("V:%6.1f \r", d_video->pts );
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1426
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1427 #if 0
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1428 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A:%6.1f V:%6.1f A-V:%7.3f ct:%7.3f %3d/%3d %2d%% %2d%% %4.1f%% %d%%\r",
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1429 a_pts,v_pts,a_pts-v_pts,c_total,
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1430 (int)sh_video->num_frames,(int)sh_video->num_frames_decoded,
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1431 (sh_video->timer>0.5)?(int)(100.0*video_time_usage/(double)sh_video->timer):0,
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1432 (sh_video->timer>0.5)?(int)(100.0*vout_time_usage/(double)sh_video->timer):0,
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1433 (sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1434 ,cache_fill_status
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1435 );
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1436 #endif
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1437
4387
df705351885a ETA/Esize/fps and some more... - new statusline
arpi
parents: 4378
diff changeset
1438 { float t=(GetTimerMS()-timer_start)*0.001f;
df705351885a ETA/Esize/fps and some more... - new statusline
arpi
parents: 4378
diff changeset
1439 float len=(demuxer->movi_end-demuxer->movi_start);
16875
4951a3abcd1a Provide percentage even when demuxer->movi_start and movi_end are not available
reimar
parents: 16836
diff changeset
1440 float p=len>1000 ? (float)(demuxer->filepos-demuxer->movi_start) / len :
4951a3abcd1a Provide percentage even when demuxer->movi_start and movi_end are not available
reimar
parents: 16836
diff changeset
1441 (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
1442 #if 0
4393
177e31fc74eb ETA/Esize for 3pass encoding from stdin
arpi
parents: 4392
diff changeset
1443 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
1444 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
1445 / (float)(sh_audio->audio.dwLength);
177e31fc74eb ETA/Esize for 3pass encoding from stdin
arpi
parents: 4392
diff changeset
1446 }
8030
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
1447 #endif
4392
b50b2b0c65ea status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents: 4388
diff changeset
1448 #if 0
b50b2b0c65ea status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents: 4388
diff changeset
1449 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"%d < %d < %d \r",
b50b2b0c65ea status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents: 4388
diff changeset
1450 (int)demuxer->movi_start,
b50b2b0c65ea status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents: 4388
diff changeset
1451 (int)demuxer->filepos,
b50b2b0c65ea status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents: 4388
diff changeset
1452 (int)demuxer->movi_end);
b50b2b0c65ea status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents: 4388
diff changeset
1453 #else
11875
6b28eb95c08b * changes mencoder's exit code on explicit kill to 2
attila
parents: 11834
diff changeset
1454 if(!quiet) {
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17910
diff changeset
1455 if( mp_msg_test(MSGT_AVSYNC,MSGL_V) ) {
7370
8e07aeda7344 count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej@lucky.net>
arpi
parents: 7331
diff changeset
1456 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %3dfps Trem:%4dmin %3dmb A-V:%5.3f [%d:%d] A/Vms %d/%d D/B/S %d/%d/%d \r",
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1457 mux_v->timer, decoded_frameno, (int)(p*100),
7058
2e5c07262861 new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents: 6947
diff changeset
1458 (t>1) ? (int)(decoded_frameno/t+0.5) : 0,
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1459 (p>0.001) ? (int)((t/p-t)/60) : 0,
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1460 (p>0.001) ? (int)(ftello(muxer_f)/p/1024/1024) : 0,
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1461 v_pts_corr,
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1462 (mux_v->timer>1) ? (int)(mux_v->size/mux_v->timer/125) : 0,
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1463 (mux_a && mux_a->timer>1) ? (int)(mux_a->size/mux_a->timer/125) : 0,
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1464 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
1465 duplicatedframes, badframes, skippedframes
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1466 );
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1467 } else
17005
3047b92e8402 print the number of encoded frames per seconds (fps) with a greater precision
gpoirier
parents: 16875
diff changeset
1468 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %5.2ffps Trem:%4dmin %3dmb A-V:%5.3f [%d:%d]\r",
4387
df705351885a ETA/Esize/fps and some more... - new statusline
arpi
parents: 4378
diff changeset
1469 mux_v->timer, decoded_frameno, (int)(p*100),
17005
3047b92e8402 print the number of encoded frames per seconds (fps) with a greater precision
gpoirier
parents: 16875
diff changeset
1470 (t>1) ? (float)(decoded_frameno/t) : 0,
4392
b50b2b0c65ea status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents: 4388
diff changeset
1471 (p>0.001) ? (int)((t/p-t)/60) : 0,
8465
arpi
parents: 8451
diff changeset
1472 (p>0.001) ? (int)(ftello(muxer_f)/p/1024/1024) : 0,
4394
e8b73a96b736 show actual video:audio bitrates at status line
arpi
parents: 4393
diff changeset
1473 v_pts_corr,
e8b73a96b736 show actual video:audio bitrates at status line
arpi
parents: 4393
diff changeset
1474 (mux_v->timer>1) ? (int)(mux_v->size/mux_v->timer/125) : 0,
4427
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1475 (mux_a && mux_a->timer>1) ? (int)(mux_a->size/mux_a->timer/125) : 0
4387
df705351885a ETA/Esize/fps and some more... - new statusline
arpi
parents: 4378
diff changeset
1476 );
11875
6b28eb95c08b * changes mencoder's exit code on explicit kill to 2
attila
parents: 11834
diff changeset
1477 }
4392
b50b2b0c65ea status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents: 4388
diff changeset
1478 #endif
4387
df705351885a ETA/Esize/fps and some more... - new statusline
arpi
parents: 4378
diff changeset
1479 }
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1480 fflush(stdout);
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1481
5669
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1482 #ifdef USE_SUB
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1483 // find sub
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9772
diff changeset
1484 if(subdata && sh_video->pts>0){
8966
arpi
parents: 8925
diff changeset
1485 float pts=sh_video->pts;
5669
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1486 if(sub_fps==0) sub_fps=sh_video->fps;
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1487 if (pts > sub_last_pts || pts < sub_last_pts-1.0 ) {
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9772
diff changeset
1488 find_sub(subdata, (pts+sub_delay) *
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9772
diff changeset
1489 (subdata->sub_uses_time? 100. : sub_fps));
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9772
diff changeset
1490 // FIXME! frame counter...
5669
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1491 sub_last_pts = pts;
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1492 }
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1493 }
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1494 #endif
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1495
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1496 #ifdef USE_DVDREAD
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1497 // DVD sub:
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
1498 if(vo_spudec||vobsub_writer){
5669
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1499 unsigned char* packet=NULL;
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1500 int len;
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1501 while((len=ds_get_packet_sub(d_dvdsub,&packet))>0){
8966
arpi
parents: 8925
diff changeset
1502 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);
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
1503 if (vo_spudec)
5669
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1504 spudec_assemble(vo_spudec,packet,len,90000*d_dvdsub->pts);
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
1505 if (vobsub_writer)
8966
arpi
parents: 8925
diff changeset
1506 vobsub_out_output(vobsub_writer,packet,len,mux_v->timer + d_dvdsub->pts - sh_video->pts);
5669
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1507 }
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
1508 if (vo_spudec) {
8966
arpi
parents: 8925
diff changeset
1509 spudec_heartbeat(vo_spudec,90000*sh_video->pts);
5670
bf171d329546 DVD subs fixed
arpi
parents: 5669
diff changeset
1510 vo_osd_changed(OSDTYPE_SPU);
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
1511 }
5669
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1512 }
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5629
diff changeset
1513 #endif
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1514
15993
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
1515 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
1516
6333
69e14bf9e223 mencoder out-of-diskspace error handling, patch by Eric Lammerts <eric@lammerts.org>
arpi
parents: 6267
diff changeset
1517 if(ferror(muxer_f)) {
6947
ab1bf337d8b0 messages moved from mencoder.c to helpmp??.h
jaf
parents: 6946
diff changeset
1518 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
1519 mencoder_exit(1, NULL);
69e14bf9e223 mencoder out-of-diskspace error handling, patch by Eric Lammerts <eric@lammerts.org>
arpi
parents: 6267
diff changeset
1520 }
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1521
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
1522 } // while(!at_eof)
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1523
14878
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14845
diff changeset
1524 if (!interrupted && filelist[++curfile].name != 0) {
19391
5d6f4f9b6727 Cosmetics (nothing but spaces, tabs, and a comment changed here..)
ods15
parents: 19390
diff changeset
1525 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
1526 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
1527 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
1528
5d6f4f9b6727 Cosmetics (nothing but spaces, tabs, and a comment changed here..)
ods15
parents: 19390
diff changeset
1529 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
1530 else sh_video->vfilter = NULL; // There is no chain except the VE.
14941
d4b70c096a8e patch by ods15:
rfelker
parents: 14928
diff changeset
1531 }
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
1532
17675
e735c3f740ba Add uninit for audio before switching to next file and completing encode
ods15
parents: 17659
diff changeset
1533 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
1534 if(sh_video){ uninit_video(sh_video);sh_video=NULL; }
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1535 if(demuxer) free_demuxer(demuxer);
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1536 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
1537
14845
bf080d401797 Multifile 10l bugfix by Oded:
rfelker
parents: 14827
diff changeset
1538 at_eof = 0;
19391
5d6f4f9b6727 Cosmetics (nothing but spaces, tabs, and a comment changed here..)
ods15
parents: 19390
diff changeset
1539
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1540 m_config_pop(mconfig);
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1541 goto play_next_file;
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1542 }
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1543
14878
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14845
diff changeset
1544 /* Emit the remaining frames in the video system */
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14845
diff changeset
1545 /*TODO emit frmaes delayed by decoder lag*/
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14845
diff changeset
1546 if(sh_video && sh_video->vfilter){
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14845
diff changeset
1547 mp_msg(MSGT_MENCODER, MSGL_INFO, "\nFlushing video frames\n");
19389
99ab8f53de3b 10l in last commit, move configured-check inside sh_video and sh_video->vfilter check.
reimar
parents: 19387
diff changeset
1548 if (!((vf_instance_t *)sh_video->vfilter)->fmt.have_configured)
19390
795e54bb8f87 re-indent properly after last patch.
reimar
parents: 19389
diff changeset
1549 mp_msg(MSGT_MENCODER, MSGL_WARN, "Filters have not been configured! Empty file?\n");
19389
99ab8f53de3b 10l in last commit, move configured-check inside sh_video and sh_video->vfilter check.
reimar
parents: 19387
diff changeset
1550 else
19390
795e54bb8f87 re-indent properly after last patch.
reimar
parents: 19389
diff changeset
1551 ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter,
14878
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14845
diff changeset
1552 VFCTRL_FLUSH_FRAMES, 0);
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14845
diff changeset
1553 }
5723c4b2a2ea fixes for encoding of multiple files
henry
parents: 14845
diff changeset
1554
15234
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1555 if(aencoder)
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1556 if(aencoder->fixup)
e84a6ae9d51e audio encoding reworked
nicodvb
parents: 15056
diff changeset
1557 aencoder->fixup(aencoder);
3354
c68f5da1c61c Using CBR stream format for CBR mp3 audio
arpi
parents: 3323
diff changeset
1558
11222
b82e3ecb11e0 some updates in muxer api
alex
parents: 10594
diff changeset
1559 if (muxer->cont_write_index) muxer_write_index(muxer);
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5569
diff changeset
1560 muxer_f_size=ftello(muxer_f);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1561 fseek(muxer_f,0,SEEK_SET);
11222
b82e3ecb11e0 some updates in muxer api
alex
parents: 10594
diff changeset
1562 if (muxer->cont_write_header) muxer_write_header(muxer); // update header
6333
69e14bf9e223 mencoder out-of-diskspace error handling, patch by Eric Lammerts <eric@lammerts.org>
arpi
parents: 6267
diff changeset
1563 if(ferror(muxer_f) || fclose(muxer_f) != 0) {
6947
ab1bf337d8b0 messages moved from mencoder.c to helpmp??.h
jaf
parents: 6946
diff changeset
1564 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
1565 mencoder_exit(1, NULL);
69e14bf9e223 mencoder out-of-diskspace error handling, patch by Eric Lammerts <eric@lammerts.org>
arpi
parents: 6267
diff changeset
1566 }
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
1567 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
1568 vobsub_out_close(vobsub_writer);
4368
fae96d93c662 bitrate calculator for 650/700 mb cdrom
arpi
parents: 4367
diff changeset
1569
fae96d93c662 bitrate calculator for 650/700 mb cdrom
arpi
parents: 4367
diff changeset
1570 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
1571 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
1572 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
1573 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
1574 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
1575 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
1576 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
1577 }
fae96d93c662 bitrate calculator for 650/700 mb cdrom
arpi
parents: 4367
diff changeset
1578
15055
cec31d399b8a Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents: 15042
diff changeset
1579 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_VideoStreamResult,
18300
21cafb27aa03 Make mencoder stream size printing use 64 bits.
corey
parents: 18267
diff changeset
1580 (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
1581 if(sh_audio)
15055
cec31d399b8a Change all MSGT_FIXME, MSGL_FIXME to appropiate values.
diego
parents: 15042
diff changeset
1582 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_AudioStreamResult,
18300
21cafb27aa03 Make mencoder stream size printing use 64 bits.
corey
parents: 18267
diff changeset
1583 (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
1584
17675
e735c3f740ba Add uninit for audio before switching to next file and completing encode
ods15
parents: 17659
diff changeset
1585 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
1586 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
1587 if(demuxer) free_demuxer(demuxer);
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
1588 if(stream) free_stream(stream); // kill cache thread
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
1589
3320
ac8b70dd5e45 use return 1; if interrupted - patch by Artur Skawina <skawina@geocities.com>
arpi
parents: 3240
diff changeset
1590 return interrupted;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1591 }
4159
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1592
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17553
diff changeset
1593 static void parse_end_at(void)
4159
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1594 {
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1595
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1596 end_at_type = END_AT_NONE;
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1597 if (!end_at_string) return;
4159
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1598
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1599 /* End at size parsing */
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1600 {
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1601 char unit[4];
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1602
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1603 end_at_type = END_AT_SIZE;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1604
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1605 if(sscanf(end_at_string, "%lf%3s", &end_at, unit) == 2) {
4159
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1606 if(!strcasecmp(unit, "b"))
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1607 ;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1608 else if(!strcasecmp(unit, "kb"))
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1609 end_at *= 1024;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1610 else if(!strcasecmp(unit, "mb"))
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1611 end_at *= 1024*1024;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1612 else
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1613 end_at_type = END_AT_NONE;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1614 }
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1615 else
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1616 end_at_type = END_AT_NONE;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1617 }
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1618
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1619 /* End at time parsing. This has to be last because of
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1620 * sscanf("%f", ...) below */
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1621 if(end_at_type == END_AT_NONE)
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1622 {
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1623 int a,b; float d;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1624
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1625 end_at_type = END_AT_TIME;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1626
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1627 if (sscanf(end_at_string, "%d:%d:%f", &a, &b, &d) == 3)
4159
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1628 end_at = 3600*a + 60*b + d;
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1629 else if (sscanf(end_at_string, "%d:%f", &a, &d) == 2)
4159
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1630 end_at = 60*a + d;
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1631 else if (sscanf(end_at_string, "%f", &d) == 1)
4159
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1632 end_at = d;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1633 else
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1634 end_at_type = END_AT_NONE;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1635 }
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1636 }
4427
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1637
7451
8669e56d2d98 some mpcodecs option declaration moved to cfg-*, as aren;t used by
arpi
parents: 7394
diff changeset
1638 #if 0
4427
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1639 /* Flip the image in src and store the result in dst. src and dst may overlap.
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1640 width is the size of each line in bytes. */
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1641 static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width,
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1642 int height)
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1643 {
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1644 uint8_t* tmp = malloc(width);
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1645 int i;
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1646
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1647 for(i = 0; i < height/2; i++) {
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1648 memcpy(tmp, &src[i*width], width);
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1649 memcpy(&dst[i * width], &src[(height - i) * width], width);
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1650 memcpy(&dst[(height - i) * width], tmp, width);
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1651 }
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1652
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1653 free(tmp);
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1654 return dst;
6310422b9557 new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4408
diff changeset
1655 }
7451
8669e56d2d98 some mpcodecs option declaration moved to cfg-*, as aren;t used by
arpi
parents: 7394
diff changeset
1656 #endif
8517
bcf1b010bf14 Presets are an easy way, to use hard to access lame options and to give
arpi
parents: 8471
diff changeset
1657
11375
3544f1823f6b mencoder lavc audio encoding support
ranma
parents: 11222
diff changeset
1658
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1659 static float stop_time(demuxer_t* demuxer, muxer_stream_t* mux_v) {
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1660 float timeleft = -1;
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1661 if (play_n_frames >= 0) timeleft = mux_v->timer + play_n_frames * (double)(mux_v->h.dwScale) / mux_v->h.dwRate;
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1662 if (end_at_type == END_AT_TIME && (timeleft > end_at || timeleft == -1)) timeleft = end_at;
14964
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1663 if (next_edl_record && demuxer && demuxer->video) { // everything is OK to be checked
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1664 float tmp = mux_v->timer + next_edl_record->start_sec - demuxer->video->pts;
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1665 if (timeleft == -1 || timeleft > tmp) {
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1666 // There's less time in EDL than what we already know
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1667 if (next_edl_record->action == EDL_SKIP && edl_seeking) {
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1668 timeleft = tmp;
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1669 } else if (next_edl_record->action == EDL_MUTE) {
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1670 //timeleft = next_edl_record->start_sec - demuxer->video->pts;
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1671 // For the moment (and probably forever) EDL mute doesn't work in MEncoder
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1672 }
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1673 }
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1674 }
14802
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1675 return timeleft;
63b1cc62fc9b MEncoder multiple files patch by Oded Shimon (ods15)
rfelker
parents: 14762
diff changeset
1676 }
14964
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1677
15994
13ae8ec083f6 -delay for MEncoder, step 3.
ods15
parents: 15993
diff changeset
1678 static float calc_a_pts(demux_stream_t *d_audio) {
13ae8ec083f6 -delay for MEncoder, step 3.
ods15
parents: 15993
diff changeset
1679 sh_audio_t * sh_audio = d_audio ? d_audio->sh : NULL;
13ae8ec083f6 -delay for MEncoder, step 3.
ods15
parents: 15993
diff changeset
1680 float a_pts = 0.;
13ae8ec083f6 -delay for MEncoder, step 3.
ods15
parents: 15993
diff changeset
1681 if (sh_audio)
13ae8ec083f6 -delay for MEncoder, step 3.
ods15
parents: 15993
diff changeset
1682 a_pts = d_audio->pts + (ds_tell_pts(d_audio) - sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
13ae8ec083f6 -delay for MEncoder, step 3.
ods15
parents: 15993
diff changeset
1683 return a_pts;
13ae8ec083f6 -delay for MEncoder, step 3.
ods15
parents: 15993
diff changeset
1684 }
13ae8ec083f6 -delay for MEncoder, step 3.
ods15
parents: 15993
diff changeset
1685
15995
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1686 static float forward_audio(float pts, demux_stream_t *d_audio, muxer_stream_t* mux_a) {
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1687 sh_audio_t * sh_audio = d_audio ? d_audio->sh : NULL;
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1688 int samplesize, avg;
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1689 float a_pts = calc_a_pts(d_audio);
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1690
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1691 if (!sh_audio) return a_pts;
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1692
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1693 if (sh_audio->audio.dwScale) samplesize = sh_audio->audio.dwSampleSize;
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1694 else samplesize = (sh_audio->wf ? sh_audio->wf->nBlockAlign : 1);
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1695 avg = (sh_audio->wf ? sh_audio->wf->nAvgBytesPerSec : sh_audio->i_bps);
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1696
15997
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1697 // after a demux_seek, a_pts will be zero until you read some audio.
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1698 // carefully checking if a_pts is truely correct by reading tiniest amount of data possible.
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1699 if (pts > a_pts && a_pts == 0.0 && samplesize) {
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1700 if (demux_read_data(sh_audio->ds,mux_a->buffer,samplesize) <= 0) return a_pts; // EOF
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1701 a_pts = calc_a_pts(d_audio);
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1702 }
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1703
15995
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1704 while (pts > a_pts) {
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1705 int len;
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1706 if (samplesize) {
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1707 len = avg * (pts - a_pts > 0.5 ? 0.5 : pts - a_pts);
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1708 len/= samplesize; if(len<1) len=1;
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1709 len*= samplesize;
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1710 len = demux_read_data(sh_audio->ds,mux_a->buffer,len);
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1711 } else {
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1712 unsigned char * crap;
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1713 len = ds_get_packet(sh_audio->ds, &crap);
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1714 }
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1715 if (len <= 0) break; // EOF of audio.
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1716 a_pts = calc_a_pts(d_audio);
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1717 }
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1718 return a_pts;
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1719 }
c3755444496d -delay for MEncoder, step 4.
ods15
parents: 15994
diff changeset
1720
15996
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1721 static int slowseek(float end_pts, demux_stream_t *d_video, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy, int print_info) {
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1722 sh_video_t * sh_video = d_video->sh;
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1723 vf_instance_t * vfilter = sh_video ? sh_video->vfilter : NULL;
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1724 int done = 0;
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1725
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1726 while (!interrupted) {
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1727 float a_pts = 0.;
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1728
16708
89504641c2a5 100000l to me
ods15
parents: 16528
diff changeset
1729 if (!frame_data->already_read) { // when called after fixdelay, a frame is already read
89504641c2a5 100000l to me
ods15
parents: 16528
diff changeset
1730 frame_data->in_size = video_read_frame(sh_video, &frame_data->frame_time, &frame_data->start, force_fps);
89504641c2a5 100000l to me
ods15
parents: 16528
diff changeset
1731 if(frame_data->in_size<0) return 2;
89504641c2a5 100000l to me
ods15
parents: 16528
diff changeset
1732 sh_video->timer += frame_data->frame_time;
89504641c2a5 100000l to me
ods15
parents: 16528
diff changeset
1733 }
89504641c2a5 100000l to me
ods15
parents: 16528
diff changeset
1734 frame_data->already_read = 0;
15996
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1735
15997
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1736 a_pts = forward_audio(sh_video->pts - frame_data->frame_time + audio_delay, d_audio, mux_a);
15996
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1737
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1738 if (done) {
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1739 frame_data->already_read = 1;
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1740 if (!framecopy || (sh_video->ds->flags & 1)) return 1;
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1741 }
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1742 if (sh_video->pts >= end_pts) done = 1;
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1743
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1744 if (vfilter) {
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1745 int softskip = (vfilter->control(vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) == CONTROL_TRUE);
17910
5ae29dc47c17 feed something (hopefully correct timestamps) into the video filter chain
michael
parents: 17895
diff changeset
1746 decode_video(sh_video, frame_data->start, frame_data->in_size, !softskip, MP_NOPTS_VALUE);
15996
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1747 }
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1748
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1749 if (print_info) mp_msg(MSGT_MENCODER, MSGL_STATUS,
17121
119790c08d5c compiler warning fixes, some of these were actual (printing) bugs.
ods15
parents: 17120
diff changeset
1750 "EDL SKIP: Start: %.2f End: %.2f Current: V: %.2f A: %.2f \r",
15996
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1751 next_edl_record->start_sec, next_edl_record->stop_sec,
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1752 sh_video->pts, a_pts);
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1753 }
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1754 if (interrupted) return 2;
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1755 return 1;
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1756 }
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1757
15997
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1758 static void fixdelay(demux_stream_t *d_video, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy) {
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1759 // TODO: Find a way to encode silence instead of deleting video
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1760 sh_video_t * sh_video = d_video->sh;
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1761 float a_pts;
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1762
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1763 // demux_seek has a weirdness that sh_video->pts is meaningless,
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1764 // until a single frame is read... Same for audio actually too.
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1765 // Reading one frame, and keeping it.
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1766 frame_data->in_size = video_read_frame(sh_video, &frame_data->frame_time, &frame_data->start, force_fps);
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1767 if(frame_data->in_size<0) return;
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1768 sh_video->timer += frame_data->frame_time;
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1769 frame_data->already_read = 1;
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1770
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1771 a_pts = forward_audio(sh_video->pts - frame_data->frame_time + audio_delay, d_audio, mux_a);
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1772
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1773 if (audio_delay > 0) return;
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1774 else if (sh_video->pts - frame_data->frame_time + audio_delay >= a_pts) return;
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1775
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1776 slowseek(a_pts - audio_delay, d_video, d_audio, mux_a, frame_data, framecopy, 0);
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1777 }
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1778
15993
4cc096594a6a -delay for MEncoder, step 2.
ods15
parents: 15992
diff changeset
1779 static int edl_seek(edl_record_ptr next_edl_record, demuxer_t* demuxer, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy) {
14964
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1780 sh_video_t * sh_video = demuxer->video ? demuxer->video->sh : NULL;
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1781
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1782 if (!sh_video) return 0;
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1783 if (sh_video->pts >= next_edl_record->stop_sec) return 1; // nothing to do...
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1784
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1785 if (!edl_seek_type) {
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17590
diff changeset
1786 if(demux_seek(demuxer, next_edl_record->stop_sec - sh_video->pts, audio_delay, 0)){
14964
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1787 sh_video->pts = demuxer->video->pts;
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1788 //if (vo_vobsub) vobsub_seek(vo_vobsub,sh_video->pts);
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1789 resync_video_stream(sh_video);
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1790 //if(vo_spudec) spudec_reset(vo_spudec);
15997
d565dc2ce82e -delay for MEncoder, final step 6.
ods15
parents: 15996
diff changeset
1791 if (audio_delay != 0.0) fixdelay(demuxer->video, d_audio, mux_a, frame_data, framecopy);
14964
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1792 return 1;
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1793 }
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1794 // non-seekable stream.
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1795 return 0;
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1796 }
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1797
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1798 // slow seek, read every frame.
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1799
15996
43971e7da5f0 -delay for MEncoder, step 5.
ods15
parents: 15995
diff changeset
1800 return slowseek(next_edl_record->stop_sec, demuxer->video, d_audio, mux_a, frame_data, framecopy, 1);
14964
92e234f53156 EDL for mencoder, patch by Oded (ods15)
rfelker
parents: 14944
diff changeset
1801 }