annotate oggenc.c @ 4883:584d9fb31093 libavformat

Change another AVERROR(EIO) inot AVERROR_EOF, because it really signals EOF, not a stream error. This also fixes an infinite loop on EOS during ASF file playback, and Michael claims he "likes the patch" (ref: [PATCH] RTSP-MS 15/15: move packet_time_start zero value assignment in asf.c" mailinglist tread).
author rbultje
date Fri, 17 Apr 2009 14:05:57 +0000
parents c05d167a4fe2
children 037f1082ecd6
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
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3188
diff changeset
22 #include "libavutil/crc.h"
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3188
diff changeset
23 #include "libavcodec/xiph.h"
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3188
diff changeset
24 #include "libavcodec/bytestream.h"
4578
c05d167a4fe2 Use a shared function to validate FLAC extradata.
jbr
parents: 4418
diff changeset
25 #include "libavcodec/flac.h"
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
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"
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
28
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
29 typedef struct {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
30 int64_t duration;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
31 unsigned page_counter;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
32 uint8_t *header[3];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
33 int header_len[3];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
34 /** for theora granule */
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
35 int kfgshift;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
36 int64_t last_kf_pts;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
37 int vrev;
3021
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
38 int eos;
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
39 } OGGStreamContext;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
40
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3593
diff changeset
41 static void ogg_update_checksum(AVFormatContext *s, int64_t crc_offset)
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
42 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3593
diff changeset
43 int64_t pos = url_ftell(s->pb);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
44 uint32_t checksum = get_checksum(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
45 url_fseek(s->pb, crc_offset, SEEK_SET);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
46 put_be32(s->pb, checksum);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
47 url_fseek(s->pb, pos, SEEK_SET);
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
48 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
49
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
50 static int ogg_write_page(AVFormatContext *s, const uint8_t *data, int size,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
51 int64_t granule, int stream_index, int flags)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
52 {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
53 OGGStreamContext *oggstream = s->streams[stream_index]->priv_data;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3593
diff changeset
54 int64_t crc_offset;
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
55 int page_segments, i;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
56
3020
38777f77320e it seems ogg requires granule to be -1 on unfinished packets
bcoudurier
parents: 2771
diff changeset
57 if (size >= 255*255) {
38777f77320e it seems ogg requires granule to be -1 on unfinished packets
bcoudurier
parents: 2771
diff changeset
58 granule = -1;
38777f77320e it seems ogg requires granule to be -1 on unfinished packets
bcoudurier
parents: 2771
diff changeset
59 size = 255*255;
3021
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
60 } else if (oggstream->eos)
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
61 flags |= 4;
3020
38777f77320e it seems ogg requires granule to be -1 on unfinished packets
bcoudurier
parents: 2771
diff changeset
62
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
63 page_segments = FFMIN((size/255)+!!size, 255);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
64
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
65 init_checksum(s->pb, ff_crc04C11DB7_update, 0);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
66 put_tag(s->pb, "OggS");
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
67 put_byte(s->pb, 0);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
68 put_byte(s->pb, flags);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
69 put_le64(s->pb, granule);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
70 put_le32(s->pb, stream_index);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
71 put_le32(s->pb, oggstream->page_counter++);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
72 crc_offset = url_ftell(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
73 put_le32(s->pb, 0); // crc
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
74 put_byte(s->pb, page_segments);
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
75 for (i = 0; i < page_segments-1; i++)
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
76 put_byte(s->pb, 255);
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
77 if (size) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
78 put_byte(s->pb, size - (page_segments-1)*255);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
79 put_buffer(s->pb, data, size);
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
80 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
81 ogg_update_checksum(s, crc_offset);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
82 put_flush_packet(s->pb);
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
83 return size;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
84 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
85
4578
c05d167a4fe2 Use a shared function to validate FLAC extradata.
jbr
parents: 4418
diff changeset
86 static int ogg_build_flac_headers(AVCodecContext *avctx,
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
87 OGGStreamContext *oggstream, int bitexact)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
88 {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
89 const char *vendor = bitexact ? "ffmpeg" : LIBAVFORMAT_IDENT;
4578
c05d167a4fe2 Use a shared function to validate FLAC extradata.
jbr
parents: 4418
diff changeset
90 enum FLACExtradataFormat format;
c05d167a4fe2 Use a shared function to validate FLAC extradata.
jbr
parents: 4418
diff changeset
91 uint8_t *streaminfo;
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
92 uint8_t *p;
4578
c05d167a4fe2 Use a shared function to validate FLAC extradata.
jbr
parents: 4418
diff changeset
93 if (!ff_flac_is_extradata_valid(avctx, &format, &streaminfo))
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
94 return -1;
3188
87119f0c4736 fix Ogg/FLAC header size
jbr
parents: 3021
diff changeset
95 oggstream->header_len[0] = 51;
87119f0c4736 fix Ogg/FLAC header size
jbr
parents: 3021
diff changeset
96 oggstream->header[0] = av_mallocz(51); // per ogg flac specs
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
97 p = oggstream->header[0];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
98 bytestream_put_byte(&p, 0x7F);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
99 bytestream_put_buffer(&p, "FLAC", 4);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
100 bytestream_put_byte(&p, 1); // major version
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
101 bytestream_put_byte(&p, 0); // minor version
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
102 bytestream_put_be16(&p, 1); // headers packets without this one
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
103 bytestream_put_buffer(&p, "fLaC", 4);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
104 bytestream_put_byte(&p, 0x00); // streaminfo
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
105 bytestream_put_be24(&p, 34);
4578
c05d167a4fe2 Use a shared function to validate FLAC extradata.
jbr
parents: 4418
diff changeset
106 bytestream_put_buffer(&p, streaminfo, FLAC_STREAMINFO_SIZE);
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
107 oggstream->header_len[1] = 1+3+4+strlen(vendor)+4;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
108 oggstream->header[1] = av_mallocz(oggstream->header_len[1]);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
109 p = oggstream->header[1];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
110 bytestream_put_byte(&p, 0x84); // last metadata block and vorbis comment
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
111 bytestream_put_be24(&p, oggstream->header_len[1] - 4);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
112 bytestream_put_le32(&p, strlen(vendor));
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
113 bytestream_put_buffer(&p, vendor, strlen(vendor));
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
114 bytestream_put_le32(&p, 0); // user comment list length
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
115 return 0;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
116 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
117
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
118 static int ogg_write_header(AVFormatContext *s)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
119 {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
120 OGGStreamContext *oggstream;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
121 int i, j;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
122 for (i = 0; i < s->nb_streams; i++) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
123 AVStream *st = s->streams[i];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
124 if (st->codec->codec_type == CODEC_TYPE_AUDIO)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
125 av_set_pts_info(st, 64, 1, st->codec->sample_rate);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
126 else if (st->codec->codec_type == CODEC_TYPE_VIDEO)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
127 av_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
128 if (st->codec->codec_id != CODEC_ID_VORBIS &&
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
129 st->codec->codec_id != CODEC_ID_THEORA &&
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
130 st->codec->codec_id != CODEC_ID_FLAC) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
131 av_log(s, AV_LOG_ERROR, "Unsupported codec id in stream %d\n", i);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
132 return -1;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
133 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
134
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
135 if (!st->codec->extradata || !st->codec->extradata_size) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
136 av_log(s, AV_LOG_ERROR, "No extradata present\n");
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
137 return -1;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
138 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
139 oggstream = av_mallocz(sizeof(*oggstream));
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
140 st->priv_data = oggstream;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
141 if (st->codec->codec_id == CODEC_ID_FLAC) {
4578
c05d167a4fe2 Use a shared function to validate FLAC extradata.
jbr
parents: 4418
diff changeset
142 if (ogg_build_flac_headers(st->codec,
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
143 oggstream, st->codec->flags & CODEC_FLAG_BITEXACT) < 0) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
144 av_log(s, AV_LOG_ERROR, "Extradata corrupted\n");
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
145 av_freep(&st->priv_data);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
146 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
147 } else {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
148 if (ff_split_xiph_headers(st->codec->extradata, st->codec->extradata_size,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
149 st->codec->codec_id == CODEC_ID_VORBIS ? 30 : 42,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
150 oggstream->header, oggstream->header_len) < 0) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
151 av_log(s, AV_LOG_ERROR, "Extradata corrupted\n");
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
152 av_freep(&st->priv_data);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
153 return -1;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
154 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
155 if (st->codec->codec_id == CODEC_ID_THEORA) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
156 /** KFGSHIFT is the width of the less significant section of the granule position
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
157 The less significant section is the frame count since the last keyframe */
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
158 oggstream->kfgshift = ((oggstream->header[0][40]&3)<<3)|(oggstream->header[0][41]>>5);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
159 oggstream->vrev = oggstream->header[0][9];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
160 av_log(s, AV_LOG_DEBUG, "theora kfgshift %d, vrev %d\n",
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
161 oggstream->kfgshift, oggstream->vrev);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
162 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
163 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
164 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
165 for (i = 0; i < 3; i++) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
166 for (j = 0; j < s->nb_streams; j++) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
167 AVStream *st = s->streams[j];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
168 OGGStreamContext *oggstream = st->priv_data;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
169 if (oggstream && oggstream->header_len[i]) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
170 ogg_write_page(s, oggstream->header[i], oggstream->header_len[i],
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
171 0, st->index, i ? 0 : 2); // bos
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
172 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
173 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
174 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
175 return 0;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
176 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
177
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
178 static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
179 {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
180 AVStream *st = s->streams[pkt->stream_index];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
181 OGGStreamContext *oggstream = st->priv_data;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
182 uint8_t *ptr = pkt->data;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
183 int ret, size = pkt->size;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
184 int64_t granule;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
185
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
186 if (st->codec->codec_id == CODEC_ID_THEORA) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
187 int64_t pts = oggstream->vrev < 1 ? pkt->pts : pkt->pts + pkt->duration;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
188 int pframe_count;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
189 if (pkt->flags & PKT_FLAG_KEY)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
190 oggstream->last_kf_pts = pts;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
191 pframe_count = pts - oggstream->last_kf_pts;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
192 // prevent frame count from overflow if key frame flag is not set
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
193 if (pframe_count >= (1<<oggstream->kfgshift)) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
194 oggstream->last_kf_pts += pframe_count;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
195 pframe_count = 0;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
196 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
197 granule = (oggstream->last_kf_pts<<oggstream->kfgshift) | pframe_count;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
198 } else
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
199 granule = pkt->pts + pkt->duration;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
200 oggstream->duration = granule;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
201 do {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
202 ret = ogg_write_page(s, ptr, size, granule, pkt->stream_index, ptr != pkt->data);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
203 ptr += ret; size -= ret;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
204 } while (size > 0 || ret == 255*255); // need to output a last nil page
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
205
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
206 return 0;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
207 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
208
4310
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
209 static int ogg_compare_granule(AVFormatContext *s, AVPacket *next, AVPacket *pkt)
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
210 {
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
211 AVStream *st2 = s->streams[next->stream_index];
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
212 AVStream *st = s->streams[pkt ->stream_index];
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
213
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
214 int64_t next_granule = av_rescale_q(next->pts + next->duration,
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
215 st2->time_base, AV_TIME_BASE_Q);
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
216 int64_t cur_granule = av_rescale_q(pkt ->pts + pkt ->duration,
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
217 st ->time_base, AV_TIME_BASE_Q);
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
218 return next_granule > cur_granule;
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
219 }
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
220
4311
03065a598506 function is static
bcoudurier
parents: 4310
diff changeset
221 static int ogg_interleave_per_granule(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush)
3021
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
222 {
4310
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
223 AVPacketList *pktl;
3021
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
224 int stream_count = 0;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
225 int streams[MAX_STREAMS] = {0};
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
226 int interleaved = 0;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
227
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
228 if (pkt) {
4310
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
229 ff_interleave_add_packet(s, pkt, ogg_compare_granule);
3021
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
230 }
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
231
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
232 pktl = s->packet_buffer;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
233 while (pktl) {
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
234 if (streams[pktl->pkt.stream_index] == 0)
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
235 stream_count++;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
236 streams[pktl->pkt.stream_index]++;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
237 // need to buffer at least one packet to set eos flag
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
238 if (streams[pktl->pkt.stream_index] == 2)
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
239 interleaved++;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
240 pktl = pktl->next;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
241 }
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
242
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
243 if ((s->nb_streams == stream_count && interleaved == stream_count) ||
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
244 (flush && stream_count)) {
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
245 pktl= s->packet_buffer;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
246 *out= pktl->pkt;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
247 s->packet_buffer = pktl->next;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
248 if (flush && streams[out->stream_index] == 1) {
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
249 OGGStreamContext *ogg = s->streams[out->stream_index]->priv_data;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
250 ogg->eos = 1;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
251 }
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
252 av_freep(&pktl);
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
253 return 1;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
254 } else {
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
255 av_init_packet(out);
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
256 return 0;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
257 }
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
258 }
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
259
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
260 static int ogg_write_trailer(AVFormatContext *s)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
261 {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
262 int i;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
263 for (i = 0; i < s->nb_streams; i++) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
264 AVStream *st = s->streams[i];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
265 OGGStreamContext *oggstream = st->priv_data;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
266 if (st->codec->codec_id == CODEC_ID_FLAC) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
267 av_free(oggstream->header[0]);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
268 av_free(oggstream->header[1]);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
269 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
270 av_freep(&st->priv_data);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
271 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
272 return 0;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
273 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
274
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
275 AVOutputFormat ogg_muxer = {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
276 "ogg",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3286
diff changeset
277 NULL_IF_CONFIG_SMALL("Ogg"),
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
278 "application/ogg",
3593
e08ec1936ad7 add ogv extension
bcoudurier
parents: 3592
diff changeset
279 "ogg,ogv",
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
280 0,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
281 CODEC_ID_FLAC,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
282 CODEC_ID_THEORA,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
283 ogg_write_header,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
284 ogg_write_packet,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
285 ogg_write_trailer,
3021
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
286 .interleave_packet = ogg_interleave_per_granule,
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
287 };