annotate asfenc.c @ 6142:bd851edc58ac libavformat

RTMP: Return from rtmp_read as soon as some data is available Earlier, the function only returned when the enough data to fill the requested buffer was available. This lead to high latency when receiving low-bandwidth streams.
author mstorsjo
date Fri, 18 Jun 2010 12:02:51 +0000
parents 11bb10c37225
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
3931
b1deda6b74c3 ASF stands for "advanced stream format" not "adaptive ...", changing it to "ASF".
michael
parents: 3766
diff changeset
2 * ASF muxer
4251
77e0c7511d41 cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents: 4206
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: 1345
diff changeset
5 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1345
diff changeset
6 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1345
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: 1345
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: 1345
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: 1345
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 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
21 #include "avformat.h"
4373
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
22 #include "metadata.h"
1172
6a5e58d2114b move common stuff from avienc.c and wav.c to new file riff.c
mru
parents: 1169
diff changeset
23 #include "riff.h"
372
2e12cd1b68ed split asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 370
diff changeset
24 #include "asf.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
25
348
ca519d041ea1 memleak fix
michael
parents: 347
diff changeset
26 #undef NDEBUG
ca519d041ea1 memleak fix
michael
parents: 347
diff changeset
27 #include <assert.h>
ca519d041ea1 memleak fix
michael
parents: 347
diff changeset
28
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
29
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
30 #define ASF_INDEXED_INTERVAL 10000000
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
31 #define ASF_INDEX_BLOCK 600
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
32
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
33 #define ASF_PACKET_ERROR_CORRECTION_DATA_SIZE 0x2
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
34 #define ASF_PACKET_ERROR_CORRECTION_FLAGS (\
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
35 ASF_PACKET_FLAG_ERROR_CORRECTION_PRESENT | \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
36 ASF_PACKET_ERROR_CORRECTION_DATA_SIZE\
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
37 )
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
38
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
39 #if (ASF_PACKET_ERROR_CORRECTION_FLAGS != 0)
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
40 # define ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE 1
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
41 #else
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
42 # define ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE 0
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
43 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
44
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
45 #define ASF_PPI_PROPERTY_FLAGS (\
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
46 ASF_PL_FLAG_REPLICATED_DATA_LENGTH_FIELD_IS_BYTE | \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
47 ASF_PL_FLAG_OFFSET_INTO_MEDIA_OBJECT_LENGTH_FIELD_IS_DWORD | \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
48 ASF_PL_FLAG_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_IS_BYTE | \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
49 ASF_PL_FLAG_STREAM_NUMBER_LENGTH_FIELD_IS_BYTE \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
50 )
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
51
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
52 #define ASF_PPI_LENGTH_TYPE_FLAGS 0
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
53
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
54 #define ASF_PAYLOAD_FLAGS ASF_PL_FLAG_PAYLOAD_LENGTH_FIELD_IS_WORD
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
55
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
56 #if (ASF_PPI_FLAG_SEQUENCE_FIELD_IS_BYTE == (ASF_PPI_LENGTH_TYPE_FLAGS & ASF_PPI_MASK_SEQUENCE_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
57 # define ASF_PPI_SEQUENCE_FIELD_SIZE 1
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
58 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
59 #if (ASF_PPI_FLAG_SEQUENCE_FIELD_IS_WORD == (ASF_PPI_LENGTH_TYPE_FLAGS & ASF_PPI_MASK_SEQUENCE_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
60 # define ASF_PPI_SEQUENCE_FIELD_SIZE 2
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
61 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
62 #if (ASF_PPI_FLAG_SEQUENCE_FIELD_IS_DWORD == (ASF_PPI_LENGTH_TYPE_FLAGS & ASF_PPI_MASK_SEQUENCE_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
63 # define ASF_PPI_SEQUENCE_FIELD_SIZE 4
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
64 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
65 #ifndef ASF_PPI_SEQUENCE_FIELD_SIZE
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
66 # define ASF_PPI_SEQUENCE_FIELD_SIZE 0
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
67 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
68
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
69
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
70 #if (ASF_PPI_FLAG_PACKET_LENGTH_FIELD_IS_BYTE == (ASF_PPI_LENGTH_TYPE_FLAGS & ASF_PPI_MASK_PACKET_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
71 # define ASF_PPI_PACKET_LENGTH_FIELD_SIZE 1
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
72 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
73 #if (ASF_PPI_FLAG_PACKET_LENGTH_FIELD_IS_WORD == (ASF_PPI_LENGTH_TYPE_FLAGS & ASF_PPI_MASK_PACKET_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
74 # define ASF_PPI_PACKET_LENGTH_FIELD_SIZE 2
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
75 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
76 #if (ASF_PPI_FLAG_PACKET_LENGTH_FIELD_IS_DWORD == (ASF_PPI_LENGTH_TYPE_FLAGS & ASF_PPI_MASK_PACKET_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
77 # define ASF_PPI_PACKET_LENGTH_FIELD_SIZE 4
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
78 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
79 #ifndef ASF_PPI_PACKET_LENGTH_FIELD_SIZE
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
80 # define ASF_PPI_PACKET_LENGTH_FIELD_SIZE 0
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
81 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
82
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
83 #if (ASF_PPI_FLAG_PADDING_LENGTH_FIELD_IS_BYTE == (ASF_PPI_LENGTH_TYPE_FLAGS & ASF_PPI_MASK_PADDING_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
84 # define ASF_PPI_PADDING_LENGTH_FIELD_SIZE 1
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
85 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
86 #if (ASF_PPI_FLAG_PADDING_LENGTH_FIELD_IS_WORD == (ASF_PPI_LENGTH_TYPE_FLAGS & ASF_PPI_MASK_PADDING_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
87 # define ASF_PPI_PADDING_LENGTH_FIELD_SIZE 2
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
88 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
89 #if (ASF_PPI_FLAG_PADDING_LENGTH_FIELD_IS_DWORD == (ASF_PPI_LENGTH_TYPE_FLAGS & ASF_PPI_MASK_PADDING_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
90 # define ASF_PPI_PADDING_LENGTH_FIELD_SIZE 4
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
91 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
92 #ifndef ASF_PPI_PADDING_LENGTH_FIELD_SIZE
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
93 # define ASF_PPI_PADDING_LENGTH_FIELD_SIZE 0
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
94 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
95
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
96 #if (ASF_PL_FLAG_REPLICATED_DATA_LENGTH_FIELD_IS_BYTE == (ASF_PPI_PROPERTY_FLAGS & ASF_PL_MASK_REPLICATED_DATA_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
97 # define ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE 1
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
98 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
99 #if (ASF_PL_FLAG_REPLICATED_DATA_LENGTH_FIELD_IS_WORD == (ASF_PPI_PROPERTY_FLAGS & ASF_PL_MASK_REPLICATED_DATA_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
100 # define ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE 2
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
101 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
102 #if (ASF_PL_FLAG_REPLICATED_DATA_LENGTH_FIELD_IS_DWORD == (ASF_PPI_PROPERTY_FLAGS & ASF_PL_MASK_REPLICATED_DATA_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
103 # define ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE 4
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
104 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
105 #ifndef ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
106 # define ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE 0
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
107 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
108
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
109 #if (ASF_PL_FLAG_OFFSET_INTO_MEDIA_OBJECT_LENGTH_FIELD_IS_BYTE == (ASF_PPI_PROPERTY_FLAGS & ASF_PL_MASK_OFFSET_INTO_MEDIA_OBJECT_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
110 # define ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE 1
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
111 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
112 #if (ASF_PL_FLAG_OFFSET_INTO_MEDIA_OBJECT_LENGTH_FIELD_IS_WORD == (ASF_PPI_PROPERTY_FLAGS & ASF_PL_MASK_OFFSET_INTO_MEDIA_OBJECT_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
113 # define ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE 2
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
114 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
115 #if (ASF_PL_FLAG_OFFSET_INTO_MEDIA_OBJECT_LENGTH_FIELD_IS_DWORD == (ASF_PPI_PROPERTY_FLAGS & ASF_PL_MASK_OFFSET_INTO_MEDIA_OBJECT_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
116 # define ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE 4
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
117 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
118 #ifndef ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
119 # define ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE 0
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
120 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
121
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
122 #if (ASF_PL_FLAG_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_IS_BYTE == (ASF_PPI_PROPERTY_FLAGS & ASF_PL_MASK_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
123 # define ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE 1
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
124 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
125 #if (ASF_PL_FLAG_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_IS_WORD == (ASF_PPI_PROPERTY_FLAGS & ASF_PL_MASK_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
126 # define ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE 2
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
127 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
128 #if (ASF_PL_FLAG_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_IS_DWORD == (ASF_PPI_PROPERTY_FLAGS & ASF_PL_MASK_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
129 # define ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE 4
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
130 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
131 #ifndef ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
132 # define ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE 0
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
133 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
134
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
135 #if (ASF_PL_FLAG_PAYLOAD_LENGTH_FIELD_IS_BYTE == (ASF_PAYLOAD_FLAGS & ASF_PL_MASK_PAYLOAD_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
136 # define ASF_PAYLOAD_LENGTH_FIELD_SIZE 1
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
137 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
138 #if (ASF_PL_FLAG_PAYLOAD_LENGTH_FIELD_IS_WORD == (ASF_PAYLOAD_FLAGS & ASF_PL_MASK_PAYLOAD_LENGTH_FIELD_SIZE))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
139 # define ASF_PAYLOAD_LENGTH_FIELD_SIZE 2
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
140 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
141 #ifndef ASF_PAYLOAD_LENGTH_FIELD_SIZE
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
142 # define ASF_PAYLOAD_LENGTH_FIELD_SIZE 0
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
143 #endif
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
144
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
145 #define PACKET_HEADER_MIN_SIZE (\
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
146 ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE + \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
147 ASF_PACKET_ERROR_CORRECTION_DATA_SIZE + \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
148 1 + /*Length Type Flags*/ \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
149 1 + /*Property Flags*/ \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
150 ASF_PPI_PACKET_LENGTH_FIELD_SIZE + \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
151 ASF_PPI_SEQUENCE_FIELD_SIZE + \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
152 ASF_PPI_PADDING_LENGTH_FIELD_SIZE + \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
153 4 + /*Send Time Field*/ \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
154 2 /*Duration Field*/ \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
155 )
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
156
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
157
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
158 // Replicated Data shall be at least 8 bytes long.
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
159 #define ASF_PAYLOAD_REPLICATED_DATA_LENGTH 0x08
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
160
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
161 #define PAYLOAD_HEADER_SIZE_SINGLE_PAYLOAD (\
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
162 1 + /*Stream Number*/ \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
163 ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE + \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
164 ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE + \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
165 ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE + \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
166 ASF_PAYLOAD_REPLICATED_DATA_LENGTH \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
167 )
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
168
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
169 #define PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS (\
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
170 1 + /*Stream Number*/ \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
171 ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE + \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
172 ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE + \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
173 ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE + \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
174 ASF_PAYLOAD_REPLICATED_DATA_LENGTH + \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
175 ASF_PAYLOAD_LENGTH_FIELD_SIZE \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
176 )
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
177
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
178 #define SINGLE_PAYLOAD_DATA_LENGTH (\
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
179 PACKET_SIZE - \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
180 PACKET_HEADER_MIN_SIZE - \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
181 PAYLOAD_HEADER_SIZE_SINGLE_PAYLOAD \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
182 )
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
183
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
184 #define MULTI_PAYLOAD_CONSTANT (\
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
185 PACKET_SIZE - \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
186 PACKET_HEADER_MIN_SIZE - \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
187 1 - /*Payload Flags*/ \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
188 2*PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS \
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
189 )
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
190
1677
2a85c82b8538 add codec_id <-> codec_tag tables to AVIn/OutputFormat
michael
parents: 1622
diff changeset
191 static const AVCodecTag codec_asf_bmp_tags[] = {
2a85c82b8538 add codec_id <-> codec_tag tables to AVIn/OutputFormat
michael
parents: 1622
diff changeset
192 { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') },
2a85c82b8538 add codec_id <-> codec_tag tables to AVIn/OutputFormat
michael
parents: 1622
diff changeset
193 { CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') },
2a85c82b8538 add codec_id <-> codec_tag tables to AVIn/OutputFormat
michael
parents: 1622
diff changeset
194 { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
2a85c82b8538 add codec_id <-> codec_tag tables to AVIn/OutputFormat
michael
parents: 1622
diff changeset
195 { CODEC_ID_NONE, 0 },
2a85c82b8538 add codec_id <-> codec_tag tables to AVIn/OutputFormat
michael
parents: 1622
diff changeset
196 };
2a85c82b8538 add codec_id <-> codec_tag tables to AVIn/OutputFormat
michael
parents: 1622
diff changeset
197
1887
490aa34aef0f move preroll_time from static variable into definition, might be a good idea moving this into the context and making user-settable
alex
parents: 1880
diff changeset
198 #define PREROLL_TIME 3100
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
199
4748
86dd0cab30d3 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents: 4618
diff changeset
200 static void put_guid(ByteIOContext *s, const ff_asf_guid *g)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
201 {
1687
39cafa2f6060 simplify GUIDs
michael
parents: 1686
diff changeset
202 assert(sizeof(*g) == 16);
2991
4591452ec78c typo, typedef uint8_t GUID[16] in asf.h, and fix warning: asf-enc.c:202: warning: passing argument 2 of 'put_buffer' from incompatible pointer type
bcoudurier
parents: 2801
diff changeset
203 put_buffer(s, *g, sizeof(*g));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
204 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
205
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
206 static void put_str16(ByteIOContext *s, const char *tag)
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
207 {
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
208 int len;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
209 uint8_t *pb;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
210 ByteIOContext *dyn_buf;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
211 if (url_open_dyn_buf(&dyn_buf) < 0)
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
212 return;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
213
5876
2c0f0162a110 Move put_le16_nolen() to asf.c and give it a ff_ prefix. This way, it is easier
rbultje
parents: 5720
diff changeset
214 ff_put_str16_nolen(dyn_buf, tag);
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
215 len = url_close_dyn_buf(dyn_buf, &pb);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
216 put_le16(s, len);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
217 put_buffer(s, pb, len);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
218 av_freep(&pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
219 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
220
4748
86dd0cab30d3 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents: 4618
diff changeset
221 static int64_t put_header(ByteIOContext *pb, const ff_asf_guid *g)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
222 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
223 int64_t pos;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
224
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
225 pos = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
226 put_guid(pb, g);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
227 put_le64(pb, 24);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
228 return pos;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
229 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
230
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
231 /* update header size */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
232 static void end_header(ByteIOContext *pb, int64_t pos)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
233 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
234 int64_t pos1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
235
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
236 pos1 = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
237 url_fseek(pb, pos + 16, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
238 put_le64(pb, pos1 - pos);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
239 url_fseek(pb, pos1, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
240 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
241
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
242 /* write an asf chunk (only used in streaming case) */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243 static void put_chunk(AVFormatContext *s, int type, int payload_length, int flags)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
245 ASFContext *asf = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
246 ByteIOContext *pb = s->pb;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
247 int length;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
248
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
249 length = payload_length + 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
250 put_le16(pb, type);
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
251 put_le16(pb, length); //size
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
252 put_le32(pb, asf->seqno);//sequence number
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253 put_le16(pb, flags); /* unknown bytes */
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
254 put_le16(pb, length); //size_confirm
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
255 asf->seqno++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
257
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
258 /* convert from unix to windows time */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
259 static int64_t unix_to_file_time(int ti)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
260 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
261 int64_t t;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
262
1556
65b7b3ff4ed7 use the standard INT64_C() macro for 64-bit constants
mru
parents: 1415
diff changeset
263 t = ti * INT64_C(10000000);
65b7b3ff4ed7 use the standard INT64_C() macro for 64-bit constants
mru
parents: 1415
diff changeset
264 t += INT64_C(116444736000000000);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
265 return t;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
266 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
267
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
268 /* write the header (used two times if non streamed) */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
269 static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data_chunk_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
270 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
271 ASFContext *asf = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
272 ByteIOContext *pb = s->pb;
5719
65b13165daaf asfenc: simplify writing of comment header.
benoit
parents: 5714
diff changeset
273 AVMetadataTag *tags[5];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
274 int header_size, n, extra_size, extra_size2, wav_extra_size, file_time;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 int has_title;
4373
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
276 int metadata_count;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
277 AVCodecContext *enc;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
278 int64_t header_offset, cur_pos, hpos;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
279 int bit_rate;
1345
0a74030d9dd7 Fix wrong ASF duration of generated files
gpoirier
parents: 1172
diff changeset
280 int64_t duration;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
281
5719
65b13165daaf asfenc: simplify writing of comment header.
benoit
parents: 5714
diff changeset
282 tags[0] = av_metadata_get(s->metadata, "title" , NULL, 0);
65b13165daaf asfenc: simplify writing of comment header.
benoit
parents: 5714
diff changeset
283 tags[1] = av_metadata_get(s->metadata, "author" , NULL, 0);
65b13165daaf asfenc: simplify writing of comment header.
benoit
parents: 5714
diff changeset
284 tags[2] = av_metadata_get(s->metadata, "copyright", NULL, 0);
65b13165daaf asfenc: simplify writing of comment header.
benoit
parents: 5714
diff changeset
285 tags[3] = av_metadata_get(s->metadata, "comment" , NULL, 0);
65b13165daaf asfenc: simplify writing of comment header.
benoit
parents: 5714
diff changeset
286 tags[4] = av_metadata_get(s->metadata, "rating" , NULL, 0);
4372
6d94691fff91 use new metadata API in asf muxer
aurel
parents: 4251
diff changeset
287
1887
490aa34aef0f move preroll_time from static variable into definition, might be a good idea moving this into the context and making user-settable
alex
parents: 1880
diff changeset
288 duration = asf->duration + PREROLL_TIME * 10000;
5719
65b13165daaf asfenc: simplify writing of comment header.
benoit
parents: 5714
diff changeset
289 has_title = tags[0] || tags[1] || tags[2] || tags[3] || tags[4];
4373
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
290 metadata_count = s->metadata ? s->metadata->count : 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
291
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
292 bit_rate = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
293 for(n=0;n<s->nb_streams;n++) {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 743
diff changeset
294 enc = s->streams[n]->codec;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
295
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 373
diff changeset
296 av_set_pts_info(s->streams[n], 32, 1, 1000); /* 32 bit pts in ms */
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 373
diff changeset
297
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
298 bit_rate += enc->bit_rate;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
299 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
300
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
301 if (asf->is_streamed) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
302 put_chunk(s, 0x4824, 0, 0xc00); /* start of stream (length will be patched later) */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
303 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
304
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
305 put_guid(pb, &ff_asf_header);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
306 put_le64(pb, -1); /* header length, will be patched after */
4373
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
307 put_le32(pb, 3 + has_title + !!metadata_count + s->nb_streams); /* number of chunks in header */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
308 put_byte(pb, 1); /* ??? */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
309 put_byte(pb, 2); /* ??? */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
310
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
311 /* file header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
312 header_offset = url_ftell(pb);
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
313 hpos = put_header(pb, &ff_asf_file_header);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
314 put_guid(pb, &ff_asf_my_guid);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
315 put_le64(pb, file_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
316 file_time = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
317 put_le64(pb, unix_to_file_time(file_time));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
318 put_le64(pb, asf->nb_packets); /* number of packets */
1345
0a74030d9dd7 Fix wrong ASF duration of generated files
gpoirier
parents: 1172
diff changeset
319 put_le64(pb, duration); /* end time stamp (in 100ns units) */
1862
7ac4b32fd3fc all asf files i have have the 2 redundant duration fields differ by the preroll time so lets set them up like that too
michael
parents: 1861
diff changeset
320 put_le64(pb, asf->duration); /* duration (in 100ns units) */
1887
490aa34aef0f move preroll_time from static variable into definition, might be a good idea moving this into the context and making user-settable
alex
parents: 1880
diff changeset
321 put_le64(pb, PREROLL_TIME); /* start time stamp */
1895
87148b96d649 some url_is_streamed()==1 related fixes
michael
parents: 1887
diff changeset
322 put_le32(pb, (asf->is_streamed || url_is_streamed(pb)) ? 3 : 2); /* ??? */
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
323 put_le32(pb, s->packet_size); /* packet size */
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
324 put_le32(pb, s->packet_size); /* packet size */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
325 put_le32(pb, bit_rate); /* Nominal data rate in bps */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
326 end_header(pb, hpos);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
328 /* unknown headers */
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
329 hpos = put_header(pb, &ff_asf_head1_guid);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
330 put_guid(pb, &ff_asf_head2_guid);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
331 put_le32(pb, 6);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
332 put_le16(pb, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
333 end_header(pb, hpos);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
334
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
335 /* title and other infos */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
336 if (has_title) {
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
337 int len;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
338 uint8_t *buf;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
339 ByteIOContext *dyn_buf;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
340
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
341 if (url_open_dyn_buf(&dyn_buf) < 0)
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
342 return AVERROR(ENOMEM);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
343
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
344 hpos = put_header(pb, &ff_asf_comment_header);
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
345
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
346 for (n = 0; n < FF_ARRAY_ELEMS(tags); n++) {
5876
2c0f0162a110 Move put_le16_nolen() to asf.c and give it a ff_ prefix. This way, it is easier
rbultje
parents: 5720
diff changeset
347 len = tags[n] ? ff_put_str16_nolen(dyn_buf, tags[n]->value) : 0;
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
348 put_le16(pb, len);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
349 }
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
350 len = url_close_dyn_buf(dyn_buf, &buf);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
351 put_buffer(pb, buf, len);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
352 av_freep(&buf);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
353 end_header(pb, hpos);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
354 }
4373
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
355 if (metadata_count) {
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
356 AVMetadataTag *tag = NULL;
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
357 hpos = put_header(pb, &ff_asf_extended_content_header);
4373
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
358 put_le16(pb, metadata_count);
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
359 while ((tag = av_metadata_get(s->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) {
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
360 put_str16(pb, tag->key);
4373
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
361 put_le16(pb, 0);
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
362 put_str16(pb, tag->value);
4373
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
363 }
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
364 end_header(pb, hpos);
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
365 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
366
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
367 /* stream headers */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
368 for(n=0;n<s->nb_streams;n++) {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
369 int64_t es_pos;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
370 // ASFStream *stream = &asf->streams[n];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
371
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 743
diff changeset
372 enc = s->streams[n]->codec;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
373 asf->streams[n].num = n + 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
374 asf->streams[n].seq = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
375
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
376
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
377 switch(enc->codec_type) {
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5876
diff changeset
378 case AVMEDIA_TYPE_AUDIO:
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
379 wav_extra_size = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
380 extra_size = 18 + wav_extra_size;
1784
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
381 extra_size2 = 8;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
382 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
383 default:
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5876
diff changeset
384 case AVMEDIA_TYPE_VIDEO:
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
385 wav_extra_size = enc->extradata_size;
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
386 extra_size = 0x33 + wav_extra_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
387 extra_size2 = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
388 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
389 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
390
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
391 hpos = put_header(pb, &ff_asf_stream_header);
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5876
diff changeset
392 if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
393 put_guid(pb, &ff_asf_audio_stream);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
394 put_guid(pb, &ff_asf_audio_conceal_spread);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
395 } else {
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
396 put_guid(pb, &ff_asf_video_stream);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
397 put_guid(pb, &ff_asf_video_conceal_none);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
398 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
399 put_le64(pb, 0); /* ??? */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
400 es_pos = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
401 put_le32(pb, extra_size); /* wav header len */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
402 put_le32(pb, extra_size2); /* additional data len */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
403 put_le16(pb, n + 1); /* stream number */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
404 put_le32(pb, 0); /* ??? */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
405
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5876
diff changeset
406 if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
407 /* WAVEFORMATEX header */
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4748
diff changeset
408 int wavsize = ff_put_wav_header(pb, enc);
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
409 if ((enc->codec_id != CODEC_ID_MP3) && (enc->codec_id != CODEC_ID_MP2) && (enc->codec_id != CODEC_ID_ADPCM_IMA_WAV) && (enc->extradata_size==0)) {
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
410 wavsize += 2;
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
411 put_le16(pb, 0);
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
412 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
413
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
414 if (wavsize < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
415 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
416 if (wavsize != extra_size) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
417 cur_pos = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
418 url_fseek(pb, es_pos, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
419 put_le32(pb, wavsize); /* wav header len */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
420 url_fseek(pb, cur_pos, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
421 }
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
422 /* ERROR Correction */
1784
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
423 put_byte(pb, 0x01);
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
424 if(enc->codec_id == CODEC_ID_ADPCM_G726 || !enc->block_align){
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
425 put_le16(pb, 0x0190);
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
426 put_le16(pb, 0x0190);
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
427 }else{
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
428 put_le16(pb, enc->block_align);
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
429 put_le16(pb, enc->block_align);
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
430 }
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
431 put_le16(pb, 0x01);
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
432 put_byte(pb, 0x00);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
433 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
434 put_le32(pb, enc->width);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
435 put_le32(pb, enc->height);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
436 put_byte(pb, 2); /* ??? */
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
437 put_le16(pb, 40 + enc->extradata_size); /* size */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
438
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
439 /* BITMAPINFOHEADER header */
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4748
diff changeset
440 ff_put_bmp_header(pb, enc, ff_codec_bmp_tags, 1);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
441 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
442 end_header(pb, hpos);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
443 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
444
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
445 /* media comments */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
446
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
447 hpos = put_header(pb, &ff_asf_codec_comment_header);
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
448 put_guid(pb, &ff_asf_codec_comment1_header);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
449 put_le32(pb, s->nb_streams);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
450 for(n=0;n<s->nb_streams;n++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
451 AVCodec *p;
5713
0db115a3dbb4 Eliminate put_str16().
rbultje
parents: 5659
diff changeset
452 const char *desc;
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
453 int len;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
454 uint8_t *buf;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
455 ByteIOContext *dyn_buf;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
456
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 743
diff changeset
457 enc = s->streams[n]->codec;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
458 p = avcodec_find_encoder(enc->codec_id);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
459
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5876
diff changeset
460 if(enc->codec_type == AVMEDIA_TYPE_AUDIO)
1863
97b153836b82 create codec_comment_header which looks more like what M$ creates, sane or not ...
michael
parents: 1862
diff changeset
461 put_le16(pb, 2);
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5876
diff changeset
462 else if(enc->codec_type == AVMEDIA_TYPE_VIDEO)
1863
97b153836b82 create codec_comment_header which looks more like what M$ creates, sane or not ...
michael
parents: 1862
diff changeset
463 put_le16(pb, 1);
97b153836b82 create codec_comment_header which looks more like what M$ creates, sane or not ...
michael
parents: 1862
diff changeset
464 else
97b153836b82 create codec_comment_header which looks more like what M$ creates, sane or not ...
michael
parents: 1862
diff changeset
465 put_le16(pb, -1);
97b153836b82 create codec_comment_header which looks more like what M$ creates, sane or not ...
michael
parents: 1862
diff changeset
466
97b153836b82 create codec_comment_header which looks more like what M$ creates, sane or not ...
michael
parents: 1862
diff changeset
467 if(enc->codec_id == CODEC_ID_WMAV2)
5713
0db115a3dbb4 Eliminate put_str16().
rbultje
parents: 5659
diff changeset
468 desc = "Windows Media Audio V8";
1863
97b153836b82 create codec_comment_header which looks more like what M$ creates, sane or not ...
michael
parents: 1862
diff changeset
469 else
5713
0db115a3dbb4 Eliminate put_str16().
rbultje
parents: 5659
diff changeset
470 desc = p ? p->name : enc->codec_name;
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
471
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
472 if ( url_open_dyn_buf(&dyn_buf) < 0)
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
473 return AVERROR(ENOMEM);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
474
5876
2c0f0162a110 Move put_le16_nolen() to asf.c and give it a ff_ prefix. This way, it is easier
rbultje
parents: 5720
diff changeset
475 ff_put_str16_nolen(dyn_buf, desc);
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
476 len = url_close_dyn_buf(dyn_buf, &buf);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
477 put_le16(pb, len / 2); // "number of characters" = length in bytes / 2
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
478
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
479 put_buffer(pb, buf, len);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
480 av_freep(&buf);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
481
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
482 put_le16(pb, 0); /* no parameters */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
483
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
484
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
485 /* id */
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5876
diff changeset
486 if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
487 put_le16(pb, 2);
196
01bec1059bdf use codec_tag for encoding too
michaelni
parents: 188
diff changeset
488 put_le16(pb, enc->codec_tag);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
489 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
490 put_le16(pb, 4);
196
01bec1059bdf use codec_tag for encoding too
michaelni
parents: 188
diff changeset
491 put_le32(pb, enc->codec_tag);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
492 }
1685
22abad288650 simplify
michael
parents: 1683
diff changeset
493 if(!enc->codec_tag)
22abad288650 simplify
michael
parents: 1683
diff changeset
494 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
495 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
496 end_header(pb, hpos);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
497
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
498 /* patch the header size fields */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
499
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
500 cur_pos = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
501 header_size = cur_pos - header_offset;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
502 if (asf->is_streamed) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
503 header_size += 8 + 30 + 50;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
504
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
505 url_fseek(pb, header_offset - 10 - 30, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
506 put_le16(pb, header_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
507 url_fseek(pb, header_offset - 2 - 30, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
508 put_le16(pb, header_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
509
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
510 header_size -= 8 + 30 + 50;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
511 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
512 header_size += 24 + 6;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
513 url_fseek(pb, header_offset - 14, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
514 put_le64(pb, header_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
515 url_fseek(pb, cur_pos, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
516
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
517 /* movie chunk, followed by packets of packet_size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
518 asf->data_offset = cur_pos;
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
519 put_guid(pb, &ff_asf_data_header);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
520 put_le64(pb, data_chunk_size);
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
521 put_guid(pb, &ff_asf_my_guid);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
522 put_le64(pb, asf->nb_packets); /* nb packets */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
523 put_byte(pb, 1); /* ??? */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
524 put_byte(pb, 1); /* ??? */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
525 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
526 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
527
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
528 static int asf_write_header(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
529 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
530 ASFContext *asf = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
531
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
532 s->packet_size = PACKET_SIZE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
533 asf->nb_packets = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
534
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
535 asf->last_indexed_pts = 0;
2787
8453787462c1 stupid code (casting of void*) found by checktree.sh
michael
parents: 2771
diff changeset
536 asf->index_ptr = av_malloc( sizeof(ASFIndex) * ASF_INDEX_BLOCK );
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
537 asf->nb_index_memory_alloc = ASF_INDEX_BLOCK;
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
538 asf->nb_index_count = 0;
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
539 asf->maximum_packet = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
540
2615
cda2c3b0a4e6 Fix streaming to XBox360.
cehoyos
parents: 1895
diff changeset
541 /* the data-chunk-size has to be 50, which is data_size - asf->data_offset
cda2c3b0a4e6 Fix streaming to XBox360.
cehoyos
parents: 1895
diff changeset
542 * at the moment this function is done. It is needed to use asf as
cda2c3b0a4e6 Fix streaming to XBox360.
cehoyos
parents: 1895
diff changeset
543 * streamable format. */
cda2c3b0a4e6 Fix streaming to XBox360.
cehoyos
parents: 1895
diff changeset
544 if (asf_write_header1(s, 0, 50) < 0) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
545 //av_free(asf);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
546 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
547 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
548
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
549 put_flush_packet(s->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
550
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
551 asf->packet_nb_payloads = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
552 asf->packet_timestamp_start = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
553 asf->packet_timestamp_end = -1;
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
554 init_put_byte(&asf->pb, asf->packet_buf, s->packet_size, 1,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
555 NULL, NULL, NULL, NULL);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
556
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
557 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
558 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
559
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
560 static int asf_write_stream_header(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
561 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
562 ASFContext *asf = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
563
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
564 asf->is_streamed = 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
565
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
566 return asf_write_header(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
567 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
568
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
569 static int put_payload_parsing_info(
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
570 AVFormatContext *s,
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
571 unsigned int sendtime,
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
572 unsigned int duration,
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
573 int nb_payloads,
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
574 int padsize
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
575 )
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
576 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
577 ASFContext *asf = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
578 ByteIOContext *pb = s->pb;
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
579 int ppi_size, i;
1766
49b67c70e9c9 remove senseless and wrong direct access to ByteIOContext internals
michael
parents: 1764
diff changeset
580 int64_t start= url_ftell(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
581
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
582 int iLengthTypeFlags = ASF_PPI_LENGTH_TYPE_FLAGS;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
583
1775
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
584 padsize -= PACKET_HEADER_MIN_SIZE;
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
585 if(asf->multi_payloads_present)
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
586 padsize--;
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
587 assert(padsize>=0);
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
588
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
589 put_byte(pb, ASF_PACKET_ERROR_CORRECTION_FLAGS);
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
590 for (i = 0; i < ASF_PACKET_ERROR_CORRECTION_DATA_SIZE; i++){
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
591 put_byte(pb, 0x0);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
592 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
593
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
594 if (asf->multi_payloads_present)
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
595 iLengthTypeFlags |= ASF_PPI_FLAG_MULTIPLE_PAYLOADS_PRESENT;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
596
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
597 if (padsize > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
598 if (padsize < 256)
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
599 iLengthTypeFlags |= ASF_PPI_FLAG_PADDING_LENGTH_FIELD_IS_BYTE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
600 else
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
601 iLengthTypeFlags |= ASF_PPI_FLAG_PADDING_LENGTH_FIELD_IS_WORD;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
602 }
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
603 put_byte(pb, iLengthTypeFlags);
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
604
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
605 put_byte(pb, ASF_PPI_PROPERTY_FLAGS);
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
606
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
607 if (iLengthTypeFlags & ASF_PPI_FLAG_PADDING_LENGTH_FIELD_IS_WORD)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
608 put_le16(pb, padsize - 2);
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
609 if (iLengthTypeFlags & ASF_PPI_FLAG_PADDING_LENGTH_FIELD_IS_BYTE)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
610 put_byte(pb, padsize - 1);
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
611
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
612 put_le32(pb, sendtime);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
613 put_le16(pb, duration);
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
614 if (asf->multi_payloads_present)
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
615 put_byte(pb, nb_payloads | ASF_PAYLOAD_FLAGS);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
616
1766
49b67c70e9c9 remove senseless and wrong direct access to ByteIOContext internals
michael
parents: 1764
diff changeset
617 ppi_size = url_ftell(pb) - start;
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
618
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
619 return ppi_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
620 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
621
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
622 static void flush_packet(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
623 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
624 ASFContext *asf = s->priv_data;
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
625 int packet_hdr_size, packet_filled_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
626
2801
dafc142ae2e2 add assert to detect invalid packet_timestamp_start/end
michael
parents: 2800
diff changeset
627 assert(asf->packet_timestamp_end >= asf->packet_timestamp_start);
dafc142ae2e2 add assert to detect invalid packet_timestamp_start/end
michael
parents: 2800
diff changeset
628
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
629 if (asf->is_streamed) {
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
630 put_chunk(s, 0x4424, s->packet_size, 0);
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
631 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
632
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
633 packet_hdr_size = put_payload_parsing_info(
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
634 s,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
635 asf->packet_timestamp_start,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
636 asf->packet_timestamp_end - asf->packet_timestamp_start,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
637 asf->packet_nb_payloads,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
638 asf->packet_size_left
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
639 );
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
640
1775
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
641 packet_filled_size = PACKET_SIZE - asf->packet_size_left;
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
642 assert(packet_hdr_size <= asf->packet_size_left);
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
643 memset(asf->packet_buf + packet_filled_size, 0, asf->packet_size_left);
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
644
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
645 put_buffer(s->pb, asf->packet_buf, s->packet_size - packet_hdr_size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
646
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
647 put_flush_packet(s->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
648 asf->nb_packets++;
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
649 asf->packet_nb_payloads = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
650 asf->packet_timestamp_start = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
651 asf->packet_timestamp_end = -1;
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
652 init_put_byte(&asf->pb, asf->packet_buf, s->packet_size, 1,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
653 NULL, NULL, NULL, NULL);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
654 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
655
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
656 static void put_payload_header(
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
657 AVFormatContext *s,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
658 ASFStream *stream,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
659 int presentation_time,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
660 int m_obj_size,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
661 int m_obj_offset,
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
662 int payload_len,
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
663 int flags
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
664 )
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
665 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
666 ASFContext *asf = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
667 ByteIOContext *pb = &asf->pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
668 int val;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
669
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
670 val = stream->num;
5913
11bb10c37225 Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents: 5910
diff changeset
671 if (flags & AV_PKT_FLAG_KEY)
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
672 val |= ASF_PL_FLAG_KEY_FRAME;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
673 put_byte(pb, val);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
674
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
675 put_byte(pb, stream->seq); //Media object number
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
676 put_le32(pb, m_obj_offset); //Offset Into Media Object
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
677
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
678 // Replicated Data shall be at least 8 bytes long.
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
679 // The first 4 bytes of data shall contain the
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
680 // Size of the Media Object that the payload belongs to.
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
681 // The next 4 bytes of data shall contain the
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
682 // Presentation Time for the media object that the payload belongs to.
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
683 put_byte(pb, ASF_PAYLOAD_REPLICATED_DATA_LENGTH);
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
684
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
685 put_le32(pb, m_obj_size); //Replicated Data - Media Object Size
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
686 put_le32(pb, presentation_time);//Replicated Data - Presentation Time
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
687
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
688 if (asf->multi_payloads_present){
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
689 put_le16(pb, payload_len); //payload length
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
690 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
691 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
692
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
693 static void put_frame(
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
694 AVFormatContext *s,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
695 ASFStream *stream,
1880
54f814d6708c prevent audio packets from being fragmented, wmp mac doesnt seem to like that and microshitty also doesnt seem to ever fragment them
michael
parents: 1863
diff changeset
696 AVStream *avst,
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
697 int timestamp,
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
698 const uint8_t *buf,
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
699 int m_obj_size,
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
700 int flags
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
701 )
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
702 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
703 ASFContext *asf = s->priv_data;
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
704 int m_obj_offset, payload_len, frag_len1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
705
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
706 m_obj_offset = 0;
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
707 while (m_obj_offset < m_obj_size) {
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
708 payload_len = m_obj_size - m_obj_offset;
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
709 if (asf->packet_timestamp_start == -1) {
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
710 asf->multi_payloads_present = (payload_len < MULTI_PAYLOAD_CONSTANT);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
711
1775
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
712 asf->packet_size_left = PACKET_SIZE;
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
713 if (asf->multi_payloads_present){
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
714 frag_len1 = MULTI_PAYLOAD_CONSTANT - 1;
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
715 }
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
716 else {
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
717 frag_len1 = SINGLE_PAYLOAD_DATA_LENGTH;
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
718 }
1764
913e0d9b82d3 iam pretty sure send time is dts and not pts ...
michael
parents: 1762
diff changeset
719 asf->packet_timestamp_start = timestamp;
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
720 }
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
721 else {
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
722 // multi payloads
1775
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
723 frag_len1 = asf->packet_size_left - PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS - PACKET_HEADER_MIN_SIZE - 1;
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
724
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5876
diff changeset
725 if(frag_len1 < payload_len && avst->codec->codec_type == AVMEDIA_TYPE_AUDIO){
1880
54f814d6708c prevent audio packets from being fragmented, wmp mac doesnt seem to like that and microshitty also doesnt seem to ever fragment them
michael
parents: 1863
diff changeset
726 flush_packet(s);
54f814d6708c prevent audio packets from being fragmented, wmp mac doesnt seem to like that and microshitty also doesnt seem to ever fragment them
michael
parents: 1863
diff changeset
727 continue;
54f814d6708c prevent audio packets from being fragmented, wmp mac doesnt seem to like that and microshitty also doesnt seem to ever fragment them
michael
parents: 1863
diff changeset
728 }
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
729 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
730 if (frag_len1 > 0) {
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
731 if (payload_len > frag_len1)
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
732 payload_len = frag_len1;
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
733 else if (payload_len == (frag_len1 - 1))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
734 payload_len = frag_len1 - 2; //additional byte need to put padding length
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
735
1887
490aa34aef0f move preroll_time from static variable into definition, might be a good idea moving this into the context and making user-settable
alex
parents: 1880
diff changeset
736 put_payload_header(s, stream, timestamp+PREROLL_TIME, m_obj_size, m_obj_offset, payload_len, flags);
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
737 put_buffer(&asf->pb, buf, payload_len);
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
738
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
739 if (asf->multi_payloads_present)
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
740 asf->packet_size_left -= (payload_len + PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS);
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
741 else
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
742 asf->packet_size_left -= (payload_len + PAYLOAD_HEADER_SIZE_SINGLE_PAYLOAD);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
743 asf->packet_timestamp_end = timestamp;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
744
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
745 asf->packet_nb_payloads++;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
746 } else {
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
747 payload_len = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
748 }
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
749 m_obj_offset += payload_len;
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
750 buf += payload_len;
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
751
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
752 if (!asf->multi_payloads_present)
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
753 flush_packet(s);
1775
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
754 else if (asf->packet_size_left <= (PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS + PACKET_HEADER_MIN_SIZE + 1))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
755 flush_packet(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
756 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
757 stream->seq++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
758 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
759
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
760 static int asf_write_packet(AVFormatContext *s, AVPacket *pkt)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
761 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
762 ASFContext *asf = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
763 ASFStream *stream;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
764 int64_t duration;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
765 AVCodecContext *codec;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
766 int64_t packet_st,pts;
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
767 int start_sec,i;
1782
4f4edbced58a dont set the keyframe flag for audio as microshitty doesnt do it and some things have problems with our asfs, maybe that has a positive effect?
michael
parents: 1775
diff changeset
768 int flags= pkt->flags;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
769
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 743
diff changeset
770 codec = s->streams[pkt->stream_index]->codec;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
771 stream = &asf->streams[pkt->stream_index];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
772
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5876
diff changeset
773 if(codec->codec_type == AVMEDIA_TYPE_AUDIO)
5913
11bb10c37225 Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents: 5910
diff changeset
774 flags &= ~AV_PKT_FLAG_KEY;
1782
4f4edbced58a dont set the keyframe flag for audio as microshitty doesnt do it and some things have problems with our asfs, maybe that has a positive effect?
michael
parents: 1775
diff changeset
775
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
776 pts = (pkt->pts != AV_NOPTS_VALUE) ? pkt->pts : pkt->dts;
1762
cb8b538021cd muxing packets with unknown timestamps is not allowed
michael
parents: 1687
diff changeset
777 assert(pts != AV_NOPTS_VALUE);
cb8b538021cd muxing packets with unknown timestamps is not allowed
michael
parents: 1687
diff changeset
778 duration = pts * 10000;
3236
57baf1166899 Correct ASF duration.
benoit
parents: 2991
diff changeset
779 asf->duration= FFMAX(asf->duration, duration + pkt->duration * 10000);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
780
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
781 packet_st = asf->nb_packets;
1880
54f814d6708c prevent audio packets from being fragmented, wmp mac doesnt seem to like that and microshitty also doesnt seem to ever fragment them
michael
parents: 1863
diff changeset
782 put_frame(s, stream, s->streams[pkt->stream_index], pkt->dts, pkt->data, pkt->size, flags);
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
783
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
784 /* check index */
5913
11bb10c37225 Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents: 5910
diff changeset
785 if ((!asf->is_streamed) && (flags & AV_PKT_FLAG_KEY)) {
1556
65b7b3ff4ed7 use the standard INT64_C() macro for 64-bit constants
mru
parents: 1415
diff changeset
786 start_sec = (int)(duration / INT64_C(10000000));
65b7b3ff4ed7 use the standard INT64_C() macro for 64-bit constants
mru
parents: 1415
diff changeset
787 if (start_sec != (int)(asf->last_indexed_pts / INT64_C(10000000))) {
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
788 for(i=asf->nb_index_count;i<start_sec;i++) {
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
789 if (i>=asf->nb_index_memory_alloc) {
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
790 asf->nb_index_memory_alloc += ASF_INDEX_BLOCK;
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
791 asf->index_ptr = (ASFIndex*)av_realloc( asf->index_ptr, sizeof(ASFIndex) * asf->nb_index_memory_alloc );
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
792 }
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
793 // store
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
794 asf->index_ptr[i].packet_number = (uint32_t)packet_st;
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
795 asf->index_ptr[i].packet_count = (uint16_t)(asf->nb_packets-packet_st);
1685
22abad288650 simplify
michael
parents: 1683
diff changeset
796 asf->maximum_packet = FFMAX(asf->maximum_packet, (uint16_t)(asf->nb_packets-packet_st));
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
797 }
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
798 asf->nb_index_count = start_sec;
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
799 asf->last_indexed_pts = duration;
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
800 }
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
801 }
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
802 return 0;
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
803 }
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
804
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
805 //
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
806 static int asf_write_index(AVFormatContext *s, ASFIndex *index, uint16_t max, uint32_t count)
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
807 {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
808 ByteIOContext *pb = s->pb;
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
809 int i;
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
810
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
811 put_guid(pb, &ff_asf_simple_index_header);
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
812 put_le64(pb, 24 + 16 + 8 + 4 + 4 + (4 + 2)*count);
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
813 put_guid(pb, &ff_asf_my_guid);
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
814 put_le64(pb, ASF_INDEXED_INTERVAL);
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
815 put_le32(pb, max);
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
816 put_le32(pb, count);
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
817 for(i=0; i<count; i++) {
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
818 put_le32(pb, index[i].packet_number);
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
819 put_le16(pb, index[i].packet_count);
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
820 }
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
821
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
822 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
823 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
824
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
825 static int asf_write_trailer(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
826 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
827 ASFContext *asf = s->priv_data;
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
828 int64_t file_size,data_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
829
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
830 /* flush the current packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
831 if (asf->pb.buf_ptr > asf->pb.buffer)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
832 flush_packet(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
833
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
834 /* write index */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
835 data_size = url_ftell(s->pb);
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
836 if ((!asf->is_streamed) && (asf->nb_index_count != 0)) {
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
837 asf_write_index(s, asf->index_ptr, asf->maximum_packet, asf->nb_index_count);
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
838 }
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
839 put_flush_packet(s->pb);
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
840
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
841 if (asf->is_streamed || url_is_streamed(s->pb)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
842 put_chunk(s, 0x4524, 0, 0); /* end of stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
843 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
844 /* rewrite an updated header */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
845 file_size = url_ftell(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
846 url_fseek(s->pb, 0, SEEK_SET);
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
847 asf_write_header1(s, file_size, data_size - asf->data_offset);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
848 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
849
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
850 put_flush_packet(s->pb);
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
851 av_free(asf->index_ptr);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
852 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
853 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
854
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 3931
diff changeset
855 #if CONFIG_ASF_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1123
diff changeset
856 AVOutputFormat asf_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
857 "asf",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3236
diff changeset
858 NULL_IF_CONFIG_SMALL("ASF format"),
14
b167760cd0aa mimetype fixes patch by (Ryutaroh Matsumoto <ryutaroh at it dot ss dot titech dot ac dot jp>)
michaelni
parents: 7
diff changeset
859 "video/x-ms-asf",
672
michael
parents: 668
diff changeset
860 "asf,wmv,wma",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
861 sizeof(ASFContext),
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 3931
diff changeset
862 #if CONFIG_LIBMP3LAME
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 196
diff changeset
863 CODEC_ID_MP3,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
864 #else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
865 CODEC_ID_MP2,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
866 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
867 CODEC_ID_MSMPEG4V3,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
868 asf_write_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
869 asf_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
870 asf_write_trailer,
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
871 .flags = AVFMT_GLOBALHEADER,
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4748
diff changeset
872 .codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0},
4618
5b9eddbee9c4 Add some basic metadata conversion tables for matroska and asf.
aurel
parents: 4593
diff changeset
873 .metadata_conv = ff_asf_metadata_conv,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
874 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
875 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
876
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 3931
diff changeset
877 #if CONFIG_ASF_STREAM_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1123
diff changeset
878 AVOutputFormat asf_stream_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
879 "asf_stream",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3236
diff changeset
880 NULL_IF_CONFIG_SMALL("ASF format"),
14
b167760cd0aa mimetype fixes patch by (Ryutaroh Matsumoto <ryutaroh at it dot ss dot titech dot ac dot jp>)
michaelni
parents: 7
diff changeset
881 "video/x-ms-asf",
672
michael
parents: 668
diff changeset
882 "asf,wmv,wma",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
883 sizeof(ASFContext),
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 3931
diff changeset
884 #if CONFIG_LIBMP3LAME
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 196
diff changeset
885 CODEC_ID_MP3,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
886 #else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
887 CODEC_ID_MP2,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
888 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
889 CODEC_ID_MSMPEG4V3,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
890 asf_write_stream_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
891 asf_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
892 asf_write_trailer,
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
893 .flags = AVFMT_GLOBALHEADER,
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4748
diff changeset
894 .codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0},
4618
5b9eddbee9c4 Add some basic metadata conversion tables for matroska and asf.
aurel
parents: 4593
diff changeset
895 .metadata_conv = ff_asf_metadata_conv,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
896 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
897 #endif //CONFIG_ASF_STREAM_MUXER