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