annotate asfdec.c @ 5369:347123a18feb libavformat

Search relative path according to alias record when opening mov reference files. Based on patch by Maksym Veremeyenko, verem at m1stereo dot tv
author bcoudurier
date Sun, 15 Nov 2009 03:26:47 +0000
parents f292b3e34823
children 4211f91f69b1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
1415
3b00fb8ef8e4 replace coder/decoder file description in libavformat by muxer/demuxer
aurel
parents: 1388
diff changeset
2 * ASF compatible demuxer
4251
77e0c7511d41 cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents: 4167
diff changeset
3 * Copyright (c) 2000, 2001 Fabrice Bellard
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
4 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1333
diff changeset
5 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1333
diff changeset
6 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1333
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1333
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1333
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1333
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 887
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
20 */
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3239
diff changeset
21
4954
2a4f618b2da3 move DEBUG define before include to get dprintf and move guidcmp before print_guid, fix compilation with DEBUG
bcoudurier
parents: 4924
diff changeset
22 //#define DEBUG
2a4f618b2da3 move DEBUG define before include to get dprintf and move guidcmp before print_guid, fix compilation with DEBUG
bcoudurier
parents: 4924
diff changeset
23
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3239
diff changeset
24 #include "libavutil/common.h"
4924
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
25 #include "libavutil/avstring.h"
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3239
diff changeset
26 #include "libavcodec/mpegaudio.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
27 #include "avformat.h"
1172
6a5e58d2114b move common stuff from avienc.c and wav.c to new file riff.c
mru
parents: 1169
diff changeset
28 #include "riff.h"
372
2e12cd1b68ed split asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 370
diff changeset
29 #include "asf.h"
2652
2d28b2a5b2e4 Add support for decrypting asf files
reimar
parents: 2603
diff changeset
30 #include "asfcrypt.h"
4924
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
31 #include "avlanguage.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
32
4058
dcdf236c9909 Delete unnecessary 'extern' keywords.
diego
parents: 4022
diff changeset
33 void ff_mms_set_stream_selection(URLContext *h, AVFormatContext *format);
2708
046577e618bd Allow propagation of stream selection through the ASF demuxer to the
benoit
parents: 2652
diff changeset
34
348
ca519d041ea1 memleak fix
michael
parents: 347
diff changeset
35 #undef NDEBUG
ca519d041ea1 memleak fix
michael
parents: 347
diff changeset
36 #include <assert.h>
ca519d041ea1 memleak fix
michael
parents: 347
diff changeset
37
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
38 #define FRAME_HEADER_SIZE 17
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
39 // Fix Me! FRAME_HEADER_SIZE may be different.
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
40
4748
86dd0cab30d3 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents: 4747
diff changeset
41 static const ff_asf_guid index_guid = {
1687
39cafa2f6060 simplify GUIDs
michael
parents: 1660
diff changeset
42 0x90, 0x08, 0x00, 0x33, 0xb1, 0xe5, 0xcf, 0x11, 0x89, 0xf4, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xcb
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
43 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
44
4748
86dd0cab30d3 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents: 4747
diff changeset
45 static const ff_asf_guid stream_bitrate_guid = { /* (http://get.to/sdp) */
1806
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
46 0xce, 0x75, 0xf8, 0x7b, 0x8d, 0x46, 0xd1, 0x11, 0x8d, 0x82, 0x00, 0x60, 0x97, 0xc9, 0xa2, 0xb2
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
47 };
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
48 /**********************************/
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
49 /* decoding */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
50
4954
2a4f618b2da3 move DEBUG define before include to get dprintf and move guidcmp before print_guid, fix compilation with DEBUG
bcoudurier
parents: 4924
diff changeset
51 static int guidcmp(const void *g1, const void *g2)
2a4f618b2da3 move DEBUG define before include to get dprintf and move guidcmp before print_guid, fix compilation with DEBUG
bcoudurier
parents: 4924
diff changeset
52 {
2a4f618b2da3 move DEBUG define before include to get dprintf and move guidcmp before print_guid, fix compilation with DEBUG
bcoudurier
parents: 4924
diff changeset
53 return memcmp(g1, g2, sizeof(ff_asf_guid));
2a4f618b2da3 move DEBUG define before include to get dprintf and move guidcmp before print_guid, fix compilation with DEBUG
bcoudurier
parents: 4924
diff changeset
54 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
55
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
56 #ifdef DEBUG
69
0686eeb0c21b prettier debug output
mmu_man
parents: 65
diff changeset
57 #define PRINT_IF_GUID(g,cmp) \
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
58 if (!guidcmp(g, &cmp)) \
3578
11042d1aba87 ASF: use dprintf(), allow compilation with -DDEBUG
mru
parents: 3568
diff changeset
59 dprintf(NULL, "(GUID: %s) ", #cmp)
69
0686eeb0c21b prettier debug output
mmu_man
parents: 65
diff changeset
60
4748
86dd0cab30d3 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents: 4747
diff changeset
61 static void print_guid(const ff_asf_guid *g)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
62 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
63 int i;
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
64 PRINT_IF_GUID(g, ff_asf_header);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
65 else PRINT_IF_GUID(g, ff_asf_file_header);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
66 else PRINT_IF_GUID(g, ff_asf_stream_header);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
67 else PRINT_IF_GUID(g, ff_asf_audio_stream);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
68 else PRINT_IF_GUID(g, ff_asf_audio_conceal_none);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
69 else PRINT_IF_GUID(g, ff_asf_video_stream);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
70 else PRINT_IF_GUID(g, ff_asf_video_conceal_none);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
71 else PRINT_IF_GUID(g, ff_asf_command_stream);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
72 else PRINT_IF_GUID(g, ff_asf_comment_header);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
73 else PRINT_IF_GUID(g, ff_asf_codec_comment_header);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
74 else PRINT_IF_GUID(g, ff_asf_codec_comment1_header);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
75 else PRINT_IF_GUID(g, ff_asf_data_header);
69
0686eeb0c21b prettier debug output
mmu_man
parents: 65
diff changeset
76 else PRINT_IF_GUID(g, index_guid);
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
77 else PRINT_IF_GUID(g, ff_asf_head1_guid);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
78 else PRINT_IF_GUID(g, ff_asf_head2_guid);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
79 else PRINT_IF_GUID(g, ff_asf_my_guid);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
80 else PRINT_IF_GUID(g, ff_asf_ext_stream_header);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
81 else PRINT_IF_GUID(g, ff_asf_extended_content_header);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
82 else PRINT_IF_GUID(g, ff_asf_ext_stream_embed_stream_header);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
83 else PRINT_IF_GUID(g, ff_asf_ext_stream_audio_stream);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
84 else PRINT_IF_GUID(g, ff_asf_metadata_header);
1806
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
85 else PRINT_IF_GUID(g, stream_bitrate_guid);
4924
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
86 else PRINT_IF_GUID(g, ff_asf_language_guid);
69
0686eeb0c21b prettier debug output
mmu_man
parents: 65
diff changeset
87 else
3578
11042d1aba87 ASF: use dprintf(), allow compilation with -DDEBUG
mru
parents: 3568
diff changeset
88 dprintf(NULL, "(GUID: unknown) ");
1687
39cafa2f6060 simplify GUIDs
michael
parents: 1660
diff changeset
89 for(i=0;i<16;i++)
3578
11042d1aba87 ASF: use dprintf(), allow compilation with -DDEBUG
mru
parents: 3568
diff changeset
90 dprintf(NULL, " 0x%02x,", (*g)[i]);
11042d1aba87 ASF: use dprintf(), allow compilation with -DDEBUG
mru
parents: 3568
diff changeset
91 dprintf(NULL, "}\n");
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
92 }
949
0566e2d915ef 10l, fails to compile when debug enabled
alex
parents: 904
diff changeset
93 #undef PRINT_IF_GUID
3578
11042d1aba87 ASF: use dprintf(), allow compilation with -DDEBUG
mru
parents: 3568
diff changeset
94 #else
11042d1aba87 ASF: use dprintf(), allow compilation with -DDEBUG
mru
parents: 3568
diff changeset
95 #define print_guid(g)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
96 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
97
4748
86dd0cab30d3 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents: 4747
diff changeset
98 static void get_guid(ByteIOContext *s, ff_asf_guid *g)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
99 {
1687
39cafa2f6060 simplify GUIDs
michael
parents: 1660
diff changeset
100 assert(sizeof(*g) == 16);
2988
bc099b0e8b6f typo, also fix warning: asf.c:90: warning: passing argument 2 of 'get_buffer' from incompatible pointer type
bcoudurier
parents: 2855
diff changeset
101 get_buffer(s, *g, sizeof(*g));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
102 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
103
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
104 #if 0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
105 static void get_str16(ByteIOContext *pb, char *buf, int buf_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
106 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
107 int len, c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
108 char *q;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
109
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110 len = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
111 q = buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112 while (len > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113 c = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
114 if ((q - buf) < buf_size - 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
115 *q++ = c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
116 len--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
117 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
118 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
120 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
121
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
122 static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
123 {
1503
a4ab86a48604 Use common macro PUT_UTF8 in asf.c
gpoirier
parents: 1443
diff changeset
124 char* q = buf;
4955
6671e7510fca fix get_str16_nolen with odd len, fix #1065
bcoudurier
parents: 4954
diff changeset
125 for (; len > 1; len -= 2) {
1503
a4ab86a48604 Use common macro PUT_UTF8 in asf.c
gpoirier
parents: 1443
diff changeset
126 uint8_t tmp;
a4ab86a48604 Use common macro PUT_UTF8 in asf.c
gpoirier
parents: 1443
diff changeset
127 PUT_UTF8(get_le16(pb), tmp, if (q - buf < buf_size - 1) *q++ = tmp;)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
128 }
4955
6671e7510fca fix get_str16_nolen with odd len, fix #1065
bcoudurier
parents: 4954
diff changeset
129 if (len > 0)
6671e7510fca fix get_str16_nolen with odd len, fix #1065
bcoudurier
parents: 4954
diff changeset
130 url_fskip(pb, len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
131 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
132 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
133
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
134 static int asf_probe(AVProbeData *pd)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
135 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
136 /* check file header */
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
137 if (!guidcmp(pd->buf, &ff_asf_header))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
138 return AVPROBE_SCORE_MAX;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
139 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
140 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
141 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
142
1750
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
143 static int get_value(ByteIOContext *pb, int type){
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
144 switch(type){
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
145 case 2: return get_le32(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
146 case 3: return get_le32(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
147 case 4: return get_le64(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
148 case 5: return get_le16(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
149 default:return INT_MIN;
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
150 }
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
151 }
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
152
4368
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
153 static void get_tag(AVFormatContext *s, const char *key, int type, int len)
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
154 {
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
155 char value[1024];
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
156 if (type <= 1) { // unicode or byte
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
157 get_str16_nolen(s->pb, len, value, sizeof(value));
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
158 } else if (type <= 5) { // boolean or DWORD or QWORD or WORD
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
159 uint64_t num = get_value(s->pb, type);
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
160 snprintf(value, sizeof(value), "%"PRIu64, num);
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
161 } else {
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
162 url_fskip(s->pb, len);
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
163 return;
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
164 }
4797
9145790397e6 Don't strip the first three characters off of any metadata in ASF file.
rbultje
parents: 4748
diff changeset
165 if (!strncmp(key, "WM/", 3))
4368
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
166 key += 3;
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
167 av_metadata_set(&s->metadata, key, value);
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
168 }
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
169
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
170 static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
171 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
172 ASFContext *asf = s->priv_data;
4748
86dd0cab30d3 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents: 4747
diff changeset
173 ff_asf_guid g;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
174 ByteIOContext *pb = s->pb;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
175 AVStream *st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
176 ASFStream *asf_st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
177 int size, i;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
178 int64_t gsize;
1750
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
179 AVRational dar[128];
2064
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
180 uint32_t bitrate[128];
1750
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
181
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
182 memset(dar, 0, sizeof(dar));
2064
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
183 memset(bitrate, 0, sizeof(bitrate));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
184
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
185 get_guid(pb, &g);
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
186 if (guidcmp(&g, &ff_asf_header))
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
187 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
188 get_le64(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
189 get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
190 get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
191 get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
192 memset(&asf->asfid2avid, -1, sizeof(asf->asfid2avid));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
193 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
194 get_guid(pb, &g);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
195 gsize = get_le64(pb);
3578
11042d1aba87 ASF: use dprintf(), allow compilation with -DDEBUG
mru
parents: 3568
diff changeset
196 dprintf(s, "%08"PRIx64": ", url_ftell(pb) - 24);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
197 print_guid(&g);
3578
11042d1aba87 ASF: use dprintf(), allow compilation with -DDEBUG
mru
parents: 3568
diff changeset
198 dprintf(s, " size=0x%"PRIx64"\n", gsize);
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
199 if (!guidcmp(&g, &ff_asf_data_header)) {
1896
6d2157d1fc93 fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents: 1859
diff changeset
200 asf->data_object_offset = url_ftell(pb);
6d2157d1fc93 fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents: 1859
diff changeset
201 // if not streaming, gsize is not unlimited (how?), and there is enough space in the file..
6d2157d1fc93 fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents: 1859
diff changeset
202 if (!(asf->hdr.flags & 0x01) && gsize >= 100) {
6d2157d1fc93 fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents: 1859
diff changeset
203 asf->data_object_size = gsize - 24;
6d2157d1fc93 fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents: 1859
diff changeset
204 } else {
6d2157d1fc93 fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents: 1859
diff changeset
205 asf->data_object_size = (uint64_t)-1;
6d2157d1fc93 fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents: 1859
diff changeset
206 }
6d2157d1fc93 fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents: 1859
diff changeset
207 break;
6d2157d1fc93 fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents: 1859
diff changeset
208 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
209 if (gsize < 24)
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
210 return -1;
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
211 if (!guidcmp(&g, &ff_asf_file_header)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
212 get_guid(pb, &asf->hdr.guid);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
213 asf->hdr.file_size = get_le64(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
214 asf->hdr.create_time = get_le64(pb);
1701
90be497b752b remove a few unused and duplicated variables
michael
parents: 1700
diff changeset
215 asf->nb_packets = get_le64(pb);
3239
319a613c1dd7 Read asf file header fields in the right order
superdump
parents: 3116
diff changeset
216 asf->hdr.play_time = get_le64(pb);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
217 asf->hdr.send_time = get_le64(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
218 asf->hdr.preroll = get_le32(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
219 asf->hdr.ignore = get_le32(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
220 asf->hdr.flags = get_le32(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
221 asf->hdr.min_pktsize = get_le32(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
222 asf->hdr.max_pktsize = get_le32(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
223 asf->hdr.max_bitrate = get_le32(pb);
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
224 s->packet_size = asf->hdr.max_pktsize;
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
225 } else if (!guidcmp(&g, &ff_asf_stream_header)) {
3967
4fd67f05bad9 Use enum typers instead of int.
benoit
parents: 3908
diff changeset
226 enum CodecType type;
4fd67f05bad9 Use enum typers instead of int.
benoit
parents: 3908
diff changeset
227 int type_specific_size, sizeX;
1263
cf88f6719743 total_size should be 64bit (1 hunk of the asf seeking patch from DrDivx / Steve Lhomme)
michael
parents: 1206
diff changeset
228 uint64_t total_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
229 unsigned int tag1;
2318
e5c3b6e7b6ef ignore preroll, it is generally not what AVStream.start_time should contain
michael
parents: 2285
diff changeset
230 int64_t pos1, pos2, start_time;
2018
0d9b233dff9b DVR-MS probe audio format
benoit
parents: 2001
diff changeset
231 int test_for_ext_stream_audio, is_dvr_ms_audio=0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
232
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
233 pos1 = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
234
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 136
diff changeset
235 st = av_new_stream(s, 0);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
236 if (!st)
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
237 return AVERROR(ENOMEM);
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 437
diff changeset
238 av_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
239 asf_st = av_mallocz(sizeof(ASFStream));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
240 if (!asf_st)
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
241 return AVERROR(ENOMEM);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
242 st->priv_data = asf_st;
2318
e5c3b6e7b6ef ignore preroll, it is generally not what AVStream.start_time should contain
michael
parents: 2285
diff changeset
243 start_time = asf->hdr.preroll;
e5c3b6e7b6ef ignore preroll, it is generally not what AVStream.start_time should contain
michael
parents: 2285
diff changeset
244
4924
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
245 asf_st->stream_language_index = 128; // invalid stream index means no language info
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
246
1552
de18846fa25c Minor modifications to handle mms streaming.
takis
parents: 1503
diff changeset
247 if(!(asf->hdr.flags & 0x01)) { // if we aren't streaming...
5153
3fe89226cacf Fix incorrect display of ASF/WMV duration after r12926.
cehoyos
parents: 5109
diff changeset
248 st->duration = asf->hdr.play_time /
2318
e5c3b6e7b6ef ignore preroll, it is generally not what AVStream.start_time should contain
michael
parents: 2285
diff changeset
249 (10000000 / 1000) - start_time;
1552
de18846fa25c Minor modifications to handle mms streaming.
takis
parents: 1503
diff changeset
250 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
251 get_guid(pb, &g);
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
252
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
253 test_for_ext_stream_audio = 0;
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
254 if (!guidcmp(&g, &ff_asf_audio_stream)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
255 type = CODEC_TYPE_AUDIO;
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
256 } else if (!guidcmp(&g, &ff_asf_video_stream)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
257 type = CODEC_TYPE_VIDEO;
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
258 } else if (!guidcmp(&g, &ff_asf_command_stream)) {
3567
6c1263967c7c command_streams are type data not unknown.
michael
parents: 3487
diff changeset
259 type = CODEC_TYPE_DATA;
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
260 } else if (!guidcmp(&g, &ff_asf_ext_stream_embed_stream_header)) {
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
261 test_for_ext_stream_audio = 1;
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
262 type = CODEC_TYPE_UNKNOWN;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
263 } else {
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
264 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
265 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
266 get_guid(pb, &g);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
267 total_size = get_le64(pb);
84
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 74
diff changeset
268 type_specific_size = get_le32(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
269 get_le32(pb);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
270 st->id = get_le16(pb) & 0x7f; /* stream id */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
271 // mapping of asf ID to AV stream ID;
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 136
diff changeset
272 asf->asfid2avid[st->id] = s->nb_streams - 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
273
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
274 get_le32(pb);
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
275
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
276 if (test_for_ext_stream_audio) {
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
277 get_guid(pb, &g);
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
278 if (!guidcmp(&g, &ff_asf_ext_stream_audio_stream)) {
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
279 type = CODEC_TYPE_AUDIO;
2018
0d9b233dff9b DVR-MS probe audio format
benoit
parents: 2001
diff changeset
280 is_dvr_ms_audio=1;
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
281 get_guid(pb, &g);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
282 get_le32(pb);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
283 get_le32(pb);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
284 get_le32(pb);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
285 get_guid(pb, &g);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
286 get_le32(pb);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
287 }
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
288 }
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
289
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
290 st->codec->codec_type = type;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
291 if (type == CODEC_TYPE_AUDIO) {
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 5011
diff changeset
292 ff_get_wav_header(pb, st->codec, type_specific_size);
2018
0d9b233dff9b DVR-MS probe audio format
benoit
parents: 2001
diff changeset
293 if (is_dvr_ms_audio) {
0d9b233dff9b DVR-MS probe audio format
benoit
parents: 2001
diff changeset
294 // codec_id and codec_tag are unreliable in dvr_ms
0d9b233dff9b DVR-MS probe audio format
benoit
parents: 2001
diff changeset
295 // files. Set them later by probing stream.
3568
c24546b44906 New codec probing system try #1.
michael
parents: 3567
diff changeset
296 st->codec->codec_id = CODEC_ID_PROBE;
2018
0d9b233dff9b DVR-MS probe audio format
benoit
parents: 2001
diff changeset
297 st->codec->codec_tag = 0;
0d9b233dff9b DVR-MS probe audio format
benoit
parents: 2001
diff changeset
298 }
4545
6b77e9f5b682 AAC in ASF does not need parsing.
alexc
parents: 4508
diff changeset
299 if (st->codec->codec_id == CODEC_ID_AAC) {
6b77e9f5b682 AAC in ASF does not need parsing.
alexc
parents: 4508
diff changeset
300 st->need_parsing = AVSTREAM_PARSE_NONE;
6b77e9f5b682 AAC in ASF does not need parsing.
alexc
parents: 4508
diff changeset
301 } else {
4546
20c095d77b92 Re-indent after last commit
alexc
parents: 4545
diff changeset
302 st->need_parsing = AVSTREAM_PARSE_FULL;
4545
6b77e9f5b682 AAC in ASF does not need parsing.
alexc
parents: 4508
diff changeset
303 }
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
304 /* We have to init the frame size at some point .... */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
305 pos2 = url_ftell(pb);
1859
9bc07f90d4a2 off by one error
michael
parents: 1806
diff changeset
306 if (gsize >= (pos2 + 8 - pos1 + 24)) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
307 asf_st->ds_span = get_byte(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
308 asf_st->ds_packet_size = get_le16(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
309 asf_st->ds_chunk_size = get_le16(pb);
1701
90be497b752b remove a few unused and duplicated variables
michael
parents: 1700
diff changeset
310 get_le16(pb); //ds_data_size
90be497b752b remove a few unused and duplicated variables
michael
parents: 1700
diff changeset
311 get_byte(pb); //ds_silence_data
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
312 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
313 //printf("Descrambling: ps:%d cs:%d ds:%d s:%d sd:%d\n",
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
314 // asf_st->ds_packet_size, asf_st->ds_chunk_size,
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
315 // asf_st->ds_data_size, asf_st->ds_span, asf_st->ds_silence_data);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
316 if (asf_st->ds_span > 1) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
317 if (!asf_st->ds_chunk_size
1700
77bd711c0aed adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents: 1699
diff changeset
318 || (asf_st->ds_packet_size/asf_st->ds_chunk_size <= 1)
77bd711c0aed adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents: 1699
diff changeset
319 || asf_st->ds_packet_size % asf_st->ds_chunk_size)
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
320 asf_st->ds_span = 0; // disable descrambling
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
321 }
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 792
diff changeset
322 switch (st->codec->codec_id) {
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 196
diff changeset
323 case CODEC_ID_MP3:
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 792
diff changeset
324 st->codec->frame_size = MPA_FRAME_SIZE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
325 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
326 case CODEC_ID_PCM_S16LE:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327 case CODEC_ID_PCM_S16BE:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
328 case CODEC_ID_PCM_U16LE:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
329 case CODEC_ID_PCM_U16BE:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
330 case CODEC_ID_PCM_S8:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
331 case CODEC_ID_PCM_U8:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
332 case CODEC_ID_PCM_ALAW:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
333 case CODEC_ID_PCM_MULAW:
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 792
diff changeset
334 st->codec->frame_size = 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
335 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
336 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
337 /* This is probably wrong, but it prevents a crash later */
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 792
diff changeset
338 st->codec->frame_size = 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
339 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
340 }
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
341 } else if (type == CODEC_TYPE_VIDEO) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
342 get_le32(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
343 get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
344 get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
345 size = get_le16(pb); /* size */
732
1221cba1c069 fixing demuxing of DV5700.asf
michael
parents: 708
diff changeset
346 sizeX= get_le32(pb); /* size */
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 792
diff changeset
347 st->codec->width = get_le32(pb);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
348 st->codec->height = get_le32(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
349 /* not available for asf */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
350 get_le16(pb); /* panes */
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3759
diff changeset
351 st->codec->bits_per_coded_sample = get_le16(pb); /* depth */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
352 tag1 = get_le32(pb);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
353 url_fskip(pb, 20);
4508
99c3000c9482 Add a context to av_log() calls.
benoit
parents: 4368
diff changeset
354 // av_log(s, AV_LOG_DEBUG, "size:%d tsize:%d sizeX:%d\n", size, total_size, sizeX);
732
1221cba1c069 fixing demuxing of DV5700.asf
michael
parents: 708
diff changeset
355 size= sizeX;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
356 if (size > 40) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
357 st->codec->extradata_size = size - 40;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
358 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
359 get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
360 }
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 277
diff changeset
361
4743
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
362 /* Extract palette from extradata if bpp <= 8 */
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
363 /* This code assumes that extradata contains only palette */
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
364 /* This is true for all paletted codecs implemented in ffmpeg */
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
365 if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) {
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
366 st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl));
5108
44a0fab134a9 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN
mru
parents: 5094
diff changeset
367 #if HAVE_BIGENDIAN
4743
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
368 for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++)
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
369 st->codec->palctrl->palette[i] = bswap_32(((uint32_t*)st->codec->extradata)[i]);
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 277
diff changeset
370 #else
4743
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
371 memcpy(st->codec->palctrl->palette, st->codec->extradata,
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
372 FFMIN(st->codec->extradata_size, AVPALETTE_SIZE));
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 277
diff changeset
373 #endif
4743
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
374 st->codec->palctrl->palette_changed = 1;
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
375 }
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 277
diff changeset
376
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 792
diff changeset
377 st->codec->codec_tag = tag1;
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 5011
diff changeset
378 st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1);
573
b3adf6716dc3 dvr-ms video decoding support
michael
parents: 555
diff changeset
379 if(tag1 == MKTAG('D', 'V', 'R', ' '))
2023
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 2018
diff changeset
380 st->need_parsing = AVSTREAM_PARSE_FULL;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
381 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
382 pos2 = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
383 url_fskip(pb, gsize - (pos2 - pos1 + 24));
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
384 } else if (!guidcmp(&g, &ff_asf_comment_header)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
385 int len1, len2, len3, len4, len5;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
386
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
387 len1 = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
388 len2 = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
389 len3 = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
390 len4 = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
391 len5 = get_le16(pb);
4368
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
392 get_tag(s, "title" , 0, len1);
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
393 get_tag(s, "author" , 0, len2);
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
394 get_tag(s, "copyright", 0, len3);
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
395 get_tag(s, "comment" , 0, len4);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
396 url_fskip(pb, len5);
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
397 } else if (!guidcmp(&g, &stream_bitrate_guid)) {
1806
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
398 int stream_count = get_le16(pb);
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
399 int j;
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
400
4508
99c3000c9482 Add a context to av_log() calls.
benoit
parents: 4368
diff changeset
401 // av_log(s, AV_LOG_ERROR, "stream bitrate properties\n");
99c3000c9482 Add a context to av_log() calls.
benoit
parents: 4368
diff changeset
402 // av_log(s, AV_LOG_ERROR, "streams %d\n", streams);
1806
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
403 for(j = 0; j < stream_count; j++) {
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
404 int flags, bitrate, stream_id;
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
405
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
406 flags= get_le16(pb);
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
407 bitrate= get_le32(pb);
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
408 stream_id= (flags & 0x7f);
4508
99c3000c9482 Add a context to av_log() calls.
benoit
parents: 4368
diff changeset
409 // av_log(s, AV_LOG_ERROR, "flags: 0x%x stream id %d, bitrate %d\n", flags, stream_id, bitrate);
2392
39e9fb85fcbc store asf streaming bitrates consistently
benoit
parents: 2319
diff changeset
410 asf->stream_bitrates[stream_id]= bitrate;
1806
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
411 }
4924
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
412 } else if (!guidcmp(&g, &ff_asf_language_guid)) {
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
413 int j;
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
414 int stream_count = get_le16(pb);
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
415 for(j = 0; j < stream_count; j++) {
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
416 char lang[6];
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
417 unsigned int lang_len = get_byte(pb);
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
418 get_str16_nolen(pb, lang_len, lang, sizeof(lang));
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
419 if (j < 128)
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
420 av_strlcpy(asf->stream_languages[j], lang, sizeof(*asf->stream_languages));
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
421 }
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
422 } else if (!guidcmp(&g, &ff_asf_extended_content_header)) {
4743
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
423 int desc_count, i;
341
ad2a57c5467a ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 312
diff changeset
424
4743
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
425 desc_count = get_le16(pb);
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
426 for(i=0;i<desc_count;i++) {
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
427 int name_len,value_type,value_len;
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
428 char name[1024];
341
ad2a57c5467a ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 312
diff changeset
429
4743
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
430 name_len = get_le16(pb);
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
431 get_str16_nolen(pb, name_len, name, sizeof(name));
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
432 value_type = get_le16(pb);
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
433 value_len = get_le16(pb);
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
434 get_tag(s, name, value_type, value_len);
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
435 }
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
436 } else if (!guidcmp(&g, &ff_asf_metadata_header)) {
1750
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
437 int n, stream_num, name_len, value_len, value_type, value_num;
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
438 n = get_le16(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
439
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
440 for(i=0;i<n;i++) {
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
441 char name[1024];
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
442
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
443 get_le16(pb); //lang_list_index
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
444 stream_num= get_le16(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
445 name_len= get_le16(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
446 value_type= get_le16(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
447 value_len= get_le32(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
448
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
449 get_str16_nolen(pb, name_len, name, sizeof(name));
4508
99c3000c9482 Add a context to av_log() calls.
benoit
parents: 4368
diff changeset
450 //av_log(s, AV_LOG_ERROR, "%d %d %d %d %d <%s>\n", i, stream_num, name_len, value_type, value_len, name);
2164
3804e39efbfd misc spelling fixes
diego
parents: 2069
diff changeset
451 value_num= get_le16(pb);//we should use get_value() here but it does not work 2 is le16 here but le32 elsewhere
1750
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
452 url_fskip(pb, value_len - 2);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
453
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
454 if(stream_num<128){
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
455 if (!strcmp(name, "AspectRatioX")) dar[stream_num].num= value_num;
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
456 else if(!strcmp(name, "AspectRatioY")) dar[stream_num].den= value_num;
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
457 }
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
458 }
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
459 } else if (!guidcmp(&g, &ff_asf_ext_stream_header)) {
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
460 int ext_len, payload_ext_ct, stream_ct;
2064
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
461 uint32_t ext_d, leak_rate, stream_num;
4924
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
462 unsigned int stream_languageid_index;
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
463
1740
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
464 get_le64(pb); // starttime
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
465 get_le64(pb); // endtime
2064
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
466 leak_rate = get_le32(pb); // leak-datarate
1740
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
467 get_le32(pb); // bucket-datasize
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
468 get_le32(pb); // init-bucket-fullness
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
469 get_le32(pb); // alt-leak-datarate
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
470 get_le32(pb); // alt-bucket-datasize
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
471 get_le32(pb); // alt-init-bucket-fullness
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
472 get_le32(pb); // max-object-size
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
473 get_le32(pb); // flags (reliable,seekable,no_cleanpoints?,resend-live-cleanpoints, rest of bits reserved)
2064
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
474 stream_num = get_le16(pb); // stream-num
4924
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
475
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
476 stream_languageid_index = get_le16(pb); // stream-language-id-index
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
477 if (stream_num < 128)
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
478 asf->streams[stream_num].stream_language_index = stream_languageid_index;
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
479
1740
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
480 get_le64(pb); // avg frametime in 100ns units
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
481 stream_ct = get_le16(pb); //stream-name-count
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
482 payload_ext_ct = get_le16(pb); //payload-extension-system-count
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
483
2064
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
484 if (stream_num < 128)
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
485 bitrate[stream_num] = leak_rate;
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
486
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
487 for (i=0; i<stream_ct; i++){
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
488 get_le16(pb);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
489 ext_len = get_le16(pb);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
490 url_fseek(pb, ext_len, SEEK_CUR);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
491 }
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
492
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
493 for (i=0; i<payload_ext_ct; i++){
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
494 get_guid(pb, &g);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
495 ext_d=get_le16(pb);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
496 ext_len=get_le32(pb);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
497 url_fseek(pb, ext_len, SEEK_CUR);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
498 }
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
499
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
500 // there could be a optional stream properties object to follow
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
501 // if so the next iteration will pick it up
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
502 } else if (!guidcmp(&g, &ff_asf_head1_guid)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
503 int v1, v2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
504 get_guid(pb, &g);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
505 v1 = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
506 v2 = get_le16(pb);
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
507 #if 0
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
508 } else if (!guidcmp(&g, &ff_asf_codec_comment_header)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
509 int len, v1, n, num;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
510 char str[256], *q;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
511 char tag[16];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
512
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
513 get_guid(pb, &g);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
514 print_guid(&g);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
515
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
516 n = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
517 for(i=0;i<n;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
518 num = get_le16(pb); /* stream number */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
519 get_str16(pb, str, sizeof(str));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
520 get_str16(pb, str, sizeof(str));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
521 len = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
522 q = tag;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
523 while (len > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
524 v1 = get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
525 if ((q - tag) < sizeof(tag) - 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
526 *q++ = v1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
527 len--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
528 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
529 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
530 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
531 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
532 } else if (url_feof(pb)) {
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
533 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
534 } else {
5273
f292b3e34823 Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents: 5153
diff changeset
535 if (!s->keylen) {
f292b3e34823 Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents: 5153
diff changeset
536 if (!guidcmp(&g, &ff_asf_content_encryption)) {
f292b3e34823 Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents: 5153
diff changeset
537 av_log(s, AV_LOG_WARNING, "DRM protected stream detected, decoding will likely fail!\n");
f292b3e34823 Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents: 5153
diff changeset
538 } else if (!guidcmp(&g, &ff_asf_ext_content_encryption)) {
f292b3e34823 Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents: 5153
diff changeset
539 av_log(s, AV_LOG_WARNING, "Ext DRM protected stream detected, decoding will likely fail!\n");
f292b3e34823 Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents: 5153
diff changeset
540 } else if (!guidcmp(&g, &ff_asf_digital_signature)) {
f292b3e34823 Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents: 5153
diff changeset
541 av_log(s, AV_LOG_WARNING, "Digital signature detected, decoding will likely fail!\n");
f292b3e34823 Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents: 5153
diff changeset
542 }
f292b3e34823 Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents: 5153
diff changeset
543 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
544 url_fseek(pb, gsize - 24, SEEK_CUR);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
545 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
546 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
547 get_guid(pb, &g);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
548 get_le64(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
549 get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
550 get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
551 if (url_feof(pb))
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
552 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
553 asf->data_offset = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
554 asf->packet_size_left = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
555
1750
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
556
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
557 for(i=0; i<128; i++){
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
558 int stream_num= asf->asfid2avid[i];
2064
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
559 if(stream_num>=0){
3759
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3578
diff changeset
560 AVStream *st = s->streams[stream_num];
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3578
diff changeset
561 if (!st->codec->bit_rate)
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3578
diff changeset
562 st->codec->bit_rate = bitrate[i];
2064
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
563 if (dar[i].num > 0 && dar[i].den > 0)
3759
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3578
diff changeset
564 av_reduce(&st->sample_aspect_ratio.num,
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3578
diff changeset
565 &st->sample_aspect_ratio.den,
2069
42d459116315 cosmetics: Fix indentation after last commit, patch by Zuxy Meng.
diego
parents: 2064
diff changeset
566 dar[i].num, dar[i].den, INT_MAX);
4508
99c3000c9482 Add a context to av_log() calls.
benoit
parents: 4368
diff changeset
567 //av_log(s, AV_LOG_ERROR, "dar %d:%d sar=%d:%d\n", dar[i].num, dar[i].den, st->sample_aspect_ratio.num, st->sample_aspect_ratio.den);
4924
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
568
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
569 // copy and convert language codes to the frontend
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
570 if (asf->streams[i].stream_language_index < 128) {
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
571 const char *rfc1766 = asf->stream_languages[asf->streams[i].stream_language_index];
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
572 if (rfc1766 && strlen(rfc1766) > 1) {
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
573 const char primary_tag[3] = { rfc1766[0], rfc1766[1], '\0' }; // ignore country code if any
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
574 const char *iso6392 = av_convert_lang_to(primary_tag, AV_LANG_ISO639_2_BIBL);
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
575 if (iso6392)
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
576 av_metadata_set(&st->metadata, "language", iso6392);
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
577 }
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
578 }
1750
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
579 }
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
580 }
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
581
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
582 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
583 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
584
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
585 #define DO_2BITS(bits, var, defval) \
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
586 switch (bits & 3) \
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
587 { \
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
588 case 3: var = get_le32(pb); rsize += 4; break; \
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
589 case 2: var = get_le16(pb); rsize += 2; break; \
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
590 case 1: var = get_byte(pb); rsize++; break; \
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
591 default: var = defval; break; \
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
592 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
593
5011
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
594 /**
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
595 * Load a single ASF packet into the demuxer.
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
596 * @param s demux context
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
597 * @param pb context to read data from
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
598 * @returns 0 on success, <0 on error
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
599 */
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
600 static int ff_asf_get_packet(AVFormatContext *s, ByteIOContext *pb)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
601 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
602 ASFContext *asf = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
603 uint32_t packet_length, padsize;
1967
8c20d8c19e1f fix demuxing of IMAG0002.ASF
michael
parents: 1958
diff changeset
604 int rsize = 8;
1722
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
605 int c, d, e, off;
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
606
5085
878651429ae5 Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.
reimar
parents: 5067
diff changeset
607 // if we do not know packet size, allow skipping up to 32 kB
878651429ae5 Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.
reimar
parents: 5067
diff changeset
608 off= 32768;
878651429ae5 Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.
reimar
parents: 5067
diff changeset
609 if (s->packet_size > 0)
5086
5e6156776ee2 Fix indentation
reimar
parents: 5085
diff changeset
610 off= (url_ftell(pb) - s->data_offset) % s->packet_size + 3;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
611
1722
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
612 c=d=e=-1;
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
613 while(off-- > 0){
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
614 c=d; d=e;
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
615 e= get_byte(pb);
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
616 if(c == 0x82 && !d && !e)
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
617 break;
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
618 }
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
619
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
620 if (c != 0x82) {
5109
293c03f0d47f Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents: 5108
diff changeset
621 /**
293c03f0d47f Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents: 5108
diff changeset
622 * This code allows handling of -EAGAIN at packet boundaries (i.e.
293c03f0d47f Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents: 5108
diff changeset
623 * if the packet sync code above triggers -EAGAIN). This does not
293c03f0d47f Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents: 5108
diff changeset
624 * imply complete -EAGAIN handling support at random positions in
293c03f0d47f Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents: 5108
diff changeset
625 * the stream.
293c03f0d47f Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents: 5108
diff changeset
626 */
293c03f0d47f Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents: 5108
diff changeset
627 if (url_ferror(pb) == AVERROR(EAGAIN))
293c03f0d47f Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents: 5108
diff changeset
628 return AVERROR(EAGAIN);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
629 if (!url_feof(pb))
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
630 av_log(s, AV_LOG_ERROR, "ff asf bad header %x at:%"PRId64"\n", c, url_ftell(pb));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
631 }
1967
8c20d8c19e1f fix demuxing of IMAG0002.ASF
michael
parents: 1958
diff changeset
632 if ((c & 0x8f) == 0x82) {
1722
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
633 if (d || e) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
634 if (!url_feof(pb))
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
635 av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n");
1716
01b3cc392466 consistant error return for asf_get_packet()
michael
parents: 1715
diff changeset
636 return -1;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
637 }
1967
8c20d8c19e1f fix demuxing of IMAG0002.ASF
michael
parents: 1958
diff changeset
638 c= get_byte(pb);
1722
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
639 d= get_byte(pb);
1967
8c20d8c19e1f fix demuxing of IMAG0002.ASF
michael
parents: 1958
diff changeset
640 rsize+=3;
8c20d8c19e1f fix demuxing of IMAG0002.ASF
michael
parents: 1958
diff changeset
641 }else{
8c20d8c19e1f fix demuxing of IMAG0002.ASF
michael
parents: 1958
diff changeset
642 url_fseek(pb, -1, SEEK_CUR); //FIXME
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
643 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
644
1967
8c20d8c19e1f fix demuxing of IMAG0002.ASF
michael
parents: 1958
diff changeset
645 asf->packet_flags = c;
8c20d8c19e1f fix demuxing of IMAG0002.ASF
michael
parents: 1958
diff changeset
646 asf->packet_property = d;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
647
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
648 DO_2BITS(asf->packet_flags >> 5, packet_length, s->packet_size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
649 DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
650 DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
651
1333
a95c384900ab prevent infinite loop with VORC012.WMA
michael
parents: 1332
diff changeset
652 //the following checks prevent overflows and infinite loops
5094
7d589bcd9b1f Check for packet_length 0, it is already treated as invalid by the padding check,
reimar
parents: 5086
diff changeset
653 if(!packet_length || packet_length >= (1U<<29)){
1333
a95c384900ab prevent infinite loop with VORC012.WMA
michael
parents: 1332
diff changeset
654 av_log(s, AV_LOG_ERROR, "invalid packet_length %d at:%"PRId64"\n", packet_length, url_ftell(pb));
1713
e48ab5187493 replace wrong return 0 by -1
michael
parents: 1712
diff changeset
655 return -1;
1333
a95c384900ab prevent infinite loop with VORC012.WMA
michael
parents: 1332
diff changeset
656 }
1715
f8c5d2c076d5 better padsize check
michael
parents: 1714
diff changeset
657 if(padsize >= packet_length){
1333
a95c384900ab prevent infinite loop with VORC012.WMA
michael
parents: 1332
diff changeset
658 av_log(s, AV_LOG_ERROR, "invalid padsize %d at:%"PRId64"\n", padsize, url_ftell(pb));
1713
e48ab5187493 replace wrong return 0 by -1
michael
parents: 1712
diff changeset
659 return -1;
1333
a95c384900ab prevent infinite loop with VORC012.WMA
michael
parents: 1332
diff changeset
660 }
a95c384900ab prevent infinite loop with VORC012.WMA
michael
parents: 1332
diff changeset
661
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
662 asf->packet_timestamp = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
663 get_le16(pb); /* duration */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
664 // rsize has at least 11 bytes which have to be present
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
665
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
666 if (asf->packet_flags & 0x01) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
667 asf->packet_segsizetype = get_byte(pb); rsize++;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
668 asf->packet_segments = asf->packet_segsizetype & 0x3f;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
669 } else {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
670 asf->packet_segments = 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
671 asf->packet_segsizetype = 0x80;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
672 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
673 asf->packet_size_left = packet_length - padsize - rsize;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
674 if (packet_length < asf->hdr.min_pktsize)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
675 padsize += asf->hdr.min_pktsize - packet_length;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
676 asf->packet_padsize = padsize;
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
677 dprintf(s, "packet: size=%d padsize=%d left=%d\n", s->packet_size, asf->packet_padsize, asf->packet_size_left);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
678 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
679 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
680
1708
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
681 /**
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
682 *
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
683 * @return <0 if error
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
684 */
4120
a22587bda6cf Add a ByteIOContext argument to ASF functions that will be shared with the
rbultje
parents: 4095
diff changeset
685 static int asf_read_frame_header(AVFormatContext *s, ByteIOContext *pb){
1708
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
686 ASFContext *asf = s->priv_data;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
687 int rsize = 1;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
688 int num = get_byte(pb);
1776
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
689 int64_t ts0, ts1;
1708
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
690
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
691 asf->packet_segments--;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
692 asf->packet_key_frame = num >> 7;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
693 asf->stream_index = asf->asfid2avid[num & 0x7f];
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
694 // sequence should be ignored!
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
695 DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0);
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
696 DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0);
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
697 DO_2BITS(asf->packet_property, asf->packet_replic_size, 0);
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
698 //printf("key:%d stream:%d seq:%d offset:%d replic_size:%d\n", asf->packet_key_frame, asf->stream_index, asf->packet_seq, //asf->packet_frag_offset, asf->packet_replic_size);
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
699 if (asf->packet_replic_size >= 8) {
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
700 asf->packet_obj_size = get_le32(pb);
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
701 if(asf->packet_obj_size >= (1<<24) || asf->packet_obj_size <= 0){
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
702 av_log(s, AV_LOG_ERROR, "packet_obj_size invalid\n");
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
703 return -1;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
704 }
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
705 asf->packet_frag_timestamp = get_le32(pb); // timestamp
1776
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
706 if(asf->packet_replic_size >= 8+38+4){
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
707 // for(i=0; i<asf->packet_replic_size-8; i++)
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
708 // av_log(s, AV_LOG_DEBUG, "%02X ",get_byte(pb));
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
709 // av_log(s, AV_LOG_DEBUG, "\n");
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
710 url_fskip(pb, 10);
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
711 ts0= get_le64(pb);
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
712 ts1= get_le64(pb);
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
713 url_fskip(pb, 12);
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
714 get_le32(pb);
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
715 url_fskip(pb, asf->packet_replic_size - 8 - 38 - 4);
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
716 if(ts0!= -1) asf->packet_frag_timestamp= ts0/10000;
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
717 else asf->packet_frag_timestamp= AV_NOPTS_VALUE;
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
718 }else
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
719 url_fskip(pb, asf->packet_replic_size - 8);
1708
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
720 rsize += asf->packet_replic_size; // FIXME - check validity
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
721 } else if (asf->packet_replic_size==1){
2855
46729b573b25 begining -> beginning typo fix
reimar
parents: 2843
diff changeset
722 // multipacket - frag_offset is beginning timestamp
1708
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
723 asf->packet_time_start = asf->packet_frag_offset;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
724 asf->packet_frag_offset = 0;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
725 asf->packet_frag_timestamp = asf->packet_timestamp;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
726
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
727 asf->packet_time_delta = get_byte(pb);
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
728 rsize++;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
729 }else if(asf->packet_replic_size!=0){
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
730 av_log(s, AV_LOG_ERROR, "unexpected packet_replic_size of %d\n", asf->packet_replic_size);
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
731 return -1;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
732 }
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
733 if (asf->packet_flags & 0x01) {
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
734 DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal
1712
fdeab224942d check to detect nonsense fragment size
michael
parents: 1711
diff changeset
735 if(asf->packet_frag_size > asf->packet_size_left - rsize){
fdeab224942d check to detect nonsense fragment size
michael
parents: 1711
diff changeset
736 av_log(s, AV_LOG_ERROR, "packet_frag_size is invalid\n");
fdeab224942d check to detect nonsense fragment size
michael
parents: 1711
diff changeset
737 return -1;
fdeab224942d check to detect nonsense fragment size
michael
parents: 1711
diff changeset
738 }
1708
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
739 //printf("Fragsize %d\n", asf->packet_frag_size);
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
740 } else {
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
741 asf->packet_frag_size = asf->packet_size_left - rsize;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
742 //printf("Using rest %d %d %d\n", asf->packet_frag_size, asf->packet_size_left, rsize);
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
743 }
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
744 if (asf->packet_replic_size == 1) {
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
745 asf->packet_multi_size = asf->packet_frag_size;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
746 if (asf->packet_multi_size > asf->packet_size_left)
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
747 return -1;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
748 }
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
749 asf->packet_size_left -= rsize;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
750 //printf("___objsize____ %d %d rs:%d\n", asf->packet_obj_size, asf->packet_frag_offset, rsize);
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
751
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
752 return 0;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
753 }
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
754
5011
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
755 /**
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
756 * Parse data from individual ASF packets (which were previously loaded
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
757 * with asf_get_packet()).
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
758 * @param s demux context
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
759 * @param pb context to read data from
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
760 * @param pkt pointer to store packet data into
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
761 * @returns 0 if data was stored in pkt, <0 on error or 1 if more ASF
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
762 * packets need to be loaded (through asf_get_packet())
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
763 */
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
764 static int ff_asf_parse_packet(AVFormatContext *s, ByteIOContext *pb, AVPacket *pkt)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
765 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
766 ASFContext *asf = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
767 ASFStream *asf_st = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
768 for (;;) {
1713
e48ab5187493 replace wrong return 0 by -1
michael
parents: 1712
diff changeset
769 if(url_feof(pb))
4879
42e183e59515 Replace AVERROR(EIO) by AVERROR_EOF on end-of-file. See mailinglist
rbultje
parents: 4797
diff changeset
770 return AVERROR_EOF;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
771 if (asf->packet_size_left < FRAME_HEADER_SIZE
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
772 || asf->packet_segments < 1) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
773 //asf->packet_size_left <= asf->packet_padsize) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
774 int ret = asf->packet_size_left + asf->packet_padsize;
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1415
diff changeset
775 //printf("PacketLeftSize:%d Pad:%d Pos:%"PRId64"\n", asf->packet_size_left, asf->packet_padsize, url_ftell(pb));
1333
a95c384900ab prevent infinite loop with VORC012.WMA
michael
parents: 1332
diff changeset
776 assert(ret>=0);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
777 /* fail safe */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
778 url_fskip(pb, ret);
1707
7e12a19c140f more correct packet alignment check and correction
michael
parents: 1706
diff changeset
779
4066
10f7232a3545 Do not access s->gb directly in functions that have a local copy of that
rbultje
parents: 4058
diff changeset
780 asf->packet_pos= url_ftell(pb);
1206
e60bf67d9bf8 The reader ignores the size of the ASF data object and keeps on
gpoirier
parents: 1172
diff changeset
781 if (asf->data_object_size != (uint64_t)-1 &&
e60bf67d9bf8 The reader ignores the size of the ASF data object and keeps on
gpoirier
parents: 1172
diff changeset
782 (asf->packet_pos - asf->data_object_offset >= asf->data_object_size))
4883
584d9fb31093 Change another AVERROR(EIO) inot AVERROR_EOF, because it really signals EOF,
rbultje
parents: 4882
diff changeset
783 return AVERROR_EOF; /* Do not exceed the size of the data object */
4095
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
784 return 1;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
785 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
786 if (asf->packet_time_start == 0) {
4167
81f64d590675 Don't use s->pb if a local ByteIOContext was already provided by the calling
rbultje
parents: 4121
diff changeset
787 if(asf_read_frame_header(s, pb) < 0){
1708
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
788 asf->packet_segments= 0;
1696
fdea5fc3362f get rid of a few idiotic asserts()
michael
parents: 1695
diff changeset
789 continue;
352
c5ea5cdb5b58 replic_size==0 fix, needed so that G.726 asf file, so ffmpeg can at least decode the video without segfaulting
michael
parents: 351
diff changeset
790 }
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
791 if (asf->stream_index < 0
708
d79164865a7c more fine grained discarding of packets
michael
parents: 652
diff changeset
792 || s->streams[asf->stream_index]->discard >= AVDISCARD_ALL
d79164865a7c more fine grained discarding of packets
michael
parents: 652
diff changeset
793 || (!asf->packet_key_frame && s->streams[asf->stream_index]->discard >= AVDISCARD_NONKEY)
d79164865a7c more fine grained discarding of packets
michael
parents: 652
diff changeset
794 ) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
795 asf->packet_time_start = 0;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
796 /* unhandled packet (should not happen) */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
797 url_fskip(pb, asf->packet_frag_size);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
798 asf->packet_size_left -= asf->packet_frag_size;
652
b47948262721 support discarding uninterresting packets
michael
parents: 643
diff changeset
799 if(asf->stream_index < 0)
1708
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
800 av_log(s, AV_LOG_ERROR, "ff asf skip %d (unknown stream)\n", asf->packet_frag_size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
801 continue;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
802 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
803 asf->asf_st = s->streams[asf->stream_index]->priv_data;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
804 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
805 asf_st = asf->asf_st;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
806
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
807 if (asf->packet_replic_size == 1) {
2855
46729b573b25 begining -> beginning typo fix
reimar
parents: 2843
diff changeset
808 // frag_offset is here used as the beginning timestamp
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
809 asf->packet_frag_timestamp = asf->packet_time_start;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
810 asf->packet_time_start += asf->packet_time_delta;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
811 asf->packet_obj_size = asf->packet_frag_size = get_byte(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
812 asf->packet_size_left--;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
813 asf->packet_multi_size--;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
814 if (asf->packet_multi_size < asf->packet_obj_size)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
815 {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
816 asf->packet_time_start = 0;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
817 url_fskip(pb, asf->packet_multi_size);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
818 asf->packet_size_left -= asf->packet_multi_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
819 continue;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
820 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
821 asf->packet_multi_size -= asf->packet_obj_size;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
822 //printf("COMPRESS size %d %d %d ms:%d\n", asf->packet_obj_size, asf->packet_frag_timestamp, asf->packet_size_left, asf->packet_multi_size);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
823 }
2285
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
824 if( /*asf->packet_frag_size == asf->packet_obj_size*/
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
825 asf_st->frag_offset + asf->packet_frag_size <= asf_st->pkt.size
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
826 && asf_st->frag_offset + asf->packet_frag_size > asf->packet_obj_size){
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
827 av_log(s, AV_LOG_INFO, "ignoring invalid packet_obj_size (%d %d %d %d)\n",
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
828 asf_st->frag_offset, asf->packet_frag_size,
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
829 asf->packet_obj_size, asf_st->pkt.size);
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
830 asf->packet_obj_size= asf_st->pkt.size;
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
831 }
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
832
1744
1f8dc697cb11 fix seeking in wma
michael
parents: 1740
diff changeset
833 if ( asf_st->pkt.size != asf->packet_obj_size
1f8dc697cb11 fix seeking in wma
michael
parents: 1740
diff changeset
834 || asf_st->frag_offset + asf->packet_frag_size > asf_st->pkt.size) { //FIXME is this condition sufficient?
1710
33a16d903dcc replace nonsense code by something which makes at least some sense
michael
parents: 1709
diff changeset
835 if(asf_st->pkt.data){
33a16d903dcc replace nonsense code by something which makes at least some sense
michael
parents: 1709
diff changeset
836 av_log(s, AV_LOG_INFO, "freeing incomplete packet size %d, new %d\n", asf_st->pkt.size, asf->packet_obj_size);
33a16d903dcc replace nonsense code by something which makes at least some sense
michael
parents: 1709
diff changeset
837 asf_st->frag_offset = 0;
33a16d903dcc replace nonsense code by something which makes at least some sense
michael
parents: 1709
diff changeset
838 av_free_packet(&asf_st->pkt);
33a16d903dcc replace nonsense code by something which makes at least some sense
michael
parents: 1709
diff changeset
839 }
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
840 /* new packet */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
841 av_new_packet(&asf_st->pkt, asf->packet_obj_size);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
842 asf_st->seq = asf->packet_seq;
4022
9be14682f7b3 timestamp is dts in wmv/asf
bcoudurier
parents: 3967
diff changeset
843 asf_st->pkt.dts = asf->packet_frag_timestamp;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
844 asf_st->pkt.stream_index = asf->stream_index;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
845 asf_st->pkt.pos =
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
846 asf_st->packet_pos= asf->packet_pos;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
847 //printf("new packet: stream:%d key:%d packet_key:%d audio:%d size:%d\n",
349
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
848 //asf->stream_index, asf->packet_key_frame, asf_st->pkt.flags & PKT_FLAG_KEY,
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 792
diff changeset
849 //s->streams[asf->stream_index]->codec->codec_type == CODEC_TYPE_AUDIO, asf->packet_obj_size);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
850 if (s->streams[asf->stream_index]->codec->codec_type == CODEC_TYPE_AUDIO)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
851 asf->packet_key_frame = 1;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
852 if (asf->packet_key_frame)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
853 asf_st->pkt.flags |= PKT_FLAG_KEY;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
854 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
855
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
856 /* read data */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
857 //printf("READ PACKET s:%d os:%d o:%d,%d l:%d DATA:%p\n",
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
858 // s->packet_size, asf_st->pkt.size, asf->packet_frag_offset,
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
859 // asf_st->frag_offset, asf->packet_frag_size, asf_st->pkt.data);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
860 asf->packet_size_left -= asf->packet_frag_size;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
861 if (asf->packet_size_left < 0)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
862 continue;
1709
7331d7153e0a check fragment offset and size
michael
parents: 1708
diff changeset
863
7331d7153e0a check fragment offset and size
michael
parents: 1708
diff changeset
864 if( asf->packet_frag_offset >= asf_st->pkt.size
7331d7153e0a check fragment offset and size
michael
parents: 1708
diff changeset
865 || asf->packet_frag_size > asf_st->pkt.size - asf->packet_frag_offset){
7331d7153e0a check fragment offset and size
michael
parents: 1708
diff changeset
866 av_log(s, AV_LOG_ERROR, "packet fragment position invalid %u,%u not in %u\n",
7331d7153e0a check fragment offset and size
michael
parents: 1708
diff changeset
867 asf->packet_frag_offset, asf->packet_frag_size, asf_st->pkt.size);
7331d7153e0a check fragment offset and size
michael
parents: 1708
diff changeset
868 continue;
7331d7153e0a check fragment offset and size
michael
parents: 1708
diff changeset
869 }
7331d7153e0a check fragment offset and size
michael
parents: 1708
diff changeset
870
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
871 get_buffer(pb, asf_st->pkt.data + asf->packet_frag_offset,
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
872 asf->packet_frag_size);
2652
2d28b2a5b2e4 Add support for decrypting asf files
reimar
parents: 2603
diff changeset
873 if (s->key && s->keylen == 20)
2d28b2a5b2e4 Add support for decrypting asf files
reimar
parents: 2603
diff changeset
874 ff_asfcrypt_dec(s->key, asf_st->pkt.data + asf->packet_frag_offset,
2d28b2a5b2e4 Add support for decrypting asf files
reimar
parents: 2603
diff changeset
875 asf->packet_frag_size);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
876 asf_st->frag_offset += asf->packet_frag_size;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
877 /* test if whole packet is read */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
878 if (asf_st->frag_offset == asf_st->pkt.size) {
2416
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
879 //workaround for macroshit radio DVR-MS files
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
880 if( s->streams[asf->stream_index]->codec->codec_id == CODEC_ID_MPEG2VIDEO
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
881 && asf_st->pkt.size > 100){
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
882 int i;
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
883 for(i=0; i<asf_st->pkt.size && !asf_st->pkt.data[i]; i++);
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
884 if(i == asf_st->pkt.size){
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
885 av_log(s, AV_LOG_DEBUG, "discarding ms fart\n");
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
886 asf_st->frag_offset = 0;
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
887 av_free_packet(&asf_st->pkt);
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
888 continue;
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
889 }
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
890 }
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
891
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
892 /* return packet */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
893 if (asf_st->ds_span > 1) {
1700
77bd711c0aed adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents: 1699
diff changeset
894 if(asf_st->pkt.size != asf_st->ds_packet_size * asf_st->ds_span){
2319
4b2f8d27c8ba more verbose error
michael
parents: 2318
diff changeset
895 av_log(s, AV_LOG_ERROR, "pkt.size != ds_packet_size * ds_span (%d %d %d)\n", asf_st->pkt.size, asf_st->ds_packet_size, asf_st->ds_span);
1700
77bd711c0aed adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents: 1699
diff changeset
896 }else{
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
897 /* packet descrambling */
1332
7474cc6383d4 fix some signedness warnings
mru
parents: 1266
diff changeset
898 uint8_t *newdata = av_malloc(asf_st->pkt.size);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
899 if (newdata) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
900 int offset = 0;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
901 while (offset < asf_st->pkt.size) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
902 int off = offset / asf_st->ds_chunk_size;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
903 int row = off / asf_st->ds_span;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
904 int col = off % asf_st->ds_span;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
905 int idx = row + col * asf_st->ds_packet_size / asf_st->ds_chunk_size;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
906 //printf("off:%d row:%d col:%d idx:%d\n", off, row, col, idx);
1700
77bd711c0aed adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents: 1699
diff changeset
907
77bd711c0aed adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents: 1699
diff changeset
908 assert(offset + asf_st->ds_chunk_size <= asf_st->pkt.size);
77bd711c0aed adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents: 1699
diff changeset
909 assert(idx+1 <= asf_st->pkt.size / asf_st->ds_chunk_size);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
910 memcpy(newdata + offset,
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
911 asf_st->pkt.data + idx * asf_st->ds_chunk_size,
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
912 asf_st->ds_chunk_size);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
913 offset += asf_st->ds_chunk_size;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
914 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
915 av_free(asf_st->pkt.data);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
916 asf_st->pkt.data = newdata;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
917 }
1700
77bd711c0aed adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents: 1699
diff changeset
918 }
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
919 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
920 asf_st->frag_offset = 0;
1699
b959208ba904 cosmetic
michael
parents: 1697
diff changeset
921 *pkt= asf_st->pkt;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
922 //printf("packet %d %d\n", asf_st->pkt.size, asf->packet_frag_size);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
923 asf_st->pkt.size = 0;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
924 asf_st->pkt.data = 0;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
925 break; // packet completed
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
926 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
927 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
928 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
929 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
930
4095
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
931 static int asf_read_packet(AVFormatContext *s, AVPacket *pkt)
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
932 {
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
933 ASFContext *asf = s->priv_data;
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
934
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
935 for (;;) {
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
936 int ret;
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
937
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
938 /* parse cached packets, if any */
4121
55e94f2a8ac1 Make asf_get_packet() and asf_parse_packet() public for use in RTSP-MS and
rbultje
parents: 4120
diff changeset
939 if ((ret = ff_asf_parse_packet(s, s->pb, pkt)) <= 0)
4095
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
940 return ret;
4121
55e94f2a8ac1 Make asf_get_packet() and asf_parse_packet() public for use in RTSP-MS and
rbultje
parents: 4120
diff changeset
941 if ((ret = ff_asf_get_packet(s, s->pb)) < 0)
4095
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
942 assert(asf->packet_size_left < FRAME_HEADER_SIZE || asf->packet_segments < 1);
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
943 asf->packet_time_start = 0;
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
944 }
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
945
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
946 return 0;
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
947 }
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
948
347
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
949 // Added to support seeking after packets have been read
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
950 // If information is not reset, read_packet fails due to
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
951 // leftover information from previous reads
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
952 static void asf_reset_header(AVFormatContext *s)
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
953 {
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
954 ASFContext *asf = s->priv_data;
349
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
955 ASFStream *asf_st;
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
956 int i;
347
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
957
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
958 asf->packet_nb_frames = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
959 asf->packet_size_left = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
960 asf->packet_segments = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
961 asf->packet_flags = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
962 asf->packet_property = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
963 asf->packet_timestamp = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
964 asf->packet_segsizetype = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
965 asf->packet_segments = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
966 asf->packet_seq = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
967 asf->packet_replic_size = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
968 asf->packet_key_frame = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
969 asf->packet_padsize = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
970 asf->packet_frag_offset = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
971 asf->packet_frag_size = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
972 asf->packet_frag_timestamp = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
973 asf->packet_multi_size = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
974 asf->packet_obj_size = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
975 asf->packet_time_delta = 0;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
976 asf->packet_time_start = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
977
349
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
978 for(i=0; i<s->nb_streams; i++){
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
979 asf_st= s->streams[i]->priv_data;
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
980 av_free_packet(&asf_st->pkt);
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
981 asf_st->frag_offset=0;
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
982 asf_st->seq=0;
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
983 }
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
984 asf->asf_st= NULL;
347
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
985 }
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
986
2603
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
987 static int asf_read_close(AVFormatContext *s)
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
988 {
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
989 int i;
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
990
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
991 asf_reset_header(s);
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
992 for(i=0;i<s->nb_streams;i++) {
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
993 AVStream *st = s->streams[i];
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
994 av_free(st->codec->palctrl);
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
995 }
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
996 return 0;
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
997 }
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
998
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 373
diff changeset
999 static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos, int64_t pos_limit)
347
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1000 {
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1001 AVPacket pkt1, *pkt = &pkt1;
349
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1002 ASFStream *asf_st;
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1003 int64_t pts;
348
ca519d041ea1 memleak fix
michael
parents: 347
diff changeset
1004 int64_t pos= *ppos;
354
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1005 int i;
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1006 int64_t start_pos[s->nb_streams];
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1007
354
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1008 for(i=0; i<s->nb_streams; i++){
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1009 start_pos[i]= pos;
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1010 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1011
5085
878651429ae5 Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.
reimar
parents: 5067
diff changeset
1012 if (s->packet_size > 0)
5086
5e6156776ee2 Fix indentation
reimar
parents: 5085
diff changeset
1013 pos= (pos+s->packet_size-1-s->data_offset)/s->packet_size*s->packet_size+ s->data_offset;
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 373
diff changeset
1014 *ppos= pos;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1015 url_fseek(s->pb, pos, SEEK_SET);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1016
349
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1017 //printf("asf_read_pts\n");
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1018 asf_reset_header(s);
354
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1019 for(;;){
349
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1020 if (av_read_frame(s, pkt) < 0){
1714
ff33c20963ec more correct error message
michael
parents: 1713
diff changeset
1021 av_log(s, AV_LOG_INFO, "asf_read_pts failed\n");
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1022 return AV_NOPTS_VALUE;
349
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1023 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1024
991
30b54c043135 timebase fix
michael
parents: 979
diff changeset
1025 pts= pkt->pts;
347
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1026
348
ca519d041ea1 memleak fix
michael
parents: 347
diff changeset
1027 av_free_packet(pkt);
354
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1028 if(pkt->flags&PKT_FLAG_KEY){
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1029 i= pkt->stream_index;
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1030
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1031 asf_st= s->streams[i]->priv_data;
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1032
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
1033 // assert((asf_st->packet_pos - s->data_offset) % s->packet_size == 0);
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 373
diff changeset
1034 pos= asf_st->packet_pos;
351
c072833fe7f4 use packet number instead of byte number internally for seeking
michael
parents: 350
diff changeset
1035
1266
5b9729f5145c fix fallback if theres no index
michael
parents: 1265
diff changeset
1036 av_add_index_entry(s->streams[i], pos, pts, pkt->size, pos - start_pos[i] + 1, AVINDEX_KEYFRAME);
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 373
diff changeset
1037 start_pos[i]= asf_st->packet_pos + 1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1038
354
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1039 if(pkt->stream_index == stream_index)
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1040 break;
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1041 }
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1042 }
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1043
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1044 *ppos= pos;
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1415
diff changeset
1045 //printf("found keyframe at %"PRId64" stream %d stamp:%"PRId64"\n", *ppos, stream_index, pts);
348
ca519d041ea1 memleak fix
michael
parents: 347
diff changeset
1046
ca519d041ea1 memleak fix
michael
parents: 347
diff changeset
1047 return pts;
347
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1048 }
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1049
1265
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1050 static void asf_build_simple_index(AVFormatContext *s, int stream_index)
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1051 {
4748
86dd0cab30d3 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents: 4747
diff changeset
1052 ff_asf_guid g;
1265
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1053 ASFContext *asf = s->priv_data;
4882
8d9ce632a3e2 Moving variable declarations in asf_build_simple_index() to clarify&prettify code.
michael
parents: 4879
diff changeset
1054 int64_t current_pos= url_ftell(s->pb);
1265
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1055 int i;
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1056
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1057 url_fseek(s->pb, asf->data_object_offset + asf->data_object_size, SEEK_SET);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1058 get_guid(s->pb, &g);
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
1059 if (!guidcmp(&g, &index_guid)) {
4882
8d9ce632a3e2 Moving variable declarations in asf_build_simple_index() to clarify&prettify code.
michael
parents: 4879
diff changeset
1060 int64_t itime;
8d9ce632a3e2 Moving variable declarations in asf_build_simple_index() to clarify&prettify code.
michael
parents: 4879
diff changeset
1061 int pct, ict;
4896
7c3c541b421e Mark gsize variable as av_unused, fixes the warning:
diego
parents: 4895
diff changeset
1062 int64_t av_unused gsize= get_le64(s->pb);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1063 get_guid(s->pb, &g);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1064 itime=get_le64(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1065 pct=get_le32(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1066 ict=get_le32(s->pb);
4508
99c3000c9482 Add a context to av_log() calls.
benoit
parents: 4368
diff changeset
1067 av_log(s, AV_LOG_DEBUG, "itime:0x%"PRIx64", pct:%d, ict:%d\n",itime,pct,ict);
1265
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1068
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1069 for (i=0;i<ict;i++){
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1070 int pktnum=get_le32(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1071 int pktct =get_le16(s->pb);
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
1072 int64_t pos = s->data_offset + s->packet_size*(int64_t)pktnum;
4882
8d9ce632a3e2 Moving variable declarations in asf_build_simple_index() to clarify&prettify code.
michael
parents: 4879
diff changeset
1073 int64_t index_pts= av_rescale(itime, i, 10000);
1265
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1074
4882
8d9ce632a3e2 Moving variable declarations in asf_build_simple_index() to clarify&prettify code.
michael
parents: 4879
diff changeset
1075 av_log(s, AV_LOG_DEBUG, "pktnum:%d, pktct:%d\n", pktnum, pktct);
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
1076 av_add_index_entry(s->streams[stream_index], pos, index_pts, s->packet_size, 0, AVINDEX_KEYFRAME);
1265
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1077 }
1266
5b9729f5145c fix fallback if theres no index
michael
parents: 1265
diff changeset
1078 asf->index_read= 1;
1265
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1079 }
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1080 url_fseek(s->pb, current_pos, SEEK_SET);
1265
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1081 }
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1082
555
0a997108f384 use native timebase for seeking
michael
parents: 482
diff changeset
1083 static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1084 {
312
8a04d2e1be2f frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents: 300
diff changeset
1085 ASFContext *asf = s->priv_data;
1265
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1086 AVStream *st = s->streams[stream_index];
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1087 int64_t pos;
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1088 int index;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1089
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
1090 if (s->packet_size <= 0)
347
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1091 return -1;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1092
2827
f717dd23fc23 Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents: 2771
diff changeset
1093 /* Try using the protocol's read_seek if available */
2842
bc317b8d7090 remove double check of pb->read_seek
aurel
parents: 2827
diff changeset
1094 if(s->pb) {
2827
f717dd23fc23 Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents: 2771
diff changeset
1095 int ret = av_url_read_fseek(s->pb, stream_index, pts, flags);
f717dd23fc23 Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents: 2771
diff changeset
1096 if(ret >= 0)
f717dd23fc23 Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents: 2771
diff changeset
1097 asf_reset_header(s);
2842
bc317b8d7090 remove double check of pb->read_seek
aurel
parents: 2827
diff changeset
1098 if (ret != AVERROR(ENOSYS))
2843
7a6b7595f933 cosmetics: indentation
aurel
parents: 2842
diff changeset
1099 return ret;
2827
f717dd23fc23 Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents: 2771
diff changeset
1100 }
f717dd23fc23 Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents: 2771
diff changeset
1101
1266
5b9729f5145c fix fallback if theres no index
michael
parents: 1265
diff changeset
1102 if (!asf->index_read)
1265
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1103 asf_build_simple_index(s, stream_index);
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1104
1266
5b9729f5145c fix fallback if theres no index
michael
parents: 1265
diff changeset
1105 if(!(asf->index_read && st->index_entries)){
1265
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1106 if(av_seek_frame_binary(s, stream_index, pts, flags)<0)
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1107 return -1;
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1108 }else{
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1109 index= av_index_search_timestamp(st, pts, flags);
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1110 if(index<0)
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1111 return -1;
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1112
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1113 /* find the position */
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1114 pos = st->index_entries[index].pos;
347
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1115
1265
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1116 // various attempts to find key frame have failed so far
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1117 // asf_reset_header(s);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1118 // url_fseek(s->pb, pos, SEEK_SET);
1265
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1119 // key_pos = pos;
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1120 // for(i=0;i<16;i++){
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1121 // pos = url_ftell(s->pb);
1265
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1122 // if (av_read_frame(s, &pkt) < 0){
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1123 // av_log(s, AV_LOG_INFO, "seek failed\n");
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1124 // return -1;
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1125 // }
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1126 // asf_st = s->streams[stream_index]->priv_data;
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1127 // pos += st->parser->frame_offset;
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1128 //
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1129 // if (pkt.size > b) {
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1130 // b = pkt.size;
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1131 // key_pos = pos;
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1132 // }
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1133 //
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1134 // av_free_packet(&pkt);
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1135 // }
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1136
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1137 /* do the seek */
4508
99c3000c9482 Add a context to av_log() calls.
benoit
parents: 4368
diff changeset
1138 av_log(s, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1139 url_fseek(s->pb, pos, SEEK_SET);
1265
613fdf995af0 read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents: 1264
diff changeset
1140 }
347
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1141 asf_reset_header(s);
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1142 return 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1143 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1144
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1145 AVInputFormat asf_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1146 "asf",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3286
diff changeset
1147 NULL_IF_CONFIG_SMALL("ASF format"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1148 sizeof(ASFContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1149 asf_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1150 asf_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1151 asf_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1152 asf_read_close,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1153 asf_read_seek,
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 373
diff changeset
1154 asf_read_pts,
4618
5b9eddbee9c4 Add some basic metadata conversion tables for matroska and asf.
aurel
parents: 4593
diff changeset
1155 .metadata_conv = ff_asf_metadata_conv,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1156 };