annotate libmpdemux/video.c @ 3202:e9b18714e3dc

Minor optimization
author nick
date Thu, 29 Nov 2001 18:00:57 +0000
parents 8e3875816f6d
children 84ed0593187c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
1 // read video frame
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
2
2775
8e3875816f6d added missing #include <malloc.h>
pl
parents: 2567
diff changeset
3 #include "config.h"
8e3875816f6d added missing #include <malloc.h>
pl
parents: 2567
diff changeset
4
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
5 #include <stdio.h>
2775
8e3875816f6d added missing #include <malloc.h>
pl
parents: 2567
diff changeset
6 #ifdef HAVE_MALLOC_H
8e3875816f6d added missing #include <malloc.h>
pl
parents: 2567
diff changeset
7 #include <malloc.h>
8e3875816f6d added missing #include <malloc.h>
pl
parents: 2567
diff changeset
8 #endif
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
9 #include <stdlib.h>
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
10 #include <unistd.h>
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
11
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
12 #include "mp_msg.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
13 #include "help_mp.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
14
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
15 #include "stream.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
16 #include "demuxer.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
17 #include "stheader.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
18 #include "parse_es.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
19 #include "mpeg_hdr.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
20
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
21 static mp_mpeg_header_t picture;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
22
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
23 int video_read_properties(sh_video_t *sh_video){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
24 demux_stream_t *d_video=sh_video->ds;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
25
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
26 // Determine image properties:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
27 switch(d_video->demuxer->file_format){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
28 case DEMUXER_TYPE_AVI:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
29 case DEMUXER_TYPE_ASF: {
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
30 // display info:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
31 sh_video->format=sh_video->bih->biCompression;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
32 sh_video->disp_w=sh_video->bih->biWidth;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
33 sh_video->disp_h=abs(sh_video->bih->biHeight);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
34 break;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
35 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
36 case DEMUXER_TYPE_MPEG_ES:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
37 case DEMUXER_TYPE_MPEG_PS: {
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
38 // Find sequence_header first:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
39 videobuf_len=0; videobuf_code_len=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
40 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for sequence header... ");fflush(stdout);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
41 while(1){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
42 int i=sync_video_packet(d_video);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
43 if(i==0x1B3) break; // found it!
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
44 if(!i || !skip_video_packet(d_video)){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
45 if(verbose) mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
46 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MpegNoSequHdr);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
47 return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
48 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
49 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
50 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n");
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
51 // sh_video=d_video->sh;sh_video->ds=d_video;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
52 // mpeg2_init();
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
53 // ========= Read & process sequence header & extension ============
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
54 if(!videobuffer) videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
55 if(!videobuffer){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
56 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
57 return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
58 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
59
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
60 if(!read_video_packet(d_video)){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
61 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdr);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
62 return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
63 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
64 if(mp_header_process_sequence_header (&picture, &videobuffer[4])) {
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
65 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdr);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
66 return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
67 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
68 if(sync_video_packet(d_video)==0x1B5){ // next packet is seq. ext.
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
69 // videobuf_len=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
70 int pos=videobuf_len;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
71 if(!read_video_packet(d_video)){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
72 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdrEx);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
73 return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
74 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
75 if(mp_header_process_extension (&picture, &videobuffer[pos+4])) {
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
76 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdrEx);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
77 return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
78 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
79 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
80
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
81 // printf("picture.fps=%d\n",picture.fps);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
82
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
83 // fill aspect info:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
84 switch(picture.aspect_ratio_information){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
85 case 2: // PAL/NTSC SVCD/DVD 4:3
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
86 case 8: // PAL VCD 4:3
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
87 case 12: // NTSC VCD 4:3
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
88 sh_video->aspect=4.0/3.0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
89 break;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
90 case 3: // PAL/NTSC Widescreen SVCD/DVD 16:9
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
91 sh_video->aspect=16.0/9.0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
92 break;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
93 default:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
94 fprintf(stderr,"Detected unknown aspect_ratio_information in mpeg sequence header.\n"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
95 "Please report the aspect value (%i) along with the movie type (VGA,PAL,NTSC,"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
96 "SECAM) and the movie resolution (720x576,352x240,480x480,...) to the MPlayer"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
97 " developers, so that we can add support for it!\nAssuming 1:1 aspect for now.\n",
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
98 picture.aspect_ratio_information);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
99 case 1: // VGA 1:1 - do not prescale
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
100 sh_video->aspect=0.0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
101 break;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
102 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
103 // display info:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
104 sh_video->format=picture.mpeg1?0x10000001:0x10000002; // mpeg video
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
105 sh_video->fps=picture.fps*0.0001f;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
106 if(!sh_video->fps){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
107 // if(!force_fps){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
108 // fprintf(stderr,"FPS not specified (or invalid) in the header! Use the -fps option!\n");
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
109 // return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
110 // }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
111 sh_video->frametime=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
112 } else {
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
113 sh_video->frametime=10000.0f/(float)picture.fps;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
114 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
115 sh_video->disp_w=picture.display_picture_width;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
116 sh_video->disp_h=picture.display_picture_height;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
117 // bitrate:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
118 if(picture.bitrate!=0x3FFFF) // unspecified/VBR ?
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
119 sh_video->i_bps=1000*picture.bitrate/16;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
120 // info:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
121 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"mpeg bitrate: %d (%X)\n",picture.bitrate,picture.bitrate);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
122 mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VIDEO: %s %dx%d (aspect %d) %4.2f fps %5.1f kbps (%4.1f kbyte/s)\n",
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
123 picture.mpeg1?"MPEG1":"MPEG2",
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
124 sh_video->disp_w,sh_video->disp_h,
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
125 picture.aspect_ratio_information,
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
126 sh_video->fps,
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
127 picture.bitrate*0.5f,
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
128 picture.bitrate/16.0f );
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
129 break;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
130 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
131 } // switch(file_format)
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
132
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
133 return 1;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
134 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
135
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
136 int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** start,int force_fps){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
137 demux_stream_t *d_video=sh_video->ds;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
138 demuxer_t *demuxer=d_video->demuxer;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
139 float frame_time=1;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
140 float pts1=d_video->pts;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
141 // unsigned char* start=NULL;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
142 int in_size=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
143
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
144 *start=NULL;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
145
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
146 if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || demuxer->file_format==DEMUXER_TYPE_MPEG_PS){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
147 int in_frame=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
148 //float newfps;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
149 //videobuf_len=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
150 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
151 int i=sync_video_packet(d_video);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
152 void* buffer=&videobuffer[videobuf_len+4];
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
153 if(in_frame){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
154 if(i<0x101 || i>=0x1B0){ // not slice code -> end of frame
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
155 #if 1
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
156 // send END OF FRAME code:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
157 videobuffer[videobuf_len+0]=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
158 videobuffer[videobuf_len+1]=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
159 videobuffer[videobuf_len+2]=1;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
160 videobuffer[videobuf_len+3]=0xFF;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
161 videobuf_len+=4;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
162 #endif
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
163 if(!i) return -1; // EOF
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
164 break;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
165 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
166 } else {
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
167 //if(i==0x100) in_frame=1; // picture startcode
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
168 if(i>=0x101 && i<0x1B0) in_frame=1; // picture startcode
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
169 else if(!i) return -1; // EOF
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
170 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
171 //if(grab_frames==2 && (i==0x1B3 || i==0x1B8)) grab_frames=1;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
172 if(!read_video_packet(d_video)) return -1; // EOF
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
173 //printf("read packet 0x%X, len=%d\n",i,videobuf_len);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
174 // process headers:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
175 switch(i){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
176 case 0x1B3: mp_header_process_sequence_header (&picture, buffer);break;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
177 case 0x1B5: mp_header_process_extension (&picture, buffer);break;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
178 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
179 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
180
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
181 // if(videobuf_len>max_framesize) max_framesize=videobuf_len; // debug
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
182 //printf("--- SEND %d bytes\n",videobuf_len);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
183 // if(grab_frames==1){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
184 // FILE *f=fopen("grab.mpg","ab");
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
185 // fwrite(videobuffer,videobuf_len-4,1,f);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
186 // fclose(f);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
187 // }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
188
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
189 *start=videobuffer; in_size=videobuf_len;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
190 //blit_frame=decode_video(video_out,sh_video,videobuffer,videobuf_len,drop_frame);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
191
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
192 #if 1
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
193 // get mpeg fps:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
194 //newfps=frameratecode2framerate[picture->frame_rate_code]*0.0001f;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
195 if((int)(sh_video->fps*10000+0.5)!=picture.fps) if(!force_fps){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
196 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);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
197 sh_video->fps=picture.fps*0.0001;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
198 sh_video->frametime=10000.0f/(float)picture.fps;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
199 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
200 #endif
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
201
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
202 // fix mpeg2 frametime:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
203 frame_time=(picture.display_time)*0.01f;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
204 picture.display_time=100;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
205 videobuf_len=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
206
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
207 } else {
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
208 // frame-based file formats: (AVI,ASF,MOV)
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
209 in_size=ds_get_packet(d_video,start);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
210 if(in_size<0) return -1; // EOF
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
211 // if(in_size>max_framesize) max_framesize=in_size;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
212 // blit_frame=decode_video(video_out,sh_video,start,in_size,drop_frame);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
213 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
214
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
215 // vdecode_time=video_time_usage-vdecode_time;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
216
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
217 //------------------------ frame decoded. --------------------
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
218
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
219 // Increase video timers:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
220 sh_video->num_frames+=frame_time;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
221 ++sh_video->num_frames_decoded;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
222
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
223 frame_time*=sh_video->frametime;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
224 if(demuxer->file_format==DEMUXER_TYPE_ASF && !force_fps){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
225 // .ASF files has no fixed FPS - just frame durations!
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
226 float d=d_video->pts-pts1;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
227 if(d>=0 && d<5) frame_time=d;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
228 if(d>0){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
229 if(verbose)
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
230 if((int)sh_video->fps==1000)
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
231 mp_msg(MSGT_CPLAYER,MSGL_STATUS,"\rASF framerate: %d fps \n",(int)(1.0f/d));
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
232 sh_video->frametime=d; // 1ms
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
233 sh_video->fps=1.0f/d;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
234 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
235 } else
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
236 if(demuxer->file_format==DEMUXER_TYPE_MOV && !force_fps){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
237 // .MOV files has no fixed FPS - just frame durations!
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
238 frame_time=d_video->pts-pts1;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
239 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
240
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
241 if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS) d_video->pts+=frame_time;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
242
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
243 if(frame_time_ptr) *frame_time_ptr=frame_time;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
244 return in_size;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
245
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
246 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
247
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
248