Mercurial > libavformat.hg
annotate mpegtsenc.c @ 6490:e1716e7b179f libavformat
Fix index_entries pos:
It was being set wrong for files with data_offset > 0
Patch by Michael Chinen, mchinen gmail
author | cehoyos |
---|---|
date | Mon, 27 Sep 2010 22:17:58 +0000 |
parents | 96d44d29ac98 |
children |
rev | line source |
---|---|
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
1 /* |
1415
3b00fb8ef8e4
replace coder/decoder file description in libavformat by muxer/demuxer
aurel
parents:
1358
diff
changeset
|
2 * MPEG2 transport stream (aka DVB) muxer |
4251
77e0c7511d41
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
4220
diff
changeset
|
3 * Copyright (c) 2003 Fabrice Bellard |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
4 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1169
diff
changeset
|
5 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1169
diff
changeset
|
6 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1169
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
8 * modify it under the terms of the GNU Lesser General Public |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
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:
1169
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
11 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1169
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
15 * Lesser General Public License for more details. |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
16 * |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
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:
1169
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:
887
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
20 */ |
3286 | 21 |
4201
7d2f3f1b68d8
Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
diego
parents:
3719
diff
changeset
|
22 #include "libavutil/bswap.h" |
3286 | 23 #include "libavutil/crc.h" |
4211
5e5654752973
set pts and dts of pes packets exactly according to specs
bcoudurier
parents:
4209
diff
changeset
|
24 #include "libavcodec/mpegvideo.h" |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
25 #include "avformat.h" |
5946
28ca2d77f997
Move the internal function declarations in avformat.h to internal.h.
stefano
parents:
5930
diff
changeset
|
26 #include "internal.h" |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
27 #include "mpegts.h" |
5787
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
28 #include "adts.h" |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
29 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
30 /* write DVB SI sections */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
31 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
32 /*********************************************/ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
33 /* mpegts section writer */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
34 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
35 typedef struct MpegTSSection { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
36 int pid; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
37 int cc; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
38 void (*write_packet)(struct MpegTSSection *s, const uint8_t *packet); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
39 void *opaque; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
40 } MpegTSSection; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
41 |
4209
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
42 typedef struct MpegTSService { |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
43 MpegTSSection pmt; /* MPEG2 pmt table context */ |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
44 int sid; /* service ID */ |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
45 char *name; |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
46 char *provider_name; |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
47 int pcr_pid; |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
48 int pcr_packet_count; |
5115
640c875b3bfe
rename freq to period which is more correct, patch by Niobos, niobos dot be at gmail dot com
bcoudurier
parents:
4952
diff
changeset
|
49 int pcr_packet_period; |
4209
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
50 } MpegTSService; |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
51 |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
52 typedef struct MpegTSWrite { |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
53 MpegTSSection pat; /* MPEG2 pat table */ |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
54 MpegTSSection sdt; /* MPEG2 sdt table context */ |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
55 MpegTSService **services; |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
56 int sdt_packet_count; |
5115
640c875b3bfe
rename freq to period which is more correct, patch by Niobos, niobos dot be at gmail dot com
bcoudurier
parents:
4952
diff
changeset
|
57 int sdt_packet_period; |
4209
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
58 int pat_packet_count; |
5115
640c875b3bfe
rename freq to period which is more correct, patch by Niobos, niobos dot be at gmail dot com
bcoudurier
parents:
4952
diff
changeset
|
59 int pat_packet_period; |
4209
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
60 int nb_services; |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
61 int onid; |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
62 int tsid; |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
63 uint64_t cur_pcr; |
5784
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
64 int mux_rate; ///< set to 1 when VBR |
4209
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
65 } MpegTSWrite; |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
66 |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
67 /* NOTE: 4 bytes must be left at the end for the crc32 */ |
1124
d3aff2c607f9
Add const to (mostly) char* and make some functions static, which aren't used
diego
parents:
996
diff
changeset
|
68 static void mpegts_write_section(MpegTSSection *s, uint8_t *buf, int len) |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
69 { |
4209
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
70 MpegTSWrite *ts = ((AVFormatContext*)s->opaque)->priv_data; |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
71 unsigned int crc; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
72 unsigned char packet[TS_PACKET_SIZE]; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
73 const unsigned char *buf_ptr; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
74 unsigned char *q; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
75 int first, b, len1, left; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
76 |
6248 | 77 crc = av_bswap32(av_crc(av_crc_get_table(AV_CRC_32_IEEE), -1, buf, len - 4)); |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
78 buf[len - 4] = (crc >> 24) & 0xff; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
79 buf[len - 3] = (crc >> 16) & 0xff; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
80 buf[len - 2] = (crc >> 8) & 0xff; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
81 buf[len - 1] = (crc) & 0xff; |
885 | 82 |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
83 /* send each packet */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
84 buf_ptr = buf; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
85 while (len > 0) { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
86 first = (buf == buf_ptr); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
87 q = packet; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
88 *q++ = 0x47; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
89 b = (s->pid >> 8); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
90 if (first) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
91 b |= 0x40; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
92 *q++ = b; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
93 *q++ = s->pid; |
5709
bdcd3e540558
Correctly increment continuity_counter in PCR packets.
cehoyos
parents:
5543
diff
changeset
|
94 s->cc = (s->cc + 1) & 0xf; |
3419 | 95 *q++ = 0x10 | s->cc; |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
96 if (first) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
97 *q++ = 0; /* 0 offset */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
98 len1 = TS_PACKET_SIZE - (q - packet); |
885 | 99 if (len1 > len) |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
100 len1 = len; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
101 memcpy(q, buf_ptr, len1); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
102 q += len1; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
103 /* add known padding data */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
104 left = TS_PACKET_SIZE - (q - packet); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
105 if (left > 0) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
106 memset(q, 0xff, left); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
107 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
108 s->write_packet(s, packet); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
109 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
110 buf_ptr += len1; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
111 len -= len1; |
4209
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
112 |
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
113 ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
114 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
115 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
116 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
117 static inline void put16(uint8_t **q_ptr, int val) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
118 { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
119 uint8_t *q; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
120 q = *q_ptr; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
121 *q++ = val >> 8; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
122 *q++ = val; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
123 *q_ptr = q; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
124 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
125 |
1124
d3aff2c607f9
Add const to (mostly) char* and make some functions static, which aren't used
diego
parents:
996
diff
changeset
|
126 static int mpegts_write_section1(MpegTSSection *s, int tid, int id, |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
127 int version, int sec_num, int last_sec_num, |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
128 uint8_t *buf, int len) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
129 { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
130 uint8_t section[1024], *q; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
131 unsigned int tot_len; |
885 | 132 |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
133 tot_len = 3 + 5 + len + 4; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
134 /* check if not too big */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
135 if (tot_len > 1024) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
136 return -1; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
137 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
138 q = section; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
139 *q++ = tid; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
140 put16(&q, 0xb000 | (len + 5 + 4)); /* 5 byte header + 4 byte CRC */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
141 put16(&q, id); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
142 *q++ = 0xc1 | (version << 1); /* current_next_indicator = 1 */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
143 *q++ = sec_num; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
144 *q++ = last_sec_num; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
145 memcpy(q, buf, len); |
885 | 146 |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
147 mpegts_write_section(s, section, tot_len); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
148 return 0; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
149 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
150 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
151 /*********************************************/ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
152 /* mpegts writer */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
153 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
154 #define DEFAULT_PMT_START_PID 0x1000 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
155 #define DEFAULT_START_PID 0x0100 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
156 #define DEFAULT_PROVIDER_NAME "FFmpeg" |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
157 #define DEFAULT_SERVICE_NAME "Service01" |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
158 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
159 /* default network id, transport stream and service identifiers */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
160 #define DEFAULT_ONID 0x0001 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
161 #define DEFAULT_TSID 0x0001 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
162 #define DEFAULT_SID 0x0001 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
163 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
164 /* a PES packet header is generated every DEFAULT_PES_HEADER_FREQ packets */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
165 #define DEFAULT_PES_HEADER_FREQ 16 |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
166 #define DEFAULT_PES_PAYLOAD_SIZE ((DEFAULT_PES_HEADER_FREQ - 1) * 184 + 170) |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
167 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
168 /* we retransmit the SI info at this rate */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
169 #define SDT_RETRANS_TIME 500 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
170 #define PAT_RETRANS_TIME 100 |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
171 #define PCR_RETRANS_TIME 20 |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
172 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
173 typedef struct MpegTSWriteStream { |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
174 struct MpegTSService *service; |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
175 int pid; /* stream associated pid */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
176 int cc; |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
177 int payload_index; |
4915 | 178 int first_pts_check; ///< first pts check needed |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
179 int64_t payload_pts; |
1838
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
180 int64_t payload_dts; |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
181 uint8_t payload[DEFAULT_PES_PAYLOAD_SIZE]; |
5787
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
182 ADTSContext *adts; |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
183 } MpegTSWriteStream; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
184 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
185 static void mpegts_write_pat(AVFormatContext *s) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
186 { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
187 MpegTSWrite *ts = s->priv_data; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
188 MpegTSService *service; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
189 uint8_t data[1012], *q; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
190 int i; |
885 | 191 |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
192 q = data; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
193 for(i = 0; i < ts->nb_services; i++) { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
194 service = ts->services[i]; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
195 put16(&q, service->sid); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
196 put16(&q, 0xe000 | service->pmt.pid); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
197 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
198 mpegts_write_section1(&ts->pat, PAT_TID, ts->tsid, 0, 0, 0, |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
199 data, q - data); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
200 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
201 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
202 static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
203 { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
204 // MpegTSWrite *ts = s->priv_data; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
205 uint8_t data[1012], *q, *desc_length_ptr, *program_info_length_ptr; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
206 int val, stream_type, i; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
207 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
208 q = data; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
209 put16(&q, 0xe000 | service->pcr_pid); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
210 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
211 program_info_length_ptr = q; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
212 q += 2; /* patched after */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
213 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
214 /* put program info here */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
215 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
216 val = 0xf000 | (q - program_info_length_ptr - 2); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
217 program_info_length_ptr[0] = val >> 8; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
218 program_info_length_ptr[1] = val; |
885 | 219 |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
220 for(i = 0; i < s->nb_streams; i++) { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
221 AVStream *st = s->streams[i]; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
222 MpegTSWriteStream *ts_st = st->priv_data; |
4525 | 223 AVMetadataTag *lang = av_metadata_get(st->metadata, "language", NULL,0); |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
785
diff
changeset
|
224 switch(st->codec->codec_id) { |
313
622892a75ddb
support more codecs in MPEG-TS patch by (mru at kth dot se (M«©ns Rullg«©rd))
michael
parents:
250
diff
changeset
|
225 case CODEC_ID_MPEG1VIDEO: |
622892a75ddb
support more codecs in MPEG-TS patch by (mru at kth dot se (M«©ns Rullg«©rd))
michael
parents:
250
diff
changeset
|
226 case CODEC_ID_MPEG2VIDEO: |
622892a75ddb
support more codecs in MPEG-TS patch by (mru at kth dot se (M«©ns Rullg«©rd))
michael
parents:
250
diff
changeset
|
227 stream_type = STREAM_TYPE_VIDEO_MPEG2; |
622892a75ddb
support more codecs in MPEG-TS patch by (mru at kth dot se (M«©ns Rullg«©rd))
michael
parents:
250
diff
changeset
|
228 break; |
622892a75ddb
support more codecs in MPEG-TS patch by (mru at kth dot se (M«©ns Rullg«©rd))
michael
parents:
250
diff
changeset
|
229 case CODEC_ID_MPEG4: |
622892a75ddb
support more codecs in MPEG-TS patch by (mru at kth dot se (M«©ns Rullg«©rd))
michael
parents:
250
diff
changeset
|
230 stream_type = STREAM_TYPE_VIDEO_MPEG4; |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
231 break; |
313
622892a75ddb
support more codecs in MPEG-TS patch by (mru at kth dot se (M«©ns Rullg«©rd))
michael
parents:
250
diff
changeset
|
232 case CODEC_ID_H264: |
622892a75ddb
support more codecs in MPEG-TS patch by (mru at kth dot se (M«©ns Rullg«©rd))
michael
parents:
250
diff
changeset
|
233 stream_type = STREAM_TYPE_VIDEO_H264; |
622892a75ddb
support more codecs in MPEG-TS patch by (mru at kth dot se (M«©ns Rullg«©rd))
michael
parents:
250
diff
changeset
|
234 break; |
3716 | 235 case CODEC_ID_DIRAC: |
236 stream_type = STREAM_TYPE_VIDEO_DIRAC; | |
237 break; | |
313
622892a75ddb
support more codecs in MPEG-TS patch by (mru at kth dot se (M«©ns Rullg«©rd))
michael
parents:
250
diff
changeset
|
238 case CODEC_ID_MP2: |
622892a75ddb
support more codecs in MPEG-TS patch by (mru at kth dot se (M«©ns Rullg«©rd))
michael
parents:
250
diff
changeset
|
239 case CODEC_ID_MP3: |
160
9bde37b1a5ce
try to filter _all_ PATs if no SDT could be found patch by (<gbazin at altern dot org>)
michaelni
parents:
152
diff
changeset
|
240 stream_type = STREAM_TYPE_AUDIO_MPEG1; |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
241 break; |
313
622892a75ddb
support more codecs in MPEG-TS patch by (mru at kth dot se (M«©ns Rullg«©rd))
michael
parents:
250
diff
changeset
|
242 case CODEC_ID_AAC: |
622892a75ddb
support more codecs in MPEG-TS patch by (mru at kth dot se (M«©ns Rullg«©rd))
michael
parents:
250
diff
changeset
|
243 stream_type = STREAM_TYPE_AUDIO_AAC; |
622892a75ddb
support more codecs in MPEG-TS patch by (mru at kth dot se (M«©ns Rullg«©rd))
michael
parents:
250
diff
changeset
|
244 break; |
622892a75ddb
support more codecs in MPEG-TS patch by (mru at kth dot se (M«©ns Rullg«©rd))
michael
parents:
250
diff
changeset
|
245 case CODEC_ID_AC3: |
5543 | 246 stream_type = STREAM_TYPE_AUDIO_AC3; |
313
622892a75ddb
support more codecs in MPEG-TS patch by (mru at kth dot se (M«©ns Rullg«©rd))
michael
parents:
250
diff
changeset
|
247 break; |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
248 default: |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
249 stream_type = STREAM_TYPE_PRIVATE_DATA; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
250 break; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
251 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
252 *q++ = stream_type; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
253 put16(&q, 0xe000 | ts_st->pid); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
254 desc_length_ptr = q; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
255 q += 2; /* patched after */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
256 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
257 /* write optional descriptors here */ |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
785
diff
changeset
|
258 switch(st->codec->codec_type) { |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5804
diff
changeset
|
259 case AVMEDIA_TYPE_AUDIO: |
4525 | 260 if (lang && strlen(lang->value) == 3) { |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
261 *q++ = 0x0a; /* ISO 639 language descriptor */ |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
262 *q++ = 4; |
4525 | 263 *q++ = lang->value[0]; |
264 *q++ = lang->value[1]; | |
265 *q++ = lang->value[2]; | |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
266 *q++ = 0; /* undefined type */ |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
267 } |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
268 break; |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5804
diff
changeset
|
269 case AVMEDIA_TYPE_SUBTITLE: |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
270 { |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
271 const char *language; |
4525 | 272 language = lang && strlen(lang->value)==3 ? lang->value : "eng"; |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
273 *q++ = 0x59; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
274 *q++ = 8; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
275 *q++ = language[0]; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
276 *q++ = language[1]; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
277 *q++ = language[2]; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
278 *q++ = 0x10; /* normal subtitles (0x20 = if hearing pb) */ |
6487 | 279 if(st->codec->extradata_size == 4) { |
280 memcpy(q, st->codec->extradata, 4); | |
281 q += 4; | |
282 } else { | |
6488 | 283 put16(&q, 1); /* page id */ |
284 put16(&q, 1); /* ancillary page id */ | |
6487 | 285 } |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
286 } |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
287 break; |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5804
diff
changeset
|
288 case AVMEDIA_TYPE_VIDEO: |
3716 | 289 if (stream_type == STREAM_TYPE_VIDEO_DIRAC) { |
290 *q++ = 0x05; /*MPEG-2 registration descriptor*/ | |
291 *q++ = 4; | |
292 *q++ = 'd'; | |
293 *q++ = 'r'; | |
294 *q++ = 'a'; | |
295 *q++ = 'c'; | |
296 } | |
297 break; | |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
298 } |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
299 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
300 val = 0xf000 | (q - desc_length_ptr - 2); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
301 desc_length_ptr[0] = val >> 8; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
302 desc_length_ptr[1] = val; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
303 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
304 mpegts_write_section1(&service->pmt, PMT_TID, service->sid, 0, 0, 0, |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
305 data, q - data); |
885 | 306 } |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
307 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
308 /* NOTE: str == NULL is accepted for an empty string */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
309 static void putstr8(uint8_t **q_ptr, const char *str) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
310 { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
311 uint8_t *q; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
312 int len; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
313 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
314 q = *q_ptr; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
315 if (!str) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
316 len = 0; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
317 else |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
318 len = strlen(str); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
319 *q++ = len; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
320 memcpy(q, str, len); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
321 q += len; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
322 *q_ptr = q; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
323 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
324 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
325 static void mpegts_write_sdt(AVFormatContext *s) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
326 { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
327 MpegTSWrite *ts = s->priv_data; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
328 MpegTSService *service; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
329 uint8_t data[1012], *q, *desc_list_len_ptr, *desc_len_ptr; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
330 int i, running_status, free_ca_mode, val; |
885 | 331 |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
332 q = data; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
333 put16(&q, ts->onid); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
334 *q++ = 0xff; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
335 for(i = 0; i < ts->nb_services; i++) { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
336 service = ts->services[i]; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
337 put16(&q, service->sid); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
338 *q++ = 0xfc | 0x00; /* currently no EIT info */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
339 desc_list_len_ptr = q; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
340 q += 2; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
341 running_status = 4; /* running */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
342 free_ca_mode = 0; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
343 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
344 /* write only one descriptor for the service name and provider */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
345 *q++ = 0x48; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
346 desc_len_ptr = q; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
347 q++; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
348 *q++ = 0x01; /* digital television service */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
349 putstr8(&q, service->provider_name); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
350 putstr8(&q, service->name); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
351 desc_len_ptr[0] = q - desc_len_ptr - 1; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
352 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
353 /* fill descriptor length */ |
885 | 354 val = (running_status << 13) | (free_ca_mode << 12) | |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
355 (q - desc_list_len_ptr - 2); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
356 desc_list_len_ptr[0] = val >> 8; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
357 desc_list_len_ptr[1] = val; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
358 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
359 mpegts_write_section1(&ts->sdt, SDT_TID, ts->tsid, 0, 0, 0, |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
360 data, q - data); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
361 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
362 |
885 | 363 static MpegTSService *mpegts_add_service(MpegTSWrite *ts, |
364 int sid, | |
365 const char *provider_name, | |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
366 const char *name) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
367 { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
368 MpegTSService *service; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
369 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
370 service = av_mallocz(sizeof(MpegTSService)); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
371 if (!service) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
372 return NULL; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
373 service->pmt.pid = DEFAULT_PMT_START_PID + ts->nb_services - 1; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
374 service->sid = sid; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
375 service->provider_name = av_strdup(provider_name); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
376 service->name = av_strdup(name); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
377 service->pcr_pid = 0x1fff; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
378 dynarray_add(&ts->services, &ts->nb_services, service); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
379 return service; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
380 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
381 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
382 static void section_write_packet(MpegTSSection *s, const uint8_t *packet) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
383 { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
384 AVFormatContext *ctx = s->opaque; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
1838
diff
changeset
|
385 put_buffer(ctx->pb, packet, TS_PACKET_SIZE); |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
386 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
387 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
388 static int mpegts_write_header(AVFormatContext *s) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
389 { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
390 MpegTSWrite *ts = s->priv_data; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
391 MpegTSWriteStream *ts_st; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
392 MpegTSService *service; |
5784
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
393 AVStream *st, *pcr_st = NULL; |
4525 | 394 AVMetadataTag *title; |
6200 | 395 int i, j; |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
396 const char *service_name; |
6200 | 397 int *pids; |
885 | 398 |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
399 ts->tsid = DEFAULT_TSID; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
400 ts->onid = DEFAULT_ONID; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
401 /* allocate a single DVB service */ |
4525 | 402 title = av_metadata_get(s->metadata, "title", NULL, 0); |
403 service_name = title ? title->value : DEFAULT_SERVICE_NAME; | |
885 | 404 service = mpegts_add_service(ts, DEFAULT_SID, |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
405 DEFAULT_PROVIDER_NAME, service_name); |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
406 service->pmt.write_packet = section_write_packet; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
407 service->pmt.opaque = s; |
5782 | 408 service->pmt.cc = 15; |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
409 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
410 ts->pat.pid = PAT_PID; |
5709
bdcd3e540558
Correctly increment continuity_counter in PCR packets.
cehoyos
parents:
5543
diff
changeset
|
411 ts->pat.cc = 15; // Initialize at 15 so that it wraps and be equal to 0 for the first packet we write |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
412 ts->pat.write_packet = section_write_packet; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
413 ts->pat.opaque = s; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
414 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
415 ts->sdt.pid = SDT_PID; |
5709
bdcd3e540558
Correctly increment continuity_counter in PCR packets.
cehoyos
parents:
5543
diff
changeset
|
416 ts->sdt.cc = 15; |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
417 ts->sdt.write_packet = section_write_packet; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
418 ts->sdt.opaque = s; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
419 |
6212 | 420 pids = av_malloc(s->nb_streams * sizeof(*pids)); |
6200 | 421 if (!pids) |
422 return AVERROR(ENOMEM); | |
423 | |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
424 /* assign pids to each stream */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
425 for(i = 0;i < s->nb_streams; i++) { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
426 st = s->streams[i]; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
427 ts_st = av_mallocz(sizeof(MpegTSWriteStream)); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
428 if (!ts_st) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
429 goto fail; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
430 st->priv_data = ts_st; |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
431 ts_st->service = service; |
6200 | 432 /* MPEG pid values < 16 are reserved. Applications which set st->id in |
433 * this range are assigned a calculated pid. */ | |
434 if (st->id < 16) { | |
435 ts_st->pid = DEFAULT_START_PID + i; | |
436 } else if (st->id < 0x1FFF) { | |
437 ts_st->pid = st->id; | |
438 } else { | |
439 av_log(s, AV_LOG_ERROR, "Invalid stream id %d, must be less than 8191\n", st->id); | |
440 goto fail; | |
441 } | |
442 if (ts_st->pid == service->pmt.pid) { | |
443 av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", ts_st->pid); | |
444 goto fail; | |
445 } | |
446 for (j = 0; j < i; j++) | |
447 if (pids[j] == ts_st->pid) { | |
448 av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", ts_st->pid); | |
449 goto fail; | |
450 } | |
451 pids[i] = ts_st->pid; | |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
452 ts_st->payload_pts = AV_NOPTS_VALUE; |
1838
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
453 ts_st->payload_dts = AV_NOPTS_VALUE; |
4915 | 454 ts_st->first_pts_check = 1; |
5781 | 455 ts_st->cc = 15; |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
456 /* update PCR pid by using the first video stream */ |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5804
diff
changeset
|
457 if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && |
5784
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
458 service->pcr_pid == 0x1fff) { |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
459 service->pcr_pid = ts_st->pid; |
5784
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
460 pcr_st = st; |
5219
583eb737b1c4
fix pes overhead computation, patch by Niobos, niobos at dest-unreach dot be
bcoudurier
parents:
5115
diff
changeset
|
461 } |
5787
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
462 if (st->codec->codec_id == CODEC_ID_AAC && |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
463 st->codec->extradata_size > 0) { |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
464 ts_st->adts = av_mallocz(sizeof(*ts_st->adts)); |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
465 if (!ts_st->adts) |
5930
08cd1179a20d
Replace all remaining occurrences of AVERROR_NOMEM with
stefano
parents:
5910
diff
changeset
|
466 return AVERROR(ENOMEM); |
5787
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
467 if (ff_adts_decode_extradata(s, ts_st->adts, st->codec->extradata, |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
468 st->codec->extradata_size) < 0) |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
469 return -1; |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
470 } |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
471 } |
885 | 472 |
6200 | 473 av_free(pids); |
474 | |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
475 /* if no video stream, use the first stream as PCR */ |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
476 if (service->pcr_pid == 0x1fff && s->nb_streams > 0) { |
5784
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
477 pcr_st = s->streams[0]; |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
478 ts_st = pcr_st->priv_data; |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
479 service->pcr_pid = ts_st->pid; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
480 } |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
481 |
5784
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
482 ts->mux_rate = s->mux_rate ? s->mux_rate : 1; |
4216
de2177071c01
calculate pat, pmt and sdt exact size and adjust total bitrate
bcoudurier
parents:
4215
diff
changeset
|
483 |
5784
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
484 if (ts->mux_rate > 1) { |
5803 | 485 service->pcr_packet_period = (ts->mux_rate * PCR_RETRANS_TIME) / |
486 (TS_PACKET_SIZE * 8 * 1000); | |
487 ts->sdt_packet_period = (ts->mux_rate * SDT_RETRANS_TIME) / | |
488 (TS_PACKET_SIZE * 8 * 1000); | |
489 ts->pat_packet_period = (ts->mux_rate * PAT_RETRANS_TIME) / | |
490 (TS_PACKET_SIZE * 8 * 1000); | |
5535
dd79e1261e28
move pcr/sdt/pat period computation after ts->mux_rate is set, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com
bcoudurier
parents:
5534
diff
changeset
|
491 |
5803 | 492 ts->cur_pcr = av_rescale(s->max_delay, 90000, AV_TIME_BASE); |
5784
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
493 } else { |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
494 /* Arbitrary values, PAT/PMT could be written on key frames */ |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
495 ts->sdt_packet_period = 200; |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
496 ts->pat_packet_period = 40; |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5804
diff
changeset
|
497 if (pcr_st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { |
5784
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
498 if (!pcr_st->codec->frame_size) { |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
499 av_log(s, AV_LOG_WARNING, "frame size not set\n"); |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
500 service->pcr_packet_period = |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
501 pcr_st->codec->sample_rate/(10*512); |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
502 } else { |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
503 service->pcr_packet_period = |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
504 pcr_st->codec->sample_rate/(10*pcr_st->codec->frame_size); |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
505 } |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
506 } else { |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
507 // max delta PCR 0.1s |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
508 service->pcr_packet_period = |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
509 pcr_st->codec->time_base.den/(10*pcr_st->codec->time_base.num); |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
510 } |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
511 } |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
512 |
5534
2836866dd7a1
output a pcr as soon as possible, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com
bcoudurier
parents:
5533
diff
changeset
|
513 // output a PCR as soon as possible |
2836866dd7a1
output a pcr as soon as possible, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com
bcoudurier
parents:
5533
diff
changeset
|
514 service->pcr_packet_count = service->pcr_packet_period; |
5784
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
515 ts->pat_packet_count = ts->pat_packet_period-1; |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
516 ts->sdt_packet_count = ts->sdt_packet_period-1; |
5534
2836866dd7a1
output a pcr as soon as possible, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com
bcoudurier
parents:
5533
diff
changeset
|
517 |
6244
17483b8b01e7
In mpegts muxer, print VBR instead of dummy 1 when displaying muxrate
bcoudurier
parents:
6212
diff
changeset
|
518 if (ts->mux_rate == 1) |
17483b8b01e7
In mpegts muxer, print VBR instead of dummy 1 when displaying muxrate
bcoudurier
parents:
6212
diff
changeset
|
519 av_log(s, AV_LOG_INFO, "muxrate VBR, "); |
17483b8b01e7
In mpegts muxer, print VBR instead of dummy 1 when displaying muxrate
bcoudurier
parents:
6212
diff
changeset
|
520 else |
17483b8b01e7
In mpegts muxer, print VBR instead of dummy 1 when displaying muxrate
bcoudurier
parents:
6212
diff
changeset
|
521 av_log(s, AV_LOG_INFO, "muxrate %d, ", ts->mux_rate); |
17483b8b01e7
In mpegts muxer, print VBR instead of dummy 1 when displaying muxrate
bcoudurier
parents:
6212
diff
changeset
|
522 av_log(s, AV_LOG_INFO, "pcr every %d pkts, " |
5538
3ad37f4daa76
print more debug info about muxing parameters, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com
bcoudurier
parents:
5537
diff
changeset
|
523 "sdt every %d, pat/pmt every %d pkts\n", |
6244
17483b8b01e7
In mpegts muxer, print VBR instead of dummy 1 when displaying muxrate
bcoudurier
parents:
6212
diff
changeset
|
524 service->pcr_packet_period, |
5784
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
525 ts->sdt_packet_period, ts->pat_packet_period); |
5538
3ad37f4daa76
print more debug info about muxing parameters, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com
bcoudurier
parents:
5537
diff
changeset
|
526 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
1838
diff
changeset
|
527 put_flush_packet(s->pb); |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
528 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
529 return 0; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
530 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
531 fail: |
6200 | 532 av_free(pids); |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
533 for(i = 0;i < s->nb_streams; i++) { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
534 st = s->streams[i]; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
535 av_free(st->priv_data); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
536 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
537 return -1; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
538 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
539 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
540 /* send SDT, PAT and PMT tables regulary */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
541 static void retransmit_si_info(AVFormatContext *s) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
542 { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
543 MpegTSWrite *ts = s->priv_data; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
544 int i; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
545 |
5115
640c875b3bfe
rename freq to period which is more correct, patch by Niobos, niobos dot be at gmail dot com
bcoudurier
parents:
4952
diff
changeset
|
546 if (++ts->sdt_packet_count == ts->sdt_packet_period) { |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
547 ts->sdt_packet_count = 0; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
548 mpegts_write_sdt(s); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
549 } |
5115
640c875b3bfe
rename freq to period which is more correct, patch by Niobos, niobos dot be at gmail dot com
bcoudurier
parents:
4952
diff
changeset
|
550 if (++ts->pat_packet_count == ts->pat_packet_period) { |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
551 ts->pat_packet_count = 0; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
552 mpegts_write_pat(s); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
553 for(i = 0; i < ts->nb_services; i++) { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
554 mpegts_write_pmt(s, ts->services[i]); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
555 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
556 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
557 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
558 |
5536
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
559 /* Write a single null transport stream packet */ |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
560 static void mpegts_insert_null_packet(AVFormatContext *s) |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
561 { |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
562 MpegTSWrite *ts = s->priv_data; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
563 uint8_t *q; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
564 uint8_t buf[TS_PACKET_SIZE]; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
565 |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
566 q = buf; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
567 *q++ = 0x47; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
568 *q++ = 0x00 | 0x1f; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
569 *q++ = 0xff; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
570 *q++ = 0x10; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
571 memset(q, 0x0FF, TS_PACKET_SIZE - (q - buf)); |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
572 put_buffer(s->pb, buf, TS_PACKET_SIZE); |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
573 ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
574 } |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
575 |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
576 /* Write a single transport stream packet with a PCR and no payload */ |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
577 static void mpegts_insert_pcr_only(AVFormatContext *s, AVStream *st) |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
578 { |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
579 MpegTSWrite *ts = s->priv_data; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
580 MpegTSWriteStream *ts_st = st->priv_data; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
581 uint8_t *q; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
582 uint64_t pcr = ts->cur_pcr; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
583 uint8_t buf[TS_PACKET_SIZE]; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
584 |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
585 q = buf; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
586 *q++ = 0x47; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
587 *q++ = ts_st->pid >> 8; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
588 *q++ = ts_st->pid; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
589 *q++ = 0x20 | ts_st->cc; /* Adaptation only */ |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
590 /* Continuity Count field does not increment (see 13818-1 section 2.4.3.3) */ |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
591 *q++ = TS_PACKET_SIZE - 5; /* Adaptation Field Length */ |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
592 *q++ = 0x10; /* Adaptation flags: PCR present */ |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
593 |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
594 /* PCR coded into 6 bytes */ |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
595 *q++ = pcr >> 25; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
596 *q++ = pcr >> 17; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
597 *q++ = pcr >> 9; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
598 *q++ = pcr >> 1; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
599 *q++ = (pcr & 1) << 7; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
600 *q++ = 0; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
601 |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
602 /* stuffing bytes */ |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
603 memset(q, 0xFF, TS_PACKET_SIZE - (q - buf)); |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
604 put_buffer(s->pb, buf, TS_PACKET_SIZE); |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
605 ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
606 } |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
607 |
1838
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
608 static void write_pts(uint8_t *q, int fourbits, int64_t pts) |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
609 { |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
610 int val; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
611 |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
612 val = fourbits << 4 | (((pts >> 30) & 0x07) << 1) | 1; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
613 *q++ = val; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
614 val = (((pts >> 15) & 0x7fff) << 1) | 1; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
615 *q++ = val >> 8; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
616 *q++ = val; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
617 val = (((pts) & 0x7fff) << 1) | 1; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
618 *q++ = val >> 8; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
619 *q++ = val; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
620 } |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
621 |
5537
8b4ac40f9525
update mpegts_write_pes documentation, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com
bcoudurier
parents:
5536
diff
changeset
|
622 /* Add a pes header to the front of payload, and segment into an integer number of |
8b4ac40f9525
update mpegts_write_pes documentation, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com
bcoudurier
parents:
5536
diff
changeset
|
623 * ts packets. The final ts packet is padded using an over-sized adaptation header |
8b4ac40f9525
update mpegts_write_pes documentation, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com
bcoudurier
parents:
5536
diff
changeset
|
624 * to exactly fill the last ts packet. |
8b4ac40f9525
update mpegts_write_pes documentation, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com
bcoudurier
parents:
5536
diff
changeset
|
625 * NOTE: 'payload' contains a complete PES payload. |
8b4ac40f9525
update mpegts_write_pes documentation, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com
bcoudurier
parents:
5536
diff
changeset
|
626 */ |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
627 static void mpegts_write_pes(AVFormatContext *s, AVStream *st, |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
628 const uint8_t *payload, int payload_size, |
1838
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
629 int64_t pts, int64_t dts) |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
630 { |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
631 MpegTSWriteStream *ts_st = st->priv_data; |
4209
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
632 MpegTSWrite *ts = s->priv_data; |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
633 uint8_t buf[TS_PACKET_SIZE]; |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
634 uint8_t *q; |
1838
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
635 int val, is_start, len, header_len, write_pcr, private_code, flags; |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
636 int afc_len, stuffing_len; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
637 int64_t pcr = -1; /* avoid warning */ |
5536
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
638 int64_t delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE); |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
639 |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
640 is_start = 1; |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
641 while (payload_size > 0) { |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
642 retransmit_si_info(s); |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
643 |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
644 write_pcr = 0; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
645 if (ts_st->pid == ts_st->service->pcr_pid) { |
5784
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
646 if (ts->mux_rate > 1 || is_start) // VBR pcr period is based on frames |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
647 ts_st->service->pcr_packet_count++; |
885 | 648 if (ts_st->service->pcr_packet_count >= |
5115
640c875b3bfe
rename freq to period which is more correct, patch by Niobos, niobos dot be at gmail dot com
bcoudurier
parents:
4952
diff
changeset
|
649 ts_st->service->pcr_packet_period) { |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
650 ts_st->service->pcr_packet_count = 0; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
651 write_pcr = 1; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
652 } |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
653 } |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
654 |
5784
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
655 if (ts->mux_rate > 1 && dts != AV_NOPTS_VALUE && |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
656 (dts - (int64_t)ts->cur_pcr) > delay) { |
5536
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
657 /* pcr insert gets priority over null packet insert */ |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
658 if (write_pcr) |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
659 mpegts_insert_pcr_only(s, st); |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
660 else |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
661 mpegts_insert_null_packet(s); |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
662 continue; /* recalculate write_pcr and possibly retransmit si_info */ |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
663 } |
c13224897684
Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
bcoudurier
parents:
5535
diff
changeset
|
664 |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
665 /* prepare packet header */ |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
666 q = buf; |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
667 *q++ = 0x47; |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
668 val = (ts_st->pid >> 8); |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
669 if (is_start) |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
670 val |= 0x40; |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
671 *q++ = val; |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
672 *q++ = ts_st->pid; |
5709
bdcd3e540558
Correctly increment continuity_counter in PCR packets.
cehoyos
parents:
5543
diff
changeset
|
673 ts_st->cc = (ts_st->cc + 1) & 0xf; |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
674 *q++ = 0x10 | ts_st->cc | (write_pcr ? 0x20 : 0); |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
675 if (write_pcr) { |
4209
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
676 // add 11, pcr references the last byte of program clock reference base |
5784
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
677 if (ts->mux_rate > 1) |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
678 pcr = ts->cur_pcr + (4+7)*8*90000LL / ts->mux_rate; |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
679 else |
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
680 pcr = dts - delay; |
4214 | 681 if (dts != AV_NOPTS_VALUE && dts < pcr) |
682 av_log(s, AV_LOG_WARNING, "dts < pcr, TS is invalid\n"); | |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
683 *q++ = 7; /* AFC length */ |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
684 *q++ = 0x10; /* flags: PCR present */ |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
685 *q++ = pcr >> 25; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
686 *q++ = pcr >> 17; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
687 *q++ = pcr >> 9; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
688 *q++ = pcr >> 1; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
689 *q++ = (pcr & 1) << 7; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
690 *q++ = 0; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
691 } |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
692 if (is_start) { |
3716 | 693 int pes_extension = 0; |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
694 /* write PES header */ |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
695 *q++ = 0x00; |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
696 *q++ = 0x00; |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
697 *q++ = 0x01; |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
698 private_code = 0; |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5804
diff
changeset
|
699 if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { |
3716 | 700 if (st->codec->codec_id == CODEC_ID_DIRAC) { |
701 *q++ = 0xfd; | |
702 } else | |
703 *q++ = 0xe0; | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5804
diff
changeset
|
704 } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
785
diff
changeset
|
705 (st->codec->codec_id == CODEC_ID_MP2 || |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
785
diff
changeset
|
706 st->codec->codec_id == CODEC_ID_MP3)) { |
885 | 707 *q++ = 0xc0; |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
708 } else { |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
709 *q++ = 0xbd; |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5804
diff
changeset
|
710 if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) { |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
711 private_code = 0x20; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
712 } |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
713 } |
1838
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
714 header_len = 0; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
715 flags = 0; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
716 if (pts != AV_NOPTS_VALUE) { |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
717 header_len += 5; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
718 flags |= 0x80; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
719 } |
4913 | 720 if (dts != AV_NOPTS_VALUE && pts != AV_NOPTS_VALUE && dts != pts) { |
1838
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
721 header_len += 5; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
722 flags |= 0x40; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
723 } |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5804
diff
changeset
|
724 if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && |
3716 | 725 st->codec->codec_id == CODEC_ID_DIRAC) { |
726 /* set PES_extension_flag */ | |
727 pes_extension = 1; | |
728 flags |= 0x01; | |
729 | |
730 /* | |
731 * One byte for PES2 extension flag + | |
732 * one byte for extension length + | |
733 * one byte for extension id | |
734 */ | |
735 header_len += 3; | |
736 } | |
1838
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
737 len = payload_size + header_len + 3; |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
738 if (private_code != 0) |
1838
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
739 len++; |
4921
fa21da521576
write a single pes for video frames, some proprietary player needs it
bcoudurier
parents:
4915
diff
changeset
|
740 if (len > 0xffff) |
fa21da521576
write a single pes for video frames, some proprietary player needs it
bcoudurier
parents:
4915
diff
changeset
|
741 len = 0; |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
742 *q++ = len >> 8; |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
743 *q++ = len; |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
744 val = 0x80; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
745 /* data alignment indicator is required for subtitle data */ |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5804
diff
changeset
|
746 if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
747 val |= 0x04; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
748 *q++ = val; |
1838
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
749 *q++ = flags; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
750 *q++ = header_len; |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
751 if (pts != AV_NOPTS_VALUE) { |
1838
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
752 write_pts(q, flags >> 6, pts); |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
753 q += 5; |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
754 } |
4913 | 755 if (dts != AV_NOPTS_VALUE && pts != AV_NOPTS_VALUE && dts != pts) { |
1838
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
756 write_pts(q, 1, dts); |
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
757 q += 5; |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
758 } |
3716 | 759 if (pes_extension && st->codec->codec_id == CODEC_ID_DIRAC) { |
760 flags = 0x01; /* set PES_extension_flag_2 */ | |
761 *q++ = flags; | |
762 *q++ = 0x80 | 0x01; /* marker bit + extension length */ | |
763 /* | |
764 * Set the stream id extension flag bit to 0 and | |
765 * write the extended stream id | |
766 */ | |
767 *q++ = 0x00 | 0x60; | |
768 } | |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
769 if (private_code != 0) |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
770 *q++ = private_code; |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
771 is_start = 0; |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
772 } |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
773 /* header size */ |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
774 header_len = q - buf; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
775 /* data len */ |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
776 len = TS_PACKET_SIZE - header_len; |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
777 if (len > payload_size) |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
778 len = payload_size; |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
779 stuffing_len = TS_PACKET_SIZE - header_len - len; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
780 if (stuffing_len > 0) { |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
781 /* add stuffing with AFC */ |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
782 if (buf[3] & 0x20) { |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
783 /* stuffing already present: increase its size */ |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
784 afc_len = buf[4] + 1; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
785 memmove(buf + 4 + afc_len + stuffing_len, |
885 | 786 buf + 4 + afc_len, |
785
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
787 header_len - (4 + afc_len)); |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
788 buf[4] += stuffing_len; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
789 memset(buf + 4 + afc_len, 0xff, stuffing_len); |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
790 } else { |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
791 /* add stuffing */ |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
792 memmove(buf + 4 + stuffing_len, buf + 4, header_len - 4); |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
793 buf[3] |= 0x20; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
794 buf[4] = stuffing_len - 1; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
795 if (stuffing_len >= 2) { |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
796 buf[5] = 0x00; |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
797 memset(buf + 6, 0xff, stuffing_len - 2); |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
798 } |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
799 } |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
800 } |
e277d8928f49
buggy PCR output (just to keep HW decoders happy) - audio and subtitle language support - 'title' stream field sets the service name - fixed TS packet stuffing code - support for subtitle PES packets
bellard
parents:
693
diff
changeset
|
801 memcpy(buf + TS_PACKET_SIZE - len, payload, len); |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
802 payload += len; |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
803 payload_size -= len; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
1838
diff
changeset
|
804 put_buffer(s->pb, buf, TS_PACKET_SIZE); |
4209
020395b83a14
compute pcr more accurately, regression tests need update
bcoudurier
parents:
4201
diff
changeset
|
805 ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
806 } |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
1838
diff
changeset
|
807 put_flush_packet(s->pb); |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
808 } |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
809 |
468 | 810 static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
811 { |
468 | 812 AVStream *st = s->streams[pkt->stream_index]; |
5539 | 813 int size = pkt->size; |
468 | 814 uint8_t *buf= pkt->data; |
4219
3bfd8604f480
add aud nal unit if not present in h264 bitstream
bcoudurier
parents:
4217
diff
changeset
|
815 uint8_t *data= NULL; |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
816 MpegTSWriteStream *ts_st = st->priv_data; |
5784
28885ab1ef1c
mpegts vbr muxing, activated when muxing rate is not supplied by the
bcoudurier
parents:
5782
diff
changeset
|
817 const uint64_t delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE)*2; |
4220 | 818 int64_t dts = AV_NOPTS_VALUE, pts = AV_NOPTS_VALUE; |
819 | |
820 if (pkt->pts != AV_NOPTS_VALUE) | |
821 pts = pkt->pts + delay; | |
822 if (pkt->dts != AV_NOPTS_VALUE) | |
823 dts = pkt->dts + delay; | |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
824 |
4915 | 825 if (ts_st->first_pts_check && pts == AV_NOPTS_VALUE) { |
826 av_log(s, AV_LOG_ERROR, "first pts value must set\n"); | |
827 return -1; | |
828 } | |
829 ts_st->first_pts_check = 0; | |
830 | |
4921
fa21da521576
write a single pes for video frames, some proprietary player needs it
bcoudurier
parents:
4915
diff
changeset
|
831 if (st->codec->codec_id == CODEC_ID_H264) { |
5786
7d670040187e
In mpegts muxer, search for h264 aud nal, it might not be the first nal.
bcoudurier
parents:
5784
diff
changeset
|
832 const uint8_t *p = buf, *buf_end = p+size; |
7d670040187e
In mpegts muxer, search for h264 aud nal, it might not be the first nal.
bcoudurier
parents:
5784
diff
changeset
|
833 uint32_t state = -1; |
7d670040187e
In mpegts muxer, search for h264 aud nal, it might not be the first nal.
bcoudurier
parents:
5784
diff
changeset
|
834 |
4219
3bfd8604f480
add aud nal unit if not present in h264 bitstream
bcoudurier
parents:
4217
diff
changeset
|
835 if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) { |
5786
7d670040187e
In mpegts muxer, search for h264 aud nal, it might not be the first nal.
bcoudurier
parents:
5784
diff
changeset
|
836 av_log(s, AV_LOG_ERROR, "h264 bitstream malformated, " |
7d670040187e
In mpegts muxer, search for h264 aud nal, it might not be the first nal.
bcoudurier
parents:
5784
diff
changeset
|
837 "no startcode found, use -vbsf h264_mp4toannexb\n"); |
4219
3bfd8604f480
add aud nal unit if not present in h264 bitstream
bcoudurier
parents:
4217
diff
changeset
|
838 return -1; |
3bfd8604f480
add aud nal unit if not present in h264 bitstream
bcoudurier
parents:
4217
diff
changeset
|
839 } |
5786
7d670040187e
In mpegts muxer, search for h264 aud nal, it might not be the first nal.
bcoudurier
parents:
5784
diff
changeset
|
840 |
7d670040187e
In mpegts muxer, search for h264 aud nal, it might not be the first nal.
bcoudurier
parents:
5784
diff
changeset
|
841 do { |
7d670040187e
In mpegts muxer, search for h264 aud nal, it might not be the first nal.
bcoudurier
parents:
5784
diff
changeset
|
842 p = ff_find_start_code(p, buf_end, &state); |
7d670040187e
In mpegts muxer, search for h264 aud nal, it might not be the first nal.
bcoudurier
parents:
5784
diff
changeset
|
843 //av_log(s, AV_LOG_INFO, "nal %d\n", state & 0x1f); |
7d670040187e
In mpegts muxer, search for h264 aud nal, it might not be the first nal.
bcoudurier
parents:
5784
diff
changeset
|
844 } while (p < buf_end && (state & 0x1f) != 9 && |
7d670040187e
In mpegts muxer, search for h264 aud nal, it might not be the first nal.
bcoudurier
parents:
5784
diff
changeset
|
845 (state & 0x1f) != 5 && (state & 0x1f) != 1); |
7d670040187e
In mpegts muxer, search for h264 aud nal, it might not be the first nal.
bcoudurier
parents:
5784
diff
changeset
|
846 |
7d670040187e
In mpegts muxer, search for h264 aud nal, it might not be the first nal.
bcoudurier
parents:
5784
diff
changeset
|
847 if ((state & 0x1f) != 9) { // AUD NAL |
4219
3bfd8604f480
add aud nal unit if not present in h264 bitstream
bcoudurier
parents:
4217
diff
changeset
|
848 data = av_malloc(pkt->size+6); |
3bfd8604f480
add aud nal unit if not present in h264 bitstream
bcoudurier
parents:
4217
diff
changeset
|
849 if (!data) |
3bfd8604f480
add aud nal unit if not present in h264 bitstream
bcoudurier
parents:
4217
diff
changeset
|
850 return -1; |
3bfd8604f480
add aud nal unit if not present in h264 bitstream
bcoudurier
parents:
4217
diff
changeset
|
851 memcpy(data+6, pkt->data, pkt->size); |
3bfd8604f480
add aud nal unit if not present in h264 bitstream
bcoudurier
parents:
4217
diff
changeset
|
852 AV_WB32(data, 0x00000001); |
3bfd8604f480
add aud nal unit if not present in h264 bitstream
bcoudurier
parents:
4217
diff
changeset
|
853 data[4] = 0x09; |
6304
50b1c5de4b71
In mpegts muxer, fix rbsp trailing bits in AUD nal, fixes issue #2122
bcoudurier
parents:
6248
diff
changeset
|
854 data[5] = 0xf0; // any slice type (0xe) + rbsp stop one bit |
4219
3bfd8604f480
add aud nal unit if not present in h264 bitstream
bcoudurier
parents:
4217
diff
changeset
|
855 buf = data; |
3bfd8604f480
add aud nal unit if not present in h264 bitstream
bcoudurier
parents:
4217
diff
changeset
|
856 size = pkt->size+6; |
3bfd8604f480
add aud nal unit if not present in h264 bitstream
bcoudurier
parents:
4217
diff
changeset
|
857 } |
5787
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
858 } else if (st->codec->codec_id == CODEC_ID_AAC) { |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
859 if (pkt->size < 2) |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
860 return -1; |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
861 if ((AV_RB16(pkt->data) & 0xfff0) != 0xfff0) { |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
862 ADTSContext *adts = ts_st->adts; |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
863 int new_size; |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
864 if (!adts) { |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
865 av_log(s, AV_LOG_ERROR, "aac bitstream not in adts format " |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
866 "and extradata missing\n"); |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
867 return -1; |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
868 } |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
869 new_size = ADTS_HEADER_SIZE+adts->pce_size+pkt->size; |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
870 if ((unsigned)new_size >= INT_MAX) |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
871 return -1; |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
872 data = av_malloc(new_size); |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
873 if (!data) |
5930
08cd1179a20d
Replace all remaining occurrences of AVERROR_NOMEM with
stefano
parents:
5910
diff
changeset
|
874 return AVERROR(ENOMEM); |
5787
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
875 ff_adts_write_frame_header(adts, data, pkt->size, adts->pce_size); |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
876 if (adts->pce_size) { |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
877 memcpy(data+ADTS_HEADER_SIZE, adts->pce_data, adts->pce_size); |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
878 adts->pce_size = 0; |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
879 } |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
880 memcpy(data+ADTS_HEADER_SIZE+adts->pce_size, pkt->data, pkt->size); |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
881 buf = data; |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
882 size = new_size; |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5786
diff
changeset
|
883 } |
4211
5e5654752973
set pts and dts of pes packets exactly according to specs
bcoudurier
parents:
4209
diff
changeset
|
884 } |
5e5654752973
set pts and dts of pes packets exactly according to specs
bcoudurier
parents:
4209
diff
changeset
|
885 |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5804
diff
changeset
|
886 if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO) { |
4921
fa21da521576
write a single pes for video frames, some proprietary player needs it
bcoudurier
parents:
4915
diff
changeset
|
887 // for video and subtitle, write a single pes packet |
fa21da521576
write a single pes for video frames, some proprietary player needs it
bcoudurier
parents:
4915
diff
changeset
|
888 mpegts_write_pes(s, st, buf, size, pts, dts); |
4922 | 889 av_free(data); |
4921
fa21da521576
write a single pes for video frames, some proprietary player needs it
bcoudurier
parents:
4915
diff
changeset
|
890 return 0; |
fa21da521576
write a single pes for video frames, some proprietary player needs it
bcoudurier
parents:
4915
diff
changeset
|
891 } |
fa21da521576
write a single pes for video frames, some proprietary player needs it
bcoudurier
parents:
4915
diff
changeset
|
892 |
5539 | 893 if (ts_st->payload_index + size > DEFAULT_PES_PAYLOAD_SIZE) { |
894 mpegts_write_pes(s, st, ts_st->payload, ts_st->payload_index, | |
895 ts_st->payload_pts, ts_st->payload_dts); | |
896 ts_st->payload_index = 0; | |
4952
0be83fd54e7a
simplify pes timestamps fetching, based on a patch by corp186, chasedouglas at gmail dot com
bcoudurier
parents:
4951
diff
changeset
|
897 } |
0be83fd54e7a
simplify pes timestamps fetching, based on a patch by corp186, chasedouglas at gmail dot com
bcoudurier
parents:
4951
diff
changeset
|
898 |
5539 | 899 if (!ts_st->payload_index) { |
900 ts_st->payload_pts = pts; | |
901 ts_st->payload_dts = dts; | |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
902 } |
4219
3bfd8604f480
add aud nal unit if not present in h264 bitstream
bcoudurier
parents:
4217
diff
changeset
|
903 |
5539 | 904 memcpy(ts_st->payload + ts_st->payload_index, buf, size); |
905 ts_st->payload_index += size; | |
906 | |
5804
9f349253996d
In mpegts muxer, free adts context and temporary data
bcoudurier
parents:
5803
diff
changeset
|
907 av_free(data); |
9f349253996d
In mpegts muxer, free adts context and temporary data
bcoudurier
parents:
5803
diff
changeset
|
908 |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
909 return 0; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
910 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
911 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
912 static int mpegts_write_end(AVFormatContext *s) |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
913 { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
914 MpegTSWrite *ts = s->priv_data; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
915 MpegTSWriteStream *ts_st; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
916 MpegTSService *service; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
917 AVStream *st; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
918 int i; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
919 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
920 /* flush current packets */ |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
921 for(i = 0; i < s->nb_streams; i++) { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
922 st = s->streams[i]; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
923 ts_st = st->priv_data; |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
924 if (ts_st->payload_index > 0) { |
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
925 mpegts_write_pes(s, st, ts_st->payload, ts_st->payload_index, |
1838
d1af40ab8ea5
write DTS, based on patch by Luca Abeni, lucabe72 email it
mru
parents:
1415
diff
changeset
|
926 ts_st->payload_pts, ts_st->payload_dts); |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
927 } |
5804
9f349253996d
In mpegts muxer, free adts context and temporary data
bcoudurier
parents:
5803
diff
changeset
|
928 av_freep(&ts_st->adts); |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
929 } |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
1838
diff
changeset
|
930 put_flush_packet(s->pb); |
885 | 931 |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
932 for(i = 0; i < ts->nb_services; i++) { |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
933 service = ts->services[i]; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
934 av_freep(&service->provider_name); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
935 av_freep(&service->name); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
936 av_free(service); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
937 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
938 av_free(ts->services); |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
939 |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
940 return 0; |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
941 } |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
942 |
1167 | 943 AVOutputFormat mpegts_muxer = { |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
944 "mpegts", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3420
diff
changeset
|
945 NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"), |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
946 "video/x-mpegts", |
3420 | 947 "ts,m2t", |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
948 sizeof(MpegTSWrite), |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
949 CODEC_ID_MP2, |
250
2d4dcb1d3e21
generate correct PTS in transport stream - use mpeg2 encoder by default
bellard
parents:
241
diff
changeset
|
950 CODEC_ID_MPEG2VIDEO, |
152
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
951 mpegts_write_header, |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
952 mpegts_write_packet, |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
953 mpegts_write_end, |
cc03a75cbde4
mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
bellard
parents:
diff
changeset
|
954 }; |