annotate oggenc.c @ 3020:38777f77320e libavformat

it seems ogg requires granule to be -1 on unfinished packets
author bcoudurier
date Tue, 05 Feb 2008 01:01:56 +0000
parents d52c718e83f9
children 6f393e79e896
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
1 /*
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
2 * Ogg muxer
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
3 * Copyright (c) 2007 Baptiste Coudurier <baptiste dot coudurier at free dot fr>
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
4 *
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
5 * This file is part of FFmpeg.
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
6 *
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
11 *
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
15 * Lesser General Public License for more details.
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
16 *
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
20 */
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
21
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
22 #include "avformat.h"
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
23 #include "crc.h"
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
24 #include "xiph.h"
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
25 #include "bytestream.h"
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
26
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
27 typedef struct {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
28 int64_t duration;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
29 unsigned page_counter;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
30 uint8_t *header[3];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
31 int header_len[3];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
32 /** for theora granule */
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
33 int kfgshift;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
34 int64_t last_kf_pts;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
35 int vrev;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
36 } OGGStreamContext;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
37
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
38 static void ogg_update_checksum(AVFormatContext *s, offset_t crc_offset)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
39 {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
40 offset_t pos = url_ftell(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
41 uint32_t checksum = get_checksum(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
42 url_fseek(s->pb, crc_offset, SEEK_SET);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
43 put_be32(s->pb, checksum);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
44 url_fseek(s->pb, pos, SEEK_SET);
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
45 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
46
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
47 static int ogg_write_page(AVFormatContext *s, const uint8_t *data, int size,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
48 int64_t granule, int stream_index, int flags)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
49 {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
50 OGGStreamContext *oggstream = s->streams[stream_index]->priv_data;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
51 offset_t crc_offset;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
52 int page_segments, i;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
53
3020
38777f77320e it seems ogg requires granule to be -1 on unfinished packets
bcoudurier
parents: 2771
diff changeset
54 if (size >= 255*255) {
38777f77320e it seems ogg requires granule to be -1 on unfinished packets
bcoudurier
parents: 2771
diff changeset
55 granule = -1;
38777f77320e it seems ogg requires granule to be -1 on unfinished packets
bcoudurier
parents: 2771
diff changeset
56 size = 255*255;
38777f77320e it seems ogg requires granule to be -1 on unfinished packets
bcoudurier
parents: 2771
diff changeset
57 }
38777f77320e it seems ogg requires granule to be -1 on unfinished packets
bcoudurier
parents: 2771
diff changeset
58
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
59 page_segments = FFMIN((size/255)+!!size, 255);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
60
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
61 init_checksum(s->pb, ff_crc04C11DB7_update, 0);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
62 put_tag(s->pb, "OggS");
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
63 put_byte(s->pb, 0);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
64 put_byte(s->pb, flags);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
65 put_le64(s->pb, granule);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
66 put_le32(s->pb, stream_index);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
67 put_le32(s->pb, oggstream->page_counter++);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
68 crc_offset = url_ftell(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
69 put_le32(s->pb, 0); // crc
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
70 put_byte(s->pb, page_segments);
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
71 for (i = 0; i < page_segments-1; i++)
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
72 put_byte(s->pb, 255);
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
73 if (size) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
74 put_byte(s->pb, size - (page_segments-1)*255);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
75 put_buffer(s->pb, data, size);
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
76 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
77 ogg_update_checksum(s, crc_offset);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
78 put_flush_packet(s->pb);
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
79 return size;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
80 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
81
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
82 static int ogg_build_flac_headers(const uint8_t *extradata, int extradata_size,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
83 OGGStreamContext *oggstream, int bitexact)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
84 {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
85 const char *vendor = bitexact ? "ffmpeg" : LIBAVFORMAT_IDENT;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
86 uint8_t *p;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
87 if (extradata_size != 34)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
88 return -1;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
89 oggstream->header_len[0] = 79;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
90 oggstream->header[0] = av_mallocz(79); // per ogg flac specs
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
91 p = oggstream->header[0];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
92 bytestream_put_byte(&p, 0x7F);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
93 bytestream_put_buffer(&p, "FLAC", 4);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
94 bytestream_put_byte(&p, 1); // major version
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
95 bytestream_put_byte(&p, 0); // minor version
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
96 bytestream_put_be16(&p, 1); // headers packets without this one
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
97 bytestream_put_buffer(&p, "fLaC", 4);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
98 bytestream_put_byte(&p, 0x00); // streaminfo
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
99 bytestream_put_be24(&p, 34);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
100 bytestream_put_buffer(&p, extradata, 34);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
101 oggstream->header_len[1] = 1+3+4+strlen(vendor)+4;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
102 oggstream->header[1] = av_mallocz(oggstream->header_len[1]);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
103 p = oggstream->header[1];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
104 bytestream_put_byte(&p, 0x84); // last metadata block and vorbis comment
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
105 bytestream_put_be24(&p, oggstream->header_len[1] - 4);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
106 bytestream_put_le32(&p, strlen(vendor));
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
107 bytestream_put_buffer(&p, vendor, strlen(vendor));
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
108 bytestream_put_le32(&p, 0); // user comment list length
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
109 return 0;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
110 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
111
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
112 static int ogg_write_header(AVFormatContext *s)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
113 {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
114 OGGStreamContext *oggstream;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
115 int i, j;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
116 for (i = 0; i < s->nb_streams; i++) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
117 AVStream *st = s->streams[i];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
118 if (st->codec->codec_type == CODEC_TYPE_AUDIO)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
119 av_set_pts_info(st, 64, 1, st->codec->sample_rate);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
120 else if (st->codec->codec_type == CODEC_TYPE_VIDEO)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
121 av_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
122 if (st->codec->codec_id != CODEC_ID_VORBIS &&
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
123 st->codec->codec_id != CODEC_ID_THEORA &&
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
124 st->codec->codec_id != CODEC_ID_FLAC) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
125 av_log(s, AV_LOG_ERROR, "Unsupported codec id in stream %d\n", i);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
126 return -1;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
127 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
128
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
129 if (!st->codec->extradata || !st->codec->extradata_size) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
130 av_log(s, AV_LOG_ERROR, "No extradata present\n");
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
131 return -1;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
132 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
133 oggstream = av_mallocz(sizeof(*oggstream));
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
134 st->priv_data = oggstream;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
135 if (st->codec->codec_id == CODEC_ID_FLAC) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
136 if (ogg_build_flac_headers(st->codec->extradata, st->codec->extradata_size,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
137 oggstream, st->codec->flags & CODEC_FLAG_BITEXACT) < 0) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
138 av_log(s, AV_LOG_ERROR, "Extradata corrupted\n");
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
139 av_freep(&st->priv_data);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
140 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
141 } else {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
142 if (ff_split_xiph_headers(st->codec->extradata, st->codec->extradata_size,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
143 st->codec->codec_id == CODEC_ID_VORBIS ? 30 : 42,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
144 oggstream->header, oggstream->header_len) < 0) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
145 av_log(s, AV_LOG_ERROR, "Extradata corrupted\n");
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
146 av_freep(&st->priv_data);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
147 return -1;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
148 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
149 if (st->codec->codec_id == CODEC_ID_THEORA) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
150 /** KFGSHIFT is the width of the less significant section of the granule position
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
151 The less significant section is the frame count since the last keyframe */
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
152 oggstream->kfgshift = ((oggstream->header[0][40]&3)<<3)|(oggstream->header[0][41]>>5);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
153 oggstream->vrev = oggstream->header[0][9];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
154 av_log(s, AV_LOG_DEBUG, "theora kfgshift %d, vrev %d\n",
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
155 oggstream->kfgshift, oggstream->vrev);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
156 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
157 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
158 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
159 for (i = 0; i < 3; i++) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
160 for (j = 0; j < s->nb_streams; j++) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
161 AVStream *st = s->streams[j];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
162 OGGStreamContext *oggstream = st->priv_data;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
163 if (oggstream && oggstream->header_len[i]) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
164 ogg_write_page(s, oggstream->header[i], oggstream->header_len[i],
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
165 0, st->index, i ? 0 : 2); // bos
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
166 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
167 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
168 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
169 return 0;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
170 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
171
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
172 static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
173 {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
174 AVStream *st = s->streams[pkt->stream_index];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
175 OGGStreamContext *oggstream = st->priv_data;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
176 uint8_t *ptr = pkt->data;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
177 int ret, size = pkt->size;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
178 int64_t granule;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
179
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
180 if (st->codec->codec_id == CODEC_ID_THEORA) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
181 int64_t pts = oggstream->vrev < 1 ? pkt->pts : pkt->pts + pkt->duration;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
182 int pframe_count;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
183 if (pkt->flags & PKT_FLAG_KEY)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
184 oggstream->last_kf_pts = pts;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
185 pframe_count = pts - oggstream->last_kf_pts;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
186 // prevent frame count from overflow if key frame flag is not set
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
187 if (pframe_count >= (1<<oggstream->kfgshift)) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
188 oggstream->last_kf_pts += pframe_count;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
189 pframe_count = 0;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
190 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
191 granule = (oggstream->last_kf_pts<<oggstream->kfgshift) | pframe_count;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
192 } else
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
193 granule = pkt->pts + pkt->duration;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
194 oggstream->duration = granule;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
195 do {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
196 ret = ogg_write_page(s, ptr, size, granule, pkt->stream_index, ptr != pkt->data);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
197 ptr += ret; size -= ret;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
198 } while (size > 0 || ret == 255*255); // need to output a last nil page
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
199
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
200 return 0;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
201 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
202
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
203
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
204 static int ogg_write_trailer(AVFormatContext *s)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
205 {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
206 int i;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
207 for (i = 0; i < s->nb_streams; i++) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
208 AVStream *st = s->streams[i];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
209 OGGStreamContext *oggstream = st->priv_data;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
210 ogg_write_page(s, NULL, 0, oggstream->duration, i, 4); // eos
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
211 if (st->codec->codec_id == CODEC_ID_FLAC) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
212 av_free(oggstream->header[0]);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
213 av_free(oggstream->header[1]);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
214 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
215 av_freep(&st->priv_data);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
216 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
217 return 0;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
218 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
219
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
220 AVOutputFormat ogg_muxer = {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
221 "ogg",
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
222 "Ogg format",
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
223 "application/ogg",
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
224 "ogg",
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
225 0,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
226 CODEC_ID_FLAC,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
227 CODEC_ID_THEORA,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
228 ogg_write_header,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
229 ogg_write_packet,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
230 ogg_write_trailer,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
231 };