annotate mpeg.c @ 2120:2f21921f9f1e libavformat

set pkt pos
author bcoudurier
date Sun, 03 Jun 2007 17:26:30 +0000
parents 0682a125d286
children 3804e39efbfd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
1415
3b00fb8ef8e4 replace coder/decoder file description in libavformat by muxer/demuxer
aurel
parents: 1358
diff changeset
2 * MPEG1/2 muxer and demuxer
0
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 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
5 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
6 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1332
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 885
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
20 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
21 #include "avformat.h"
628
8909a59c9461 common.h -> common.h/bitstream.h
michael
parents: 603
diff changeset
22 #include "bitstream.h"
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
23 #include "fifo.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
25 #define MAX_PAYLOAD_SIZE 4096
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
26 //#define DEBUG_SEEK
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
27
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
28 #undef NDEBUG
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
29 #include <assert.h>
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
30
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
31 typedef struct PacketDesc {
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
32 int64_t pts;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
33 int64_t dts;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
34 int size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
35 int unwritten_size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
36 int flags;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
37 struct PacketDesc *next;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
38 } PacketDesc;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
39
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
40 typedef struct {
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
41 AVFifoBuffer fifo;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
42 uint8_t id;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
43 int max_buffer_size; /* in bytes */
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
44 int buffer_index;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
45 PacketDesc *predecode_packet;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
46 PacketDesc *premux_packet;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
47 PacketDesc **next_packet;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
48 int packet_number;
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
49 uint8_t lpcm_header[3];
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
50 int lpcm_align;
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
51 int bytes_to_iframe;
596
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
52 int align_iframe;
674
b2ee9f2492d7 -target dvd minimum vobu length patch by ("Chris" [chris garveycocker com])
michael
parents: 652
diff changeset
53 int64_t vobu_start_pts;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
54 } StreamInfo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
55
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
56 typedef struct {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57 int packet_size; /* required packet size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
58 int packet_number;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
59 int pack_header_freq; /* frequency (in packets^-1) at which we send pack headers */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
60 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
61 int system_header_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
62 int mux_rate; /* bitrate in units of 50 bytes/s */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
63 /* stream info */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
64 int audio_bound;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
65 int video_bound;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
66 int is_mpeg2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
67 int is_vcd;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
68 int is_svcd;
548
fbc9b13c35cd AVOutputFormat mpeg2dvd_mux and int is_dvd from the dvd patch by (Paul Curtis <pfc at terrapin dot com>)
michael
parents: 547
diff changeset
69 int is_dvd;
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
70 int64_t last_scr; /* current system clock */
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
71
541
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
72 double vcd_padding_bitrate; //FIXME floats
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
73 int64_t vcd_padding_bytes_written;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
74
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
75 } MpegMuxContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
76
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
77 #define PACK_START_CODE ((unsigned int)0x000001ba)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
78 #define SYSTEM_HEADER_START_CODE ((unsigned int)0x000001bb)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
79 #define SEQUENCE_END_CODE ((unsigned int)0x000001b7)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
80 #define PACKET_START_CODE_MASK ((unsigned int)0xffffff00)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
81 #define PACKET_START_CODE_PREFIX ((unsigned int)0x00000100)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
82 #define ISO_11172_END_CODE ((unsigned int)0x000001b9)
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
83
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
84 /* mpeg2 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
85 #define PROGRAM_STREAM_MAP 0x1bc
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
86 #define PRIVATE_STREAM_1 0x1bd
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
87 #define PADDING_STREAM 0x1be
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
88 #define PRIVATE_STREAM_2 0x1bf
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
89
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
90
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
91 #define AUDIO_ID 0xc0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
92 #define VIDEO_ID 0xe0
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
93 #define AC3_ID 0x80
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
94 #define DTS_ID 0x8a
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
95 #define LPCM_ID 0xa0
789
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
96 #define SUB_ID 0x20
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
97
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
98 #define STREAM_TYPE_VIDEO_MPEG1 0x01
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
99 #define STREAM_TYPE_VIDEO_MPEG2 0x02
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
100 #define STREAM_TYPE_AUDIO_MPEG1 0x03
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
101 #define STREAM_TYPE_AUDIO_MPEG2 0x04
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
102 #define STREAM_TYPE_PRIVATE_SECTION 0x05
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
103 #define STREAM_TYPE_PRIVATE_DATA 0x06
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
104 #define STREAM_TYPE_AUDIO_AAC 0x0f
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
105 #define STREAM_TYPE_VIDEO_MPEG4 0x10
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
106 #define STREAM_TYPE_VIDEO_H264 0x1b
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
107
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
108 #define STREAM_TYPE_AUDIO_AC3 0x81
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
109 #define STREAM_TYPE_AUDIO_DTS 0x8a
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
110
356
72c7cf2f3a7a CONFIG_ENCODERS fix by (Ronald Bultje <rbultje at ronald dot bitfreak dot net>)
michael
parents: 355
diff changeset
111 static const int lpcm_freq_tab[4] = { 48000, 96000, 44100, 32000 };
72c7cf2f3a7a CONFIG_ENCODERS fix by (Ronald Bultje <rbultje at ronald dot bitfreak dot net>)
michael
parents: 355
diff changeset
112
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 820
diff changeset
113 #ifdef CONFIG_MUXERS
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
114 AVOutputFormat mpeg1system_muxer;
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
115 AVOutputFormat mpeg1vcd_muxer;
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
116 AVOutputFormat mpeg2vob_muxer;
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
117 AVOutputFormat mpeg2svcd_muxer;
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
118 AVOutputFormat mpeg2dvd_muxer;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
120 static int put_pack_header(AVFormatContext *ctx,
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
121 uint8_t *buf, int64_t timestamp)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
122 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
123 MpegMuxContext *s = ctx->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
124 PutBitContext pb;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
125
276
3dd3646e0164 init_put_bits changed
alex
parents: 242
diff changeset
126 init_put_bits(&pb, buf, 128);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
127
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
128 put_bits(&pb, 32, PACK_START_CODE);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
129 if (s->is_mpeg2) {
174
7d56e9f83fdb Write correct MPEG2-PS streams patch by (mru at users dot sourceforge dot net (M«©ns Rullg«©rd))
michaelni
parents: 165
diff changeset
130 put_bits(&pb, 2, 0x1);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
131 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
132 put_bits(&pb, 4, 0x2);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
133 }
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
134 put_bits(&pb, 3, (uint32_t)((timestamp >> 30) & 0x07));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
135 put_bits(&pb, 1, 1);
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
136 put_bits(&pb, 15, (uint32_t)((timestamp >> 15) & 0x7fff));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
137 put_bits(&pb, 1, 1);
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
138 put_bits(&pb, 15, (uint32_t)((timestamp) & 0x7fff));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
139 put_bits(&pb, 1, 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
140 if (s->is_mpeg2) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
141 /* clock extension */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
142 put_bits(&pb, 9, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
143 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
144 put_bits(&pb, 1, 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
145 put_bits(&pb, 22, s->mux_rate);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
146 put_bits(&pb, 1, 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
147 if (s->is_mpeg2) {
357
f4f573c7dc56 Patch for MPEG-2 VOB headers by (Jimmy Blair <blueskyjb at verizon dot net>)
michael
parents: 356
diff changeset
148 put_bits(&pb, 1, 1);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
149 put_bits(&pb, 5, 0x1f); /* reserved */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
150 put_bits(&pb, 3, 0); /* stuffing length */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
151 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
152 flush_put_bits(&pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
153 return pbBufPtr(&pb) - pb.buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
154 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
155
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
156 static int put_system_header(AVFormatContext *ctx, uint8_t *buf,int only_for_stream_id)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
157 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
158 MpegMuxContext *s = ctx->priv_data;
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
159 int size, i, private_stream_coded, id;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
160 PutBitContext pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
161
276
3dd3646e0164 init_put_bits changed
alex
parents: 242
diff changeset
162 init_put_bits(&pb, buf, 128);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
163
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
164 put_bits(&pb, 32, SYSTEM_HEADER_START_CODE);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
165 put_bits(&pb, 16, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
166 put_bits(&pb, 1, 1);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
167
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
168 put_bits(&pb, 22, s->mux_rate); /* maximum bit rate of the multiplexed stream */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
169 put_bits(&pb, 1, 1); /* marker */
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
170 if (s->is_vcd && only_for_stream_id==VIDEO_ID) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
171 /* This header applies only to the video stream (see VCD standard p. IV-7)*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
172 put_bits(&pb, 6, 0);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
173 } else
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
174 put_bits(&pb, 6, s->audio_bound);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
175
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
176 if (s->is_vcd) {
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
177 /* see VCD standard, p. IV-7*/
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
178 put_bits(&pb, 1, 0);
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
179 put_bits(&pb, 1, 1);
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
180 } else {
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
181 put_bits(&pb, 1, 0); /* variable bitrate*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
182 put_bits(&pb, 1, 0); /* non constrainted bit stream */
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
183 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
184
596
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
185 if (s->is_vcd || s->is_dvd) {
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
186 /* see VCD standard p IV-7 */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
187 put_bits(&pb, 1, 1); /* audio locked */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
188 put_bits(&pb, 1, 1); /* video locked */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
189 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
190 put_bits(&pb, 1, 0); /* audio locked */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
191 put_bits(&pb, 1, 0); /* video locked */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
192 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
193
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
194 put_bits(&pb, 1, 1); /* marker */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
195
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
196 if (s->is_vcd && only_for_stream_id==AUDIO_ID) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
197 /* This header applies only to the audio stream (see VCD standard p. IV-7)*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
198 put_bits(&pb, 5, 0);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
199 } else
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
200 put_bits(&pb, 5, s->video_bound);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
201
596
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
202 if (s->is_dvd) {
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
203 put_bits(&pb, 1, 0); /* packet_rate_restriction_flag */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
204 put_bits(&pb, 7, 0x7f); /* reserved byte */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
205 } else
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
206 put_bits(&pb, 8, 0xff); /* reserved byte */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
207
596
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
208 /* DVD-Video Stream_bound entries
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
209 id (0xB9) video, maximum P-STD for stream 0xE0. (P-STD_buffer_bound_scale = 1)
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
210 id (0xB8) audio, maximum P-STD for any MPEG audio (0xC0 to 0xC7) streams. If there are none set to 4096 (32x128). (P-STD_buffer_bound_scale = 0)
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
211 id (0xBD) private stream 1 (audio other than MPEG and subpictures). (P-STD_buffer_bound_scale = 1)
596
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
212 id (0xBF) private stream 2, NAV packs, set to 2x1024. */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
213 if (s->is_dvd) {
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
214
596
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
215 int P_STD_max_video = 0;
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
216 int P_STD_max_mpeg_audio = 0;
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
217 int P_STD_max_mpeg_PS1 = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
218
596
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
219 for(i=0;i<ctx->nb_streams;i++) {
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
220 StreamInfo *stream = ctx->streams[i]->priv_data;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
221
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
222 id = stream->id;
596
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
223 if (id == 0xbd && stream->max_buffer_size > P_STD_max_mpeg_PS1) {
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
224 P_STD_max_mpeg_PS1 = stream->max_buffer_size;
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
225 } else if (id >= 0xc0 && id <= 0xc7 && stream->max_buffer_size > P_STD_max_mpeg_audio) {
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
226 P_STD_max_mpeg_audio = stream->max_buffer_size;
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
227 } else if (id == 0xe0 && stream->max_buffer_size > P_STD_max_video) {
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
228 P_STD_max_video = stream->max_buffer_size;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
229 }
596
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
230 }
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
231
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
232 /* video */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
233 put_bits(&pb, 8, 0xb9); /* stream ID */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
234 put_bits(&pb, 2, 3);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
235 put_bits(&pb, 1, 1);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
236 put_bits(&pb, 13, P_STD_max_video / 1024);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
237
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
238 /* audio */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
239 if (P_STD_max_mpeg_audio == 0)
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
240 P_STD_max_mpeg_audio = 4096;
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
241 put_bits(&pb, 8, 0xb8); /* stream ID */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
242 put_bits(&pb, 2, 3);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
243 put_bits(&pb, 1, 0);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
244 put_bits(&pb, 13, P_STD_max_mpeg_audio / 128);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
245
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
246 /* private stream 1 */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
247 put_bits(&pb, 8, 0xbd); /* stream ID */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
248 put_bits(&pb, 2, 3);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
249 put_bits(&pb, 1, 0);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
250 put_bits(&pb, 13, P_STD_max_mpeg_PS1 / 128);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
251
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
252 /* private stream 2 */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
253 put_bits(&pb, 8, 0xbf); /* stream ID */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
254 put_bits(&pb, 2, 3);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
255 put_bits(&pb, 1, 1);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
256 put_bits(&pb, 13, 2);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
257 }
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
258 else {
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
259 /* audio stream info */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
260 private_stream_coded = 0;
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
261 for(i=0;i<ctx->nb_streams;i++) {
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
262 StreamInfo *stream = ctx->streams[i]->priv_data;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
263
596
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
264
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
265 /* For VCDs, only include the stream info for the stream
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
266 that the pack which contains this system belongs to.
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
267 (see VCD standard p. IV-7) */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
268 if ( !s->is_vcd || stream->id==only_for_stream_id
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
269 || only_for_stream_id==0) {
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
270
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
271 id = stream->id;
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
272 if (id < 0xc0) {
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
273 /* special case for private streams (AC3 use that) */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
274 if (private_stream_coded)
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
275 continue;
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
276 private_stream_coded = 1;
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
277 id = 0xbd;
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
278 }
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
279 put_bits(&pb, 8, id); /* stream ID */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
280 put_bits(&pb, 2, 3);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
281 if (id < 0xe0) {
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
282 /* audio */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
283 put_bits(&pb, 1, 0);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
284 put_bits(&pb, 13, stream->max_buffer_size / 128);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
285 } else {
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
286 /* video */
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
287 put_bits(&pb, 1, 1);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
288 put_bits(&pb, 13, stream->max_buffer_size / 1024);
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
289 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
290 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
291 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
292 }
596
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
293
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
294 flush_put_bits(&pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
295 size = pbBufPtr(&pb) - pb.buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
296 /* patch packet size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
297 buf[4] = (size - 6) >> 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
298 buf[5] = (size - 6) & 0xff;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
299
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
300 return size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
301 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
302
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
303 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
304 {
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
305 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
306 StreamInfo *stream;
596
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
307 MpegMuxContext *s = ctx->priv_data;
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
308
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
309 if (s->is_dvd)
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
310 return 18; // DVD-Video system headers are 18 bytes fixed length.
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
311
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
312 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
313 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
314 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
315 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
316 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
317 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
318 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
319 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
320 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
321 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
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 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
324 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing 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
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
326 static int mpeg_mux_init(AVFormatContext *ctx)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
328 MpegMuxContext *s = ctx->priv_data;
789
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
329 int bitrate, i, mpa_id, mpv_id, mps_id, ac3_id, dts_id, lpcm_id, j;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
330 AVStream *st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
331 StreamInfo *stream;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
332 int audio_bitrate;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
333 int video_bitrate;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
334
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
335 s->packet_number = 0;
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1146
diff changeset
336 s->is_vcd = (ctx->oformat == &mpeg1vcd_muxer);
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1146
diff changeset
337 s->is_svcd = (ctx->oformat == &mpeg2svcd_muxer);
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1146
diff changeset
338 s->is_mpeg2 = (ctx->oformat == &mpeg2vob_muxer || ctx->oformat == &mpeg2svcd_muxer || ctx->oformat == &mpeg2dvd_muxer);
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1146
diff changeset
339 s->is_dvd = (ctx->oformat == &mpeg2dvd_muxer);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
340
551
ef359bf133cc user selectable packet_size and mux_rate
michael
parents: 548
diff changeset
341 if(ctx->packet_size)
ef359bf133cc user selectable packet_size and mux_rate
michael
parents: 548
diff changeset
342 s->packet_size = ctx->packet_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
343 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
344 s->packet_size = 2048;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
345
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
346 s->vcd_padding_bytes_written = 0;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
347 s->vcd_padding_bitrate=0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
348
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
349 s->audio_bound = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
350 s->video_bound = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
351 mpa_id = AUDIO_ID;
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
352 ac3_id = AC3_ID;
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
353 dts_id = DTS_ID;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
354 mpv_id = VIDEO_ID;
789
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
355 mps_id = SUB_ID;
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
356 lpcm_id = LPCM_ID;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
357 for(i=0;i<ctx->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
358 st = ctx->streams[i];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
359 stream = av_mallocz(sizeof(StreamInfo));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
360 if (!stream)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
361 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
362 st->priv_data = stream;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
363
546
7c5ec900b38a remove wrong 33bit truncation of internal timestamps
michael
parents: 545
diff changeset
364 av_set_pts_info(st, 64, 1, 90000);
7c5ec900b38a remove wrong 33bit truncation of internal timestamps
michael
parents: 545
diff changeset
365
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
366 switch(st->codec->codec_type) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
367 case CODEC_TYPE_AUDIO:
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
368 if (st->codec->codec_id == CODEC_ID_AC3) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
369 stream->id = ac3_id++;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
370 } else if (st->codec->codec_id == CODEC_ID_DTS) {
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
371 stream->id = dts_id++;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
372 } else if (st->codec->codec_id == CODEC_ID_PCM_S16BE) {
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
373 stream->id = lpcm_id++;
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
374 for(j = 0; j < 4; j++) {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
375 if (lpcm_freq_tab[j] == st->codec->sample_rate)
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
376 break;
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
377 }
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
378 if (j == 4)
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
379 goto fail;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
380 if (st->codec->channels > 8)
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
381 return -1;
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
382 stream->lpcm_header[0] = 0x0c;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
383 stream->lpcm_header[1] = (st->codec->channels - 1) | (j << 4);
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
384 stream->lpcm_header[2] = 0x80;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
385 stream->lpcm_align = st->codec->channels * 2;
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
386 } else {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
387 stream->id = mpa_id++;
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
388 }
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
389
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
390 /* This value HAS to be used for VCD (see VCD standard, p. IV-7).
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
391 Right now it is also used for everything else.*/
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
392 stream->max_buffer_size = 4 * 1024;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
393 s->audio_bound++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
394 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
395 case CODEC_TYPE_VIDEO:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
396 stream->id = mpv_id++;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
397 if (st->codec->rc_buffer_size)
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
398 stream->max_buffer_size = 6*1024 + st->codec->rc_buffer_size/8;
544
1244786bfb26 cleanup video buffer size
michael
parents: 543
diff changeset
399 else
1244786bfb26 cleanup video buffer size
michael
parents: 543
diff changeset
400 stream->max_buffer_size = 230*1024; //FIXME this is probably too small as default
1244786bfb26 cleanup video buffer size
michael
parents: 543
diff changeset
401 #if 0
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
402 /* see VCD standard, p. IV-7*/
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
403 stream->max_buffer_size = 46 * 1024;
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
404 else
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
405 /* This value HAS to be used for SVCD (see SVCD standard, p. 26 V.2.3.2).
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
406 Right now it is also used for everything else.*/
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
407 stream->max_buffer_size = 230 * 1024;
544
1244786bfb26 cleanup video buffer size
michael
parents: 543
diff changeset
408 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
409 s->video_bound++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
410 break;
789
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
411 case CODEC_TYPE_SUBTITLE:
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
412 stream->id = mps_id++;
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
413 stream->max_buffer_size = 16 * 1024;
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
414 break;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
415 default:
537
558a093b04db do not call (av_)abort()
michael
parents: 496
diff changeset
416 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
417 }
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
418 av_fifo_init(&stream->fifo, 16);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
419 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
420 bitrate = 0;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
421 audio_bitrate = 0;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
422 video_bitrate = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
423 for(i=0;i<ctx->nb_streams;i++) {
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
424 int codec_rate;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
425 st = ctx->streams[i];
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
426 stream = (StreamInfo*) st->priv_data;
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
427
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
428 if(st->codec->rc_max_rate || stream->id==VIDEO_ID)
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
429 codec_rate= st->codec->rc_max_rate;
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
430 else
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
431 codec_rate= st->codec->bit_rate;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
432
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
433 if(!codec_rate)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
434 codec_rate= (1<<21)*8*50/ctx->nb_streams;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
435
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
436 bitrate += codec_rate;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
437
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
438 if (stream->id==AUDIO_ID)
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
439 audio_bitrate += codec_rate;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
440 else if (stream->id==VIDEO_ID)
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
441 video_bitrate += codec_rate;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
442 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
443
551
ef359bf133cc user selectable packet_size and mux_rate
michael
parents: 548
diff changeset
444 if(ctx->mux_rate){
ef359bf133cc user selectable packet_size and mux_rate
michael
parents: 548
diff changeset
445 s->mux_rate= (ctx->mux_rate + (8 * 50) - 1) / (8 * 50);
ef359bf133cc user selectable packet_size and mux_rate
michael
parents: 548
diff changeset
446 } else {
ef359bf133cc user selectable packet_size and mux_rate
michael
parents: 548
diff changeset
447 /* we increase slightly the bitrate to take into account the
ef359bf133cc user selectable packet_size and mux_rate
michael
parents: 548
diff changeset
448 headers. XXX: compute it exactly */
ef359bf133cc user selectable packet_size and mux_rate
michael
parents: 548
diff changeset
449 bitrate += bitrate*5/100;
ef359bf133cc user selectable packet_size and mux_rate
michael
parents: 548
diff changeset
450 bitrate += 10000;
ef359bf133cc user selectable packet_size and mux_rate
michael
parents: 548
diff changeset
451 s->mux_rate = (bitrate + (8 * 50) - 1) / (8 * 50);
ef359bf133cc user selectable packet_size and mux_rate
michael
parents: 548
diff changeset
452 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
453
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
454 if (s->is_vcd) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
455 double overhead_rate;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
456
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
457 /* The VCD standard mandates that the mux_rate field is 3528
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
458 (see standard p. IV-6).
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
459 The value is actually "wrong", i.e. if you calculate
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
460 it using the normal formula and the 75 sectors per second transfer
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
461 rate you get a different value because the real pack size is 2324,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
462 not 2352. But the standard explicitly specifies that the mux_rate
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
463 field in the header must have this value.*/
551
ef359bf133cc user selectable packet_size and mux_rate
michael
parents: 548
diff changeset
464 // s->mux_rate=2352 * 75 / 50; /* = 3528*/
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
465
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
466 /* The VCD standard states that the muxed stream must be
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
467 exactly 75 packs / second (the data rate of a single speed cdrom).
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
468 Since the video bitrate (probably 1150000 bits/sec) will be below
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
469 the theoretical maximum we have to add some padding packets
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
470 to make up for the lower data rate.
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
471 (cf. VCD standard p. IV-6 )*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
472
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
473 /* Add the header overhead to the data rate.
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
474 2279 data bytes per audio pack, 2294 data bytes per video pack*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
475 overhead_rate = ((audio_bitrate / 8.0) / 2279) * (2324 - 2279);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
476 overhead_rate += ((video_bitrate / 8.0) / 2294) * (2324 - 2294);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
477 overhead_rate *= 8;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
478
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
479 /* Add padding so that the full bitrate is 2324*75 bytes/sec */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
480 s->vcd_padding_bitrate = 2324 * 75 * 8 - (bitrate + overhead_rate);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
481 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
482
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
483 if (s->is_vcd || s->is_mpeg2)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
484 /* every packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
485 s->pack_header_freq = 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
486 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
487 /* every 2 seconds */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
488 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
489
b19f70a6d60f 1/0 fix by (Tim Allen <tim at proximity dot com dot au>)
michael
parents: 277
diff changeset
490 /* 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
491 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
492 s->pack_header_freq = 1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
493
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
494 if (s->is_mpeg2)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
495 /* every 200 packets. Need to look at the spec. */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
496 s->system_header_freq = s->pack_header_freq * 40;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
497 else if (s->is_vcd)
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
498 /* the standard mandates that there are only two system headers
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
499 in the whole file: one in the first packet of each stream.
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
500 (see standard p. IV-7 and IV-8) */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
501 s->system_header_freq = 0x7fffffff;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
502 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
503 s->system_header_freq = s->pack_header_freq * 5;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
504
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
505 for(i=0;i<ctx->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
506 stream = ctx->streams[i]->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
507 stream->packet_number = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
508 }
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
509 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
510 s->last_scr = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
511 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
512 fail:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
513 for(i=0;i<ctx->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
514 av_free(ctx->streams[i]->priv_data);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
515 }
1787
eb16c64144ee This fixes error handling for BeOS, removing the need for some ifdefs.
mmu_man
parents: 1759
diff changeset
516 return AVERROR(ENOMEM);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
517 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
518
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
519 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
520 {
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
521 put_byte(pb,
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
522 (id << 4) |
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
523 (((timestamp >> 30) & 0x07) << 1) |
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
524 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
525 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
526 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
527 }
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
528
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
529
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
530 /* return the number of padding bytes that should be inserted into
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
531 the multiplexed stream.*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
532 static int get_vcd_padding_size(AVFormatContext *ctx, int64_t pts)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
533 {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
534 MpegMuxContext *s = ctx->priv_data;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
535 int pad_bytes = 0;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
536
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
537 if (s->vcd_padding_bitrate > 0 && pts!=AV_NOPTS_VALUE)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
538 {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
539 int64_t full_pad_bytes;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
540
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
541 full_pad_bytes = (int64_t)((s->vcd_padding_bitrate * (pts / 90000.0)) / 8.0); //FIXME this is wrong
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
542 pad_bytes = (int) (full_pad_bytes - s->vcd_padding_bytes_written);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
543
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
544 if (pad_bytes<0)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
545 /* might happen if we have already padded to a later timestamp. This
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
546 can occur if another stream has already advanced further.*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
547 pad_bytes=0;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
548 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
549
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
550 return pad_bytes;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
551 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
552
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
553
683
095009fc2f35 kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 674
diff changeset
554 #if 0 /* unused, remove? */
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
555 /* 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
556 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
557 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
558 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
559 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
560 {
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
561 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
562 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
563 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
564
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
565 stream = ctx->streams[stream_index]->priv_data;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
566
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
567 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
568 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
569 /* pack header size */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
570 if (s->is_mpeg2)
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
571 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
572 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
573 buf_index += 12;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
574
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
575 if (s->is_vcd) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
576 /* there is exactly one system header for each stream in a VCD MPEG,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
577 One in the very first video packet and one in the very first
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
578 audio packet (see VCD standard p. IV-7 and IV-8).*/
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
579
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
580 if (stream->packet_number==0)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
581 /* The system headers refer only to the stream they occur in,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
582 so they have a constant size.*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
583 buf_index += 15;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
584
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
585 } else {
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
586 if ((s->packet_number % s->system_header_freq) == 0)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
587 buf_index += s->system_header_size;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
588 }
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
589 }
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing 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
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
591 if ((s->is_vcd && stream->packet_number==0)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
592 || (s->is_svcd && s->packet_number==0))
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
593 /* the first pack of each stream contains only the pack header,
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
594 the system header and some padding (see VCD standard p. IV-6)
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
595 Add the padding size, so that the actual payload becomes 0.*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
596 buf_index += s->packet_size - buf_index;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
597 else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
598 /* packet header size */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
599 buf_index += 6;
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
600 if (s->is_mpeg2) {
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
601 buf_index += 3;
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
602 if (stream->packet_number==0)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
603 buf_index += 3; /* PES extension */
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
604 buf_index += 1; /* obligatory stuffing byte */
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
605 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
606 if (pts != AV_NOPTS_VALUE) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
607 if (dts != pts)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
608 buf_index += 5 + 5;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
609 else
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
610 buf_index += 5;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
611
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
612 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
613 if (!s->is_mpeg2)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
614 buf_index++;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
615 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
616
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
617 if (stream->id < 0xc0) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
618 /* AC3/LPCM private data header */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
619 buf_index += 4;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
620 if (stream->id >= 0xa0) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
621 int n;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
622 buf_index += 3;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
623 /* NOTE: we round the payload size to an integer number of
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
624 LPCM samples */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
625 n = (s->packet_size - buf_index) % stream->lpcm_align;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
626 if (n)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
627 buf_index += (stream->lpcm_align - n);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
628 }
336
d75fd4c6ab62 primitive LPCM generator
bellard
parents: 335
diff changeset
629 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
630
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
631 if (s->is_vcd && stream->id == AUDIO_ID)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
632 /* The VCD standard demands that 20 zero bytes follow
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
633 each audio packet (see standard p. IV-8).*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
634 buf_index+=20;
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
635 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
636 return s->packet_size - buf_index;
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
637 }
683
095009fc2f35 kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 674
diff changeset
638 #endif
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
639
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
640 /* Write an MPEG padding packet header. */
541
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
641 static void put_padding_packet(AVFormatContext *ctx, ByteIOContext *pb,int packet_bytes)
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
642 {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
643 MpegMuxContext *s = ctx->priv_data;
541
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
644 int i;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
645
541
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
646 put_be32(pb, PADDING_STREAM);
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
647 put_be16(pb, packet_bytes - 6);
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
648 if (!s->is_mpeg2) {
541
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
649 put_byte(pb, 0x0f);
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
650 packet_bytes -= 7;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
651 } else
541
23a5448ade32 simplify put_padding_packet()
michael
parents: 540
diff changeset
652 packet_bytes -= 6;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
653
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
654 for(i=0;i<packet_bytes;i++)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
655 put_byte(pb, 0xff);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
656 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
657
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
658 static int get_nb_frames(AVFormatContext *ctx, StreamInfo *stream, int len){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
659 int nb_frames=0;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
660 PacketDesc *pkt_desc= stream->premux_packet;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
661
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
662 while(len>0){
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
663 if(pkt_desc->size == pkt_desc->unwritten_size)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
664 nb_frames++;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
665 len -= pkt_desc->unwritten_size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
666 pkt_desc= pkt_desc->next;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
667 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
668
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
669 return nb_frames;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
670 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
671
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
672 /* flush the packet on stream stream_index */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
673 static int flush_packet(AVFormatContext *ctx, int stream_index,
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
674 int64_t pts, int64_t dts, int64_t scr, int trailer_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
675 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
676 MpegMuxContext *s = ctx->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
677 StreamInfo *stream = ctx->streams[stream_index]->priv_data;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
678 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
679 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
680 int packet_size;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 49
diff changeset
681 uint8_t buffer[128];
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
682 int zero_trail_bytes = 0;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
683 int pad_packet_bytes = 0;
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
684 int pes_flags;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
685 int general_pack = 0; /*"general" pack without data specific to one stream?*/
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
686 int nb_frames;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
687
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
688 id = stream->id;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
689
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
690 #if 0
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
691 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
692 id, pts / 90000.0);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
693 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
694
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
695 buf_ptr = buffer;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
696
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
697 if ((s->packet_number % s->pack_header_freq) == 0 || s->last_scr != scr) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
698 /* 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
699 size = put_pack_header(ctx, buf_ptr, scr);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
700 buf_ptr += size;
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
701 s->last_scr= scr;
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
702
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
703 if (s->is_vcd) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
704 /* there is exactly one system header for each stream in a VCD MPEG,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
705 One in the very first video packet and one in the very first
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
706 audio packet (see VCD standard p. IV-7 and IV-8).*/
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
707
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
708 if (stream->packet_number==0) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
709 size = put_system_header(ctx, buf_ptr, id);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
710 buf_ptr += size;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
711 }
598
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
712 } else if (s->is_dvd) {
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
713 if (stream->align_iframe || s->packet_number == 0){
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
714 int PES_bytes_to_fill = s->packet_size - size - 10;
598
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
715
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
716 if (pts != AV_NOPTS_VALUE) {
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
717 if (dts != pts)
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
718 PES_bytes_to_fill -= 5 + 5;
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
719 else
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
720 PES_bytes_to_fill -= 5;
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
721 }
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
722
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
723 if (stream->bytes_to_iframe == 0 || s->packet_number == 0) {
598
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
724 size = put_system_header(ctx, buf_ptr, 0);
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
725 buf_ptr += size;
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
726 size = buf_ptr - buffer;
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
727 put_buffer(&ctx->pb, buffer, size);
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
728
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
729 put_be32(&ctx->pb, PRIVATE_STREAM_2);
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
730 put_be16(&ctx->pb, 0x03d4); // length
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
731 put_byte(&ctx->pb, 0x00); // substream ID, 00=PCI
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
732 for (i = 0; i < 979; i++)
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
733 put_byte(&ctx->pb, 0x00);
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
734
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
735 put_be32(&ctx->pb, PRIVATE_STREAM_2);
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
736 put_be16(&ctx->pb, 0x03fa); // length
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
737 put_byte(&ctx->pb, 0x01); // substream ID, 01=DSI
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
738 for (i = 0; i < 1017; i++)
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
739 put_byte(&ctx->pb, 0x00);
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
740
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
741 memset(buffer, 0, 128);
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
742 buf_ptr = buffer;
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
743 s->packet_number++;
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
744 stream->align_iframe = 0;
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
745 scr += s->packet_size*90000LL / (s->mux_rate*50LL); //FIXME rounding and first few bytes of each packet
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
746 size = put_pack_header(ctx, buf_ptr, scr);
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
747 s->last_scr= scr;
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
748 buf_ptr += size;
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
749 /* GOP Start */
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
750 } else if (stream->bytes_to_iframe < PES_bytes_to_fill) {
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
751 pad_packet_bytes = PES_bytes_to_fill - stream->bytes_to_iframe;
598
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
752 }
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
753 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
754 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
755 if ((s->packet_number % s->system_header_freq) == 0) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
756 size = put_system_header(ctx, buf_ptr, 0);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
757 buf_ptr += size;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
758 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
759 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
760 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
761 size = buf_ptr - buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
762 put_buffer(&ctx->pb, buffer, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
763
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
764 packet_size = s->packet_size - size;
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
765
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
766 if (s->is_vcd && id == AUDIO_ID)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
767 /* The VCD standard demands that 20 zero bytes follow
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
768 each audio pack (see standard p. IV-8).*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
769 zero_trail_bytes += 20;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
770
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
771 if ((s->is_vcd && stream->packet_number==0)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
772 || (s->is_svcd && s->packet_number==0)) {
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
773 /* for VCD the first pack of each stream contains only the pack header,
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
774 the system header and lots of padding (see VCD standard p. IV-6).
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
775 In the case of an audio pack, 20 zero bytes are also added at
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
776 the end.*/
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
777 /* For SVCD we fill the very first pack to increase compatibility with
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
778 some DVD players. Not mandated by the standard.*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
779 if (s->is_svcd)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
780 general_pack = 1; /* the system header refers to both streams and no stream data*/
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
781 pad_packet_bytes = packet_size - zero_trail_bytes;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
782 }
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
783
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
784 packet_size -= pad_packet_bytes + zero_trail_bytes;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
785
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
786 if (packet_size > 0) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
787
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
788 /* packet header size */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
789 packet_size -= 6;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
790
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
791 /* packet header */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
792 if (s->is_mpeg2) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
793 header_len = 3;
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
794 if (stream->packet_number==0)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
795 header_len += 3; /* PES extension */
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
796 header_len += 1; /* obligatory stuffing byte */
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
797 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
798 header_len = 0;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
799 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
800 if (pts != AV_NOPTS_VALUE) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
801 if (dts != pts)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
802 header_len += 5 + 5;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
803 else
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
804 header_len += 5;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
805 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
806 if (!s->is_mpeg2)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
807 header_len++;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
808 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
809
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
810 payload_size = packet_size - header_len;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
811 if (id < 0xc0) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
812 startcode = PRIVATE_STREAM_1;
789
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
813 payload_size -= 1;
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
814 if (id >= 0x40) {
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
815 payload_size -= 3;
789
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
816 if (id >= 0xa0)
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
817 payload_size -= 3;
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
818 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
819 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
820 startcode = 0x100 + id;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
821 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
822
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
823 stuffing_size = payload_size - av_fifo_size(&stream->fifo);
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
824
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
825 // first byte doesnt fit -> reset pts/dts + stuffing
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
826 if(payload_size <= trailer_size && pts != AV_NOPTS_VALUE){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
827 int timestamp_len=0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
828 if(dts != pts)
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
829 timestamp_len += 5;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
830 if(pts != AV_NOPTS_VALUE)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
831 timestamp_len += s->is_mpeg2 ? 5 : 4;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
832 pts=dts= AV_NOPTS_VALUE;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
833 header_len -= timestamp_len;
598
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
834 if (s->is_dvd && stream->align_iframe) {
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
835 pad_packet_bytes += timestamp_len;
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
836 packet_size -= timestamp_len;
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
837 } else {
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
838 payload_size += timestamp_len;
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
839 }
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
840 stuffing_size += timestamp_len;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
841 if(payload_size > trailer_size)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
842 stuffing_size += payload_size - trailer_size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
843 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
844
598
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
845 if (pad_packet_bytes > 0 && pad_packet_bytes <= 7) { // can't use padding, so use stuffing
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
846 packet_size += pad_packet_bytes;
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
847 payload_size += pad_packet_bytes; // undo the previous adjustment
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
848 if (stuffing_size < 0) {
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
849 stuffing_size = pad_packet_bytes;
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
850 } else {
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
851 stuffing_size += pad_packet_bytes;
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
852 }
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
853 pad_packet_bytes = 0;
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
854 }
4c53352471f2 DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>)
michael
parents: 596
diff changeset
855
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
856 if (stuffing_size < 0)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
857 stuffing_size = 0;
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
858 if (stuffing_size > 16) { /*<=16 for MPEG-1, <=32 for MPEG-2*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
859 pad_packet_bytes += stuffing_size;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
860 packet_size -= stuffing_size;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
861 payload_size -= stuffing_size;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
862 stuffing_size = 0;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
863 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
864
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
865 nb_frames= get_nb_frames(ctx, stream, payload_size - stuffing_size);
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
866
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
867 put_be32(&ctx->pb, startcode);
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
868
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
869 put_be16(&ctx->pb, packet_size);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
870
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
871 if (!s->is_mpeg2)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
872 for(i=0;i<stuffing_size;i++)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
873 put_byte(&ctx->pb, 0xff);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
874
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
875 if (s->is_mpeg2) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
876 put_byte(&ctx->pb, 0x80); /* mpeg2 id */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
877
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
878 pes_flags=0;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
879
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
880 if (pts != AV_NOPTS_VALUE) {
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
881 pes_flags |= 0x80;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
882 if (dts != pts)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
883 pes_flags |= 0x40;
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
884 }
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
885
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
886 /* Both the MPEG-2 and the SVCD standards demand that the
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
887 P-STD_buffer_size field be included in the first packet of
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
888 every stream. (see SVCD standard p. 26 V.2.3.1 and V.2.3.2
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
889 and MPEG-2 standard 2.7.7) */
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
890 if (stream->packet_number == 0)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
891 pes_flags |= 0x01;
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
892
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
893 put_byte(&ctx->pb, pes_flags); /* flags */
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
894 put_byte(&ctx->pb, header_len - 3 + stuffing_size);
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
895
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
896 if (pes_flags & 0x80) /*write pts*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
897 put_timestamp(&ctx->pb, (pes_flags & 0x40) ? 0x03 : 0x02, pts);
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
898 if (pes_flags & 0x40) /*write dts*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
899 put_timestamp(&ctx->pb, 0x01, dts);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
900
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
901 if (pes_flags & 0x01) { /*write pes extension*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
902 put_byte(&ctx->pb, 0x10); /* flags */
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
903
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
904 /* P-STD buffer info */
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
905 if (id == AUDIO_ID)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
906 put_be16(&ctx->pb, 0x4000 | stream->max_buffer_size/128);
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
907 else
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
908 put_be16(&ctx->pb, 0x6000 | stream->max_buffer_size/1024);
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
909 }
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
910
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
911 } else {
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
912 if (pts != AV_NOPTS_VALUE) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
913 if (dts != pts) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
914 put_timestamp(&ctx->pb, 0x03, pts);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
915 put_timestamp(&ctx->pb, 0x01, dts);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
916 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
917 put_timestamp(&ctx->pb, 0x02, pts);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
918 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
919 } else {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
920 put_byte(&ctx->pb, 0x0f);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
921 }
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 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
923
467
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
924 if (s->is_mpeg2) {
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
925 /* special stuffing byte that is always written
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
926 to prevent accidental generation of start codes. */
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
927 put_byte(&ctx->pb, 0xff);
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
928
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
929 for(i=0;i<stuffing_size;i++)
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
930 put_byte(&ctx->pb, 0xff);
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
931 }
40069a91d1a0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>)
michael
parents: 463
diff changeset
932
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
933 if (startcode == PRIVATE_STREAM_1) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
934 put_byte(&ctx->pb, id);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
935 if (id >= 0xa0) {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
936 /* LPCM (XXX: check nb_frames) */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
937 put_byte(&ctx->pb, 7);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
938 put_be16(&ctx->pb, 4); /* skip 3 header bytes */
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
939 put_byte(&ctx->pb, stream->lpcm_header[0]);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
940 put_byte(&ctx->pb, stream->lpcm_header[1]);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
941 put_byte(&ctx->pb, stream->lpcm_header[2]);
789
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
942 } else if (id >= 0x40) {
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
943 /* AC3 */
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
944 put_byte(&ctx->pb, nb_frames);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
945 put_be16(&ctx->pb, trailer_size+1);
331
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
946 }
4530681af424 suppress PTS in packets when not needed (slightly smaller files), fixed PTS generation in some cases, added provision for DTS generation, slightly better SCR generation (initial patch by Michel Bardiaux)
bellard
parents: 310
diff changeset
947 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
948
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
949 /* output data */
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
950 if(av_fifo_generic_read(&stream->fifo, payload_size - stuffing_size, &put_buffer, &ctx->pb) < 0)
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
951 return -1;
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
952 stream->bytes_to_iframe -= payload_size - stuffing_size;
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
953 }else{
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
954 payload_size=
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
955 stuffing_size= 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
956 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
957
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
958 if (pad_packet_bytes > 0)
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
959 put_padding_packet(ctx,&ctx->pb, pad_packet_bytes);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
960
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
961 for(i=0;i<zero_trail_bytes;i++)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
962 put_byte(&ctx->pb, 0x00);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
963
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
964 put_flush_packet(&ctx->pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
965
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
966 s->packet_number++;
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
967
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
968 /* only increase the stream packet number if this pack actually contains
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
969 something that is specific to this stream! I.e. a dedicated header
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
970 or some data.*/
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
971 if (!general_pack)
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
972 stream->packet_number++;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
973
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
974 return payload_size - stuffing_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
975 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
976
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
977 static void put_vcd_padding_sector(AVFormatContext *ctx)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
978 {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
979 /* There are two ways to do this padding: writing a sector/pack
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
980 of 0 values, or writing an MPEG padding pack. Both seem to
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
981 work with most decoders, BUT the VCD standard only allows a 0-sector
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
982 (see standard p. IV-4, IV-5).
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
983 So a 0-sector it is...*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
984
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
985 MpegMuxContext *s = ctx->priv_data;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
986 int i;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
987
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
988 for(i=0;i<s->packet_size;i++)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
989 put_byte(&ctx->pb, 0);
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
990
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
991 s->vcd_padding_bytes_written += s->packet_size;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
992
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
993 put_flush_packet(&ctx->pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
994
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
995 /* increasing the packet number is correct. The SCR of the following packs
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
996 is calculated from the packet_number and it has to include the padding
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
997 sector (it represents the sector index, not the MPEG pack index)
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
998 (see VCD standard p. IV-6)*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
999 s->packet_number++;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1000 }
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1001
683
095009fc2f35 kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 674
diff changeset
1002 #if 0 /* unused, remove? */
543
acf8a88674ff cleanup
michael
parents: 542
diff changeset
1003 static int64_t get_vcd_scr(AVFormatContext *ctx,int stream_index,int64_t pts)
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1004 {
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1005 MpegMuxContext *s = ctx->priv_data;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1006 int64_t scr;
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1007
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1008 /* Since the data delivery rate is constant, SCR is computed
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1009 using the formula C + i * 1200 where C is the start constant
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1010 and i is the pack index.
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1011 It is recommended that SCR 0 is at the beginning of the VCD front
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1012 margin (a sequence of empty Form 2 sectors on the CD).
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1013 It is recommended that the front margin is 30 sectors long, so
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1014 we use C = 30*1200 = 36000
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1015 (Note that even if the front margin is not 30 sectors the file
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1016 will still be correct according to the standard. It just won't have
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1017 the "recommended" value).*/
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1018 scr = 36000 + s->packet_number * 1200;
452
11d07f14b077 mpeg SVCD compatibility, SCR fixes, standard compliance
michael
parents: 447
diff changeset
1019
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1020 return scr;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1021 }
683
095009fc2f35 kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 674
diff changeset
1022 #endif
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1023
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1024 static int remove_decoded_packets(AVFormatContext *ctx, int64_t scr){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1025 // MpegMuxContext *s = ctx->priv_data;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1026 int i;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1027
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1028 for(i=0; i<ctx->nb_streams; i++){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1029 AVStream *st = ctx->streams[i];
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1030 StreamInfo *stream = st->priv_data;
2063
0682a125d286 Fix loop condition so it can be run through more than once.
diego
parents: 2062
diff changeset
1031 PacketDesc *pkt_desc;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1032
2063
0682a125d286 Fix loop condition so it can be run through more than once.
diego
parents: 2062
diff changeset
1033 while((pkt_desc= stream->predecode_packet)
0682a125d286 Fix loop condition so it can be run through more than once.
diego
parents: 2062
diff changeset
1034 && scr > pkt_desc->dts){ //FIXME > vs >=
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1035 if(stream->buffer_index < pkt_desc->size ||
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1036 stream->predecode_packet == stream->premux_packet){
2062
f1e774bb675c more detailed error message for buffer underflow
diego
parents: 2023
diff changeset
1037 av_log(ctx, AV_LOG_ERROR,
f1e774bb675c more detailed error message for buffer underflow
diego
parents: 2023
diff changeset
1038 "buffer underflow i=%d bufi=%d size=%d\n",
f1e774bb675c more detailed error message for buffer underflow
diego
parents: 2023
diff changeset
1039 i, stream->buffer_index, pkt_desc->size);
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1040 break;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1041 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1042 stream->buffer_index -= pkt_desc->size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1043
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1044 stream->predecode_packet= pkt_desc->next;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1045 av_freep(&pkt_desc);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1046 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1047 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1048
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1049 return 0;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1050 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1051
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1052 static int output_packet(AVFormatContext *ctx, int flush){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1053 MpegMuxContext *s = ctx->priv_data;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1054 AVStream *st;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1055 StreamInfo *stream;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1056 int i, avail_space, es_size, trailer_size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1057 int best_i= -1;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1058 int best_score= INT_MIN;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1059 int ignore_constraints=0;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1060 int64_t scr= s->last_scr;
545
afe2c9a33928 pts/dts 100l fix
michael
parents: 544
diff changeset
1061 PacketDesc *timestamp_packet;
566
c1e54abaa87e user setable preload and max_mux_delay
michael
parents: 552
diff changeset
1062 const int64_t max_delay= av_rescale(ctx->max_delay, 90000, AV_TIME_BASE);
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1063
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1064 retry:
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1065 for(i=0; i<ctx->nb_streams; i++){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1066 AVStream *st = ctx->streams[i];
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1067 StreamInfo *stream = st->priv_data;
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
1068 const int avail_data= av_fifo_size(&stream->fifo);
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1069 const int space= stream->max_buffer_size - stream->buffer_index;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1070 int rel_space= 1024*space / stream->max_buffer_size;
566
c1e54abaa87e user setable preload and max_mux_delay
michael
parents: 552
diff changeset
1071 PacketDesc *next_pkt= stream->premux_packet;
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1072
789
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
1073 /* for subtitle, a single PES packet must be generated,
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
1074 so we flush after every single subtitle packet */
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
1075 if(s->packet_size > avail_data && !flush
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
1076 && st->codec->codec_type != CODEC_TYPE_SUBTITLE)
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1077 return 0;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1078 if(avail_data==0)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1079 continue;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1080 assert(avail_data>0);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1081
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1082 if(space < s->packet_size && !ignore_constraints)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1083 continue;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1084
566
c1e54abaa87e user setable preload and max_mux_delay
michael
parents: 552
diff changeset
1085 if(next_pkt && next_pkt->dts - scr > max_delay)
c1e54abaa87e user setable preload and max_mux_delay
michael
parents: 552
diff changeset
1086 continue;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1087
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1088 if(rel_space > best_score){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1089 best_score= rel_space;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1090 best_i = i;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1091 avail_space= space;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1092 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1093 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1094
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1095 if(best_i < 0){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1096 int64_t best_dts= INT64_MAX;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1097
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1098 for(i=0; i<ctx->nb_streams; i++){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1099 AVStream *st = ctx->streams[i];
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1100 StreamInfo *stream = st->priv_data;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1101 PacketDesc *pkt_desc= stream->predecode_packet;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1102 if(pkt_desc && pkt_desc->dts < best_dts)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1103 best_dts= pkt_desc->dts;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1104 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1105
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1106 #if 0
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1107 av_log(ctx, AV_LOG_DEBUG, "bumping scr, scr:%f, dts:%f\n",
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1108 scr/90000.0, best_dts/90000.0);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1109 #endif
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1110 if(best_dts == INT64_MAX)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1111 return 0;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1112
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1113 if(scr >= best_dts+1 && !ignore_constraints){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1114 av_log(ctx, AV_LOG_ERROR, "packet too large, ignoring buffer limits to mux it\n");
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1115 ignore_constraints= 1;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1116 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1117 scr= FFMAX(best_dts+1, scr);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1118 if(remove_decoded_packets(ctx, scr) < 0)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1119 return -1;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1120 goto retry;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1121 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1122
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1123 assert(best_i >= 0);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1124
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1125 st = ctx->streams[best_i];
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1126 stream = st->priv_data;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1127
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
1128 assert(av_fifo_size(&stream->fifo) > 0);
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1129
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1130 assert(avail_space >= s->packet_size || ignore_constraints);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1131
545
afe2c9a33928 pts/dts 100l fix
michael
parents: 544
diff changeset
1132 timestamp_packet= stream->premux_packet;
afe2c9a33928 pts/dts 100l fix
michael
parents: 544
diff changeset
1133 if(timestamp_packet->unwritten_size == timestamp_packet->size){
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1134 trailer_size= 0;
545
afe2c9a33928 pts/dts 100l fix
michael
parents: 544
diff changeset
1135 }else{
afe2c9a33928 pts/dts 100l fix
michael
parents: 544
diff changeset
1136 trailer_size= timestamp_packet->unwritten_size;
afe2c9a33928 pts/dts 100l fix
michael
parents: 544
diff changeset
1137 timestamp_packet= timestamp_packet->next;
afe2c9a33928 pts/dts 100l fix
michael
parents: 544
diff changeset
1138 }
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1139
545
afe2c9a33928 pts/dts 100l fix
michael
parents: 544
diff changeset
1140 if(timestamp_packet){
551
ef359bf133cc user selectable packet_size and mux_rate
michael
parents: 548
diff changeset
1141 //av_log(ctx, AV_LOG_DEBUG, "dts:%f pts:%f scr:%f stream:%d\n", timestamp_packet->dts/90000.0, timestamp_packet->pts/90000.0, scr/90000.0, best_i);
545
afe2c9a33928 pts/dts 100l fix
michael
parents: 544
diff changeset
1142 es_size= flush_packet(ctx, best_i, timestamp_packet->pts, timestamp_packet->dts, scr, trailer_size);
afe2c9a33928 pts/dts 100l fix
michael
parents: 544
diff changeset
1143 }else{
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
1144 assert(av_fifo_size(&stream->fifo) == trailer_size);
545
afe2c9a33928 pts/dts 100l fix
michael
parents: 544
diff changeset
1145 es_size= flush_packet(ctx, best_i, AV_NOPTS_VALUE, AV_NOPTS_VALUE, scr, trailer_size);
afe2c9a33928 pts/dts 100l fix
michael
parents: 544
diff changeset
1146 }
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1147
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1148 if (s->is_vcd) {
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1149 /* Write one or more padding sectors, if necessary, to reach
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1150 the constant overall bitrate.*/
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1151 int vcd_pad_bytes;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1152
543
acf8a88674ff cleanup
michael
parents: 542
diff changeset
1153 while((vcd_pad_bytes = get_vcd_padding_size(ctx,stream->premux_packet->pts) ) >= s->packet_size){ //FIXME pts cannot be correct here
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1154 put_vcd_padding_sector(ctx);
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1155 s->last_scr += s->packet_size*90000LL / (s->mux_rate*50LL); //FIXME rounding and first few bytes of each packet
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1156 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1157 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1158
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1159 stream->buffer_index += es_size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1160 s->last_scr += s->packet_size*90000LL / (s->mux_rate*50LL); //FIXME rounding and first few bytes of each packet
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1161
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1162 while(stream->premux_packet && stream->premux_packet->unwritten_size <= es_size){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1163 es_size -= stream->premux_packet->unwritten_size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1164 stream->premux_packet= stream->premux_packet->next;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1165 }
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1166 if(es_size)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1167 stream->premux_packet->unwritten_size -= es_size;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1168
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1169 if(remove_decoded_packets(ctx, s->last_scr) < 0)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1170 return -1;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1171
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1172 return 1;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1173 }
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1174
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 467
diff changeset
1175 static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1176 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1177 MpegMuxContext *s = ctx->priv_data;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 467
diff changeset
1178 int stream_index= pkt->stream_index;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 467
diff changeset
1179 int size= pkt->size;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 467
diff changeset
1180 uint8_t *buf= pkt->data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1181 AVStream *st = ctx->streams[stream_index];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1182 StreamInfo *stream = st->priv_data;
543
acf8a88674ff cleanup
michael
parents: 542
diff changeset
1183 int64_t pts, dts;
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1184 PacketDesc *pkt_desc;
566
c1e54abaa87e user setable preload and max_mux_delay
michael
parents: 552
diff changeset
1185 const int preload= av_rescale(ctx->preload, 90000, AV_TIME_BASE);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
1186 const int is_iframe = st->codec->codec_type == CODEC_TYPE_VIDEO && (pkt->flags & PKT_FLAG_KEY);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1187
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 467
diff changeset
1188 pts= pkt->pts;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 467
diff changeset
1189 dts= pkt->dts;
337
f6b2b0718235 harcoded DTS computation for mpeg
bellard
parents: 336
diff changeset
1190
566
c1e54abaa87e user setable preload and max_mux_delay
michael
parents: 552
diff changeset
1191 if(pts != AV_NOPTS_VALUE) pts += preload;
c1e54abaa87e user setable preload and max_mux_delay
michael
parents: 552
diff changeset
1192 if(dts != AV_NOPTS_VALUE) dts += preload;
c1e54abaa87e user setable preload and max_mux_delay
michael
parents: 552
diff changeset
1193
552
56a704ec417e do not randomize unknown timestamps
michael
parents: 551
diff changeset
1194 //av_log(ctx, AV_LOG_DEBUG, "dts:%f pts:%f flags:%d stream:%d nopts:%d\n", dts/90000.0, pts/90000.0, pkt->flags, pkt->stream_index, pts != AV_NOPTS_VALUE);
789
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
1195 if (!stream->premux_packet)
411b75055a43 add support for muxing subtitles in mpeg-ps
aurel
parents: 783
diff changeset
1196 stream->next_packet = &stream->premux_packet;
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1197 *stream->next_packet=
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1198 pkt_desc= av_mallocz(sizeof(PacketDesc));
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1199 pkt_desc->pts= pts;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1200 pkt_desc->dts= dts;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1201 pkt_desc->unwritten_size=
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1202 pkt_desc->size= size;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1203 if(!stream->predecode_packet)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1204 stream->predecode_packet= pkt_desc;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1205 stream->next_packet= &pkt_desc->next;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1206
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
1207 av_fifo_realloc(&stream->fifo, av_fifo_size(&stream->fifo) + size + 1);
603
0b266c470c96 This patch takes into account that fifo_realloc may adjust fifo.wptr
michael
parents: 602
diff changeset
1208
596
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
1209 if (s->is_dvd){
674
b2ee9f2492d7 -target dvd minimum vobu length patch by ("Chris" [chris garveycocker com])
michael
parents: 652
diff changeset
1210 if (is_iframe && (s->packet_number == 0 || (pts - stream->vobu_start_pts >= 36000))) { // min VOBU length 0.4 seconds (mpucoder)
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
1211 stream->bytes_to_iframe = av_fifo_size(&stream->fifo);
596
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
1212 stream->align_iframe = 1;
674
b2ee9f2492d7 -target dvd minimum vobu length patch by ("Chris" [chris garveycocker com])
michael
parents: 652
diff changeset
1213 stream->vobu_start_pts = pts;
596
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
1214 } else {
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
1215 stream->align_iframe = 0;
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
1216 }
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
1217 }
a966fb81b076 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
michael
parents: 566
diff changeset
1218
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
1219 av_fifo_write(&stream->fifo, buf, size);
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1220
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1221 for(;;){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1222 int ret= output_packet(ctx, 0);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1223 if(ret<=0)
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1224 return ret;
335
b0ac206f232d better and simpler logic for MPEG muxing - fixed rare MPEG muxing PTS generation bug (stuffing is added in such rare cases) - fixed AC3 payload size generation - generate correct AC3 frame header (need spec checking)
bellard
parents: 331
diff changeset
1225 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1226 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1227
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1228 static int mpeg_mux_end(AVFormatContext *ctx)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1229 {
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1230 // MpegMuxContext *s = ctx->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1231 StreamInfo *stream;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1232 int i;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1233
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1234 for(;;){
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1235 int ret= output_packet(ctx, 1);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1236 if(ret<0)
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1237 return ret;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1238 else if(ret==0)
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1239 break;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1240 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1241
242
3c299d432ca4 removed invalid sequence end code
bellard
parents: 241
diff changeset
1242 /* End header according to MPEG1 systems standard. We do not write
3c299d432ca4 removed invalid sequence end code
bellard
parents: 241
diff changeset
1243 it as it is usually not needed by decoders and because it
3c299d432ca4 removed invalid sequence end code
bellard
parents: 241
diff changeset
1244 complicates MPEG stream concatenation. */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1245 //put_be32(&ctx->pb, ISO_11172_END_CODE);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1246 //put_flush_packet(&ctx->pb);
237
35231c0be8e5 memleak fix by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michaelni
parents: 210
diff changeset
1247
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1248 for(i=0;i<ctx->nb_streams;i++) {
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1249 stream = ctx->streams[i]->priv_data;
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1250
1322
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
1251 assert(av_fifo_size(&stream->fifo) == 0);
95f56c7b24eb * Moving FifoBuffer out of libavformat/avformat.h and
romansh
parents: 1284
diff changeset
1252 av_fifo_free(&stream->fifo);
542
be81a0f1974d SCR timestamp fix try #1
michael
parents: 541
diff changeset
1253 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1254 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1255 }
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 820
diff changeset
1256 #endif //CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1257
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1258 /*********************************************/
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1259 /* demux code */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1260
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1261 #define MAX_SYNC_SIZE 100000
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1262
1284
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
1263 static int cdxa_probe(AVProbeData *p)
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
1264 {
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
1265 /* check file header */
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
1266 if (p->buf[0] == 'R' && p->buf[1] == 'I' &&
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
1267 p->buf[2] == 'F' && p->buf[3] == 'F' &&
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
1268 p->buf[8] == 'C' && p->buf[9] == 'D' &&
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
1269 p->buf[10] == 'X' && p->buf[11] == 'A')
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
1270 return AVPROBE_SCORE_MAX;
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
1271 else
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
1272 return 0;
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
1273 }
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
1274
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1275 static int mpegps_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1276 {
936
7eb5c18614ae replace probe() by one similar to MPEG-ES
michael
parents: 896
diff changeset
1277 uint32_t code= -1;
1138
36ce24677f96 detect MPEG PES streams as MPEG PS; the PS demuxer will cope
mru
parents: 1126
diff changeset
1278 int sys=0, pspack=0, priv1=0, vid=0, audio=0;
539
78a8cbdad269 64bit and reading over the end of the array fixes
michael
parents: 537
diff changeset
1279 int i;
1257
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
1280 int score=0;
49
3e7e13e08b27 avoid too many false detections
bellard
parents: 41
diff changeset
1281
1284
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
1282 score = cdxa_probe(p);
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
1283 if (score > 0) return score;
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
1284
5abdc17dc283 add support for information in CDXA format
gpoirier
parents: 1257
diff changeset
1285 /* Search for MPEG stream */
936
7eb5c18614ae replace probe() by one similar to MPEG-ES
michael
parents: 896
diff changeset
1286 for(i=0; i<p->buf_size; i++){
7eb5c18614ae replace probe() by one similar to MPEG-ES
michael
parents: 896
diff changeset
1287 code = (code<<8) + p->buf[i];
165
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
1288 if ((code & 0xffffff00) == 0x100) {
1140
2cfb5e02b299 detect audio-only program streams and broken files made by VDR
mru
parents: 1138
diff changeset
1289 if(code == SYSTEM_HEADER_START_CODE) sys++;
2cfb5e02b299 detect audio-only program streams and broken files made by VDR
mru
parents: 1138
diff changeset
1290 else if(code == PRIVATE_STREAM_1) priv1++;
2cfb5e02b299 detect audio-only program streams and broken files made by VDR
mru
parents: 1138
diff changeset
1291 else if(code == PACK_START_CODE) pspack++;
2cfb5e02b299 detect audio-only program streams and broken files made by VDR
mru
parents: 1138
diff changeset
1292 else if((code & 0xf0) == VIDEO_ID) vid++;
2cfb5e02b299 detect audio-only program streams and broken files made by VDR
mru
parents: 1138
diff changeset
1293 else if((code & 0xe0) == AUDIO_ID) audio++;
165
e4d2f704bf80 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
michaelni
parents: 65
diff changeset
1294 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1295 }
1257
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
1296
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
1297 if(vid || audio) /* invalid VDR files nd short PES streams */
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
1298 score= AVPROBE_SCORE_MAX/4;
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
1299
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
1300 //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d\n", sys, priv1, pspack,vid, audio);
936
7eb5c18614ae replace probe() by one similar to MPEG-ES
michael
parents: 896
diff changeset
1301 if(sys && sys*9 <= pspack*10)
7eb5c18614ae replace probe() by one similar to MPEG-ES
michael
parents: 896
diff changeset
1302 return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
1140
2cfb5e02b299 detect audio-only program streams and broken files made by VDR
mru
parents: 1138
diff changeset
1303 if((priv1 || vid || audio) && (priv1+vid+audio)*9 <= pspack*10)
940
53c4a89c1a82 mpeg-ps probe 2nd try
michael
parents: 936
diff changeset
1304 return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
1257
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
1305 if((!!vid ^ !!audio) && (audio+vid > 1) && !sys && !pspack) /* PES stream */
1140
2cfb5e02b299 detect audio-only program streams and broken files made by VDR
mru
parents: 1138
diff changeset
1306 return AVPROBE_SCORE_MAX/2+2;
1257
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
1307
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
1308 //02-Penguin.flac has sys:0 priv1:0 pspack:0 vid:0 audio:1
6c654821b0ae fix probing of 02-Penguin.flac
michael
parents: 1169
diff changeset
1309 return score;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1310 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1311
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1312
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1313 typedef struct MpegDemuxContext {
1332
7474cc6383d4 fix some signedness warnings
mru
parents: 1322
diff changeset
1314 int32_t header_state;
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1315 unsigned char psm_es_type[256];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1316 } MpegDemuxContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1317
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1318 static int mpegps_read_header(AVFormatContext *s,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1319 AVFormatParameters *ap)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1320 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1321 MpegDemuxContext *m = s->priv_data;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1322 m->header_state = 0xff;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1323 s->ctx_flags |= AVFMTCTX_NOHEADER;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1324
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1325 /* no need to do more */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1326 return 0;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1327 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1328
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1329 static int64_t get_pts(ByteIOContext *pb, int c)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1330 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1331 int64_t pts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1332 int val;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1333
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1334 if (c < 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1335 c = get_byte(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1336 pts = (int64_t)((c >> 1) & 0x07) << 30;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1337 val = get_be16(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1338 pts |= (int64_t)(val >> 1) << 15;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1339 val = get_be16(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1340 pts |= (int64_t)(val >> 1);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1341 return pts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1342 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1343
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1344 static int find_next_start_code(ByteIOContext *pb, int *size_ptr,
1332
7474cc6383d4 fix some signedness warnings
mru
parents: 1322
diff changeset
1345 int32_t *header_state)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1346 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1347 unsigned int state, v;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1348 int val, n;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1349
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1350 state = *header_state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1351 n = *size_ptr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1352 while (n > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1353 if (url_feof(pb))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1354 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1355 v = get_byte(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1356 n--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1357 if (state == 0x000001) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1358 state = ((state << 8) | v) & 0xffffff;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1359 val = state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1360 goto found;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1361 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1362 state = ((state << 8) | v) & 0xffffff;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1363 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1364 val = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1365 found:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1366 *header_state = state;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1367 *size_ptr = n;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1368 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1369 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1370
683
095009fc2f35 kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 674
diff changeset
1371 #if 0 /* unused, remove? */
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1372 /* XXX: optimize */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1373 static int find_prev_start_code(ByteIOContext *pb, int *size_ptr)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1374 {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1375 int64_t pos, pos_start;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1376 int max_size, start_code;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1377
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1378 max_size = *size_ptr;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1379 pos_start = url_ftell(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1380
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1381 /* in order to go faster, we fill the buffer */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1382 pos = pos_start - 16386;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1383 if (pos < 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1384 pos = 0;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1385 url_fseek(pb, pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1386 get_byte(pb);
293
62cec412a186 make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
bellard
parents: 291
diff changeset
1387
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1388 pos = pos_start;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1389 for(;;) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1390 pos--;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1391 if (pos < 0 || (pos_start - pos) >= max_size) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1392 start_code = -1;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1393 goto the_end;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1394 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1395 url_fseek(pb, pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1396 start_code = get_be32(pb);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1397 if ((start_code & 0xffffff00) == 0x100)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1398 break;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1399 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1400 the_end:
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1401 *size_ptr = pos_start - pos;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1402 return start_code;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1403 }
683
095009fc2f35 kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 674
diff changeset
1404 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1405
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1406 /**
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1407 * Extracts stream types from a program stream map
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1408 * According to ISO/IEC 13818-1 ('MPEG-2 Systems') table 2-35
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1409 *
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1410 * @return number of bytes occupied by PSM in the bitstream
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1411 */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1412 static long mpegps_psm_parse(MpegDemuxContext *m, ByteIOContext *pb)
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1413 {
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1414 int psm_length, ps_info_length, es_map_length;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1415
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1416 psm_length = get_be16(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1417 get_byte(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1418 get_byte(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1419 ps_info_length = get_be16(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1420
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1421 /* skip program_stream_info */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1422 url_fskip(pb, ps_info_length);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1423 es_map_length = get_be16(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1424
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1425 /* at least one es available? */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1426 while (es_map_length >= 4){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1427 unsigned char type = get_byte(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1428 unsigned char es_id = get_byte(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1429 uint16_t es_info_length = get_be16(pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1430 /* remember mapping from stream id to stream type */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1431 m->psm_es_type[es_id] = type;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1432 /* skip program_stream_info */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1433 url_fskip(pb, es_info_length);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1434 es_map_length -= 4 + es_info_length;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1435 }
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1436 get_be32(pb); /* crc32 */
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1437 return 2 + psm_length;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1438 }
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1439
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1440 /* read the next PES header. Return its position in ppos
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1441 (if not NULL), and its start code, pts and dts.
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1442 */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1443 static int mpegps_read_pes_header(AVFormatContext *s,
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1444 int64_t *ppos, int *pstart_code,
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
1445 int64_t *ppts, int64_t *pdts)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1446 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1447 MpegDemuxContext *m = s->priv_data;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1448 int len, size, startcode, c, flags, header_len;
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1449 int pes_ext, ext2_len, id_ext, skip;
1664
5e7460a2f209 seperate redo (we dont handle this possibly valid packet) from
michael
parents: 1443
diff changeset
1450 int64_t pts, dts;
5e7460a2f209 seperate redo (we dont handle this possibly valid packet) from
michael
parents: 1443
diff changeset
1451 int64_t last_sync= url_ftell(&s->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1452
1664
5e7460a2f209 seperate redo (we dont handle this possibly valid packet) from
michael
parents: 1443
diff changeset
1453 error_redo:
5e7460a2f209 seperate redo (we dont handle this possibly valid packet) from
michael
parents: 1443
diff changeset
1454 url_fseek(&s->pb, last_sync, SEEK_SET);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1455 redo:
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1456 /* next start code (should be immediately after) */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1457 m->header_state = 0xff;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1458 size = MAX_SYNC_SIZE;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1459 startcode = find_next_start_code(&s->pb, &size, &m->header_state);
1664
5e7460a2f209 seperate redo (we dont handle this possibly valid packet) from
michael
parents: 1443
diff changeset
1460 last_sync = url_ftell(&s->pb);
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1415
diff changeset
1461 //printf("startcode=%x pos=0x%"PRIx64"\n", startcode, url_ftell(&s->pb));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1462 if (startcode < 0)
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 475
diff changeset
1463 return AVERROR_IO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1464 if (startcode == PACK_START_CODE)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1465 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1466 if (startcode == SYSTEM_HEADER_START_CODE)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1467 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1468 if (startcode == PADDING_STREAM ||
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1469 startcode == PRIVATE_STREAM_2) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1470 /* skip them */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1471 len = get_be16(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1472 url_fskip(&s->pb, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1473 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1474 }
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1475 if (startcode == PROGRAM_STREAM_MAP) {
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1476 mpegps_psm_parse(m, &s->pb);
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1477 goto redo;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1478 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1479
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1480 /* find matching stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1481 if (!((startcode >= 0x1c0 && startcode <= 0x1df) ||
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1482 (startcode >= 0x1e0 && startcode <= 0x1ef) ||
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1483 (startcode == 0x1bd) || (startcode == 0x1fd)))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1484 goto redo;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1485 if (ppos) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1486 *ppos = url_ftell(&s->pb) - 4;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1487 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1488 len = get_be16(&s->pb);
1666
682ea2701149 cosmetic
michael
parents: 1665
diff changeset
1489 pts =
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1490 dts = AV_NOPTS_VALUE;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1491 /* stuffing */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1492 for(;;) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1493 if (len < 1)
1664
5e7460a2f209 seperate redo (we dont handle this possibly valid packet) from
michael
parents: 1443
diff changeset
1494 goto error_redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1495 c = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1496 len--;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1497 /* XXX: for mpeg1, should test only bit 7 */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1498 if (c != 0xff)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1499 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1500 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1501 if ((c & 0xc0) == 0x40) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1502 /* buffer scale & size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1503 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1504 c = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1505 len -= 2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1506 }
1667
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
1507 if ((c & 0xe0) == 0x20) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1508 dts = pts = get_pts(&s->pb, c);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1509 len -= 4;
1667
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
1510 if (c & 0x10){
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
1511 dts = get_pts(&s->pb, -1);
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
1512 len -= 5;
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
1513 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1514 } else if ((c & 0xc0) == 0x80) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1515 /* mpeg 2 PES */
1126
8ba9a025a342 allow packets with non-zero PES_scrambling_control
mru
parents: 979
diff changeset
1516 #if 0 /* some streams have this field set for no apparent reason */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1517 if ((c & 0x30) != 0) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1518 /* Encrypted multiplex not handled */
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1519 goto redo;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1520 }
1126
8ba9a025a342 allow packets with non-zero PES_scrambling_control
mru
parents: 979
diff changeset
1521 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1522 flags = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1523 header_len = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1524 len -= 2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1525 if (header_len > len)
1664
5e7460a2f209 seperate redo (we dont handle this possibly valid packet) from
michael
parents: 1443
diff changeset
1526 goto error_redo;
1668
b609473bf4bb simplify
michael
parents: 1667
diff changeset
1527 len -= header_len;
1667
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
1528 if (flags & 0x80) {
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1529 dts = pts = get_pts(&s->pb, -1);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1530 header_len -= 5;
1667
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
1531 if (flags & 0x40) {
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
1532 dts = get_pts(&s->pb, -1);
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
1533 header_len -= 5;
a20d8757d598 simplify pts/dts reading
michael
parents: 1666
diff changeset
1534 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1535 }
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1536 if (flags & 0x01) { /* PES extension */
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1537 pes_ext = get_byte(&s->pb);
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1538 header_len--;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1539 if (pes_ext & 0x40) { /* pack header - should be zero in PS */
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1540 goto error_redo;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1541 }
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1542 /* Skip PES private data, program packet sequence counter and P-STD buffer */
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1543 skip = (pes_ext >> 4) & 0xb;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1544 skip += skip & 0x9;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1545 url_fskip(&s->pb, skip);
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1546 header_len -= skip;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1547
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1548 if (pes_ext & 0x01) { /* PES extension 2 */
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1549 ext2_len = get_byte(&s->pb);
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1550 header_len--;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1551 if ((ext2_len & 0x7f) > 0) {
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1552 id_ext = get_byte(&s->pb);
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1553 if ((id_ext & 0x80) == 0)
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1554 startcode = ((startcode & 0xff) << 8) | id_ext;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1555 header_len--;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1556 }
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1557 }
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1558 }
1668
b609473bf4bb simplify
michael
parents: 1667
diff changeset
1559 if(header_len < 0)
b609473bf4bb simplify
michael
parents: 1667
diff changeset
1560 goto error_redo;
b609473bf4bb simplify
michael
parents: 1667
diff changeset
1561 url_fskip(&s->pb, header_len);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1562 }
447
94aa265c18b9 Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents: 437
diff changeset
1563 else if( c!= 0xf )
94aa265c18b9 Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents: 437
diff changeset
1564 goto redo;
94aa265c18b9 Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>)
michael
parents: 437
diff changeset
1565
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1566 if (startcode == PRIVATE_STREAM_1 && !m->psm_es_type[startcode & 0xff]) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1567 startcode = get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1568 len--;
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1569 if (startcode >= 0x80 && startcode <= 0xcf) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1570 /* audio: skip header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1571 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1572 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1573 get_byte(&s->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1574 len -= 3;
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1575 if (startcode >= 0xb0 && startcode <= 0xbf) {
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1576 /* MLP/TrueHD audio has a 4-byte header */
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1577 get_byte(&s->pb);
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1578 len--;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1579 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1580 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1581 }
1665
074b64b1fb61 reduce len checks, simplifies code
michael
parents: 1664
diff changeset
1582 if(len<0)
074b64b1fb61 reduce len checks, simplifies code
michael
parents: 1664
diff changeset
1583 goto error_redo;
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1584 if(dts != AV_NOPTS_VALUE && ppos){
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1585 int i;
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1586 for(i=0; i<s->nb_streams; i++){
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1587 if(startcode == s->streams[i]->id) {
979
d2e5dfdf4def add size to AVIndex
michael
parents: 940
diff changeset
1588 av_add_index_entry(s->streams[i], *ppos, dts, 0, 0, AVINDEX_KEYFRAME /* FIXME keyframe? */);
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1589 }
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1590 }
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1591 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1592
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1593 *pstart_code = startcode;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1594 *ppts = pts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1595 *pdts = dts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1596 return len;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1597 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1598
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1599 static int mpegps_read_packet(AVFormatContext *s,
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1600 AVPacket *pkt)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1601 {
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1602 MpegDemuxContext *m = s->priv_data;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1603 AVStream *st;
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1604 int len, startcode, i, type, codec_id = 0, es_type;
346
e154eb1b7149 caching of timestamps for mpeg-ps so seeking is faster
michael
parents: 337
diff changeset
1605 int64_t pts, dts, dummy_pos; //dummy_pos is needed for the index building to work
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1606
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1607 redo:
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
1608 len = mpegps_read_pes_header(s, &dummy_pos, &startcode, &pts, &dts);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1609 if (len < 0)
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1610 return len;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1611
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1612 /* now find stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1613 for(i=0;i<s->nb_streams;i++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1614 st = s->streams[i];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1615 if (st->id == startcode)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1616 goto found;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1617 }
722
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1618
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1619 es_type = m->psm_es_type[startcode & 0xff];
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1620 if(es_type > 0){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1621 if(es_type == STREAM_TYPE_VIDEO_MPEG1){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1622 codec_id = CODEC_ID_MPEG2VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1623 type = CODEC_TYPE_VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1624 } else if(es_type == STREAM_TYPE_VIDEO_MPEG2){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1625 codec_id = CODEC_ID_MPEG2VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1626 type = CODEC_TYPE_VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1627 } else if(es_type == STREAM_TYPE_AUDIO_MPEG1 ||
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1628 es_type == STREAM_TYPE_AUDIO_MPEG2){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1629 codec_id = CODEC_ID_MP3;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1630 type = CODEC_TYPE_AUDIO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1631 } else if(es_type == STREAM_TYPE_AUDIO_AAC){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1632 codec_id = CODEC_ID_AAC;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1633 type = CODEC_TYPE_AUDIO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1634 } else if(es_type == STREAM_TYPE_VIDEO_MPEG4){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1635 codec_id = CODEC_ID_MPEG4;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1636 type = CODEC_TYPE_VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1637 } else if(es_type == STREAM_TYPE_VIDEO_H264){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1638 codec_id = CODEC_ID_H264;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1639 type = CODEC_TYPE_VIDEO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1640 } else if(es_type == STREAM_TYPE_AUDIO_AC3){
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1641 codec_id = CODEC_ID_AC3;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1642 type = CODEC_TYPE_AUDIO;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1643 } else {
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1644 goto skip;
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1645 }
2443f9469df2 PSM support in MPEG-PS demuxer.
mru
parents: 708
diff changeset
1646 } else if (startcode >= 0x1e0 && startcode <= 0x1ef) {
1146
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
1647 static const unsigned char avs_seqh[4] = { 0, 0, 1, 0xb0 };
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
1648 unsigned char buf[8];
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
1649 get_buffer(&s->pb, buf, 8);
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
1650 url_fseek(&s->pb, -8, SEEK_CUR);
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
1651 if(!memcmp(buf, avs_seqh, 4) && (buf[6] != 0 || buf[7] != 1))
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
1652 codec_id = CODEC_ID_CAVS;
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
1653 else
11a8f0c50814 attempt to detect Chinese AVS video
mru
parents: 1140
diff changeset
1654 codec_id = CODEC_ID_MPEG2VIDEO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1655 type = CODEC_TYPE_VIDEO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1656 } else if (startcode >= 0x1c0 && startcode <= 0x1df) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1657 type = CODEC_TYPE_AUDIO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1658 codec_id = CODEC_ID_MP2;
767
cbfea73709bd fix ac3 and dts detection (patch by Joakim Plate <joakim.plate at ecce.se>)
mru
parents: 722
diff changeset
1659 } else if (startcode >= 0x80 && startcode <= 0x87) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1660 type = CODEC_TYPE_AUDIO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1661 codec_id = CODEC_ID_AC3;
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1662 } else if ((startcode >= 0x88 && startcode <= 0x8f)
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1663 ||( startcode >= 0x98 && startcode <= 0x9f)) {
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1664 /* 0x90 - 0x97 is reserved for SDDS in DVD specs */
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
1665 type = CODEC_TYPE_AUDIO;
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 483
diff changeset
1666 codec_id = CODEC_ID_DTS;
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1667 } else if (startcode >= 0xa0 && startcode <= 0xaf) {
41
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1668 type = CODEC_TYPE_AUDIO;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1669 codec_id = CODEC_ID_PCM_S16BE;
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1670 } else if (startcode >= 0xb0 && startcode <= 0xbf) {
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1671 type = CODEC_TYPE_AUDIO;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1672 codec_id = CODEC_ID_MLP;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1673 } else if (startcode >= 0xc0 && startcode <= 0xcf) {
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1674 /* Used for both AC-3 and E-AC-3 in EVOB files */
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1675 type = CODEC_TYPE_AUDIO;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1676 codec_id = CODEC_ID_AC3;
783
2e8b5a7d7e02 DVD subtitle parsing - show mpeg component IDs by default
bellard
parents: 767
diff changeset
1677 } else if (startcode >= 0x20 && startcode <= 0x3f) {
2e8b5a7d7e02 DVD subtitle parsing - show mpeg component IDs by default
bellard
parents: 767
diff changeset
1678 type = CODEC_TYPE_SUBTITLE;
2e8b5a7d7e02 DVD subtitle parsing - show mpeg component IDs by default
bellard
parents: 767
diff changeset
1679 codec_id = CODEC_ID_DVD_SUBTITLE;
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1680 } else if (startcode >= 0xfd55 && startcode <= 0xfd5f) {
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1681 type = CODEC_TYPE_VIDEO;
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1682 codec_id = CODEC_ID_VC1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1683 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1684 skip:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1685 /* skip packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1686 url_fskip(&s->pb, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1687 goto redo;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1688 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1689 /* no stream found: add a new stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1690 st = av_new_stream(s, startcode);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1691 if (!st)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1692 goto skip;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
1693 st->codec->codec_type = type;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
1694 st->codec->codec_id = codec_id;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1695 if (codec_id != CODEC_ID_PCM_S16BE)
2023
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 2001
diff changeset
1696 st->need_parsing = AVSTREAM_PARSE_FULL;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1697 found:
708
d79164865a7c more fine grained discarding of packets
michael
parents: 698
diff changeset
1698 if(st->discard >= AVDISCARD_ALL)
652
b47948262721 support discarding uninterresting packets
michael
parents: 628
diff changeset
1699 goto skip;
1759
9eaf71a70ac1 Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>)
michael
parents: 1668
diff changeset
1700 if (startcode >= 0xa0 && startcode <= 0xaf) {
41
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1701 int b1, freq;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1702
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1703 /* for LPCM, we just skip the header and consider it is raw
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1704 audio data */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1705 if (len <= 3)
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1706 goto skip;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1707 get_byte(&s->pb); /* emphasis (1), muse(1), reserved(1), frame number(5) */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1708 b1 = get_byte(&s->pb); /* quant (2), freq(2), reserved(1), channels(3) */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1709 get_byte(&s->pb); /* dynamic range control (0x80 = off) */
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1710 len -= 3;
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1711 freq = (b1 >> 4) & 3;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
1712 st->codec->sample_rate = lpcm_freq_tab[freq];
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
1713 st->codec->channels = 1 + (b1 & 7);
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 789
diff changeset
1714 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * 2;
41
b892b9f97291 added DVD LPCM decoding support
bellard
parents: 14
diff changeset
1715 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1716 av_new_packet(pkt, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1717 get_buffer(&s->pb, pkt->data, pkt->size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1718 pkt->pts = pts;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1719 pkt->dts = dts;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1720 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
1721 #if 0
652
b47948262721 support discarding uninterresting packets
michael
parents: 628
diff changeset
1722 av_log(s, AV_LOG_DEBUG, "%d: pts=%0.3f dts=%0.3f size=%d\n",
b47948262721 support discarding uninterresting packets
michael
parents: 628
diff changeset
1723 pkt->stream_index, pkt->pts / 90000.0, pkt->dts / 90000.0, pkt->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
1724 #endif
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 475
diff changeset
1725
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1726 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1727 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1728
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1729 static int mpegps_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1730 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1731 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1732 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1733
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1734 static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index,
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
1735 int64_t *ppos, int64_t pos_limit)
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1736 {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1737 int len, startcode;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1738 int64_t pos, pts, dts;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1739
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1740 pos = *ppos;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1741 #ifdef DEBUG_SEEK
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1415
diff changeset
1742 printf("read_dts: pos=0x%"PRIx64" next=%d -> ", pos, find_next);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1743 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1744 url_fseek(&s->pb, pos, SEEK_SET);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1745 for(;;) {
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
1746 len = mpegps_read_pes_header(s, &pos, &startcode, &pts, &dts);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1747 if (len < 0) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1748 #ifdef DEBUG_SEEK
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1749 printf("none (ret=%d)\n", len);
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1750 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1751 return AV_NOPTS_VALUE;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1752 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1753 if (startcode == s->streams[stream_index]->id &&
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1754 dts != AV_NOPTS_VALUE) {
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1755 break;
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1756 }
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
1757 url_fskip(&s->pb, len);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1758 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1759 #ifdef DEBUG_SEEK
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1415
diff changeset
1760 printf("pos=0x%"PRIx64" dts=0x%"PRIx64" %0.3f\n", pos, dts, dts / 90000.0);
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1761 #endif
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1762 *ppos = pos;
463
696f41bc8784 store index for seeking in the native timebase of each stream
michael
parents: 452
diff changeset
1763 return dts;
310
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1764 }
944c8edaf609 seek support
bellard
parents: 293
diff changeset
1765
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1766 #ifdef CONFIG_MPEG1SYSTEM_MUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1767 AVOutputFormat mpeg1system_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1768 "mpeg",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1769 "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
1770 "video/mpeg",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1771 "mpg,mpeg",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1772 sizeof(MpegMuxContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1773 CODEC_ID_MP2,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1774 CODEC_ID_MPEG1VIDEO,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1775 mpeg_mux_init,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1776 mpeg_mux_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1777 mpeg_mux_end,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1778 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1779 #endif
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1780 #ifdef CONFIG_MPEG1VCD_MUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1781 AVOutputFormat mpeg1vcd_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1782 "vcd",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1783 "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
1784 "video/mpeg",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1785 NULL,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1786 sizeof(MpegMuxContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1787 CODEC_ID_MP2,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1788 CODEC_ID_MPEG1VIDEO,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1789 mpeg_mux_init,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1790 mpeg_mux_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1791 mpeg_mux_end,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1792 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1793 #endif
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1794 #ifdef CONFIG_MPEG2VOB_MUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1795 AVOutputFormat mpeg2vob_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1796 "vob",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1797 "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
1798 "video/mpeg",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1799 "vob",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1800 sizeof(MpegMuxContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1801 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
1802 CODEC_ID_MPEG2VIDEO,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1803 mpeg_mux_init,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1804 mpeg_mux_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1805 mpeg_mux_end,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1806 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1807 #endif
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1808
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1809 /* Same as mpeg2vob_mux except that the pack size is 2324 */
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1810 #ifdef CONFIG_MPEG2SVCD_MUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1811 AVOutputFormat mpeg2svcd_muxer = {
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1812 "svcd",
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1813 "MPEG2 PS format (VOB)",
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1814 "video/mpeg",
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1815 "vob",
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1816 sizeof(MpegMuxContext),
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1817 CODEC_ID_MP2,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1818 CODEC_ID_MPEG2VIDEO,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1819 mpeg_mux_init,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1820 mpeg_mux_write_packet,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1821 mpeg_mux_end,
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1822 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1823 #endif
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1824
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1825 /* Same as mpeg2vob_mux except the 'is_dvd' flag is set to produce NAV pkts */
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1826 #ifdef CONFIG_MPEG2DVD_MUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1827 AVOutputFormat mpeg2dvd_muxer = {
548
fbc9b13c35cd AVOutputFormat mpeg2dvd_mux and int is_dvd from the dvd patch by (Paul Curtis <pfc at terrapin dot com>)
michael
parents: 547
diff changeset
1828 "dvd",
fbc9b13c35cd AVOutputFormat mpeg2dvd_mux and int is_dvd from the dvd patch by (Paul Curtis <pfc at terrapin dot com>)
michael
parents: 547
diff changeset
1829 "MPEG2 PS format (DVD VOB)",
fbc9b13c35cd AVOutputFormat mpeg2dvd_mux and int is_dvd from the dvd patch by (Paul Curtis <pfc at terrapin dot com>)
michael
parents: 547
diff changeset
1830 "video/mpeg",
fbc9b13c35cd AVOutputFormat mpeg2dvd_mux and int is_dvd from the dvd patch by (Paul Curtis <pfc at terrapin dot com>)
michael
parents: 547
diff changeset
1831 "dvd",
fbc9b13c35cd AVOutputFormat mpeg2dvd_mux and int is_dvd from the dvd patch by (Paul Curtis <pfc at terrapin dot com>)
michael
parents: 547
diff changeset
1832 sizeof(MpegMuxContext),
fbc9b13c35cd AVOutputFormat mpeg2dvd_mux and int is_dvd from the dvd patch by (Paul Curtis <pfc at terrapin dot com>)
michael
parents: 547
diff changeset
1833 CODEC_ID_MP2,
fbc9b13c35cd AVOutputFormat mpeg2dvd_mux and int is_dvd from the dvd patch by (Paul Curtis <pfc at terrapin dot com>)
michael
parents: 547
diff changeset
1834 CODEC_ID_MPEG2VIDEO,
fbc9b13c35cd AVOutputFormat mpeg2dvd_mux and int is_dvd from the dvd patch by (Paul Curtis <pfc at terrapin dot com>)
michael
parents: 547
diff changeset
1835 mpeg_mux_init,
fbc9b13c35cd AVOutputFormat mpeg2dvd_mux and int is_dvd from the dvd patch by (Paul Curtis <pfc at terrapin dot com>)
michael
parents: 547
diff changeset
1836 mpeg_mux_write_packet,
fbc9b13c35cd AVOutputFormat mpeg2dvd_mux and int is_dvd from the dvd patch by (Paul Curtis <pfc at terrapin dot com>)
michael
parents: 547
diff changeset
1837 mpeg_mux_end,
fbc9b13c35cd AVOutputFormat mpeg2dvd_mux and int is_dvd from the dvd patch by (Paul Curtis <pfc at terrapin dot com>)
michael
parents: 547
diff changeset
1838 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1839 #endif
366
cbcbaeff1f2c improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>)
michael
parents: 357
diff changeset
1840
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1841 #ifdef CONFIG_MPEGPS_DEMUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1146
diff changeset
1842 AVInputFormat mpegps_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1843 "mpeg",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1844 "MPEG PS format",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1845 sizeof(MpegDemuxContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1846 mpegps_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1847 mpegps_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1848 mpegps_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1849 mpegps_read_close,
437
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
1850 NULL, //mpegps_read_seek,
50bae308f71e moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents: 396
diff changeset
1851 mpegps_read_dts,
783
2e8b5a7d7e02 DVD subtitle parsing - show mpeg component IDs by default
bellard
parents: 767
diff changeset
1852 .flags = AVFMT_SHOW_IDS,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1853 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1854 #endif