annotate mencoder.c @ 4355:4167864cfb0a

Add -nosound/-sound and -ovc null to mencoder.
author kmkaplan
date Sat, 26 Jan 2002 16:32:06 +0000
parents b0c8eed7473c
children 9e20866c3250
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
1
3384
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
2 #define VCODEC_COPY 0
3361
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
3 #define VCODEC_FRAMENO 1
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
4 #define VCODEC_DIVX4 2
3480
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
5 #define VCODEC_RAW 3
3504
21fc87d76300 support for RGB/BGR modes (tested with raw and divx4)
alex
parents: 3480
diff changeset
6 #define VCODEC_LIBAVCODEC 4
4355
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
7 #define VCODEC_NULL 5
3361
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
8
3385
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
9 #define ACODEC_COPY 0
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
10 #define ACODEC_PCM 1
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
11 #define ACODEC_VBRMP3 2
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
12
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
13 #include <stdio.h>
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
14 #include <stdlib.h>
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
15 #include <string.h>
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
16 #include <signal.h>
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
17
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
18 #include "config.h"
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
19 #include "mp_msg.h"
2978
6be2873a5a91 banner + version printed
arpi
parents: 2897
diff changeset
20 #include "version.h"
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
21 #include "help_mp.h"
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
22
2978
6be2873a5a91 banner + version printed
arpi
parents: 2897
diff changeset
23 static char* banner_text=
6be2873a5a91 banner + version printed
arpi
parents: 2897
diff changeset
24 "\n\n"
6be2873a5a91 banner + version printed
arpi
parents: 2897
diff changeset
25 "MEncoder " VERSION "(C) 2000-2001 Arpad Gereoffy (see DOCS!)\n"
6be2873a5a91 banner + version printed
arpi
parents: 2897
diff changeset
26 "\n";
6be2873a5a91 banner + version printed
arpi
parents: 2897
diff changeset
27
3323
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
28 #include "cpudetect.h"
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
29
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
30 #include "codec-cfg.h"
4343
b0c8eed7473c Extended DVD chapter specification. Remove -last-chapter option.
kmkaplan
parents: 4207
diff changeset
31 #include "cfgparser.h"
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
32
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
33 #include "stream.h"
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
34 #include "demuxer.h"
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
35 #include "stheader.h"
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
36 #include "playtree.h"
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
37
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
38 #include "aviwrite.h"
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
39
2897
283eab7c4c8e Added proper #include's for libvo2
mswitch
parents: 2887
diff changeset
40 #ifdef USE_LIBVO2
283eab7c4c8e Added proper #include's for libvo2
mswitch
parents: 2887
diff changeset
41 #include "libvo2/libvo2.h"
283eab7c4c8e Added proper #include's for libvo2
mswitch
parents: 2887
diff changeset
42 #else
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
43 #include "libvo/video_out.h"
2897
283eab7c4c8e Added proper #include's for libvo2
mswitch
parents: 2887
diff changeset
44 #endif
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
45
2574
arpi
parents: 2571
diff changeset
46 #include "dec_audio.h"
arpi
parents: 2571
diff changeset
47 #include "dec_video.h"
arpi
parents: 2571
diff changeset
48
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
49 #ifdef HAVE_DIVX4ENCORE
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
50 #include <encore2.h>
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
51 #include "divx4_vbr.h"
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
52 #endif
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
53
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
54 #ifdef HAVE_MP3LAME
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
55 #include <lame/lame.h>
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
56 #endif
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
57
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
58 #ifdef USE_LIBAVCODEC
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
59 #ifdef USE_LIBAVCODEC_SO
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
60 #include <libffmpeg/avcodec.h>
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
61 #else
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
62 #include "libavcodec/avcodec.h"
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
63 #endif
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
64 static AVCodec *lavc_venc_codec=NULL;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
65 static AVCodecContext lavc_venc_context;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
66 static AVPicture lavc_venc_picture;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
67 extern int avcodec_inited;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
68
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
69 char *lavc_param_vcodec = NULL;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
70 int lavc_param_vbitrate = -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
71 int lavc_param_vhq = 0; /* default is realtime encoding */
4207
1427d0f1f2d6 -lavcopts vme= option to set motion estimation method - patch by Rich Felker <dalias@aerifal.cx>
arpi
parents: 4176
diff changeset
72 int lavc_param_vme = 3;
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
73 int lavc_param_keyint = -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
74 #endif
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
75
3521
48f3b07e174f Patch by Adam Di Carlo <adam@onshore-devel.com>:
pl
parents: 3504
diff changeset
76 #ifdef HAVE_LIBCSS
48f3b07e174f Patch by Adam Di Carlo <adam@onshore-devel.com>:
pl
parents: 3504
diff changeset
77 #include "libmpdemux/dvdauth.h"
48f3b07e174f Patch by Adam Di Carlo <adam@onshore-devel.com>:
pl
parents: 3504
diff changeset
78 #endif
48f3b07e174f Patch by Adam Di Carlo <adam@onshore-devel.com>:
pl
parents: 3504
diff changeset
79
3236
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
80 #include <inttypes.h>
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
81 #include "../postproc/swscale.h"
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
82
3385
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
83 #include "fastmemcpy.h"
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
84
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
85 //--------------------------
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
86
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
87 // cache2:
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
88 static int stream_cache_size=0;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
89 #ifdef USE_STREAM_CACHE
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
90 extern int cache_fill_status;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
91 #else
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
92 #define cache_fill_status 0
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
93 #endif
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
94
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
95 int vcd_track=0;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
96 int audio_id=-1;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
97 int video_id=-1;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
98 int dvdsub_id=-1;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
99
4355
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
100 static int has_audio=1;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
101 char *audio_codec=NULL; // override audio codec
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
102 char *video_codec=NULL; // override video codec
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
103 int audio_family=-1; // override audio codec family
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
104 int video_family=-1; // override video codec family
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
105
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
106 #ifdef HAVE_MP3LAME
2661
11f4c2b2b70f -oac/-ovc (fake:))
arpi
parents: 2655
diff changeset
107 int out_audio_codec=ACODEC_VBRMP3;
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
108 #else
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
109 int out_audio_codec=ACODEC_PCM;
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
110 #endif
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
111
2661
11f4c2b2b70f -oac/-ovc (fake:))
arpi
parents: 2655
diff changeset
112 int out_video_codec=VCODEC_DIVX4;
11f4c2b2b70f -oac/-ovc (fake:))
arpi
parents: 2655
diff changeset
113
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
114 // audio stream skip/resync functions requires only for seeking.
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
115 // (they should be implemented in the audio codec layer)
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
116 //void skip_audio_frame(sh_audio_t *sh_audio){}
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
117 //void resync_audio_stream(sh_audio_t *sh_audio){}
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
118
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
119 int verbose=0; // must be global!
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
120
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
121 double video_time_usage=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
122 double vout_time_usage=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
123 static double audio_time_usage=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
124 static int total_time_usage_start=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
125 static int benchmark=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
126
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
127 // A-V sync:
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
128 int delay_corrected=1;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
129 static float default_max_pts_correction=-1;//0.01f;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
130 static float max_pts_correction=0;//default_max_pts_correction;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
131 static float c_total=0;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
132
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
133 float force_fps=0;
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
134 float force_ofps=0; // set to 24 for inverse telecine
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
135
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
136 int force_srate=0;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
137
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
138 char* out_filename="test.avi";
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
139 char* mp3_filename=NULL;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
140 char* ac3_filename=NULL;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
141
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
142 char *force_fourcc=NULL;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
143
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
144 #ifdef HAVE_DIVX4ENCORE
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
145 static int pass=0;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
146 static char* passtmpfile="divx2pass.log";
3377
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
147 int pass_working=0;
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
148 #endif
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
149
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
150 static int play_n_frames=-1;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
151
2661
11f4c2b2b70f -oac/-ovc (fake:))
arpi
parents: 2655
diff changeset
152 //char *out_audio_codec=NULL; // override audio codec
11f4c2b2b70f -oac/-ovc (fake:))
arpi
parents: 2655
diff changeset
153 //char *out_video_codec=NULL; // override video codec
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
154
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
155 //#include "libmpeg2/mpeg2.h"
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
156 //#include "libmpeg2/mpeg2_internal.h"
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
157
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
158 #ifdef HAVE_DIVX4ENCORE
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
159 ENC_PARAM divx4_param;
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
160 int divx4_crispness=100;
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
161 #endif
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
162
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
163 #ifdef HAVE_MP3LAME
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
164 int lame_param_quality=0; // best
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
165 int lame_param_vbr=vbr_default;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
166 int lame_param_mode=-1; // unset
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
167 int lame_param_padding=-1; // unset
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
168 int lame_param_br=-1; // unset
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
169 int lame_param_ratio=-1; // unset
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
170 #endif
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
171
3236
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
172 static int scale_srcW=0;
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
173 static int scale_srcH=0;
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
174 static int vo_w=0, vo_h=0;
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
175 //-------------------------- config stuff:
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
176
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
177 m_config_t* mconfig;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
178
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
179 static int cfg_inc_verbose(struct config *conf){ ++verbose; return 0;}
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
180
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
181 static int cfg_include(struct config *conf, char *filename){
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
182 return m_config_parse_config_file(mconfig, filename);
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
183 }
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
184
4159
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
185 static int parse_end_at(struct config *conf, const char* param);
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
186
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
187 #include "get_path.c"
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
188
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
189 #include "cfg-mplayer-def.h"
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
190 #include "cfg-mencoder.h"
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
191
4088
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
192 #ifdef USE_DVDREAD
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
193 #include "spudec.h"
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
194 #endif
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
195
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
196 //---------------------------------------------------------------------------
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
197
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
198 // mini dummy libvo:
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
199
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
200 static unsigned char* vo_image=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
201 static unsigned char* vo_image_ptr=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
202
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
203 static uint32_t draw_slice(uint8_t *src[], int stride[], int w,int h, int x0,int y0){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
204 int y;
3236
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
205 // printf("draw_slice %dx%d %d;%d\n",w,h,x0,y0);
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
206 if(scale_srcW)
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
207 {
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
208 uint8_t* dstPtr[3]= {
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
209 vo_image,
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
210 vo_image + vo_w*vo_h*5/4,
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
211 vo_image + vo_w*vo_h};
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
212 SwScale_YV12slice(src, stride, y0, h, dstPtr, vo_w, 12, scale_srcW, scale_srcH, vo_w, vo_h);
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
213 }
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
214 else
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
215 {
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
216 // copy Y:
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
217 for(y=0;y<h;y++){
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
218 unsigned char* s=src[0]+stride[0]*y;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
219 unsigned char* d=vo_image+vo_w*(y0+y)+x0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
220 memcpy(d,s,w);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
221 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
222 x0>>=1;y0>>=1;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
223 w>>=1;h>>=1;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
224 // copy U:
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
225 for(y=0;y<h;y++){
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
226 unsigned char* s=src[2]+stride[2]*y;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
227 unsigned char* d=vo_image+vo_w*vo_h+(vo_w>>1)*(y0+y)+x0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
228 memcpy(d,s,w);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
229 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
230 // copy V:
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
231 for(y=0;y<h;y++){
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
232 unsigned char* s=src[1]+stride[1]*y;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
233 unsigned char* d=vo_image+vo_w*vo_h+vo_w*vo_h/4+(vo_w>>1)*(y0+y)+x0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
234 memcpy(d,s,w);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
235 }
3236
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
236 } // !swscaler
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
237 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
238
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
239 static uint32_t draw_frame(uint8_t *src[]){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
240 // printf("This function shouldn't be called - report bug!\n");
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
241 // later: add YUY2->YV12 conversion here!
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
242 vo_image_ptr=src[0];
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
243 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
244
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
245 vo_functions_t video_out;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
246
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
247 //---------------------------------------------------------------------------
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
248
4088
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
249 void *vo_spudec=NULL;
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
250
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
251 static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
252 vo_draw_alpha_yv12(w,h,src,srca,stride,vo_image + vo_w * y0 + x0,vo_w);
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
253 }
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
254
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
255 static void draw_sub(void) {
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
256 #ifdef USE_DVDREAD
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
257 if (vo_spudec)
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
258 spudec_draw_scaled(vo_spudec, vo_w, vo_h, draw_alpha);
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
259 #endif
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
260 }
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
261
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
262 int dec_audio(sh_audio_t *sh_audio,unsigned char* buffer,int total){
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
263 int size=0;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
264 int eof=0;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
265 while(size<total && !eof){
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
266 int len=total-size;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
267 if(len>MAX_OUTBURST) len=MAX_OUTBURST;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
268 if(len>sh_audio->a_buffer_size) len=sh_audio->a_buffer_size;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
269 if(len>sh_audio->a_buffer_len){
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
270 int ret=decode_audio(sh_audio,
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
271 &sh_audio->a_buffer[sh_audio->a_buffer_len],
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
272 len-sh_audio->a_buffer_len,
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
273 sh_audio->a_buffer_size-sh_audio->a_buffer_len);
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
274 if(ret>0) sh_audio->a_buffer_len+=ret; else eof=1;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
275 }
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
276 if(len>sh_audio->a_buffer_len) len=sh_audio->a_buffer_len;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
277 memcpy(buffer+size,sh_audio->a_buffer,len);
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
278 sh_audio->a_buffer_len-=len; size+=len;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
279 if(sh_audio->a_buffer_len>0)
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
280 memcpy(sh_audio->a_buffer,&sh_audio->a_buffer[len],sh_audio->a_buffer_len);
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
281 }
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
282 return size;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
283 }
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
284
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
285 //---------------------------------------------------------------------------
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
286
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
287 static int eof=0;
3320
ac8b70dd5e45 use return 1; if interrupted - patch by Artur Skawina <skawina@geocities.com>
arpi
parents: 3240
diff changeset
288 static int interrupted=0;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
289
4159
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
290 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
291 static enum end_at_type_t end_at_type = END_AT_NONE;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
292 static int end_at;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
293
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
294 static void exit_sighandler(int x){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
295 eof=1;
3320
ac8b70dd5e45 use return 1; if interrupted - patch by Artur Skawina <skawina@geocities.com>
arpi
parents: 3240
diff changeset
296 interrupted=1;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
297 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
298
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
299 int main(int argc,char* argv[], char *envp[]){
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
300
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
301 stream_t* stream=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
302 demuxer_t* demuxer=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
303 demux_stream_t *d_audio=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
304 demux_stream_t *d_video=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
305 demux_stream_t *d_dvdsub=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
306 sh_audio_t *sh_audio=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
307 sh_video_t *sh_video=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
308 int file_format=DEMUXER_TYPE_UNKNOWN;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
309 int i;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
310 unsigned int out_fmt;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
311
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
312 aviwrite_t* muxer=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
313 aviwrite_stream_t* mux_a=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
314 aviwrite_stream_t* mux_v=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
315 FILE* muxer_f=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
316
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
317 #ifdef HAVE_DIVX4ENCORE
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
318 ENC_FRAME enc_frame;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
319 ENC_RESULT enc_result;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
320 void* enc_handle=NULL;
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
321 #endif
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
322
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
323 #ifdef HAVE_MP3LAME
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
324 lame_global_flags *lame;
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
325 #endif
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
326
2653
a863a97f3a1c WMP compatibility fixed
arpi
parents: 2643
diff changeset
327 float audio_preload=0.5;
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
328
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
329 double v_pts_corr=0;
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
330 double v_timer_corr=0;
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
331
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
332 play_tree_t* playtree;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
333 play_tree_iter_t* playtree_iter;
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
334 char* filename=NULL;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
335
3361
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
336 int decoded_frameno=0;
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
337
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
338 //int out_buffer_size=0x200000;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
339 //unsigned char* out_buffer=malloc(out_buffer_size);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
340
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
341 mp_msg_init(MSGL_STATUS);
2978
6be2873a5a91 banner + version printed
arpi
parents: 2897
diff changeset
342 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s",banner_text);
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
343
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
344 // check codec.conf
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
345 if(!parse_codec_cfg(get_path("codecs.conf"))){
3748
6da59751fb20 search codecs.conf at CONFDIR
arpi
parents: 3712
diff changeset
346 if(!parse_codec_cfg(CONFDIR"/codecs.conf")){
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
347 mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf);
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
348 exit(0);
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
349 }
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
350 }
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
351
3323
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
352 /* Test for cpu capabilities (and corresponding OS support) for optimizing */
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
353 #ifdef ARCH_X86
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
354 GetCpuCaps(&gCpuCaps);
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
355 mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: Type: %d MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n",
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
356 gCpuCaps.cpuType,gCpuCaps.hasMMX,gCpuCaps.hasMMX2,
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
357 gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
358 gCpuCaps.hasSSE, gCpuCaps.hasSSE2);
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
359 #endif
7cd9dd989662 CPU detection added
arpi
parents: 3320
diff changeset
360
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
361 #ifdef HAVE_DIVX4ENCORE
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
362 // set some defaults, before parsing configfile/commandline:
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
363 divx4_param.min_quantizer = 2;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
364 divx4_param.max_quantizer = 31;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
365 divx4_param.rc_period = 2000;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
366 divx4_param.rc_reaction_period = 10;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
367 divx4_param.rc_reaction_ratio = 20;
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
368 #endif
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
369
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
370 playtree = play_tree_new();
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
371 mconfig = m_config_new(playtree);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
372 m_config_register_options(mconfig,mencoder_opts);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
373
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
374 if(m_config_parse_command_line(mconfig, argc, argv, envp) < 0) exit(1); // error parsing cmdline
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
375 playtree = play_tree_cleanup(playtree);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
376 if(playtree) {
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
377 playtree_iter = play_tree_iter_new(playtree,mconfig);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
378 if(playtree_iter) {
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
379 if(play_tree_iter_step(playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY) {
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
380 play_tree_iter_free(playtree_iter);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
381 playtree_iter = NULL;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
382 }
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
383 filename = play_tree_iter_get_file(playtree_iter,1);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
384 }
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
385 }
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
386
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4088
diff changeset
387 if(!filename && !vcd_track && !dvd_title && !tv_param_on){
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
388 printf("\nMissing filename!\n\n");
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
389 exit(1);
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
390 }
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
391
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
392 mp_msg_init(verbose+MSGL_STATUS);
2600
51a88ac2a602 nosound fixed?
arpi
parents: 2591
diff changeset
393
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
394 stream=open_stream(filename,vcd_track,&file_format);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
395
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
396 if(!stream){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
397 printf("Cannot open file/device\n");
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
398 exit(1);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
399 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
400
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
401 printf("success: format: %d data: 0x%X - 0x%X\n",file_format, (int)(stream->start_pos),(int)(stream->end_pos));
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
402
3563
3d73514ddefc precaching
arpi
parents: 3521
diff changeset
403 if(stream_cache_size) stream_enable_cache(stream,stream_cache_size*1024,0,0);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
404
3979
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
405 #ifdef HAVE_LIBCSS
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
406 // current_module="libcss";
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
407 if (dvdimportkey) {
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
408 if (dvd_import_key(dvdimportkey)) {
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
409 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorDVDkey);
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
410 exit(1);
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
411 }
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
412 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CmdlineDVDkey);
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
413 }
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
414 if (dvd_auth_device) {
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
415 // if (dvd_auth(dvd_auth_device,f)) {
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
416 if (dvd_auth(dvd_auth_device,filename)) {
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
417 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Error in DVD auth...\n");
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
418 exit(1);
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
419 }
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
420 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_DVDauthOk);
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
421 }
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
422 #endif
b28af7b58f4c libcss support in mencoder, too
lgb
parents: 3894
diff changeset
423
4355
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
424 if(!has_audio) audio_id=-2; /* do NOT read audio packets... */
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
425
2882
2fd108f6bc68 -aid fixed
arpi
parents: 2840
diff changeset
426 //demuxer=demux_open(stream,file_format,video_id,audio_id,dvdsub_id);
2fd108f6bc68 -aid fixed
arpi
parents: 2840
diff changeset
427 demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
428 if(!demuxer){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
429 printf("Cannot open demuxer\n");
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
430 exit(1);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
431 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
432
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
433 d_audio=demuxer->audio;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
434 d_video=demuxer->video;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
435 d_dvdsub=demuxer->sub;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
436 sh_audio=d_audio->sh;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
437 sh_video=d_video->sh;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
438
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
439 if(!video_read_properties(sh_video)){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
440 printf("Couldn't read video properties\n");
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
441 exit(1);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
442 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
443
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
444 mp_msg(MSGT_MENCODER,MSGL_INFO,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n",
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
445 demuxer->file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h,
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
446 sh_video->fps,sh_video->frametime
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
447 );
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
448
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
449
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
450 sh_video->codec=NULL;
3361
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
451 if(out_video_codec>1){
2884
d69598d847e0 fourcc mapping fixed
arpi
parents: 2882
diff changeset
452
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
453 if(video_family!=-1) mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_TryForceVideoFmt,video_family);
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
454 { /* local vars */
3667
ec943f8ec439 add support for priotity <int> in codecs.conf, higher numbers are better
atmos4
parents: 3663
diff changeset
455 short bestprio=-1;
ec943f8ec439 add support for priotity <int> in codecs.conf, higher numbers are better
atmos4
parents: 3663
diff changeset
456 struct codecs_st *bestcodec=NULL;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
457 while(1){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
458 sh_video->codec=find_codec(sh_video->format,
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
459 sh_video->bih?((unsigned int*) &sh_video->bih->biCompression):NULL,sh_video->codec,0);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
460 if(!sh_video->codec){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
461 if(video_family!=-1) {
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
462 //sh_video->codec=NULL; /* re-search */
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
463 mp_msg(MSGT_MENCODER,MSGL_WARN,MSGTR_CantFindVfmtFallback);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
464 video_family=-1;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
465 continue;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
466 }
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
467 if(bestprio==-1 || !video_codec) {
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
468 mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CantFindVideoCodec,sh_video->format);
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
469 mp_msg(MSGT_MENCODER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf"));
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
470 exit(1);
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
471 }
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
472 } else {
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
473 if(video_codec && strcmp(sh_video->codec->name,video_codec)) continue;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
474 else if(video_family!=-1 && sh_video->codec->driver!=video_family) continue;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
475 else if(video_family==-1 && !video_codec && sh_video->codec->priority) {
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
476 if(sh_video->codec->priority > bestprio) {
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
477 //printf("\n\n!!! setting bestprio from %d to %d for %s!!!\n\n", bestprio, sh_video->codec->priority, sh_video->codec->name);
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
478 bestprio=sh_video->codec->priority;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
479 bestcodec=sh_video->codec;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
480 }
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
481 continue;
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
482 }
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
483 } /* sh_video->codec */
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
484 break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
485 }
3667
ec943f8ec439 add support for priotity <int> in codecs.conf, higher numbers are better
atmos4
parents: 3663
diff changeset
486 if(bestprio!=-1) {
ec943f8ec439 add support for priotity <int> in codecs.conf, higher numbers are better
atmos4
parents: 3663
diff changeset
487 //printf("chose codec %s by priority.\n", bestcodec->name);
ec943f8ec439 add support for priotity <int> in codecs.conf, higher numbers are better
atmos4
parents: 3663
diff changeset
488 sh_video->codec=bestcodec;
ec943f8ec439 add support for priotity <int> in codecs.conf, higher numbers are better
atmos4
parents: 3663
diff changeset
489 }
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
490
3712
d846a89e609a fixed priority support, tested with -vfm -vc, etc.
atmos4
parents: 3702
diff changeset
491 } /* end local vars */
3667
ec943f8ec439 add support for priotity <int> in codecs.conf, higher numbers are better
atmos4
parents: 3663
diff changeset
492
ec943f8ec439 add support for priotity <int> in codecs.conf, higher numbers are better
atmos4
parents: 3663
diff changeset
493 mp_msg(MSGT_MENCODER,MSGL_INFO,"%s video codec: [%s] drv:%d prio:%d (%s)\n",video_codec?"Forcing":"Detected",sh_video->codec->name,sh_video->codec->driver,sh_video->codec->priority!=-1?sh_video->codec->priority:0,sh_video->codec->info);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
494
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
495 for(i=0;i<CODECS_MAX_OUTFMT;i++){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
496 out_fmt=sh_video->codec->outfmt[i];
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
497 if(out_fmt==0xFFFFFFFF) continue;
3504
21fc87d76300 support for RGB/BGR modes (tested with raw and divx4)
alex
parents: 3480
diff changeset
498 if(IMGFMT_IS_RGB(out_fmt) || IMGFMT_IS_BGR(out_fmt)) break;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
499 if(out_fmt==IMGFMT_YV12) break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
500 if(out_fmt==IMGFMT_I420) break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
501 if(out_fmt==IMGFMT_IYUV) break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
502 if(out_fmt==IMGFMT_YUY2) break;
2825
c4b167e07a62 support for UYVY
arpi
parents: 2661
diff changeset
503 if(out_fmt==IMGFMT_UYVY) break;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
504 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
505 if(i>=CODECS_MAX_OUTFMT){
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
506 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_VOincompCodec);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
507 exit(1); // exit_player(MSGTR_Exit_error);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
508 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
509 sh_video->outfmtidx=i;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
510
3240
fbdb14138675 bugfix if only -x or only -y is used
michael
parents: 3236
diff changeset
511 if(out_fmt==IMGFMT_YV12 && (vo_w!=0 || vo_h!=0))
3236
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
512 {
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
513 scale_srcW= sh_video->disp_w;
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
514 scale_srcH= sh_video->disp_h;
3240
fbdb14138675 bugfix if only -x or only -y is used
michael
parents: 3236
diff changeset
515 if(!vo_w) vo_w=sh_video->disp_w;
fbdb14138675 bugfix if only -x or only -y is used
michael
parents: 3236
diff changeset
516 if(!vo_h) vo_h=sh_video->disp_h;
3236
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
517 }
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
518 else
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
519 {
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
520 vo_w=sh_video->disp_w;
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
521 vo_h=sh_video->disp_h;
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
522 }
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
523
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
524 if(out_fmt==IMGFMT_YV12 || out_fmt==IMGFMT_I420 || out_fmt==IMGFMT_IYUV){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
525 vo_image=malloc(vo_w*vo_h*3/2);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
526 vo_image_ptr=vo_image;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
527 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
528
3504
21fc87d76300 support for RGB/BGR modes (tested with raw and divx4)
alex
parents: 3480
diff changeset
529 if (IMGFMT_IS_BGR(out_fmt))
21fc87d76300 support for RGB/BGR modes (tested with raw and divx4)
alex
parents: 3480
diff changeset
530 vo_image_ptr = vo_image = malloc(vo_w*vo_h*IMGFMT_BGR_DEPTH(out_fmt)/8);
21fc87d76300 support for RGB/BGR modes (tested with raw and divx4)
alex
parents: 3480
diff changeset
531
21fc87d76300 support for RGB/BGR modes (tested with raw and divx4)
alex
parents: 3480
diff changeset
532 if (IMGFMT_IS_RGB(out_fmt))
21fc87d76300 support for RGB/BGR modes (tested with raw and divx4)
alex
parents: 3480
diff changeset
533 vo_image_ptr = vo_image = malloc(vo_w*vo_h*IMGFMT_RGB_DEPTH(out_fmt)/8);
21fc87d76300 support for RGB/BGR modes (tested with raw and divx4)
alex
parents: 3480
diff changeset
534
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
535 if(!init_video(sh_video)){
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
536 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_CouldntInitVideoCodec);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
537 exit(1);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
538 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
539
2884
d69598d847e0 fourcc mapping fixed
arpi
parents: 2882
diff changeset
540 } // if(out_video_codec)
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
541
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
542 if(sh_audio){
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
543 // Go through the codec.conf and find the best codec...
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
544 sh_audio->codec=NULL;
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
545 if(audio_family!=-1) mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_TryForceAudioFmt,audio_family);
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
546 while(1){
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
547 sh_audio->codec=find_codec(sh_audio->format,NULL,sh_audio->codec,1);
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
548 if(!sh_audio->codec){
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
549 if(audio_family!=-1) {
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
550 sh_audio->codec=NULL; /* re-search */
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
551 mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CantFindAfmtFallback);
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
552 audio_family=-1;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
553 continue;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
554 }
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
555 mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CantFindAudioCodec,sh_audio->format);
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
556 mp_msg(MSGT_MENCODER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf"));
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
557 sh_audio=d_audio->sh=NULL;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
558 break;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
559 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
560 if(audio_codec && strcmp(sh_audio->codec->name,audio_codec)) continue;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
561 else if(audio_family!=-1 && sh_audio->codec->driver!=audio_family) continue;
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
562 mp_msg(MSGT_MENCODER,MSGL_INFO,"%s audio codec: [%s] drv:%d (%s)\n",audio_codec?"Forcing":"Detected",sh_audio->codec->name,sh_audio->codec->driver,sh_audio->codec->info);
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
563 break;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
564 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
565 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
566
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
567 if(sh_audio){
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
568 mp_msg(MSGT_MENCODER,MSGL_V,"Initializing audio codec...\n");
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
569 if(!init_audio(sh_audio)){
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
570 mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CouldntInitAudioCodec);
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
571 sh_audio=d_audio->sh=NULL;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
572 } else {
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
573 mp_msg(MSGT_MENCODER,MSGL_INFO,"AUDIO: srate=%d chans=%d bps=%d sfmt=0x%X ratio: %d->%d\n",sh_audio->samplerate,sh_audio->channels,sh_audio->samplesize,
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
574 sh_audio->sample_format,sh_audio->i_bps,sh_audio->o_bps);
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
575 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
576 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
577
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
578
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
579
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
580 // set up video encoder:
3236
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
581 SwScale_Init();
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
582 video_out.draw_slice=draw_slice;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
583 video_out.draw_frame=draw_frame;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
584
4088
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
585 #ifdef USE_DVDREAD
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
586 vo_spudec=spudec_new_scaled(stream->priv?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL,
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
587 sh_video->disp_w, sh_video->disp_h);
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
588 #endif
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
589
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
590 // set up output file:
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
591 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
592 if(!muxer_f) {
bc648c6a464a fixes a segfault if file specified in -o can't be accessed
pl
parents: 2884
diff changeset
593 printf("Cannot open output file '%s'\n", out_filename);
bc648c6a464a fixes a segfault if file specified in -o can't be accessed
pl
parents: 2884
diff changeset
594 exit(1);
bc648c6a464a fixes a segfault if file specified in -o can't be accessed
pl
parents: 2884
diff changeset
595 }
bc648c6a464a fixes a segfault if file specified in -o can't be accessed
pl
parents: 2884
diff changeset
596
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
597 muxer=aviwrite_new_muxer();
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
598
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
599 // ============= VIDEO ===============
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
600
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
601 mux_v=aviwrite_new_stream(muxer,AVIWRITE_TYPE_VIDEO);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
602
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
603 mux_v->buffer_size=0x200000;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
604 mux_v->buffer=malloc(mux_v->buffer_size);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
605
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
606 mux_v->source=sh_video;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
607
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
608 mux_v->h.dwSampleSize=0; // VBR
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
609 mux_v->h.dwScale=10000;
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
610 mux_v->h.dwRate=mux_v->h.dwScale*(force_ofps?force_ofps:sh_video->fps);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
611
2661
11f4c2b2b70f -oac/-ovc (fake:))
arpi
parents: 2655
diff changeset
612 mux_v->codec=out_video_codec;
2574
arpi
parents: 2571
diff changeset
613
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
614 switch(mux_v->codec){
3384
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
615 case VCODEC_COPY:
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
616 printf("sh_video->bih: %x\n", sh_video->bih);
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
617 if (sh_video->bih)
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
618 mux_v->bih=sh_video->bih;
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
619 else
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
620 {
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
621 mux_v->bih=malloc(sizeof(BITMAPINFOHEADER));
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
622 mux_v->bih->biSize=sizeof(BITMAPINFOHEADER);
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
623 mux_v->bih->biWidth=sh_video->disp_w;
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
624 mux_v->bih->biHeight=sh_video->disp_h;
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
625 mux_v->bih->biCompression=sh_video->format;
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
626 mux_v->bih->biPlanes=1;
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
627 mux_v->bih->biBitCount=24; // FIXME!!!
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
628 mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8);
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
629 }
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
630 printf("videocodec: framecopy (%dx%d %dbpp fourcc=%x)\n",
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
631 mux_v->bih->biWidth, mux_v->bih->biHeight,
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
632 mux_v->bih->biBitCount, mux_v->bih->biCompression);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
633 break;
3480
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
634 case VCODEC_RAW:
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
635 printf("sh_video->bih: %x\n", sh_video->bih);
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
636 if (sh_video->bih)
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
637 mux_v->bih=sh_video->bih;
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
638 else
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
639 {
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
640 mux_v->bih=malloc(sizeof(BITMAPINFOHEADER));
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
641 mux_v->bih->biSize=sizeof(BITMAPINFOHEADER);
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
642 mux_v->bih->biWidth=sh_video->disp_w;
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
643 mux_v->bih->biHeight=sh_video->disp_h;
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
644 mux_v->bih->biCompression=0;
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
645 mux_v->bih->biPlanes=1;
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
646 mux_v->bih->biBitCount=24; // FIXME!!!
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
647 mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8);
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
648 }
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
649 mux_v->bih->biCompression=0;
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
650 printf("videocodec: raw (%dx%d %dbpp fourcc=%x)\n",
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
651 mux_v->bih->biWidth, mux_v->bih->biHeight,
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
652 mux_v->bih->biBitCount, mux_v->bih->biCompression);
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
653 break;
3361
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
654 case VCODEC_FRAMENO:
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
655 mux_v->bih=malloc(sizeof(BITMAPINFOHEADER));
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
656 mux_v->bih->biSize=sizeof(BITMAPINFOHEADER);
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
657 mux_v->bih->biWidth=vo_w;
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
658 mux_v->bih->biHeight=vo_h;
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
659 mux_v->bih->biPlanes=1;
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
660 mux_v->bih->biBitCount=24;
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
661 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
662 mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8);
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
663 break;
4355
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
664 case VCODEC_NULL:
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
665 mux_v->bih=malloc(sizeof(BITMAPINFOHEADER));
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
666 mux_v->bih->biSize=sizeof(BITMAPINFOHEADER);
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
667 mux_v->bih->biWidth=vo_w;
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
668 mux_v->bih->biHeight=vo_h;
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
669 mux_v->bih->biPlanes=1;
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
670 mux_v->bih->biBitCount=24;
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
671 mux_v->bih->biCompression=0;
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
672 mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8);
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
673 break;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
674 case VCODEC_DIVX4:
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
675 #ifndef HAVE_DIVX4ENCORE
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
676 printf("No support for Divx4 encore compiled in\n");
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
677 return 0; /* FIXME */
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
678 #else
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
679 mux_v->bih=malloc(sizeof(BITMAPINFOHEADER));
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
680 mux_v->bih->biSize=sizeof(BITMAPINFOHEADER);
3236
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
681 mux_v->bih->biWidth=vo_w;
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
682 mux_v->bih->biHeight=vo_h;
2635
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
683 mux_v->bih->biPlanes=1;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
684 mux_v->bih->biBitCount=24;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
685 mux_v->bih->biCompression=mmioFOURCC('d','i','v','x');
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
686 mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8);
3377
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
687
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
688 if (pass)
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
689 printf("Divx: 2-pass logfile: %s\n", passtmpfile);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
690 break;
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
691 #endif
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
692 case VCODEC_LIBAVCODEC:
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
693 #ifndef USE_LIBAVCODEC
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
694 printf("No support for FFmpeg's libavcodec compiled in\n");
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
695 return 0; /* FIXME */
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
696 #else
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
697 mux_v->bih=malloc(sizeof(BITMAPINFOHEADER));
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
698 mux_v->bih->biSize=sizeof(BITMAPINFOHEADER);
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
699 mux_v->bih->biWidth=vo_w;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
700 mux_v->bih->biHeight=vo_h;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
701 mux_v->bih->biPlanes=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
702 mux_v->bih->biBitCount=24;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
703 mux_v->bih->biCompression=mmioFOURCC(lavc_param_vcodec[0],
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
704 lavc_param_vcodec[1], lavc_param_vcodec[2], lavc_param_vcodec[3]); /* FIXME!!! */
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
705 mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8);
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
706
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
707 printf("videocodec: libavcodec (%dx%d fourcc=%x [%.4s])\n",
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
708 mux_v->bih->biWidth, mux_v->bih->biHeight, mux_v->bih->biCompression,
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
709 &mux_v->bih->biCompression);
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
710 #endif
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
711 }
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
712
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
713 /* force output fourcc to .. */
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
714 if (force_fourcc != NULL)
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
715 {
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
716 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
717 force_fourcc[2], force_fourcc[3]);
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
718 printf("Forcing output fourcc to %x [%.4s]\n",
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
719 mux_v->bih->biCompression, &mux_v->bih->biCompression);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
720 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
721
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
722 // ============= AUDIO ===============
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
723 if(sh_audio){
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
724
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
725 mux_a=aviwrite_new_stream(muxer,AVIWRITE_TYPE_AUDIO);
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
726
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
727 mux_a->buffer_size=0x100000; //16384;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
728 mux_a->buffer=malloc(mux_a->buffer_size);
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
729
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
730 mux_a->source=sh_audio;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
731
2661
11f4c2b2b70f -oac/-ovc (fake:))
arpi
parents: 2655
diff changeset
732 mux_a->codec=out_audio_codec;
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
733
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
734 switch(mux_a->codec){
3385
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
735 case ACODEC_COPY:
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
736 printf("sh_audio->wf: %x\n", sh_audio->wf);
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
737 mux_a->h.dwSampleSize=sh_audio->audio.dwSampleSize;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
738 mux_a->h.dwScale=sh_audio->audio.dwScale;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
739 mux_a->h.dwRate=sh_audio->audio.dwRate;
3385
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
740 if (sh_audio->wf)
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
741 mux_a->wf=sh_audio->wf;
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
742 else
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
743 {
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
744 mux_a->wf = malloc(sizeof(WAVEFORMATEX));
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
745 mux_a->wf->nBlockAlign = mux_a->h.dwSampleSize;
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
746 mux_a->wf->wFormatTag = sh_audio->sample_format;
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
747 mux_a->wf->nChannels = sh_audio->channels;
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
748 mux_a->wf->nSamplesPerSec = sh_audio->samplerate;
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
749 mux_a->wf->nAvgBytesPerSec=mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec;
3480
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
750 mux_a->wf->wBitsPerSample = 16; // FIXME
3385
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
751 mux_a->wf->cbSize=0; // FIXME for l3codeca.acm
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
752 }
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
753 printf("audiocodec: framecopy (format=%x chans=%d rate=%d bits=%d)\n",
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
754 mux_a->wf->wFormatTag, mux_a->wf->nChannels, mux_a->wf->nSamplesPerSec,
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
755 mux_a->wf->wBitsPerSample);
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
756 break;
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
757 case ACODEC_PCM:
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
758 printf("CBR PCM audio selected\n");
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
759 mux_a->h.dwSampleSize=2*sh_audio->channels;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
760 mux_a->h.dwScale=1;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
761 mux_a->h.dwRate=sh_audio->samplerate;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
762 mux_a->wf=malloc(sizeof(WAVEFORMATEX));
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
763 mux_a->wf->nBlockAlign=mux_a->h.dwSampleSize;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
764 mux_a->wf->wFormatTag=0x1; // PCM
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
765 mux_a->wf->nChannels=sh_audio->channels;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
766 mux_a->wf->nSamplesPerSec=sh_audio->samplerate;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
767 mux_a->wf->nAvgBytesPerSec=mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
768 mux_a->wf->wBitsPerSample=16;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
769 mux_a->wf->cbSize=0; // FIXME for l3codeca.acm
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
770 break;
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
771 case ACODEC_VBRMP3:
3385
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
772 printf("MP3 audio selected\n");
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
773 mux_a->h.dwSampleSize=0; // VBR
2653
a863a97f3a1c WMP compatibility fixed
arpi
parents: 2643
diff changeset
774 mux_a->h.dwScale=1152; // samples/frame
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
775 mux_a->h.dwRate=sh_audio->samplerate;
2635
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
776 if(sizeof(MPEGLAYER3WAVEFORMAT)!=30) mp_msg(MSGT_MENCODER,MSGL_WARN,"sizeof(MPEGLAYER3WAVEFORMAT)==%d!=30, maybe broken C compiler?\n",sizeof(MPEGLAYER3WAVEFORMAT));
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
777 mux_a->wf=malloc(sizeof(MPEGLAYER3WAVEFORMAT)); // should be 30
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
778 mux_a->wf->wFormatTag=0x55; // MP3
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
779 mux_a->wf->nChannels=sh_audio->channels;
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
780 mux_a->wf->nSamplesPerSec=force_srate?force_srate:sh_audio->samplerate;
2635
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
781 mux_a->wf->nAvgBytesPerSec=192000/8; // FIXME!
2653
a863a97f3a1c WMP compatibility fixed
arpi
parents: 2643
diff changeset
782 mux_a->wf->nBlockAlign=1152; // requires for l3codeca.acm + WMP 6.4
2635
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
783 mux_a->wf->wBitsPerSample=0; //16;
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
784 // from NaNdub: (requires for l3codeca.acm)
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
785 mux_a->wf->cbSize=12;
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
786 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->wID=1;
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
787 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->fdwFlags=2;
2653
a863a97f3a1c WMP compatibility fixed
arpi
parents: 2643
diff changeset
788 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nBlockSize=1152; // ???
2635
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
789 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nFramesPerBlock=1;
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
790 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nCodecDelay=0;
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
791 break;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
792 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
793 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
794
2840
808fe0767cf8 fix typos - patch by Colin Marquardt <colin@marquardt-home.de>
pl
parents: 2825
diff changeset
795 printf("Writing AVI header...\n");
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
796 aviwrite_write_header(muxer,muxer_f);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
797
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
798 switch(mux_v->codec){
3384
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
799 case VCODEC_COPY:
3480
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
800 case VCODEC_RAW:
4355
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
801 case VCODEC_NULL:
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
802 break;
3361
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
803 case VCODEC_FRAMENO:
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
804 decoded_frameno=0;
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
805 break;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
806 case VCODEC_DIVX4:
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
807 #ifndef HAVE_DIVX4ENCORE
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
808 printf("No support for Divx4 encore compiled in\n");
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
809 return 0; /* FIXME */
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
810 #else
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
811 // init divx4linux:
3236
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
812 divx4_param.x_dim=vo_w;
1774d0530a6d yv12 scaling (-x & -y)
michael
parents: 2978
diff changeset
813 divx4_param.y_dim=vo_h;
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
814 divx4_param.framerate=(float)mux_v->h.dwRate/mux_v->h.dwScale;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
815 if(!divx4_param.bitrate) divx4_param.bitrate=800000;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
816 else if(divx4_param.bitrate<=16000) divx4_param.bitrate*=1000;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
817 if(!divx4_param.quality) divx4_param.quality=5; // the quality of compression ( 1 - fastest, 5 - best )
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
818 divx4_param.handle=NULL;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
819 encore(NULL,ENC_OPT_INIT,&divx4_param,NULL);
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
820 enc_handle=divx4_param.handle;
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
821 switch(out_fmt){
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
822 case IMGFMT_YV12: enc_frame.colorspace=ENC_CSP_YV12; break;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
823 case IMGFMT_IYUV:
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
824 case IMGFMT_I420: enc_frame.colorspace=ENC_CSP_I420; break;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
825 case IMGFMT_YUY2: enc_frame.colorspace=ENC_CSP_YUY2; break;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
826 case IMGFMT_UYVY: enc_frame.colorspace=ENC_CSP_UYVY; break;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
827 case IMGFMT_RGB24:
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
828 case IMGFMT_BGR24:
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
829 enc_frame.colorspace=ENC_CSP_RGB24; break;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
830 default:
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
831 mp_msg(MSGT_MENCODER,MSGL_ERR,"divx4: unsupported picture format (%s)!\n",
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
832 vo_format_name(out_fmt));
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
833 }
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
834 switch(pass){
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
835 case 1:
3377
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
836 if (VbrControl_init_2pass_vbr_analysis(passtmpfile, divx4_param.quality) == -1)
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
837 {
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
838 printf("2pass failed: filename=%s\n", passtmpfile);
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
839 pass_working = 0;
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
840 }
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
841 else
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
842 pass_working = 1;
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
843 break;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
844 case 2:
3377
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
845 if (VbrControl_init_2pass_vbr_encoding(passtmpfile,
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
846 divx4_param.bitrate,
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
847 divx4_param.framerate,
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
848 divx4_crispness,
3377
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
849 divx4_param.quality) == -1)
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
850 {
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
851 printf("2pass failed: filename=%s\n", passtmpfile);
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
852 pass_working = 0;
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
853 }
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
854 else
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
855 pass_working = 1;
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
856 break;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
857 }
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
858 break;
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
859 #endif
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
860 case VCODEC_LIBAVCODEC:
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
861 #ifndef USE_LIBAVCODEC
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
862 printf("No support for FFmpeg's libavcodec compiled in\n");
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
863 #else
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
864 if (!avcodec_inited)
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
865 {
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
866 avcodec_init();
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
867 avcodec_register_all();
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
868 avcodec_inited=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
869 }
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
870
3702
e16996f5497d supporting -ofps by lavc, using avcodec_find_encoder_by_name (latest libavcodec cvs)
alex
parents: 3693
diff changeset
871 #if 0
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
872 {
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
873 extern AVCodec *first_avcodec;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
874 AVCodec *p = first_avcodec;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
875
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
876 lavc_venc_codec = NULL;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
877 while (p)
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
878 {
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
879 if (p->encode != NULL && strcmp(lavc_param_vcodec, p->name) == 0)
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
880 break;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
881 p = p->next;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
882 }
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
883 lavc_venc_codec = p;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
884 }
3691
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
885 #else
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
886 /* XXX: implement this in avcodec (i will send a patch to ffmpeglist) -- alex */
3691
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
887 lavc_venc_codec = (AVCodec *)avcodec_find_encoder_by_name(lavc_param_vcodec);
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
888 #endif
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
889
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
890 if (!lavc_venc_codec)
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
891 {
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
892 printf(MSGTR_MissingLAVCcodec, lavc_param_vcodec);
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
893 return 0; /* FIXME */
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
894 }
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
895
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
896 memset(&lavc_venc_context, 0, sizeof(lavc_venc_context));
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
897
3691
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
898 // lavc_venc_context.width = mux_v->bih->biWidth;
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
899 // lavc_venc_context.height = mux_v->bih->biHeight;
3702
e16996f5497d supporting -ofps by lavc, using avcodec_find_encoder_by_name (latest libavcodec cvs)
alex
parents: 3693
diff changeset
900 /* scaling only for YV12 (and lavc supports only YV12 ;) */
3691
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
901 lavc_venc_context.width = vo_w;
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
902 lavc_venc_context.height = vo_h;
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
903 if (lavc_param_vbitrate >= 0) /* != -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
904 lavc_venc_context.bit_rate = lavc_param_vbitrate;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
905 else
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
906 lavc_venc_context.bit_rate = 800000; /* default */
3702
e16996f5497d supporting -ofps by lavc, using avcodec_find_encoder_by_name (latest libavcodec cvs)
alex
parents: 3693
diff changeset
907 lavc_venc_context.frame_rate = (float)(force_ofps?force_ofps:sh_video->fps) * FRAME_RATE_BASE;
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
908 /* keyframe interval */
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
909 if (lavc_param_keyint >= 0) /* != -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
910 lavc_venc_context.gop_size = lavc_param_keyint;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
911 else
3691
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
912 lavc_venc_context.gop_size = 250; /* default */
3693
470d75f1e087 lavc quality fixed - using right fps
arpi
parents: 3691
diff changeset
913
3691
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
914 /* ignored by libavcodec? */
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
915 if (lavc_param_vhq)
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
916 {
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
917 printf("High quality encoding selected (non real time)!\n");
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
918 lavc_venc_context.flags = CODEC_FLAG_HQ;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
919 }
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
920 else
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
921 lavc_venc_context.flags = 0;
3691
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
922
4207
1427d0f1f2d6 -lavcopts vme= option to set motion estimation method - patch by Rich Felker <dalias@aerifal.cx>
arpi
parents: 4176
diff changeset
923 /* motion estimation (0 = none ... 3 = high quality but slow) */
1427d0f1f2d6 -lavcopts vme= option to set motion estimation method - patch by Rich Felker <dalias@aerifal.cx>
arpi
parents: 4176
diff changeset
924 /* this is just an extern from libavcodec but it should be in the
1427d0f1f2d6 -lavcopts vme= option to set motion estimation method - patch by Rich Felker <dalias@aerifal.cx>
arpi
parents: 4176
diff changeset
925 encoder context - FIXME */
1427d0f1f2d6 -lavcopts vme= option to set motion estimation method - patch by Rich Felker <dalias@aerifal.cx>
arpi
parents: 4176
diff changeset
926 motion_estimation_method = lavc_param_vme;
1427d0f1f2d6 -lavcopts vme= option to set motion estimation method - patch by Rich Felker <dalias@aerifal.cx>
arpi
parents: 4176
diff changeset
927
3691
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
928 #if 0
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
929 /* fixed qscale :p */
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
930 lavc_venc_context.flags |= CODEC_FLAG_QSCALE;
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
931 lavc_venc_context.quality = 1;
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
932 #endif
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
933
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
934 if (avcodec_open(&lavc_venc_context, lavc_venc_codec) != 0)
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
935 {
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
936 printf(MSGTR_CantOpenCodec);
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
937 return 0; /* FIXME */
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
938 }
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
939
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
940 if (lavc_venc_context.codec->encode == NULL)
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
941 {
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
942 printf("avcodec init failed (ctx->codec->encode == NULL)!\n");
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
943 return 0;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
944 }
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
945
3691
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
946 #if 1
3764
0195894e279f added support for I420 input (used by TV V4L) in lavc encoder
alex
parents: 3748
diff changeset
947 if (out_fmt != IMGFMT_YV12 && out_fmt != IMGFMT_I420)
3691
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
948 {
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
949 printf("Not supported image format! (%s)\n",
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
950 vo_format_name(out_fmt));
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
951 return 0; /* FIXME */
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
952 }
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
953
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
954 memset(&lavc_venc_picture, 0, sizeof(lavc_venc_picture));
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
955
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
956 {
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
957 int size = lavc_venc_context.width * lavc_venc_context.height;
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
958
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
959 /* Y */ lavc_venc_picture.data[0] = vo_image_ptr;
3764
0195894e279f added support for I420 input (used by TV V4L) in lavc encoder
alex
parents: 3748
diff changeset
960 if (out_fmt == IMGFMT_YV12)
0195894e279f added support for I420 input (used by TV V4L) in lavc encoder
alex
parents: 3748
diff changeset
961 {
0195894e279f added support for I420 input (used by TV V4L) in lavc encoder
alex
parents: 3748
diff changeset
962 /* U */ lavc_venc_picture.data[2] = lavc_venc_picture.data[0] + size;
0195894e279f added support for I420 input (used by TV V4L) in lavc encoder
alex
parents: 3748
diff changeset
963 /* V */ lavc_venc_picture.data[1] = lavc_venc_picture.data[2] + size/4;
0195894e279f added support for I420 input (used by TV V4L) in lavc encoder
alex
parents: 3748
diff changeset
964 }
0195894e279f added support for I420 input (used by TV V4L) in lavc encoder
alex
parents: 3748
diff changeset
965 else /* IMGFMT_I420 */
0195894e279f added support for I420 input (used by TV V4L) in lavc encoder
alex
parents: 3748
diff changeset
966 {
0195894e279f added support for I420 input (used by TV V4L) in lavc encoder
alex
parents: 3748
diff changeset
967 /* U */ lavc_venc_picture.data[1] = lavc_venc_picture.data[0] + size;
0195894e279f added support for I420 input (used by TV V4L) in lavc encoder
alex
parents: 3748
diff changeset
968 /* V */ lavc_venc_picture.data[2] = lavc_venc_picture.data[1] + size/4;
0195894e279f added support for I420 input (used by TV V4L) in lavc encoder
alex
parents: 3748
diff changeset
969 }
3691
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
970 lavc_venc_picture.linesize[0] = lavc_venc_context.width;
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
971 lavc_venc_picture.linesize[1] = lavc_venc_context.width / 2;
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
972 lavc_venc_picture.linesize[2] = lavc_venc_context.width / 2;
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
973 }
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
974 #else
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
975 switch(out_fmt)
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
976 {
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
977 case IMGFMT_YV12:
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
978 lavc_venc_context.pix_fmt = PIX_FMT_YUV420P;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
979 break;
3691
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
980 #if 0 /* it's faulting :( -- libavcodec's bug! -- alex */
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
981 case IMGFMT_YUY2: /* or UYVY */
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
982 lavc_venc_context.pix_fmt = PIX_FMT_YUV422;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
983 break;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
984 case IMGFMT_BGR24:
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
985 lavc_venc_context.pix_fmt = PIX_FMT_BGR24;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
986 break;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
987 case IMGFMT_RGB24:
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
988 lavc_venc_context.pix_fmt = PIX_FMT_RGB24;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
989 break;
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
990 #endif
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
991 default:
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
992 printf("Not supported image format! (%s)\n",
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
993 vo_format_name(out_fmt));
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
994 return 0; /* FIXME */
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
995 }
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
996
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
997 printf("Using picture format: %s\n", vo_format_name(out_fmt));
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
998
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
999 memset(&lavc_venc_picture, 0, sizeof(lavc_venc_picture));
3691
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
1000
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
1001 printf("ahh: avpict_getsize=%d, vo_image_ptr=%d\n", avpicture_get_size(lavc_venc_context.pix_fmt,
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
1002 lavc_venc_context.width, lavc_venc_context.height),
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
1003 vo_h*vo_w*3/2);
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
1004
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
1005 avpicture_fill(&lavc_venc_picture, vo_image_ptr,
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1006 lavc_venc_context.pix_fmt, lavc_venc_context.width,
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1007 lavc_venc_context.height);
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1008
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1009 {
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1010 char buf[1024];
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1011
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1012 avcodec_string((char *)&buf[0], 1023, &lavc_venc_context, 1);
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
1013 printf("%s\n", buf);
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
1014 }
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1015 #endif
3691
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
1016
ed9404084ca7 fixed scaling and colors with libavcodec (and some comments added)
alex
parents: 3667
diff changeset
1017 #endif
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1018 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1019
2600
51a88ac2a602 nosound fixed?
arpi
parents: 2591
diff changeset
1020 if(sh_audio)
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1021 switch(mux_a->codec){
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
1022 #ifdef HAVE_MP3LAME
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1023 case ACODEC_VBRMP3:
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1024
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1025 lame=lame_init();
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1026 lame_set_bWriteVbrTag(lame,0);
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1027 lame_set_in_samplerate(lame,sh_audio->samplerate);
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1028 lame_set_num_channels(lame,mux_a->wf->nChannels);
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
1029 lame_set_out_samplerate(lame,mux_a->wf->nSamplesPerSec);
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
1030 if(lame_param_vbr){ // VBR:
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
1031 lame_set_VBR(lame,lame_param_vbr); // vbr mode
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
1032 lame_set_VBR_q(lame,lame_param_quality+1); // 1 = best vbr q 6=~128k
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
1033 if(lame_param_br>0) lame_set_VBR_mean_bitrate_kbps(lame,lame_param_br);
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
1034 } else { // CBR:
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
1035 lame_set_quality(lame,lame_param_quality); // 0 = best q
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
1036 if(lame_param_br>0) lame_set_brate(lame,lame_param_br);
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
1037 }
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
1038 if(lame_param_mode>=0) lame_set_mode(lame,lame_param_mode); // j-st
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
1039 if(lame_param_ratio>0) lame_set_compression_ratio(lame,lame_param_ratio);
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1040 lame_init_params(lame);
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
1041 if(verbose){
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
1042 lame_print_config(lame);
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
1043 lame_print_internals(lame);
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
1044 }
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
1045 break;
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
1046 #endif
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1047
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1048 }
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1049
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1050 signal(SIGINT,exit_sighandler); // Interrupt from keyboard
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1051 signal(SIGQUIT,exit_sighandler); // Quit from keyboard
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1052 signal(SIGTERM,exit_sighandler); // kill
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1053
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1054 while(!eof){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1055
2571
13608ff3d1e6 simplified
arpi
parents: 2531
diff changeset
1056 float frame_time=0;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1057 int blit_frame=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1058 float a_pts=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1059 float v_pts=0;
2574
arpi
parents: 2571
diff changeset
1060 unsigned char* start=NULL;
arpi
parents: 2571
diff changeset
1061 int in_size;
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1062 int skip_flag=0; // 1=skip -1=duplicate
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1063
4159
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1064 if((end_at_type == END_AT_SIZE && end_at <= ftell(muxer_f)) ||
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1065 (end_at_type == END_AT_TIME && end_at < sh_video->timer))
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1066 break;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1067
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1068 if(play_n_frames>=0){
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1069 --play_n_frames;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1070 if(play_n_frames<0) break;
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1071 }
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1072
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1073 if(sh_audio){
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1074 // get audio:
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1075 while(mux_a->timer-audio_preload<mux_v->timer){
2653
a863a97f3a1c WMP compatibility fixed
arpi
parents: 2643
diff changeset
1076 int len=0;
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1077 if(mux_a->h.dwSampleSize){
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1078 // CBR - copy 0.5 sec of audio
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1079 switch(mux_a->codec){
3385
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
1080 case ACODEC_COPY: // copy
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1081 len=sh_audio->i_bps/2;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1082 len/=mux_a->h.dwSampleSize;if(len<1) len=1;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1083 len*=mux_a->h.dwSampleSize;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1084 len=demux_read_data(sh_audio->ds,mux_a->buffer,len);
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1085 break;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1086 case ACODEC_PCM:
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1087 len=mux_a->h.dwSampleSize*(mux_a->h.dwRate/2);
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1088 len=dec_audio(sh_audio,mux_a->buffer,len);
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1089 break;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1090 }
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1091 } else {
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1092 // VBR - encode/copy an audio frame
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1093 switch(mux_a->codec){
3385
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
1094 case ACODEC_COPY: // copy
6975a75a47fb fixed cbr audiocopy (if no sh_audio->wf)
alex
parents: 3384
diff changeset
1095 printf("VBR audio framecopy not yet implemented!\n");
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1096 break;
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
1097 #ifdef HAVE_MP3LAME
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1098 case ACODEC_VBRMP3:
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1099 while(mux_a->buffer_len<4){
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1100 unsigned char tmp[2304];
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1101 int len=dec_audio(sh_audio,tmp,2304);
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1102 if(len<=0) break; // eof
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1103 len=lame_encode_buffer_interleaved(lame,
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1104 tmp,len/4,
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1105 mux_a->buffer+mux_a->buffer_len,mux_a->buffer_size-mux_a->buffer_len);
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1106 if(len<0) break; // error
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1107 mux_a->buffer_len+=len;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1108 }
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1109 if(mux_a->buffer_len<4) break;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1110 len=mp_decode_mp3_header(mux_a->buffer);
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
1111 //printf("%d\n",len);
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1112 if(len<=0) break; // bad frame!
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1113 while(mux_a->buffer_len<len){
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1114 unsigned char tmp[2304];
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1115 int len=dec_audio(sh_audio,tmp,2304);
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1116 if(len<=0) break; // eof
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1117 len=lame_encode_buffer_interleaved(lame,
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1118 tmp,len/4,
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1119 mux_a->buffer+mux_a->buffer_len,mux_a->buffer_size-mux_a->buffer_len);
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1120 if(len<0) break; // error
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1121 mux_a->buffer_len+=len;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1122 }
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1123 break;
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
1124 #endif
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1125 }
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1126 }
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1127 if(len<=0) break; // EOF?
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
1128 aviwrite_write_chunk(muxer,mux_a,muxer_f,len,0);
2655
40fbed77bbb8 avg bps calc fixed
arpi
parents: 2653
diff changeset
1129 if(!mux_a->h.dwSampleSize && mux_a->timer>0)
3354
c68f5da1c61c Using CBR stream format for CBR mp3 audio
arpi
parents: 3323
diff changeset
1130 mux_a->wf->nAvgBytesPerSec=0.5f+(double)mux_a->size/mux_a->timer; // avg bps (VBR)
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1131 if(mux_a->buffer_len>=len){
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1132 mux_a->buffer_len-=len;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1133 memcpy(mux_a->buffer,mux_a->buffer+len,mux_a->buffer_len);
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
1134 }
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1135 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1136 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1137
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1138 // get video frame!
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1139 in_size=video_read_frame(sh_video,&frame_time,&start,force_fps);
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
1140 if(in_size<0){ eof=1; break; }
3361
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
1141 sh_video->timer+=frame_time; ++decoded_frameno;
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1142
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1143 v_timer_corr-=frame_time-(float)mux_v->h.dwScale/mux_v->h.dwRate;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1144
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1145 // check frame duplicate/drop:
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1146
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1147 if(v_timer_corr>=(float)mux_v->h.dwScale/mux_v->h.dwRate){
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1148 v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate;
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1149 ++skip_flag; // skip
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1150 } else
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1151 while(v_timer_corr<=-(float)mux_v->h.dwScale/mux_v->h.dwRate){
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1152 v_timer_corr+=(float)mux_v->h.dwScale/mux_v->h.dwRate;
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1153 --skip_flag; // dup
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1154 }
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1155
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1156 while( (v_pts_corr<=-(float)mux_v->h.dwScale/mux_v->h.dwRate && skip_flag>0)
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1157 || (v_pts_corr<=-2*(float)mux_v->h.dwScale/mux_v->h.dwRate) ){
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1158 v_pts_corr+=(float)mux_v->h.dwScale/mux_v->h.dwRate;
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1159 --skip_flag; // dup
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1160 }
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1161 if( (v_pts_corr>=(float)mux_v->h.dwScale/mux_v->h.dwRate && skip_flag<0)
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1162 || (v_pts_corr>=2*(float)mux_v->h.dwScale/mux_v->h.dwRate) )
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1163 if(skip_flag<=0){ // we can't skip more than 1 frame now
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1164 v_pts_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate;
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1165 ++skip_flag; // skip
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1166 }
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1167
4088
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
1168 #ifdef USE_DVDREAD
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
1169 // DVD sub:
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
1170 if(vo_spudec){
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
1171 unsigned char* packet=NULL;
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
1172 int len;
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
1173 while((len=ds_get_packet_sub(d_dvdsub,&packet))>0){
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
1174 mp_msg(MSGT_MENCODER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f \n",len,d_video->pts,d_dvdsub->pts);
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
1175 spudec_assemble(vo_spudec,packet,len,100*d_dvdsub->pts);
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
1176 }
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
1177 spudec_heartbeat(vo_spudec,100*d_video->pts);
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
1178 }
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
1179 #endif
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1180
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1181 switch(mux_v->codec){
3384
cff2875ad6e6 fixed framecopy
alex
parents: 3378
diff changeset
1182 case VCODEC_COPY:
2574
arpi
parents: 2571
diff changeset
1183 mux_v->buffer=start;
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
1184 if(skip_flag<=0) aviwrite_write_chunk(muxer,mux_v,muxer_f,in_size,(sh_video->ds->flags&1)?0x10:0);
2574
arpi
parents: 2571
diff changeset
1185 break;
3480
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
1186 case VCODEC_RAW:
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
1187 blit_frame=decode_video(&video_out,sh_video,start,in_size,0);
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
1188 if(skip_flag>0) break;
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
1189 if(!blit_frame){
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
1190 // empty.
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
1191 aviwrite_write_chunk(muxer,mux_v,muxer_f,0,0);
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
1192 break;
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
1193 }
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
1194 mux_v->buffer = vo_image_ptr;
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
1195 aviwrite_write_chunk(muxer,mux_v,muxer_f,mux_v->buffer_size,0x10);
9943dbacb48e vcodec_raw added
alex
parents: 3385
diff changeset
1196 break;
3361
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
1197 case VCODEC_FRAMENO:
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
1198 mux_v->buffer=&decoded_frameno; // tricky
3363
1459912caea5 set all frames to keyframes for -ovc frameno - allow seeking in resulting audio-only avi
arpi
parents: 3362
diff changeset
1199 if(skip_flag<=0) aviwrite_write_chunk(muxer,mux_v,muxer_f,sizeof(int),0x10);
3361
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
1200 break;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1201 case VCODEC_DIVX4:
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
1202 #ifndef HAVE_DIVX4ENCORE
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
1203 printf("No support for Divx4 encore compiled in\n");
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
1204 return 0; /* FIXME */
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
1205 #else
2574
arpi
parents: 2571
diff changeset
1206 blit_frame=decode_video(&video_out,sh_video,start,in_size,0);
4088
4435dc3b8bef Add DVD subtitles to menoder
kmkaplan
parents: 3979
diff changeset
1207 draw_sub();
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
1208 if(skip_flag>0) break;
2574
arpi
parents: 2571
diff changeset
1209 if(!blit_frame){
arpi
parents: 2571
diff changeset
1210 // empty.
arpi
parents: 2571
diff changeset
1211 aviwrite_write_chunk(muxer,mux_v,muxer_f,0,0);
arpi
parents: 2571
diff changeset
1212 break;
arpi
parents: 2571
diff changeset
1213 }
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1214 enc_frame.image=vo_image_ptr;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1215 enc_frame.bitstream=mux_v->buffer;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1216 enc_frame.length=mux_v->buffer_size;
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1217 enc_frame.mvs=NULL;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1218 enc_frame.quant=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1219 enc_frame.intra=0;
3377
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
1220 if(pass==2 && pass_working){ // handle 2-pass:
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
1221 enc_frame.quant = VbrControl_get_quant();
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1222 enc_frame.intra = VbrControl_get_intra();
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1223 encore(enc_handle,ENC_OPT_ENCODE_VBR,&enc_frame,&enc_result);
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1224 VbrControl_update_2pass_vbr_encoding(enc_result.motion_bits,
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1225 enc_result.texture_bits,
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1226 enc_result.total_bits);
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1227 } else {
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1228 encore(enc_handle,ENC_OPT_ENCODE,&enc_frame,&enc_result);
3377
4723f6fd750a do not fault if 2pass VbrControl can't open the logfile
alex
parents: 3363
diff changeset
1229 if(pass==1 && pass_working){
2643
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1230 VbrControl_update_2pass_vbr_analysis(enc_result.is_key_frame,
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1231 enc_result.motion_bits,
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1232 enc_result.texture_bits,
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1233 enc_result.total_bits,
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1234 enc_result.quantizer);
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1235 }
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1236 }
9d0a638e211a divx4 2-pass support, -frames option
arpi
parents: 2639
diff changeset
1237
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1238 // printf("encoding...\n");
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1239 // printf(" len=%d key:%d qualt:%d \n",enc_frame.length,enc_result.is_key_frame,enc_result.quantizer);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1240 aviwrite_write_chunk(muxer,mux_v,muxer_f,enc_frame.length,enc_result.is_key_frame?0x10:0);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1241 break;
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
1242 #endif
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
1243 case VCODEC_LIBAVCODEC:
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1244 {
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1245 #ifndef USE_LIBAVCODEC
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1246 printf("No support for FFmpeg's libavcodec compiled in\n");
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1247 #else
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1248 int out_size;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1249
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1250 blit_frame=decode_video(&video_out,sh_video,start,in_size,0);
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1251 if(skip_flag>0) break;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1252 if(!blit_frame){
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1253 // empty.
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1254 aviwrite_write_chunk(muxer,mux_v,muxer_f,0,0);
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1255 break;
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1256 }
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1257
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1258 out_size = avcodec_encode_video(&lavc_venc_context, mux_v->buffer, mux_v->buffer_size,
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1259 &lavc_venc_picture);
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1260 // printf("out_size = %d\n", out_size);
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1261 aviwrite_write_chunk(muxer,mux_v,muxer_f,out_size,lavc_venc_context.key_frame?0x10:0);
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1262 #endif
af1f8e2d693a added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
alex
parents: 3563
diff changeset
1263 }
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1264 }
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1265
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1266 if(skip_flag<0){
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1267 // duplicate frame
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1268 printf("\nduplicate %d frame(s)!!! \n",-skip_flag);
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1269 while(skip_flag<0){
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1270 aviwrite_write_chunk(muxer,mux_v,muxer_f,0,0);
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1271 ++skip_flag;
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1272 }
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
1273 } else
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
1274 if(skip_flag>0){
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1275 // skip frame
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1276 printf("\nskip frame!!! \n");
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1277 --skip_flag;
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1278 }
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1279
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1280 if(sh_audio){
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1281 float AV_delay,x;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1282 // A-V sync!
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1283 if(pts_from_bps){
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1284 unsigned int samples=(sh_audio->audio.dwSampleSize)?
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1285 ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) :
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1286 (d_audio->pack_no); // <- used for VBR audio
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1287 a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1288 delay_corrected=1;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1289 } else {
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1290 // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec)
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1291 a_pts=d_audio->pts;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1292 if(!delay_corrected) if(a_pts) delay_corrected=1;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1293 //printf("*** %5.3f ***\n",a_pts);
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1294 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1295 }
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1296 v_pts=d_video->pts;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1297 // av = compensated (with out buffering delay) A-V diff
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1298 AV_delay=(a_pts-v_pts); AV_delay-=mux_a->timer-(mux_v->timer-(v_timer_corr+v_pts_corr));
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1299 // compensate input video timer by av:
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1300 x=AV_delay*0.1f;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1301 if(x<-max_pts_correction) x=-max_pts_correction; else
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1302 if(x> max_pts_correction) x= max_pts_correction;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1303 if(default_max_pts_correction>=0)
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1304 max_pts_correction=default_max_pts_correction;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1305 else
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1306 max_pts_correction=sh_video->frametime*0.10; // +-10% of time
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1307 // sh_video->timer-=x;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1308 c_total+=x;
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1309 v_pts_corr+=x;
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1310
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1311 printf("A:%6.1f V:%6.1f A-V:%7.3f oAV:%7.3f diff:%7.3f ct:%7.3f vpc:%7.3f \r",
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1312 a_pts,v_pts,a_pts-v_pts,
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1313 (float)(mux_a->timer-mux_v->timer),
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
1314 AV_delay, c_total, v_pts_corr );
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1315
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1316 }
4355
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
1317 else
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
1318 printf("V:%6.1f \r", d_video->pts );
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1319
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1320 #if 0
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1321 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A:%6.1f V:%6.1f A-V:%7.3f ct:%7.3f %3d/%3d %2d%% %2d%% %4.1f%% %d%%\r",
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1322 a_pts,v_pts,a_pts-v_pts,c_total,
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1323 (int)sh_video->num_frames,(int)sh_video->num_frames_decoded,
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1324 (sh_video->timer>0.5)?(int)(100.0*video_time_usage/(double)sh_video->timer):0,
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1325 (sh_video->timer>0.5)?(int)(100.0*vout_time_usage/(double)sh_video->timer):0,
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1326 (sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1327 ,cache_fill_status
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1328 );
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1329 #endif
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1330
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1331 fflush(stdout);
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
1332
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1333
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1334
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1335 } // while(!eof)
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1336
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
1337 #ifdef HAVE_MP3LAME
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
1338 // fixup CBR mp3 audio header:
3354
c68f5da1c61c Using CBR stream format for CBR mp3 audio
arpi
parents: 3323
diff changeset
1339 if(sh_audio && mux_a->codec==ACODEC_VBRMP3 && !lame_param_vbr){
c68f5da1c61c Using CBR stream format for CBR mp3 audio
arpi
parents: 3323
diff changeset
1340 mux_a->h.dwSampleSize=1;
c68f5da1c61c Using CBR stream format for CBR mp3 audio
arpi
parents: 3323
diff changeset
1341 mux_a->h.dwRate=mux_a->wf->nAvgBytesPerSec;
c68f5da1c61c Using CBR stream format for CBR mp3 audio
arpi
parents: 3323
diff changeset
1342 mux_a->h.dwScale=1;
c68f5da1c61c Using CBR stream format for CBR mp3 audio
arpi
parents: 3323
diff changeset
1343 printf("\n\nCBR audio effective bitrate: %8.3f kbit/s (%d bytes/sec)\n",
c68f5da1c61c Using CBR stream format for CBR mp3 audio
arpi
parents: 3323
diff changeset
1344 mux_a->h.dwRate*8.0f/1000.0f,mux_a->h.dwRate);
c68f5da1c61c Using CBR stream format for CBR mp3 audio
arpi
parents: 3323
diff changeset
1345 }
3357
1fa5d7dda911 libmp3lame optional
arpi
parents: 3354
diff changeset
1346 #endif
3354
c68f5da1c61c Using CBR stream format for CBR mp3 audio
arpi
parents: 3323
diff changeset
1347
3663
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
1348 #ifdef USE_LIBAVCODEC
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
1349 if (mux_v->codec == VCODEC_LIBAVCODEC)
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
1350 avcodec_close(&lavc_venc_context);
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
1351 #endif
9092546e7765 made divx4 optional (also configure checking needed) and added avcodec_close
alex
parents: 3657
diff changeset
1352
2840
808fe0767cf8 fix typos - patch by Colin Marquardt <colin@marquardt-home.de>
pl
parents: 2825
diff changeset
1353 printf("\nWriting AVI index...\n");
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1354 aviwrite_write_index(muxer,muxer_f);
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
1355 printf("Fixup AVI header...\n");
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1356 fseek(muxer_f,0,SEEK_SET);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1357 aviwrite_write_header(muxer,muxer_f); // update header
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1358 fclose(muxer_f);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1359
4355
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
1360 printf("\nVideo stream: %8.3f kbit/s (%d bps) size: %d bytes %5.3f secs %d frames\n",
4167864cfb0a Add -nosound/-sound and -ovc null to mencoder.
kmkaplan
parents: 4343
diff changeset
1361 (float)(mux_v->size/mux_v->timer*8.0f/1000.0f), (int)(mux_v->size/mux_v->timer), 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
1362 if(sh_audio)
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
1363 printf("\nAudio stream: %8.3f kbit/s (%d bps) size: %d bytes %5.3f secs\n",
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
1364 (float)(mux_a->size/mux_a->timer*8.0f/1000.0f), (int)(mux_a->size/mux_a->timer), mux_a->size, (float)mux_a->timer);
5d70491f438c new video codec: frameno (just the number of frame - for 3-pass encoding)
arpi
parents: 3357
diff changeset
1365
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
1366 if(stream) free_stream(stream); // kill cache thread
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
1367
3320
ac8b70dd5e45 use return 1; if interrupted - patch by Artur Skawina <skawina@geocities.com>
arpi
parents: 3240
diff changeset
1368 return interrupted;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1369 }
4159
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1370
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1371 static int parse_end_at(struct config *conf, const char* param)
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1372 {
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1373 int i;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1374
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1375 end_at_type = END_AT_NONE;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1376
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1377 /* End at size parsing */
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1378 {
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1379 char unit[4];
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1380
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1381 end_at_type = END_AT_SIZE;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1382
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1383 if(sscanf(param, "%d%3s", &end_at, unit) == 2) {
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1384 if(!strcasecmp(unit, "b"))
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1385 ;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1386 else if(!strcasecmp(unit, "kb"))
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1387 end_at *= 1024;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1388 else if(!strcasecmp(unit, "mb"))
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1389 end_at *= 1024*1024;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1390 else
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1391 end_at_type = END_AT_NONE;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1392 }
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1393 else
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1394 end_at_type = END_AT_NONE;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1395 }
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1396
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1397 /* 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
1398 * sscanf("%f", ...) below */
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1399 if(end_at_type == END_AT_NONE)
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1400 {
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1401 int a,b; float d;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1402
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1403 end_at_type = END_AT_TIME;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1404
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1405 if (sscanf(param, "%d:%d:%f", &a, &b, &d) == 3)
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1406 end_at = 3600*a + 60*b + d;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1407 else if (sscanf(param, "%d:%f", &a, &d) == 2)
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1408 end_at = 60*a + d;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1409 else if (sscanf(param, "%f", &d) == 1)
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1410 end_at = d;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1411 else
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1412 end_at_type = END_AT_NONE;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1413 }
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1414
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1415 if(end_at_type == END_AT_NONE)
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1416 return ERR_FUNC_ERR;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1417
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1418 return 1;
42fec596fe7c -endpos option, patch by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 4156
diff changeset
1419 }