Mercurial > mplayer.hg
annotate libmpdemux/demux_asf.c @ 26907:f0d0b666ee35
Fix compilation with internal dvdnav
author | rtogni |
---|---|
date | Sat, 31 May 2008 13:42:09 +0000 |
parents | 87d096a58965 |
children | f8df4c3e2ac2 |
rev | line source |
---|---|
1 | 1 // ASF file parser for DEMUXER v0.3 by A'rpi/ESP-team |
2 | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
3 #include <stdio.h> |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
4 #include <stdlib.h> |
1430 | 5 #include <unistd.h> |
26612
87d096a58965
Check ASF packet size before calling demux_asf_read_packet. Fixes segfault
eugeni
parents:
26414
diff
changeset
|
6 #include <assert.h> |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
7 |
1567 | 8 #include "config.h" |
9 #include "mp_msg.h" | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1628
diff
changeset
|
10 #include "help_mp.h" |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
11 |
22605
4d81dbdf46b9
Add explicit location for headers from the stream/ directory.
diego
parents:
21968
diff
changeset
|
12 #include "stream/stream.h" |
1342 | 13 #include "asf.h" |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
14 #include "demuxer.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
15 |
17012 | 16 #include "libvo/fastmemcpy.h" |
25488 | 17 #include "libavutil/intreadwrite.h" |
1342 | 18 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
19 // defined at asfheader.c: |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
20 |
16175 | 21 extern int asf_check_header(demuxer_t *demuxer); |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
22 extern int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf); |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
23 |
1 | 24 // based on asf file-format doc by Eugene [http://divx.euro.ru] |
25 | |
25487
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
26 /** |
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
27 * \brief reads int stored in number of bytes given by len |
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
28 * \param ptr pointer to read from, is incremented appropriately |
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
29 * \param len lowest 2 bits indicate number of bytes to read |
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
30 * \param def default value to return if len is invalid |
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
31 */ |
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
32 static inline unsigned read_varlen(uint8_t **ptr, int len, int def) { |
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
33 const uint8_t *p = *ptr; |
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
34 len &= 3; |
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
35 switch (len) { |
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
36 case 1: *ptr += 1; return *p; |
25488 | 37 case 2: *ptr += 2; return AV_RL16(p); |
38 case 3: *ptr += 4; return AV_RL32(p); | |
25487
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
39 } |
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
40 return def; |
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
41 } |
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
42 |
25925 | 43 /** |
44 * \brief checks if there is enough data to read the bytes given by len | |
45 * \param ptr pointer to read from | |
46 * \param endptr pointer to the end of the buffer | |
47 * \param len lowest 2 bits indicate number of bytes to read | |
48 */ | |
49 static inline int check_varlen(uint8_t *ptr, uint8_t *endptr, int len) { | |
26414
a7031923e4dc
demux_asf: Fix operator precedence in packet length check
uau
parents:
26069
diff
changeset
|
50 return len&3 ? ptr + (1<<((len&3) - 1)) <= endptr : 1; |
25925 | 51 } |
52 | |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
53 static void asf_descrambling(unsigned char **src,unsigned len, struct asf_priv* asf){ |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
54 unsigned char *dst=malloc(len); |
15553
43af13780751
Speedup asf descrambling (avoid one memcpy and use our fastmemcpy).
reimar
parents:
14502
diff
changeset
|
55 unsigned char *s2=*src; |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
56 unsigned i=0,x,y; |
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
57 while(len>=asf->scrambling_h*asf->scrambling_w*asf->scrambling_b+i){ |
1567 | 58 // mp_msg(MSGT_DEMUX,MSGL_DBG4,"descrambling! (w=%d b=%d)\n",w,asf_scrambling_b); |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
59 //i+=asf_scrambling_h*asf_scrambling_w; |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
60 for(x=0;x<asf->scrambling_w;x++) |
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
61 for(y=0;y<asf->scrambling_h;y++){ |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
23357
diff
changeset
|
62 fast_memcpy(dst+i,s2+(y*asf->scrambling_w+x)*asf->scrambling_b,asf->scrambling_b); |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
63 i+=asf->scrambling_b; |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
64 } |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
65 s2+=asf->scrambling_h*asf->scrambling_w*asf->scrambling_b; |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
66 } |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
23357
diff
changeset
|
67 //if(i<len) fast_memcpy(dst+i,src+i,len-i); |
15553
43af13780751
Speedup asf descrambling (avoid one memcpy and use our fastmemcpy).
reimar
parents:
14502
diff
changeset
|
68 free(*src); |
43af13780751
Speedup asf descrambling (avoid one memcpy and use our fastmemcpy).
reimar
parents:
14502
diff
changeset
|
69 *src = dst; |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
70 } |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
71 |
23239 | 72 /***************************************************************** |
73 * \brief initializes asf private data | |
74 * | |
75 */ | |
76 static void init_priv (struct asf_priv* asf){ | |
77 asf->last_vid_seq=-1; | |
78 asf->vid_ext_timing_index=-1; | |
79 asf->aud_ext_timing_index=-1; | |
80 asf->vid_ext_frame_index=-1; | |
81 } | |
82 | |
26069
1318e956c092
FFmpeg now uses different (unified) #include paths.
diego
parents:
25925
diff
changeset
|
83 #ifdef USE_LIBAVCODEC |
17343
b07bb7ee7ce4
include the right avcodec.h, consistently with the rest of mplayer
nicodvb
parents:
17232
diff
changeset
|
84 #include "libavcodec/avcodec.h" |
17226
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
85 #else |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
86 #define FF_INPUT_BUFFER_PADDING_SIZE 8 |
255b14c0bc36
malloc padding to avoid access beyond allocated memory
henry
parents:
17012
diff
changeset
|
87 #endif |
1 | 88 |
18609
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
89 |
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
90 static void demux_asf_append_to_packet(demux_packet_t* dp,unsigned char *data,int len,int offs) |
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
91 { |
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
92 if(dp->len!=offs && offs!=-1) mp_msg(MSGT_DEMUX,MSGL_V,"warning! fragment.len=%d BUT next fragment offset=%d \n",dp->len,offs); |
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
93 dp->buffer=realloc(dp->buffer,dp->len+len+FF_INPUT_BUFFER_PADDING_SIZE); |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
23357
diff
changeset
|
94 fast_memcpy(dp->buffer+dp->len,data,len); |
18609
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
95 memset(dp->buffer+dp->len+len, 0, FF_INPUT_BUFFER_PADDING_SIZE); |
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
96 mp_dbg(MSGT_DEMUX,MSGL_DBG4,"data appended! %d+%d\n",dp->len,len); |
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
97 dp->len+=len; |
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
98 } |
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
99 |
23239 | 100 static int demux_asf_read_packet(demuxer_t *demux,unsigned char *data,int len,int id,int seq,uint64_t time,unsigned short dur,int offs,int keyframe){ |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
101 struct asf_priv* asf = demux->priv; |
1 | 102 demux_stream_t *ds=NULL; |
18609
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
103 int close_seg=0; |
1 | 104 |
1567 | 105 mp_dbg(MSGT_DEMUX,MSGL_DBG4,"demux_asf.read_packet: id=%d seq=%d len=%d\n",id,seq,len); |
1 | 106 |
426 | 107 if(demux->video->id==-1) |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
108 if(demux->v_streams[id]) |
426 | 109 demux->video->id=id; |
110 | |
1 | 111 if(demux->audio->id==-1) |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
112 if(demux->a_streams[id]) |
426 | 113 demux->audio->id=id; |
1 | 114 |
115 if(id==demux->audio->id){ | |
116 // audio | |
117 ds=demux->audio; | |
426 | 118 if(!ds->sh){ |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
119 ds->sh=demux->a_streams[id]; |
1567 | 120 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected ASF audio ID = %d\n",ds->id); |
426 | 121 } |
1 | 122 } else |
123 if(id==demux->video->id){ | |
124 // video | |
125 ds=demux->video; | |
426 | 126 if(!ds->sh){ |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
426
diff
changeset
|
127 ds->sh=demux->v_streams[id]; |
1567 | 128 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected ASF video ID = %d\n",ds->id); |
426 | 129 } |
1 | 130 } |
131 | |
132 if(ds){ | |
133 if(ds->asf_packet){ | |
18609
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
134 demux_packet_t* dp=ds->asf_packet; |
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
135 |
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
136 if (ds==demux->video && asf->asf_is_dvr_ms) { |
23239 | 137 if (asf->new_vid_frame_seg) { |
18609
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
138 dp->pos=demux->filepos; |
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
139 close_seg = 1; |
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
140 } else seq = ds->asf_seq; |
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
141 } else close_seg = ds->asf_seq!=seq; |
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
142 |
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
143 if(close_seg){ |
1 | 144 // closed segment, finalize packet: |
145 if(ds==demux->audio) | |
18001 | 146 if(asf->scrambling_h>1 && asf->scrambling_w>1 && asf->scrambling_b>0) |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
147 asf_descrambling(&ds->asf_packet->buffer,ds->asf_packet->len,asf); |
1 | 148 ds_add_packet(ds,ds->asf_packet); |
149 ds->asf_packet=NULL; | |
150 } else { | |
151 // append data to it! | |
18609
bb7042d74855
Patch from John Donaghy: "fix for audio and video in dvr-ms asf files"
pacman
parents:
18001
diff
changeset
|
152 demux_asf_append_to_packet(dp,data,len,offs); |
1 | 153 // we are ready now. |
154 return 1; | |
155 } | |
156 } | |
157 // create new packet: | |
158 { demux_packet_t* dp; | |
159 if(offs>0){ | |
1567 | 160 mp_msg(MSGT_DEMUX,MSGL_V,"warning! broken fragment, %d bytes missing \n",offs); |
1 | 161 return 0; |
162 } | |
163 dp=new_demux_packet(len); | |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
23357
diff
changeset
|
164 fast_memcpy(dp->buffer,data,len); |
23239 | 165 if (asf->asf_is_dvr_ms) |
23469 | 166 dp->pts=time*0.0000001; |
23239 | 167 else |
23469 | 168 dp->pts=time*0.001; |
979 | 169 dp->flags=keyframe; |
1 | 170 // if(ds==demux->video) printf("ASF time: %8d dur: %5d \n",time,dur); |
171 dp->pos=demux->filepos; | |
172 ds->asf_packet=dp; | |
173 ds->asf_seq=seq; | |
174 // we are ready now. | |
175 return 1; | |
176 } | |
177 } | |
178 | |
179 return 0; | |
180 } | |
181 | |
23239 | 182 /***************************************************************** |
183 * \brief read the replicated data associated with each segment | |
184 * \parameter pp reference to replicated data | |
185 * \parameter id stream number | |
186 * \parameter seq media object number | |
187 * \parameter keyframe key frame indicator - set to zero if keyframe, non-zero otherwise | |
188 * \parameter seg_time set to payload time when valid, if audio or new video frame payload, zero otherwise | |
189 * | |
190 */ | |
191 static void get_payload_extension_data(demuxer_t *demux, unsigned char** pp, unsigned char id, unsigned int seq, int *keyframe, uint64_t *seg_time){ | |
192 struct asf_priv* asf = demux->priv; | |
193 uint64_t payload_time; //100ns units | |
194 int i, ext_max, ext_timing_index; | |
195 uint8_t *pi = *pp+4; | |
196 | |
197 if(demux->video->id==-1) | |
198 if(demux->v_streams[id]) | |
199 demux->video->id=id; | |
200 | |
201 if(demux->audio->id==-1) | |
202 if(demux->a_streams[id]) | |
203 demux->audio->id=id; | |
204 | |
205 if (id!=demux->video->id && id!=demux->audio->id) return; | |
206 | |
207 if (id==demux->video->id) { | |
208 ext_max = asf->vid_repdata_count; | |
209 ext_timing_index = asf->vid_ext_timing_index; | |
210 } else { | |
211 ext_max = asf->aud_repdata_count; | |
212 ext_timing_index = asf->aud_ext_timing_index; | |
213 } | |
214 | |
215 *seg_time=0.0; | |
216 asf->new_vid_frame_seg = 0; | |
217 | |
218 for (i=0; i<ext_max; i++) { | |
219 uint16_t payextsize; | |
220 uint8_t segment_marker; | |
221 | |
222 if (id==demux->video->id) | |
223 payextsize = asf->vid_repdata_sizes[i]; | |
224 else | |
225 payextsize = asf->aud_repdata_sizes[i]; | |
226 | |
227 if (payextsize == 65535) { | |
25488 | 228 payextsize = AV_RL16(pi); |
23239 | 229 pi+=2; |
230 } | |
231 | |
232 // if this is the timing info extension then read the payload time | |
233 if (i == ext_timing_index) | |
25488 | 234 payload_time = AV_RL64(pi+8); |
23239 | 235 |
236 // if this is the video frame info extension then | |
237 // set the keyframe indicator, the 'new frame segment' indicator | |
238 // and (initially) the 'frame time' | |
239 if (i == asf->vid_ext_frame_index && id==demux->video->id) { | |
240 segment_marker = pi[0]; | |
241 // Known video stream segment_marker values that | |
242 // contain useful information: | |
243 // | |
244 // NTSC/ATSC (29.97fps): 0X4A 01001010 | |
245 // 0X4B 01001011 | |
246 // 0X49 01001001 | |
247 // | |
248 // PAL/ATSC (25fps): 0X3A 00111010 | |
249 // 0X3B 00111011 | |
250 // 0X39 00111001 | |
251 // | |
252 // ATSC progressive (29.97fps): 0X7A 01111010 | |
253 // 0X7B 01111011 | |
254 // 0X79 01111001 | |
255 // 11111111 | |
256 // ^ this is new video frame marker | |
257 // | |
258 // ^^^^ these bits indicate the framerate | |
259 // 0X4 is 29.97i, 0X3 is 25i, 0X7 is 29.97p, ???=25p | |
260 // | |
261 // ^^^ these bits indicate the frame type: | |
262 // 001 means I-frame | |
263 // 010 and 011 probably mean P and B | |
264 | |
265 asf->new_vid_frame_seg = (0X08 & segment_marker) && seq != asf->last_vid_seq; | |
266 | |
267 if (asf->new_vid_frame_seg) asf->last_vid_seq = seq; | |
268 | |
269 if (asf->avg_vid_frame_time == 0) { | |
270 // set the average frame time initially (in 100ns units). | |
271 // This is based on what works for known samples. | |
272 // It can be extended if more samples of different types can be obtained. | |
273 if (((segment_marker & 0XF0) >> 4) == 4) { | |
274 asf->avg_vid_frame_time = (uint64_t)((1.001 / 30.0) * 10000000.0); | |
275 asf->know_frame_time=1; | |
276 } else if (((segment_marker & 0XF0) >> 4) == 3) { | |
277 asf->avg_vid_frame_time = (uint64_t)(0.04 * 10000000.0); | |
278 asf->know_frame_time=1; | |
279 } else if (((segment_marker & 0XF0) >> 4) == 6) { | |
280 asf->avg_vid_frame_time = (uint64_t)(0.02 * 10000000.0); | |
281 asf->know_frame_time=1; | |
282 } else if (((segment_marker & 0XF0) >> 4) == 7) { | |
283 asf->avg_vid_frame_time = (uint64_t)((1.001 / 60.0) * 10000000.0); | |
284 asf->know_frame_time=1; | |
285 } else { | |
286 // we dont know the frame time initially so | |
287 // make a guess and then recalculate as we go. | |
288 asf->avg_vid_frame_time = (uint64_t)((1.001 / 60.0) * 10000000.0); | |
289 asf->know_frame_time=0; | |
290 } | |
291 } | |
292 *keyframe = (asf->new_vid_frame_seg && (segment_marker & 0X07) == 1); | |
293 } | |
294 pi +=payextsize; | |
295 } | |
296 | |
297 if (id==demux->video->id && asf->new_vid_frame_seg) { | |
298 asf->vid_frame_ct++; | |
299 // Some samples only have timings on key frames and | |
300 // the rest contain non-cronological timestamps. Interpolating | |
301 // the values between key frames works for all samples. | |
302 if (*keyframe) { | |
303 asf->found_first_key_frame=1; | |
304 if (!asf->know_frame_time && asf->last_key_payload_time > 0) { | |
305 // We dont know average frametime so recalculate. | |
306 // Giving precedence to the 'weight' of the existing | |
307 // average limits damage done to new value when there is | |
308 // a sudden time jump which happens occasionally. | |
309 asf->avg_vid_frame_time = | |
310 (0.9 * asf->avg_vid_frame_time) + | |
311 (0.1 * ((payload_time - asf->last_key_payload_time) / asf->vid_frame_ct)); | |
312 } | |
313 asf->last_key_payload_time = payload_time; | |
314 asf->vid_frame_ct = 1; | |
315 *seg_time = payload_time; | |
316 } else | |
317 *seg_time = (asf->last_key_payload_time + (asf->avg_vid_frame_time * (asf->vid_frame_ct-1))); | |
318 } | |
319 | |
320 if (id==demux->audio->id) { | |
321 if (payload_time != -1) | |
322 asf->last_aud_diff = payload_time - asf->last_aud_pts; | |
323 asf->last_aud_pts += asf->last_aud_diff; | |
324 *seg_time = asf->last_aud_pts; | |
325 } | |
326 } | |
1 | 327 //static int num_elementary_packets100=0; |
328 //static int num_elementary_packets101=0; | |
329 | |
330 // return value: | |
331 // 0 = EOF or no stream found | |
332 // 1 = successfully read a packet | |
16175 | 333 static int demux_asf_fill_buffer(demuxer_t *demux, demux_stream_t *ds){ |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
334 struct asf_priv* asf = demux->priv; |
1 | 335 |
336 demux->filepos=stream_tell(demux->stream); | |
3475
390388c75209
Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents:
2338
diff
changeset
|
337 // Brodcast stream have movi_start==movi_end |
390388c75209
Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents:
2338
diff
changeset
|
338 // Better test ? |
10622 | 339 if((demux->movi_start < demux->movi_end) && (demux->filepos>=demux->movi_end)){ |
1 | 340 demux->stream->eof=1; |
341 return 0; | |
342 } | |
343 | |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
344 stream_read(demux->stream,asf->packet,asf->packetsize); |
1 | 345 if(demux->stream->eof) return 0; // EOF |
25925 | 346 if(asf->packetsize < 2) return 0; // Packet too short |
1 | 347 |
12877
e427e3cc26c1
skip ecc only if present, patch by Alexis Durelle <alexis.durelle@cen.cnamts.fr> (needed for the Aiptek DV3500 camera)
alex
parents:
10832
diff
changeset
|
348 { |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
349 unsigned char* p=asf->packet; |
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
350 unsigned char* p_end=asf->packet+asf->packetsize; |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
351 unsigned char flags=p[0]; |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
352 unsigned char segtype=p[1]; |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
353 unsigned padding; |
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
354 unsigned plen; |
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
355 unsigned sequence; |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
356 unsigned long time=0; |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
357 unsigned short duration=0; |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
358 |
1 | 359 int segs=1; |
360 unsigned char segsizetype=0x80; | |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
361 int seg=-1; |
1 | 362 |
17932 | 363 if( mp_msg_test(MSGT_DEMUX,MSGL_DBG2) ){ |
1 | 364 int i; |
25925 | 365 for(i=0;i<FFMIN(16, asf->packetsize);i++) printf(" %02X",asf->packet[i]); |
1 | 366 printf("\n"); |
367 } | |
368 | |
12877
e427e3cc26c1
skip ecc only if present, patch by Alexis Durelle <alexis.durelle@cen.cnamts.fr> (needed for the Aiptek DV3500 camera)
alex
parents:
10832
diff
changeset
|
369 // skip ECC data if present by testing bit 7 of flags |
e427e3cc26c1
skip ecc only if present, patch by Alexis Durelle <alexis.durelle@cen.cnamts.fr> (needed for the Aiptek DV3500 camera)
alex
parents:
10832
diff
changeset
|
370 // 1xxxbbbb -> ecc data present, skip bbbb byte(s) |
e427e3cc26c1
skip ecc only if present, patch by Alexis Durelle <alexis.durelle@cen.cnamts.fr> (needed for the Aiptek DV3500 camera)
alex
parents:
10832
diff
changeset
|
371 // 0xxxxxxx -> payload parsing info starts |
e427e3cc26c1
skip ecc only if present, patch by Alexis Durelle <alexis.durelle@cen.cnamts.fr> (needed for the Aiptek DV3500 camera)
alex
parents:
10832
diff
changeset
|
372 if (flags & 0x80) |
e427e3cc26c1
skip ecc only if present, patch by Alexis Durelle <alexis.durelle@cen.cnamts.fr> (needed for the Aiptek DV3500 camera)
alex
parents:
10832
diff
changeset
|
373 { |
e427e3cc26c1
skip ecc only if present, patch by Alexis Durelle <alexis.durelle@cen.cnamts.fr> (needed for the Aiptek DV3500 camera)
alex
parents:
10832
diff
changeset
|
374 p += (flags & 0x0f)+1; |
25925 | 375 if (p+1 >= p_end) return 0; // Packet too short |
12877
e427e3cc26c1
skip ecc only if present, patch by Alexis Durelle <alexis.durelle@cen.cnamts.fr> (needed for the Aiptek DV3500 camera)
alex
parents:
10832
diff
changeset
|
376 flags = p[0]; |
e427e3cc26c1
skip ecc only if present, patch by Alexis Durelle <alexis.durelle@cen.cnamts.fr> (needed for the Aiptek DV3500 camera)
alex
parents:
10832
diff
changeset
|
377 segtype = p[1]; |
e427e3cc26c1
skip ecc only if present, patch by Alexis Durelle <alexis.durelle@cen.cnamts.fr> (needed for the Aiptek DV3500 camera)
alex
parents:
10832
diff
changeset
|
378 } |
e427e3cc26c1
skip ecc only if present, patch by Alexis Durelle <alexis.durelle@cen.cnamts.fr> (needed for the Aiptek DV3500 camera)
alex
parents:
10832
diff
changeset
|
379 |
1 | 380 //if(segtype!=0x5d) printf("Warning! packet[4] != 0x5d \n"); |
381 | |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
382 p+=2; // skip flags & segtype |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
383 |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
384 // Read packet size (plen): |
25925 | 385 if(!check_varlen(p, p_end, flags>> 5)) return 0; // Not enough data |
25487
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
386 plen = read_varlen(&p, flags >> 5, 0); |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
387 |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
388 // Read sequence: |
25925 | 389 if(!check_varlen(p, p_end, flags>> 1)) return 0; // Not enough data |
25487
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
390 sequence = read_varlen(&p, flags >> 1, 0); |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
391 |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
392 // Read padding size (padding): |
25925 | 393 if(!check_varlen(p, p_end, flags>> 3)) return 0; // Not enough data |
25487
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
394 padding = read_varlen(&p, flags >> 3, 0); |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
395 |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
396 if(((flags>>5)&3)!=0){ |
1 | 397 // Explicit (absoulte) packet size |
1567 | 398 mp_dbg(MSGT_DEMUX,MSGL_DBG2,"Explicit packet size specified: %d \n",plen); |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
399 if(plen>asf->packetsize) mp_msg(MSGT_DEMUX,MSGL_V,"Warning! plen>packetsize! (%d>%d) \n",plen,asf->packetsize); |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
400 } else { |
1 | 401 // Padding (relative) size |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
402 plen=asf->packetsize-padding; |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
403 } |
1 | 404 |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
405 // Read time & duration: |
25925 | 406 if (p+5 >= p_end) return 0; // Packet too short |
25488 | 407 time = AV_RL32(p); p+=4; |
408 duration = AV_RL16(p); p+=2; | |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
409 |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
410 // Read payload flags: |
1 | 411 if(flags&1){ |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
412 // multiple sub-packets |
25925 | 413 if (p >= p_end) return 0; // Packet too short |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
414 segsizetype=p[0]>>6; |
1 | 415 segs=p[0] & 0x3F; |
416 ++p; | |
417 } | |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
418 mp_dbg(MSGT_DEMUX,MSGL_DBG4,"%08"PRIu64": flag=%02X segs=%d seq=%u plen=%u pad=%u time=%ld dur=%d\n", |
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
419 (uint64_t)demux->filepos,flags,segs,sequence,plen,padding,time,duration); |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
420 |
1 | 421 for(seg=0;seg<segs;seg++){ |
422 //ASF_segmhdr_t* sh; | |
423 unsigned char streamno; | |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
424 unsigned int seq; |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
425 unsigned int x; // offset or timestamp |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
426 unsigned int rlen; |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
427 // |
1 | 428 int len; |
23239 | 429 uint64_t time2=0; |
979 | 430 int keyframe=0; |
1 | 431 |
21968
92f83f7c8eef
Instead of printing a useless "sig11 coming soon" message, just abort parsing
reimar
parents:
20792
diff
changeset
|
432 if(p>=p_end) { |
92f83f7c8eef
Instead of printing a useless "sig11 coming soon" message, just abort parsing
reimar
parents:
20792
diff
changeset
|
433 mp_msg(MSGT_DEMUX,MSGL_V,"Warning! invalid packet 1, aborting parsing...\n"); |
92f83f7c8eef
Instead of printing a useless "sig11 coming soon" message, just abort parsing
reimar
parents:
20792
diff
changeset
|
434 break; |
92f83f7c8eef
Instead of printing a useless "sig11 coming soon" message, just abort parsing
reimar
parents:
20792
diff
changeset
|
435 } |
1 | 436 |
17932 | 437 if( mp_msg_test(MSGT_DEMUX,MSGL_DBG2) ){ |
1 | 438 int i; |
439 printf("seg %d:",seg); | |
25925 | 440 for(i=0;i<FFMIN(16, p_end - p);i++) printf(" %02X",p[i]); |
1 | 441 printf("\n"); |
442 } | |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
443 |
1 | 444 streamno=p[0]&0x7F; |
979 | 445 if(p[0]&0x80) keyframe=1; |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
446 p++; |
1 | 447 |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
448 // Read media object number (seq): |
25925 | 449 if(!check_varlen(p, p_end, segtype >> 4)) break; // Not enough data |
25487
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
450 seq = read_varlen(&p, segtype >> 4, 0); |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
451 |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
452 // Read offset or timestamp: |
25925 | 453 if(!check_varlen(p, p_end, segtype >> 2)) break; // Not enough data |
25487
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
454 x = read_varlen(&p, segtype >> 2, 0); |
1 | 455 |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
456 // Read replic.data len: |
25925 | 457 if(!check_varlen(p, p_end, segtype)) break; // Not enough data |
25487
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
458 rlen = read_varlen(&p, segtype, 0); |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
459 |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
460 // printf("### rlen=%d \n",rlen); |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
461 |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
462 switch(rlen){ |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
463 case 0x01: // 1 = special, means grouping |
1 | 464 //printf("grouping: %02X \n",p[0]); |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
465 ++p; // skip PTS delta |
1 | 466 break; |
467 default: | |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
468 if(rlen>=8){ |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
469 p+=4; // skip object size |
25925 | 470 if (p+3 >= p_end) break; // Packet too short |
25488 | 471 time2=AV_RL32(p); // read PTS |
23239 | 472 if (asf->asf_is_dvr_ms) |
473 get_payload_extension_data(demux, &p, streamno, seq, &keyframe, &time2); | |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
474 p+=rlen-4; |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
475 } else { |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
476 mp_msg(MSGT_DEMUX,MSGL_V,"unknown segment type (rlen): 0x%02X \n",rlen); |
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
6668
diff
changeset
|
477 time2=0; // unknown |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
478 p+=rlen; |
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
479 } |
1 | 480 } |
481 | |
482 if(flags&1){ | |
483 // multiple segments | |
25925 | 484 if(!check_varlen(p, p_end, segsizetype)) break; // Not enough data |
25487
81a77832f5fc
Add a read_varlen function to reduce some code duplication
reimar
parents:
23511
diff
changeset
|
485 len = read_varlen(&p, segsizetype, plen-(p-asf->packet)); |
1 | 486 } else { |
487 // single segment | |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
488 len=plen-(p-asf->packet); |
1 | 489 } |
4197 | 490 if(len<0 || (p+len)>p_end){ |
1567 | 491 mp_msg(MSGT_DEMUX,MSGL_V,"ASF_parser: warning! segment len=%d\n",len); |
1 | 492 } |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
493 mp_dbg(MSGT_DEMUX,MSGL_DBG4," seg #%d: streamno=%d seq=%d type=%02X len=%d\n",seg,streamno,seq,rlen,len); |
1 | 494 |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
495 switch(rlen){ |
1 | 496 case 0x01: |
497 // GROUPING: | |
498 //printf("ASF_parser: warning! grouping (flag=1) not yet supported!\n",len); | |
499 //printf(" total: %d \n",len); | |
500 while(len>0){ | |
501 int len2=p[0]; | |
502 p++; | |
503 //printf(" group part: %d bytes\n",len2); | |
25925 | 504 if(len2 > len - 1) break; // Not enough data |
26612
87d096a58965
Check ASF packet size before calling demux_asf_read_packet. Fixes segfault
eugeni
parents:
26414
diff
changeset
|
505 assert(len2 > 0 && len2 <= asf->packetsize); |
979 | 506 demux_asf_read_packet(demux,p,len2,streamno,seq,x,duration,-1,keyframe); |
1 | 507 p+=len2; |
508 len-=len2+1; | |
6668 | 509 ++seq; |
1 | 510 } |
511 if(len!=0){ | |
1567 | 512 mp_msg(MSGT_DEMUX,MSGL_V,"ASF_parser: warning! groups total != len\n"); |
1 | 513 } |
514 break; | |
6442
2eaeb73ce8ab
some cleanup and fixes, but the badquality.asf is still buggy :(
arpi
parents:
4197
diff
changeset
|
515 default: |
1 | 516 // NO GROUPING: |
517 //printf("fragment offset: %d \n",sh->x); | |
26612
87d096a58965
Check ASF packet size before calling demux_asf_read_packet. Fixes segfault
eugeni
parents:
26414
diff
changeset
|
518 if (!asf->asf_is_dvr_ms || asf->found_first_key_frame) { |
87d096a58965
Check ASF packet size before calling demux_asf_read_packet. Fixes segfault
eugeni
parents:
26414
diff
changeset
|
519 assert(len > 0 && len <= asf->packetsize); |
23239 | 520 demux_asf_read_packet(demux,p,len,streamno,seq,time2,duration,x,keyframe); |
26612
87d096a58965
Check ASF packet size before calling demux_asf_read_packet. Fixes segfault
eugeni
parents:
26414
diff
changeset
|
521 } |
1 | 522 p+=len; |
523 break; | |
524 } | |
525 | |
526 } // for segs | |
527 return 1; // success | |
528 } | |
529 | |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
530 mp_msg(MSGT_DEMUX,MSGL_V,"%08"PRIX64": UNKNOWN TYPE %02X %02X %02X %02X %02X...\n",(int64_t)demux->filepos,asf->packet[0],asf->packet[1],asf->packet[2],asf->packet[3],asf->packet[4]); |
1 | 531 return 0; |
532 } | |
1466 | 533 |
534 #include "stheader.h" | |
535 | |
8123
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
7472
diff
changeset
|
536 extern void skip_audio_frame(sh_audio_t *sh_audio); |
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
7472
diff
changeset
|
537 |
17636 | 538 static void demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){ |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
539 struct asf_priv* asf = demuxer->priv; |
1466 | 540 demux_stream_t *d_audio=demuxer->audio; |
541 demux_stream_t *d_video=demuxer->video; | |
542 sh_audio_t *sh_audio=d_audio->sh; | |
543 // sh_video_t *sh_video=d_video->sh; | |
544 | |
545 //FIXME: OFF_T - didn't test ASF case yet (don't have a large asf...) | |
546 //FIXME: reports good or bad to steve@daviesfam.org please | |
547 | |
548 //================= seek in ASF ========================== | |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
549 float p_rate=asf->packetrate; // packets / sec |
25883
baf32110d3fc
Use defines to give names to the different seek flags.
reimar
parents:
25707
diff
changeset
|
550 off_t rel_seek_packs=(flags&SEEK_FACTOR)? // FIXME: int may be enough? |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
551 (rel_seek_secs*(demuxer->movi_end-demuxer->movi_start)/asf->packetsize): |
1628
bd1ef18cdf33
seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents:
1567
diff
changeset
|
552 (rel_seek_secs*p_rate); |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
553 off_t rel_seek_bytes=rel_seek_packs*asf->packetsize; |
1466 | 554 off_t newpos; |
555 //printf("ASF: packs: %d duration: %d \n",(int)fileh.packets,*((int*)&fileh.duration)); | |
556 // printf("ASF_seek: %d secs -> %d packs -> %d bytes \n", | |
557 // rel_seek_secs,rel_seek_packs,rel_seek_bytes); | |
25883
baf32110d3fc
Use defines to give names to the different seek flags.
reimar
parents:
25707
diff
changeset
|
558 newpos=((flags&SEEK_ABSOLUTE)?demuxer->movi_start:demuxer->filepos)+rel_seek_bytes; |
1466 | 559 if(newpos<0 || newpos<demuxer->movi_start) newpos=demuxer->movi_start; |
560 // printf("\r -- asf: newpos=%d -- \n",newpos); | |
561 stream_seek(demuxer->stream,newpos); | |
562 | |
19961
9f011e6892e8
interpolate real fps of dvr-ms files using the extended stream properties.
nicodvb
parents:
18710
diff
changeset
|
563 if (asf->asf_is_dvr_ms) asf->dvr_last_vid_pts = 0.0f; |
9f011e6892e8
interpolate real fps of dvr-ms files using the extended stream properties.
nicodvb
parents:
18710
diff
changeset
|
564 |
13310
c629f7ac9b9f
fix seeking in audio-only case (crash when seeking backwards, time reset to 0)
reimar
parents:
12877
diff
changeset
|
565 if (d_video->id >= 0) |
1466 | 566 ds_fill_buffer(d_video); |
567 if(sh_audio){ | |
568 ds_fill_buffer(d_audio); | |
569 } | |
570 | |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18609
diff
changeset
|
571 if (d_video->id >= 0) |
1466 | 572 while(1){ |
573 if(sh_audio && !d_audio->eof){ | |
574 float a_pts=d_audio->pts; | |
575 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; | |
576 // sync audio: | |
577 if (d_video->pts > a_pts){ | |
578 skip_audio_frame(sh_audio); | |
579 // if(!ds_fill_buffer(d_audio)) sh_audio=NULL; // skip audio. EOF? | |
580 continue; | |
581 } | |
582 } | |
583 if(d_video->flags&1) break; // found a keyframe! | |
584 if(!ds_fill_buffer(d_video)) break; // skip frame. EOF? | |
585 } | |
586 | |
587 | |
588 } | |
589 | |
16175 | 590 static int demux_asf_control(demuxer_t *demuxer,int cmd, void *arg){ |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
591 struct asf_priv* asf = demuxer->priv; |
8254
772d6d27fd66
warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents:
8208
diff
changeset
|
592 /* demux_stream_t *d_audio=demuxer->audio; |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
593 demux_stream_t *d_video=demuxer->video; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
594 sh_audio_t *sh_audio=d_audio->sh; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
595 sh_video_t *sh_video=d_video->sh; |
8254
772d6d27fd66
warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents:
8208
diff
changeset
|
596 */ |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
597 switch(cmd) { |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
598 case DEMUXER_CTRL_GET_TIME_LENGTH: |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
599 *((double *)arg)=(double)(asf->movielength); |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
600 return DEMUXER_CTRL_OK; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
601 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
602 case DEMUXER_CTRL_GET_PERCENT_POS: |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
603 return DEMUXER_CTRL_DONTKNOW; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
604 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
605 default: |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
606 return DEMUXER_CTRL_NOTIMPL; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
607 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
608 } |
16175 | 609 |
610 | |
611 static demuxer_t* demux_open_asf(demuxer_t* demuxer) | |
612 { | |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
613 struct asf_priv* asf = demuxer->priv; |
16175 | 614 sh_audio_t *sh_audio=NULL; |
615 sh_video_t *sh_video=NULL; | |
616 | |
617 //---- ASF header: | |
17992
2545bbd91450
Move global vars used for header parsing, etc to dewux->priv as it should
albeu
parents:
17932
diff
changeset
|
618 if(!asf) return NULL; |
23239 | 619 init_priv(asf); |
23295 | 620 if (!read_asf_header(demuxer,asf)) |
17598
4b8193d51bda
we cannot continue without a crash when read_asf_header fails, since some
reimar
parents:
17569
diff
changeset
|
621 return NULL; |
16175 | 622 stream_reset(demuxer->stream); |
623 stream_seek(demuxer->stream,demuxer->movi_start); | |
624 // demuxer->idx_pos=0; | |
625 // demuxer->endpos=avi_header.movi_end; | |
626 if(demuxer->video->id != -2) { | |
627 if(!ds_fill_buffer(demuxer->video)){ | |
628 mp_msg(MSGT_DEMUXER,MSGL_WARN,"ASF: " MSGTR_MissingVideoStream); | |
629 demuxer->video->sh=NULL; | |
630 //printf("ASF: missing video stream!? contact the author, it may be a bug :(\n"); | |
631 } else { | |
632 sh_video=demuxer->video->sh;sh_video->ds=demuxer->video; | |
23239 | 633 sh_video->fps=1000.0f; sh_video->frametime=0.001f; |
20636
325db3f2aba3
don't set the resolution for dvr-ms files: in the asf headers it seems to
nicodvb
parents:
19961
diff
changeset
|
634 |
325db3f2aba3
don't set the resolution for dvr-ms files: in the asf headers it seems to
nicodvb
parents:
19961
diff
changeset
|
635 if (asf->asf_is_dvr_ms) { |
325db3f2aba3
don't set the resolution for dvr-ms files: in the asf headers it seems to
nicodvb
parents:
19961
diff
changeset
|
636 sh_video->bih->biWidth = 0; |
325db3f2aba3
don't set the resolution for dvr-ms files: in the asf headers it seems to
nicodvb
parents:
19961
diff
changeset
|
637 sh_video->bih->biHeight = 0; |
325db3f2aba3
don't set the resolution for dvr-ms files: in the asf headers it seems to
nicodvb
parents:
19961
diff
changeset
|
638 } |
16175 | 639 } |
640 } | |
641 | |
642 if(demuxer->audio->id!=-2){ | |
643 mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_ASFSearchingForAudioStream,demuxer->audio->id); | |
644 if(!ds_fill_buffer(demuxer->audio)){ | |
645 mp_msg(MSGT_DEMUXER,MSGL_INFO,"ASF: " MSGTR_MissingAudioStream); | |
646 demuxer->audio->sh=NULL; | |
647 } else { | |
648 sh_audio=demuxer->audio->sh;sh_audio->ds=demuxer->audio; | |
649 sh_audio->format=sh_audio->wf->wFormatTag; | |
650 } | |
651 } | |
20792
dcaf8b9f47e9
Fix crash when attempting to seek in a streamed unseekable stream, like
gpoirier
parents:
20636
diff
changeset
|
652 if(!demuxer->stream->seek) |
dcaf8b9f47e9
Fix crash when attempting to seek in a streamed unseekable stream, like
gpoirier
parents:
20636
diff
changeset
|
653 demuxer->seekable=0; |
16175 | 654 |
655 return demuxer; | |
656 } | |
657 | |
658 | |
23239 | 659 static void demux_close_asf(demuxer_t *demuxer) { |
660 struct asf_priv* asf = demuxer->priv; | |
661 | |
662 if (!asf) return; | |
663 | |
664 if (asf->aud_repdata_sizes) | |
665 free(asf->aud_repdata_sizes); | |
666 | |
667 if (asf->vid_repdata_sizes) | |
668 free(asf->vid_repdata_sizes); | |
669 | |
670 free(asf); | |
671 } | |
672 | |
25707
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25488
diff
changeset
|
673 const demuxer_desc_t demuxer_desc_asf = { |
16175 | 674 "ASF demuxer", |
17232
d318e2ff799e
Typo in ASF demuxer selection by name (it's 'asf', not 'asv')
rtognimp
parents:
17226
diff
changeset
|
675 "asf", |
16175 | 676 "ASF", |
677 "A'rpi", | |
678 "ASF, WMV, WMA", | |
679 DEMUXER_TYPE_ASF, | |
680 1, // safe autodetect | |
681 asf_check_header, | |
682 demux_asf_fill_buffer, | |
683 demux_open_asf, | |
23239 | 684 demux_close_asf, |
16175 | 685 demux_seek_asf, |
686 demux_asf_control | |
687 }; |