annotate mpeg.c @ 542:be81a0f1974d libavformat

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