annotate mpeg.c @ 605:deece487318e libavformat

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