annotate mpeg.c @ 544:1244786bfb26 libavformat

cleanup video buffer size
author michael
date Sun, 03 Oct 2004 03:14:09 +0000
parents acf8a88674ff
children afe2c9a33928
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2 * MPEG1/2 mux/demux
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
3 * Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
4 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
5 * This library is free software; you can redistribute it and/or
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
7 * License as published by the Free Software Foundation; either
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * version 2 of the License, or (at your option) any later version.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
10 * This library is distributed in the hope that it will be useful,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 * License along with this library; if not, write to the Free Software
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
18 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
19 #include "avformat.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
20
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
21 #define MAX_PAYLOAD_SIZE 4096
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
22 #define PRELOAD 45000 //0.5sec
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
23 //#define DEBUG_SEEK
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
25 #undef NDEBUG
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
26 #include <assert.h>
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
27
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
28 typedef struct PacketDesc {
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
29 int64_t pts;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
30 int64_t dts;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
31 int size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
32 int unwritten_size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
33 int flags;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
34 struct PacketDesc *next;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
35 } PacketDesc;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
36
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
37 typedef struct {
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
38 FifoBuffer fifo;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
39 uint8_t id;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
40 int max_buffer_size; /* in bytes */
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
41 int buffer_index;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
42 PacketDesc *predecode_packet;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
43 PacketDesc *premux_packet;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
44 PacketDesc **next_packet;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
45 int packet_number;
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
46 uint8_t lpcm_header[3];
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
47 int lpcm_align;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
48 } StreamInfo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
49
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
50 typedef struct {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
51 int packet_size; /* required packet size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
52 int packet_number;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
53 int pack_header_freq; /* frequency (in packets^-1) at which we send pack headers */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
54 int system_header_freq;
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
55 int system_header_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
56 int mux_rate; /* bitrate in units of 50 bytes/s */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57 /* stream info */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
58 int audio_bound;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
59 int video_bound;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
60 int is_mpeg2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
61 int is_vcd;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
62 int is_svcd;
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
63 int64_t last_scr; /* current system clock */
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
64
541
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
65 double vcd_padding_bitrate; //FIXME floats
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
66 int64_t vcd_padding_bytes_written;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
67
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
68 } MpegMuxContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
69
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70 #define PACK_START_CODE ((unsigned int)0x000001ba)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
71 #define SYSTEM_HEADER_START_CODE ((unsigned int)0x000001bb)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
72 #define SEQUENCE_END_CODE ((unsigned int)0x000001b7)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
73 #define PACKET_START_CODE_MASK ((unsigned int)0xffffff00)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
74 #define PACKET_START_CODE_PREFIX ((unsigned int)0x00000100)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
75 #define ISO_11172_END_CODE ((unsigned int)0x000001b9)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
76
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
77 /* mpeg2 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
78 #define PROGRAM_STREAM_MAP 0x1bc
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
79 #define PRIVATE_STREAM_1 0x1bd
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
80 #define PADDING_STREAM 0x1be
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
81 #define PRIVATE_STREAM_2 0x1bf
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
82
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
83
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
84 #define AUDIO_ID 0xc0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
85 #define VIDEO_ID 0xe0
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
86 #define AC3_ID 0x80
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
87 #define DTS_ID 0x8a
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
88 #define LPCM_ID 0xa0
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
89
356
72c7cf2f3a7a CONFIG_ENCODERS fix by (Ronald Bultje <rbultje at ronald dot bitfreak dot net>)
michael
parents: 355
diff changeset
90 static const int lpcm_freq_tab[4] = { 48000, 96000, 44100, 32000 };
72c7cf2f3a7a CONFIG_ENCODERS fix by (Ronald Bultje <rbultje at ronald dot bitfreak dot net>)
michael
parents: 355
diff changeset
91
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 276
diff changeset
92 #ifdef CONFIG_ENCODERS
396
96f8086bc2ba warning patrol
mellum
parents: 370
diff changeset
93 static AVOutputFormat mpeg1system_mux;
96f8086bc2ba warning patrol
mellum
parents: 370
diff changeset
94 static AVOutputFormat mpeg1vcd_mux;
96f8086bc2ba warning patrol
mellum
parents: 370
diff changeset
95 static AVOutputFormat mpeg2vob_mux;
96f8086bc2ba warning patrol
mellum
parents: 370
diff changeset
96 static AVOutputFormat mpeg2svcd_mux;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
97
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
98 static int put_pack_header(AVFormatContext *ctx,
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
99 uint8_t *buf, int64_t timestamp)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
100 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
101 MpegMuxContext *s = ctx->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
102 PutBitContext pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
103
276
3dd3646e0164 init_put_bits changed
alex
parents: 242
diff changeset
104 init_put_bits(&pb, buf, 128);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
105
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
106 put_bits(&pb, 32, PACK_START_CODE);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
107 if (s->is_mpeg2) {
174
7d56e9f83fdb Write correct MPEG2-PS streams patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 165
diff changeset
108 put_bits(&pb, 2, 0x1);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
109 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110 put_bits(&pb, 4, 0x2);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
111 }
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
112 put_bits(&pb, 3, (uint32_t)((timestamp >> 30) & 0x07));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113 put_bits(&pb, 1, 1);
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
114 put_bits(&pb, 15, (uint32_t)((timestamp >> 15) & 0x7fff));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
115 put_bits(&pb, 1, 1);
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
116 put_bits(&pb, 15, (uint32_t)((timestamp) & 0x7fff));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
117 put_bits(&pb, 1, 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
118 if (s->is_mpeg2) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119 /* clock extension */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
120 put_bits(&pb, 9, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
121 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
122 put_bits(&pb, 1, 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
123 put_bits(&pb, 22, s->mux_rate);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
124 put_bits(&pb, 1, 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
125 if (s->is_mpeg2) {
357
f4f573c7dc56 Patch for MPEG-2 VOB headers by (Jimmy Blair <blueskyjb at verizon dot net>)
michael
parents: 356
diff changeset
126 put_bits(&pb, 1, 1);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
127 put_bits(&pb, 5, 0x1f); /* reserved */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
128 put_bits(&pb, 3, 0); /* stuffing length */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
129 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
130 flush_put_bits(&pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
131 return pbBufPtr(&pb) - pb.buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
132 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
133
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
134 static int put_system_header(AVFormatContext *ctx, uint8_t *buf,int only_for_stream_id)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
135 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
136 MpegMuxContext *s = ctx->priv_data;
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
137 int size, i, private_stream_coded, id;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
138 PutBitContext pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
139
276
3dd3646e0164 init_put_bits changed
alex
parents: 242
diff changeset
140 init_put_bits(&pb, buf, 128);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
141
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
142 put_bits(&pb, 32, SYSTEM_HEADER_START_CODE);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
143 put_bits(&pb, 16, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
144 put_bits(&pb, 1, 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
145
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
146 put_bits(&pb, 22, s->mux_rate); /* maximum bit rate of the multiplexed stream */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
147 put_bits(&pb, 1, 1); /* marker */
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
148 if (s->is_vcd && only_for_stream_id==VIDEO_ID) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
149 /* This header applies only to the video stream (see VCD standard p. IV-7)*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
150 put_bits(&pb, 6, 0);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
151 } else
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
152 put_bits(&pb, 6, s->audio_bound);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
153
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
154 if (s->is_vcd) {
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
155 /* see VCD standard, p. IV-7*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
156 put_bits(&pb, 1, 0);
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
157 put_bits(&pb, 1, 1);
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
158 } else {
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
159 put_bits(&pb, 1, 0); /* variable bitrate*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
160 put_bits(&pb, 1, 0); /* non constrainted bit stream */
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
161 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
162
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
163 if (s->is_vcd) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
164 /* see VCD standard p IV-7 */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
165 put_bits(&pb, 1, 1); /* audio locked */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
166 put_bits(&pb, 1, 1); /* video locked */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
167 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
168 put_bits(&pb, 1, 0); /* audio locked */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
169 put_bits(&pb, 1, 0); /* video locked */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
170 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
171
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
172 put_bits(&pb, 1, 1); /* marker */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
173
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
174 if (s->is_vcd && only_for_stream_id==AUDIO_ID) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
175 /* This header applies only to the audio stream (see VCD standard p. IV-7)*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
176 put_bits(&pb, 5, 0);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
177 } else
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
178 put_bits(&pb, 5, s->video_bound);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
179
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
180 put_bits(&pb, 8, 0xff); /* reserved byte */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
181
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
182 /* audio stream info */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
183 private_stream_coded = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
184 for(i=0;i<ctx->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
185 StreamInfo *stream = ctx->streams[i]->priv_data;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
186
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
187 /* For VCDs, only include the stream info for the stream
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
188 that the pack which contains this system belongs to.
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
189 (see VCD standard p. IV-7) */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
190 if ( !s->is_vcd || stream->id==only_for_stream_id
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
191 || only_for_stream_id==0) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
192
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
193 id = stream->id;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
194 if (id < 0xc0) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
195 /* special case for private streams (AC3 use that) */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
196 if (private_stream_coded)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
197 continue;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
198 private_stream_coded = 1;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
199 id = 0xbd;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
200 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
201 put_bits(&pb, 8, id); /* stream ID */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
202 put_bits(&pb, 2, 3);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
203 if (id < 0xe0) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
204 /* audio */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
205 put_bits(&pb, 1, 0);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
206 put_bits(&pb, 13, stream->max_buffer_size / 128);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
207 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
208 /* video */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
209 put_bits(&pb, 1, 1);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
210 put_bits(&pb, 13, stream->max_buffer_size / 1024);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
211 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
212 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
213 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
214 flush_put_bits(&pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
215 size = pbBufPtr(&pb) - pb.buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
216 /* patch packet size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
217 buf[4] = (size - 6) >> 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
218 buf[5] = (size - 6) & 0xff;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
219
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
220 return size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
221 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
222
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
223 static int get_system_header_size(AVFormatContext *ctx)
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
224 {
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
225 int buf_index, i, private_stream_coded;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
226 StreamInfo *stream;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
227
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
228 buf_index = 12;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
229 private_stream_coded = 0;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
230 for(i=0;i<ctx->nb_streams;i++) {
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
231 stream = ctx->streams[i]->priv_data;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
232 if (stream->id < 0xc0) {
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
233 if (private_stream_coded)
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
234 continue;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
235 private_stream_coded = 1;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
236 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
237 buf_index += 3;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
238 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
239 return buf_index;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
240 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
241
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
242 static int mpeg_mux_init(AVFormatContext *ctx)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244 MpegMuxContext *s = ctx->priv_data;
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
245 int bitrate, i, mpa_id, mpv_id, ac3_id, dts_id, lpcm_id, j;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
246 AVStream *st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
247 StreamInfo *stream;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
248 int audio_bitrate;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
249 int video_bitrate;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
250
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
251 s->packet_number = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
252 s->is_vcd = (ctx->oformat == &mpeg1vcd_mux);
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
253 s->is_svcd = (ctx->oformat == &mpeg2svcd_mux);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
254 s->is_mpeg2 = (ctx->oformat == &mpeg2vob_mux || ctx->oformat == &mpeg2svcd_mux);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
255
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
256 if (s->is_vcd || s->is_svcd)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
257 s->packet_size = 2324; /* VCD/SVCD packet size */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
258 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
259 s->packet_size = 2048;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
260
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
261 s->vcd_padding_bytes_written = 0;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
262 s->vcd_padding_bitrate=0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
263
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
264 s->audio_bound = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
265 s->video_bound = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
266 mpa_id = AUDIO_ID;
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
267 ac3_id = AC3_ID;
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
268 dts_id = DTS_ID;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
269 mpv_id = VIDEO_ID;
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
270 lpcm_id = LPCM_ID;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
271 for(i=0;i<ctx->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
272 st = ctx->streams[i];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
273 stream = av_mallocz(sizeof(StreamInfo));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
274 if (!stream)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
276 st->priv_data = stream;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
277
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
278 switch(st->codec.codec_type) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
279 case CODEC_TYPE_AUDIO:
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
280 if (st->codec.codec_id == CODEC_ID_AC3) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
281 stream->id = ac3_id++;
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
282 } else if (st->codec.codec_id == CODEC_ID_DTS) {
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
283 stream->id = dts_id++;
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
284 } else if (st->codec.codec_id == CODEC_ID_PCM_S16BE) {
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
285 stream->id = lpcm_id++;
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
286 for(j = 0; j < 4; j++) {
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
287 if (lpcm_freq_tab[j] == st->codec.sample_rate)
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
288 break;
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
289 }
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
290 if (j == 4)
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
291 goto fail;
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
292 if (st->codec.channels > 8)
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
293 return -1;
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
294 stream->lpcm_header[0] = 0x0c;
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
295 stream->lpcm_header[1] = (st->codec.channels - 1) | (j << 4);
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
296 stream->lpcm_header[2] = 0x80;
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
297 stream->lpcm_align = st->codec.channels * 2;
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
298 } else {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
299 stream->id = mpa_id++;
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
300 }
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
301
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
302 /* This value HAS to be used for VCD (see VCD standard, p. IV-7).
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
303 Right now it is also used for everything else.*/
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
304 stream->max_buffer_size = 4 * 1024;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
305 s->audio_bound++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
306 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
307 case CODEC_TYPE_VIDEO:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
308 stream->id = mpv_id++;
544
1244786bfb26 cleanup video buffer size
michael
parents: 543
diff changeset
309 if (st->codec.rc_buffer_size)
1244786bfb26 cleanup video buffer size
michael
parents: 543
diff changeset
310 stream->max_buffer_size = 6*1024 + st->codec.rc_buffer_size/8;
1244786bfb26 cleanup video buffer size
michael
parents: 543
diff changeset
311 else
1244786bfb26 cleanup video buffer size
michael
parents: 543
diff changeset
312 stream->max_buffer_size = 230*1024; //FIXME this is probably too small as default
1244786bfb26 cleanup video buffer size
michael
parents: 543
diff changeset
313 #if 0
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
314 /* see VCD standard, p. IV-7*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
315 stream->max_buffer_size = 46 * 1024;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
316 else
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
317 /* This value HAS to be used for SVCD (see SVCD standard, p. 26 V.2.3.2).
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
318 Right now it is also used for everything else.*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
319 stream->max_buffer_size = 230 * 1024;
544
1244786bfb26 cleanup video buffer size
michael
parents: 543
diff changeset
320 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
321 s->video_bound++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
322 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
323 default:
537
558a093b04db do not call (av_)abort()
michael
parents: 496
diff changeset
324 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
325 }
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
326 fifo_init(&stream->fifo, 2*stream->max_buffer_size + 100*MAX_PAYLOAD_SIZE); //FIXME think about the size maybe dynamically realloc
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
327 stream->next_packet= &stream->premux_packet;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
328 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
329 bitrate = 0;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
330 audio_bitrate = 0;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
331 video_bitrate = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
332 for(i=0;i<ctx->nb_streams;i++) {
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
333 int codec_rate;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
334 st = ctx->streams[i];
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
335 stream = (StreamInfo*) st->priv_data;
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
336
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
337 if(st->codec.rc_max_rate || stream->id==VIDEO_ID)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
338 codec_rate= st->codec.rc_max_rate;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
339 else
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
340 codec_rate= st->codec.bit_rate;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
341
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
342 if(!codec_rate)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
343 codec_rate= (1<<21)*8*50/ctx->nb_streams;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
344
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
345 bitrate += codec_rate;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
346
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
347 if (stream->id==AUDIO_ID)
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
348 audio_bitrate += codec_rate;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
349 else if (stream->id==VIDEO_ID)
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
350 video_bitrate += codec_rate;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
351 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
352
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
353 if (s->is_vcd) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
354 double overhead_rate;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
355
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
356 /* The VCD standard mandates that the mux_rate field is 3528
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
357 (see standard p. IV-6).
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
358 The value is actually "wrong", i.e. if you calculate
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
359 it using the normal formula and the 75 sectors per second transfer
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
360 rate you get a different value because the real pack size is 2324,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
361 not 2352. But the standard explicitly specifies that the mux_rate
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
362 field in the header must have this value.*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
363 s->mux_rate=2352 * 75 / 50; /* = 3528*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
364
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
365 /* The VCD standard states that the muxed stream must be
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
366 exactly 75 packs / second (the data rate of a single speed cdrom).
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
367 Since the video bitrate (probably 1150000 bits/sec) will be below
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
368 the theoretical maximum we have to add some padding packets
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
369 to make up for the lower data rate.
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
370 (cf. VCD standard p. IV-6 )*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
371
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
372 /* Add the header overhead to the data rate.
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
373 2279 data bytes per audio pack, 2294 data bytes per video pack*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
374 overhead_rate = ((audio_bitrate / 8.0) / 2279) * (2324 - 2279);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
375 overhead_rate += ((video_bitrate / 8.0) / 2294) * (2324 - 2294);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
376 overhead_rate *= 8;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
377
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
378 /* Add padding so that the full bitrate is 2324*75 bytes/sec */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
379 s->vcd_padding_bitrate = 2324 * 75 * 8 - (bitrate + overhead_rate);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
380
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
381 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
382 /* we increase slightly the bitrate to take into account the
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
383 headers. XXX: compute it exactly */
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
384 bitrate += bitrate*5/100;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
385 bitrate += 10000;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
386 s->mux_rate = (bitrate + (8 * 50) - 1) / (8 * 50);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
387 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
388
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
389 if (s->is_vcd || s->is_mpeg2)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
390 /* every packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
391 s->pack_header_freq = 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
392 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
393 /* every 2 seconds */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
394 s->pack_header_freq = 2 * bitrate / s->packet_size / 8;
291
b19f70a6d60f 1/0 fix by (Tim Allen <tim at proximity dot com dot au>)
michael
parents: 277
diff changeset
395
b19f70a6d60f 1/0 fix by (Tim Allen <tim at proximity dot com dot au>)
michael
parents: 277
diff changeset
396 /* the above seems to make pack_header_freq zero sometimes */
b19f70a6d60f 1/0 fix by (Tim Allen <tim at proximity dot com dot au>)
michael
parents: 277
diff changeset
397 if (s->pack_header_freq == 0)
b19f70a6d60f 1/0 fix by (Tim Allen <tim at proximity dot com dot au>)
michael
parents: 277
diff changeset
398 s->pack_header_freq = 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
399
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
400 if (s->is_mpeg2)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
401 /* every 200 packets. Need to look at the spec. */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
402 s->system_header_freq = s->pack_header_freq * 40;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
403 else if (s->is_vcd)
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
404 /* the standard mandates that there are only two system headers
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
405 in the whole file: one in the first packet of each stream.
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
406 (see standard p. IV-7 and IV-8) */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
407 s->system_header_freq = 0x7fffffff;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
408 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
409 s->system_header_freq = s->pack_header_freq * 5;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
410
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
411 for(i=0;i<ctx->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
412 stream = ctx->streams[i]->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
413 stream->packet_number = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
414 }
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
415 s->system_header_size = get_system_header_size(ctx);
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
416 s->last_scr = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
417 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
418 fail:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
419 for(i=0;i<ctx->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
420 av_free(ctx->streams[i]->priv_data);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
421 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
422 return -ENOMEM;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
423 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
424
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
425 static inline void put_timestamp(ByteIOContext *pb, int id, int64_t timestamp)
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
426 {
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
427 put_byte(pb,
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
428 (id << 4) |
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
429 (((timestamp >> 30) & 0x07) << 1) |
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
430 1);
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
431 put_be16(pb, (uint16_t)((((timestamp >> 15) & 0x7fff) << 1) | 1));
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
432 put_be16(pb, (uint16_t)((((timestamp) & 0x7fff) << 1) | 1));
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
433 }
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
434
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
435
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
436 /* return the number of padding bytes that should be inserted into
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
437 the multiplexed stream.*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
438 static int get_vcd_padding_size(AVFormatContext *ctx, int64_t pts)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
439 {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
440 MpegMuxContext *s = ctx->priv_data;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
441 int pad_bytes = 0;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
442
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
443 if (s->vcd_padding_bitrate > 0 && pts!=AV_NOPTS_VALUE)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
444 {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
445 int64_t full_pad_bytes;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
446
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
447 full_pad_bytes = (int64_t)((s->vcd_padding_bitrate * (pts / 90000.0)) / 8.0); //FIXME this is wrong
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
448 pad_bytes = (int) (full_pad_bytes - s->vcd_padding_bytes_written);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
449
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
450 if (pad_bytes<0)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
451 /* might happen if we have already padded to a later timestamp. This
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
452 can occur if another stream has already advanced further.*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
453 pad_bytes=0;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
454 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
455
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
456 return pad_bytes;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
457 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
458
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
459
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
460 /* return the exact available payload size for the next packet for
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
461 stream 'stream_index'. 'pts' and 'dts' are only used to know if
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
462 timestamps are needed in the packet header. */
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
463 static int get_packet_payload_size(AVFormatContext *ctx, int stream_index,
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
464 int64_t pts, int64_t dts)
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
465 {
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
466 MpegMuxContext *s = ctx->priv_data;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
467 int buf_index;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
468 StreamInfo *stream;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
469
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
470 stream = ctx->streams[stream_index]->priv_data;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
471
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
472 buf_index = 0;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
473 if (((s->packet_number % s->pack_header_freq) == 0)) {
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
474 /* pack header size */
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
475 if (s->is_mpeg2)
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
476 buf_index += 14;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
477 else
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
478 buf_index += 12;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
479
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
480 if (s->is_vcd) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
481 /* there is exactly one system header for each stream in a VCD MPEG,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
482 One in the very first video packet and one in the very first
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
483 audio packet (see VCD standard p. IV-7 and IV-8).*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
484
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
485 if (stream->packet_number==0)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
486 /* The system headers refer only to the stream they occur in,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
487 so they have a constant size.*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
488 buf_index += 15;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
489
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
490 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
491 if ((s->packet_number % s->system_header_freq) == 0)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
492 buf_index += s->system_header_size;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
493 }
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
494 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
495
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
496 if ((s->is_vcd && stream->packet_number==0)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
497 || (s->is_svcd && s->packet_number==0))
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
498 /* the first pack of each stream contains only the pack header,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
499 the system header and some padding (see VCD standard p. IV-6)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
500 Add the padding size, so that the actual payload becomes 0.*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
501 buf_index += s->packet_size - buf_index;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
502 else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
503 /* packet header size */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
504 buf_index += 6;
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
505 if (s->is_mpeg2) {
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
506 buf_index += 3;
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
507 if (stream->packet_number==0)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
508 buf_index += 3; /* PES extension */
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
509 buf_index += 1; /* obligatory stuffing byte */
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
510 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
511 if (pts != AV_NOPTS_VALUE) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
512 if (dts != pts)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
513 buf_index += 5 + 5;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
514 else
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
515 buf_index += 5;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
516
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
517 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
518 if (!s->is_mpeg2)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
519 buf_index++;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
520 }
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
521
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
522 if (stream->id < 0xc0) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
523 /* AC3/LPCM private data header */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
524 buf_index += 4;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
525 if (stream->id >= 0xa0) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
526 int n;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
527 buf_index += 3;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
528 /* NOTE: we round the payload size to an integer number of
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
529 LPCM samples */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
530 n = (s->packet_size - buf_index) % stream->lpcm_align;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
531 if (n)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
532 buf_index += (stream->lpcm_align - n);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
533 }
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
534 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
535
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
536 if (s->is_vcd && stream->id == AUDIO_ID)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
537 /* The VCD standard demands that 20 zero bytes follow
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
538 each audio packet (see standard p. IV-8).*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
539 buf_index+=20;
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
540 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
541 return s->packet_size - buf_index;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
542 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
543
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
544 /* Write an MPEG padding packet header. */
541
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
545 static void put_padding_packet(AVFormatContext *ctx, ByteIOContext *pb,int packet_bytes)
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
546 {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
547 MpegMuxContext *s = ctx->priv_data;
541
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
548 int i;
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
549
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
550 put_be32(pb, PADDING_STREAM);
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
551 put_be16(pb, packet_bytes - 6);
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
552 if (!s->is_mpeg2) {
541
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
553 put_byte(pb, 0x0f);
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
554 packet_bytes -= 7;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
555 } else
541
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
556 packet_bytes -= 6;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
557
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
558 for(i=0;i<packet_bytes;i++)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
559 put_byte(pb, 0xff);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
560 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
561
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
562 static int get_nb_frames(AVFormatContext *ctx, StreamInfo *stream, int len){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
563 int nb_frames=0;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
564 PacketDesc *pkt_desc= stream->premux_packet;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
565
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
566 while(len>0){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
567 if(pkt_desc->size == pkt_desc->unwritten_size)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
568 nb_frames++;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
569 len -= pkt_desc->unwritten_size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
570 pkt_desc= pkt_desc->next;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
571 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
572
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
573 return nb_frames;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
574 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
575
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
576 /* flush the packet on stream stream_index */
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
577 static int flush_packet(AVFormatContext *ctx, int stream_index,
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
578 int64_t pts, int64_t dts, int64_t scr, int trailer_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
579 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
580 MpegMuxContext *s = ctx->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
581 StreamInfo *stream = ctx->streams[stream_index]->priv_data;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
582 uint8_t *buf_ptr;
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
583 int size, payload_size, startcode, id, stuffing_size, i, header_len;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
584 int packet_size;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
585 uint8_t buffer[128];
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
586 int zero_trail_bytes = 0;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
587 int pad_packet_bytes = 0;
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
588 int pes_flags;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
589 int general_pack = 0; /*"general" pack without data specific to one stream?*/
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
590 int nb_frames;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
591
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
592 id = stream->id;
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
593
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
594 #if 0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
595 printf("packet ID=%2x PTS=%0.3f\n",
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
596 id, pts / 90000.0);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
597 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
598
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
599 buf_ptr = buffer;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
600
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
601 if ((s->packet_number % s->pack_header_freq) == 0 || s->last_scr != scr) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
602 /* output pack and systems header if needed */
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
603 size = put_pack_header(ctx, buf_ptr, scr);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
604 buf_ptr += size;
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
605 s->last_scr= scr;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
606
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
607 if (s->is_vcd) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
608 /* there is exactly one system header for each stream in a VCD MPEG,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
609 One in the very first video packet and one in the very first
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
610 audio packet (see VCD standard p. IV-7 and IV-8).*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
611
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
612 if (stream->packet_number==0) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
613 size = put_system_header(ctx, buf_ptr, id);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
614 buf_ptr += size;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
615 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
616 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
617 if ((s->packet_number % s->system_header_freq) == 0) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
618 size = put_system_header(ctx, buf_ptr, 0);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
619 buf_ptr += size;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
620 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
621 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
622 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
623 size = buf_ptr - buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
624 put_buffer(&ctx->pb, buffer, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
625
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
626 packet_size = s->packet_size - size;
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
627
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
628 if (s->is_vcd && id == AUDIO_ID)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
629 /* The VCD standard demands that 20 zero bytes follow
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
630 each audio pack (see standard p. IV-8).*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
631 zero_trail_bytes += 20;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
632
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
633 if ((s->is_vcd && stream->packet_number==0)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
634 || (s->is_svcd && s->packet_number==0)) {
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
635 /* for VCD the first pack of each stream contains only the pack header,
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
636 the system header and lots of padding (see VCD standard p. IV-6).
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
637 In the case of an audio pack, 20 zero bytes are also added at
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
638 the end.*/
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
639 /* For SVCD we fill the very first pack to increase compatibility with
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
640 some DVD players. Not mandated by the standard.*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
641 if (s->is_svcd)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
642 general_pack = 1; /* the system header refers to both streams and no stream data*/
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
643 pad_packet_bytes = packet_size - zero_trail_bytes;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
644 }
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
645
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
646 packet_size -= pad_packet_bytes + zero_trail_bytes;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
647
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
648 if (packet_size > 0) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
649
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
650 /* packet header size */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
651 packet_size -= 6;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
652
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
653 /* packet header */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
654 if (s->is_mpeg2) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
655 header_len = 3;
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
656 if (stream->packet_number==0)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
657 header_len += 3; /* PES extension */
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
658 header_len += 1; /* obligatory stuffing byte */
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
659 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
660 header_len = 0;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
661 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
662 if (pts != AV_NOPTS_VALUE) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
663 if (dts != pts)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
664 header_len += 5 + 5;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
665 else
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
666 header_len += 5;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
667 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
668 if (!s->is_mpeg2)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
669 header_len++;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
670 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
671
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
672 payload_size = packet_size - header_len;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
673 if (id < 0xc0) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
674 startcode = PRIVATE_STREAM_1;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
675 payload_size -= 4;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
676 if (id >= 0xa0)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
677 payload_size -= 3;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
678 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
679 startcode = 0x100 + id;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
680 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
681
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
682 stuffing_size = payload_size - fifo_size(&stream->fifo, stream->fifo.rptr);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
683
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
684 // first byte doesnt fit -> reset pts/dts + stuffing
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
685 if(payload_size <= trailer_size && pts != AV_NOPTS_VALUE){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
686 int timestamp_len=0;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
687 if(dts != pts)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
688 timestamp_len += 5;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
689 if(pts != AV_NOPTS_VALUE)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
690 timestamp_len += s->is_mpeg2 ? 5 : 4;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
691 pts=dts= AV_NOPTS_VALUE;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
692 header_len -= timestamp_len;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
693 payload_size += timestamp_len;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
694 stuffing_size += timestamp_len;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
695 if(payload_size > trailer_size)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
696 stuffing_size += payload_size - trailer_size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
697 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
698
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
699 if (stuffing_size < 0)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
700 stuffing_size = 0;
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
701 if (stuffing_size > 16) { /*<=16 for MPEG-1, <=32 for MPEG-2*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
702 pad_packet_bytes += stuffing_size;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
703 packet_size -= stuffing_size;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
704 payload_size -= stuffing_size;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
705 stuffing_size = 0;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
706 }
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
707
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
708 nb_frames= get_nb_frames(ctx, stream, payload_size - stuffing_size);
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
709
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
710 put_be32(&ctx->pb, startcode);
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
711
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
712 put_be16(&ctx->pb, packet_size);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
713
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
714 if (!s->is_mpeg2)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
715 for(i=0;i<stuffing_size;i++)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
716 put_byte(&ctx->pb, 0xff);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
717
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
718 if (s->is_mpeg2) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
719 put_byte(&ctx->pb, 0x80); /* mpeg2 id */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
720
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
721 pes_flags=0;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
722
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
723 if (pts != AV_NOPTS_VALUE) {
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
724 pes_flags |= 0x80;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
725 if (dts != pts)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
726 pes_flags |= 0x40;
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
727 }
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
728
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
729 /* Both the MPEG-2 and the SVCD standards demand that the
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
730 P-STD_buffer_size field be included in the first packet of
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
731 every stream. (see SVCD standard p. 26 V.2.3.1 and V.2.3.2
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
732 and MPEG-2 standard 2.7.7) */
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
733 if (stream->packet_number == 0)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
734 pes_flags |= 0x01;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
735
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
736 put_byte(&ctx->pb, pes_flags); /* flags */
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
737 put_byte(&ctx->pb, header_len - 3 + stuffing_size);
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
738
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
739 if (pes_flags & 0x80) /*write pts*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
740 put_timestamp(&ctx->pb, (pes_flags & 0x40) ? 0x03 : 0x02, pts);
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
741 if (pes_flags & 0x40) /*write dts*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
742 put_timestamp(&ctx->pb, 0x01, dts);
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
743
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
744 if (pes_flags & 0x01) { /*write pes extension*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
745 put_byte(&ctx->pb, 0x10); /* flags */
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
746
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
747 /* P-STD buffer info */
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
748 if (id == AUDIO_ID)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
749 put_be16(&ctx->pb, 0x4000 | stream->max_buffer_size/128);
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
750 else
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
751 put_be16(&ctx->pb, 0x6000 | stream->max_buffer_size/1024);
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
752 }
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
753
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
754 } else {
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
755 if (pts != AV_NOPTS_VALUE) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
756 if (dts != pts) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
757 put_timestamp(&ctx->pb, 0x03, pts);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
758 put_timestamp(&ctx->pb, 0x01, dts);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
759 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
760 put_timestamp(&ctx->pb, 0x02, pts);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
761 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
762 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
763 put_byte(&ctx->pb, 0x0f);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
764 }
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
765 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
766
467
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
767 if (s->is_mpeg2) {
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
768 /* special stuffing byte that is always written
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
769 to prevent accidental generation of start codes. */
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
770 put_byte(&ctx->pb, 0xff);
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
771
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
772 for(i=0;i<stuffing_size;i++)
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
773 put_byte(&ctx->pb, 0xff);
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
774 }
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
775
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
776 if (startcode == PRIVATE_STREAM_1) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
777 put_byte(&ctx->pb, id);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
778 if (id >= 0xa0) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
779 /* LPCM (XXX: check nb_frames) */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
780 put_byte(&ctx->pb, 7);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
781 put_be16(&ctx->pb, 4); /* skip 3 header bytes */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
782 put_byte(&ctx->pb, stream->lpcm_header[0]);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
783 put_byte(&ctx->pb, stream->lpcm_header[1]);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
784 put_byte(&ctx->pb, stream->lpcm_header[2]);
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
785 } else {
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
786 /* AC3 */
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
787 put_byte(&ctx->pb, nb_frames);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
788 put_be16(&ctx->pb, trailer_size+1);
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
789 }
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
790 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
791
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
792 /* output data */
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
793 if(put_fifo(&ctx->pb, &stream->fifo, payload_size - stuffing_size, &stream->fifo.rptr) < 0)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
794 return -1;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
795 }else{
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
796 payload_size=
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
797 stuffing_size= 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
798 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
799
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
800 if (pad_packet_bytes > 0)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
801 put_padding_packet(ctx,&ctx->pb, pad_packet_bytes);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
802
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
803 for(i=0;i<zero_trail_bytes;i++)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
804 put_byte(&ctx->pb, 0x00);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
805
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
806 put_flush_packet(&ctx->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
807
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
808 s->packet_number++;
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
809
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
810 /* only increase the stream packet number if this pack actually contains
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
811 something that is specific to this stream! I.e. a dedicated header
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
812 or some data.*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
813 if (!general_pack)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
814 stream->packet_number++;
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
815
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
816 return payload_size - stuffing_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
817 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
818
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
819 static void put_vcd_padding_sector(AVFormatContext *ctx)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
820 {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
821 /* There are two ways to do this padding: writing a sector/pack
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
822 of 0 values, or writing an MPEG padding pack. Both seem to
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
823 work with most decoders, BUT the VCD standard only allows a 0-sector
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
824 (see standard p. IV-4, IV-5).
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
825 So a 0-sector it is...*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
826
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
827 MpegMuxContext *s = ctx->priv_data;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
828 int i;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
829
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
830 for(i=0;i<s->packet_size;i++)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
831 put_byte(&ctx->pb, 0);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
832
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
833 s->vcd_padding_bytes_written += s->packet_size;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
834
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
835 put_flush_packet(&ctx->pb);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
836
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
837 /* increasing the packet number is correct. The SCR of the following packs
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
838 is calculated from the packet_number and it has to include the padding
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
839 sector (it represents the sector index, not the MPEG pack index)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
840 (see VCD standard p. IV-6)*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
841 s->packet_number++;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
842 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
843
543
acf8a88674ff cleanup
michael
parents: 542
diff changeset
844 static int64_t get_vcd_scr(AVFormatContext *ctx,int stream_index,int64_t pts)
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
845 {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
846 MpegMuxContext *s = ctx->priv_data;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
847 int64_t scr;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
848
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
849 /* Since the data delivery rate is constant, SCR is computed
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
850 using the formula C + i * 1200 where C is the start constant
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
851 and i is the pack index.
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
852 It is recommended that SCR 0 is at the beginning of the VCD front
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
853 margin (a sequence of empty Form 2 sectors on the CD).
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
854 It is recommended that the front margin is 30 sectors long, so
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
855 we use C = 30*1200 = 36000
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
856 (Note that even if the front margin is not 30 sectors the file
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
857 will still be correct according to the standard. It just won't have
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
858 the "recommended" value).*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
859 scr = 36000 + s->packet_number * 1200;
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
860
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
861 return scr;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
862 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
863
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
864 static int remove_decoded_packets(AVFormatContext *ctx, int64_t scr){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
865 // MpegMuxContext *s = ctx->priv_data;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
866 int i;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
867
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
868 for(i=0; i<ctx->nb_streams; i++){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
869 AVStream *st = ctx->streams[i];
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
870 StreamInfo *stream = st->priv_data;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
871 PacketDesc *pkt_desc= stream->predecode_packet;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
872
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
873 while(pkt_desc && scr > pkt_desc->dts){ //FIXME > vs >=
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
874 if(stream->buffer_index < pkt_desc->size ||
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
875 stream->predecode_packet == stream->premux_packet){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
876 av_log(ctx, AV_LOG_ERROR, "buffer underflow\n");
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
877 break;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
878 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
879 stream->buffer_index -= pkt_desc->size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
880
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
881 stream->predecode_packet= pkt_desc->next;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
882 av_freep(&pkt_desc);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
883 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
884 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
885
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
886 return 0;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
887 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
888
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
889 static int output_packet(AVFormatContext *ctx, int flush){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
890 MpegMuxContext *s = ctx->priv_data;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
891 AVStream *st;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
892 StreamInfo *stream;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
893 int i, avail_space, es_size, trailer_size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
894 int best_i= -1;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
895 int best_score= INT_MIN;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
896 int ignore_constraints=0;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
897 int64_t scr= s->last_scr;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
898
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
899 retry:
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
900 for(i=0; i<ctx->nb_streams; i++){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
901 AVStream *st = ctx->streams[i];
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
902 StreamInfo *stream = st->priv_data;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
903 const int avail_data= fifo_size(&stream->fifo, stream->fifo.rptr);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
904 const int space= stream->max_buffer_size - stream->buffer_index;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
905 int rel_space= 1024*space / stream->max_buffer_size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
906
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
907 if(s->packet_size > avail_data && !flush)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
908 return 0;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
909 if(avail_data==0)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
910 continue;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
911 assert(avail_data>0);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
912
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
913 if(space < s->packet_size && !ignore_constraints)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
914 continue;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
915
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
916 if(rel_space > best_score){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
917 best_score= rel_space;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
918 best_i = i;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
919 avail_space= space;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
920 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
921 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
922
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
923 if(best_i < 0){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
924 int64_t best_dts= INT64_MAX;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
925
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
926 for(i=0; i<ctx->nb_streams; i++){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
927 AVStream *st = ctx->streams[i];
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
928 StreamInfo *stream = st->priv_data;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
929 PacketDesc *pkt_desc= stream->predecode_packet;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
930 if(pkt_desc && pkt_desc->dts < best_dts)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
931 best_dts= pkt_desc->dts;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
932 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
933
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
934 #if 0
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
935 av_log(ctx, AV_LOG_DEBUG, "bumping scr, scr:%f, dts:%f\n",
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
936 scr/90000.0, best_dts/90000.0);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
937 #endif
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
938 if(best_dts == INT64_MAX)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
939 return 0;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
940
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
941 if(scr >= best_dts+1 && !ignore_constraints){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
942 av_log(ctx, AV_LOG_ERROR, "packet too large, ignoring buffer limits to mux it\n");
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
943 ignore_constraints= 1;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
944 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
945 scr= FFMAX(best_dts+1, scr);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
946 if(remove_decoded_packets(ctx, scr) < 0)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
947 return -1;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
948 goto retry;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
949 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
950
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
951 assert(best_i >= 0);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
952
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
953 st = ctx->streams[best_i];
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
954 stream = st->priv_data;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
955
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
956 assert(fifo_size(&stream->fifo, stream->fifo.rptr) > 0);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
957
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
958 assert(avail_space >= s->packet_size || ignore_constraints);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
959
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
960 if(stream->premux_packet->unwritten_size == stream->premux_packet->size)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
961 trailer_size= 0;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
962 else
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
963 trailer_size= stream->premux_packet->unwritten_size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
964
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
965 es_size= flush_packet(ctx, best_i, stream->premux_packet->pts, stream->premux_packet->dts, scr, trailer_size);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
966
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
967 if (s->is_vcd) {
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
968 /* Write one or more padding sectors, if necessary, to reach
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
969 the constant overall bitrate.*/
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
970 int vcd_pad_bytes;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
971
543
acf8a88674ff cleanup
michael
parents: 542
diff changeset
972 while((vcd_pad_bytes = get_vcd_padding_size(ctx,stream->premux_packet->pts) ) >= s->packet_size){ //FIXME pts cannot be correct here
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
973 put_vcd_padding_sector(ctx);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
974 s->last_scr += s->packet_size*90000LL / (s->mux_rate*50LL); //FIXME rounding and first few bytes of each packet
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
975 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
976 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
977
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
978 stream->buffer_index += es_size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
979 s->last_scr += s->packet_size*90000LL / (s->mux_rate*50LL); //FIXME rounding and first few bytes of each packet
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
980
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
981 while(stream->premux_packet && stream->premux_packet->unwritten_size <= es_size){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
982 es_size -= stream->premux_packet->unwritten_size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
983 stream->premux_packet= stream->premux_packet->next;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
984 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
985 if(es_size)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
986 stream->premux_packet->unwritten_size -= es_size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
987
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
988 if(remove_decoded_packets(ctx, s->last_scr) < 0)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
989 return -1;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
990
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
991 return 1;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
992 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
993
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 467
diff changeset
994 static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
995 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
996 MpegMuxContext *s = ctx->priv_data;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 467
diff changeset
997 int stream_index= pkt->stream_index;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 467
diff changeset
998 int size= pkt->size;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 467
diff changeset
999 uint8_t *buf= pkt->data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1000 AVStream *st = ctx->streams[stream_index];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1001 StreamInfo *stream = st->priv_data;
543
acf8a88674ff cleanup
michael
parents: 542
diff changeset
1002 int64_t pts, dts;
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1003 PacketDesc *pkt_desc;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1004
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 467
diff changeset
1005 pts= pkt->pts;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 467
diff changeset
1006 dts= pkt->dts;
337
f6b2b0718235 harcoded DTS computation for mpeg
bellard
parents: 336
diff changeset
1007
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1008 if(s->is_svcd) {
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1009 /* offset pts and dts slightly into the future to be able
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1010 to do the compatibility fix below.*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1011 pts = (pts + 2) & ((1LL << 33) - 1);
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1012 dts = (dts + 2) & ((1LL << 33) - 1);
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1013
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1014 if (stream->packet_number == 0 && dts == pts)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1015 /* For the very first packet we want to force the DTS to be included.
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1016 This increases compatibility with lots of DVD players.
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1017 Since the MPEG-2 standard mandates that DTS is only written when
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1018 it is different from PTS we have to move it slightly into the past.*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1019 dts = (dts - 2) & ((1LL << 33) - 1);
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1020 }
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1021 if(s->is_vcd) {
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1022 /* We have to offset the PTS, so that it is consistent with the SCR.
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1023 SCR starts at 36000, but the first two packs contain only padding
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1024 and the first pack from the other stream, respectively, may also have
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1025 been written before.
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1026 So the real data starts at SCR 36000+3*1200. */
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1027 pts = (pts + 36000 + 3600) & ((1LL << 33) - 1);
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1028 dts = (dts + 36000 + 3600) & ((1LL << 33) - 1);
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1029 }else{
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1030 pts = (pts + PRELOAD) & ((1LL << 33) - 1);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1031 dts = (dts + PRELOAD) & ((1LL << 33) - 1);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1032 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1033
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1034 *stream->next_packet=
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1035 pkt_desc= av_mallocz(sizeof(PacketDesc));
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1036 pkt_desc->pts= pts;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1037 pkt_desc->dts= dts;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1038 pkt_desc->unwritten_size=
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1039 pkt_desc->size= size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1040 if(!stream->predecode_packet)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1041 stream->predecode_packet= pkt_desc;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1042 stream->next_packet= &pkt_desc->next;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1043
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1044 if(stream->fifo.end - stream->fifo.buffer - fifo_size(&stream->fifo, stream->fifo.rptr) < size){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1045 av_log(ctx, AV_LOG_ERROR, "fifo overflow\n");
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1046 return -1;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1047 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1048 fifo_write(&stream->fifo, buf, size, &stream->fifo.wptr);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1049
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1050 for(;;){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1051 int ret= output_packet(ctx, 0);
543
acf8a88674ff cleanup
michael
parents: 542
diff changeset
1052 if(ret<=0)
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1053 return ret;
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
1054 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1055 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1056
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1057 static int mpeg_mux_end(AVFormatContext *ctx)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1058 {
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1059 // MpegMuxContext *s = ctx->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1060 StreamInfo *stream;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1061 int i;
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1062
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1063 for(;;){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1064 int ret= output_packet(ctx, 1);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1065 if(ret<0)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1066 return ret;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1067 else if(ret==0)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1068 break;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1069 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1070
242
3c299d432ca4 removed invalid sequence end code
bellard
parents: 241
diff changeset
1071 /* End header according to MPEG1 systems standard. We do not write
3c299d432ca4 removed invalid sequence end code
bellard
parents: 241
diff changeset
1072 it as it is usually not needed by decoders and because it
3c299d432ca4 removed invalid sequence end code
bellard
parents: 241
diff changeset
1073 complicates MPEG stream concatenation. */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1074 //put_be32(&ctx->pb, ISO_11172_END_CODE);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1075 //put_flush_packet(&ctx->pb);
237
35231c0be8e5 memleak fix by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michaelni
parents: 210
diff changeset
1076
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1077 for(i=0;i<ctx->nb_streams;i++) {
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1078 stream = ctx->streams[i]->priv_data;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1079
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1080 assert(fifo_size(&stream->fifo, stream->fifo.rptr) == 0);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1081 fifo_free(&stream->fifo);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1082 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1083 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1084 }
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 276
diff changeset
1085 #endif //CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1086
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1087 /*********************************************/
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1088 /* demux code */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1089
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1090 #define MAX_SYNC_SIZE 100000
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1091
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1092 static int mpegps_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1093 {
539
78a8cbdad269 64bit and reading over the end of the array fixes
michael
parents: 537
diff changeset
1094 int i;
78a8cbdad269 64bit and reading over the end of the array fixes
michael
parents: 537
diff changeset
1095 int size= FFMIN(20, p->buf_size);
78a8cbdad269 64bit and reading over the end of the array fixes
michael
parents: 537
diff changeset
1096 uint32_t code=0xFF;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1097
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1098 /* we search the first start code. If it is a packet start code,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1099 then we decide it is mpeg ps. We do not send highest value to
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1100 give a chance to mpegts */
49
3e7e13e08b27 avoid too many false detections
bellard
parents: 41
diff changeset
1101 /* NOTE: the search range was restricted to avoid too many false
3e7e13e08b27 avoid too many false detections
bellard
parents: 41
diff changeset
1102 detections */
3e7e13e08b27 avoid too many false detections
bellard
parents: 41
diff changeset
1103
539
78a8cbdad269 64bit and reading over the end of the array fixes
michael
parents: 537
diff changeset
1104 for (i = 0; i < size; i++) {
78a8cbdad269 64bit and reading over the end of the array fixes
michael
parents: 537
diff changeset
1105 code = (code << 8) | p->buf[i];
165
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
1106 if ((code & 0xffffff00) == 0x100) {
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
1107 if (code == PACK_START_CODE ||
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
1108 code == SYSTEM_HEADER_START_CODE ||
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
1109 (code >= 0x1e0 && code <= 0x1ef) ||
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
1110 (code >= 0x1c0 && code <= 0x1df) ||
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
1111 code == PRIVATE_STREAM_2 ||
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
1112 code == PROGRAM_STREAM_MAP ||
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
1113 code == PRIVATE_STREAM_1 ||
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
1114 code == PADDING_STREAM)
210
0533547fb150 fix MPEG-TS missdetected as MPEG-PS
michaelni
parents: 190
diff changeset
1115 return AVPROBE_SCORE_MAX - 2;
165
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
1116 else
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
1117 return 0;
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
1118 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1119 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1120 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1121 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1122
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1123
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1124 typedef struct MpegDemuxContext {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1125 int header_state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1126 } MpegDemuxContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1127
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1128 static int mpegps_read_header(AVFormatContext *s,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1129 AVFormatParameters *ap)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1130 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1131 MpegDemuxContext *m = s->priv_data;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1132 m->header_state = 0xff;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1133 s->ctx_flags |= AVFMTCTX_NOHEADER;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1134
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1135 /* no need to do more */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1136 return 0;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1137 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1138
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1139 static int64_t get_pts(ByteIOContext *pb, int c)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1140 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1141 int64_t pts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1142 int val;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1143
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1144 if (c < 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1145 c = get_byte(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1146 pts = (int64_t)((c >> 1) & 0x07) << 30;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1147 val = get_be16(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1148 pts |= (int64_t)(val >> 1) << 15;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1149 val = get_be16(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1150 pts |= (int64_t)(val >> 1);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1151 return pts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1152 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1153
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1154 static int find_next_start_code(ByteIOContext *pb, int *size_ptr,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1155 uint32_t *header_state)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1156 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1157 unsigned int state, v;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1158 int val, n;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1159
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1160 state = *header_state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1161 n = *size_ptr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1162 while (n > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1163 if (url_feof(pb))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1164 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1165 v = get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1166 n--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1167 if (state == 0x000001) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1168 state = ((state << 8) | v) & 0xffffff;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1169 val = state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1170 goto found;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1171 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1172 state = ((state << 8) | v) & 0xffffff;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1173 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1174 val = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1175 found:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1176 *header_state = state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1177 *size_ptr = n;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1178 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1179 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1180
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1181 /* XXX: optimize */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1182 static int find_prev_start_code(ByteIOContext *pb, int *size_ptr)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1183 {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1184 int64_t pos, pos_start;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1185 int max_size, start_code;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1186
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1187 max_size = *size_ptr;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1188 pos_start = url_ftell(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1189
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1190 /* in order to go faster, we fill the buffer */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1191 pos = pos_start - 16386;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1192 if (pos < 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1193 pos = 0;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1194 url_fseek(pb, pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1195 get_byte(pb);
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 291
diff changeset
1196
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1197 pos = pos_start;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1198 for(;;) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1199 pos--;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1200 if (pos < 0 || (pos_start - pos) >= max_size) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1201 start_code = -1;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1202 goto the_end;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1203 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1204 url_fseek(pb, pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1205 start_code = get_be32(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1206 if ((start_code & 0xffffff00) == 0x100)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1207 break;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1208 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1209 the_end:
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1210 *size_ptr = pos_start - pos;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1211 return start_code;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1212 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1213
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
1214 /* read the next PES header. Return its position in ppos
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1215 (if not NULL), and its start code, pts and dts.
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1216 */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1217 static int mpegps_read_pes_header(AVFormatContext *s,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1218 int64_t *ppos, int *pstart_code,
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
1219 int64_t *ppts, int64_t *pdts)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1220 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1221 MpegDemuxContext *m = s->priv_data;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1222 int len, size, startcode, c, flags, header_len;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1223 int64_t pts, dts, last_pos;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1224
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1225 last_pos = -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1226 redo:
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1227 /* next start code (should be immediately after) */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1228 m->header_state = 0xff;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1229 size = MAX_SYNC_SIZE;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1230 startcode = find_next_start_code(&s->pb, &size, &m->header_state);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1231 //printf("startcode=%x pos=0x%Lx\n", startcode, url_ftell(&s->pb));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1232 if (startcode < 0)
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 475
diff changeset
1233 return AVERROR_IO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1234 if (startcode == PACK_START_CODE)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1235 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1236 if (startcode == SYSTEM_HEADER_START_CODE)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1237 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1238 if (startcode == PADDING_STREAM ||
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1239 startcode == PRIVATE_STREAM_2) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1240 /* skip them */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1241 len = get_be16(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1242 url_fskip(&s->pb, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1243 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1244 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1245 /* find matching stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1246 if (!((startcode >= 0x1c0 && startcode <= 0x1df) ||
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1247 (startcode >= 0x1e0 && startcode <= 0x1ef) ||
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1248 (startcode == 0x1bd)))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1249 goto redo;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1250 if (ppos) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1251 *ppos = url_ftell(&s->pb) - 4;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1252 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1253 len = get_be16(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1254 pts = AV_NOPTS_VALUE;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1255 dts = AV_NOPTS_VALUE;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1256 /* stuffing */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1257 for(;;) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1258 if (len < 1)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1259 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1260 c = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1261 len--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1262 /* XXX: for mpeg1, should test only bit 7 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1263 if (c != 0xff)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1264 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1265 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1266 if ((c & 0xc0) == 0x40) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1267 /* buffer scale & size */
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1268 if (len < 2)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1269 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1270 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1271 c = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1272 len -= 2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1273 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1274 if ((c & 0xf0) == 0x20) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1275 if (len < 4)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1276 goto redo;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1277 dts = pts = get_pts(&s->pb, c);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1278 len -= 4;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1279 } else if ((c & 0xf0) == 0x30) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1280 if (len < 9)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1281 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1282 pts = get_pts(&s->pb, c);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1283 dts = get_pts(&s->pb, -1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1284 len -= 9;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1285 } else if ((c & 0xc0) == 0x80) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1286 /* mpeg 2 PES */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1287 if ((c & 0x30) != 0) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1288 /* Encrypted multiplex not handled */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1289 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1290 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1291 flags = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1292 header_len = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1293 len -= 2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1294 if (header_len > len)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1295 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1296 if ((flags & 0xc0) == 0x80) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1297 dts = pts = get_pts(&s->pb, -1);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1298 if (header_len < 5)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1299 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1300 header_len -= 5;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1301 len -= 5;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1302 } if ((flags & 0xc0) == 0xc0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1303 pts = get_pts(&s->pb, -1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1304 dts = get_pts(&s->pb, -1);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1305 if (header_len < 10)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1306 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1307 header_len -= 10;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1308 len -= 10;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1309 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1310 len -= header_len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1311 while (header_len > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1312 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1313 header_len--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1314 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1315 }
447
94aa265c18b9 Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents: 437
diff changeset
1316 else if( c!= 0xf )
94aa265c18b9 Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents: 437
diff changeset
1317 goto redo;
94aa265c18b9 Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents: 437
diff changeset
1318
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1319 if (startcode == 0x1bd) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1320 if (len < 1)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1321 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1322 startcode = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1323 len--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1324 if (startcode >= 0x80 && startcode <= 0xbf) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1325 /* audio: skip header */
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1326 if (len < 3)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1327 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1328 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1329 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1330 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1331 len -= 3;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1332 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1333 }
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1334 if(dts != AV_NOPTS_VALUE && ppos){
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1335 int i;
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1336 for(i=0; i<s->nb_streams; i++){
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1337 if(startcode == s->streams[i]->id) {
463
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 452
diff changeset
1338 av_add_index_entry(s->streams[i], *ppos, dts, 0, 0 /* FIXME keyframe? */);
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1339 }
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1340 }
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1341 }
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1342
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1343 *pstart_code = startcode;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1344 *ppts = pts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1345 *pdts = dts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1346 return len;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1347 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1348
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1349 static int mpegps_read_packet(AVFormatContext *s,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1350 AVPacket *pkt)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1351 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1352 AVStream *st;
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 475
diff changeset
1353 int len, startcode, i, type, codec_id = 0;
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1354 int64_t pts, dts, dummy_pos; //dummy_pos is needed for the index building to work
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1355
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1356 redo:
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
1357 len = mpegps_read_pes_header(s, &dummy_pos, &startcode, &pts, &dts);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1358 if (len < 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1359 return len;
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
1360
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1361 /* now find stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1362 for(i=0;i<s->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1363 st = s->streams[i];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1364 if (st->id == startcode)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1365 goto found;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1366 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1367 if (startcode >= 0x1e0 && startcode <= 0x1ef) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1368 type = CODEC_TYPE_VIDEO;
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
1369 codec_id = CODEC_ID_MPEG2VIDEO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1370 } else if (startcode >= 0x1c0 && startcode <= 0x1df) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1371 type = CODEC_TYPE_AUDIO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1372 codec_id = CODEC_ID_MP2;
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
1373 } else if (startcode >= 0x80 && startcode <= 0x89) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1374 type = CODEC_TYPE_AUDIO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1375 codec_id = CODEC_ID_AC3;
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
1376 } else if (startcode >= 0x8a && startcode <= 0x9f) {
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
1377 type = CODEC_TYPE_AUDIO;
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
1378 codec_id = CODEC_ID_DTS;
41
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1379 } else if (startcode >= 0xa0 && startcode <= 0xbf) {
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1380 type = CODEC_TYPE_AUDIO;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1381 codec_id = CODEC_ID_PCM_S16BE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1382 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1383 skip:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1384 /* skip packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1385 url_fskip(&s->pb, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1386 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1387 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1388 /* no stream found: add a new stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1389 st = av_new_stream(s, startcode);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1390 if (!st)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1391 goto skip;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1392 st->codec.codec_type = type;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1393 st->codec.codec_id = codec_id;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1394 if (codec_id != CODEC_ID_PCM_S16BE)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1395 st->need_parsing = 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1396 found:
41
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1397 if (startcode >= 0xa0 && startcode <= 0xbf) {
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1398 int b1, freq;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1399
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1400 /* for LPCM, we just skip the header and consider it is raw
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1401 audio data */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1402 if (len <= 3)
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1403 goto skip;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1404 get_byte(&s->pb); /* emphasis (1), muse(1), reserved(1), frame number(5) */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1405 b1 = get_byte(&s->pb); /* quant (2), freq(2), reserved(1), channels(3) */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1406 get_byte(&s->pb); /* dynamic range control (0x80 = off) */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1407 len -= 3;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1408 freq = (b1 >> 4) & 3;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1409 st->codec.sample_rate = lpcm_freq_tab[freq];
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1410 st->codec.channels = 1 + (b1 & 7);
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1411 st->codec.bit_rate = st->codec.channels * st->codec.sample_rate * 2;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1412 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1413 av_new_packet(pkt, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1414 get_buffer(&s->pb, pkt->data, pkt->size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1415 pkt->pts = pts;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1416 pkt->dts = dts;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1417 pkt->stream_index = st->index;
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
1418 #if 0
470
334e08488ad1 correctly interleave packets during encoding
michael
parents: 468
diff changeset
1419 av_log(s, AV_LOG_DEBUG, "%d: pts=%0.3f dts=%0.3f\n",
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
1420 pkt->stream_index, pkt->pts / 90000.0, pkt->dts / 90000.0);
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
1421 #endif
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 475
diff changeset
1422
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1423 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1424 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1425
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1426 static int mpegps_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1427 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1428 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1429 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1430
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1431 static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index,
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
1432 int64_t *ppos, int64_t pos_limit)
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1433 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1434 int len, startcode;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1435 int64_t pos, pts, dts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1436
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1437 pos = *ppos;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1438 #ifdef DEBUG_SEEK
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1439 printf("read_dts: pos=0x%llx next=%d -> ", pos, find_next);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1440 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1441 url_fseek(&s->pb, pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1442 for(;;) {
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
1443 len = mpegps_read_pes_header(s, &pos, &startcode, &pts, &dts);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1444 if (len < 0) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1445 #ifdef DEBUG_SEEK
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1446 printf("none (ret=%d)\n", len);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1447 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1448 return AV_NOPTS_VALUE;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1449 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1450 if (startcode == s->streams[stream_index]->id &&
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1451 dts != AV_NOPTS_VALUE) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1452 break;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1453 }
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
1454 url_fskip(&s->pb, len);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1455 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1456 #ifdef DEBUG_SEEK
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1457 printf("pos=0x%llx dts=0x%llx %0.3f\n", pos, dts, dts / 90000.0);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1458 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1459 *ppos = pos;
463
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 452
diff changeset
1460 return dts;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1461 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1462
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 276
diff changeset
1463 #ifdef CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1464 static AVOutputFormat mpeg1system_mux = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1465 "mpeg",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1466 "MPEG1 System format",
14
b167760cd0aa mimetype fixes patch by (Ryutaroh Matsumoto <ryutaroh at it dot ss dot titech dot ac dot jp>)
michaelni
parents: 0
diff changeset
1467 "video/mpeg",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1468 "mpg,mpeg",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1469 sizeof(MpegMuxContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1470 CODEC_ID_MP2,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1471 CODEC_ID_MPEG1VIDEO,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1472 mpeg_mux_init,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1473 mpeg_mux_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1474 mpeg_mux_end,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1475 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1476
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1477 static AVOutputFormat mpeg1vcd_mux = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1478 "vcd",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1479 "MPEG1 System format (VCD)",
14
b167760cd0aa mimetype fixes patch by (Ryutaroh Matsumoto <ryutaroh at it dot ss dot titech dot ac dot jp>)
michaelni
parents: 0
diff changeset
1480 "video/mpeg",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1481 NULL,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1482 sizeof(MpegMuxContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1483 CODEC_ID_MP2,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1484 CODEC_ID_MPEG1VIDEO,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1485 mpeg_mux_init,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1486 mpeg_mux_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1487 mpeg_mux_end,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1488 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1489
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1490 static AVOutputFormat mpeg2vob_mux = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1491 "vob",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1492 "MPEG2 PS format (VOB)",
14
b167760cd0aa mimetype fixes patch by (Ryutaroh Matsumoto <ryutaroh at it dot ss dot titech dot ac dot jp>)
michaelni
parents: 0
diff changeset
1493 "video/mpeg",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1494 "vob",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1495 sizeof(MpegMuxContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1496 CODEC_ID_MP2,
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
1497 CODEC_ID_MPEG2VIDEO,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1498 mpeg_mux_init,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1499 mpeg_mux_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1500 mpeg_mux_end,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1501 };
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1502
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1503 /* Same as mpeg2vob_mux except that the pack size is 2324 */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1504 static AVOutputFormat mpeg2svcd_mux = {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1505 "svcd",
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1506 "MPEG2 PS format (VOB)",
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1507 "video/mpeg",
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1508 "vob",
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1509 sizeof(MpegMuxContext),
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1510 CODEC_ID_MP2,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1511 CODEC_ID_MPEG2VIDEO,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1512 mpeg_mux_init,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1513 mpeg_mux_write_packet,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1514 mpeg_mux_end,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1515 };
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1516
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1517
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1518
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 276
diff changeset
1519 #endif //CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1520
190
94fa5e3367ed exports mpegps_demux
bellard
parents: 178
diff changeset
1521 AVInputFormat mpegps_demux = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1522 "mpeg",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1523 "MPEG PS format",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1524 sizeof(MpegDemuxContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1525 mpegps_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1526 mpegps_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1527 mpegps_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1528 mpegps_read_close,
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
1529 NULL, //mpegps_read_seek,
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
1530 mpegps_read_dts,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1531 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1532
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1533 int mpegps_init(void)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1534 {
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 276
diff changeset
1535 #ifdef CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1536 av_register_output_format(&mpeg1system_mux);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1537 av_register_output_format(&mpeg1vcd_mux);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1538 av_register_output_format(&mpeg2vob_mux);
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1539 av_register_output_format(&mpeg2svcd_mux);
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 276
diff changeset
1540 #endif //CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1541 av_register_input_format(&mpegps_demux);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1542 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1543 }