annotate mpeg.c @ 396:96f8086bc2ba libavformat

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