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