annotate mencoder.c @ 2639:511f1983e0f0

-srate and -pp 0 fixes
author arpi
date Fri, 02 Nov 2001 20:05:36 +0000
parents c1e24e01601b
children 9d0a638e211a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
1
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
2 #define VCODEC_DIVX4 1
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
3 #define ACODEC_PCM 1
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
4 #define ACODEC_VBRMP3 2
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
5
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
6 #include <stdio.h>
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
7 #include <stdlib.h>
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
8 #include <string.h>
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
9 #include <signal.h>
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
10
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
11 #include "config.h"
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
12 #include "mp_msg.h"
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
13 #include "help_mp.h"
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
14
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
15 #include "codec-cfg.h"
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
16
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
17 #include "stream.h"
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
18 #include "demuxer.h"
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
19 #include "stheader.h"
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
20
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
21 #include "aviwrite.h"
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
22
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
23 #include "libvo/video_out.h"
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
24
2574
arpi
parents: 2571
diff changeset
25 #include "dec_audio.h"
arpi
parents: 2571
diff changeset
26 #include "dec_video.h"
arpi
parents: 2571
diff changeset
27
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
28 #include <encore2.h>
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
29
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
30 #include <lame/lame.h>
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
31
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
32 //--------------------------
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
33
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
34 // cache2:
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
35 static int stream_cache_size=0;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
36 #ifdef USE_STREAM_CACHE
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
37 extern int cache_fill_status;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
38 #else
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
39 #define cache_fill_status 0
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
40 #endif
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
41
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
42 int vcd_track=0;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
43 int audio_id=-1;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
44 int video_id=-1;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
45 int dvdsub_id=-1;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
46
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
47 char *audio_codec=NULL; // override audio codec
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
48 char *video_codec=NULL; // override video codec
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
49 int audio_family=-1; // override audio codec family
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
50 int video_family=-1; // override video codec family
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
51
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
52 // audio stream skip/resync functions requires only for seeking.
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
53 // (they should be implemented in the audio codec layer)
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
54 //void skip_audio_frame(sh_audio_t *sh_audio){}
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
55 //void resync_audio_stream(sh_audio_t *sh_audio){}
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
56
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
57 int verbose=0; // must be global!
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
58
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
59 double video_time_usage=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
60 double vout_time_usage=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
61 static double audio_time_usage=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
62 static int total_time_usage_start=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
63 static int benchmark=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
64
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
65 // A-V sync:
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
66 int delay_corrected=1;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
67 static float default_max_pts_correction=-1;//0.01f;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
68 static float max_pts_correction=0;//default_max_pts_correction;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
69 static float c_total=0;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
70
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
71 float force_fps=0;
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
72 float force_ofps=0; // set to 24 for inverse telecine
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
73
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
74 int force_srate=0;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
75
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
76 char* out_filename="test.avi";
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
77 char* mp3_filename=NULL;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
78 char* ac3_filename=NULL;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
79
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
80 char *out_audio_codec=NULL; // override audio codec
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
81 char *out_video_codec=NULL; // override video codec
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
82
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
83 //#include "libmpeg2/mpeg2.h"
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
84 //#include "libmpeg2/mpeg2_internal.h"
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
85
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
86 ENC_PARAM divx4_param;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
87
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
88 int lame_param_quality=0; // best
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
89 int lame_param_vbr=vbr_default;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
90 int lame_param_mode=-1; // unset
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
91 int lame_param_padding=-1; // unset
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
92 int lame_param_br=-1; // unset
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
93 int lame_param_ratio=-1; // unset
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
94
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
95 //-------------------------- config stuff:
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
96
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
97 #include "cfgparser.h"
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
98
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
99 static int cfg_inc_verbose(struct config *conf){ ++verbose; return 0;}
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
100
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
101 static int cfg_include(struct config *conf, char *filename){
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
102 return parse_config_file(conf, filename);
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
103 }
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
104
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
105 #include "get_path.c"
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
106
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
107 #include "cfg-mplayer-def.h"
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
108 #include "cfg-mencoder.h"
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
109
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
110 //---------------------------------------------------------------------------
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
111
2627
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
112 // dummy datas for gui :(
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
113
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
114 #ifdef HAVE_NEW_GUI
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
115 float rel_seek_secs=0;
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
116 int abs_seek_pos=0;
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
117 int use_gui=0;
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
118
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
119 void exit_player(char* how){
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
120 }
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
121 void vo_x11_putkey(int key){
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
122 }
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
123 void vo_setwindow( int w,int g ) {
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
124 }
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
125 void vo_setwindowsize( int w,int h ) {
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
126 }
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
127
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
128 int vo_resize = 0;
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
129 int vo_expose = 0;
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
130
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
131 #endif
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
132 // ---
29bc08cc8e43 kurva gui.
pontscho
parents: 2626
diff changeset
133
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
134 // mini dummy libvo:
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
135
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
136 static unsigned char* vo_image=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
137 static unsigned char* vo_image_ptr=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
138 static int vo_w,vo_h;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
139
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
140 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
141 int y;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
142 // printf("draw_slice %dx%d %d;%d\n",w,h,x,y);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
143
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
144 // copy Y:
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
145 for(y=0;y<h;y++){
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
146 unsigned char* s=src[0]+stride[0]*y;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
147 unsigned char* d=vo_image+vo_w*(y0+y)+x0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
148 memcpy(d,s,w);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
149 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
150 x0>>=1;y0>>=1;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
151 w>>=1;h>>=1;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
152 // copy U:
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
153 for(y=0;y<h;y++){
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
154 unsigned char* s=src[2]+stride[2]*y;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
155 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
156 memcpy(d,s,w);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
157 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
158 // copy V:
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
159 for(y=0;y<h;y++){
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
160 unsigned char* s=src[1]+stride[1]*y;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
161 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
162 memcpy(d,s,w);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
163 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
164
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
165 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
166
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
167 static uint32_t draw_frame(uint8_t *src[]){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
168 // printf("This function shouldn't be called - report bug!\n");
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
169 // later: add YUY2->YV12 conversion here!
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
170 vo_image_ptr=src[0];
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
171 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
172
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
173 vo_functions_t video_out;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
174
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
175 //---------------------------------------------------------------------------
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
176
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
177 int dec_audio(sh_audio_t *sh_audio,unsigned char* buffer,int total){
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
178 int size=0;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
179 int eof=0;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
180 while(size<total && !eof){
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
181 int len=total-size;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
182 if(len>MAX_OUTBURST) len=MAX_OUTBURST;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
183 if(len>sh_audio->a_buffer_size) len=sh_audio->a_buffer_size;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
184 if(len>sh_audio->a_buffer_len){
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
185 int ret=decode_audio(sh_audio,
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
186 &sh_audio->a_buffer[sh_audio->a_buffer_len],
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
187 len-sh_audio->a_buffer_len,
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
188 sh_audio->a_buffer_size-sh_audio->a_buffer_len);
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
189 if(ret>0) sh_audio->a_buffer_len+=ret; else eof=1;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
190 }
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
191 if(len>sh_audio->a_buffer_len) len=sh_audio->a_buffer_len;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
192 memcpy(buffer+size,sh_audio->a_buffer,len);
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
193 sh_audio->a_buffer_len-=len; size+=len;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
194 if(sh_audio->a_buffer_len>0)
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
195 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
196 }
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
197 return size;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
198 }
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
199
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
200 //---------------------------------------------------------------------------
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
201
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
202 static int eof=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
203
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
204 static void exit_sighandler(int x){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
205 eof=1;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
206 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
207
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
208 int main(int argc,char* argv[], char *envp[]){
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
209
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
210 stream_t* stream=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
211 demuxer_t* demuxer=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
212 demux_stream_t *d_audio=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
213 demux_stream_t *d_video=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
214 demux_stream_t *d_dvdsub=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
215 sh_audio_t *sh_audio=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
216 sh_video_t *sh_video=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
217 int file_format=DEMUXER_TYPE_UNKNOWN;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
218 int i;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
219 unsigned int out_fmt;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
220
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
221 aviwrite_t* muxer=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
222 aviwrite_stream_t* mux_a=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
223 aviwrite_stream_t* mux_v=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
224 FILE* muxer_f=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
225
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
226 ENC_FRAME enc_frame;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
227 ENC_RESULT enc_result;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
228 void* enc_handle=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
229
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
230 lame_global_flags *lame;
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
231
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
232 float audio_preload=0.3;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
233
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
234 double v_pts_corr=0;
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
235 double v_timer_corr=0;
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
236
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
237 char** filenames=NULL;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
238 char* filename=NULL;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
239 int num_filenames;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
240
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
241 //int out_buffer_size=0x200000;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
242 //unsigned char* out_buffer=malloc(out_buffer_size);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
243
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
244 mp_msg_init(MSGL_STATUS);
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
245
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
246 // check codec.conf
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
247 if(!parse_codec_cfg(get_path("codecs.conf"))){
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
248 if(!parse_codec_cfg(DATADIR"/codecs.conf")){
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
249 mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf);
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
250 exit(0);
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
251 }
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
252 }
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
253
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
254 num_filenames=parse_command_line(conf, argc, argv, envp, &filenames);
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
255 if(num_filenames<0) exit(1); // error parsing cmdline
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
256 if(!num_filenames && !vcd_track && !dvd_title){
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
257 printf("\nMissing filename!\n\n");
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
258 exit(1);
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
259 }
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
260
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
261 mp_msg_init(verbose+MSGL_STATUS);
2600
51a88ac2a602 nosound fixed?
arpi
parents: 2591
diff changeset
262
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
263 filename=(num_filenames>0)?filenames[0]:NULL;
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
264 stream=open_stream(filename,vcd_track,&file_format);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
265
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
266 if(!stream){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
267 printf("Cannot open file/device\n");
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
268 exit(1);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
269 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
270
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
271 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
272
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
273 if(stream_cache_size) stream_enable_cache(stream,stream_cache_size*1024);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
274
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
275 demuxer=demux_open(stream,file_format,video_id,audio_id,dvdsub_id);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
276 if(!demuxer){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
277 printf("Cannot open demuxer\n");
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
278 exit(1);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
279 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
280
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
281 d_audio=demuxer->audio;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
282 d_video=demuxer->video;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
283 d_dvdsub=demuxer->sub;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
284 sh_audio=d_audio->sh;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
285 sh_video=d_video->sh;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
286
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
287 if(!video_read_properties(sh_video)){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
288 printf("Couldn't read video properties\n");
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
289 exit(1);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
290 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
291
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
292 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
293 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
294 sh_video->fps,sh_video->frametime
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
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
297
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
298 sh_video->codec=NULL;
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
299 if(video_family!=-1) mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_TryForceVideoFmt,video_family);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
300 while(1){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
301 sh_video->codec=find_codec(sh_video->format,
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
302 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
303 if(!sh_video->codec){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
304 if(video_family!=-1) {
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
305 sh_video->codec=NULL; /* re-search */
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
306 mp_msg(MSGT_MENCODER,MSGL_WARN,MSGTR_CantFindVfmtFallback);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
307 video_family=-1;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
308 continue;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
309 }
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
310 mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CantFindVideoCodec,sh_video->format);
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
311 mp_msg(MSGT_MENCODER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf"));
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
312 exit(1);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
313 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
314 if(video_codec && strcmp(sh_video->codec->name,video_codec)) continue;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
315 else if(video_family!=-1 && sh_video->codec->driver!=video_family) continue;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
316 break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
317 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
318
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
319 mp_msg(MSGT_MENCODER,MSGL_INFO,"%s video codec: [%s] drv:%d (%s)\n",video_codec?"Forcing":"Detected",sh_video->codec->name,sh_video->codec->driver,sh_video->codec->info);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
320
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
321 for(i=0;i<CODECS_MAX_OUTFMT;i++){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
322 out_fmt=sh_video->codec->outfmt[i];
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
323 if(out_fmt==0xFFFFFFFF) continue;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
324 if(out_fmt==IMGFMT_YV12) break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
325 if(out_fmt==IMGFMT_I420) break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
326 if(out_fmt==IMGFMT_IYUV) break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
327 if(out_fmt==IMGFMT_YUY2) break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
328 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
329 if(i>=CODECS_MAX_OUTFMT){
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
330 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_VOincompCodec);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
331 exit(1); // exit_player(MSGTR_Exit_error);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
332 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
333 sh_video->outfmtidx=i;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
334
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
335 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
336 vo_w=sh_video->disp_w;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
337 vo_h=sh_video->disp_h;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
338 vo_image=malloc(vo_w*vo_h*3/2);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
339 vo_image_ptr=vo_image;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
340 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
341
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
342 if(!init_video(sh_video)){
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
343 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_CouldntInitVideoCodec);
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
344 exit(1);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
345 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
346
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
347
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
348 if(sh_audio){
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
349 // Go through the codec.conf and find the best codec...
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
350 sh_audio->codec=NULL;
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
351 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
352 while(1){
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
353 sh_audio->codec=find_codec(sh_audio->format,NULL,sh_audio->codec,1);
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
354 if(!sh_audio->codec){
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
355 if(audio_family!=-1) {
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
356 sh_audio->codec=NULL; /* re-search */
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
357 mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CantFindAfmtFallback);
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
358 audio_family=-1;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
359 continue;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
360 }
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
361 mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CantFindAudioCodec,sh_audio->format);
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
362 mp_msg(MSGT_MENCODER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf"));
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
363 sh_audio=d_audio->sh=NULL;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
364 break;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
365 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
366 if(audio_codec && strcmp(sh_audio->codec->name,audio_codec)) continue;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
367 else if(audio_family!=-1 && sh_audio->codec->driver!=audio_family) continue;
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
368 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
369 break;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
370 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
371 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
372
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
373 if(sh_audio){
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
374 mp_msg(MSGT_MENCODER,MSGL_V,"Initializing audio codec...\n");
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
375 if(!init_audio(sh_audio)){
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
376 mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CouldntInitAudioCodec);
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
377 sh_audio=d_audio->sh=NULL;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
378 } else {
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
379 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
380 sh_audio->sample_format,sh_audio->i_bps,sh_audio->o_bps);
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
381 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
382 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
383
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
384
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
385
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
386 // set up video encoder:
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
387 video_out.draw_slice=draw_slice;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
388 video_out.draw_frame=draw_frame;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
389
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
390 // set up output file:
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
391 muxer_f=fopen(out_filename,"wb");
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
392 muxer=aviwrite_new_muxer();
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
393
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
394 // ============= VIDEO ===============
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
395
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
396 mux_v=aviwrite_new_stream(muxer,AVIWRITE_TYPE_VIDEO);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
397
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
398 mux_v->buffer_size=0x200000;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
399 mux_v->buffer=malloc(mux_v->buffer_size);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
400
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
401 mux_v->source=sh_video;
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 mux_v->h.dwSampleSize=0; // VBR
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
404 mux_v->h.dwScale=10000;
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
405 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
406
2574
arpi
parents: 2571
diff changeset
407 mux_v->codec=VCODEC_DIVX4; // 0=streamcopy
arpi
parents: 2571
diff changeset
408
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
409 switch(mux_v->codec){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
410 case 0:
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
411 mux_v->bih=sh_video->bih;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
412 break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
413 case VCODEC_DIVX4:
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
414 mux_v->bih=malloc(sizeof(BITMAPINFOHEADER));
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
415 mux_v->bih->biSize=sizeof(BITMAPINFOHEADER);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
416 mux_v->bih->biWidth=sh_video->disp_w;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
417 mux_v->bih->biHeight=sh_video->disp_h;
2635
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
418 mux_v->bih->biPlanes=1;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
419 mux_v->bih->biBitCount=24;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
420 mux_v->bih->biCompression=mmioFOURCC('d','i','v','x');
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
421 mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
422 break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
423 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
424
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
425 // ============= AUDIO ===============
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
426 if(sh_audio){
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
427
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
428 mux_a=aviwrite_new_stream(muxer,AVIWRITE_TYPE_AUDIO);
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
429
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
430 mux_a->buffer_size=0x100000; //16384;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
431 mux_a->buffer=malloc(mux_a->buffer_size);
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
432
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
433 mux_a->source=sh_audio;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
434
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
435 //mux_a->codec=ACODEC_PCM; // 0=streamcopy
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
436 mux_a->codec=ACODEC_VBRMP3; // 0=streamcopy
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
437
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
438 switch(mux_a->codec){
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
439 case 0:
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
440 mux_a->h.dwSampleSize=sh_audio->audio.dwSampleSize;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
441 mux_a->h.dwScale=sh_audio->audio.dwScale;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
442 mux_a->h.dwRate=sh_audio->audio.dwRate;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
443 mux_a->wf=sh_audio->wf;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
444 break;
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
445 case ACODEC_PCM:
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
446 printf("CBR PCM audio selected\n");
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
447 mux_a->h.dwSampleSize=2*sh_audio->channels;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
448 mux_a->h.dwScale=1;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
449 mux_a->h.dwRate=sh_audio->samplerate;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
450 mux_a->wf=malloc(sizeof(WAVEFORMATEX));
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
451 mux_a->wf->nBlockAlign=mux_a->h.dwSampleSize;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
452 mux_a->wf->wFormatTag=0x1; // PCM
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
453 mux_a->wf->nChannels=sh_audio->channels;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
454 mux_a->wf->nSamplesPerSec=sh_audio->samplerate;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
455 mux_a->wf->nAvgBytesPerSec=mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
456 mux_a->wf->wBitsPerSample=16;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
457 mux_a->wf->cbSize=0; // FIXME for l3codeca.acm
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
458 break;
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
459 case ACODEC_VBRMP3:
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
460 mux_a->h.dwSampleSize=0; // VBR
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
461 mux_a->h.dwScale=4608/4;
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
462 mux_a->h.dwRate=sh_audio->samplerate;
2635
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
463 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
464 mux_a->wf=malloc(sizeof(MPEGLAYER3WAVEFORMAT)); // should be 30
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
465 mux_a->wf->wFormatTag=0x55; // MP3
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
466 mux_a->wf->nChannels=sh_audio->channels;
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
467 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
468 mux_a->wf->nAvgBytesPerSec=192000/8; // FIXME!
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
469 mux_a->wf->nBlockAlign=1;
2635
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
470 mux_a->wf->wBitsPerSample=0; //16;
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
471 // from NaNdub: (requires for l3codeca.acm)
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
472 mux_a->wf->cbSize=12;
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
473 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->wID=1;
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
474 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->fdwFlags=2;
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
475 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nBlockSize=1024; // ???
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
476 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nFramesPerBlock=1;
c1e24e01601b fixed AVI header creation - now should be compatible with NaNdub
arpi
parents: 2627
diff changeset
477 ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nCodecDelay=0;
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
478 break;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
479 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
480 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
481
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
482 printf("Writting AVI header...\n");
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
483 aviwrite_write_header(muxer,muxer_f);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
484
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
485 switch(mux_v->codec){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
486 case 0:
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
487 break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
488 case VCODEC_DIVX4:
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
489 // init divx4linux:
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
490 divx4_param.x_dim=sh_video->disp_w;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
491 divx4_param.y_dim=sh_video->disp_h;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
492 divx4_param.framerate=(float)mux_v->h.dwRate/mux_v->h.dwScale;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
493 if(!divx4_param.bitrate) divx4_param.bitrate=800000;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
494 else if(divx4_param.bitrate<=16000) divx4_param.bitrate*=1000;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
495 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
496 divx4_param.handle=NULL;
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
497 encore(NULL,ENC_OPT_INIT,&divx4_param,NULL);
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
498 enc_handle=divx4_param.handle;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
499 break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
500 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
501
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
502 #if 1
2600
51a88ac2a602 nosound fixed?
arpi
parents: 2591
diff changeset
503 if(sh_audio)
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
504 switch(mux_a->codec){
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
505 case ACODEC_VBRMP3:
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
506
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
507 lame=lame_init();
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
508 lame_set_bWriteVbrTag(lame,0);
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
509 lame_set_in_samplerate(lame,sh_audio->samplerate);
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
510 lame_set_num_channels(lame,mux_a->wf->nChannels);
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
511 lame_set_out_samplerate(lame,mux_a->wf->nSamplesPerSec);
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
512 if(lame_param_vbr){ // VBR:
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
513 lame_set_VBR(lame,lame_param_vbr); // vbr mode
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
514 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
515 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
516 } else { // CBR:
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
517 lame_set_quality(lame,lame_param_quality); // 0 = best q
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
518 if(lame_param_br>0) lame_set_brate(lame,lame_param_br);
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
519 }
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
520 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
521 if(lame_param_ratio>0) lame_set_compression_ratio(lame,lame_param_ratio);
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
522 lame_init_params(lame);
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
523 if(verbose){
2626
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
524 lame_print_config(lame);
da9777831e1b divx4 and lame subconfig support
arpi
parents: 2622
diff changeset
525 lame_print_internals(lame);
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
526 }
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
527
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
528 }
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
529 #endif
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
530
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
531 signal(SIGINT,exit_sighandler); // Interrupt from keyboard
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
532 signal(SIGQUIT,exit_sighandler); // Quit from keyboard
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
533 signal(SIGTERM,exit_sighandler); // kill
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
534
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
535 while(!eof){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
536
2571
13608ff3d1e6 simplified
arpi
parents: 2531
diff changeset
537 float frame_time=0;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
538 int blit_frame=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
539 float a_pts=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
540 float v_pts=0;
2574
arpi
parents: 2571
diff changeset
541 unsigned char* start=NULL;
arpi
parents: 2571
diff changeset
542 int in_size;
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
543 int skip_flag=0; // 1=skip -1=duplicate
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
544
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
545 if(sh_audio){
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
546 // get audio:
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
547 while(mux_a->timer-audio_preload<mux_v->timer){
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
548 int len;
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
549 if(mux_a->h.dwSampleSize){
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
550 // CBR - copy 0.5 sec of audio
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
551 switch(mux_a->codec){
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
552 case 0: // copy
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
553 len=sh_audio->i_bps/2;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
554 len/=mux_a->h.dwSampleSize;if(len<1) len=1;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
555 len*=mux_a->h.dwSampleSize;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
556 len=demux_read_data(sh_audio->ds,mux_a->buffer,len);
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
557 break;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
558 case ACODEC_PCM:
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
559 len=mux_a->h.dwSampleSize*(mux_a->h.dwRate/2);
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
560 len=dec_audio(sh_audio,mux_a->buffer,len);
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
561 break;
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
562 }
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
563 } else {
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
564 // VBR - encode/copy an audio frame
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
565 switch(mux_a->codec){
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
566 case 0: // copy
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
567 printf("not yet implemented!\n");
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
568 break;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
569 case ACODEC_VBRMP3:
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
570 while(mux_a->buffer_len<4){
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
571 unsigned char tmp[2304];
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
572 int len=dec_audio(sh_audio,tmp,2304);
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
573 if(len<=0) break; // eof
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
574 len=lame_encode_buffer_interleaved(lame,
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
575 tmp,len/4,
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
576 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
577 if(len<0) break; // error
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
578 mux_a->buffer_len+=len;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
579 }
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
580 if(mux_a->buffer_len<4) break;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
581 len=mp_decode_mp3_header(mux_a->buffer);
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
582 //printf("%d\n",len);
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
583 if(len<=0) break; // bad frame!
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
584 while(mux_a->buffer_len<len){
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
585 unsigned char tmp[2304];
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
586 int len=dec_audio(sh_audio,tmp,2304);
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
587 if(len<=0) break; // eof
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
588 len=lame_encode_buffer_interleaved(lame,
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
589 tmp,len/4,
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
590 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
591 if(len<0) break; // error
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
592 mux_a->buffer_len+=len;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
593 }
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
594 break;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
595 }
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
596 }
2583
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
597 if(len<=0) break; // EOF?
3dce775d82cb PCM audio
arpi
parents: 2581
diff changeset
598 aviwrite_write_chunk(muxer,mux_a,muxer_f,len,0);
2591
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
599 if(mux_a->buffer_len>=len){
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
600 mux_a->buffer_len-=len;
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
601 memcpy(mux_a->buffer,mux_a->buffer+len,mux_a->buffer_len);
f4b01c45b1ea libmp3lame vbr mp3 support
arpi
parents: 2583
diff changeset
602 }
2581
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
603 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
604 }
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
605
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
606 // get video frame!
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
607 in_size=video_read_frame(sh_video,&frame_time,&start,force_fps);
e94a20dec331 avi audio stream copy support
arpi
parents: 2577
diff changeset
608 if(in_size<0){ eof=1; break; }
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
609 sh_video->timer+=frame_time;
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
610
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
611 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
612
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
613 // check frame duplicate/drop:
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
614
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
615 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
616 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
617 ++skip_flag; // skip
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
618 } else
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
619 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
620 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
621 --skip_flag; // dup
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
622 }
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
623
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
624 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
625 || (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
626 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
627 --skip_flag; // dup
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
628 }
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
629 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
630 || (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
631 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
632 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
633 ++skip_flag; // skip
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
634 }
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
635
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
636
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
637 switch(mux_v->codec){
2574
arpi
parents: 2571
diff changeset
638 case 0:
arpi
parents: 2571
diff changeset
639 mux_v->buffer=start;
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
640 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
641 break;
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
642 case VCODEC_DIVX4:
2574
arpi
parents: 2571
diff changeset
643 blit_frame=decode_video(&video_out,sh_video,start,in_size,0);
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
644 if(skip_flag>0) break;
2574
arpi
parents: 2571
diff changeset
645 if(!blit_frame){
arpi
parents: 2571
diff changeset
646 // empty.
arpi
parents: 2571
diff changeset
647 aviwrite_write_chunk(muxer,mux_v,muxer_f,0,0);
arpi
parents: 2571
diff changeset
648 break;
arpi
parents: 2571
diff changeset
649 }
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
650 enc_frame.image=vo_image_ptr;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
651 enc_frame.bitstream=mux_v->buffer;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
652 enc_frame.length=mux_v->buffer_size;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
653 switch(out_fmt){
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
654 case IMGFMT_YV12: enc_frame.colorspace=ENC_CSP_YV12; break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
655 case IMGFMT_IYUV:
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
656 case IMGFMT_I420: enc_frame.colorspace=ENC_CSP_I420; break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
657 case IMGFMT_YUY2: enc_frame.colorspace=ENC_CSP_YUY2; break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
658 case IMGFMT_UYVY: enc_frame.colorspace=ENC_CSP_UYVY; break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
659 case IMGFMT_RGB24:
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
660 case IMGFMT_BGR24:
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
661 enc_frame.colorspace=ENC_CSP_RGB24; break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
662 }
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
663 enc_frame.quant=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
664 enc_frame.intra=0;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
665 enc_frame.mvs=NULL;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
666 // printf("encoding...\n");
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
667 encore(enc_handle,ENC_OPT_ENCODE,&enc_frame,&enc_result);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
668 // 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
669 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
670 break;
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
671 }
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
672
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
673 if(skip_flag<0){
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
674 // duplicate frame
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
675 printf("\nduplicate %d frame(s)!!! \n",-skip_flag);
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
676 while(skip_flag<0){
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
677 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
678 ++skip_flag;
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
679 }
2639
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
680 } else
511f1983e0f0 -srate and -pp 0 fixes
arpi
parents: 2635
diff changeset
681 if(skip_flag>0){
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
682 // skip frame
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
683 printf("\nskip frame!!! \n");
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
684 --skip_flag;
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
685 }
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
686
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
687 if(sh_audio){
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
688 float AV_delay,x;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
689 // A-V sync!
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
690 if(pts_from_bps){
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
691 unsigned int samples=(sh_audio->audio.dwSampleSize)?
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
692 ((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
693 (d_audio->pack_no); // <- used for VBR audio
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
694 a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
695 delay_corrected=1;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
696 } else {
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
697 // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec)
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
698 a_pts=d_audio->pts;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
699 if(!delay_corrected) if(a_pts) delay_corrected=1;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
700 //printf("*** %5.3f ***\n",a_pts);
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
701 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
702 }
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
703 v_pts=d_video->pts;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
704 // 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
705 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
706 // compensate input video timer by av:
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
707 x=AV_delay*0.1f;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
708 if(x<-max_pts_correction) x=-max_pts_correction; else
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
709 if(x> max_pts_correction) x= max_pts_correction;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
710 if(default_max_pts_correction>=0)
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
711 max_pts_correction=default_max_pts_correction;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
712 else
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
713 max_pts_correction=sh_video->frametime*0.10; // +-10% of time
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
714 // sh_video->timer-=x;
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
715 c_total+=x;
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
716 v_pts_corr+=x;
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
717
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
718 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
719 a_pts,v_pts,a_pts-v_pts,
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
720 (float)(mux_a->timer-mux_v->timer),
2613
156efe748b3d new A-V sync correction and fps conversion stuff
arpi
parents: 2605
diff changeset
721 AV_delay, c_total, v_pts_corr );
2605
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
722
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
723 }
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
724
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
725 #if 0
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
726 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
727 a_pts,v_pts,a_pts-v_pts,c_total,
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
728 (int)sh_video->num_frames,(int)sh_video->num_frames_decoded,
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
729 (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
730 (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
731 (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
732 ,cache_fill_status
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
733 );
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
734 #endif
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
735
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
736 fflush(stdout);
f629b154ecbf input A-V sync correction
arpi
parents: 2600
diff changeset
737
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
738
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
739
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
740 } // while(!eof)
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
741
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
742 printf("\nWritting AVI index...\n");
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
743 aviwrite_write_index(muxer,muxer_f);
2622
fb7220c79b69 verbose fixed
arpi
parents: 2618
diff changeset
744 printf("Fixup AVI header...\n");
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
745 fseek(muxer_f,0,SEEK_SET);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
746 aviwrite_write_header(muxer,muxer_f); // update header
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
747 fclose(muxer_f);
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
748
2618
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
749 if(stream) free_stream(stream); // kill cache thread
47a338888698 mencoder commandline handling
arpi
parents: 2613
diff changeset
750
2531
cf6a236b2d00 very alpha code - needs Makefile modifications to compile
arpi
parents:
diff changeset
751 }