annotate mencoder.c @ 15993:4cc096594a6a

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