annotate mpeg.c @ 337:f6b2b0718235 libavformat

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