annotate mpeg.c @ 552:56a704ec417e libavformat

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