Mercurial > libavformat.hg
annotate rtpdec_xiph.c @ 5920:c07680f39362 libavformat
Reindent after r22766.
Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>.
author | rbultje |
---|---|
date | Thu, 01 Apr 2010 21:42:10 +0000 |
parents | abd4e9638613 |
children | f8d4cc91c798 |
rev | line source |
---|---|
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
1 /* |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
2 * Xiph RTP Protocols |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
3 * Copyright (c) 2010 Josh Allmann |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
4 * |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
5 * This file is part of FFmpeg. |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
6 * |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
8 * modify it under the terms of the GNU Lesser General Public |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
9 * License as published by the Free Software Foundation; either |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
11 * |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
15 * Lesser General Public License for more details. |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
16 * |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
17 * You should have received a copy of the GNU Lesser General Public |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
20 */ |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
21 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
22 /** |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
23 * @file libavformat/rtpdec_xiph.c |
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
24 * @brief Xiph / RTP Code |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
25 * @author Josh Allmann <joshua.allmann@gmail.com> |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
26 */ |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
27 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
28 #include "libavutil/avstring.h" |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
29 #include "libavutil/base64.h" |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
30 #include "libavcodec/bytestream.h" |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
31 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
32 #include <assert.h> |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
33 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
34 #include "rtpdec.h" |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
35 #include "rtpdec_xiph.h" |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
36 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
37 /** |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
38 * RTP/Xiph specific private data. |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
39 */ |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
40 struct PayloadContext { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
41 unsigned ident; ///< 24-bit stream configuration identifier |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
42 uint32_t timestamp; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
43 ByteIOContext* fragment; ///< buffer for split payloads |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
44 }; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
45 |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
46 static PayloadContext *xiph_new_context(void) |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
47 { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
48 return av_mallocz(sizeof(PayloadContext)); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
49 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
50 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
51 static inline void free_fragment_if_needed(PayloadContext * data) |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
52 { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
53 if (data->fragment) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
54 uint8_t* p; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
55 url_close_dyn_buf(data->fragment, &p); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
56 av_free(p); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
57 data->fragment = NULL; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
58 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
59 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
60 |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
61 static void xiph_free_context(PayloadContext * data) |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
62 { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
63 free_fragment_if_needed(data); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
64 av_free(data); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
65 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
66 |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
67 static int xiph_handle_packet(AVFormatContext * ctx, |
5920 | 68 PayloadContext * data, |
69 AVStream * st, | |
70 AVPacket * pkt, | |
71 uint32_t * timestamp, | |
72 const uint8_t * buf, int len, int flags) | |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
73 { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
74 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
75 int ident, fragmented, tdt, num_pkts, pkt_len; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
76 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
77 if (len < 6) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
78 av_log(ctx, AV_LOG_ERROR, "Invalid %d byte packet\n", len); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
79 return AVERROR_INVALIDDATA; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
80 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
81 |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
82 // read xiph rtp headers |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
83 ident = AV_RB24(buf); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
84 fragmented = buf[3] >> 6; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
85 tdt = (buf[3] >> 4) & 3; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
86 num_pkts = buf[3] & 7; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
87 pkt_len = AV_RB16(buf + 4); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
88 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
89 if (pkt_len > len - 6) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
90 av_log(ctx, AV_LOG_ERROR, |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
91 "Invalid packet length %d in %d byte packet\n", pkt_len, |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
92 len); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
93 return AVERROR_INVALIDDATA; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
94 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
95 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
96 if (ident != data->ident) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
97 av_log(ctx, AV_LOG_ERROR, |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
98 "Unimplemented Xiph SDP configuration change detected\n"); |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
99 return AVERROR_PATCHWELCOME; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
100 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
101 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
102 if (tdt) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
103 av_log(ctx, AV_LOG_ERROR, |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
104 "Unimplemented RTP Xiph packet settings (%d,%d,%d)\n", |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
105 fragmented, tdt, num_pkts); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
106 return AVERROR_PATCHWELCOME; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
107 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
108 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
109 buf += 6; // move past header bits |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
110 len -= 6; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
111 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
112 if (fragmented == 0) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
113 // whole frame(s) |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
114 int i, data_len, write_len; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
115 buf -= 2; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
116 len += 2; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
117 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
118 // fast first pass to calculate total length |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
119 for (i = 0, data_len = 0; (i < num_pkts) && (len >= 2); i++) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
120 int off = data_len + (i << 1); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
121 pkt_len = AV_RB16(buf + off); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
122 data_len += pkt_len; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
123 len -= pkt_len + 2; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
124 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
125 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
126 if (len < 0 || i < num_pkts) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
127 av_log(ctx, AV_LOG_ERROR, |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
128 "Bad packet: %d bytes left at frame %d of %d\n", |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
129 len, i, num_pkts); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
130 return AVERROR_INVALIDDATA; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
131 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
132 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
133 if (av_new_packet(pkt, data_len)) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
134 av_log(ctx, AV_LOG_ERROR, "Out of memory.\n"); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
135 return AVERROR_NOMEM; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
136 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
137 pkt->stream_index = st->index; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
138 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
139 // concatenate frames |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
140 for (i = 0, write_len = 0; write_len < data_len; i++) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
141 pkt_len = AV_RB16(buf); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
142 buf += 2; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
143 memcpy(pkt->data + write_len, buf, pkt_len); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
144 write_len += pkt_len; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
145 buf += pkt_len; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
146 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
147 assert(write_len == data_len); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
148 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
149 return 0; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
150 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
151 } else if (fragmented == 1) { |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
152 // start of xiph data fragment |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
153 int res; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
154 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
155 // end packet has been lost somewhere, so drop buffered data |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
156 free_fragment_if_needed(data); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
157 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
158 if((res = url_open_dyn_buf(&data->fragment)) < 0) |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
159 return res; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
160 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
161 put_buffer(data->fragment, buf, pkt_len); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
162 data->timestamp = *timestamp; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
163 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
164 } else { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
165 assert(fragmented < 4); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
166 if (data->timestamp != *timestamp) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
167 // skip if fragmented timestamp is incorrect; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
168 // a start packet has been lost somewhere |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
169 free_fragment_if_needed(data); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
170 av_log(ctx, AV_LOG_ERROR, "RTP timestamps don't match!\n"); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
171 return AVERROR_INVALIDDATA; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
172 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
173 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
174 // copy data to fragment buffer |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
175 put_buffer(data->fragment, buf, pkt_len); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
176 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
177 if (fragmented == 3) { |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
178 // end of xiph data packet |
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
179 uint8_t* xiph_data; |
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
180 int frame_size = url_close_dyn_buf(data->fragment, &xiph_data); |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
181 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
182 if (frame_size < 0) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
183 av_log(ctx, AV_LOG_ERROR, |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
184 "Error occurred when getting fragment buffer."); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
185 return frame_size; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
186 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
187 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
188 if (av_new_packet(pkt, frame_size)) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
189 av_log(ctx, AV_LOG_ERROR, "Out of memory.\n"); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
190 return AVERROR_NOMEM; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
191 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
192 |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
193 memcpy(pkt->data, xiph_data, frame_size); |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
194 pkt->stream_index = st->index; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
195 |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
196 av_free(xiph_data); |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
197 data->fragment = NULL; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
198 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
199 return 0; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
200 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
201 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
202 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
203 return AVERROR(EAGAIN); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
204 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
205 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
206 /** |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
207 * Length encoding described in RFC5215 section 3.1.1. |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
208 */ |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
209 static int get_base128(const uint8_t ** buf, const uint8_t * buf_end) |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
210 { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
211 int n = 0; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
212 for (; *buf < buf_end; ++*buf) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
213 n <<= 7; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
214 n += **buf & 0x7f; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
215 if (!(**buf & 0x80)) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
216 ++*buf; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
217 return n; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
218 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
219 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
220 return 0; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
221 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
222 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
223 /** |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
224 * Based off parse_packed_headers in Vorbis RTP |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
225 */ |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
226 static unsigned int |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
227 parse_packed_headers(const uint8_t * packed_headers, |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
228 const uint8_t * packed_headers_end, |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
229 AVCodecContext * codec, PayloadContext * xiph_data) |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
230 { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
231 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
232 unsigned num_packed, num_headers, length, length1, length2, extradata_alloc; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
233 uint8_t *ptr; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
234 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
235 if (packed_headers_end - packed_headers < 9) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
236 av_log(codec, AV_LOG_ERROR, |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
237 "Invalid %d byte packed header.", |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
238 packed_headers_end - packed_headers); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
239 return AVERROR_INVALIDDATA; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
240 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
241 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
242 num_packed = bytestream_get_be32(&packed_headers); |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
243 xiph_data->ident = bytestream_get_be24(&packed_headers); |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
244 length = bytestream_get_be16(&packed_headers); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
245 num_headers = get_base128(&packed_headers, packed_headers_end); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
246 length1 = get_base128(&packed_headers, packed_headers_end); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
247 length2 = get_base128(&packed_headers, packed_headers_end); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
248 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
249 if (num_packed != 1 || num_headers > 3) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
250 av_log(codec, AV_LOG_ERROR, |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
251 "Unimplemented number of headers: %d packed headers, %d headers\n", |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
252 num_packed, num_headers); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
253 return AVERROR_PATCHWELCOME; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
254 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
255 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
256 if (packed_headers_end - packed_headers != length || |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
257 length1 > length || length2 > length - length1) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
258 av_log(codec, AV_LOG_ERROR, |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
259 "Bad packed header lengths (%d,%d,%d,%d)\n", length1, |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
260 length2, packed_headers_end - packed_headers, length); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
261 return AVERROR_INVALIDDATA; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
262 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
263 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
264 /* allocate extra space: |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
265 * -- length/255 +2 for xiphlacing |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
266 * -- one for the '2' marker |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
267 * -- FF_INPUT_BUFFER_PADDING_SIZE required */ |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
268 extradata_alloc = length + length/255 + 3 + FF_INPUT_BUFFER_PADDING_SIZE; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
269 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
270 ptr = codec->extradata = av_malloc(extradata_alloc); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
271 if (!ptr) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
272 av_log(codec, AV_LOG_ERROR, "Out of memory\n"); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
273 return AVERROR_NOMEM; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
274 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
275 *ptr++ = 2; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
276 ptr += av_xiphlacing(ptr, length1); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
277 ptr += av_xiphlacing(ptr, length2); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
278 memcpy(ptr, packed_headers, length); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
279 ptr += length; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
280 codec->extradata_size = ptr - codec->extradata; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
281 // clear out remaining parts of the buffer |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
282 memset(ptr, 0, extradata_alloc - codec->extradata_size); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
283 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
284 return 0; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
285 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
286 |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
287 static int xiph_parse_fmtp_pair(AVCodecContext * codec, |
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
288 PayloadContext *xiph_data, |
5920 | 289 char *attr, char *value) |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
290 { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
291 int result = 0; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
292 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
293 if (!strcmp(attr, "sampling")) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
294 return AVERROR_PATCHWELCOME; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
295 } else if (!strcmp(attr, "width")) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
296 /* This is an integer between 1 and 1048561 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
297 * and MUST be in multiples of 16. */ |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
298 codec->width = atoi(value); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
299 return 0; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
300 } else if (!strcmp(attr, "height")) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
301 /* This is an integer between 1 and 1048561 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
302 * and MUST be in multiples of 16. */ |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
303 codec->height = atoi(value); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
304 return 0; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
305 } else if (!strcmp(attr, "delivery-method")) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
306 /* Possible values are: inline, in_band, out_band/specific_name. */ |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
307 return AVERROR_PATCHWELCOME; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
308 } else if (!strcmp(attr, "configuration-uri")) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
309 /* NOTE: configuration-uri is supported only under 2 conditions: |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
310 *--after the delivery-method tag |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
311 * --with a delivery-method value of out_band */ |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
312 return AVERROR_PATCHWELCOME; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
313 } else if (!strcmp(attr, "configuration")) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
314 /* NOTE: configuration is supported only AFTER the delivery-method tag |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
315 * The configuration value is a base64 encoded packed header */ |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
316 uint8_t *decoded_packet = NULL; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
317 int packet_size; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
318 size_t decoded_alloc = strlen(value) / 4 * 3 + 4; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
319 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
320 if (decoded_alloc <= INT_MAX) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
321 decoded_packet = av_malloc(decoded_alloc); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
322 if (decoded_packet) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
323 packet_size = |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
324 av_base64_decode(decoded_packet, value, decoded_alloc); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
325 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
326 result = parse_packed_headers |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
327 (decoded_packet, decoded_packet + packet_size, codec, |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
328 xiph_data); |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
329 } else { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
330 av_log(codec, AV_LOG_ERROR, |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
331 "Out of memory while decoding SDP configuration.\n"); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
332 result = AVERROR_NOMEM; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
333 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
334 } else { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
335 av_log(codec, AV_LOG_ERROR, "Packet too large\n"); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
336 result = AVERROR_INVALIDDATA; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
337 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
338 av_free(decoded_packet); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
339 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
340 return result; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
341 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
342 |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
343 static int xiph_parse_sdp_line(AVFormatContext *s, int st_index, |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
344 PayloadContext *data, const char *line) |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
345 { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
346 const char *p; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
347 char *value; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
348 char attr[25]; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
349 int value_size = strlen(line), attr_size = sizeof(attr), res = 0; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
350 AVCodecContext* codec = s->streams[st_index]->codec; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
351 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
352 assert(codec->id == CODEC_ID_THEORA); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
353 assert(data); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
354 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
355 if (!(value = av_malloc(value_size))) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
356 av_log(codec, AV_LOG_ERROR, "Out of memory\n"); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
357 return AVERROR_NOMEM; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
358 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
359 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
360 if (av_strstart(line, "fmtp:", &p)) { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
361 // remove protocol identifier |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
362 while (*p && *p == ' ') p++; // strip spaces |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
363 while (*p && *p != ' ') p++; // eat protocol identifier |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
364 while (*p && *p == ' ') p++; // strip trailing spaces |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
365 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
366 while (ff_rtsp_next_attr_and_value(&p, |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
367 attr, attr_size, |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
368 value, value_size)) { |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
369 res = xiph_parse_fmtp_pair(codec, data, attr, value); |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
370 if (res < 0 && res != AVERROR_PATCHWELCOME) |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
371 return res; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
372 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
373 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
374 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
375 av_free(value); |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
376 return 0; |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
377 } |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
378 |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
379 RTPDynamicProtocolHandler ff_theora_dynamic_handler = { |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
380 .enc_name = "theora", |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
381 .codec_type = AVMEDIA_TYPE_VIDEO, |
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
382 .codec_id = CODEC_ID_THEORA, |
5919
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
383 .parse_sdp_a_line = xiph_parse_sdp_line, |
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
384 .open = xiph_new_context, |
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
385 .close = xiph_free_context, |
abd4e9638613
Rename functions / comments from "Theora" to "Xiph" where relevant.
rbultje
parents:
5918
diff
changeset
|
386 .parse_packet = xiph_handle_packet |
5918
e3b4d7181606
Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
rbultje
parents:
diff
changeset
|
387 }; |