annotate mpeg.c @ 335:b0ac206f232d libavformat

better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
author bellard
date Tue, 16 Dec 2003 11:25:30 +0000
parents 4530681af424
children d75fd4c6ab62
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24 typedef struct {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
25 uint8_t buffer[MAX_PAYLOAD_SIZE];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
26 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
27 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
28 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
29 uint8_t id;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
30 int max_buffer_size; /* in bytes */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
31 int packet_number;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
32 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
33 int64_t start_dts;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
34 } StreamInfo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
35
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
36 typedef struct {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
37 int packet_size; /* required packet size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
38 int packet_number;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
39 int pack_header_freq; /* frequency (in packets^-1) at which we send pack headers */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
40 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
41 int system_header_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
42 int mux_rate; /* bitrate in units of 50 bytes/s */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
43 /* stream info */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
44 int audio_bound;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
45 int video_bound;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
46 int is_mpeg2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
47 int is_vcd;
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
48 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
49 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
50 int64_t last_scr; /* current system clock */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
51 } MpegMuxContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
52
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
53 #define PACK_START_CODE ((unsigned int)0x000001ba)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
54 #define SYSTEM_HEADER_START_CODE ((unsigned int)0x000001bb)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
55 #define SEQUENCE_END_CODE ((unsigned int)0x000001b7)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
56 #define PACKET_START_CODE_MASK ((unsigned int)0xffffff00)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57 #define PACKET_START_CODE_PREFIX ((unsigned int)0x00000100)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
58 #define ISO_11172_END_CODE ((unsigned int)0x000001b9)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
59
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
60 /* mpeg2 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
61 #define PROGRAM_STREAM_MAP 0x1bc
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
62 #define PRIVATE_STREAM_1 0x1bd
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
63 #define PADDING_STREAM 0x1be
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
64 #define PRIVATE_STREAM_2 0x1bf
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
65
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
66
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
67 #define AUDIO_ID 0xc0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
68 #define VIDEO_ID 0xe0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
69
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 276
diff changeset
70 #ifdef CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
71 extern AVOutputFormat mpeg1system_mux;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
72 extern AVOutputFormat mpeg1vcd_mux;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
73 extern AVOutputFormat mpeg2vob_mux;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
74
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
75 static int put_pack_header(AVFormatContext *ctx,
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
76 uint8_t *buf, int64_t timestamp)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
77 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
78 MpegMuxContext *s = ctx->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
79 PutBitContext pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
80
276
3dd3646e0164 init_put_bits changed
alex
parents: 242
diff changeset
81 init_put_bits(&pb, buf, 128);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
82
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
83 put_bits(&pb, 32, PACK_START_CODE);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
84 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
85 put_bits(&pb, 2, 0x1);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
86 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
87 put_bits(&pb, 4, 0x2);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
88 }
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
89 put_bits(&pb, 3, (uint32_t)((timestamp >> 30) & 0x07));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
90 put_bits(&pb, 1, 1);
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
91 put_bits(&pb, 15, (uint32_t)((timestamp >> 15) & 0x7fff));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
92 put_bits(&pb, 1, 1);
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
93 put_bits(&pb, 15, (uint32_t)((timestamp) & 0x7fff));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
94 put_bits(&pb, 1, 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
95 if (s->is_mpeg2) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
96 /* clock extension */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
97 put_bits(&pb, 9, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
98 put_bits(&pb, 1, 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
99 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
100 put_bits(&pb, 1, 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
101 put_bits(&pb, 22, s->mux_rate);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
102 put_bits(&pb, 1, 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
103 if (s->is_mpeg2) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
104 put_bits(&pb, 5, 0x1f); /* reserved */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
105 put_bits(&pb, 3, 0); /* stuffing length */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
106 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
107 flush_put_bits(&pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
108 return pbBufPtr(&pb) - pb.buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
109 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
111 static int put_system_header(AVFormatContext *ctx, uint8_t *buf)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113 MpegMuxContext *s = ctx->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
114 int size, rate_bound, i, private_stream_coded, id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
115 PutBitContext pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
116
276
3dd3646e0164 init_put_bits changed
alex
parents: 242
diff changeset
117 init_put_bits(&pb, buf, 128);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
118
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119 put_bits(&pb, 32, SYSTEM_HEADER_START_CODE);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
120 put_bits(&pb, 16, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
121 put_bits(&pb, 1, 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
122
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
123 rate_bound = s->mux_rate; /* maximum bit rate of the multiplexed stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
124 put_bits(&pb, 22, rate_bound);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
125 put_bits(&pb, 1, 1); /* marker */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
126 put_bits(&pb, 6, s->audio_bound);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
127
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
128 put_bits(&pb, 1, 1); /* variable bitrate */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
129 put_bits(&pb, 1, 1); /* non constrainted bit stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
130
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
131 put_bits(&pb, 1, 0); /* audio locked */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
132 put_bits(&pb, 1, 0); /* video locked */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
133 put_bits(&pb, 1, 1); /* marker */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
134
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
135 put_bits(&pb, 5, s->video_bound);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
136 put_bits(&pb, 8, 0xff); /* reserved byte */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
137
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
138 /* audio stream info */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
139 private_stream_coded = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
140 for(i=0;i<ctx->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
141 StreamInfo *stream = ctx->streams[i]->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
142 id = stream->id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
143 if (id < 0xc0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
144 /* special case for private streams (AC3 use that) */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
145 if (private_stream_coded)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
146 continue;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
147 private_stream_coded = 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
148 id = 0xbd;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
149 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
150 put_bits(&pb, 8, id); /* stream ID */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
151 put_bits(&pb, 2, 3);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
152 if (id < 0xe0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
153 /* audio */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
154 put_bits(&pb, 1, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
155 put_bits(&pb, 13, stream->max_buffer_size / 128);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
156 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
157 /* video */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
158 put_bits(&pb, 1, 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
159 put_bits(&pb, 13, stream->max_buffer_size / 1024);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
160 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
161 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
162 flush_put_bits(&pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
163 size = pbBufPtr(&pb) - pb.buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
164 /* patch packet size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
165 buf[4] = (size - 6) >> 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
166 buf[5] = (size - 6) & 0xff;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
167
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
168 return size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
169 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
170
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
171 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
172 {
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
173 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
174 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
175
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
176 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
177 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
178 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
179 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
180 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
181 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
182 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
183 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
184 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
185 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
186 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
187 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
188 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
189
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
190 static int mpeg_mux_init(AVFormatContext *ctx)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
191 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
192 MpegMuxContext *s = ctx->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
193 int bitrate, i, mpa_id, mpv_id, ac3_id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
194 AVStream *st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
195 StreamInfo *stream;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
196
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
197 s->packet_number = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
198 s->is_vcd = (ctx->oformat == &mpeg1vcd_mux);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
199 s->is_mpeg2 = (ctx->oformat == &mpeg2vob_mux);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
200
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
201 if (s->is_vcd)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
202 s->packet_size = 2324; /* VCD packet size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
203 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
204 s->packet_size = 2048;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
205
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
206 s->audio_bound = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
207 s->video_bound = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
208 mpa_id = AUDIO_ID;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
209 ac3_id = 0x80;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
210 mpv_id = VIDEO_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
211 s->scr_stream_index = -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
212 for(i=0;i<ctx->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
213 st = ctx->streams[i];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
214 stream = av_mallocz(sizeof(StreamInfo));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
215 if (!stream)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
216 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
217 st->priv_data = stream;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
218
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
219 switch(st->codec.codec_type) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
220 case CODEC_TYPE_AUDIO:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
221 if (st->codec.codec_id == CODEC_ID_AC3)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
222 stream->id = ac3_id++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
223 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
224 stream->id = mpa_id++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
225 stream->max_buffer_size = 4 * 1024;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
226 s->audio_bound++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
227 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
228 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
229 /* 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
230 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
231 s->scr_stream_index = i;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
232 stream->id = mpv_id++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
233 stream->max_buffer_size = 46 * 1024;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
234 s->video_bound++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
235 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
236 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
237 av_abort();
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
238 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
239 }
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
240 /* 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
241 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
242 s->scr_stream_index = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244 /* we increase slightly the bitrate to take into account the
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
245 headers. XXX: compute it exactly */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
246 bitrate = 2000;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
247 for(i=0;i<ctx->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
248 st = ctx->streams[i];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
249 bitrate += st->codec.bit_rate;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
250 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
251 s->mux_rate = (bitrate + (8 * 50) - 1) / (8 * 50);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
252
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253 if (s->is_vcd || s->is_mpeg2)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
254 /* every packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
255 s->pack_header_freq = 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
257 /* every 2 seconds */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
258 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
259
b19f70a6d60f 1/0 fix by (Tim Allen <tim at proximity dot com dot au>)
michael
parents: 277
diff changeset
260 /* 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
261 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
262 s->pack_header_freq = 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
263
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
264 if (s->is_mpeg2)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
265 /* every 200 packets. Need to look at the spec. */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
266 s->system_header_freq = s->pack_header_freq * 40;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
267 else if (s->is_vcd)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
268 /* every 40 packets, this is my invention */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
269 s->system_header_freq = s->pack_header_freq * 40;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
270 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
271 s->system_header_freq = s->pack_header_freq * 5;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
272
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
273 for(i=0;i<ctx->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
274 stream = ctx->streams[i]->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 stream->buffer_ptr = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
276 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
277 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
278 stream->start_dts = AV_NOPTS_VALUE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
279 }
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
280 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
281 s->last_scr = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
282 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
283 fail:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
284 for(i=0;i<ctx->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
285 av_free(ctx->streams[i]->priv_data);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
286 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
287 return -ENOMEM;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
288 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
289
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
290 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
291 {
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
292 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
293 (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
294 (((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
295 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
296 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
297 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
298 }
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
299
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
300
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
301 /* 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
302 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
303 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
304 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
305 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
306 {
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
307 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
308 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
309 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
310
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
311 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
312 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
313 /* 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
314 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
315 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
316 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
317 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
318 if ((s->packet_number % s->system_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
319 buf_index += s->system_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
320 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
321
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
322 /* packet 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
323 buf_index += 6;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
324 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
325 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
326 if (pts != AV_NOPTS_VALUE) {
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
327 if (dts != AV_NOPTS_VALUE)
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
328 buf_index += 5 + 5;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
329 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
330 buf_index += 5;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
331 } 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
332 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
333 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
334 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
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
336 stream = ctx->streams[stream_index]->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
337 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
338 /* AC3 private data 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
339 buf_index += 4;
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
340 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
341 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
342 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
343
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
344 /* 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
345 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
346 int64_t pts, int64_t dts, int64_t scr)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
347 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
348 MpegMuxContext *s = ctx->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
349 StreamInfo *stream = ctx->streams[stream_index]->priv_data;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
350 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
351 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
352 int packet_size;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
353 uint8_t buffer[128];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
354
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
355 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
356
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
357 #if 0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
358 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
359 id, pts / 90000.0);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
360 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
361
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
362 buf_ptr = buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
363 if (((s->packet_number % s->pack_header_freq) == 0)) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
364 /* 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
365 size = put_pack_header(ctx, buf_ptr, scr);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
366 buf_ptr += size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
367 if ((s->packet_number % s->system_header_freq) == 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
368 size = put_system_header(ctx, buf_ptr);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
369 buf_ptr += size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
370 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
371 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
372 size = buf_ptr - buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
373 put_buffer(&ctx->pb, buffer, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
374
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
375 /* packet header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
376 if (s->is_mpeg2) {
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
377 header_len = 3;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
378 } else {
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
379 header_len = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
380 }
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
381 if (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
382 if (dts != 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
383 header_len += 5 + 5;
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 else
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 header_len += 5;
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
386 } else {
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
387 if (!s->is_mpeg2)
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 header_len++;
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
389 }
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
390
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
391 packet_size = s->packet_size - (size + 6);
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
392 payload_size = packet_size - header_len;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
393 if (id < 0xc0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
394 startcode = PRIVATE_STREAM_1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
395 payload_size -= 4;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
396 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
397 startcode = 0x100 + id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
398 }
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
399
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
400 stuffing_size = payload_size - stream->buffer_ptr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
401 if (stuffing_size < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
402 stuffing_size = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
403 put_be32(&ctx->pb, startcode);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
404
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
405 put_be16(&ctx->pb, packet_size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
406 /* stuffing */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
407 for(i=0;i<stuffing_size;i++)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
408 put_byte(&ctx->pb, 0xff);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
409
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
410 if (s->is_mpeg2) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
411 put_byte(&ctx->pb, 0x80); /* mpeg2 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
412
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
413 if (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
414 if (dts != 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
415 put_byte(&ctx->pb, 0xc0); /* flags */
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
416 put_byte(&ctx->pb, header_len - 3);
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
417 put_timestamp(&ctx->pb, 0x03, pts);
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
418 put_timestamp(&ctx->pb, 0x01, dts);
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
419 } else {
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
420 put_byte(&ctx->pb, 0x80); /* flags */
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
421 put_byte(&ctx->pb, header_len - 3);
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
422 put_timestamp(&ctx->pb, 0x02, pts);
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
423 }
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
424 } else {
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
425 put_byte(&ctx->pb, 0x00); /* flags */
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
426 put_byte(&ctx->pb, header_len - 3);
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
427 }
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
428 } else {
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
429 if (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
430 if (dts != 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
431 put_timestamp(&ctx->pb, 0x03, pts);
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
432 put_timestamp(&ctx->pb, 0x01, dts);
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
433 } else {
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
434 put_timestamp(&ctx->pb, 0x02, pts);
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
435 }
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
436 } else {
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
437 put_byte(&ctx->pb, 0x0f);
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
438 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
439 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
440
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
441 if (startcode == PRIVATE_STREAM_1) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
442 put_byte(&ctx->pb, id);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
443 if (id >= 0x80 && id <= 0xbf) {
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 put_byte(&ctx->pb, 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
445 put_be16(&ctx->pb, stream->frame_start_offset);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
446 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
447 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
448
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
449 /* output data */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
450 put_buffer(&ctx->pb, stream->buffer, payload_size - stuffing_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
451 put_flush_packet(&ctx->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
452
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
453 s->packet_number++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
454 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
455 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
456 stream->frame_start_offset = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
457 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
458
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
459 static int mpeg_mux_write_packet(AVFormatContext *ctx, int stream_index,
241
3d92f793fd67 64 bit pts for writing - more const usage
bellard
parents: 237
diff changeset
460 const uint8_t *buf, int size, int64_t pts)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
461 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
462 MpegMuxContext *s = ctx->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
463 AVStream *st = ctx->streams[stream_index];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
464 StreamInfo *stream = st->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
465 int64_t dts, new_start_pts, 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
466 int len, avail_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
467
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
468 /* XXX: system clock should be computed precisely, especially for
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
469 CBR case. The current mode gives at least something coherent */
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
470 if (stream_index == s->scr_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
471 s->last_scr = pts;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
472
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
473 #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
474 printf("%d: pts=%0.3f scr=%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
475 stream_index, pts / 90000.0, s->last_scr / 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
476 #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
477
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
478 /* XXX: currently no way to pass dts, will change soon */
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
479 dts = 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
480
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
481 /* 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
482 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
483 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
484
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
485 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
486 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
487 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
488 }
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
489 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
490 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
491 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
492 if (stream->buffer_ptr >= avail_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
493 /* 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
494 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
495 packet. In this case, we must flush the current packet with
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
496 padding */
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
497 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
498 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
499 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
500 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
501 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
502 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
503 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
504 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
505 stream->frame_start_offset = stream->buffer_ptr;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
506 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
507 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
508 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
509 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
510 len = avail_size - stream->buffer_ptr;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
511 if (len > size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
512 len = size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
513 memcpy(stream->buffer + stream->buffer_ptr, buf, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
514 stream->buffer_ptr += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
515 buf += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
516 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
517 if (stream->buffer_ptr >= avail_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
518 /* 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
519 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
520 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
521 stream->buffer_ptr = 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
522 /* 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
523 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
524 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
525 stream->start_dts = AV_NOPTS_VALUE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
526 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
527 }
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
528
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
529 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
530 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
531
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
532 static int mpeg_mux_end(AVFormatContext *ctx)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
533 {
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
534 MpegMuxContext *s = ctx->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
535 StreamInfo *stream;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
536 int i;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
537
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
538 /* flush each packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
539 for(i=0;i<ctx->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
540 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
541 if (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
542 /* 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
543 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
544 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
545 s->last_scr);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
546 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
547 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
548
242
3c299d432ca4 removed invalid sequence end code
bellard
parents: 241
diff changeset
549 /* End header according to MPEG1 systems standard. We do not write
3c299d432ca4 removed invalid sequence end code
bellard
parents: 241
diff changeset
550 it as it is usually not needed by decoders and because it
3c299d432ca4 removed invalid sequence end code
bellard
parents: 241
diff changeset
551 complicates MPEG stream concatenation. */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
552 //put_be32(&ctx->pb, ISO_11172_END_CODE);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
553 //put_flush_packet(&ctx->pb);
237
35231c0be8e5 memleak fix by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michaelni
parents: 210
diff changeset
554
35231c0be8e5 memleak fix by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michaelni
parents: 210
diff changeset
555 for(i=0;i<ctx->nb_streams;i++)
35231c0be8e5 memleak fix by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michaelni
parents: 210
diff changeset
556 av_freep(&ctx->streams[i]->priv_data);
35231c0be8e5 memleak fix by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michaelni
parents: 210
diff changeset
557
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
558 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
559 }
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 276
diff changeset
560 #endif //CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
561
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
562 /*********************************************/
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
563 /* demux code */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
564
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
565 #define MAX_SYNC_SIZE 100000
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
566
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
567 static int mpegps_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
568 {
165
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
569 int code, c, i;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
570
165
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
571 code = 0xff;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
572 /* we search the first start code. If it is a packet start code,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
573 then we decide it is mpeg ps. We do not send highest value to
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
574 give a chance to mpegts */
49
3e7e13e08b27 avoid too many false detections
bellard
parents: 41
diff changeset
575 /* NOTE: the search range was restricted to avoid too many false
3e7e13e08b27 avoid too many false detections
bellard
parents: 41
diff changeset
576 detections */
3e7e13e08b27 avoid too many false detections
bellard
parents: 41
diff changeset
577
3e7e13e08b27 avoid too many false detections
bellard
parents: 41
diff changeset
578 if (p->buf_size < 6)
3e7e13e08b27 avoid too many false detections
bellard
parents: 41
diff changeset
579 return 0;
165
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
580
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
581 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
582 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
583 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
584 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
585 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
586 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
587 (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
588 (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
589 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
590 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
591 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
592 code == PADDING_STREAM)
210
0533547fb150 fix MPEG-TS missdetected as MPEG-PS
michaelni
parents: 190
diff changeset
593 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
594 else
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
595 return 0;
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
596 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
597 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
598 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
599 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
600
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
601
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
602 typedef struct MpegDemuxContext {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
603 int header_state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
604 } MpegDemuxContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
605
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
606 static int mpegps_read_header(AVFormatContext *s,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
607 AVFormatParameters *ap)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
608 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
609 MpegDemuxContext *m = s->priv_data;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
610 m->header_state = 0xff;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
611 s->ctx_flags |= AVFMTCTX_NOHEADER;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
612
944c8edaf609 seek support
bellard
parents: 293
diff changeset
613 /* no need to do more */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
614 return 0;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
615 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
616
944c8edaf609 seek support
bellard
parents: 293
diff changeset
617 static int64_t get_pts(ByteIOContext *pb, int c)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
618 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
619 int64_t pts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
620 int val;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
621
944c8edaf609 seek support
bellard
parents: 293
diff changeset
622 if (c < 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
623 c = get_byte(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
624 pts = (int64_t)((c >> 1) & 0x07) << 30;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
625 val = get_be16(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
626 pts |= (int64_t)(val >> 1) << 15;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
627 val = get_be16(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
628 pts |= (int64_t)(val >> 1);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
629 return pts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
630 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
631
944c8edaf609 seek support
bellard
parents: 293
diff changeset
632 static int find_next_start_code(ByteIOContext *pb, int *size_ptr,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
633 uint32_t *header_state)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
634 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
635 unsigned int state, v;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
636 int val, n;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
637
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
638 state = *header_state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
639 n = *size_ptr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
640 while (n > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
641 if (url_feof(pb))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
642 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
643 v = get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
644 n--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
645 if (state == 0x000001) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
646 state = ((state << 8) | v) & 0xffffff;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
647 val = state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
648 goto found;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
649 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
650 state = ((state << 8) | v) & 0xffffff;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
651 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
652 val = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
653 found:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
654 *header_state = state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
655 *size_ptr = n;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
656 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
657 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
658
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
659 /* XXX: optimize */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
660 static int find_prev_start_code(ByteIOContext *pb, int *size_ptr)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
661 {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
662 int64_t pos, pos_start;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
663 int max_size, start_code;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
664
944c8edaf609 seek support
bellard
parents: 293
diff changeset
665 max_size = *size_ptr;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
666 pos_start = url_ftell(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
667
944c8edaf609 seek support
bellard
parents: 293
diff changeset
668 /* in order to go faster, we fill the buffer */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
669 pos = pos_start - 16386;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
670 if (pos < 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
671 pos = 0;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
672 url_fseek(pb, pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
673 get_byte(pb);
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 291
diff changeset
674
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
675 pos = pos_start;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
676 for(;;) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
677 pos--;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
678 if (pos < 0 || (pos_start - pos) >= max_size) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
679 start_code = -1;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
680 goto the_end;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
681 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
682 url_fseek(pb, pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
683 start_code = get_be32(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
684 if ((start_code & 0xffffff00) == 0x100)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
685 break;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
686 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
687 the_end:
944c8edaf609 seek support
bellard
parents: 293
diff changeset
688 *size_ptr = pos_start - pos;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
689 return start_code;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
690 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
691
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
692 /* read the next (or previous) PES header. Return its position in ppos
944c8edaf609 seek support
bellard
parents: 293
diff changeset
693 (if not NULL), and its start code, pts and dts.
944c8edaf609 seek support
bellard
parents: 293
diff changeset
694 */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
695 static int mpegps_read_pes_header(AVFormatContext *s,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
696 int64_t *ppos, int *pstart_code,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
697 int64_t *ppts, int64_t *pdts, int find_next)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
698 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
699 MpegDemuxContext *m = s->priv_data;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
700 int len, size, startcode, c, flags, header_len;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
701 int64_t pts, dts, last_pos;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
702
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
703 last_pos = -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
704 redo:
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
705 if (find_next) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
706 /* next start code (should be immediately after) */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
707 m->header_state = 0xff;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
708 size = MAX_SYNC_SIZE;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
709 startcode = find_next_start_code(&s->pb, &size, &m->header_state);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
710 } else {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
711 if (last_pos >= 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
712 url_fseek(&s->pb, last_pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
713 size = MAX_SYNC_SIZE;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
714 startcode = find_prev_start_code(&s->pb, &size);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
715 last_pos = url_ftell(&s->pb) - 4;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
716 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
717 //printf("startcode=%x pos=0x%Lx\n", startcode, url_ftell(&s->pb));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
718 if (startcode < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
719 return -EIO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
720 if (startcode == PACK_START_CODE)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
721 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
722 if (startcode == SYSTEM_HEADER_START_CODE)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
723 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
724 if (startcode == PADDING_STREAM ||
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
725 startcode == PRIVATE_STREAM_2) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
726 /* skip them */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
727 len = get_be16(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
728 url_fskip(&s->pb, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
729 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
730 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
731 /* find matching stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
732 if (!((startcode >= 0x1c0 && startcode <= 0x1df) ||
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
733 (startcode >= 0x1e0 && startcode <= 0x1ef) ||
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
734 (startcode == 0x1bd)))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
735 goto redo;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
736 if (ppos) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
737 *ppos = url_ftell(&s->pb) - 4;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
738 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
739 len = get_be16(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
740 pts = AV_NOPTS_VALUE;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
741 dts = AV_NOPTS_VALUE;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
742 /* stuffing */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
743 for(;;) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
744 if (len < 1)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
745 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
746 c = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
747 len--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
748 /* XXX: for mpeg1, should test only bit 7 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
749 if (c != 0xff)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
750 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
751 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
752 if ((c & 0xc0) == 0x40) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
753 /* buffer scale & size */
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
754 if (len < 2)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
755 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
756 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
757 c = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
758 len -= 2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
759 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
760 if ((c & 0xf0) == 0x20) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
761 if (len < 4)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
762 goto redo;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
763 dts = pts = get_pts(&s->pb, c);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
764 len -= 4;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
765 } else if ((c & 0xf0) == 0x30) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
766 if (len < 9)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
767 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
768 pts = get_pts(&s->pb, c);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
769 dts = get_pts(&s->pb, -1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
770 len -= 9;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
771 } else if ((c & 0xc0) == 0x80) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
772 /* mpeg 2 PES */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
773 if ((c & 0x30) != 0) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
774 /* Encrypted multiplex not handled */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
775 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
776 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
777 flags = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
778 header_len = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
779 len -= 2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
780 if (header_len > len)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
781 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
782 if ((flags & 0xc0) == 0x80) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
783 dts = pts = get_pts(&s->pb, -1);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
784 if (header_len < 5)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
785 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
786 header_len -= 5;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
787 len -= 5;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
788 } if ((flags & 0xc0) == 0xc0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
789 pts = get_pts(&s->pb, -1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
790 dts = get_pts(&s->pb, -1);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
791 if (header_len < 10)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
792 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
793 header_len -= 10;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
794 len -= 10;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
795 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
796 len -= header_len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
797 while (header_len > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
798 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
799 header_len--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
800 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
801 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
802 if (startcode == 0x1bd) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
803 if (len < 1)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
804 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
805 startcode = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
806 len--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
807 if (startcode >= 0x80 && startcode <= 0xbf) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
808 /* audio: skip header */
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
809 if (len < 3)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
810 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
811 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
812 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
813 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
814 len -= 3;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
815 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
816 }
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
817 *pstart_code = startcode;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
818 *ppts = pts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
819 *pdts = dts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
820 return len;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
821 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
822
944c8edaf609 seek support
bellard
parents: 293
diff changeset
823 static int mpegps_read_packet(AVFormatContext *s,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
824 AVPacket *pkt)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
825 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
826 AVStream *st;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
827 int len, startcode, i, type, codec_id;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
828 int64_t pts, dts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
829
944c8edaf609 seek support
bellard
parents: 293
diff changeset
830 redo:
944c8edaf609 seek support
bellard
parents: 293
diff changeset
831 len = mpegps_read_pes_header(s, NULL, &startcode, &pts, &dts, 1);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
832 if (len < 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
833 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
834
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
835 /* now find stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
836 for(i=0;i<s->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
837 st = s->streams[i];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
838 if (st->id == startcode)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
839 goto found;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
840 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
841 if (startcode >= 0x1e0 && startcode <= 0x1ef) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
842 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
843 codec_id = CODEC_ID_MPEG2VIDEO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
844 } else if (startcode >= 0x1c0 && startcode <= 0x1df) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
845 type = CODEC_TYPE_AUDIO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
846 codec_id = CODEC_ID_MP2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
847 } else if (startcode >= 0x80 && startcode <= 0x9f) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
848 type = CODEC_TYPE_AUDIO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
849 codec_id = CODEC_ID_AC3;
41
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
850 } else if (startcode >= 0xa0 && startcode <= 0xbf) {
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
851 type = CODEC_TYPE_AUDIO;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
852 codec_id = CODEC_ID_PCM_S16BE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
853 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
854 skip:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
855 /* skip packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
856 url_fskip(&s->pb, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
857 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
858 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
859 /* no stream found: add a new stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
860 st = av_new_stream(s, startcode);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
861 if (!st)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
862 goto skip;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
863 st->codec.codec_type = type;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
864 st->codec.codec_id = codec_id;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
865 if (codec_id != CODEC_ID_PCM_S16BE)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
866 st->need_parsing = 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
867 found:
41
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
868 if (startcode >= 0xa0 && startcode <= 0xbf) {
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
869 int b1, freq;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
870 static const int lpcm_freq_tab[4] = { 48000, 96000, 44100, 32000 };
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
871
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
872 /* for LPCM, we just skip the header and consider it is raw
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
873 audio data */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
874 if (len <= 3)
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
875 goto skip;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
876 get_byte(&s->pb); /* emphasis (1), muse(1), reserved(1), frame number(5) */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
877 b1 = get_byte(&s->pb); /* quant (2), freq(2), reserved(1), channels(3) */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
878 get_byte(&s->pb); /* dynamic range control (0x80 = off) */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
879 len -= 3;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
880 freq = (b1 >> 4) & 3;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
881 st->codec.sample_rate = lpcm_freq_tab[freq];
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
882 st->codec.channels = 1 + (b1 & 7);
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
883 st->codec.bit_rate = st->codec.channels * st->codec.sample_rate * 2;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
884 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
885 av_new_packet(pkt, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
886 get_buffer(&s->pb, pkt->data, pkt->size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
887 pkt->pts = pts;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
888 pkt->dts = dts;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
889 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
890 #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
891 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
892 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
893 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
894 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
895 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
896
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
897 static int mpegps_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
898 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
899 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
900 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
901
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
902 static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
903 int64_t *ppos, int find_next)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
904 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
905 int len, startcode;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
906 int64_t pos, pts, dts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
907
944c8edaf609 seek support
bellard
parents: 293
diff changeset
908 pos = *ppos;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
909 #ifdef DEBUG_SEEK
944c8edaf609 seek support
bellard
parents: 293
diff changeset
910 printf("read_dts: pos=0x%llx next=%d -> ", pos, find_next);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
911 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
912 url_fseek(&s->pb, pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
913 for(;;) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
914 len = mpegps_read_pes_header(s, &pos, &startcode, &pts, &dts, find_next);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
915 if (len < 0) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
916 #ifdef DEBUG_SEEK
944c8edaf609 seek support
bellard
parents: 293
diff changeset
917 printf("none (ret=%d)\n", len);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
918 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
919 return AV_NOPTS_VALUE;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
920 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
921 if (startcode == s->streams[stream_index]->id &&
944c8edaf609 seek support
bellard
parents: 293
diff changeset
922 dts != AV_NOPTS_VALUE) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
923 break;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
924 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
925 if (find_next) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
926 url_fskip(&s->pb, len);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
927 } else {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
928 url_fseek(&s->pb, pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
929 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
930 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
931 #ifdef DEBUG_SEEK
944c8edaf609 seek support
bellard
parents: 293
diff changeset
932 printf("pos=0x%llx dts=0x%llx %0.3f\n", pos, dts, dts / 90000.0);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
933 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
934 *ppos = pos;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
935 return dts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
936 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
937
944c8edaf609 seek support
bellard
parents: 293
diff changeset
938 static int find_stream_index(AVFormatContext *s)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
939 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
940 int i;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
941 AVStream *st;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
942
944c8edaf609 seek support
bellard
parents: 293
diff changeset
943 if (s->nb_streams <= 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
944 return -1;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
945 for(i = 0; i < s->nb_streams; i++) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
946 st = s->streams[i];
944c8edaf609 seek support
bellard
parents: 293
diff changeset
947 if (st->codec.codec_type == CODEC_TYPE_VIDEO) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
948 return i;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
949 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
950 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
951 return 0;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
952 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
953
944c8edaf609 seek support
bellard
parents: 293
diff changeset
954 static int mpegps_read_seek(AVFormatContext *s,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
955 int stream_index, int64_t timestamp)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
956 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
957 int64_t pos_min, pos_max, pos;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
958 int64_t dts_min, dts_max, dts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
959
944c8edaf609 seek support
bellard
parents: 293
diff changeset
960 timestamp = (timestamp * 90000) / AV_TIME_BASE;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
961
944c8edaf609 seek support
bellard
parents: 293
diff changeset
962 #ifdef DEBUG_SEEK
944c8edaf609 seek support
bellard
parents: 293
diff changeset
963 printf("read_seek: %d %0.3f\n", stream_index, timestamp / 90000.0);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
964 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
965
944c8edaf609 seek support
bellard
parents: 293
diff changeset
966 /* XXX: find stream_index by looking at the first PES packet found */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
967 if (stream_index < 0) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
968 stream_index = find_stream_index(s);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
969 if (stream_index < 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
970 return -1;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
971 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
972 pos_min = 0;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
973 dts_min = mpegps_read_dts(s, stream_index, &pos_min, 1);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
974 if (dts_min == AV_NOPTS_VALUE) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
975 /* we can reach this case only if no PTS are present in
944c8edaf609 seek support
bellard
parents: 293
diff changeset
976 the whole stream */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
977 return -1;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
978 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
979 pos_max = url_filesize(url_fileno(&s->pb)) - 1;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
980 dts_max = mpegps_read_dts(s, stream_index, &pos_max, 0);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
981
944c8edaf609 seek support
bellard
parents: 293
diff changeset
982 while (pos_min <= pos_max) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
983 #ifdef DEBUG_SEEK
944c8edaf609 seek support
bellard
parents: 293
diff changeset
984 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
985 pos_min, pos_max,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
986 dts_min / 90000.0, dts_max / 90000.0);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
987 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
988 if (timestamp <= dts_min) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
989 pos = pos_min;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
990 goto found;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
991 } else if (timestamp >= dts_max) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
992 pos = pos_max;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
993 goto found;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
994 } else {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
995 /* interpolate position (better than dichotomy) */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
996 pos = (int64_t)((double)(pos_max - pos_min) *
944c8edaf609 seek support
bellard
parents: 293
diff changeset
997 (double)(timestamp - dts_min) /
944c8edaf609 seek support
bellard
parents: 293
diff changeset
998 (double)(dts_max - dts_min)) + pos_min;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
999 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1000 #ifdef DEBUG_SEEK
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1001 printf("pos=0x%llx\n", pos);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1002 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1003 /* read the next timestamp */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1004 dts = mpegps_read_dts(s, stream_index, &pos, 1);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1005 /* check if we are lucky */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1006 if (dts == AV_NOPTS_VALUE) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1007 /* should never happen */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1008 pos = pos_min;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1009 goto found;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1010 } else if (timestamp == dts) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1011 goto found;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1012 } else if (timestamp < dts) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1013 pos_max = pos;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1014 dts_max = mpegps_read_dts(s, stream_index, &pos_max, 0);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1015 if (dts_max == AV_NOPTS_VALUE) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1016 /* should never happen */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1017 break;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1018 } else if (timestamp >= dts_max) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1019 pos = pos_max;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1020 goto found;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1021 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1022 } else {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1023 pos_min = pos + 1;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1024 dts_min = mpegps_read_dts(s, stream_index, &pos_min, 1);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1025 if (dts_min == AV_NOPTS_VALUE) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1026 /* should never happen */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1027 goto found;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1028 } else if (timestamp <= dts_min) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1029 goto found;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1030 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1031 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1032 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1033 pos = pos_min;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1034 found:
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1035 #ifdef DEBUG_SEEK
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1036 pos_min = pos;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1037 dts_min = mpegps_read_dts(s, stream_index, &pos_min, 1);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1038 pos_min++;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1039 dts_max = mpegps_read_dts(s, stream_index, &pos_min, 1);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1040 printf("pos=0x%llx %0.3f<=%0.3f<=%0.3f\n",
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1041 pos, dts_min / 90000.0, timestamp / 90000.0, dts_max / 90000.0);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1042 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1043 /* do the seek */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1044 url_fseek(&s->pb, pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1045 return 0;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1046 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1047
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 276
diff changeset
1048 #ifdef CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1049 static AVOutputFormat mpeg1system_mux = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1050 "mpeg",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1051 "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
1052 "video/mpeg",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1053 "mpg,mpeg",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1054 sizeof(MpegMuxContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1055 CODEC_ID_MP2,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1056 CODEC_ID_MPEG1VIDEO,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1057 mpeg_mux_init,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1058 mpeg_mux_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1059 mpeg_mux_end,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1060 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1061
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1062 static AVOutputFormat mpeg1vcd_mux = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1063 "vcd",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1064 "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
1065 "video/mpeg",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1066 NULL,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1067 sizeof(MpegMuxContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1068 CODEC_ID_MP2,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1069 CODEC_ID_MPEG1VIDEO,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1070 mpeg_mux_init,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1071 mpeg_mux_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1072 mpeg_mux_end,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1073 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1074
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1075 static AVOutputFormat mpeg2vob_mux = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1076 "vob",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1077 "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
1078 "video/mpeg",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1079 "vob",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1080 sizeof(MpegMuxContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1081 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
1082 CODEC_ID_MPEG2VIDEO,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1083 mpeg_mux_init,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1084 mpeg_mux_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1085 mpeg_mux_end,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1086 };
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 276
diff changeset
1087 #endif //CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1088
190
94fa5e3367ed exports mpegps_demux
bellard
parents: 178
diff changeset
1089 AVInputFormat mpegps_demux = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1090 "mpeg",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1091 "MPEG PS format",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1092 sizeof(MpegDemuxContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1093 mpegps_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1094 mpegps_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1095 mpegps_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1096 mpegps_read_close,
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1097 mpegps_read_seek,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1098 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1099
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1100 int mpegps_init(void)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1101 {
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 276
diff changeset
1102 #ifdef CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1103 av_register_output_format(&mpeg1system_mux);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1104 av_register_output_format(&mpeg1vcd_mux);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1105 av_register_output_format(&mpeg2vob_mux);
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 276
diff changeset
1106 #endif //CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1107 av_register_input_format(&mpegps_demux);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1108 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1109 }