annotate mencoder.c @ 3755:b805040d6645

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