annotate libmpdemux/video.c @ 6371:622d57683187

Fix asf stream wich were giving invalid frame times because the frame time was 0.
author albeu
date Mon, 10 Jun 2002 09:59:44 +0000
parents 68cac7ecaf05
children 13cf65db9ebc
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>
3726
1acf2f1f9dc8 missing #include's
pl
parents: 3666
diff changeset
10 #include <string.h>
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
11 #include <unistd.h>
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
12
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
13 #include "mp_msg.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
14 #include "help_mp.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
15
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
16 #include "stream.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
17 #include "demuxer.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
18 #include "stheader.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
19 #include "parse_es.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
20 #include "mpeg_hdr.h"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
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
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
25 static mp_mpeg_header_t picture;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
26
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
27 int video_read_properties(sh_video_t *sh_video){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
28 demux_stream_t *d_video=sh_video->ds;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
29
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
30 // Determine image properties:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
31 switch(d_video->demuxer->file_format){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
32 case DEMUXER_TYPE_AVI:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
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
31202ff6fb3d ugly workaround disabled
arpi
parents: 5573
diff changeset
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
31202ff6fb3d ugly workaround disabled
arpi
parents: 5573
diff changeset
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
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
48 sh_video->disp_w=sh_video->bih->biWidth;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
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
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
77 break;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
78 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
79 case DEMUXER_TYPE_MPEG_ES:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
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
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
82 // Find sequence_header first:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
83 videobuf_len=0; videobuf_code_len=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
84 mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for sequence header... ");fflush(stdout);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
85 while(1){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
86 int i=sync_video_packet(d_video);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
87 if(i==0x1B3) break; // found it!
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
88 if(!i || !skip_video_packet(d_video)){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
89 if(verbose) mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
90 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MpegNoSequHdr);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
91 return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
92 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
93 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
94 mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n");
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
95 // sh_video=d_video->sh;sh_video->ds=d_video;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
96 // mpeg2_init();
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
97 // ========= Read & process sequence header & extension ============
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
98 if(!videobuffer) videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
99 if(!videobuffer){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
100 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
101 return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
102 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
103
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
104 if(!read_video_packet(d_video)){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
105 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdr);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
106 return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
107 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
108 if(mp_header_process_sequence_header (&picture, &videobuffer[4])) {
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
109 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdr);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
110 return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
111 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
112 if(sync_video_packet(d_video)==0x1B5){ // next packet is seq. ext.
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
113 // videobuf_len=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
114 int pos=videobuf_len;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
115 if(!read_video_packet(d_video)){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
116 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdrEx);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
117 return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
118 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
119 if(mp_header_process_extension (&picture, &videobuffer[pos+4])) {
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
120 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdrEx);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
121 return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
122 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
123 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
124
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
125 // printf("picture.fps=%d\n",picture.fps);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
126
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
127 // fill aspect info:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
128 switch(picture.aspect_ratio_information){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
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
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
131 case 8: // PAL VCD 4:3
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
132 case 12: // NTSC VCD 4:3
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
133 sh_video->aspect=4.0/3.0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
134 break;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
135 case 3: // PAL/NTSC Widescreen SVCD/DVD 16:9
3666
70c409621d92 Add aspect 6, anamorphic 16:9 for svcd
atmos4
parents: 3526
diff changeset
136 case 6: // (PAL?)/NTSC Widescreen SVCD 16:9
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
137 sh_video->aspect=16.0/9.0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
138 break;
4336
71fa805e84d6 aspect ratio 9 added.
jaf
parents: 4074
diff changeset
139 case 9: // Movie Type ??? / 640x480
71fa805e84d6 aspect ratio 9 added.
jaf
parents: 4074
diff changeset
140 sh_video->aspect=0.0;
71fa805e84d6 aspect ratio 9 added.
jaf
parents: 4074
diff changeset
141 break;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
142 default:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
143 fprintf(stderr,"Detected unknown aspect_ratio_information in mpeg sequence header.\n"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
144 "Please report the aspect value (%i) along with the movie type (VGA,PAL,NTSC,"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
145 "SECAM) and the movie resolution (720x576,352x240,480x480,...) to the MPlayer"
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
146 " 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
147 picture.aspect_ratio_information);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
148 case 1: // VGA 1:1 - do not prescale
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
149 sh_video->aspect=0.0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
150 break;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
151 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
152 // display info:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
153 sh_video->format=picture.mpeg1?0x10000001:0x10000002; // mpeg video
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
154 sh_video->fps=picture.fps*0.0001f;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
155 if(!sh_video->fps){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
156 // if(!force_fps){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
157 // fprintf(stderr,"FPS not specified (or invalid) in the header! Use the -fps option!\n");
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
158 // return 0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
159 // }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
160 sh_video->frametime=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
161 } else {
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
162 sh_video->frametime=10000.0f/(float)picture.fps;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
163 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
164 sh_video->disp_w=picture.display_picture_width;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
165 sh_video->disp_h=picture.display_picture_height;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
166 // bitrate:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
167 if(picture.bitrate!=0x3FFFF) // unspecified/VBR ?
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
168 sh_video->i_bps=1000*picture.bitrate/16;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
169 // info:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
170 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"mpeg bitrate: %d (%X)\n",picture.bitrate,picture.bitrate);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
171 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
172 picture.mpeg1?"MPEG1":"MPEG2",
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
173 sh_video->disp_w,sh_video->disp_h,
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
174 picture.aspect_ratio_information,
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
175 sh_video->fps,
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
176 picture.bitrate*0.5f,
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
177 picture.bitrate/16.0f );
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
178 break;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
179 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
180 } // switch(file_format)
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
181
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
182 return 1;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
183 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
184
4074
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
185 static void process_userdata(unsigned char* buf,int len){
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
186 int i;
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
187 printf( "user_data: len=%3d %02X %02X %02X %02X '",
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
188 len, buf[0], buf[1], buf[2], buf[3]);
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
189 for(i=0;i<len;i++)
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
190 if(buf[i]>=32 && buf[i]<127) putchar(buf[i]);
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
191 printf("'\n");
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
192 }
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
193
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
194 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
195 demux_stream_t *d_video=sh_video->ds;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
196 demuxer_t *demuxer=d_video->demuxer;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
197 float frame_time=1;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
198 float pts1=d_video->pts;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
199 // unsigned char* start=NULL;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
200 int in_size=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
201
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
202 *start=NULL;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
203
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
204 if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || demuxer->file_format==DEMUXER_TYPE_MPEG_PS){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
205 int in_frame=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
206 //float newfps;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
207 //videobuf_len=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
208 while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
209 int i=sync_video_packet(d_video);
4074
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
210 //void* buffer=&videobuffer[videobuf_len+4];
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
211 int start=videobuf_len+4;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
212 if(in_frame){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
213 if(i<0x101 || i>=0x1B0){ // not slice code -> end of frame
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
214 #if 1
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
215 // send END OF FRAME code:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
216 videobuffer[videobuf_len+0]=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
217 videobuffer[videobuf_len+1]=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
218 videobuffer[videobuf_len+2]=1;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
219 videobuffer[videobuf_len+3]=0xFF;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
220 videobuf_len+=4;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
221 #endif
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
222 if(!i) return -1; // EOF
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
223 break;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
224 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
225 } else {
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
226 //if(i==0x100) in_frame=1; // picture startcode
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
227 if(i>=0x101 && i<0x1B0) in_frame=1; // picture startcode
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
228 else if(!i) return -1; // EOF
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
229 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
230 //if(grab_frames==2 && (i==0x1B3 || i==0x1B8)) grab_frames=1;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
231 if(!read_video_packet(d_video)) return -1; // EOF
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
232 //printf("read packet 0x%X, len=%d\n",i,videobuf_len);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
233 // process headers:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
234 switch(i){
4074
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
235 case 0x1B3: mp_header_process_sequence_header (&picture, &videobuffer[start]);break;
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
236 case 0x1B5: mp_header_process_extension (&picture, &videobuffer[start]);break;
aca490499e1f added mpeg userdata dump
arpi
parents: 3980
diff changeset
237 case 0x1B2: if(verbose) process_userdata (&videobuffer[start], videobuf_len-start);break;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
238 }
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(videobuf_len>max_framesize) max_framesize=videobuf_len; // debug
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
242 //printf("--- SEND %d bytes\n",videobuf_len);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
243 // if(grab_frames==1){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
244 // FILE *f=fopen("grab.mpg","ab");
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
245 // fwrite(videobuffer,videobuf_len-4,1,f);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
246 // fclose(f);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
247 // }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
248
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
249 *start=videobuffer; in_size=videobuf_len;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
250 //blit_frame=decode_video(video_out,sh_video,videobuffer,videobuf_len,drop_frame);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
251
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
252 #if 1
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
253 // get mpeg fps:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
254 //newfps=frameratecode2framerate[picture->frame_rate_code]*0.0001f;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
255 if((int)(sh_video->fps*10000+0.5)!=picture.fps) if(!force_fps){
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
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);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
257 sh_video->fps=picture.fps*0.0001;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
258 sh_video->frametime=10000.0f/(float)picture.fps;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
259 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
260 #endif
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
261
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
262 // fix mpeg2 frametime:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
263 frame_time=(picture.display_time)*0.01f;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
264 picture.display_time=100;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
265 videobuf_len=0;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
266
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
267 } else {
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
268 // frame-based file formats: (AVI,ASF,MOV)
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
269 in_size=ds_get_packet(d_video,start);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
270 if(in_size<0) return -1; // EOF
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
271 // if(in_size>max_framesize) max_framesize=in_size;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
272 // blit_frame=decode_video(video_out,sh_video,start,in_size,drop_frame);
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
273 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
274
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
275 // vdecode_time=video_time_usage-vdecode_time;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
276
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
277 //------------------------ frame decoded. --------------------
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
278
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
279 // Increase video timers:
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
280 sh_video->num_frames+=frame_time;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
281 ++sh_video->num_frames_decoded;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
282
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
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;
6371
622d57683187 Fix asf stream wich were giving invalid frame times because the frame time
albeu
parents: 5930
diff changeset
296 if(d>=0){
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
297 if(verbose)
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
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
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
300 sh_video->frametime=d; // 1ms
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
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 {
6371
622d57683187 Fix asf stream wich were giving invalid frame times because the frame time
albeu
parents: 5930
diff changeset
304 mp_msg(MSGT_CPLAYER,MSGL_WARN,"\nInvalid frame duration value (%2.5f/%2.5f => %2.5f). Defaulting to 1/25 sec.\n",d_video->pts,next_pts,d);
5930
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
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
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
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
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
f6d45a3f005c mpeg-es osd fix - patch by ??? (lost mail:((()
arpi
parents: 4336
diff changeset
310 if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS ||
f6d45a3f005c mpeg-es osd fix - patch by ??? (lost mail:((()
arpi
parents: 4336
diff changeset
311 demuxer->file_format==DEMUXER_TYPE_MPEG_ES) d_video->pts+=frame_time;
2567
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
312
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
313 if(frame_time_ptr) *frame_time_ptr=frame_time;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
314 return in_size;
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
315
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
316 }
ea6158be8103 video frame reading cleanup
arpi
parents:
diff changeset
317