Mercurial > libavformat.hg
annotate oggenc.c @ 6470:5d5fbab4d608 libavformat
adts demuxer: Set the time base to be the LCM of all ADTS sample rates.
author | alexc |
---|---|
date | Thu, 09 Sep 2010 23:15:17 +0000 |
parents | cf0ea082dad2 |
children |
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" |
6054
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
23 #include "libavutil/random_seed.h" |
3286 | 24 #include "libavcodec/xiph.h" |
25 #include "libavcodec/bytestream.h" | |
4578 | 26 #include "libavcodec/flac.h" |
2731 | 27 #include "avformat.h" |
4418
d5119d75439d
Move declaration of ff_interleave_add_packet to internal.h.
bcoudurier
parents:
4311
diff
changeset
|
28 #include "internal.h" |
5858
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
29 #include "vorbiscomment.h" |
2731 | 30 |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
31 #define MAX_PAGE_SIZE 65025 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
32 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
33 typedef struct { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
34 int64_t granule; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
35 int stream_index; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
36 uint8_t flags; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
37 uint8_t segments_count; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
38 uint8_t segments[255]; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
39 uint8_t data[MAX_PAGE_SIZE]; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
40 uint16_t size; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
41 } OGGPage; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
42 |
2731 | 43 typedef struct { |
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 |
6054
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
54 unsigned serial_num; ///< serial number |
2731 | 55 } OGGStreamContext; |
56 | |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
57 typedef struct OGGPageList { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
58 OGGPage page; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
59 struct OGGPageList *next; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
60 } OGGPageList; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
61 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
62 typedef struct { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
63 OGGPageList *page_list; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
64 } OGGContext; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
65 |
6260
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
66 static void ogg_update_checksum(AVFormatContext *s, ByteIOContext *pb, int64_t crc_offset) |
2731 | 67 { |
6260
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
68 int64_t pos = url_ftell(pb); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
69 uint32_t checksum = get_checksum(pb); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
70 url_fseek(pb, crc_offset, SEEK_SET); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
71 put_be32(pb, checksum); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
72 url_fseek(pb, pos, SEEK_SET); |
2731 | 73 } |
74 | |
6260
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
75 static int ogg_write_page(AVFormatContext *s, OGGPage *page, int extra_flags) |
2731 | 76 { |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
77 OGGStreamContext *oggstream = s->streams[page->stream_index]->priv_data; |
6260
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
78 ByteIOContext *pb; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3593
diff
changeset
|
79 int64_t crc_offset; |
6260
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
80 int ret, size; |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
81 uint8_t *buf; |
2731 | 82 |
6260
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
83 ret = url_open_dyn_buf(&pb); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
84 if (ret < 0) |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
85 return ret; |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
86 init_checksum(pb, ff_crc04C11DB7_update, 0); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
87 put_tag(pb, "OggS"); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
88 put_byte(pb, 0); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
89 put_byte(pb, page->flags | extra_flags); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
90 put_le64(pb, page->granule); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
91 put_le32(pb, oggstream->serial_num); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
92 put_le32(pb, oggstream->page_counter++); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
93 crc_offset = url_ftell(pb); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
94 put_le32(pb, 0); // crc |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
95 put_byte(pb, page->segments_count); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
96 put_buffer(pb, page->segments, page->segments_count); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
97 put_buffer(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
|
98 |
6260
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
99 ogg_update_checksum(s, pb, crc_offset); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
100 put_flush_packet(pb); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
101 |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
102 size = url_close_dyn_buf(pb, &buf); |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
103 if (size < 0) |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
104 return size; |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
105 |
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
106 put_buffer(s->pb, buf, size); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2731
diff
changeset
|
107 put_flush_packet(s->pb); |
6264
f4f55ad4a603
In ogg muxer, free dyn allocated buffer, fix memleak
bcoudurier
parents:
6260
diff
changeset
|
108 av_free(buf); |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
109 oggstream->page_count--; |
6260
5c17c20dd67a
In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
bcoudurier
parents:
6054
diff
changeset
|
110 return 0; |
6027
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 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
113 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
|
114 { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
115 if (oggstream->kfgshift) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
116 return (page->granule>>oggstream->kfgshift) + |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
117 (page->granule & ((1<<oggstream->kfgshift)-1)); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
118 else |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
119 return page->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_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
|
123 { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
124 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
|
125 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
|
126 int64_t next_granule, cur_granule; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
127 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
128 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
|
129 return 0; |
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 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
|
132 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
|
133 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
|
134 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
|
135 return next_granule > cur_granule; |
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 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
138 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
|
139 { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
140 oggstream->page.granule = -1; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
141 oggstream->page.flags = 0; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
142 oggstream->page.segments_count = 0; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
143 oggstream->page.size = 0; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
144 return 0; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
145 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
146 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
147 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
|
148 { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
149 OGGContext *ogg = s->priv_data; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
150 OGGPageList **p = &ogg->page_list; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
151 OGGPageList *l = av_mallocz(sizeof(*l)); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
152 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
153 if (!l) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
154 return AVERROR(ENOMEM); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
155 l->page = oggstream->page; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
156 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
157 oggstream->page_count++; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
158 ogg_reset_cur_page(oggstream); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
159 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
160 while (*p) { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
161 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
|
162 break; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
163 p = &(*p)->next; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
164 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
165 l->next = *p; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
166 *p = l; |
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 return 0; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
169 } |
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 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
|
172 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
|
173 { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
174 OGGStreamContext *oggstream = st->priv_data; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
175 int total_segments = size / 255 + 1; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
176 uint8_t *p = data; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
177 int i, segments, len; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
178 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
179 for (i = 0; i < total_segments; ) { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
180 OGGPage *page = &oggstream->page; |
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 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
|
183 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
184 if (i && !page->segments_count) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
185 page->flags |= 1; // continued packet |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
186 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
187 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
|
188 page->segments_count += segments - 1; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
189 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
190 len = FFMIN(size, segments*255); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
191 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
|
192 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
|
193 p += len; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
194 size -= len; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
195 i += segments; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
196 page->size += len; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
197 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
198 if (i == total_segments) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
199 page->granule = granule; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
200 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
201 if (page->segments_count == 255) { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
202 ogg_buffer_page(s, oggstream); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
203 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
204 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
205 return 0; |
2731 | 206 } |
207 | |
5280 | 208 static uint8_t *ogg_write_vorbiscomment(int offset, int bitexact, |
6459
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
209 int *header_len, AVMetadata *m, int framing_bit) |
5280 | 210 { |
211 const char *vendor = bitexact ? "ffmpeg" : LIBAVFORMAT_IDENT; | |
212 int size; | |
213 uint8_t *p, *p0; | |
5858
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
214 unsigned int count; |
5280 | 215 |
6459
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
216 size = offset + ff_vorbiscomment_length(m, vendor, &count) + framing_bit; |
5280 | 217 p = av_mallocz(size); |
218 if (!p) | |
219 return NULL; | |
220 p0 = p; | |
221 | |
222 p += offset; | |
5858
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
223 ff_vorbiscomment_write(&p, m, vendor, count); |
6459
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
224 if (framing_bit) |
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
225 bytestream_put_byte(&p, 1); |
5280 | 226 |
227 *header_len = size; | |
228 return p0; | |
229 } | |
230 | |
4578 | 231 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
|
232 OGGStreamContext *oggstream, int bitexact, |
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
233 AVMetadata *m) |
2731 | 234 { |
4578 | 235 enum FLACExtradataFormat format; |
236 uint8_t *streaminfo; | |
2731 | 237 uint8_t *p; |
5054 | 238 |
4578 | 239 if (!ff_flac_is_extradata_valid(avctx, &format, &streaminfo)) |
2731 | 240 return -1; |
5054 | 241 |
242 // first packet: STREAMINFO | |
3188 | 243 oggstream->header_len[0] = 51; |
244 oggstream->header[0] = av_mallocz(51); // per ogg flac specs | |
2731 | 245 p = oggstream->header[0]; |
5053 | 246 if (!p) |
5930
08cd1179a20d
Replace all remaining occurrences of AVERROR_NOMEM with
stefano
parents:
5913
diff
changeset
|
247 return AVERROR(ENOMEM); |
2731 | 248 bytestream_put_byte(&p, 0x7F); |
249 bytestream_put_buffer(&p, "FLAC", 4); | |
250 bytestream_put_byte(&p, 1); // major version | |
251 bytestream_put_byte(&p, 0); // minor version | |
252 bytestream_put_be16(&p, 1); // headers packets without this one | |
253 bytestream_put_buffer(&p, "fLaC", 4); | |
254 bytestream_put_byte(&p, 0x00); // streaminfo | |
255 bytestream_put_be24(&p, 34); | |
4578 | 256 bytestream_put_buffer(&p, streaminfo, FLAC_STREAMINFO_SIZE); |
5054 | 257 |
258 // second packet: VorbisComment | |
6459
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
259 p = ogg_write_vorbiscomment(4, bitexact, &oggstream->header_len[1], m, 0); |
5053 | 260 if (!p) |
5930
08cd1179a20d
Replace all remaining occurrences of AVERROR_NOMEM with
stefano
parents:
5913
diff
changeset
|
261 return AVERROR(ENOMEM); |
5280 | 262 oggstream->header[1] = p; |
2731 | 263 bytestream_put_byte(&p, 0x84); // last metadata block and vorbis comment |
264 bytestream_put_be24(&p, oggstream->header_len[1] - 4); | |
5280 | 265 |
266 return 0; | |
267 } | |
268 | |
269 #define SPEEX_HEADER_SIZE 80 | |
270 | |
271 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
|
272 OGGStreamContext *oggstream, int bitexact, |
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
273 AVMetadata *m) |
5280 | 274 { |
275 uint8_t *p; | |
276 | |
277 if (avctx->extradata_size < SPEEX_HEADER_SIZE) | |
278 return -1; | |
279 | |
280 // first packet: Speex header | |
281 p = av_mallocz(SPEEX_HEADER_SIZE); | |
282 if (!p) | |
5930
08cd1179a20d
Replace all remaining occurrences of AVERROR_NOMEM with
stefano
parents:
5913
diff
changeset
|
283 return AVERROR(ENOMEM); |
5280 | 284 oggstream->header[0] = p; |
285 oggstream->header_len[0] = SPEEX_HEADER_SIZE; | |
286 bytestream_put_buffer(&p, avctx->extradata, SPEEX_HEADER_SIZE); | |
287 AV_WL32(&oggstream->header[0][68], 0); // set extra_headers to 0 | |
288 | |
289 // second packet: VorbisComment | |
6459
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
290 p = ogg_write_vorbiscomment(0, bitexact, &oggstream->header_len[1], m, 0); |
5280 | 291 if (!p) |
5930
08cd1179a20d
Replace all remaining occurrences of AVERROR_NOMEM with
stefano
parents:
5913
diff
changeset
|
292 return AVERROR(ENOMEM); |
5280 | 293 oggstream->header[1] = p; |
5054 | 294 |
2731 | 295 return 0; |
296 } | |
297 | |
298 static int ogg_write_header(AVFormatContext *s) | |
299 { | |
300 OGGStreamContext *oggstream; | |
301 int i, j; | |
6054
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
302 |
2731 | 303 for (i = 0; i < s->nb_streams; i++) { |
304 AVStream *st = s->streams[i]; | |
6054
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
305 unsigned serial_num = i; |
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
306 |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5858
diff
changeset
|
307 if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) |
2731 | 308 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
|
309 else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) |
2731 | 310 av_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den); |
311 if (st->codec->codec_id != CODEC_ID_VORBIS && | |
312 st->codec->codec_id != CODEC_ID_THEORA && | |
5280 | 313 st->codec->codec_id != CODEC_ID_SPEEX && |
2731 | 314 st->codec->codec_id != CODEC_ID_FLAC) { |
315 av_log(s, AV_LOG_ERROR, "Unsupported codec id in stream %d\n", i); | |
316 return -1; | |
317 } | |
318 | |
319 if (!st->codec->extradata || !st->codec->extradata_size) { | |
320 av_log(s, AV_LOG_ERROR, "No extradata present\n"); | |
321 return -1; | |
322 } | |
323 oggstream = av_mallocz(sizeof(*oggstream)); | |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
324 oggstream->page.stream_index = i; |
6054
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
325 |
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
326 if (!(st->codec->flags & CODEC_FLAG_BITEXACT)) |
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
327 do { |
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
328 serial_num = av_get_random_seed(); |
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
329 for (j = 0; j < i; j++) { |
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
330 OGGStreamContext *sc = s->streams[j]->priv_data; |
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
331 if (serial_num == sc->serial_num) |
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
332 break; |
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
333 } |
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
334 } while (j < i); |
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
335 oggstream->serial_num = serial_num; |
a198eb01f895
In ogg muxer, use random serial number of each ogg streams
bcoudurier
parents:
6028
diff
changeset
|
336 |
2731 | 337 st->priv_data = oggstream; |
338 if (st->codec->codec_id == CODEC_ID_FLAC) { | |
5055
5a6bbdd352fb
oggenc: return error value from ogg_build_flac_headers()
jbr
parents:
5054
diff
changeset
|
339 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
|
340 st->codec->flags & CODEC_FLAG_BITEXACT, |
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
341 s->metadata); |
5055
5a6bbdd352fb
oggenc: return error value from ogg_build_flac_headers()
jbr
parents:
5054
diff
changeset
|
342 if (err) { |
5056
f67fad61077e
oggenc: Change error log text. An error here does not necessarily mean
jbr
parents:
5055
diff
changeset
|
343 av_log(s, AV_LOG_ERROR, "Error writing FLAC headers\n"); |
2731 | 344 av_freep(&st->priv_data); |
5055
5a6bbdd352fb
oggenc: return error value from ogg_build_flac_headers()
jbr
parents:
5054
diff
changeset
|
345 return err; |
2731 | 346 } |
5280 | 347 } else if (st->codec->codec_id == CODEC_ID_SPEEX) { |
348 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
|
349 st->codec->flags & CODEC_FLAG_BITEXACT, |
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
350 s->metadata); |
5280 | 351 if (err) { |
352 av_log(s, AV_LOG_ERROR, "Error writing Speex headers\n"); | |
353 av_freep(&st->priv_data); | |
354 return err; | |
355 } | |
2731 | 356 } else { |
6459
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
357 uint8_t *p; |
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
358 char *cstr = st->codec->codec_id == CODEC_ID_VORBIS ? "vorbis" : "theora"; |
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
359 int header_type = st->codec->codec_id == CODEC_ID_VORBIS ? 3 : 0x81; |
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
360 int framing_bit = st->codec->codec_id == CODEC_ID_VORBIS ? 1 : 0; |
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
361 |
2731 | 362 if (ff_split_xiph_headers(st->codec->extradata, st->codec->extradata_size, |
363 st->codec->codec_id == CODEC_ID_VORBIS ? 30 : 42, | |
364 oggstream->header, oggstream->header_len) < 0) { | |
365 av_log(s, AV_LOG_ERROR, "Extradata corrupted\n"); | |
366 av_freep(&st->priv_data); | |
367 return -1; | |
368 } | |
6459
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
369 |
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
370 p = ogg_write_vorbiscomment(7, st->codec->flags & CODEC_FLAG_BITEXACT, |
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
371 &oggstream->header_len[1], s->metadata, |
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
372 framing_bit); |
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
373 if (!p) |
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
374 return AVERROR(ENOMEM); |
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
375 |
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
376 oggstream->header[1] = p; |
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
377 bytestream_put_byte(&p, header_type); |
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
378 bytestream_put_buffer(&p, cstr, 6); |
cf0ea082dad2
Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
rbultje
parents:
6264
diff
changeset
|
379 |
2731 | 380 if (st->codec->codec_id == CODEC_ID_THEORA) { |
381 /** KFGSHIFT is the width of the less significant section of the granule position | |
382 The less significant section is the frame count since the last keyframe */ | |
383 oggstream->kfgshift = ((oggstream->header[0][40]&3)<<3)|(oggstream->header[0][41]>>5); | |
384 oggstream->vrev = oggstream->header[0][9]; | |
385 av_log(s, AV_LOG_DEBUG, "theora kfgshift %d, vrev %d\n", | |
386 oggstream->kfgshift, oggstream->vrev); | |
387 } | |
388 } | |
389 } | |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
390 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
391 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
|
392 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
|
393 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
|
394 oggstream->header_len[0], 0); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
395 oggstream->page.flags |= 2; // bos |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
396 ogg_buffer_page(s, oggstream); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
397 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
398 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
|
399 AVStream *st = s->streams[j]; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
400 OGGStreamContext *oggstream = st->priv_data; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
401 for (i = 1; i < 3; i++) { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
402 if (oggstream && oggstream->header_len[i]) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
403 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
|
404 oggstream->header_len[i], 0); |
2731 | 405 } |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
406 ogg_buffer_page(s, oggstream); |
2731 | 407 } |
408 return 0; | |
409 } | |
410 | |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
411 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
|
412 { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
413 OGGContext *ogg = s->priv_data; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
414 OGGPageList *next, *p; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
415 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
416 if (!ogg->page_list) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
417 return; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
418 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
419 for (p = ogg->page_list; p; ) { |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
420 OGGStreamContext *oggstream = |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
421 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
|
422 if (oggstream->page_count < 2 && !flush) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
423 break; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
424 ogg_write_page(s, &p->page, |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
425 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
|
426 next = p->next; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
427 av_freep(&p); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
428 p = next; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
429 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
430 ogg->page_list = p; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
431 } |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
432 |
2731 | 433 static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt) |
434 { | |
435 AVStream *st = s->streams[pkt->stream_index]; | |
436 OGGStreamContext *oggstream = st->priv_data; | |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
437 int ret; |
2731 | 438 int64_t granule; |
439 | |
440 if (st->codec->codec_id == CODEC_ID_THEORA) { | |
441 int64_t pts = oggstream->vrev < 1 ? pkt->pts : pkt->pts + pkt->duration; | |
442 int pframe_count; | |
5913
11bb10c37225
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents:
5910
diff
changeset
|
443 if (pkt->flags & AV_PKT_FLAG_KEY) |
2731 | 444 oggstream->last_kf_pts = pts; |
445 pframe_count = pts - oggstream->last_kf_pts; | |
446 // prevent frame count from overflow if key frame flag is not set | |
447 if (pframe_count >= (1<<oggstream->kfgshift)) { | |
448 oggstream->last_kf_pts += pframe_count; | |
449 pframe_count = 0; | |
450 } | |
451 granule = (oggstream->last_kf_pts<<oggstream->kfgshift) | pframe_count; | |
452 } else | |
453 granule = pkt->pts + pkt->duration; | |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
454 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
455 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
|
456 if (ret < 0) |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
457 return ret; |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
458 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
459 ogg_write_pages(s, 0); |
2731 | 460 |
461 return 0; | |
462 } | |
463 | |
464 static int ogg_write_trailer(AVFormatContext *s) | |
465 { | |
466 int i; | |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
467 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
468 /* flush current page */ |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
469 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
|
470 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
|
471 |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
472 ogg_write_pages(s, 1); |
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
473 |
2731 | 474 for (i = 0; i < s->nb_streams; i++) { |
475 AVStream *st = s->streams[i]; | |
476 OGGStreamContext *oggstream = st->priv_data; | |
5280 | 477 if (st->codec->codec_id == CODEC_ID_FLAC || |
478 st->codec->codec_id == CODEC_ID_SPEEX) { | |
2731 | 479 av_free(oggstream->header[0]); |
480 av_free(oggstream->header[1]); | |
481 } | |
482 av_freep(&st->priv_data); | |
483 } | |
484 return 0; | |
485 } | |
486 | |
487 AVOutputFormat ogg_muxer = { | |
488 "ogg", | |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3286
diff
changeset
|
489 NULL_IF_CONFIG_SMALL("Ogg"), |
2731 | 490 "application/ogg", |
5280 | 491 "ogg,ogv,spx", |
6027
710cc5866cbf
In ogg muxer, pack multiple frames into one page, much lower overhead
bcoudurier
parents:
5930
diff
changeset
|
492 sizeof(OGGContext), |
2731 | 493 CODEC_ID_FLAC, |
494 CODEC_ID_THEORA, | |
495 ogg_write_header, | |
496 ogg_write_packet, | |
497 ogg_write_trailer, | |
5858
274fed269b59
Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
jbr
parents:
5851
diff
changeset
|
498 .metadata_conv = ff_vorbiscomment_metadata_conv, |
2731 | 499 }; |