Mercurial > mplayer.hg
annotate libmpdemux/video.c @ 8154:3dd948f5d012
size optim
author | pontscho |
---|---|
date | Mon, 11 Nov 2002 18:31:13 +0000 |
parents | b9da278e4c92 |
children | 14fa6a121a47 |
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')) || |
7302
7d32189dbae4
typo (checking for mpeg twice, instead of mpeg & MPEG)
michael
parents:
7208
diff
changeset
|
63 (sh_video->format == mmioFOURCC('M','P','E','G'))) |
3980
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 } | |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
82 #ifdef STREAMING_LIVE_DOT_COM |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
83 case DEMUXER_TYPE_RTP: |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
84 // If the RTP stream is a MPEG stream, then we use this code to check |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
85 // for MPEG headers: |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
86 if (!demux_is_mpeg_rtp_stream(d_video->demuxer)) break; |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
87 // otherwise fall through to... |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
88 #endif |
7364
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7302
diff
changeset
|
89 case DEMUXER_TYPE_PVA: |
2567 | 90 case DEMUXER_TYPE_MPEG_ES: |
91 case DEMUXER_TYPE_MPEG_PS: { | |
3980
cdd55ab40363
libmpeg2 is now able to decode framecopied (with mencoder) mpeg files
alex
parents:
3726
diff
changeset
|
92 //mpeg_header_parser: |
2567 | 93 // Find sequence_header first: |
94 videobuf_len=0; videobuf_code_len=0; | |
95 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for sequence header... ");fflush(stdout); | |
96 while(1){ | |
97 int i=sync_video_packet(d_video); | |
98 if(i==0x1B3) break; // found it! | |
99 if(!i || !skip_video_packet(d_video)){ | |
8027 | 100 if(verbose>0) mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); |
2567 | 101 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MpegNoSequHdr); |
102 return 0; | |
103 } | |
104 } | |
105 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); | |
106 // sh_video=d_video->sh;sh_video->ds=d_video; | |
107 // mpeg2_init(); | |
108 // ========= Read & process sequence header & extension ============ | |
109 if(!videobuffer) videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE); | |
110 if(!videobuffer){ | |
111 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); | |
112 return 0; | |
113 } | |
114 | |
115 if(!read_video_packet(d_video)){ | |
116 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdr); | |
117 return 0; | |
118 } | |
119 if(mp_header_process_sequence_header (&picture, &videobuffer[4])) { | |
120 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdr); | |
121 return 0; | |
122 } | |
123 if(sync_video_packet(d_video)==0x1B5){ // next packet is seq. ext. | |
124 // videobuf_len=0; | |
125 int pos=videobuf_len; | |
126 if(!read_video_packet(d_video)){ | |
127 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdrEx); | |
128 return 0; | |
129 } | |
130 if(mp_header_process_extension (&picture, &videobuffer[pos+4])) { | |
131 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdrEx); | |
132 return 0; | |
133 } | |
134 } | |
135 | |
136 // printf("picture.fps=%d\n",picture.fps); | |
137 | |
138 // fill aspect info: | |
139 switch(picture.aspect_ratio_information){ | |
140 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
|
141 case 4: // SECAM 4:3? - XXX check with more files! |
2567 | 142 case 8: // PAL VCD 4:3 |
143 case 12: // NTSC VCD 4:3 | |
144 sh_video->aspect=4.0/3.0; | |
145 break; | |
146 case 3: // PAL/NTSC Widescreen SVCD/DVD 16:9 | |
3666 | 147 case 6: // (PAL?)/NTSC Widescreen SVCD 16:9 |
2567 | 148 sh_video->aspect=16.0/9.0; |
149 break; | |
4336 | 150 case 9: // Movie Type ??? / 640x480 |
151 sh_video->aspect=0.0; | |
152 break; | |
2567 | 153 default: |
154 fprintf(stderr,"Detected unknown aspect_ratio_information in mpeg sequence header.\n" | |
155 "Please report the aspect value (%i) along with the movie type (VGA,PAL,NTSC," | |
156 "SECAM) and the movie resolution (720x576,352x240,480x480,...) to the MPlayer" | |
157 " developers, so that we can add support for it!\nAssuming 1:1 aspect for now.\n", | |
158 picture.aspect_ratio_information); | |
159 case 1: // VGA 1:1 - do not prescale | |
160 sh_video->aspect=0.0; | |
161 break; | |
162 } | |
163 // display info: | |
164 sh_video->format=picture.mpeg1?0x10000001:0x10000002; // mpeg video | |
165 sh_video->fps=picture.fps*0.0001f; | |
166 if(!sh_video->fps){ | |
167 // if(!force_fps){ | |
168 // fprintf(stderr,"FPS not specified (or invalid) in the header! Use the -fps option!\n"); | |
169 // return 0; | |
170 // } | |
171 sh_video->frametime=0; | |
172 } else { | |
173 sh_video->frametime=10000.0f/(float)picture.fps; | |
174 } | |
175 sh_video->disp_w=picture.display_picture_width; | |
176 sh_video->disp_h=picture.display_picture_height; | |
177 // bitrate: | |
178 if(picture.bitrate!=0x3FFFF) // unspecified/VBR ? | |
179 sh_video->i_bps=1000*picture.bitrate/16; | |
180 // info: | |
181 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"mpeg bitrate: %d (%X)\n",picture.bitrate,picture.bitrate); | |
182 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VIDEO: %s %dx%d (aspect %d) %4.2f fps %5.1f kbps (%4.1f kbyte/s)\n", | |
183 picture.mpeg1?"MPEG1":"MPEG2", | |
184 sh_video->disp_w,sh_video->disp_h, | |
185 picture.aspect_ratio_information, | |
186 sh_video->fps, | |
187 picture.bitrate*0.5f, | |
188 picture.bitrate/16.0f ); | |
189 break; | |
190 } | |
191 } // switch(file_format) | |
192 | |
193 return 1; | |
194 } | |
195 | |
4074 | 196 static void process_userdata(unsigned char* buf,int len){ |
197 int i; | |
6791 | 198 /* if the user data starts with "CC", assume it is a CC info packet */ |
199 if(len>2 && buf[0]=='C' && buf[1]=='C'){ | |
200 // 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
|
201 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
|
202 } |
7208 | 203 if(verbose<2) return; |
4074 | 204 printf( "user_data: len=%3d %02X %02X %02X %02X '", |
205 len, buf[0], buf[1], buf[2], buf[3]); | |
206 for(i=0;i<len;i++) | |
6791 | 207 // if(buf[i]>=32 && buf[i]<127) putchar(buf[i]); |
208 if(buf[i]&0x60) putchar(buf[i]&0x7F); | |
4074 | 209 printf("'\n"); |
210 } | |
211 | |
2567 | 212 int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** start,int force_fps){ |
213 demux_stream_t *d_video=sh_video->ds; | |
214 demuxer_t *demuxer=d_video->demuxer; | |
215 float frame_time=1; | |
216 float pts1=d_video->pts; | |
217 // unsigned char* start=NULL; | |
218 int in_size=0; | |
219 | |
220 *start=NULL; | |
221 | |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
222 if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || demuxer->file_format==DEMUXER_TYPE_MPEG_PS |
7364
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7302
diff
changeset
|
223 || demuxer->file_format==DEMUXER_TYPE_PVA |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
224 #ifdef STREAMING_LIVE_DOT_COM |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
225 || (demuxer->file_format==DEMUXER_TYPE_RTP && demux_is_mpeg_rtp_stream(demuxer)) |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
226 #endif |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6791
diff
changeset
|
227 ){ |
2567 | 228 int in_frame=0; |
229 //float newfps; | |
230 //videobuf_len=0; | |
231 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){ | |
232 int i=sync_video_packet(d_video); | |
4074 | 233 //void* buffer=&videobuffer[videobuf_len+4]; |
234 int start=videobuf_len+4; | |
2567 | 235 if(in_frame){ |
236 if(i<0x101 || i>=0x1B0){ // not slice code -> end of frame | |
7465 | 237 #if 0 |
2567 | 238 // send END OF FRAME code: |
239 videobuffer[videobuf_len+0]=0; | |
240 videobuffer[videobuf_len+1]=0; | |
241 videobuffer[videobuf_len+2]=1; | |
242 videobuffer[videobuf_len+3]=0xFF; | |
243 videobuf_len+=4; | |
244 #endif | |
245 if(!i) return -1; // EOF | |
246 break; | |
247 } | |
248 } else { | |
249 //if(i==0x100) in_frame=1; // picture startcode | |
250 if(i>=0x101 && i<0x1B0) in_frame=1; // picture startcode | |
251 else if(!i) return -1; // EOF | |
252 } | |
253 //if(grab_frames==2 && (i==0x1B3 || i==0x1B8)) grab_frames=1; | |
254 if(!read_video_packet(d_video)) return -1; // EOF | |
255 //printf("read packet 0x%X, len=%d\n",i,videobuf_len); | |
256 // process headers: | |
257 switch(i){ | |
4074 | 258 case 0x1B3: mp_header_process_sequence_header (&picture, &videobuffer[start]);break; |
259 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
|
260 case 0x1B2: process_userdata (&videobuffer[start], videobuf_len-start);break; |
2567 | 261 } |
262 } | |
263 | |
264 // if(videobuf_len>max_framesize) max_framesize=videobuf_len; // debug | |
265 //printf("--- SEND %d bytes\n",videobuf_len); | |
266 // if(grab_frames==1){ | |
267 // FILE *f=fopen("grab.mpg","ab"); | |
268 // fwrite(videobuffer,videobuf_len-4,1,f); | |
269 // fclose(f); | |
270 // } | |
271 | |
272 *start=videobuffer; in_size=videobuf_len; | |
273 //blit_frame=decode_video(video_out,sh_video,videobuffer,videobuf_len,drop_frame); | |
274 | |
275 #if 1 | |
276 // get mpeg fps: | |
277 //newfps=frameratecode2framerate[picture->frame_rate_code]*0.0001f; | |
278 if((int)(sh_video->fps*10000+0.5)!=picture.fps) if(!force_fps){ | |
279 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); | |
280 sh_video->fps=picture.fps*0.0001; | |
281 sh_video->frametime=10000.0f/(float)picture.fps; | |
282 } | |
283 #endif | |
284 | |
285 // fix mpeg2 frametime: | |
286 frame_time=(picture.display_time)*0.01f; | |
287 picture.display_time=100; | |
288 videobuf_len=0; | |
289 | |
290 } else { | |
291 // frame-based file formats: (AVI,ASF,MOV) | |
292 in_size=ds_get_packet(d_video,start); | |
293 if(in_size<0) return -1; // EOF | |
294 // if(in_size>max_framesize) max_framesize=in_size; | |
295 // blit_frame=decode_video(video_out,sh_video,start,in_size,drop_frame); | |
296 } | |
297 | |
298 // vdecode_time=video_time_usage-vdecode_time; | |
299 | |
300 //------------------------ frame decoded. -------------------- | |
301 | |
302 // Increase video timers: | |
303 sh_video->num_frames+=frame_time; | |
304 ++sh_video->num_frames_decoded; | |
305 | |
306 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
|
307 |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
308 // 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
|
309 if(!force_fps) switch(demuxer->file_format){ |
6423 | 310 case DEMUXER_TYPE_REAL: |
311 if(d_video->pts>0 && pts1>0 && d_video->pts>pts1) | |
312 frame_time=d_video->pts-pts1; | |
313 break; | |
6571 | 314 #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
|
315 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
|
316 #endif |
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
317 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
|
318 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
|
319 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
|
320 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
|
321 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
|
322 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
|
323 if(d>=0){ |
6423 | 324 if(d>0){ |
2567 | 325 if((int)sh_video->fps==1000) |
6423 | 326 mp_msg(MSGT_CPLAYER,MSGL_V,"\navg. framerate: %d fps \n",(int)(1.0f/d)); |
327 sh_video->frametime=d; // 1ms | |
328 sh_video->fps=1.0f/d; | |
329 } | |
5930
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5898
diff
changeset
|
330 frame_time = d; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5898
diff
changeset
|
331 } else { |
6423 | 332 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); |
333 // frame_time = 1/25.0; | |
2567 | 334 } |
5573
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
335 } |
2567 | 336 } |
5573
b8a8ab95c73d
generalized the cut'n'pasted variable fps code, #ifdef-ed TV until v4l is updated
arpi
parents:
5572
diff
changeset
|
337 |
4705 | 338 if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS || |
339 demuxer->file_format==DEMUXER_TYPE_MPEG_ES) d_video->pts+=frame_time; | |
2567 | 340 |
341 if(frame_time_ptr) *frame_time_ptr=frame_time; | |
342 return in_size; | |
343 | |
344 } | |
345 |