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