Mercurial > mplayer.hg
annotate mencoder.c @ 5755:4593e6189c20
more infos
author | jaf |
---|---|
date | Sun, 21 Apr 2002 02:44:25 +0000 |
parents | a56c9404364e |
children | 48a0667742b9 |
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 |
4427
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
6 #define VCODEC_RAWRGB 6 |
4575 | 7 #define VCODEC_VFW 7 |
5578 | 8 #define VCODEC_LIBDV 8 |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
9 |
3385 | 10 #define ACODEC_COPY 0 |
2583 | 11 #define ACODEC_PCM 1 |
12 #define ACODEC_VBRMP3 2 | |
4368 | 13 #define ACODEC_NULL 3 |
2531 | 14 |
15 #include <stdio.h> | |
16 #include <stdlib.h> | |
17 #include <string.h> | |
18 #include <signal.h> | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
19 #include <sys/time.h> |
2531 | 20 |
2591 | 21 #include "config.h" |
2531 | 22 #include "mp_msg.h" |
2978 | 23 #include "version.h" |
2531 | 24 #include "help_mp.h" |
25 | |
2978 | 26 static char* banner_text= |
27 "\n\n" | |
4757 | 28 "MEncoder " VERSION "(C) 2000-2002 Arpad Gereoffy (see DOCS!)\n" |
2978 | 29 "\n"; |
30 | |
3323 | 31 #include "cpudetect.h" |
32 | |
2531 | 33 #include "codec-cfg.h" |
4343
b0c8eed7473c
Extended DVD chapter specification. Remove -last-chapter option.
kmkaplan
parents:
4207
diff
changeset
|
34 #include "cfgparser.h" |
2531 | 35 |
36 #include "stream.h" | |
37 #include "demuxer.h" | |
38 #include "stheader.h" | |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
39 #include "playtree.h" |
2531 | 40 |
41 #include "aviwrite.h" | |
42 | |
43 #include "libvo/video_out.h" | |
44 | |
5607 | 45 #include "libmpcodecs/dec_audio.h" |
46 #include "libmpcodecs/dec_video.h" | |
2574 | 47 |
3357 | 48 #ifdef HAVE_MP3LAME |
2591 | 49 #include <lame/lame.h> |
3357 | 50 #endif |
2583 | 51 |
3521 | 52 #ifdef HAVE_LIBCSS |
53 #include "libmpdemux/dvdauth.h" | |
54 #endif | |
55 | |
3236 | 56 #include <inttypes.h> |
57 | |
3385 | 58 #include "fastmemcpy.h" |
59 | |
4388 | 60 /************************************************************************** |
61 Video accelerated architecture | |
62 **************************************************************************/ | |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
63 vo_vaa_t vo_vaa; // FIXME! remove me! |
5511 | 64 int vo_doublebuffering=0; |
65 int vo_directrendering=0; | |
66 int vo_config_count=0; | |
4388 | 67 |
2583 | 68 //-------------------------- |
69 | |
2531 | 70 // cache2: |
2618 | 71 static int stream_cache_size=0; |
2531 | 72 #ifdef USE_STREAM_CACHE |
73 extern int cache_fill_status; | |
74 #else | |
75 #define cache_fill_status 0 | |
76 #endif | |
77 | |
2618 | 78 int vcd_track=0; |
79 int audio_id=-1; | |
80 int video_id=-1; | |
81 int dvdsub_id=-1; | |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
82 int vobsub_id=-1; |
5436 | 83 char* audio_lang=NULL; |
84 char* dvdsub_lang=NULL; | |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
85 static char* spudec_ifo=NULL; |
2618 | 86 |
4355 | 87 static int has_audio=1; |
2531 | 88 char *audio_codec=NULL; // override audio codec |
89 char *video_codec=NULL; // override video codec | |
90 int audio_family=-1; // override audio codec family | |
91 int video_family=-1; // override video codec family | |
92 | |
3357 | 93 #ifdef HAVE_MP3LAME |
2661 | 94 int out_audio_codec=ACODEC_VBRMP3; |
3357 | 95 #else |
96 int out_audio_codec=ACODEC_PCM; | |
97 #endif | |
98 | |
4620 | 99 int out_video_codec= |
100 #ifdef HAVE_DIVX4ENCORE | |
101 VCODEC_DIVX4; | |
102 #else | |
103 #ifdef USE_LIBAVCODEC | |
104 VCODEC_LIBAVCODEC; | |
105 #else | |
5569 | 106 VCODEC_COPY; |
4620 | 107 #endif |
108 #endif | |
109 | |
2661 | 110 |
2531 | 111 // audio stream skip/resync functions requires only for seeking. |
112 // (they should be implemented in the audio codec layer) | |
113 //void skip_audio_frame(sh_audio_t *sh_audio){} | |
114 //void resync_audio_stream(sh_audio_t *sh_audio){} | |
115 | |
2618 | 116 int verbose=0; // must be global! |
2531 | 117 double video_time_usage=0; |
118 double vout_time_usage=0; | |
4834 | 119 double max_video_time_usage=0; |
120 double max_vout_time_usage=0; | |
4838 | 121 double cur_video_time_usage=0; |
122 double cur_vout_time_usage=0; | |
2531 | 123 static double audio_time_usage=0; |
124 static int total_time_usage_start=0; | |
4844
76acf5bbda78
exclude benchmark stuff execution from normal playback
nick
parents:
4838
diff
changeset
|
125 int benchmark=0; |
2531 | 126 |
2605 | 127 // A-V sync: |
128 int delay_corrected=1; | |
129 static float default_max_pts_correction=-1;//0.01f; | |
130 static float max_pts_correction=0;//default_max_pts_correction; | |
131 static float c_total=0; | |
132 | |
2613 | 133 float force_fps=0; |
134 float force_ofps=0; // set to 24 for inverse telecine | |
5629 | 135 static int skip_limit=-1; |
2531 | 136 |
2618 | 137 int force_srate=0; |
138 | |
2626 | 139 char* out_filename="test.avi"; |
140 char* mp3_filename=NULL; | |
141 char* ac3_filename=NULL; | |
142 | |
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
|
143 char *force_fourcc=NULL; |
af1f8e2d693a
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents:
3563
diff
changeset
|
144 |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
145 int pass=0; |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
146 char* passtmpfile="divx2pass.log"; |
3377
4723f6fd750a
do not fault if 2pass VbrControl can't open the logfile
alex
parents:
3363
diff
changeset
|
147 int pass_working=0; |
2643 | 148 |
149 static int play_n_frames=-1; | |
150 | |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
151 #include "libvo/font_load.h" |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
152 #include "libvo/sub.h" |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
153 |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
154 // sub: |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
155 char *font_name=NULL; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
156 float font_factor=0.75; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
157 char *sub_name=NULL; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
158 float sub_delay=0; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
159 float sub_fps=0; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
160 int sub_auto = 0; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
161 |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
162 #ifdef USE_SUB |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
163 static subtitle* subtitles=NULL; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
164 float sub_last_pts = -303; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
165 #endif |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
166 |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
167 |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
168 |
2661 | 169 //char *out_audio_codec=NULL; // override audio codec |
170 //char *out_video_codec=NULL; // override video codec | |
2626 | 171 |
2591 | 172 //#include "libmpeg2/mpeg2.h" |
173 //#include "libmpeg2/mpeg2_internal.h" | |
174 | |
3357 | 175 #ifdef HAVE_MP3LAME |
2626 | 176 int lame_param_quality=0; // best |
177 int lame_param_vbr=vbr_default; | |
178 int lame_param_mode=-1; // unset | |
179 int lame_param_padding=-1; // unset | |
180 int lame_param_br=-1; // unset | |
181 int lame_param_ratio=-1; // unset | |
3357 | 182 #endif |
2626 | 183 |
3236 | 184 static int vo_w=0, vo_h=0; |
5270 | 185 static int input_pitch, input_bpp; |
186 | |
2618 | 187 //-------------------------- config stuff: |
188 | |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
189 m_config_t* mconfig; |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
190 |
2618 | 191 static int cfg_inc_verbose(struct config *conf){ ++verbose; return 0;} |
192 | |
193 static int cfg_include(struct config *conf, char *filename){ | |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
194 return m_config_parse_config_file(mconfig, filename); |
2618 | 195 } |
196 | |
4620 | 197 static char *seek_to_sec=NULL; |
198 static off_t seek_to_byte=0; | |
199 | |
4159
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
200 static int parse_end_at(struct config *conf, const char* param); |
4427
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
201 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
|
202 |
2618 | 203 #include "get_path.c" |
204 | |
205 #include "cfg-mplayer-def.h" | |
206 #include "cfg-mencoder.h" | |
207 | |
4088 | 208 #ifdef USE_DVDREAD |
209 #include "spudec.h" | |
210 #endif | |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
211 #include "vobsub.h" |
4088 | 212 |
4743 | 213 /* FIXME */ |
214 void mencoder_exit(int level, char *how) | |
215 { | |
216 if (how) | |
217 printf("Exiting... (%s)\n", how); | |
218 else | |
219 printf("Exiting...\n"); | |
220 | |
221 exit(level); | |
222 } | |
223 | |
4488 | 224 void parse_cfgfiles( m_config_t* conf ) |
225 { | |
226 char *conffile; | |
227 if ((conffile = get_path("mencoder")) == NULL) { | |
228 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem); | |
229 } else { | |
230 if (m_config_parse_config_file(conf, conffile) < 0) | |
4743 | 231 mencoder_exit(1,"configfile error"); |
4488 | 232 free(conffile); |
233 } | |
234 } | |
235 | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
236 |
2591 | 237 //--------------------------------------------------------------------------- |
238 | |
239 int dec_audio(sh_audio_t *sh_audio,unsigned char* buffer,int total){ | |
240 int size=0; | |
241 int eof=0; | |
242 while(size<total && !eof){ | |
243 int len=total-size; | |
244 if(len>MAX_OUTBURST) len=MAX_OUTBURST; | |
245 if(len>sh_audio->a_buffer_size) len=sh_audio->a_buffer_size; | |
246 if(len>sh_audio->a_buffer_len){ | |
247 int ret=decode_audio(sh_audio, | |
248 &sh_audio->a_buffer[sh_audio->a_buffer_len], | |
249 len-sh_audio->a_buffer_len, | |
250 sh_audio->a_buffer_size-sh_audio->a_buffer_len); | |
251 if(ret>0) sh_audio->a_buffer_len+=ret; else eof=1; | |
252 } | |
253 if(len>sh_audio->a_buffer_len) len=sh_audio->a_buffer_len; | |
254 memcpy(buffer+size,sh_audio->a_buffer,len); | |
255 sh_audio->a_buffer_len-=len; size+=len; | |
256 if(sh_audio->a_buffer_len>0) | |
257 memcpy(sh_audio->a_buffer,&sh_audio->a_buffer[len],sh_audio->a_buffer_len); | |
258 } | |
259 return size; | |
260 } | |
261 | |
4767 | 262 extern void me_register_options(m_config_t* cfg); |
263 | |
2591 | 264 //--------------------------------------------------------------------------- |
2531 | 265 |
266 static int eof=0; | |
3320
ac8b70dd5e45
use return 1; if interrupted - patch by Artur Skawina <skawina@geocities.com>
arpi
parents:
3240
diff
changeset
|
267 static int interrupted=0; |
2531 | 268 |
4159
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
269 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
|
270 static enum end_at_type_t end_at_type = END_AT_NONE; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
271 static int end_at; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
272 |
2531 | 273 static void exit_sighandler(int x){ |
274 eof=1; | |
3320
ac8b70dd5e45
use return 1; if interrupted - patch by Artur Skawina <skawina@geocities.com>
arpi
parents:
3240
diff
changeset
|
275 interrupted=1; |
2531 | 276 } |
277 | |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
278 aviwrite_t* muxer=NULL; |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
279 FILE* muxer_f=NULL; |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
280 |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
281 // callback for ve_*.c: |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
282 void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags){ |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
283 aviwrite_write_chunk(muxer,s,muxer_f,len,flags); |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
284 } |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
285 |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
286 |
2618 | 287 int main(int argc,char* argv[], char *envp[]){ |
2531 | 288 |
289 stream_t* stream=NULL; | |
290 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
|
291 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
|
292 demuxer_t* demuxer2=NULL; |
2531 | 293 demux_stream_t *d_audio=NULL; |
294 demux_stream_t *d_video=NULL; | |
295 demux_stream_t *d_dvdsub=NULL; | |
296 sh_audio_t *sh_audio=NULL; | |
297 sh_video_t *sh_video=NULL; | |
298 int file_format=DEMUXER_TYPE_UNKNOWN; | |
5149 | 299 int i; |
2531 | 300 |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
301 uint32_t ptimer_start; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
302 uint32_t audiorate=0; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
303 uint32_t videorate=0; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
304 uint32_t audiosamples=1; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
305 uint32_t videosamples=1; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
306 uint32_t skippedframes=0; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
307 uint32_t duplicatedframes=0; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
308 |
2531 | 309 aviwrite_stream_t* mux_a=NULL; |
310 aviwrite_stream_t* mux_v=NULL; | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
311 off_t muxer_f_size=0; |
2531 | 312 |
3357 | 313 #ifdef HAVE_MP3LAME |
2591 | 314 lame_global_flags *lame; |
3357 | 315 #endif |
2583 | 316 |
2653 | 317 float audio_preload=0.5; |
2581 | 318 |
2613 | 319 double v_pts_corr=0; |
320 double v_timer_corr=0; | |
2605 | 321 |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
322 play_tree_t* playtree; |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
323 play_tree_iter_t* playtree_iter; |
2618 | 324 char* filename=NULL; |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
325 char* frameno_filename="frameno.avi"; |
2618 | 326 |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
327 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
|
328 int next_frameno=-1; |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
329 |
4387 | 330 unsigned int timer_start; |
331 | |
5223 | 332 mp_msg_init(); |
333 mp_msg_set_level(MSGL_STATUS); | |
2978 | 334 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s",banner_text); |
2622 | 335 |
336 // check codec.conf | |
337 if(!parse_codec_cfg(get_path("codecs.conf"))){ | |
3748 | 338 if(!parse_codec_cfg(CONFDIR"/codecs.conf")){ |
2622 | 339 mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf); |
4743 | 340 mencoder_exit(1,NULL); |
2622 | 341 } |
342 } | |
2531 | 343 |
3323 | 344 /* Test for cpu capabilities (and corresponding OS support) for optimizing */ |
345 #ifdef ARCH_X86 | |
346 GetCpuCaps(&gCpuCaps); | |
347 mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: Type: %d MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n", | |
348 gCpuCaps.cpuType,gCpuCaps.hasMMX,gCpuCaps.hasMMX2, | |
349 gCpuCaps.has3DNow, gCpuCaps.has3DNowExt, | |
350 gCpuCaps.hasSSE, gCpuCaps.hasSSE2); | |
351 #endif | |
352 | |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
353 // check font |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
354 #ifdef USE_OSD |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
355 if(font_name){ |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
356 vo_font=read_font_desc(font_name,font_factor,verbose>1); |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
357 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name); |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
358 } else { |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
359 // try default: |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
360 vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1); |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
361 if(!vo_font) |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
362 vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1); |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
363 } |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
364 #endif |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
365 |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
366 vo_init_osd(); |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
367 |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
368 // FIXME: get rid of -dvd and other tricky options and config/playtree |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
369 stream2=open_stream(frameno_filename,0,&i); |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
370 if(stream2){ |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
371 demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2); |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
372 if(demuxer2) printf("Using pass3 control file: %s\n",frameno_filename); |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
373 } |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
374 |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
375 playtree = play_tree_new(); |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
376 mconfig = m_config_new(playtree); |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
377 m_config_register_options(mconfig,mencoder_opts); |
4767 | 378 me_register_options(mconfig); |
4488 | 379 parse_cfgfiles(mconfig); |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
380 |
4743 | 381 if(m_config_parse_command_line(mconfig, argc, argv, envp) < 0) mencoder_exit(1, "error parsing cmdline"); |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
382 playtree = play_tree_cleanup(playtree); |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
383 if(playtree) { |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
384 playtree_iter = play_tree_iter_new(playtree,mconfig); |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
385 if(playtree_iter) { |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
386 if(play_tree_iter_step(playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY) { |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
387 play_tree_iter_free(playtree_iter); |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
388 playtree_iter = NULL; |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
389 } |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
390 filename = play_tree_iter_get_file(playtree_iter,1); |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
391 } |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
392 } |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
393 |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4088
diff
changeset
|
394 if(!filename && !vcd_track && !dvd_title && !tv_param_on){ |
2618 | 395 printf("\nMissing filename!\n\n"); |
4743 | 396 mencoder_exit(1,NULL); |
2618 | 397 } |
398 | |
5223 | 399 mp_msg_set_level(verbose+MSGL_STATUS); |
2600 | 400 |
2618 | 401 stream=open_stream(filename,vcd_track,&file_format); |
2531 | 402 |
403 if(!stream){ | |
404 printf("Cannot open file/device\n"); | |
4743 | 405 mencoder_exit(1,NULL); |
2531 | 406 } |
407 | |
408 printf("success: format: %d data: 0x%X - 0x%X\n",file_format, (int)(stream->start_pos),(int)(stream->end_pos)); | |
409 | |
5436 | 410 #ifdef USE_DVDREAD |
411 if(stream->type==STREAMTYPE_DVD){ | |
412 if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang); | |
413 if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang); | |
414 } | |
415 #endif | |
416 | |
5626
b7b40e65c070
-sb option re-added (noticed by Alexandre Oliva <oliva@lsd.ic.unicamp.br>)
arpi
parents:
5607
diff
changeset
|
417 stream->start_pos+=seek_to_byte; |
2531 | 418 |
3979 | 419 #ifdef HAVE_LIBCSS |
420 // current_module="libcss"; | |
421 if (dvdimportkey) { | |
422 if (dvd_import_key(dvdimportkey)) { | |
423 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorDVDkey); | |
4743 | 424 mencoder_exit(1,NULL); |
3979 | 425 } |
426 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CmdlineDVDkey); | |
427 } | |
428 if (dvd_auth_device) { | |
429 // if (dvd_auth(dvd_auth_device,f)) { | |
430 if (dvd_auth(dvd_auth_device,filename)) { | |
431 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Error in DVD auth...\n"); | |
4743 | 432 mencoder_exit(1,NULL); |
3979 | 433 } |
434 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_DVDauthOk); | |
435 } | |
436 #endif | |
437 | |
5626
b7b40e65c070
-sb option re-added (noticed by Alexandre Oliva <oliva@lsd.ic.unicamp.br>)
arpi
parents:
5607
diff
changeset
|
438 if(stream_cache_size) stream_enable_cache(stream,stream_cache_size*1024,0,0); |
b7b40e65c070
-sb option re-added (noticed by Alexandre Oliva <oliva@lsd.ic.unicamp.br>)
arpi
parents:
5607
diff
changeset
|
439 |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
440 if(!has_audio || demuxer2) audio_id=-2; /* do NOT read audio packets... */ |
4355 | 441 |
2882 | 442 //demuxer=demux_open(stream,file_format,video_id,audio_id,dvdsub_id); |
443 demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id); | |
2531 | 444 if(!demuxer){ |
445 printf("Cannot open demuxer\n"); | |
4743 | 446 mencoder_exit(1,NULL); |
2531 | 447 } |
448 | |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
449 d_audio=demuxer2 ? demuxer2->audio : demuxer->audio; |
2531 | 450 d_video=demuxer->video; |
451 d_dvdsub=demuxer->sub; | |
452 sh_audio=d_audio->sh; | |
453 sh_video=d_video->sh; | |
454 | |
455 if(!video_read_properties(sh_video)){ | |
456 printf("Couldn't read video properties\n"); | |
4743 | 457 mencoder_exit(1,NULL); |
2531 | 458 } |
459 | |
2622 | 460 mp_msg(MSGT_MENCODER,MSGL_INFO,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n", |
2531 | 461 demuxer->file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h, |
462 sh_video->fps,sh_video->frametime | |
463 ); | |
2581 | 464 |
4620 | 465 if(sh_audio && (out_audio_codec || seek_to_sec || !sh_audio->wf)){ |
2581 | 466 // Go through the codec.conf and find the best codec... |
467 sh_audio->codec=NULL; | |
2622 | 468 if(audio_family!=-1) mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_TryForceAudioFmt,audio_family); |
2581 | 469 while(1){ |
470 sh_audio->codec=find_codec(sh_audio->format,NULL,sh_audio->codec,1); | |
471 if(!sh_audio->codec){ | |
472 if(audio_family!=-1) { | |
473 sh_audio->codec=NULL; /* re-search */ | |
2622 | 474 mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CantFindAfmtFallback); |
2581 | 475 audio_family=-1; |
476 continue; | |
477 } | |
2622 | 478 mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CantFindAudioCodec,sh_audio->format); |
479 mp_msg(MSGT_MENCODER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf")); | |
2581 | 480 sh_audio=d_audio->sh=NULL; |
481 break; | |
482 } | |
483 if(audio_codec && strcmp(sh_audio->codec->name,audio_codec)) continue; | |
484 else if(audio_family!=-1 && sh_audio->codec->driver!=audio_family) continue; | |
2622 | 485 mp_msg(MSGT_MENCODER,MSGL_INFO,"%s audio codec: [%s] drv:%d (%s)\n",audio_codec?"Forcing":"Detected",sh_audio->codec->name,sh_audio->codec->driver,sh_audio->codec->info); |
2581 | 486 break; |
487 } | |
488 } | |
489 | |
4620 | 490 if(sh_audio && (out_audio_codec || seek_to_sec || !sh_audio->wf)){ |
2622 | 491 mp_msg(MSGT_MENCODER,MSGL_V,"Initializing audio codec...\n"); |
2581 | 492 if(!init_audio(sh_audio)){ |
2622 | 493 mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CouldntInitAudioCodec); |
2581 | 494 sh_audio=d_audio->sh=NULL; |
495 } else { | |
2622 | 496 mp_msg(MSGT_MENCODER,MSGL_INFO,"AUDIO: srate=%d chans=%d bps=%d sfmt=0x%X ratio: %d->%d\n",sh_audio->samplerate,sh_audio->channels,sh_audio->samplesize, |
2581 | 497 sh_audio->sample_format,sh_audio->i_bps,sh_audio->o_bps); |
498 } | |
499 } | |
500 | |
2531 | 501 // set up video encoder: |
502 | |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
503 if (spudec_ifo) { |
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
504 unsigned int palette[16], width, height; |
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
505 if (vobsub_parse_ifo(spudec_ifo, palette, &width, &height, 1) >= 0) |
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
506 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
|
507 } |
5392
d7c586ebbacf
Fix bug noticed by Hajba Szilard in message <20020329151644.A23301@revai.hu>
kmkaplan
parents:
5390
diff
changeset
|
508 #ifdef USE_DVDREAD |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
509 if (vo_spudec==NULL) { |
4557 | 510 vo_spudec=spudec_new_scaled(stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL, |
4088 | 511 sh_video->disp_w, sh_video->disp_h); |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5386
diff
changeset
|
512 } |
4088 | 513 #endif |
514 | |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
515 #ifdef USE_SUB |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
516 // after reading video params we should load subtitles because |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
517 // we know fps so now we can adjust subtitles time to ~6 seconds AST |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
518 // check .sub |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
519 // current_module="read_subtitles_file"; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
520 if(sub_name){ |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
521 subtitles=sub_read_file(sub_name, sh_video->fps); |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
522 if(!subtitles) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name); |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
523 } else |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
524 if(sub_auto) { // auto load sub file ... |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
525 subtitles=sub_read_file( filename ? sub_filename( get_path("sub/"), filename ) |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
526 : "default.sub", sh_video->fps ); |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
527 } |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
528 #endif |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
529 |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
530 |
2531 | 531 // set up output file: |
2626 | 532 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
|
533 if(!muxer_f) { |
bc648c6a464a
fixes a segfault if file specified in -o can't be accessed
pl
parents:
2884
diff
changeset
|
534 printf("Cannot open output file '%s'\n", out_filename); |
4743 | 535 mencoder_exit(1,NULL); |
2887
bc648c6a464a
fixes a segfault if file specified in -o can't be accessed
pl
parents:
2884
diff
changeset
|
536 } |
bc648c6a464a
fixes a segfault if file specified in -o can't be accessed
pl
parents:
2884
diff
changeset
|
537 |
2531 | 538 muxer=aviwrite_new_muxer(); |
2581 | 539 |
540 // ============= VIDEO =============== | |
541 | |
2531 | 542 mux_v=aviwrite_new_stream(muxer,AVIWRITE_TYPE_VIDEO); |
543 | |
4575 | 544 mux_v->buffer_size=0x200000; // 2MB |
2531 | 545 mux_v->buffer=malloc(mux_v->buffer_size); |
546 | |
547 mux_v->source=sh_video; | |
548 | |
549 mux_v->h.dwSampleSize=0; // VBR | |
550 mux_v->h.dwScale=10000; | |
2613 | 551 mux_v->h.dwRate=mux_v->h.dwScale*(force_ofps?force_ofps:sh_video->fps); |
2531 | 552 |
2661 | 553 mux_v->codec=out_video_codec; |
2574 | 554 |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
555 mux_v->bih=NULL; |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
556 sh_video->codec=NULL; |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
557 sh_video->video_out=NULL; |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
558 sh_video->vfilter=NULL; // fixme! |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
559 |
2531 | 560 switch(mux_v->codec){ |
3384 | 561 case VCODEC_COPY: |
562 if (sh_video->bih) | |
563 mux_v->bih=sh_video->bih; | |
564 else | |
565 { | |
566 mux_v->bih=malloc(sizeof(BITMAPINFOHEADER)); | |
567 mux_v->bih->biSize=sizeof(BITMAPINFOHEADER); | |
568 mux_v->bih->biWidth=sh_video->disp_w; | |
569 mux_v->bih->biHeight=sh_video->disp_h; | |
570 mux_v->bih->biCompression=sh_video->format; | |
571 mux_v->bih->biPlanes=1; | |
572 mux_v->bih->biBitCount=24; // FIXME!!! | |
573 mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8); | |
574 } | |
575 printf("videocodec: framecopy (%dx%d %dbpp fourcc=%x)\n", | |
576 mux_v->bih->biWidth, mux_v->bih->biHeight, | |
577 mux_v->bih->biBitCount, mux_v->bih->biCompression); | |
2531 | 578 break; |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
579 case VCODEC_FRAMENO: |
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
580 mux_v->bih=malloc(sizeof(BITMAPINFOHEADER)); |
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
581 mux_v->bih->biSize=sizeof(BITMAPINFOHEADER); |
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
582 mux_v->bih->biWidth=vo_w; |
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
583 mux_v->bih->biHeight=vo_h; |
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
584 mux_v->bih->biPlanes=1; |
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
585 mux_v->bih->biBitCount=24; |
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
586 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
|
587 mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8); |
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
588 break; |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
589 default: |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
590 |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
591 switch(mux_v->codec){ |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
592 case VCODEC_DIVX4: |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
593 sh_video->vfilter=vf_open_encoder(NULL,"divx4",mux_v); break; |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
594 case VCODEC_LIBAVCODEC: |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
595 sh_video->vfilter=vf_open_encoder(NULL,"lavc",mux_v); break; |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
596 case VCODEC_RAWRGB: |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
597 sh_video->vfilter=vf_open_encoder(NULL,"rawrgb",mux_v); break; |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
598 case VCODEC_VFW: |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
599 sh_video->vfilter=vf_open_encoder(NULL,"vfw",mux_v); break; |
5578 | 600 case VCODEC_LIBDV: |
601 sh_video->vfilter=vf_open_encoder(NULL,"libdv",mux_v); break; | |
4743 | 602 } |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
603 if(!mux_v->bih || !sh_video->vfilter){ |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
604 mp_msg(MSGT_MENCODER,MSGL_FATAL,"Failed to open the encoder\n"); |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
605 mencoder_exit(1,NULL); |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
606 } |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
607 // append 'expand' filter, it fixes stride problems and renders osd: |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
608 sh_video->vfilter=vf_open_filter(sh_video->vfilter,"expand","-1:-1:-1:-1:1"); |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
609 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
|
610 |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
611 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
612 // Go through the codec.conf and find the best codec... |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
613 sh_video->inited=0; |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
614 codecs_reset_selection(0); |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
615 if(video_codec){ |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
616 // forced codec by name: |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
617 mp_msg(MSGT_CPLAYER,MSGL_INFO,"Forced video codec: %s\n",video_codec); |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
618 init_video(sh_video,video_codec,-1,-1); |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
619 } else { |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
620 int status; |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
621 // try in stability order: UNTESTED, WORKING, BUGGY, BROKEN |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
622 if(video_family>=0) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceVideoFmt,video_family); |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
623 for(status=CODECS_STATUS__MAX;status>=CODECS_STATUS__MIN;--status){ |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
624 if(video_family>=0) // try first the preferred codec family: |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
625 if(init_video(sh_video,NULL,video_family,status)) break; |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
626 if(init_video(sh_video,NULL,-1,status)) break; |
4365
9e20866c3250
added better fourcc handling for lavc, exiting if no lavc video codec name specified
alex
parents:
4355
diff
changeset
|
627 } |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
628 } |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
629 if(!sh_video->inited){ |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
630 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindVideoCodec,sh_video->format); |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
631 mp_msg(MSGT_CPLAYER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf")); |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
632 mencoder_exit(1,NULL); |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
633 } |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
634 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s video codec: [%s] drv:%d prio:%d (%s)\n", |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
635 video_codec?mp_gettext("Forcing"):mp_gettext("Detected"),sh_video->codec->name,sh_video->codec->driver,sh_video->codec->priority!=-1?sh_video->codec->priority:0,sh_video->codec->info); |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
636 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
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
|
637 |
af1f8e2d693a
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents:
3563
diff
changeset
|
638 } |
af1f8e2d693a
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents:
3563
diff
changeset
|
639 |
af1f8e2d693a
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents:
3563
diff
changeset
|
640 /* 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
|
641 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
|
642 { |
af1f8e2d693a
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents:
3563
diff
changeset
|
643 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
|
644 force_fourcc[2], force_fourcc[3]); |
af1f8e2d693a
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents:
3563
diff
changeset
|
645 printf("Forcing output fourcc to %x [%.4s]\n", |
4365
9e20866c3250
added better fourcc handling for lavc, exiting if no lavc video codec name specified
alex
parents:
4355
diff
changeset
|
646 mux_v->bih->biCompression, (char *)&mux_v->bih->biCompression); |
2531 | 647 } |
648 | |
4370 | 649 if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf! |
650 | |
2581 | 651 // ============= AUDIO =============== |
652 if(sh_audio){ | |
653 | |
654 mux_a=aviwrite_new_stream(muxer,AVIWRITE_TYPE_AUDIO); | |
655 | |
656 mux_a->buffer_size=0x100000; //16384; | |
657 mux_a->buffer=malloc(mux_a->buffer_size); | |
658 | |
659 mux_a->source=sh_audio; | |
660 | |
2661 | 661 mux_a->codec=out_audio_codec; |
2581 | 662 |
663 switch(mux_a->codec){ | |
3385 | 664 case ACODEC_COPY: |
4369 | 665 if (sh_audio->wf){ |
3385 | 666 mux_a->wf=sh_audio->wf; |
4370 | 667 if(!sh_audio->i_bps) sh_audio->i_bps=mux_a->wf->nAvgBytesPerSec; |
4369 | 668 } else { |
3385 | 669 mux_a->wf = malloc(sizeof(WAVEFORMATEX)); |
4370 | 670 mux_a->wf->nBlockAlign = 1; //mux_a->h.dwSampleSize; |
4369 | 671 mux_a->wf->wFormatTag = sh_audio->format; |
3385 | 672 mux_a->wf->nChannels = sh_audio->channels; |
673 mux_a->wf->nSamplesPerSec = sh_audio->samplerate; | |
4369 | 674 mux_a->wf->nAvgBytesPerSec=sh_audio->i_bps; //mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec; |
3480 | 675 mux_a->wf->wBitsPerSample = 16; // FIXME |
3385 | 676 mux_a->wf->cbSize=0; // FIXME for l3codeca.acm |
677 } | |
4370 | 678 if(sh_audio->audio.dwScale){ |
679 mux_a->h.dwSampleSize=sh_audio->audio.dwSampleSize; | |
680 mux_a->h.dwScale=sh_audio->audio.dwScale; | |
681 mux_a->h.dwRate=sh_audio->audio.dwRate; | |
682 } else { | |
683 mux_a->h.dwSampleSize=mux_a->wf->nBlockAlign; | |
684 mux_a->h.dwScale=mux_a->h.dwSampleSize; | |
685 mux_a->h.dwRate=mux_a->wf->nAvgBytesPerSec; | |
686 } | |
687 printf("audiocodec: framecopy (format=%x chans=%d rate=%d bits=%d bps=%d sample=%d)\n", | |
3385 | 688 mux_a->wf->wFormatTag, mux_a->wf->nChannels, mux_a->wf->nSamplesPerSec, |
4370 | 689 mux_a->wf->wBitsPerSample, mux_a->wf->nAvgBytesPerSec, mux_a->h.dwSampleSize); |
2581 | 690 break; |
2583 | 691 case ACODEC_PCM: |
692 printf("CBR PCM audio selected\n"); | |
693 mux_a->h.dwSampleSize=2*sh_audio->channels; | |
694 mux_a->h.dwScale=1; | |
695 mux_a->h.dwRate=sh_audio->samplerate; | |
696 mux_a->wf=malloc(sizeof(WAVEFORMATEX)); | |
697 mux_a->wf->nBlockAlign=mux_a->h.dwSampleSize; | |
698 mux_a->wf->wFormatTag=0x1; // PCM | |
699 mux_a->wf->nChannels=sh_audio->channels; | |
700 mux_a->wf->nSamplesPerSec=sh_audio->samplerate; | |
701 mux_a->wf->nAvgBytesPerSec=mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec; | |
702 mux_a->wf->wBitsPerSample=16; | |
703 mux_a->wf->cbSize=0; // FIXME for l3codeca.acm | |
704 break; | |
2581 | 705 case ACODEC_VBRMP3: |
3385 | 706 printf("MP3 audio selected\n"); |
2581 | 707 mux_a->h.dwSampleSize=0; // VBR |
5685 | 708 mux_a->h.dwRate=force_srate?force_srate:sh_audio->samplerate; |
709 mux_a->h.dwScale=(mux_a->h.dwRate<32000)?576:1152; // samples/frame | |
2635
c1e24e01601b
fixed AVI header creation - now should be compatible with NaNdub
arpi
parents:
2627
diff
changeset
|
710 if(sizeof(MPEGLAYER3WAVEFORMAT)!=30) mp_msg(MSGT_MENCODER,MSGL_WARN,"sizeof(MPEGLAYER3WAVEFORMAT)==%d!=30, maybe broken C compiler?\n",sizeof(MPEGLAYER3WAVEFORMAT)); |
c1e24e01601b
fixed AVI header creation - now should be compatible with NaNdub
arpi
parents:
2627
diff
changeset
|
711 mux_a->wf=malloc(sizeof(MPEGLAYER3WAVEFORMAT)); // should be 30 |
2581 | 712 mux_a->wf->wFormatTag=0x55; // MP3 |
713 mux_a->wf->nChannels=sh_audio->channels; | |
2639 | 714 mux_a->wf->nSamplesPerSec=force_srate?force_srate:sh_audio->samplerate; |
2635
c1e24e01601b
fixed AVI header creation - now should be compatible with NaNdub
arpi
parents:
2627
diff
changeset
|
715 mux_a->wf->nAvgBytesPerSec=192000/8; // FIXME! |
5685 | 716 mux_a->wf->nBlockAlign=(mux_a->h.dwRate<32000)?576:1152; // requires for l3codeca.acm + WMP 6.4 |
2635
c1e24e01601b
fixed AVI header creation - now should be compatible with NaNdub
arpi
parents:
2627
diff
changeset
|
717 mux_a->wf->wBitsPerSample=0; //16; |
c1e24e01601b
fixed AVI header creation - now should be compatible with NaNdub
arpi
parents:
2627
diff
changeset
|
718 // from NaNdub: (requires for l3codeca.acm) |
c1e24e01601b
fixed AVI header creation - now should be compatible with NaNdub
arpi
parents:
2627
diff
changeset
|
719 mux_a->wf->cbSize=12; |
c1e24e01601b
fixed AVI header creation - now should be compatible with NaNdub
arpi
parents:
2627
diff
changeset
|
720 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->wID=1; |
c1e24e01601b
fixed AVI header creation - now should be compatible with NaNdub
arpi
parents:
2627
diff
changeset
|
721 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->fdwFlags=2; |
5685 | 722 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nBlockSize=(mux_a->h.dwRate<32000)?576:1152; // ??? |
2635
c1e24e01601b
fixed AVI header creation - now should be compatible with NaNdub
arpi
parents:
2627
diff
changeset
|
723 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nFramesPerBlock=1; |
c1e24e01601b
fixed AVI header creation - now should be compatible with NaNdub
arpi
parents:
2627
diff
changeset
|
724 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nCodecDelay=0; |
2581 | 725 break; |
726 } | |
727 } | |
728 | |
2840
808fe0767cf8
fix typos - patch by Colin Marquardt <colin@marquardt-home.de>
pl
parents:
2825
diff
changeset
|
729 printf("Writing AVI header...\n"); |
2531 | 730 aviwrite_write_header(muxer,muxer_f); |
731 | |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
732 decoded_frameno=0; |
2531 | 733 |
2600 | 734 if(sh_audio) |
2583 | 735 switch(mux_a->codec){ |
3357 | 736 #ifdef HAVE_MP3LAME |
2583 | 737 case ACODEC_VBRMP3: |
738 | |
739 lame=lame_init(); | |
2591 | 740 lame_set_bWriteVbrTag(lame,0); |
2583 | 741 lame_set_in_samplerate(lame,sh_audio->samplerate); |
742 lame_set_num_channels(lame,mux_a->wf->nChannels); | |
2639 | 743 lame_set_out_samplerate(lame,mux_a->wf->nSamplesPerSec); |
2626 | 744 if(lame_param_vbr){ // VBR: |
745 lame_set_VBR(lame,lame_param_vbr); // vbr mode | |
746 lame_set_VBR_q(lame,lame_param_quality+1); // 1 = best vbr q 6=~128k | |
747 if(lame_param_br>0) lame_set_VBR_mean_bitrate_kbps(lame,lame_param_br); | |
748 } else { // CBR: | |
749 lame_set_quality(lame,lame_param_quality); // 0 = best q | |
750 if(lame_param_br>0) lame_set_brate(lame,lame_param_br); | |
751 } | |
752 if(lame_param_mode>=0) lame_set_mode(lame,lame_param_mode); // j-st | |
753 if(lame_param_ratio>0) lame_set_compression_ratio(lame,lame_param_ratio); | |
2583 | 754 lame_init_params(lame); |
2622 | 755 if(verbose){ |
2626 | 756 lame_print_config(lame); |
757 lame_print_internals(lame); | |
2622 | 758 } |
3357 | 759 break; |
760 #endif | |
2583 | 761 } |
762 | |
2531 | 763 signal(SIGINT,exit_sighandler); // Interrupt from keyboard |
764 signal(SIGQUIT,exit_sighandler); // Quit from keyboard | |
765 signal(SIGTERM,exit_sighandler); // kill | |
766 | |
4387 | 767 timer_start=GetTimerMS(); |
768 | |
4620 | 769 if (seek_to_sec) { |
770 int a,b; float d; | |
771 | |
772 if (sscanf(seek_to_sec, "%d:%d:%f", &a,&b,&d)==3) | |
773 d += 3600*a + 60*b; | |
774 else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2) | |
775 d += 60*a; | |
776 else | |
777 sscanf(seek_to_sec, "%f", &d); | |
778 | |
779 demux_seek(demuxer, d, 1); | |
780 } | |
781 | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
782 if(tv_param_on == 1) |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
783 { |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
784 fprintf(stderr,"Forcing audio preload to 0, max pts correction to 0\n"); |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
785 audio_preload = 0.0; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
786 default_max_pts_correction = 0; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
787 } |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
788 |
2531 | 789 while(!eof){ |
790 | |
2571 | 791 float frame_time=0; |
2531 | 792 int blit_frame=0; |
793 float a_pts=0; | |
794 float v_pts=0; | |
2574 | 795 unsigned char* start=NULL; |
796 int in_size; | |
2613 | 797 int skip_flag=0; // 1=skip -1=duplicate |
2531 | 798 |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
799 if((end_at_type == END_AT_SIZE && end_at <= ftello(muxer_f)) || |
4159
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
800 (end_at_type == END_AT_TIME && end_at < sh_video->timer)) |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
801 break; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
802 |
2643 | 803 if(play_n_frames>=0){ |
804 --play_n_frames; | |
805 if(play_n_frames<0) break; | |
806 } | |
807 | |
2581 | 808 if(sh_audio){ |
809 // get audio: | |
2583 | 810 while(mux_a->timer-audio_preload<mux_v->timer){ |
2653 | 811 int len=0; |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
812 |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
813 ptimer_start = GetTimerMS(); |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
814 |
2581 | 815 if(mux_a->h.dwSampleSize){ |
2605 | 816 // CBR - copy 0.5 sec of audio |
2583 | 817 switch(mux_a->codec){ |
3385 | 818 case ACODEC_COPY: // copy |
4370 | 819 len=mux_a->wf->nAvgBytesPerSec/2; |
2583 | 820 len/=mux_a->h.dwSampleSize;if(len<1) len=1; |
821 len*=mux_a->h.dwSampleSize; | |
822 len=demux_read_data(sh_audio->ds,mux_a->buffer,len); | |
823 break; | |
824 case ACODEC_PCM: | |
825 len=mux_a->h.dwSampleSize*(mux_a->h.dwRate/2); | |
2591 | 826 len=dec_audio(sh_audio,mux_a->buffer,len); |
2583 | 827 break; |
828 } | |
2581 | 829 } else { |
2605 | 830 // VBR - encode/copy an audio frame |
831 switch(mux_a->codec){ | |
3385 | 832 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
|
833 len=ds_get_packet(sh_audio->ds,(unsigned char**) &mux_a->buffer); |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
834 // printf("VBR audio framecopy not yet implemented!\n"); |
2605 | 835 break; |
3357 | 836 #ifdef HAVE_MP3LAME |
2605 | 837 case ACODEC_VBRMP3: |
2591 | 838 while(mux_a->buffer_len<4){ |
839 unsigned char tmp[2304]; | |
840 int len=dec_audio(sh_audio,tmp,2304); | |
841 if(len<=0) break; // eof | |
842 len=lame_encode_buffer_interleaved(lame, | |
843 tmp,len/4, | |
844 mux_a->buffer+mux_a->buffer_len,mux_a->buffer_size-mux_a->buffer_len); | |
845 if(len<0) break; // error | |
846 mux_a->buffer_len+=len; | |
847 } | |
848 if(mux_a->buffer_len<4) break; | |
849 len=mp_decode_mp3_header(mux_a->buffer); | |
2639 | 850 //printf("%d\n",len); |
2591 | 851 if(len<=0) break; // bad frame! |
5685 | 852 // printf("[%d]\n",mp_mp3_get_lsf(mux_a->buffer)); |
2591 | 853 while(mux_a->buffer_len<len){ |
854 unsigned char tmp[2304]; | |
855 int len=dec_audio(sh_audio,tmp,2304); | |
856 if(len<=0) break; // eof | |
857 len=lame_encode_buffer_interleaved(lame, | |
858 tmp,len/4, | |
859 mux_a->buffer+mux_a->buffer_len,mux_a->buffer_size-mux_a->buffer_len); | |
860 if(len<0) break; // error | |
861 mux_a->buffer_len+=len; | |
862 } | |
2605 | 863 break; |
3357 | 864 #endif |
2605 | 865 } |
2581 | 866 } |
2583 | 867 if(len<=0) break; // EOF? |
868 aviwrite_write_chunk(muxer,mux_a,muxer_f,len,0); | |
2655 | 869 if(!mux_a->h.dwSampleSize && mux_a->timer>0) |
3354 | 870 mux_a->wf->nAvgBytesPerSec=0.5f+(double)mux_a->size/mux_a->timer; // avg bps (VBR) |
2591 | 871 if(mux_a->buffer_len>=len){ |
872 mux_a->buffer_len-=len; | |
873 memcpy(mux_a->buffer,mux_a->buffer+len,mux_a->buffer_len); | |
874 } | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
875 |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
876 |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
877 audiosamples++; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
878 audiorate+= (GetTimerMS() - ptimer_start); |
2581 | 879 } |
880 } | |
881 | |
882 // get video frame! | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
883 |
2581 | 884 in_size=video_read_frame(sh_video,&frame_time,&start,force_fps); |
885 if(in_size<0){ eof=1; break; } | |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
886 sh_video->timer+=frame_time; ++decoded_frameno; |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
887 |
2613 | 888 v_timer_corr-=frame_time-(float)mux_v->h.dwScale/mux_v->h.dwRate; |
2531 | 889 |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
890 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
|
891 // find our frame: |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
892 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
|
893 int* start; |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
894 int len=ds_get_packet(demuxer2->video,(unsigned char**) &start); |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
895 if(len<0){ eof=1;break;} |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
896 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
|
897 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
|
898 } |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
899 if(eof) break; |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
900 // 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
|
901 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
|
902 // find next frame: |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
903 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
|
904 int* start; |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
905 int len=ds_get_packet(demuxer2->video,(unsigned char**) &start); |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
906 if(len<0){ eof=1;break;} |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
907 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
|
908 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
|
909 } |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
910 // if(eof) break; |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
911 // 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
|
912 } else { |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
913 |
2613 | 914 // check frame duplicate/drop: |
915 | |
5629 | 916 if(v_timer_corr>=(float)mux_v->h.dwScale/mux_v->h.dwRate && |
917 (skip_limit<0 || skip_flag<skip_limit) ){ | |
2613 | 918 v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate; |
919 ++skip_flag; // skip | |
920 } else | |
5629 | 921 while(v_timer_corr<=-(float)mux_v->h.dwScale/mux_v->h.dwRate && |
922 (skip_limit<0 || (-skip_flag)<skip_limit) ){ | |
2613 | 923 v_timer_corr+=(float)mux_v->h.dwScale/mux_v->h.dwRate; |
924 --skip_flag; // dup | |
925 } | |
2531 | 926 |
2613 | 927 while( (v_pts_corr<=-(float)mux_v->h.dwScale/mux_v->h.dwRate && skip_flag>0) |
928 || (v_pts_corr<=-2*(float)mux_v->h.dwScale/mux_v->h.dwRate) ){ | |
929 v_pts_corr+=(float)mux_v->h.dwScale/mux_v->h.dwRate; | |
930 --skip_flag; // dup | |
931 } | |
932 if( (v_pts_corr>=(float)mux_v->h.dwScale/mux_v->h.dwRate && skip_flag<0) | |
933 || (v_pts_corr>=2*(float)mux_v->h.dwScale/mux_v->h.dwRate) ) | |
934 if(skip_flag<=0){ // we can't skip more than 1 frame now | |
935 v_pts_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate; | |
936 ++skip_flag; // skip | |
937 } | |
938 | |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
939 } // demuxer2 |
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
940 |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
941 ptimer_start = GetTimerMS(); |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
942 |
2531 | 943 switch(mux_v->codec){ |
3384 | 944 case VCODEC_COPY: |
2574 | 945 mux_v->buffer=start; |
2639 | 946 if(skip_flag<=0) aviwrite_write_chunk(muxer,mux_v,muxer_f,in_size,(sh_video->ds->flags&1)?0x10:0); |
2574 | 947 break; |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
948 case VCODEC_FRAMENO: |
3361
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
949 mux_v->buffer=&decoded_frameno; // tricky |
3363
1459912caea5
set all frames to keyframes for -ovc frameno - allow seeking in resulting audio-only avi
arpi
parents:
3362
diff
changeset
|
950 if(skip_flag<=0) aviwrite_write_chunk(muxer,mux_v,muxer_f,sizeof(int),0x10); |
4575 | 951 break; |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
952 default: |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
953 // decode_video will callback down to ve_*.c encoders, through the video filters |
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
954 blit_frame=decode_video(sh_video,start,in_size,(skip_flag>0)?1:0); |
2639 | 955 if(skip_flag>0) break; |
5553
38697931adf4
video codecs moved to libmpencoders, crop/scale removed, use -vop for that
arpi
parents:
5546
diff
changeset
|
956 if(!blit_frame) aviwrite_write_chunk(muxer,mux_v,muxer_f,0,0); // empty. |
2531 | 957 } |
2613 | 958 |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
959 videosamples++; |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
960 videorate+=(GetTimerMS() - ptimer_start); |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
961 |
2613 | 962 if(skip_flag<0){ |
2605 | 963 // duplicate frame |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
964 if(!tv_param_on && !verbose) printf("\nduplicate %d frame(s)!!! \n",-skip_flag); |
2613 | 965 while(skip_flag<0){ |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
966 duplicatedframes++; |
2613 | 967 aviwrite_write_chunk(muxer,mux_v,muxer_f,0,0); |
968 ++skip_flag; | |
969 } | |
2639 | 970 } else |
971 if(skip_flag>0){ | |
2605 | 972 // skip frame |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
973 if(!tv_param_on && !verbose) printf("\nskip frame!!! \n"); |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
974 skippedframes++; |
2613 | 975 --skip_flag; |
2605 | 976 } |
977 | |
4367
c2be4fb65cee
3-pass encoding support (reads frame skip/dup control and audio stream from frameno.avi)
arpi
parents:
4365
diff
changeset
|
978 if(sh_audio && !demuxer2){ |
2605 | 979 float AV_delay,x; |
980 // A-V sync! | |
981 if(pts_from_bps){ | |
982 unsigned int samples=(sh_audio->audio.dwSampleSize)? | |
983 ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) : | |
984 (d_audio->pack_no); // <- used for VBR audio | |
4378 | 985 // printf("samples=%d \n",samples); |
2605 | 986 a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate; |
987 delay_corrected=1; | |
988 } else { | |
989 // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec) | |
990 a_pts=d_audio->pts; | |
991 if(!delay_corrected) if(a_pts) delay_corrected=1; | |
992 //printf("*** %5.3f ***\n",a_pts); | |
993 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; | |
994 } | |
995 v_pts=d_video->pts; | |
996 // av = compensated (with out buffering delay) A-V diff | |
2613 | 997 AV_delay=(a_pts-v_pts); AV_delay-=mux_a->timer-(mux_v->timer-(v_timer_corr+v_pts_corr)); |
2605 | 998 // compensate input video timer by av: |
999 x=AV_delay*0.1f; | |
1000 if(x<-max_pts_correction) x=-max_pts_correction; else | |
1001 if(x> max_pts_correction) x= max_pts_correction; | |
1002 if(default_max_pts_correction>=0) | |
1003 max_pts_correction=default_max_pts_correction; | |
1004 else | |
1005 max_pts_correction=sh_video->frametime*0.10; // +-10% of time | |
1006 // sh_video->timer-=x; | |
1007 c_total+=x; | |
2613 | 1008 v_pts_corr+=x; |
4387 | 1009 } |
2605 | 1010 |
4387 | 1011 // printf("A:%6.1f V:%6.1f A-V:%7.3f oAV:%7.3f diff:%7.3f ct:%7.3f vpc:%7.3f \r", |
1012 // a_pts,v_pts,a_pts-v_pts, | |
1013 // (float)(mux_a->timer-mux_v->timer), | |
1014 // AV_delay, c_total, v_pts_corr ); | |
1015 // printf("V:%6.1f \r", d_video->pts ); | |
2605 | 1016 |
1017 #if 0 | |
1018 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", | |
1019 a_pts,v_pts,a_pts-v_pts,c_total, | |
1020 (int)sh_video->num_frames,(int)sh_video->num_frames_decoded, | |
1021 (sh_video->timer>0.5)?(int)(100.0*video_time_usage/(double)sh_video->timer):0, | |
1022 (sh_video->timer>0.5)?(int)(100.0*vout_time_usage/(double)sh_video->timer):0, | |
1023 (sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0 | |
1024 ,cache_fill_status | |
1025 ); | |
1026 #endif | |
1027 | |
4387 | 1028 { float t=(GetTimerMS()-timer_start)*0.001f; |
1029 float len=(demuxer->movi_end-demuxer->movi_start); | |
1030 float p=len>1000 ? (float)(demuxer->filepos-demuxer->movi_start) / len : 0; | |
4393 | 1031 if(!len && sh_audio && sh_audio->audio.dwLength>100){ |
1032 p=(sh_audio->audio.dwSampleSize? ds_tell(sh_audio->ds)/sh_audio->audio.dwSampleSize : sh_audio->ds->pack_no) | |
1033 / (float)(sh_audio->audio.dwLength); | |
1034 } | |
4392
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1035 #if 0 |
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1036 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
|
1037 (int)demuxer->movi_start, |
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1038 (int)demuxer->filepos, |
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1039 (int)demuxer->movi_end); |
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1040 #else |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1041 if(verbose) { |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1042 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/S %d/%d \r", |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1043 mux_v->timer, decoded_frameno, (int)(p*100), |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1044 (t>1) ? (int)(decoded_frameno/t) : 0, |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1045 (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
|
1046 (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
|
1047 v_pts_corr, |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1048 (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
|
1049 (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
|
1050 audiorate/audiosamples, videorate/videosamples, |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1051 duplicatedframes, skippedframes |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1052 ); |
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1053 } else |
4394 | 1054 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %3dfps Trem:%4dmin %3dmb A-V:%5.3f [%d:%d]\r", |
4387 | 1055 mux_v->timer, decoded_frameno, (int)(p*100), |
1056 (t>1) ? (int)(decoded_frameno/t) : 0, | |
4392
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1057 (p>0.001) ? (int)((t/p-t)/60) : 0, |
4387 | 1058 (p>0.001) ? (int)(ftell(muxer_f)/p/1024/1024) : 0, |
4394 | 1059 v_pts_corr, |
1060 (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
|
1061 (mux_a && mux_a->timer>1) ? (int)(mux_a->size/mux_a->timer/125) : 0 |
4387 | 1062 ); |
4392
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1063 #endif |
4387 | 1064 } |
2605 | 1065 fflush(stdout); |
1066 | |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1067 #ifdef USE_SUB |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1068 // find sub |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1069 if(subtitles && d_video->pts>0){ |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1070 float pts=d_video->pts; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1071 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
|
1072 if (pts > sub_last_pts || pts < sub_last_pts-1.0 ) { |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1073 find_sub(subtitles,sub_uses_time?(100*(pts+sub_delay)):((pts+sub_delay)*sub_fps)); // FIXME! frame counter... |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1074 sub_last_pts = pts; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1075 } |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1076 } |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1077 #endif |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1078 |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1079 #ifdef USE_DVDREAD |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1080 // DVD sub: |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1081 if(vo_spudec){ |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1082 unsigned char* packet=NULL; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1083 int len; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1084 while((len=ds_get_packet_sub(d_dvdsub,&packet))>0){ |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1085 mp_msg(MSGT_MENCODER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f \n",len,d_video->pts,d_dvdsub->pts); |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1086 spudec_assemble(vo_spudec,packet,len,90000*d_dvdsub->pts); |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1087 } |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1088 spudec_heartbeat(vo_spudec,90000*d_video->pts); |
5670 | 1089 vo_osd_changed(OSDTYPE_SPU); |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1090 } |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5629
diff
changeset
|
1091 #endif |
2531 | 1092 |
1093 | |
1094 } // while(!eof) | |
1095 | |
3357 | 1096 #ifdef HAVE_MP3LAME |
1097 // fixup CBR mp3 audio header: | |
3354 | 1098 if(sh_audio && mux_a->codec==ACODEC_VBRMP3 && !lame_param_vbr){ |
1099 mux_a->h.dwSampleSize=1; | |
5673 | 1100 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nBlockSize= |
1101 (mux_a->size+(mux_a->h.dwLength>>1))/mux_a->h.dwLength; | |
1102 mux_a->h.dwLength=mux_a->size; | |
3354 | 1103 mux_a->h.dwRate=mux_a->wf->nAvgBytesPerSec; |
1104 mux_a->h.dwScale=1; | |
5673 | 1105 mux_a->wf->nBlockAlign=1; |
1106 printf("\n\nCBR audio: %d bytes/sec, %d bytes/block\n", | |
1107 mux_a->h.dwRate,((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nBlockSize); | |
3354 | 1108 } |
3357 | 1109 #endif |
3354 | 1110 |
2840
808fe0767cf8
fix typos - patch by Colin Marquardt <colin@marquardt-home.de>
pl
parents:
2825
diff
changeset
|
1111 printf("\nWriting AVI index...\n"); |
2531 | 1112 aviwrite_write_index(muxer,muxer_f); |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1113 muxer_f_size=ftello(muxer_f); |
2622 | 1114 printf("Fixup AVI header...\n"); |
2531 | 1115 fseek(muxer_f,0,SEEK_SET); |
1116 aviwrite_write_header(muxer,muxer_f); // update header | |
4377 | 1117 fclose(muxer_f); |
4368 | 1118 |
1119 if(out_video_codec==VCODEC_FRAMENO && mux_v->timer>100){ | |
4392
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1120 printf("Recommended video bitrate for 650MB CD: %d\n",(int)((650*1024*1024-muxer_f_size)/mux_v->timer/125)); |
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1121 printf("Recommended video bitrate for 700MB CD: %d\n",(int)((700*1024*1024-muxer_f_size)/mux_v->timer/125)); |
b50b2b0c65ea
status print fixes - DVD estimation worx, print remaining time instead of total
arpi
parents:
4388
diff
changeset
|
1122 printf("Recommended video bitrate for 800MB CD: %d\n",(int)((800*1024*1024-muxer_f_size)/mux_v->timer/125)); |
4368 | 1123 } |
1124 | |
4355 | 1125 printf("\nVideo stream: %8.3f kbit/s (%d bps) size: %d bytes %5.3f secs %d frames\n", |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1126 (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
|
1127 if(sh_audio) |
5d70491f438c
new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents:
3357
diff
changeset
|
1128 printf("\nAudio stream: %8.3f kbit/s (%d bps) size: %d bytes %5.3f secs\n", |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5569
diff
changeset
|
1129 (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
|
1130 |
2618 | 1131 if(stream) free_stream(stream); // kill cache thread |
1132 | |
3320
ac8b70dd5e45
use return 1; if interrupted - patch by Artur Skawina <skawina@geocities.com>
arpi
parents:
3240
diff
changeset
|
1133 return interrupted; |
2531 | 1134 } |
4159
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1135 |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1136 static int parse_end_at(struct config *conf, const char* param) |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1137 { |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1138 int i; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1139 |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1140 end_at_type = END_AT_NONE; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1141 |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1142 /* End at size parsing */ |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1143 { |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1144 char unit[4]; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1145 |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1146 end_at_type = END_AT_SIZE; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1147 |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1148 if(sscanf(param, "%d%3s", &end_at, unit) == 2) { |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1149 if(!strcasecmp(unit, "b")) |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1150 ; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1151 else if(!strcasecmp(unit, "kb")) |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1152 end_at *= 1024; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1153 else if(!strcasecmp(unit, "mb")) |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1154 end_at *= 1024*1024; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1155 else |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1156 end_at_type = END_AT_NONE; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1157 } |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1158 else |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1159 end_at_type = END_AT_NONE; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1160 } |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1161 |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1162 /* 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
|
1163 * sscanf("%f", ...) below */ |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1164 if(end_at_type == END_AT_NONE) |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1165 { |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1166 int a,b; float d; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1167 |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1168 end_at_type = END_AT_TIME; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1169 |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1170 if (sscanf(param, "%d:%d:%f", &a, &b, &d) == 3) |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1171 end_at = 3600*a + 60*b + d; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1172 else if (sscanf(param, "%d:%f", &a, &d) == 2) |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1173 end_at = 60*a + d; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1174 else if (sscanf(param, "%f", &d) == 1) |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1175 end_at = d; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1176 else |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1177 end_at_type = END_AT_NONE; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1178 } |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1179 |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1180 if(end_at_type == END_AT_NONE) |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1181 return ERR_FUNC_ERR; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1182 |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1183 return 1; |
42fec596fe7c
-endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4156
diff
changeset
|
1184 } |
4427
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1185 |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1186 /* 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
|
1187 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
|
1188 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
|
1189 int height) |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1190 { |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1191 uint8_t* tmp = malloc(width); |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1192 int i; |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1193 |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1194 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
|
1195 memcpy(tmp, &src[i*width], width); |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1196 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
|
1197 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
|
1198 } |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1199 |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1200 free(tmp); |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1201 return dst; |
6310422b9557
new video format: yuvrgb. patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
4408
diff
changeset
|
1202 } |
5270 | 1203 |