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