Mercurial > mplayer.hg
annotate libmpdemux/video.c @ 6809:0250f691037e
10L bugs founds by Jindrich Makovicka <makovick at MLinux dot fjfi dot cvut dotcz>
Fix the eq
author | albeu |
---|---|
date | Fri, 26 Jul 2002 02:04:11 +0000 |
parents | a3b2f80f3a26 |
children | 1a747aee653b |
rev | line source |
---|---|
2567 | 1 // read video frame |
2 | |
2775 | 3 #include "config.h" |
4 | |
2567 | 5 #include <stdio.h> |
2775 | 6 #ifdef HAVE_MALLOC_H |
7 #include <malloc.h> | |
8 #endif | |
2567 | 9 #include <stdlib.h> |
3726 | 10 #include <string.h> |
2567 | 11 #include <unistd.h> |
12 | |
13 #include "mp_msg.h" | |
14 #include "help_mp.h" | |
15 | |
16 #include "stream.h" | |
17 #include "demuxer.h" | |
18 #include "stheader.h" | |
19 #include "parse_es.h" | |
20 #include "mpeg_hdr.h" | |
21 | |
6784
b38e38b6f88f
DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
6571
diff
changeset
|
22 /* sub_cc (closed captions)*/ |
b38e38b6f88f
DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
6571
diff
changeset
|
23 #include "../sub_cc.h" |
b38e38b6f88f
DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
6571
diff
changeset
|
24 |
4774
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
25 /* biCompression constant */ |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
26 #define BI_RGB 0L |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
27 |
2567 | 28 static mp_mpeg_header_t picture; |
29 | |
30 int video_read_properties(sh_video_t *sh_video){ | |
31 demux_stream_t *d_video=sh_video->ds; | |
32 | |
33 // Determine image properties: | |
34 switch(d_video->demuxer->file_format){ | |
35 case DEMUXER_TYPE_AVI: | |
36 case DEMUXER_TYPE_ASF: { | |
4774
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
37 // display info: |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
38 |
5898 | 39 #if 0 |
4774
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
40 if(sh_video->bih->biCompression == BI_RGB && |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
41 (sh_video->video.fccHandler == mmioFOURCC('D', 'I', 'B', ' ') || |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
42 sh_video->video.fccHandler == mmioFOURCC('R', 'G', 'B', ' ') || |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
43 sh_video->video.fccHandler == mmioFOURCC('R', 'A', 'W', ' ') || |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
44 sh_video->video.fccHandler == 0)) { |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
45 sh_video->format = mmioFOURCC(0, 'R', 'G', 'B') | sh_video->bih->biBitCount; |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
46 } |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
47 else |
5898 | 48 #endif |
4774
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
49 sh_video->format=sh_video->bih->biCompression; |
fc2f76964606
Patch: Improved raw encoding support in mencoder by Fredrik Kuivinen
atmos4
parents:
4705
diff
changeset
|
50 |
2567 | 51 sh_video->disp_w=sh_video->bih->biWidth; |
52 sh_video->disp_h=abs(sh_video->bih->biHeight); | |
3980
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
53 |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
54 #if 1 |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
55 /* hack to support decoding of mpeg1 chunks in AVI's with libmpeg2 -- 2002 alex */ |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
56 if ((sh_video->format == 0x10000001) || |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
57 (sh_video->format == 0x10000002) || |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
58 (sh_video->format == mmioFOURCC('m','p','g','1')) || |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
59 (sh_video->format == mmioFOURCC('M','P','G','1')) || |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
60 (sh_video->format == mmioFOURCC('m','p','g','2')) || |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
61 (sh_video->format == mmioFOURCC('M','P','G','2')) || |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
62 (sh_video->format == mmioFOURCC('m','p','e','g')) || |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
63 (sh_video->format == mmioFOURCC('m','p','e','g'))) |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
64 { |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
65 int saved_pos, saved_type; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
66 |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
67 /* demuxer pos saving is required for libavcodec mpeg decoder as it's |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
68 reading the mpeg header self! */ |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
69 |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
70 saved_pos = d_video->buffer_pos; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
71 saved_type = d_video->demuxer->file_format; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
72 |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
73 d_video->demuxer->file_format = DEMUXER_TYPE_MPEG_ES; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
74 video_read_properties(sh_video); |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
75 d_video->demuxer->file_format = saved_type; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
76 d_video->buffer_pos = saved_pos; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
77 // goto mpeg_header_parser; |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
78 } |
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
79 #endif |
2567 | 80 break; |
81 } | |
82 case DEMUXER_TYPE_MPEG_ES: | |
83 case DEMUXER_TYPE_MPEG_PS: { | |
3980
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
84 //mpeg_header_parser: |
2567 | 85 // Find sequence_header first: |
86 videobuf_len=0; videobuf_code_len=0; | |
87 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for sequence header... ");fflush(stdout); | |
88 while(1){ | |
89 int i=sync_video_packet(d_video); | |
90 if(i==0x1B3) break; // found it! | |
91 if(!i || !skip_video_packet(d_video)){ | |
92 if(verbose) mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); | |
93 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MpegNoSequHdr); | |
94 return 0; | |
95 } | |
96 } | |
97 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); | |
98 // sh_video=d_video->sh;sh_video->ds=d_video; | |
99 // mpeg2_init(); | |
100 // ========= Read & process sequence header & extension ============ | |
101 if(!videobuffer) videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE); | |
102 if(!videobuffer){ | |
103 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); | |
104 return 0; | |
105 } | |
106 | |
107 if(!read_video_packet(d_video)){ | |
108 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdr); | |
109 return 0; | |
110 } | |
111 if(mp_header_process_sequence_header (&picture, &videobuffer[4])) { | |
112 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdr); | |
113 return 0; | |
114 } | |
115 if(sync_video_packet(d_video)==0x1B5){ // next packet is seq. ext. | |
116 // videobuf_len=0; | |
117 int pos=videobuf_len; | |
118 if(!read_video_packet(d_video)){ | |
119 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdrEx); | |
120 return 0; | |
121 } | |
122 if(mp_header_process_extension (&picture, &videobuffer[pos+4])) { | |
123 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdrEx); | |
124 return 0; | |
125 } | |
126 } | |
127 | |
128 // printf("picture.fps=%d\n",picture.fps); | |
129 | |
130 // fill aspect info: | |
131 switch(picture.aspect_ratio_information){ | |
132 case 2: // PAL/NTSC SVCD/DVD 4:3 | |
3379
84ed0593187c
Add aspect 4 to known aspect codes, probably SECAM 4:3, at least sample file was 4:3.
atmos4
parents:
2775
diff
changeset
|
133 case 4: // SECAM 4:3? - XXX check with more files! |
2567 | 134 case 8: // PAL VCD 4:3 |
135 case 12: // NTSC VCD 4:3 | |
136 sh_video->aspect=4.0/3.0; | |
137 break; | |
138 case 3: // PAL/NTSC Widescreen SVCD/DVD 16:9 | |
3666 | 139 case 6: // (PAL?)/NTSC Widescreen SVCD 16:9 |
2567 | 140 sh_video->aspect=16.0/9.0; |
141 break; | |
4336 | 142 case 9: // Movie Type ??? / 640x480 |
143 sh_video->aspect=0.0; | |
144 break; | |
2567 | 145 default: |
146 fprintf(stderr,"Detected unknown aspect_ratio_information in mpeg sequence header.\n" | |
147 "Please report the aspect value (%i) along with the movie type (VGA,PAL,NTSC," | |
148 "SECAM) and the movie resolution (720x576,352x240,480x480,...) to the MPlayer" | |
149 " developers, so that we can add support for it!\nAssuming 1:1 aspect for now.\n", | |
150 picture.aspect_ratio_information); | |
151 case 1: // VGA 1:1 - do not prescale | |
152 sh_video->aspect=0.0; | |
153 break; | |
154 } | |
155 // display info: | |
156 sh_video->format=picture.mpeg1?0x10000001:0x10000002; // mpeg video | |
157 sh_video->fps=picture.fps*0.0001f; | |
158 if(!sh_video->fps){ | |
159 // if(!force_fps){ | |
160 // fprintf(stderr,"FPS not specified (or invalid) in the header! Use the -fps option!\n"); | |
161 // return 0; | |
162 // } | |
163 sh_video->frametime=0; | |
164 } else { | |
165 sh_video->frametime=10000.0f/(float)picture.fps; | |
166 } | |
167 sh_video->disp_w=picture.display_picture_width; | |
168 sh_video->disp_h=picture.display_picture_height; | |
169 // bitrate: | |
170 if(picture.bitrate!=0x3FFFF) // unspecified/VBR ? | |
171 sh_video->i_bps=1000*picture.bitrate/16; | |
172 // info: | |
173 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"mpeg bitrate: %d (%X)\n",picture.bitrate,picture.bitrate); | |
174 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VIDEO: %s %dx%d (aspect %d) %4.2f fps %5.1f kbps (%4.1f kbyte/s)\n", | |
175 picture.mpeg1?"MPEG1":"MPEG2", | |
176 sh_video->disp_w,sh_video->disp_h, | |
177 picture.aspect_ratio_information, | |
178 sh_video->fps, | |
179 picture.bitrate*0.5f, | |
180 picture.bitrate/16.0f ); | |
181 break; | |
182 } | |
183 } // switch(file_format) | |
184 | |
185 return 1; | |
186 } | |
187 | |
4074 | 188 static void process_userdata(unsigned char* buf,int len){ |
189 int i; | |
6791 | 190 /* if the user data starts with "CC", assume it is a CC info packet */ |
191 if(len>2 && buf[0]=='C' && buf[1]=='C'){ | |
192 // mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"video.c: process_userdata() detected Closed Captions!\n"); | |
6784
b38e38b6f88f
DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
6571
diff
changeset
|
193 if(subcc_enabled) subcc_process_data(buf+2,len-2); |
b38e38b6f88f
DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
6571
diff
changeset
|
194 } |
6791 | 195 if(!verbose) return; |
4074 | 196 printf( "user_data: len=%3d %02X %02X %02X %02X '", |
197 len, buf[0], buf[1], buf[2], buf[3]); | |
198 for(i=0;i<len;i++) | |
6791 | 199 // if(buf[i]>=32 && buf[i]<127) putchar(buf[i]); |
200 if(buf[i]&0x60) putchar(buf[i]&0x7F); | |
4074 | 201 printf("'\n"); |
202 } | |
203 | |
2567 | 204 int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** start,int force_fps){ |
205 demux_stream_t *d_video=sh_video->ds; | |
206 demuxer_t *demuxer=d_video->demuxer; | |
207 float frame_time=1; | |
208 float pts1=d_video->pts; | |
209 // unsigned char* start=NULL; | |
210 int in_size=0; | |
211 | |
212 *start=NULL; | |
213 | |
214 if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || demuxer->file_format==DEMUXER_TYPE_MPEG_PS){ | |
215 int in_frame=0; | |
216 //float newfps; | |
217 //videobuf_len=0; | |
218 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){ | |
219 int i=sync_video_packet(d_video); | |
4074 | 220 //void* buffer=&videobuffer[videobuf_len+4]; |
221 int start=videobuf_len+4; | |
2567 | 222 if(in_frame){ |
223 if(i<0x101 || i>=0x1B0){ // not slice code -> end of frame | |
224 #if 1 | |
225 // send END OF FRAME code: | |
226 videobuffer[videobuf_len+0]=0; | |
227 videobuffer[videobuf_len+1]=0; | |
228 videobuffer[videobuf_len+2]=1; | |
229 videobuffer[videobuf_len+3]=0xFF; | |
230 videobuf_len+=4; | |
231 #endif | |
232 if(!i) return -1; // EOF | |
233 break; | |
234 } | |
235 } else { | |
236 //if(i==0x100) in_frame=1; // picture startcode | |
237 if(i>=0x101 && i<0x1B0) in_frame=1; // picture startcode | |
238 else if(!i) return -1; // EOF | |
239 } | |
240 //if(grab_frames==2 && (i==0x1B3 || i==0x1B8)) grab_frames=1; | |
241 if(!read_video_packet(d_video)) return -1; // EOF | |
242 //printf("read packet 0x%X, len=%d\n",i,videobuf_len); | |
243 // process headers: | |
244 switch(i){ | |
4074 | 245 case 0x1B3: mp_header_process_sequence_header (&picture, &videobuffer[start]);break; |
246 case 0x1B5: mp_header_process_extension (&picture, &videobuffer[start]);break; | |
6784
b38e38b6f88f
DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
6571
diff
changeset
|
247 case 0x1B2: process_userdata (&videobuffer[start], videobuf_len-start);break; |
2567 | 248 } |
249 } | |
250 | |
251 // if(videobuf_len>max_framesize) max_framesize=videobuf_len; // debug | |
252 //printf("--- SEND %d bytes\n",videobuf_len); | |
253 // if(grab_frames==1){ | |
254 // FILE *f=fopen("grab.mpg","ab"); | |
255 // fwrite(videobuffer,videobuf_len-4,1,f); | |
256 // fclose(f); | |
257 // } | |
258 | |
259 *start=videobuffer; in_size=videobuf_len; | |
260 //blit_frame=decode_video(video_out,sh_video,videobuffer,videobuf_len,drop_frame); | |
261 | |
262 #if 1 | |
263 // get mpeg fps: | |
264 //newfps=frameratecode2framerate[picture->frame_rate_code]*0.0001f; | |
265 if((int)(sh_video->fps*10000+0.5)!=picture.fps) if(!force_fps){ | |
266 mp_msg(MSGT_CPLAYER,MSGL_WARN,"Warning! FPS changed %5.3f -> %5.3f (%f) [%d] \n",sh_video->fps,picture.fps*0.0001,sh_video->fps-picture.fps*0.0001,picture.frame_rate_code); | |
267 sh_video->fps=picture.fps*0.0001; | |
268 sh_video->frametime=10000.0f/(float)picture.fps; | |
269 } | |
270 #endif | |
271 | |
272 // fix mpeg2 frametime: | |
273 frame_time=(picture.display_time)*0.01f; | |
274 picture.display_time=100; | |
275 videobuf_len=0; | |
276 | |
277 } else { | |
278 // frame-based file formats: (AVI,ASF,MOV) | |
279 in_size=ds_get_packet(d_video,start); | |
280 if(in_size<0) return -1; // EOF | |
281 // if(in_size>max_framesize) max_framesize=in_size; | |
282 // blit_frame=decode_video(video_out,sh_video,start,in_size,drop_frame); | |
283 } | |
284 | |
285 // vdecode_time=video_time_usage-vdecode_time; | |
286 | |
287 //------------------------ frame decoded. -------------------- | |
288 | |
289 // Increase video timers: | |
290 sh_video->num_frames+=frame_time; | |
291 ++sh_video->num_frames_decoded; | |
292 | |
293 frame_time*=sh_video->frametime; | |
5573
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
294 |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
295 // override frame_time for variable/unknown FPS formats: |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
296 if(!force_fps) switch(demuxer->file_format){ |
6423 | 297 case DEMUXER_TYPE_REAL: |
298 if(d_video->pts>0 && pts1>0 && d_video->pts>pts1) | |
299 frame_time=d_video->pts-pts1; | |
300 break; | |
6571 | 301 #ifdef USE_TV |
5573
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
302 case DEMUXER_TYPE_TV: |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
303 #endif |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
304 case DEMUXER_TYPE_MOV: |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
305 case DEMUXER_TYPE_FILM: |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
306 case DEMUXER_TYPE_VIVO: |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
307 case DEMUXER_TYPE_ASF: { |
5930
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5898
diff
changeset
|
308 float next_pts = ds_get_next_pts(d_video); |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5898
diff
changeset
|
309 float d= next_pts > 0 ? next_pts - d_video->pts : d_video->pts-pts1; |
6371
622d57683187
Fix asf stream wich were giving invalid frame times because the frame time
albeu
parents:
5930
diff
changeset
|
310 if(d>=0){ |
6423 | 311 if(d>0){ |
2567 | 312 if((int)sh_video->fps==1000) |
6423 | 313 mp_msg(MSGT_CPLAYER,MSGL_V,"\navg. framerate: %d fps \n",(int)(1.0f/d)); |
314 sh_video->frametime=d; // 1ms | |
315 sh_video->fps=1.0f/d; | |
316 } | |
5930
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5898
diff
changeset
|
317 frame_time = d; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5898
diff
changeset
|
318 } else { |
6423 | 319 mp_msg(MSGT_CPLAYER,MSGL_WARN,"\nInvalid frame duration value (%5.3f/%5.3f => %5.3f). Defaulting to %5.3f sec.\n",d_video->pts,next_pts,d,frame_time); |
320 // frame_time = 1/25.0; | |
2567 | 321 } |
5573
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
322 } |
2567 | 323 } |
5573
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
324 |
4705 | 325 if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS || |
326 demuxer->file_format==DEMUXER_TYPE_MPEG_ES) d_video->pts+=frame_time; | |
2567 | 327 |
328 if(frame_time_ptr) *frame_time_ptr=frame_time; | |
329 return in_size; | |
330 | |
331 } | |
332 |