annotate asfenc.c @ 5747:551765b1772b libavformat

Ensure that we write clusters and blocks with known size when streaming Too many demuxers can't cope with clusters of unknown size.
author conrad
date Thu, 04 Mar 2010 08:53:14 +0000
parents d833557e7287
children 2c0f0162a110
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 int put_str16_nolen(ByteIOContext *s, const char *tag)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
207 {
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
208 const uint8_t *q = tag;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
209 int ret = 0;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
210
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
211 while (*q) {
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
212 uint32_t ch;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
213 uint16_t tmp;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
214
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
215 GET_UTF8(ch, *q++, break;)
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
216 PUT_UTF16(ch, tmp, put_le16(s, tmp);ret += 2;)
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
217 }
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
218 put_le16(s, 0);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
219 ret += 2;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
220 return ret;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
221 }
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
222
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
223 static void put_str16(ByteIOContext *s, const char *tag)
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
224 {
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
225 int len;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
226 uint8_t *pb;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
227 ByteIOContext *dyn_buf;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
228 if (url_open_dyn_buf(&dyn_buf) < 0)
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
229 return;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
230
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
231 put_str16_nolen(dyn_buf, tag);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
232 len = url_close_dyn_buf(dyn_buf, &pb);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
233 put_le16(s, len);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
234 put_buffer(s, pb, len);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
235 av_freep(&pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
236 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
237
4748
86dd0cab30d3 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents: 4618
diff changeset
238 static int64_t put_header(ByteIOContext *pb, const ff_asf_guid *g)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
239 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
240 int64_t pos;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
241
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
242 pos = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243 put_guid(pb, g);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244 put_le64(pb, 24);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
245 return pos;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
246 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
247
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
248 /* update header size */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
249 static void end_header(ByteIOContext *pb, int64_t pos)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
250 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
251 int64_t pos1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
252
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253 pos1 = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
254 url_fseek(pb, pos + 16, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
255 put_le64(pb, pos1 - pos);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256 url_fseek(pb, pos1, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
257 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
258
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
259 /* write an asf chunk (only used in streaming case) */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
260 static void put_chunk(AVFormatContext *s, int type, int payload_length, int flags)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
261 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
262 ASFContext *asf = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
263 ByteIOContext *pb = s->pb;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
264 int length;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
265
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
266 length = payload_length + 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
267 put_le16(pb, type);
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
268 put_le16(pb, length); //size
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
269 put_le32(pb, asf->seqno);//sequence number
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
270 put_le16(pb, flags); /* unknown bytes */
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
271 put_le16(pb, length); //size_confirm
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
272 asf->seqno++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
273 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
274
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 /* convert from unix to windows time */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
276 static int64_t unix_to_file_time(int ti)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
277 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
278 int64_t t;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
279
1556
65b7b3ff4ed7 use the standard INT64_C() macro for 64-bit constants
mru
parents: 1415
diff changeset
280 t = ti * INT64_C(10000000);
65b7b3ff4ed7 use the standard INT64_C() macro for 64-bit constants
mru
parents: 1415
diff changeset
281 t += INT64_C(116444736000000000);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
282 return t;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
283 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
284
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
285 /* write the header (used two times if non streamed) */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
286 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
287 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
288 ASFContext *asf = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
289 ByteIOContext *pb = s->pb;
5719
65b13165daaf asfenc: simplify writing of comment header.
benoit
parents: 5714
diff changeset
290 AVMetadataTag *tags[5];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
291 int header_size, n, extra_size, extra_size2, wav_extra_size, file_time;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
292 int has_title;
4373
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
293 int metadata_count;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
294 AVCodecContext *enc;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
295 int64_t header_offset, cur_pos, hpos;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
296 int bit_rate;
1345
0a74030d9dd7 Fix wrong ASF duration of generated files
gpoirier
parents: 1172
diff changeset
297 int64_t duration;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
298
5719
65b13165daaf asfenc: simplify writing of comment header.
benoit
parents: 5714
diff changeset
299 tags[0] = av_metadata_get(s->metadata, "title" , NULL, 0);
65b13165daaf asfenc: simplify writing of comment header.
benoit
parents: 5714
diff changeset
300 tags[1] = av_metadata_get(s->metadata, "author" , NULL, 0);
65b13165daaf asfenc: simplify writing of comment header.
benoit
parents: 5714
diff changeset
301 tags[2] = av_metadata_get(s->metadata, "copyright", NULL, 0);
65b13165daaf asfenc: simplify writing of comment header.
benoit
parents: 5714
diff changeset
302 tags[3] = av_metadata_get(s->metadata, "comment" , NULL, 0);
65b13165daaf asfenc: simplify writing of comment header.
benoit
parents: 5714
diff changeset
303 tags[4] = av_metadata_get(s->metadata, "rating" , NULL, 0);
4372
6d94691fff91 use new metadata API in asf muxer
aurel
parents: 4251
diff changeset
304
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
305 duration = asf->duration + PREROLL_TIME * 10000;
5719
65b13165daaf asfenc: simplify writing of comment header.
benoit
parents: 5714
diff changeset
306 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
307 metadata_count = s->metadata ? s->metadata->count : 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
308
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
309 bit_rate = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
310 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
311 enc = s->streams[n]->codec;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
312
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 373
diff changeset
313 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
314
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
315 bit_rate += enc->bit_rate;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
316 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
317
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
318 if (asf->is_streamed) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
319 put_chunk(s, 0x4824, 0, 0xc00); /* start of stream (length will be patched later) */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
320 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
321
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
322 put_guid(pb, &ff_asf_header);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
323 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
324 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
325 put_byte(pb, 1); /* ??? */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
326 put_byte(pb, 2); /* ??? */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
328 /* file header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
329 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
330 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
331 put_guid(pb, &ff_asf_my_guid);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
332 put_le64(pb, file_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
333 file_time = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
334 put_le64(pb, unix_to_file_time(file_time));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
335 put_le64(pb, asf->nb_packets); /* number of packets */
1345
0a74030d9dd7 Fix wrong ASF duration of generated files
gpoirier
parents: 1172
diff changeset
336 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
337 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
338 put_le64(pb, PREROLL_TIME); /* start time stamp */
1895
87148b96d649 some url_is_streamed()==1 related fixes
michael
parents: 1887
diff changeset
339 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
340 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
341 put_le32(pb, s->packet_size); /* packet size */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
342 put_le32(pb, bit_rate); /* Nominal data rate in bps */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
343 end_header(pb, hpos);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
344
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
345 /* unknown headers */
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
346 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
347 put_guid(pb, &ff_asf_head2_guid);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
348 put_le32(pb, 6);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
349 put_le16(pb, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
350 end_header(pb, hpos);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
351
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
352 /* title and other infos */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
353 if (has_title) {
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
354 int len;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
355 uint8_t *buf;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
356 ByteIOContext *dyn_buf;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
357
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
358 if (url_open_dyn_buf(&dyn_buf) < 0)
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
359 return AVERROR(ENOMEM);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
360
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
361 hpos = put_header(pb, &ff_asf_comment_header);
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
362
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
363 for (n = 0; n < FF_ARRAY_ELEMS(tags); n++) {
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
364 len = tags[n] ? put_str16_nolen(dyn_buf, tags[n]->value) : 0;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
365 put_le16(pb, len);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
366 }
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
367 len = url_close_dyn_buf(dyn_buf, &buf);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
368 put_buffer(pb, buf, len);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
369 av_freep(&buf);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
370 end_header(pb, hpos);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
371 }
4373
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
372 if (metadata_count) {
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
373 AVMetadataTag *tag = NULL;
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
374 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
375 put_le16(pb, metadata_count);
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
376 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
377 put_str16(pb, tag->key);
4373
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
378 put_le16(pb, 0);
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
379 put_str16(pb, tag->value);
4373
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
380 }
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
381 end_header(pb, hpos);
7eef34a6f1c0 write all available metadata tags into extended_content_header
aurel
parents: 4372
diff changeset
382 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
383
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
384 /* stream headers */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
385 for(n=0;n<s->nb_streams;n++) {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
386 int64_t es_pos;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
387 // ASFStream *stream = &asf->streams[n];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
388
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 743
diff changeset
389 enc = s->streams[n]->codec;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
390 asf->streams[n].num = n + 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
391 asf->streams[n].seq = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
392
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
393
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
394 switch(enc->codec_type) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
395 case CODEC_TYPE_AUDIO:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
396 wav_extra_size = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
397 extra_size = 18 + wav_extra_size;
1784
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
398 extra_size2 = 8;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
399 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
400 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
401 case CODEC_TYPE_VIDEO:
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
402 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
403 extra_size = 0x33 + wav_extra_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
404 extra_size2 = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
405 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
406 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
407
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
408 hpos = put_header(pb, &ff_asf_stream_header);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
409 if (enc->codec_type == CODEC_TYPE_AUDIO) {
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
410 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
411 put_guid(pb, &ff_asf_audio_conceal_spread);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
412 } else {
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
413 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
414 put_guid(pb, &ff_asf_video_conceal_none);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
415 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
416 put_le64(pb, 0); /* ??? */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
417 es_pos = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
418 put_le32(pb, extra_size); /* wav header len */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
419 put_le32(pb, extra_size2); /* additional data len */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
420 put_le16(pb, n + 1); /* stream number */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
421 put_le32(pb, 0); /* ??? */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
422
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
423 if (enc->codec_type == CODEC_TYPE_AUDIO) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
424 /* WAVEFORMATEX header */
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4748
diff changeset
425 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
426 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
427 wavsize += 2;
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
428 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
429 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
430
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
431 if (wavsize < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
432 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
433 if (wavsize != extra_size) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
434 cur_pos = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
435 url_fseek(pb, es_pos, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
436 put_le32(pb, wavsize); /* wav header len */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
437 url_fseek(pb, cur_pos, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
438 }
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
439 /* ERROR Correction */
1784
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
440 put_byte(pb, 0x01);
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
441 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
442 put_le16(pb, 0x0190);
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
443 put_le16(pb, 0x0190);
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
444 }else{
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
445 put_le16(pb, enc->block_align);
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
446 put_le16(pb, enc->block_align);
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
447 }
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
448 put_le16(pb, 0x01);
597e5dd62399 always use audio spread (instead of "video no spread" for audio ...)
michael
parents: 1783
diff changeset
449 put_byte(pb, 0x00);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
450 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
451 put_le32(pb, enc->width);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
452 put_le32(pb, enc->height);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
453 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
454 put_le16(pb, 40 + enc->extradata_size); /* size */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
455
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
456 /* BITMAPINFOHEADER header */
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4748
diff changeset
457 ff_put_bmp_header(pb, enc, ff_codec_bmp_tags, 1);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
458 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
459 end_header(pb, hpos);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
460 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
461
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
462 /* media comments */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
463
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
464 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
465 put_guid(pb, &ff_asf_codec_comment1_header);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
466 put_le32(pb, s->nb_streams);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
467 for(n=0;n<s->nb_streams;n++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
468 AVCodec *p;
5713
0db115a3dbb4 Eliminate put_str16().
rbultje
parents: 5659
diff changeset
469 const char *desc;
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
470 int len;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
471 uint8_t *buf;
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
472 ByteIOContext *dyn_buf;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
473
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 743
diff changeset
474 enc = s->streams[n]->codec;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
475 p = avcodec_find_encoder(enc->codec_id);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
476
1863
97b153836b82 create codec_comment_header which looks more like what M$ creates, sane or not ...
michael
parents: 1862
diff changeset
477 if(enc->codec_type == CODEC_TYPE_AUDIO)
97b153836b82 create codec_comment_header which looks more like what M$ creates, sane or not ...
michael
parents: 1862
diff changeset
478 put_le16(pb, 2);
97b153836b82 create codec_comment_header which looks more like what M$ creates, sane or not ...
michael
parents: 1862
diff changeset
479 else if(enc->codec_type == CODEC_TYPE_VIDEO)
97b153836b82 create codec_comment_header which looks more like what M$ creates, sane or not ...
michael
parents: 1862
diff changeset
480 put_le16(pb, 1);
97b153836b82 create codec_comment_header which looks more like what M$ creates, sane or not ...
michael
parents: 1862
diff changeset
481 else
97b153836b82 create codec_comment_header which looks more like what M$ creates, sane or not ...
michael
parents: 1862
diff changeset
482 put_le16(pb, -1);
97b153836b82 create codec_comment_header which looks more like what M$ creates, sane or not ...
michael
parents: 1862
diff changeset
483
97b153836b82 create codec_comment_header which looks more like what M$ creates, sane or not ...
michael
parents: 1862
diff changeset
484 if(enc->codec_id == CODEC_ID_WMAV2)
5713
0db115a3dbb4 Eliminate put_str16().
rbultje
parents: 5659
diff changeset
485 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
486 else
5713
0db115a3dbb4 Eliminate put_str16().
rbultje
parents: 5659
diff changeset
487 desc = p ? p->name : enc->codec_name;
5720
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
488
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
489 if ( url_open_dyn_buf(&dyn_buf) < 0)
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
490 return AVERROR(ENOMEM);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
491
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
492 put_str16_nolen(dyn_buf, desc);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
493 len = url_close_dyn_buf(dyn_buf, &buf);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
494 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
495
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
496 put_buffer(pb, buf, len);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
497 av_freep(&buf);
d833557e7287 asfenc: write tags in proper UTF-16.
benoit
parents: 5719
diff changeset
498
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
499 put_le16(pb, 0); /* no parameters */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
500
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
501
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
502 /* id */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
503 if (enc->codec_type == CODEC_TYPE_AUDIO) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
504 put_le16(pb, 2);
196
01bec1059bdf use codec_tag for encoding too
michaelni
parents: 188
diff changeset
505 put_le16(pb, enc->codec_tag);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
506 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
507 put_le16(pb, 4);
196
01bec1059bdf use codec_tag for encoding too
michaelni
parents: 188
diff changeset
508 put_le32(pb, enc->codec_tag);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
509 }
1685
22abad288650 simplify
michael
parents: 1683
diff changeset
510 if(!enc->codec_tag)
22abad288650 simplify
michael
parents: 1683
diff changeset
511 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
512 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
513 end_header(pb, hpos);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
514
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
515 /* patch the header size fields */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
516
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
517 cur_pos = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
518 header_size = cur_pos - header_offset;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
519 if (asf->is_streamed) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
520 header_size += 8 + 30 + 50;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
521
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
522 url_fseek(pb, header_offset - 10 - 30, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
523 put_le16(pb, header_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
524 url_fseek(pb, header_offset - 2 - 30, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
525 put_le16(pb, header_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
526
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
527 header_size -= 8 + 30 + 50;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
528 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
529 header_size += 24 + 6;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
530 url_fseek(pb, header_offset - 14, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
531 put_le64(pb, header_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
532 url_fseek(pb, cur_pos, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
533
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
534 /* movie chunk, followed by packets of packet_size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
535 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
536 put_guid(pb, &ff_asf_data_header);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
537 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
538 put_guid(pb, &ff_asf_my_guid);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
539 put_le64(pb, asf->nb_packets); /* nb packets */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
540 put_byte(pb, 1); /* ??? */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
541 put_byte(pb, 1); /* ??? */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
542 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
543 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
544
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
545 static int asf_write_header(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
546 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
547 ASFContext *asf = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
548
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
549 s->packet_size = PACKET_SIZE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
550 asf->nb_packets = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
551
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
552 asf->last_indexed_pts = 0;
2787
8453787462c1 stupid code (casting of void*) found by checktree.sh
michael
parents: 2771
diff changeset
553 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
554 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
555 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
556 asf->maximum_packet = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
557
2615
cda2c3b0a4e6 Fix streaming to XBox360.
cehoyos
parents: 1895
diff changeset
558 /* 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
559 * at the moment this function is done. It is needed to use asf as
cda2c3b0a4e6 Fix streaming to XBox360.
cehoyos
parents: 1895
diff changeset
560 * streamable format. */
cda2c3b0a4e6 Fix streaming to XBox360.
cehoyos
parents: 1895
diff changeset
561 if (asf_write_header1(s, 0, 50) < 0) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
562 //av_free(asf);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
563 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
564 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
565
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
566 put_flush_packet(s->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
567
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
568 asf->packet_nb_payloads = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
569 asf->packet_timestamp_start = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
570 asf->packet_timestamp_end = -1;
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
571 init_put_byte(&asf->pb, asf->packet_buf, s->packet_size, 1,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
572 NULL, NULL, NULL, NULL);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
573
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
574 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
575 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
576
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
577 static int asf_write_stream_header(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
578 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
579 ASFContext *asf = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
580
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
581 asf->is_streamed = 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
582
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
583 return asf_write_header(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
584 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
585
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
586 static int put_payload_parsing_info(
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
587 AVFormatContext *s,
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
588 unsigned int sendtime,
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
589 unsigned int duration,
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
590 int nb_payloads,
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
591 int padsize
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
592 )
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
593 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
594 ASFContext *asf = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
595 ByteIOContext *pb = s->pb;
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
596 int ppi_size, i;
1766
49b67c70e9c9 remove senseless and wrong direct access to ByteIOContext internals
michael
parents: 1764
diff changeset
597 int64_t start= url_ftell(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
598
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
599 int iLengthTypeFlags = ASF_PPI_LENGTH_TYPE_FLAGS;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
600
1775
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
601 padsize -= PACKET_HEADER_MIN_SIZE;
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
602 if(asf->multi_payloads_present)
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
603 padsize--;
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
604 assert(padsize>=0);
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
605
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
606 put_byte(pb, ASF_PACKET_ERROR_CORRECTION_FLAGS);
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
607 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
608 put_byte(pb, 0x0);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
609 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
610
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
611 if (asf->multi_payloads_present)
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
612 iLengthTypeFlags |= ASF_PPI_FLAG_MULTIPLE_PAYLOADS_PRESENT;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
613
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
614 if (padsize > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
615 if (padsize < 256)
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
616 iLengthTypeFlags |= ASF_PPI_FLAG_PADDING_LENGTH_FIELD_IS_BYTE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
617 else
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
618 iLengthTypeFlags |= ASF_PPI_FLAG_PADDING_LENGTH_FIELD_IS_WORD;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
619 }
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
620 put_byte(pb, iLengthTypeFlags);
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
621
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
622 put_byte(pb, ASF_PPI_PROPERTY_FLAGS);
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
623
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
624 if (iLengthTypeFlags & ASF_PPI_FLAG_PADDING_LENGTH_FIELD_IS_WORD)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
625 put_le16(pb, padsize - 2);
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
626 if (iLengthTypeFlags & ASF_PPI_FLAG_PADDING_LENGTH_FIELD_IS_BYTE)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
627 put_byte(pb, padsize - 1);
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
628
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
629 put_le32(pb, sendtime);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
630 put_le16(pb, duration);
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
631 if (asf->multi_payloads_present)
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
632 put_byte(pb, nb_payloads | ASF_PAYLOAD_FLAGS);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
633
1766
49b67c70e9c9 remove senseless and wrong direct access to ByteIOContext internals
michael
parents: 1764
diff changeset
634 ppi_size = url_ftell(pb) - start;
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
635
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
636 return ppi_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
637 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
638
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
639 static void flush_packet(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
640 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
641 ASFContext *asf = s->priv_data;
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
642 int packet_hdr_size, packet_filled_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
643
2801
dafc142ae2e2 add assert to detect invalid packet_timestamp_start/end
michael
parents: 2800
diff changeset
644 assert(asf->packet_timestamp_end >= asf->packet_timestamp_start);
dafc142ae2e2 add assert to detect invalid packet_timestamp_start/end
michael
parents: 2800
diff changeset
645
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
646 if (asf->is_streamed) {
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
647 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
648 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
649
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
650 packet_hdr_size = put_payload_parsing_info(
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
651 s,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
652 asf->packet_timestamp_start,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
653 asf->packet_timestamp_end - asf->packet_timestamp_start,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
654 asf->packet_nb_payloads,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
655 asf->packet_size_left
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
656 );
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
657
1775
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
658 packet_filled_size = PACKET_SIZE - asf->packet_size_left;
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
659 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
660 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
661
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
662 put_buffer(s->pb, asf->packet_buf, s->packet_size - packet_hdr_size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
663
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
664 put_flush_packet(s->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
665 asf->nb_packets++;
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
666 asf->packet_nb_payloads = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
667 asf->packet_timestamp_start = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
668 asf->packet_timestamp_end = -1;
5067
499c21a8e0c2 Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents: 5058
diff changeset
669 init_put_byte(&asf->pb, asf->packet_buf, s->packet_size, 1,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
670 NULL, NULL, NULL, NULL);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
671 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
672
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
673 static void put_payload_header(
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
674 AVFormatContext *s,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
675 ASFStream *stream,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
676 int presentation_time,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
677 int m_obj_size,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
678 int m_obj_offset,
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
679 int payload_len,
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
680 int flags
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
681 )
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
682 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
683 ASFContext *asf = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
684 ByteIOContext *pb = &asf->pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
685 int val;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
686
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
687 val = stream->num;
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
688 if (flags & PKT_FLAG_KEY)
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
689 val |= ASF_PL_FLAG_KEY_FRAME;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
690 put_byte(pb, val);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
691
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
692 put_byte(pb, stream->seq); //Media object number
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
693 put_le32(pb, m_obj_offset); //Offset Into Media Object
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
694
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
695 // Replicated Data shall be at least 8 bytes long.
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
696 // 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
697 // Size of the Media Object that the payload belongs to.
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
698 // 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
699 // 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
700 put_byte(pb, ASF_PAYLOAD_REPLICATED_DATA_LENGTH);
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
701
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
702 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
703 put_le32(pb, presentation_time);//Replicated Data - Presentation Time
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
704
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
705 if (asf->multi_payloads_present){
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
706 put_le16(pb, payload_len); //payload length
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
707 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
708 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
709
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
710 static void put_frame(
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
711 AVFormatContext *s,
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
712 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
713 AVStream *avst,
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
714 int timestamp,
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
715 const uint8_t *buf,
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
716 int m_obj_size,
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
717 int flags
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
718 )
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
719 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
720 ASFContext *asf = s->priv_data;
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
721 int m_obj_offset, payload_len, frag_len1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
722
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
723 m_obj_offset = 0;
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
724 while (m_obj_offset < m_obj_size) {
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
725 payload_len = m_obj_size - m_obj_offset;
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
726 if (asf->packet_timestamp_start == -1) {
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
727 asf->multi_payloads_present = (payload_len < MULTI_PAYLOAD_CONSTANT);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
728
1775
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
729 asf->packet_size_left = PACKET_SIZE;
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
730 if (asf->multi_payloads_present){
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
731 frag_len1 = MULTI_PAYLOAD_CONSTANT - 1;
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
732 }
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
733 else {
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
734 frag_len1 = SINGLE_PAYLOAD_DATA_LENGTH;
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
735 }
1764
913e0d9b82d3 iam pretty sure send time is dts and not pts ...
michael
parents: 1762
diff changeset
736 asf->packet_timestamp_start = timestamp;
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
737 }
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
738 else {
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
739 // multi payloads
1775
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
740 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
741
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
742 if(frag_len1 < payload_len && avst->codec->codec_type == CODEC_TYPE_AUDIO){
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
743 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
744 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
745 }
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
746 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
747 if (frag_len1 > 0) {
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
748 if (payload_len > frag_len1)
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
749 payload_len = frag_len1;
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
750 else if (payload_len == (frag_len1 - 1))
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
751 payload_len = frag_len1 - 2; //additional byte need to put padding length
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
752
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
753 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
754 put_buffer(&asf->pb, buf, payload_len);
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
755
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
756 if (asf->multi_payloads_present)
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
757 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
758 else
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
759 asf->packet_size_left -= (payload_len + PAYLOAD_HEADER_SIZE_SINGLE_PAYLOAD);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
760 asf->packet_timestamp_end = timestamp;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
761
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
762 asf->packet_nb_payloads++;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
763 } else {
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
764 payload_len = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
765 }
373
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
766 m_obj_offset += payload_len;
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
767 buf += payload_len;
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
768
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
769 if (!asf->multi_payloads_present)
e47d9c8e2054 asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents: 372
diff changeset
770 flush_packet(s);
1775
3562fd629c37 fix broken memset(padding, 0) code
michael
parents: 1766
diff changeset
771 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
772 flush_packet(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
773 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
774 stream->seq++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
775 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
776
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
777 static int asf_write_packet(AVFormatContext *s, AVPacket *pkt)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
778 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
779 ASFContext *asf = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
780 ASFStream *stream;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 14
diff changeset
781 int64_t duration;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
782 AVCodecContext *codec;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
783 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
784 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
785 int flags= pkt->flags;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
786
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 743
diff changeset
787 codec = s->streams[pkt->stream_index]->codec;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
788 stream = &asf->streams[pkt->stream_index];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
789
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
790 if(codec->codec_type == CODEC_TYPE_AUDIO)
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
791 flags &= ~PKT_FLAG_KEY;
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
792
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
793 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
794 assert(pts != AV_NOPTS_VALUE);
cb8b538021cd muxing packets with unknown timestamps is not allowed
michael
parents: 1687
diff changeset
795 duration = pts * 10000;
3236
57baf1166899 Correct ASF duration.
benoit
parents: 2991
diff changeset
796 asf->duration= FFMAX(asf->duration, duration + pkt->duration * 10000);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
797
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
798 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
799 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
800
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
801 /* check index */
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
802 if ((!asf->is_streamed) && (flags & PKT_FLAG_KEY)) {
1556
65b7b3ff4ed7 use the standard INT64_C() macro for 64-bit constants
mru
parents: 1415
diff changeset
803 start_sec = (int)(duration / INT64_C(10000000));
65b7b3ff4ed7 use the standard INT64_C() macro for 64-bit constants
mru
parents: 1415
diff changeset
804 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
805 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
806 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
807 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
808 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
809 }
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
810 // store
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
811 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
812 asf->index_ptr[i].packet_count = (uint16_t)(asf->nb_packets-packet_st);
1685
22abad288650 simplify
michael
parents: 1683
diff changeset
813 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
814 }
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
815 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
816 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
817 }
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
818 }
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
819 return 0;
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
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
822 //
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
823 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
824 {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
825 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
826 int i;
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
827
4593
0d8b36d98ce2 move static tables from asf.h to non-static tables in asf.c
aurel
parents: 4592
diff changeset
828 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
829 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
830 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
831 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
832 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
833 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
834 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
835 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
836 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
837 }
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
838
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
839 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
840 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
841
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
842 static int asf_write_trailer(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
843 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
844 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
845 int64_t file_size,data_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
846
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
847 /* flush the current packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
848 if (asf->pb.buf_ptr > asf->pb.buffer)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
849 flush_packet(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
850
716
55081ada3aad 31_ASF_compatibility_with_WMP_and_add_index.patch by (Calcium | calcium nurs or jp)
michael
parents: 672
diff changeset
851 /* write index */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
852 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
853 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
854 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
855 }
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
856 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
857
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
858 if (asf->is_streamed || url_is_streamed(s->pb)) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
859 put_chunk(s, 0x4524, 0, 0); /* end of stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
860 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
861 /* rewrite an updated header */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
862 file_size = url_ftell(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
863 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
864 asf_write_header1(s, file_size, data_size - asf->data_offset);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
865 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
866
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2615
diff changeset
867 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
868 av_free(asf->index_ptr);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
869 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
870 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
871
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 3931
diff changeset
872 #if CONFIG_ASF_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1123
diff changeset
873 AVOutputFormat asf_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
874 "asf",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3236
diff changeset
875 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
876 "video/x-ms-asf",
672
michael
parents: 668
diff changeset
877 "asf,wmv,wma",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
878 sizeof(ASFContext),
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 3931
diff changeset
879 #if CONFIG_LIBMP3LAME
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 196
diff changeset
880 CODEC_ID_MP3,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
881 #else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
882 CODEC_ID_MP2,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
883 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
884 CODEC_ID_MSMPEG4V3,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
885 asf_write_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
886 asf_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
887 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
888 .flags = AVFMT_GLOBALHEADER,
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4748
diff changeset
889 .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
890 .metadata_conv = ff_asf_metadata_conv,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
891 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
892 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
893
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 3931
diff changeset
894 #if CONFIG_ASF_STREAM_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1123
diff changeset
895 AVOutputFormat asf_stream_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
896 "asf_stream",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3236
diff changeset
897 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
898 "video/x-ms-asf",
672
michael
parents: 668
diff changeset
899 "asf,wmv,wma",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
900 sizeof(ASFContext),
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 3931
diff changeset
901 #if CONFIG_LIBMP3LAME
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 196
diff changeset
902 CODEC_ID_MP3,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
903 #else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
904 CODEC_ID_MP2,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
905 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
906 CODEC_ID_MSMPEG4V3,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
907 asf_write_stream_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
908 asf_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
909 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
910 .flags = AVFMT_GLOBALHEADER,
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4748
diff changeset
911 .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
912 .metadata_conv = ff_asf_metadata_conv,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
913 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
914 #endif //CONFIG_ASF_STREAM_MUXER