annotate mencoder.c @ 29688:94f1bca4f4b6

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