Mercurial > hg > nginx
annotate src/http/modules/ngx_http_mp4_module.c @ 7376:e5069816039b
Mp4: fixed reading 64-bit atoms.
Previously there was no validation for the size of a 64-bit atom
in an mp4 file. This could lead to a CPU hog when the size is 0,
or various other problems due to integer underflow when calculating
atom data size, including segmentation fault or worker process
memory disclosure.
| author | Roman Arutyunyan <arut@nginx.com> |
|---|---|
| date | Tue, 06 Nov 2018 16:29:18 +0300 |
| parents | 99934aade555 |
| children | be5cb9c67c05 |
| rev | line source |
|---|---|
| 4085 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4412 | 4 * Copyright (C) Nginx, Inc. |
| 4085 | 5 */ |
| 6 | |
| 7 #include <ngx_config.h> | |
| 8 #include <ngx_core.h> | |
| 9 #include <ngx_http.h> | |
| 10 | |
| 11 | |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
12 #define NGX_HTTP_MP4_TRAK_ATOM 0 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
13 #define NGX_HTTP_MP4_TKHD_ATOM 1 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
14 #define NGX_HTTP_MP4_MDIA_ATOM 2 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
15 #define NGX_HTTP_MP4_MDHD_ATOM 3 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
16 #define NGX_HTTP_MP4_HDLR_ATOM 4 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
17 #define NGX_HTTP_MP4_MINF_ATOM 5 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
18 #define NGX_HTTP_MP4_VMHD_ATOM 6 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
19 #define NGX_HTTP_MP4_SMHD_ATOM 7 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
20 #define NGX_HTTP_MP4_DINF_ATOM 8 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
21 #define NGX_HTTP_MP4_STBL_ATOM 9 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
22 #define NGX_HTTP_MP4_STSD_ATOM 10 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
23 #define NGX_HTTP_MP4_STTS_ATOM 11 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
24 #define NGX_HTTP_MP4_STTS_DATA 12 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
25 #define NGX_HTTP_MP4_STSS_ATOM 13 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
26 #define NGX_HTTP_MP4_STSS_DATA 14 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
27 #define NGX_HTTP_MP4_CTTS_ATOM 15 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
28 #define NGX_HTTP_MP4_CTTS_DATA 16 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
29 #define NGX_HTTP_MP4_STSC_ATOM 17 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
30 #define NGX_HTTP_MP4_STSC_START 18 |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
31 #define NGX_HTTP_MP4_STSC_DATA 19 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
32 #define NGX_HTTP_MP4_STSC_END 20 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
33 #define NGX_HTTP_MP4_STSZ_ATOM 21 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
34 #define NGX_HTTP_MP4_STSZ_DATA 22 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
35 #define NGX_HTTP_MP4_STCO_ATOM 23 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
36 #define NGX_HTTP_MP4_STCO_DATA 24 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
37 #define NGX_HTTP_MP4_CO64_ATOM 25 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
38 #define NGX_HTTP_MP4_CO64_DATA 26 |
| 4112 | 39 |
| 40 #define NGX_HTTP_MP4_LAST_ATOM NGX_HTTP_MP4_CO64_DATA | |
| 4085 | 41 |
| 42 | |
| 43 typedef struct { | |
| 44 size_t buffer_size; | |
|
4089
e27670e1ab70
mp4_max_moov_size directive has been renamed to mp4_max_buffer_size.
Igor Sysoev <igor@sysoev.ru>
parents:
4088
diff
changeset
|
45 size_t max_buffer_size; |
| 4085 | 46 } ngx_http_mp4_conf_t; |
| 47 | |
| 48 | |
| 49 typedef struct { | |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
50 u_char chunk[4]; |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
51 u_char samples[4]; |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
52 u_char id[4]; |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
53 } ngx_mp4_stsc_entry_t; |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
54 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
55 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
56 typedef struct { |
| 4085 | 57 uint32_t timescale; |
| 58 uint32_t time_to_sample_entries; | |
| 59 uint32_t sample_to_chunk_entries; | |
| 60 uint32_t sync_samples_entries; | |
| 61 uint32_t composition_offset_entries; | |
| 62 uint32_t sample_sizes_entries; | |
| 63 uint32_t chunks; | |
| 64 | |
| 65 ngx_uint_t start_sample; | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
66 ngx_uint_t end_sample; |
| 4085 | 67 ngx_uint_t start_chunk; |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
68 ngx_uint_t end_chunk; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
69 ngx_uint_t start_chunk_samples; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
70 ngx_uint_t end_chunk_samples; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
71 uint64_t start_chunk_samples_size; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
72 uint64_t end_chunk_samples_size; |
| 4085 | 73 off_t start_offset; |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
74 off_t end_offset; |
| 4085 | 75 |
| 76 size_t tkhd_size; | |
| 77 size_t mdhd_size; | |
| 78 size_t hdlr_size; | |
| 79 size_t vmhd_size; | |
| 80 size_t smhd_size; | |
| 81 size_t dinf_size; | |
| 82 size_t size; | |
| 83 | |
| 84 ngx_chain_t out[NGX_HTTP_MP4_LAST_ATOM + 1]; | |
| 85 | |
| 86 ngx_buf_t trak_atom_buf; | |
| 87 ngx_buf_t tkhd_atom_buf; | |
| 88 ngx_buf_t mdia_atom_buf; | |
| 89 ngx_buf_t mdhd_atom_buf; | |
| 90 ngx_buf_t hdlr_atom_buf; | |
| 91 ngx_buf_t minf_atom_buf; | |
| 92 ngx_buf_t vmhd_atom_buf; | |
| 93 ngx_buf_t smhd_atom_buf; | |
| 94 ngx_buf_t dinf_atom_buf; | |
| 95 ngx_buf_t stbl_atom_buf; | |
| 96 ngx_buf_t stsd_atom_buf; | |
| 97 ngx_buf_t stts_atom_buf; | |
| 98 ngx_buf_t stts_data_buf; | |
| 99 ngx_buf_t stss_atom_buf; | |
| 100 ngx_buf_t stss_data_buf; | |
| 101 ngx_buf_t ctts_atom_buf; | |
| 102 ngx_buf_t ctts_data_buf; | |
| 103 ngx_buf_t stsc_atom_buf; | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
104 ngx_buf_t stsc_start_chunk_buf; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
105 ngx_buf_t stsc_end_chunk_buf; |
| 4085 | 106 ngx_buf_t stsc_data_buf; |
| 107 ngx_buf_t stsz_atom_buf; | |
| 108 ngx_buf_t stsz_data_buf; | |
| 4107 | 109 ngx_buf_t stco_atom_buf; |
| 110 ngx_buf_t stco_data_buf; | |
| 4112 | 111 ngx_buf_t co64_atom_buf; |
| 112 ngx_buf_t co64_data_buf; | |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
113 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
114 ngx_mp4_stsc_entry_t stsc_start_chunk_entry; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
115 ngx_mp4_stsc_entry_t stsc_end_chunk_entry; |
| 4085 | 116 } ngx_http_mp4_trak_t; |
| 117 | |
| 118 | |
| 119 typedef struct { | |
| 120 ngx_file_t file; | |
| 121 | |
| 122 u_char *buffer; | |
| 123 u_char *buffer_start; | |
| 124 u_char *buffer_pos; | |
| 125 u_char *buffer_end; | |
| 126 size_t buffer_size; | |
| 127 | |
| 128 off_t offset; | |
| 129 off_t end; | |
| 130 off_t content_length; | |
| 131 ngx_uint_t start; | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
132 ngx_uint_t length; |
| 4085 | 133 uint32_t timescale; |
| 134 ngx_http_request_t *request; | |
| 135 ngx_array_t trak; | |
| 136 ngx_http_mp4_trak_t traks[2]; | |
| 137 | |
| 138 size_t ftyp_size; | |
| 139 size_t moov_size; | |
| 140 | |
| 141 ngx_chain_t *out; | |
| 142 ngx_chain_t ftyp_atom; | |
| 143 ngx_chain_t moov_atom; | |
| 144 ngx_chain_t mvhd_atom; | |
| 145 ngx_chain_t mdat_atom; | |
| 146 ngx_chain_t mdat_data; | |
| 147 | |
| 148 ngx_buf_t ftyp_atom_buf; | |
| 149 ngx_buf_t moov_atom_buf; | |
| 150 ngx_buf_t mvhd_atom_buf; | |
| 151 ngx_buf_t mdat_atom_buf; | |
| 152 ngx_buf_t mdat_data_buf; | |
| 153 | |
| 154 u_char moov_atom_header[8]; | |
| 155 u_char mdat_atom_header[16]; | |
| 156 } ngx_http_mp4_file_t; | |
| 157 | |
| 158 | |
| 159 typedef struct { | |
| 160 char *name; | |
| 161 ngx_int_t (*handler)(ngx_http_mp4_file_t *mp4, | |
| 162 uint64_t atom_data_size); | |
| 163 } ngx_http_mp4_atom_handler_t; | |
| 164 | |
| 165 | |
| 166 #define ngx_mp4_atom_header(mp4) (mp4->buffer_pos - 8) | |
| 167 #define ngx_mp4_atom_data(mp4) mp4->buffer_pos | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
168 #define ngx_mp4_atom_data_size(t) (uint64_t) (sizeof(t) - 8) |
|
5359
2fda9065d0f4
Win32: Borland C compatibility fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
169 |
|
2fda9065d0f4
Win32: Borland C compatibility fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
170 |
|
2fda9065d0f4
Win32: Borland C compatibility fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
171 #define ngx_mp4_atom_next(mp4, n) \ |
|
2fda9065d0f4
Win32: Borland C compatibility fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
172 mp4->buffer_pos += (size_t) n; \ |
|
2fda9065d0f4
Win32: Borland C compatibility fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
173 mp4->offset += n |
| 4085 | 174 |
| 175 | |
| 176 #define ngx_mp4_set_atom_name(p, n1, n2, n3, n4) \ | |
| 177 ((u_char *) (p))[4] = n1; \ | |
| 178 ((u_char *) (p))[5] = n2; \ | |
| 179 ((u_char *) (p))[6] = n3; \ | |
| 180 ((u_char *) (p))[7] = n4 | |
| 181 | |
| 182 #define ngx_mp4_get_32value(p) \ | |
|
4402
b20019ecfdcc
Fixed handling of mp4 above 2G and 32bit offsets (ticket #84).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4382
diff
changeset
|
183 ( ((uint32_t) ((u_char *) (p))[0] << 24) \ |
|
b20019ecfdcc
Fixed handling of mp4 above 2G and 32bit offsets (ticket #84).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4382
diff
changeset
|
184 + ( ((u_char *) (p))[1] << 16) \ |
|
b20019ecfdcc
Fixed handling of mp4 above 2G and 32bit offsets (ticket #84).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4382
diff
changeset
|
185 + ( ((u_char *) (p))[2] << 8) \ |
|
b20019ecfdcc
Fixed handling of mp4 above 2G and 32bit offsets (ticket #84).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4382
diff
changeset
|
186 + ( ((u_char *) (p))[3]) ) |
| 4085 | 187 |
| 188 #define ngx_mp4_set_32value(p, n) \ | |
| 189 ((u_char *) (p))[0] = (u_char) ((n) >> 24); \ | |
| 190 ((u_char *) (p))[1] = (u_char) ((n) >> 16); \ | |
| 191 ((u_char *) (p))[2] = (u_char) ((n) >> 8); \ | |
| 192 ((u_char *) (p))[3] = (u_char) (n) | |
| 193 | |
| 194 #define ngx_mp4_get_64value(p) \ | |
| 195 ( ((uint64_t) ((u_char *) (p))[0] << 56) \ | |
| 196 + ((uint64_t) ((u_char *) (p))[1] << 48) \ | |
| 197 + ((uint64_t) ((u_char *) (p))[2] << 40) \ | |
| 198 + ((uint64_t) ((u_char *) (p))[3] << 32) \ | |
| 199 + ((uint64_t) ((u_char *) (p))[4] << 24) \ | |
| 200 + ( ((u_char *) (p))[5] << 16) \ | |
| 201 + ( ((u_char *) (p))[6] << 8) \ | |
| 202 + ( ((u_char *) (p))[7]) ) | |
| 203 | |
| 204 #define ngx_mp4_set_64value(p, n) \ | |
|
4155
d9636bf3f159
Fix of building on platforms with 32-bit off_t. (closed #23)
Igor Sysoev <igor@sysoev.ru>
parents:
4112
diff
changeset
|
205 ((u_char *) (p))[0] = (u_char) ((uint64_t) (n) >> 56); \ |
|
d9636bf3f159
Fix of building on platforms with 32-bit off_t. (closed #23)
Igor Sysoev <igor@sysoev.ru>
parents:
4112
diff
changeset
|
206 ((u_char *) (p))[1] = (u_char) ((uint64_t) (n) >> 48); \ |
|
d9636bf3f159
Fix of building on platforms with 32-bit off_t. (closed #23)
Igor Sysoev <igor@sysoev.ru>
parents:
4112
diff
changeset
|
207 ((u_char *) (p))[2] = (u_char) ((uint64_t) (n) >> 40); \ |
|
d9636bf3f159
Fix of building on platforms with 32-bit off_t. (closed #23)
Igor Sysoev <igor@sysoev.ru>
parents:
4112
diff
changeset
|
208 ((u_char *) (p))[3] = (u_char) ((uint64_t) (n) >> 32); \ |
|
d9636bf3f159
Fix of building on platforms with 32-bit off_t. (closed #23)
Igor Sysoev <igor@sysoev.ru>
parents:
4112
diff
changeset
|
209 ((u_char *) (p))[4] = (u_char) ( (n) >> 24); \ |
|
d9636bf3f159
Fix of building on platforms with 32-bit off_t. (closed #23)
Igor Sysoev <igor@sysoev.ru>
parents:
4112
diff
changeset
|
210 ((u_char *) (p))[5] = (u_char) ( (n) >> 16); \ |
|
d9636bf3f159
Fix of building on platforms with 32-bit off_t. (closed #23)
Igor Sysoev <igor@sysoev.ru>
parents:
4112
diff
changeset
|
211 ((u_char *) (p))[6] = (u_char) ( (n) >> 8); \ |
|
d9636bf3f159
Fix of building on platforms with 32-bit off_t. (closed #23)
Igor Sysoev <igor@sysoev.ru>
parents:
4112
diff
changeset
|
212 ((u_char *) (p))[7] = (u_char) (n) |
| 4085 | 213 |
| 214 #define ngx_mp4_last_trak(mp4) \ | |
| 215 &((ngx_http_mp4_trak_t *) mp4->trak.elts)[mp4->trak.nelts - 1] | |
| 216 | |
| 217 | |
|
5202
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
218 static ngx_int_t ngx_http_mp4_handler(ngx_http_request_t *r); |
|
6782
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
219 static ngx_int_t ngx_http_mp4_atofp(u_char *line, size_t n, size_t point); |
|
5202
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
220 |
| 4085 | 221 static ngx_int_t ngx_http_mp4_process(ngx_http_mp4_file_t *mp4); |
| 222 static ngx_int_t ngx_http_mp4_read_atom(ngx_http_mp4_file_t *mp4, | |
| 223 ngx_http_mp4_atom_handler_t *atom, uint64_t atom_data_size); | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
224 static ngx_int_t ngx_http_mp4_read(ngx_http_mp4_file_t *mp4, size_t size); |
| 4085 | 225 static ngx_int_t ngx_http_mp4_read_ftyp_atom(ngx_http_mp4_file_t *mp4, |
| 226 uint64_t atom_data_size); | |
| 227 static ngx_int_t ngx_http_mp4_read_moov_atom(ngx_http_mp4_file_t *mp4, | |
| 228 uint64_t atom_data_size); | |
| 229 static ngx_int_t ngx_http_mp4_read_mdat_atom(ngx_http_mp4_file_t *mp4, | |
| 230 uint64_t atom_data_size); | |
| 231 static size_t ngx_http_mp4_update_mdat_atom(ngx_http_mp4_file_t *mp4, | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
232 off_t start_offset, off_t end_offset); |
| 4085 | 233 static ngx_int_t ngx_http_mp4_read_mvhd_atom(ngx_http_mp4_file_t *mp4, |
| 234 uint64_t atom_data_size); | |
| 235 static ngx_int_t ngx_http_mp4_read_trak_atom(ngx_http_mp4_file_t *mp4, | |
| 236 uint64_t atom_data_size); | |
| 237 static void ngx_http_mp4_update_trak_atom(ngx_http_mp4_file_t *mp4, | |
| 238 ngx_http_mp4_trak_t *trak); | |
| 239 static ngx_int_t ngx_http_mp4_read_cmov_atom(ngx_http_mp4_file_t *mp4, | |
| 240 uint64_t atom_data_size); | |
| 241 static ngx_int_t ngx_http_mp4_read_tkhd_atom(ngx_http_mp4_file_t *mp4, | |
| 242 uint64_t atom_data_size); | |
| 243 static ngx_int_t ngx_http_mp4_read_mdia_atom(ngx_http_mp4_file_t *mp4, | |
| 244 uint64_t atom_data_size); | |
| 245 static void ngx_http_mp4_update_mdia_atom(ngx_http_mp4_file_t *mp4, | |
| 246 ngx_http_mp4_trak_t *trak); | |
| 247 static ngx_int_t ngx_http_mp4_read_mdhd_atom(ngx_http_mp4_file_t *mp4, | |
| 248 uint64_t atom_data_size); | |
| 249 static ngx_int_t ngx_http_mp4_read_hdlr_atom(ngx_http_mp4_file_t *mp4, | |
| 250 uint64_t atom_data_size); | |
| 251 static ngx_int_t ngx_http_mp4_read_minf_atom(ngx_http_mp4_file_t *mp4, | |
| 252 uint64_t atom_data_size); | |
| 253 static void ngx_http_mp4_update_minf_atom(ngx_http_mp4_file_t *mp4, | |
| 254 ngx_http_mp4_trak_t *trak); | |
| 255 static ngx_int_t ngx_http_mp4_read_dinf_atom(ngx_http_mp4_file_t *mp4, | |
| 256 uint64_t atom_data_size); | |
| 257 static ngx_int_t ngx_http_mp4_read_vmhd_atom(ngx_http_mp4_file_t *mp4, | |
| 258 uint64_t atom_data_size); | |
| 259 static ngx_int_t ngx_http_mp4_read_smhd_atom(ngx_http_mp4_file_t *mp4, | |
| 260 uint64_t atom_data_size); | |
| 261 static ngx_int_t ngx_http_mp4_read_stbl_atom(ngx_http_mp4_file_t *mp4, | |
| 262 uint64_t atom_data_size); | |
| 263 static void ngx_http_mp4_update_stbl_atom(ngx_http_mp4_file_t *mp4, | |
| 264 ngx_http_mp4_trak_t *trak); | |
| 265 static ngx_int_t ngx_http_mp4_read_stsd_atom(ngx_http_mp4_file_t *mp4, | |
| 266 uint64_t atom_data_size); | |
| 267 static ngx_int_t ngx_http_mp4_read_stts_atom(ngx_http_mp4_file_t *mp4, | |
| 268 uint64_t atom_data_size); | |
| 269 static ngx_int_t ngx_http_mp4_update_stts_atom(ngx_http_mp4_file_t *mp4, | |
| 270 ngx_http_mp4_trak_t *trak); | |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
271 static ngx_int_t ngx_http_mp4_crop_stts_data(ngx_http_mp4_file_t *mp4, |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
272 ngx_http_mp4_trak_t *trak, ngx_uint_t start); |
| 4085 | 273 static ngx_int_t ngx_http_mp4_read_stss_atom(ngx_http_mp4_file_t *mp4, |
| 274 uint64_t atom_data_size); | |
| 275 static ngx_int_t ngx_http_mp4_update_stss_atom(ngx_http_mp4_file_t *mp4, | |
| 276 ngx_http_mp4_trak_t *trak); | |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
277 static void ngx_http_mp4_crop_stss_data(ngx_http_mp4_file_t *mp4, |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
278 ngx_http_mp4_trak_t *trak, ngx_uint_t start); |
| 4085 | 279 static ngx_int_t ngx_http_mp4_read_ctts_atom(ngx_http_mp4_file_t *mp4, |
| 280 uint64_t atom_data_size); | |
| 281 static void ngx_http_mp4_update_ctts_atom(ngx_http_mp4_file_t *mp4, | |
| 282 ngx_http_mp4_trak_t *trak); | |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
283 static void ngx_http_mp4_crop_ctts_data(ngx_http_mp4_file_t *mp4, |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
284 ngx_http_mp4_trak_t *trak, ngx_uint_t start); |
| 4085 | 285 static ngx_int_t ngx_http_mp4_read_stsc_atom(ngx_http_mp4_file_t *mp4, |
| 286 uint64_t atom_data_size); | |
| 287 static ngx_int_t ngx_http_mp4_update_stsc_atom(ngx_http_mp4_file_t *mp4, | |
| 288 ngx_http_mp4_trak_t *trak); | |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
289 static ngx_int_t ngx_http_mp4_crop_stsc_data(ngx_http_mp4_file_t *mp4, |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
290 ngx_http_mp4_trak_t *trak, ngx_uint_t start); |
| 4085 | 291 static ngx_int_t ngx_http_mp4_read_stsz_atom(ngx_http_mp4_file_t *mp4, |
| 292 uint64_t atom_data_size); | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
293 static ngx_int_t ngx_http_mp4_update_stsz_atom(ngx_http_mp4_file_t *mp4, |
| 4085 | 294 ngx_http_mp4_trak_t *trak); |
| 295 static ngx_int_t ngx_http_mp4_read_stco_atom(ngx_http_mp4_file_t *mp4, | |
| 296 uint64_t atom_data_size); | |
| 297 static ngx_int_t ngx_http_mp4_update_stco_atom(ngx_http_mp4_file_t *mp4, | |
| 298 ngx_http_mp4_trak_t *trak); | |
| 299 static void ngx_http_mp4_adjust_stco_atom(ngx_http_mp4_file_t *mp4, | |
| 300 ngx_http_mp4_trak_t *trak, int32_t adjustment); | |
| 4112 | 301 static ngx_int_t ngx_http_mp4_read_co64_atom(ngx_http_mp4_file_t *mp4, |
| 302 uint64_t atom_data_size); | |
| 303 static ngx_int_t ngx_http_mp4_update_co64_atom(ngx_http_mp4_file_t *mp4, | |
| 304 ngx_http_mp4_trak_t *trak); | |
| 305 static void ngx_http_mp4_adjust_co64_atom(ngx_http_mp4_file_t *mp4, | |
| 306 ngx_http_mp4_trak_t *trak, off_t adjustment); | |
|
5202
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
307 |
| 4085 | 308 static char *ngx_http_mp4(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
| 309 static void *ngx_http_mp4_create_conf(ngx_conf_t *cf); | |
| 310 static char *ngx_http_mp4_merge_conf(ngx_conf_t *cf, void *parent, void *child); | |
| 311 | |
|
5202
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
312 |
| 4085 | 313 static ngx_command_t ngx_http_mp4_commands[] = { |
| 314 | |
| 315 { ngx_string("mp4"), | |
| 316 NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS, | |
| 317 ngx_http_mp4, | |
| 318 0, | |
| 319 0, | |
| 320 NULL }, | |
| 321 | |
| 322 { ngx_string("mp4_buffer_size"), | |
| 323 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 324 ngx_conf_set_size_slot, | |
| 325 NGX_HTTP_LOC_CONF_OFFSET, | |
| 326 offsetof(ngx_http_mp4_conf_t, buffer_size), | |
| 327 NULL }, | |
| 328 | |
|
4089
e27670e1ab70
mp4_max_moov_size directive has been renamed to mp4_max_buffer_size.
Igor Sysoev <igor@sysoev.ru>
parents:
4088
diff
changeset
|
329 { ngx_string("mp4_max_buffer_size"), |
| 4085 | 330 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 331 ngx_conf_set_size_slot, | |
| 332 NGX_HTTP_LOC_CONF_OFFSET, | |
|
4089
e27670e1ab70
mp4_max_moov_size directive has been renamed to mp4_max_buffer_size.
Igor Sysoev <igor@sysoev.ru>
parents:
4088
diff
changeset
|
333 offsetof(ngx_http_mp4_conf_t, max_buffer_size), |
| 4085 | 334 NULL }, |
| 335 | |
| 336 ngx_null_command | |
| 337 }; | |
| 338 | |
| 339 | |
| 340 static ngx_http_module_t ngx_http_mp4_module_ctx = { | |
| 341 NULL, /* preconfiguration */ | |
| 342 NULL, /* postconfiguration */ | |
| 343 | |
| 344 NULL, /* create main configuration */ | |
| 345 NULL, /* init main configuration */ | |
| 346 | |
| 347 NULL, /* create server configuration */ | |
| 348 NULL, /* merge server configuration */ | |
| 349 | |
| 350 ngx_http_mp4_create_conf, /* create location configuration */ | |
| 351 ngx_http_mp4_merge_conf /* merge location configuration */ | |
| 352 }; | |
| 353 | |
| 354 | |
| 355 ngx_module_t ngx_http_mp4_module = { | |
| 356 NGX_MODULE_V1, | |
| 357 &ngx_http_mp4_module_ctx, /* module context */ | |
| 358 ngx_http_mp4_commands, /* module directives */ | |
| 359 NGX_HTTP_MODULE, /* module type */ | |
| 360 NULL, /* init master */ | |
| 361 NULL, /* init module */ | |
| 362 NULL, /* init process */ | |
| 363 NULL, /* init thread */ | |
| 364 NULL, /* exit thread */ | |
| 365 NULL, /* exit process */ | |
| 366 NULL, /* exit master */ | |
| 367 NGX_MODULE_V1_PADDING | |
| 368 }; | |
| 369 | |
| 370 | |
| 371 static ngx_http_mp4_atom_handler_t ngx_http_mp4_atoms[] = { | |
| 372 { "ftyp", ngx_http_mp4_read_ftyp_atom }, | |
| 373 { "moov", ngx_http_mp4_read_moov_atom }, | |
| 374 { "mdat", ngx_http_mp4_read_mdat_atom }, | |
| 375 { NULL, NULL } | |
| 376 }; | |
| 377 | |
| 378 static ngx_http_mp4_atom_handler_t ngx_http_mp4_moov_atoms[] = { | |
| 379 { "mvhd", ngx_http_mp4_read_mvhd_atom }, | |
| 380 { "trak", ngx_http_mp4_read_trak_atom }, | |
| 381 { "cmov", ngx_http_mp4_read_cmov_atom }, | |
| 382 { NULL, NULL } | |
| 383 }; | |
| 384 | |
| 385 static ngx_http_mp4_atom_handler_t ngx_http_mp4_trak_atoms[] = { | |
| 386 { "tkhd", ngx_http_mp4_read_tkhd_atom }, | |
| 387 { "mdia", ngx_http_mp4_read_mdia_atom }, | |
| 388 { NULL, NULL } | |
| 389 }; | |
| 390 | |
| 391 static ngx_http_mp4_atom_handler_t ngx_http_mp4_mdia_atoms[] = { | |
| 392 { "mdhd", ngx_http_mp4_read_mdhd_atom }, | |
| 393 { "hdlr", ngx_http_mp4_read_hdlr_atom }, | |
| 394 { "minf", ngx_http_mp4_read_minf_atom }, | |
| 395 { NULL, NULL } | |
| 396 }; | |
| 397 | |
| 398 static ngx_http_mp4_atom_handler_t ngx_http_mp4_minf_atoms[] = { | |
| 399 { "vmhd", ngx_http_mp4_read_vmhd_atom }, | |
| 400 { "smhd", ngx_http_mp4_read_smhd_atom }, | |
| 401 { "dinf", ngx_http_mp4_read_dinf_atom }, | |
| 402 { "stbl", ngx_http_mp4_read_stbl_atom }, | |
| 403 { NULL, NULL } | |
| 404 }; | |
| 405 | |
| 406 static ngx_http_mp4_atom_handler_t ngx_http_mp4_stbl_atoms[] = { | |
| 407 { "stsd", ngx_http_mp4_read_stsd_atom }, | |
| 408 { "stts", ngx_http_mp4_read_stts_atom }, | |
| 409 { "stss", ngx_http_mp4_read_stss_atom }, | |
| 410 { "ctts", ngx_http_mp4_read_ctts_atom }, | |
| 411 { "stsc", ngx_http_mp4_read_stsc_atom }, | |
| 412 { "stsz", ngx_http_mp4_read_stsz_atom }, | |
| 413 { "stco", ngx_http_mp4_read_stco_atom }, | |
| 4112 | 414 { "co64", ngx_http_mp4_read_co64_atom }, |
| 4085 | 415 { NULL, NULL } |
| 416 }; | |
| 417 | |
| 418 | |
| 419 static ngx_int_t | |
| 420 ngx_http_mp4_handler(ngx_http_request_t *r) | |
| 421 { | |
| 422 u_char *last; | |
| 423 size_t root; | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
424 ngx_int_t rc, start, end; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
425 ngx_uint_t level, length; |
| 4085 | 426 ngx_str_t path, value; |
| 427 ngx_log_t *log; | |
| 428 ngx_buf_t *b; | |
| 429 ngx_chain_t out; | |
| 430 ngx_http_mp4_file_t *mp4; | |
| 431 ngx_open_file_info_t of; | |
| 432 ngx_http_core_loc_conf_t *clcf; | |
| 433 | |
| 434 if (!(r->method & (NGX_HTTP_GET|NGX_HTTP_HEAD))) { | |
| 435 return NGX_HTTP_NOT_ALLOWED; | |
| 436 } | |
| 437 | |
| 438 if (r->uri.data[r->uri.len - 1] == '/') { | |
| 439 return NGX_DECLINED; | |
| 440 } | |
| 441 | |
| 442 rc = ngx_http_discard_request_body(r); | |
| 443 | |
| 444 if (rc != NGX_OK) { | |
| 445 return rc; | |
| 446 } | |
| 447 | |
| 448 last = ngx_http_map_uri_to_path(r, &path, &root, 0); | |
| 449 if (last == NULL) { | |
| 450 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 451 } | |
| 452 | |
| 453 log = r->connection->log; | |
| 454 | |
| 455 path.len = last - path.data; | |
| 456 | |
| 457 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, | |
| 458 "http mp4 filename: \"%V\"", &path); | |
| 459 | |
| 460 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); | |
| 461 | |
| 462 ngx_memzero(&of, sizeof(ngx_open_file_info_t)); | |
| 463 | |
| 464 of.read_ahead = clcf->read_ahead; | |
|
4087
3aa3b7bb9f0d
Bugfix of r4086: directio was always enabled if mp4 file was sent as is.
Igor Sysoev <igor@sysoev.ru>
parents:
4085
diff
changeset
|
465 of.directio = NGX_MAX_OFF_T_VALUE; |
| 4085 | 466 of.valid = clcf->open_file_cache_valid; |
| 467 of.min_uses = clcf->open_file_cache_min_uses; | |
| 468 of.errors = clcf->open_file_cache_errors; | |
| 469 of.events = clcf->open_file_cache_events; | |
|
4494
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
470 |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
471 if (ngx_http_set_disable_symlinks(r, clcf, &path, &of) != NGX_OK) { |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
472 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
473 } |
| 4085 | 474 |
| 475 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) | |
| 476 != NGX_OK) | |
| 477 { | |
| 478 switch (of.err) { | |
| 479 | |
| 480 case 0: | |
| 481 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 482 | |
| 483 case NGX_ENOENT: | |
| 484 case NGX_ENOTDIR: | |
| 485 case NGX_ENAMETOOLONG: | |
| 486 | |
| 487 level = NGX_LOG_ERR; | |
| 488 rc = NGX_HTTP_NOT_FOUND; | |
| 489 break; | |
| 490 | |
| 491 case NGX_EACCES: | |
|
4478
08713bac87fc
Support for disable_symlinks in various modules.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
492 #if (NGX_HAVE_OPENAT) |
|
08713bac87fc
Support for disable_symlinks in various modules.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
493 case NGX_EMLINK: |
|
08713bac87fc
Support for disable_symlinks in various modules.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
494 case NGX_ELOOP: |
|
08713bac87fc
Support for disable_symlinks in various modules.
Andrey Belov <defan@nginx.com>
parents:
4412
diff
changeset
|
495 #endif |
| 4085 | 496 |
| 497 level = NGX_LOG_ERR; | |
| 498 rc = NGX_HTTP_FORBIDDEN; | |
| 499 break; | |
| 500 | |
| 501 default: | |
| 502 | |
| 503 level = NGX_LOG_CRIT; | |
| 504 rc = NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 505 break; | |
| 506 } | |
| 507 | |
| 508 if (rc != NGX_HTTP_NOT_FOUND || clcf->log_not_found) { | |
| 509 ngx_log_error(level, log, of.err, | |
| 510 "%s \"%s\" failed", of.failed, path.data); | |
| 511 } | |
| 512 | |
| 513 return rc; | |
| 514 } | |
| 515 | |
| 516 if (!of.is_file) { | |
| 517 | |
| 518 if (ngx_close_file(of.fd) == NGX_FILE_ERROR) { | |
| 519 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, | |
| 520 ngx_close_file_n " \"%s\" failed", path.data); | |
| 521 } | |
| 522 | |
| 523 return NGX_DECLINED; | |
| 524 } | |
| 525 | |
| 526 r->root_tested = !r->error_page; | |
| 527 r->allow_ranges = 1; | |
| 528 | |
| 529 start = -1; | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
530 length = 0; |
| 4085 | 531 r->headers_out.content_length_n = of.size; |
| 532 mp4 = NULL; | |
| 533 b = NULL; | |
| 534 | |
| 535 if (r->args.len) { | |
| 536 | |
| 537 if (ngx_http_arg(r, (u_char *) "start", 5, &value) == NGX_OK) { | |
| 538 | |
|
4156
67a4654ba7d9
Using strtod() instead of atofp() to support a lot of digits after dot in
Igor Sysoev <igor@sysoev.ru>
parents:
4155
diff
changeset
|
539 /* |
|
67a4654ba7d9
Using strtod() instead of atofp() to support a lot of digits after dot in
Igor Sysoev <igor@sysoev.ru>
parents:
4155
diff
changeset
|
540 * A Flash player may send start value with a lot of digits |
|
6782
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
541 * after dot so a custom function is used instead of ngx_atofp(). |
|
4156
67a4654ba7d9
Using strtod() instead of atofp() to support a lot of digits after dot in
Igor Sysoev <igor@sysoev.ru>
parents:
4155
diff
changeset
|
542 */ |
|
67a4654ba7d9
Using strtod() instead of atofp() to support a lot of digits after dot in
Igor Sysoev <igor@sysoev.ru>
parents:
4155
diff
changeset
|
543 |
|
6782
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
544 start = ngx_http_mp4_atofp(value.data, value.len, 3); |
| 4085 | 545 } |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
546 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
547 if (ngx_http_arg(r, (u_char *) "end", 3, &value) == NGX_OK) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
548 |
|
6782
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
549 end = ngx_http_mp4_atofp(value.data, value.len, 3); |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
550 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
551 if (end > 0) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
552 if (start < 0) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
553 start = 0; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
554 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
555 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
556 if (end > start) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
557 length = end - start; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
558 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
559 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
560 } |
| 4085 | 561 } |
| 562 | |
|
5202
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
563 if (start >= 0) { |
|
5621
345e4fd4bb64
Range filter: single_range flag in request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5620
diff
changeset
|
564 r->single_range = 1; |
|
5202
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
565 |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
566 mp4 = ngx_pcalloc(r->pool, sizeof(ngx_http_mp4_file_t)); |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
567 if (mp4 == NULL) { |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
568 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
569 } |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
570 |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
571 mp4->file.fd = of.fd; |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
572 mp4->file.name = path; |
|
5496
9d056f10fb99
Style: removed surplus semicolons.
Valentin Bartenev <vbart@nginx.com>
parents:
5359
diff
changeset
|
573 mp4->file.log = r->connection->log; |
|
5202
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
574 mp4->end = of.size; |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
575 mp4->start = (ngx_uint_t) start; |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
576 mp4->length = length; |
|
5202
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
577 mp4->request = r; |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
578 |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
579 switch (ngx_http_mp4_process(mp4)) { |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
580 |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
581 case NGX_DECLINED: |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
582 if (mp4->buffer) { |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
583 ngx_pfree(r->pool, mp4->buffer); |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
584 } |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
585 |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
586 ngx_pfree(r->pool, mp4); |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
587 mp4 = NULL; |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
588 |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
589 break; |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
590 |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
591 case NGX_OK: |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
592 r->headers_out.content_length_n = mp4->content_length; |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
593 break; |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
594 |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
595 default: /* NGX_ERROR */ |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
596 if (mp4->buffer) { |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
597 ngx_pfree(r->pool, mp4->buffer); |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
598 } |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
599 |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
600 ngx_pfree(r->pool, mp4); |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
601 |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
602 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
603 } |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
604 } |
|
322434f13bd8
Mp4: indentation and style, no functional changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5097
diff
changeset
|
605 |
| 4085 | 606 log->action = "sending mp4 to client"; |
| 607 | |
| 608 if (clcf->directio <= of.size) { | |
| 609 | |
| 610 /* | |
| 611 * DIRECTIO is set on transfer only | |
| 612 * to allow kernel to cache "moov" atom | |
| 613 */ | |
| 614 | |
| 615 if (ngx_directio_on(of.fd) == NGX_FILE_ERROR) { | |
| 616 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, | |
| 617 ngx_directio_on_n " \"%s\" failed", path.data); | |
| 618 } | |
| 619 | |
|
4087
3aa3b7bb9f0d
Bugfix of r4086: directio was always enabled if mp4 file was sent as is.
Igor Sysoev <igor@sysoev.ru>
parents:
4085
diff
changeset
|
620 of.is_directio = 1; |
|
3aa3b7bb9f0d
Bugfix of r4086: directio was always enabled if mp4 file was sent as is.
Igor Sysoev <igor@sysoev.ru>
parents:
4085
diff
changeset
|
621 |
| 4085 | 622 if (mp4) { |
| 623 mp4->file.directio = 1; | |
| 624 } | |
| 625 } | |
| 626 | |
| 627 r->headers_out.status = NGX_HTTP_OK; | |
| 628 r->headers_out.last_modified_time = of.mtime; | |
| 629 | |
|
4748
192f54280a7a
Entity tags: set for static respones.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4705
diff
changeset
|
630 if (ngx_http_set_etag(r) != NGX_OK) { |
|
192f54280a7a
Entity tags: set for static respones.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4705
diff
changeset
|
631 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
|
192f54280a7a
Entity tags: set for static respones.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4705
diff
changeset
|
632 } |
|
192f54280a7a
Entity tags: set for static respones.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4705
diff
changeset
|
633 |
| 4085 | 634 if (ngx_http_set_content_type(r) != NGX_OK) { |
| 635 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 636 } | |
| 637 | |
| 638 if (mp4 == NULL) { | |
|
6973
99934aade555
Use ngx_calloc_buf() where appropriate.
Ruslan Ermilov <ru@nginx.com>
parents:
6818
diff
changeset
|
639 b = ngx_calloc_buf(r->pool); |
| 4085 | 640 if (b == NULL) { |
| 641 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 642 } | |
| 643 | |
| 644 b->file = ngx_pcalloc(r->pool, sizeof(ngx_file_t)); | |
| 645 if (b->file == NULL) { | |
| 646 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 647 } | |
| 648 } | |
| 649 | |
| 650 rc = ngx_http_send_header(r); | |
| 651 | |
| 652 if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) { | |
| 653 return rc; | |
| 654 } | |
| 655 | |
| 656 if (mp4) { | |
| 657 return ngx_http_output_filter(r, mp4->out); | |
| 658 } | |
| 659 | |
| 660 b->file_pos = 0; | |
| 661 b->file_last = of.size; | |
| 662 | |
| 663 b->in_file = b->file_last ? 1 : 0; | |
|
4611
2b6cb7528409
Allows particular modules to handle subrequests properly.
Andrey Belov <defan@nginx.com>
parents:
4585
diff
changeset
|
664 b->last_buf = (r == r->main) ? 1 : 0; |
| 4085 | 665 b->last_in_chain = 1; |
| 666 | |
| 667 b->file->fd = of.fd; | |
| 668 b->file->name = path; | |
| 669 b->file->log = log; | |
| 670 b->file->directio = of.is_directio; | |
| 671 | |
| 672 out.buf = b; | |
| 673 out.next = NULL; | |
| 674 | |
| 675 return ngx_http_output_filter(r, &out); | |
| 676 } | |
| 677 | |
| 678 | |
| 679 static ngx_int_t | |
|
6782
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
680 ngx_http_mp4_atofp(u_char *line, size_t n, size_t point) |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
681 { |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
682 ngx_int_t value, cutoff, cutlim; |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
683 ngx_uint_t dot; |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
684 |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
685 /* same as ngx_atofp(), but allows additional digits */ |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
686 |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
687 if (n == 0) { |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
688 return NGX_ERROR; |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
689 } |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
690 |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
691 cutoff = NGX_MAX_INT_T_VALUE / 10; |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
692 cutlim = NGX_MAX_INT_T_VALUE % 10; |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
693 |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
694 dot = 0; |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
695 |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
696 for (value = 0; n--; line++) { |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
697 |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
698 if (*line == '.') { |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
699 if (dot) { |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
700 return NGX_ERROR; |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
701 } |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
702 |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
703 dot = 1; |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
704 continue; |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
705 } |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
706 |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
707 if (*line < '0' || *line > '9') { |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
708 return NGX_ERROR; |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
709 } |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
710 |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
711 if (point == 0) { |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
712 continue; |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
713 } |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
714 |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
715 if (value >= cutoff && (value > cutoff || *line - '0' > cutlim)) { |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
716 return NGX_ERROR; |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
717 } |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
718 |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
719 value = value * 10 + (*line - '0'); |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
720 point -= dot; |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
721 } |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
722 |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
723 while (point--) { |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
724 if (value > cutoff) { |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
725 return NGX_ERROR; |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
726 } |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
727 |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
728 value = value * 10; |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
729 } |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
730 |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
731 return value; |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
732 } |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
733 |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
734 |
|
b123eae3fd4e
Mp4: introduced custom version of ngx_atofp().
Maxim Dounin <mdounin@mdounin.ru>
parents:
6722
diff
changeset
|
735 static ngx_int_t |
| 4085 | 736 ngx_http_mp4_process(ngx_http_mp4_file_t *mp4) |
| 737 { | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
738 off_t start_offset, end_offset, adjustment; |
| 4085 | 739 ngx_int_t rc; |
| 740 ngx_uint_t i, j; | |
| 741 ngx_chain_t **prev; | |
| 742 ngx_http_mp4_trak_t *trak; | |
| 743 ngx_http_mp4_conf_t *conf; | |
| 744 | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
745 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
746 "mp4 start:%ui, length:%ui", mp4->start, mp4->length); |
| 4085 | 747 |
| 748 conf = ngx_http_get_module_loc_conf(mp4->request, ngx_http_mp4_module); | |
| 749 | |
| 750 mp4->buffer_size = conf->buffer_size; | |
| 751 | |
| 752 rc = ngx_http_mp4_read_atom(mp4, ngx_http_mp4_atoms, mp4->end); | |
| 753 if (rc != NGX_OK) { | |
| 754 return rc; | |
| 755 } | |
| 756 | |
| 757 if (mp4->trak.nelts == 0) { | |
| 758 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, | |
| 759 "no mp4 trak atoms were found in \"%s\"", | |
| 760 mp4->file.name.data); | |
| 761 return NGX_ERROR; | |
| 762 } | |
| 763 | |
| 764 if (mp4->mdat_atom.buf == NULL) { | |
| 765 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, | |
| 766 "no mp4 mdat atom was found in \"%s\"", | |
| 767 mp4->file.name.data); | |
| 768 return NGX_ERROR; | |
| 769 } | |
| 770 | |
| 771 prev = &mp4->out; | |
| 772 | |
| 773 if (mp4->ftyp_atom.buf) { | |
| 774 *prev = &mp4->ftyp_atom; | |
| 775 prev = &mp4->ftyp_atom.next; | |
| 776 } | |
| 777 | |
| 778 *prev = &mp4->moov_atom; | |
| 779 prev = &mp4->moov_atom.next; | |
| 780 | |
| 781 if (mp4->mvhd_atom.buf) { | |
| 782 mp4->moov_size += mp4->mvhd_atom_buf.last - mp4->mvhd_atom_buf.pos; | |
| 783 *prev = &mp4->mvhd_atom; | |
| 784 prev = &mp4->mvhd_atom.next; | |
| 785 } | |
| 786 | |
| 787 start_offset = mp4->end; | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
788 end_offset = 0; |
| 4085 | 789 trak = mp4->trak.elts; |
| 790 | |
| 791 for (i = 0; i < mp4->trak.nelts; i++) { | |
| 792 | |
| 793 if (ngx_http_mp4_update_stts_atom(mp4, &trak[i]) != NGX_OK) { | |
| 794 return NGX_ERROR; | |
| 795 } | |
| 796 | |
| 797 if (ngx_http_mp4_update_stss_atom(mp4, &trak[i]) != NGX_OK) { | |
| 798 return NGX_ERROR; | |
| 799 } | |
| 800 | |
| 801 ngx_http_mp4_update_ctts_atom(mp4, &trak[i]); | |
| 802 | |
| 803 if (ngx_http_mp4_update_stsc_atom(mp4, &trak[i]) != NGX_OK) { | |
| 804 return NGX_ERROR; | |
| 805 } | |
| 806 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
807 if (ngx_http_mp4_update_stsz_atom(mp4, &trak[i]) != NGX_OK) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
808 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
809 } |
| 4085 | 810 |
| 4112 | 811 if (trak[i].out[NGX_HTTP_MP4_CO64_DATA].buf) { |
| 812 if (ngx_http_mp4_update_co64_atom(mp4, &trak[i]) != NGX_OK) { | |
| 813 return NGX_ERROR; | |
| 814 } | |
| 815 | |
| 816 } else { | |
| 817 if (ngx_http_mp4_update_stco_atom(mp4, &trak[i]) != NGX_OK) { | |
| 818 return NGX_ERROR; | |
| 819 } | |
| 4085 | 820 } |
| 821 | |
| 822 ngx_http_mp4_update_stbl_atom(mp4, &trak[i]); | |
| 823 ngx_http_mp4_update_minf_atom(mp4, &trak[i]); | |
| 824 trak[i].size += trak[i].mdhd_size; | |
| 825 trak[i].size += trak[i].hdlr_size; | |
| 826 ngx_http_mp4_update_mdia_atom(mp4, &trak[i]); | |
| 827 trak[i].size += trak[i].tkhd_size; | |
| 828 ngx_http_mp4_update_trak_atom(mp4, &trak[i]); | |
| 829 | |
| 830 mp4->moov_size += trak[i].size; | |
| 831 | |
| 832 if (start_offset > trak[i].start_offset) { | |
| 833 start_offset = trak[i].start_offset; | |
| 834 } | |
| 835 | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
836 if (end_offset < trak[i].end_offset) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
837 end_offset = trak[i].end_offset; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
838 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
839 |
| 4085 | 840 *prev = &trak[i].out[NGX_HTTP_MP4_TRAK_ATOM]; |
| 841 prev = &trak[i].out[NGX_HTTP_MP4_TRAK_ATOM].next; | |
| 842 | |
| 843 for (j = 0; j < NGX_HTTP_MP4_LAST_ATOM + 1; j++) { | |
| 844 if (trak[i].out[j].buf) { | |
| 845 *prev = &trak[i].out[j]; | |
| 846 prev = &trak[i].out[j].next; | |
| 847 } | |
| 848 } | |
| 849 } | |
| 850 | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
851 if (end_offset < start_offset) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
852 end_offset = start_offset; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
853 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
854 |
| 4085 | 855 mp4->moov_size += 8; |
| 856 | |
| 857 ngx_mp4_set_32value(mp4->moov_atom_header, mp4->moov_size); | |
| 858 ngx_mp4_set_atom_name(mp4->moov_atom_header, 'm', 'o', 'o', 'v'); | |
| 859 mp4->content_length += mp4->moov_size; | |
| 860 | |
| 861 *prev = &mp4->mdat_atom; | |
| 862 | |
|
5097
37671d0042b7
Mp4: fixed handling of too small mdat atoms (ticket #266).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4820
diff
changeset
|
863 if (start_offset > mp4->mdat_data.buf->file_last) { |
|
37671d0042b7
Mp4: fixed handling of too small mdat atoms (ticket #266).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4820
diff
changeset
|
864 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
37671d0042b7
Mp4: fixed handling of too small mdat atoms (ticket #266).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4820
diff
changeset
|
865 "start time is out mp4 mdat atom in \"%s\"", |
|
37671d0042b7
Mp4: fixed handling of too small mdat atoms (ticket #266).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4820
diff
changeset
|
866 mp4->file.name.data); |
|
37671d0042b7
Mp4: fixed handling of too small mdat atoms (ticket #266).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4820
diff
changeset
|
867 return NGX_ERROR; |
|
37671d0042b7
Mp4: fixed handling of too small mdat atoms (ticket #266).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4820
diff
changeset
|
868 } |
|
37671d0042b7
Mp4: fixed handling of too small mdat atoms (ticket #266).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4820
diff
changeset
|
869 |
| 4085 | 870 adjustment = mp4->ftyp_size + mp4->moov_size |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
871 + ngx_http_mp4_update_mdat_atom(mp4, start_offset, end_offset) |
| 4085 | 872 - start_offset; |
| 873 | |
|
4088
8fe1da7b8386
bugfix of r4086: nginx could not be built without debug log.
Igor Sysoev <igor@sysoev.ru>
parents:
4087
diff
changeset
|
874 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
| 4579 | 875 "mp4 adjustment:%O", adjustment); |
| 4085 | 876 |
| 877 for (i = 0; i < mp4->trak.nelts; i++) { | |
| 4112 | 878 if (trak[i].out[NGX_HTTP_MP4_CO64_DATA].buf) { |
| 879 ngx_http_mp4_adjust_co64_atom(mp4, &trak[i], adjustment); | |
| 880 } else { | |
| 881 ngx_http_mp4_adjust_stco_atom(mp4, &trak[i], (int32_t) adjustment); | |
| 882 } | |
| 4085 | 883 } |
| 884 | |
| 885 return NGX_OK; | |
| 886 } | |
| 887 | |
| 888 | |
| 889 typedef struct { | |
| 890 u_char size[4]; | |
| 891 u_char name[4]; | |
| 892 } ngx_mp4_atom_header_t; | |
| 893 | |
| 894 typedef struct { | |
| 895 u_char size[4]; | |
| 896 u_char name[4]; | |
| 897 u_char size64[8]; | |
| 898 } ngx_mp4_atom_header64_t; | |
| 899 | |
| 900 | |
| 901 static ngx_int_t | |
| 902 ngx_http_mp4_read_atom(ngx_http_mp4_file_t *mp4, | |
| 903 ngx_http_mp4_atom_handler_t *atom, uint64_t atom_data_size) | |
| 904 { | |
| 905 off_t end; | |
| 906 size_t atom_header_size; | |
| 907 u_char *atom_header, *atom_name; | |
| 908 uint64_t atom_size; | |
| 909 ngx_int_t rc; | |
| 910 ngx_uint_t n; | |
| 911 | |
| 912 end = mp4->offset + atom_data_size; | |
| 913 | |
| 914 while (mp4->offset < end) { | |
| 915 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
916 if (ngx_http_mp4_read(mp4, sizeof(uint32_t)) != NGX_OK) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
917 return NGX_ERROR; |
| 4085 | 918 } |
| 919 | |
| 920 atom_header = mp4->buffer_pos; | |
| 921 atom_size = ngx_mp4_get_32value(atom_header); | |
| 922 atom_header_size = sizeof(ngx_mp4_atom_header_t); | |
| 923 | |
| 924 if (atom_size == 0) { | |
| 925 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 926 "mp4 atom end"); | |
| 927 return NGX_OK; | |
| 928 } | |
| 929 | |
| 930 if (atom_size < sizeof(ngx_mp4_atom_header_t)) { | |
| 931 | |
| 932 if (atom_size == 1) { | |
| 933 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
934 if (ngx_http_mp4_read(mp4, sizeof(ngx_mp4_atom_header64_t)) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
935 != NGX_OK) |
| 4085 | 936 { |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
937 return NGX_ERROR; |
| 4085 | 938 } |
| 939 | |
| 940 /* 64-bit atom size */ | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
941 atom_header = mp4->buffer_pos; |
| 4085 | 942 atom_size = ngx_mp4_get_64value(atom_header + 8); |
| 943 atom_header_size = sizeof(ngx_mp4_atom_header64_t); | |
| 944 | |
|
7376
e5069816039b
Mp4: fixed reading 64-bit atoms.
Roman Arutyunyan <arut@nginx.com>
parents:
6973
diff
changeset
|
945 if (atom_size < sizeof(ngx_mp4_atom_header64_t)) { |
|
e5069816039b
Mp4: fixed reading 64-bit atoms.
Roman Arutyunyan <arut@nginx.com>
parents:
6973
diff
changeset
|
946 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
e5069816039b
Mp4: fixed reading 64-bit atoms.
Roman Arutyunyan <arut@nginx.com>
parents:
6973
diff
changeset
|
947 "\"%s\" mp4 atom is too small:%uL", |
|
e5069816039b
Mp4: fixed reading 64-bit atoms.
Roman Arutyunyan <arut@nginx.com>
parents:
6973
diff
changeset
|
948 mp4->file.name.data, atom_size); |
|
e5069816039b
Mp4: fixed reading 64-bit atoms.
Roman Arutyunyan <arut@nginx.com>
parents:
6973
diff
changeset
|
949 return NGX_ERROR; |
|
e5069816039b
Mp4: fixed reading 64-bit atoms.
Roman Arutyunyan <arut@nginx.com>
parents:
6973
diff
changeset
|
950 } |
|
e5069816039b
Mp4: fixed reading 64-bit atoms.
Roman Arutyunyan <arut@nginx.com>
parents:
6973
diff
changeset
|
951 |
| 4085 | 952 } else { |
| 953 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, | |
| 954 "\"%s\" mp4 atom is too small:%uL", | |
| 955 mp4->file.name.data, atom_size); | |
| 956 return NGX_ERROR; | |
| 957 } | |
| 958 } | |
| 959 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
960 if (ngx_http_mp4_read(mp4, sizeof(ngx_mp4_atom_header_t)) != NGX_OK) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
961 return NGX_ERROR; |
| 4085 | 962 } |
| 963 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
964 atom_header = mp4->buffer_pos; |
| 4085 | 965 atom_name = atom_header + sizeof(uint32_t); |
| 966 | |
|
4088
8fe1da7b8386
bugfix of r4086: nginx could not be built without debug log.
Igor Sysoev <igor@sysoev.ru>
parents:
4087
diff
changeset
|
967 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
| 4085 | 968 "mp4 atom: %*s @%O:%uL", |
|
6478
3ef7bb882ad4
Fixed logging with variable field width.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6474
diff
changeset
|
969 (size_t) 4, atom_name, mp4->offset, atom_size); |
| 4085 | 970 |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
971 if (atom_size > (uint64_t) (NGX_MAX_OFF_T_VALUE - mp4->offset) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
972 || mp4->offset + (off_t) atom_size > end) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
973 { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
974 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
975 "\"%s\" mp4 atom too large:%uL", |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
976 mp4->file.name.data, atom_size); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
977 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
978 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
979 |
| 4085 | 980 for (n = 0; atom[n].name; n++) { |
| 981 | |
| 982 if (ngx_strncmp(atom_name, atom[n].name, 4) == 0) { | |
| 983 | |
| 984 ngx_mp4_atom_next(mp4, atom_header_size); | |
| 985 | |
| 986 rc = atom[n].handler(mp4, atom_size - atom_header_size); | |
| 987 if (rc != NGX_OK) { | |
| 988 return rc; | |
| 989 } | |
| 990 | |
| 991 goto next; | |
| 992 } | |
| 993 } | |
| 994 | |
| 995 ngx_mp4_atom_next(mp4, atom_size); | |
| 996 | |
| 997 next: | |
| 998 continue; | |
| 999 } | |
| 1000 | |
| 1001 return NGX_OK; | |
| 1002 } | |
| 1003 | |
| 1004 | |
| 1005 static ngx_int_t | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1006 ngx_http_mp4_read(ngx_http_mp4_file_t *mp4, size_t size) |
| 4085 | 1007 { |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1008 ssize_t n; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1009 |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1010 if (mp4->buffer_pos + size <= mp4->buffer_end) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1011 return NGX_OK; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1012 } |
| 4085 | 1013 |
| 1014 if (mp4->offset + (off_t) mp4->buffer_size > mp4->end) { | |
| 1015 mp4->buffer_size = (size_t) (mp4->end - mp4->offset); | |
| 1016 } | |
| 1017 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1018 if (mp4->buffer_size < size) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1019 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1020 "\"%s\" mp4 file truncated", mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1021 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1022 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1023 |
| 4085 | 1024 if (mp4->buffer == NULL) { |
| 1025 mp4->buffer = ngx_palloc(mp4->request->pool, mp4->buffer_size); | |
| 1026 if (mp4->buffer == NULL) { | |
| 1027 return NGX_ERROR; | |
| 1028 } | |
| 1029 | |
| 1030 mp4->buffer_start = mp4->buffer; | |
| 1031 } | |
| 1032 | |
| 1033 n = ngx_read_file(&mp4->file, mp4->buffer_start, mp4->buffer_size, | |
| 1034 mp4->offset); | |
| 1035 | |
| 1036 if (n == NGX_ERROR) { | |
| 1037 return NGX_ERROR; | |
| 1038 } | |
| 1039 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1040 if ((size_t) n != mp4->buffer_size) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1041 ngx_log_error(NGX_LOG_CRIT, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1042 ngx_read_file_n " read only %z of %z from \"%s\"", |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1043 n, mp4->buffer_size, mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1044 return NGX_ERROR; |
| 4085 | 1045 } |
| 1046 | |
| 1047 mp4->buffer_pos = mp4->buffer_start; | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1048 mp4->buffer_end = mp4->buffer_start + mp4->buffer_size; |
| 4085 | 1049 |
| 1050 return NGX_OK; | |
| 1051 } | |
| 1052 | |
| 1053 | |
| 1054 static ngx_int_t | |
| 1055 ngx_http_mp4_read_ftyp_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 1056 { | |
| 1057 u_char *ftyp_atom; | |
| 1058 size_t atom_size; | |
| 1059 ngx_buf_t *atom; | |
| 1060 | |
| 1061 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 ftyp atom"); | |
| 1062 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1063 if (atom_data_size > 1024 |
|
5359
2fda9065d0f4
Win32: Borland C compatibility fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
1064 || ngx_mp4_atom_data(mp4) + (size_t) atom_data_size > mp4->buffer_end) |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1065 { |
| 4085 | 1066 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
| 1067 "\"%s\" mp4 ftyp atom is too large:%uL", | |
| 1068 mp4->file.name.data, atom_data_size); | |
| 1069 return NGX_ERROR; | |
| 1070 } | |
| 1071 | |
| 1072 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; | |
| 1073 | |
| 1074 ftyp_atom = ngx_palloc(mp4->request->pool, atom_size); | |
| 1075 if (ftyp_atom == NULL) { | |
| 1076 return NGX_ERROR; | |
| 1077 } | |
| 1078 | |
| 1079 ngx_mp4_set_32value(ftyp_atom, atom_size); | |
| 1080 ngx_mp4_set_atom_name(ftyp_atom, 'f', 't', 'y', 'p'); | |
| 1081 | |
| 1082 /* | |
| 1083 * only moov atom content is guaranteed to be in mp4->buffer | |
| 1084 * during sending response, so ftyp atom content should be copied | |
| 1085 */ | |
| 1086 ngx_memcpy(ftyp_atom + sizeof(ngx_mp4_atom_header_t), | |
| 1087 ngx_mp4_atom_data(mp4), (size_t) atom_data_size); | |
| 1088 | |
| 1089 atom = &mp4->ftyp_atom_buf; | |
| 1090 atom->temporary = 1; | |
| 1091 atom->pos = ftyp_atom; | |
| 1092 atom->last = ftyp_atom + atom_size; | |
| 1093 | |
| 1094 mp4->ftyp_atom.buf = atom; | |
| 1095 mp4->ftyp_size = atom_size; | |
| 1096 mp4->content_length = atom_size; | |
| 1097 | |
| 1098 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 1099 | |
| 1100 return NGX_OK; | |
| 1101 } | |
| 1102 | |
| 1103 | |
| 1104 /* | |
| 1105 * Small excess buffer to process atoms after moov atom, mp4->buffer_start | |
| 1106 * will be set to this buffer part after moov atom processing. | |
| 1107 */ | |
| 1108 #define NGX_HTTP_MP4_MOOV_BUFFER_EXCESS (4 * 1024) | |
| 1109 | |
| 1110 static ngx_int_t | |
| 1111 ngx_http_mp4_read_moov_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 1112 { | |
| 1113 ngx_int_t rc; | |
| 1114 ngx_uint_t no_mdat; | |
| 1115 ngx_buf_t *atom; | |
| 1116 ngx_http_mp4_conf_t *conf; | |
| 1117 | |
| 1118 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 moov atom"); | |
| 1119 | |
| 1120 no_mdat = (mp4->mdat_atom.buf == NULL); | |
| 1121 | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1122 if (no_mdat && mp4->start == 0 && mp4->length == 0) { |
| 4085 | 1123 /* |
| 1124 * send original file if moov atom resides before | |
| 1125 * mdat atom and client requests integral file | |
| 1126 */ | |
| 1127 return NGX_DECLINED; | |
| 1128 } | |
| 1129 | |
| 1130 conf = ngx_http_get_module_loc_conf(mp4->request, ngx_http_mp4_module); | |
| 1131 | |
| 1132 if (atom_data_size > mp4->buffer_size) { | |
| 1133 | |
|
4089
e27670e1ab70
mp4_max_moov_size directive has been renamed to mp4_max_buffer_size.
Igor Sysoev <igor@sysoev.ru>
parents:
4088
diff
changeset
|
1134 if (atom_data_size > conf->max_buffer_size) { |
| 4085 | 1135 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
| 1136 "\"%s\" mp4 moov atom is too large:%uL, " | |
|
4089
e27670e1ab70
mp4_max_moov_size directive has been renamed to mp4_max_buffer_size.
Igor Sysoev <igor@sysoev.ru>
parents:
4088
diff
changeset
|
1137 "you may want to increase mp4_max_buffer_size", |
| 4085 | 1138 mp4->file.name.data, atom_data_size); |
| 1139 return NGX_ERROR; | |
| 1140 } | |
| 1141 | |
| 1142 ngx_pfree(mp4->request->pool, mp4->buffer); | |
| 1143 mp4->buffer = NULL; | |
| 1144 mp4->buffer_pos = NULL; | |
| 1145 mp4->buffer_end = NULL; | |
| 1146 | |
| 1147 mp4->buffer_size = (size_t) atom_data_size | |
| 1148 + NGX_HTTP_MP4_MOOV_BUFFER_EXCESS * no_mdat; | |
| 1149 } | |
| 1150 | |
|
4705
9a43b145a8ba
Mp4: fixed build on win32 after r4689.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4688
diff
changeset
|
1151 if (ngx_http_mp4_read(mp4, (size_t) atom_data_size) != NGX_OK) { |
|
4688
5fedb27c3e36
Mp4: fixed streaming if moov atom is at buffer edge.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4687
diff
changeset
|
1152 return NGX_ERROR; |
|
5fedb27c3e36
Mp4: fixed streaming if moov atom is at buffer edge.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4687
diff
changeset
|
1153 } |
|
5fedb27c3e36
Mp4: fixed streaming if moov atom is at buffer edge.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4687
diff
changeset
|
1154 |
| 4085 | 1155 mp4->trak.elts = &mp4->traks; |
| 1156 mp4->trak.size = sizeof(ngx_http_mp4_trak_t); | |
| 1157 mp4->trak.nalloc = 2; | |
| 1158 mp4->trak.pool = mp4->request->pool; | |
| 1159 | |
| 1160 atom = &mp4->moov_atom_buf; | |
| 1161 atom->temporary = 1; | |
| 1162 atom->pos = mp4->moov_atom_header; | |
| 1163 atom->last = mp4->moov_atom_header + 8; | |
| 1164 | |
| 1165 mp4->moov_atom.buf = &mp4->moov_atom_buf; | |
| 1166 | |
| 1167 rc = ngx_http_mp4_read_atom(mp4, ngx_http_mp4_moov_atoms, atom_data_size); | |
| 1168 | |
| 1169 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 moov atom done"); | |
| 1170 | |
| 1171 if (no_mdat) { | |
| 1172 mp4->buffer_start = mp4->buffer_pos; | |
| 1173 mp4->buffer_size = NGX_HTTP_MP4_MOOV_BUFFER_EXCESS; | |
| 1174 | |
|
4688
5fedb27c3e36
Mp4: fixed streaming if moov atom is at buffer edge.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4687
diff
changeset
|
1175 if (mp4->buffer_start + mp4->buffer_size > mp4->buffer_end) { |
|
5fedb27c3e36
Mp4: fixed streaming if moov atom is at buffer edge.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4687
diff
changeset
|
1176 mp4->buffer = NULL; |
|
5fedb27c3e36
Mp4: fixed streaming if moov atom is at buffer edge.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4687
diff
changeset
|
1177 mp4->buffer_pos = NULL; |
|
5fedb27c3e36
Mp4: fixed streaming if moov atom is at buffer edge.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4687
diff
changeset
|
1178 mp4->buffer_end = NULL; |
|
5fedb27c3e36
Mp4: fixed streaming if moov atom is at buffer edge.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4687
diff
changeset
|
1179 } |
|
5fedb27c3e36
Mp4: fixed streaming if moov atom is at buffer edge.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4687
diff
changeset
|
1180 |
| 4085 | 1181 } else { |
| 1182 /* skip atoms after moov atom */ | |
| 1183 mp4->offset = mp4->end; | |
| 1184 } | |
| 1185 | |
| 1186 return rc; | |
| 1187 } | |
| 1188 | |
| 1189 | |
| 1190 static ngx_int_t | |
| 1191 ngx_http_mp4_read_mdat_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 1192 { | |
| 1193 ngx_buf_t *data; | |
| 1194 | |
| 1195 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mdat atom"); | |
| 1196 | |
| 1197 data = &mp4->mdat_data_buf; | |
| 1198 data->file = &mp4->file; | |
| 1199 data->in_file = 1; | |
|
6722
6136a51f9c21
Do not set last_buf flag in subrequests.
Roman Arutyunyan <arut@nginx.com>
parents:
6504
diff
changeset
|
1200 data->last_buf = (mp4->request == mp4->request->main) ? 1 : 0; |
| 4085 | 1201 data->last_in_chain = 1; |
| 1202 data->file_last = mp4->offset + atom_data_size; | |
| 1203 | |
| 1204 mp4->mdat_atom.buf = &mp4->mdat_atom_buf; | |
| 1205 mp4->mdat_atom.next = &mp4->mdat_data; | |
| 1206 mp4->mdat_data.buf = data; | |
| 1207 | |
| 1208 if (mp4->trak.nelts) { | |
| 1209 /* skip atoms after mdat atom */ | |
| 1210 mp4->offset = mp4->end; | |
| 1211 | |
| 1212 } else { | |
| 1213 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 1214 } | |
| 1215 | |
| 1216 return NGX_OK; | |
| 1217 } | |
| 1218 | |
| 1219 | |
| 1220 static size_t | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1221 ngx_http_mp4_update_mdat_atom(ngx_http_mp4_file_t *mp4, off_t start_offset, |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1222 off_t end_offset) |
| 4085 | 1223 { |
| 1224 off_t atom_data_size; | |
| 1225 u_char *atom_header; | |
| 1226 uint32_t atom_header_size; | |
| 1227 uint64_t atom_size; | |
| 1228 ngx_buf_t *atom; | |
| 1229 | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1230 atom_data_size = end_offset - start_offset; |
| 4085 | 1231 mp4->mdat_data.buf->file_pos = start_offset; |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1232 mp4->mdat_data.buf->file_last = end_offset; |
| 4085 | 1233 |
|
4088
8fe1da7b8386
bugfix of r4086: nginx could not be built without debug log.
Igor Sysoev <igor@sysoev.ru>
parents:
4087
diff
changeset
|
1234 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
| 4085 | 1235 "mdat new offset @%O:%O", start_offset, atom_data_size); |
| 1236 | |
| 1237 atom_header = mp4->mdat_atom_header; | |
| 1238 | |
|
6818
2b2239a1e0d4
Mp4: fixed setting wrong mdat atom size in very rare cases.
hucongcong <hucong.c@foxmail.com>
parents:
6782
diff
changeset
|
1239 if ((uint64_t) atom_data_size |
|
2b2239a1e0d4
Mp4: fixed setting wrong mdat atom size in very rare cases.
hucongcong <hucong.c@foxmail.com>
parents:
6782
diff
changeset
|
1240 > (uint64_t) 0xffffffff - sizeof(ngx_mp4_atom_header_t)) |
|
2b2239a1e0d4
Mp4: fixed setting wrong mdat atom size in very rare cases.
hucongcong <hucong.c@foxmail.com>
parents:
6782
diff
changeset
|
1241 { |
| 4085 | 1242 atom_size = 1; |
| 1243 atom_header_size = sizeof(ngx_mp4_atom_header64_t); | |
| 1244 ngx_mp4_set_64value(atom_header + sizeof(ngx_mp4_atom_header_t), | |
| 1245 sizeof(ngx_mp4_atom_header64_t) + atom_data_size); | |
| 1246 } else { | |
| 1247 atom_size = sizeof(ngx_mp4_atom_header_t) + atom_data_size; | |
| 1248 atom_header_size = sizeof(ngx_mp4_atom_header_t); | |
| 1249 } | |
| 1250 | |
|
4282
71cdac0b9ea6
Fix of "Content-Length" header of MP4 response if start argument was used.
Igor Sysoev <igor@sysoev.ru>
parents:
4189
diff
changeset
|
1251 mp4->content_length += atom_header_size + atom_data_size; |
|
71cdac0b9ea6
Fix of "Content-Length" header of MP4 response if start argument was used.
Igor Sysoev <igor@sysoev.ru>
parents:
4189
diff
changeset
|
1252 |
| 4085 | 1253 ngx_mp4_set_32value(atom_header, atom_size); |
| 1254 ngx_mp4_set_atom_name(atom_header, 'm', 'd', 'a', 't'); | |
| 1255 | |
| 1256 atom = &mp4->mdat_atom_buf; | |
| 1257 atom->temporary = 1; | |
| 1258 atom->pos = atom_header; | |
| 1259 atom->last = atom_header + atom_header_size; | |
| 1260 | |
| 1261 return atom_header_size; | |
| 1262 } | |
| 1263 | |
| 1264 | |
| 1265 typedef struct { | |
| 1266 u_char size[4]; | |
| 1267 u_char name[4]; | |
| 1268 u_char version[1]; | |
| 1269 u_char flags[3]; | |
| 1270 u_char creation_time[4]; | |
| 1271 u_char modification_time[4]; | |
| 1272 u_char timescale[4]; | |
| 1273 u_char duration[4]; | |
| 1274 u_char rate[4]; | |
| 1275 u_char volume[2]; | |
| 1276 u_char reserved[10]; | |
| 1277 u_char matrix[36]; | |
| 1278 u_char preview_time[4]; | |
| 1279 u_char preview_duration[4]; | |
| 1280 u_char poster_time[4]; | |
| 1281 u_char selection_time[4]; | |
| 1282 u_char selection_duration[4]; | |
| 1283 u_char current_time[4]; | |
| 1284 u_char next_track_id[4]; | |
| 1285 } ngx_mp4_mvhd_atom_t; | |
| 1286 | |
| 1287 typedef struct { | |
| 1288 u_char size[4]; | |
| 1289 u_char name[4]; | |
| 1290 u_char version[1]; | |
| 1291 u_char flags[3]; | |
| 1292 u_char creation_time[8]; | |
| 1293 u_char modification_time[8]; | |
| 1294 u_char timescale[4]; | |
| 1295 u_char duration[8]; | |
| 1296 u_char rate[4]; | |
| 1297 u_char volume[2]; | |
| 1298 u_char reserved[10]; | |
| 1299 u_char matrix[36]; | |
| 1300 u_char preview_time[4]; | |
| 1301 u_char preview_duration[4]; | |
| 1302 u_char poster_time[4]; | |
| 1303 u_char selection_time[4]; | |
| 1304 u_char selection_duration[4]; | |
| 1305 u_char current_time[4]; | |
| 1306 u_char next_track_id[4]; | |
| 1307 } ngx_mp4_mvhd64_atom_t; | |
| 1308 | |
| 1309 | |
| 1310 static ngx_int_t | |
| 1311 ngx_http_mp4_read_mvhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 1312 { | |
| 1313 u_char *atom_header; | |
| 1314 size_t atom_size; | |
| 1315 uint32_t timescale; | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1316 uint64_t duration, start_time, length_time; |
| 4085 | 1317 ngx_buf_t *atom; |
| 1318 ngx_mp4_mvhd_atom_t *mvhd_atom; | |
| 1319 ngx_mp4_mvhd64_atom_t *mvhd64_atom; | |
| 1320 | |
| 1321 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mvhd atom"); | |
| 1322 | |
| 1323 atom_header = ngx_mp4_atom_header(mp4); | |
| 1324 mvhd_atom = (ngx_mp4_mvhd_atom_t *) atom_header; | |
| 1325 mvhd64_atom = (ngx_mp4_mvhd64_atom_t *) atom_header; | |
| 1326 ngx_mp4_set_atom_name(atom_header, 'm', 'v', 'h', 'd'); | |
| 1327 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1328 if (ngx_mp4_atom_data_size(ngx_mp4_mvhd_atom_t) > atom_data_size) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1329 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1330 "\"%s\" mp4 mvhd atom too small", mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1331 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1332 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1333 |
| 4085 | 1334 if (mvhd_atom->version[0] == 0) { |
| 1335 /* version 0: 32-bit duration */ | |
| 1336 timescale = ngx_mp4_get_32value(mvhd_atom->timescale); | |
| 1337 duration = ngx_mp4_get_32value(mvhd_atom->duration); | |
| 1338 | |
| 1339 } else { | |
| 1340 /* version 1: 64-bit duration */ | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1341 |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1342 if (ngx_mp4_atom_data_size(ngx_mp4_mvhd64_atom_t) > atom_data_size) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1343 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1344 "\"%s\" mp4 mvhd atom too small", |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1345 mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1346 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1347 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1348 |
| 4085 | 1349 timescale = ngx_mp4_get_32value(mvhd64_atom->timescale); |
| 1350 duration = ngx_mp4_get_64value(mvhd64_atom->duration); | |
| 1351 } | |
| 1352 | |
| 1353 mp4->timescale = timescale; | |
| 1354 | |
| 1355 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 1356 "mvhd timescale:%uD, duration:%uL, time:%.3fs", | |
| 1357 timescale, duration, (double) duration / timescale); | |
| 1358 | |
|
5543
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1359 start_time = (uint64_t) mp4->start * timescale / 1000; |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1360 |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1361 if (duration < start_time) { |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1362 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1363 "\"%s\" mp4 start time exceeds file duration", |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1364 mp4->file.name.data); |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1365 return NGX_ERROR; |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1366 } |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1367 |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1368 duration -= start_time; |
| 4085 | 1369 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1370 if (mp4->length) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1371 length_time = (uint64_t) mp4->length * timescale / 1000; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1372 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1373 if (duration > length_time) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1374 duration = length_time; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1375 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1376 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1377 |
| 4085 | 1378 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
| 1379 "mvhd new duration:%uL, time:%.3fs", | |
| 1380 duration, (double) duration / timescale); | |
| 1381 | |
| 1382 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; | |
| 1383 ngx_mp4_set_32value(mvhd_atom->size, atom_size); | |
| 1384 | |
| 1385 if (mvhd_atom->version[0] == 0) { | |
| 1386 ngx_mp4_set_32value(mvhd_atom->duration, duration); | |
| 1387 | |
| 1388 } else { | |
| 1389 ngx_mp4_set_64value(mvhd64_atom->duration, duration); | |
| 1390 } | |
| 1391 | |
| 1392 atom = &mp4->mvhd_atom_buf; | |
| 1393 atom->temporary = 1; | |
| 1394 atom->pos = atom_header; | |
| 1395 atom->last = atom_header + atom_size; | |
| 1396 | |
| 1397 mp4->mvhd_atom.buf = atom; | |
| 1398 | |
| 1399 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 1400 | |
| 1401 return NGX_OK; | |
| 1402 } | |
| 1403 | |
| 1404 | |
| 1405 static ngx_int_t | |
| 1406 ngx_http_mp4_read_trak_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 1407 { | |
|
4099
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1408 u_char *atom_header, *atom_end; |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1409 off_t atom_file_end; |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1410 ngx_int_t rc; |
| 4085 | 1411 ngx_buf_t *atom; |
| 1412 ngx_http_mp4_trak_t *trak; | |
| 1413 | |
| 1414 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 trak atom"); | |
| 1415 | |
| 1416 trak = ngx_array_push(&mp4->trak); | |
| 1417 if (trak == NULL) { | |
| 1418 return NGX_ERROR; | |
| 1419 } | |
| 1420 | |
| 1421 ngx_memzero(trak, sizeof(ngx_http_mp4_trak_t)); | |
| 1422 | |
| 1423 atom_header = ngx_mp4_atom_header(mp4); | |
| 1424 ngx_mp4_set_atom_name(atom_header, 't', 'r', 'a', 'k'); | |
| 1425 | |
| 1426 atom = &trak->trak_atom_buf; | |
| 1427 atom->temporary = 1; | |
| 1428 atom->pos = atom_header; | |
| 1429 atom->last = atom_header + sizeof(ngx_mp4_atom_header_t); | |
| 1430 | |
| 1431 trak->out[NGX_HTTP_MP4_TRAK_ATOM].buf = atom; | |
| 1432 | |
|
5359
2fda9065d0f4
Win32: Borland C compatibility fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5358
diff
changeset
|
1433 atom_end = mp4->buffer_pos + (size_t) atom_data_size; |
|
4099
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1434 atom_file_end = mp4->offset + atom_data_size; |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1435 |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1436 rc = ngx_http_mp4_read_atom(mp4, ngx_http_mp4_trak_atoms, atom_data_size); |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1437 |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1438 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1439 "mp4 trak atom: %i", rc); |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1440 |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1441 if (rc == NGX_DECLINED) { |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1442 /* skip this trak */ |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1443 ngx_memzero(trak, sizeof(ngx_http_mp4_trak_t)); |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1444 mp4->trak.nelts--; |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1445 mp4->buffer_pos = atom_end; |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1446 mp4->offset = atom_file_end; |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1447 return NGX_OK; |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1448 } |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1449 |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1450 return rc; |
| 4085 | 1451 } |
| 1452 | |
| 1453 | |
| 1454 static void | |
| 1455 ngx_http_mp4_update_trak_atom(ngx_http_mp4_file_t *mp4, | |
| 1456 ngx_http_mp4_trak_t *trak) | |
| 1457 { | |
| 1458 ngx_buf_t *atom; | |
| 1459 | |
| 1460 trak->size += sizeof(ngx_mp4_atom_header_t); | |
| 1461 atom = &trak->trak_atom_buf; | |
| 1462 ngx_mp4_set_32value(atom->pos, trak->size); | |
| 1463 } | |
| 1464 | |
| 1465 | |
| 1466 static ngx_int_t | |
| 1467 ngx_http_mp4_read_cmov_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 1468 { | |
| 1469 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, | |
| 1470 "\"%s\" mp4 compressed moov atom (cmov) is not supported", | |
| 1471 mp4->file.name.data); | |
| 1472 | |
| 1473 return NGX_ERROR; | |
| 1474 } | |
| 1475 | |
| 1476 | |
| 1477 typedef struct { | |
| 1478 u_char size[4]; | |
| 1479 u_char name[4]; | |
| 1480 u_char version[1]; | |
| 1481 u_char flags[3]; | |
| 1482 u_char creation_time[4]; | |
| 1483 u_char modification_time[4]; | |
| 1484 u_char track_id[4]; | |
| 1485 u_char reserved1[4]; | |
| 1486 u_char duration[4]; | |
| 1487 u_char reserved2[8]; | |
| 1488 u_char layer[2]; | |
| 1489 u_char group[2]; | |
| 1490 u_char volume[2]; | |
| 6504 | 1491 u_char reserved3[2]; |
| 4085 | 1492 u_char matrix[36]; |
| 1493 u_char width[4]; | |
| 6504 | 1494 u_char height[4]; |
| 4085 | 1495 } ngx_mp4_tkhd_atom_t; |
| 1496 | |
| 1497 typedef struct { | |
| 1498 u_char size[4]; | |
| 1499 u_char name[4]; | |
| 1500 u_char version[1]; | |
| 1501 u_char flags[3]; | |
| 1502 u_char creation_time[8]; | |
| 1503 u_char modification_time[8]; | |
| 1504 u_char track_id[4]; | |
| 1505 u_char reserved1[4]; | |
| 1506 u_char duration[8]; | |
| 1507 u_char reserved2[8]; | |
| 1508 u_char layer[2]; | |
| 1509 u_char group[2]; | |
| 1510 u_char volume[2]; | |
| 6504 | 1511 u_char reserved3[2]; |
| 4085 | 1512 u_char matrix[36]; |
| 1513 u_char width[4]; | |
| 6504 | 1514 u_char height[4]; |
| 4085 | 1515 } ngx_mp4_tkhd64_atom_t; |
| 1516 | |
| 1517 | |
| 1518 static ngx_int_t | |
| 1519 ngx_http_mp4_read_tkhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 1520 { | |
| 1521 u_char *atom_header; | |
| 1522 size_t atom_size; | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1523 uint64_t duration, start_time, length_time; |
| 4085 | 1524 ngx_buf_t *atom; |
| 1525 ngx_http_mp4_trak_t *trak; | |
| 1526 ngx_mp4_tkhd_atom_t *tkhd_atom; | |
| 1527 ngx_mp4_tkhd64_atom_t *tkhd64_atom; | |
| 1528 | |
| 1529 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 tkhd atom"); | |
| 1530 | |
| 1531 atom_header = ngx_mp4_atom_header(mp4); | |
| 1532 tkhd_atom = (ngx_mp4_tkhd_atom_t *) atom_header; | |
| 1533 tkhd64_atom = (ngx_mp4_tkhd64_atom_t *) atom_header; | |
| 1534 ngx_mp4_set_atom_name(tkhd_atom, 't', 'k', 'h', 'd'); | |
| 1535 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1536 if (ngx_mp4_atom_data_size(ngx_mp4_tkhd_atom_t) > atom_data_size) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1537 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1538 "\"%s\" mp4 tkhd atom too small", mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1539 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1540 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1541 |
| 4085 | 1542 if (tkhd_atom->version[0] == 0) { |
| 1543 /* version 0: 32-bit duration */ | |
| 1544 duration = ngx_mp4_get_32value(tkhd_atom->duration); | |
| 1545 | |
| 1546 } else { | |
| 1547 /* version 1: 64-bit duration */ | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1548 |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1549 if (ngx_mp4_atom_data_size(ngx_mp4_tkhd64_atom_t) > atom_data_size) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1550 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1551 "\"%s\" mp4 tkhd atom too small", |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1552 mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1553 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1554 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1555 |
| 4085 | 1556 duration = ngx_mp4_get_64value(tkhd64_atom->duration); |
| 1557 } | |
| 1558 | |
| 1559 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 1560 "tkhd duration:%uL, time:%.3fs", | |
| 1561 duration, (double) duration / mp4->timescale); | |
| 1562 | |
|
5543
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1563 start_time = (uint64_t) mp4->start * mp4->timescale / 1000; |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1564 |
|
5629
c7bbc5fcf27c
Mp4: fixed seeking to a track end.
Roman Arutyunyan <arut@nginx.com>
parents:
5622
diff
changeset
|
1565 if (duration <= start_time) { |
|
5543
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1566 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1567 "tkhd duration is less than start time"); |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1568 return NGX_DECLINED; |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1569 } |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1570 |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1571 duration -= start_time; |
| 4085 | 1572 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1573 if (mp4->length) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1574 length_time = (uint64_t) mp4->length * mp4->timescale / 1000; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1575 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1576 if (duration > length_time) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1577 duration = length_time; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1578 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1579 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1580 |
| 4085 | 1581 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
| 1582 "tkhd new duration:%uL, time:%.3fs", | |
| 1583 duration, (double) duration / mp4->timescale); | |
| 1584 | |
| 1585 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; | |
| 1586 | |
| 1587 trak = ngx_mp4_last_trak(mp4); | |
| 1588 trak->tkhd_size = atom_size; | |
| 1589 | |
| 1590 ngx_mp4_set_32value(tkhd_atom->size, atom_size); | |
| 1591 | |
| 1592 if (tkhd_atom->version[0] == 0) { | |
| 1593 ngx_mp4_set_32value(tkhd_atom->duration, duration); | |
| 1594 | |
| 1595 } else { | |
| 1596 ngx_mp4_set_64value(tkhd64_atom->duration, duration); | |
| 1597 } | |
| 1598 | |
| 1599 atom = &trak->tkhd_atom_buf; | |
| 1600 atom->temporary = 1; | |
| 1601 atom->pos = atom_header; | |
| 1602 atom->last = atom_header + atom_size; | |
| 1603 | |
| 1604 trak->out[NGX_HTTP_MP4_TKHD_ATOM].buf = atom; | |
| 1605 | |
| 1606 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 1607 | |
| 1608 return NGX_OK; | |
| 1609 } | |
| 1610 | |
| 1611 | |
| 1612 static ngx_int_t | |
| 1613 ngx_http_mp4_read_mdia_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 1614 { | |
| 1615 u_char *atom_header; | |
| 1616 ngx_buf_t *atom; | |
| 1617 ngx_http_mp4_trak_t *trak; | |
| 1618 | |
| 1619 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "process mdia atom"); | |
| 1620 | |
| 1621 atom_header = ngx_mp4_atom_header(mp4); | |
| 1622 ngx_mp4_set_atom_name(atom_header, 'm', 'd', 'i', 'a'); | |
| 1623 | |
| 1624 trak = ngx_mp4_last_trak(mp4); | |
| 1625 | |
| 1626 atom = &trak->mdia_atom_buf; | |
| 1627 atom->temporary = 1; | |
| 1628 atom->pos = atom_header; | |
| 1629 atom->last = atom_header + sizeof(ngx_mp4_atom_header_t); | |
| 1630 | |
| 1631 trak->out[NGX_HTTP_MP4_MDIA_ATOM].buf = atom; | |
| 1632 | |
| 1633 return ngx_http_mp4_read_atom(mp4, ngx_http_mp4_mdia_atoms, atom_data_size); | |
| 1634 } | |
| 1635 | |
| 1636 | |
| 1637 static void | |
| 1638 ngx_http_mp4_update_mdia_atom(ngx_http_mp4_file_t *mp4, | |
| 1639 ngx_http_mp4_trak_t *trak) | |
| 1640 { | |
| 1641 ngx_buf_t *atom; | |
| 1642 | |
| 1643 trak->size += sizeof(ngx_mp4_atom_header_t); | |
| 1644 atom = &trak->mdia_atom_buf; | |
| 1645 ngx_mp4_set_32value(atom->pos, trak->size); | |
| 1646 } | |
| 1647 | |
| 1648 | |
| 1649 typedef struct { | |
| 1650 u_char size[4]; | |
| 1651 u_char name[4]; | |
| 1652 u_char version[1]; | |
| 1653 u_char flags[3]; | |
| 1654 u_char creation_time[4]; | |
| 1655 u_char modification_time[4]; | |
| 1656 u_char timescale[4]; | |
| 1657 u_char duration[4]; | |
| 1658 u_char language[2]; | |
| 1659 u_char quality[2]; | |
| 1660 } ngx_mp4_mdhd_atom_t; | |
| 1661 | |
| 1662 typedef struct { | |
| 1663 u_char size[4]; | |
| 1664 u_char name[4]; | |
| 1665 u_char version[1]; | |
| 1666 u_char flags[3]; | |
| 1667 u_char creation_time[8]; | |
| 1668 u_char modification_time[8]; | |
| 1669 u_char timescale[4]; | |
| 1670 u_char duration[8]; | |
| 1671 u_char language[2]; | |
| 1672 u_char quality[2]; | |
| 1673 } ngx_mp4_mdhd64_atom_t; | |
| 1674 | |
| 1675 | |
| 1676 static ngx_int_t | |
| 1677 ngx_http_mp4_read_mdhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 1678 { | |
| 1679 u_char *atom_header; | |
| 1680 size_t atom_size; | |
| 1681 uint32_t timescale; | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1682 uint64_t duration, start_time, length_time; |
| 4085 | 1683 ngx_buf_t *atom; |
| 1684 ngx_http_mp4_trak_t *trak; | |
| 1685 ngx_mp4_mdhd_atom_t *mdhd_atom; | |
| 1686 ngx_mp4_mdhd64_atom_t *mdhd64_atom; | |
| 1687 | |
| 1688 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mdhd atom"); | |
| 1689 | |
| 1690 atom_header = ngx_mp4_atom_header(mp4); | |
| 1691 mdhd_atom = (ngx_mp4_mdhd_atom_t *) atom_header; | |
| 1692 mdhd64_atom = (ngx_mp4_mdhd64_atom_t *) atom_header; | |
| 1693 ngx_mp4_set_atom_name(mdhd_atom, 'm', 'd', 'h', 'd'); | |
| 1694 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1695 if (ngx_mp4_atom_data_size(ngx_mp4_mdhd_atom_t) > atom_data_size) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1696 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1697 "\"%s\" mp4 mdhd atom too small", mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1698 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1699 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1700 |
| 4085 | 1701 if (mdhd_atom->version[0] == 0) { |
| 1702 /* version 0: everything is 32-bit */ | |
| 1703 timescale = ngx_mp4_get_32value(mdhd_atom->timescale); | |
| 1704 duration = ngx_mp4_get_32value(mdhd_atom->duration); | |
| 1705 | |
| 1706 } else { | |
| 1707 /* version 1: 64-bit duration and 32-bit timescale */ | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1708 |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1709 if (ngx_mp4_atom_data_size(ngx_mp4_mdhd64_atom_t) > atom_data_size) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1710 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1711 "\"%s\" mp4 mdhd atom too small", |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1712 mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1713 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1714 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
1715 |
| 4085 | 1716 timescale = ngx_mp4_get_32value(mdhd64_atom->timescale); |
| 1717 duration = ngx_mp4_get_64value(mdhd64_atom->duration); | |
| 1718 } | |
| 1719 | |
| 1720 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 1721 "mdhd timescale:%uD, duration:%uL, time:%.3fs", | |
| 1722 timescale, duration, (double) duration / timescale); | |
| 1723 | |
|
5543
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1724 start_time = (uint64_t) mp4->start * timescale / 1000; |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1725 |
|
5629
c7bbc5fcf27c
Mp4: fixed seeking to a track end.
Roman Arutyunyan <arut@nginx.com>
parents:
5622
diff
changeset
|
1726 if (duration <= start_time) { |
|
5543
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1727 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1728 "mdhd duration is less than start time"); |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1729 return NGX_DECLINED; |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1730 } |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1731 |
|
5730c0193842
Mp4: skip tracks shorter than seek position (ticket #414).
Roman Arutyunyan <arut@nginx.com>
parents:
5542
diff
changeset
|
1732 duration -= start_time; |
| 4085 | 1733 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1734 if (mp4->length) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1735 length_time = (uint64_t) mp4->length * timescale / 1000; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1736 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1737 if (duration > length_time) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1738 duration = length_time; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1739 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1740 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
1741 |
| 4085 | 1742 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
| 1743 "mdhd new duration:%uL, time:%.3fs", | |
| 1744 duration, (double) duration / timescale); | |
| 1745 | |
| 1746 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; | |
| 1747 | |
| 1748 trak = ngx_mp4_last_trak(mp4); | |
| 1749 trak->mdhd_size = atom_size; | |
| 1750 trak->timescale = timescale; | |
| 1751 | |
| 1752 ngx_mp4_set_32value(mdhd_atom->size, atom_size); | |
| 1753 | |
| 1754 if (mdhd_atom->version[0] == 0) { | |
| 1755 ngx_mp4_set_32value(mdhd_atom->duration, duration); | |
| 1756 | |
| 1757 } else { | |
| 1758 ngx_mp4_set_64value(mdhd64_atom->duration, duration); | |
| 1759 } | |
| 1760 | |
| 1761 atom = &trak->mdhd_atom_buf; | |
| 1762 atom->temporary = 1; | |
| 1763 atom->pos = atom_header; | |
| 1764 atom->last = atom_header + atom_size; | |
| 1765 | |
| 1766 trak->out[NGX_HTTP_MP4_MDHD_ATOM].buf = atom; | |
| 1767 | |
| 1768 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 1769 | |
| 1770 return NGX_OK; | |
| 1771 } | |
| 1772 | |
| 1773 | |
| 1774 static ngx_int_t | |
| 1775 ngx_http_mp4_read_hdlr_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 1776 { | |
| 1777 u_char *atom_header; | |
| 1778 size_t atom_size; | |
| 1779 ngx_buf_t *atom; | |
| 1780 ngx_http_mp4_trak_t *trak; | |
| 1781 | |
| 1782 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 hdlr atom"); | |
| 1783 | |
| 1784 atom_header = ngx_mp4_atom_header(mp4); | |
| 1785 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; | |
| 1786 ngx_mp4_set_32value(atom_header, atom_size); | |
| 1787 ngx_mp4_set_atom_name(atom_header, 'h', 'd', 'l', 'r'); | |
| 1788 | |
| 1789 trak = ngx_mp4_last_trak(mp4); | |
| 1790 | |
| 1791 atom = &trak->hdlr_atom_buf; | |
| 1792 atom->temporary = 1; | |
| 1793 atom->pos = atom_header; | |
| 1794 atom->last = atom_header + atom_size; | |
| 1795 | |
| 1796 trak->hdlr_size = atom_size; | |
| 1797 trak->out[NGX_HTTP_MP4_HDLR_ATOM].buf = atom; | |
| 1798 | |
| 1799 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 1800 | |
| 1801 return NGX_OK; | |
| 1802 } | |
| 1803 | |
| 1804 | |
| 1805 static ngx_int_t | |
| 1806 ngx_http_mp4_read_minf_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 1807 { | |
| 1808 u_char *atom_header; | |
| 1809 ngx_buf_t *atom; | |
| 1810 ngx_http_mp4_trak_t *trak; | |
| 1811 | |
| 1812 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "process minf atom"); | |
| 1813 | |
| 1814 atom_header = ngx_mp4_atom_header(mp4); | |
| 1815 ngx_mp4_set_atom_name(atom_header, 'm', 'i', 'n', 'f'); | |
| 1816 | |
| 1817 trak = ngx_mp4_last_trak(mp4); | |
| 1818 | |
| 1819 atom = &trak->minf_atom_buf; | |
| 1820 atom->temporary = 1; | |
| 1821 atom->pos = atom_header; | |
| 1822 atom->last = atom_header + sizeof(ngx_mp4_atom_header_t); | |
| 1823 | |
| 1824 trak->out[NGX_HTTP_MP4_MINF_ATOM].buf = atom; | |
| 1825 | |
| 1826 return ngx_http_mp4_read_atom(mp4, ngx_http_mp4_minf_atoms, atom_data_size); | |
| 1827 } | |
| 1828 | |
| 1829 | |
| 1830 static void | |
| 1831 ngx_http_mp4_update_minf_atom(ngx_http_mp4_file_t *mp4, | |
| 1832 ngx_http_mp4_trak_t *trak) | |
| 1833 { | |
| 1834 ngx_buf_t *atom; | |
| 1835 | |
| 1836 trak->size += sizeof(ngx_mp4_atom_header_t) | |
| 1837 + trak->vmhd_size | |
| 1838 + trak->smhd_size | |
| 1839 + trak->dinf_size; | |
| 1840 atom = &trak->minf_atom_buf; | |
| 1841 ngx_mp4_set_32value(atom->pos, trak->size); | |
| 1842 } | |
| 1843 | |
| 1844 | |
| 1845 static ngx_int_t | |
| 1846 ngx_http_mp4_read_vmhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 1847 { | |
| 1848 u_char *atom_header; | |
| 1849 size_t atom_size; | |
| 1850 ngx_buf_t *atom; | |
| 1851 ngx_http_mp4_trak_t *trak; | |
| 1852 | |
| 1853 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 vmhd atom"); | |
| 1854 | |
| 1855 atom_header = ngx_mp4_atom_header(mp4); | |
| 1856 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; | |
| 1857 ngx_mp4_set_32value(atom_header, atom_size); | |
| 1858 ngx_mp4_set_atom_name(atom_header, 'v', 'm', 'h', 'd'); | |
| 1859 | |
| 1860 trak = ngx_mp4_last_trak(mp4); | |
| 1861 | |
| 1862 atom = &trak->vmhd_atom_buf; | |
| 1863 atom->temporary = 1; | |
| 1864 atom->pos = atom_header; | |
| 1865 atom->last = atom_header + atom_size; | |
| 1866 | |
| 1867 trak->vmhd_size += atom_size; | |
| 1868 trak->out[NGX_HTTP_MP4_VMHD_ATOM].buf = atom; | |
| 1869 | |
| 1870 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 1871 | |
| 1872 return NGX_OK; | |
| 1873 } | |
| 1874 | |
| 1875 | |
| 1876 static ngx_int_t | |
| 1877 ngx_http_mp4_read_smhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 1878 { | |
| 1879 u_char *atom_header; | |
| 1880 size_t atom_size; | |
| 1881 ngx_buf_t *atom; | |
| 1882 ngx_http_mp4_trak_t *trak; | |
| 1883 | |
| 1884 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 smhd atom"); | |
| 1885 | |
| 1886 atom_header = ngx_mp4_atom_header(mp4); | |
| 1887 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; | |
| 1888 ngx_mp4_set_32value(atom_header, atom_size); | |
| 1889 ngx_mp4_set_atom_name(atom_header, 's', 'm', 'h', 'd'); | |
| 1890 | |
| 1891 trak = ngx_mp4_last_trak(mp4); | |
| 1892 | |
| 1893 atom = &trak->smhd_atom_buf; | |
| 1894 atom->temporary = 1; | |
| 1895 atom->pos = atom_header; | |
| 1896 atom->last = atom_header + atom_size; | |
| 1897 | |
|
5807
6d468b45f40e
Mp4: use trak->smhd_size in ngx_http_mp4_read_smhd_atom().
Roman Arutyunyan <arut@nginx.com>
parents:
5638
diff
changeset
|
1898 trak->smhd_size += atom_size; |
| 4085 | 1899 trak->out[NGX_HTTP_MP4_SMHD_ATOM].buf = atom; |
| 1900 | |
| 1901 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 1902 | |
| 1903 return NGX_OK; | |
| 1904 } | |
| 1905 | |
| 1906 | |
| 1907 static ngx_int_t | |
| 1908 ngx_http_mp4_read_dinf_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 1909 { | |
| 1910 u_char *atom_header; | |
| 1911 size_t atom_size; | |
| 1912 ngx_buf_t *atom; | |
| 1913 ngx_http_mp4_trak_t *trak; | |
| 1914 | |
| 1915 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 dinf atom"); | |
| 1916 | |
| 1917 atom_header = ngx_mp4_atom_header(mp4); | |
| 1918 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; | |
| 1919 ngx_mp4_set_32value(atom_header, atom_size); | |
| 1920 ngx_mp4_set_atom_name(atom_header, 'd', 'i', 'n', 'f'); | |
| 1921 | |
| 1922 trak = ngx_mp4_last_trak(mp4); | |
| 1923 | |
| 1924 atom = &trak->dinf_atom_buf; | |
| 1925 atom->temporary = 1; | |
| 1926 atom->pos = atom_header; | |
| 1927 atom->last = atom_header + atom_size; | |
| 1928 | |
| 1929 trak->dinf_size += atom_size; | |
| 1930 trak->out[NGX_HTTP_MP4_DINF_ATOM].buf = atom; | |
| 1931 | |
| 1932 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 1933 | |
| 1934 return NGX_OK; | |
| 1935 } | |
| 1936 | |
| 1937 | |
| 1938 static ngx_int_t | |
| 1939 ngx_http_mp4_read_stbl_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 1940 { | |
| 1941 u_char *atom_header; | |
| 1942 ngx_buf_t *atom; | |
| 1943 ngx_http_mp4_trak_t *trak; | |
| 1944 | |
| 1945 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "process stbl atom"); | |
| 1946 | |
| 1947 atom_header = ngx_mp4_atom_header(mp4); | |
| 1948 ngx_mp4_set_atom_name(atom_header, 's', 't', 'b', 'l'); | |
| 1949 | |
| 1950 trak = ngx_mp4_last_trak(mp4); | |
| 1951 | |
| 1952 atom = &trak->stbl_atom_buf; | |
| 1953 atom->temporary = 1; | |
| 1954 atom->pos = atom_header; | |
| 1955 atom->last = atom_header + sizeof(ngx_mp4_atom_header_t); | |
| 1956 | |
| 1957 trak->out[NGX_HTTP_MP4_STBL_ATOM].buf = atom; | |
| 1958 | |
| 1959 return ngx_http_mp4_read_atom(mp4, ngx_http_mp4_stbl_atoms, atom_data_size); | |
| 1960 } | |
| 1961 | |
| 1962 | |
| 1963 static void | |
| 1964 ngx_http_mp4_update_stbl_atom(ngx_http_mp4_file_t *mp4, | |
| 1965 ngx_http_mp4_trak_t *trak) | |
| 1966 { | |
| 1967 ngx_buf_t *atom; | |
| 1968 | |
| 1969 trak->size += sizeof(ngx_mp4_atom_header_t); | |
| 1970 atom = &trak->stbl_atom_buf; | |
| 1971 ngx_mp4_set_32value(atom->pos, trak->size); | |
| 1972 } | |
| 1973 | |
| 1974 | |
| 1975 typedef struct { | |
| 1976 u_char size[4]; | |
| 1977 u_char name[4]; | |
| 1978 u_char version[1]; | |
| 1979 u_char flags[3]; | |
| 1980 u_char entries[4]; | |
|
4099
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1981 |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1982 u_char media_size[4]; |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
1983 u_char media_name[4]; |
| 4085 | 1984 } ngx_mp4_stsd_atom_t; |
| 1985 | |
| 1986 | |
| 1987 static ngx_int_t | |
| 1988 ngx_http_mp4_read_stsd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 1989 { | |
| 1990 u_char *atom_header, *atom_table; | |
| 1991 size_t atom_size; | |
| 1992 ngx_buf_t *atom; | |
| 1993 ngx_mp4_stsd_atom_t *stsd_atom; | |
| 1994 ngx_http_mp4_trak_t *trak; | |
| 1995 | |
| 1996 /* sample description atom */ | |
| 1997 | |
| 1998 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 stsd atom"); | |
| 1999 | |
| 2000 atom_header = ngx_mp4_atom_header(mp4); | |
| 2001 stsd_atom = (ngx_mp4_stsd_atom_t *) atom_header; | |
| 2002 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; | |
| 2003 atom_table = atom_header + atom_size; | |
| 2004 ngx_mp4_set_32value(stsd_atom->size, atom_size); | |
| 2005 ngx_mp4_set_atom_name(stsd_atom, 's', 't', 's', 'd'); | |
| 2006 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2007 if (ngx_mp4_atom_data_size(ngx_mp4_stsd_atom_t) > atom_data_size) { |
|
4099
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
2008 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2009 "\"%s\" mp4 stsd atom too small", mp4->file.name.data); |
|
4099
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
2010 return NGX_ERROR; |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
2011 } |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
2012 |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
2013 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
2014 "stsd entries:%uD, media:%*s", |
|
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
2015 ngx_mp4_get_32value(stsd_atom->entries), |
|
6478
3ef7bb882ad4
Fixed logging with variable field width.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6474
diff
changeset
|
2016 (size_t) 4, stsd_atom->media_name); |
|
4099
9ee6944590c0
Skipping traks with unsupported media formats.
Igor Sysoev <igor@sysoev.ru>
parents:
4098
diff
changeset
|
2017 |
| 4085 | 2018 trak = ngx_mp4_last_trak(mp4); |
| 2019 | |
| 2020 atom = &trak->stsd_atom_buf; | |
| 2021 atom->temporary = 1; | |
| 2022 atom->pos = atom_header; | |
| 2023 atom->last = atom_table; | |
| 2024 | |
| 2025 trak->out[NGX_HTTP_MP4_STSD_ATOM].buf = atom; | |
| 2026 trak->size += atom_size; | |
| 2027 | |
| 2028 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 2029 | |
| 2030 return NGX_OK; | |
| 2031 } | |
| 2032 | |
| 2033 | |
| 2034 typedef struct { | |
| 2035 u_char size[4]; | |
| 2036 u_char name[4]; | |
| 2037 u_char version[1]; | |
| 2038 u_char flags[3]; | |
| 2039 u_char entries[4]; | |
| 2040 } ngx_mp4_stts_atom_t; | |
| 2041 | |
| 2042 typedef struct { | |
| 2043 u_char count[4]; | |
| 2044 u_char duration[4]; | |
| 2045 } ngx_mp4_stts_entry_t; | |
| 2046 | |
| 2047 | |
| 2048 static ngx_int_t | |
| 2049 ngx_http_mp4_read_stts_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 2050 { | |
| 2051 u_char *atom_header, *atom_table, *atom_end; | |
| 2052 uint32_t entries; | |
| 2053 ngx_buf_t *atom, *data; | |
| 2054 ngx_mp4_stts_atom_t *stts_atom; | |
| 2055 ngx_http_mp4_trak_t *trak; | |
| 2056 | |
| 2057 /* time-to-sample atom */ | |
| 2058 | |
| 2059 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 stts atom"); | |
| 2060 | |
| 2061 atom_header = ngx_mp4_atom_header(mp4); | |
| 2062 stts_atom = (ngx_mp4_stts_atom_t *) atom_header; | |
| 2063 ngx_mp4_set_atom_name(stts_atom, 's', 't', 't', 's'); | |
| 2064 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2065 if (ngx_mp4_atom_data_size(ngx_mp4_stts_atom_t) > atom_data_size) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2066 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2067 "\"%s\" mp4 stts atom too small", mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2068 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2069 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2070 |
| 4085 | 2071 entries = ngx_mp4_get_32value(stts_atom->entries); |
| 2072 | |
| 2073 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 4096 | 2074 "mp4 time-to-sample entries:%uD", entries); |
| 4085 | 2075 |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2076 if (ngx_mp4_atom_data_size(ngx_mp4_stts_atom_t) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2077 + entries * sizeof(ngx_mp4_stts_entry_t) > atom_data_size) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2078 { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2079 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2080 "\"%s\" mp4 stts atom too small", mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2081 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2082 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2083 |
| 4085 | 2084 atom_table = atom_header + sizeof(ngx_mp4_stts_atom_t); |
| 2085 atom_end = atom_table + entries * sizeof(ngx_mp4_stts_entry_t); | |
| 2086 | |
| 2087 trak = ngx_mp4_last_trak(mp4); | |
| 2088 trak->time_to_sample_entries = entries; | |
| 2089 | |
| 2090 atom = &trak->stts_atom_buf; | |
| 2091 atom->temporary = 1; | |
| 2092 atom->pos = atom_header; | |
| 2093 atom->last = atom_table; | |
| 2094 | |
| 2095 data = &trak->stts_data_buf; | |
| 2096 data->temporary = 1; | |
| 2097 data->pos = atom_table; | |
| 2098 data->last = atom_end; | |
| 2099 | |
| 2100 trak->out[NGX_HTTP_MP4_STTS_ATOM].buf = atom; | |
| 2101 trak->out[NGX_HTTP_MP4_STTS_DATA].buf = data; | |
| 2102 | |
| 2103 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 2104 | |
| 2105 return NGX_OK; | |
| 2106 } | |
| 2107 | |
| 2108 | |
| 2109 static ngx_int_t | |
| 2110 ngx_http_mp4_update_stts_atom(ngx_http_mp4_file_t *mp4, | |
| 2111 ngx_http_mp4_trak_t *trak) | |
| 2112 { | |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2113 size_t atom_size; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2114 ngx_buf_t *atom, *data; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2115 ngx_mp4_stts_atom_t *stts_atom; |
| 4085 | 2116 |
| 2117 /* | |
| 2118 * mdia.minf.stbl.stts updating requires trak->timescale | |
| 2119 * from mdia.mdhd atom which may reside after mdia.minf | |
| 2120 */ | |
| 2121 | |
| 2122 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 2123 "mp4 stts atom update"); | |
| 2124 | |
| 2125 data = trak->out[NGX_HTTP_MP4_STTS_DATA].buf; | |
| 2126 | |
| 2127 if (data == NULL) { | |
| 2128 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, | |
| 2129 "no mp4 stts atoms were found in \"%s\"", | |
| 2130 mp4->file.name.data); | |
| 2131 return NGX_ERROR; | |
| 2132 } | |
| 2133 | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2134 if (ngx_http_mp4_crop_stts_data(mp4, trak, 1) != NGX_OK) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2135 return NGX_ERROR; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2136 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2137 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2138 if (ngx_http_mp4_crop_stts_data(mp4, trak, 0) != NGX_OK) { |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2139 return NGX_ERROR; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2140 } |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2141 |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2142 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2143 "time-to-sample entries:%uD", trak->time_to_sample_entries); |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2144 |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2145 atom_size = sizeof(ngx_mp4_stts_atom_t) + (data->last - data->pos); |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2146 trak->size += atom_size; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2147 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2148 atom = trak->out[NGX_HTTP_MP4_STTS_ATOM].buf; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2149 stts_atom = (ngx_mp4_stts_atom_t *) atom->pos; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2150 ngx_mp4_set_32value(stts_atom->size, atom_size); |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2151 ngx_mp4_set_32value(stts_atom->entries, trak->time_to_sample_entries); |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2152 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2153 return NGX_OK; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2154 } |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2155 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2156 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2157 static ngx_int_t |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2158 ngx_http_mp4_crop_stts_data(ngx_http_mp4_file_t *mp4, |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2159 ngx_http_mp4_trak_t *trak, ngx_uint_t start) |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2160 { |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2161 uint32_t count, duration, rest; |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2162 uint64_t start_time; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2163 ngx_buf_t *data; |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2164 ngx_uint_t start_sample, entries, start_sec; |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2165 ngx_mp4_stts_entry_t *entry, *end; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2166 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2167 if (start) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2168 start_sec = mp4->start; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2169 |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2170 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2171 "mp4 stts crop start_time:%ui", start_sec); |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2172 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2173 } else if (mp4->length) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2174 start_sec = mp4->length; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2175 |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2176 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2177 "mp4 stts crop end_time:%ui", start_sec); |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2178 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2179 } else { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2180 return NGX_OK; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2181 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2182 |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2183 data = trak->out[NGX_HTTP_MP4_STTS_DATA].buf; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2184 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2185 start_time = (uint64_t) start_sec * trak->timescale / 1000; |
| 4085 | 2186 |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2187 entries = trak->time_to_sample_entries; |
| 4085 | 2188 start_sample = 0; |
| 2189 entry = (ngx_mp4_stts_entry_t *) data->pos; | |
| 2190 end = (ngx_mp4_stts_entry_t *) data->last; | |
| 2191 | |
| 2192 while (entry < end) { | |
| 2193 count = ngx_mp4_get_32value(entry->count); | |
| 2194 duration = ngx_mp4_get_32value(entry->duration); | |
| 2195 | |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2196 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2197 "time:%uL, count:%uD, duration:%uD", |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2198 start_time, count, duration); |
| 4085 | 2199 |
| 4306 | 2200 if (start_time < (uint64_t) count * duration) { |
| 4085 | 2201 start_sample += (ngx_uint_t) (start_time / duration); |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2202 rest = (uint32_t) (start_time / duration); |
| 4085 | 2203 goto found; |
| 2204 } | |
| 2205 | |
| 2206 start_sample += count; | |
| 2207 start_time -= count * duration; | |
| 2208 entries--; | |
| 2209 entry++; | |
| 2210 } | |
| 2211 | |
|
5638
0c0dd1aacdf5
Mp4: allow end values bigger than track duration.
Roman Arutyunyan <arut@nginx.com>
parents:
5630
diff
changeset
|
2212 if (start) { |
|
0c0dd1aacdf5
Mp4: allow end values bigger than track duration.
Roman Arutyunyan <arut@nginx.com>
parents:
5630
diff
changeset
|
2213 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
0c0dd1aacdf5
Mp4: allow end values bigger than track duration.
Roman Arutyunyan <arut@nginx.com>
parents:
5630
diff
changeset
|
2214 "start time is out mp4 stts samples in \"%s\"", |
|
0c0dd1aacdf5
Mp4: allow end values bigger than track duration.
Roman Arutyunyan <arut@nginx.com>
parents:
5630
diff
changeset
|
2215 mp4->file.name.data); |
|
0c0dd1aacdf5
Mp4: allow end values bigger than track duration.
Roman Arutyunyan <arut@nginx.com>
parents:
5630
diff
changeset
|
2216 |
|
0c0dd1aacdf5
Mp4: allow end values bigger than track duration.
Roman Arutyunyan <arut@nginx.com>
parents:
5630
diff
changeset
|
2217 return NGX_ERROR; |
|
0c0dd1aacdf5
Mp4: allow end values bigger than track duration.
Roman Arutyunyan <arut@nginx.com>
parents:
5630
diff
changeset
|
2218 |
|
0c0dd1aacdf5
Mp4: allow end values bigger than track duration.
Roman Arutyunyan <arut@nginx.com>
parents:
5630
diff
changeset
|
2219 } else { |
|
0c0dd1aacdf5
Mp4: allow end values bigger than track duration.
Roman Arutyunyan <arut@nginx.com>
parents:
5630
diff
changeset
|
2220 trak->end_sample = trak->start_sample + start_sample; |
|
0c0dd1aacdf5
Mp4: allow end values bigger than track duration.
Roman Arutyunyan <arut@nginx.com>
parents:
5630
diff
changeset
|
2221 |
|
0c0dd1aacdf5
Mp4: allow end values bigger than track duration.
Roman Arutyunyan <arut@nginx.com>
parents:
5630
diff
changeset
|
2222 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
0c0dd1aacdf5
Mp4: allow end values bigger than track duration.
Roman Arutyunyan <arut@nginx.com>
parents:
5630
diff
changeset
|
2223 "end_sample:%ui", trak->end_sample); |
|
0c0dd1aacdf5
Mp4: allow end values bigger than track duration.
Roman Arutyunyan <arut@nginx.com>
parents:
5630
diff
changeset
|
2224 |
|
0c0dd1aacdf5
Mp4: allow end values bigger than track duration.
Roman Arutyunyan <arut@nginx.com>
parents:
5630
diff
changeset
|
2225 return NGX_OK; |
|
0c0dd1aacdf5
Mp4: allow end values bigger than track duration.
Roman Arutyunyan <arut@nginx.com>
parents:
5630
diff
changeset
|
2226 } |
| 4085 | 2227 |
| 2228 found: | |
| 2229 | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2230 if (start) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2231 ngx_mp4_set_32value(entry->count, count - rest); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2232 data->pos = (u_char *) entry; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2233 trak->time_to_sample_entries = entries; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2234 trak->start_sample = start_sample; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2235 |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2236 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2237 "start_sample:%ui, new count:%uD", |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2238 trak->start_sample, count - rest); |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2239 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2240 } else { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2241 ngx_mp4_set_32value(entry->count, rest); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2242 data->last = (u_char *) (entry + 1); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2243 trak->time_to_sample_entries -= entries - 1; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2244 trak->end_sample = trak->start_sample + start_sample; |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2245 |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2246 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2247 "end_sample:%ui, new count:%uD", |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2248 trak->end_sample, rest); |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2249 } |
| 4085 | 2250 |
| 2251 return NGX_OK; | |
| 2252 } | |
| 2253 | |
| 2254 | |
| 2255 typedef struct { | |
| 2256 u_char size[4]; | |
| 2257 u_char name[4]; | |
| 2258 u_char version[1]; | |
| 2259 u_char flags[3]; | |
| 2260 u_char entries[4]; | |
| 2261 } ngx_http_mp4_stss_atom_t; | |
| 2262 | |
| 2263 | |
| 2264 static ngx_int_t | |
| 2265 ngx_http_mp4_read_stss_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 2266 { | |
| 2267 u_char *atom_header, *atom_table, *atom_end; | |
| 2268 uint32_t entries; | |
| 2269 ngx_buf_t *atom, *data; | |
| 2270 ngx_http_mp4_trak_t *trak; | |
| 2271 ngx_http_mp4_stss_atom_t *stss_atom; | |
| 2272 | |
| 2273 /* sync samples atom */ | |
| 2274 | |
| 2275 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 stss atom"); | |
| 2276 | |
| 2277 atom_header = ngx_mp4_atom_header(mp4); | |
| 2278 stss_atom = (ngx_http_mp4_stss_atom_t *) atom_header; | |
| 2279 ngx_mp4_set_atom_name(stss_atom, 's', 't', 's', 's'); | |
| 2280 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2281 if (ngx_mp4_atom_data_size(ngx_http_mp4_stss_atom_t) > atom_data_size) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2282 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2283 "\"%s\" mp4 stss atom too small", mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2284 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2285 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2286 |
| 4085 | 2287 entries = ngx_mp4_get_32value(stss_atom->entries); |
| 2288 | |
| 2289 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 4096 | 2290 "sync sample entries:%uD", entries); |
| 4085 | 2291 |
| 2292 trak = ngx_mp4_last_trak(mp4); | |
| 2293 trak->sync_samples_entries = entries; | |
| 2294 | |
| 2295 atom_table = atom_header + sizeof(ngx_http_mp4_stss_atom_t); | |
| 2296 | |
| 2297 atom = &trak->stss_atom_buf; | |
| 2298 atom->temporary = 1; | |
| 2299 atom->pos = atom_header; | |
| 2300 atom->last = atom_table; | |
| 2301 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2302 if (ngx_mp4_atom_data_size(ngx_http_mp4_stss_atom_t) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2303 + entries * sizeof(uint32_t) > atom_data_size) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2304 { |
| 4085 | 2305 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2306 "\"%s\" mp4 stss atom too small", mp4->file.name.data); |
| 4085 | 2307 return NGX_ERROR; |
| 2308 } | |
| 2309 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2310 atom_end = atom_table + entries * sizeof(uint32_t); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2311 |
| 4085 | 2312 data = &trak->stss_data_buf; |
| 2313 data->temporary = 1; | |
| 2314 data->pos = atom_table; | |
| 2315 data->last = atom_end; | |
| 2316 | |
| 2317 trak->out[NGX_HTTP_MP4_STSS_ATOM].buf = atom; | |
| 2318 trak->out[NGX_HTTP_MP4_STSS_DATA].buf = data; | |
| 2319 | |
| 2320 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 2321 | |
| 2322 return NGX_OK; | |
| 2323 } | |
| 2324 | |
| 2325 | |
| 2326 static ngx_int_t | |
| 2327 ngx_http_mp4_update_stss_atom(ngx_http_mp4_file_t *mp4, | |
| 2328 ngx_http_mp4_trak_t *trak) | |
| 2329 { | |
| 2330 size_t atom_size; | |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2331 uint32_t sample, start_sample, *entry, *end; |
| 4085 | 2332 ngx_buf_t *atom, *data; |
| 2333 ngx_http_mp4_stss_atom_t *stss_atom; | |
| 2334 | |
| 2335 /* | |
| 2336 * mdia.minf.stbl.stss updating requires trak->start_sample | |
| 2337 * from mdia.minf.stbl.stts which depends on value from mdia.mdhd | |
| 2338 * atom which may reside after mdia.minf | |
| 2339 */ | |
| 2340 | |
| 2341 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 2342 "mp4 stss atom update"); | |
| 2343 | |
| 2344 data = trak->out[NGX_HTTP_MP4_STSS_DATA].buf; | |
| 2345 | |
| 2346 if (data == NULL) { | |
| 2347 return NGX_OK; | |
| 2348 } | |
| 2349 | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2350 ngx_http_mp4_crop_stss_data(mp4, trak, 1); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2351 ngx_http_mp4_crop_stss_data(mp4, trak, 0); |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2352 |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2353 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2354 "sync sample entries:%uD", trak->sync_samples_entries); |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2355 |
|
5622
a23c35496c2f
Mp4: skipped empty stss atom table in output.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5621
diff
changeset
|
2356 if (trak->sync_samples_entries) { |
|
a23c35496c2f
Mp4: skipped empty stss atom table in output.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5621
diff
changeset
|
2357 entry = (uint32_t *) data->pos; |
|
a23c35496c2f
Mp4: skipped empty stss atom table in output.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5621
diff
changeset
|
2358 end = (uint32_t *) data->last; |
|
a23c35496c2f
Mp4: skipped empty stss atom table in output.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5621
diff
changeset
|
2359 |
|
a23c35496c2f
Mp4: skipped empty stss atom table in output.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5621
diff
changeset
|
2360 start_sample = trak->start_sample; |
|
a23c35496c2f
Mp4: skipped empty stss atom table in output.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5621
diff
changeset
|
2361 |
|
a23c35496c2f
Mp4: skipped empty stss atom table in output.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5621
diff
changeset
|
2362 while (entry < end) { |
|
a23c35496c2f
Mp4: skipped empty stss atom table in output.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5621
diff
changeset
|
2363 sample = ngx_mp4_get_32value(entry); |
|
a23c35496c2f
Mp4: skipped empty stss atom table in output.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5621
diff
changeset
|
2364 sample -= start_sample; |
|
a23c35496c2f
Mp4: skipped empty stss atom table in output.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5621
diff
changeset
|
2365 ngx_mp4_set_32value(entry, sample); |
|
a23c35496c2f
Mp4: skipped empty stss atom table in output.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5621
diff
changeset
|
2366 entry++; |
|
a23c35496c2f
Mp4: skipped empty stss atom table in output.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5621
diff
changeset
|
2367 } |
|
a23c35496c2f
Mp4: skipped empty stss atom table in output.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5621
diff
changeset
|
2368 |
|
a23c35496c2f
Mp4: skipped empty stss atom table in output.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5621
diff
changeset
|
2369 } else { |
|
a23c35496c2f
Mp4: skipped empty stss atom table in output.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5621
diff
changeset
|
2370 trak->out[NGX_HTTP_MP4_STSS_DATA].buf = NULL; |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2371 } |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2372 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2373 atom_size = sizeof(ngx_http_mp4_stss_atom_t) + (data->last - data->pos); |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2374 trak->size += atom_size; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2375 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2376 atom = trak->out[NGX_HTTP_MP4_STSS_ATOM].buf; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2377 stss_atom = (ngx_http_mp4_stss_atom_t *) atom->pos; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2378 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2379 ngx_mp4_set_32value(stss_atom->size, atom_size); |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2380 ngx_mp4_set_32value(stss_atom->entries, trak->sync_samples_entries); |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2381 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2382 return NGX_OK; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2383 } |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2384 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2385 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2386 static void |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2387 ngx_http_mp4_crop_stss_data(ngx_http_mp4_file_t *mp4, |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2388 ngx_http_mp4_trak_t *trak, ngx_uint_t start) |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2389 { |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2390 uint32_t sample, start_sample, *entry, *end; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2391 ngx_buf_t *data; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2392 ngx_uint_t entries; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2393 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2394 /* sync samples starts from 1 */ |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2395 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2396 if (start) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2397 start_sample = trak->start_sample + 1; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2398 |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2399 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2400 "mp4 stss crop start_sample:%uD", start_sample); |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2401 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2402 } else if (mp4->length) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2403 start_sample = trak->end_sample + 1; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2404 |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2405 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2406 "mp4 stss crop end_sample:%uD", start_sample); |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2407 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2408 } else { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2409 return; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2410 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2411 |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2412 data = trak->out[NGX_HTTP_MP4_STSS_DATA].buf; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2413 |
| 4085 | 2414 entries = trak->sync_samples_entries; |
| 2415 entry = (uint32_t *) data->pos; | |
| 2416 end = (uint32_t *) data->last; | |
| 2417 | |
| 2418 while (entry < end) { | |
| 2419 sample = ngx_mp4_get_32value(entry); | |
| 2420 | |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2421 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2422 "sync:%uD", sample); |
| 4085 | 2423 |
| 2424 if (sample >= start_sample) { | |
| 2425 goto found; | |
| 2426 } | |
| 2427 | |
| 2428 entries--; | |
| 2429 entry++; | |
| 2430 } | |
| 2431 | |
|
5542
847c308917af
Mp4: fix seeks after the last key frame.
Roman Arutyunyan <arut@nginx.com>
parents:
5496
diff
changeset
|
2432 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2433 "sample is out of mp4 stss atom"); |
| 4085 | 2434 |
| 2435 found: | |
| 2436 | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2437 if (start) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2438 data->pos = (u_char *) entry; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2439 trak->sync_samples_entries = entries; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2440 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2441 } else { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2442 data->last = (u_char *) entry; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2443 trak->sync_samples_entries -= entries; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2444 } |
| 4085 | 2445 } |
| 2446 | |
| 2447 | |
| 2448 typedef struct { | |
| 2449 u_char size[4]; | |
| 2450 u_char name[4]; | |
| 2451 u_char version[1]; | |
| 2452 u_char flags[3]; | |
| 2453 u_char entries[4]; | |
| 2454 } ngx_mp4_ctts_atom_t; | |
| 2455 | |
| 2456 typedef struct { | |
| 2457 u_char count[4]; | |
| 2458 u_char offset[4]; | |
| 2459 } ngx_mp4_ctts_entry_t; | |
| 2460 | |
| 2461 | |
| 2462 static ngx_int_t | |
| 2463 ngx_http_mp4_read_ctts_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 2464 { | |
| 2465 u_char *atom_header, *atom_table, *atom_end; | |
| 2466 uint32_t entries; | |
| 2467 ngx_buf_t *atom, *data; | |
| 2468 ngx_mp4_ctts_atom_t *ctts_atom; | |
| 2469 ngx_http_mp4_trak_t *trak; | |
| 2470 | |
| 2471 /* composition offsets atom */ | |
| 2472 | |
| 2473 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 ctts atom"); | |
| 2474 | |
| 2475 atom_header = ngx_mp4_atom_header(mp4); | |
| 2476 ctts_atom = (ngx_mp4_ctts_atom_t *) atom_header; | |
| 2477 ngx_mp4_set_atom_name(ctts_atom, 'c', 't', 't', 's'); | |
| 2478 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2479 if (ngx_mp4_atom_data_size(ngx_mp4_ctts_atom_t) > atom_data_size) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2480 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2481 "\"%s\" mp4 ctts atom too small", mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2482 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2483 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2484 |
| 4085 | 2485 entries = ngx_mp4_get_32value(ctts_atom->entries); |
| 2486 | |
| 2487 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 4096 | 2488 "composition offset entries:%uD", entries); |
| 4085 | 2489 |
| 2490 trak = ngx_mp4_last_trak(mp4); | |
| 2491 trak->composition_offset_entries = entries; | |
| 2492 | |
| 2493 atom_table = atom_header + sizeof(ngx_mp4_ctts_atom_t); | |
| 2494 | |
| 2495 atom = &trak->ctts_atom_buf; | |
| 2496 atom->temporary = 1; | |
| 2497 atom->pos = atom_header; | |
| 2498 atom->last = atom_table; | |
| 2499 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2500 if (ngx_mp4_atom_data_size(ngx_mp4_ctts_atom_t) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2501 + entries * sizeof(ngx_mp4_ctts_entry_t) > atom_data_size) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2502 { |
| 4085 | 2503 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2504 "\"%s\" mp4 ctts atom too small", mp4->file.name.data); |
| 4085 | 2505 return NGX_ERROR; |
| 2506 } | |
| 2507 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2508 atom_end = atom_table + entries * sizeof(ngx_mp4_ctts_entry_t); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2509 |
| 4085 | 2510 data = &trak->ctts_data_buf; |
| 2511 data->temporary = 1; | |
| 2512 data->pos = atom_table; | |
| 2513 data->last = atom_end; | |
| 2514 | |
| 2515 trak->out[NGX_HTTP_MP4_CTTS_ATOM].buf = atom; | |
| 2516 trak->out[NGX_HTTP_MP4_CTTS_DATA].buf = data; | |
| 2517 | |
| 2518 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 2519 | |
| 2520 return NGX_OK; | |
| 2521 } | |
| 2522 | |
| 2523 | |
| 2524 static void | |
| 2525 ngx_http_mp4_update_ctts_atom(ngx_http_mp4_file_t *mp4, | |
| 2526 ngx_http_mp4_trak_t *trak) | |
| 2527 { | |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2528 size_t atom_size; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2529 ngx_buf_t *atom, *data; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2530 ngx_mp4_ctts_atom_t *ctts_atom; |
| 4085 | 2531 |
| 2532 /* | |
| 2533 * mdia.minf.stbl.ctts updating requires trak->start_sample | |
| 2534 * from mdia.minf.stbl.stts which depends on value from mdia.mdhd | |
| 2535 * atom which may reside after mdia.minf | |
| 2536 */ | |
| 2537 | |
| 2538 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 2539 "mp4 ctts atom update"); | |
| 2540 | |
| 2541 data = trak->out[NGX_HTTP_MP4_CTTS_DATA].buf; | |
| 2542 | |
| 2543 if (data == NULL) { | |
| 2544 return; | |
| 2545 } | |
| 2546 | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2547 ngx_http_mp4_crop_ctts_data(mp4, trak, 1); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2548 ngx_http_mp4_crop_ctts_data(mp4, trak, 0); |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2549 |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2550 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2551 "composition offset entries:%uD", |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2552 trak->composition_offset_entries); |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2553 |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2554 if (trak->composition_offset_entries == 0) { |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2555 trak->out[NGX_HTTP_MP4_CTTS_ATOM].buf = NULL; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2556 trak->out[NGX_HTTP_MP4_CTTS_DATA].buf = NULL; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2557 return; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2558 } |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2559 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2560 atom_size = sizeof(ngx_mp4_ctts_atom_t) + (data->last - data->pos); |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2561 trak->size += atom_size; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2562 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2563 atom = trak->out[NGX_HTTP_MP4_CTTS_ATOM].buf; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2564 ctts_atom = (ngx_mp4_ctts_atom_t *) atom->pos; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2565 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2566 ngx_mp4_set_32value(ctts_atom->size, atom_size); |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2567 ngx_mp4_set_32value(ctts_atom->entries, trak->composition_offset_entries); |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2568 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2569 return; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2570 } |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2571 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2572 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2573 static void |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2574 ngx_http_mp4_crop_ctts_data(ngx_http_mp4_file_t *mp4, |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2575 ngx_http_mp4_trak_t *trak, ngx_uint_t start) |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2576 { |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2577 uint32_t count, start_sample, rest; |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2578 ngx_buf_t *data; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2579 ngx_uint_t entries; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2580 ngx_mp4_ctts_entry_t *entry, *end; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2581 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2582 /* sync samples starts from 1 */ |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2583 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2584 if (start) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2585 start_sample = trak->start_sample + 1; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2586 |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2587 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2588 "mp4 ctts crop start_sample:%uD", start_sample); |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2589 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2590 } else if (mp4->length) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2591 start_sample = trak->end_sample - trak->start_sample + 1; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2592 |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2593 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2594 "mp4 ctts crop end_sample:%uD", start_sample); |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2595 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2596 } else { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2597 return; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2598 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2599 |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2600 data = trak->out[NGX_HTTP_MP4_CTTS_DATA].buf; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2601 |
| 4085 | 2602 entries = trak->composition_offset_entries; |
| 2603 entry = (ngx_mp4_ctts_entry_t *) data->pos; | |
| 2604 end = (ngx_mp4_ctts_entry_t *) data->last; | |
| 2605 | |
| 2606 while (entry < end) { | |
| 2607 count = ngx_mp4_get_32value(entry->count); | |
| 2608 | |
|
4088
8fe1da7b8386
bugfix of r4086: nginx could not be built without debug log.
Igor Sysoev <igor@sysoev.ru>
parents:
4087
diff
changeset
|
2609 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2610 "sample:%uD, count:%uD, offset:%uD", |
| 4085 | 2611 start_sample, count, ngx_mp4_get_32value(entry->offset)); |
| 2612 | |
| 6474 | 2613 if (start_sample <= count) { |
| 2614 rest = start_sample - 1; | |
| 2615 goto found; | |
| 2616 } | |
| 2617 | |
| 2618 start_sample -= count; | |
| 2619 entries--; | |
| 2620 entry++; | |
| 4085 | 2621 } |
| 2622 | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2623 if (start) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2624 data->pos = (u_char *) end; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2625 trak->composition_offset_entries = 0; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2626 } |
| 4085 | 2627 |
| 2628 return; | |
| 2629 | |
| 2630 found: | |
| 2631 | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2632 if (start) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2633 ngx_mp4_set_32value(entry->count, count - rest); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2634 data->pos = (u_char *) entry; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2635 trak->composition_offset_entries = entries; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2636 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2637 } else { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2638 ngx_mp4_set_32value(entry->count, rest); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2639 data->last = (u_char *) (entry + 1); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2640 trak->composition_offset_entries -= entries - 1; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2641 } |
| 4085 | 2642 } |
| 2643 | |
| 2644 | |
| 2645 typedef struct { | |
| 2646 u_char size[4]; | |
| 2647 u_char name[4]; | |
| 2648 u_char version[1]; | |
| 2649 u_char flags[3]; | |
| 2650 u_char entries[4]; | |
| 2651 } ngx_mp4_stsc_atom_t; | |
| 2652 | |
| 2653 | |
| 2654 static ngx_int_t | |
| 2655 ngx_http_mp4_read_stsc_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 2656 { | |
| 2657 u_char *atom_header, *atom_table, *atom_end; | |
| 2658 uint32_t entries; | |
| 2659 ngx_buf_t *atom, *data; | |
| 2660 ngx_mp4_stsc_atom_t *stsc_atom; | |
| 2661 ngx_http_mp4_trak_t *trak; | |
| 2662 | |
| 2663 /* sample-to-chunk atom */ | |
| 2664 | |
| 2665 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 stsc atom"); | |
| 2666 | |
| 2667 atom_header = ngx_mp4_atom_header(mp4); | |
| 2668 stsc_atom = (ngx_mp4_stsc_atom_t *) atom_header; | |
| 2669 ngx_mp4_set_atom_name(stsc_atom, 's', 't', 's', 'c'); | |
| 2670 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2671 if (ngx_mp4_atom_data_size(ngx_mp4_stsc_atom_t) > atom_data_size) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2672 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2673 "\"%s\" mp4 stsc atom too small", mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2674 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2675 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2676 |
| 4085 | 2677 entries = ngx_mp4_get_32value(stsc_atom->entries); |
| 2678 | |
| 2679 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 4096 | 2680 "sample-to-chunk entries:%uD", entries); |
| 4085 | 2681 |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2682 if (ngx_mp4_atom_data_size(ngx_mp4_stsc_atom_t) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2683 + entries * sizeof(ngx_mp4_stsc_entry_t) > atom_data_size) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2684 { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2685 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2686 "\"%s\" mp4 stsc atom too small", mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2687 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2688 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2689 |
| 4085 | 2690 atom_table = atom_header + sizeof(ngx_mp4_stsc_atom_t); |
| 2691 atom_end = atom_table + entries * sizeof(ngx_mp4_stsc_entry_t); | |
| 2692 | |
| 2693 trak = ngx_mp4_last_trak(mp4); | |
| 2694 trak->sample_to_chunk_entries = entries; | |
| 2695 | |
| 2696 atom = &trak->stsc_atom_buf; | |
| 2697 atom->temporary = 1; | |
| 2698 atom->pos = atom_header; | |
| 2699 atom->last = atom_table; | |
| 2700 | |
| 2701 data = &trak->stsc_data_buf; | |
| 2702 data->temporary = 1; | |
| 2703 data->pos = atom_table; | |
| 2704 data->last = atom_end; | |
| 2705 | |
| 2706 trak->out[NGX_HTTP_MP4_STSC_ATOM].buf = atom; | |
| 2707 trak->out[NGX_HTTP_MP4_STSC_DATA].buf = data; | |
| 2708 | |
| 2709 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 2710 | |
| 2711 return NGX_OK; | |
| 2712 } | |
| 2713 | |
| 2714 | |
| 2715 static ngx_int_t | |
| 2716 ngx_http_mp4_update_stsc_atom(ngx_http_mp4_file_t *mp4, | |
| 2717 ngx_http_mp4_trak_t *trak) | |
| 2718 { | |
| 2719 size_t atom_size; | |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2720 uint32_t chunk; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2721 ngx_buf_t *atom, *data; |
| 4085 | 2722 ngx_mp4_stsc_atom_t *stsc_atom; |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2723 ngx_mp4_stsc_entry_t *entry, *end; |
| 4085 | 2724 |
| 2725 /* | |
| 2726 * mdia.minf.stbl.stsc updating requires trak->start_sample | |
| 2727 * from mdia.minf.stbl.stts which depends on value from mdia.mdhd | |
| 2728 * atom which may reside after mdia.minf | |
| 2729 */ | |
| 2730 | |
| 2731 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 2732 "mp4 stsc atom update"); | |
| 2733 | |
| 2734 data = trak->out[NGX_HTTP_MP4_STSC_DATA].buf; | |
| 2735 | |
| 2736 if (data == NULL) { | |
| 2737 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, | |
| 2738 "no mp4 stsc atoms were found in \"%s\"", | |
| 2739 mp4->file.name.data); | |
| 2740 return NGX_ERROR; | |
| 2741 } | |
| 2742 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2743 if (trak->sample_to_chunk_entries == 0) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2744 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2745 "zero number of entries in stsc atom in \"%s\"", |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2746 mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2747 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2748 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
2749 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2750 if (ngx_http_mp4_crop_stsc_data(mp4, trak, 1) != NGX_OK) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2751 return NGX_ERROR; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2752 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2753 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2754 if (ngx_http_mp4_crop_stsc_data(mp4, trak, 0) != NGX_OK) { |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2755 return NGX_ERROR; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2756 } |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2757 |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2758 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2759 "sample-to-chunk entries:%uD", |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2760 trak->sample_to_chunk_entries); |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2761 |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2762 entry = (ngx_mp4_stsc_entry_t *) data->pos; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2763 end = (ngx_mp4_stsc_entry_t *) data->last; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2764 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2765 while (entry < end) { |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2766 chunk = ngx_mp4_get_32value(entry->chunk); |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2767 chunk -= trak->start_chunk; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2768 ngx_mp4_set_32value(entry->chunk, chunk); |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2769 entry++; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2770 } |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2771 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2772 atom_size = sizeof(ngx_mp4_stsc_atom_t) |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2773 + trak->sample_to_chunk_entries * sizeof(ngx_mp4_stsc_entry_t); |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2774 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2775 trak->size += atom_size; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2776 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2777 atom = trak->out[NGX_HTTP_MP4_STSC_ATOM].buf; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2778 stsc_atom = (ngx_mp4_stsc_atom_t *) atom->pos; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2779 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2780 ngx_mp4_set_32value(stsc_atom->size, atom_size); |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2781 ngx_mp4_set_32value(stsc_atom->entries, trak->sample_to_chunk_entries); |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2782 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2783 return NGX_OK; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2784 } |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2785 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2786 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2787 static ngx_int_t |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2788 ngx_http_mp4_crop_stsc_data(ngx_http_mp4_file_t *mp4, |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2789 ngx_http_mp4_trak_t *trak, ngx_uint_t start) |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2790 { |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2791 uint32_t start_sample, chunk, samples, id, next_chunk, n, |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2792 prev_samples; |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2793 ngx_buf_t *data, *buf; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2794 ngx_uint_t entries, target_chunk, chunk_samples; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2795 ngx_mp4_stsc_entry_t *entry, *end, *first; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2796 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2797 entries = trak->sample_to_chunk_entries - 1; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2798 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2799 if (start) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2800 start_sample = (uint32_t) trak->start_sample; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2801 |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2802 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2803 "mp4 stsc crop start_sample:%uD", start_sample); |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2804 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2805 } else if (mp4->length) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2806 start_sample = (uint32_t) (trak->end_sample - trak->start_sample); |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2807 samples = 0; |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2808 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2809 data = trak->out[NGX_HTTP_MP4_STSC_START].buf; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2810 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2811 if (data) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2812 entry = (ngx_mp4_stsc_entry_t *) data->pos; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2813 samples = ngx_mp4_get_32value(entry->samples); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2814 entries--; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2815 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2816 if (samples > start_sample) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2817 samples = start_sample; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2818 ngx_mp4_set_32value(entry->samples, samples); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2819 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2820 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2821 start_sample -= samples; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2822 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2823 |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2824 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2825 "mp4 stsc crop end_sample:%uD, ext_samples:%uD", |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2826 start_sample, samples); |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2827 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2828 } else { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2829 return NGX_OK; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2830 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2831 |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2832 data = trak->out[NGX_HTTP_MP4_STSC_DATA].buf; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2833 |
| 4085 | 2834 entry = (ngx_mp4_stsc_entry_t *) data->pos; |
| 2835 end = (ngx_mp4_stsc_entry_t *) data->last; | |
| 2836 | |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2837 chunk = ngx_mp4_get_32value(entry->chunk); |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2838 samples = ngx_mp4_get_32value(entry->samples); |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2839 id = ngx_mp4_get_32value(entry->id); |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2840 prev_samples = 0; |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2841 entry++; |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2842 |
| 4085 | 2843 while (entry < end) { |
| 2844 | |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2845 next_chunk = ngx_mp4_get_32value(entry->chunk); |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2846 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2847 ngx_log_debug5(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2848 "sample:%uD, chunk:%uD, chunks:%uD, " |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2849 "samples:%uD, id:%uD", |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2850 start_sample, chunk, next_chunk - chunk, samples, id); |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2851 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2852 n = (next_chunk - chunk) * samples; |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2853 |
|
5578
e280ece17020
Mp4: remove useless leading stsc entry in result mp4.
Roman Arutyunyan <arut@nginx.com>
parents:
5544
diff
changeset
|
2854 if (start_sample < n) { |
| 4085 | 2855 goto found; |
| 2856 } | |
| 2857 | |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2858 start_sample -= n; |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2859 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2860 prev_samples = samples; |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2861 chunk = next_chunk; |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2862 samples = ngx_mp4_get_32value(entry->samples); |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2863 id = ngx_mp4_get_32value(entry->id); |
| 4085 | 2864 entries--; |
| 2865 entry++; | |
| 2866 } | |
| 2867 | |
|
5544
2f586f1684fa
Mp4: fix seeks to standalone last chunk.
Roman Arutyunyan <arut@nginx.com>
parents:
5543
diff
changeset
|
2868 next_chunk = trak->chunks + 1; |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2869 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2870 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2871 "sample:%uD, chunk:%uD, chunks:%uD, samples:%uD", |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2872 start_sample, chunk, next_chunk - chunk, samples); |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2873 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2874 n = (next_chunk - chunk) * samples; |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2875 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2876 if (start_sample > n) { |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2877 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2878 "%s time is out mp4 stsc chunks in \"%s\"", |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2879 start ? "start" : "end", mp4->file.name.data); |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2880 return NGX_ERROR; |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2881 } |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2882 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2883 found: |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2884 |
| 4085 | 2885 entries++; |
| 2886 entry--; | |
| 2887 | |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2888 if (samples == 0) { |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2889 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2890 "zero number of samples in \"%s\"", |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2891 mp4->file.name.data); |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2892 return NGX_ERROR; |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2893 } |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2894 |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2895 target_chunk = chunk - 1; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2896 target_chunk += start_sample / samples; |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2897 chunk_samples = start_sample % samples; |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2898 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2899 if (start) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2900 data->pos = (u_char *) entry; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2901 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2902 trak->sample_to_chunk_entries = entries; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2903 trak->start_chunk = target_chunk; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2904 trak->start_chunk_samples = chunk_samples; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2905 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2906 ngx_mp4_set_32value(entry->chunk, trak->start_chunk + 1); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2907 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2908 samples -= chunk_samples; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2909 |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2910 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2911 "start_chunk:%ui, start_chunk_samples:%ui", |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2912 trak->start_chunk, trak->start_chunk_samples); |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2913 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2914 } else { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2915 if (start_sample) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2916 data->last = (u_char *) (entry + 1); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2917 trak->sample_to_chunk_entries -= entries - 1; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2918 trak->end_chunk_samples = samples; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2919 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2920 } else { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2921 data->last = (u_char *) entry; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2922 trak->sample_to_chunk_entries -= entries; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2923 trak->end_chunk_samples = prev_samples; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2924 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2925 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2926 if (chunk_samples) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2927 trak->end_chunk = target_chunk + 1; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2928 trak->end_chunk_samples = chunk_samples; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2929 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2930 } else { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2931 trak->end_chunk = target_chunk; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2932 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2933 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2934 samples = chunk_samples; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2935 next_chunk = chunk + 1; |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2936 |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2937 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2938 "end_chunk:%ui, end_chunk_samples:%ui", |
|
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
2939 trak->end_chunk, trak->end_chunk_samples); |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2940 } |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2941 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2942 if (chunk_samples && next_chunk - target_chunk == 2) { |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2943 |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2944 ngx_mp4_set_32value(entry->samples, samples); |
|
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2945 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2946 } else if (chunk_samples && start) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2947 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2948 first = &trak->stsc_start_chunk_entry; |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2949 ngx_mp4_set_32value(first->chunk, 1); |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2950 ngx_mp4_set_32value(first->samples, samples); |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2951 ngx_mp4_set_32value(first->id, id); |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2952 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2953 buf = &trak->stsc_start_chunk_buf; |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2954 buf->temporary = 1; |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2955 buf->pos = (u_char *) first; |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2956 buf->last = (u_char *) first + sizeof(ngx_mp4_stsc_entry_t); |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2957 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2958 trak->out[NGX_HTTP_MP4_STSC_START].buf = buf; |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2959 |
|
5619
517b5b599e3f
Mp4: moved atom cropping code out of update functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5578
diff
changeset
|
2960 ngx_mp4_set_32value(entry->chunk, trak->start_chunk + 2); |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2961 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2962 trak->sample_to_chunk_entries++; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2963 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2964 } else if (chunk_samples) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2965 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2966 first = &trak->stsc_end_chunk_entry; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2967 ngx_mp4_set_32value(first->chunk, trak->end_chunk - trak->start_chunk); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2968 ngx_mp4_set_32value(first->samples, samples); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2969 ngx_mp4_set_32value(first->id, id); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2970 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2971 buf = &trak->stsc_end_chunk_buf; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2972 buf->temporary = 1; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2973 buf->pos = (u_char *) first; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2974 buf->last = (u_char *) first + sizeof(ngx_mp4_stsc_entry_t); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2975 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2976 trak->out[NGX_HTTP_MP4_STSC_END].buf = buf; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2977 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
2978 trak->sample_to_chunk_entries++; |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2979 } |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
2980 |
| 4085 | 2981 return NGX_OK; |
| 2982 } | |
| 2983 | |
| 2984 | |
| 2985 typedef struct { | |
| 2986 u_char size[4]; | |
| 2987 u_char name[4]; | |
| 2988 u_char version[1]; | |
| 2989 u_char flags[3]; | |
| 2990 u_char uniform_size[4]; | |
| 2991 u_char entries[4]; | |
| 2992 } ngx_mp4_stsz_atom_t; | |
| 2993 | |
| 2994 | |
| 2995 static ngx_int_t | |
| 2996 ngx_http_mp4_read_stsz_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 2997 { | |
| 2998 u_char *atom_header, *atom_table, *atom_end; | |
| 2999 size_t atom_size; | |
| 3000 uint32_t entries, size; | |
| 3001 ngx_buf_t *atom, *data; | |
| 3002 ngx_mp4_stsz_atom_t *stsz_atom; | |
| 3003 ngx_http_mp4_trak_t *trak; | |
| 3004 | |
| 3005 /* sample sizes atom */ | |
| 3006 | |
| 3007 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 stsz atom"); | |
| 3008 | |
| 3009 atom_header = ngx_mp4_atom_header(mp4); | |
| 3010 stsz_atom = (ngx_mp4_stsz_atom_t *) atom_header; | |
| 3011 ngx_mp4_set_atom_name(stsz_atom, 's', 't', 's', 'z'); | |
| 3012 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3013 if (ngx_mp4_atom_data_size(ngx_mp4_stsz_atom_t) > atom_data_size) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3014 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3015 "\"%s\" mp4 stsz atom too small", mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3016 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3017 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3018 |
| 4085 | 3019 size = ngx_mp4_get_32value(stsz_atom->uniform_size); |
| 3020 entries = ngx_mp4_get_32value(stsz_atom->entries); | |
| 3021 | |
| 3022 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 3023 "sample uniform size:%uD, entries:%uD", size, entries); | |
| 3024 | |
| 3025 trak = ngx_mp4_last_trak(mp4); | |
| 3026 trak->sample_sizes_entries = entries; | |
| 3027 | |
| 3028 atom_table = atom_header + sizeof(ngx_mp4_stsz_atom_t); | |
| 3029 | |
| 3030 atom = &trak->stsz_atom_buf; | |
| 3031 atom->temporary = 1; | |
| 3032 atom->pos = atom_header; | |
| 3033 atom->last = atom_table; | |
| 3034 | |
| 3035 trak->out[NGX_HTTP_MP4_STSZ_ATOM].buf = atom; | |
| 3036 | |
| 3037 if (size == 0) { | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3038 if (ngx_mp4_atom_data_size(ngx_mp4_stsz_atom_t) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3039 + entries * sizeof(uint32_t) > atom_data_size) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3040 { |
| 4085 | 3041 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3042 "\"%s\" mp4 stsz atom too small", |
| 4085 | 3043 mp4->file.name.data); |
| 3044 return NGX_ERROR; | |
| 3045 } | |
| 3046 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3047 atom_end = atom_table + entries * sizeof(uint32_t); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3048 |
| 4085 | 3049 data = &trak->stsz_data_buf; |
| 3050 data->temporary = 1; | |
| 3051 data->pos = atom_table; | |
| 3052 data->last = atom_end; | |
| 3053 | |
| 3054 trak->out[NGX_HTTP_MP4_STSZ_DATA].buf = data; | |
| 3055 | |
| 3056 } else { | |
| 3057 /* if size != 0 then all samples are the same size */ | |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
3058 /* TODO : chunk samples */ |
| 4085 | 3059 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; |
| 3060 ngx_mp4_set_32value(atom_header, atom_size); | |
| 3061 trak->size += atom_size; | |
| 3062 } | |
| 3063 | |
| 3064 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 3065 | |
| 3066 return NGX_OK; | |
| 3067 } | |
| 3068 | |
| 3069 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3070 static ngx_int_t |
| 4085 | 3071 ngx_http_mp4_update_stsz_atom(ngx_http_mp4_file_t *mp4, |
| 3072 ngx_http_mp4_trak_t *trak) | |
| 3073 { | |
| 3074 size_t atom_size; | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3075 uint32_t *pos, *end, entries; |
| 4085 | 3076 ngx_buf_t *atom, *data; |
| 3077 ngx_mp4_stsz_atom_t *stsz_atom; | |
| 3078 | |
| 3079 /* | |
| 3080 * mdia.minf.stbl.stsz updating requires trak->start_sample | |
| 3081 * from mdia.minf.stbl.stts which depends on value from mdia.mdhd | |
| 3082 * atom which may reside after mdia.minf | |
| 3083 */ | |
| 3084 | |
| 3085 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 3086 "mp4 stsz atom update"); | |
| 3087 | |
| 3088 data = trak->out[NGX_HTTP_MP4_STSZ_DATA].buf; | |
| 3089 | |
| 3090 if (data) { | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3091 entries = trak->sample_sizes_entries; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3092 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3093 if (trak->start_sample > entries) { |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3094 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3095 "start time is out mp4 stsz samples in \"%s\"", |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3096 mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3097 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3098 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3099 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3100 entries -= trak->start_sample; |
| 4085 | 3101 data->pos += trak->start_sample * sizeof(uint32_t); |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
3102 end = (uint32_t *) data->pos; |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
3103 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3104 for (pos = end - trak->start_chunk_samples; pos < end; pos++) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3105 trak->start_chunk_samples_size += ngx_mp4_get_32value(pos); |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
3106 } |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
3107 |
|
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
3108 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3109 "chunk samples sizes:%uL", |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3110 trak->start_chunk_samples_size); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3111 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3112 if (mp4->length) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3113 if (trak->end_sample - trak->start_sample > entries) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3114 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3115 "end time is out mp4 stsz samples in \"%s\"", |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3116 mp4->file.name.data); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3117 return NGX_ERROR; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3118 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3119 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3120 entries = trak->end_sample - trak->start_sample; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3121 data->last = data->pos + entries * sizeof(uint32_t); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3122 end = (uint32_t *) data->last; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3123 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3124 for (pos = end - trak->end_chunk_samples; pos < end; pos++) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3125 trak->end_chunk_samples_size += ngx_mp4_get_32value(pos); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3126 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3127 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3128 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3129 "mp4 stsz end_chunk_samples_size:%uL", |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3130 trak->end_chunk_samples_size); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3131 } |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
3132 |
| 4085 | 3133 atom_size = sizeof(ngx_mp4_stsz_atom_t) + (data->last - data->pos); |
| 3134 trak->size += atom_size; | |
| 3135 | |
| 3136 atom = trak->out[NGX_HTTP_MP4_STSZ_ATOM].buf; | |
| 3137 stsz_atom = (ngx_mp4_stsz_atom_t *) atom->pos; | |
| 3138 | |
| 3139 ngx_mp4_set_32value(stsz_atom->size, atom_size); | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3140 ngx_mp4_set_32value(stsz_atom->entries, entries); |
| 4085 | 3141 } |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3142 |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3143 return NGX_OK; |
| 4085 | 3144 } |
| 3145 | |
| 3146 | |
| 3147 typedef struct { | |
| 3148 u_char size[4]; | |
| 3149 u_char name[4]; | |
| 3150 u_char version[1]; | |
| 3151 u_char flags[3]; | |
| 3152 u_char entries[4]; | |
| 3153 } ngx_mp4_stco_atom_t; | |
| 3154 | |
| 3155 | |
| 3156 static ngx_int_t | |
| 3157 ngx_http_mp4_read_stco_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 3158 { | |
| 3159 u_char *atom_header, *atom_table, *atom_end; | |
| 3160 uint32_t entries; | |
| 3161 ngx_buf_t *atom, *data; | |
| 3162 ngx_mp4_stco_atom_t *stco_atom; | |
| 3163 ngx_http_mp4_trak_t *trak; | |
| 3164 | |
| 3165 /* chunk offsets atom */ | |
| 3166 | |
| 3167 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 stco atom"); | |
| 3168 | |
| 3169 atom_header = ngx_mp4_atom_header(mp4); | |
| 3170 stco_atom = (ngx_mp4_stco_atom_t *) atom_header; | |
| 3171 ngx_mp4_set_atom_name(stco_atom, 's', 't', 'c', 'o'); | |
| 3172 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3173 if (ngx_mp4_atom_data_size(ngx_mp4_stco_atom_t) > atom_data_size) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3174 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3175 "\"%s\" mp4 stco atom too small", mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3176 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3177 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3178 |
| 4085 | 3179 entries = ngx_mp4_get_32value(stco_atom->entries); |
| 3180 | |
| 3181 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "chunks:%uD", entries); | |
| 3182 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3183 if (ngx_mp4_atom_data_size(ngx_mp4_stco_atom_t) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3184 + entries * sizeof(uint32_t) > atom_data_size) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3185 { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3186 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3187 "\"%s\" mp4 stco atom too small", mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3188 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3189 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3190 |
| 4085 | 3191 atom_table = atom_header + sizeof(ngx_mp4_stco_atom_t); |
| 3192 atom_end = atom_table + entries * sizeof(uint32_t); | |
| 3193 | |
| 3194 trak = ngx_mp4_last_trak(mp4); | |
| 3195 trak->chunks = entries; | |
| 3196 | |
| 4107 | 3197 atom = &trak->stco_atom_buf; |
| 4085 | 3198 atom->temporary = 1; |
| 3199 atom->pos = atom_header; | |
| 3200 atom->last = atom_table; | |
| 3201 | |
| 4107 | 3202 data = &trak->stco_data_buf; |
| 4085 | 3203 data->temporary = 1; |
| 3204 data->pos = atom_table; | |
| 3205 data->last = atom_end; | |
| 3206 | |
| 3207 trak->out[NGX_HTTP_MP4_STCO_ATOM].buf = atom; | |
| 3208 trak->out[NGX_HTTP_MP4_STCO_DATA].buf = data; | |
| 3209 | |
| 3210 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 3211 | |
| 3212 return NGX_OK; | |
| 3213 } | |
| 3214 | |
| 3215 | |
| 3216 static ngx_int_t | |
| 3217 ngx_http_mp4_update_stco_atom(ngx_http_mp4_file_t *mp4, | |
| 3218 ngx_http_mp4_trak_t *trak) | |
| 3219 { | |
| 3220 size_t atom_size; | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3221 uint32_t entries; |
| 4085 | 3222 ngx_buf_t *atom, *data; |
| 3223 ngx_mp4_stco_atom_t *stco_atom; | |
| 3224 | |
| 3225 /* | |
| 3226 * mdia.minf.stbl.stco updating requires trak->start_chunk | |
| 3227 * from mdia.minf.stbl.stsc which depends on value from mdia.mdhd | |
| 3228 * atom which may reside after mdia.minf | |
| 3229 */ | |
| 3230 | |
| 3231 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 3232 "mp4 stco atom update"); | |
| 3233 | |
| 3234 data = trak->out[NGX_HTTP_MP4_STCO_DATA].buf; | |
| 3235 | |
| 3236 if (data == NULL) { | |
| 3237 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, | |
| 3238 "no mp4 stco atoms were found in \"%s\"", | |
| 3239 mp4->file.name.data); | |
| 3240 return NGX_ERROR; | |
| 3241 } | |
| 3242 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3243 if (trak->start_chunk > trak->chunks) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3244 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3245 "start time is out mp4 stco chunks in \"%s\"", |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3246 mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3247 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3248 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3249 |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
3250 data->pos += trak->start_chunk * sizeof(uint32_t); |
| 4085 | 3251 |
| 3252 trak->start_offset = ngx_mp4_get_32value(data->pos); | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3253 trak->start_offset += trak->start_chunk_samples_size; |
|
4098
a3e07fab98a3
Fix of case when start sample does not reside on chunk boundary.
Igor Sysoev <igor@sysoev.ru>
parents:
4096
diff
changeset
|
3254 ngx_mp4_set_32value(data->pos, trak->start_offset); |
| 4085 | 3255 |
| 3256 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
3257 "start chunk offset:%O", trak->start_offset); |
| 4085 | 3258 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3259 if (mp4->length) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3260 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3261 if (trak->end_chunk > trak->chunks) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3262 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3263 "end time is out mp4 stco chunks in \"%s\"", |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3264 mp4->file.name.data); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3265 return NGX_ERROR; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3266 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3267 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3268 entries = trak->end_chunk - trak->start_chunk; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3269 data->last = data->pos + entries * sizeof(uint32_t); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3270 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3271 if (entries) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3272 trak->end_offset = |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3273 ngx_mp4_get_32value(data->last - sizeof(uint32_t)); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3274 trak->end_offset += trak->end_chunk_samples_size; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3275 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3276 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3277 "end chunk offset:%O", trak->end_offset); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3278 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3279 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3280 } else { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3281 entries = trak->chunks - trak->start_chunk; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3282 trak->end_offset = mp4->mdat_data.buf->file_last; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3283 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3284 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3285 if (entries == 0) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3286 trak->start_offset = mp4->end; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3287 trak->end_offset = 0; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3288 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3289 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3290 atom_size = sizeof(ngx_mp4_stco_atom_t) + (data->last - data->pos); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3291 trak->size += atom_size; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3292 |
| 4085 | 3293 atom = trak->out[NGX_HTTP_MP4_STCO_ATOM].buf; |
| 3294 stco_atom = (ngx_mp4_stco_atom_t *) atom->pos; | |
| 3295 | |
| 3296 ngx_mp4_set_32value(stco_atom->size, atom_size); | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3297 ngx_mp4_set_32value(stco_atom->entries, entries); |
| 4085 | 3298 |
| 3299 return NGX_OK; | |
| 3300 } | |
| 3301 | |
| 3302 | |
| 3303 static void | |
| 3304 ngx_http_mp4_adjust_stco_atom(ngx_http_mp4_file_t *mp4, | |
| 3305 ngx_http_mp4_trak_t *trak, int32_t adjustment) | |
| 3306 { | |
| 3307 uint32_t offset, *entry, *end; | |
| 3308 ngx_buf_t *data; | |
| 3309 | |
| 3310 /* | |
| 3311 * moov.trak.mdia.minf.stbl.stco adjustment requires | |
| 3312 * minimal start offset of all traks and new moov atom size | |
| 3313 */ | |
| 3314 | |
| 3315 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 3316 "mp4 stco atom adjustment"); | |
| 3317 | |
| 3318 data = trak->out[NGX_HTTP_MP4_STCO_DATA].buf; | |
| 3319 entry = (uint32_t *) data->pos; | |
| 3320 end = (uint32_t *) data->last; | |
| 3321 | |
| 3322 while (entry < end) { | |
| 3323 offset = ngx_mp4_get_32value(entry); | |
| 3324 offset += adjustment; | |
| 3325 ngx_mp4_set_32value(entry, offset); | |
| 3326 entry++; | |
| 3327 } | |
| 3328 } | |
| 3329 | |
| 3330 | |
| 4112 | 3331 typedef struct { |
| 3332 u_char size[4]; | |
| 3333 u_char name[4]; | |
| 3334 u_char version[1]; | |
| 3335 u_char flags[3]; | |
| 3336 u_char entries[4]; | |
| 3337 } ngx_mp4_co64_atom_t; | |
| 3338 | |
| 3339 | |
| 3340 static ngx_int_t | |
| 3341 ngx_http_mp4_read_co64_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) | |
| 3342 { | |
| 3343 u_char *atom_header, *atom_table, *atom_end; | |
| 3344 uint32_t entries; | |
| 3345 ngx_buf_t *atom, *data; | |
| 3346 ngx_mp4_co64_atom_t *co64_atom; | |
| 3347 ngx_http_mp4_trak_t *trak; | |
| 3348 | |
| 3349 /* chunk offsets atom */ | |
| 3350 | |
| 3351 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 co64 atom"); | |
| 3352 | |
| 3353 atom_header = ngx_mp4_atom_header(mp4); | |
| 3354 co64_atom = (ngx_mp4_co64_atom_t *) atom_header; | |
| 3355 ngx_mp4_set_atom_name(co64_atom, 'c', 'o', '6', '4'); | |
| 3356 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3357 if (ngx_mp4_atom_data_size(ngx_mp4_co64_atom_t) > atom_data_size) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3358 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3359 "\"%s\" mp4 co64 atom too small", mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3360 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3361 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3362 |
| 4112 | 3363 entries = ngx_mp4_get_32value(co64_atom->entries); |
| 3364 | |
| 3365 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "chunks:%uD", entries); | |
| 3366 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3367 if (ngx_mp4_atom_data_size(ngx_mp4_co64_atom_t) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3368 + entries * sizeof(uint64_t) > atom_data_size) |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3369 { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3370 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3371 "\"%s\" mp4 co64 atom too small", mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3372 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3373 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3374 |
| 4112 | 3375 atom_table = atom_header + sizeof(ngx_mp4_co64_atom_t); |
| 3376 atom_end = atom_table + entries * sizeof(uint64_t); | |
| 3377 | |
| 3378 trak = ngx_mp4_last_trak(mp4); | |
| 3379 trak->chunks = entries; | |
| 3380 | |
| 3381 atom = &trak->co64_atom_buf; | |
| 3382 atom->temporary = 1; | |
| 3383 atom->pos = atom_header; | |
| 3384 atom->last = atom_table; | |
| 3385 | |
| 3386 data = &trak->co64_data_buf; | |
| 3387 data->temporary = 1; | |
| 3388 data->pos = atom_table; | |
| 3389 data->last = atom_end; | |
| 3390 | |
| 3391 trak->out[NGX_HTTP_MP4_CO64_ATOM].buf = atom; | |
| 3392 trak->out[NGX_HTTP_MP4_CO64_DATA].buf = data; | |
| 3393 | |
| 3394 ngx_mp4_atom_next(mp4, atom_data_size); | |
| 3395 | |
| 3396 return NGX_OK; | |
| 3397 } | |
| 3398 | |
| 3399 | |
| 3400 static ngx_int_t | |
| 3401 ngx_http_mp4_update_co64_atom(ngx_http_mp4_file_t *mp4, | |
| 3402 ngx_http_mp4_trak_t *trak) | |
| 3403 { | |
| 3404 size_t atom_size; | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3405 uint64_t entries; |
| 4112 | 3406 ngx_buf_t *atom, *data; |
| 3407 ngx_mp4_co64_atom_t *co64_atom; | |
| 3408 | |
| 3409 /* | |
| 3410 * mdia.minf.stbl.co64 updating requires trak->start_chunk | |
| 3411 * from mdia.minf.stbl.stsc which depends on value from mdia.mdhd | |
| 3412 * atom which may reside after mdia.minf | |
| 3413 */ | |
| 3414 | |
| 3415 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 3416 "mp4 co64 atom update"); | |
| 3417 | |
| 3418 data = trak->out[NGX_HTTP_MP4_CO64_DATA].buf; | |
| 3419 | |
| 3420 if (data == NULL) { | |
| 3421 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, | |
| 3422 "no mp4 co64 atoms were found in \"%s\"", | |
| 3423 mp4->file.name.data); | |
| 3424 return NGX_ERROR; | |
| 3425 } | |
| 3426 | |
|
4585
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3427 if (trak->start_chunk > trak->chunks) { |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3428 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3429 "start time is out mp4 co64 chunks in \"%s\"", |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3430 mp4->file.name.data); |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3431 return NGX_ERROR; |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3432 } |
|
3f874d645f45
Mp4: sanity checks cleanup.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4579
diff
changeset
|
3433 |
| 4112 | 3434 data->pos += trak->start_chunk * sizeof(uint64_t); |
| 3435 | |
| 3436 trak->start_offset = ngx_mp4_get_64value(data->pos); | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3437 trak->start_offset += trak->start_chunk_samples_size; |
| 4112 | 3438 ngx_mp4_set_64value(data->pos, trak->start_offset); |
| 3439 | |
| 3440 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
|
5630
02584b335727
Mp4: improved logging after adding "end" support.
Roman Arutyunyan <arut@nginx.com>
parents:
5629
diff
changeset
|
3441 "start chunk offset:%O", trak->start_offset); |
| 4112 | 3442 |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3443 if (mp4->length) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3444 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3445 if (trak->end_chunk > trak->chunks) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3446 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3447 "end time is out mp4 co64 chunks in \"%s\"", |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3448 mp4->file.name.data); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3449 return NGX_ERROR; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3450 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3451 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3452 entries = trak->end_chunk - trak->start_chunk; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3453 data->last = data->pos + entries * sizeof(uint64_t); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3454 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3455 if (entries) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3456 trak->end_offset = |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3457 ngx_mp4_get_64value(data->last - sizeof(uint64_t)); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3458 trak->end_offset += trak->end_chunk_samples_size; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3459 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3460 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3461 "end chunk offset:%O", trak->end_offset); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3462 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3463 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3464 } else { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3465 entries = trak->chunks - trak->start_chunk; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3466 trak->end_offset = mp4->mdat_data.buf->file_last; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3467 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3468 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3469 if (entries == 0) { |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3470 trak->start_offset = mp4->end; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3471 trak->end_offset = 0; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3472 } |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3473 |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3474 atom_size = sizeof(ngx_mp4_co64_atom_t) + (data->last - data->pos); |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3475 trak->size += atom_size; |
|
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3476 |
| 4112 | 3477 atom = trak->out[NGX_HTTP_MP4_CO64_ATOM].buf; |
| 3478 co64_atom = (ngx_mp4_co64_atom_t *) atom->pos; | |
| 3479 | |
| 3480 ngx_mp4_set_32value(co64_atom->size, atom_size); | |
|
5620
0a567878254b
Mp4: added "end" argument support.
Roman Arutyunyan <arut@nginx.com>
parents:
5619
diff
changeset
|
3481 ngx_mp4_set_32value(co64_atom->entries, entries); |
| 4112 | 3482 |
| 3483 return NGX_OK; | |
| 3484 } | |
| 3485 | |
| 3486 | |
| 3487 static void | |
| 3488 ngx_http_mp4_adjust_co64_atom(ngx_http_mp4_file_t *mp4, | |
| 3489 ngx_http_mp4_trak_t *trak, off_t adjustment) | |
| 3490 { | |
| 3491 uint64_t offset, *entry, *end; | |
| 3492 ngx_buf_t *data; | |
| 3493 | |
| 3494 /* | |
| 3495 * moov.trak.mdia.minf.stbl.co64 adjustment requires | |
| 3496 * minimal start offset of all traks and new moov atom size | |
| 3497 */ | |
| 3498 | |
| 3499 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | |
| 3500 "mp4 co64 atom adjustment"); | |
| 3501 | |
| 3502 data = trak->out[NGX_HTTP_MP4_CO64_DATA].buf; | |
| 3503 entry = (uint64_t *) data->pos; | |
| 3504 end = (uint64_t *) data->last; | |
| 3505 | |
| 3506 while (entry < end) { | |
| 3507 offset = ngx_mp4_get_64value(entry); | |
| 3508 offset += adjustment; | |
| 3509 ngx_mp4_set_64value(entry, offset); | |
| 3510 entry++; | |
| 3511 } | |
| 3512 } | |
| 3513 | |
| 3514 | |
| 4085 | 3515 static char * |
| 3516 ngx_http_mp4(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 3517 { | |
| 3518 ngx_http_core_loc_conf_t *clcf; | |
| 3519 | |
| 3520 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); | |
| 3521 clcf->handler = ngx_http_mp4_handler; | |
| 3522 | |
| 3523 return NGX_CONF_OK; | |
| 3524 } | |
| 3525 | |
| 3526 | |
| 3527 static void * | |
| 3528 ngx_http_mp4_create_conf(ngx_conf_t *cf) | |
| 3529 { | |
| 3530 ngx_http_mp4_conf_t *conf; | |
| 3531 | |
| 3532 conf = ngx_palloc(cf->pool, sizeof(ngx_http_mp4_conf_t)); | |
| 3533 if (conf == NULL) { | |
| 3534 return NULL; | |
| 3535 } | |
| 3536 | |
| 3537 conf->buffer_size = NGX_CONF_UNSET_SIZE; | |
|
4089
e27670e1ab70
mp4_max_moov_size directive has been renamed to mp4_max_buffer_size.
Igor Sysoev <igor@sysoev.ru>
parents:
4088
diff
changeset
|
3538 conf->max_buffer_size = NGX_CONF_UNSET_SIZE; |
| 4085 | 3539 |
| 3540 return conf; | |
| 3541 } | |
| 3542 | |
| 3543 | |
| 3544 static char * | |
| 3545 ngx_http_mp4_merge_conf(ngx_conf_t *cf, void *parent, void *child) | |
| 3546 { | |
| 3547 ngx_http_mp4_conf_t *prev = parent; | |
| 3548 ngx_http_mp4_conf_t *conf = child; | |
| 3549 | |
| 3550 ngx_conf_merge_size_value(conf->buffer_size, prev->buffer_size, 512 * 1024); | |
|
4089
e27670e1ab70
mp4_max_moov_size directive has been renamed to mp4_max_buffer_size.
Igor Sysoev <igor@sysoev.ru>
parents:
4088
diff
changeset
|
3551 ngx_conf_merge_size_value(conf->max_buffer_size, prev->max_buffer_size, |
| 4085 | 3552 10 * 1024 * 1024); |
| 3553 | |
| 3554 return NGX_CONF_OK; | |
| 3555 } |