annotate asfdec.c @ 6481:123ebc5da327 libavformat

Fix aspect ratio for files that have it stored in ff_asf_extended_content_header. Patch by Richard Buteau, rbuteau rgbnetworks com
author cehoyos
date Thu, 23 Sep 2010 03:40:06 +0000
parents 3800dce5a40a
children c59fad269e39
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
6171
240beb8a3072 asfdec: ensure number of streams is within bounds; remove VLA in asf_read_pts()
mru
parents: 6167
diff changeset
38 #define ASF_MAX_STREAMS 127
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
39 #define FRAME_HEADER_SIZE 17
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
40 // 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
41
4748
86dd0cab30d3 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents: 4747
diff changeset
42 static const ff_asf_guid index_guid = {
1687
39cafa2f6060 simplify GUIDs
michael
parents: 1660
diff changeset
43 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
44 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
45
4748
86dd0cab30d3 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents: 4747
diff changeset
46 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
47 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
48 };
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
49 /**********************************/
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
50 /* decoding */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
51
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
52 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
53 {
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 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
55 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
56
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57 #ifdef DEBUG
69
0686eeb0c21b prettier debug output
mmu_man
parents: 65
diff changeset
58 #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
59 if (!guidcmp(g, &cmp)) \
3578
11042d1aba87 ASF: use dprintf(), allow compilation with -DDEBUG
mru
parents: 3568
diff changeset
60 dprintf(NULL, "(GUID: %s) ", #cmp)
69
0686eeb0c21b prettier debug output
mmu_man
parents: 65
diff changeset
61
4748
86dd0cab30d3 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents: 4747
diff changeset
62 static void print_guid(const ff_asf_guid *g)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
63 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
64 int i;
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
65 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
66 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
67 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
68 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
69 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
70 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
71 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
72 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
73 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
74 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
75 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
76 else PRINT_IF_GUID(g, ff_asf_data_header);
69
0686eeb0c21b prettier debug output
mmu_man
parents: 65
diff changeset
77 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
78 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
79 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
80 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
81 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
82 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
83 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
84 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
85 else PRINT_IF_GUID(g, ff_asf_metadata_header);
5778
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
86 else PRINT_IF_GUID(g, ff_asf_marker_header);
1806
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
87 else PRINT_IF_GUID(g, stream_bitrate_guid);
4924
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
88 else PRINT_IF_GUID(g, ff_asf_language_guid);
69
0686eeb0c21b prettier debug output
mmu_man
parents: 65
diff changeset
89 else
3578
11042d1aba87 ASF: use dprintf(), allow compilation with -DDEBUG
mru
parents: 3568
diff changeset
90 dprintf(NULL, "(GUID: unknown) ");
1687
39cafa2f6060 simplify GUIDs
michael
parents: 1660
diff changeset
91 for(i=0;i<16;i++)
3578
11042d1aba87 ASF: use dprintf(), allow compilation with -DDEBUG
mru
parents: 3568
diff changeset
92 dprintf(NULL, " 0x%02x,", (*g)[i]);
11042d1aba87 ASF: use dprintf(), allow compilation with -DDEBUG
mru
parents: 3568
diff changeset
93 dprintf(NULL, "}\n");
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
94 }
949
0566e2d915ef 10l, fails to compile when debug enabled
alex
parents: 904
diff changeset
95 #undef PRINT_IF_GUID
3578
11042d1aba87 ASF: use dprintf(), allow compilation with -DDEBUG
mru
parents: 3568
diff changeset
96 #else
11042d1aba87 ASF: use dprintf(), allow compilation with -DDEBUG
mru
parents: 3568
diff changeset
97 #define print_guid(g)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
98 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
99
4748
86dd0cab30d3 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents: 4747
diff changeset
100 static void get_guid(ByteIOContext *s, ff_asf_guid *g)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
101 {
1687
39cafa2f6060 simplify GUIDs
michael
parents: 1660
diff changeset
102 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
103 get_buffer(s, *g, sizeof(*g));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
104 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
105
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
106 #if 0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
107 static void get_str16(ByteIOContext *pb, char *buf, int buf_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
108 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
109 int len, c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110 char *q;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
111
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112 len = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113 q = buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
114 while (len > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
115 c = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
116 if ((q - buf) < buf_size - 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
117 *q++ = c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
118 len--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
120 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
121 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
122 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
123
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
124 static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
125 {
1503
a4ab86a48604 Use common macro PUT_UTF8 in asf.c
gpoirier
parents: 1443
diff changeset
126 char* q = buf;
5715
ead2df871971 Read ASF metadata as proper UTF-16 and spit it out as proper UTF-8 in our
rbultje
parents: 5708
diff changeset
127 while (len > 1) {
1503
a4ab86a48604 Use common macro PUT_UTF8 in asf.c
gpoirier
parents: 1443
diff changeset
128 uint8_t tmp;
5715
ead2df871971 Read ASF metadata as proper UTF-16 and spit it out as proper UTF-8 in our
rbultje
parents: 5708
diff changeset
129 uint32_t ch;
ead2df871971 Read ASF metadata as proper UTF-16 and spit it out as proper UTF-8 in our
rbultje
parents: 5708
diff changeset
130
ead2df871971 Read ASF metadata as proper UTF-16 and spit it out as proper UTF-8 in our
rbultje
parents: 5708
diff changeset
131 GET_UTF16(ch, (len -= 2) >= 0 ? get_le16(pb) : 0, break;)
ead2df871971 Read ASF metadata as proper UTF-16 and spit it out as proper UTF-8 in our
rbultje
parents: 5708
diff changeset
132 PUT_UTF8(ch, tmp, if (q - buf < buf_size - 1) *q++ = tmp;)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
133 }
4955
6671e7510fca fix get_str16_nolen with odd len, fix #1065
bcoudurier
parents: 4954
diff changeset
134 if (len > 0)
6671e7510fca fix get_str16_nolen with odd len, fix #1065
bcoudurier
parents: 4954
diff changeset
135 url_fskip(pb, len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
136 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
137 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
138
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
139 static int asf_probe(AVProbeData *pd)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
140 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
141 /* check file header */
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
142 if (!guidcmp(pd->buf, &ff_asf_header))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
143 return AVPROBE_SCORE_MAX;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
144 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
145 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
146 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
147
1750
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
148 static int get_value(ByteIOContext *pb, int type){
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
149 switch(type){
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
150 case 2: return get_le32(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
151 case 3: return get_le32(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
152 case 4: return get_le64(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
153 case 5: return get_le16(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
154 default:return INT_MIN;
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
155 }
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
156 }
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
157
4368
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
158 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
159 {
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5273
diff changeset
160 char *value;
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5273
diff changeset
161
5715
ead2df871971 Read ASF metadata as proper UTF-16 and spit it out as proper UTF-8 in our
rbultje
parents: 5708
diff changeset
162 if ((unsigned)len >= (UINT_MAX - 1)/2)
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5273
diff changeset
163 return;
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5273
diff changeset
164
5715
ead2df871971 Read ASF metadata as proper UTF-16 and spit it out as proper UTF-8 in our
rbultje
parents: 5708
diff changeset
165 value = av_malloc(2*len+1);
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5273
diff changeset
166 if (!value)
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5273
diff changeset
167 return;
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5273
diff changeset
168
5708
f096d96c7e5c asfdec: skip byte array tags.
benoit
parents: 5707
diff changeset
169 if (type == 0) { // UTF16-LE
5715
ead2df871971 Read ASF metadata as proper UTF-16 and spit it out as proper UTF-8 in our
rbultje
parents: 5708
diff changeset
170 get_str16_nolen(s->pb, len, value, 2*len + 1);
5708
f096d96c7e5c asfdec: skip byte array tags.
benoit
parents: 5707
diff changeset
171 } else if (type > 1 && type <= 5) { // boolean or DWORD or QWORD or WORD
4368
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
172 uint64_t num = get_value(s->pb, type);
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5273
diff changeset
173 snprintf(value, len, "%"PRIu64, num);
4368
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
174 } else {
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
175 url_fskip(s->pb, len);
5706
85900cc2695d asfdec: fix a memleak.
benoit
parents: 5705
diff changeset
176 av_freep(&value);
5707
a97d8df3be2b asfdec: add a debug message about skipped tags.
benoit
parents: 5706
diff changeset
177 av_log(s, AV_LOG_DEBUG, "Unsupported value type %d in tag %s.\n", type, key);
4368
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
178 return;
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
179 }
5715
ead2df871971 Read ASF metadata as proper UTF-16 and spit it out as proper UTF-8 in our
rbultje
parents: 5708
diff changeset
180 av_metadata_set2(&s->metadata, key, value, 0);
ead2df871971 Read ASF metadata as proper UTF-16 and spit it out as proper UTF-8 in our
rbultje
parents: 5708
diff changeset
181 av_freep(&value);
4368
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
182 }
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
183
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
184 static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
185 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
186 ASFContext *asf = s->priv_data;
4748
86dd0cab30d3 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents: 4747
diff changeset
187 ff_asf_guid g;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
188 ByteIOContext *pb = s->pb;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
189 AVStream *st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
190 ASFStream *asf_st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
191 int size, i;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
192 int64_t gsize;
1750
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
193 AVRational dar[128];
2064
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
194 uint32_t bitrate[128];
1750
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
195
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
196 memset(dar, 0, sizeof(dar));
2064
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
197 memset(bitrate, 0, sizeof(bitrate));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
198
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
199 get_guid(pb, &g);
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
200 if (guidcmp(&g, &ff_asf_header))
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
201 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
202 get_le64(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
203 get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
204 get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
205 get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
206 memset(&asf->asfid2avid, -1, sizeof(asf->asfid2avid));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
207 for(;;) {
5995
74e41ed8fb26 Favor chunk size over hitting the correct position after reading the chunk size in asf.
michael
parents: 5982
diff changeset
208 uint64_t gpos= url_ftell(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
209 get_guid(pb, &g);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
210 gsize = get_le64(pb);
5995
74e41ed8fb26 Favor chunk size over hitting the correct position after reading the chunk size in asf.
michael
parents: 5982
diff changeset
211 dprintf(s, "%08"PRIx64": ", gpos);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
212 print_guid(&g);
3578
11042d1aba87 ASF: use dprintf(), allow compilation with -DDEBUG
mru
parents: 3568
diff changeset
213 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
214 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
215 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
216 // 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
217 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
218 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
219 } else {
6d2157d1fc93 fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents: 1859
diff changeset
220 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
221 }
6d2157d1fc93 fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents: 1859
diff changeset
222 break;
6d2157d1fc93 fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents: 1859
diff changeset
223 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
224 if (gsize < 24)
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
225 return -1;
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
226 if (!guidcmp(&g, &ff_asf_file_header)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
227 get_guid(pb, &asf->hdr.guid);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
228 asf->hdr.file_size = get_le64(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
229 asf->hdr.create_time = get_le64(pb);
1701
90be497b752b remove a few unused and duplicated variables
michael
parents: 1700
diff changeset
230 asf->nb_packets = get_le64(pb);
3239
319a613c1dd7 Read asf file header fields in the right order
superdump
parents: 3116
diff changeset
231 asf->hdr.play_time = get_le64(pb);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
232 asf->hdr.send_time = get_le64(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
233 asf->hdr.preroll = get_le32(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
234 asf->hdr.ignore = get_le32(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
235 asf->hdr.flags = get_le32(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
236 asf->hdr.min_pktsize = get_le32(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
237 asf->hdr.max_pktsize = get_le32(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
238 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
239 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
240 } else if (!guidcmp(&g, &ff_asf_stream_header)) {
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5909
diff changeset
241 enum AVMediaType type;
3967
4fd67f05bad9 Use enum typers instead of int.
benoit
parents: 3908
diff changeset
242 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
243 uint64_t total_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244 unsigned int tag1;
2318
e5c3b6e7b6ef ignore preroll, it is generally not what AVStream.start_time should contain
michael
parents: 2285
diff changeset
245 int64_t pos1, pos2, start_time;
2018
0d9b233dff9b DVR-MS probe audio format
benoit
parents: 2001
diff changeset
246 int test_for_ext_stream_audio, is_dvr_ms_audio=0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
247
6171
240beb8a3072 asfdec: ensure number of streams is within bounds; remove VLA in asf_read_pts()
mru
parents: 6167
diff changeset
248 if (s->nb_streams == ASF_MAX_STREAMS) {
240beb8a3072 asfdec: ensure number of streams is within bounds; remove VLA in asf_read_pts()
mru
parents: 6167
diff changeset
249 av_log(s, AV_LOG_ERROR, "too many streams\n");
240beb8a3072 asfdec: ensure number of streams is within bounds; remove VLA in asf_read_pts()
mru
parents: 6167
diff changeset
250 return AVERROR(EINVAL);
240beb8a3072 asfdec: ensure number of streams is within bounds; remove VLA in asf_read_pts()
mru
parents: 6167
diff changeset
251 }
240beb8a3072 asfdec: ensure number of streams is within bounds; remove VLA in asf_read_pts()
mru
parents: 6167
diff changeset
252
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253 pos1 = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
254
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 136
diff changeset
255 st = av_new_stream(s, 0);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256 if (!st)
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
257 return AVERROR(ENOMEM);
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 437
diff changeset
258 av_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
259 asf_st = av_mallocz(sizeof(ASFStream));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
260 if (!asf_st)
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
261 return AVERROR(ENOMEM);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
262 st->priv_data = asf_st;
2318
e5c3b6e7b6ef ignore preroll, it is generally not what AVStream.start_time should contain
michael
parents: 2285
diff changeset
263 start_time = asf->hdr.preroll;
e5c3b6e7b6ef ignore preroll, it is generally not what AVStream.start_time should contain
michael
parents: 2285
diff changeset
264
4924
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
265 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
266
1552
de18846fa25c Minor modifications to handle mms streaming.
takis
parents: 1503
diff changeset
267 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
268 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
269 (10000000 / 1000) - start_time;
1552
de18846fa25c Minor modifications to handle mms streaming.
takis
parents: 1503
diff changeset
270 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
271 get_guid(pb, &g);
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
272
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
273 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
274 if (!guidcmp(&g, &ff_asf_audio_stream)) {
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5909
diff changeset
275 type = AVMEDIA_TYPE_AUDIO;
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
276 } else if (!guidcmp(&g, &ff_asf_video_stream)) {
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5909
diff changeset
277 type = AVMEDIA_TYPE_VIDEO;
6285
14c5d7cc71aa asfdec: Handle asf_jfif_media
mstorsjo
parents: 6248
diff changeset
278 } else if (!guidcmp(&g, &ff_asf_jfif_media)) {
14c5d7cc71aa asfdec: Handle asf_jfif_media
mstorsjo
parents: 6248
diff changeset
279 type = AVMEDIA_TYPE_VIDEO;
14c5d7cc71aa asfdec: Handle asf_jfif_media
mstorsjo
parents: 6248
diff changeset
280 st->codec->codec_id = CODEC_ID_MJPEG;
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
281 } else if (!guidcmp(&g, &ff_asf_command_stream)) {
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5909
diff changeset
282 type = AVMEDIA_TYPE_DATA;
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
283 } 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
284 test_for_ext_stream_audio = 1;
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5909
diff changeset
285 type = AVMEDIA_TYPE_UNKNOWN;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
286 } else {
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
287 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
288 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
289 get_guid(pb, &g);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
290 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
291 type_specific_size = get_le32(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
292 get_le32(pb);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
293 st->id = get_le16(pb) & 0x7f; /* stream id */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
294 // 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
295 asf->asfid2avid[st->id] = s->nb_streams - 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
296
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
297 get_le32(pb);
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
298
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
299 if (test_for_ext_stream_audio) {
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
300 get_guid(pb, &g);
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
301 if (!guidcmp(&g, &ff_asf_ext_stream_audio_stream)) {
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5909
diff changeset
302 type = AVMEDIA_TYPE_AUDIO;
2018
0d9b233dff9b DVR-MS probe audio format
benoit
parents: 2001
diff changeset
303 is_dvr_ms_audio=1;
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
304 get_guid(pb, &g);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
305 get_le32(pb);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
306 get_le32(pb);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
307 get_le32(pb);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
308 get_guid(pb, &g);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
309 get_le32(pb);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
310 }
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
311 }
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
312
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
313 st->codec->codec_type = type;
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5909
diff changeset
314 if (type == AVMEDIA_TYPE_AUDIO) {
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 5011
diff changeset
315 ff_get_wav_header(pb, st->codec, type_specific_size);
2018
0d9b233dff9b DVR-MS probe audio format
benoit
parents: 2001
diff changeset
316 if (is_dvr_ms_audio) {
0d9b233dff9b DVR-MS probe audio format
benoit
parents: 2001
diff changeset
317 // codec_id and codec_tag are unreliable in dvr_ms
0d9b233dff9b DVR-MS probe audio format
benoit
parents: 2001
diff changeset
318 // files. Set them later by probing stream.
3568
c24546b44906 New codec probing system try #1.
michael
parents: 3567
diff changeset
319 st->codec->codec_id = CODEC_ID_PROBE;
2018
0d9b233dff9b DVR-MS probe audio format
benoit
parents: 2001
diff changeset
320 st->codec->codec_tag = 0;
0d9b233dff9b DVR-MS probe audio format
benoit
parents: 2001
diff changeset
321 }
4545
6b77e9f5b682 AAC in ASF does not need parsing.
alexc
parents: 4508
diff changeset
322 if (st->codec->codec_id == CODEC_ID_AAC) {
6b77e9f5b682 AAC in ASF does not need parsing.
alexc
parents: 4508
diff changeset
323 st->need_parsing = AVSTREAM_PARSE_NONE;
6b77e9f5b682 AAC in ASF does not need parsing.
alexc
parents: 4508
diff changeset
324 } else {
4546
20c095d77b92 Re-indent after last commit
alexc
parents: 4545
diff changeset
325 st->need_parsing = AVSTREAM_PARSE_FULL;
4545
6b77e9f5b682 AAC in ASF does not need parsing.
alexc
parents: 4508
diff changeset
326 }
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
327 /* We have to init the frame size at some point .... */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
328 pos2 = url_ftell(pb);
1859
9bc07f90d4a2 off by one error
michael
parents: 1806
diff changeset
329 if (gsize >= (pos2 + 8 - pos1 + 24)) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
330 asf_st->ds_span = get_byte(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
331 asf_st->ds_packet_size = get_le16(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
332 asf_st->ds_chunk_size = get_le16(pb);
1701
90be497b752b remove a few unused and duplicated variables
michael
parents: 1700
diff changeset
333 get_le16(pb); //ds_data_size
90be497b752b remove a few unused and duplicated variables
michael
parents: 1700
diff changeset
334 get_byte(pb); //ds_silence_data
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
335 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
336 //printf("Descrambling: ps:%d cs:%d ds:%d s:%d sd:%d\n",
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
337 // asf_st->ds_packet_size, asf_st->ds_chunk_size,
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
338 // 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
339 if (asf_st->ds_span > 1) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
340 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
341 || (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
342 || asf_st->ds_packet_size % asf_st->ds_chunk_size)
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
343 asf_st->ds_span = 0; // disable descrambling
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
344 }
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 792
diff changeset
345 switch (st->codec->codec_id) {
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 196
diff changeset
346 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
347 st->codec->frame_size = MPA_FRAME_SIZE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
348 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
349 case CODEC_ID_PCM_S16LE:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
350 case CODEC_ID_PCM_S16BE:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
351 case CODEC_ID_PCM_U16LE:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
352 case CODEC_ID_PCM_U16BE:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
353 case CODEC_ID_PCM_S8:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
354 case CODEC_ID_PCM_U8:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
355 case CODEC_ID_PCM_ALAW:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
356 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
357 st->codec->frame_size = 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
358 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
359 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
360 /* 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
361 st->codec->frame_size = 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
362 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
363 }
6286
bb928e39c078 asfdec: Don't read the video stream header if there isn't enough data
mstorsjo
parents: 6285
diff changeset
364 } else if (type == AVMEDIA_TYPE_VIDEO &&
6287
3800dce5a40a asfdec: 10l, fix the minimum asf video stream header size
mstorsjo
parents: 6286
diff changeset
365 gsize - (url_ftell(pb) - pos1 + 24) >= 51) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
366 get_le32(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
367 get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
368 get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
369 size = get_le16(pb); /* size */
732
1221cba1c069 fixing demuxing of DV5700.asf
michael
parents: 708
diff changeset
370 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
371 st->codec->width = get_le32(pb);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
372 st->codec->height = get_le32(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
373 /* not available for asf */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
374 get_le16(pb); /* panes */
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3759
diff changeset
375 st->codec->bits_per_coded_sample = get_le16(pb); /* depth */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
376 tag1 = get_le32(pb);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
377 url_fskip(pb, 20);
4508
99c3000c9482 Add a context to av_log() calls.
benoit
parents: 4368
diff changeset
378 // 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
379 size= sizeX;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
380 if (size > 40) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
381 st->codec->extradata_size = size - 40;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
382 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
383 get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
384 }
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 277
diff changeset
385
4743
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
386 /* Extract palette from extradata if bpp <= 8 */
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
387 /* This code assumes that extradata contains only palette */
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
388 /* 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
389 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
390 st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl));
5108
44a0fab134a9 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN
mru
parents: 5094
diff changeset
391 #if HAVE_BIGENDIAN
4743
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
392 for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++)
6248
e630da0f5861 Add av_ prefix to bswap macros
mru
parents: 6240
diff changeset
393 st->codec->palctrl->palette[i] = av_bswap32(((uint32_t*)st->codec->extradata)[i]);
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 277
diff changeset
394 #else
4743
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
395 memcpy(st->codec->palctrl->palette, st->codec->extradata,
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
396 FFMIN(st->codec->extradata_size, AVPALETTE_SIZE));
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 277
diff changeset
397 #endif
4743
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
398 st->codec->palctrl->palette_changed = 1;
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
399 }
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 277
diff changeset
400
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 792
diff changeset
401 st->codec->codec_tag = tag1;
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 5011
diff changeset
402 st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1);
6240
8333d7ea7257 Ignore extradata & w/h in asf/dvr.
michael
parents: 6171
diff changeset
403 if(tag1 == MKTAG('D', 'V', 'R', ' ')){
2023
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 2018
diff changeset
404 st->need_parsing = AVSTREAM_PARSE_FULL;
6240
8333d7ea7257 Ignore extradata & w/h in asf/dvr.
michael
parents: 6171
diff changeset
405 // issue658 containse wrong w/h and MS even puts a fake seq header with wrong w/h in extradata while a correct one is in te stream. maximum lameness
8333d7ea7257 Ignore extradata & w/h in asf/dvr.
michael
parents: 6171
diff changeset
406 st->codec->width =
8333d7ea7257 Ignore extradata & w/h in asf/dvr.
michael
parents: 6171
diff changeset
407 st->codec->height = 0;
8333d7ea7257 Ignore extradata & w/h in asf/dvr.
michael
parents: 6171
diff changeset
408 av_freep(&st->codec->extradata);
8333d7ea7257 Ignore extradata & w/h in asf/dvr.
michael
parents: 6171
diff changeset
409 st->codec->extradata_size=0;
8333d7ea7257 Ignore extradata & w/h in asf/dvr.
michael
parents: 6171
diff changeset
410 }
6060
8d92fb0a1a24 Parse and repack the first frame of H.264 in ASF because SPS+PPS lives in its own packet.
alexc
parents: 5995
diff changeset
411 if(st->codec->codec_id == CODEC_ID_H264)
8d92fb0a1a24 Parse and repack the first frame of H.264 in ASF because SPS+PPS lives in its own packet.
alexc
parents: 5995
diff changeset
412 st->need_parsing = AVSTREAM_PARSE_FULL_ONCE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
413 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
414 pos2 = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
415 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
416 } else if (!guidcmp(&g, &ff_asf_comment_header)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
417 int len1, len2, len3, len4, len5;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
418
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
419 len1 = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
420 len2 = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
421 len3 = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
422 len4 = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
423 len5 = get_le16(pb);
4368
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
424 get_tag(s, "title" , 0, len1);
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
425 get_tag(s, "author" , 0, len2);
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
426 get_tag(s, "copyright", 0, len3);
f666f5481e53 use new metadata API in asf demuxer
aurel
parents: 4251
diff changeset
427 get_tag(s, "comment" , 0, len4);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
428 url_fskip(pb, len5);
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
429 } 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
430 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
431 int j;
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
432
4508
99c3000c9482 Add a context to av_log() calls.
benoit
parents: 4368
diff changeset
433 // av_log(s, AV_LOG_ERROR, "stream bitrate properties\n");
99c3000c9482 Add a context to av_log() calls.
benoit
parents: 4368
diff changeset
434 // 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
435 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
436 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
437
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
438 flags= get_le16(pb);
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
439 bitrate= get_le32(pb);
bf6a0dd6d7be Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents: 1776
diff changeset
440 stream_id= (flags & 0x7f);
4508
99c3000c9482 Add a context to av_log() calls.
benoit
parents: 4368
diff changeset
441 // 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
442 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
443 }
4924
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
444 } else if (!guidcmp(&g, &ff_asf_language_guid)) {
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
445 int j;
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
446 int stream_count = get_le16(pb);
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
447 for(j = 0; j < stream_count; j++) {
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
448 char lang[6];
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
449 unsigned int lang_len = get_byte(pb);
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
450 get_str16_nolen(pb, lang_len, lang, sizeof(lang));
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
451 if (j < 128)
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
452 av_strlcpy(asf->stream_languages[j], lang, sizeof(*asf->stream_languages));
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
453 }
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
454 } 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
455 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
456
4743
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
457 desc_count = get_le16(pb);
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
458 for(i=0;i<desc_count;i++) {
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
459 int name_len,value_type,value_len;
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
460 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
461
4743
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
462 name_len = get_le16(pb);
5658
9e6fd33adfb4 workaround for broken files created by previous versions of asfenc.
cehoyos
parents: 5467
diff changeset
463 if (name_len%2) // must be even, broken lavf versions wrote len-1
9e6fd33adfb4 workaround for broken files created by previous versions of asfenc.
cehoyos
parents: 5467
diff changeset
464 name_len += 1;
4743
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
465 get_str16_nolen(pb, name_len, name, sizeof(name));
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
466 value_type = get_le16(pb);
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
467 value_len = get_le16(pb);
5705
fabb2eb7d42c asfdec: only unicode tags must have even length.
benoit
parents: 5658
diff changeset
468 if (!value_type && value_len%2)
5658
9e6fd33adfb4 workaround for broken files created by previous versions of asfenc.
cehoyos
parents: 5467
diff changeset
469 value_len += 1;
6481
123ebc5da327 Fix aspect ratio for files that have it stored in
cehoyos
parents: 6287
diff changeset
470 /**
123ebc5da327 Fix aspect ratio for files that have it stored in
cehoyos
parents: 6287
diff changeset
471 * My sample has that stream set to 0 maybe that mean the container.
123ebc5da327 Fix aspect ratio for files that have it stored in
cehoyos
parents: 6287
diff changeset
472 * Asf stream count start at 1. I am using 0 to the container value since it's unused
123ebc5da327 Fix aspect ratio for files that have it stored in
cehoyos
parents: 6287
diff changeset
473 */
123ebc5da327 Fix aspect ratio for files that have it stored in
cehoyos
parents: 6287
diff changeset
474 if (!strcmp(name, "AspectRatioX")){
123ebc5da327 Fix aspect ratio for files that have it stored in
cehoyos
parents: 6287
diff changeset
475 dar[0].num= get_value(s->pb, value_type);
123ebc5da327 Fix aspect ratio for files that have it stored in
cehoyos
parents: 6287
diff changeset
476 } else if(!strcmp(name, "AspectRatioY")){
123ebc5da327 Fix aspect ratio for files that have it stored in
cehoyos
parents: 6287
diff changeset
477 dar[0].den= get_value(s->pb, value_type);
123ebc5da327 Fix aspect ratio for files that have it stored in
cehoyos
parents: 6287
diff changeset
478 } else get_tag(s, name, value_type, value_len);
4743
5c65daa1c678 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents: 4618
diff changeset
479 }
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
480 } else if (!guidcmp(&g, &ff_asf_metadata_header)) {
1750
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
481 int n, stream_num, name_len, value_len, value_type, value_num;
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
482 n = get_le16(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
483
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
484 for(i=0;i<n;i++) {
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
485 char name[1024];
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
486
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
487 get_le16(pb); //lang_list_index
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
488 stream_num= get_le16(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
489 name_len= get_le16(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
490 value_type= get_le16(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
491 value_len= get_le32(pb);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
492
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
493 get_str16_nolen(pb, name_len, name, sizeof(name));
4508
99c3000c9482 Add a context to av_log() calls.
benoit
parents: 4368
diff changeset
494 //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
495 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
496 url_fskip(pb, value_len - 2);
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
497
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
498 if(stream_num<128){
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
499 if (!strcmp(name, "AspectRatioX")) dar[stream_num].num= value_num;
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
500 else if(!strcmp(name, "AspectRatioY")) dar[stream_num].den= value_num;
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
501 }
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
502 }
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
503 } 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
504 int ext_len, payload_ext_ct, stream_ct;
2064
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
505 uint32_t ext_d, leak_rate, stream_num;
4924
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
506 unsigned int stream_languageid_index;
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
507
1740
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
508 get_le64(pb); // starttime
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
509 get_le64(pb); // endtime
2064
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
510 leak_rate = get_le32(pb); // leak-datarate
1740
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
511 get_le32(pb); // bucket-datasize
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
512 get_le32(pb); // init-bucket-fullness
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
513 get_le32(pb); // alt-leak-datarate
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
514 get_le32(pb); // alt-bucket-datasize
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
515 get_le32(pb); // alt-init-bucket-fullness
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
516 get_le32(pb); // max-object-size
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
517 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
518 stream_num = get_le16(pb); // stream-num
4924
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
519
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
520 stream_languageid_index = get_le16(pb); // stream-language-id-index
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
521 if (stream_num < 128)
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
522 asf->streams[stream_num].stream_language_index = stream_languageid_index;
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
523
1740
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
524 get_le64(pb); // avg frametime in 100ns units
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
525 stream_ct = get_le16(pb); //stream-name-count
5ebac013d792 stealing a few field names from mplayers asf demuxer
michael
parents: 1722
diff changeset
526 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
527
2064
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
528 if (stream_num < 128)
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
529 bitrate[stream_num] = leak_rate;
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
530
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
531 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
532 get_le16(pb);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
533 ext_len = get_le16(pb);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
534 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
535 }
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
536
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
537 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
538 get_guid(pb, &g);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
539 ext_d=get_le16(pb);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
540 ext_len=get_le32(pb);
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
541 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
542 }
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
543
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
544 // 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
545 // if so the next iteration will pick it up
6167
7827c07e6813 Continue after guids in asf after which other guids are possible instead of skiping
michael
parents: 6060
diff changeset
546 continue;
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
547 } else if (!guidcmp(&g, &ff_asf_head1_guid)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
548 int v1, v2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
549 get_guid(pb, &g);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
550 v1 = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
551 v2 = get_le16(pb);
6167
7827c07e6813 Continue after guids in asf after which other guids are possible instead of skiping
michael
parents: 6060
diff changeset
552 continue;
5778
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
553 } else if (!guidcmp(&g, &ff_asf_marker_header)) {
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
554 int i, count, name_len;
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
555 char name[1024];
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
556
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
557 get_le64(pb); // reserved 16 bytes
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
558 get_le64(pb); // ...
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
559 count = get_le32(pb); // markers count
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
560 get_le16(pb); // reserved 2 bytes
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
561 name_len = get_le16(pb); // name length
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
562 for(i=0;i<name_len;i++){
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
563 get_byte(pb); // skip the name
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
564 }
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
565
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
566 for(i=0;i<count;i++){
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
567 int64_t pres_time;
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
568 int name_len;
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
569
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
570 get_le64(pb); // offset, 8 bytes
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
571 pres_time = get_le64(pb); // presentation time
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
572 get_le16(pb); // entry length
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
573 get_le32(pb); // send time
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
574 get_le32(pb); // flags
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
575 name_len = get_le32(pb); // name length
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
576 get_str16_nolen(pb, name_len * 2, name, sizeof(name));
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
577 ff_new_chapter(s, i, (AVRational){1, 10000000}, pres_time, AV_NOPTS_VALUE, name );
e3ec6991698b Use ASF supports "markers" which are a name and a time stamp to create
benoit
parents: 5718
diff changeset
578 }
904
5d3dc3a6bbe7 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents: 896
diff changeset
579 #if 0
4747
0ad594176680 Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents: 4743
diff changeset
580 } else if (!guidcmp(&g, &ff_asf_codec_comment_header)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
581 int len, v1, n, num;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
582 char str[256], *q;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
583 char tag[16];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
584
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
585 get_guid(pb, &g);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
586 print_guid(&g);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
587
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
588 n = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
589 for(i=0;i<n;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
590 num = get_le16(pb); /* stream number */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
591 get_str16(pb, str, sizeof(str));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
592 get_str16(pb, str, sizeof(str));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
593 len = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
594 q = tag;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
595 while (len > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
596 v1 = get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
597 if ((q - tag) < sizeof(tag) - 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
598 *q++ = v1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
599 len--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
600 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
601 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
602 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
603 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
604 } else if (url_feof(pb)) {
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
605 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
606 } else {
5273
f292b3e34823 Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents: 5153
diff changeset
607 if (!s->keylen) {
f292b3e34823 Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents: 5153
diff changeset
608 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
609 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
610 } 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
611 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
612 } 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
613 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
614 }
f292b3e34823 Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents: 5153
diff changeset
615 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
616 }
5995
74e41ed8fb26 Favor chunk size over hitting the correct position after reading the chunk size in asf.
michael
parents: 5982
diff changeset
617 if(url_ftell(pb) != gpos + gsize)
74e41ed8fb26 Favor chunk size over hitting the correct position after reading the chunk size in asf.
michael
parents: 5982
diff changeset
618 av_log(s, AV_LOG_DEBUG, "gpos mismatch our pos=%"PRIu64", end=%"PRIu64"\n", url_ftell(pb)-gpos, gsize);
74e41ed8fb26 Favor chunk size over hitting the correct position after reading the chunk size in asf.
michael
parents: 5982
diff changeset
619 url_fseek(pb, gpos + gsize, SEEK_SET);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
620 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
621 get_guid(pb, &g);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
622 get_le64(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
623 get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
624 get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
625 if (url_feof(pb))
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
626 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
627 asf->data_offset = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
628 asf->packet_size_left = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
629
1750
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
630
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
631 for(i=0; i<128; i++){
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
632 int stream_num= asf->asfid2avid[i];
2064
ebc45cc020b7 use asf stream information to set bitrate
benoit
parents: 2023
diff changeset
633 if(stream_num>=0){
3759
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3578
diff changeset
634 AVStream *st = s->streams[stream_num];
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3578
diff changeset
635 if (!st->codec->bit_rate)
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3578
diff changeset
636 st->codec->bit_rate = bitrate[i];
6481
123ebc5da327 Fix aspect ratio for files that have it stored in
cehoyos
parents: 6287
diff changeset
637 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
638 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
639 &st->sample_aspect_ratio.den,
2069
42d459116315 cosmetics: Fix indentation after last commit, patch by Zuxy Meng.
diego
parents: 2064
diff changeset
640 dar[i].num, dar[i].den, INT_MAX);
6481
123ebc5da327 Fix aspect ratio for files that have it stored in
cehoyos
parents: 6287
diff changeset
641 } else if ((dar[0].num > 0) && (dar[0].den > 0) && (st->codec->codec_type==CODEC_TYPE_VIDEO)) // Use ASF container value if the stream doesn't AR set.
123ebc5da327 Fix aspect ratio for files that have it stored in
cehoyos
parents: 6287
diff changeset
642 av_reduce(&st->sample_aspect_ratio.num,
123ebc5da327 Fix aspect ratio for files that have it stored in
cehoyos
parents: 6287
diff changeset
643 &st->sample_aspect_ratio.den,
123ebc5da327 Fix aspect ratio for files that have it stored in
cehoyos
parents: 6287
diff changeset
644 dar[0].num, dar[0].den, INT_MAX);
123ebc5da327 Fix aspect ratio for files that have it stored in
cehoyos
parents: 6287
diff changeset
645
123ebc5da327 Fix aspect ratio for files that have it stored in
cehoyos
parents: 6287
diff changeset
646 //av_log(s, AV_LOG_INFO, "i=%d, st->codec->codec_type:%d, dar %d:%d sar=%d:%d\n", i, st->codec->codec_type, 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
647
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
648 // copy and convert language codes to the frontend
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
649 if (asf->streams[i].stream_language_index < 128) {
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
650 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
651 if (rfc1766 && strlen(rfc1766) > 1) {
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
652 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
653 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
654 if (iso6392)
5982
f74198942337 Mark av_metadata_set() as deprecated, and use av_metadata_set2()
stefano
parents: 5913
diff changeset
655 av_metadata_set2(&st->metadata, "language", iso6392, 0);
4924
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
656 }
c090f960fc8a Per-stream language-tags extraction in asfdec.
benoit
parents: 4896
diff changeset
657 }
1750
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
658 }
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
659 }
ea10bb05b839 extract aspect ratio
michael
parents: 1744
diff changeset
660
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
661 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
662 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
663
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
664 #define DO_2BITS(bits, var, defval) \
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
665 switch (bits & 3) \
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
666 { \
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
667 case 3: var = get_le32(pb); rsize += 4; break; \
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
668 case 2: var = get_le16(pb); rsize += 2; break; \
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
669 case 1: var = get_byte(pb); rsize++; break; \
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
670 default: var = defval; break; \
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
671 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
672
5011
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
673 /**
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
674 * 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
675 * @param s demux context
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
676 * @param pb context to read data from
5909
b8041f85c327 Replace @returns by @return.
benoit
parents: 5778
diff changeset
677 * @return 0 on success, <0 on error
5011
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
678 */
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
679 static int ff_asf_get_packet(AVFormatContext *s, ByteIOContext *pb)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
680 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
681 ASFContext *asf = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
682 uint32_t packet_length, padsize;
1967
8c20d8c19e1f fix demuxing of IMAG0002.ASF
michael
parents: 1958
diff changeset
683 int rsize = 8;
1722
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
684 int c, d, e, off;
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
685
5085
878651429ae5 Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.
reimar
parents: 5067
diff changeset
686 // 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
687 off= 32768;
878651429ae5 Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.
reimar
parents: 5067
diff changeset
688 if (s->packet_size > 0)
5086
5e6156776ee2 Fix indentation
reimar
parents: 5085
diff changeset
689 off= (url_ftell(pb) - s->data_offset) % s->packet_size + 3;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
690
1722
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
691 c=d=e=-1;
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
692 while(off-- > 0){
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
693 c=d; d=e;
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
694 e= get_byte(pb);
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
695 if(c == 0x82 && !d && !e)
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
696 break;
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
697 }
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
698
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
699 if (c != 0x82) {
5109
293c03f0d47f Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents: 5108
diff changeset
700 /**
293c03f0d47f Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents: 5108
diff changeset
701 * 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
702 * 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
703 * 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
704 * the stream.
293c03f0d47f Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents: 5108
diff changeset
705 */
293c03f0d47f Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents: 5108
diff changeset
706 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
707 return AVERROR(EAGAIN);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
708 if (!url_feof(pb))
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
709 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
710 }
1967
8c20d8c19e1f fix demuxing of IMAG0002.ASF
michael
parents: 1958
diff changeset
711 if ((c & 0x8f) == 0x82) {
1722
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
712 if (d || e) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
713 if (!url_feof(pb))
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
714 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
715 return -1;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
716 }
1967
8c20d8c19e1f fix demuxing of IMAG0002.ASF
michael
parents: 1958
diff changeset
717 c= get_byte(pb);
1722
cb0dc6abf4d1 make the asf demuxer resistant against insertion/deletion errors
michael
parents: 1716
diff changeset
718 d= get_byte(pb);
1967
8c20d8c19e1f fix demuxing of IMAG0002.ASF
michael
parents: 1958
diff changeset
719 rsize+=3;
8c20d8c19e1f fix demuxing of IMAG0002.ASF
michael
parents: 1958
diff changeset
720 }else{
8c20d8c19e1f fix demuxing of IMAG0002.ASF
michael
parents: 1958
diff changeset
721 url_fseek(pb, -1, SEEK_CUR); //FIXME
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
722 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
723
1967
8c20d8c19e1f fix demuxing of IMAG0002.ASF
michael
parents: 1958
diff changeset
724 asf->packet_flags = c;
8c20d8c19e1f fix demuxing of IMAG0002.ASF
michael
parents: 1958
diff changeset
725 asf->packet_property = d;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
726
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
727 DO_2BITS(asf->packet_flags >> 5, packet_length, s->packet_size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
728 DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
729 DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
730
1333
a95c384900ab prevent infinite loop with VORC012.WMA
michael
parents: 1332
diff changeset
731 //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
732 if(!packet_length || packet_length >= (1U<<29)){
1333
a95c384900ab prevent infinite loop with VORC012.WMA
michael
parents: 1332
diff changeset
733 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
734 return -1;
1333
a95c384900ab prevent infinite loop with VORC012.WMA
michael
parents: 1332
diff changeset
735 }
1715
f8c5d2c076d5 better padsize check
michael
parents: 1714
diff changeset
736 if(padsize >= packet_length){
1333
a95c384900ab prevent infinite loop with VORC012.WMA
michael
parents: 1332
diff changeset
737 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
738 return -1;
1333
a95c384900ab prevent infinite loop with VORC012.WMA
michael
parents: 1332
diff changeset
739 }
a95c384900ab prevent infinite loop with VORC012.WMA
michael
parents: 1332
diff changeset
740
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
741 asf->packet_timestamp = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
742 get_le16(pb); /* duration */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
743 // rsize has at least 11 bytes which have to be present
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
744
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
745 if (asf->packet_flags & 0x01) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
746 asf->packet_segsizetype = get_byte(pb); rsize++;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
747 asf->packet_segments = asf->packet_segsizetype & 0x3f;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
748 } else {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
749 asf->packet_segments = 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
750 asf->packet_segsizetype = 0x80;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
751 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
752 asf->packet_size_left = packet_length - padsize - rsize;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
753 if (packet_length < asf->hdr.min_pktsize)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
754 padsize += asf->hdr.min_pktsize - packet_length;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
755 asf->packet_padsize = padsize;
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
756 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
757 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
758 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
759
1708
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
760 /**
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
761 *
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
762 * @return <0 if error
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
763 */
4120
a22587bda6cf Add a ByteIOContext argument to ASF functions that will be shared with the
rbultje
parents: 4095
diff changeset
764 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
765 ASFContext *asf = s->priv_data;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
766 int rsize = 1;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
767 int num = get_byte(pb);
1776
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
768 int64_t ts0, ts1;
1708
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
769
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
770 asf->packet_segments--;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
771 asf->packet_key_frame = num >> 7;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
772 asf->stream_index = asf->asfid2avid[num & 0x7f];
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
773 // sequence should be ignored!
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
774 DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0);
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
775 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
776 DO_2BITS(asf->packet_property, asf->packet_replic_size, 0);
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
777 //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
778 if (asf->packet_replic_size >= 8) {
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
779 asf->packet_obj_size = get_le32(pb);
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
780 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
781 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
782 return -1;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
783 }
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
784 asf->packet_frag_timestamp = get_le32(pb); // timestamp
1776
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
785 if(asf->packet_replic_size >= 8+38+4){
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
786 // for(i=0; i<asf->packet_replic_size-8; i++)
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
787 // av_log(s, AV_LOG_DEBUG, "%02X ",get_byte(pb));
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
788 // av_log(s, AV_LOG_DEBUG, "\n");
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
789 url_fskip(pb, 10);
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
790 ts0= get_le64(pb);
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
791 ts1= get_le64(pb);
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
792 url_fskip(pb, 12);
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
793 get_le32(pb);
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
794 url_fskip(pb, asf->packet_replic_size - 8 - 38 - 4);
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
795 if(ts0!= -1) asf->packet_frag_timestamp= ts0/10000;
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
796 else asf->packet_frag_timestamp= AV_NOPTS_VALUE;
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
797 }else
b090df664f0d use dvr-ms timestamps
michael
parents: 1752
diff changeset
798 url_fskip(pb, asf->packet_replic_size - 8);
1708
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
799 rsize += asf->packet_replic_size; // FIXME - check validity
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
800 } else if (asf->packet_replic_size==1){
2855
46729b573b25 begining -> beginning typo fix
reimar
parents: 2843
diff changeset
801 // multipacket - frag_offset is beginning timestamp
1708
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
802 asf->packet_time_start = asf->packet_frag_offset;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
803 asf->packet_frag_offset = 0;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
804 asf->packet_frag_timestamp = asf->packet_timestamp;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
805
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
806 asf->packet_time_delta = get_byte(pb);
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
807 rsize++;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
808 }else if(asf->packet_replic_size!=0){
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
809 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
810 return -1;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
811 }
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
812 if (asf->packet_flags & 0x01) {
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
813 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
814 if(asf->packet_frag_size > asf->packet_size_left - rsize){
fdeab224942d check to detect nonsense fragment size
michael
parents: 1711
diff changeset
815 av_log(s, AV_LOG_ERROR, "packet_frag_size is invalid\n");
fdeab224942d check to detect nonsense fragment size
michael
parents: 1711
diff changeset
816 return -1;
fdeab224942d check to detect nonsense fragment size
michael
parents: 1711
diff changeset
817 }
1708
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
818 //printf("Fragsize %d\n", asf->packet_frag_size);
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
819 } else {
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
820 asf->packet_frag_size = asf->packet_size_left - rsize;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
821 //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
822 }
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
823 if (asf->packet_replic_size == 1) {
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
824 asf->packet_multi_size = asf->packet_frag_size;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
825 if (asf->packet_multi_size > asf->packet_size_left)
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
826 return -1;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
827 }
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
828 asf->packet_size_left -= rsize;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
829 //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
830
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
831 return 0;
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
832 }
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
833
5011
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
834 /**
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
835 * 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
836 * with asf_get_packet()).
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
837 * @param s demux context
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
838 * @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
839 * @param pkt pointer to store packet data into
5909
b8041f85c327 Replace @returns by @return.
benoit
parents: 5778
diff changeset
840 * @return 0 if data was stored in pkt, <0 on error or 1 if more ASF
5011
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
841 * 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
842 */
5cf7e033989d Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents: 4955
diff changeset
843 static int ff_asf_parse_packet(AVFormatContext *s, ByteIOContext *pb, AVPacket *pkt)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
844 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
845 ASFContext *asf = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
846 ASFStream *asf_st = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
847 for (;;) {
1713
e48ab5187493 replace wrong return 0 by -1
michael
parents: 1712
diff changeset
848 if(url_feof(pb))
4879
42e183e59515 Replace AVERROR(EIO) by AVERROR_EOF on end-of-file. See mailinglist
rbultje
parents: 4797
diff changeset
849 return AVERROR_EOF;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
850 if (asf->packet_size_left < FRAME_HEADER_SIZE
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
851 || asf->packet_segments < 1) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
852 //asf->packet_size_left <= asf->packet_padsize) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
853 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
854 //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
855 assert(ret>=0);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
856 /* fail safe */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
857 url_fskip(pb, ret);
1707
7e12a19c140f more correct packet alignment check and correction
michael
parents: 1706
diff changeset
858
4066
10f7232a3545 Do not access s->gb directly in functions that have a local copy of that
rbultje
parents: 4058
diff changeset
859 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
860 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
861 (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
862 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
863 return 1;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
864 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
865 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
866 if(asf_read_frame_header(s, pb) < 0){
1708
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
867 asf->packet_segments= 0;
1696
fdea5fc3362f get rid of a few idiotic asserts()
michael
parents: 1695
diff changeset
868 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
869 }
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
870 if (asf->stream_index < 0
708
d79164865a7c more fine grained discarding of packets
michael
parents: 652
diff changeset
871 || s->streams[asf->stream_index]->discard >= AVDISCARD_ALL
d79164865a7c more fine grained discarding of packets
michael
parents: 652
diff changeset
872 || (!asf->packet_key_frame && s->streams[asf->stream_index]->discard >= AVDISCARD_NONKEY)
d79164865a7c more fine grained discarding of packets
michael
parents: 652
diff changeset
873 ) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
874 asf->packet_time_start = 0;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
875 /* unhandled packet (should not happen) */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
876 url_fskip(pb, asf->packet_frag_size);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
877 asf->packet_size_left -= asf->packet_frag_size;
652
b47948262721 support discarding uninterresting packets
michael
parents: 643
diff changeset
878 if(asf->stream_index < 0)
1708
2c4d5a3fbab1 move frame header reading into its own function
michael
parents: 1707
diff changeset
879 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
880 continue;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
881 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
882 asf->asf_st = s->streams[asf->stream_index]->priv_data;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
883 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
884 asf_st = asf->asf_st;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
885
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
886 if (asf->packet_replic_size == 1) {
2855
46729b573b25 begining -> beginning typo fix
reimar
parents: 2843
diff changeset
887 // frag_offset is here used as the beginning timestamp
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
888 asf->packet_frag_timestamp = asf->packet_time_start;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
889 asf->packet_time_start += asf->packet_time_delta;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
890 asf->packet_obj_size = asf->packet_frag_size = get_byte(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
891 asf->packet_size_left--;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
892 asf->packet_multi_size--;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
893 if (asf->packet_multi_size < asf->packet_obj_size)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
894 {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
895 asf->packet_time_start = 0;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
896 url_fskip(pb, asf->packet_multi_size);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
897 asf->packet_size_left -= asf->packet_multi_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
898 continue;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
899 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
900 asf->packet_multi_size -= asf->packet_obj_size;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
901 //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
902 }
2285
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
903 if( /*asf->packet_frag_size == asf->packet_obj_size*/
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
904 asf_st->frag_offset + asf->packet_frag_size <= asf_st->pkt.size
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
905 && asf_st->frag_offset + asf->packet_frag_size > asf->packet_obj_size){
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
906 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
907 asf_st->frag_offset, asf->packet_frag_size,
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
908 asf->packet_obj_size, asf_st->pkt.size);
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
909 asf->packet_obj_size= asf_st->pkt.size;
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
910 }
a36b77f40ee2 ignore invalid packet_obj_size
michael
parents: 2274
diff changeset
911
1744
1f8dc697cb11 fix seeking in wma
michael
parents: 1740
diff changeset
912 if ( asf_st->pkt.size != asf->packet_obj_size
1f8dc697cb11 fix seeking in wma
michael
parents: 1740
diff changeset
913 || 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
914 if(asf_st->pkt.data){
33a16d903dcc replace nonsense code by something which makes at least some sense
michael
parents: 1709
diff changeset
915 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
916 asf_st->frag_offset = 0;
33a16d903dcc replace nonsense code by something which makes at least some sense
michael
parents: 1709
diff changeset
917 av_free_packet(&asf_st->pkt);
33a16d903dcc replace nonsense code by something which makes at least some sense
michael
parents: 1709
diff changeset
918 }
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
919 /* new packet */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
920 av_new_packet(&asf_st->pkt, asf->packet_obj_size);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
921 asf_st->seq = asf->packet_seq;
4022
9be14682f7b3 timestamp is dts in wmv/asf
bcoudurier
parents: 3967
diff changeset
922 asf_st->pkt.dts = asf->packet_frag_timestamp;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
923 asf_st->pkt.stream_index = asf->stream_index;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
924 asf_st->pkt.pos =
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
925 asf_st->packet_pos= asf->packet_pos;
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
926 //printf("new packet: stream:%d key:%d packet_key:%d audio:%d size:%d\n",
5913
11bb10c37225 Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents: 5910
diff changeset
927 //asf->stream_index, asf->packet_key_frame, asf_st->pkt.flags & AV_PKT_FLAG_KEY,
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5909
diff changeset
928 //s->streams[asf->stream_index]->codec->codec_type == AVMEDIA_TYPE_AUDIO, asf->packet_obj_size);
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5909
diff changeset
929 if (s->streams[asf->stream_index]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
930 asf->packet_key_frame = 1;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
931 if (asf->packet_key_frame)
5913
11bb10c37225 Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents: 5910
diff changeset
932 asf_st->pkt.flags |= AV_PKT_FLAG_KEY;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
933 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
934
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
935 /* read data */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
936 //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
937 // s->packet_size, asf_st->pkt.size, asf->packet_frag_offset,
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
938 // asf_st->frag_offset, asf->packet_frag_size, asf_st->pkt.data);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
939 asf->packet_size_left -= asf->packet_frag_size;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
940 if (asf->packet_size_left < 0)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
941 continue;
1709
7331d7153e0a check fragment offset and size
michael
parents: 1708
diff changeset
942
7331d7153e0a check fragment offset and size
michael
parents: 1708
diff changeset
943 if( asf->packet_frag_offset >= asf_st->pkt.size
7331d7153e0a check fragment offset and size
michael
parents: 1708
diff changeset
944 || asf->packet_frag_size > asf_st->pkt.size - asf->packet_frag_offset){
7331d7153e0a check fragment offset and size
michael
parents: 1708
diff changeset
945 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
946 asf->packet_frag_offset, asf->packet_frag_size, asf_st->pkt.size);
7331d7153e0a check fragment offset and size
michael
parents: 1708
diff changeset
947 continue;
7331d7153e0a check fragment offset and size
michael
parents: 1708
diff changeset
948 }
7331d7153e0a check fragment offset and size
michael
parents: 1708
diff changeset
949
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
950 get_buffer(pb, asf_st->pkt.data + asf->packet_frag_offset,
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
951 asf->packet_frag_size);
2652
2d28b2a5b2e4 Add support for decrypting asf files
reimar
parents: 2603
diff changeset
952 if (s->key && s->keylen == 20)
2d28b2a5b2e4 Add support for decrypting asf files
reimar
parents: 2603
diff changeset
953 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
954 asf->packet_frag_size);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
955 asf_st->frag_offset += asf->packet_frag_size;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
956 /* test if whole packet is read */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
957 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
958 //workaround for macroshit radio DVR-MS files
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
959 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
960 && asf_st->pkt.size > 100){
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
961 int i;
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
962 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
963 if(i == asf_st->pkt.size){
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
964 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
965 asf_st->frag_offset = 0;
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
966 av_free_packet(&asf_st->pkt);
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
967 continue;
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
968 }
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
969 }
1a2f353ac291 workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents: 2392
diff changeset
970
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
971 /* return packet */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
972 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
973 if(asf_st->pkt.size != asf_st->ds_packet_size * asf_st->ds_span){
2319
4b2f8d27c8ba more verbose error
michael
parents: 2318
diff changeset
974 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
975 }else{
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
976 /* packet descrambling */
1332
7474cc6383d4 fix some signedness warnings
mru
parents: 1266
diff changeset
977 uint8_t *newdata = av_malloc(asf_st->pkt.size);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
978 if (newdata) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
979 int offset = 0;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
980 while (offset < asf_st->pkt.size) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
981 int off = offset / asf_st->ds_chunk_size;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
982 int row = off / asf_st->ds_span;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
983 int col = off % asf_st->ds_span;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
984 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
985 //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
986
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
987 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
988 assert(idx+1 <= asf_st->pkt.size / asf_st->ds_chunk_size);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
989 memcpy(newdata + offset,
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
990 asf_st->pkt.data + idx * asf_st->ds_chunk_size,
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
991 asf_st->ds_chunk_size);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
992 offset += asf_st->ds_chunk_size;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
993 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
994 av_free(asf_st->pkt.data);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
995 asf_st->pkt.data = newdata;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
996 }
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
997 }
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
998 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
999 asf_st->frag_offset = 0;
1699
b959208ba904 cosmetic
michael
parents: 1697
diff changeset
1000 *pkt= asf_st->pkt;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1001 //printf("packet %d %d\n", asf_st->pkt.size, asf->packet_frag_size);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1002 asf_st->pkt.size = 0;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1003 asf_st->pkt.data = 0;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1004 break; // packet completed
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1005 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1006 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1007 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1008 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1009
4095
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
1010 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
1011 {
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
1012 ASFContext *asf = s->priv_data;
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
1013
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
1014 for (;;) {
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
1015 int ret;
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
1016
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
1017 /* 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
1018 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
1019 return ret;
4121
55e94f2a8ac1 Make asf_get_packet() and asf_parse_packet() public for use in RTSP-MS and
rbultje
parents: 4120
diff changeset
1020 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
1021 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
1022 asf->packet_time_start = 0;
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
1023 }
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
1024
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
1025 return 0;
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
1026 }
27f4b31bc790 Separate the packet fetching from the data reading, so that the data reading
rbultje
parents: 4068
diff changeset
1027
347
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1028 // 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
1029 // 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
1030 // 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
1031 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
1032 {
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1033 ASFContext *asf = s->priv_data;
349
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1034 ASFStream *asf_st;
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1035 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
1036
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1037 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
1038 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
1039 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
1040 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
1041 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
1042 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
1043 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
1044 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
1045 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
1046 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
1047 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
1048 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
1049 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
1050 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
1051 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
1052 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
1053 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
1054 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
1055 asf->packet_time_start = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1056
349
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1057 for(i=0; i<s->nb_streams; i++){
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1058 asf_st= s->streams[i]->priv_data;
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1059 av_free_packet(&asf_st->pkt);
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1060 asf_st->frag_offset=0;
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1061 asf_st->seq=0;
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1062 }
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1063 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
1064 }
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1065
2603
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
1066 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
1067 {
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
1068 int i;
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
1069
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
1070 asf_reset_header(s);
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
1071 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
1072 AVStream *st = s->streams[i];
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
1073 av_free(st->codec->palctrl);
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
1074 }
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
1075 return 0;
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
1076 }
4a3957734e85 cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents: 2599
diff changeset
1077
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 373
diff changeset
1078 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
1079 {
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1080 AVPacket pkt1, *pkt = &pkt1;
349
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1081 ASFStream *asf_st;
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1082 int64_t pts;
348
ca519d041ea1 memleak fix
michael
parents: 347
diff changeset
1083 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
1084 int i;
6171
240beb8a3072 asfdec: ensure number of streams is within bounds; remove VLA in asf_read_pts()
mru
parents: 6167
diff changeset
1085 int64_t start_pos[ASF_MAX_STREAMS];
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1086
354
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1087 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
1088 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
1089 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1090
5085
878651429ae5 Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.
reimar
parents: 5067
diff changeset
1091 if (s->packet_size > 0)
5086
5e6156776ee2 Fix indentation
reimar
parents: 5085
diff changeset
1092 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
1093 *ppos= pos;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1094 url_fseek(s->pb, pos, SEEK_SET);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1095
349
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1096 //printf("asf_read_pts\n");
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1097 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
1098 for(;;){
349
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1099 if (av_read_frame(s, pkt) < 0){
1714
ff33c20963ec more correct error message
michael
parents: 1713
diff changeset
1100 av_log(s, AV_LOG_INFO, "asf_read_pts failed\n");
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
1101 return AV_NOPTS_VALUE;
349
2bed194f8362 seeking fixes
michael
parents: 348
diff changeset
1102 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1103
991
30b54c043135 timebase fix
michael
parents: 979
diff changeset
1104 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
1105
348
ca519d041ea1 memleak fix
michael
parents: 347
diff changeset
1106 av_free_packet(pkt);
5913
11bb10c37225 Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents: 5910
diff changeset
1107 if(pkt->flags&AV_PKT_FLAG_KEY){
354
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1108 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
1109
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1110 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
1111
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
1112 // 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
1113 pos= asf_st->packet_pos;
351
c072833fe7f4 use packet number instead of byte number internally for seeking
michael
parents: 350
diff changeset
1114
1266
5b9729f5145c fix fallback if theres no index
michael
parents: 1265
diff changeset
1115 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
1116 start_pos[i]= asf_st->packet_pos + 1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1117
354
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1118 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
1119 break;
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1120 }
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1121 }
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1122
6770ca07abe2 store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents: 353
diff changeset
1123 *ppos= pos;
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1415
diff changeset
1124 //printf("found keyframe at %"PRId64" stream %d stamp:%"PRId64"\n", *ppos, stream_index, pts);
348
ca519d041ea1 memleak fix
michael
parents: 347
diff changeset
1125
ca519d041ea1 memleak fix
michael
parents: 347
diff changeset
1126 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
1127 }
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1128
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
1129 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
1130 {
4748
86dd0cab30d3 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents: 4747
diff changeset
1131 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
1132 ASFContext *asf = s->priv_data;
4882
8d9ce632a3e2 Moving variable declarations in asf_build_simple_index() to clarify&prettify code.
michael
parents: 4879
diff changeset
1133 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
1134 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
1135
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1136 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
1137 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
1138 if (!guidcmp(&g, &index_guid)) {
5467
09cb78a5b0e4 Only add 1 index entry per keyframe.
michael
parents: 5446
diff changeset
1139 int64_t itime, last_pos=-1;
4882
8d9ce632a3e2 Moving variable declarations in asf_build_simple_index() to clarify&prettify code.
michael
parents: 4879
diff changeset
1140 int pct, ict;
4896
7c3c541b421e Mark gsize variable as av_unused, fixes the warning:
diego
parents: 4895
diff changeset
1141 int64_t av_unused gsize= get_le64(s->pb);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1142 get_guid(s->pb, &g);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1143 itime=get_le64(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1144 pct=get_le32(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1145 ict=get_le32(s->pb);
4508
99c3000c9482 Add a context to av_log() calls.
benoit
parents: 4368
diff changeset
1146 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
1147
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
1148 for (i=0;i<ict;i++){
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1149 int pktnum=get_le32(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1150 int pktct =get_le16(s->pb);
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
1151 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
1152 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
1153
5467
09cb78a5b0e4 Only add 1 index entry per keyframe.
michael
parents: 5446
diff changeset
1154 if(pos != last_pos){
4882
8d9ce632a3e2 Moving variable declarations in asf_build_simple_index() to clarify&prettify code.
michael
parents: 4879
diff changeset
1155 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
1156 av_add_index_entry(s->streams[stream_index], pos, index_pts, s->packet_size, 0, AVINDEX_KEYFRAME);
5467
09cb78a5b0e4 Only add 1 index entry per keyframe.
michael
parents: 5446
diff changeset
1157 last_pos=pos;
09cb78a5b0e4 Only add 1 index entry per keyframe.
michael
parents: 5446
diff changeset
1158 }
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
1159 }
1266
5b9729f5145c fix fallback if theres no index
michael
parents: 1265
diff changeset
1160 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
1161 }
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1162 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
1163 }
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
1164
555
0a997108f384 use native timebase for seeking
michael
parents: 482
diff changeset
1165 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
1166 {
312
8a04d2e1be2f frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents: 300
diff changeset
1167 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
1168 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
1169 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
1170 int index;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 881
diff changeset
1171
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
1172 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
1173 return -1;
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1174
2827
f717dd23fc23 Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents: 2771
diff changeset
1175 /* Try using the protocol's read_seek if available */
2842
bc317b8d7090 remove double check of pb->read_seek
aurel
parents: 2827
diff changeset
1176 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
1177 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
1178 if(ret >= 0)
f717dd23fc23 Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents: 2771
diff changeset
1179 asf_reset_header(s);
2842
bc317b8d7090 remove double check of pb->read_seek
aurel
parents: 2827
diff changeset
1180 if (ret != AVERROR(ENOSYS))
2843
7a6b7595f933 cosmetics: indentation
aurel
parents: 2842
diff changeset
1181 return ret;
2827
f717dd23fc23 Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents: 2771
diff changeset
1182 }
f717dd23fc23 Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents: 2771
diff changeset
1183
1266
5b9729f5145c fix fallback if theres no index
michael
parents: 1265
diff changeset
1184 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
1185 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
1186
1266
5b9729f5145c fix fallback if theres no index
michael
parents: 1265
diff changeset
1187 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
1188 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
1189 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
1190 }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
1191 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
1192 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
1193 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
1194
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
1195 /* 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
1196 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
1197
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
1198 // 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
1199 // asf_reset_header(s);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1200 // 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
1201 // 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
1202 // for(i=0;i<16;i++){
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1203 // 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
1204 // 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
1205 // 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
1206 // 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
1207 // }
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
1208 // 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
1209 // 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
1210 //
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
1211 // 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
1212 // 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
1213 // 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
1214 // }
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
1215 //
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
1216 // 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
1217 // }
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
1218
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
1219 /* do the seek */
4508
99c3000c9482 Add a context to av_log() calls.
benoit
parents: 4368
diff changeset
1220 av_log(s, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2737
diff changeset
1221 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
1222 }
347
2b485a3c5cfb seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents: 341
diff changeset
1223 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
1224 return 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1225 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1226
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1227 AVInputFormat asf_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1228 "asf",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3286
diff changeset
1229 NULL_IF_CONFIG_SMALL("ASF format"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1230 sizeof(ASFContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1231 asf_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1232 asf_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1233 asf_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1234 asf_read_close,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1235 asf_read_seek,
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 373
diff changeset
1236 asf_read_pts,
4618
5b9eddbee9c4 Add some basic metadata conversion tables for matroska and asf.
aurel
parents: 4593
diff changeset
1237 .metadata_conv = ff_asf_metadata_conv,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1238 };