Mercurial > libavformat.hg
annotate oggenc.c @ 6027:710cc5866cbf libavformat
In ogg muxer, pack multiple frames into one page, much lower overhead
author | bcoudurier |
---|---|
date | Fri, 21 May 2010 21:38:54 +0000 |
parents | 08cd1179a20d |
children | d920f5eb9d10 |
rev | line source |
---|---|
2731 | 1 /* |
2 * Ogg muxer | |
3 * Copyright (c) 2007 Baptiste Coudurier <baptiste dot coudurier at free dot fr> | |
4 * | |
5 * This file is part of FFmpeg. | |
6 * | |
7 * FFmpeg is free software; you can redistribute it and/or | |
8 * modify it under the terms of the GNU Lesser General Public | |
9 * License as published by the Free Software Foundation; either | |
10 * version 2.1 of the License, or (at your option) any later version. | |
11 * | |
12 * FFmpeg is distributed in the hope that it will be useful, | |
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Lesser General Public | |
18 * License along with FFmpeg; if not, write to the Free Software | |
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
20 */ | |
21 | |
3286 | 22 #include "libavutil/crc.h" |
23 #include "libavcodec/xiph.h" | |
24 #include "libavcodec/bytestream.h" | |
4578 | 25 #include "libavcodec/flac.h" |
2731 | 26 #include "avformat.h" |
4418
d5119d75439d
Move declaration of ff_interleave_add_packet to internal.h.
bcoudurier
parents:
4311
diff
changeset
|
27 #include "internal.h" |
5858
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
28 #include "vorbiscomment.h" |
2731 | 29 |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
30 #define MAX_PAGE_SIZE 65025 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
31 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
32 typedef struct { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
33 int64_t granule; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
34 int stream_index; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
35 uint8_t flags; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
36 uint8_t segments_count; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
37 uint8_t segments[255]; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
38 uint8_t data[MAX_PAGE_SIZE]; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
39 uint16_t size; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
40 } OGGPage; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
41 |
2731 | 42 typedef struct { |
43 int64_t duration; | |
44 unsigned page_counter; | |
45 uint8_t *header[3]; | |
46 int header_len[3]; | |
47 /** for theora granule */ | |
48 int kfgshift; | |
49 int64_t last_kf_pts; | |
50 int vrev; | |
3021 | 51 int eos; |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
52 unsigned page_count; ///< number of page buffered |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
53 OGGPage page; ///< current page |
2731 | 54 } OGGStreamContext; |
55 | |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
56 typedef struct OGGPageList { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
57 OGGPage page; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
58 struct OGGPageList *next; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
59 } OGGPageList; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
60 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
61 typedef struct { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
62 OGGPageList *page_list; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
63 } OGGContext; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
64 |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3593
diff
changeset
|
65 static void ogg_update_checksum(AVFormatContext *s, int64_t crc_offset) |
2731 | 66 { |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3593
diff
changeset
|
67 int64_t pos = url_ftell(s->pb); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2731
diff
changeset
|
68 uint32_t checksum = get_checksum(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2731
diff
changeset
|
69 url_fseek(s->pb, crc_offset, SEEK_SET); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2731
diff
changeset
|
70 put_be32(s->pb, checksum); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2731
diff
changeset
|
71 url_fseek(s->pb, pos, SEEK_SET); |
2731 | 72 } |
73 | |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
74 static void ogg_write_page(AVFormatContext *s, OGGPage *page, int extra_flags) |
2731 | 75 { |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
76 OGGStreamContext *oggstream = s->streams[page->stream_index]->priv_data; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3593
diff
changeset
|
77 int64_t crc_offset; |
2731 | 78 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2731
diff
changeset
|
79 init_checksum(s->pb, ff_crc04C11DB7_update, 0); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2731
diff
changeset
|
80 put_tag(s->pb, "OggS"); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2731
diff
changeset
|
81 put_byte(s->pb, 0); |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
82 put_byte(s->pb, page->flags | extra_flags); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
83 put_le64(s->pb, page->granule); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
84 put_le32(s->pb, page->stream_index); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2731
diff
changeset
|
85 put_le32(s->pb, oggstream->page_counter++); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2731
diff
changeset
|
86 crc_offset = url_ftell(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2731
diff
changeset
|
87 put_le32(s->pb, 0); // crc |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
88 put_byte(s->pb, page->segments_count); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
89 put_buffer(s->pb, page->segments, page->segments_count); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
90 put_buffer(s->pb, page->data, page->size); |
5851
d88fc4640994
Correctly write last 0 lacing value when packet size is multiple of 255, patch by Greg Maxwell, gmaxwell at gmail dot com
bcoudurier
parents:
5602
diff
changeset
|
91 |
2731 | 92 ogg_update_checksum(s, crc_offset); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2731
diff
changeset
|
93 put_flush_packet(s->pb); |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
94 oggstream->page_count--; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
95 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
96 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
97 static int64_t ogg_granule_to_timestamp(OGGStreamContext *oggstream, OGGPage *page) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
98 { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
99 if (oggstream->kfgshift) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
100 return (page->granule>>oggstream->kfgshift) + |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
101 (page->granule & ((1<<oggstream->kfgshift)-1)); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
102 else |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
103 return page->granule; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
104 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
105 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
106 static int ogg_compare_granule(AVFormatContext *s, OGGPage *next, OGGPage *page) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
107 { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
108 AVStream *st2 = s->streams[next->stream_index]; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
109 AVStream *st = s->streams[page->stream_index]; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
110 int64_t next_granule, cur_granule; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
111 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
112 if (next->granule == -1 || page->granule == -1) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
113 return 0; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
114 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
115 next_granule = av_rescale_q(ogg_granule_to_timestamp(st2->priv_data, next), |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
116 st2->time_base, AV_TIME_BASE_Q); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
117 cur_granule = av_rescale_q(ogg_granule_to_timestamp(st->priv_data, page), |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
118 st ->time_base, AV_TIME_BASE_Q); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
119 return next_granule > cur_granule; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
120 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
121 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
122 static int ogg_reset_cur_page(OGGStreamContext *oggstream) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
123 { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
124 oggstream->page.granule = -1; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
125 oggstream->page.flags = 0; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
126 oggstream->page.segments_count = 0; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
127 oggstream->page.size = 0; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
128 return 0; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
129 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
130 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
131 static int ogg_buffer_page(AVFormatContext *s, OGGStreamContext *oggstream) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
132 { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
133 OGGContext *ogg = s->priv_data; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
134 OGGPageList **p = &ogg->page_list; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
135 OGGPageList *l = av_mallocz(sizeof(*l)); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
136 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
137 if (!l) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
138 return AVERROR(ENOMEM); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
139 l->page = oggstream->page; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
140 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
141 oggstream->page_count++; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
142 ogg_reset_cur_page(oggstream); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
143 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
144 while (*p) { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
145 if (ogg_compare_granule(s, &(*p)->page, &l->page)) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
146 break; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
147 p = &(*p)->next; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
148 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
149 l->next = *p; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
150 *p = l; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
151 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
152 return 0; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
153 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
154 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
155 static int ogg_buffer_data(AVFormatContext *s, AVStream *st, |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
156 uint8_t *data, unsigned size, int64_t granule) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
157 { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
158 OGGStreamContext *oggstream = st->priv_data; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
159 int total_segments = size / 255 + 1; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
160 uint8_t *p = data; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
161 int i, segments, len; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
162 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
163 for (i = 0; i < total_segments; ) { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
164 OGGPage *page = &oggstream->page; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
165 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
166 segments = FFMIN(total_segments - i, 255 - page->segments_count); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
167 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
168 if (i && !page->segments_count) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
169 page->flags |= 1; // continued packet |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
170 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
171 memset(page->segments+page->segments_count, 255, segments - 1); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
172 page->segments_count += segments - 1; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
173 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
174 len = FFMIN(size, segments*255); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
175 page->segments[page->segments_count++] = len - (segments-1)*255; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
176 memcpy(page->data+page->size, p, len); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
177 p += len; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
178 size -= len; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
179 i += segments; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
180 page->size += len; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
181 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
182 if (i == total_segments) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
183 page->granule = granule; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
184 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
185 if (page->segments_count == 255) { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
186 ogg_buffer_page(s, oggstream); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
187 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
188 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
189 return 0; |
2731 | 190 } |
191 | |
5280 | 192 static uint8_t *ogg_write_vorbiscomment(int offset, int bitexact, |
5858
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
193 int *header_len, AVMetadata *m) |
5280 | 194 { |
195 const char *vendor = bitexact ? "ffmpeg" : LIBAVFORMAT_IDENT; | |
196 int size; | |
197 uint8_t *p, *p0; | |
5858
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
198 unsigned int count; |
5280 | 199 |
5858
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
200 size = offset + ff_vorbiscomment_length(m, vendor, &count); |
5280 | 201 p = av_mallocz(size); |
202 if (!p) | |
203 return NULL; | |
204 p0 = p; | |
205 | |
206 p += offset; | |
5858
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
207 ff_vorbiscomment_write(&p, m, vendor, count); |
5280 | 208 |
209 *header_len = size; | |
210 return p0; | |
211 } | |
212 | |
4578 | 213 static int ogg_build_flac_headers(AVCodecContext *avctx, |
5858
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
214 OGGStreamContext *oggstream, int bitexact, |
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
215 AVMetadata *m) |
2731 | 216 { |
4578 | 217 enum FLACExtradataFormat format; |
218 uint8_t *streaminfo; | |
2731 | 219 uint8_t *p; |
5054 | 220 |
4578 | 221 if (!ff_flac_is_extradata_valid(avctx, &format, &streaminfo)) |
2731 | 222 return -1; |
5054 | 223 |
224 // first packet: STREAMINFO | |
3188 | 225 oggstream->header_len[0] = 51; |
226 oggstream->header[0] = av_mallocz(51); // per ogg flac specs | |
2731 | 227 p = oggstream->header[0]; |
5053 | 228 if (!p) |
5930
08cd1179a20d
Replace all remaining occurrences of AVERROR_NOMEM with
stefano
parents:
5913
diff
changeset
|
229 return AVERROR(ENOMEM); |
2731 | 230 bytestream_put_byte(&p, 0x7F); |
231 bytestream_put_buffer(&p, "FLAC", 4); | |
232 bytestream_put_byte(&p, 1); // major version | |
233 bytestream_put_byte(&p, 0); // minor version | |
234 bytestream_put_be16(&p, 1); // headers packets without this one | |
235 bytestream_put_buffer(&p, "fLaC", 4); | |
236 bytestream_put_byte(&p, 0x00); // streaminfo | |
237 bytestream_put_be24(&p, 34); | |
4578 | 238 bytestream_put_buffer(&p, streaminfo, FLAC_STREAMINFO_SIZE); |
5054 | 239 |
240 // second packet: VorbisComment | |
5858
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
241 p = ogg_write_vorbiscomment(4, bitexact, &oggstream->header_len[1], m); |
5053 | 242 if (!p) |
5930
08cd1179a20d
Replace all remaining occurrences of AVERROR_NOMEM with
stefano
parents:
5913
diff
changeset
|
243 return AVERROR(ENOMEM); |
5280 | 244 oggstream->header[1] = p; |
2731 | 245 bytestream_put_byte(&p, 0x84); // last metadata block and vorbis comment |
246 bytestream_put_be24(&p, oggstream->header_len[1] - 4); | |
5280 | 247 |
248 return 0; | |
249 } | |
250 | |
251 #define SPEEX_HEADER_SIZE 80 | |
252 | |
253 static int ogg_build_speex_headers(AVCodecContext *avctx, | |
5858
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
254 OGGStreamContext *oggstream, int bitexact, |
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
255 AVMetadata *m) |
5280 | 256 { |
257 uint8_t *p; | |
258 | |
259 if (avctx->extradata_size < SPEEX_HEADER_SIZE) | |
260 return -1; | |
261 | |
262 // first packet: Speex header | |
263 p = av_mallocz(SPEEX_HEADER_SIZE); | |
264 if (!p) | |
5930
08cd1179a20d
Replace all remaining occurrences of AVERROR_NOMEM with
stefano
parents:
5913
diff
changeset
|
265 return AVERROR(ENOMEM); |
5280 | 266 oggstream->header[0] = p; |
267 oggstream->header_len[0] = SPEEX_HEADER_SIZE; | |
268 bytestream_put_buffer(&p, avctx->extradata, SPEEX_HEADER_SIZE); | |
269 AV_WL32(&oggstream->header[0][68], 0); // set extra_headers to 0 | |
270 | |
271 // second packet: VorbisComment | |
5858
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
272 p = ogg_write_vorbiscomment(0, bitexact, &oggstream->header_len[1], m); |
5280 | 273 if (!p) |
5930
08cd1179a20d
Replace all remaining occurrences of AVERROR_NOMEM with
stefano
parents:
5913
diff
changeset
|
274 return AVERROR(ENOMEM); |
5280 | 275 oggstream->header[1] = p; |
5054 | 276 |
2731 | 277 return 0; |
278 } | |
279 | |
280 static int ogg_write_header(AVFormatContext *s) | |
281 { | |
282 OGGStreamContext *oggstream; | |
283 int i, j; | |
284 for (i = 0; i < s->nb_streams; i++) { | |
285 AVStream *st = s->streams[i]; | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5858
diff
changeset
|
286 if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) |
2731 | 287 av_set_pts_info(st, 64, 1, st->codec->sample_rate); |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5858
diff
changeset
|
288 else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) |
2731 | 289 av_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den); |
290 if (st->codec->codec_id != CODEC_ID_VORBIS && | |
291 st->codec->codec_id != CODEC_ID_THEORA && | |
5280 | 292 st->codec->codec_id != CODEC_ID_SPEEX && |
2731 | 293 st->codec->codec_id != CODEC_ID_FLAC) { |
294 av_log(s, AV_LOG_ERROR, "Unsupported codec id in stream %d\n", i); | |
295 return -1; | |
296 } | |
297 | |
298 if (!st->codec->extradata || !st->codec->extradata_size) { | |
299 av_log(s, AV_LOG_ERROR, "No extradata present\n"); | |
300 return -1; | |
301 } | |
302 oggstream = av_mallocz(sizeof(*oggstream)); | |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
303 oggstream->page.stream_index = i; |
2731 | 304 st->priv_data = oggstream; |
305 if (st->codec->codec_id == CODEC_ID_FLAC) { | |
5055
5a6bbdd352fb
oggenc: return error value from ogg_build_flac_headers()
jbr
parents:
5054
diff
changeset
|
306 int err = ogg_build_flac_headers(st->codec, oggstream, |
5858
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
307 st->codec->flags & CODEC_FLAG_BITEXACT, |
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
308 s->metadata); |
5055
5a6bbdd352fb
oggenc: return error value from ogg_build_flac_headers()
jbr
parents:
5054
diff
changeset
|
309 if (err) { |
5056
f67fad61077e
oggenc: Change error log text. An error here does not necessarily mean
jbr
parents:
5055
diff
changeset
|
310 av_log(s, AV_LOG_ERROR, "Error writing FLAC headers\n"); |
2731 | 311 av_freep(&st->priv_data); |
5055
5a6bbdd352fb
oggenc: return error value from ogg_build_flac_headers()
jbr
parents:
5054
diff
changeset
|
312 return err; |
2731 | 313 } |
5280 | 314 } else if (st->codec->codec_id == CODEC_ID_SPEEX) { |
315 int err = ogg_build_speex_headers(st->codec, oggstream, | |
5858
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
316 st->codec->flags & CODEC_FLAG_BITEXACT, |
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
317 s->metadata); |
5280 | 318 if (err) { |
319 av_log(s, AV_LOG_ERROR, "Error writing Speex headers\n"); | |
320 av_freep(&st->priv_data); | |
321 return err; | |
322 } | |
2731 | 323 } else { |
324 if (ff_split_xiph_headers(st->codec->extradata, st->codec->extradata_size, | |
325 st->codec->codec_id == CODEC_ID_VORBIS ? 30 : 42, | |
326 oggstream->header, oggstream->header_len) < 0) { | |
327 av_log(s, AV_LOG_ERROR, "Extradata corrupted\n"); | |
328 av_freep(&st->priv_data); | |
329 return -1; | |
330 } | |
331 if (st->codec->codec_id == CODEC_ID_THEORA) { | |
332 /** KFGSHIFT is the width of the less significant section of the granule position | |
333 The less significant section is the frame count since the last keyframe */ | |
334 oggstream->kfgshift = ((oggstream->header[0][40]&3)<<3)|(oggstream->header[0][41]>>5); | |
335 oggstream->vrev = oggstream->header[0][9]; | |
336 av_log(s, AV_LOG_DEBUG, "theora kfgshift %d, vrev %d\n", | |
337 oggstream->kfgshift, oggstream->vrev); | |
338 } | |
339 } | |
340 } | |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
341 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
342 for (j = 0; j < s->nb_streams; j++) { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
343 OGGStreamContext *oggstream = s->streams[j]->priv_data; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
344 ogg_buffer_data(s, s->streams[j], oggstream->header[0], |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
345 oggstream->header_len[0], 0); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
346 oggstream->page.flags |= 2; // bos |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
347 ogg_buffer_page(s, oggstream); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
348 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
349 for (j = 0; j < s->nb_streams; j++) { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
350 AVStream *st = s->streams[j]; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
351 OGGStreamContext *oggstream = st->priv_data; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
352 for (i = 1; i < 3; i++) { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
353 if (oggstream && oggstream->header_len[i]) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
354 ogg_buffer_data(s, st, oggstream->header[i], |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
355 oggstream->header_len[i], 0); |
2731 | 356 } |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
357 ogg_buffer_page(s, oggstream); |
2731 | 358 } |
359 return 0; | |
360 } | |
361 | |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
362 static void ogg_write_pages(AVFormatContext *s, int flush) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
363 { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
364 OGGContext *ogg = s->priv_data; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
365 OGGPageList *next, *p; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
366 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
367 if (!ogg->page_list) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
368 return; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
369 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
370 for (p = ogg->page_list; p; ) { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
371 OGGStreamContext *oggstream = |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
372 s->streams[p->page.stream_index]->priv_data; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
373 if (oggstream->page_count < 2 && !flush) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
374 break; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
375 ogg_write_page(s, &p->page, |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
376 flush && oggstream->page_count == 1 ? 4 : 0); // eos |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
377 next = p->next; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
378 av_freep(&p); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
379 p = next; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
380 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
381 ogg->page_list = p; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
382 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
383 |
2731 | 384 static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt) |
385 { | |
386 AVStream *st = s->streams[pkt->stream_index]; | |
387 OGGStreamContext *oggstream = st->priv_data; | |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
388 int ret; |
2731 | 389 int64_t granule; |
390 | |
391 if (st->codec->codec_id == CODEC_ID_THEORA) { | |
392 int64_t pts = oggstream->vrev < 1 ? pkt->pts : pkt->pts + pkt->duration; | |
393 int pframe_count; | |
5913
11bb10c37225
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents:
5910
diff
changeset
|
394 if (pkt->flags & AV_PKT_FLAG_KEY) |
2731 | 395 oggstream->last_kf_pts = pts; |
396 pframe_count = pts - oggstream->last_kf_pts; | |
397 // prevent frame count from overflow if key frame flag is not set | |
398 if (pframe_count >= (1<<oggstream->kfgshift)) { | |
399 oggstream->last_kf_pts += pframe_count; | |
400 pframe_count = 0; | |
401 } | |
402 granule = (oggstream->last_kf_pts<<oggstream->kfgshift) | pframe_count; | |
403 } else | |
404 granule = pkt->pts + pkt->duration; | |
405 oggstream->duration = granule; | |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
406 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
407 ret = ogg_buffer_data(s, st, pkt->data, pkt->size, granule); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
408 if (ret < 0) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
409 return ret; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
410 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
411 ogg_write_pages(s, 0); |
2731 | 412 |
413 return 0; | |
414 } | |
415 | |
416 static int ogg_write_trailer(AVFormatContext *s) | |
417 { | |
418 int i; | |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
419 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
420 /* flush current page */ |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
421 for (i = 0; i < s->nb_streams; i++) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
422 ogg_buffer_page(s, s->streams[i]->priv_data); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
423 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
424 ogg_write_pages(s, 1); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
425 |
2731 | 426 for (i = 0; i < s->nb_streams; i++) { |
427 AVStream *st = s->streams[i]; | |
428 OGGStreamContext *oggstream = st->priv_data; | |
5280 | 429 if (st->codec->codec_id == CODEC_ID_FLAC || |
430 st->codec->codec_id == CODEC_ID_SPEEX) { | |
2731 | 431 av_free(oggstream->header[0]); |
432 av_free(oggstream->header[1]); | |
433 } | |
434 av_freep(&st->priv_data); | |
435 } | |
436 return 0; | |
437 } | |
438 | |
439 AVOutputFormat ogg_muxer = { | |
440 "ogg", | |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3286
diff
changeset
|
441 NULL_IF_CONFIG_SMALL("Ogg"), |
2731 | 442 "application/ogg", |
5280 | 443 "ogg,ogv,spx", |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
444 sizeof(OGGContext), |
2731 | 445 CODEC_ID_FLAC, |
446 CODEC_ID_THEORA, | |
447 ogg_write_header, | |
448 ogg_write_packet, | |
449 ogg_write_trailer, | |
5858
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
450 .metadata_conv = ff_vorbiscomment_metadata_conv, |
2731 | 451 }; |